Default Zoom setting is re-enabled.
Also useWideViewPort setting is forced to false to make
ZoomDensity value other than the default (MEDIUM) to work.
Change-Id: I06d849ff88caecb03a4d2135f01e505a9e056123
diff --git a/res/xml/advanced_preferences.xml b/res/xml/advanced_preferences.xml
index a941f6d..333883a 100644
--- a/res/xml/advanced_preferences.xml
+++ b/res/xml/advanced_preferences.xml
@@ -61,7 +61,6 @@
<PreferenceCategory android:title="@string/pref_content_title">
- <!-- Disable Default Zoom
<ListPreference
android:key="default_zoom"
android:title="@string/pref_default_zoom"
@@ -69,7 +68,6 @@
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"
diff --git a/src/com/android/browser/BrowserSettings.java b/src/com/android/browser/BrowserSettings.java
index fc70a76..0e4fba6 100644
--- a/src/com/android/browser/BrowserSettings.java
+++ b/src/com/android/browser/BrowserSettings.java
@@ -121,6 +121,7 @@
private static boolean sInitialized = false;
private boolean mNeedsSharedSync = true;
private float mFontSizeMult = 1.0f;
+ private boolean enableWideViewport = true;
// Current state of network-dependent settings
private boolean mLinkPrefetchAllowed = true;
@@ -834,7 +835,13 @@
// TODO: Cache
public ZoomDensity getDefaultZoom() {
String zoom = mPrefs.getString(PREF_DEFAULT_ZOOM, "MEDIUM");
- return ZoomDensity.valueOf(zoom);
+ ZoomDensity zoomDensity = ZoomDensity.valueOf(zoom);
+ //SWE: If zoomDensity is not MEDIUM, set enableWideViewport to false.
+ if(zoomDensity != ZoomDensity.MEDIUM)
+ enableWideViewport = false;
+ else
+ enableWideViewport = true;
+ return zoomDensity;
}
public boolean loadPageInOverviewMode() {
@@ -936,9 +943,9 @@
public boolean isWideViewport() {
if (!isDebugEnabled()) {
- return true;
+ return enableWideViewport;
}
- return mPrefs.getBoolean(PREF_WIDE_VIEWPORT, true);
+ return mPrefs.getBoolean(PREF_WIDE_VIEWPORT, enableWideViewport);
}
public boolean isNormalLayout() {
diff --git a/src/com/android/browser/preferences/AdvancedPreferencesFragment.java b/src/com/android/browser/preferences/AdvancedPreferencesFragment.java
index 609f84f..4abd301 100644
--- a/src/com/android/browser/preferences/AdvancedPreferencesFragment.java
+++ b/src/com/android/browser/preferences/AdvancedPreferencesFragment.java
@@ -55,14 +55,14 @@
PreferenceScreen websiteSettings = (PreferenceScreen) findPreference(
PreferenceKeys.PREF_WEBSITE_SETTINGS);
websiteSettings.setFragment(WebsiteSettingsFragment.class.getName());
- // SWE: Disable default zoom
- /*Preference e = findPreference(PreferenceKeys.PREF_DEFAULT_ZOOM);
+
+ Preference e = findPreference(PreferenceKeys.PREF_DEFAULT_ZOOM);
e.setOnPreferenceChangeListener(this);
e.setSummary(getVisualDefaultZoomName(
getPreferenceScreen().getSharedPreferences()
- .getString(PreferenceKeys.PREF_DEFAULT_ZOOM, null)) );*/
+ .getString(PreferenceKeys.PREF_DEFAULT_ZOOM, null)) );
- Preference e = findPreference(PreferenceKeys.PREF_DEFAULT_TEXT_ENCODING);
+ e = findPreference(PreferenceKeys.PREF_DEFAULT_TEXT_ENCODING);
e.setOnPreferenceChangeListener(this);
e = findPreference(PreferenceKeys.PREF_RESET_DEFAULT_PREFERENCES);
@@ -174,12 +174,11 @@
Log.w("PageContentPreferencesFragment", "onPreferenceChange called from detached fragment!");
return false;
}
- // SWE disable default Zoom.
- /*if (pref.getKey().equals(PreferenceKeys.PREF_DEFAULT_ZOOM)) {
+
+ if (pref.getKey().equals(PreferenceKeys.PREF_DEFAULT_ZOOM)) {
pref.setSummary(getVisualDefaultZoomName((String) objValue));
return true;
- } else*/
- if (pref.getKey().equals(PreferenceKeys.PREF_DEFAULT_TEXT_ENCODING)) {
+ } else if (pref.getKey().equals(PreferenceKeys.PREF_DEFAULT_TEXT_ENCODING)) {
pref.setSummary((String) objValue);
return true;
} else if (pref.getKey().equals(PreferenceKeys.PREF_RESET_DEFAULT_PREFERENCES)) {