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

1 files changed, 10 insertions, 3 deletions

diff --git a/src/com/android/browser/BrowserSettings.java b/src/com/android/browser/BrowserSettings.java
index fc70a760..0e4fba68 100644
--- a/src/com/android/browser/BrowserSettings.java
+++ b/src/com/android/browser/BrowserSettings.java
@@ -121,6 +121,7 @@ public class BrowserSettings implements OnSharedPreferenceChangeListener,
     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 @@ public class BrowserSettings implements OnSharedPreferenceChangeListener,
     // 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 class BrowserSettings implements OnSharedPreferenceChangeListener,
 
     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() {