Fixes for changing the search engine.

[android-x86/packages-apps-Browser.git] / res / xml / browser_preferences.xml

diff --git a/res/xml/browser_preferences.xml b/res/xml/browser_preferences.xml
index c5b6b24..501d8c1 100644 (file)
--- a/res/xml/browser_preferences.xml
+++ b/res/xml/browser_preferences.xml
@@ -29,6 +29,20 @@
                 android:dialogTitle="@string/pref_text_size_dialogtitle" />
 
         <ListPreference
+                android:key="default_zoom"
+                android:title="@string/pref_default_zoom"
+                android:defaultValue="MEDIUM"
+                android:entries="@array/pref_default_zoom_choices"
+                android:entryValues="@array/pref_default_zoom_values"
+                android:dialogTitle="@string/pref_default_zoom_dialogtitle" />
+
+        <CheckBoxPreference
+                android:key="load_page"
+                android:defaultValue="true"
+                android:title="@string/pref_content_load_page"
+                android:summary="@string/pref_content_load_page_summary" />
+
+        <ListPreference
                 android:key="default_text_encoding"
                 android:title="@string/pref_default_text_encoding"
                 android:defaultValue="@string/pref_default_text_encoding_default"
@@ -63,7 +77,15 @@
                 android:key="enable_javascript"
                 android:defaultValue="true"
                 android:title="@string/pref_content_javascript" />     
-            
+
+        <ListPreference
+                android:key="plugin_state"
+                android:title="@string/pref_content_plugins"
+                android:defaultValue="ON"
+                android:entries="@array/pref_content_plugins_choices"
+                android:entryValues="@array/pref_content_plugins_values"
+                android:dialogTitle="@string/pref_content_plugins" />
+
         <CheckBoxPreference
                 android:key="open_in_background"
                 android:defaultValue="false"
@@ -74,8 +96,7 @@
                 android:key="homepage" 
                 android:title="@string/pref_content_homepage"
                 android:hint="@string/http"
-                android:inputType="textUri"
-                android:singleLine="true" />
+                android:inputType="textUri|textMultiLine" />
 
     </PreferenceCategory>
 
@@ -126,6 +147,21 @@
                 android:dialogTitle="@string/clear" 
                 android:dialogIcon="@android:drawable/ic_dialog_alert"/>
 
+        <CheckBoxPreference
+                android:key="enable_geolocation"
+                android:defaultValue="true"
+                android:title="@string/pref_privacy_enable_geolocation"
+                android:summary="@string/pref_privacy_enable_geolocation_summary" />
+
+        <com.android.browser.BrowserYesNoPreference
+                android:key="privacy_clear_geolocation_access"
+                android:dependency="enable_geolocation"
+                android:title="@string/pref_privacy_clear_geolocation_access"
+                android:summary="@string/pref_privacy_clear_geolocation_access_summary"
+                android:dialogMessage="@string/pref_privacy_clear_geolocation_access_dlg"
+                android:dialogTitle="@string/clear"
+                android:dialogIcon="@android:drawable/ic_dialog_alert"/>
+
     </PreferenceCategory>
     
         <PreferenceCategory
@@ -155,57 +191,26 @@
     </PreferenceCategory>
     <PreferenceCategory
             android:title="@string/pref_extras_title">
-                     
-            <!-- This setting is named "Enable Gears" but is actually
-                 tied to enabling all plugins. -->
+
+            <!-- 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="enable_plugins"
+                    android:key="show_search_suggestions"
                     android:defaultValue="true"
-                    android:title="@string/pref_extras_gears_enable"
-                    android:summary="@string/pref_extras_gears_enable_summary" />
-
-            <Preference
-                    android:key="gears_settings"
-                    android:persistent="false"
-                    android:dependency="enable_plugins"
-                    android:title="@string/pref_extras_gears_settings"
-                    android:summary="@string/pref_extras_gears_settings_summary" />
+                    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="webstorage_settings"
-                    android:title="@string/pref_extras_webstorage_settings"
-                    android:summary="@string/pref_extras_webstorage_settings_summary">
-
-                  <CheckBoxPreference
-                        android:key="enable_database"
-                        android:defaultValue="true"
-                        android:title="@string/pref_extras_webstorage_enable"
-                        android:summary="@string/pref_extras_webstorage_enable_summary" />
-
-                  <ListPreference
-                        android:key="webstorage_default_quota"
-                        android:dependency="enable_database"
-                        android:title="@string/pref_extras_webstorage_set_quota"
-                        android:summary="@string/pref_extras_webstorage_set_quota_summary"
-                        android:entries="@array/webstorage_quota_entries"
-                        android:entryValues="@array/webstorage_quota_entries_values" />
-
-                  <PreferenceScreen
-                        android:key="webstorage_manage_databases"
-                        android:dependency="enable_database"
-                        android:title="@string/pref_extras_webstorage_manage_databases"
-                        android:summary="@string/pref_extras_webstorage_manage_databases_summary" />
-
-                  <com.android.browser.BrowserYesNoPreference
-                        android:key="webstorage_clear_databases"
-                        android:dependency="enable_database"
-                        android:title="@string/pref_extras_webstorage_clear_databases"
-                        android:summary="@string/pref_extras_webstorage_clear_databases_summary"
-                        android:dialogMessage="@string/pref_extras_webstorage_clear_databases_dlg"
-                        android:dialogTitle="@string/clear"
-                        android:dialogIcon="@android:drawable/ic_dialog_alert" />
-
-            </PreferenceScreen>
+                  android:key="website_settings"
+                  android:title="@string/pref_extras_website_settings"
+                  android:summary="@string/pref_extras_website_settings_summary" />
 
             <com.android.browser.BrowserYesNoPreference
                     android:key="reset_default_preferences"