Merge "Add e2e for bringing desktop windows to front via the header" into main (9e37df59) · Commits · e / os / android_frameworks_base

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

0 → 100644

+26 −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.functional

		import android.platform.test.annotations.Postsubmit
		import com.android.wm.shell.scenarios.BringDesktopAppsToFront
		import org.junit.runner.RunWith
		import org.junit.runners.BlockJUnit4ClassRunner

		/** Functional test for [BringDesktopAppsToFront]. */
		@RunWith(BlockJUnit4ClassRunner::class)
		@Postsubmit
		class BringDesktopAppsToFrontTest : BringDesktopAppsToFront()

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

0 → 100644

+72 −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.tools.NavBar
		import android.tools.Rotation
		import android.tools.flicker.rules.ChangeDisplayOrientationRule
		import com.android.server.wm.flicker.helpers.DesktopModeAppHelper
		import com.android.server.wm.flicker.helpers.MailAppHelper
		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("Test Base Class")
		abstract class BringDesktopAppsToFront(
		val rotation: Rotation = Rotation.ROTATION_0,
		isResizable: Boolean = true,
		isLandscapeApp: Boolean = true,
		) : DesktopScenarioCustomAppTestBase(isResizable, isLandscapeApp) {

		private val mailApp = DesktopModeAppHelper(MailAppHelper(instrumentation))

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

		@Before
		fun setup() {
		Assume.assumeTrue(Flags.enableDesktopWindowingMode() && tapl.isTablet)
		tapl.setEnableRotation(true)
		tapl.setExpectedRotation(rotation.value)
		ChangeDisplayOrientationRule.setRotation(rotation)
		tapl.enableTransientTaskbar(false)
		// Launch a first app and snap it to left side so that it doesn't overlap too much with
		// the next launching app, and their headers are visible enough to switch focus by tapping
		// on them.
		testApp.enterDesktopMode(wmHelper, device)
		testApp.snapResizeDesktopApp(wmHelper, device, instrumentation.context, toLeft = true)
		mailApp.launchViaIntent(wmHelper)
		}

		@Test
		open fun bringDesktopAppsToFront() {
		testApp.bringToFront(wmHelper, device)
		mailApp.bringToFront(wmHelper, device)
		testApp.bringToFront(wmHelper, device)
		mailApp.bringToFront(wmHelper, device)
		}

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

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

+20 −0

Original line number	Diff line number	Diff line
		@@ -166,6 +166,25 @@ open class DesktopModeAppHelper(private val innerHelper: IStandardAppHelper) :
		.waitForAndVerify()
		}

		private fun getHeaderEmptyView(caption: UiObject2?): UiObject2 {
		return caption
		?.children
		?.find { it.resourceName.endsWith(HEADER_EMPTY_VIEW) }
		?: error("Unable to find resource $HEADER_EMPTY_VIEW\n")
		}

		/** Click on an existing window's header to bring it to the front. */
		fun bringToFront(wmHelper: WindowManagerStateHelper, device: UiDevice) {
		val caption = getCaptionForTheApp(wmHelper, device)
		val openHeaderView = getHeaderEmptyView(caption)
		openHeaderView.click()
		wmHelper
		.StateSyncBuilder()
		.withAppTransitionIdle()
		.withTopVisibleApp(innerHelper)
		.waitForAndVerify()
		}

		/** Open maximize menu and click snap resize button on the app header for the given app. */
		fun snapResizeDesktopApp(
		wmHelper: WindowManagerStateHelper,
		@@ -447,6 +466,7 @@ open class DesktopModeAppHelper(private val innerHelper: IStandardAppHelper) :
		const val SNAP_LEFT_BUTTON: String = "maximize_menu_snap_left_button"
		const val SNAP_RIGHT_BUTTON: String = "maximize_menu_snap_right_button"
		const val MINIMIZE_BUTTON_VIEW: String = "minimize_window"
		const val HEADER_EMPTY_VIEW: String = "caption_handle"
		val caption: BySelector
		get() = By.res(SYSTEMUI_PACKAGE, CAPTION)
		}