Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 32b9f4a6: Merge "Reapply animation duration scale each time it is started." into lmp-dev

Browse Source 
* commit '32b9f4a650d1b8b52b85a27109f95fde030dff66':
  Reapply animation duration scale each time it is started.
This commit is contained in:
Jeff Brown
2014-10-08 05:12:57 +00:00
committed by Android Git Automerger
parent 662034f11e 32b9f4a650
commit e1449dfc55
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/java/android/animation/ValueAnimator.java
View File

@@ -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) {