Merge "Add flicker test for back navigation on Desktop mode." into main (1f7c0905) · Commits · e / os / android_frameworks_base

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

0 → 100644

+51 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2024 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

		import android.tools.Rotation
		import android.tools.flicker.FlickerConfig
		import android.tools.flicker.annotation.ExpectedScenarios
		import android.tools.flicker.annotation.FlickerConfigProvider
		import android.tools.flicker.config.FlickerConfig
		import android.tools.flicker.config.FlickerServiceConfig
		import android.tools.flicker.junit.FlickerServiceJUnit4ClassRunner
		import com.android.wm.shell.flicker.DesktopModeFlickerScenarios.Companion.CLOSE_APP
		import com.android.wm.shell.flicker.DesktopModeFlickerScenarios.Companion.CLOSE_LAST_APP
		import com.android.wm.shell.scenarios.CloseAllAppsWithBackNavigation
		import org.junit.Test
		import org.junit.runner.RunWith

		@RunWith(FlickerServiceJUnit4ClassRunner::class)
		class CloseAllAppsWithBackNavigationLandscape : CloseAllAppsWithBackNavigation(
		Rotation.ROTATION_90
		) {
		// TODO(b/390043833): Add verifications that TO_BACK transition is captured when the back
		// navigation button is pressed.
		@ExpectedScenarios(["CLOSE_APP", "CLOSE_LAST_APP"])
		@Test
		override fun closeAllAppsInDesktop() = super.closeAllAppsInDesktop()

		companion object {
		@JvmStatic
		@FlickerConfigProvider
		fun flickerConfigProvider(): FlickerConfig =
		FlickerConfig()
		.use(FlickerServiceConfig.DEFAULT)
		.use(CLOSE_APP)
		.use(CLOSE_LAST_APP)
		}
		}

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

0 → 100644

+48 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2024 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

		import android.tools.flicker.FlickerConfig
		import android.tools.flicker.annotation.ExpectedScenarios
		import android.tools.flicker.annotation.FlickerConfigProvider
		import android.tools.flicker.config.FlickerConfig
		import android.tools.flicker.config.FlickerServiceConfig
		import android.tools.flicker.junit.FlickerServiceJUnit4ClassRunner
		import com.android.wm.shell.flicker.DesktopModeFlickerScenarios.Companion.CLOSE_APP
		import com.android.wm.shell.flicker.DesktopModeFlickerScenarios.Companion.CLOSE_LAST_APP
		import com.android.wm.shell.scenarios.CloseAllAppsWithBackNavigation
		import org.junit.Test
		import org.junit.runner.RunWith

		@RunWith(FlickerServiceJUnit4ClassRunner::class)
		class CloseAllAppsWithBackNavigationPortrait : CloseAllAppsWithBackNavigation() {
		// TODO(b/390043833): Add verifications that TO_BACK transition is captured when the back
		// navigation button is pressed.
		@ExpectedScenarios(["CLOSE_APP", "CLOSE_LAST_APP"])
		@Test
		override fun closeAllAppsInDesktop() = super.closeAllAppsInDesktop()

		companion object {
		@JvmStatic
		@FlickerConfigProvider
		fun flickerConfigProvider(): FlickerConfig =
		FlickerConfig()
		.use(FlickerServiceConfig.DEFAULT)
		.use(CLOSE_APP)
		.use(CLOSE_LAST_APP)
		}
		}

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

0 → 100644

+73 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2024 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.tools.NavBar
		import android.tools.Rotation
		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.NonResizeableAppHelper
		import com.android.server.wm.flicker.helpers.SimpleAppHelper
		import com.android.window.flags.Flags
		import com.android.wm.shell.Utils
		import org.junit.After
		import org.junit.Assume
		import org.junit.Before
		import org.junit.Ignore
		import org.junit.Rule
		import org.junit.Test

		@Ignore("Base Test Class")
		abstract class CloseAllAppsWithBackNavigation(val rotation: Rotation = Rotation.ROTATION_0) {
		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 nonResizeableApp = DesktopModeAppHelper(NonResizeableAppHelper(instrumentation))

		@Rule @JvmField val testSetupRule = Utils.testSetupRule(NavBar.MODE_GESTURAL, rotation)

		@Before
		fun setup() {
		Assume.assumeTrue(Flags.enableDesktopWindowingMode() && tapl.isTablet)
		Assume.assumeTrue(Flags.enableDesktopWindowingBackNavigation())
		tapl.setEnableRotation(true)
		tapl.setExpectedRotation(rotation.value)
		testApp.enterDesktopMode(wmHelper, device)
		mailApp.launchViaIntent(wmHelper)
		nonResizeableApp.launchViaIntent(wmHelper)
		}

		@Test
		open fun closeAllAppsInDesktop() {
		nonResizeableApp.closeDesktopApp(wmHelper, device, usingBackNavigation = true)
		mailApp.closeDesktopApp(wmHelper, device, usingBackNavigation = true)
		testApp.closeDesktopApp(wmHelper, device, usingBackNavigation = true)
		}

		@After
		fun teardown() {
		testApp.exit(wmHelper)
		}
		}

tests/FlickerTests/test-apps/app-helpers/src/com/android/server/wm/flicker/helpers/DesktopModeAppHelper.kt

+14 −5

Original line number	Diff line number	Diff line
		@@ -280,11 +280,20 @@ open class DesktopModeAppHelper(private val innerHelper: IStandardAppHelper) :
		.waitForAndVerify()
		}

		/** Click close button on the app header for the given app. */
		fun closeDesktopApp(wmHelper: WindowManagerStateHelper, device: UiDevice) {
		/** Close a desktop app by clicking the close button on the app header for the given app or by
		* pressing back. */
		fun closeDesktopApp(
		wmHelper: WindowManagerStateHelper,
		device: UiDevice,
		usingBackNavigation: Boolean = false
		) {
		if (usingBackNavigation) {
		device.pressBack()
		} else {
		val caption = getCaptionForTheApp(wmHelper, device)
		val closeButton = caption?.children?.find { it.resourceName.endsWith(CLOSE_BUTTON) }
		closeButton?.click()
		}
		wmHelper
		.StateSyncBuilder()
		.withAppTransitionIdle()