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

am b5631f59: Merge "Do not merge : cancel text select mode when pressing back, etc." into gingerbread

Browse Source 
Merge commit 'b5631f59d3b0411ed493dc382bb96ab15ca3304d' into gingerbread-plus-aosp

* commit 'b5631f59d3b0411ed493dc382bb96ab15ca3304d':
  Do not merge : cancel text select mode when pressing back, etc.
This commit is contained in:
Cary Clark
2010-09-21 11:51:23 -07:00
committed by Android Git Automerger
parent 7e8a16e884 b5631f59d3
commit 100cc263b4
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1284,13 +1284,18 @@ public class WebView extends AbsoluteLayout
return mDatabase.getHttpAuthUsernamePassword(host, realm); return mDatabase.getHttpAuthUsernamePassword(host, realm);
} }
private void clearHelpers() {
clearTextEntry(false);
selectionDone();
}
/** /**
* Destroy the internal state of the WebView. This method should be called * Destroy the internal state of the WebView. This method should be called
* after the WebView has been removed from the view system. No other * after the WebView has been removed from the view system. No other
* methods may be called on a WebView after destroy. * methods may be called on a WebView after destroy.
*/ */
public void destroy() { public void destroy() {
clearTextEntry(false); clearHelpers();
if (mWebViewCore != null) { if (mWebViewCore != null) {
// Set the handlers to null before destroying WebViewCore so no // Set the handlers to null before destroying WebViewCore so no
// more messages will be posted. // more messages will be posted.
@@ -1608,7 +1613,7 @@ public class WebView extends AbsoluteLayout
arg.mUrl = url; arg.mUrl = url;
arg.mExtraHeaders = extraHeaders; arg.mExtraHeaders = extraHeaders;
mWebViewCore.sendMessage(EventHub.LOAD_URL, arg); mWebViewCore.sendMessage(EventHub.LOAD_URL, arg);
clearTextEntry(false); clearHelpers();
} }
/** /**
@@ -1637,7 +1642,7 @@ public class WebView extends AbsoluteLayout
arg.mUrl = url; arg.mUrl = url;
arg.mPostData = postData; arg.mPostData = postData;
mWebViewCore.sendMessage(EventHub.POST_URL, arg); mWebViewCore.sendMessage(EventHub.POST_URL, arg);
clearTextEntry(false); clearHelpers();
} else { } else {
loadUrl(url); loadUrl(url);
} }
@@ -1693,7 +1698,7 @@ public class WebView extends AbsoluteLayout
arg.mEncoding = encoding; arg.mEncoding = encoding;
arg.mHistoryUrl = historyUrl; arg.mHistoryUrl = historyUrl;
mWebViewCore.sendMessage(EventHub.LOAD_DATA, arg); mWebViewCore.sendMessage(EventHub.LOAD_DATA, arg);
clearTextEntry(false); clearHelpers();
} }
/** /**
@@ -1710,7 +1715,7 @@ public class WebView extends AbsoluteLayout
* Reload the current url. * Reload the current url.
*/ */
public void reload() { public void reload() {
clearTextEntry(false); clearHelpers();
switchOutDrawHistory(); switchOutDrawHistory();
mWebViewCore.sendMessage(EventHub.RELOAD); mWebViewCore.sendMessage(EventHub.RELOAD);
} }
@@ -1790,7 +1795,7 @@ public class WebView extends AbsoluteLayout
private void goBackOrForward(int steps, boolean ignoreSnapshot) { private void goBackOrForward(int steps, boolean ignoreSnapshot) {
if (steps != 0) { if (steps != 0) {
clearTextEntry(false); clearHelpers();
mWebViewCore.sendMessage(EventHub.GO_BACK_FORWARD, steps, mWebViewCore.sendMessage(EventHub.GO_BACK_FORWARD, steps,
ignoreSnapshot ? 1 : 0); ignoreSnapshot ? 1 : 0);
} }
@@ -4431,7 +4436,7 @@ public class WebView extends AbsoluteLayout
@Override @Override
protected void onDetachedFromWindow() { protected void onDetachedFromWindow() {
clearTextEntry(false); clearHelpers();
dismissZoomControl(); dismissZoomControl();
if (hasWindowFocus()) setActive(false); if (hasWindowFocus()) setActive(false);
super.onDetachedFromWindow(); super.onDetachedFromWindow();