Merge "Update ripple mask when invalidated" into sc-dev

2021-05-07 16:30:33 +00:00
parent 5a7bd2754e 5121e27f89
commit 6836ab8607
1 changed files with 4 additions and 0 deletions
--- a/graphics/java/android/graphics/drawable/RippleDrawable.java
+++ b/graphics/java/android/graphics/drawable/RippleDrawable.java
@@ -864,6 +864,10 @@ public class RippleDrawable extends LayerDrawable {
        boolean shouldExit = mExitingAnimation;
        mRippleActive = false;
        mExitingAnimation = false;
+        if (mRunningAnimations.size() > 0 && !shouldAnimate) {
+            // update paint when view is invalidated
+            getRipplePaint();
+        }
        drawContent(canvas);
        drawPatternedBackground(canvas, cx, cy);
        if (shouldAnimate && mRunningAnimations.size() <= MAX_RIPPLES) {