diff options
| author | 2025-02-16 15:35:10 -0800 | |
|---|---|---|
| committer | 2025-02-16 15:35:10 -0800 | |
| commit | ddd4aeda8f4fb8bfaf98d93ce26cdbae79936d40 (patch) | |
| tree | c3149077e9b0830fffb6ebbb217fe49048fe176a | |
| parent | e1b3da5affaba5c83a0e785f20217cffcea8b897 (diff) | |
| parent | 69d23794c2ff80caebc5a3c5198f8c377b825452 (diff) | |
Merge "Add assertions to PiP related test cases in DesktopTasksControllerTest" into main
| -rw-r--r-- | libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/desktopmode/DesktopTasksControllerTest.kt | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/desktopmode/DesktopTasksControllerTest.kt b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/desktopmode/DesktopTasksControllerTest.kt index e2c3dda0d927..058fb714427c 100644 --- a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/desktopmode/DesktopTasksControllerTest.kt +++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/desktopmode/DesktopTasksControllerTest.kt @@ -2900,7 +2900,10 @@ class DesktopTasksControllerTest(flags: FlagsParameterization) : ShellTestCase() } @Test - @EnableFlags(FLAG_ENABLE_DESKTOP_WINDOWING_PIP) + @EnableFlags( + FLAG_ENABLE_DESKTOP_WINDOWING_PIP, + Flags.FLAG_ENABLE_DESKTOP_WALLPAPER_ACTIVITY_FOR_SYSTEM_USER, + ) fun onDesktopWindowClose_minimizedPipNotPresent_exitDesktop() { val freeformTask = setUpFreeformTask() val pipTask = setUpPipTask(autoEnterEnabled = true) @@ -2915,10 +2918,8 @@ class DesktopTasksControllerTest(flags: FlagsParameterization) : ShellTestCase() val wct = WindowContainerTransaction() controller.onDesktopWindowClose(wct, displayId = DEFAULT_DISPLAY, freeformTask) - // Remove wallpaper operation - wct.hierarchyOps.any { hop -> - hop.type == HIERARCHY_OP_TYPE_REMOVE_TASK && hop.container == wallpaperToken.asBinder() - } + // Moves wallpaper activity to back when leaving desktop + wct.assertReorder(wallpaperToken, toTop = false) } @Test @@ -4338,7 +4339,10 @@ class DesktopTasksControllerTest(flags: FlagsParameterization) : ShellTestCase() } @Test - @EnableFlags(FLAG_ENABLE_DESKTOP_WINDOWING_PIP) + @EnableFlags( + FLAG_ENABLE_DESKTOP_WINDOWING_PIP, + Flags.FLAG_ENABLE_DESKTOP_WALLPAPER_ACTIVITY_FOR_SYSTEM_USER, + ) fun moveFocusedTaskToFullscreen_minimizedPipPresent_removeWallpaperActivity() { val freeformTask = setUpFreeformTask() val pipTask = setUpPipTask(autoEnterEnabled = true) @@ -4356,10 +4360,8 @@ class DesktopTasksControllerTest(flags: FlagsParameterization) : ShellTestCase() val taskChange = assertNotNull(wct.changes[freeformTask.token.asBinder()]) assertThat(taskChange.windowingMode) .isEqualTo(WINDOWING_MODE_UNDEFINED) // inherited FULLSCREEN - // Remove wallpaper operation - wct.hierarchyOps.any { hop -> - hop.type == HIERARCHY_OP_TYPE_REMOVE_TASK && hop.container == wallpaperToken.asBinder() - } + // Moves wallpaper activity to back when leaving desktop + wct.assertReorder(wallpaperToken, toTop = false) } @Test |