From db0dbef52bf173fa63c9335914b6fdfcd1c8ac0b Mon Sep 17 00:00:00 2001 From: Anna Galusza Date: Thu, 9 Jun 2016 11:22:31 -0700 Subject: [PATCH] Remove "Help & feedback" from toggle screen for accessibility services to prevent confusion when users are trying to submit feedback for a specific accessibility service (accessibility services can place their own "Help & feedabck" in their apks and route it appropriately). Bug: 29278252 Change-Id: Ie6f0d92a9ded82eaf3a0ac1122861f26639bc58a --- ...AccessibilityServicePreferenceFragment.java | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java b/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java index 4e2ebce5209..e37de68206d 100644 --- a/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java +++ b/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java @@ -34,6 +34,9 @@ import android.os.storage.StorageManager; import android.provider.Settings; import android.text.TextUtils; import android.view.LayoutInflater; +import android.view.Menu; +import android.view.MenuInflater; +import android.view.MenuItem; import android.view.MotionEvent; import android.view.View; import android.view.accessibility.AccessibilityManager; @@ -79,6 +82,21 @@ public class ToggleAccessibilityServicePreferenceFragment return MetricsEvent.ACCESSIBILITY_SERVICE; } + @Override + public void onCreateOptionsMenu(Menu menu, MenuInflater infalter) { + // 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. + + // We still want to show the "Settings" menu. + if (mSettingsTitle != null && mSettingsIntent != null) { + MenuItem menuItem = menu.add(mSettingsTitle); + menuItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM); + menuItem.setIntent(mSettingsIntent); + } + + } + @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState);