diff options
| author | Chet Haase <chet@google.com> | 2015-01-23 17:56:57 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-01-23 17:56:59 +0000 |
| commit | af8c621d2165248cdb60699a6655e56e7dfa2e05 (patch) | |
| tree | 35023225129e9e9b68f3c832802e6d393363c57e | |
| parent | e77adabeafa16f9b401a6ad67405205bd96f2219 (diff) | |
| parent | d15e94f0309a91d5a75d03a9ae165121e7f24907 (diff) | |
| download | frameworks_base-af8c621d2165248cdb60699a6655e56e7dfa2e05.zip frameworks_base-af8c621d2165248cdb60699a6655e56e7dfa2e05.tar.gz frameworks_base-af8c621d2165248cdb60699a6655e56e7dfa2e05.tar.bz2 | |
Merge "Allow infinite-repeat zero-duration animators to continue repeating" into lmp-mr1-dev
| -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 8b70ae6..9709555 100644 --- a/core/java/android/animation/ValueAnimator.java +++ b/core/java/android/animation/ValueAnimator.java @@ -1273,8 +1273,7 @@ public class ValueAnimator extends Animator { } } if (fraction >= 1f) { - if (mCurrentIteration < mRepeatCount || - (mRepeatCount == INFINITE && mDuration != 0)) { + if (mCurrentIteration < mRepeatCount || mRepeatCount == INFINITE) { // Time to repeat if (mListeners != null) { int numListeners = mListeners.size(); |