diff options
| author | 2013-04-23 03:52:28 -0700 | |
|---|---|---|
| committer | 2013-04-23 03:52:28 -0700 | |
| commit | 393abb1c54c6b847b81e2390efcd6ec95e8237f8 (patch) | |
| tree | 8ed4d6bb2263a6584315779f8894fe8a7b089f35 | |
| parent | 448c6ca48144b324ca1e98962bd5dd06451a355e (diff) | |
| parent | 5e650cef53cf1eb33f9c8b2f8e5c8b1bb24b32d9 (diff) | |
am 5e650cef: Merge "Expand invalidation rectangle when clipChildren == false" into jb-mr2-dev
* commit '5e650cef53cf1eb33f9c8b2f8e5c8b1bb24b32d9':
Expand invalidation rectangle when clipChildren == false
| -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 39bff689fa72..c7ce99955e5d 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)) { |