Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Put starting the animation back inside state changed check" into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-06-14 17:01:42 +00:00
committed by Android (Google) Code Review
parent eee7cc8764 7c0a17c042
commit 7395d119e6
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -331,18 +331,18 @@ public class RippleDrawable extends LayerDrawable {
private void setRippleActive(boolean active) { private void setRippleActive(boolean active) {
if (mRippleActive != active) { if (mRippleActive != active) {
mRippleActive = active; mRippleActive = active;
} if (mState.mRippleStyle == STYLE_SOLID) {
if (mState.mRippleStyle == STYLE_SOLID) { if (active) {
if (active) { tryRippleEnter();
tryRippleEnter(); } else {
tryRippleExit();
}
} else { } else {
tryRippleExit(); if (active) {
} startPatternedAnimation();
} else { } else {
if (active) { exitPatternedAnimation();
startPatternedAnimation(); }
} else {
exitPatternedAnimation();
} }
} }
} }