Merge "Remove animation listener while paused." into nyc-dev (7d09ca79) · Commits · e / os / android_frameworks_base

core/java/android/animation/ValueAnimator.java

+11 −4

Original line number	Diff line number	Diff line
		@@ -1029,8 +1029,16 @@ public class ValueAnimator extends Animator implements AnimationHandler.Animatio

		@Override
		public void resume() {
		if (mPaused) {
		if (Looper.myLooper() == null) {
		throw new AndroidRuntimeException("Animators may only be resumed from the same " +
		"thread that the animator was started on");
		}
		if (mPaused && !mResumed) {
		mResumed = true;
		if (mPauseTime > 0) {
		AnimationHandler handler = AnimationHandler.getInstance();
		handler.addAnimationFrameCallback(this, 0);
		}
		}
		super.resume();
		}
		@@ -1235,9 +1243,8 @@ public class ValueAnimator extends Animator implements AnimationHandler.Animatio
		}
		mLastFrameTime = frameTime;
		if (mPaused) {
		if (mPauseTime < 0) {
		mPauseTime = frameTime;
		}
		handler.removeCallback(this);
		return;
		} else if (mResumed) {
		mResumed = false;

+6 −1

Original line number	Diff line number	Diff line
		@@ -328,7 +328,12 @@ public class ValueAnimatorTests extends ActivityInstrumentationTestCase2<BasicAn
		// Only a1's pause listener should be called.
		assertTrue(l1.pauseCalled);
		assertFalse(l1.resumeCalled);
		runTestOnUiThread(new Runnable() {
		@Override
		public void run() {
		a1.resume();
		}
		});

		Thread.sleep(a1.getTotalDuration());