Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5f36f4b8 authored Aug 24, 2021 by Nataniel Borges

Use display information from layers trace on assertions

Displays were added to the SF trace. Parse them on flicker and use during entireScreenCovered assertion instead of estimating coordinates based on the screen rotation.

Bug: 188792659
Test: atest FlickerTests
Change-Id: I5e01979e17a28a8ff83814bc43bf6ed91b5626a8

parent 5dc64f79

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

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -104,7 +104,7 @@ class LegacySplitScreenToLauncher(

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

	@Presubmit		@Presubmit
	@Test		@Test

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

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -28,7 +28,6 @@ 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.entireScreenCovered		import com.android.server.wm.flicker.entireScreenCovered
	import com.android.server.wm.flicker.helpers.launchSplitScreen		import com.android.server.wm.flicker.helpers.launchSplitScreen
	import com.android.server.wm.flicker.startRotation
	import com.android.server.wm.flicker.statusBarLayerIsVisible		import com.android.server.wm.flicker.statusBarLayerIsVisible
	import com.android.server.wm.traces.parser.windowmanager.WindowManagerStateHelper		import com.android.server.wm.traces.parser.windowmanager.WindowManagerStateHelper
	import com.android.wm.shell.flicker.appPairsDividerBecomesVisible		import com.android.wm.shell.flicker.appPairsDividerBecomesVisible
	@@ -77,7 +76,7 @@ class OpenAppToLegacySplitScreen(

	@Presubmit		@Presubmit
	@Test		@Test
	fun entireScreenCovered() = testSpec.entireScreenCovered(testSpec.config.startRotation)		fun entireScreenCovered() = testSpec.entireScreenCovered()

	@Presubmit		@Presubmit
	@Test		@Test

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

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -129,7 +129,7 @@ class ResizeLegacySplitScreen(
	fun statusBarLayerIsVisible() = testSpec.statusBarLayerIsVisible()		fun statusBarLayerIsVisible() = testSpec.statusBarLayerIsVisible()

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

	@Test		@Test
	fun navBarLayerRotatesAndScales() =		fun navBarLayerRotatesAndScales() =

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

+3 −2

Original line number	Original line	Diff line number	Diff line
	@@ -126,11 +126,12 @@ class EnterPipToOtherOrientationTest(

	/**		/**
	* Checks that all parts of the screen are covered at the start and end of the transition		* Checks that all parts of the screen are covered at the start and end of the transition
			*
			* TODO b/197726599 Prevents all states from being checked
	*/		*/
	@Presubmit		@Presubmit
	@Test		@Test
	override fun entireScreenCovered() =		override fun entireScreenCovered() = testSpec.entireScreenCovered(allStates = false)
	testSpec.entireScreenCovered(Surface.ROTATION_90, Surface.ROTATION_0, allStates = false)

	/**		/**
	* Checks [pipApp] window remains visible and on top throughout the transition		* Checks [pipApp] window remains visible and on top throughout the transition

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

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -88,8 +88,7 @@ class PipRotationTest(testSpec: FlickerTestParameter) : PipTransition(testSpec)
	*/		*/
	@Presubmit		@Presubmit
	@Test		@Test
	override fun entireScreenCovered() = testSpec.entireScreenCovered(testSpec.config.startRotation,		override fun entireScreenCovered() = testSpec.entireScreenCovered()
	testSpec.config.endRotation, allStates = false)

	/**		/**
	* Checks the position of the navigation bar at the start and end of the transition		* Checks the position of the navigation bar at the start and end of the transition