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

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

Merge "Dismiss browser popups when starting TaskbarOverflow test" into main

parents e1f86402 c6d7434d

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

+4 −1
Original line number Original line Diff line number Diff line
@@ -41,7 +41,8 @@ abstract class FocusAppFromTaskbarOverflow(val rotation: Rotation = Rotation.ROT 
    private val tapl = LauncherInstrumentation()

    private val tapl = LauncherInstrumentation()

    private val wmHelper = WindowManagerStateHelper(instrumentation)

    private val wmHelper = WindowManagerStateHelper(instrumentation)

    private val device = UiDevice.getInstance(instrumentation)

    private val device = UiDevice.getInstance(instrumentation)

    private val browserApp = DesktopModeAppHelper(BrowserAppHelper(instrumentation))

    private val browserAppHelper = BrowserAppHelper(instrumentation)

    private val browserApp = DesktopModeAppHelper(browserAppHelper)





    private val firstApp = DesktopModeAppHelper(CalculatorAppHelper(instrumentation))

    private val firstApp = DesktopModeAppHelper(CalculatorAppHelper(instrumentation))

    private val secondApp = DesktopModeAppHelper(ClockAppHelper())

    private val secondApp = DesktopModeAppHelper(ClockAppHelper())
@@ -51,6 +52,8 @@ abstract class FocusAppFromTaskbarOverflow(val rotation: Rotation = Rotation.ROT 




    @Before

    @Before

    fun setup() {

    fun setup() {

        browserAppHelper.launchViaIntent(wmHelper)

        browserAppHelper.closePopupsIfNeeded(device)

        browserApp.enterDesktopMode(wmHelper, device)

        browserApp.enterDesktopMode(wmHelper, device)

        tapl.limitMaxNumberOfTaskbarIcons(8)

        tapl.limitMaxNumberOfTaskbarIcons(8)

        tapl.showTaskbarIfHidden()

        tapl.showTaskbarIfHidden()