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

Commit ecb94f54 authored by Tracy Zhou's avatar Tracy Zhou
Browse files

Enable nav bar overlay when gestural nav is enabled and tune edge swipe 

width.

Fixes: 128680874, 128711028
Test: Manual
Change-Id: I371819c6f6206f2bbc8599c0b14b4da9b67a2e14
parent 7099f1ce

src/com/android/settings/gestures/SystemNavigationPreferenceController.java

+4 −1
Original line number Original line Diff line number Diff line
@@ -51,13 +51,15 @@ public abstract class SystemNavigationPreferenceController extends GesturePrefer 
    private static final String ENABLE_ASSISTANT_GESTURE = "ENABLE_ASSISTANT_GESTURE";

    private static final String ENABLE_ASSISTANT_GESTURE = "ENABLE_ASSISTANT_GESTURE";

    private static final String PROTOTYPE_ENABLED = "prototype_enabled";

    private static final String PROTOTYPE_ENABLED = "prototype_enabled";





    private static final int EDGE_SENSITIVITY_WIDTH = 32;

    private static final int EDGE_SENSITIVITY_WIDTH = 48;

    private static final String EDGE_SENSITIVITY_KEY = "quickstepcontroller_edge_width_sensitivity";

    private static final String EDGE_SENSITIVITY_KEY = "quickstepcontroller_edge_width_sensitivity";





    private static final String GESTURES_MATCH_MAP_OFF = "000000";

    private static final String GESTURES_MATCH_MAP_OFF = "000000";

    private static final String GESTURES_MATCH_MAP_ON = "071133";

    private static final String GESTURES_MATCH_MAP_ON = "071133";

    private static final String GESTURES_MATCH_MAP_KEY = "quickstepcontroller_gesture_match_map";

    private static final String GESTURES_MATCH_MAP_KEY = "quickstepcontroller_gesture_match_map";





    private static final String OVERLAY_NAVBAR_KEY =

            "com.android.internal.experiment.navbar.default";

    private static final String OVERLAY_NAVBAR_TYPE_INSET =

    private static final String OVERLAY_NAVBAR_TYPE_INSET =

            "com.android.internal.experiment.navbar.type.inset";

            "com.android.internal.experiment.navbar.type.inset";

    private static final String OVERLAY_NAVBAR_TYPE_FLOATING =

    private static final String OVERLAY_NAVBAR_TYPE_FLOATING =
@@ -174,6 +176,7 @@ public abstract class SystemNavigationPreferenceController extends GesturePrefer 
                .asInterface(ServiceManager.getService(Context.OVERLAY_SERVICE));

                .asInterface(ServiceManager.getService(Context.OVERLAY_SERVICE));

        if (overlayManager != null) {

        if (overlayManager != null) {

            try {

            try {

                overlayManager.setEnabled(OVERLAY_NAVBAR_KEY, true, USER_SYSTEM);

                overlayManager.setEnabled(OVERLAY_NAVBAR_TYPE_FLOATING, false, USER_SYSTEM);

                overlayManager.setEnabled(OVERLAY_NAVBAR_TYPE_FLOATING, false, USER_SYSTEM);

                overlayManager.setEnabled(OVERLAY_NAVBAR_TYPE_INSET, enable, USER_SYSTEM);

                overlayManager.setEnabled(OVERLAY_NAVBAR_TYPE_INSET, enable, USER_SYSTEM);

            } catch (RemoteException e) {

            } catch (RemoteException e) {