On zoom to overview, reflow text, if necessary.

Reset the text wrap scale to the correct value (i.e., reading level
scale) on zoom to overview. This addresses the scenario where text is
wrapped at a larger scale following a pinch zoom and double tap to
reflow.

Bug: 5254253
Change-Id: I57f706ef4254dd3f194cc35f109dd48b61b72f73

Author: mghiware

core/java/android/webkit/ZoomManager.java

@@ -651,6 +651,11 @@ && exceedsMinScaleIncrement(mTextWrapScale, newTextWrapScale)
             mTextWrapScale = newTextWrapScale;
             refreshZoomScale(true);
         } else if (!mInZoomOverview && willScaleTriggerZoom(getZoomOverviewScale())) {
+            // Reflow, if necessary.
+            if (mTextWrapScale > getReadingLevelScale()) {
+                mTextWrapScale = getReadingLevelScale();
+                refreshZoomScale(true);
+            }
             zoomToOverview();
         } else {
             zoomToReadingLevelOrMore();