summaryrefslogtreecommitdiffstats
path: root/tests/src/com/android
diff options
context:
space:
mode:
authorvadimt <vadimt@google.com>2019-04-26 18:29:07 -0700
committervadimt <vadimt@google.com>2019-04-26 18:29:07 -0700
commit3be3f03e9082d06e68ac378fe3a27a3760cdbf6a (patch)
treeaab57e9c026f8c3763c29d2f3f77b3c309f66f8c /tests/src/com/android
parentb3a934d98485c05489154ef7ffd06bd3d7a583e0 (diff)
downloadandroid_packages_apps_Trebuchet-3be3f03e9082d06e68ac378fe3a27a3760cdbf6a.tar.gz
android_packages_apps_Trebuchet-3be3f03e9082d06e68ac378fe3a27a3760cdbf6a.tar.bz2
android_packages_apps_Trebuchet-3be3f03e9082d06e68ac378fe3a27a3760cdbf6a.zip
Attempt to fix broken tests by having different nav models
Change-Id: I1adae9f5897269bda9019b1cce0479b6d4af1c72 Pixel1: 3 button Pixel2: 0 button Pixel3: 2 button
Diffstat (limited to 'tests/src/com/android')
-rw-r--r--tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java8
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java b/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java
index 86a576956..3e84440b0 100644
--- a/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java
+++ b/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java
@@ -118,13 +118,13 @@ public abstract class AbstractLauncherUiTest {
int apiLevel = (int) getInt.invoke(null, "ro.product.first_api_level", 0);
if (apiLevel >= Build.VERSION_CODES.P) {
- setActiveOverlay(NAV_BAR_MODE_GESTURAL_OVERLAY,
- LauncherInstrumentation.NavigationModel.ZERO_BUTTON);
- }
- if (apiLevel >= Build.VERSION_CODES.O && apiLevel < Build.VERSION_CODES.P) {
setActiveOverlay(NAV_BAR_MODE_2BUTTON_OVERLAY,
LauncherInstrumentation.NavigationModel.TWO_BUTTON);
}
+ if (apiLevel >= Build.VERSION_CODES.O && apiLevel < Build.VERSION_CODES.P) {
+ setActiveOverlay(NAV_BAR_MODE_GESTURAL_OVERLAY,
+ LauncherInstrumentation.NavigationModel.ZERO_BUTTON);
+ }
if (apiLevel < Build.VERSION_CODES.O) {
setActiveOverlay(NAV_BAR_MODE_3BUTTON_OVERLAY,
LauncherInstrumentation.NavigationModel.THREE_BUTTON);