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

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

Merge "Reroute Manage Windows open instance transition through shell transition" into main

parents 531d8eb2 e95d5331

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

+3 −0
Original line number Diff line number Diff line
@@ -1990,6 +1990,9 @@ class DesktopTasksController( 
                splitPosition,

                options.toBundle(),

                /* hideTaskToken= */ null,

                if (enableFlexibleSplit())

                    splitScreenController.determineNewInstanceIndex(callingTask)

                else SPLIT_INDEX_UNDEFINED,

            )

        }

    }

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

+8 −0
Original line number Diff line number Diff line
@@ -637,6 +637,14 @@ public class SplitScreenController implements SplitDragPolicy.Starter, 
        }

    }



    /**

     * Starts an existing task via StageCoordinator.

     */

    public void startTask(int taskId, @SplitPosition int position, @Nullable Bundle options,

            @Nullable WindowContainerToken hideTaskToken, @SplitIndex int index) {

        mStageCoordinator.startTask(taskId, position, options, hideTaskToken, index);

    }



    /**

     * See {@link #startShortcut(String, String, int, Bundle, UserHandle)}

     * @param instanceId to be used by {@link SplitscreenEventLogger}

libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/desktopmode/DesktopTasksControllerTest.kt

+2 −2
Original line number Diff line number Diff line
@@ -4865,7 +4865,7 @@ class DesktopTasksControllerTest(flags: FlagsParameterization) : ShellTestCase() 
        val optionsCaptor = argumentCaptor<Bundle>()

        runOpenInstance(task, taskToRequest.taskId)

        verify(splitScreenController)

            .startTask(anyInt(), anyInt(), optionsCaptor.capture(), anyOrNull())

            .startTask(anyInt(), anyInt(), optionsCaptor.capture(), anyOrNull(), any())

        assertThat(ActivityOptions.fromBundle(optionsCaptor.firstValue).launchWindowingMode)

            .isEqualTo(WINDOWING_MODE_MULTI_WINDOW)

    }
@@ -4879,7 +4879,7 @@ class DesktopTasksControllerTest(flags: FlagsParameterization) : ShellTestCase() 
        val optionsCaptor = argumentCaptor<Bundle>()

        runOpenInstance(task, taskToRequest.taskId)

        verify(splitScreenController)

            .startTask(anyInt(), anyInt(), optionsCaptor.capture(), anyOrNull())

            .startTask(anyInt(), anyInt(), optionsCaptor.capture(), anyOrNull(), any())

        assertThat(ActivityOptions.fromBundle(optionsCaptor.firstValue).launchWindowingMode)

            .isEqualTo(WINDOWING_MODE_MULTI_WINDOW)

    }