From 96bb8adf4c89878adc96252e340099c6922e19ee Mon Sep 17 00:00:00 2001 From: John Reck Date: Thu, 19 Jun 2014 10:53:03 -0700 Subject: [PATCH] Revert changes to invalidateChild Bug: 15682142 Apparently it's still necessary to invalidate the parent if a child is a hardware layer Change-Id: Iaf4c1b49debd1b78b1fc8a095f685ddfcf752373 --- core/java/android/view/ViewGroup.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/core/java/android/view/ViewGroup.java b/core/java/android/view/ViewGroup.java index a02e76bbbfa56..1e72625afb5be 100644 --- a/core/java/android/view/ViewGroup.java +++ b/core/java/android/view/ViewGroup.java @@ -4386,7 +4386,7 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager // Make sure we do not set both flags at the same time int opaqueFlag = isOpaque ? PFLAG_DIRTY_OPAQUE : PFLAG_DIRTY; - if (child.mLayerType == LAYER_TYPE_SOFTWARE) { + if (child.mLayerType != LAYER_TYPE_NONE) { mPrivateFlags |= PFLAG_INVALIDATED; mPrivateFlags &= ~PFLAG_DRAWING_CACHE_VALID; } @@ -4497,7 +4497,7 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager location[CHILD_LEFT_INDEX] = left; location[CHILD_TOP_INDEX] = top; - if (mLayerType == LAYER_TYPE_SOFTWARE) { + if (mLayerType != LAYER_TYPE_NONE) { mPrivateFlags |= PFLAG_INVALIDATED; } @@ -4515,7 +4515,7 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager dirty.union(0, 0, mRight - mLeft, mBottom - mTop); } - if (mLayerType == LAYER_TYPE_SOFTWARE) { + if (mLayerType != LAYER_TYPE_NONE) { mPrivateFlags |= PFLAG_INVALIDATED; }