diff options
| author | Alan Viverette <alanv@google.com> | 2015-08-11 14:25:45 -0400 |
|---|---|---|
| committer | Alan Viverette <alanv@google.com> | 2015-08-11 14:25:45 -0400 |
| commit | bac9769146af07753728e5c6b3a30eae3076aed0 (patch) | |
| tree | 6bf46bf18afbe8e2d76648666801b2393a850f83 /graphics | |
| parent | ad7719dea4e8fd34854e4dcc918fc593c4416d82 (diff) | |
| download | frameworks_base-bac9769146af07753728e5c6b3a30eae3076aed0.zip frameworks_base-bac9769146af07753728e5c6b3a30eae3076aed0.tar.gz frameworks_base-bac9769146af07753728e5c6b3a30eae3076aed0.tar.bz2 | |
Ensure ripple mask is drawn at correct position
Bug: 22911708
Change-Id: Icdbe1f8a66d5e35eb25aa973c94f5870896cc1f8
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/java/android/graphics/drawable/RippleDrawable.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/graphics/java/android/graphics/drawable/RippleDrawable.java b/graphics/java/android/graphics/drawable/RippleDrawable.java index bf069d3..32f6a89 100644 --- a/graphics/java/android/graphics/drawable/RippleDrawable.java +++ b/graphics/java/android/graphics/drawable/RippleDrawable.java @@ -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() { |