Merge "Use tapl instrumentation to go home." into tm-qpr-dev (9a817344) · Commits · e / os / android_frameworks_base

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/helpers/PipAppHelper.kt

+0 −27

Original line number	Diff line number	Diff line
		@@ -107,33 +107,6 @@ class PipAppHelper(instrumentation: Instrumentation) : BaseAppHelper(
		uiDevice.wait(Until.gone(By.res(SYSTEMUI_PACKAGE, "dismiss")), FIND_TIMEOUT)
		}

		@JvmOverloads
		fun enterPipViaHomeButton(wmHelper: WindowManagerStateHelper) {
		uiDevice.pressHome()

		// Wait on WMHelper or simply wait for 3 seconds
		wmHelper.waitPipShown() ?: SystemClock.sleep(3_000)
		// when entering pip, the dismiss button is visible at the start. to ensure the pip
		// animation is complete, wait until the pip dismiss button is no longer visible.
		// b/176822698: dismiss-only state will be removed in the future
		uiDevice.wait(Until.gone(By.res(SYSTEMUI_PACKAGE, "dismiss")), FIND_TIMEOUT)
		}

		@JvmOverloads
		fun enterPipViaSwipeToHome(wmHelper: WindowManagerStateHelper) {
		uiDevice.swipe(
		uiDevice.displayWidth / 2, uiDevice.displayHeight - 10,
		uiDevice.displayWidth / 2, uiDevice.displayHeight - 300, 3
		)

		// Wait on WMHelper or simply wait for 3 seconds
		wmHelper.waitPipShown() ?: SystemClock.sleep(3_000)
		// when entering pip, the dismiss button is visible at the start. to ensure the pip
		// animation is complete, wait until the pip dismiss button is no longer visible.
		// b/176822698: dismiss-only state will be removed in the future
		uiDevice.wait(Until.gone(By.res(SYSTEMUI_PACKAGE, "dismiss")), FIND_TIMEOUT)
		}

		fun enableEnterPipOnUserLeaveHint() {
		clickObject(ENTER_PIP_ON_USER_LEAVE_HINT)
		}

+3 −5

Original line number	Diff line number	Diff line
		@@ -17,6 +17,7 @@
		package com.android.wm.shell.flicker.pip

		import androidx.test.filters.RequiresDevice
		import com.android.launcher3.tapl.LauncherInstrumentation
		import com.android.server.wm.flicker.FlickerParametersRunnerFactory
		import com.android.server.wm.flicker.FlickerTestParameter
		import com.android.server.wm.flicker.annotation.Group3
		@@ -50,7 +51,7 @@ import org.junit.runners.Parameterized
		@FixMethodOrder(MethodSorters.NAME_ASCENDING)
		@Group3
		class EnterPipOnUserLeaveHintTest(testSpec: FlickerTestParameter) : EnterPipTest(testSpec) {

		protected val taplInstrumentation = LauncherInstrumentation()
		/**
		* Defines the transition used to run the test
		*/
		@@ -69,10 +70,7 @@ class EnterPipOnUserLeaveHintTest(testSpec: FlickerTestParameter) : EnterPipTest
		}
		}
		transitions {
		when (testSpec.isGesturalNavigation) {
		true -> pipApp.enterPipViaSwipeToHome(wmHelper)
		false -> pipApp.enterPipViaHomeButton(wmHelper)
		}
		taplInstrumentation.goHome()
		}
		}