PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix TaplTestsLauncher.testWorkspace's page expectation for 2 panel" into sc-v2-dev am: 3c7bde72f7

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

Change-Id: I0a4971b48f8c82b98f5bc0ba45cd8d0140e04358
This commit is contained in:
Alex Chau
2021-07-02 21:06:36 +00:00
committed by Automerger Merge Worker
parent b0b343324f 3c7bde72f7
commit 0666a16689
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java
+10 -5
View File
@@ -80,8 +80,12 @@ public class TaplTestsLauncher3 extends AbstractLauncherUiTest {
assertTrue(message, failed);
}
private int pagesPerScreen() {
return mLauncher.isTablet() ? 2 : 1;
}
private boolean isWorkspaceScrollable(Launcher launcher) {
return launcher.getWorkspace().getPageCount() > 1;
return launcher.getWorkspace().getPageCount() > pagesPerScreen();
}
private int getCurrentWorkspacePage(Launcher launcher) {
@@ -195,8 +199,9 @@ public class TaplTestsLauncher3 extends AbstractLauncherUiTest {
workspace.ensureWorkspaceIsScrollable();
executeOnLauncher(
launcher -> assertEquals("Ensuring workspace scrollable didn't switch to page #1",
1, getCurrentWorkspacePage(launcher)));
launcher -> assertEquals(
"Ensuring workspace scrollable didn't switch to next screen",
pagesPerScreen(), getCurrentWorkspacePage(launcher)));
executeOnLauncher(
launcher -> assertTrue("ensureScrollable didn't make workspace scrollable",
isWorkspaceScrollable(launcher)));
@@ -212,8 +217,8 @@ public class TaplTestsLauncher3 extends AbstractLauncherUiTest {
workspace.flingForward();
executeOnLauncher(
launcher -> assertEquals("Flinging forward didn't switch workspace to page #1",
1, getCurrentWorkspacePage(launcher)));
launcher -> assertEquals("Flinging forward didn't switch workspace to next screen",
pagesPerScreen(), getCurrentWorkspacePage(launcher)));
assertTrue("Launcher internal state is not Home", isInState(() -> LauncherState.NORMAL));
// Test starting a workspace app.
tests/tapl/com/android/launcher3/tapl/Workspace.java
+1 -1
View File
@@ -163,7 +163,7 @@ public final class Workspace extends Home {
}
private boolean isWorkspaceScrollable(UiObject2 workspace) {
return workspace.getChildCount() > 1;
return workspace.getChildCount() > (mLauncher.isTablet() ? 2 : 1);
}
@NonNull