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"

Browse Source 
Revert submission 22349283-intents-split

Reason for revert: Cause master branch build break

Reverted changes: /q/submissionid:22349283-intents-split

Change-Id: I1030f801385b6f17e8565f2f64f71ba5229aed73
This commit is contained in:
Tony Huang
2023-04-06 08:08:17 +00:00
committed by Android (Google) Code Review
parent e1826dbdc7
commit 0b69d38787
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,
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");
}
quickstep/src/com/android/quickstep/util/SplitSelectStateController.java
+3 -4
View File
@@ -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 =