Merge "Add a unit test for auto-enter PiP by navigating to home" into... (15f2e337) · Commits · e / os / android_frameworks_base

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

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -116,6 +116,10 @@ class PipAppHelper(instrumentation: Instrumentation) : BaseAppHelper(
	clickObject(ENTER_PIP_ON_USER_LEAVE_HINT)		clickObject(ENTER_PIP_ON_USER_LEAVE_HINT)
	}		}

			fun enableAutoEnterForPipActivity() {
			clickObject(ENTER_PIP_AUTOENTER)
			}

	fun clickStartMediaSessionButton() {		fun clickStartMediaSessionButton() {
	clickObject(MEDIA_SESSION_START_RADIO_BUTTON_ID)		clickObject(MEDIA_SESSION_START_RADIO_BUTTON_ID)
	}		}
	@@ -214,5 +218,6 @@ class PipAppHelper(instrumentation: Instrumentation) : BaseAppHelper(
	private const val WITH_CUSTOM_ACTIONS_BUTTON_ID = "with_custom_actions"		private const val WITH_CUSTOM_ACTIONS_BUTTON_ID = "with_custom_actions"
	private const val MEDIA_SESSION_START_RADIO_BUTTON_ID = "media_session_start"		private const val MEDIA_SESSION_START_RADIO_BUTTON_ID = "media_session_start"
	private const val ENTER_PIP_ON_USER_LEAVE_HINT = "enter_pip_on_leave_manual"		private const val ENTER_PIP_ON_USER_LEAVE_HINT = "enter_pip_on_leave_manual"
			private const val ENTER_PIP_AUTOENTER = "enter_pip_on_leave_autoenter"
	}		}
	}		}

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

0 → 100644

+116 −0

Original line number	Original line	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.Postsubmit
			import androidx.test.filters.RequiresDevice
			import com.android.launcher3.tapl.LauncherInstrumentation
			import com.android.server.wm.flicker.FlickerParametersRunnerFactory
			import com.android.server.wm.flicker.FlickerTestParameter
			import com.android.server.wm.flicker.annotation.Group3
			import com.android.server.wm.flicker.dsl.FlickerBuilder
			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.
			*
			* To run this test: `atest WMShellFlickerTests:AutoEnterPipOnGoToHomeTest`
			*
			* Actions:
			* Launch an app in full screen
			* Select "Auto-enter PiP" radio button
			* 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
			* [com.android.server.wm.flicker.TransitionRunnerWithRules],
			* 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)
			@Postsubmit
			@Group3
			class AutoEnterPipOnGoToHomeTest(testSpec: FlickerTestParameter) : EnterPipTest(testSpec) {
			protected val taplInstrumentation = LauncherInstrumentation()
			/**
			* Defines the transition used to run the test
			*/
			override val transition: FlickerBuilder.() -> Unit
			get() = {
			setupAndTeardown(this)
			setup {
			eachRun {
			pipApp.launchViaIntent(wmHelper)
			pipApp.enableAutoEnterForPipActivity()
			}
			}
			teardown {
			eachRun {
			// close gracefully so that onActivityUnpinned() can be called before force exit
			pipApp.closePipWindow(wmHelper)
			pipApp.exit(wmHelper)
			}
			}
			transitions {
			taplInstrumentation.goHome()
			}
			}

			override fun pipLayerReduces() {
			val layerName = pipApp.component.toLayerName()
			testSpec.assertLayers {
			val pipLayerList = this.layers { it.name.contains(layerName) && it.isVisible }
			pipLayerList.zipWithNext { previous, current ->
			current.visibleRegion.notBiggerThan(previous.visibleRegion.region)
			}
			}
			}

			/**
			* Checks that [pipApp] window is animated towards default position in right bottom corner
			*/
			@Test
			fun pipLayerMovesTowardsRightBottomCorner() {
			// in gestural nav the swipe makes PiP first go upwards
			Assume.assumeFalse(testSpec.isGesturalNavigation)
			val layerName = pipApp.component.toLayerName()
			testSpec.assertLayers {
			val pipLayerList = this.layers { it.name.contains(layerName) && it.isVisible }
			// Pip animates towards the right bottom corner, but because it is being resized at the
			// same time, it is possible it shrinks first quickly below the default position and get
			// moved up after that in just few last frames
			pipLayerList.zipWithNext { previous, current ->
			current.visibleRegion.isToTheRightBottom(previous.visibleRegion.region, 3)
			}
			}
			}

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

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

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -35,7 +35,7 @@ import org.junit.runners.Parameterized
	* Actions:		* Actions:
	* Launch an app in full screen		* Launch an app in full screen
	* Select "Via code behind" radio button		* Select "Via code behind" radio button
	* Press Home button to put [pipApp] in pip mode		* Press Home button or swipe up to go Home and put [pipApp] in pip mode
	*		*
	* Notes:		* Notes:
	* 1. All assertions are inherited from [EnterPipTest]		* 1. All assertions are inherited from [EnterPipTest]

libs/WindowManager/Shell/tests/flicker/test-apps/flickerapp/res/layout/activity_pip.xml

+7 −0

Original line number	Original line	Diff line number	Diff line
	@@ -64,6 +64,13 @@
	android:layout_height="wrap_content"		android:layout_height="wrap_content"
	android:text="Via code behind"		android:text="Via code behind"
	android:onClick="onAutoPipSelected"/>		android:onClick="onAutoPipSelected"/>

			<RadioButton
			android:id="@+id/enter_pip_on_leave_autoenter"
			android:layout_width="wrap_content"
			android:layout_height="wrap_content"
			android:text="Auto-enter PiP"
			android:onClick="onAutoPipSelected"/>
	</RadioGroup>		</RadioGroup>

	<RadioGroup		<RadioGroup

libs/WindowManager/Shell/tests/flicker/test-apps/flickerapp/src/com/android/wm/shell/flicker/testapp/PipActivity.java

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -236,6 +236,10 @@ public class PipActivity extends Activity {
	mPipParamsBuilder.setAutoEnterEnabled(false);		mPipParamsBuilder.setAutoEnterEnabled(false);
	setPictureInPictureParams(mPipParamsBuilder.build());		setPictureInPictureParams(mPipParamsBuilder.build());
	break;		break;
			case R.id.enter_pip_on_leave_autoenter:
			mPipParamsBuilder.setAutoEnterEnabled(true);
			setPictureInPictureParams(mPipParamsBuilder.build());
			break;
	}		}
	}		}