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

Commit b29ba1c3 authored by Sergey Pinkevich's avatar Sergey Pinkevich Committed by Android (Google) Code Review
Browse files

Merge "[E2E test] Ensure that opening app in DW limit should minimize the... 

Merge "[E2E test] Ensure that opening app in DW limit should minimize the first opened app" into main
parents 254272b8 55905b88

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

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ import com.android.wm.shell.scenarios.MinimizeWindowOnAppOpen 
import org.junit.runner.RunWith

import org.junit.runners.BlockJUnit4ClassRunner



/* Functional test for [MinimizeAppWindows]. */

/* Functional test for [MinimizeWindowOnAppOpen]. */

@RunWith(BlockJUnit4ClassRunner::class)

@Postsubmit

@ScreenRecordRule.ScreenRecord

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

0 → 100644
+29 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2025 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.wm.shell.functional



import android.platform.test.annotations.Postsubmit

import android.platform.test.rule.ScreenRecordRule

import com.android.wm.shell.scenarios.MinimizeWindowOnAppOpenViaIntent

import org.junit.runner.RunWith

import org.junit.runners.BlockJUnit4ClassRunner



/* Functional test for [MinimizeWindowOnAppOpenViaIntent]. */

@RunWith(BlockJUnit4ClassRunner::class)

@Postsubmit

@ScreenRecordRule.ScreenRecord

class MinimizeWindowOnAppOpenViaIntentTest : MinimizeWindowOnAppOpenViaIntent()

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

+75 −15
Original line number Diff line number Diff line
@@ -17,6 +17,10 @@ 
package com.android.wm.shell.scenarios



import android.app.Instrumentation

import android.content.Intent.FLAG_ACTIVITY_MULTIPLE_TASK

import android.content.Intent.FLAG_ACTIVITY_NEW_TASK

import android.tools.device.apphelpers.BrowserAppHelper

import android.tools.device.apphelpers.StandardAppHelper

import android.tools.traces.parsers.WindowManagerStateHelper

import androidx.test.platform.app.InstrumentationRegistry

import androidx.test.uiautomator.UiDevice
@@ -34,43 +38,99 @@ import org.junit.Test 


/**

 * Base scenario test for minimizing the least recently used window when a new window is opened

 * above the window limit. For tangor devices, which this test currently runs on, the window limit

 * above the window limit. For Tangor devices, which this test currently runs on, the window limit

 * is 4.

 */

@Ignore("Test Base Class")

abstract class MinimizeWindowOnAppOpen() : TestScenarioBase() {

abstract class MinimizeWindowOnAppOpen : TestScenarioBase() {

    private val instrumentation: Instrumentation = InstrumentationRegistry.getInstrumentation()

    private val tapl = LauncherInstrumentation()

    private val wmHelper = WindowManagerStateHelper(instrumentation)

    private val device = UiDevice.getInstance(instrumentation)



    private val testApp = DesktopModeAppHelper(SimpleAppHelper(instrumentation))

    private val mailApp = DesktopModeAppHelper(MailAppHelper(instrumentation))

    private val desktopConfig = DesktopConfig.fromContext(instrumentation.context)



    private val testAppHelper = SimpleAppHelper(instrumentation)

    private val testAppDesktopHelper = DesktopModeAppHelper(testAppHelper)

    private val mailAppHelper = MailAppHelper(instrumentation)

    private val mailAppDesktopHelper = DesktopModeAppHelper(mailAppHelper)

    private val browserAppHelper = BrowserAppHelper(instrumentation)

    private val browserAppDesktopHelper = DesktopModeAppHelper(browserAppHelper)



    private val maxNum = desktopConfig.maxTaskLimit



    @Before

