From b3d0cc5ca99753c7aae3c04a5d7b607ce0aeabbb Mon Sep 17 00:00:00 2001 From: Grace Kloba Date: Mon, 1 Mar 2010 12:25:29 -0800 Subject: [PATCH] If zoom scale is set to minimum, treat it as in overview mode. When view size changed, we will adjust scale factor, which should update the zoom button states afterwards. http://b/issue?id=2477282 --- core/java/android/webkit/WebView.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java index 897bd75fe1aad..17f18f71288a6 100644 --- a/core/java/android/webkit/WebView.java +++ b/core/java/android/webkit/WebView.java @@ -2069,6 +2069,8 @@ public class WebView extends AbsoluteLayout boolean force) { if (scale < mMinZoomScale) { scale = mMinZoomScale; + // set mInZoomOverview for non mobile sites + if (scale < mDefaultScale) mInZoomOverview = true; } else if (scale > mMaxZoomScale) { scale = mMaxZoomScale; } @@ -4017,6 +4019,10 @@ public class WebView extends AbsoluteLayout // still want to send the notification over to webkit. mWebView.setNewZoomScale(mWebView.mActualScale, mUpdateTextWrap, true); + // update the zoom buttons as the scale can be changed + if (mWebView.getSettings().getBuiltInZoomControls()) { + mWebView.updateZoomButtonsEnabled(); + } } } }