Merge "Use display information from layers trace on assertions" (edd0ff08) · Commits · e / os / android_frameworks_base

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

+2 −10

Original line number	Original line	Diff line number	Diff line
	@@ -20,13 +20,11 @@ import android.app.Instrumentation
	import android.content.Context		import android.content.Context
	import android.platform.test.annotations.Presubmit		import android.platform.test.annotations.Presubmit
	import android.system.helpers.ActivityHelper		import android.system.helpers.ActivityHelper
	import android.view.Surface
	import androidx.test.filters.FlakyTest		import androidx.test.filters.FlakyTest
	import androidx.test.platform.app.InstrumentationRegistry		import androidx.test.platform.app.InstrumentationRegistry
	import com.android.server.wm.flicker.FlickerBuilderProvider		import com.android.server.wm.flicker.FlickerBuilderProvider
	import com.android.server.wm.flicker.FlickerTestParameter		import com.android.server.wm.flicker.FlickerTestParameter
	import com.android.server.wm.flicker.dsl.FlickerBuilder		import com.android.server.wm.flicker.dsl.FlickerBuilder
	import com.android.server.wm.flicker.endRotation
	import com.android.server.wm.flicker.helpers.isRotated		import com.android.server.wm.flicker.helpers.isRotated
	import com.android.server.wm.flicker.helpers.setRotation		import com.android.server.wm.flicker.helpers.setRotation
	import com.android.server.wm.flicker.helpers.wakeUpAndGoToHomeScreen		import com.android.server.wm.flicker.helpers.wakeUpAndGoToHomeScreen
	@@ -179,15 +177,9 @@ abstract class AppPairsTransition(protected val testSpec: FlickerTestParameter)

	@Presubmit		@Presubmit
	@Test		@Test
	open fun navBarLayerRotatesAndScales() {		open fun navBarLayerRotatesAndScales() = testSpec.navBarLayerRotatesAndScales()
	testSpec.navBarLayerRotatesAndScales(Surface.ROTATION_0,
	testSpec.config.endRotation)
	}

	@Presubmit		@Presubmit
	@Test		@Test
	open fun statusBarLayerRotatesScales() {		open fun statusBarLayerRotatesScales() = testSpec.statusBarLayerRotatesScales()
	testSpec.statusBarLayerRotatesScales(Surface.ROTATION_0,
	testSpec.config.endRotation)
	}
	}		}
			No newline at end of file

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

+2 −4

