Merge "Remove circular dependency between datatypes and traces package" into udc-dev am: 4dd6a96568 (13b6f856) · Commits · e / os / android_frameworks_base

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

+1 −1

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

	import android.app.Instrumentation		import android.app.Instrumentation
	import android.platform.test.annotations.Presubmit		import android.platform.test.annotations.Presubmit
	import android.tools.common.datatypes.component.ComponentNameMatcher		import android.tools.common.traces.component.ComponentNameMatcher
	import android.tools.device.flicker.junit.FlickerBuilderProvider		import android.tools.device.flicker.junit.FlickerBuilderProvider
	import android.tools.device.flicker.legacy.FlickerBuilder		import android.tools.device.flicker.legacy.FlickerBuilder
	import android.tools.device.flicker.legacy.FlickerTest		import android.tools.device.flicker.legacy.FlickerTest

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

+6 −6

Original line number	Original line	Diff line number	Diff line
	@@ -20,9 +20,9 @@ package com.android.wm.shell.flicker

	import android.tools.common.Rotation		import android.tools.common.Rotation
	import android.tools.common.datatypes.Region		import android.tools.common.datatypes.Region
	import android.tools.common.datatypes.component.IComponentMatcher
	import android.tools.common.flicker.subject.layers.LayerTraceEntrySubject		import android.tools.common.flicker.subject.layers.LayerTraceEntrySubject
	import android.tools.common.flicker.subject.layers.LayersTraceSubject		import android.tools.common.flicker.subject.layers.LayersTraceSubject
			import android.tools.common.traces.component.IComponentMatcher
	import android.tools.device.flicker.legacy.FlickerTest		import android.tools.device.flicker.legacy.FlickerTest
	import android.tools.device.helpers.WindowUtils		import android.tools.device.helpers.WindowUtils

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

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -18,7 +18,7 @@

	package com.android.wm.shell.flicker		package com.android.wm.shell.flicker

	import android.tools.common.datatypes.component.ComponentNameMatcher		import android.tools.common.traces.component.ComponentNameMatcher

	const val SYSTEM_UI_PACKAGE_NAME = "com.android.systemui"		const val SYSTEM_UI_PACKAGE_NAME = "com.android.systemui"
	const val LAUNCHER_UI_PACKAGE_NAME = "com.google.android.apps.nexuslauncher"		const val LAUNCHER_UI_PACKAGE_NAME = "com.google.android.apps.nexuslauncher"

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

+5 −5

Original line number	Original line	Diff line number	Diff line
	@@ -20,11 +20,11 @@ import android.content.Context
	import android.system.helpers.CommandsHelper		import android.system.helpers.CommandsHelper
	import android.tools.device.flicker.legacy.FlickerBuilder		import android.tools.device.flicker.legacy.FlickerBuilder
	import android.tools.device.flicker.legacy.FlickerTest		import android.tools.device.flicker.legacy.FlickerTest
	import com.android.wm.shell.flicker.BaseTest
	import com.android.server.wm.flicker.helpers.setRotation
	import com.android.server.wm.flicker.helpers.LetterboxAppHelper
	import android.tools.device.flicker.legacy.FlickerTestFactory		import android.tools.device.flicker.legacy.FlickerTestFactory
	import android.tools.device.flicker.legacy.IFlickerTestData		import android.tools.device.flicker.legacy.IFlickerTestData
			import com.android.server.wm.flicker.helpers.LetterboxAppHelper
			import com.android.server.wm.flicker.helpers.setRotation
			import com.android.wm.shell.flicker.BaseTest
	import com.android.wm.shell.flicker.appWindowIsVisibleAtEnd		import com.android.wm.shell.flicker.appWindowIsVisibleAtEnd
	import com.android.wm.shell.flicker.appWindowIsVisibleAtStart		import com.android.wm.shell.flicker.appWindowIsVisibleAtStart
	import org.junit.Assume		import org.junit.Assume
	@@ -104,8 +104,8 @@ abstract class BaseAppCompat(flicker: FlickerTest) : BaseTest(flicker) {
	/**		/**
	* Creates the test configurations.		* Creates the test configurations.
	*		*
	* See [FlickerTestFactory.rotationTests] for configuring screen orientation and		* See [FlickerTestFactory.rotationTests] for configuring screen orientation and navigation
	* navigation modes.		* modes.
	*/		*/
	@Parameterized.Parameters(name = "{0}")		@Parameterized.Parameters(name = "{0}")
	@JvmStatic		@JvmStatic

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

+5 −5

Original line number	Original line	Diff line number	Diff line
	@@ -17,11 +17,11 @@
	package com.android.wm.shell.flicker.appcompat		package com.android.wm.shell.flicker.appcompat

	import android.platform.test.annotations.Postsubmit		import android.platform.test.annotations.Postsubmit
	import androidx.test.filters.RequiresDevice		import android.tools.common.traces.component.ComponentNameMatcher
			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.FlickerTest		import android.tools.device.flicker.legacy.FlickerTest
	import android.tools.device.flicker.junit.FlickerParametersRunnerFactory		import androidx.test.filters.RequiresDevice
	import android.tools.common.datatypes.component.ComponentNameMatcher
	import org.junit.Test		import org.junit.Test
	import org.junit.runner.RunWith		import org.junit.runner.RunWith
	import org.junit.runners.Parameterized		import org.junit.runners.Parameterized
	@@ -35,13 +35,13 @@ import org.junit.runners.Parameterized
	* ```		* ```
	* Rotate non resizable portrait only app to opposite orientation to trigger size compat mode		* Rotate non resizable portrait only app to opposite orientation to trigger size compat mode
	* ```		* ```
			*
	* Notes:		* Notes:
	* ```		* ```
	* Some default assertions (e.g., nav bar, status bar and screen covered)		* Some default assertions (e.g., nav bar, status bar and screen covered)
	* are inherited [BaseTest]		* are inherited [BaseTest]
	* ```		* ```
	*/		*/

	@RequiresDevice		@RequiresDevice
	@RunWith(Parameterized::class)		@RunWith(Parameterized::class)
	@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)		@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)