From 378f0280006aa5c81643378100274608941b7502 Mon Sep 17 00:00:00 2001
From: Grace Kloba <klobag@google.com>
Date: Fri, 26 Mar 2010 15:01:30 -0700
Subject: [PATCH] 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 | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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