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

Merge "Flag cleanup: keyboard_a11y_(bounce/slow/sticky)_keys_flag" into main

Browse Source
This commit is contained in:
Vaibhav Devmurari
2025-02-11 04:03:17 -08:00
committed by Android (Google) Code Review
parent 2c916f11e2 a55fbee143
commit 9dc7367909
4 changed files with 24 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/android/settings/inputmethod/KeyboardAccessibilityBounceKeysController.java
View File

@@ -53,13 +53,6 @@ public class KeyboardAccessibilityBounceKeysController extends
mPrimaryPreference = screen.findPreference(getPreferenceKey());
}
@Override
public int getAvailabilityStatus() {
return (super.getAvailabilityStatus() == AVAILABLE)
&& InputSettings.isAccessibilityBounceKeysFeatureEnabled() ? AVAILABLE
: UNSUPPORTED_ON_DEVICE;
}
@Override
public boolean handlePreferenceTreeClick(@NonNull Preference preference) {
if (!TextUtils.equals(preference.getKey(), getPreferenceKey())

7
src/com/android/settings/inputmethod/KeyboardAccessibilitySlowKeysController.java
View File

@@ -65,13 +65,6 @@ public class KeyboardAccessibilitySlowKeysController extends
return true;
}
@Override
public int getAvailabilityStatus() {
return (super.getAvailabilityStatus() == AVAILABLE)
&& InputSettings.isAccessibilitySlowKeysFeatureFlagEnabled() ? AVAILABLE
: UNSUPPORTED_ON_DEVICE;
}
@Override
protected void onInputSettingUpdated() {
if (mPrimarySwitchPreference != null) {

7
src/com/android/settings/inputmethod/KeyboardAccessibilityStickyKeysController.java
View File

@@ -60,13 +60,6 @@ public class KeyboardAccessibilityStickyKeysController extends
return true;
}
@Override
public int getAvailabilityStatus() {
return (super.getAvailabilityStatus() == AVAILABLE)
&& InputSettings.isAccessibilitySlowKeysFeatureFlagEnabled() ? AVAILABLE
: UNSUPPORTED_ON_DEVICE;
}
@Override
protected void onInputSettingUpdated() {
if (mTwoStatePreference != null) {

69
src/com/android/settings/inputmethod/PhysicalKeyboardFragment.java
View File

@@ -169,16 +169,13 @@ public final class PhysicalKeyboardFragment extends DashboardFragment
mKeyboardAssistanceCategory.removePreference(
findPreference(ACCESSIBILITY_PHYSICAL_KEYBOARD_A11Y));
}
if (!InputSettings.isAccessibilityBounceKeysFeatureEnabled()
|| isKeyboardAndTouchpadA11yNewPageEnabled) {
if (isKeyboardAndTouchpadA11yNewPageEnabled) {
mKeyboardA11yCategory.removePreference(mAccessibilityBounceKeys);
}
if (!InputSettings.isAccessibilitySlowKeysFeatureFlagEnabled()
|| isKeyboardAndTouchpadA11yNewPageEnabled) {
if (isKeyboardAndTouchpadA11yNewPageEnabled) {
mKeyboardA11yCategory.removePreference(mAccessibilitySlowKeys);
}
if (!InputSettings.isAccessibilityStickyKeysFeatureEnabled()
|| isKeyboardAndTouchpadA11yNewPageEnabled) {
if (isKeyboardAndTouchpadA11yNewPageEnabled) {
mKeyboardA11yCategory.removePreference(mAccessibilityStickyKeys);
}
if (!InputSettings.isAccessibilityMouseKeysFeatureFlagEnabled()
@@ -338,15 +335,12 @@ public final class PhysicalKeyboardFragment extends DashboardFragment
mFeatureProvider.registerKeyboardInformationCategory(preferenceScreen);
}
if (InputSettings.isAccessibilityBounceKeysFeatureEnabled()
|| InputSettings.isAccessibilityStickyKeysFeatureEnabled()
|| InputSettings.isAccessibilitySlowKeysFeatureFlagEnabled()
|| InputSettings.isAccessibilityMouseKeysFeatureFlagEnabled()) {
Objects.requireNonNull(mKeyboardA11yCategory).setOrder(2);
preferenceScreen.addPreference(mKeyboardA11yCategory);
updateAccessibilityBounceKeysSwitch(context);
updateAccessibilitySlowKeysSwitch(context);
updateAccessibilityStickyKeysSwitch(context);
Objects.requireNonNull(mKeyboardA11yCategory).setOrder(2);
preferenceScreen.addPreference(mKeyboardA11yCategory);
updateAccessibilityStickyKeysSwitch(context);
updateAccessibilityBounceKeysSwitch(context);
updateAccessibilitySlowKeysSwitch(context);
if (InputSettings.isAccessibilityMouseKeysFeatureFlagEnabled()) {
updateAccessibilityMouseKeysSwitch(context);
}
}
@@ -370,27 +364,21 @@ public final class PhysicalKeyboardFragment extends DashboardFragment
false,
mContentObserver,
UserHandle.myUserId());
if (InputSettings.isAccessibilityBounceKeysFeatureEnabled()) {
contentResolver.registerContentObserver(
sAccessibilityBounceKeysUri,
false,
mContentObserver,
UserHandle.myUserId());
}
if (InputSettings.isAccessibilitySlowKeysFeatureFlagEnabled()) {
contentResolver.registerContentObserver(
sAccessibilitySlowKeysUri,
false,
mContentObserver,
UserHandle.myUserId());
}
if (InputSettings.isAccessibilityStickyKeysFeatureEnabled()) {
contentResolver.registerContentObserver(
sAccessibilityStickyKeysUri,
false,
mContentObserver,
UserHandle.myUserId());
}
contentResolver.registerContentObserver(
sAccessibilityBounceKeysUri,
false,
mContentObserver,
UserHandle.myUserId());
contentResolver.registerContentObserver(
sAccessibilitySlowKeysUri,
false,
mContentObserver,
UserHandle.myUserId());
contentResolver.registerContentObserver(
sAccessibilityStickyKeysUri,
false,
mContentObserver,
UserHandle.myUserId());
if (InputSettings.isAccessibilityMouseKeysFeatureFlagEnabled()) {
contentResolver.registerContentObserver(
sAccessibilityMouseKeysUri,
@@ -413,25 +401,16 @@ public final class PhysicalKeyboardFragment extends DashboardFragment
}
private void updateAccessibilityBounceKeysSwitch(@NonNull Context context) {
if (!InputSettings.isAccessibilityBounceKeysFeatureEnabled()) {
return;
}
Objects.requireNonNull(mAccessibilityBounceKeys).setChecked(
InputSettings.isAccessibilityBounceKeysEnabled(context));
}
private void updateAccessibilitySlowKeysSwitch(@NonNull Context context) {
if (!InputSettings.isAccessibilitySlowKeysFeatureFlagEnabled()) {
return;
}
Objects.requireNonNull(mAccessibilitySlowKeys).setChecked(
InputSettings.isAccessibilitySlowKeysEnabled(context));
}
private void updateAccessibilityStickyKeysSwitch(@NonNull Context context) {
if (!InputSettings.isAccessibilityStickyKeysFeatureEnabled()) {
return;
}
Objects.requireNonNull(mAccessibilityStickyKeys).setChecked(
InputSettings.isAccessibilityStickyKeysEnabled(context));
}