PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Implement two intents or shortcuts to active split" am: 0b69d38787

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22506283

Change-Id: I75b9d165dd1d745e04de375a7f404ee5b3f1186a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Tony Huang
2023-04-06 08:56:22 +00:00
committed by Automerger Merge Worker
parent 4c85783c51 0b69d38787
commit bcb97d7ebc
2 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quickstep/src/com/android/quickstep/SystemUiProxy.java
+5 -6
View File
@@ -621,15 +621,14 @@ public class SystemUiProxy implements ISystemUiProxy {
} }
} }
public void startIntents(PendingIntent pendingIntent1, @Nullable ShortcutInfo shortcutInfo1, public void startIntents(PendingIntent pendingIntent1, Bundle options1,
Bundle options1, PendingIntent pendingIntent2, @Nullable ShortcutInfo shortcutInfo2, PendingIntent pendingIntent2, Bundle options2,
Bundle options2, @SplitConfigurationOptions.StagePosition int splitPosition, @SplitConfigurationOptions.StagePosition int splitPosition,
float splitRatio, RemoteTransition remoteTransition, InstanceId instanceId) { float splitRatio, RemoteTransition remoteTransition, InstanceId instanceId) {
if (mSystemUiProxy != null) { if (mSystemUiProxy != null) {
try { try {
mSplitScreen.startIntents(pendingIntent1, shortcutInfo1, options1, pendingIntent2, mSplitScreen.startIntents(pendingIntent1, options1, pendingIntent2, options2,
shortcutInfo2, options2, splitPosition, splitRatio, remoteTransition, splitPosition, splitRatio, remoteTransition, instanceId);
instanceId);
} catch (RemoteException e) { } catch (RemoteException e) {
Log.w(TAG, "Failed call startIntents"); Log.w(TAG, "Failed call startIntents");
} }
quickstep/src/com/android/quickstep/util/SplitSelectStateController.java
+3 -4
View File
@@ -298,10 +298,9 @@ public class SplitSelectStateController {
getOppositeStagePosition(stagePosition), splitRatio, remoteTransition, getOppositeStagePosition(stagePosition), splitRatio, remoteTransition,
shellInstanceId); shellInstanceId);
} else { } else {
mSystemUiProxy.startIntents(getPendingIntent(intent1), getShortcutInfo(intent1), mSystemUiProxy.startIntents(getPendingIntent(intent1), options1.toBundle(),
options1.toBundle(), getPendingIntent(intent2), getShortcutInfo(intent2), getPendingIntent(intent2), null /* options2 */, stagePosition,
null /* options2 */, stagePosition, splitRatio, remoteTransition, splitRatio, remoteTransition, shellInstanceId);
shellInstanceId);
} }
} else { } else {
final RemoteSplitLaunchAnimationRunner animationRunner = final RemoteSplitLaunchAnimationRunner animationRunner =