Original line number	Original line	Diff line number	Diff line
	@@ -107,13 +107,11 @@ class LegacySplitScreenToLauncher(

	@Presubmit		@Presubmit
	@Test		@Test
	fun navBarLayerRotatesAndScales() =		fun navBarLayerRotatesAndScales() = testSpec.navBarLayerRotatesAndScales()
	testSpec.navBarLayerRotatesAndScales(testSpec.config.endRotation)

	@Presubmit		@Presubmit
	@Test		@Test
	fun statusBarLayerRotatesScales() =		fun statusBarLayerRotatesScales() = testSpec.statusBarLayerRotatesScales()
	testSpec.statusBarLayerRotatesScales(testSpec.config.endRotation)

	@Presubmit		@Presubmit
	@Test		@Test

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

+2 −5

Original line number	Original line	Diff line number	Diff line
	@@ -27,7 +27,6 @@ import com.android.server.wm.flicker.FlickerTestParameter
	import com.android.server.wm.flicker.FlickerTestParameterFactory		import com.android.server.wm.flicker.FlickerTestParameterFactory
	import com.android.server.wm.flicker.annotation.Group2		import com.android.server.wm.flicker.annotation.Group2
	import com.android.server.wm.flicker.dsl.FlickerBuilder		import com.android.server.wm.flicker.dsl.FlickerBuilder
	import com.android.server.wm.flicker.endRotation
	import com.android.server.wm.flicker.entireScreenCovered		import com.android.server.wm.flicker.entireScreenCovered
	import com.android.server.wm.flicker.helpers.ImeAppHelper		import com.android.server.wm.flicker.helpers.ImeAppHelper
	import com.android.server.wm.flicker.helpers.WindowUtils		import com.android.server.wm.flicker.helpers.WindowUtils
	@@ -133,12 +132,10 @@ class ResizeLegacySplitScreen(
	fun entireScreenCovered() = testSpec.entireScreenCovered()		fun entireScreenCovered() = testSpec.entireScreenCovered()

	@Test		@Test
	fun navBarLayerRotatesAndScales() =		fun navBarLayerRotatesAndScales() = testSpec.navBarLayerRotatesAndScales()
	testSpec.navBarLayerRotatesAndScales(testSpec.config.endRotation)

	@Test		@Test
	fun statusBarLayerRotatesScales() =		fun statusBarLayerRotatesScales() = testSpec.statusBarLayerRotatesScales()
	testSpec.statusBarLayerRotatesScales(testSpec.config.endRotation)

	@Test		@Test
	fun topAppLayerIsAlwaysVisible() {		fun topAppLayerIsAlwaysVisible() {

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

+2 −7

Original line number	Original line	Diff line number	Diff line
	@@ -25,7 +25,6 @@ import com.android.server.wm.flicker.FlickerTestParameter
	import com.android.server.wm.flicker.FlickerTestParameterFactory		import com.android.server.wm.flicker.FlickerTestParameterFactory
	import com.android.server.wm.flicker.annotation.Group2		import com.android.server.wm.flicker.annotation.Group2
	import com.android.server.wm.flicker.dsl.FlickerBuilder		import com.android.server.wm.flicker.dsl.FlickerBuilder
	import com.android.server.wm.flicker.endRotation
	import com.android.server.wm.flicker.helpers.launchSplitScreen		import com.android.server.wm.flicker.helpers.launchSplitScreen
	import com.android.server.wm.flicker.helpers.setRotation		import com.android.server.wm.flicker.helpers.setRotation
	import com.android.server.wm.flicker.navBarLayerRotatesAndScales		import com.android.server.wm.flicker.navBarLayerRotatesAndScales
	@@ -75,15 +74,11 @@ class RotateOneLaunchedAppAndEnterSplitScreen(

	@Presubmit		@Presubmit
	@Test		@Test
	fun navBarLayerRotatesAndScales() =		fun navBarLayerRotatesAndScales() = testSpec.navBarLayerRotatesAndScales()
	testSpec.navBarLayerRotatesAndScales(testSpec.config.startRotation,
	testSpec.config.endRotation)

	@Presubmit		@Presubmit
	@Test		@Test
	fun statusBarLayerRotatesScales() =		fun statusBarLayerRotatesScales() = testSpec.statusBarLayerRotatesScales()
	testSpec.statusBarLayerRotatesScales(testSpec.config.startRotation,
	testSpec.config.endRotation)

	@Presubmit		@Presubmit
	@Test		@Test

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

+2 −5

Original line number	Original line	Diff line number	Diff line
	@@ -25,7 +25,6 @@ import com.android.server.wm.flicker.FlickerTestParameter
	import com.android.server.wm.flicker.FlickerTestParameterFactory		import com.android.server.wm.flicker.FlickerTestParameterFactory
	import com.android.server.wm.flicker.annotation.Group2		import com.android.server.wm.flicker.annotation.Group2
	import com.android.server.wm.flicker.dsl.FlickerBuilder		import com.android.server.wm.flicker.dsl.FlickerBuilder
	import com.android.server.wm.flicker.endRotation
	import com.android.server.wm.flicker.helpers.launchSplitScreen		import com.android.server.wm.flicker.helpers.launchSplitScreen
	import com.android.server.wm.flicker.helpers.setRotation		import com.android.server.wm.flicker.helpers.setRotation
	import com.android.server.wm.flicker.navBarLayerRotatesAndScales		import com.android.server.wm.flicker.navBarLayerRotatesAndScales
	@@ -74,13 +73,11 @@ class RotateOneLaunchedAppInSplitScreenMode(

	@Presubmit		@Presubmit
	@Test		@Test
	fun navBarLayerRotatesAndScales() = testSpec.navBarLayerRotatesAndScales(		fun navBarLayerRotatesAndScales() = testSpec.navBarLayerRotatesAndScales()
	testSpec.config.startRotation, testSpec.config.endRotation)

	@Presubmit		@Presubmit
	@Test		@Test
	fun statusBarLayerRotatesScales() = testSpec.statusBarLayerRotatesScales(		fun statusBarLayerRotatesScales() = testSpec.statusBarLayerRotatesScales()
	testSpec.config.startRotation, testSpec.config.endRotation)

	@Presubmit		@Presubmit
	@Test		@Test