diff options
| author | Leon Scroggins III <scroggo@google.com> | 2010-09-14 11:07:46 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-14 11:07:46 -0700 |
| commit | 6ac51e2b2defbc33834ec92d8a3e7c904f20811e (patch) | |
| tree | 93a934e94932daf95daae4b4d7bd9eee8d17ab25 /res | |
| parent | 7f737ca14895f4263c4ff4390a0e7ad0149a7a62 (diff) | |
| parent | 867c0465e9f5bd5da410fd9b721050d9e2c36c9c (diff) | |
| download | packages_apps_Browser-6ac51e2b2defbc33834ec92d8a3e7c904f20811e.zip packages_apps_Browser-6ac51e2b2defbc33834ec92d8a3e7c904f20811e.tar.gz packages_apps_Browser-6ac51e2b2defbc33834ec92d8a3e7c904f20811e.tar.bz2 | |
am 867c0465: am 430057da: Fixes for changing the search engine.
Merge commit '867c0465e9f5bd5da410fd9b721050d9e2c36c9c' into gingerbread-plus-aosp
* commit '867c0465e9f5bd5da410fd9b721050d9e2c36c9c':
Fixes for changing the search engine.
Diffstat (limited to 'res')
| -rw-r--r-- | res/xml/browser_preferences.xml | 29 |
1 files changed, 15 insertions, 14 deletions
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" |