Merge change 22565 into eclair

* changes:
  Fixed up intent MIME-types, add Accounts menu, clean unused.
diff --git a/res/xml/searchable.xml b/res/xml/searchable.xml
index 0deed7e..af8b3ef 100644
--- a/res/xml/searchable.xml
+++ b/res/xml/searchable.xml
@@ -25,9 +25,9 @@
     android:searchMode="queryRewriteFromText"
 
     android:includeInGlobalSearch="true"
-    android:searchSuggestAuthority="contacts"
+    android:searchSuggestAuthority="com.android.contacts"
     android:searchSuggestIntentAction="android.provider.Contacts.SEARCH_SUGGESTION_CLICKED"
-    android:searchSuggestIntentData="content://contacts/people"
+    android:searchSuggestIntentData="content://com.android.contacts/contacts"
     android:searchSettingsDescription="@string/search_settings_description"
 >