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
This commit is contained in:
Victoria Lease
2013-04-26 10:27:02 -07:00
committed by Android Git Automerger
2 changed files with 9 additions and 2 deletions

View File

@@ -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) {

View File

@@ -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) {