Merge "Add CUJ for legacy enter PiP from split screen" into main (220ea939) · Commits · e / os / android_frameworks_base

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

+1 −0

Original line number	Diff line number	Diff line
		@@ -30,6 +30,7 @@ filegroup {
		"src/*/B.kt",
		"src/*/C.kt",
		"src/*/D.kt",
		"src/*/F.kt",
		"src/*/S.kt",
		],
		}

libs/WindowManager/Shell/tests/flicker/pip/src/com/android/wm/shell/flicker/pip/AutoEnterPipFromSplitScreenOnGoToHomeTest.kt→libs/WindowManager/Shell/tests/flicker/pip/src/com/android/wm/shell/flicker/pip/FromSplitScreenAutoEnterPipOnGoToHomeTest.kt

+3 −7

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

		import android.platform.test.annotations.Presubmit
		import android.tools.common.NavBar
		import android.tools.common.Rotation
		import android.tools.device.flicker.junit.FlickerParametersRunnerFactory
		import android.tools.device.flicker.legacy.FlickerBuilder
		@@ -62,7 +61,7 @@ import org.junit.runners.Parameterized
		@RunWith(Parameterized::class)
		@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)
		@FixMethodOrder(MethodSorters.NAME_ASCENDING)
		class AutoEnterPipFromSplitScreenOnGoToHomeTest(flicker: LegacyFlickerTest) :
		class FromSplitScreenAutoEnterPipOnGoToHomeTest(flicker: LegacyFlickerTest) :
		AutoEnterPipOnGoToHomeTest(flicker) {
		private val portraitDisplayBounds = WindowUtils.getDisplayBounds(Rotation.ROTATION_0)
		/** Second app used to enter split screen mode */
		@@ -120,9 +119,7 @@ class AutoEnterPipFromSplitScreenOnGoToHomeTest(flicker: LegacyFlickerTest) :
		@Presubmit
		@Test
		override fun pipAppLayerAlwaysVisible() {
		// pip layer in gesture nav will disappear during transition with alpha animation
		Assume.assumeFalse(flicker.scenario.isGesturalNavigation)
		super.pipAppLayerAlwaysVisible()
		// pip layer in should disappear during transition with alpha animation
		}

		@Presubmit
		@@ -151,8 +148,7 @@ class AutoEnterPipFromSplitScreenOnGoToHomeTest(flicker: LegacyFlickerTest) :
		@JvmStatic
		fun getParams() =
		LegacyFlickerTestFactory.nonRotationTests(
		// TODO(b/176061063):The 3 buttons of nav bar do not exist in the hierarchy.
		supportedNavigationModes = listOf(NavBar.MODE_GESTURAL)
		supportedRotations = listOf(Rotation.ROTATION_0)
		)
		}
		}

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

0 → 100644

