commit fab41117a03da765c1424a68917db2e011e88bd5
author Alan Viverette <alanv@google.com> Fri May 06 15:31:23 2016 -0400
committer The Android Automerger <android-build@google.com> Mon May 09 17:29:49 2016 -0700
tree 6bcaefd28f9b24c7e124f8fdb18b7249d79e0e03
parent a649704366636adeaa60925949971284b132f15d

Cancel animation and jump to current state if not animating picker

Bug: 28629631
Change-Id: I0e1b3c2f2c774e027f2df8c9ab75c7a89bd2ddb7

core/java/android/widget/RadialTimePickerView.java

diff --git a/core/java/android/widget/RadialTimePickerView.java b/core/java/android/widget/RadialTimePickerView.java
index 8c8d38f..02ee2df 100644
--- a/core/java/android/widget/RadialTimePickerView.java
+++ b/core/java/android/widget/RadialTimePickerView.java
@@ -658,6 +658,13 @@
 
         if (animate) {
             animatePicker(hours, ANIM_DURATION_NORMAL);
+        } else {
+            // If we have a pending or running animator, cancel it.
+            if (mHoursToMinutesAnimator != null && mHoursToMinutesAnimator.isStarted()) {
+                mHoursToMinutesAnimator.cancel();
+                mHoursToMinutesAnimator = null;
+            }
+            mHoursToMinutes = hours ? 0.0f : 1.0f;
         }
 
         initData();