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

Commit e34d0ece authored by Vania Desmonda's avatar Vania Desmonda
Browse files

Update assumption in Desktop mode scenarios to use DesktopState. 

Fixes: 419516785
Test: atest OpenAppFromAllAppsFlickerTest
Flag: EXEMPT test updates
Change-Id: Ied623fc02d6f945726597b4a9e758a1e4cc6796a
parent e931bef9

libs/WindowManager/Shell/tests/e2e/desktopmode/scenarios/src/com/android/wm/shell/scenarios/AltTabSwitchInDesktopMode.kt

+6 −1
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package com.android.wm.shell.scenarios 
import android.app.Instrumentation

import android.tools.flicker.rules.ChangeDisplayOrientationRule

import android.tools.NavBar

import android.tools.PlatformConsts.DEFAULT_DISPLAY

import android.tools.Rotation

import android.tools.traces.parsers.WindowManagerStateHelper

import androidx.test.platform.app.InstrumentationRegistry
@@ -30,6 +31,7 @@ import com.android.server.wm.flicker.helpers.NewTasksAppHelper 
import com.android.server.wm.flicker.helpers.SimpleAppHelper

import com.android.window.flags.Flags

import com.android.wm.shell.Utils

import com.android.wm.shell.shared.desktopmode.DesktopState

import org.junit.After

import org.junit.Assume