+191 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2022 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

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

		import android.platform.test.annotations.Presubmit
		import android.tools.common.Rotation
		import android.tools.device.flicker.junit.FlickerParametersRunnerFactory
		import android.tools.device.flicker.legacy.FlickerBuilder
		import android.tools.device.flicker.legacy.LegacyFlickerTest
		import android.tools.device.flicker.legacy.LegacyFlickerTestFactory
		import android.tools.device.helpers.WindowUtils
		import android.tools.device.traces.parsers.toFlickerComponent
		import androidx.test.filters.RequiresDevice
		import com.android.server.wm.flicker.helpers.SimpleAppHelper
		import com.android.server.wm.flicker.testapp.ActivityOptions
		import com.android.wm.shell.flicker.pip.common.EnterPipTransition
		import com.android.wm.shell.flicker.utils.SplitScreenUtils
		import org.junit.Assume
		import org.junit.FixMethodOrder
		import org.junit.Test
		import org.junit.runner.RunWith
		import org.junit.runners.MethodSorters
		import org.junit.runners.Parameterized

		/**
		* Test entering pip from an app via auto-enter property when navigating to home from split screen.
		*
		* To run this test: `atest WMShellFlickerTests:AutoEnterPipOnGoToHomeTest`
		*
		* Actions:
		* ```
		* Launch an app in full screen
		* Select "Auto-enter PiP" radio button
		* Open all apps and drag another app icon to enter split screen
		* Press Home button or swipe up to go Home and put [pipApp] in pip mode
		* ```
		*
		* Notes:
		* ```
		* 1. All assertions are inherited from [EnterPipTest]
		* 2. Part of the test setup occurs automatically via
		* [android.tools.device.flicker.legacy.runner.TransitionRunner],
		* including configuring navigation mode, initial orientation and ensuring no
		* apps are running before setup
		* ```
		*/
		@RequiresDevice
		@RunWith(Parameterized::class)
		@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)
		@FixMethodOrder(MethodSorters.NAME_ASCENDING)
		class FromSplitScreenEnterPipOnUserLeaveHintTest(flicker: LegacyFlickerTest) :
		EnterPipTransition(flicker) {
		private val portraitDisplayBounds = WindowUtils.getDisplayBounds(Rotation.ROTATION_0)
		/** Second app used to enter split screen mode */
		private val secondAppForSplitScreen =
		SimpleAppHelper(
		instrumentation,
		ActivityOptions.SplitScreen.Primary.LABEL,
		ActivityOptions.SplitScreen.Primary.COMPONENT.toFlickerComponent()
		)

		/** Defines the transition used to run the test */
		override val transition: FlickerBuilder.() -> Unit
		get() = {
		setup {
		secondAppForSplitScreen.launchViaIntent(wmHelper)
		pipApp.launchViaIntent(wmHelper)
		tapl.goHome()
		SplitScreenUtils.enterSplit(
		wmHelper,
		tapl,
		device,
		pipApp,
		secondAppForSplitScreen,
		flicker.scenario.startRotation
		)
		pipApp.enableEnterPipOnUserLeaveHint()
		}
		teardown {
		pipApp.exit(wmHelper)
		secondAppForSplitScreen.exit(wmHelper)
		}
		transitions { tapl.goHome() }
		}

		@Presubmit
		@Test
		override fun pipOverlayLayerAppearThenDisappear() {
		// when entering from split screen we use alpha animation, without overlay
		}

		@Presubmit
		@Test
		override fun pipLayerOrOverlayRemainInsideVisibleBounds() {
		// when entering from split screen we use alpha animation, without overlay
		}

		@Presubmit
		@Test
		override fun pipLayerReduces() {
		// when entering from split screen we use alpha animation, so there is no size change
		Assume.assumeFalse(flicker.scenario.isGesturalNavigation)
		super.pipLayerReduces()
		}

		@Presubmit
		@Test
		override fun pipAppLayerAlwaysVisible() {
		// pip layer in should disappear during transition with alpha animation
		}

		@Presubmit
		@Test
		override fun focusChanges() {
		// in gestural nav the focus goes to different activity on swipe up
		Assume.assumeFalse(flicker.scenario.isGesturalNavigation)
		super.focusChanges()
		}

		@Presubmit
		@Test
		fun pipAppWindowVisibleChanges() {
		// TODO(b/322394235) this method comes from EnterPipOnUserLeaveHintTest, but due to how
		// it is being packaged in Android.bp we cannot inherit from it. Needs to be refactored.
		Assume.assumeTrue(flicker.scenario.isGesturalNavigation)
		flicker.assertWm {
		this.isAppWindowVisible(pipApp)
		.then()
		.isAppWindowInvisible(pipApp, isOptional = true)
		.then()
		.isAppWindowVisible(pipApp, isOptional = true)
		}
		}

		@Presubmit
		@Test
		override fun pipAppWindowAlwaysVisible() {
		// TODO(b/322394235) this method comes from EnterPipOnUserLeaveHintTest, but due to how
		// it is being packaged in Android.bp we cannot inherit from it. Needs to be refactored.
		// In gestural nav the pip will first move behind home and then above home. The visual
		// appearance visible->invisible->visible is asserted by pipAppLayerAlwaysVisible().
		// But the internal states of activity don't need to follow that, such as a temporary
		// visibility state can be changed quickly outside a transaction so the test doesn't
		// detect that. Hence, skip the case to avoid restricting the internal implementation.
		Assume.assumeFalse(flicker.scenario.isGesturalNavigation)
		super.pipAppWindowAlwaysVisible()
		}

		@Presubmit
		@Test
		override fun pipWindowRemainInsideVisibleBounds() {
		if (tapl.isTablet) {
		flicker.assertWmVisibleRegion(pipApp) { coversAtMost(displayBounds) }
		} else {
		// on phones home screen does not rotate in landscape, PiP enters back to portrait
		// orientation - if we go from landscape to portrait it should switch between the bounds
		// otherwise it should be the same as tablet (i.e. portrait to portrait)
		if (flicker.scenario.isLandscapeOrSeascapeAtStart) {
		flicker.assertWmVisibleRegion(pipApp) {
		// first check against landscape bounds then against portrait bounds
		coversAtMost(displayBounds).then().coversAtMost(portraitDisplayBounds)
		}
		} else {
		// always check against the display bounds which do not change during transition
		flicker.assertWmVisibleRegion(pipApp) { coversAtMost(displayBounds) }
		}
		}
		}

		companion object {
		@Parameterized.Parameters(name = "{0}")
		@JvmStatic
		fun getParams() = LegacyFlickerTestFactory.nonRotationTests(
		supportedRotations = listOf(Rotation.ROTATION_0)
		)
		}
		}