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

Commit 9030ff14 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "If wallpaper activity already exists, reorder it" into main

parents a5146c80 fd74bb68

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

+9 −4
Original line number Diff line number Diff line
@@ -1525,11 +1525,16 @@ class DesktopTasksController( 
    private fun addWallpaperActivity(displayId: Int, wct: WindowContainerTransaction) {

        logV("addWallpaperActivity")

        if (ENABLE_DESKTOP_WALLPAPER_ACTIVITY_FOR_SYSTEM_USER.isTrue()) {



            // If the wallpaper activity for this display already exists, let's reorder it to top.

            val wallpaperActivityToken = desktopWallpaperActivityTokenProvider.getToken(displayId)

            if (wallpaperActivityToken != null) {

                wct.reorder(wallpaperActivityToken, /* onTop= */ true)

                return

            }



            val intent = Intent(context, DesktopWallpaperActivity::class.java)

            if (

                desktopWallpaperActivityTokenProvider.getToken(displayId) == null &&

                    Flags.enablePerDisplayDesktopWallpaperActivity()

            ) {

            if (Flags.enablePerDisplayDesktopWallpaperActivity()) {

                intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)

                intent.addFlags(Intent.FLAG_ACTIVITY_MULTIPLE_TASK)

            }

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

+45 −2
Original line number Diff line number Diff line
@@ -538,6 +538,7 @@ class DesktopTasksControllerTest(flags: FlagsParameterization) : ShellTestCase() 
    @Test

    @EnableFlags(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_WALLPAPER_ACTIVITY)

    fun showDesktopApps_allAppsInvisible_bringsToFront_desktopWallpaperEnabled() {

        whenever(desktopWallpaperActivityTokenProvider.getToken()).thenReturn(null)

        val task1 = setUpFreeformTask()

        val task2 = setUpFreeformTask()

        markTaskHidden(task1)
@@ -726,6 +727,7 @@ class DesktopTasksControllerTest(flags: FlagsParameterization) : ShellTestCase() 
    @Test

    @EnableFlags(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_WALLPAPER_ACTIVITY)

    fun showDesktopApps_appsAlreadyVisible_bringsToFront_desktopWallpaperEnabled() {

        whenever(desktopWallpaperActivityTokenProvider.getToken()).thenReturn(null)

        val task1 = setUpFreeformTask()

        val task2 = setUpFreeformTask()

        markTaskVisible(task1)
@@ -764,7 +766,8 @@ class DesktopTasksControllerTest(flags: FlagsParameterization) : ShellTestCase() 


    @Test

    @EnableFlags(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_WALLPAPER_ACTIVITY)

    fun showDesktopApps_someAppsInvisible_reordersAll_desktopWallpaperEnabled() {

    fun showDesktopApps_someAppsInvisible_desktopWallpaperEnabled_reordersOnlyFreeformTasks() {

        whenever(desktopWallpaperActivityTokenProvider.getToken()).thenReturn(null)

        val task1 = setUpFreeformTask()

        val task2 = setUpFreeformTask()

        markTaskHidden(task1)
@@ -781,6 +784,24 @@ class DesktopTasksControllerTest(flags: FlagsParameterization) : ShellTestCase() 
        wct.assertReorderAt(index = 2, task2)

    }



    @EnableFlags(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_WALLPAPER_ACTIVITY)

    fun showDesktopApps_someAppsInvisible_desktopWallpaperEnabled_reordersAll() {

        val task1 = setUpFreeformTask()

        val task2 = setUpFreeformTask()

        markTaskHidden(task1)

        markTaskVisible(task2)



        controller.showDesktopApps(DEFAULT_DISPLAY, RemoteTransition(TestRemoteTransition()))



        val wct =

            getLatestWct(type = TRANSIT_TO_FRONT, handlerClass = OneShotRemoteHandler::class.java)

        assertThat(wct.hierarchyOps).hasSize(3)

        // Expect order to be from bottom: wallpaper intent, task1, task2

        wct.assertReorderAt(index = 0, wallpaperToken)

        wct.assertReorderAt(index = 1, task1)

        wct.assertReorderAt(index = 2, task2)

    }



    @Test

    @DisableFlags(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_WALLPAPER_ACTIVITY)

    fun showDesktopApps_noActiveTasks_reorderHomeToTop_desktopWallpaperDisabled() {
@@ -796,7 +817,9 @@ class DesktopTasksControllerTest(flags: FlagsParameterization) : ShellTestCase() 


    @Test

    @EnableFlags(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_WALLPAPER_ACTIVITY)

    fun showDesktopApps_noActiveTasks_addDesktopWallpaper_desktopWallpaperEnabled() {

    fun showDesktopApps_noActiveTasks_desktopWallpaperEnabled_addsDesktopWallpaper() {

        whenever(desktopWallpaperActivityTokenProvider.getToken()).thenReturn(null)



        controller.showDesktopApps(DEFAULT_DISPLAY, RemoteTransition(TestRemoteTransition()))



        val wct =
@@ -804,6 +827,16 @@ class DesktopTasksControllerTest(flags: FlagsParameterization) : ShellTestCase() 
        wct.assertPendingIntentAt(index = 0, desktopWallpaperIntent)

    }



    @Test

    @EnableFlags(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_WALLPAPER_ACTIVITY)

    fun showDesktopApps_noActiveTasks_desktopWallpaperEnabled_reordersDesktopWallpaper() {

        controller.showDesktopApps(DEFAULT_DISPLAY, RemoteTransition(TestRemoteTransition()))



        val wct =

            getLatestWct(type = TRANSIT_TO_FRONT, handlerClass = OneShotRemoteHandler::class.java)

        wct.assertReorderAt(index = 0, wallpaperToken)

    }



    @Test

    @DisableFlags(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_WALLPAPER_ACTIVITY)

    fun showDesktopApps_twoDisplays_bringsToFrontOnlyOneDisplay_desktopWallpaperDisabled() {
@@ -828,6 +861,7 @@ class DesktopTasksControllerTest(flags: FlagsParameterization) : ShellTestCase() 
    @Test

    @EnableFlags(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_WALLPAPER_ACTIVITY)

    fun showDesktopApps_twoDisplays_bringsToFrontOnlyOneDisplay_desktopWallpaperEnabled() {

        whenever(desktopWallpaperActivityTokenProvider.getToken()).thenReturn(null)

        taskRepository.addDesk(displayId = SECOND_DISPLAY, deskId = SECOND_DISPLAY)

        val homeTaskDefaultDisplay = setUpHomeTask(DEFAULT_DISPLAY)

        val taskDefaultDisplay = setUpFreeformTask(DEFAULT_DISPLAY)
@@ -872,6 +906,7 @@ class DesktopTasksControllerTest(flags: FlagsParameterization) : ShellTestCase() 
    @Test

    @EnableFlags(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_WALLPAPER_ACTIVITY)

    fun showDesktopApps_desktopWallpaperEnabled_dontReorderMinimizedTask() {

        whenever(desktopWallpaperActivityTokenProvider.getToken()).thenReturn(null)

        val homeTask = setUpHomeTask()

        val freeformTask = setUpFreeformTask()

        val minimizedTask = setUpFreeformTask()
@@ -1337,6 +1372,7 @@ class DesktopTasksControllerTest(flags: FlagsParameterization) : ShellTestCase() 
    @Test

    @EnableFlags(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_WALLPAPER_ACTIVITY)

    fun moveTaskToDesktop_desktopWallpaperEnabled_nonRunningTask_launchesInFreeform() {

        whenever(desktopWallpaperActivityTokenProvider.getToken()).thenReturn(null)

        val task = createTaskInfo(1)

        whenever(shellTaskOrganizer.getRunningTaskInfo(anyInt())).thenReturn(null)

        whenever(recentTasksController.findTaskInBackground(anyInt())).thenReturn(task)
@@ -1484,6 +1520,7 @@ class DesktopTasksControllerTest(flags: FlagsParameterization) : ShellTestCase() 
    @Test

    @EnableFlags(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_WALLPAPER_ACTIVITY)

    fun moveRunningTaskToDesktop_otherFreeformTasksBroughtToFront_desktopWallpaperEnabled() {

        whenever(desktopWallpaperActivityTokenProvider.getToken()).thenReturn(null)

        val freeformTask = setUpFreeformTask()

        val fullscreenTask = setUpFullscreenTask()

        markTaskHidden(freeformTask)
@@ -1586,6 +1623,7 @@ class DesktopTasksControllerTest(flags: FlagsParameterization) : ShellTestCase() 
    @Test

    @EnableFlags(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_WALLPAPER_ACTIVITY)

    fun moveRunningTaskToDesktop_desktopWallpaperEnabled_bringsTasksOverLimit_dontShowBackTask() {

        whenever(desktopWallpaperActivityTokenProvider.getToken()).thenReturn(null)

        val freeformTasks = (1..MAX_TASK_LIMIT).map { _ -> setUpFreeformTask() }

        val newTask = setUpFullscreenTask()

        val homeTask = setUpHomeTask()
@@ -2606,6 +2644,7 @@ class DesktopTasksControllerTest(flags: FlagsParameterization) : ShellTestCase() 
    @Test

    @EnableFlags(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_WALLPAPER_ACTIVITY)

    fun handleRequest_fullscreenTask_noTasks_enforceDesktop_freeformDisplay_returnFreeformWCT() {

        whenever(desktopWallpaperActivityTokenProvider.getToken()).thenReturn(null)

        whenever(DesktopModeStatus.enterDesktopByDefaultOnFreeformDisplay(context)).thenReturn(true)

        val tda = rootTaskDisplayAreaOrganizer.getDisplayAreaInfo(DEFAULT_DISPLAY)!!

        tda.configuration.windowConfiguration.windowingMode = WINDOWING_MODE_FREEFORM
@@ -2737,6 +2776,7 @@ class DesktopTasksControllerTest(flags: FlagsParameterization) : ShellTestCase() 
    @Test

    @EnableFlags(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_WALLPAPER_ACTIVITY)

    fun handleRequest_freeformTask_desktopWallpaperEnabled_freeformNotVisible_reorderedToTop() {

        whenever(desktopWallpaperActivityTokenProvider.getToken()).thenReturn(null)

        val freeformTask1 = setUpFreeformTask()

        val freeformTask2 = createFreeformTask()
@@ -2771,7 +2811,9 @@ class DesktopTasksControllerTest(flags: FlagsParameterization) : ShellTestCase() 
    @Test

    @EnableFlags(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_WALLPAPER_ACTIVITY)

    fun handleRequest_freeformTask_desktopWallpaperEnabled_noOtherTasks_reorderedToTop() {

        whenever(desktopWallpaperActivityTokenProvider.getToken()).thenReturn(null)

        val task = createFreeformTask()



        val result = controller.handleRequest(Binder(), createTransition(task))



        assertNotNull(result, "Should handle request")
@@ -2799,6 +2841,7 @@ class DesktopTasksControllerTest(flags: FlagsParameterization) : ShellTestCase() 
    @Test

    @EnableFlags(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_WALLPAPER_ACTIVITY)

    fun handleRequest_freeformTask_dskWallpaperEnabled_freeformOnOtherDisplayOnly_reorderedToTop() {

        whenever(desktopWallpaperActivityTokenProvider.getToken()).thenReturn(null)

        val taskDefaultDisplay = createFreeformTask(displayId = DEFAULT_DISPLAY)

        // Second display task

        createFreeformTask(displayId = SECOND_DISPLAY)