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

Commit 428d8c48 authored Aug 15, 2023 by Treehugger Robot Committed by Automerger Merge Worker Aug 15, 2023

Merge "Include AE Flicker tests to be tracked" into udc-qpr-dev am: a66a05ab

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24326122

Change-Id: I95a2deac67c5ac42b0b113e9e9c55fbddcbcfc8c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents cd5522b6 a66a05ab

tests/FlickerTests/Android.bp

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -39,7 +39,11 @@ filegroup {
	"src/*/activityembedding/.kt",		"src/*/activityembedding/.kt",
	"src/*/activityembedding/open/.kt",		"src/*/activityembedding/open/.kt",
	"src/*/activityembedding/close/.kt",		"src/*/activityembedding/close/.kt",
			"src/*/activityembedding/layoutchange/.kt",
			"src/*/activityembedding/pip/.kt",
	"src/*/activityembedding/rotation/.kt",		"src/*/activityembedding/rotation/.kt",
			"src/*/activityembedding/rtl/.kt",
			"src/*/activityembedding/splitscreen/.kt",
	],		],
	}		}

tests/FlickerTests/src/com/android/server/wm/flicker/activityembedding/close/CloseSecondaryActivityInSplitTest.kt

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -38,7 +38,7 @@ import org.junit.runners.Parameterized
	* Setup: Launch A\|B in split with B being the secondary activity. Transitions: Finish B and expect		* Setup: Launch A\|B in split with B being the secondary activity. Transitions: Finish B and expect
	* A to become fullscreen.		* A to become fullscreen.
	*		*
	* To run this test: `atest FlickerTests:CloseSecondaryActivityInSplitTest`		* To run this test: `atest FlickerTestsOther:CloseSecondaryActivityInSplitTest`
	*/		*/
	@RequiresDevice		@RequiresDevice
	@RunWith(Parameterized::class)		@RunWith(Parameterized::class)

tests/FlickerTests/src/com/android/server/wm/flicker/activityembedding/layoutchange/HorizontalSplitChangeRatioTest.kt

+3 −2

Original line number	Original line	Diff line number	Diff line
	@@ -14,7 +14,7 @@
	* limitations under the License.		* limitations under the License.
	*/		*/

	package com.android.server.wm.flicker.activityembedding		package com.android.server.wm.flicker.activityembedding.layoutchange

	import android.platform.test.annotations.Presubmit		import android.platform.test.annotations.Presubmit
	import android.tools.common.datatypes.Rect		import android.tools.common.datatypes.Rect
	@@ -22,6 +22,7 @@ import android.tools.device.flicker.junit.FlickerParametersRunnerFactory
	import android.tools.device.flicker.legacy.FlickerBuilder		import android.tools.device.flicker.legacy.FlickerBuilder
	import android.tools.device.flicker.legacy.LegacyFlickerTest		import android.tools.device.flicker.legacy.LegacyFlickerTest
	import android.tools.device.flicker.legacy.LegacyFlickerTestFactory		import android.tools.device.flicker.legacy.LegacyFlickerTestFactory
			import com.android.server.wm.flicker.activityembedding.ActivityEmbeddingTestBase
	import com.android.server.wm.flicker.helpers.ActivityEmbeddingAppHelper		import com.android.server.wm.flicker.helpers.ActivityEmbeddingAppHelper
	import androidx.test.filters.RequiresDevice		import androidx.test.filters.RequiresDevice
	import org.junit.FixMethodOrder		import org.junit.FixMethodOrder
	@@ -38,7 +39,7 @@ import org.junit.runners.Parameterized
	* Transitions:		* Transitions:
	* Change the split ratio to A:B=0.7:0.3, expect bounds change for both A and B.		* Change the split ratio to A:B=0.7:0.3, expect bounds change for both A and B.
	*		*
	* To run this test: `atest FlickerTests:HorizontalSplitChangeRatioTest`		* To run this test: `atest FlickerTestsOther:HorizontalSplitChangeRatioTest`
	*/		*/
	@RequiresDevice		@RequiresDevice
	@RunWith(Parameterized::class)		@RunWith(Parameterized::class)

tests/FlickerTests/src/com/android/server/wm/flicker/activityembedding/open/MainActivityStartsSecondaryWithAlwaysExpandTest.kt

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -39,7 +39,7 @@ import org.junit.runners.Parameterized
	* Setup: Launch A\|B in split with B being the secondary activity. Transitions: A start C with		* Setup: Launch A\|B in split with B being the secondary activity. Transitions: A start C with
	* alwaysExpand=true, expect C to launch in fullscreen and cover split A\|B.		* alwaysExpand=true, expect C to launch in fullscreen and cover split A\|B.
	*		*
	* To run this test: `atest FlickerTests:MainActivityStartsSecondaryWithAlwaysExpandTest`		* To run this test: `atest FlickerTestsOther:MainActivityStartsSecondaryWithAlwaysExpandTest`
	*/		*/
	@RequiresDevice		@RequiresDevice
	@RunWith(Parameterized::class)		@RunWith(Parameterized::class)

tests/FlickerTests/src/com/android/server/wm/flicker/activityembedding/open/OpenActivityEmbeddingPlaceholderSplitTest.kt

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -34,7 +34,7 @@ import org.junit.runners.Parameterized
	* Test opening an activity that will launch another activity as ActivityEmbedding placeholder in		* Test opening an activity that will launch another activity as ActivityEmbedding placeholder in
	* split.		* split.
	*		*
	* To run this test: `atest FlickerTests:OpenActivityEmbeddingPlaceholderSplitTest`		* To run this test: `atest FlickerTestsOther:OpenActivityEmbeddingPlaceholderSplitTest`
	*/		*/
	@RequiresDevice		@RequiresDevice
	@RunWith(Parameterized::class)		@RunWith(Parameterized::class)