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

Merge "[Touchpad Setting] Hide Touchpad page when there's no connected one" into main

Browse Source
This commit is contained in:
Shaowei Shen
2024-07-08 03:55:14 +00:00
committed by Android (Google) Code Review
parent 606f9b1727 60eae5e01c
commit 76129cbe23
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/inputmethod/TrackpadSettings.java
View File

@@ -56,7 +56,8 @@ public class TrackpadSettings extends DashboardFragment {
@Override @Override
protected boolean isPageSearchEnabled(Context context) { protected boolean isPageSearchEnabled(Context context) {
return FeatureFlagUtils return FeatureFlagUtils
.isEnabled(context, FeatureFlagUtils.SETTINGS_NEW_KEYBOARD_TRACKPAD); .isEnabled(context, FeatureFlagUtils.SETTINGS_NEW_KEYBOARD_TRACKPAD)
&& NewKeyboardSettingsUtils.isTouchpad();
} }
}; };
} }

3
src/com/android/settings/inputmethod/TrackpadTouchGestureSettings.java
View File

@@ -58,7 +58,8 @@ public class TrackpadTouchGestureSettings extends DashboardFragment {
return FeatureFlagUtils return FeatureFlagUtils
.isEnabled( .isEnabled(
context, context,
FeatureFlagUtils.SETTINGS_NEW_KEYBOARD_TRACKPAD_GESTURE); FeatureFlagUtils.SETTINGS_NEW_KEYBOARD_TRACKPAD_GESTURE)
&& NewKeyboardSettingsUtils.isTouchpad();
} }
}; };
} }

3
src/com/android/settings/inputmethod/TrackpadTouchGestureSettingsController.java
View File

@@ -31,6 +31,7 @@ public class TrackpadTouchGestureSettingsController extends BasePreferenceContro
public int getAvailabilityStatus() { public int getAvailabilityStatus() {
boolean isFeatureOn = FeatureFlagUtils boolean isFeatureOn = FeatureFlagUtils
.isEnabled(mContext, FeatureFlagUtils.SETTINGS_NEW_KEYBOARD_TRACKPAD_GESTURE); .isEnabled(mContext, FeatureFlagUtils.SETTINGS_NEW_KEYBOARD_TRACKPAD_GESTURE);
return isFeatureOn ? AVAILABLE : CONDITIONALLY_UNAVAILABLE; boolean isTouchpad = NewKeyboardSettingsUtils.isTouchpad();
return (isFeatureOn && isTouchpad) ? AVAILABLE : CONDITIONALLY_UNAVAILABLE;
} }
} }