commit 2187144408dbdb5322a2212fa2e68a5891ea60ca
author Chet Haase <chet@google.com> Mon Dec 01 15:52:58 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Dec 01 15:52:59 2014 +0000
tree 3c9599c97b81fb9948b0a5e25772e006793e03a3
parent 3fbf3b939abbc681f6812a429e2b809358deb7c3
parent 5a25e5bae223bbee56dab75e36d1d947c8c3cb11

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

core/java/android/animation/ValueAnimator.java

diff --git a/core/java/android/animation/ValueAnimator.java b/core/java/android/animation/ValueAnimator.java
index d65b490..e18aa5c 100644
--- a/core/java/android/animation/ValueAnimator.java
+++ b/core/java/android/animation/ValueAnimator.java
@@ -537,8 +537,7 @@
      * @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);
     }