Merge "Revert "Add testSplitFromOverview test (for phones)"" into tm-qpr-dev (0438ea22) · Commits · e / os / android_packages_apps_Trebuchet

quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java

+0 −15

Original line number	Diff line number	Diff line
		@@ -179,21 +179,6 @@ public class TaplTestsQuickstep extends AbstractQuickStepTest {
		actionsView.clickAndDismissScreenshot();
		}

		@Test
		@PortraitLandscape
		public void testSplitFromOverview() {
		assumeTrue(!mLauncher.isTablet());

		startTestActivity(2);
		startTestActivity(3);

		mLauncher.goHome().switchToOverview().getCurrentTask()
		.tapMenu()
		.tapSplitMenuItem()
		.getTestActivityTask(2)
		.open();
		}

		@Test
		@PortraitLandscape
		public void testSplitFromOverviewForTablet() {

tests/tapl/com/android/launcher3/tapl/BaseOverview.java

+1 −5

Original line number	Diff line number	Diff line
		@@ -247,12 +247,8 @@ public class BaseOverview extends LauncherInstrumentation.VisibleContainer {
		return mLauncher.hasLauncherObject(mLauncher.getOverviewObjectSelector("clear_all"));
		}

		protected boolean isActionsViewVisible() {
		return true;
		}

		private void verifyActionsViewVisibility() {
		if (!hasTasks() \|\| !isActionsViewVisible()) {
		if (!hasTasks()) {
		return;
		}
		try (LauncherInstrumentation.Closable c = mLauncher.addContextLayer(

tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java

+1 −16

Original line number	Diff line number	Diff line
		@@ -169,7 +169,6 @@ public final class LauncherInstrumentation {
		private static final String WIDGETS_RES_ID = "primary_widgets_list_view";
		private static final String CONTEXT_MENU_RES_ID = "popup_container";
		private static final String TASKBAR_RES_ID = "taskbar_view";
		private static final String SPLIT_PLACEHOLDER_RES_ID = "split_placeholder";
		public static final int WAIT_TIME_MS = 30000;
		private static final String SYSTEMUI_PACKAGE = "com.android.systemui";
		private static final String ANDROID_PACKAGE = "android";
		@@ -725,7 +724,6 @@ public final class LauncherInstrumentation {
		waitUntilLauncherObjectGone(OVERVIEW_RES_ID);
		waitUntilLauncherObjectGone(WIDGETS_RES_ID);
		waitUntilLauncherObjectGone(TASKBAR_RES_ID);
		waitUntilLauncherObjectGone(SPLIT_PLACEHOLDER_RES_ID);

		return waitForLauncherObject(WORKSPACE_RES_ID);
		}
		@@ -734,7 +732,6 @@ public final class LauncherInstrumentation {
		waitUntilLauncherObjectGone(APPS_RES_ID);
		waitUntilLauncherObjectGone(OVERVIEW_RES_ID);
		waitUntilLauncherObjectGone(TASKBAR_RES_ID);
		waitUntilLauncherObjectGone(SPLIT_PLACEHOLDER_RES_ID);

		return waitForLauncherObject(WIDGETS_RES_ID);
		}
		@@ -744,26 +741,16 @@ public final class LauncherInstrumentation {
		waitUntilLauncherObjectGone(OVERVIEW_RES_ID);
		waitUntilLauncherObjectGone(WIDGETS_RES_ID);
		waitUntilLauncherObjectGone(TASKBAR_RES_ID);
		waitUntilLauncherObjectGone(SPLIT_PLACEHOLDER_RES_ID);

		return waitForLauncherObject(APPS_RES_ID);
		}
		case OVERVIEW: {
		waitUntilLauncherObjectGone(APPS_RES_ID);
		waitUntilLauncherObjectGone(WORKSPACE_RES_ID);
		waitUntilLauncherObjectGone(WIDGETS_RES_ID);
		waitUntilLauncherObjectGone(TASKBAR_RES_ID);
		waitUntilLauncherObjectGone(SPLIT_PLACEHOLDER_RES_ID);

		return waitForLauncherObject(OVERVIEW_RES_ID);
		}
		case OVERVIEW:
		case SPLIT_SCREEN_SELECT: {
		waitUntilLauncherObjectGone(APPS_RES_ID);
		waitUntilLauncherObjectGone(WORKSPACE_RES_ID);
		waitUntilLauncherObjectGone(WIDGETS_RES_ID);
		waitUntilLauncherObjectGone(TASKBAR_RES_ID);

		waitForLauncherObject(SPLIT_PLACEHOLDER_RES_ID);
		return waitForLauncherObject(OVERVIEW_RES_ID);
		}
		case FALLBACK_OVERVIEW: {
		@@ -771,7 +758,6 @@ public final class LauncherInstrumentation {
		waitUntilLauncherObjectGone(WORKSPACE_RES_ID);
		waitUntilLauncherObjectGone(WIDGETS_RES_ID);
		waitUntilLauncherObjectGone(TASKBAR_RES_ID);
		waitUntilLauncherObjectGone(SPLIT_PLACEHOLDER_RES_ID);

		return waitForFallbackLauncherObject(OVERVIEW_RES_ID);
		}
		@@ -780,7 +766,6 @@ public final class LauncherInstrumentation {
		waitUntilLauncherObjectGone(APPS_RES_ID);
		waitUntilLauncherObjectGone(OVERVIEW_RES_ID);
		waitUntilLauncherObjectGone(WIDGETS_RES_ID);
		waitUntilLauncherObjectGone(SPLIT_PLACEHOLDER_RES_ID);

		if (isTablet() && !isFallbackOverview()) {
		waitForLauncherObject(TASKBAR_RES_ID);

tests/tapl/com/android/launcher3/tapl/OverviewTask.java

+0 −17

Original line number	Diff line number	Diff line
		@@ -20,7 +20,6 @@ import static android.view.accessibility.AccessibilityEvent.TYPE_WINDOW_STATE_CH

		import android.graphics.Rect;

		import androidx.annotation.NonNull;
		import androidx.test.uiautomator.By;
		import androidx.test.uiautomator.BySelector;
		import androidx.test.uiautomator.UiObject2;
		@@ -160,20 +159,4 @@ public final class OverviewTask {
		}
		}
		}

		/** Taps the task menu. */
		@NonNull
		public OverviewTaskMenu tapMenu() {
		try (LauncherInstrumentation.Closable e = mLauncher.eventsCheck();
		LauncherInstrumentation.Closable c = mLauncher.addContextLayer(
		"want to tap the task menu")) {
		mLauncher.clickLauncherObject(
		mLauncher.waitForObjectInContainer(mTask.getParent(), "icon"));

		try (LauncherInstrumentation.Closable c1 = mLauncher.addContextLayer(
		"tapped the task menu")) {
		return new OverviewTaskMenu(mLauncher);
		}
		}
		}
		}

tests/tapl/com/android/launcher3/tapl/OverviewTaskMenu.java

deleted100644 → 0

+0 −52

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.launcher3.tapl;

		import androidx.annotation.NonNull;
		import androidx.test.uiautomator.By;
		import androidx.test.uiautomator.UiObject2;

		/** Represents the menu of an overview task. */
		public class OverviewTaskMenu {

		private final LauncherInstrumentation mLauncher;
		private final UiObject2 mMenu;

		OverviewTaskMenu(LauncherInstrumentation launcher) {
		mLauncher = launcher;

		mMenu = mLauncher.waitForLauncherObject("menu_option_layout");
		mLauncher.assertTrue("The overview task menus is not visible",
		!mMenu.getVisibleBounds().isEmpty());
		}

		/** Taps the split menu item from the overview task menu. */
		@NonNull
		public SplitScreenSelect tapSplitMenuItem() {
		try (LauncherInstrumentation.Closable e = mLauncher.eventsCheck();
		LauncherInstrumentation.Closable c = mLauncher.addContextLayer(
		"tap split menu item")) {
		mLauncher.clickLauncherObject(
		mLauncher.findObjectInContainer(mMenu, By.textStartsWith("Split")));

		try (LauncherInstrumentation.Closable c1 = mLauncher.addContextLayer(
		"tapped split menu item")) {
		return new SplitScreenSelect(mLauncher);
		}
		}
		}
		}