Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7d9fafaa authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Using cmd overlay enable-exclusive to switch nav modes am: bd0955df 

Change-Id: Ib6b7e135e52398a559b426b1283a50ac0ecee64b
parents dc651709 bd0955df

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

+3 −14
Original line number Diff line number Diff line
@@ -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();