diff options
| author | Chet Haase <chet@google.com> | 2015-01-23 18:11:51 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-01-23 18:11:51 +0000 |
| commit | 34efbcedac4157b1e92fcd8fd746ba2754b44858 (patch) | |
| tree | e2d95cea923fc78a2ee49e4ebe261db0ff1c1c94 /core/java/android/animation | |
| parent | 543945669b60c9f1b5e1ad6ac14bf794bf796d5d (diff) | |
| parent | f647cde899c4462b465721cd705f234da7e82730 (diff) | |
| download | frameworks_base-34efbcedac4157b1e92fcd8fd746ba2754b44858.zip frameworks_base-34efbcedac4157b1e92fcd8fd746ba2754b44858.tar.gz frameworks_base-34efbcedac4157b1e92fcd8fd746ba2754b44858.tar.bz2 | |
am af8c621d: Merge "Allow infinite-repeat zero-duration animators to continue repeating" into lmp-mr1-dev automerge: 458cc6a
automerge: f647cde
* commit 'f647cde899c4462b465721cd705f234da7e82730':
Allow infinite-repeat zero-duration animators to continue repeating
Diffstat (limited to 'core/java/android/animation')
| -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 e4becf5..292bb1d 100644 --- a/core/java/android/animation/ValueAnimator.java +++ b/core/java/android/animation/ValueAnimator.java @@ -1289,8 +1289,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(); |