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

Commit bf15587d authored by Matthew Ng's avatar Matthew Ng
Browse files

Renamed moveTaskToDockedStack to setTaskWindowingModeSplitScreenPrimary 

Renamed a few functions related to moveTaskToDockedStack to use the new
notion of split screen primary windows instead of docked stack. Most of
the calls that use moveTaskToDockedStack are renamed.

Test: go/wm_smoke
Bug: 68017311
Change-Id: I73df051a9261d213b3415ac132962d91ec632e0a
parent dedcab0b

core/java/android/app/ActivityManager.java

+6 −5
Original line number Diff line number Diff line
@@ -682,20 +682,21 @@ public class ActivityManager { 
    }



    /**

     * Input parameter to {@link android.app.IActivityManager#moveTaskToDockedStack} which

     * specifies the position of the created docked stack at the top half of the screen if

     * Parameter to {@link android.app.IActivityManager#setTaskWindowingModeSplitScreenPrimary}

     * which specifies the position of the created docked stack at the top half of the screen if

     * in portrait mode or at the left half of the screen if in landscape mode.

     * @hide

     */

    public static final int DOCKED_STACK_CREATE_MODE_TOP_OR_LEFT = 0;

    public static final int SPLIT_SCREEN_CREATE_MODE_TOP_OR_LEFT = 0;



    /**

     * Input parameter to {@link android.app.IActivityManager#moveTaskToDockedStack} which

     * Parameter to {@link android.app.IActivityManager#setTaskWindowingModeSplitScreenPrimary}

     * which

     * specifies the position of the created docked stack at the bottom half of the screen if

     * in portrait mode or at the right half of the screen if in landscape mode.

     * @hide

     */

    public static final int DOCKED_STACK_CREATE_MODE_BOTTOM_OR_RIGHT = 1;

    public static final int SPLIT_SCREEN_CREATE_MODE_BOTTOM_OR_RIGHT = 1;



    /**

     * Input parameter to {@link android.app.IActivityManager#resizeTask} which indicates

core/java/android/app/ActivityOptions.java

+12 −10
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


package android.app;



import static android.app.ActivityManager.DOCKED_STACK_CREATE_MODE_TOP_OR_LEFT;

import static android.app.ActivityManager.SPLIT_SCREEN_CREATE_MODE_TOP_OR_LEFT;

import static android.app.WindowConfiguration.ACTIVITY_TYPE_UNDEFINED;

import static android.app.WindowConfiguration.WINDOWING_MODE_UNDEFINED;

import static android.view.Display.INVALID_DISPLAY;
@@ -203,10 +203,11 @@ public class ActivityOptions { 
            "android.activity.taskOverlayCanResume";



    /**

     * Where the docked stack should be positioned.

     * Where the split-screen-primary stack should be positioned.

     * @hide

     */

    private static final String KEY_DOCK_CREATE_MODE = "android:activity.dockCreateMode";

    private static final String KEY_SPLIT_SCREEN_CREATE_MODE =

            "android:activity.splitScreenCreateMode";



    /**

     * Determines whether to disallow the outgoing activity from entering picture-in-picture as the
@@ -292,7 +293,7 @@ public class ActivityOptions { 
    @WindowConfiguration.ActivityType

    private int mLaunchActivityType = ACTIVITY_TYPE_UNDEFINED;

    private int mLaunchTaskId = -1;

    private int mDockCreateMode = DOCKED_STACK_CREATE_MODE_TOP_OR_LEFT;

    private int mSplitScreenCreateMode = SPLIT_SCREEN_CREATE_MODE_TOP_OR_LEFT;

    private boolean mDisallowEnterPictureInPictureWhileLaunching;

    private boolean mTaskOverlay;

    private boolean mTaskOverlayCanResume;
@@ -884,7 +885,8 @@ public class ActivityOptions { 
        mLaunchTaskId = opts.getInt(KEY_LAUNCH_TASK_ID, -1);

        mTaskOverlay = opts.getBoolean(KEY_TASK_OVERLAY, false);

        mTaskOverlayCanResume = opts.getBoolean(KEY_TASK_OVERLAY_CAN_RESUME, false);

        mDockCreateMode = opts.getInt(KEY_DOCK_CREATE_MODE, DOCKED_STACK_CREATE_MODE_TOP_OR_LEFT);

        mSplitScreenCreateMode = opts.getInt(KEY_SPLIT_SCREEN_CREATE_MODE,

                SPLIT_SCREEN_CREATE_MODE_TOP_OR_LEFT);

        mDisallowEnterPictureInPictureWhileLaunching = opts.getBoolean(

                KEY_DISALLOW_ENTER_PICTURE_IN_PICTURE_WHILE_LAUNCHING, false);

        if (opts.containsKey(KEY_ANIM_SPECS)) {
@@ -1194,13 +1196,13 @@ public class ActivityOptions { 
    }



    /** @hide */

    public int getDockCreateMode() {

        return mDockCreateMode;

    public int getSplitScreenCreateMode() {

        return mSplitScreenCreateMode;

    }



    /** @hide */

    public void setDockCreateMode(int dockCreateMode) {

        mDockCreateMode = dockCreateMode;

    public void setSplitScreenCreateMode(int splitScreenCreateMode) {

        mSplitScreenCreateMode = splitScreenCreateMode;

    }



    /** @hide */
@@ -1369,7 +1371,7 @@ public class ActivityOptions { 
        b.putInt(KEY_LAUNCH_TASK_ID, mLaunchTaskId);

        b.putBoolean(KEY_TASK_OVERLAY, mTaskOverlay);

        b.putBoolean(KEY_TASK_OVERLAY_CAN_RESUME, mTaskOverlayCanResume);

        b.putInt(KEY_DOCK_CREATE_MODE, mDockCreateMode);

        b.putInt(KEY_SPLIT_SCREEN_CREATE_MODE, mSplitScreenCreateMode);

        b.putBoolean(KEY_DISALLOW_ENTER_PICTURE_IN_PICTURE_WHILE_LAUNCHING,

                mDisallowEnterPictureInPictureWhileLaunching);

        if (mAnimSpecs != null) {

core/java/android/app/IActivityManager.aidl

+2 −2
Original line number Diff line number Diff line
@@ -499,8 +499,8 @@ interface IActivityManager { 
    void exitFreeformMode(in IBinder token);

    void reportSizeConfigurations(in IBinder token, in int[] horizontalSizeConfiguration,

            in int[] verticalSizeConfigurations, in int[] smallestWidthConfigurations);

    boolean moveTaskToDockedStack(int taskId, int createMode, boolean toTop, boolean animate,

            in Rect initialBounds);

    boolean setTaskWindowingModeSplitScreenPrimary(int taskId, int createMode, boolean toTop,

            boolean animate, in Rect initialBounds);

    /**

     * Dismisses split-screen multi-window mode.

     * {@param toTop} If true the current primary split-screen stack will be placed or left on top.

packages/SystemUI/src/com/android/systemui/RecentsComponent.java

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ public interface RecentsComponent { 
    /**

     * Docks the top-most task and opens recents.

     */

    boolean dockTopTask(int dragMode, int stackCreateMode, Rect initialBounds,

    boolean splitPrimaryTask(int dragMode, int stackCreateMode, Rect initialBounds,

            int metricsDockAction);



    /**

packages/SystemUI/src/com/android/systemui/recents/IRecentsNonSystemUserCallbacks.aidl

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ oneway interface IRecentsNonSystemUserCallbacks { 
    void hideRecents(boolean triggeredFromAltTab, boolean triggeredFromHomeKey);

    void toggleRecents(int recentsGrowTarget);

    void onConfigurationChanged();

    void dockTopTask(int topTaskId, int dragMode, int stackCreateMode,

    void splitPrimaryTask(int topTaskId, int dragMode, int stackCreateMode,

            in Rect initialBounds);

    void onDraggingInRecents(float distanceFromTop);

    void onDraggingInRecentsEnded(float velocity);