commit 3be3f03e9082d06e68ac378fe3a27a3760cdbf6a
author vadimt <vadimt@google.com> Fri Apr 26 18:29:07 2019 -0700
committer vadimt <vadimt@google.com> Fri Apr 26 18:29:07 2019 -0700
tree aab57e9c026f8c3763c29d2f3f77b3c309f66f8c
parent b3a934d98485c05489154ef7ffd06bd3d7a583e0

Attempt to fix broken tests by having different nav models

Change-Id: I1adae9f5897269bda9019b1cce0479b6d4af1c72
Pixel1: 3 button
Pixel2: 0 button
Pixel3: 2 button

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

diff --git a/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java b/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java
index 86a5769..3e84440 100644
--- a/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java
+++ b/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java
@@ -118,13 +118,13 @@
                 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);