diff options
| author | Bjorn Bringert <bringert@android.com> | 2010-09-20 12:40:57 +0100 |
|---|---|---|
| committer | Bjorn Bringert <bringert@android.com> | 2010-09-21 10:51:45 +0100 |
| commit | 28580b4d9a36bb15e75423bc95747b9a746ea8b9 (patch) | |
| tree | b838f3543d0358e214157786920a9955f8395aae /src/com/android/settings/Settings.java | |
| parent | 3a6bb47d9f97ff55d75a23fac85c0febbabcb2eb (diff) | |
| download | packages_apps_settings-28580b4d9a36bb15e75423bc95747b9a746ea8b9.zip packages_apps_settings-28580b4d9a36bb15e75423bc95747b9a746ea8b9.tar.gz packages_apps_settings-28580b4d9a36bb15e75423bc95747b9a746ea8b9.tar.bz2 | |
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).
This is a cherry-pick of change I08f3979cd8cdc0742efbc49be95aa59753c94c0d
to gingerbread.
Bug: 3017365
Change-Id: I55df30e3a0e1f307ad6f23900f54d3018efda59f
Diffstat (limited to 'src/com/android/settings/Settings.java')
| -rw-r--r-- | src/com/android/settings/Settings.java | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java index b37c340..f07892e 100644 --- a/src/com/android/settings/Settings.java +++ b/src/com/android/settings/Settings.java @@ -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) { |