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

Commit 11104791 authored by Alan Viverette's avatar Alan Viverette Committed by Android (Google) Code Review
Browse files

Merge "Ensure ripple mask is drawn at correct position" into mnc-dev

parents b4eb0640 bac97691

graphics/java/android/graphics/drawable/RippleDrawable.java

+5 −1
Original line number Diff line number Diff line
@@ -786,12 +786,16 @@ public class RippleDrawable extends LayerDrawable { 
            mMaskColorFilter = new PorterDuffColorFilter(0, PorterDuff.Mode.SRC_IN);

        }



        // Draw the appropriate mask.

        // Draw the appropriate mask anchored to (0,0).

        final int left = bounds.left;

        final int top = bounds.top;

        mMaskCanvas.translate(-left, -top);

        if (maskType == MASK_EXPLICIT) {

            drawMask(mMaskCanvas);

        } else if (maskType == MASK_CONTENT) {

            drawContent(mMaskCanvas);

        }

        mMaskCanvas.translate(left, top);

    }



    private int getMaskType() {