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

Commit d2011522 authored by Matt Sziklay's avatar Matt Sziklay Committed by Android (Google) Code Review
Browse files

Merge "Desktop Mode split exit reason changes." into main

parents 0d3b9e3b 394e744a

libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopTasksController.kt

+2 −2
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ import com.android.wm.shell.protolog.ShellProtoLogGroup.WM_SHELL_DESKTOP_MODE 
import com.android.wm.shell.recents.RecentsTransitionHandler

import com.android.wm.shell.recents.RecentsTransitionStateListener

import com.android.wm.shell.splitscreen.SplitScreenController

import com.android.wm.shell.splitscreen.SplitScreenController.EXIT_REASON_ENTER_DESKTOP

import com.android.wm.shell.splitscreen.SplitScreenController.EXIT_REASON_DESKTOP_MODE

import com.android.wm.shell.sysui.ShellCommandHandler

import com.android.wm.shell.sysui.ShellController

import com.android.wm.shell.sysui.ShellInit
@@ -355,7 +355,7 @@ class DesktopTasksController( 
            splitScreenController.prepareExitSplitScreen(

                    wct,

                    splitScreenController.getStageOfTask(taskInfo.taskId),

                    EXIT_REASON_ENTER_DESKTOP

                    EXIT_REASON_DESKTOP_MODE

            )

            getOtherSplitTask(taskInfo.taskId)?.let { otherTaskInfo ->

                wct.removeTask(otherTaskInfo.token)

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

+6 −6
Original line number Diff line number Diff line
@@ -138,7 +138,7 @@ public class SplitScreenController implements DragAndDropPolicy.Starter, 
    public static final int EXIT_REASON_CHILD_TASK_ENTER_PIP = 9;

    public static final int EXIT_REASON_RECREATE_SPLIT = 10;

    public static final int EXIT_REASON_FULLSCREEN_SHORTCUT = 11;

    public static final int EXIT_REASON_ENTER_DESKTOP = 12;

    public static final int EXIT_REASON_DESKTOP_MODE = 12;

    @IntDef(value = {

            EXIT_REASON_UNKNOWN,

            EXIT_REASON_APP_DOES_NOT_SUPPORT_MULTIWINDOW,
@@ -152,7 +152,7 @@ public class SplitScreenController implements DragAndDropPolicy.Starter, 
            EXIT_REASON_CHILD_TASK_ENTER_PIP,

            EXIT_REASON_RECREATE_SPLIT,

            EXIT_REASON_FULLSCREEN_SHORTCUT,

            EXIT_REASON_ENTER_DESKTOP

            EXIT_REASON_DESKTOP_MODE

    })

    @Retention(RetentionPolicy.SOURCE)

    @interface ExitReason{}
@@ -529,8 +529,8 @@ public class SplitScreenController implements DragAndDropPolicy.Starter, 
    }



    /** Move the specified task to fullscreen, regardless of focus state. */

    public void moveTaskToFullscreen(int taskId) {

        mStageCoordinator.moveTaskToFullscreen(taskId);

    public void moveTaskToFullscreen(int taskId, int exitReason) {

        mStageCoordinator.moveTaskToFullscreen(taskId, exitReason);

    }



    public boolean isLaunchToSplit(TaskInfo taskInfo) {
@@ -1144,8 +1144,8 @@ public class SplitScreenController implements DragAndDropPolicy.Starter, 
                return "CHILD_TASK_ENTER_PIP";

            case EXIT_REASON_RECREATE_SPLIT:

                return "RECREATE_SPLIT";

            case EXIT_REASON_ENTER_DESKTOP:

                return "ENTER_DESKTOP";

            case EXIT_REASON_DESKTOP_MODE:

                return "DESKTOP_MODE";

            default:

                return "unknown reason, reason int = " + exitReason;

        }

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

+4 −4
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ import static com.android.internal.util.FrameworkStatsLog.SPLITSCREEN_UICHANGED_ 
import static com.android.internal.util.FrameworkStatsLog.SPLITSCREEN_UICHANGED__EXIT_REASON__DEVICE_FOLDED;

import static com.android.internal.util.FrameworkStatsLog.SPLITSCREEN_UICHANGED__EXIT_REASON__DRAG_DIVIDER;

import static com.android.internal.util.FrameworkStatsLog.SPLITSCREEN_UICHANGED__EXIT_REASON__FULLSCREEN_SHORTCUT;

import static com.android.internal.util.FrameworkStatsLog.SPLITSCREEN_UICHANGED__EXIT_REASON__ENTER_DESKTOP;

import static com.android.internal.util.FrameworkStatsLog.SPLITSCREEN_UICHANGED__EXIT_REASON__DESKTOP_MODE;

import static com.android.internal.util.FrameworkStatsLog.SPLITSCREEN_UICHANGED__EXIT_REASON__RECREATE_SPLIT;

import static com.android.internal.util.FrameworkStatsLog.SPLITSCREEN_UICHANGED__EXIT_REASON__RETURN_HOME;

import static com.android.internal.util.FrameworkStatsLog.SPLITSCREEN_UICHANGED__EXIT_REASON__ROOT_TASK_VANISHED;
@@ -43,7 +43,7 @@ import static com.android.wm.shell.splitscreen.SplitScreenController.EXIT_REASON 
import static com.android.wm.shell.splitscreen.SplitScreenController.EXIT_REASON_CHILD_TASK_ENTER_PIP;

import static com.android.wm.shell.splitscreen.SplitScreenController.EXIT_REASON_DEVICE_FOLDED;

import static com.android.wm.shell.splitscreen.SplitScreenController.EXIT_REASON_DRAG_DIVIDER;

import static com.android.wm.shell.splitscreen.SplitScreenController.EXIT_REASON_ENTER_DESKTOP;

import static com.android.wm.shell.splitscreen.SplitScreenController.EXIT_REASON_DESKTOP_MODE;

import static com.android.wm.shell.splitscreen.SplitScreenController.EXIT_REASON_FULLSCREEN_SHORTCUT;

import static com.android.wm.shell.splitscreen.SplitScreenController.EXIT_REASON_RECREATE_SPLIT;

import static com.android.wm.shell.splitscreen.SplitScreenController.EXIT_REASON_RETURN_HOME;
@@ -194,8 +194,8 @@ public class SplitscreenEventLogger { 
                return SPLITSCREEN_UICHANGED__EXIT_REASON__RECREATE_SPLIT;

            case EXIT_REASON_FULLSCREEN_SHORTCUT:

                return SPLITSCREEN_UICHANGED__EXIT_REASON__FULLSCREEN_SHORTCUT;

            case EXIT_REASON_ENTER_DESKTOP:

                return SPLITSCREEN_UICHANGED__EXIT_REASON__ENTER_DESKTOP;

            case EXIT_REASON_DESKTOP_MODE:

                return SPLITSCREEN_UICHANGED__EXIT_REASON__DESKTOP_MODE;

            case EXIT_REASON_UNKNOWN:

                // Fall through

            default:

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

+2 −2
Original line number Diff line number Diff line
@@ -2973,7 +2973,7 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler, 
    }



    /** Move the specified task to fullscreen, regardless of focus state. */

    public void moveTaskToFullscreen(int taskId) {

    public void moveTaskToFullscreen(int taskId, int exitReason) {

        boolean leftOrTop;

        if (mMainStage.containsTask(taskId)) {

            leftOrTop = (mSideStagePosition == SPLIT_POSITION_TOP_OR_LEFT);
@@ -2982,7 +2982,7 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler, 
        } else {

            return;

        }

        mSplitLayout.flingDividerToDismiss(!leftOrTop, EXIT_REASON_FULLSCREEN_SHORTCUT);

        mSplitLayout.flingDividerToDismiss(!leftOrTop, exitReason);



    }

libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecorViewModel.java

+4 −2
Original line number Diff line number Diff line
@@ -339,7 +339,8 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel { 
            final int id = v.getId();

            if (id == R.id.close_window) {

                if (isTaskInSplitScreen(mTaskId)) {

                    mSplitScreenController.moveTaskToFullscreen(getOtherSplitTask(mTaskId).taskId);

                    mSplitScreenController.moveTaskToFullscreen(getOtherSplitTask(mTaskId).taskId,

                            SplitScreenController.EXIT_REASON_DESKTOP_MODE);

                } else {

                    mTaskOperations.closeTask(mTaskToken);

                }
@@ -365,7 +366,8 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel { 
            } else if (id == R.id.fullscreen_button) {

                decoration.closeHandleMenu();

                if (isTaskInSplitScreen(mTaskId)) {

                    mSplitScreenController.moveTaskToFullscreen(mTaskId);

                    mSplitScreenController.moveTaskToFullscreen(mTaskId,

                            SplitScreenController.EXIT_REASON_DESKTOP_MODE);

                } else {

                    mDesktopTasksController.ifPresent(c ->

                            c.moveToFullscreen(mTaskId));