End current key button animations when the button is hidden

- If the ripple animation doesn't finish before the view is hidden
  and not scheduled to draw, the render node animation will not
  finish, leaving the ripple visible until it is next touched.
  Instead, we should just end existing animations whenever the
  buttons are made invisible

Bug: 168422286
Test: Extend ripple duration beyond the dismiss nav bar window
      duration and verify bug happens without change and is fixed
      with the change

Change-Id: If3a38bcd47cc7665ee42c66f688cf306c7fab44c
This commit is contained in:
Winson Chung
2020-09-18 16:51:41 -07:00
parent 90af015660
commit df7e471a6f
2 changed files with 28 additions and 0 deletions

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

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 */);