aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-02-19 10:48:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Create TAPL test for taskbar in overview" into udc-dev am: ac206e1daf

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23155127

Change-Id: I2777ad7cdc9a117b77072ae7138d5fcdb66455ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Thales Lima
2023-05-23 18:59:16 +00:00
committed by Automerger Merge Worker
parent 028849dfd1 ac206e1daf
commit dd2c541ffe
5 changed files with 195 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -427,6 +427,55 @@ public class TaplTestsQuickstep extends AbstractQuickStepTest {
0, getTaskCount(launcher)));
}
@Test
@PortraitLandscape
public void testOverviewDeadzones() throws Exception {
startTestAppsWithCheck();
Overview overview = mLauncher.goHome().switchToOverview();
assertTrue("Launcher internal state should be Overview",
isInState(() -> LauncherState.OVERVIEW));
executeOnLauncher(
launcher -> assertTrue("Should have at least 3 tasks",
getTaskCount(launcher) >= 3));
// It should not dismiss overview when tapping between tasks
overview.touchBetweenTasks();
overview = mLauncher.getOverview();
assertTrue("Launcher internal state should be Overview",
isInState(() -> LauncherState.OVERVIEW));
// Dismiss when tapping to the right of the focused task
overview.touchOutsideFirstTask();
assertTrue("Launcher internal state should be Home",
isInState(() -> LauncherState.NORMAL));
}
@Test
@PortraitLandscape
public void testTaskbarDeadzonesForTablet() throws Exception {
assumeTrue(mLauncher.isTablet());
startTestAppsWithCheck();
Overview overview = mLauncher.goHome().switchToOverview();
assertTrue("Launcher internal state should be Overview",
isInState(() -> LauncherState.OVERVIEW));
executeOnLauncher(
launcher -> assertTrue("Should have at least 3 tasks",
getTaskCount(launcher) >= 3));
// On persistent taskbar, it should not dismiss when tapping the taskbar
overview.touchTaskbarBottomCorner(/* tapRight= */ false);
assertTrue("Launcher internal state should be Overview",
isInState(() -> LauncherState.OVERVIEW));
// On persistent taskbar, it should not dismiss when tapping the taskbar
overview.touchTaskbarBottomCorner(/* tapRight= */ true);
assertTrue("Launcher internal state should be Overview",
isInState(() -> LauncherState.OVERVIEW));
}
@Test
@ScreenRecord // b/242163205
public void testDisableRotationCheckForPhone() throws Exception {

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

@@ -71,6 +71,44 @@ public class BaseOverview extends LauncherInstrumentation.VisibleContainer {
}
}
/**
* Flings backward (right) and waits the fling's end.
*/
public void flingBackward() {
try (LauncherInstrumentation.Closable e = mLauncher.eventsCheck()) {
flingBackwardImpl();
}
}
private void flingBackwardImpl() {
try (LauncherInstrumentation.Closable c =
mLauncher.addContextLayer("want to fling backward in overview")) {
LauncherInstrumentation.log("Overview.flingBackward before fling");
final UiObject2 overview = verifyActiveContainer();
final int rightMargin =
mLauncher.getTargetInsets().right + mLauncher.getEdgeSensitivityWidth();
mLauncher.scroll(
overview, Direction.RIGHT, new Rect(0, 0, rightMargin + 1, 0), 20, false);
try (LauncherInstrumentation.Closable c2 =
mLauncher.addContextLayer("flung backwards")) {
verifyActiveContainer();
verifyActionsViewVisibility();
}
}
}
private OverviewTask flingToFirstTask() {
OverviewTask currentTask = getCurrentTask();
while (mLauncher.getRealDisplaySize().x - currentTask.getUiObject().getVisibleBounds().right
<= mLauncher.getOverviewPageSpacing()) {
flingBackwardImpl();
currentTask = getCurrentTask();
}
return currentTask;
}
/**
* Dismissed all tasks by scrolling to Clear-all button and pressing it.
*/
@@ -94,23 +132,57 @@ public class BaseOverview extends LauncherInstrumentation.VisibleContainer {
}
/**
* Flings backward (right) and waits the fling's end.
* Touch to the right of current task. This should dismiss overview and go back to Workspace.
*/
public void flingBackward() {
public Workspace touchOutsideFirstTask() {
try (LauncherInstrumentation.Closable e = mLauncher.eventsCheck();
LauncherInstrumentation.Closable c =
mLauncher.addContextLayer("want to fling backward in overview")) {
LauncherInstrumentation.log("Overview.flingBackward before fling");
final UiObject2 overview = verifyActiveContainer();
final int rightMargin =
mLauncher.getTargetInsets().right + mLauncher.getEdgeSensitivityWidth();
mLauncher.scroll(
overview, Direction.RIGHT, new Rect(0, 0, rightMargin + 1, 0), 20, false);
try (LauncherInstrumentation.Closable c2 =
mLauncher.addContextLayer("flung backwards")) {
verifyActiveContainer();
verifyActionsViewVisibility();
LauncherInstrumentation.Closable c = mLauncher.addContextLayer(
"touching outside the focused task")) {
if (getTaskCount() < 2) {
throw new IllegalStateException(
"Need to have at least 2 tasks");
}
OverviewTask currentTask = flingToFirstTask();
mLauncher.touchOutsideContainer(currentTask.getUiObject(),
/* tapRight= */ true,
/* halfwayToEdge= */ false);
return new Workspace(mLauncher);
}
}
/**
* Touch between two tasks
*/
public void touchBetweenTasks() {
try (LauncherInstrumentation.Closable e = mLauncher.eventsCheck();
LauncherInstrumentation.Closable c = mLauncher.addContextLayer(
"touching outside the focused task")) {
if (getTaskCount() < 2) {
throw new IllegalStateException(
"Need to have at least 2 tasks");
}
OverviewTask currentTask = flingToFirstTask();
mLauncher.touchOutsideContainer(currentTask.getUiObject(),
/* tapRight= */ false,
/* halfwayToEdge= */ false);
}
}
/**
* Touch either on the right or the left corner of the screen, 1 pixel from the bottom and
* from the sides.
*/
public void touchTaskbarBottomCorner(boolean tapRight) {
try (LauncherInstrumentation.Closable e = mLauncher.eventsCheck()) {
Taskbar taskbar = new Taskbar(mLauncher);
taskbar.touchBottomCorner(tapRight);
verifyActiveContainer();
}
}

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

@@ -2014,21 +2014,41 @@ public final class LauncherInstrumentation {
}
/**
* Taps outside container to dismiss.
* Taps outside container to dismiss, centered vertically and halfway to the edge of the screen.
*
* @param container container to be dismissed
* @param tapRight tap on the right of the container if true, or left otherwise
*/
void touchOutsideContainer(UiObject2 container, boolean tapRight) {
touchOutsideContainer(container, tapRight, true);
}
/**
* Taps outside the container, to the right or left, and centered vertically.
*
* @param tapRight if true touches to the right of the container, otherwise touches on left
* @param halfwayToEdge if true touches halfway to the screen edge, if false touches 1 px from
* container
*/
void touchOutsideContainer(UiObject2 container, boolean tapRight, boolean halfwayToEdge) {
try (LauncherInstrumentation.Closable c = addContextLayer(
"want to tap outside container on the " + (tapRight ? "right" : "left"))) {
Rect containerBounds = getVisibleBounds(container);
int x;
if (halfwayToEdge) {
x = tapRight
? (containerBounds.right + getRealDisplaySize().x) / 2
: containerBounds.left / 2;
} else {
x = tapRight
? containerBounds.right + 1
: containerBounds.left - 1;
}
int y = containerBounds.top + containerBounds.height() / 2;
final long downTime = SystemClock.uptimeMillis();
final Point tapTarget = new Point(
tapRight
? (containerBounds.right + getRealDisplaySize().x) / 2
: containerBounds.left / 2,
containerBounds.top + 1);
final Point tapTarget = new Point(x, y);
sendPointer(downTime, downTime, MotionEvent.ACTION_DOWN, tapTarget,
LauncherInstrumentation.GestureScope.INSIDE);
sendPointer(downTime, downTime, MotionEvent.ACTION_UP, tapTarget,

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

@@ -71,6 +71,10 @@ public final class OverviewTask {
return mTask.getVisibleBounds().exactCenterX();
}
UiObject2 getUiObject() {
return mTask;
}
/**
* Dismisses the task by swiping up.
*/

30
tests/tapl/com/android/launcher3/tapl/Taskbar.java
View File

@@ -20,6 +20,7 @@ import static com.android.launcher3.testing.shared.TestProtocol.REQUEST_DISABLE_
import static com.android.launcher3.testing.shared.TestProtocol.REQUEST_ENABLE_MANUAL_TASKBAR_STASHING;
import android.graphics.Point;
import android.graphics.Rect;
import android.os.SystemClock;
import android.text.TextUtils;
import android.view.MotionEvent;
@@ -122,4 +123,33 @@ public final class Taskbar {
// Look for an icon with no text
return By.clazz(TextView.class).text("");
}
private Rect getVisibleBounds() {
return mLauncher.waitForSystemLauncherObject(TASKBAR_RES_ID).getVisibleBounds();
}
/**
* Touch either on the right or the left corner of the screen, 1 pixel from the bottom and
* from the sides.
*/
void touchBottomCorner(boolean tapRight) {
try (LauncherInstrumentation.Closable c = mLauncher.addContextLayer(
"want to tap bottom corner on the " + (tapRight ? "right" : "left"))) {
final long downTime = SystemClock.uptimeMillis();
final Point tapTarget = new Point(
tapRight
?
getVisibleBounds().right
- mLauncher.getTargetInsets().right
- 1
: getVisibleBounds().left
+ 1,
mLauncher.getRealDisplaySize().y - 1);
mLauncher.sendPointer(downTime, downTime, MotionEvent.ACTION_DOWN, tapTarget,
LauncherInstrumentation.GestureScope.INSIDE);
mLauncher.sendPointer(downTime, downTime, MotionEvent.ACTION_UP, tapTarget,
LauncherInstrumentation.GestureScope.INSIDE);
}
}
}