Merge "Translate ripple mask to account for drawable bounds" into mnc-dev

2015-08-20 20:31:27 +00:00
parent 1773ded846 f0d69b9e33
commit 54c807e713
1 changed files with 2 additions and 1 deletions
--- a/graphics/java/android/graphics/drawable/RippleDrawable.java
+++ b/graphics/java/android/graphics/drawable/RippleDrawable.java
@@ -855,7 +855,8 @@ public class RippleDrawable extends LayerDrawable {

        // Position the shader to account for canvas translation.
        if (mMaskShader != null) {
-            mMaskMatrix.setTranslate(-x, -y);
+            final Rect bounds = getBounds();
+            mMaskMatrix.setTranslate(bounds.left - x, bounds.top - y);
            mMaskShader.setLocalMatrix(mMaskMatrix);
        }