Merge "Make the 1P/3P PiP tests run without screen recorder." into main (5a30cec2) · Commits · e / os / android_frameworks_base

libs/WindowManager/Shell/tests/flicker/pip/src/com/android/wm/shell/flicker/pip/apps/AppsEnterPipTransition.kt

+11 −0

Original line number	Diff line number	Diff line
		@@ -20,6 +20,8 @@ import android.platform.test.annotations.Postsubmit
		import android.tools.common.Rotation
		import android.tools.common.traces.component.ComponentNameMatcher
		import android.tools.device.apphelpers.StandardAppHelper
		import android.tools.device.flicker.junit.FlickerBuilderProvider
		import android.tools.device.flicker.legacy.FlickerBuilder
		import android.tools.device.flicker.legacy.LegacyFlickerTest
		import android.tools.device.flicker.legacy.LegacyFlickerTestFactory
		import com.android.wm.shell.flicker.pip.common.EnterPipTransition
		@@ -29,6 +31,15 @@ import org.junit.runners.Parameterized
		abstract class AppsEnterPipTransition(flicker: LegacyFlickerTest) : EnterPipTransition(flicker) {
		protected abstract val standardAppHelper: StandardAppHelper

		@FlickerBuilderProvider
		override fun buildFlicker(): FlickerBuilder {
		return FlickerBuilder(instrumentation).apply {
		withoutScreenRecorder()
		setup { flicker.scenario.setIsTablet(tapl.isTablet) }
		transition()
		}
		}

		/** Checks [standardAppHelper] window remains visible throughout the animation */
		@Postsubmit
		@Test

+1 −1

Original line number	Diff line number	Diff line
		@@ -38,7 +38,7 @@ constructor(
		* executions
		*/
		@FlickerBuilderProvider
		fun buildFlicker(): FlickerBuilder {
		open fun buildFlicker(): FlickerBuilder {
		return FlickerBuilder(instrumentation).apply {
		setup { flicker.scenario.setIsTablet(tapl.isTablet) }
		transition()