Merge "Add tests for a desktop app opening from All Apps using KB" into main (4a7d26dc) · Commits · e / os / android_frameworks_base

libs/WindowManager/Shell/tests/e2e/desktopmode/flicker-service/Android.bp

+21 −14

Original line number	Diff line number	Diff line
		@@ -108,20 +108,6 @@ test_module_config {
		include_filters: ["com.android.wm.shell.flicker.externaldisplay.OpenAppWithExternalDisplayConnectedFlickerTest"],
		}

		test_module_config {
		name: "WMShellFlickerTestsDesktopMode-keyboardshortcuts-AltTabSwitchInDesktopModeFlickerTest",
		base: "WMShellFlickerTestsDesktopMode",
		test_suites: ["device-tests"],
		include_filters: ["com.android.wm.shell.flicker.keyboardshortcuts.AltTabSwitchInDesktopModeFlickerTest"],
		}

		test_module_config {
		name: "WMShellFlickerTestsDesktopMode-keyboardshortcuts-OpenBrowserWithKeyboardShortcutFlickerTest",
		base: "WMShellFlickerTestsDesktopMode",
		test_suites: ["device-tests"],
		include_filters: ["com.android.wm.shell.flicker.keyboardshortcuts.OpenBrowserWithKeyboardShortcutFlickerTest"],
		}

		test_module_config {
		name: "WMShellFlickerTestsDesktopMode-fundamentals-CloseAllAppsViaAppHeaderExitTest",
		base: "WMShellFlickerTestsDesktopMode",
		@@ -227,6 +213,13 @@ test_module_config {
		include_filters: ["com.android.wm.shell.flicker.fundamentals.SwitchToOverviewFromDesktopFlickerTest"],
		}

		test_module_config {
		name: "WMShellFlickerTestsDesktopMode-keyboardshortcuts-AltTabSwitchInDesktopModeFlickerTest",
		base: "WMShellFlickerTestsDesktopMode",
		test_suites: ["device-tests"],
		include_filters: ["com.android.wm.shell.flicker.keyboardshortcuts.AltTabSwitchInDesktopModeFlickerTest"],
		}

		test_module_config {
		name: "WMShellFlickerTestsDesktopMode-keyboardshortcuts-EnterDesktopFromKeyboardShortcutFlickerTest",
		base: "WMShellFlickerTestsDesktopMode",
		@@ -255,6 +248,20 @@ test_module_config {
		include_filters: ["com.android.wm.shell.flicker.keyboardshortcuts.MinimizeAppsWithKeyboardFlickerTest"],
		}

		test_module_config {
		name: "WMShellFlickerTestsDesktopMode-keyboardshortcuts-OpenAppFromAllAppsUsingKeyboardFlickerTest",
		base: "WMShellFlickerTestsDesktopMode",
		test_suites: ["device-tests"],
		include_filters: ["com.android.wm.shell.flicker.keyboardshortcuts.OpenAppFromAllAppsUsingKeyboardFlickerTest"],
		}

		test_module_config {
		name: "WMShellFlickerTestsDesktopMode-keyboardshortcuts-OpenBrowserWithKeyboardShortcutFlickerTest",
		base: "WMShellFlickerTestsDesktopMode",
		test_suites: ["device-tests"],
		include_filters: ["com.android.wm.shell.flicker.keyboardshortcuts.OpenBrowserWithKeyboardShortcutFlickerTest"],
		}

		test_module_config {
		name: "WMShellFlickerTestsDesktopMode-maximize-ExitDesktopToFullScreenWithDragToTopDragZoneFlickerTest",
		base: "WMShellFlickerTestsDesktopMode",

libs/WindowManager/Shell/tests/e2e/desktopmode/flicker-service/TEST_MAPPING

+3 −0

Original line number	Diff line number	Diff line
		@@ -66,6 +66,9 @@
		{
		"name": "WMShellFlickerTestsDesktopMode-keyboardshortcuts-MinimizeAppsWithKeyboardFlickerTest"
		},
		{
		"name": "WMShellFlickerTestsDesktopMode-keyboardshortcuts-OpenAppFromAllAppsUsingKeyboardFlickerTest"
		},
		{
		"name": "WMShellFlickerTestsDesktopMode-keyboardshortcuts-OpenBrowserWithKeyboardShortcutFlickerTest"
		},

libs/WindowManager/Shell/tests/e2e/desktopmode/flicker-service/src/com/android/wm/shell/flicker/keyboardshortcuts/OpenAppFromAllAppsUsingKeyboardFlickerTest.kt

0 → 100644

+93 −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.flicker.keyboardshortcuts

		import android.platform.test.annotations.Postsubmit
		import android.platform.test.annotations.RequiresDesktopDevice
		import android.tools.NavBar
		import android.tools.flicker.assertions.FlickerChecker
		import android.tools.flicker.FlickerBuilder
		import android.tools.flicker.FlickerTest
		import android.tools.flicker.FlickerTestFactory
		import android.tools.flicker.junit.FlickerParametersRunnerFactory
		import com.android.wm.shell.Utils
		import com.android.wm.shell.flicker.DesktopModeBaseTest
		import com.android.wm.shell.flicker.utils.appWindowInsideDisplayBoundsAtEnd
		import com.android.wm.shell.flicker.utils.appWindowOnTopAtEnd
		import com.android.wm.shell.flicker.utils.layerBecomesVisible
		import com.android.wm.shell.flicker.utils.cascadingEffectAppliedAtEnd
		import com.android.wm.shell.scenarios.OpenAppFromAllAppsUsingKeyboard
		import org.junit.Rule
		import org.junit.Test
		import org.junit.runner.RunWith
		import org.junit.runners.Parameterized

		/**
		* Tests desktop app opening from All Apps with keyboard shortcuts.
		*
		* To run this test: atest OpenAppFromAllAppsUsingKeyboardFlickerTest
		*/
		@RequiresDesktopDevice
		@RunWith(Parameterized::class)
		@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)
		@Postsubmit
		class OpenAppFromAllAppsUsingKeyboardFlickerTest(flicker: FlickerTest) : DesktopModeBaseTest(flicker) {
		inner class OpenAppFromAllAppsUsingKeyboardScenario : OpenAppFromAllAppsUsingKeyboard(rotation = flicker.scenario.startRotation)

		@Rule
		@JvmField
		val testSetupRule = Utils.testSetupRule(NavBar.MODE_GESTURAL, flicker.scenario.startRotation)
		val scenario = OpenAppFromAllAppsUsingKeyboardScenario()

		private val calculatorApp = scenario.calculatorApp

		override val transition: FlickerBuilder.() -> Unit
		get() = {
		setup {
		scenario.setup()
		}
		transitions {
		scenario.openAppFromAllAppsUsingKeyboard()
		}
		teardown {
		scenario.teardown()
		}
		}

		@Test
		fun appWindowInsideDisplayBoundsAtEnd() =
		flicker.appWindowInsideDisplayBoundsAtEnd(calculatorApp)

		@Test
		fun appWindowOnTopAtEnd() = flicker.appWindowOnTopAtEnd(calculatorApp)

		@Test
		fun layerBecomesVisible() = flicker.layerBecomesVisible(calculatorApp)

		@Test
		fun cascadingEffectAppliedAtEnd() = flicker.cascadingEffectAppliedAtEnd(calculatorApp)

		companion object {
		@Parameterized.Parameters(name = "{0}")
		@JvmStatic
		fun getParams(): Collection<FlickerChecker> {
		return FlickerTestFactory.nonRotationTests(
		supportedNavigationModes = listOf(NavBar.MODE_GESTURAL)
		)
		}
		}
		}

libs/WindowManager/Shell/tests/e2e/desktopmode/scenarios/Android.bp

+1 −0

Original line number	Diff line number	Diff line
		@@ -142,6 +142,7 @@ test_module_config {
		"com.android.wm.shell.functional.fundamentals.focus.OpenAndFocusTest",
		"com.android.wm.shell.functional.keyboardshortcuts.EnterDesktopFromKeyboardShortcutTest",
		"com.android.wm.shell.functional.keyboardshortcuts.ExitDesktopFromKeyboardShortcutTest",
		"com.android.wm.shell.functional.keyboardshortcuts.OpenAppFromAllAppsUsingKeyboardTest",
		"com.android.wm.shell.functional.keyboardshortcuts.OpenBrowserWithKeyboardShortcutTest",
		"com.android.wm.shell.functional.maximize.ExitDesktopWithDragToTopDragZoneTest",
		"com.android.wm.shell.functional.maximize.MaximizeAppWindowTest",

libs/WindowManager/Shell/tests/e2e/desktopmode/scenarios/TEST_MAPPING

+3 −0

Original line number	Diff line number	Diff line
		@@ -168,6 +168,9 @@
		{
		"name": "FunctionalTestsDesktopMode-keyboardshortcuts-ExitDesktopFromKeyboardShortcutTest"
		},
		{
		"name": "FunctionalTestsDesktopMode-keyboardshortcuts-OpenAppFromAllAppsUsingKeyboardTest"
		},
		{
		"name": "FunctionalTestsDesktopMode-keyboardshortcuts-OpenBrowserWithKeyboardShortcutTest"
		},