From 24a3ff958b87550904a71961835f6883d1411c27 Mon Sep 17 00:00:00 2001
From: Grace Kloba <klobag@google.com>
Date: Tue, 22 Sep 2009 10:42:22 -0700
Subject: [PATCH] Change double tap toast to long toast.

Change toast count to static to cross all the windows.

It should be --count instead of count--.
---
 core/java/android/webkit/WebSettings.java | 8 +++++---
 core/java/android/webkit/WebView.java     | 4 ++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/core/java/android/webkit/WebSettings.java b/core/java/android/webkit/WebSettings.java
index 3c43fd15a2a86..5f6a734aa0024 100644
--- a/core/java/android/webkit/WebSettings.java
+++ b/core/java/android/webkit/WebSettings.java
@@ -195,7 +195,7 @@ public class WebSettings {
     static GoogleLocationSettingManager sGoogleLocationSettingManager;
 
     // private WebSettings, not accessible by the host activity
-    private int             mDoubleTapToastCount = 3;
+    static private int      mDoubleTapToastCount = 3;
 
     private static final String PREF_FILE = "WebViewSettings";
     private static final String DOUBLE_TAP_TOAST_COUNT = "double_tap_toast_count";
@@ -1357,8 +1357,10 @@ public class WebSettings {
         sGoogleLocationSettingManager.start();
         SharedPreferences sp = mContext.getSharedPreferences(PREF_FILE,
                 Context.MODE_PRIVATE);
-        mDoubleTapToastCount = sp.getInt(DOUBLE_TAP_TOAST_COUNT,
-                mDoubleTapToastCount);
+        if (mDoubleTapToastCount > 0) {
+            mDoubleTapToastCount = sp.getInt(DOUBLE_TAP_TOAST_COUNT,
+                    mDoubleTapToastCount);
+        }
         nativeSync(frame.mNativeFrame);
         mSyncPending = false;
         mEventHandler.createHandler();
diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java
index 113eac5c3fbc8..51c5e1f5344cb 100644
--- a/core/java/android/webkit/WebView.java
+++ b/core/java/android/webkit/WebView.java
@@ -3772,10 +3772,10 @@ public class WebView extends AbsoluteLayout
                         mZoomButtonsController.setVisible(true);
                         int count = settings.getDoubleTapToastCount();
                         if (mInZoomOverview && count > 0) {
-                            settings.setDoubleTapToastCount(count--);
+                            settings.setDoubleTapToastCount(--count);
                             Toast.makeText(mContext,
                                     com.android.internal.R.string.double_tap_toast,
-                                    Toast.LENGTH_SHORT).show();
+                                    Toast.LENGTH_LONG).show();
                         }
                     }
                 }