Merge "Add CheckFlagsRule to tests with `@RequiresFlags[Enabled|Disabled]`" into main (a72ede85) · Commits · e / os / android_frameworks_base

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

+2 −4

Original line number	Original line	Diff line number	Diff line
	@@ -18,7 +18,6 @@ package com.android.wm.shell.scenarios

	import android.app.Instrumentation		import android.app.Instrumentation
	import android.platform.test.annotations.RequiresFlagsEnabled		import android.platform.test.annotations.RequiresFlagsEnabled
	import android.platform.test.flag.junit.DeviceFlagsValueProvider
	import android.provider.Settings		import android.provider.Settings
	import android.tools.traces.parsers.WindowManagerStateHelper		import android.tools.traces.parsers.WindowManagerStateHelper
	import androidx.test.platform.app.InstrumentationRegistry		import androidx.test.platform.app.InstrumentationRegistry
	@@ -44,8 +43,7 @@ abstract class DisableDisplayMirroringSwitch : TestScenarioBase() {
	private val wmHelper = WindowManagerStateHelper(instrumentation)		private val wmHelper = WindowManagerStateHelper(instrumentation)
	private val tapl = LauncherInstrumentation()		private val tapl = LauncherInstrumentation()

	@get:Rule(order = 0) val checkFlagsRule = DeviceFlagsValueProvider.createCheckFlagsRule()		@get:Rule val connectedDisplayRule = SimulatedConnectedDisplayTestRule()
	@get:Rule(order = 1) val connectedDisplayRule = SimulatedConnectedDisplayTestRule()

	@Before		@Before
	fun setup() {		fun setup() {

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

+2 −4

Original line number	Original line	Diff line number	Diff line
	@@ -18,7 +18,6 @@ package com.android.wm.shell.scenarios

	import android.app.Instrumentation		import android.app.Instrumentation
	import android.platform.test.annotations.RequiresFlagsEnabled		import android.platform.test.annotations.RequiresFlagsEnabled
	import android.platform.test.flag.junit.DeviceFlagsValueProvider
	import android.provider.Settings		import android.provider.Settings
	import android.tools.traces.parsers.WindowManagerStateHelper		import android.tools.traces.parsers.WindowManagerStateHelper
	import androidx.test.platform.app.InstrumentationRegistry		import androidx.test.platform.app.InstrumentationRegistry
	@@ -44,8 +43,7 @@ abstract class EnableDisplayMirroringSwitch : TestScenarioBase() {
	private val wmHelper = WindowManagerStateHelper(instrumentation)		private val wmHelper = WindowManagerStateHelper(instrumentation)
	private val tapl = LauncherInstrumentation()		private val tapl = LauncherInstrumentation()

	@get:Rule(order = 0) val checkFlagsRule = DeviceFlagsValueProvider.createCheckFlagsRule()		@get:Rule val connectedDisplayRule = SimulatedConnectedDisplayTestRule()
	@get:Rule(order = 1) val connectedDisplayRule = SimulatedConnectedDisplayTestRule()

	@Before		@Before
	fun setup() {		fun setup() {

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

+1 −6

Original line number	Original line	Diff line number	Diff line
	@@ -18,7 +18,6 @@ package com.android.wm.shell.scenarios

	import android.app.Instrumentation		import android.app.Instrumentation
	import android.platform.test.annotations.RequiresFlagsEnabled		import android.platform.test.annotations.RequiresFlagsEnabled
	import android.platform.test.flag.junit.DeviceFlagsValueProvider
	import android.tools.Rotation		import android.tools.Rotation
	import android.tools.traces.parsers.WindowManagerStateHelper		import android.tools.traces.parsers.WindowManagerStateHelper
	import androidx.test.platform.app.InstrumentationRegistry		import androidx.test.platform.app.InstrumentationRegistry
	@@ -51,11 +50,7 @@ abstract class MaximizeAppWindowWithDragToTopDragZoneInDesktopFirst(
	private val device = UiDevice.getInstance(instrumentation)		private val device = UiDevice.getInstance(instrumentation)
	val testApp = DesktopModeAppHelper(SimpleAppHelper(instrumentation))		val testApp = DesktopModeAppHelper(SimpleAppHelper(instrumentation))

	@get:Rule(order = 0)		@get:Rule val connectedDisplayRule = SimulatedConnectedDisplayTestRule()
	val checkFlagsRule = DeviceFlagsValueProvider.createCheckFlagsRule()

	@get:Rule(order = 1)
	val connectedDisplayRule = SimulatedConnectedDisplayTestRule()

	@Before		@Before
	fun setup() {		fun setup() {

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

+1 −7

Original line number	Original line	Diff line number	Diff line
	@@ -17,12 +17,10 @@
	package com.android.wm.shell.scenarios		package com.android.wm.shell.scenarios

	import android.app.Instrumentation		import android.app.Instrumentation
	import android.platform.test.flag.junit.DeviceFlagsValueProvider
	import android.tools.Rotation		import android.tools.Rotation
	import android.tools.traces.parsers.WindowManagerStateHelper		import android.tools.traces.parsers.WindowManagerStateHelper
	import android.window.DesktopExperienceFlags		import android.window.DesktopExperienceFlags
	import androidx.test.platform.app.InstrumentationRegistry		import androidx.test.platform.app.InstrumentationRegistry
	import com.android.launcher3.tapl.LauncherInstrumentation
	import com.android.server.wm.flicker.helpers.DesktopModeAppHelper		import com.android.server.wm.flicker.helpers.DesktopModeAppHelper
	import com.android.server.wm.flicker.helpers.SimpleAppHelper		import com.android.server.wm.flicker.helpers.SimpleAppHelper
	import com.android.wm.shell.ExtendedDisplaySettingsSession		import com.android.wm.shell.ExtendedDisplaySettingsSession
	@@ -48,11 +46,7 @@ constructor(private val rotation: Rotation = Rotation.ROTATION_0) : TestScenario
	private val extendedDisplaySettingsSession =		private val extendedDisplaySettingsSession =
	ExtendedDisplaySettingsSession(instrumentation.context.contentResolver)		ExtendedDisplaySettingsSession(instrumentation.context.contentResolver)

	@get:Rule(order = 0)		@get:Rule val connectedDisplayRule = SimulatedConnectedDisplayTestRule()
	val checkFlagsRule = DeviceFlagsValueProvider.createCheckFlagsRule()

	@get:Rule(order = 1)
	val connectedDisplayRule = SimulatedConnectedDisplayTestRule()

	@Before		@Before
	fun setup() {		fun setup() {

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

+1 −3

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

	import android.platform.test.annotations.RequiresFlagsEnabled		import android.platform.test.annotations.RequiresFlagsEnabled
	import android.platform.test.flag.junit.DeviceFlagsValueProvider
	import com.android.window.flags.Flags		import com.android.window.flags.Flags
	import org.junit.After		import org.junit.After
	import org.junit.Assume.assumeTrue		import org.junit.Assume.assumeTrue
	@@ -38,8 +37,7 @@ abstract class RestartAppInDesktopMode(
	isLandscapeApp: Boolean = true,		isLandscapeApp: Boolean = true,
	) : DesktopScenarioCustomAppTestBase(isResizable, isLandscapeApp) {		) : DesktopScenarioCustomAppTestBase(isResizable, isLandscapeApp) {

	@get:Rule(order = 0) val checkFlagsRule = DeviceFlagsValueProvider.createCheckFlagsRule()		@get:Rule val connectedDisplayRule = SimulatedConnectedDisplayTestRule()
	@get:Rule(order = 1) val connectedDisplayRule = SimulatedConnectedDisplayTestRule()

	@Before		@Before
	fun setup() {		fun setup() {