diff options
| author | Chet Haase <chet@google.com> | 2013-09-11 14:13:48 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-09-11 14:13:48 +0000 |
| commit | a8e176534cb086cdf925b0ab0fbd7c2859a1de44 (patch) | |
| tree | 57d492d8286ac39607ba4e10e14a3ed5367b893f | |
| parent | ab6284f1e0224fcbf07de5bd0c1e9ed58509946a (diff) | |
| parent | f43fb2a57f152b5760d8792fec26f36d46b23817 (diff) | |
| download | frameworks_base-a8e176534cb086cdf925b0ab0fbd7c2859a1de44.zip frameworks_base-a8e176534cb086cdf925b0ab0fbd7c2859a1de44.tar.gz frameworks_base-a8e176534cb086cdf925b0ab0fbd7c2859a1de44.tar.bz2 | |
Merge "Reversing immediately after starting animator ends it" into klp-dev
| -rw-r--r-- | core/java/android/animation/ValueAnimator.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/core/java/android/animation/ValueAnimator.java b/core/java/android/animation/ValueAnimator.java index 6394299..86da673 100644 --- a/core/java/android/animation/ValueAnimator.java +++ b/core/java/android/animation/ValueAnimator.java @@ -1027,6 +1027,8 @@ public class ValueAnimator extends Animator { long currentPlayTime = currentTime - mStartTime; long timeLeft = mDuration - currentPlayTime; mStartTime = currentTime - timeLeft; + } else if (mStarted) { + end(); } else { start(true); } |