Merge "end() a reverse()'d animation correctly" into jb-mr1-dev

2012-09-12 17:30:15 -07:00
parent 51e67a0a74 4dd1768643
commit 0c348b6dd7
1 changed files with 1 additions and 7 deletions
--- a/core/java/android/animation/ValueAnimator.java
+++ b/core/java/android/animation/ValueAnimator.java
@@ -958,13 +958,7 @@ public class ValueAnimator extends Animator {
        } else if (!mInitialized) {
            initAnimation();
        }
-        // The final value set on the target varies, depending on whether the animation
-        // was supposed to repeat an odd number of times
-        if (mRepeatCount > 0 && (mRepeatCount & 0x01) == 1) {
-            animateValue(0f);
-        } else {
-            animateValue(1f);
-        }
+        animateValue(mPlayingBackwards ? 0f : 1f);
        endAnimation(handler);
    }