Merge "Add CUJ for dragging shortcut to split" (55187ea6) · Commits · e / os / android_frameworks_base

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

0 → 100644

+189 −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.splitscreen

			import android.view.WindowManagerPolicyConstants
			import android.platform.test.annotations.Postsubmit
			import androidx.test.filters.RequiresDevice
			import com.android.server.wm.flicker.FlickerParametersRunnerFactory
			import com.android.server.wm.flicker.FlickerTestParameter
			import com.android.server.wm.flicker.FlickerTestParameterFactory
			import com.android.server.wm.flicker.dsl.FlickerBuilder
			import com.android.wm.shell.flicker.appWindowBecomesVisible
			import com.android.wm.shell.flicker.appWindowIsVisibleAtEnd
			import com.android.wm.shell.flicker.layerBecomesVisible
			import com.android.wm.shell.flicker.layerIsVisibleAtEnd
			import com.android.wm.shell.flicker.splitAppLayerBoundsBecomesVisibleByDrag
			import com.android.wm.shell.flicker.splitAppLayerBoundsIsVisibleAtEnd
			import com.android.wm.shell.flicker.splitScreenDividerBecomesVisible
			import com.android.wm.shell.flicker.splitScreenEntered
			import org.junit.Assume
			import org.junit.Before
			import org.junit.FixMethodOrder
			import org.junit.Test
			import org.junit.runner.RunWith
			import org.junit.runners.MethodSorters
			import org.junit.runners.Parameterized

			/**
			* Test enter split screen by dragging a shortcut.
			* This test is only for large screen devices.
			*
			* To run this test: `atest WMShellFlickerTests:EnterSplitScreenByDragFromShortcut`
			*/
			@RequiresDevice
			@RunWith(Parameterized::class)
			@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)
			@FixMethodOrder(MethodSorters.NAME_ASCENDING)
			class EnterSplitScreenByDragFromShortcut(
			testSpec: FlickerTestParameter
			) : SplitScreenBase(testSpec) {

			@Before
			fun before() {
			Assume.assumeTrue(testSpec.isTablet)
			}

			override val transition: FlickerBuilder.() -> Unit
			get() = {
			super.transition(this)
			setup {
			tapl.goHome()
			SplitScreenUtils.createShortcutOnHotseatIfNotExist(tapl, secondaryApp.appName)
			primaryApp.launchViaIntent(wmHelper)
			}
			transitions {
			tapl.launchedAppState.taskbar
			.getAppIcon(secondaryApp.appName)
			.openDeepShortcutMenu()
			.getMenuItem("Split Screen Secondary Activity")
			.dragToSplitscreen(secondaryApp.`package`, primaryApp.`package`)
			SplitScreenUtils.waitForSplitComplete(wmHelper, primaryApp, secondaryApp)
			}
			}

			@Postsubmit
			@Test
			fun cujCompleted() = testSpec.splitScreenEntered(primaryApp, secondaryApp, fromOtherApp = false)

			@Postsubmit
			@Test
			fun splitScreenDividerBecomesVisible() = testSpec.splitScreenDividerBecomesVisible()

			@Postsubmit
			@Test
			fun primaryAppLayerIsVisibleAtEnd() = testSpec.layerIsVisibleAtEnd(primaryApp)

			@Postsubmit
			@Test
			fun secondaryAppLayerBecomesVisible() = testSpec.layerBecomesVisible(secondaryApp)

			@Postsubmit
			@Test
			fun primaryAppBoundsIsVisibleAtEnd() = testSpec.splitAppLayerBoundsIsVisibleAtEnd(
			primaryApp, landscapePosLeft = false, portraitPosTop = false)

			@Postsubmit
			@Test
			fun secondaryAppBoundsBecomesVisible() = testSpec.splitAppLayerBoundsBecomesVisibleByDrag(
			secondaryApp)

			@Postsubmit
			@Test
			fun primaryAppWindowIsVisibleAtEnd() = testSpec.appWindowIsVisibleAtEnd(primaryApp)

			@Postsubmit
			@Test
			fun secondaryAppWindowBecomesVisible() = testSpec.appWindowBecomesVisible(secondaryApp)

			/** {@inheritDoc} */
			@Postsubmit
			@Test
			override fun entireScreenCovered() =
			super.entireScreenCovered()

			/** {@inheritDoc} */
			@Postsubmit
			@Test
			override fun navBarLayerIsVisibleAtStartAndEnd() =
			super.navBarLayerIsVisibleAtStartAndEnd()

			/** {@inheritDoc} */
			@Postsubmit
			@Test
			override fun navBarLayerPositionAtStartAndEnd() =
			super.navBarLayerPositionAtStartAndEnd()

			/** {@inheritDoc} */
			@Postsubmit
			@Test
			override fun navBarWindowIsAlwaysVisible() =
			super.navBarWindowIsAlwaysVisible()

			/** {@inheritDoc} */
			@Postsubmit
			@Test
			override fun statusBarLayerIsVisibleAtStartAndEnd() =
			super.statusBarLayerIsVisibleAtStartAndEnd()

			/** {@inheritDoc} */
			@Postsubmit
			@Test
			override fun statusBarLayerPositionAtStartAndEnd() =
			super.statusBarLayerPositionAtStartAndEnd()

			/** {@inheritDoc} */
			@Postsubmit
			@Test
			override fun statusBarWindowIsAlwaysVisible() =
			super.statusBarWindowIsAlwaysVisible()

			/** {@inheritDoc} */
			@Postsubmit
			@Test
			override fun taskBarLayerIsVisibleAtStartAndEnd() =
			super.taskBarLayerIsVisibleAtStartAndEnd()

			/** {@inheritDoc} */
			@Postsubmit
			@Test
			override fun taskBarWindowIsAlwaysVisible() =
			super.taskBarWindowIsAlwaysVisible()

			/** {@inheritDoc} */
			@Postsubmit
			@Test
			override fun visibleLayersShownMoreThanOneConsecutiveEntry() =
			super.visibleLayersShownMoreThanOneConsecutiveEntry()

			/** {@inheritDoc} */
			@Postsubmit
			@Test
			override fun visibleWindowsShownMoreThanOneConsecutiveEntry() =
			super.visibleWindowsShownMoreThanOneConsecutiveEntry()

			companion object {
			@Parameterized.Parameters(name = "{0}")
			@JvmStatic
			fun getParams(): List<FlickerTestParameter> {
			return FlickerTestParameterFactory.getInstance().getConfigNonRotationTests(
			// TODO(b/176061063):The 3 buttons of nav bar do not exist in the hierarchy.
			supportedNavigationModes =
			listOf(WindowManagerPolicyConstants.NAV_BAR_MODE_GESTURAL_OVERLAY))
			}
			}
			}
			No newline at end of file

