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

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

Browse Source 
* commit '2187144408dbdb5322a2212fa2e68a5891ea60ca':
  Zero duration animations snap to end value when started
This commit is contained in:
Chet Haase
2014-12-01 15:58:46 +00:00
committed by Android Git Automerger
parent 9e8637411a 2187144408
commit 8394e9fff3
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -537,8 +537,7 @@ public class ValueAnimator extends Animator {
* @param playTime The time, in milliseconds, to which the animation is advanced or rewound. * @param playTime The time, in milliseconds, to which the animation is advanced or rewound.
*/ */
public void setCurrentPlayTime(long playTime) { public void setCurrentPlayTime(long playTime) {
float fraction = mUnscaledDuration > 0 ? (float) playTime / mUnscaledDuration : float fraction = mUnscaledDuration > 0 ? (float) playTime / mUnscaledDuration : 1;
playTime == 0 ? 0 : 1;
setCurrentFraction(fraction); setCurrentFraction(fraction);
} }