From cab6d0da262e892ba8a665e11ccfa694bbb04ea1 Mon Sep 17 00:00:00 2001 From: Aurimas Liutikas Date: Fri, 9 Dec 2016 00:58:25 +0000 Subject: [PATCH] Merge "Do not attempt to update GONE childen of CoordinatorLayout." GitOrigin-RevId=73c5aabec92eff5417a06f84459d7f39470851e4 PiperOrigin-RevId: 141502378 --- .../support/design/widget/CoordinatorLayout.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/lib/src/android/support/design/widget/CoordinatorLayout.java b/lib/src/android/support/design/widget/CoordinatorLayout.java index 95669341c..d4e5a1a92 100644 --- a/lib/src/android/support/design/widget/CoordinatorLayout.java +++ b/lib/src/android/support/design/widget/CoordinatorLayout.java @@ -16,6 +16,9 @@ package android.support.design.widget; +import static android.support.annotation.RestrictTo.Scope.GROUP_ID; +import static android.support.design.widget.ViewUtils.objectEquals; + import android.content.Context; import android.content.res.Resources; import android.content.res.TypedArray; @@ -72,9 +75,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import static android.support.annotation.RestrictTo.Scope.GROUP_ID; -import static android.support.design.widget.ViewUtils.objectEquals; - /** * CoordinatorLayout is a super-powered {@link android.widget.FrameLayout FrameLayout}. * @@ -1219,6 +1219,10 @@ public class CoordinatorLayout extends ViewGroup implements NestedScrollingParen for (int i = 0; i < childCount; i++) { final View child = mDependencySortedChildren.get(i); final LayoutParams lp = (LayoutParams) child.getLayoutParams(); + if (type == EVENT_PRE_DRAW && child.getVisibility() == View.GONE) { + // Do not try to update GONE child views in pre draw updates. + continue; + } // Check child views before for anchor for (int j = 0; j < i; j++) {