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

Merge "End current key button animations when the button is hidden"

Browse Source
This commit is contained in:
Winson Chung
2020-09-21 18:20:54 +00:00
committed by Android (Google) Code Review
parent dc818acc6c df7e471a6f
commit 89008da40e
2 changed files with 28 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
packages/SystemUI/src/com/android/systemui/navigationbar/buttons/KeyButtonDrawable.java
View File

@@ -170,6 +170,24 @@ public class KeyButtonDrawable extends Drawable {
}
}
@Override
public boolean setVisible(boolean visible, boolean restart) {
boolean changed = super.setVisible(visible, restart);
if (changed) {
// End any existing animations when the visibility changes
jumpToCurrentState();
}
return changed;
}
@Override
public void jumpToCurrentState() {
super.jumpToCurrentState();
if (mAnimatedDrawable != null) {
mAnimatedDrawable.jumpToCurrentState();
}
}
@Override
public void setAlpha(int alpha) {
mState.mAlpha = alpha;

10
packages/SystemUI/src/com/android/systemui/navigationbar/buttons/KeyButtonRipple.java
View File

@@ -224,6 +224,16 @@ public class KeyButtonRipple extends Drawable {
}
}
@Override
public boolean setVisible(boolean visible, boolean restart) {
boolean changed = super.setVisible(visible, restart);
if (changed) {
// End any existing animations when the visibility changes
jumpToCurrentState();
}
return changed;
}
@Override
public void jumpToCurrentState() {
endAnimations("jumpToCurrentState", false /* cancel */);