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

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

Merge "Expand invalidation rectangle when clipChildren == false" into jb-mr2-dev

parents ea236f19 a4f14ebe

core/java/android/view/ViewGroup.java

+6 −0
Original line number Diff line number Diff line
@@ -4279,6 +4279,9 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager 
                        FLAG_OPTIMIZE_INVALIDATE) {

                dirty.offset(location[CHILD_LEFT_INDEX] - mScrollX,

                        location[CHILD_TOP_INDEX] - mScrollY);

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

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

                }



                final int left = mLeft;

                final int top = mTop;
@@ -4378,6 +4381,9 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager 
        if ((mPrivateFlags & PFLAG_DRAWN) == PFLAG_DRAWN ||

                (mPrivateFlags & PFLAG_DRAWING_CACHE_VALID) == PFLAG_DRAWING_CACHE_VALID) {

            dirty.offset(left - mScrollX, top - mScrollY);

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

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

            }



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

                    dirty.intersect(0, 0, mRight - mLeft, mBottom - mTop)) {