Format files (cbbb1133) · Commits · e / os / android_frameworks_base

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

+1 −4

Original line number	Diff line number	Diff line
		@@ -28,7 +28,6 @@ import com.android.wm.shell.flicker.appWindowIsVisibleAtEnd
		import com.android.wm.shell.flicker.appWindowIsVisibleAtStart
		import com.android.wm.shell.flicker.appWindowKeepVisible
		import com.android.wm.shell.flicker.layerKeepVisible

		import org.junit.Assume
		import org.junit.Before
		import org.junit.Rule
		@@ -37,9 +36,7 @@ abstract class BaseAppCompat(flicker: LegacyFlickerTest) : BaseTest(flicker) {
		protected val context: Context = instrumentation.context
		protected val letterboxApp = LetterboxAppHelper(instrumentation)

		@JvmField
		@Rule
		val letterboxRule: LetterboxRule = LetterboxRule()
		@JvmField @Rule val letterboxRule: LetterboxRule = LetterboxRule()

		/** {@inheritDoc} */
		override val transition: FlickerBuilder.() -> Unit

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

+15 −17

Original line number	Diff line number	Diff line
		@@ -23,9 +23,7 @@ import org.junit.rules.TestRule
		import org.junit.runner.Description
		import org.junit.runners.model.Statement

		/**
		* JUnit Rule to handle letterboxStyles and states
		*/
		/** JUnit Rule to handle letterboxStyles and states */
		class LetterboxRule(
		private val withLetterboxEducationEnabled: Boolean = false,
		private val instrumentation: Instrumentation = InstrumentationRegistry.getInstrumentation(),
		@@ -62,8 +60,7 @@ class LetterboxRule(
		var hasLetterboxEducationStateChanged = false
		if ("$withLetterboxEducationEnabled" != isLetterboxEducationEnabled) {
		hasLetterboxEducationStateChanged = true
		execAdb("wm set-letterbox-style --isEducationEnabled " +
		withLetterboxEducationEnabled)
		execAdb("wm set-letterbox-style --isEducationEnabled " + withLetterboxEducationEnabled)
		}
		return try {
		object : Statement() {
		@@ -74,8 +71,8 @@ class LetterboxRule(
		}
		} finally {
		if (hasLetterboxEducationStateChanged) {
		execAdb("wm set-letterbox-style --isEducationEnabled " +
		isLetterboxEducationEnabled
		execAdb(
		"wm set-letterbox-style --isEducationEnabled " + isLetterboxEducationEnabled
		)
		}
		resetLetterboxStyle()
		@@ -100,7 +97,8 @@ class LetterboxRule(
		execAdb("wm reset-letterbox-style")
		}

		private fun asInt(str: String?): Int? = try {
		private fun asInt(str: String?): Int? =
		try {
		str?.toInt()
		} catch (e: NumberFormatException) {
		null

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

+11 −22

Original line number	Diff line number	Diff line
		@@ -54,9 +54,7 @@ class OpenTransparentActivityTest(flicker: LegacyFlickerTest) : TransparentBaseA
		/** {@inheritDoc} */
		override val transition: FlickerBuilder.() -> Unit
		get() = {
		setup {
		letterboxTranslucentLauncherApp.launchViaIntent(wmHelper)
		}
		setup { letterboxTranslucentLauncherApp.launchViaIntent(wmHelper) }
		transitions {
		waitAndGetLaunchTransparent()?.click() ?: error("Launch Transparent not found")
		}
		@@ -66,9 +64,7 @@ class OpenTransparentActivityTest(flicker: LegacyFlickerTest) : TransparentBaseA
		}
		}

		/**
		* Checks the transparent activity is launched on top of the opaque one
		*/
		/** Checks the transparent activity is launched on top of the opaque one */
		@Postsubmit
		@Test
		fun translucentActivityIsLaunchedOnTopOfOpaqueActivity() {
		@@ -79,18 +75,14 @@ class OpenTransparentActivityTest(flicker: LegacyFlickerTest) : TransparentBaseA
		}
		}

		/**
		* Checks that the activity is letterboxed
		*/
		/** Checks that the activity is letterboxed */
		@Postsubmit
		@Test
		fun translucentActivityIsLetterboxed() {
		flicker.assertLayers { isVisible(ComponentNameMatcher.LETTERBOX) }
		}

		/**
		* Checks that the translucent activity inherits bounds from the opaque one.
		*/
		/** Checks that the translucent activity inherits bounds from the opaque one. */
		@Postsubmit
		@Test
		fun translucentActivityInheritsBoundsFromOpaqueActivity() {
		@@ -100,29 +92,26 @@ class OpenTransparentActivityTest(flicker: LegacyFlickerTest) : TransparentBaseA
		}
		}

		/**
		* Checks that the translucent activity has rounded corners
		*/
		/** Checks that the translucent activity has rounded corners */
		@Postsubmit
		@Test
		fun translucentActivityHasRoundedCorners() {
		flicker.assertLayersEnd {
		this.hasRoundedCorners(letterboxTranslucentApp)
		}
		flicker.assertLayersEnd { this.hasRoundedCorners(letterboxTranslucentApp) }
		}

		companion object {
		/**
		* Creates the test configurations.
		*
		* See [FlickerTestFactory.rotationTests] for configuring screen orientation and
		* navigation modes.
		* See [FlickerTestFactory.rotationTests] for configuring screen orientation and navigation
		* modes.
		*/
		@Parameterized.Parameters(name = "{0}")
		@JvmStatic
		fun getParams(): Collection<FlickerTest> {
		return LegacyFlickerTestFactory
		.nonRotationTests(supportedRotations = listOf(Rotation.ROTATION_90))
		return LegacyFlickerTestFactory.nonRotationTests(
		supportedRotations = listOf(Rotation.ROTATION_90)
		)
		}
		}
		}

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

+1 −2

Original line number	Diff line number	Diff line
		@@ -49,8 +49,7 @@ import org.junit.runners.Parameterized
		@RunWith(Parameterized::class)
		@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)
		@FixMethodOrder(MethodSorters.NAME_ASCENDING)
		class QuickSwitchLauncherToLetterboxAppTest(flicker: LegacyFlickerTest) :
		BaseAppCompat(flicker) {
		class QuickSwitchLauncherToLetterboxAppTest(flicker: LegacyFlickerTest) : BaseAppCompat(flicker) {

		/** {@inheritDoc} */
		override val transition: FlickerBuilder.() -> Unit = {

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

+14 −17

Original line number	Diff line number	Diff line
		@@ -33,20 +33,20 @@ import org.junit.Rule

		abstract class TransparentBaseAppCompat(flicker: LegacyFlickerTest) : BaseTest(flicker) {
		protected val context: Context = instrumentation.context
		protected val letterboxTranslucentLauncherApp = LetterboxAppHelper(
		protected val letterboxTranslucentLauncherApp =
		LetterboxAppHelper(
		instrumentation,
		launcherName = ActivityOptions.LaunchTransparentActivity.LABEL,
		component = ActivityOptions.LaunchTransparentActivity.COMPONENT.toFlickerComponent()
		)
		protected val letterboxTranslucentApp = LetterboxAppHelper(
		protected val letterboxTranslucentApp =
		LetterboxAppHelper(
		instrumentation,
		launcherName = ActivityOptions.TransparentActivity.LABEL,
		component = ActivityOptions.TransparentActivity.COMPONENT.toFlickerComponent()
		)

		@JvmField
		@Rule
		val letterboxRule: LetterboxRule = LetterboxRule()
		@JvmField @Rule val letterboxRule: LetterboxRule = LetterboxRule()

		@Before
		fun before() {
		@@ -54,10 +54,7 @@ abstract class TransparentBaseAppCompat(flicker: LegacyFlickerTest) : BaseTest(f
		}

		protected fun FlickerTestData.waitAndGetLaunchTransparent(): UiObject2? =
		device.wait(
		Until.findObject(By.text("Launch Transparent")),
		FIND_TIMEOUT
		)
		device.wait(Until.findObject(By.text("Launch Transparent")), FIND_TIMEOUT)

		protected fun FlickerTestData.goBack() = device.pressBack()
		}