From 0b69d3878750817721d9151577249af1628b49f0 Mon Sep 17 00:00:00 2001 From: Tony Huang Date: Thu, 6 Apr 2023 08:08:17 +0000 Subject: [PATCH] Revert "Implement two intents or shortcuts to active split" Revert submission 22349283-intents-split Reason for revert: Cause master branch build break Reverted changes: /q/submissionid:22349283-intents-split Change-Id: I1030f801385b6f17e8565f2f64f71ba5229aed73 --- .../src/com/android/quickstep/SystemUiProxy.java | 11 +++++------ .../quickstep/util/SplitSelectStateController.java | 7 +++---- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/quickstep/src/com/android/quickstep/SystemUiProxy.java b/quickstep/src/com/android/quickstep/SystemUiProxy.java index 512d47e6c7..73f05c2caf 100644 --- a/quickstep/src/com/android/quickstep/SystemUiProxy.java +++ b/quickstep/src/com/android/quickstep/SystemUiProxy.java @@ -621,15 +621,14 @@ public class SystemUiProxy implements ISystemUiProxy { } } - public void startIntents(PendingIntent pendingIntent1, @Nullable ShortcutInfo shortcutInfo1, - Bundle options1, PendingIntent pendingIntent2, @Nullable ShortcutInfo shortcutInfo2, - Bundle options2, @SplitConfigurationOptions.StagePosition int splitPosition, + public void startIntents(PendingIntent pendingIntent1, Bundle options1, + PendingIntent pendingIntent2, Bundle options2, + @SplitConfigurationOptions.StagePosition int splitPosition, float splitRatio, RemoteTransition remoteTransition, InstanceId instanceId) { if (mSystemUiProxy != null) { try { - mSplitScreen.startIntents(pendingIntent1, shortcutInfo1, options1, pendingIntent2, - shortcutInfo2, options2, splitPosition, splitRatio, remoteTransition, - instanceId); + mSplitScreen.startIntents(pendingIntent1, options1, pendingIntent2, 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 66bf40fcd0..c537ef88d7 100644 --- a/quickstep/src/com/android/quickstep/util/SplitSelectStateController.java +++ b/quickstep/src/com/android/quickstep/util/SplitSelectStateController.java @@ -298,10 +298,9 @@ public class SplitSelectStateController { getOppositeStagePosition(stagePosition), splitRatio, remoteTransition, shellInstanceId); } else { - mSystemUiProxy.startIntents(getPendingIntent(intent1), getShortcutInfo(intent1), - options1.toBundle(), getPendingIntent(intent2), getShortcutInfo(intent2), - null /* options2 */, stagePosition, splitRatio, remoteTransition, - shellInstanceId); + mSystemUiProxy.startIntents(getPendingIntent(intent1), options1.toBundle(), + getPendingIntent(intent2), null /* options2 */, stagePosition, + splitRatio, remoteTransition, shellInstanceId); } } else { final RemoteSplitLaunchAnimationRunner animationRunner =