diff options
| author | John Reck <jreck@android.com> | 2013-04-30 01:21:30 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-04-30 01:21:31 +0000 |
| commit | 28d91bdbde63ba1afe3bb67c5466527ec7184217 (patch) | |
| tree | 220f93a18ed1c3b46459875d7af2ac10396f4536 | |
| parent | b3f6687756ffb660f834ef673bed04b2d4a26d21 (diff) | |
| parent | 8717061f5be4526a99f3c0ea1f17330d77b52cb7 (diff) | |
| download | base-28d91bdbde63ba1afe3bb67c5466527ec7184217.tar.gz | |
Merge "Revert "Can not mark the same content of browser page after copy""
| -rw-r--r-- | core/java/android/webkit/SelectActionModeCallback.java | 2 | ||||
| -rw-r--r-- | core/java/android/webkit/WebViewClassic.java | 9 |
2 files changed, 2 insertions, 9 deletions
diff --git a/core/java/android/webkit/SelectActionModeCallback.java b/core/java/android/webkit/SelectActionModeCallback.java index 215467be4e24..f9f5b0332741 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.clearSelection(); + mWebView.selectionDone(); } 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 c5765462a0e0..4db9f6c27342 100644 --- a/core/java/android/webkit/WebViewClassic.java +++ b/core/java/android/webkit/WebViewClassic.java @@ -4478,13 +4478,6 @@ 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. */ @@ -4502,7 +4495,7 @@ public final class WebViewClassic implements WebViewProvider, WebViewProvider.Sc public void onConfigurationChanged(Configuration newConfig) { mCachedOverlappingActionModeHeight = -1; if (mSelectingText && mOrientation != newConfig.orientation) { - clearSelection(); + selectionDone(); } mOrientation = newConfig.orientation; if (mWebViewCore != null && !mBlockWebkitViewMessages) { |