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

am 786529f2: am 54c807e7: Merge "Translate ripple mask to account for drawable bounds" into mnc-dev

Browse Source 
* commit '786529f2d15fe9b9083eb9ac46c8305f29cdf8e9':
  Translate ripple mask to account for drawable bounds
This commit is contained in:
Alan Viverette
2015-08-20 20:44:40 +00:00
committed by Android Git Automerger
parent 78985f3fb5 786529f2d1
commit 63e9875a3d
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -855,7 +855,8 @@ public class RippleDrawable extends LayerDrawable {
// Position the shader to account for canvas translation. // Position the shader to account for canvas translation.
if (mMaskShader != null) { if (mMaskShader != null) {
mMaskMatrix.setTranslate(-x, -y); final Rect bounds = getBounds();
mMaskMatrix.setTranslate(bounds.left - x, bounds.top - y);
mMaskShader.setLocalMatrix(mMaskMatrix); mMaskShader.setLocalMatrix(mMaskMatrix);
} }