Remove Search from the system Settings app DO NOT MERGE
The search settings acitivity lives in the system search app, which is build-dependent. Also, since the Browser no longer looks at the SHOW_WEB_SUGGESTIONS system preference, none of the search settings affect the behavior of any other platform apps. The search settings will henceforth only be available from within the search app (e.g. QuickSearchBox). Bug: 3017365 Change-Id: I08f3979cd8cdc0742efbc49be95aa59753c94c0d
This commit is contained in:
Binary file not shown.
Before Width: | Height: | Size: 1.6 KiB |
Binary file not shown.
Before Width: | Height: | Size: 920 B |
@@ -118,21 +118,6 @@
|
||||
android:targetClass="com.android.settings.deviceinfo.Memory" />
|
||||
</com.android.settings.IconPreferenceScreen>
|
||||
|
||||
<!-- Search.
|
||||
The settings activity will ensure that this is resolved to an
|
||||
activity on the system image, otherwise it will remove this
|
||||
preference.
|
||||
The intent action is the same as
|
||||
android.app.SearchManager.INTENT_ACTION_SEARCH_SETTINGS.
|
||||
-->
|
||||
|
||||
<com.android.settings.IconPreferenceScreen
|
||||
settings:icon="@drawable/ic_settings_search"
|
||||
android:title="@string/search_settings"
|
||||
android:key="search_settings">
|
||||
<intent android:action="android.search.action.SEARCH_SETTINGS" />
|
||||
</com.android.settings.IconPreferenceScreen>
|
||||
|
||||
<!-- Language -->
|
||||
|
||||
<com.android.settings.IconPreferenceScreen
|
||||
|
@@ -27,7 +27,6 @@ public class Settings extends PreferenceActivity {
|
||||
private static final String KEY_PARENT = "parent";
|
||||
private static final String KEY_CALL_SETTINGS = "call_settings";
|
||||
private static final String KEY_SYNC_SETTINGS = "sync_settings";
|
||||
private static final String KEY_SEARCH_SETTINGS = "search_settings";
|
||||
private static final String KEY_DOCK_SETTINGS = "dock_settings";
|
||||
|
||||
@Override
|
||||
@@ -40,7 +39,6 @@ public class Settings extends PreferenceActivity {
|
||||
|
||||
PreferenceGroup parent = (PreferenceGroup) findPreference(KEY_PARENT);
|
||||
Utils.updatePreferenceToSpecificActivityOrRemove(this, parent, KEY_SYNC_SETTINGS, 0);
|
||||
Utils.updatePreferenceToSpecificActivityOrRemove(this, parent, KEY_SEARCH_SETTINGS, 0);
|
||||
|
||||
Preference dockSettings = parent.findPreference(KEY_DOCK_SETTINGS);
|
||||
if (getResources().getBoolean(R.bool.has_dock_settings) == false && dockSettings != null) {
|
||||
|
Reference in New Issue
Block a user