From: Bjorn Bringert <bringert@android.com>
Date: Mon, 20 Sep 2010 11:40:57 +0000 (+0100)
Subject: Remove Search from the system Settings app DO NOT MERGE
X-Git-Tag: android-x86-4.4-r1~2043^2~97^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=50c529220a8af165df92f4aa6a52c3eec60282ee;p=android-x86%2Fpackages-apps-Settings.git

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

diff --git a/res/drawable-hdpi/ic_settings_search.png b/res/drawable-hdpi/ic_settings_search.png
deleted file mode 100755
index ec07f37031..0000000000
Binary files a/res/drawable-hdpi/ic_settings_search.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_settings_search.png b/res/drawable-mdpi/ic_settings_search.png
deleted file mode 100755
index 8e13de315e..0000000000
Binary files a/res/drawable-mdpi/ic_settings_search.png and /dev/null differ
diff --git a/res/xml/settings.xml b/res/xml/settings.xml
index 0f194423fe..8c928706aa 100644
--- a/res/xml/settings.xml
+++ b/res/xml/settings.xml
@@ -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
diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java
index 5309cf57a2..fd87fa68a0 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";
     
     @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) {