From 17ebdcf6e66f4388c74a4d104486e22ee5ad8d40 Mon Sep 17 00:00:00 2001 From: rafftsai Date: Thu, 10 May 2018 11:18:03 +0800 Subject: [PATCH] Remove search option in Magnification settings - AccessibilitySettingsForSetupWizardActivity add extra argument to hide search and help menu. It applies to AccessibilitySettingsForSetupWizard. Add extra in MagnificationPreferenceFragment when launch from SUW. Fixes: 74195957 Test: am start -a android.settings.ACCESSIBILITY_SETTINGS_FOR_SUW Change-Id: I8314e3a01907e0befa63b96271bfc2b15c5a1d50 Merged-In: I8314e3a01907e0befa63b96271bfc2b15c5a1d50 --- .../accessibility/MagnificationPreferenceFragment.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/com/android/settings/accessibility/MagnificationPreferenceFragment.java b/src/com/android/settings/accessibility/MagnificationPreferenceFragment.java index 44d5b7942c1..aa6d4f3bd33 100644 --- a/src/com/android/settings/accessibility/MagnificationPreferenceFragment.java +++ b/src/com/android/settings/accessibility/MagnificationPreferenceFragment.java @@ -32,6 +32,8 @@ import com.android.settings.R; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.search.Indexable; +import com.android.settings.search.actionbar.SearchMenuController; +import com.android.settings.support.actionbar.HelpResourceProvider; import java.util.Arrays; import java.util.List; @@ -88,6 +90,10 @@ public final class MagnificationPreferenceFragment extends DashboardFragment { // If invoked from SUW, redirect to fragment instrumented for Vision Settings metrics preference.setFragment( ToggleScreenMagnificationPreferenceFragmentForSetupWizard.class.getName()); + Bundle args = preference.getExtras(); + // Copy from AccessibilitySettingsForSetupWizardActivity, hide search and help menu + args.putInt(HelpResourceProvider.HELP_URI_RESOURCE_KEY, 0); + args.putBoolean(SearchMenuController.NEED_SEARCH_ICON_IN_ACTION_BAR, false); } return super.onPreferenceTreeClick(preference); }