From 32f7dab2823168f24f2dc769adcea8c0a4c79f2f Mon Sep 17 00:00:00 2001
From: Alan Viverette <alanv@google.com>
Date: Fri, 6 May 2016 15:31:23 -0400
Subject: [PATCH] Cancel animation and jump to current state if not animating
 picker

Bug: 28629631
Change-Id: I0e1b3c2f2c774e027f2df8c9ab75c7a89bd2ddb7
---
 core/java/android/widget/RadialTimePickerView.java | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/core/java/android/widget/RadialTimePickerView.java b/core/java/android/widget/RadialTimePickerView.java
index 8c8d38f188750..02ee2df18aafd 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();