diff options
| author | Derek Sollenberger <djsollen@google.com> | 2010-06-09 14:11:59 -0400 |
|---|---|---|
| committer | Derek Sollenberger <djsollen@google.com> | 2010-06-09 14:11:59 -0400 |
| commit | 369aca27ec44274d9e70e91513914fa2564c6aef (patch) | |
| tree | 4239100e4cd7f3162f1807a868575441f945181e /core/java/android/webkit/ZoomControlEmbedded.java | |
| parent | 293c360ffe2980b4d5d2d7c4aff69166ff265e9c (diff) | |
Consolidate common zoom code and tighten access to some ZoomManager variables.
This is a single CL in a series of CL's that is focused on moving the
zoom logic from WebView to ZoomManager.
Change-Id: I741fc34d5dd481b89f6e0b33503834c33f4fe69e
http://b/2671604
Diffstat (limited to 'core/java/android/webkit/ZoomControlEmbedded.java')
| -rw-r--r-- | core/java/android/webkit/ZoomControlEmbedded.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/core/java/android/webkit/ZoomControlEmbedded.java b/core/java/android/webkit/ZoomControlEmbedded.java index 20366355b3da..6e07ada93be7 100644 --- a/core/java/android/webkit/ZoomControlEmbedded.java +++ b/core/java/android/webkit/ZoomControlEmbedded.java @@ -36,8 +36,7 @@ class ZoomControlEmbedded implements ZoomControlBase { } public void show() { - if (!getControls().isVisible() - && mZoomManager.mMinZoomScale < mZoomManager.mMaxZoomScale) { + if (!getControls().isVisible() && !mZoomManager.isZoomScaleFixed()) { mZoomButtonsController.setVisible(true); |