Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Merge commit '307a2b59ba9666c071f5c5b03f58700e7c28ea35' into kraken

* commit '307a2b59ba9666c071f5c5b03f58700e7c28ea35':
  Remove long_press when WebView lost window focus.
This commit is contained in:
Grace Kloba
2010-03-26 15:40:18 -07:00
committed by Android Git Automerger
parent 3cc042cb3e 307a2b59ba
commit 04f2f31a5f
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/webkit/WebView.java
View File

@@ -4012,8 +4012,8 @@ public class WebView extends AbsoluteLayout
@Override @Override
protected void onDetachedFromWindow() { protected void onDetachedFromWindow() {
clearTextEntry(false); clearTextEntry(false);
super.onDetachedFromWindow();
dismissZoomControl(); dismissZoomControl();
super.onDetachedFromWindow();
} }
/** /**
@@ -4076,6 +4076,8 @@ public class WebView extends AbsoluteLayout
} }
mGotKeyDown = false; mGotKeyDown = false;
mShiftIsPressed = false; mShiftIsPressed = false;
mPrivateHandler.removeMessages(SWITCH_TO_LONGPRESS);
mTouchMode = TOUCH_DONE_MODE;
if (mNativeClass != 0) { if (mNativeClass != 0) {
nativeRecordButtons(false, false, true); nativeRecordButtons(false, false, true);
} }