summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--res/values/strings.xml4
-rw-r--r--res/xml/browser_preferences.xml6
-rw-r--r--src/com/android/browser/BrowserSettings.java4
3 files changed, 14 insertions, 0 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 3f4c786..fb4295c 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -399,6 +399,10 @@
<item><xliff:g>MEDIUM</xliff:g></item>
<item><xliff:g>CLOSE</xliff:g></item>
</string-array>
+ <!-- Settings label -->
+ <string name="pref_content_load_page">When a page loads:</string>
+ <!-- Settings summary -->
+ <string name="pref_content_load_page_summary">Show overview of the page</string>
<!-- Settings screen, section title -->
<string name="pref_extras_title">Advanced settings</string>
<!-- Settings label -->
diff --git a/res/xml/browser_preferences.xml b/res/xml/browser_preferences.xml
index 83c492e..37b9f11 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"
diff --git a/src/com/android/browser/BrowserSettings.java b/src/com/android/browser/BrowserSettings.java
index 05b05d6..6f5caed 100644
--- a/src/com/android/browser/BrowserSettings.java
+++ b/src/com/android/browser/BrowserSettings.java
@@ -72,6 +72,7 @@ class BrowserSettings extends Observable {
private boolean loginInitialized = false;
private boolean autoFitPage = true;
private boolean landscapeOnly = false;
+ private boolean loadsPageInOverviewMode = true;
private boolean showDebugSettings = false;
// HTML5 API flags
private boolean appCacheEnabled = true;
@@ -200,6 +201,7 @@ class BrowserSettings extends Observable {
s.setLightTouchEnabled(b.lightTouch);
s.setSaveFormData(b.saveFormData);
s.setSavePassword(b.rememberPasswords);
+ s.setLoadWithOverviewMode(b.loadsPageInOverviewMode);
// WebView inside Browser doesn't want initial focus to be set.
s.setNeedInitialFocus(false);
@@ -296,6 +298,8 @@ class BrowserSettings extends Observable {
zoomDensity = WebSettings.ZoomDensity.valueOf(
p.getString(PREF_DEFAULT_ZOOM, zoomDensity.name()));
autoFitPage = p.getBoolean("autofit_pages", autoFitPage);
+ loadsPageInOverviewMode = p.getBoolean("load_page",
+ loadsPageInOverviewMode);
boolean landscapeOnlyTemp =
p.getBoolean("landscape_only", landscapeOnly);
if (landscapeOnlyTemp != landscapeOnly) {