From 3be3f03e9082d06e68ac378fe3a27a3760cdbf6a Mon Sep 17 00:00:00 2001 From: vadimt Date: Fri, 26 Apr 2019 18:29:07 -0700 Subject: [PATCH] Attempt to fix broken tests by having different nav models Change-Id: I1adae9f5897269bda9019b1cce0479b6d4af1c72 Pixel1: 3 button Pixel2: 0 button Pixel3: 2 button --- .../com/android/launcher3/ui/AbstractLauncherUiTest.java | 8 ++++---- 1 file 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 86a5769564..3e84440b0c 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);