Skip to content

Commit fbb4321

Browse files
author
Romain Guy
committed
Don't quickReject() children if FLAG_CLIP_CHILDREN isn't set
External report: http://code.google.com/p/android/issues/detail?id=36788 Change-Id: Ibdaecf37ab013e30b16e9dc7a6e50156d72c3e4f
1 parent e217ee4 commit fbb4321

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

core/java/android/view/View.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13055,7 +13055,9 @@ boolean draw(Canvas canvas, ViewGroup parent, long drawingTime) {
1305513055
// to call invalidate() successfully when doing animations
1305613056
mPrivateFlags |= PFLAG_DRAWN;
1305713057

13058-
if (!concatMatrix && (flags & ViewGroup.FLAG_SUPPORT_STATIC_TRANSFORMATIONS) == 0 &&
13058+
if (!concatMatrix &&
13059+
(flags & (ViewGroup.FLAG_SUPPORT_STATIC_TRANSFORMATIONS |
13060+
ViewGroup.FLAG_CLIP_CHILDREN)) == ViewGroup.FLAG_CLIP_CHILDREN &&
1305913061
canvas.quickReject(mLeft, mTop, mRight, mBottom, Canvas.EdgeType.BW) &&
1306013062
(mPrivateFlags & PFLAG_DRAW_ANIMATION) == 0) {
1306113063
mPrivateFlags2 |= PFLAG2_VIEW_QUICK_REJECTED;

0 commit comments

Comments
 (0)