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

Commit 7201bf2b authored by Chris Craik's avatar Chris Craik Committed by Android (Google) Code Review
Browse files

Merge "Unify View alpha implies clipping behavior" into mnc-dev

parents c0667853 7ebc0eb2

core/java/android/view/View.java

+1 −5
Original line number Diff line number Diff line
@@ -15490,12 +15490,8 @@ public class View implements Drawable.Callback, KeyEvent.Callback, 
                        if (drawingWithRenderNode) {

                            renderNode.setAlpha(alpha * getAlpha() * getTransitionAlpha());

                        } else if (layerType == LAYER_TYPE_NONE) {

                            int layerFlags = Canvas.HAS_ALPHA_LAYER_SAVE_FLAG;

                            if ((parentFlags & ViewGroup.FLAG_CLIP_CHILDREN) != 0) {

                                layerFlags |= Canvas.CLIP_TO_LAYER_SAVE_FLAG;

                            }

                            canvas.saveLayerAlpha(sx, sy, sx + getWidth(), sy + getHeight(),

                                    multipliedAlpha, layerFlags);

                                    multipliedAlpha);

                        }

                    } else {

                        // Alpha is handled by the child directly, clobber the layer's alpha