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

Commit 334ca495 authored by Ajinkya Chalke's avatar Ajinkya Chalke
Browse files

Disable KQS flatenning for some WMShell unit tests 

- The behavior with KQS flatenning ON is already verified with unit
  tests. So, we don't need to add different variant of tests for failing
  tests.
- So only disable the flag for the unit tests that are failing as these
  tests are expecting X heirarchy changes but are getting Y with KQS
  flatenning flag ON.

Fix: 413074928
Bug: 382769617
Test: atest WMShellUnitTests:DesktopTasksControllerTest
Flag: EXEMPT disabling flag for unit tests
Change-Id: I05c87462d0e50e9e3e6d98ed1b6b1cd94769faf1
parent 29c44684

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

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




    @Test

    @Test

    @EnableFlags(Flags.FLAG_ENABLE_DESKTOP_WALLPAPER_ACTIVITY_FOR_SYSTEM_USER)

    @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() {

    fun moveToFullscreen_tdaFullscreen_windowingModeUndefined_removesWallpaperActivity() {

        desktopState.enterDesktopByDefaultOnFreeformDisplay = true

        desktopState.enterDesktopByDefaultOnFreeformDisplay = true

        val homeTask = setUpHomeTask()

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




    @Test

    @Test

    @EnableFlags(Flags.FLAG_ENABLE_DESKTOP_WALLPAPER_ACTIVITY_FOR_SYSTEM_USER)

    @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() {

    fun moveToFullscreen_tdaFreeform_windowingModeFullscreen_removesWallpaperActivity() {

        desktopState.enterDesktopByDefaultOnFreeformDisplay = false

        desktopState.enterDesktopByDefaultOnFreeformDisplay = false

        val homeTask = setUpHomeTask()

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

    @DisableFlags(

        Flags.FLAG_ENABLE_MULTIPLE_DESKTOPS_BACKEND,

        Flags.FLAG_ENABLE_MULTIPLE_DESKTOPS_BACKEND,

        Flags.FLAG_ENABLE_DESKTOP_WINDOWING_PIP,

        Flags.FLAG_ENABLE_DESKTOP_WINDOWING_PIP,

        com.android.launcher3.Flags.FLAG_ENABLE_ALT_TAB_KQS_FLATENNING,

    )

    )

    fun moveToFullscreen_multipleVisibleNonMinimizedTasks_doesNotRemoveWallpaperActivity() {

    fun moveToFullscreen_multipleVisibleNonMinimizedTasks_doesNotRemoveWallpaperActivity() {

        val homeTask = setUpHomeTask()

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

    @DisableFlags(

        Flags.FLAG_ENABLE_MULTIPLE_DESKTOPS_BACKEND,

        Flags.FLAG_ENABLE_MULTIPLE_DESKTOPS_BACKEND,

        Flags.FLAG_ENABLE_DESKTOP_WINDOWING_PIP,

        Flags.FLAG_ENABLE_DESKTOP_WINDOWING_PIP,

        com.android.launcher3.Flags.FLAG_ENABLE_ALT_TAB_KQS_FLATENNING,

    )

    )

    fun moveFocusedTaskToFullscreen_multipleVisibleTasks_doesNotRemoveWallpaperActivity() {

    fun moveFocusedTaskToFullscreen_multipleVisibleTasks_doesNotRemoveWallpaperActivity() {

        val homeTask = setUpHomeTask()

        val homeTask = setUpHomeTask()