From 0ed2bb5e566aee763e7a4ff22a58db9f424e6e9c Mon Sep 17 00:00:00 2001
From: "Shimeng (Simon) Wang" <swang@google.com>
Date: Thu, 19 Aug 2010 10:05:08 -0700
Subject: Set the scale to be at least overview zoom scale.

This happens when screen is rotated.  Also removed a not-needed calculation.

issue: 2919307
Change-Id: If24ccb45a488aa8f00fead09206bfbe1799ebcb2
---
 core/java/android/webkit/ZoomManager.java | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'core/java')

diff --git a/core/java/android/webkit/ZoomManager.java b/core/java/android/webkit/ZoomManager.java
index ea975c2..33ebcf5 100644
--- a/core/java/android/webkit/ZoomManager.java
+++ b/core/java/android/webkit/ZoomManager.java
@@ -727,7 +727,8 @@ class ZoomManager {
             if (mWebView.getWebViewCore() != null) {
                 // we always force, in case our height changed, in which case we
                 // still want to send the notification over to webkit.
-                refreshZoomScale(mUpdateTextWrap);
+                setZoomScale(Math.max(mActualScale, getZoomOverviewScale()),
+                    mUpdateTextWrap, true);
                 // update the zoom buttons as the scale can be changed
                 updateZoomPicker();
             }
@@ -787,8 +788,6 @@ class ZoomManager {
                 && Math.abs((viewWidth * mInvActualScale) - mZoomOverviewWidth) > 1))) {
             mInitialZoomOverview = false;
             setZoomScale(zoomOverviewScale, !willScaleTriggerZoom(mTextWrapScale));
-        } else {
-            mInZoomOverview = !exceedsMinScaleIncrement(mActualScale, zoomOverviewScale);
         }
     }
 
-- 
cgit v1.1