Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0fa814d7 authored by Romain Guy's avatar Romain Guy Committed by Android (Google) Code Review
Browse files

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

parents 73365695 fbb4321b

core/java/android/view/View.java

+3 −1
Original line number Diff line number Diff line
@@ -13055,7 +13055,9 @@ public class View implements Drawable.Callback, KeyEvent.Callback, 
        // to call invalidate() successfully when doing animations

        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) &&















                (mPrivateFlags & PFLAG_DRAW_ANIMATION) == 0) {















            mPrivateFlags2 |= PFLAG2_VIEW_QUICK_REJECTED;