commit 46f24850ed8daaa0b94186398d8280f7a7e4ebf8
author Tracy Zhou <tracyzhou@google.com> Tue Aug 17 01:15:56 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Aug 17 01:15:56 2021 +0000
tree 21af81c5a7dc5f9fec5d02ab71b5b0228703c579
parent 974f20f333bb7e914c9b97d823407461059a4943
parent 180a7d97d76aac2df3b535472e9f289a3fc7147d

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

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

Change-Id: I7a51badb5f4ce4fade888c02ef20e24c5a21a272

tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java

diff --git a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
index 8d05b70..2ca40d8 100644
--- a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
+++ b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
@@ -622,9 +622,7 @@
     }
 
     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 @@
                 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 @@
                             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:");