eclair snapshot
diff --git a/res/xml/browser_preferences.xml b/res/xml/browser_preferences.xml
index 23618c5..1845e20 100644
--- a/res/xml/browser_preferences.xml
+++ b/res/xml/browser_preferences.xml
@@ -36,6 +36,12 @@
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"
@@ -62,10 +68,21 @@
android:summary="@string/pref_content_autofit_summary" />
<CheckBoxPreference
+ android:key="landscape_only"
+ android:defaultValue="false"
+ android:title="@string/pref_content_landscape_only"
+ android:summary="@string/pref_content_landscape_only_summary" />
+
+ <CheckBoxPreference
android:key="enable_javascript"
android:defaultValue="true"
android:title="@string/pref_content_javascript" />
-
+
+ <CheckBoxPreference
+ android:key="enable_plugins"
+ android:defaultValue="true"
+ android:title="@string/pref_content_plugins" />
+
<CheckBoxPreference
android:key="open_in_background"
android:defaultValue="false"
@@ -128,6 +145,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
@@ -157,21 +189,11 @@
</PreferenceCategory>
<PreferenceCategory
android:title="@string/pref_extras_title">
-
- <!-- This setting is named "Enable Gears" but is actually
- tied to enabling all plugins. -->
- <CheckBoxPreference
- android:key="enable_plugins"
- 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" />
+ <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"