Merge "Accessibility shortcut primary action - remove search and help icon" into rvc-dev

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

@@ -28,6 +28,8 @@ import android.os.Bundle;
 import android.os.UserHandle;
 import android.text.TextUtils;
 import android.util.Log;
+import android.view.Menu;
+import android.view.MenuInflater;
 import android.view.View;
 import android.view.accessibility.AccessibilityManager;
 
@@ -98,6 +100,13 @@ public class LaunchAccessibilityActivityPreferenceFragment extends
         showDialog(DialogEnums.EDIT_SHORTCUT);
     }
 
+    @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
     protected void updateToggleServiceTitle(SwitchPreference switchPreference) {
         final AccessibilityShortcutInfo info = getAccessibilityShortcutInfo();