Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8b2d8cd4 authored by Jeff Chang's avatar Jeff Chang Committed by Automerger Merge Worker
Browse files

Merge "Apply multi_task flag with startIntents" into udc-qpr-dev am: 4ea2ef66 am: 0cb6c561 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24108352



Change-Id: I84e622ca4fbe2c7fe0a746caf582cfca39bcd03d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b749c221 0cb6c561

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

+15 −3
Original line number Diff line number Diff line
@@ -737,12 +737,23 @@ public class SplitScreenController implements DragAndDropPolicy.Starter, 
        Intent fillInIntent2 = null;

        final String packageName1 = SplitScreenUtils.getPackageName(pendingIntent1);

        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 (supportMultiInstancesSplit(packageName1)) {

                fillInIntent1 = new Intent();

                fillInIntent1.addFlags(FLAG_ACTIVITY_MULTIPLE_TASK);

                fillInIntent2 = new Intent();

                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");

            } else {

                pendingIntent2 = null;
@@ -754,9 +765,10 @@ public class SplitScreenController implements DragAndDropPolicy.Starter, 
                        Toast.LENGTH_SHORT).show();

            }

        }

        mStageCoordinator.startIntents(pendingIntent1, fillInIntent1, shortcutInfo1, options1,

                pendingIntent2, fillInIntent2, shortcutInfo2, options2, splitPosition, splitRatio,

                remoteTransition, instanceId);

        mStageCoordinator.startIntents(pendingIntent1, fillInIntent1, shortcutInfo1,

                activityOptions1.toBundle(), pendingIntent2, fillInIntent2, shortcutInfo2,

                activityOptions2.toBundle(), splitPosition, splitRatio, remoteTransition,

                instanceId);

    }



    @Override