diff options
| author | Chet Haase <chet@google.com> | 2013-04-20 21:37:23 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-04-20 21:37:23 -0700 |
| commit | 684634144b15e4da0ed04baa2c4531ef538652a6 (patch) | |
| tree | 3b2d77eaf84979a554b35375578d00874bafc745 /core/java/android/view/ViewGroup.java | |
| parent | f986ecf47eeba73e848d6eaef7d6a8f5ab3b1713 (diff) | |
| parent | 371d4cccde56ec4d26e51f8e82ef68f196169a3d (diff) | |
am 371d4ccc: am 339ac854: Merge "Fix quickReject logic to account for setClipChildren() setting" into jb-mr2-dev
* commit '371d4cccde56ec4d26e51f8e82ef68f196169a3d':
Fix quickReject logic to account for setClipChildren() setting
Diffstat (limited to 'core/java/android/view/ViewGroup.java')
| -rw-r--r-- | core/java/android/view/ViewGroup.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/view/ViewGroup.java b/core/java/android/view/ViewGroup.java index a8c83f7f681c..931c7333d736 100644 --- a/core/java/android/view/ViewGroup.java +++ b/core/java/android/view/ViewGroup.java @@ -3119,7 +3119,7 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager for (int i = 0; i < mChildrenCount; ++i) { View child = getChildAt(i); if (child.mDisplayList != null) { - child.mDisplayList.setClipChildren(clipChildren); + child.mDisplayList.setClipToBounds(clipChildren); } } } |