Merge "Remove non-shell transitions code from split shell code" into main (33debd03) · Commits · e / os / android_frameworks_base

libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/ISplitScreen.aidl

+0 −43

Original line number	Diff line number	Diff line
		@@ -108,35 +108,6 @@ interface ISplitScreen {
		in Bundle options2, int splitPosition, int snapPosition,
		in RemoteTransition remoteTransition, in InstanceId instanceId) = 17;

		/**
		* Version of startTasks using legacy transition system.
		*/
		oneway void startTasksWithLegacyTransition(int taskId1, in Bundle options1, int taskId2,
		in Bundle options2, int splitPosition, int snapPosition,
		in RemoteAnimationAdapter adapter, in InstanceId instanceId) = 11;

		/**
		* Starts a pair of intent and task using legacy transition system.
		*/
		oneway void startIntentAndTaskWithLegacyTransition(in PendingIntent pendingIntent, int userId1,
		in Bundle options1, int taskId, in Bundle options2, int splitPosition, int snapPosition,
		in RemoteAnimationAdapter adapter, in InstanceId instanceId) = 12;

		/**
		* Starts a pair of shortcut and task using legacy transition system.
		*/
		oneway void startShortcutAndTaskWithLegacyTransition(in ShortcutInfo shortcutInfo,
		in Bundle options1, int taskId, in Bundle options2, int splitPosition, int snapPosition,
		in RemoteAnimationAdapter adapter, in InstanceId instanceId) = 15;

		/**
		* Start a pair of intents using legacy transition system.
		*/
		oneway void startIntentsWithLegacyTransition(in PendingIntent pendingIntent1, int userId1,
		in ShortcutInfo shortcutInfo1, in Bundle options1, in PendingIntent pendingIntent2,
		int userId2, in ShortcutInfo shortcutInfo2, in Bundle options2, int splitPosition,
		int snapPosition, in RemoteAnimationAdapter adapter, in InstanceId instanceId) = 18;

		/**
		* Start a pair of intents in one transition.
		*/
		@@ -145,20 +116,6 @@ interface ISplitScreen {
		int userId2, in ShortcutInfo shortcutInfo2, in Bundle options2, int splitPosition,
		int snapPosition, in RemoteTransition remoteTransition, in InstanceId instanceId) = 19;

		/**
		* Blocking call that notifies and gets additional split-screen targets when entering
		* recents (for example: the dividerBar).
		* @param appTargets apps that will be re-parented to display area
		*/
		RemoteAnimationTarget[] onGoingToRecentsLegacy(in RemoteAnimationTarget[] appTargets) = 13;

		/**
		* Blocking call that notifies and gets additional split-screen targets when entering
		* recents (for example: the dividerBar). Different than the method above in that this one
		* does not expect split to currently be running.
		*/
		RemoteAnimationTarget[] onStartingSplitLegacy(in RemoteAnimationTarget[] appTargets) = 14;

		/**
		* Reverse the split.
		*/

libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/SplitScreenController.java

+9 −234

