commit fa0d2316f98ab787ff26383ff651dc31aac60ffd
author Mangesh Ghiware <mghiware@google.com> Mon Sep 12 09:46:49 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Mon Sep 12 09:46:49 2011 -0700
tree 0885d24d23006fdd58988188788ab60d2b064639
parent 049f5cc3de8e30d05a26e135ab0978b3e1fe62b4
parent 886b372b52d122d25f95ef39833254197bebba69

Merge "On zoom to overview, reflow text, if necessary."

core/java/android/webkit/ZoomManager.java

diff --git a/core/java/android/webkit/ZoomManager.java b/core/java/android/webkit/ZoomManager.java
index 0bfb668..7ca6aeb 100644
--- a/core/java/android/webkit/ZoomManager.java
+++ b/core/java/android/webkit/ZoomManager.java
@@ -651,6 +651,11 @@
             mTextWrapScale = newTextWrapScale;
             refreshZoomScale(true);
         } else if (!mInZoomOverview && willScaleTriggerZoom(getZoomOverviewScale())) {
+            // Reflow, if necessary.
+            if (mTextWrapScale > getReadingLevelScale()) {
+                mTextWrapScale = getReadingLevelScale();
+                refreshZoomScale(true);
+            }
             zoomToOverview();
         } else {
             zoomToReadingLevelOrMore();