Merge "Using cmd overlay enable-exclusive to switch nav modes" into ub-launcher3-master (661e0f18) · Commits · e / os / android_packages_apps_Trebuchet

quickstep/tests/src/com/android/quickstep/NavigationModeSwitchRule.java

+3 −14

Original line number	Diff line number	Diff line
		@@ -166,12 +166,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);
		@@ -210,14 +207,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();