From 60eae5e01cb7c8f1392057e120c89cf462de889d Mon Sep 17 00:00:00 2001 From: shaoweishen Date: Thu, 4 Jul 2024 07:01:42 +0000 Subject: [PATCH] [Touchpad Setting] Hide Touchpad page when there's no connected one The option for entering page already has complete check condition. Update the same check logic to isSeachable in setting page to hide page when there's no touchpad connected. Also apply check on trackpadTouchGesture. Test: verify on device Bug: 346497646 Flag: EXEMPT bugfix Change-Id: I1730c7bd1fd2615dc1725ec0cc32293254e5b54a --- src/com/android/settings/inputmethod/TrackpadSettings.java | 3 ++- .../settings/inputmethod/TrackpadTouchGestureSettings.java | 3 ++- .../inputmethod/TrackpadTouchGestureSettingsController.java | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/com/android/settings/inputmethod/TrackpadSettings.java b/src/com/android/settings/inputmethod/TrackpadSettings.java index 49559333bfe..dca418a154d 100644 --- a/src/com/android/settings/inputmethod/TrackpadSettings.java +++ b/src/com/android/settings/inputmethod/TrackpadSettings.java @@ -56,7 +56,8 @@ public class TrackpadSettings extends DashboardFragment { @Override protected boolean isPageSearchEnabled(Context context) { return FeatureFlagUtils - .isEnabled(context, FeatureFlagUtils.SETTINGS_NEW_KEYBOARD_TRACKPAD); + .isEnabled(context, FeatureFlagUtils.SETTINGS_NEW_KEYBOARD_TRACKPAD) + && NewKeyboardSettingsUtils.isTouchpad(); } }; } diff --git a/src/com/android/settings/inputmethod/TrackpadTouchGestureSettings.java b/src/com/android/settings/inputmethod/TrackpadTouchGestureSettings.java index 9a4b90f4044..a6af3f651ba 100644 --- a/src/com/android/settings/inputmethod/TrackpadTouchGestureSettings.java +++ b/src/com/android/settings/inputmethod/TrackpadTouchGestureSettings.java @@ -58,7 +58,8 @@ public class TrackpadTouchGestureSettings extends DashboardFragment { return FeatureFlagUtils .isEnabled( context, - FeatureFlagUtils.SETTINGS_NEW_KEYBOARD_TRACKPAD_GESTURE); + FeatureFlagUtils.SETTINGS_NEW_KEYBOARD_TRACKPAD_GESTURE) + && NewKeyboardSettingsUtils.isTouchpad(); } }; } diff --git a/src/com/android/settings/inputmethod/TrackpadTouchGestureSettingsController.java b/src/com/android/settings/inputmethod/TrackpadTouchGestureSettingsController.java index 8f04aee1404..79497276aba 100644 --- a/src/com/android/settings/inputmethod/TrackpadTouchGestureSettingsController.java +++ b/src/com/android/settings/inputmethod/TrackpadTouchGestureSettingsController.java @@ -31,6 +31,7 @@ public class TrackpadTouchGestureSettingsController extends BasePreferenceContro public int getAvailabilityStatus() { boolean isFeatureOn = FeatureFlagUtils .isEnabled(mContext, FeatureFlagUtils.SETTINGS_NEW_KEYBOARD_TRACKPAD_GESTURE); - return isFeatureOn ? AVAILABLE : CONDITIONALLY_UNAVAILABLE; + boolean isTouchpad = NewKeyboardSettingsUtils.isTouchpad(); + return (isFeatureOn && isTouchpad) ? AVAILABLE : CONDITIONALLY_UNAVAILABLE; } }