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

Merge "Add test to dismiss AllApps by swipe up to home gesture." into udc-qpr-dev

Browse Source
This commit is contained in:
Pat Manning
2023-08-17 21:09:12 +00:00
committed by Android (Google) Code Review
parent 828f9f326e 39521ce7a5
commit bbf481b6b9
2 changed files with 25 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java
View File

@@ -229,7 +229,18 @@ public class TaplTestsLauncher3 extends AbstractLauncherUiTest {
@PortraitLandscape
public void testAllAppsSwitchToWorkspace() {
assertNotNull("switchToWorkspace() returned null",
mLauncher.getWorkspace().switchToAllApps().switchToWorkspace());
mLauncher.getWorkspace().switchToAllApps()
.switchToWorkspace(/* swipeDown= */ true));
assertTrue("Launcher internal state is not Workspace",
isInState(() -> LauncherState.NORMAL));
}
@Test
@PortraitLandscape
public void testAllAppsSwipeUpToWorkspace() {
assertNotNull("testAllAppsSwipeUpToWorkspace() returned null",
mLauncher.getWorkspace().switchToAllApps()
.switchToWorkspace(/* swipeDown= */ false));
assertTrue("Launcher internal state is not Workspace",
isInState(() -> LauncherState.NORMAL));
}

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

@@ -30,23 +30,28 @@ public class HomeAllApps extends AllApps {
}
/**
* Swipes down to Workspace.
* Swipes up or down to dismiss to Workspace.
* @param swipeDown Swipe all apps down to dismiss, otherwise swipe up to dismiss by going home.
*
* @return the Workspace object.
*/
@NonNull
public Workspace switchToWorkspace() {
public Workspace switchToWorkspace(boolean swipeDown) {
try (LauncherInstrumentation.Closable e = mLauncher.eventsCheck();
LauncherInstrumentation.Closable c =
mLauncher.addContextLayer("want to switch from all apps to workspace")) {
UiObject2 allAppsContainer = verifyActiveContainer();
final int startX = allAppsContainer.getVisibleCenter().x;
final int startY = getTopVisibleIconBounds(allAppsContainer).centerY();
final int endY = mLauncher.getDevice().getDisplayHeight();
final int startY = swipeDown ? getTopVisibleIconBounds(allAppsContainer).centerY()
: mLauncher.getDevice().getDisplayHeight();
final int endY =
swipeDown ? mLauncher.getDevice().getDisplayHeight() : getTopVisibleIconBounds(
allAppsContainer).centerY();
LauncherInstrumentation.log(
"switchToWorkspace: startY = " + startY + ", endY = " + endY
+ ", slop = " + mLauncher.getTouchSlop());
+ ", slop = " + mLauncher.getTouchSlop()
+ ", swipeDown = " + swipeDown);
mLauncher.swipeToState(
startX,
@@ -54,7 +59,9 @@ public class HomeAllApps extends AllApps {
startX,
endY,
5 /* steps */,
NORMAL_STATE_ORDINAL, LauncherInstrumentation.GestureScope.INSIDE);
NORMAL_STATE_ORDINAL,
swipeDown ? LauncherInstrumentation.GestureScope.INSIDE
: LauncherInstrumentation.GestureScope.OUTSIDE_WITH_PILFER);
try (LauncherInstrumentation.Closable c1 = mLauncher.addContextLayer(
"swiped to workspace")) {