Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Don't quickReject() children if FLAG_CLIP_CHILDREN isn't set" into jb-mr1-dev

Browse Source
This commit is contained in:
Romain Guy
2012-08-30 15:26:57 -07:00
committed by Android (Google) Code Review
parent 73365695e4 fbb4321b94
commit 0fa814d7e6
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/view/View.java
View File

@@ -13055,7 +13055,9 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
// to call invalidate() successfully when doing animations // to call invalidate() successfully when doing animations
mPrivateFlags |= PFLAG_DRAWN; mPrivateFlags |= PFLAG_DRAWN;
if (!concatMatrix && (flags & ViewGroup.FLAG_SUPPORT_STATIC_TRANSFORMATIONS) == 0 && if (!concatMatrix &&
(flags & (ViewGroup.FLAG_SUPPORT_STATIC_TRANSFORMATIONS |
ViewGroup.FLAG_CLIP_CHILDREN)) == ViewGroup.FLAG_CLIP_CHILDREN &&
canvas.quickReject(mLeft, mTop, mRight, mBottom, Canvas.EdgeType.BW) && canvas.quickReject(mLeft, mTop, mRight, mBottom, Canvas.EdgeType.BW) &&
(mPrivateFlags & PFLAG_DRAW_ANIMATION) == 0) { (mPrivateFlags & PFLAG_DRAW_ANIMATION) == 0) {
mPrivateFlags2 |= PFLAG2_VIEW_QUICK_REJECTED; mPrivateFlags2 |= PFLAG2_VIEW_QUICK_REJECTED;