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

Commit 7f39c0aa authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Ripple mask shader not drawing properly" into tm-dev am: 64f13bc9 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17147739

Change-Id: Ifd2862a6552081b9364f57716070cf6e0ac05889
parents 972b3fd9 64f13bc9

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

+9 −8
Original line number Diff line number Diff line
@@ -1098,19 +1098,16 @@ public class RippleDrawable extends LayerDrawable { 
        }



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

        final int saveCount = mMaskCanvas.save();

        final int left = bounds.left;

        final int top = bounds.top;

        if (mState.mRippleStyle == STYLE_SOLID) {

        mMaskCanvas.translate(-left, -top);

        }

        if (maskType == MASK_EXPLICIT) {

            drawMask(mMaskCanvas);

        } else if (maskType == MASK_CONTENT) {

            drawContent(mMaskCanvas);

        }

        if (mState.mRippleStyle == STYLE_SOLID) {

            mMaskCanvas.translate(left, top);

        }

        mMaskCanvas.restoreToCount(saveCount);

        if (mState.mRippleStyle == STYLE_PATTERNED) {

            for (int i = 0; i < mRunningAnimations.size(); i++) {

                mRunningAnimations.get(i).getProperties().getShader().setShader(mMaskShader);
@@ -1210,9 +1207,13 @@ public class RippleDrawable extends LayerDrawable { 
        updateMaskShaderIfNeeded();



        // Position the shader to account for canvas translation.

        if (mMaskShader != null && mState.mRippleStyle == STYLE_SOLID) {

        if (mMaskShader != null) {

            final Rect bounds = getBounds();

            if (mState.mRippleStyle == STYLE_PATTERNED) {

                mMaskMatrix.setTranslate(bounds.left, bounds.top);

            } else {

                mMaskMatrix.setTranslate(bounds.left - x, bounds.top - y);

            }

            mMaskShader.setLocalMatrix(mMaskMatrix);

        }