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
This commit is contained in:
Chet Haase
2015-01-23 18:11:51 +00:00
committed by android-build-merger

View File

@@ -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();