Merge "Reorganize PiP flicker code, move apps tests to new target" into main (4a983ac1) · Commits · e / os / android_frameworks_base

libs/WindowManager/Shell/tests/flicker/Android.bp

+26 −0

Original line number	Diff line number	Diff line
		@@ -43,6 +43,16 @@ filegroup {
		srcs: ["src/com/android/wm/shell/flicker/pip/*.kt"],
		}

		filegroup {
		name: "WMShellFlickerTestsPipCommon-src",
		srcs: ["src/com/android/wm/shell/flicker/pip/common/*.kt"],
		}

		filegroup {
		name: "WMShellFlickerTestsPipApps-src",
		srcs: ["src/com/android/wm/shell/flicker/pip/apps/*.kt"],
		}

		filegroup {
		name: "WMShellFlickerTestsSplitScreenBase-src",
		srcs: [
		@@ -152,6 +162,8 @@ android_test {
		exclude_srcs: [
		":WMShellFlickerTestsBubbles-src",
		":WMShellFlickerTestsPip-src",
		":WMShellFlickerTestsPipCommon-src",
		":WMShellFlickerTestsPipApps-src",
		":WMShellFlickerTestsSplitScreenGroup1-src",
		":WMShellFlickerTestsSplitScreenGroup2-src",
		":WMShellFlickerTestsSplitScreenBase-src",
		@@ -181,6 +193,20 @@ android_test {
		srcs: [
		":WMShellFlickerTestsBase-src",
		":WMShellFlickerTestsPip-src",
		":WMShellFlickerTestsPipCommon-src",
		],
		}

		android_test {
		name: "WMShellFlickerTestsPipApps",
		defaults: ["WMShellFlickerTestsDefault"],
		additional_manifests: ["manifests/AndroidManifestPip.xml"],
		package_name: "com.android.wm.shell.flicker.pip.apps",
		instrumentation_target_package: "com.android.wm.shell.flicker.pip.apps",
		srcs: [
		":WMShellFlickerTestsBase-src",
		":WMShellFlickerTestsPipApps-src",
		":WMShellFlickerTestsPipCommon-src",
		],
		}

+2 −2

Original line number	Diff line number	Diff line
		@@ -60,9 +60,9 @@
		<!-- Enable mocking GPS location by the test app -->
		<target_preparer class="com.android.tradefed.targetprep.RunCommandTargetPreparer">
		<option name="run-command"
		value="appops set com.android.wm.shell.flicker.pip android:mock_location allow"/>
		value="appops set com.android.wm.shell.flicker.pip.apps android:mock_location allow"/>
		<option name="teardown-command"
		value="appops set com.android.wm.shell.flicker.pip android:mock_location deny"/>
		value="appops set com.android.wm.shell.flicker.pip.apps android:mock_location deny"/>
		</target_preparer>

		<!-- Needed for pushing the trace config file -->

+1 −0

Original line number	Diff line number	Diff line
		@@ -21,6 +21,7 @@ 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.LegacyFlickerTest
		import com.android.wm.shell.flicker.pip.common.ClosePipTransition
		import org.junit.FixMethodOrder
		import org.junit.Test
		import org.junit.runner.RunWith

+1 −0

Original line number	Diff line number	Diff line
		@@ -20,6 +20,7 @@ import android.platform.test.annotations.Presubmit
		import android.tools.device.flicker.junit.FlickerParametersRunnerFactory
		import android.tools.device.flicker.legacy.FlickerBuilder
		import android.tools.device.flicker.legacy.LegacyFlickerTest
		import com.android.wm.shell.flicker.pip.common.ClosePipTransition
		import org.junit.FixMethodOrder
		import org.junit.Test
		import org.junit.runner.RunWith

+1 −0

Original line number	Diff line number	Diff line
		@@ -20,6 +20,7 @@ import android.platform.test.annotations.Presubmit
		import android.tools.device.flicker.junit.FlickerParametersRunnerFactory
		import android.tools.device.flicker.legacy.FlickerBuilder
		import android.tools.device.flicker.legacy.LegacyFlickerTest
		import com.android.wm.shell.flicker.pip.common.EnterPipTransition
		import org.junit.Assume
		import org.junit.FixMethodOrder
		import org.junit.Test