diff options
| author | Bjorn Bringert <bringert@android.com> | 2010-09-21 03:05:25 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-21 03:05:25 -0700 |
| commit | e2b102de6723b06d26dd5df986884881f72335ea (patch) | |
| tree | 5232ab32ced8d7258ad1295ea5c6cf30083ac007 | |
| parent | 7cad4e2c88949b8fffc3cb85de3bbf01f9749cbb (diff) | |
| parent | 28580b4d9a36bb15e75423bc95747b9a746ea8b9 (diff) | |
| download | packages_apps_Settings-e2b102de6723b06d26dd5df986884881f72335ea.tar.gz packages_apps_Settings-e2b102de6723b06d26dd5df986884881f72335ea.tar.bz2 packages_apps_Settings-e2b102de6723b06d26dd5df986884881f72335ea.zip | |
am 28580b4d: Remove Search from the system Settings app DO NOT MERGE
Merge commit '28580b4d9a36bb15e75423bc95747b9a746ea8b9' into gingerbread-plus-aosp
* commit '28580b4d9a36bb15e75423bc95747b9a746ea8b9':
Remove Search from the system Settings app DO NOT MERGE
| -rwxr-xr-x | res/drawable-hdpi/ic_settings_search.png | bin | 1630 -> 0 bytes | |||
| -rwxr-xr-x | res/drawable-mdpi/ic_settings_search.png | bin | 920 -> 0 bytes | |||
| -rw-r--r-- | res/xml/settings.xml | 15 | ||||
| -rw-r--r-- | src/com/android/settings/Settings.java | 2 |
4 files changed, 0 insertions, 17 deletions
diff --git a/res/drawable-hdpi/ic_settings_search.png b/res/drawable-hdpi/ic_settings_search.png Binary files differdeleted file mode 100755 index ec07f3703..000000000 --- a/res/drawable-hdpi/ic_settings_search.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_settings_search.png b/res/drawable-mdpi/ic_settings_search.png Binary files differdeleted file mode 100755 index 8e13de315..000000000 --- a/res/drawable-mdpi/ic_settings_search.png +++ /dev/null diff --git a/res/xml/settings.xml b/res/xml/settings.xml index 326c49480..6ddbf7c52 100644 --- a/res/xml/settings.xml +++ b/res/xml/settings.xml @@ -132,21 +132,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 diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java index 4ecf85b03..d92483407 100644 --- a/src/com/android/settings/Settings.java +++ b/src/com/android/settings/Settings.java @@ -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"; private static final String KEY_OPERATOR_SETTINGS = "operator_settings"; @@ -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) { |
