Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Apply multi_task flag with startIntents" into udc-qpr-dev

Browse Source
This commit is contained in:
Jeff Chang
2023-07-19 12:06:47 +00:00
committed by Android (Google) Code Review
parent b73baea107 ab177614f8
commit 4ea2ef660e
1 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/SplitScreenController.java
View File

@@ -737,12 +737,23 @@ public class SplitScreenController implements DragAndDropPolicy.Starter,
Intent fillInIntent2 = null; Intent fillInIntent2 = null;
final String packageName1 = SplitScreenUtils.getPackageName(pendingIntent1); final String packageName1 = SplitScreenUtils.getPackageName(pendingIntent1);
final String packageName2 = SplitScreenUtils.getPackageName(pendingIntent2); final String packageName2 = SplitScreenUtils.getPackageName(pendingIntent2);
final ActivityOptions activityOptions1 = options1 != null
? ActivityOptions.fromBundle(options1) : ActivityOptions.makeBasic();
final ActivityOptions activityOptions2 = options2 != null
? ActivityOptions.fromBundle(options2) : ActivityOptions.makeBasic();
if (samePackage(packageName1, packageName2, userId1, userId2)) { if (samePackage(packageName1, packageName2, userId1, userId2)) {
if (supportMultiInstancesSplit(packageName1)) { if (supportMultiInstancesSplit(packageName1)) {
fillInIntent1 = new Intent(); fillInIntent1 = new Intent();
fillInIntent1.addFlags(FLAG_ACTIVITY_MULTIPLE_TASK); fillInIntent1.addFlags(FLAG_ACTIVITY_MULTIPLE_TASK);
fillInIntent2 = new Intent(); fillInIntent2 = new Intent();
fillInIntent2.addFlags(FLAG_ACTIVITY_MULTIPLE_TASK); fillInIntent2.addFlags(FLAG_ACTIVITY_MULTIPLE_TASK);
if (shortcutInfo1 != null) {
activityOptions1.setApplyMultipleTaskFlagForShortcut(true);
}
if (shortcutInfo2 != null) {
activityOptions2.setApplyMultipleTaskFlagForShortcut(true);
}
ProtoLog.v(ShellProtoLogGroup.WM_SHELL_SPLIT_SCREEN, "Adding MULTIPLE_TASK"); ProtoLog.v(ShellProtoLogGroup.WM_SHELL_SPLIT_SCREEN, "Adding MULTIPLE_TASK");
} else { } else {
pendingIntent2 = null; pendingIntent2 = null;
@@ -754,9 +765,10 @@ public class SplitScreenController implements DragAndDropPolicy.Starter,
Toast.LENGTH_SHORT).show(); Toast.LENGTH_SHORT).show();
} }
} }
mStageCoordinator.startIntents(pendingIntent1, fillInIntent1, shortcutInfo1, options1, mStageCoordinator.startIntents(pendingIntent1, fillInIntent1, shortcutInfo1,
pendingIntent2, fillInIntent2, shortcutInfo2, options2, splitPosition, splitRatio, activityOptions1.toBundle(), pendingIntent2, fillInIntent2, shortcutInfo2,
remoteTransition, instanceId); activityOptions2.toBundle(), splitPosition, splitRatio, remoteTransition,
instanceId);
} }
@Override @Override