Merge "Not switching nav mode on a virtual device for now" into ub-launcher3-qt-dev

tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java

@@ -111,7 +111,7 @@ public abstract class AbstractLauncherUiTest {
         mLauncher = new LauncherInstrumentation(instrumentation);
 
         // b/130558787; b/131419978
-        if (TestHelpers.isInLauncherProcess()) {
+        if (TestHelpers.isInLauncherProcess() && !LauncherInstrumentation.needSlowGestures()) {
             try {
                 Class systemProps = Class.forName("android.os.SystemProperties");
                 Method getInt = systemProps.getMethod("getInt", String.class, int.class);

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

@@ -191,7 +191,7 @@ public final class LauncherInstrumentation {
         return NavigationModel.THREE_BUTTON;
     }
 
-    static boolean needSlowGestures() {
+    public static boolean needSlowGestures() {
         return Build.MODEL.contains("Cuttlefish");
     }