PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Holly Jiuyu Sun
2023-08-23 19:09:27 +00:00
committed by Automerger Merge Worker
parent b3c3c72502 ef6ac74a15
commit 694c9db7f4
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/core/FeatureFlags.java
View File

@@ -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";
}

3
src/com/android/settings/gestures/SystemNavigationPreferenceController.java
View File

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