diff options
author | cretin45 <cretin45@gmail.com> | 2016-05-03 11:27:22 -0700 |
---|---|---|
committer | Ed Carrigan <cretin45@gmail.com> | 2016-05-03 12:25:00 -0700 |
commit | 252ecb10381090b77f1debef1b1af71540e85855 (patch) | |
tree | 499e71c09fa86297790996b1f00c2578b3d96c70 | |
parent | 2a5fc2998e47a30a9174b43cde981ab0c100f3a6 (diff) | |
download | android_packages_apps_DeskClock-252ecb10381090b77f1debef1b1af71540e85855.tar.gz android_packages_apps_DeskClock-252ecb10381090b77f1debef1b1af71540e85855.tar.bz2 android_packages_apps_DeskClock-252ecb10381090b77f1debef1b1af71540e85855.zip |
DeskClock: Fix view animator race condition
Issue-id: FEIJ-268
Change-Id: I3f04dcf45a21cced1baac9eca86f59c65bd984ec
(cherry picked from commit 5d346944d3859de53f2c2401addbab3f71e74026)
-rw-r--r-- | src/com/android/deskclock/TimerSetupView.java | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/src/com/android/deskclock/TimerSetupView.java b/src/com/android/deskclock/TimerSetupView.java index bd2216f5c..86a66a1cc 100644 --- a/src/com/android/deskclock/TimerSetupView.java +++ b/src/com/android/deskclock/TimerSetupView.java @@ -49,10 +49,21 @@ public class TimerSetupView extends LinearLayout implements Button.OnClickListen private final int mColorAccent; private final int mColorHairline; + // When quickly switching between a hide/show, + // the hide animation ends after show starts resulting in being in an invisible state. + // This boolean tracks the state that is expected. + private int mStartVisibility = View.INVISIBLE; + private final AnimatorListenerAdapter mHideFabAnimatorListener = new AnimatorListenerAdapter() { + + @Override + public void onAnimationStart(Animator animation) { + mStartVisibility = View.INVISIBLE; + } + @Override public void onAnimationEnd(Animator animation) { - if (mStart != null) { + if (mStart != null && mStartVisibility == View.INVISIBLE) { mStart.setScaleX(1.0f); mStart.setScaleY(1.0f); mStart.setVisibility(View.INVISIBLE); @@ -63,6 +74,7 @@ public class TimerSetupView extends LinearLayout implements Button.OnClickListen private final AnimatorListenerAdapter mShowFabAnimatorListener = new AnimatorListenerAdapter() { @Override public void onAnimationStart(Animator animation) { + mStartVisibility = View.VISIBLE; if (mStart != null) { mStart.setVisibility(View.VISIBLE); } @@ -155,7 +167,7 @@ public class TimerSetupView extends LinearLayout implements Button.OnClickListen private void setFabButtonVisibility(boolean show) { final int finalVisibility = show ? View.VISIBLE : View.INVISIBLE; - if (mStart == null || mStart.getVisibility() == finalVisibility) { + if (mStart == null || mStartVisibility == finalVisibility) { // Fab is not initialized yet or already shown/hidden return; } |