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

* commit '5646203c0b92e26d4e4e37acad1d6d904ff50b0c':
  Translate ripple mask to account for drawable bounds
This commit is contained in:
Alan Viverette
2015-08-20 21:02:40 +00:00
committed by Android Git Automerger

View File

@ -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);
}