Merge "Update ripple mask when invalidated" into sc-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
6836ab8607
@@ -864,6 +864,10 @@ public class RippleDrawable extends LayerDrawable {
|
|||||||
boolean shouldExit = mExitingAnimation;
|
boolean shouldExit = mExitingAnimation;
|
||||||
mRippleActive = false;
|
mRippleActive = false;
|
||||||
mExitingAnimation = false;
|
mExitingAnimation = false;
|
||||||
|
if (mRunningAnimations.size() > 0 && !shouldAnimate) {
|
||||||
|
// update paint when view is invalidated
|
||||||
|
getRipplePaint();
|
||||||
|
}
|
||||||
drawContent(canvas);
|
drawContent(canvas);
|
||||||
drawPatternedBackground(canvas, cx, cy);
|
drawPatternedBackground(canvas, cx, cy);
|
||||||
if (shouldAnimate && mRunningAnimations.size() <= MAX_RIPPLES) {
|
if (shouldAnimate && mRunningAnimations.size() <= MAX_RIPPLES) {
|
||||||
|
|||||||
Reference in New Issue
Block a user