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

Commit db94b0a5 authored by Chet Haase's avatar Chet Haase Committed by Android (Google) Code Review
Browse files

Merge "Don't constrain invalidation rect when not clipping children"

parents 378c368f a3db8660

core/java/android/view/ViewGroup.java

+8 −3
Original line number Diff line number Diff line
@@ -3964,7 +3964,8 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager 
                final int left = mLeft;

                final int top = mTop;



                if (dirty.intersect(0, 0, mRight - left, mBottom - top) ||

                if ((mGroupFlags & FLAG_CLIP_CHILDREN) != FLAG_CLIP_CHILDREN ||

                        dirty.intersect(0, 0, mRight - left, mBottom - top) ||

                        (mPrivateFlags & DRAW_ANIMATION) == DRAW_ANIMATION) {

                    mPrivateFlags &= ~DRAWING_CACHE_VALID;
@@ -3982,8 +3983,12 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager 


                location[CHILD_LEFT_INDEX] = mLeft;

                location[CHILD_TOP_INDEX] = mTop;



                if ((mGroupFlags & FLAG_CLIP_CHILDREN) == FLAG_CLIP_CHILDREN) {

                    dirty.set(0, 0, mRight - mLeft, mBottom - mTop);

                } else {

                    // in case the dirty rect extends outside the bounds of this container

                    dirty.union(0, 0, mRight - mLeft, mBottom - mTop);

                }



                if (mLayerType != LAYER_TYPE_NONE) {

                    mLocalDirtyRect.union(dirty);