Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 96bb8adf authored by John Reck's avatar John Reck
Browse files

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
parent 45b161d2

core/java/android/view/ViewGroup.java

+3 −3
Original line number Diff line number Diff line
@@ -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;

                }