diff options
| -rw-r--r-- | core/java/android/webkit/ZoomControlEmbedded.java | 16 | ||||
| -rw-r--r-- | core/java/android/webkit/ZoomManager.java | 7 |
2 files changed, 15 insertions, 8 deletions
diff --git a/core/java/android/webkit/ZoomControlEmbedded.java b/core/java/android/webkit/ZoomControlEmbedded.java index c29e72b7667f..e505614e2838 100644 --- a/core/java/android/webkit/ZoomControlEmbedded.java +++ b/core/java/android/webkit/ZoomControlEmbedded.java @@ -40,13 +40,15 @@ class ZoomControlEmbedded implements ZoomControlBase { mZoomButtonsController.setVisible(true); - WebSettings settings = mWebView.getSettings(); - int count = settings.getDoubleTapToastCount(); - if (mZoomManager.isInZoomOverview() && count > 0) { - settings.setDoubleTapToastCount(--count); - Toast.makeText(mWebView.getContext(), - com.android.internal.R.string.double_tap_toast, - Toast.LENGTH_LONG).show(); + if (mZoomManager.isDoubleTapEnabled()) { + WebSettings settings = mWebView.getSettings(); + int count = settings.getDoubleTapToastCount(); + if (mZoomManager.isInZoomOverview() && count > 0) { + settings.setDoubleTapToastCount(--count); + Toast.makeText(mWebView.getContext(), + com.android.internal.R.string.double_tap_toast, + Toast.LENGTH_LONG).show(); + } } } } diff --git a/core/java/android/webkit/ZoomManager.java b/core/java/android/webkit/ZoomManager.java index c788a53a3636..23f8bd962c4d 100644 --- a/core/java/android/webkit/ZoomManager.java +++ b/core/java/android/webkit/ZoomManager.java @@ -510,6 +510,11 @@ class ZoomManager { } } + public boolean isDoubleTapEnabled() { + WebSettings settings = mWebView.getSettings(); + return settings != null && settings.getUseWideViewPort(); + } + /** * The double tap gesture can result in different behaviors depending on the * content that is tapped. @@ -528,7 +533,7 @@ class ZoomManager { */ public void handleDoubleTap(float lastTouchX, float lastTouchY) { WebSettings settings = mWebView.getSettings(); - if (settings == null || settings.getUseWideViewPort() == false) { + if (!isDoubleTapEnabled()) { return; } |