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

Commit ef6ac74a authored by Holly Jiuyu Sun's avatar Holly Jiuyu Sun Committed by Android (Google) Code Review
Browse files

Merge "Update Gesture navigation page to support search." into udc-qpr-dev

parents be8b899e e23520d5

src/com/android/settings/core/FeatureFlags.java

+2 −0
Original line number Diff line number Diff line
@@ -30,4 +30,6 @@ public class FeatureFlags { 
    public static final String CONTEXTUAL_HOME = "settings_contextual_home";

    public static final String SETTINGS_SEARCH_ALWAYS_EXPAND =

            "settings_search_always_expand";

    public static final String PRESS_HOLD_NAV_HANDLE_TO_SEARCH =

            "settings_press_hold_nav_handle_to_search";

}

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

+2 −1
Original line number Diff line number Diff line
@@ -52,7 +52,8 @@ public class SystemNavigationPreferenceController extends BasePreferenceControll 
        }

    }



    static boolean isGestureAvailable(Context context) {

    /** Returns {@code true} if gesture is available. */

    public static boolean isGestureAvailable(Context context) {

        // Skip if the swipe up settings are not available

        if (!context.getResources().getBoolean(

                com.android.internal.R.bool.config_swipe_up_gesture_setting_available)) {