Merge "Remove duplicate isTablet initialization" (1c7719f1) · Commits · e / os / android_frameworks_base

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

+1 −11

Original line number	Diff line number	Diff line
		@@ -33,7 +33,6 @@ import com.android.server.wm.flicker.statusBarWindowIsAlwaysVisible
		import com.android.server.wm.flicker.taskBarLayerIsVisibleAtStartAndEnd
		import com.android.server.wm.flicker.taskBarWindowIsAlwaysVisible
		import com.android.server.wm.traces.common.ComponentNameMatcher
		import com.android.server.wm.traces.parser.windowmanager.WindowManagerStateHelper
		import org.junit.Assume
		import org.junit.Test

		@@ -49,15 +48,6 @@ constructor(
		protected val instrumentation: Instrumentation = InstrumentationRegistry.getInstrumentation(),
		protected val tapl: LauncherInstrumentation = LauncherInstrumentation()
		) {
		init {
		flicker.scenario.setIsTablet(
		WindowManagerStateHelper(instrumentation, clearCacheAfterParsing = false)
		.currentState
		.wmState
		.isTablet
		)
		}

		/** Specification of the test transition to execute */
		abstract val transition: FlickerBuilder.() -> Unit

		@@ -68,7 +58,7 @@ constructor(
		@FlickerBuilderProvider
		fun buildFlicker(): FlickerBuilder {
		return FlickerBuilder(instrumentation).apply {
		setup { flicker.scenario.setIsTablet(wmHelper.currentState.wmState.isTablet) }
		setup { flicker.scenario.setIsTablet(tapl.isTablet) }
		transition()
		}
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -120,7 +120,7 @@ class EnterPipToOtherOrientationTest(flicker: FlickerTest) : PipTransition(flick
		*/
		@Before
		fun setup() {
		Assume.assumeFalse(flicker.scenario.isTablet)
		Assume.assumeFalse(tapl.isTablet)
		}

		/**

+1 −1

Original line number	Diff line number	Diff line
		@@ -103,7 +103,7 @@ open class SetRequestedOrientationWhilePinnedTest(flicker: FlickerTest) : PipTra
		*/
		@Before
		fun setup() {
		Assume.assumeFalse(flicker.scenario.isTablet)
		Assume.assumeFalse(tapl.isTablet)
		}

		@Presubmit

+1 −1

Original line number	Diff line number	Diff line
		@@ -53,7 +53,7 @@ class EnterSplitScreenByDragFromShortcut(flicker: FlickerTest) : SplitScreenBase

		@Before
		fun before() {
		Assume.assumeTrue(flicker.scenario.isTablet)
		Assume.assumeTrue(tapl.isTablet)
		}

		override val transition: FlickerBuilder.() -> Unit

+0 −7

Original line number	Diff line number	Diff line
		@@ -23,7 +23,6 @@ import androidx.test.platform.app.InstrumentationRegistry
		import com.android.launcher3.tapl.LauncherInstrumentation
		import com.android.server.wm.flicker.junit.FlickerBuilderProvider
		import com.android.server.wm.traces.common.ComponentNameMatcher
		import com.android.server.wm.traces.parser.windowmanager.WindowManagerStateHelper
		import org.junit.Assume
		import org.junit.AssumptionViolatedException
		import org.junit.Test
		@@ -41,12 +40,6 @@ constructor(
		protected val tapl: LauncherInstrumentation = LauncherInstrumentation()
		) {
		init {
		flicker.scenario.setIsTablet(
		WindowManagerStateHelper(instrumentation, clearCacheAfterParsing = false)
		.currentState
		.wmState
		.isTablet
		)
		tapl.setExpectedRotationCheckEnabled(true)
		}