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

Merge "Ensure ripple mask is drawn at correct position" into mnc-dev

Browse Source
This commit is contained in:
Alan Viverette
2015-08-11 19:33:55 +00:00
committed by Android (Google) Code Review
parent b4eb06402f bac9769146
commit 11104791c7
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() {