commit 307a2b59ba9666c071f5c5b03f58700e7c28ea35
author Grace Kloba <klobag@google.com> Fri Mar 26 15:30:26 2010 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Fri Mar 26 15:30:26 2010 -0700
tree 4ce7b269599511e27aa7d4946eb1c91bb73a778b
parent 9c3cee9824026764275e4d84ba9b5d9fdc5da690
parent 378f0280006aa5c81643378100274608941b7502

Merge "Remove long_press when WebView lost window focus. Reset touch mode too." into froyo

core/java/android/webkit/WebView.java

diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java
index ff1a685..1c2733c 100644
--- a/core/java/android/webkit/WebView.java
+++ b/core/java/android/webkit/WebView.java
@@ -4012,8 +4012,8 @@
     @Override
     protected void onDetachedFromWindow() {
         clearTextEntry(false);
-        super.onDetachedFromWindow();
         dismissZoomControl();
+        super.onDetachedFromWindow();
     }
 
     /**
@@ -4076,6 +4076,8 @@
             }
             mGotKeyDown = false;
             mShiftIsPressed = false;
+            mPrivateHandler.removeMessages(SWITCH_TO_LONGPRESS);
+            mTouchMode = TOUCH_DONE_MODE;
             if (mNativeClass != 0) {
                 nativeRecordButtons(false, false, true);
             }