use NARROW_COLUMNS when using classic webview

This reverts commit a31cfea when using classic webview. Change-Id: I26741a7b956b384258f0cd8aa444c7ba86fd5390
CyanogenMod · May 14, 2014 · 8c9ccb1 · 8c9ccb1
1 parent 03b1039
commit 8c9ccb1
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/src/com/android/browser/BrowserSettings.java b/src/com/android/browser/BrowserSettings.java
@@ -26,6 +26,7 @@
 import android.net.NetworkInfo;
 import android.os.Build;
 import android.os.Message;
+import android.os.SystemProperties;
 import android.preference.PreferenceManager;
 import android.provider.Browser;
 import android.provider.Settings;
@@ -356,9 +357,14 @@ public static String getFactoryResetHomeUrl(Context context) {
     }
 
     public LayoutAlgorithm getLayoutAlgorithm() {
+        boolean useClassicWebview = "classic".equals(SystemProperties.get("persist.webview.provider"));
         LayoutAlgorithm layoutAlgorithm = LayoutAlgorithm.NORMAL;
         if (autofitPages()) {
-            layoutAlgorithm = LayoutAlgorithm.TEXT_AUTOSIZING;
+            if (useClassicWebview) {
+                layoutAlgorithm = LayoutAlgorithm.NARROW_COLUMNS;
+            } else {
+                layoutAlgorithm = LayoutAlgorithm.TEXT_AUTOSIZING;
+            }
         }
         if (isDebugEnabled()) {
             if (isSmallScreen()) {
@@ -367,7 +373,11 @@ public LayoutAlgorithm getLayoutAlgorithm() {
                 if (isNormalLayout()) {
                     layoutAlgorithm = LayoutAlgorithm.NORMAL;
                 } else {
-                    layoutAlgorithm = LayoutAlgorithm.TEXT_AUTOSIZING;
+                    if (useClassicWebview) {
+                        layoutAlgorithm = LayoutAlgorithm.NARROW_COLUMNS;
+                    } else {
+                        layoutAlgorithm = LayoutAlgorithm.TEXT_AUTOSIZING;
+                    }
                 }
             }
         }