diff options
| author | Chet Haase <chet@google.com> | 2013-04-23 02:50:54 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-04-23 02:50:54 +0000 |
| commit | 5e650cef53cf1eb33f9c8b2f8e5c8b1bb24b32d9 (patch) | |
| tree | 20170dd669a352b843b3d6faa6814aed4fbc646b /core | |
| parent | ea236f19e652942a7af384566c70cdd0c7f88c58 (diff) | |
| parent | a4f14ebe29b9c1286badeb47da19af4df88250dd (diff) | |
| download | frameworks_base-5e650cef53cf1eb33f9c8b2f8e5c8b1bb24b32d9.zip frameworks_base-5e650cef53cf1eb33f9c8b2f8e5c8b1bb24b32d9.tar.gz frameworks_base-5e650cef53cf1eb33f9c8b2f8e5c8b1bb24b32d9.tar.bz2 | |
Merge "Expand invalidation rectangle when clipChildren == false" into jb-mr2-dev
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/view/ViewGroup.java | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/core/java/android/view/ViewGroup.java b/core/java/android/view/ViewGroup.java index 39bff68..c7ce999 100644 --- a/core/java/android/view/ViewGroup.java +++ b/core/java/android/view/ViewGroup.java @@ -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)) { |