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

Merge "Update LauncherInstrumentation to consider tablet w/o nav bar" into sc-v2-dev am: 180a7d97d7

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

Change-Id: I7a51badb5f4ce4fade888c02ef20e24c5a21a272
This commit is contained in:
Tracy Zhou
2021-08-17 01:15:56 +00:00
committed by Automerger Merge Worker
parent 974f20f333 180a7d97d7
commit 46f24850ed
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
+6 -7
View File
@@ -622,9 +622,7 @@ public final class LauncherInstrumentation {
}
private String getNavigationButtonResPackage() {
return isTablet() && getNavigationModel() == NavigationModel.THREE_BUTTON ?
getLauncherPackageName() :
SYSTEMUI_PACKAGE;
return isTablet() ? getLauncherPackageName() : SYSTEMUI_PACKAGE;
}
private UiObject2 verifyContainerType(ContainerType containerType) {
@@ -755,11 +753,11 @@ public final class LauncherInstrumentation {
boolean gestureStartFromLauncher = isTablet()
? !isLauncher3() || hasLauncherObject(WORKSPACE_RES_ID)
: isLauncherVisible();
GestureScope gestureScope = gestureStartFromLauncher
? GestureScope.INSIDE_TO_OUTSIDE
: GestureScope.OUTSIDE_WITH_PILFER;
if (hasLauncherObject(CONTEXT_MENU_RES_ID)) {
GestureScope gestureScope = gestureStartFromLauncher
? (isTablet()? GestureScope.INSIDE : GestureScope.INSIDE_TO_OUTSIDE)
: GestureScope.OUTSIDE_WITH_PILFER;
linearGesture(
displaySize.x / 2, displaySize.y - 1,
displaySize.x / 2, 0,
@@ -782,7 +780,8 @@ public final class LauncherInstrumentation {
displaySize.x / 2, displaySize.y - 1,
displaySize.x / 2, 0,
ZERO_BUTTON_STEPS_FROM_BACKGROUND_TO_HOME, NORMAL_STATE_ORDINAL,
gestureScope);
gestureStartFromLauncher ? GestureScope.INSIDE_TO_OUTSIDE
: GestureScope.OUTSIDE_WITH_PILFER);
}
} else {
log("Hierarchy before clicking home:");