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

Commit cfc15b57 authored by Orhan Uysal's avatar Orhan Uysal
Browse files

Specify windowing mode when starting single intent 

Previously when starting a single intent we did not specify windowing
mode. This caused the task to keep its previous windowing mode. By
specifying the windowing mode, we enforce the launch to be in fullscreen
all the time.

Fix: 414808454
Test: Move a desktop app to split through app header, choose the same
app as the app pair. See that app is launched in fullscreen. App is a
single-instance app.
Flag: EXEMPT Bugfix (Enforcing policy of the method)

Change-Id: Ic6375dd2805350f15772e5e7338c7d1ced0cc6d7
parent 0944ef7b

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

+9 −1
Original line number Diff line number Diff line
@@ -1236,7 +1236,7 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler, 
            WindowContainerTransaction wct,

            RemoteTransition remoteTransition) {

        Bundle optionsToLaunch = options != null ? options : new Bundle();

        addActivityOptions(optionsToLaunch, null);

        addActivityOptions(optionsToLaunch, null, WINDOWING_MODE_FULLSCREEN);

        wct.sendPendingIntent(pendingIntent, fillInIntent, optionsToLaunch);

        mSplitTransitions.startFullscreenTransition(wct, remoteTransition);

    }
@@ -2001,6 +2001,14 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler, 
        opts.putAll(options.toBundle());

    }



    private void addActivityOptions(Bundle opts, @Nullable StageTaskListener launchTarget,

            int targetWindowingMode) {

        ActivityOptions options = ActivityOptions.fromBundle(opts);

        options.setLaunchWindowingMode(targetWindowingMode);

        opts.putAll(options.toBundle());

        addActivityOptions(opts, launchTarget);

    }



    void updateActivityOptions(Bundle opts, @SplitPosition int position) {

        addActivityOptions(opts, position == mSideStagePosition ? mSideStage : mMainStage);

    }