summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShimeng (Simon) Wang <swang@google.com>2010-10-22 15:26:03 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-10-22 15:26:03 -0700
commitb398fb91ebab7b1717d37680ddfe71c71f532fb4 (patch)
tree80b1eb66cc5adf3791203708bb3e315ac1ee130b
parent12e343d6b0e6e119cb085c299e820d9238a31fc1 (diff)
parent8117e760ee3097b05af9b092bdff5f0c6d7f0d35 (diff)
downloadframeworks_base-b398fb91ebab7b1717d37680ddfe71c71f532fb4.zip
frameworks_base-b398fb91ebab7b1717d37680ddfe71c71f532fb4.tar.gz
frameworks_base-b398fb91ebab7b1717d37680ddfe71c71f532fb4.tar.bz2
Merge "Let double tap reflow text."
-rw-r--r--core/java/android/webkit/ZoomManager.java4
1 files changed, 1 insertions, 3 deletions
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 @@ class ZoomManager {
}
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();