import org.junit.Before
@@ -55,7 +57,10 @@ abstract class AltTabSwitchInDesktopMode( 


    @Before

    fun setup() {

        Assume.assumeTrue(Flags.enableDesktopWindowingMode() && tapl.isTablet)

        Assume.assumeTrue(

            DesktopState.fromContext(instrumentation.context)

                .isDesktopModeSupportedOnDisplay(DEFAULT_DISPLAY)

        )

        tapl.setEnableRotation(true)

        tapl.setExpectedRotation(rotation.value)

        tapl.enableTransientTaskbar(false)

libs/WindowManager/Shell/tests/e2e/desktopmode/scenarios/src/com/android/wm/shell/scenarios/AltTabSwitchOutDesktopMode.kt

+6 −1
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import android.app.Instrumentation 
import android.platform.test.annotations.RequiresFlagsEnabled

import android.tools.flicker.rules.ChangeDisplayOrientationRule

import android.tools.NavBar

import android.tools.PlatformConsts.DEFAULT_DISPLAY

import android.tools.Rotation

import android.tools.traces.parsers.WindowManagerStateHelper

import androidx.test.platform.app.InstrumentationRegistry
@@ -30,6 +31,7 @@ import com.android.server.wm.flicker.helpers.MailAppHelper 
import com.android.server.wm.flicker.helpers.SimpleAppHelper

import com.android.window.flags.Flags

import com.android.wm.shell.Utils

import com.android.wm.shell.shared.desktopmode.DesktopState

import org.junit.After

import org.junit.Assume

import org.junit.Before
@@ -56,7 +58,10 @@ abstract class AltTabSwitchOutDesktopMode : TestScenarioBase() { 


    @Before

    fun setup() {

        Assume.assumeTrue(tapl.isTablet)

        Assume.assumeTrue(

            DesktopState.fromContext(instrumentation.context)

                .isDesktopModeSupportedOnDisplay(DEFAULT_DISPLAY)

        )

        tapl.setEnableRotation(true)

        tapl.setExpectedRotation(rotation.value)

        tapl.enableTransientTaskbar(false)

libs/WindowManager/Shell/tests/e2e/desktopmode/scenarios/src/com/android/wm/shell/scenarios/BringDesktopAppsToFront.kt

+6 −1
Original line number Diff line number Diff line
@@ -16,12 +16,14 @@ 
package com.android.wm.shell.scenarios



import android.tools.NavBar

import android.tools.PlatformConsts.DEFAULT_DISPLAY

import android.tools.Rotation

import android.tools.flicker.rules.ChangeDisplayOrientationRule

import com.android.server.wm.flicker.helpers.DesktopModeAppHelper

import com.android.server.wm.flicker.helpers.MailAppHelper

import com.android.window.flags.Flags

import com.android.wm.shell.Utils

import com.android.wm.shell.shared.desktopmode.DesktopState

import org.junit.After

import org.junit.Assume

import org.junit.Before
@@ -43,7 +45,10 @@ abstract class BringDesktopAppsToFront( 


    @Before

    fun setup() {

        Assume.assumeTrue(Flags.enableDesktopWindowingMode() && tapl.isTablet)

        Assume.assumeTrue(

            DesktopState.fromContext(instrumentation.context)

                .isDesktopModeSupportedOnDisplay(DEFAULT_DISPLAY)

        )

        tapl.setEnableRotation(true)

        tapl.setExpectedRotation(rotation.value)

        ChangeDisplayOrientationRule.setRotation(rotation)

libs/WindowManager/Shell/tests/e2e/desktopmode/scenarios/src/com/android/wm/shell/scenarios/ChromeNewTabAtWindowLimit.kt

+6 −1
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.wm.shell.scenarios 


import android.app.Instrumentation

import android.tools.NavBar

import android.tools.PlatformConsts.DEFAULT_DISPLAY

import android.tools.Rotation

import android.tools.device.apphelpers.BrowserAppHelper

import android.tools.device.apphelpers.CalculatorAppHelper
@@ -31,6 +32,7 @@ import com.android.server.wm.flicker.helpers.DesktopModeAppHelper 
import com.android.server.wm.flicker.helpers.MailAppHelper

import com.android.window.flags.Flags

import com.android.wm.shell.Utils

import com.android.wm.shell.shared.desktopmode.DesktopState

import org.junit.After

import org.junit.Assume

import org.junit.Before
@@ -57,7 +59,10 @@ abstract class ChromeNewTabAtWindowLimit(val rotation: Rotation = Rotation.ROTAT 


    @Before

    fun setup() {

        Assume.assumeTrue(Flags.enableDesktopWindowingMode() && Flags.enableDesktopTaskLimitSeparateTransition() && tapl.isTablet)

        Assume.assumeTrue(

            DesktopState.fromContext(instrumentation.context)

                .isDesktopModeSupportedOnDisplay(DEFAULT_DISPLAY)

        )

        tapl.apply {

            setEnableRotation(true)

            setExpectedRotation(rotation.value)

libs/WindowManager/Shell/tests/e2e/desktopmode/scenarios/src/com/android/wm/shell/scenarios/CloseAllAppsWithAppHeaderExit.kt

+6 −1
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.wm.shell.scenarios 


import android.app.Instrumentation

import android.tools.NavBar

import android.tools.PlatformConsts.DEFAULT_DISPLAY

import android.tools.Rotation

import android.tools.traces.parsers.WindowManagerStateHelper

import androidx.test.platform.app.InstrumentationRegistry
@@ -29,6 +30,7 @@ import com.android.server.wm.flicker.helpers.NonResizeableAppHelper 
import com.android.server.wm.flicker.helpers.SimpleAppHelper

import com.android.window.flags.Flags

import com.android.wm.shell.Utils

import com.android.wm.shell.shared.desktopmode.DesktopState

import org.junit.After

import org.junit.Assume

import org.junit.Before
@@ -53,7 +55,10 @@ abstract class CloseAllAppsWithAppHeaderExit ( 


    @Before

    fun setup() {

        Assume.assumeTrue(Flags.enableDesktopWindowingMode() && tapl.isTablet)

        Assume.assumeTrue(

            DesktopState.fromContext(instrumentation.context)

                .isDesktopModeSupportedOnDisplay(DEFAULT_DISPLAY)

        )

        tapl.setEnableRotation(true)

        tapl.setExpectedRotation(rotation.value)

        testApp.enterDesktopMode(wmHelper, device)