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

Commit 5dfe2360 authored by Jeff Brown's avatar Jeff Brown Committed by Android Git Automerger
Browse files

am 93116ed9: am 1ec045ad: am 45bdf81a: am e1449dfc: am 32b9f4a6: Merge... 

am 93116ed9: am 1ec045ad: am 45bdf81a: am e1449dfc: am 32b9f4a6: Merge "Reapply animation duration scale each time it is started." into lmp-dev

* commit '93116ed9':
  Reapply animation duration scale each time it is started.
parents c414ba19 93116ed9

core/java/android/animation/ValueAnimator.java

+6 −1
Original line number Diff line number Diff line
@@ -508,10 +508,14 @@ public class ValueAnimator extends Animator { 
                    duration);

        }

        mUnscaledDuration = duration;

        mDuration = (long)(duration * sDurationScale);

        updateScaledDuration();

        return this;

    }



    private void updateScaledDuration() {

        mDuration = (long)(mUnscaledDuration * sDurationScale);

    }



    /**

     * Gets the length of the animation. The default duration is 300 milliseconds.

     *
@@ -947,6 +951,7 @@ public class ValueAnimator extends Animator { 
        mStarted = true;

        mStartedDelay = false;

        mPaused = false;

        updateScaledDuration(); // in case the scale factor has changed since creation time

        AnimationHandler animationHandler = getOrCreateAnimationHandler();

        animationHandler.mPendingAnimations.add(this);

        if (mStartDelay == 0) {