Don’t remeasure if the visibility is gone

Change-Id: Idf4045d4d0e7aad9e6902b9d7411ffb32e85db9c
Fixes: 75994549
Test: example program

1 files changed, 2 insertions, 1 deletions

diff --git a/constraintlayout/src/main/java/android/support/constraint/ConstraintLayout.java b/constraintlayout/src/main/java/android/support/constraint/ConstraintLayout.java
index ab4c6df..4be6ebd 100644
--- a/constraintlayout/src/main/java/android/support/constraint/ConstraintLayout.java
+++ b/constraintlayout/src/main/java/android/support/constraint/ConstraintLayout.java
@@ -1686,7 +1686,8 @@ public class ConstraintLayout extends ViewGroup {
                 if (child == null) {
                     continue;
                 }
-                if (child.getMeasuredWidth() != widget.getWidth() || child.getMeasuredHeight() != widget.getHeight()) {
+                if ((child.getMeasuredWidth() != widget.getWidth() || child.getMeasuredHeight() != widget.getHeight())
+                        && widget.getVisibility() != ConstraintWidget.GONE) {
                     int widthSpec = MeasureSpec.makeMeasureSpec(widget.getWidth(), MeasureSpec.EXACTLY);
                     int heightSpec = MeasureSpec.makeMeasureSpec(widget.getHeight(), MeasureSpec.EXACTLY);
                     child.measure(widthSpec, heightSpec);