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

Commit 21bde0b1 authored Nov 01, 2022 by TreeHugger Robot Committed by Android (Google) Code Review Nov 01, 2022

Merge "Add CUJ for quick switch between two split-pairs"

parents 8643a61f 91281762

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

+1 −0

Original line number	Diff line number	Diff line
		@@ -21,6 +21,7 @@ package com.android.wm.shell.flicker
		import com.android.server.wm.traces.common.ComponentNameMatcher

		const val SYSTEM_UI_PACKAGE_NAME = "com.android.systemui"
		const val LAUNCHER_UI_PACKAGE_NAME = "com.google.android.apps.nexuslauncher"
		val APP_PAIR_SPLIT_DIVIDER_COMPONENT = ComponentNameMatcher("", "AppPairSplitDivider#")
		val DOCKED_STACK_DIVIDER_COMPONENT = ComponentNameMatcher("", "DockedStackDivider#")
		val SPLIT_SCREEN_DIVIDER_COMPONENT = ComponentNameMatcher("", "StageCoordinatorSplitDivider#")

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -53,7 +53,7 @@ class CopyContentInSplit(testSpec: FlickerTestParameter) : SplitScreenBase(testS
		override val transition: FlickerBuilder.() -> Unit
		get() = {
		super.transition(this)
		setup { SplitScreenUtils.enterSplit(wmHelper, tapl, primaryApp, textEditApp) }
		setup { SplitScreenUtils.enterSplit(wmHelper, tapl, device, primaryApp, textEditApp) }
		transitions {
		SplitScreenUtils.copyContentInSplit(
		instrumentation,

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -55,7 +55,7 @@ class DismissSplitScreenByDivider (testSpec: FlickerTestParameter) : SplitScreen
		get() = {
		super.transition(this)
		setup {
		SplitScreenUtils.enterSplit(wmHelper, tapl, primaryApp, secondaryApp)
		SplitScreenUtils.enterSplit(wmHelper, tapl, device, primaryApp, secondaryApp)
		}
		transitions {
		if (tapl.isTablet) {

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -52,7 +52,7 @@ class DismissSplitScreenByGoHome(
		get() = {
		super.transition(this)
		setup {
		SplitScreenUtils.enterSplit(wmHelper, tapl, primaryApp, secondaryApp)
		SplitScreenUtils.enterSplit(wmHelper, tapl, device, primaryApp, secondaryApp)
		}
		transitions {
		tapl.goHome()

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -56,7 +56,7 @@ class DragDividerToResize(testSpec: FlickerTestParameter) : SplitScreenBase(test
		get() = {
		super.transition(this)
		setup {
		SplitScreenUtils.enterSplit(wmHelper, tapl, primaryApp, secondaryApp)
		SplitScreenUtils.enterSplit(wmHelper, tapl, device, primaryApp, secondaryApp)
		}
		transitions {
		SplitScreenUtils.dragDividerToResizeAndWait(device, wmHelper)