From bd0955dfd748494cfbc18f2ddee353ded1f5bdaa Mon Sep 17 00:00:00 2001 From: vadimt Date: Mon, 16 Mar 2020 12:43:10 -0700 Subject: [PATCH] Using cmd overlay enable-exclusive to switch nav modes Bug: 151598694 Change-Id: I7df6b7538f7233163868065b866b610c45dc7b46 (cherry picked from commit ccf083dc7d12b8f9fa39083fcf0c7663c7808e06) --- .../quickstep/NavigationModeSwitchRule.java | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/quickstep/tests/src/com/android/quickstep/NavigationModeSwitchRule.java b/quickstep/tests/src/com/android/quickstep/NavigationModeSwitchRule.java index cd94704228..6a66a8b8f4 100644 --- a/quickstep/tests/src/com/android/quickstep/NavigationModeSwitchRule.java +++ b/quickstep/tests/src/com/android/quickstep/NavigationModeSwitchRule.java @@ -167,12 +167,9 @@ public class NavigationModeSwitchRule implements TestRule { return false; } - setOverlayPackageEnabled(NAV_BAR_MODE_3BUTTON_OVERLAY, - overlayPackage == NAV_BAR_MODE_3BUTTON_OVERLAY); - setOverlayPackageEnabled(NAV_BAR_MODE_2BUTTON_OVERLAY, - overlayPackage == NAV_BAR_MODE_2BUTTON_OVERLAY); - setOverlayPackageEnabled(NAV_BAR_MODE_GESTURAL_OVERLAY, - overlayPackage == NAV_BAR_MODE_GESTURAL_OVERLAY); + Log.d(TAG, "setActiveOverlay: " + overlayPackage + "..."); + UiDevice.getInstance(getInstrumentation()).executeShellCommand( + "cmd overlay enable-exclusive " + overlayPackage); if (currentSysUiNavigationMode() != expectedMode) { final CountDownLatch latch = new CountDownLatch(1); @@ -204,14 +201,6 @@ public class NavigationModeSwitchRule implements TestRule { return true; } - private static void setOverlayPackageEnabled(String overlayPackage, boolean enable) - throws Exception { - Log.d(TAG, "setOverlayPackageEnabled: " + overlayPackage + " " + enable); - final String action = enable ? "enable" : "disable"; - UiDevice.getInstance(getInstrumentation()).executeShellCommand( - "cmd overlay " + action + " " + overlayPackage); - } - private static boolean packageExists(String packageName) { try { PackageManager pm = getInstrumentation().getContext().getPackageManager();