commit 378f0280006aa5c81643378100274608941b7502
author Grace Kloba <klobag@google.com> Fri Mar 26 15:01:30 2010 -0700
committer Grace Kloba <klobag@google.com> Fri Mar 26 15:01:30 2010 -0700
tree 5371955598ff730d85e6dfa4ebc7bde63ad1038d
parent 092cfaaa22795b7e63f2e55ff9102a569ec17efe

Remove long_press when WebView lost window focus.
Reset touch mode too.

Fix http://b/issue?id=2542711.

Also move dismissZoomControl() before calling
super.onDetachedFromWindow(). This is a guess to
fix http://b/issue?id=2547574

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);
             }