Merge "Do not attempt to update GONE childen of CoordinatorLayout."

GitOrigin-RevId=73c5aabec92eff5417a06f84459d7f39470851e4

PiperOrigin-RevId: 141502378
This commit is contained in:
Aurimas Liutikas 2016-12-09 00:58:25 +00:00 committed by Travis Collins
parent 1c047f4d1d
commit cab6d0da26

View File

@ -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++) {