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

Commit 4b5d12d2 authored by Doris Liu's avatar Doris Liu Committed by android-build-merger
Browse files

Merge "Ensure start delay is properly scaled with duration scale" into oc-dev 

am: 9057f846

Change-Id: I124f898f6514a80a0a21682f9f9c21b282e05dde
parents 1b7ec9ad 9057f846

core/java/android/animation/ValueAnimator.java

+1 −1
Original line number Diff line number Diff line
@@ -1397,7 +1397,7 @@ public class ValueAnimator extends Animator implements AnimationHandler.Animatio 
        if (mStartTime < 0) {

            // First frame. If there is start delay, start delay count down will happen *after* this

            // frame.

            mStartTime = mReversing ? frameTime : frameTime + mStartDelay;

            mStartTime = mReversing ? frameTime : frameTime + (long) (mStartDelay * sDurationScale);

        }



        // Handle pause/resume