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

2017-06-01 00:52:57 +00:00
parent ceb24e88cb 2ac6547824
commit 9057f846ac
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