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 am: 7395d119e6

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14940219

Change-Id: Id079a41692640f6c36b5fa96e3ad4ad56e71fe8f
This commit is contained in:
TreeHugger Robot
2021-06-14 17:14:57 +00:00
committed by Automerger Merge Worker
parent d74e376eae 7395d119e6
commit 7c892f1b21
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) {
if (mRippleActive != active) {
mRippleActive = active;
}
if (mState.mRippleStyle == STYLE_SOLID) {
if (active) {
tryRippleEnter();
if (mState.mRippleStyle == STYLE_SOLID) {
if (active) {
tryRippleEnter();
} else {
tryRippleExit();
}
} else {
tryRippleExit();
}
} else {
if (active) {
startPatternedAnimation();
} else {
exitPatternedAnimation();
if (active) {
startPatternedAnimation();
} else {
exitPatternedAnimation();
}
}
}
}