From f5fffe3da647b2a40efedfd832055f4df6eea85c 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 --- .../accessibility/MagnificationPreferenceFragment.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/com/android/settings/accessibility/MagnificationPreferenceFragment.java b/src/com/android/settings/accessibility/MagnificationPreferenceFragment.java index f2e357fc930..1d66812fd2b 100644 --- a/src/com/android/settings/accessibility/MagnificationPreferenceFragment.java +++ b/src/com/android/settings/accessibility/MagnificationPreferenceFragment.java @@ -23,7 +23,6 @@ import android.content.res.Resources; import android.os.Bundle; import android.provider.SearchIndexableResource; import android.provider.Settings; -import androidx.preference.Preference; import android.text.TextUtils; import android.view.accessibility.AccessibilityManager; @@ -32,11 +31,15 @@ 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 com.android.settingslib.search.SearchIndexable; import java.util.Arrays; import java.util.List; +import androidx.preference.Preference; + @SearchIndexable public final class MagnificationPreferenceFragment extends DashboardFragment { @@ -90,6 +93,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); }