commit 3f35d8d105b3f52814d4ebf585b55c52a1bedff9
author Panos Thomas <panos@codeaurora.org> Sat Nov 08 22:40:23 2014 -0800
committer WebTech Code Review <code-review@localhost> Wed Nov 12 19:54:30 2014 -0800
tree 766a25b158d9290374ce17a5314d3436af0ce0fc
parent f9ef98f9f0d74359d5cd2dfa5a0b4ae626924f23

Enable viewport HTML tag processing irrespective of zoom mode

Set use_wide_viewport flag to TRUE independent of default
zoom mode (far/medium/close).

Change-Id: I2e7a86e7c35917dbf77817da94c3478123a92629

src/com/android/browser/BrowserSettings.java

diff --git a/src/com/android/browser/BrowserSettings.java b/src/com/android/browser/BrowserSettings.java
index 2a3a171..b958854 100644
--- a/src/com/android/browser/BrowserSettings.java
+++ b/src/com/android/browser/BrowserSettings.java
@@ -53,6 +53,7 @@
 import org.codeaurora.swe.WebSettings;
 import org.codeaurora.swe.WebView;
 import org.codeaurora.swe.WebViewDatabase;
+
 /**
  * Class for managing settings
  */
@@ -116,7 +117,6 @@
     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;
@@ -801,13 +801,7 @@
     // TODO: Cache
     public ZoomDensity getDefaultZoom() {
         String zoom = mPrefs.getString(PREF_DEFAULT_ZOOM, "MEDIUM");
-        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;
+        return ZoomDensity.valueOf(zoom);
     }
 
     public boolean loadPageInOverviewMode() {
@@ -909,9 +903,9 @@
 
     public boolean isWideViewport() {
         if (!isDebugEnabled()) {
-            return enableWideViewport;
+            return true;
         }
-        return mPrefs.getBoolean(PREF_WIDE_VIEWPORT, enableWideViewport);
+        return mPrefs.getBoolean(PREF_WIDE_VIEWPORT, true);
     }
 
     public boolean isNormalLayout() {