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

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

View File

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