Merge "End current key button animations when the button is hidden" (89008da4) · Commits · e / os / android_frameworks_base

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

+18 −0

Original line number	Diff line number	Diff line
		@@ -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 −0

Original line number	Diff line number	Diff line
		@@ -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 */);