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/View.java | |
| parent | f986ecf47eeba73e848d6eaef7d6a8f5ab3b1713 (diff) | |
| parent | 371d4cccde56ec4d26e51f8e82ef68f196169a3d (diff) | |
| download | frameworks_base-684634144b15e4da0ed04baa2c4531ef538652a6.zip frameworks_base-684634144b15e4da0ed04baa2c4531ef538652a6.tar.gz frameworks_base-684634144b15e4da0ed04baa2c4531ef538652a6.tar.bz2 | |
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/View.java')
| -rw-r--r-- | core/java/android/view/View.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java index 17ef58a..d658aac 100644 --- a/core/java/android/view/View.java +++ b/core/java/android/view/View.java @@ -13515,8 +13515,8 @@ public class View implements Drawable.Callback, KeyEvent.Callback, displayList.setLeftTopRightBottom(mLeft, mTop, mRight, mBottom); displayList.setHasOverlappingRendering(hasOverlappingRendering()); if (mParent instanceof ViewGroup) { - displayList.setClipChildren( - (((ViewGroup)mParent).mGroupFlags & ViewGroup.FLAG_CLIP_CHILDREN) != 0); + displayList.setClipToBounds( + (((ViewGroup) mParent).mGroupFlags & ViewGroup.FLAG_CLIP_CHILDREN) != 0); } float alpha = 1; if (mParent instanceof ViewGroup && (((ViewGroup) mParent).mGroupFlags & |