commit c1fcdd8b6c048cc8202332558ff89d7297b08363
author Asmita Poddar <asmitapoddar@google.com> Wed Jul 02 11:51:00 2025 +0000
committer Asmita Poddar <asmitapoddar@google.com> Thu Jul 03 15:49:26 2025 +0000
tree f199487466bbec214bfeb46ded63c008adc23f3c
parent 0315887c6d0a5cf80a367fc13ad64b45f7b47e72

Remove flag KeyboardA11yMouseKeys

Bug: 409610617
Test: Presubmit
Flag: EXEMPT removing com.android.hardware.input.keyboard_a11y_mouse_keys
Change-Id: I1d29593ca566134b433f06252a045104680ac82c

src/com/android/settings/inputmethod/KeyboardAccessibilityMouseKeysController.java

diff --git a/src/com/android/settings/inputmethod/KeyboardAccessibilityMouseKeysController.java b/src/com/android/settings/inputmethod/KeyboardAccessibilityMouseKeysController.java
index a8d9f30..08eb1e0 100644
--- a/src/com/android/settings/inputmethod/KeyboardAccessibilityMouseKeysController.java
+++ b/src/com/android/settings/inputmethod/KeyboardAccessibilityMouseKeysController.java
@@ -72,13 +72,6 @@
     }
 
     @Override
-    public int getAvailabilityStatus() {
-        return (super.getAvailabilityStatus() == AVAILABLE)
-                && InputSettings.isAccessibilityMouseKeysFeatureFlagEnabled() ? AVAILABLE
-                : UNSUPPORTED_ON_DEVICE;
-    }
-
-    @Override
     protected void onInputSettingUpdated() {
         if (mPrimaryPreference != null) {
             mPrimaryPreference.setChecked(

src/com/android/settings/inputmethod/PhysicalKeyboardFragment.java

diff --git a/src/com/android/settings/inputmethod/PhysicalKeyboardFragment.java b/src/com/android/settings/inputmethod/PhysicalKeyboardFragment.java
index 5bdb9e7..e9687b8 100644
--- a/src/com/android/settings/inputmethod/PhysicalKeyboardFragment.java
+++ b/src/com/android/settings/inputmethod/PhysicalKeyboardFragment.java
@@ -178,8 +178,7 @@
         if (isKeyboardAndTouchpadA11yNewPageEnabled) {
             mKeyboardA11yCategory.removePreference(mAccessibilityStickyKeys);
         }
-        if (!InputSettings.isAccessibilityMouseKeysFeatureFlagEnabled()
-                || isKeyboardAndTouchpadA11yNewPageEnabled) {
+        if (isKeyboardAndTouchpadA11yNewPageEnabled) {
             mKeyboardA11yCategory.removePreference(mAccessibilityMouseKeys);
         }
         if (isKeyboardAndTouchpadA11yNewPageEnabled) {
@@ -340,9 +339,7 @@
         updateAccessibilityStickyKeysSwitch(context);
         updateAccessibilityBounceKeysSwitch(context);
         updateAccessibilitySlowKeysSwitch(context);
-        if (InputSettings.isAccessibilityMouseKeysFeatureFlagEnabled()) {
-            updateAccessibilityMouseKeysSwitch(context);
-        }
+        updateAccessibilityMouseKeysSwitch(context);
     }
 
     private void showEnabledLocalesKeyboardLayoutList(InputDeviceIdentifier inputDeviceIdentifier) {
@@ -379,13 +376,11 @@
                 false,
                 mContentObserver,
                 UserHandle.myUserId());
-        if (InputSettings.isAccessibilityMouseKeysFeatureFlagEnabled()) {
-            contentResolver.registerContentObserver(
-                    sAccessibilityMouseKeysUri,
-                    false,
-                    mContentObserver,
-                    UserHandle.myUserId());
-        }
+        contentResolver.registerContentObserver(
+                sAccessibilityMouseKeysUri,
+                false,
+                mContentObserver,
+                UserHandle.myUserId());
         final Context context = getContext();
         updateAccessibilityBounceKeysSwitch(context);
         updateAccessibilitySlowKeysSwitch(context);
@@ -416,9 +411,6 @@
     }
 
     private void updateAccessibilityMouseKeysSwitch(@NonNull Context context) {
-        if (!InputSettings.isAccessibilityMouseKeysFeatureFlagEnabled()) {
-            return;
-        }
         Objects.requireNonNull(mAccessibilityMouseKeys).setChecked(
                 InputSettings.isAccessibilityMouseKeysEnabled(context));
     }