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

Commit bd0955df authored by vadimt's avatar vadimt Committed by Vadim Tryshev
Browse files

Using cmd overlay enable-exclusive to switch nav modes 

Bug: 151598694
Change-Id: I7df6b7538f7233163868065b866b610c45dc7b46
(cherry picked from commit ccf083dc)
parent f7871fdb

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

+3 −14
Original line number Original line Diff line number Diff line
@@ -167,12 +167,9 @@ public class NavigationModeSwitchRule implements TestRule { 
            return false;

            return false;

        }

        }





        setOverlayPackageEnabled(NAV_BAR_MODE_3BUTTON_OVERLAY,

        Log.d(TAG, "setActiveOverlay: " + overlayPackage + "...");

                overlayPackage == NAV_BAR_MODE_3BUTTON_OVERLAY);

        UiDevice.getInstance(getInstrumentation()).executeShellCommand(

        setOverlayPackageEnabled(NAV_BAR_MODE_2BUTTON_OVERLAY,

                "cmd overlay enable-exclusive " + overlayPackage);

                overlayPackage == NAV_BAR_MODE_2BUTTON_OVERLAY);

        setOverlayPackageEnabled(NAV_BAR_MODE_GESTURAL_OVERLAY,

                overlayPackage == NAV_BAR_MODE_GESTURAL_OVERLAY);





        if (currentSysUiNavigationMode() != expectedMode) {

        if (currentSysUiNavigationMode() != expectedMode) {

            final CountDownLatch latch = new CountDownLatch(1);

            final CountDownLatch latch = new CountDownLatch(1);
@@ -204,14 +201,6 @@ public class NavigationModeSwitchRule implements TestRule { 
        return true;

        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) {

    private static boolean packageExists(String packageName) {

        try {

        try {

            PackageManager pm = getInstrumentation().getContext().getPackageManager();

            PackageManager pm = getInstrumentation().getContext().getPackageManager();