Merge "[Re-land] Implement two intents or shortcuts to active split" into udc-dev (433d215c) · Commits · e / os / android_packages_apps_Trebuchet

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

+6 −5

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

		public void startIntents(PendingIntent pendingIntent1, Bundle options1,
		PendingIntent pendingIntent2, Bundle options2,
		@SplitConfigurationOptions.StagePosition int splitPosition,
		public void startIntents(PendingIntent pendingIntent1, @Nullable ShortcutInfo shortcutInfo1,
		Bundle options1, PendingIntent pendingIntent2, @Nullable ShortcutInfo shortcutInfo2,
		Bundle options2, @SplitConfigurationOptions.StagePosition int splitPosition,
		float splitRatio, RemoteTransition remoteTransition, InstanceId instanceId) {
		if (mSystemUiProxy != null) {
		try {
		mSplitScreen.startIntents(pendingIntent1, options1, pendingIntent2, options2,
		splitPosition, splitRatio, remoteTransition, instanceId);
		mSplitScreen.startIntents(pendingIntent1, shortcutInfo1, options1, pendingIntent2,
		shortcutInfo2, options2, splitPosition, splitRatio, remoteTransition,
		instanceId);
		} catch (RemoteException e) {
		Log.w(TAG, "Failed call startIntents");
		}

+4 −3

Original line number	Diff line number	Diff line
		@@ -309,9 +309,10 @@ public class SplitSelectStateController {
		shellInstanceId);
		} else {
		mSystemUiProxy.startIntents(getPendingIntent(intent1, mInitialUser),
		options1.toBundle(), getPendingIntent(intent2, mSecondUser),
		null /* options2 */, stagePosition, splitRatio, remoteTransition,
		shellInstanceId);
		getShortcutInfo(intent1, mInitialUser), options1.toBundle(),
		getPendingIntent(intent2, mSecondUser),
		getShortcutInfo(intent2, mSecondUser), null /* options2 */,
		stagePosition, splitRatio, remoteTransition, shellInstanceId);
		}
		} else {
		final RemoteSplitLaunchAnimationRunner animationRunner =