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

Commit 570a2363 authored by Alan Viverette's avatar Alan Viverette Committed by Android Git Automerger
Browse files

am a8431e8c: am bfd62580: am 11104791: Merge "Ensure ripple mask is drawn at... 

am a8431e8c: am bfd62580: am 11104791: Merge "Ensure ripple mask is drawn at correct position" into mnc-dev

* commit 'a8431e8c':
  Ensure ripple mask is drawn at correct position
parents 1743988c a8431e8c

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

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

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

        if (maskType == MASK_EXPLICIT) {

            drawMask(mMaskCanvas);

            drawMask(mMaskCanvas);

        } else if (maskType == MASK_CONTENT) {

        } else if (maskType == MASK_CONTENT) {

            drawContent(mMaskCanvas);

            drawContent(mMaskCanvas);

        }

        }

        mMaskCanvas.translate(left, top);

    }

    }





    private int getMaskType() {

    private int getMaskType() {