Original line number	Diff line number	Diff line
		@@ -23,7 +23,6 @@ import static android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN;
		import static android.content.Intent.FLAG_ACTIVITY_MULTIPLE_TASK;
		import static android.content.Intent.FLAG_ACTIVITY_NO_USER_ACTION;
		import static android.view.Display.DEFAULT_DISPLAY;
		import static android.view.RemoteAnimationTarget.MODE_OPENING;

		import static com.android.wm.shell.common.MultiInstanceHelper.getComponent;
		import static com.android.wm.shell.common.MultiInstanceHelper.getShortcutComponent;
		@@ -35,9 +34,9 @@ import static com.android.wm.shell.common.split.SplitScreenConstants.SPLIT_POSIT
		import static com.android.wm.shell.common.split.SplitScreenUtils.isValidToSplit;
		import static com.android.wm.shell.common.split.SplitScreenUtils.reverseSplitPosition;
		import static com.android.wm.shell.common.split.SplitScreenUtils.splitFailureMessage;
		import static com.android.wm.shell.protolog.ShellProtoLogGroup.WM_SHELL_SPLIT_SCREEN;
		import static com.android.wm.shell.splitscreen.SplitScreen.STAGE_TYPE_UNDEFINED;
		import static com.android.wm.shell.sysui.ShellSharedConstants.KEY_EXTRA_SHELL_SPLIT_SCREEN;
		import static com.android.wm.shell.transition.Transitions.ENABLE_SHELL_TRANSITIONS;

		import android.app.ActivityManager;
		import android.app.ActivityOptions;
		@@ -201,11 +200,6 @@ public class SplitScreenController implements DragAndDropPolicy.Starter,
		@VisibleForTesting
		StageCoordinator mStageCoordinator;

		// Only used for the legacy recents animation from splitscreen to allow the tasks to be animated
		// outside the bounds of the roots by being reparented into a higher level fullscreen container
		private SurfaceControl mGoingToRecentsTasksLayer;
		private SurfaceControl mStartingSplitTasksLayer;

		/**
		* @param stageCoordinator if null, a stage coordinator will be created when this controller is
		* initialized. Can be non-null for testing purposes.
		@@ -457,11 +451,7 @@ public class SplitScreenController implements DragAndDropPolicy.Starter,
		}

		public void exitSplitScreen(int toTopTaskId, @ExitReason int exitReason) {
		if (ENABLE_SHELL_TRANSITIONS) {
		mStageCoordinator.dismissSplitScreen(toTopTaskId, exitReason);
		} else {
		mStageCoordinator.exitSplitScreen(toTopTaskId, exitReason);
		}
		}

		@Override
		@@ -606,7 +596,8 @@ public class SplitScreenController implements DragAndDropPolicy.Starter,
		*/
		public void startShortcut(String packageName, String shortcutId, @SplitPosition int position,
		@Nullable Bundle options, UserHandle user, @NonNull InstanceId instanceId) {
		mStageCoordinator.onRequestToSplit(instanceId, ENTER_REASON_LAUNCHER);
		ProtoLog.d(WM_SHELL_SPLIT_SCREEN, "startShortcut: reason=%d", ENTER_REASON_LAUNCHER);
		mStageCoordinator.getLogger().enterRequested(instanceId, ENTER_REASON_LAUNCHER);
		startShortcut(packageName, shortcutId, position, options, user);
		}

		@@ -640,37 +631,6 @@ public class SplitScreenController implements DragAndDropPolicy.Starter,
		activityOptions.toBundle(), user);
		}

		void startShortcutAndTaskWithLegacyTransition(@NonNull ShortcutInfo shortcutInfo,
		@Nullable Bundle options1, int taskId, @Nullable Bundle options2,
		@SplitPosition int splitPosition, @PersistentSnapPosition int snapPosition,
		RemoteAnimationAdapter adapter, InstanceId instanceId) {
		if (options1 == null) options1 = new Bundle();
		final ActivityOptions activityOptions = ActivityOptions.fromBundle(options1);

		final String packageName1 = shortcutInfo.getPackage();
		final String packageName2 = SplitScreenUtils.getPackageName(taskId, mTaskOrganizer);
		final int userId1 = shortcutInfo.getUserId();
		final int userId2 = SplitScreenUtils.getUserId(taskId, mTaskOrganizer);
		if (samePackage(packageName1, packageName2, userId1, userId2)) {
		if (mMultiInstanceHelpher.supportsMultiInstanceSplit(shortcutInfo.getActivity())) {
		activityOptions.setApplyMultipleTaskFlagForShortcut(true);
		ProtoLog.v(ShellProtoLogGroup.WM_SHELL_SPLIT_SCREEN, "Adding MULTIPLE_TASK");
		} else {
		taskId = INVALID_TASK_ID;
		ProtoLog.v(ShellProtoLogGroup.WM_SHELL_SPLIT_SCREEN,
		"Cancel entering split as not supporting multi-instances");
		Log.w(TAG, splitFailureMessage("startShortcutAndTaskWithLegacyTransition",
		"app package " + packageName1 + " does not support multi-instance"));
		Toast.makeText(mContext, R.string.dock_multi_instances_not_supported_text,
		Toast.LENGTH_SHORT).show();
		}
		}

		mStageCoordinator.startShortcutAndTaskWithLegacyTransition(shortcutInfo,
		activityOptions.toBundle(), taskId, options2, splitPosition, snapPosition, adapter,
		instanceId);
		}

		void startShortcutAndTask(@NonNull ShortcutInfo shortcutInfo, @Nullable Bundle options1,
		int taskId, @Nullable Bundle options2, @SplitPosition int splitPosition,
		@PersistentSnapPosition int snapPosition, @Nullable RemoteTransition remoteTransition,
		@@ -711,37 +671,12 @@ public class SplitScreenController implements DragAndDropPolicy.Starter,
		public void startIntentWithInstanceId(PendingIntent intent, int userId,
		@Nullable Intent fillInIntent, @SplitPosition int position, @Nullable Bundle options,
		@NonNull InstanceId instanceId) {
		mStageCoordinator.onRequestToSplit(instanceId, ENTER_REASON_LAUNCHER);
		ProtoLog.d(WM_SHELL_SPLIT_SCREEN, "startIntentWithInstanceId: reason=%d",
		ENTER_REASON_LAUNCHER);
		mStageCoordinator.getLogger().enterRequested(instanceId, ENTER_REASON_LAUNCHER);
		startIntent(intent, userId, fillInIntent, position, options, null /* hideTaskToken */);
		}

		private void startIntentAndTaskWithLegacyTransition(PendingIntent pendingIntent, int userId1,
		@Nullable Bundle options1, int taskId, @Nullable Bundle options2,
		@SplitPosition int splitPosition, @PersistentSnapPosition int snapPosition,
		RemoteAnimationAdapter adapter, InstanceId instanceId) {
		Intent fillInIntent = null;
		final String packageName1 = SplitScreenUtils.getPackageName(pendingIntent);
		final String packageName2 = SplitScreenUtils.getPackageName(taskId, mTaskOrganizer);
		final int userId2 = SplitScreenUtils.getUserId(taskId, mTaskOrganizer);
		if (samePackage(packageName1, packageName2, userId1, userId2)) {
		if (mMultiInstanceHelpher.supportsMultiInstanceSplit(getComponent(pendingIntent))) {
		fillInIntent = new Intent();
		fillInIntent.addFlags(FLAG_ACTIVITY_MULTIPLE_TASK);
		ProtoLog.v(ShellProtoLogGroup.WM_SHELL_SPLIT_SCREEN, "Adding MULTIPLE_TASK");
		} else {
		taskId = INVALID_TASK_ID;
		ProtoLog.v(ShellProtoLogGroup.WM_SHELL_SPLIT_SCREEN,
		"Cancel entering split as not supporting multi-instances");
		Log.w(TAG, splitFailureMessage("startIntentAndTaskWithLegacyTransition",
		"app package " + packageName1 + " does not support multi-instance"));
		Toast.makeText(mContext, R.string.dock_multi_instances_not_supported_text,
		Toast.LENGTH_SHORT).show();
		}
		}
		mStageCoordinator.startIntentAndTaskWithLegacyTransition(pendingIntent, fillInIntent,
		options1, taskId, options2, splitPosition, snapPosition, adapter, instanceId);
		}

		private void startIntentAndTask(PendingIntent pendingIntent, int userId1,
		@Nullable Bundle options1, int taskId, @Nullable Bundle options2,
		@SplitPosition int splitPosition, @PersistentSnapPosition int snapPosition,
		@@ -778,38 +713,6 @@ public class SplitScreenController implements DragAndDropPolicy.Starter,
		options2, splitPosition, snapPosition, remoteTransition, instanceId);
		}

		private void startIntentsWithLegacyTransition(PendingIntent pendingIntent1, int userId1,
		@Nullable ShortcutInfo shortcutInfo1, @Nullable Bundle options1,
		PendingIntent pendingIntent2, int userId2, @Nullable ShortcutInfo shortcutInfo2,
		@Nullable Bundle options2, @SplitPosition int splitPosition,
		@PersistentSnapPosition int snapPosition, RemoteAnimationAdapter adapter,
		InstanceId instanceId) {
		Intent fillInIntent1 = null;
		Intent fillInIntent2 = null;
		final String packageName1 = SplitScreenUtils.getPackageName(pendingIntent1);
		final String packageName2 = SplitScreenUtils.getPackageName(pendingIntent2);
		if (samePackage(packageName1, packageName2, userId1, userId2)) {
		if (mMultiInstanceHelpher.supportsMultiInstanceSplit(getComponent(pendingIntent1))) {
		fillInIntent1 = new Intent();
		fillInIntent1.addFlags(FLAG_ACTIVITY_MULTIPLE_TASK);
		fillInIntent2 = new Intent();
		fillInIntent2.addFlags(FLAG_ACTIVITY_MULTIPLE_TASK);
		ProtoLog.v(ShellProtoLogGroup.WM_SHELL_SPLIT_SCREEN, "Adding MULTIPLE_TASK");
		} else {
		pendingIntent2 = null;
		ProtoLog.v(ShellProtoLogGroup.WM_SHELL_SPLIT_SCREEN,
		"Cancel entering split as not supporting multi-instances");
		Log.w(TAG, splitFailureMessage("startIntentsWithLegacyTransition",
		"app package " + packageName1 + " does not support multi-instance"));
		Toast.makeText(mContext, R.string.dock_multi_instances_not_supported_text,
		Toast.LENGTH_SHORT).show();
		}
		}
		mStageCoordinator.startIntentsWithLegacyTransition(pendingIntent1, fillInIntent1,
		shortcutInfo1, options1, pendingIntent2, fillInIntent2, shortcutInfo2, options2,
		splitPosition, snapPosition, adapter, instanceId);
		}

		private void startIntents(PendingIntent pendingIntent1, int userId1,
		@Nullable ShortcutInfo shortcutInfo1, @Nullable Bundle options1,
		PendingIntent pendingIntent2, int userId2, @Nullable ShortcutInfo shortcutInfo2,
		@@ -891,11 +794,8 @@ public class SplitScreenController implements DragAndDropPolicy.Starter,
		if (taskInfo != null) {
		ProtoLog.v(ShellProtoLogGroup.WM_SHELL_SPLIT_SCREEN,
		"Found suitable background task=%s", taskInfo);
		if (ENABLE_SHELL_TRANSITIONS) {
		mStageCoordinator.startTask(taskInfo.taskId, position, options, hideTaskToken);
		} else {
		startTask(taskInfo.taskId, position, options, hideTaskToken);
		}

		ProtoLog.v(ShellProtoLogGroup.WM_SHELL_SPLIT_SCREEN, "Start task in background");
		return;
		}
		@@ -995,63 +895,6 @@ public class SplitScreenController implements DragAndDropPolicy.Starter,
		return fillInIntent2;
		}

		RemoteAnimationTarget[] onGoingToRecentsLegacy(RemoteAnimationTarget[] apps) {
		if (ENABLE_SHELL_TRANSITIONS) return null;

		if (isSplitScreenVisible()) {
		// Evict child tasks except the top visible one under split root to ensure it could be
		// launched as full screen when switching to it on recents.
		final WindowContainerTransaction wct = new WindowContainerTransaction();
		mStageCoordinator.prepareEvictInvisibleChildTasks(wct);
		mSyncQueue.queue(wct);
		} else {
		return null;
		}

		SurfaceControl.Transaction t = mTransactionPool.acquire();
		if (mGoingToRecentsTasksLayer != null) {
		t.remove(mGoingToRecentsTasksLayer);
		}
		mGoingToRecentsTasksLayer = reparentSplitTasksForAnimation(apps, t,
		"SplitScreenController#onGoingToRecentsLegacy" /* callsite */);
		t.apply();
		mTransactionPool.release(t);

		return new RemoteAnimationTarget[]{mStageCoordinator.getDividerBarLegacyTarget()};
		}

		RemoteAnimationTarget[] onStartingSplitLegacy(RemoteAnimationTarget[] apps) {
		if (ENABLE_SHELL_TRANSITIONS) return null;

		int openingApps = 0;
		for (int i = 0; i < apps.length; ++i) {
		if (apps[i].mode == MODE_OPENING) openingApps++;
		}
		if (openingApps < 2) {
		// Not having enough apps to enter split screen
		return null;
		}

		SurfaceControl.Transaction t = mTransactionPool.acquire();
		if (mStartingSplitTasksLayer != null) {
		t.remove(mStartingSplitTasksLayer);
		}
		mStartingSplitTasksLayer = reparentSplitTasksForAnimation(apps, t,
		"SplitScreenController#onStartingSplitLegacy" /* callsite */);
		t.apply();
		mTransactionPool.release(t);

		try {
		return new RemoteAnimationTarget[]{mStageCoordinator.getDividerBarLegacyTarget()};
		} finally {
		for (RemoteAnimationTarget appTarget : apps) {
		if (appTarget.leash != null) {
		appTarget.leash.release();
		}
		}
		}
		}

		private SurfaceControl reparentSplitTasksForAnimation(RemoteAnimationTarget[] apps,
		SurfaceControl.Transaction t, String callsite) {
		final SurfaceControl.Builder builder = new SurfaceControl.Builder(new SurfaceSession())
		@@ -1347,41 +1190,6 @@ public class SplitScreenController implements DragAndDropPolicy.Starter,
		null /* hideTaskToken */));
		}

		@Override
		public void startTasksWithLegacyTransition(int taskId1, @Nullable Bundle options1,
		int taskId2, @Nullable Bundle options2, @SplitPosition int splitPosition,
		@PersistentSnapPosition int snapPosition, RemoteAnimationAdapter adapter,
		InstanceId instanceId) {
		executeRemoteCallWithTaskPermission(mController, "startTasks",
		(controller) -> controller.mStageCoordinator.startTasksWithLegacyTransition(
		taskId1, options1, taskId2, options2, splitPosition, snapPosition,
		adapter, instanceId));
		}

		@Override
		public void startIntentAndTaskWithLegacyTransition(PendingIntent pendingIntent, int userId1,
		Bundle options1, int taskId, Bundle options2, int splitPosition,
		@PersistentSnapPosition int snapPosition, RemoteAnimationAdapter adapter,
		InstanceId instanceId) {
		executeRemoteCallWithTaskPermission(mController,
		"startIntentAndTaskWithLegacyTransition", (controller) ->
		controller.startIntentAndTaskWithLegacyTransition(pendingIntent,
		userId1, options1, taskId, options2, splitPosition,
		snapPosition, adapter, instanceId));
		}

		@Override
		public void startShortcutAndTaskWithLegacyTransition(ShortcutInfo shortcutInfo,
		@Nullable Bundle options1, int taskId, @Nullable Bundle options2,
		@SplitPosition int splitPosition, @PersistentSnapPosition int snapPosition,
		RemoteAnimationAdapter adapter, InstanceId instanceId) {
		executeRemoteCallWithTaskPermission(mController,
		"startShortcutAndTaskWithLegacyTransition", (controller) ->
		controller.startShortcutAndTaskWithLegacyTransition(
		shortcutInfo, options1, taskId, options2, splitPosition,
		snapPosition, adapter, instanceId));
		}

		@Override
		public void startTasks(int taskId1, @Nullable Bundle options1, int taskId2,
		@Nullable Bundle options2, @SplitPosition int splitPosition,
		@@ -1414,21 +1222,6 @@ public class SplitScreenController implements DragAndDropPolicy.Starter,
		options2, splitPosition, snapPosition, remoteTransition, instanceId));
		}

		@Override
		public void startIntentsWithLegacyTransition(PendingIntent pendingIntent1, int userId1,
		@Nullable ShortcutInfo shortcutInfo1, @Nullable Bundle options1,
		PendingIntent pendingIntent2, int userId2, @Nullable ShortcutInfo shortcutInfo2,
		@Nullable Bundle options2, @SplitPosition int splitPosition,
		@PersistentSnapPosition int snapPosition, RemoteAnimationAdapter adapter,
		InstanceId instanceId) {
		executeRemoteCallWithTaskPermission(mController, "startIntentsWithLegacyTransition",
		(controller) ->
		controller.startIntentsWithLegacyTransition(pendingIntent1, userId1,
		shortcutInfo1, options1, pendingIntent2, userId2, shortcutInfo2,
		options2, splitPosition, snapPosition, adapter, instanceId)
		);
		}

		@Override
		public void startIntents(PendingIntent pendingIntent1, int userId1,
		@Nullable ShortcutInfo shortcutInfo1, @Nullable Bundle options1,
		@@ -1460,24 +1253,6 @@ public class SplitScreenController implements DragAndDropPolicy.Starter,
		fillInIntent, position, options, instanceId));
		}

		@Override
		public RemoteAnimationTarget[] onGoingToRecentsLegacy(RemoteAnimationTarget[] apps) {
		final RemoteAnimationTarget[][] out = new RemoteAnimationTarget[][]{null};
		executeRemoteCallWithTaskPermission(mController, "onGoingToRecentsLegacy",
		(controller) -> out[0] = controller.onGoingToRecentsLegacy(apps),
		true /* blocking */);
		return out[0];
		}

		@Override
		public RemoteAnimationTarget[] onStartingSplitLegacy(RemoteAnimationTarget[] apps) {
		final RemoteAnimationTarget[][] out = new RemoteAnimationTarget[][]{null};
		executeRemoteCallWithTaskPermission(mController, "onStartingSplitLegacy",
		(controller) -> out[0] = controller.onStartingSplitLegacy(apps),
		true /* blocking */);
		return out[0];
		}

		@Override
		public void switchSplitPosition() {
		executeRemoteCallWithTaskPermission(mController, "switchSplitPosition",

libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java

+24 −550

File changed.

Preview size limit exceeded, changes collapsed.

libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/splitscreen/StageCoordinatorTests.java

+1 −38

Original line number	Diff line number	Diff line
		@@ -244,38 +244,6 @@ public class StageCoordinatorTests extends ShellTestCase {
		eq(task.taskId), any(), any(WindowContainerTransaction.class));
		}

		@Test
		public void testExitSplitScreen() {
		when(mMainStage.isActive()).thenReturn(true);
		mStageCoordinator.exitSplitScreen(INVALID_TASK_ID, EXIT_REASON_RETURN_HOME);
		verify(mSideStage).removeAllTasks(any(WindowContainerTransaction.class), eq(false));
		verify(mMainStage).deactivate(any(WindowContainerTransaction.class), eq(false));
		}

		@Test
		public void testExitSplitScreenToMainStage() {
		when(mMainStage.isActive()).thenReturn(true);
		final int testTaskId = 12345;
		when(mMainStage.containsTask(eq(testTaskId))).thenReturn(true);
		when(mSideStage.containsTask(eq(testTaskId))).thenReturn(false);
		mStageCoordinator.exitSplitScreen(testTaskId, EXIT_REASON_RETURN_HOME);
		verify(mMainStage).reorderChild(eq(testTaskId), eq(true),
		any(WindowContainerTransaction.class));
		verify(mMainStage).resetBounds(any(WindowContainerTransaction.class));
		}

		@Test
		public void testExitSplitScreenToSideStage() {
		when(mMainStage.isActive()).thenReturn(true);
		final int testTaskId = 12345;
		when(mMainStage.containsTask(eq(testTaskId))).thenReturn(false);
		when(mSideStage.containsTask(eq(testTaskId))).thenReturn(true);
		mStageCoordinator.exitSplitScreen(testTaskId, EXIT_REASON_RETURN_HOME);
		verify(mSideStage).reorderChild(eq(testTaskId), eq(true),
		any(WindowContainerTransaction.class));
		verify(mSideStage).resetBounds(any(WindowContainerTransaction.class));
		}

		@Test
		public void testResolveStartStage_beforeSplitActivated_setsStagePosition() {
		mStageCoordinator.setSideStagePosition(SPLIT_POSITION_TOP_OR_LEFT, null /* wct */);
		@@ -367,12 +335,7 @@ public class StageCoordinatorTests extends ShellTestCase {

		mStageCoordinator.onFinishedWakingUp();

		if (Transitions.ENABLE_SHELL_TRANSITIONS) {
		verify(mTaskOrganizer).startNewTransition(eq(TRANSIT_SPLIT_DISMISS), notNull());
		} else {
		verify(mStageCoordinator).onSplitScreenExit();
		verify(mMainStage).deactivate(any(WindowContainerTransaction.class), eq(false));
		}
		}

		@Test