Merge "Flakiness fix for RadiiAnimatorTest#animationCanRepeat" into main (c8bfd1ab) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/accessibility/floatingmenu/IRadiiAnimationListener.java

+4 −0

Original line number	Diff line number	Diff line
		@@ -18,4 +18,8 @@ package com.android.systemui.accessibility.floatingmenu;

		interface IRadiiAnimationListener {
		void onRadiiAnimationUpdate(float[] radii);

		void onRadiiAnimationStart();

		void onRadiiAnimationStop();
		}

packages/SystemUI/src/com/android/systemui/accessibility/floatingmenu/MenuAnimationController.java

+13 −1

Original line number	Diff line number	Diff line
		@@ -94,7 +94,19 @@ class MenuAnimationController {
		mFadeOutAnimator.setDuration(FADE_OUT_DURATION_MS);
		mFadeOutAnimator.addUpdateListener(
		(animation) -> menuView.setAlpha((float) animation.getAnimatedValue()));
		mRadiiAnimator = new RadiiAnimator(mMenuViewAppearance.getMenuRadii(), mMenuView::setRadii);
		mRadiiAnimator = new RadiiAnimator(mMenuViewAppearance.getMenuRadii(),
		new IRadiiAnimationListener() {
		@Override
		public void onRadiiAnimationUpdate(float[] radii) {
		mMenuView.setRadii(radii);
		}

		@Override
		public void onRadiiAnimationStart() {}

		@Override
		public void onRadiiAnimationStop() {}
		});
		}

		void moveToPosition(PointF position) {

packages/SystemUI/src/com/android/systemui/accessibility/floatingmenu/RadiiAnimator.java

+5 −1

Original line number	Diff line number	Diff line
		@@ -55,15 +55,19 @@ class RadiiAnimator {
		@Override
		public void onAnimationStart(@NonNull Animator animation) {
		animationListener.onRadiiAnimationUpdate(evaluate(/* t = */ 0.0f));
		animationListener.onRadiiAnimationStart();
		}

		@Override
		public void onAnimationEnd(@NonNull Animator animation) {}
		public void onAnimationEnd(@NonNull Animator animation) {
		animationListener.onRadiiAnimationStop();
		}

		@Override
		public void onAnimationCancel(@NonNull Animator animation) {
		animationListener.onRadiiAnimationUpdate(
		evaluate(mAnimationDriver.getAnimatedFraction()));
		animationListener.onRadiiAnimationStop();
		}

		@Override

packages/SystemUI/tests/src/com/android/systemui/accessibility/floatingmenu/RadiiAnimatorTest.java

+32 −14

Original line number	Diff line number	Diff line
		@@ -31,42 +31,60 @@ import org.junit.Test;
		import org.junit.runner.RunWith;

		import java.util.Arrays;
		import java.util.concurrent.atomic.AtomicBoolean;

		/** Tests for {@link RadiiAnimator}. */
		@SmallTest
		@RunWith(AndroidTestingRunner.class)
		public class RadiiAnimatorTest extends SysuiTestCase {
		float[] mResultRadii = new float[RadiiAnimator.RADII_COUNT];
		final AtomicBoolean mAnimationStarted = new AtomicBoolean(false);
		final AtomicBoolean mAnimationStopped = new AtomicBoolean(false);
		final IRadiiAnimationListener mRadiiAnimationListener = new IRadiiAnimationListener() {
		@Override
		public void onRadiiAnimationUpdate(float[] radii) {
		mResultRadii = radii;
		}

		@Override
		public void onRadiiAnimationStart() {
		mAnimationStarted.set(true);
		}

		@Override
		public void onRadiiAnimationStop() {
		mAnimationStopped.set(true);
		}
		};

		@Test
		public void constructor() {
		final float[] radii = generateRadii(0.0f);
		final RadiiAnimator radiiAnimator = new RadiiAnimator(radii, newRadii -> {});

		final RadiiAnimator radiiAnimator = new RadiiAnimator(radii, mRadiiAnimationListener);
		assertThat(radiiAnimator.evaluate(0.0f)).isEqualTo(radii);
		}

		@Test
		public void skip_updates_to_end() {
		public void skipAnimation_updatesToEnd() {
		final float[] startRadii = generateRadii(0.0f);
		final float[] endRadii = generateRadii(1.0f);

		final RadiiAnimator radiiAnimator = setupAnimator(startRadii);

		mAnimationStarted.set(false);
		mAnimationStopped.set(false);
		new Handler(Looper.getMainLooper()).post(() -> radiiAnimator.startAnimation(endRadii));
		TestUtils.waitForCondition(radiiAnimator::isStarted, "Animation did not start.");
		TestUtils.waitForCondition(mAnimationStarted::get, "Animation did not start.");
		TestUtils.waitForCondition(() -> Arrays.equals(radiiAnimator.evaluate(0.0f), startRadii)
		&& Arrays.equals(radiiAnimator.evaluate(1.0f), endRadii),
		"Animator did not initialize to start and end values");

		new Handler(Looper.getMainLooper()).post(radiiAnimator::skipAnimationToEnd);
		TestUtils.waitForCondition(
		() -> !radiiAnimator.isStarted(), "Animation did not end.");
		TestUtils.waitForCondition(mAnimationStopped::get, "Animation did not stop.");
		assertThat(mResultRadii).usingTolerance(0.001).containsExactly(endRadii);
		}

		@Test
		public void animation_can_repeat() {
		public void finishedAnimation_canRepeat() {
		final float[] startRadii = generateRadii(0.0f);
		final float[] midRadii = generateRadii(1.0f);
		final float[] endRadii = generateRadii(2.0f);
		@@ -88,15 +106,15 @@ public class RadiiAnimatorTest extends SysuiTestCase {

		private RadiiAnimator setupAnimator(float[] startRadii) {
		mResultRadii = new float[RadiiAnimator.RADII_COUNT];
		return new RadiiAnimator(startRadii,
		newRadii -> mResultRadii = newRadii);
		return new RadiiAnimator(startRadii, mRadiiAnimationListener);
		}

		private void playAndSkipAnimation(RadiiAnimator animator, float[] endRadii) {
		mAnimationStarted.set(false);
		mAnimationStopped.set(false);
		new Handler(Looper.getMainLooper()).post(() -> animator.startAnimation(endRadii));
		TestUtils.waitForCondition(animator::isStarted, "Animation did not start.");
		TestUtils.waitForCondition(mAnimationStarted::get, "Animation did not start.");
		new Handler(Looper.getMainLooper()).post(animator::skipAnimationToEnd);
		TestUtils.waitForCondition(
		() -> !animator.isStarted(), "Animation did not end.");
		TestUtils.waitForCondition(mAnimationStopped::get, "Animation did not stop.");
		}
		}