Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 784aa149 authored by Alan Viverette's avatar Alan Viverette Committed by android-build-merger
Browse files

Merge "Cancel animation and jump to current state if not animating picker" into nyc-dev 

am: d8c38b89

* commit 'd8c38b89':
  Cancel animation and jump to current state if not animating picker

Change-Id: I20684e1e974e1d5f8f6987ca9eac17d3da470763
parents fe3659e5 d8c38b89

core/java/android/widget/RadialTimePickerView.java

+7 −0
Original line number Diff line number Diff line
@@ -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();