Merge "Fix end() for infinite AnimatorSet" into oc-mr1-dev (aace6555) · Commits · e / os / android_frameworks_base

core/java/android/animation/AnimatorSet.java

+3 −2

Original line number	Diff line number	Diff line
		@@ -843,7 +843,7 @@ public final class AnimatorSet extends Animator implements AnimationHandler.Anim
		// Assumes forward playing from here on.
		for (int i = 0; i < mEvents.size(); i++) {
		AnimationEvent event = mEvents.get(i);
		if (event.getTime() > currentPlayTime) {
		if (event.getTime() > currentPlayTime \|\| event.getTime() == DURATION_INFINITE) {
		break;
		}

		@@ -1264,7 +1264,8 @@ public final class AnimatorSet extends Animator implements AnimationHandler.Anim
		} else {
		for (int i = mLastEventId + 1; i < size; i++) {
		AnimationEvent event = mEvents.get(i);
		if (event.getTime() <= currentPlayTime) {
		// TODO: need a function that accounts for infinite duration to compare time
		if (event.getTime() != DURATION_INFINITE && event.getTime() <= currentPlayTime) {
		latestId = i;
		}
		}