Merge "Add set correct window corner radius on split invocation animation leashes" into main (d900d394) · Commits · e / os / android_packages_apps_Trebuchet

quickstep/src/com/android/quickstep/util/SplitAnimationController.kt

+11 −7

Original line number	Diff line number	Diff line
		@@ -486,7 +486,8 @@ class SplitAnimationController(val splitSelectStateController: SplitSelectStateC
		depthController: DepthController?,
		info: TransitionInfo?,
		t: Transaction?,
		finishCallback: Runnable
		finishCallback: Runnable,
		cornerRadius: Float
		) {
		if (info == null && t == null) {
		// (Legacy animation) Tapping a split tile in Overview
		@@ -550,7 +551,8 @@ class SplitAnimationController(val splitSelectStateController: SplitSelectStateC
		"unexpected null"
		}

		composeFadeInSplitLaunchAnimator(initialTaskId, secondTaskId, info, t, finishCallback)
		composeFadeInSplitLaunchAnimator(initialTaskId, secondTaskId, info, t, finishCallback,
		cornerRadius)
		}
		}

		@@ -1028,7 +1030,8 @@ class SplitAnimationController(val splitSelectStateController: SplitSelectStateC
		secondTaskId: Int,
		transitionInfo: TransitionInfo,
		t: Transaction,
		finishCallback: Runnable
		finishCallback: Runnable,
		cornerRadius: Float
		) {
		var splitRoot1: Change? = null
		var splitRoot2: Change? = null
		@@ -1106,6 +1109,7 @@ class SplitAnimationController(val splitSelectStateController: SplitSelectStateC
		override fun onAnimationStart(animation: Animator) {
		for (leash in openingTargets) {
		animTransaction.show(leash).setAlpha(leash, 0.0f)
		animTransaction.setCornerRadius(leash, cornerRadius);
		}
		animTransaction.apply()
		}

quickstep/src/com/android/quickstep/util/SplitSelectStateController.java

+7 −3

Original line number	Diff line number	Diff line
		@@ -104,6 +104,7 @@ import com.android.systemui.animation.RemoteAnimationRunnerCompat;
		import com.android.systemui.shared.recents.model.Task;
		import com.android.systemui.shared.system.ActivityManagerWrapper;
		import com.android.systemui.shared.system.InteractionJankMonitorWrapper;
		import com.android.systemui.shared.system.QuickStepContract;
		import com.android.wm.shell.common.split.SplitScreenConstants.PersistentSnapPosition;
		import com.android.wm.shell.splitscreen.ISplitSelectListener;

		@@ -778,7 +779,8 @@ public class SplitSelectStateController {
		info, t, () -> {
		finishAdapter.run();
		cleanup(true /success/);
		});
		},
		QuickStepContract.getWindowCornerRadius(mContainer.asContext()));
		});
		}

		@@ -826,7 +828,8 @@ public class SplitSelectStateController {
		RemoteAnimationTarget[] wallpapers, RemoteAnimationTarget[] nonApps,
		Runnable finishedCallback) {
		postAsyncCallback(mHandler,
		() -> mSplitAnimationController.playSplitLaunchAnimation(mLaunchingTaskView,
		() -> mSplitAnimationController
		.playSplitLaunchAnimation(mLaunchingTaskView,
		mLaunchingIconView, mInitialTaskId, mSecondTaskId, apps, wallpapers,
		nonApps, mStateManager, mDepthController, null /* info /, null / t */,
		() -> {
		@@ -835,7 +838,8 @@ public class SplitSelectStateController {
		mSuccessCallback.accept(true);
		}
		resetState();
		}));
		},
		QuickStepContract.getWindowCornerRadius(mContainer.asContext())));
		}

		@Override

quickstep/tests/multivalentTests/src/com/android/quickstep/util/SplitAnimationControllerTest.kt

+16 −9

Original line number	Diff line number	Diff line
		@@ -225,7 +225,8 @@ class SplitAnimationControllerTest {
		depthController,
		null /* info */,
		null /* t */,
		{} /* finishCallback */
		{} /* finishCallback */,
		1f /* cornerRadius */
		)

		verify(spySplitAnimationController)
		@@ -261,7 +262,8 @@ class SplitAnimationControllerTest {
		depthController,
		transitionInfo,
		transaction,
		{} /* finishCallback */
		{} /* finishCallback */,
		1f /* cornerRadius */
		)

		verify(spySplitAnimationController)
		@@ -289,7 +291,8 @@ class SplitAnimationControllerTest {
		depthController,
		transitionInfo,
		transaction,
		{} /* finishCallback */
		{} /* finishCallback */,
		1f /* cornerRadius */
		)

		verify(spySplitAnimationController)
		@@ -317,7 +320,8 @@ class SplitAnimationControllerTest {
		depthController,
		transitionInfo,
		transaction,
		{} /* finishCallback */
		{} /* finishCallback */,
		1f /* cornerRadius */
		)

		verify(spySplitAnimationController)
		@@ -344,7 +348,8 @@ class SplitAnimationControllerTest {
		depthController,
		transitionInfo,
		transaction,
		{} /* finishCallback */
		{} /* finishCallback */,
		1f /* cornerRadius */
		)

		verify(spySplitAnimationController)
		@@ -371,7 +376,8 @@ class SplitAnimationControllerTest {
		depthController,
		transitionInfo,
		transaction,
		{} /* finishCallback */
		{} /* finishCallback */,
		1f /* cornerRadius */
		)

		verify(spySplitAnimationController)
		@@ -383,7 +389,7 @@ class SplitAnimationControllerTest {
		val spySplitAnimationController = spy(splitAnimationController)
		doNothing()
		.whenever(spySplitAnimationController)
		.composeFadeInSplitLaunchAnimator(any(), any(), any(), any(), any())
		.composeFadeInSplitLaunchAnimator(any(), any(), any(), any(), any(), any())

		spySplitAnimationController.playSplitLaunchAnimation(
		null /* launchingTaskView */,
		@@ -397,10 +403,11 @@ class SplitAnimationControllerTest {
		depthController,
		transitionInfo,
		transaction,
		{} /* finishCallback */
		{} /* finishCallback */,
		1f /* cornerRadius */
		)

		verify(spySplitAnimationController)
		.composeFadeInSplitLaunchAnimator(any(), any(), any(), any(), any())
		.composeFadeInSplitLaunchAnimator(any(), any(), any(), any(), any(), any())
		}
		}