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

* 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

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.
*/
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);
}