From bcddc529baf6695ee793ee293fa54e8214f4715d Mon Sep 17 00:00:00 2001 From: Menghan Li Date: Tue, 4 Mar 2025 08:54:43 +0000 Subject: [PATCH] chore(A11yFeedback): Removing Legacy Android M Menu Behavior Removed legacy code that suppressed search and help menus for accessibility features. This workaround was implemented in Android M (ag/10438579) and is no longer needed. Bug: 393980229 Test: Manual testing on Pixel and non-Pixel devices Flag: EXEMPT cleanup Change-Id: Ide4978bb5d2fdacad48399fb8525c6a0dfcd4277 --- .../LaunchAccessibilityActivityPreferenceFragment.java | 9 --------- .../ToggleAccessibilityServicePreferenceFragment.java | 9 --------- 2 files changed, 18 deletions(-) diff --git a/src/com/android/settings/accessibility/LaunchAccessibilityActivityPreferenceFragment.java b/src/com/android/settings/accessibility/LaunchAccessibilityActivityPreferenceFragment.java index 013fdeeb215..3287ce8ec51 100644 --- a/src/com/android/settings/accessibility/LaunchAccessibilityActivityPreferenceFragment.java +++ b/src/com/android/settings/accessibility/LaunchAccessibilityActivityPreferenceFragment.java @@ -31,8 +31,6 @@ import android.os.UserHandle; import android.text.TextUtils; import android.util.Log; import android.view.LayoutInflater; -import android.view.Menu; -import android.view.MenuInflater; import android.view.View; import android.view.ViewGroup; import android.view.accessibility.AccessibilityManager; @@ -115,13 +113,6 @@ public class LaunchAccessibilityActivityPreferenceFragment extends ToggleFeature return mTileComponentName; } - @Override - public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) { - // Do not call super. We don't want to see the "Help & feedback" option on this page so as - // not to confuse users who think they might be able to send feedback about a specific - // accessibility service from this page. - } - // IMPORTANT: Refresh the info since there are dynamically changing capabilities. private AccessibilityShortcutInfo getAccessibilityShortcutInfo() { final List infos = AccessibilityManager.getInstance( diff --git a/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java b/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java index 06bcdb7c2eb..3cd4bb6b3ed 100644 --- a/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java +++ b/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java @@ -39,8 +39,6 @@ import android.os.SystemClock; import android.text.BidiFormatter; import android.text.TextUtils; import android.util.Log; -import android.view.Menu; -import android.view.MenuInflater; import android.view.accessibility.AccessibilityManager; import android.widget.CompoundButton; @@ -75,13 +73,6 @@ public class ToggleAccessibilityServicePreferenceFragment extends return getArguments().getInt(AccessibilitySettings.EXTRA_METRICS_CATEGORY); } - @Override - public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) { - // Do not call super. We don't want to see the "Help & feedback" option on this page so as - // not to confuse users who think they might be able to send feedback about a specific - // accessibility service from this page. - } - @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState);