commit a94e0c8651fc103cbe33b6bd8777ba9ea83830a5
author Shimeng (Simon) Wang <swang@google.com> Tue Feb 15 11:52:16 2011 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Tue Feb 15 11:52:16 2011 -0800
tree 7bce3d7fae6fffaf42a2344db9882fb75154ae47
parent d3b6abc4667e6e69e945db7e62fcd5dff49d3c23
parent a5b3d807a192e14ae7e5c11353633c08ff5aaae6

Merge "Keep overview mode when screen is rotated."

core/java/android/webkit/ZoomManager.java

diff --git a/core/java/android/webkit/ZoomManager.java b/core/java/android/webkit/ZoomManager.java
index 4597727..08c8144 100644
--- a/core/java/android/webkit/ZoomManager.java
+++ b/core/java/android/webkit/ZoomManager.java
@@ -805,8 +805,11 @@
             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.
-                setZoomScale(Math.max(mActualScale, getZoomOverviewScale()),
-                    mUpdateTextWrap, true);
+                // Keep overview mode unchanged when rotating.
+                final float zoomOverviewScale = getZoomOverviewScale();
+                final float newScale = (mInZoomOverview) ?
+                    zoomOverviewScale : Math.max(mActualScale, zoomOverviewScale); 
+                setZoomScale(newScale, mUpdateTextWrap, true);
                 // update the zoom buttons as the scale can be changed
                 updateZoomPicker();
             }