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

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

Merge "Use calculator instead of Gmail in UnminimizeAppFromTaskbar" into main

parents 0ded5d19 fc3cc7bf

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

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

import android.tools.NavBar

import android.tools.Rotation

import android.tools.device.apphelpers.GmailAppHelper

import android.tools.device.apphelpers.CalculatorAppHelper

import android.tools.flicker.rules.ChangeDisplayOrientationRule

import android.tools.traces.parsers.WindowManagerStateHelper

import androidx.test.platform.app.InstrumentationRegistry
@@ -44,8 +44,9 @@ abstract class UnminimizeAppFromTaskbar(val rotation: Rotation = Rotation.ROTATI 
    private val wmHelper = WindowManagerStateHelper(instrumentation)

    private val device = UiDevice.getInstance(instrumentation)

    private val testApp = DesktopModeAppHelper(SimpleAppHelper(instrumentation))

    private val gmailHelper = GmailAppHelper(instrumentation)

    private val gmailApp = DesktopModeAppHelper(gmailHelper)

    private val calculatorHelper = CalculatorAppHelper(instrumentation)

    private val calculatorApp = DesktopModeAppHelper(calculatorHelper)





    @Rule

    @JvmField val testSetupRule = Utils.testSetupRule(NavBar.MODE_GESTURAL, rotation)
@@ -59,20 +60,20 @@ abstract class UnminimizeAppFromTaskbar(val rotation: Rotation = Rotation.ROTATI 
        ChangeDisplayOrientationRule.setRotation(rotation)

        testApp.enterDesktopMode(wmHelper, device)

        tapl.showTaskbarIfHidden()

        gmailApp.launchViaIntent(wmHelper)

        gmailApp.minimizeDesktopApp(wmHelper, device)

        calculatorApp.launchViaIntent(wmHelper)

        calculatorApp.minimizeDesktopApp(wmHelper, device)

    }



    @Test

    open fun unminimizeApp() {

        tapl.launchedAppState.taskbar

            .getAppIcon(gmailHelper.appName)

            .launch(gmailHelper.packageName)

            .getAppIcon(calculatorHelper.appName)

            .launch(calculatorApp.packageName)

    }



    @After

    fun teardown() {

        testApp.exit(wmHelper)

        gmailApp.exit(wmHelper)

        calculatorApp.exit(wmHelper)

    }

}