commit 433d215c886b5904e64b11f574ffe1efdfb6bd1d
author Tony Huang <tonyychuang@google.com> Tue Apr 11 05:43:14 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Apr 11 05:43:14 2023 +0000
tree 8d16ec4f8995d05a09338ae1862c44d21bdf0338
parent 4c233bd64583d949aa99de0c343cef4818a68afe
parent 26b426aa891bb20f8991f85f9f742c9fe30344db

Merge "[Re-land] Implement two intents or shortcuts to active split" into udc-dev

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

diff --git a/quickstep/src/com/android/quickstep/SystemUiProxy.java b/quickstep/src/com/android/quickstep/SystemUiProxy.java
index 73f05c2..512d47e 100644
--- a/quickstep/src/com/android/quickstep/SystemUiProxy.java
+++ b/quickstep/src/com/android/quickstep/SystemUiProxy.java
@@ -621,14 +621,15 @@
         }
     }
 
-    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");
             }

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

diff --git a/quickstep/src/com/android/quickstep/util/SplitSelectStateController.java b/quickstep/src/com/android/quickstep/util/SplitSelectStateController.java
index 11e1fbd..d44d7f6 100644
--- a/quickstep/src/com/android/quickstep/util/SplitSelectStateController.java
+++ b/quickstep/src/com/android/quickstep/util/SplitSelectStateController.java
@@ -309,9 +309,10 @@
                         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 =