Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bcddc529 authored by Menghan Li's avatar Menghan Li
Browse files

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
parent c26eb7fd

src/com/android/settings/accessibility/LaunchAccessibilityActivityPreferenceFragment.java

+0 −9
Original line number Diff line number Diff line
@@ -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<AccessibilityShortcutInfo> infos = AccessibilityManager.getInstance(

src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java

+0 −9
Original line number Diff line number Diff line
@@ -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);