diff options
| author | Victoria Lease <violets@android.com> | 2013-04-26 10:27:02 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-04-26 10:27:02 -0700 |
| commit | aae1b5163c319eae31fca509f13ce0a4ea422840 (patch) | |
| tree | d59f70999ca0656b7f0195d9280405c35b808d85 /core/java/android/webkit | |
| parent | bafd663fcdd36042e2340efed835d3fb6d76e3dd (diff) | |
| parent | b0e0e54d9dbef720ac653ed87d8ed6b46e1abdbe (diff) | |
| download | frameworks_base-aae1b5163c319eae31fca509f13ce0a4ea422840.zip frameworks_base-aae1b5163c319eae31fca509f13ce0a4ea422840.tar.gz frameworks_base-aae1b5163c319eae31fca509f13ce0a4ea422840.tar.bz2 | |
am b0e0e54d: Merge "Can not mark the same content of browser page after copy"
* commit 'b0e0e54d9dbef720ac653ed87d8ed6b46e1abdbe':
Can not mark the same content of browser page after copy
Diffstat (limited to 'core/java/android/webkit')
| -rw-r--r-- | core/java/android/webkit/SelectActionModeCallback.java | 2 | ||||
| -rw-r--r-- | core/java/android/webkit/WebViewClassic.java | 9 |
2 files changed, 9 insertions, 2 deletions
diff --git a/core/java/android/webkit/SelectActionModeCallback.java b/core/java/android/webkit/SelectActionModeCallback.java index f9f5b03..215467b 100644 --- a/core/java/android/webkit/SelectActionModeCallback.java +++ b/core/java/android/webkit/SelectActionModeCallback.java @@ -137,7 +137,7 @@ class SelectActionModeCallback implements ActionMode.Callback { @Override public void onDestroyActionMode(ActionMode mode) { - mWebView.selectionDone(); + mWebView.clearSelection(); } private void setMenuVisibility(Menu menu, boolean visible, int resourceId) { diff --git a/core/java/android/webkit/WebViewClassic.java b/core/java/android/webkit/WebViewClassic.java index a324502..246f000 100644 --- a/core/java/android/webkit/WebViewClassic.java +++ b/core/java/android/webkit/WebViewClassic.java @@ -4482,6 +4482,13 @@ public final class WebViewClassic implements WebViewProvider, WebViewProvider.Sc return selectText(x, y); } + public void clearSelection() { + selectionDone(); + if (mWebViewCore != null) { + mWebViewCore.sendMessage(EventHub.SELECT_TEXT, null); + } + } + /** * Select the word at the indicated content coordinates. */ @@ -4499,7 +4506,7 @@ public final class WebViewClassic implements WebViewProvider, WebViewProvider.Sc public void onConfigurationChanged(Configuration newConfig) { mCachedOverlappingActionModeHeight = -1; if (mSelectingText && mOrientation != newConfig.orientation) { - selectionDone(); + clearSelection(); } mOrientation = newConfig.orientation; if (mWebViewCore != null && !mBlockWebkitViewMessages) { |