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

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

Merge "Don't clip alpha layers if the flag is not set."

parents 297bb68d fd880425

core/java/android/view/ViewGroup.java

+5 −1
Original line number Diff line number Diff line
@@ -1973,8 +1973,12 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager 
                if (hasNoCache) {

                    final int multipliedAlpha = (int) (255 * alpha);

                    if (!child.onSetAlpha(multipliedAlpha)) {

                        int layerFlags = Canvas.HAS_ALPHA_LAYER_SAVE_FLAG;

                        if ((flags & FLAG_CLIP_CHILDREN) == FLAG_CLIP_CHILDREN) {

                            layerFlags |= Canvas.CLIP_TO_LAYER_SAVE_FLAG;

                        }

                        canvas.saveLayerAlpha(sx, sy, sx + cr - cl, sy + cb - ct, multipliedAlpha,

                                Canvas.HAS_ALPHA_LAYER_SAVE_FLAG | Canvas.CLIP_TO_LAYER_SAVE_FLAG);

                                layerFlags);

                    } else {

                        child.mPrivateFlags |= ALPHA_SET;

                    }