From 515f6d8db3f02eaa010eee78c504c71d1a2d6a7a Mon Sep 17 00:00:00 2001
From: Derek Sollenberger <djsollen@google.com>
Date: Fri, 12 Nov 2010 15:12:58 -0500
Subject: Only show double-tap tip if the feature is enabled.

bug: 3170472
Change-Id: I41a278ff44a7fba807c3a4a22f0e0ea20d137d0a
---
 core/java/android/webkit/ZoomControlEmbedded.java | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

(limited to 'core/java/android/webkit/ZoomControlEmbedded.java')

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();
+                }
             }
         }
     }
-- 
cgit v1.2.3