From 7506ee034f6399ad529d47c0ee478dd6ff580a4f Mon Sep 17 00:00:00 2001 From: Pranav Vashi Date: Wed, 26 Mar 2025 21:53:46 +0530 Subject: [PATCH] Settings: Do not hide navigation modes * We have customization for 3 buttons included here. * Instead hide "Gesture Navigation" if config_swipe_up_gesture_setting_available is disabled. Signed-off-by: Pranav Vashi --- .../gestures/SystemNavigationGestureSettings.java | 8 +++++--- .../gestures/SystemNavigationPreferenceController.java | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/com/android/settings/gestures/SystemNavigationGestureSettings.java b/src/com/android/settings/gestures/SystemNavigationGestureSettings.java index cf4a3adab91..87f23056a0c 100644 --- a/src/com/android/settings/gestures/SystemNavigationGestureSettings.java +++ b/src/com/android/settings/gestures/SystemNavigationGestureSettings.java @@ -201,7 +201,8 @@ public class SystemNavigationGestureSettings extends RadioButtonPickerFragment i List candidates = new ArrayList<>(); if (SystemNavigationPreferenceController.isOverlayPackageAvailable(c, - NAV_BAR_MODE_GESTURAL_OVERLAY)) { + NAV_BAR_MODE_GESTURAL_OVERLAY) + && SystemNavigationPreferenceController.isGestureAvailable(c)) { candidates.add(new CandidateInfoExtra( c.getText(R.string.edge_to_edge_navigation_title), c.getText(R.string.edge_to_edge_navigation_summary), @@ -344,7 +345,7 @@ public class SystemNavigationGestureSettings extends RadioButtonPickerFragment i @Override protected boolean isPageSearchEnabled(Context context) { - return SystemNavigationPreferenceController.isGestureAvailable(context); + return true; } @Override @@ -354,7 +355,8 @@ public class SystemNavigationGestureSettings extends RadioButtonPickerFragment i final List result = new ArrayList<>(); if (SystemNavigationPreferenceController.isOverlayPackageAvailable(context, - NAV_BAR_MODE_GESTURAL_OVERLAY)) { + NAV_BAR_MODE_GESTURAL_OVERLAY) && + SystemNavigationPreferenceController.isGestureAvailable(context)) { SearchIndexableRaw data = new SearchIndexableRaw(context); data.title = res.getString(R.string.edge_to_edge_navigation_title); data.key = KEY_SYSTEM_NAV_GESTURAL; diff --git a/src/com/android/settings/gestures/SystemNavigationPreferenceController.java b/src/com/android/settings/gestures/SystemNavigationPreferenceController.java index 797c0c0f7b9..6c92bae6b54 100644 --- a/src/com/android/settings/gestures/SystemNavigationPreferenceController.java +++ b/src/com/android/settings/gestures/SystemNavigationPreferenceController.java @@ -42,7 +42,7 @@ public class SystemNavigationPreferenceController extends BasePreferenceControll @Override public int getAvailabilityStatus() { - return isGestureAvailable(mContext) ? AVAILABLE : UNSUPPORTED_ON_DEVICE; + return AVAILABLE; } @Override