commit 430057dad085f3c3dbc386f127b1f5a10a9851da
author Leon Scroggins III <scroggo@google.com> Tue Sep 14 10:57:37 2010 -0400
committer Leon Scroggins III <scroggo@google.com> Tue Sep 14 13:07:43 2010 -0400
tree 3fd53a66a26a9ce37572a37a1260fc948b45571e
parent d26706538834e0ed58bf28f08d9a2885c0e7efcb

Fixes for changing the search engine.

Provide a default value for the Select search engine preference.
Move the Select search engine preference into advanced settings.
When opening the SearchDialog with a SearchEngine other than
Google, add a flag to hide the voice search icon.

Depends on a change to frameworks/base.

Change-Id: I6da2e582789253b3c5ffac9fe1ad3732f99f28ea

res/xml/browser_preferences.xml

diff --git a/res/xml/browser_preferences.xml b/res/xml/browser_preferences.xml
index fd994e8..501d8c1 100644
--- a/res/xml/browser_preferences.xml
+++ b/res/xml/browser_preferences.xml
@@ -98,20 +98,6 @@
                 android:hint="@string/http"
                 android:inputType="textUri|textMultiLine" />
 
-        <!-- Entries and values in this list are set dynamically. -->
-        <com.android.browser.search.SearchEnginePreference
-                android:key="search_engine"
-                android:title="@string/pref_content_search_engine"
-                android:summary="@string/pref_content_search_engine_summary"
-                android:dialogTitle="@string/pref_content_search_engine" />
-
-        <CheckBoxPreference
-                android:key="show_search_suggestions"
-                android:defaultValue="true"
-                android:title="@string/pref_content_show_search_suggestions"
-                android:summaryOn="@string/pref_content_show_web_suggestions_summary_on"
-                android:summaryOff="@string/pref_content_show_web_suggestions_summary_off" />
-
     </PreferenceCategory>
 
     <PreferenceCategory
@@ -206,6 +192,21 @@
     <PreferenceCategory
             android:title="@string/pref_extras_title">
 
+            <!-- Entries and values in this list are set dynamically. -->
+            <com.android.browser.search.SearchEnginePreference
+                    android:key="search_engine"
+                    android:title="@string/pref_content_search_engine"
+                    android:defaultValue="google"
+                    android:summary="@string/pref_content_search_engine_summary"
+                    android:dialogTitle="@string/pref_content_search_engine" />
+
+            <CheckBoxPreference
+                    android:key="show_search_suggestions"
+                    android:defaultValue="true"
+                    android:title="@string/pref_content_show_search_suggestions"
+                    android:summaryOn="@string/pref_content_show_web_suggestions_summary_on"
+                    android:summaryOff="@string/pref_content_show_web_suggestions_summary_off" />
+
             <PreferenceScreen
                   android:key="website_settings"
                   android:title="@string/pref_extras_website_settings"