commit af39e4b8022c5ac66faf441c38a71387ca20b300
author Derek Sollenberger <djsollen@google.com> Wed Jun 02 12:55:40 2010 -0400
committer Derek Sollenberger <djsollen@google.com> Wed Jun 02 12:55:40 2010 -0400
tree 0bf88d70539e1facd960405bf5fb8237592166b2
parent 347d50fb1f4a40742c977f63dfbf7d60ff72e705

Update EmbeddedZoomControl to use new ZoomManager methods.

Change-Id: Icea2bea36d42ff58a05600ceb4388992bc8979d7

core/java/android/webkit/ZoomControlEmbedded.java

diff --git a/core/java/android/webkit/ZoomControlEmbedded.java b/core/java/android/webkit/ZoomControlEmbedded.java
index cd02c00..2036635 100644
--- a/core/java/android/webkit/ZoomControlEmbedded.java
+++ b/core/java/android/webkit/ZoomControlEmbedded.java
@@ -67,9 +67,8 @@
             return;
         }
 
-        boolean canZoomIn = mWebView.getScale() < mZoomManager.mMaxZoomScale;
-        boolean canZoomOut = mWebView.getScale() > mZoomManager.mMinZoomScale &&
-                                                  !mZoomManager.mInZoomOverview;
+        boolean canZoomIn = mZoomManager.canZoomIn();
+        boolean canZoomOut = mZoomManager.canZoomOut() && !mZoomManager.mInZoomOverview;
         if (!canZoomIn && !canZoomOut) {
             // Hide the zoom in and out buttons if the page cannot zoom
             mZoomButtonsController.getZoomControls().setVisibility(View.GONE);