Merge "Formatting" into main (53287e14) · Commits · e / os / android_frameworks_base

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

+2 −6

Original line number	Diff line number	Diff line
		@@ -63,12 +63,8 @@ class MovePipDownOnShelfHeightChange(flicker: LegacyFlickerTest) :
		}

		/** Checks that the visible region of [pipApp] window always moves down during the animation. */
		@Presubmit
		@Test
		fun pipWindowMovesDown() = pipWindowMoves(Direction.DOWN)
		@Presubmit @Test fun pipWindowMovesDown() = pipWindowMoves(Direction.DOWN)

		/** Checks that the visible region of [pipApp] layer always moves down during the animation. */
		@Presubmit
		@Test
		fun pipLayerMovesDown() = pipLayerMoves(Direction.DOWN)
		@Presubmit @Test fun pipLayerMovesDown() = pipLayerMoves(Direction.DOWN)
		}

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

+36 −41

Original line number	Diff line number	Diff line
		@@ -25,8 +25,8 @@ import android.tools.device.flicker.legacy.LegacyFlickerTest
		import android.tools.device.flicker.legacy.LegacyFlickerTestFactory
		import androidx.test.filters.RequiresDevice
		import com.android.server.wm.flicker.helpers.PipAppHelper
		import com.android.wm.shell.flicker.utils.SplitScreenUtils
		import com.android.wm.shell.flicker.splitscreen.benchmark.SplitScreenBase
		import com.android.wm.shell.flicker.utils.SplitScreenUtils
		import com.android.wm.shell.flicker.utils.layerBecomesInvisible
		import com.android.wm.shell.flicker.utils.splitAppLayerBoundsIsVisibleAtEnd
		import com.android.wm.shell.flicker.utils.splitAppLayerBoundsSnapToDivider
		@@ -77,26 +77,26 @@ class SwitchBetweenSplitPairsNoPip (override val flicker: LegacyFlickerTest) :
		}
		}

		/**
		* Checks that [pipApp] window won't enter pip
		*/
		/** Checks that [pipApp] window won't enter pip */
		@Presubmit
		@Test
		fun notEnterPip() {
		flicker.assertWm { isNotPinned(pipApp) }
		}

		/**
		* Checks the [pipApp] task did not reshow during transition.
		*/
		/** Checks the [pipApp] task did not reshow during transition. */
		@Presubmit
		@Test
		fun app1WindowIsVisibleOnceApp2WindowIsInvisible() {
		flicker.assertLayers {
		this.isVisible(pipApp)
		.then().isVisible(ComponentNameMatcher.LAUNCHER, isOptional = true)
		.then().isVisible(ComponentNameMatcher.SNAPSHOT, isOptional = true)
		.then().isInvisible(pipApp).isVisible(secondaryApp)
		.then()
		.isVisible(ComponentNameMatcher.LAUNCHER, isOptional = true)
		.then()
		.isVisible(ComponentNameMatcher.SNAPSHOT, isOptional = true)
		.then()
		.isInvisible(pipApp)
		.isVisible(secondaryApp)
		}
		}

		@@ -118,16 +118,10 @@ class SwitchBetweenSplitPairsNoPip (override val flicker: LegacyFlickerTest) :
		portraitPosTop = true
		)

		/**
		* Checks the [pipApp] task become invisible after transition finish.
		*/
		@Presubmit
		@Test
		fun pipAppLayerBecomesInvisible() = flicker.layerBecomesInvisible(pipApp)
		/** Checks the [pipApp] task become invisible after transition finish. */
		@Presubmit @Test fun pipAppLayerBecomesInvisible() = flicker.layerBecomesInvisible(pipApp)

		/**
		* Checks the [pipApp] task is in split screen bounds when transition start.
		*/
		/** Checks the [pipApp] task is in split screen bounds when transition start. */
		@Presubmit
		@Test
		fun pipAppBoundsIsVisibleAtBegin() =
		@@ -143,7 +137,8 @@ class SwitchBetweenSplitPairsNoPip (override val flicker: LegacyFlickerTest) :
		companion object {
		@Parameterized.Parameters(name = "{0}")
		@JvmStatic
		fun getParams() = LegacyFlickerTestFactory.nonRotationTests(
		fun getParams() =
		LegacyFlickerTestFactory.nonRotationTests(
		supportedNavigationModes = listOf(NavBar.MODE_GESTURAL)
		)
		}

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

+5 −4

Original line number	Diff line number	Diff line
		@@ -69,11 +69,12 @@ class UnlockKeyguardToSplitScreen(override val flicker: LegacyFlickerTest) :
		@Test
		@Presubmit
		fun visibleLayersShownMoreThanOneConsecutiveEntry_withoutWallpaper() =
		flicker.assertLayers { this.visibleLayersShownMoreThanOneConsecutiveEntry(
		LayersTraceSubject.VISIBLE_FOR_MORE_THAN_ONE_ENTRY_IGNORE_LAYERS + listOf(
		WALLPAPER_BBQ_WRAPPER
		flicker.assertLayers {
		this.visibleLayersShownMoreThanOneConsecutiveEntry(
		LayersTraceSubject.VISIBLE_FOR_MORE_THAN_ONE_ENTRY_IGNORE_LAYERS +
		listOf(WALLPAPER_BBQ_WRAPPER)
		)
		) }
		}

		@Test
		fun splitScreenDividerIsVisibleAtEnd() {