commit b398fb91ebab7b1717d37680ddfe71c71f532fb4
author Shimeng (Simon) Wang <swang@google.com> Fri Oct 22 15:26:03 2010 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Fri Oct 22 15:26:03 2010 -0700
tree 80b1eb66cc5adf3791203708bb3e315ac1ee130b
parent 12e343d6b0e6e119cb085c299e820d9238a31fc1
parent 8117e760ee3097b05af9b092bdff5f0c6d7f0d35

Merge "Let double tap reflow text."

core/java/android/webkit/ZoomManager.java

diff --git a/core/java/android/webkit/ZoomManager.java b/core/java/android/webkit/ZoomManager.java
index 0a91ac4..91c0fb2 100644
--- a/core/java/android/webkit/ZoomManager.java
+++ b/core/java/android/webkit/ZoomManager.java
@@ -554,9 +554,7 @@
         }
 
         if (settings.getLayoutAlgorithm() == WebSettings.LayoutAlgorithm.NARROW_COLUMNS
-                && willScaleTriggerZoom(mTextWrapScale)
-                // For tablet, not much need to reflow text w/o double tapping.
-                && !settings.getUseFixedViewport()) {
+                && willScaleTriggerZoom(mTextWrapScale)) {
             refreshZoomScale(true);
         } else if (!mInZoomOverview) {
             zoomToOverview();