| commit | 694c9db7f4c0424f2b49d1d724bf524f5fc26fc1 | [log] [tgz] |
|---|---|---|
| author | Holly Jiuyu Sun <jiuyu@google.com> | Wed Aug 23 19:09:27 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Aug 23 19:09:27 2023 +0000 |
| tree | c87cf8b0d5e77a5dd8e0606f7cb1e4c785d6cd63 | |
| parent | b3c3c72502f0569bb6c63f6de098f8eba491ed31 [diff] | |
| parent | ef6ac74a1599b924d7cad108060102720260fc94 [diff] |
Merge "Update Gesture navigation page to support search." into udc-qpr-dev am: ef6ac74a15 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24452189 Change-Id: I6b623e251477a80517a5469a686f77969ad49239 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/src/com/android/settings/core/FeatureFlags.java b/src/com/android/settings/core/FeatureFlags.java index 1a97ca9..fb552d7 100644 --- a/src/com/android/settings/core/FeatureFlags.java +++ b/src/com/android/settings/core/FeatureFlags.java
@@ -30,4 +30,6 @@ 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"; }
diff --git a/src/com/android/settings/gestures/SystemNavigationPreferenceController.java b/src/com/android/settings/gestures/SystemNavigationPreferenceController.java index ab83a9d..ccdb257 100644 --- a/src/com/android/settings/gestures/SystemNavigationPreferenceController.java +++ b/src/com/android/settings/gestures/SystemNavigationPreferenceController.java
@@ -52,7 +52,8 @@ } } - 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)) {