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" into rvc-qpr-dev am: 1989311276

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

Change-Id: Idbce346cc33731b1682bcdb511b1532a897c8e67
This commit is contained in:
TreeHugger Robot
2020-09-21 21:49:13 +00:00
committed by Automerger Merge Worker
parent 0ebdca74d1 1989311276
commit 2c4063757d
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/statusbar/policy/KeyButtonDrawable.java
View File

@@ -171,6 +171,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 @Override
public void setAlpha(int alpha) { public void setAlpha(int alpha) {
mState.mAlpha = alpha; mState.mAlpha = alpha;

10
packages/SystemUI/src/com/android/systemui/statusbar/policy/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 @Override
public void jumpToCurrentState() { public void jumpToCurrentState() {
endAnimations("jumpToCurrentState", false /* cancel */); endAnimations("jumpToCurrentState", false /* cancel */);