Merge "Split split screen module for trunk stable SLO" into main (4722d8f6) · Commits · e / os / android_frameworks_base

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

+37 −5

Original line number	Original line	Diff line number	Diff line
	@@ -44,13 +44,26 @@ filegroup {
	}		}

	filegroup {		filegroup {
	name: "WMShellFlickerTestsSplitScreen-src",		name: "WMShellFlickerTestsSplitScreenBase-src",
	srcs: [		srcs: [
	"src/com/android/wm/shell/flicker/splitscreen/*.kt",
	"src/com/android/wm/shell/flicker/splitscreen/benchmark/*.kt",		"src/com/android/wm/shell/flicker/splitscreen/benchmark/*.kt",
	],		],
	}		}

			filegroup {
			name: "WMShellFlickerTestsSplitScreenEnter-src",
			srcs: [
			"src/com/android/wm/shell/flicker/splitscreen/Enter*.kt",
			],
			}

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

	filegroup {		filegroup {
	name: "WMShellFlickerServiceTests-src",		name: "WMShellFlickerServiceTests-src",
	srcs: [		srcs: [
	@@ -122,7 +135,9 @@ android_test {
	exclude_srcs: [		exclude_srcs: [
	":WMShellFlickerTestsBubbles-src",		":WMShellFlickerTestsBubbles-src",
	":WMShellFlickerTestsPip-src",		":WMShellFlickerTestsPip-src",
	":WMShellFlickerTestsSplitScreen-src",		":WMShellFlickerTestsSplitScreenEnter-src",
			":WMShellFlickerTestsSplitScreenOther-src",
			":WMShellFlickerTestsSplitScreenBase-src",
	":WMShellFlickerServiceTests-src",		":WMShellFlickerServiceTests-src",
	],		],
	}		}
	@@ -152,14 +167,31 @@ android_test {
	}		}

	android_test {		android_test {
	name: "WMShellFlickerTestsSplitScreen",		name: "WMShellFlickerTestsSplitScreenEnter",
	defaults: ["WMShellFlickerTestsDefault"],		defaults: ["WMShellFlickerTestsDefault"],
	additional_manifests: ["manifests/AndroidManifestSplitScreen.xml"],		additional_manifests: ["manifests/AndroidManifestSplitScreen.xml"],
	package_name: "com.android.wm.shell.flicker.splitscreen",		package_name: "com.android.wm.shell.flicker.splitscreen",
	instrumentation_target_package: "com.android.wm.shell.flicker.splitscreen",		instrumentation_target_package: "com.android.wm.shell.flicker.splitscreen",
	srcs: [		srcs: [
	":WMShellFlickerTestsBase-src",		":WMShellFlickerTestsBase-src",
	":WMShellFlickerTestsSplitScreen-src",		":WMShellFlickerTestsSplitScreenBase-src",
			":WMShellFlickerTestsSplitScreenEnter-src",
			],
			}

			android_test {
			name: "WMShellFlickerTestsSplitScreenOther",
			defaults: ["WMShellFlickerTestsDefault"],
			additional_manifests: ["manifests/AndroidManifestSplitScreen.xml"],
			package_name: "com.android.wm.shell.flicker.splitscreen",
			instrumentation_target_package: "com.android.wm.shell.flicker.splitscreen",
			srcs: [
			":WMShellFlickerTestsBase-src",
			":WMShellFlickerTestsSplitScreenBase-src",
			":WMShellFlickerTestsSplitScreenOther-src",
			],
			exclude_srcs: [
			":WMShellFlickerTestsSplitScreenEnter-src",
	],		],
	}		}

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/splitscreen/benchmark/CopyContentInSplitBenchmark.kt

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -22,7 +22,6 @@ 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 androidx.test.filters.RequiresDevice		import androidx.test.filters.RequiresDevice
	import com.android.wm.shell.flicker.splitscreen.SplitScreenBase
	import com.android.wm.shell.flicker.utils.SplitScreenUtils		import com.android.wm.shell.flicker.utils.SplitScreenUtils
	import org.junit.FixMethodOrder		import org.junit.FixMethodOrder
	import org.junit.runner.RunWith		import org.junit.runner.RunWith

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/splitscreen/benchmark/DismissSplitScreenByDividerBenchmark.kt

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -21,7 +21,6 @@ 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 androidx.test.filters.RequiresDevice		import androidx.test.filters.RequiresDevice
	import com.android.wm.shell.flicker.splitscreen.SplitScreenBase
	import com.android.wm.shell.flicker.utils.SplitScreenUtils		import com.android.wm.shell.flicker.utils.SplitScreenUtils
	import org.junit.FixMethodOrder		import org.junit.FixMethodOrder
	import org.junit.runner.RunWith		import org.junit.runner.RunWith

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/splitscreen/benchmark/DismissSplitScreenByGoHomeBenchmark.kt

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -21,7 +21,6 @@ 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 androidx.test.filters.RequiresDevice		import androidx.test.filters.RequiresDevice
	import com.android.wm.shell.flicker.splitscreen.SplitScreenBase
	import com.android.wm.shell.flicker.utils.SplitScreenUtils		import com.android.wm.shell.flicker.utils.SplitScreenUtils
	import org.junit.FixMethodOrder		import org.junit.FixMethodOrder
	import org.junit.runner.RunWith		import org.junit.runner.RunWith

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/splitscreen/benchmark/DragDividerToResizeBenchmark.kt

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -21,7 +21,6 @@ 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 androidx.test.filters.RequiresDevice		import androidx.test.filters.RequiresDevice
	import com.android.wm.shell.flicker.splitscreen.SplitScreenBase
	import com.android.wm.shell.flicker.utils.SplitScreenUtils		import com.android.wm.shell.flicker.utils.SplitScreenUtils
	import org.junit.Assume		import org.junit.Assume
	import org.junit.Before		import org.junit.Before