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

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

Merge "Disable KQS flatenning for some WMShell unit tests" into main

parents 0a5b0263 334ca495

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

+10 −2
Original line number Diff line number Diff line
@@ -2366,7 +2366,10 @@ class DesktopTasksControllerTest(flags: FlagsParameterization) : ShellTestCase() 


    @Test

    @EnableFlags(Flags.FLAG_ENABLE_DESKTOP_WALLPAPER_ACTIVITY_FOR_SYSTEM_USER)

    @DisableFlags(Flags.FLAG_ENABLE_MULTIPLE_DESKTOPS_BACKEND)

    @DisableFlags(

        Flags.FLAG_ENABLE_MULTIPLE_DESKTOPS_BACKEND,

        com.android.launcher3.Flags.FLAG_ENABLE_ALT_TAB_KQS_FLATENNING,

    )

    fun moveToFullscreen_tdaFullscreen_windowingModeUndefined_removesWallpaperActivity() {

        desktopState.enterDesktopByDefaultOnFreeformDisplay = true

        val homeTask = setUpHomeTask()
@@ -2496,7 +2499,10 @@ class DesktopTasksControllerTest(flags: FlagsParameterization) : ShellTestCase() 


    @Test

    @EnableFlags(Flags.FLAG_ENABLE_DESKTOP_WALLPAPER_ACTIVITY_FOR_SYSTEM_USER)

    @DisableFlags(Flags.FLAG_ENABLE_MULTIPLE_DESKTOPS_BACKEND)

    @DisableFlags(

        Flags.FLAG_ENABLE_MULTIPLE_DESKTOPS_BACKEND,

        com.android.launcher3.Flags.FLAG_ENABLE_ALT_TAB_KQS_FLATENNING,

    )

    fun moveToFullscreen_tdaFreeform_windowingModeFullscreen_removesWallpaperActivity() {

        desktopState.enterDesktopByDefaultOnFreeformDisplay = false

        val homeTask = setUpHomeTask()
@@ -2588,6 +2594,7 @@ class DesktopTasksControllerTest(flags: FlagsParameterization) : ShellTestCase() 
    @DisableFlags(

        Flags.FLAG_ENABLE_MULTIPLE_DESKTOPS_BACKEND,

        Flags.FLAG_ENABLE_DESKTOP_WINDOWING_PIP,

        com.android.launcher3.Flags.FLAG_ENABLE_ALT_TAB_KQS_FLATENNING,

    )

    fun moveToFullscreen_multipleVisibleNonMinimizedTasks_doesNotRemoveWallpaperActivity() {

        val homeTask = setUpHomeTask()
@@ -6084,6 +6091,7 @@ class DesktopTasksControllerTest(flags: FlagsParameterization) : ShellTestCase() 
    @DisableFlags(

        Flags.FLAG_ENABLE_MULTIPLE_DESKTOPS_BACKEND,

        Flags.FLAG_ENABLE_DESKTOP_WINDOWING_PIP,

        com.android.launcher3.Flags.FLAG_ENABLE_ALT_TAB_KQS_FLATENNING,

    )

    fun moveFocusedTaskToFullscreen_multipleVisibleTasks_doesNotRemoveWallpaperActivity() {

        val homeTask = setUpHomeTask()