drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit '570a2363c8f80e94fbd6433e0c7f655a7350ad04':
  Ensure ripple mask is drawn at correct position
This commit is contained in:
Alan Viverette
2015-08-11 20:02:30 +00:00
committed by Android Git Automerger
parent 3e384531be 570a2363c8
commit e968c87fa7
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
graphics/java/android/graphics/drawable/RippleDrawable.java
View File

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