From a5b3d807a192e14ae7e5c11353633c08ff5aaae6 Mon Sep 17 00:00:00 2001 From: "Shimeng (Simon) Wang" Date: Tue, 15 Feb 2011 11:14:57 -0800 Subject: [PATCH] Keep overview mode when screen is rotated. issue: 3385613 Change-Id: I49ba8dbdfe72adb1df5e453d7c95ec107e0d3e75 --- core/java/android/webkit/ZoomManager.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/core/java/android/webkit/ZoomManager.java b/core/java/android/webkit/ZoomManager.java index efbcd5811db8e..e416da2cd8e59 100644 --- a/core/java/android/webkit/ZoomManager.java +++ b/core/java/android/webkit/ZoomManager.java @@ -805,8 +805,11 @@ 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. - 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(); }