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

Commit b640e38e authored by Orhan Uysal's avatar Orhan Uysal Committed by Android (Google) Code Review
Browse files

Merge "Rename `enterDesktop` to `moveFocusedTaskToDesktop`" into main

parents 95082e13 ed280568

core/java/com/android/internal/statusbar/IStatusBar.aidl

+2 −2
Original line number Diff line number Diff line
@@ -388,9 +388,9 @@ oneway interface IStatusBar 
     */

    void showMediaOutputSwitcher(String packageName);



    /** Enters desktop mode.

    /** Enters desktop mode from the current focused app.

    *

    * @param displayId the id of the current display.

    */

    void enterDesktop(int displayId);

    void moveFocusedTaskToDesktop(int displayId);

}

libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopMode.java

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ public interface DesktopMode { 




    /** Called when requested to go to desktop mode from the current focused app. */

    void enterDesktop(int displayId);

    void moveFocusedTaskToDesktop(int displayId);



    /** Called when requested to go to fullscreen from the current focused desktop app. */

    void moveFocusedTaskToFullscreen(int displayId);

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

+3 −3
Original line number Diff line number Diff line
@@ -263,7 +263,7 @@ class DesktopTasksController( 
    }



    /** Enter desktop by using the focused task in given `displayId` */

    fun enterDesktop(displayId: Int) {

    fun moveFocusedTaskToDesktop(displayId: Int) {

        val allFocusedTasks =

            shellTaskOrganizer.getRunningTasks(displayId).filter { taskInfo ->

                taskInfo.isFocused &&
@@ -1212,9 +1212,9 @@ class DesktopTasksController( 
            }

        }



        override fun enterDesktop(displayId: Int) {

        override fun moveFocusedTaskToDesktop(displayId: Int) {

            mainExecutor.execute {

                this@DesktopTasksController.enterDesktop(displayId)

                this@DesktopTasksController.moveFocusedTaskToDesktop(displayId)

            }

        }

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

+4 −4
Original line number Diff line number Diff line
@@ -833,7 +833,7 @@ class DesktopTasksControllerTest : ShellTestCase() { 
        verify(launchAdjacentController).launchAdjacentEnabled = true

    }

    @Test

    fun enterDesktop_fullscreenTaskIsMovedToDesktop() {

    fun moveFocusedTaskToDesktop_fullscreenTaskIsMovedToDesktop() {

        val task1 = setUpFullscreenTask()

        val task2 = setUpFullscreenTask()

        val task3 = setUpFullscreenTask()
@@ -842,7 +842,7 @@ class DesktopTasksControllerTest : ShellTestCase() { 
        task2.isFocused = false

        task3.isFocused = false



        controller.enterDesktop(DEFAULT_DISPLAY)

        controller.moveFocusedTaskToDesktop(DEFAULT_DISPLAY)



        val wct = getLatestMoveToDesktopWct()

        assertThat(wct.changes[task1.token.asBinder()]?.windowingMode)
@@ -850,7 +850,7 @@ class DesktopTasksControllerTest : ShellTestCase() { 
    }



    @Test

    fun enterDesktop_splitScreenTaskIsMovedToDesktop() {

    fun moveFocusedTaskToDesktop_splitScreenTaskIsMovedToDesktop() {

        val task1 = setUpSplitScreenTask()

        val task2 = setUpFullscreenTask()

        val task3 = setUpFullscreenTask()
@@ -863,7 +863,7 @@ class DesktopTasksControllerTest : ShellTestCase() { 


        task4.parentTaskId = task1.taskId



        controller.enterDesktop(DEFAULT_DISPLAY)

        controller.moveFocusedTaskToDesktop(DEFAULT_DISPLAY)



        val wct = getLatestMoveToDesktopWct()

        assertThat(wct.changes[task4.token.asBinder()]?.windowingMode)

packages/SystemUI/src/com/android/systemui/statusbar/CommandQueue.java

+4 −4
Original line number Diff line number Diff line
@@ -529,9 +529,9 @@ public class CommandQueue extends IStatusBar.Stub implements 
        default void immersiveModeChanged(int rootDisplayAreaId, boolean isImmersiveMode) {}



        /**

         * @see IStatusBar#enterDesktop(int)

         * @see IStatusBar#moveFocusedTaskToDesktop(int)

         */

        default void enterDesktop(int displayId) {}

        default void moveFocusedTaskToDesktop(int displayId) {}

    }



    @VisibleForTesting
@@ -1444,7 +1444,7 @@ public class CommandQueue extends IStatusBar.Stub implements 
    }



    @Override

    public void enterDesktop(int displayId) {

    public void moveFocusedTaskToDesktop(int displayId) {

        SomeArgs args = SomeArgs.obtain();

        args.arg1 = displayId;

        mHandler.obtainMessage(MSG_ENTER_DESKTOP, args).sendToTarget();
@@ -1960,7 +1960,7 @@ public class CommandQueue extends IStatusBar.Stub implements 
                    args = (SomeArgs) msg.obj;

                    int displayId = args.argi1;

                    for (int i = 0; i < mCallbacks.size(); i++) {

                        mCallbacks.get(i).enterDesktop(displayId);

                        mCallbacks.get(i).moveFocusedTaskToDesktop(displayId);

                    }

                    break;

                }