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

diff --cc res/xml/settings.xml
Simple merge

diff --cc src/com/android/settings/Settings.java
index 4ecf85b,f07892e..d924834
--- 1/src/com/android/settings/Settings.java
--- 2/src/com/android/settings/Settings.java
+++ b/src/com/android/settings/Settings.java
@@@ -27,12 -28,8 +27,11 @@@ public class Settings extends Preferenc
      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";
 +    private static final String KEY_MANUFACTURER_SETTINGS = "manufacturer_settings";
 +
      @Override
      protected void onCreate(Bundle savedInstanceState) {
          super.onCreate(savedInstanceState);