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

Remove Search from the system Settings app DO NOT MERGE

Browse Source 
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).

This is a cherry-pick of change I08f3979cd8cdc0742efbc49be95aa59753c94c0d
to gingerbread.

Bug: 3017365
Change-Id: I55df30e3a0e1f307ad6f23900f54d3018efda59f
This commit is contained in:
Bjorn Bringert
2010-09-20 12:40:57 +01:00
parent 3a6bb47d9f
commit 28580b4d9a
4 changed files with 0 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
res/drawable-hdpi/ic_settings_search.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.6 KiB

BIN
res/drawable-mdpi/ic_settings_search.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 920 B

15
res/xml/settings.xml
View File

@@ -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

2
src/com/android/settings/Settings.java
View File

@@ -28,7 +28,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
@@ -41,7 +40,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) {