Merge "Zero duration animations snap to end value when started" into lmp-mr1-dev

2014-12-01 15:52:58 +00:00
parent 3fbf3b939a 5a25e5bae2
commit 2187144408
1 changed files with 1 additions and 2 deletions
--- a/core/java/android/animation/ValueAnimator.java
+++ b/core/java/android/animation/ValueAnimator.java
@@ -537,8 +537,7 @@ public class ValueAnimator extends Animator {
     * @param playTime The time, in milliseconds, to which the animation is advanced or rewound.
     */
    public void setCurrentPlayTime(long playTime) {
-        float fraction = mUnscaledDuration > 0 ? (float) playTime / mUnscaledDuration :
-                playTime == 0 ? 0 : 1;
+        float fraction = mUnscaledDuration > 0 ? (float) playTime / mUnscaledDuration : 1;
        setCurrentFraction(fraction);
    }