summaryrefslogtreecommitdiff
path: root/graphics/java
diff options
context:
space:
mode:
authorJay Aliomer <aaliomer@google.com>2021-06-18 17:57:57 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2021-06-18 17:57:57 +0000
commitccc98b8d6e6498ea4fffc3ca99a7681435c9bed1 (patch)
tree261dce0a8fee9202d1c35311a3843ea8afd0d4f0 /graphics/java
parentba942160b8c3dbd9d7fbe45e3ecbc04af52946e3 (diff)
parent88114108eebff0ca3204880896d1e2a3fa8fb62c (diff)
Merge "Update patterned ripple mask when changed" into sc-dev
Diffstat (limited to 'graphics/java')
-rw-r--r--graphics/java/android/graphics/drawable/RippleDrawable.java5
1 files changed, 5 insertions, 0 deletions
diff --git a/graphics/java/android/graphics/drawable/RippleDrawable.java b/graphics/java/android/graphics/drawable/RippleDrawable.java
index 0264f60fbd4d..8aba87ba3c8f 100644
--- a/graphics/java/android/graphics/drawable/RippleDrawable.java
+++ b/graphics/java/android/graphics/drawable/RippleDrawable.java
@@ -1100,6 +1100,11 @@ public class RippleDrawable extends LayerDrawable {
if (mState.mRippleStyle == STYLE_SOLID) {
mMaskCanvas.translate(left, top);
}
+ if (mState.mRippleStyle == STYLE_PATTERNED) {
+ for (int i = 0; i < mRunningAnimations.size(); i++) {
+ mRunningAnimations.get(i).getProperties().getShader().setShader(mMaskShader);
+ }
+ }
}
private int getMaskType() {