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

Commit e51c8d32 authored by Nadia Benbernou's avatar Nadia Benbernou Committed by Android (Google) Code Review
Browse files

Merge "Add compat for secondary splitscreen window option"

parents d1d2b665 ab47e04d

packages/SystemUI/shared/src/com/android/systemui/shared/system/ActivityOptionsCompat.java

+12 −2
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import static android.app.ActivityTaskManager.SPLIT_SCREEN_CREATE_MODE_BOTTOM_OR 
import static android.app.ActivityTaskManager.SPLIT_SCREEN_CREATE_MODE_TOP_OR_LEFT;

import static android.app.WindowConfiguration.WINDOWING_MODE_FREEFORM;

import static android.app.WindowConfiguration.WINDOWING_MODE_SPLIT_SCREEN_PRIMARY;

import static android.app.WindowConfiguration.WINDOWING_MODE_SPLIT_SCREEN_SECONDARY;



import android.app.ActivityOptions;

import android.content.Context;
@@ -31,11 +32,20 @@ import android.os.Handler; 
public abstract class ActivityOptionsCompat {



    /**

     * @return ActivityOptions for starting a task in split screen.

     * @return ActivityOptions for starting a task in split screen as the primary window.

     */

    public static ActivityOptions makeSplitScreenOptions(boolean dockTopLeft) {

        return makeSplitScreenOptions(dockTopLeft, true);

    }



    /**

     * @return ActivityOptions for starting a task in split screen.

     */

    public static ActivityOptions makeSplitScreenOptions(boolean dockTopLeft, boolean isPrimary) {

        final ActivityOptions options = ActivityOptions.makeBasic();

        options.setLaunchWindowingMode(WINDOWING_MODE_SPLIT_SCREEN_PRIMARY);

        options.setLaunchWindowingMode(isPrimary

                ? WINDOWING_MODE_SPLIT_SCREEN_PRIMARY

                : WINDOWING_MODE_SPLIT_SCREEN_SECONDARY);

        options.setSplitScreenCreateMode(dockTopLeft

                ? SPLIT_SCREEN_CREATE_MODE_TOP_OR_LEFT

                : SPLIT_SCREEN_CREATE_MODE_BOTTOM_OR_RIGHT);