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

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

Browse Source 
* commit '45bdf81a48253c90797e99794323c8ece9806a50':
  Reapply animation duration scale each time it is started.
This commit is contained in:
Jeff Brown
2014-10-08 05:35:45 +00:00
committed by Android Git Automerger
parent afcd49611e 45bdf81a48
commit 1ec045adb7
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); duration);
} }
mUnscaledDuration = duration; mUnscaledDuration = duration;
mDuration = (long)(duration * sDurationScale); updateScaledDuration();
return this; return this;
} }
private void updateScaledDuration() {
mDuration = (long)(mUnscaledDuration * sDurationScale);
}
/** /**
* Gets the length of the animation. The default duration is 300 milliseconds. * Gets the length of the animation. The default duration is 300 milliseconds.
* *
@@ -947,6 +951,7 @@ public class ValueAnimator extends Animator {
mStarted = true; mStarted = true;
mStartedDelay = false; mStartedDelay = false;
mPaused = false; mPaused = false;
updateScaledDuration(); // in case the scale factor has changed since creation time
AnimationHandler animationHandler = getOrCreateAnimationHandler(); AnimationHandler animationHandler = getOrCreateAnimationHandler();
animationHandler.mPendingAnimations.add(this); animationHandler.mPendingAnimations.add(this);
if (mStartDelay == 0) { if (mStartDelay == 0) {