From e1826dbdc7bb30b991db166518c773245c0ac3d4 Mon Sep 17 00:00:00 2001
From: Tony Huang <tonyychuang@google.com>
Date: Thu, 30 Mar 2023 10:16:26 +0000
Subject: [PATCH] Implement two intents or shortcuts to active split

Implement two intents or shortcuts to active split with shell
transition.

Fix: 259368992
Test: manual
Test: pass existing tests
Change-Id: I13522531022b635dc8508a3213b6f414a6b50ce9
---
 .../src/com/android/quickstep/SystemUiProxy.java      | 11 ++++++-----
 .../quickstep/util/SplitSelectStateController.java    |  7 ++++---
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/SystemUiProxy.java b/quickstep/src/com/android/quickstep/SystemUiProxy.java
index 73f05c2caf..512d47e6c7 100644
--- a/quickstep/src/com/android/quickstep/SystemUiProxy.java
+++ b/quickstep/src/com/android/quickstep/SystemUiProxy.java
@@ -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");
             }
diff --git a/quickstep/src/com/android/quickstep/util/SplitSelectStateController.java b/quickstep/src/com/android/quickstep/util/SplitSelectStateController.java
index c537ef88d7..66bf40fcd0 100644
--- a/quickstep/src/com/android/quickstep/util/SplitSelectStateController.java
+++ b/quickstep/src/com/android/quickstep/util/SplitSelectStateController.java
@@ -298,9 +298,10 @@ public class SplitSelectStateController {
                         getOppositeStagePosition(stagePosition), splitRatio, remoteTransition,
                         shellInstanceId);
             } else {
-                mSystemUiProxy.startIntents(getPendingIntent(intent1), options1.toBundle(),
-                        getPendingIntent(intent2), null /* options2 */, stagePosition,
-                        splitRatio, remoteTransition, shellInstanceId);
+                mSystemUiProxy.startIntents(getPendingIntent(intent1), getShortcutInfo(intent1),
+                        options1.toBundle(), getPendingIntent(intent2), getShortcutInfo(intent2),
+                        null /* options2 */, stagePosition, splitRatio, remoteTransition,
+                        shellInstanceId);
             }
         } else {
             final RemoteSplitLaunchAnimationRunner animationRunner =