| commit | 7fd3c6fc66dd6180e004d3a620820e277fe8c796 | [log] [tgz] |
|---|---|---|
| author | Vadim Tryshev <vadimt@google.com> | Mon Apr 29 16:36:47 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Apr 29 16:36:47 2019 -0700 |
| tree | c49e9c6dca489f27425a288660553e7973055fa3 | |
| parent | 51f364a184def405f20a354e4ff6fe265fa357ca [diff] | |
| parent | ac8494bfd9caa42e56cc0fc195a000ad7622c938 [diff] |
Merge "Not switching nav mode on a virtual device for now" into ub-launcher3-qt-dev am: ac8494bfd9 Change-Id: I8d2fe47624b8c4959187f9092fe4207806de854b
diff --git a/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java b/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java index 3e84440..dedc6b3 100644 --- a/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java +++ b/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java
@@ -111,7 +111,7 @@ 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);
diff --git a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java index 27bc43e..f5c5a8d 100644 --- a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java +++ b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
@@ -191,7 +191,7 @@ return NavigationModel.THREE_BUTTON; } - static boolean needSlowGestures() { + public static boolean needSlowGestures() { return Build.MODEL.contains("Cuttlefish"); }