    fun setup() {

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

        Assume.assumeTrue(maxNum > 0)

        testApp.enterDesktopMode(wmHelper, device)

        // Launch new [maxNum-1] tasks, which ends up opening [maxNum] tasks in total.

        for (i in 1..maxNum - 1) {

            mailApp.launchViaIntent(wmHelper)

        tapl.enableTransientTaskbar(false)

        tapl.showTaskbarIfHidden()

        testAppDesktopHelper.enterDesktopMode(wmHelper, device)

    }



    @Test

    open fun openAppFromAllApps() {

        openMailApps(maxNum - 1)

        // Launch a new task, which ends up opening [maxNum]+1 tasks in total. This should

        // result in the first app we opened to be minimized.

        tapl.launchedAppState.taskbar

            .openAllApps()

            .getAppIcon(browserAppHelper.appName)

            .launch(browserAppHelper.packageName)

        assertWindowManagerState(appShouldBeMinimized = testAppHelper, appShouldBeOnTop = browserAppHelper)

    }



    @Test

    open fun openAppToMinimizeWindow() {

        // Launch a new tasks, which ends up opening [maxNum]+1 tasks in total. This should

    open fun openAppFromTaskbar() {

        openMailApps(maxNum - 1)

        // Launch a new task, which ends up opening [maxNum]+1 tasks in total. This should

        // result in the first app we opened to be minimized.

        mailApp.launchViaIntent(wmHelper)

        tapl.launchedAppState.taskbar

            .getAppIcon(browserAppHelper.appName)

            .launch(browserAppHelper.packageName)

        assertWindowManagerState(appShouldBeMinimized = testAppHelper, appShouldBeOnTop = browserAppHelper)

    }



    @Test

    open fun unminimizeApp() {

        openMailApps(maxNum - 2)

        browserAppHelper.launchViaIntent(wmHelper)

        browserAppHelper.closePopupsIfNeeded(device)

        browserAppDesktopHelper.minimizeDesktopApp(wmHelper, device)

        openMailApps(1)

        tapl.launchedAppState.taskbar

            .getAppIcon(browserAppHelper.appName)

            .launch(browserAppHelper.packageName)

        assertWindowManagerState(appShouldBeMinimized = testAppHelper, appShouldBeOnTop = browserAppHelper)

    }



    private fun openMailApps(limit: Int) {

        for (i in 0..<limit) {

            mailAppDesktopHelper.launchViaIntent(

                wmHelper,

                mailAppHelper.openAppIntent.apply {

                    addFlags(FLAG_ACTIVITY_MULTIPLE_TASK or FLAG_ACTIVITY_NEW_TASK)

                }

            )

        }

    }



    private fun assertWindowManagerState(

        appShouldBeMinimized: StandardAppHelper,

        appShouldBeOnTop: StandardAppHelper

    ) {

        wmHelper

            .StateSyncBuilder()

            .withWindowSurfaceDisappeared(appShouldBeMinimized.componentMatcher)

            .withLayerVisible(mailAppHelper.componentMatcher)

            .withTopVisibleApp(appShouldBeOnTop.componentMatcher)

            .waitForAndVerify()

    }



    @After

    fun teardown() {

        testApp.exit(wmHelper)

        mailApp.exit(wmHelper)

        browserAppHelper.exit(wmHelper)

        mailAppDesktopHelper.exit(wmHelper)

        testAppDesktopHelper.exit(wmHelper)

        tapl.goHome()

    }

}

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

0 → 100644
+97 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2025 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.wm.shell.scenarios



import android.app.Instrumentation

import android.content.Intent.FLAG_ACTIVITY_MULTIPLE_TASK

import android.content.Intent.FLAG_ACTIVITY_NEW_TASK

import android.tools.device.apphelpers.BrowserAppHelper

import android.tools.traces.parsers.WindowManagerStateHelper

import androidx.test.platform.app.InstrumentationRegistry

import androidx.test.uiautomator.UiDevice

import com.android.launcher3.tapl.LauncherInstrumentation

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

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.shared.desktopmode.DesktopConfig

import org.junit.After

import org.junit.Assume

import org.junit.Before

import org.junit.Ignore

import org.junit.Test



/**

 * Base scenario test for minimizing the least recently used window when a new window is opened

 * above the window limit. For Tangor devices, which this test currently runs on, the window limit

 * is 4.

 */

@Ignore("Test Base Class")

abstract class MinimizeWindowOnAppOpenViaIntent : TestScenarioBase() {

    private val instrumentation: Instrumentation = InstrumentationRegistry.getInstrumentation()

    private val tapl = LauncherInstrumentation()

    private val wmHelper = WindowManagerStateHelper(instrumentation)

    private val device = UiDevice.getInstance(instrumentation)

    private val desktopConfig = DesktopConfig.fromContext(instrumentation.context)



    private val testAppHelper = SimpleAppHelper(instrumentation)

    private val testAppDesktopHelper = DesktopModeAppHelper(testAppHelper)

    private val mailAppHelper = MailAppHelper(instrumentation)

    private val mailAppDesktopHelper = DesktopModeAppHelper(mailAppHelper)

    private val browserAppHelper = BrowserAppHelper(instrumentation)

    private val browserAppDesktopHelper = DesktopModeAppHelper(browserAppHelper)



    private val maxNum = desktopConfig.maxTaskLimit



    @Before

    fun setup() {

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

        Assume.assumeTrue(maxNum > 0)

        tapl.enableTransientTaskbar(false)

        tapl.showTaskbarIfHidden()

        testAppDesktopHelper.enterDesktopMode(wmHelper, device)

        // Launch new [maxNum-1] tasks, which ends up opening [maxNum] tasks in total.

        for (i in 1..<maxNum) {

            mailAppDesktopHelper.launchViaIntent(

                wmHelper,

                mailAppHelper.openAppIntent.apply {

                    addFlags(FLAG_ACTIVITY_MULTIPLE_TASK or FLAG_ACTIVITY_NEW_TASK)

                }

            )

        }

    }



    @Test

    open fun openAppViaIntent() {

        // Launch a new task, which ends up opening [maxNum]+1 tasks in total. This should

        // result in the first app we opened to be minimized.

        browserAppHelper.launchViaIntent(wmHelper)

        wmHelper

            .StateSyncBuilder()

            .withWindowSurfaceDisappeared(testAppHelper.componentMatcher)

            .withLayerVisible(mailAppHelper.componentMatcher)

            .withLayerVisible(browserAppHelper.componentMatcher)

            .waitForAndVerify()

    }



    @After

    fun teardown() {

        browserAppHelper.exit(wmHelper)

        mailAppDesktopHelper.exit(wmHelper)

        testAppDesktopHelper.exit(wmHelper)

    }

}