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

Commit 48fd9ed7 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"... 

Merge "Cancel animation and jump to current state if not animating picker" into nyc-dev am: d8c38b89 am: 3f9d17fb
am: 93b15870

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

Change-Id: Ic72675504ac72cd1b19ec8049fd56b3f54401b72
parents d905f1a5 93b15870

core/java/android/widget/RadialTimePickerView.java

+7 −0
Original line number Original line Diff line number Diff line
@@ -658,6 +658,13 @@ public class RadialTimePickerView extends View { 




        if (animate) {

        if (animate) {

            animatePicker(hours, ANIM_DURATION_NORMAL);

            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();

        initData();