summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--core/java/android/widget/RadialTimePickerView.java7
1 files changed, 7 insertions, 0 deletions
diff --git a/core/java/android/widget/RadialTimePickerView.java b/core/java/android/widget/RadialTimePickerView.java
index 8c8d38f18875..02ee2df18aaf 100644
--- a/core/java/android/widget/RadialTimePickerView.java
+++ b/core/java/android/widget/RadialTimePickerView.java
@@ -658,6 +658,13 @@ public class RadialTimePickerView extends View {
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();