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

am: 9057f846ac Change-Id: I124f898f6514a80a0a21682f9f9c21b282e05dde
2017-06-01 00:57:49 +00:00
parent 1b7ec9ad2c 9057f846ac
commit 4b5d12d25a
1 changed files with 1 additions and 1 deletions
--- a/core/java/android/animation/ValueAnimator.java
+++ b/core/java/android/animation/ValueAnimator.java
@@ -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