diff options
| author | Chet Haase <chet@google.com> | 2014-12-01 15:52:58 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-12-01 15:52:59 +0000 |
| commit | 2187144408dbdb5322a2212fa2e68a5891ea60ca (patch) | |
| tree | 3c9599c97b81fb9948b0a5e25772e006793e03a3 /core/java | |
| parent | 3fbf3b939abbc681f6812a429e2b809358deb7c3 (diff) | |
| parent | 5a25e5bae223bbee56dab75e36d1d947c8c3cb11 (diff) | |
Merge "Zero duration animations snap to end value when started" into lmp-mr1-dev
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/animation/ValueAnimator.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/core/java/android/animation/ValueAnimator.java b/core/java/android/animation/ValueAnimator.java index d65b4905a2ed..e18aa5c961cd 100644 --- 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); } |