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

Commit 9c18fea9 authored by Jeff Chang's avatar Jeff Chang Committed by Automerger Merge Worker
Browse files

Merge "Starting a shortcut into split with no_user_action" into tm-qpr-dev am:... 

Merge "Starting a shortcut into split with no_user_action" into tm-qpr-dev am: fe9eaa51 am: bcb32743

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



Change-Id: Idc38064a83c7b95ec7cadf33cbb60084030683dd
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b1e5fcf2 bcb32743

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

+4 −0
Original line number Diff line number Diff line
@@ -535,6 +535,10 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler, 
        RemoteAnimationAdapter wrappedAdapter = new RemoteAnimationAdapter(wrapper,

                0 /* duration */, 0 /* statusBarTransitionDelay */);

        ActivityOptions activityOptions = ActivityOptions.fromBundle(options);

        // Flag this as a no-user-action launch to prevent sending user leaving event to the current

        // top activity since it's going to be put into another side of the split. This prevents the

        // current top activity from going into pip mode due to user leaving event.

        activityOptions.setApplyNoUserActionFlagForShortcut(true);

        activityOptions.update(ActivityOptions.makeRemoteAnimation(wrappedAdapter));

        try {

            LauncherApps launcherApps = mContext.getSystemService(LauncherApps.class);