aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-03-03 17:36:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Add splitFromOverviewForTablet test" into tm-qpr-dev

Browse Source
This commit is contained in:
Tracy Zhou
2022-07-19 19:06:47 +00:00
committed by Android (Google) Code Review
parent df1c1c84b5 86a844c976
commit 3e64f94387
9 changed files with 141 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
quickstep/src/com/android/quickstep/util/SplitSelectStateController.java
View File

@@ -42,6 +42,8 @@ import androidx.annotation.Nullable;
import com.android.launcher3.statehandlers.DepthController;
import com.android.launcher3.statemanager.StateManager;
import com.android.launcher3.testing.TestLogging;
import com.android.launcher3.testing.TestProtocol;
import com.android.launcher3.util.SplitConfigurationOptions;
import com.android.launcher3.util.SplitConfigurationOptions.StagePosition;
import com.android.quickstep.SystemUiProxy;
@@ -171,6 +173,8 @@ public class SplitSelectStateController {
public void launchTasks(int taskId1, @Nullable PendingIntent taskPendingIntent,
@Nullable Intent fillInIntent, int taskId2, @StagePosition int stagePosition,
Consumer<Boolean> callback, boolean freezeTaskList, float splitRatio) {
TestLogging.recordEvent(
TestProtocol.SEQUENCE_MAIN, "launchSplitTasks");
// Assume initial task is for top/left part of screen
final int[] taskIds = stagePosition == STAGE_POSITION_TOP_OR_LEFT
? new int[]{taskId1, taskId2}

14
quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java
View File

@@ -179,6 +179,20 @@ public class TaplTestsQuickstep extends AbstractQuickStepTest {
actionsView.clickAndDismissScreenshot();
}
@Test
@PortraitLandscape
public void testSplitFromOverviewForTablet() {
assumeTrue(mLauncher.isTablet());
startTestActivity(2);
startTestActivity(3);
mLauncher.goHome().switchToOverview().getOverviewActions()
.clickSplit()
.getTestActivityTask(2)
.open();
}
private int getCurrentOverviewPage(Launcher launcher) {
return launcher.<RecentsView>getOverviewPanel().getCurrentPage();
}

17
tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java
View File

@@ -563,10 +563,13 @@ public abstract class AbstractLauncherUiTest {
break;
}
case OVERVIEW: {
checkLauncherStateInOverview(launcher, expectedContainerType, isStarted,
isResumed);
assertTrue(TestProtocol.stateOrdinalToString(ordinal),
ordinal == TestProtocol.OVERVIEW_STATE_ORDINAL);
verifyOverviewState(launcher, expectedContainerType, isStarted, isResumed,
ordinal, TestProtocol.OVERVIEW_STATE_ORDINAL);
break;
}
case SPLIT_SCREEN_SELECT: {
verifyOverviewState(launcher, expectedContainerType, isStarted, isResumed,
ordinal, TestProtocol.OVERVIEW_SPLIT_SELECT_ORDINAL);
break;
}
case TASKBAR_ALL_APPS:
@@ -632,5 +635,9 @@ public abstract class AbstractLauncherUiTest {
return homeAppIcon;
}
private void verifyOverviewState(Launcher launcher, ContainerType expectedContainerType,
boolean isStarted, boolean isResumed, int ordinal, int expectedOrdinal) {
checkLauncherStateInOverview(launcher, expectedContainerType, isStarted, isResumed);
assertEquals(TestProtocol.stateOrdinalToString(ordinal), ordinal, expectedOrdinal);
}
}

22
tests/tapl/com/android/launcher3/tapl/BaseOverview.java
View File

@@ -19,6 +19,7 @@ package com.android.launcher3.tapl;
import android.graphics.Rect;
import androidx.annotation.NonNull;
import androidx.test.uiautomator.By;
import androidx.test.uiautomator.BySelector;
import androidx.test.uiautomator.Direction;
import androidx.test.uiautomator.UiObject2;
@@ -168,6 +169,27 @@ public class BaseOverview extends LauncherInstrumentation.VisibleContainer {
return new OverviewTask(mLauncher, widestTask, this);
}
/** Returns an overview task matching TestActivity {@param activityNumber}. */
@NonNull
public OverviewTask getTestActivityTask(int activityNumber) {
final List<UiObject2> taskViews = getTasks();
mLauncher.assertNotEquals("Unable to find a task", 0, taskViews.size());
final String activityName = "TestActivity" + activityNumber;
UiObject2 task = null;
for (UiObject2 taskView : taskViews) {
// TODO(b/239452415): Use equals instead of descEndsWith
if (taskView.getParent().hasObject(By.descEndsWith(activityName))) {
task = taskView;
break;
}
}
mLauncher.assertNotNull(
"Unable to find a task with " + activityName + " from the task list", task);
return new OverviewTask(mLauncher, task, this);
}
/**
* Returns a list of all tasks fully visible in the tablet grid overview.
*/

15
tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
View File

@@ -121,8 +121,8 @@ public final class LauncherInstrumentation {
// Types for launcher containers that the user is interacting with. "Background" is a
// pseudo-container corresponding to inactive launcher covered by another app.
public enum ContainerType {
WORKSPACE, HOME_ALL_APPS, OVERVIEW, WIDGETS, FALLBACK_OVERVIEW, LAUNCHED_APP,
TASKBAR_ALL_APPS
WORKSPACE, HOME_ALL_APPS, OVERVIEW, SPLIT_SCREEN_SELECT, WIDGETS, FALLBACK_OVERVIEW,
LAUNCHED_APP, TASKBAR_ALL_APPS
}
public enum NavigationModel {ZERO_BUTTON, THREE_BUTTON}
@@ -744,7 +744,8 @@ public final class LauncherInstrumentation {
return waitForLauncherObject(APPS_RES_ID);
}
case OVERVIEW: {
case OVERVIEW:
case SPLIT_SCREEN_SELECT: {
waitUntilLauncherObjectGone(APPS_RES_ID);
waitUntilLauncherObjectGone(WORKSPACE_RES_ID);
waitUntilLauncherObjectGone(WIDGETS_RES_ID);
@@ -1090,6 +1091,14 @@ public final class LauncherInstrumentation {
return object;
}
@NonNull
UiObject2 waitForSystemUiObject(BySelector selector) {
final UiObject2 object = TestHelpers.wait(
Until.findObject(selector), WAIT_TIME_MS);
assertNotNull("Can't find a systemui object with selector: " + selector, object);
return object;
}
@NonNull
UiObject2 waitForNavigationUiObject(String resId) {
String resPackage = getNavigationButtonResPackage();

4
tests/tapl/com/android/launcher3/tapl/Overview.java
View File

@@ -21,7 +21,7 @@ import com.android.launcher3.tapl.LauncherInstrumentation.ContainerType;
/**
* Overview pane.
*/
public final class Overview extends BaseOverview {
public class Overview extends BaseOverview {
Overview(LauncherInstrumentation launcher) {
super(launcher);
@@ -29,7 +29,7 @@ public final class Overview extends BaseOverview {
@Override
protected ContainerType getContainerType() {
return LauncherInstrumentation.ContainerType.OVERVIEW;
return ContainerType.OVERVIEW;
}
@Override

19
tests/tapl/com/android/launcher3/tapl/OverviewActions.java
View File

@@ -86,7 +86,6 @@ public class OverviewActions {
"clicked select button")) {
return getSelectModeButtons();
}
}
}
@@ -103,4 +102,22 @@ public class OverviewActions {
return new SelectModeButtons(selectModeButtons, mLauncher);
}
}
/**
* Clicks split button and enters split select mode.
*/
@NonNull
public SplitScreenSelect clickSplit() {
try (LauncherInstrumentation.Closable e = mLauncher.eventsCheck();
LauncherInstrumentation.Closable c = mLauncher.addContextLayer(
"want to click split button to enter split select mode")) {
UiObject2 split = mLauncher.waitForObjectInContainer(mOverviewActions,
"action_split");
mLauncher.clickLauncherObject(split);
try (LauncherInstrumentation.Closable c2 = mLauncher.addContextLayer(
"clicked split")) {
return new SplitScreenSelect(mLauncher);
}
}
}
}

25
tests/tapl/com/android/launcher3/tapl/OverviewTask.java
View File

@@ -20,6 +20,8 @@ import static android.view.accessibility.AccessibilityEvent.TYPE_WINDOW_STATE_CH
import android.graphics.Rect;
import androidx.test.uiautomator.By;
import androidx.test.uiautomator.BySelector;
import androidx.test.uiautomator.UiObject2;
import com.android.launcher3.testing.TestProtocol;
@@ -32,8 +34,12 @@ import java.util.stream.Collectors;
* A recent task in the overview panel carousel.
*/
public final class OverviewTask {
private static final String SYSTEMUI_PACKAGE = "com.android.systemui";
static final Pattern TASK_START_EVENT =
Pattern.compile("startActivityFromRecentsAsync");
static final Pattern SPLIT_START_EVENT =
Pattern.compile("launchSplitTasks");
private final LauncherInstrumentation mLauncher;
private final UiObject2 mTask;
private final BaseOverview mOverview;
@@ -125,7 +131,7 @@ public final class OverviewTask {
}
/**
* Clicks at the task.
* Clicks the task.
*/
public LaunchedAppState open() {
try (LauncherInstrumentation.Closable e = mLauncher.eventsCheck()) {
@@ -136,8 +142,21 @@ public final class OverviewTask {
() -> "Launching task didn't open a new window: "
+ mTask.getParent().getContentDescription(),
"clicking an overview task");
mLauncher.expectEvent(TestProtocol.SEQUENCE_MAIN, TASK_START_EVENT);
return new LaunchedAppState(mLauncher);
if (mOverview.getContainerType()
== LauncherInstrumentation.ContainerType.SPLIT_SCREEN_SELECT) {
mLauncher.expectEvent(TestProtocol.SEQUENCE_MAIN, SPLIT_START_EVENT);
try (LauncherInstrumentation.Closable c = mLauncher.addContextLayer(
"launched splitscreen")) {
BySelector divider = By.res(SYSTEMUI_PACKAGE, "docked_divider_handle");
mLauncher.waitForSystemUiObject(divider);
return new LaunchedAppState(mLauncher);
}
} else {
mLauncher.expectEvent(TestProtocol.SEQUENCE_MAIN, TASK_START_EVENT);
return new LaunchedAppState(mLauncher);
}
}
}
}

35
tests/tapl/com/android/launcher3/tapl/SplitScreenSelect.java Normal file
View File

@@ -0,0 +1,35 @@
/*
* 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 com.android.launcher3.tapl.LauncherInstrumentation.ContainerType;
/**
* Represents a special state in Overview where the initial split app is shoved to the side and a
* second split app can be selected.
*/
public class SplitScreenSelect extends Overview {
SplitScreenSelect(LauncherInstrumentation launcher) {
super(launcher);
}
@Override
protected ContainerType getContainerType() {
return ContainerType.SPLIT_SCREEN_SELECT;
}
}