Merge "Remove stage concept from split screen APIs" into tm-qpr-dev (6aca959b) · Commits · e / os / android_packages_apps_Trebuchet

quickstep/src/com/android/quickstep/SystemUiProxy.java

+17 −19

Original line number	Diff line number	Diff line
		@@ -548,15 +548,15 @@ public class SystemUiProxy implements ISystemUiProxy {
		}

		/** Start multiple tasks in split-screen simultaneously. */
		public void startTasks(int mainTaskId, Bundle mainOptions, int sideTaskId, Bundle sideOptions,
		@SplitConfigurationOptions.StagePosition int sidePosition, float splitRatio,
		public void startTasks(int taskId1, Bundle options1, int taskId2, Bundle options2,
		@SplitConfigurationOptions.StagePosition int splitPosition, float splitRatio,
		RemoteTransitionCompat remoteTransition, InstanceId instanceId) {
		if (mSystemUiProxy != null) {
		try {
		mSplitScreen.startTasks(mainTaskId, mainOptions, sideTaskId, sideOptions,
		sidePosition, splitRatio, remoteTransition.getTransition(), instanceId);
		mSplitScreen.startTasks(taskId1, options1, taskId2, options2, splitPosition,
		splitRatio, remoteTransition.getTransition(), instanceId);
		} catch (RemoteException e) {
		Log.w(TAG, "Failed call startTask");
		Log.w(TAG, "Failed call startTasks");
		}
		}
		}
		@@ -564,13 +564,13 @@ public class SystemUiProxy implements ISystemUiProxy {
		/**
		* Start multiple tasks in split-screen simultaneously.
		*/
		public void startTasksWithLegacyTransition(int mainTaskId, Bundle mainOptions, int sideTaskId,
		Bundle sideOptions, @SplitConfigurationOptions.StagePosition int sidePosition,
		public void startTasksWithLegacyTransition(int taskId1, Bundle options1, int taskId2,
		Bundle options2, @SplitConfigurationOptions.StagePosition int splitPosition,
		float splitRatio, RemoteAnimationAdapter adapter, InstanceId instanceId) {
		if (mSystemUiProxy != null) {
		try {
		mSplitScreen.startTasksWithLegacyTransition(mainTaskId, mainOptions, sideTaskId,
		sideOptions, sidePosition, splitRatio, adapter, instanceId);
		mSplitScreen.startTasksWithLegacyTransition(taskId1, options1, taskId2, options2,
		splitPosition, splitRatio, adapter, instanceId);
		} catch (RemoteException e) {
		Log.w(TAG, "Failed call startTasksWithLegacyTransition");
		}
		@@ -578,28 +578,26 @@ public class SystemUiProxy implements ISystemUiProxy {
		}

		public void startIntentAndTaskWithLegacyTransition(PendingIntent pendingIntent,
		Intent fillInIntent, int taskId, Bundle mainOptions, Bundle sideOptions,
		@SplitConfigurationOptions.StagePosition int sidePosition, float splitRatio,
		Intent fillInIntent, Bundle options1, int taskId, Bundle options2,
		@SplitConfigurationOptions.StagePosition int splitPosition, float splitRatio,
		RemoteAnimationAdapter adapter, InstanceId instanceId) {
		if (mSystemUiProxy != null) {
		try {
		mSplitScreen.startIntentAndTaskWithLegacyTransition(pendingIntent, fillInIntent,
		taskId, mainOptions, sideOptions, sidePosition, splitRatio, adapter,
		instanceId);
		options1, taskId, options2, splitPosition, splitRatio, adapter, instanceId);
		} catch (RemoteException e) {
		Log.w(TAG, "Failed call startIntentAndTaskWithLegacyTransition");
		}
		}
		}

		public void startShortcutAndTaskWithLegacyTransition(ShortcutInfo shortcutInfo, int taskId,
		Bundle mainOptions, Bundle sideOptions,
		@SplitConfigurationOptions.StagePosition int sidePosition, float splitRatio,
		RemoteAnimationAdapter adapter, InstanceId instanceId) {
		public void startShortcutAndTaskWithLegacyTransition(ShortcutInfo shortcutInfo, Bundle options1,
		int taskId, Bundle options2, @SplitConfigurationOptions.StagePosition int splitPosition,
		float splitRatio, RemoteAnimationAdapter adapter, InstanceId instanceId) {
		if (mSystemUiProxy != null) {
		try {
		mSplitScreen.startShortcutAndTaskWithLegacyTransition(shortcutInfo, taskId,
		mainOptions, sideOptions, sidePosition, splitRatio, adapter, instanceId);
		mSplitScreen.startShortcutAndTaskWithLegacyTransition(shortcutInfo, options1,
		taskId, options2, splitPosition, splitRatio, adapter, instanceId);
		} catch (RemoteException e) {
		Log.w(TAG, "Failed call startShortcutAndTaskWithLegacyTransition");
		}

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

+11 −17

Original line number	Diff line number	Diff line
		@@ -22,8 +22,6 @@ import static android.app.PendingIntent.FLAG_MUTABLE;
		import static com.android.launcher3.Utilities.postAsyncCallback;
		import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
		import static com.android.launcher3.util.SplitConfigurationOptions.DEFAULT_SPLIT_RATIO;
		import static com.android.launcher3.util.SplitConfigurationOptions.STAGE_POSITION_BOTTOM_OR_RIGHT;
		import static com.android.launcher3.util.SplitConfigurationOptions.STAGE_POSITION_TOP_OR_LEFT;

		import android.annotation.NonNull;
		import android.app.ActivityOptions;
		@@ -216,16 +214,12 @@ public class SplitSelectStateController {
		@Nullable InstanceId shellInstanceId) {
		TestLogging.recordEvent(
		TestProtocol.SEQUENCE_MAIN, "launchSplitTasks");
		// Assume initial task is for top/left part of screen
		final int[] taskIds = stagePosition == STAGE_POSITION_TOP_OR_LEFT
		? new int[]{taskId1, taskId2}
		: new int[]{taskId2, taskId1};
		if (TaskAnimationManager.ENABLE_SHELL_TRANSITIONS) {
		RemoteSplitLaunchTransitionRunner animationRunner =
		new RemoteSplitLaunchTransitionRunner(taskId1, taskPendingIntent, taskId2,
		callback);
		mSystemUiProxy.startTasks(taskIds[0], null /* mainOptions */, taskIds[1],
		null /* sideOptions */, STAGE_POSITION_BOTTOM_OR_RIGHT, splitRatio,
		mSystemUiProxy.startTasks(taskId1, null /* options1 */, taskId2,
		null /* options2 */, stagePosition, splitRatio,
		new RemoteTransitionCompat(animationRunner, MAIN_EXECUTOR,
		ActivityThread.currentActivityThread().getApplicationThread()),
		shellInstanceId);
		@@ -239,24 +233,24 @@ public class SplitSelectStateController {
		300, 150,
		ActivityThread.currentActivityThread().getApplicationThread());

		ActivityOptions mainOpts = ActivityOptions.makeBasic();
		ActivityOptions options1 = ActivityOptions.makeBasic();
		if (freezeTaskList) {
		mainOpts.setFreezeRecentTasksReordering();
		options1.setFreezeRecentTasksReordering();
		}
		if (taskPendingIntent == null) {
		mSystemUiProxy.startTasksWithLegacyTransition(taskIds[0], mainOpts.toBundle(),
		taskIds[1], null /* sideOptions */, STAGE_POSITION_BOTTOM_OR_RIGHT,
		splitRatio, adapter, shellInstanceId);
		mSystemUiProxy.startTasksWithLegacyTransition(taskId1, options1.toBundle(),
		taskId2, null /* options2 */, stagePosition, splitRatio, adapter,
		shellInstanceId);
		} else {
		final ShortcutInfo shortcutInfo = getShortcutInfo(mInitialTaskIntent,
		taskPendingIntent.getCreatorUserHandle());
		if (shortcutInfo != null) {
		mSystemUiProxy.startShortcutAndTaskWithLegacyTransition(shortcutInfo, taskId2,
		mainOpts.toBundle(), null /* sideOptions */, stagePosition, splitRatio,
		adapter, shellInstanceId);
		mSystemUiProxy.startShortcutAndTaskWithLegacyTransition(shortcutInfo,
		options1.toBundle(), taskId2, null /* options2 */, stagePosition,
		splitRatio, adapter, shellInstanceId);
		} else {
		mSystemUiProxy.startIntentAndTaskWithLegacyTransition(taskPendingIntent,
		fillInIntent, taskId2, mainOpts.toBundle(), null /* sideOptions */,
		fillInIntent, options1.toBundle(), taskId2, null /* options2 */,
		stagePosition, splitRatio, adapter, shellInstanceId);
		}
		}