tests/FlickerTests/test-apps/flickerapp/AndroidManifest.xml

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -254,6 +254,8 @@
	<action android:name="android.intent.action.MAIN"/>		<action android:name="android.intent.action.MAIN"/>
	<category android:name="android.intent.category.LAUNCHER"/>		<category android:name="android.intent.category.LAUNCHER"/>
	</intent-filter>		</intent-filter>
			<meta-data android:name="android.app.shortcuts"
			android:resource="@xml/shortcuts" />
	</activity>		</activity>
	<activity android:name=".SendNotificationActivity"		<activity android:name=".SendNotificationActivity"
	android:taskAffinity="com.android.server.wm.flicker.testapp.SendNotificationActivity"		android:taskAffinity="com.android.server.wm.flicker.testapp.SendNotificationActivity"

tests/FlickerTests/test-apps/flickerapp/res/values/strings.xml

0 → 100644

+19 −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.
			-->
			<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
			<!-- Label for split screen shortcut-->
			<string name="split_screen_shortcut_label">Split Screen Secondary Activity</string>
			</resources>
			No newline at end of file

tests/FlickerTests/test-apps/flickerapp/res/xml/shortcuts.xml

0 → 100644

+26 −0

Original line number	Original line	Diff line number	Diff line
			<?xml version="1.0" encoding="utf-8"?>
			<!--
			~ 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.
			-->
			<shortcuts xmlns:android="http://schemas.android.com/apk/res/android">
			<shortcut
			android:shortcutId="split_screen_shortcut"
			android:shortcutShortLabel="@string/split_screen_shortcut_label">
			<intent
			android:action="android.intent.action.VIEW"
			android:targetPackage="com.android.server.wm.flicker.testapp"
			android:targetClass="com.android.server.wm.flicker.testapp.SplitScreenSecondaryActivity" />
			</shortcut>
			</shortcuts>
			No newline at end of file