PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove search option in Magnification settings"

Browse Source
This commit is contained in:
Fan Zhang
2018-05-10 22:14:06 +00:00
committed by Android (Google) Code Review
parent 3a4e213037 f5fffe3da6
commit 6600bbaf10
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/android/settings/accessibility/MagnificationPreferenceFragment.java
View File

@@ -23,7 +23,6 @@ import android.content.res.Resources;
import android.os.Bundle; import android.os.Bundle;
import android.provider.SearchIndexableResource; import android.provider.SearchIndexableResource;
import android.provider.Settings; import android.provider.Settings;
import androidx.preference.Preference;
import android.text.TextUtils; import android.text.TextUtils;
import android.view.accessibility.AccessibilityManager; import android.view.accessibility.AccessibilityManager;
@@ -32,11 +31,15 @@ import com.android.settings.R;
import com.android.settings.dashboard.DashboardFragment; import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settings.search.Indexable; 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 com.android.settingslib.search.SearchIndexable;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
import androidx.preference.Preference;
@SearchIndexable @SearchIndexable
public final class MagnificationPreferenceFragment extends DashboardFragment { 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 // If invoked from SUW, redirect to fragment instrumented for Vision Settings metrics
preference.setFragment( preference.setFragment(
ToggleScreenMagnificationPreferenceFragmentForSetupWizard.class.getName()); 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); return super.onPreferenceTreeClick(preference);
} }