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

Merge "Can not mark the same content of browser page after copy"

Browse Source
This commit is contained in:
Victoria Lease
2013-04-26 17:17:39 +00:00
committed by Gerrit Code Review
parent a643652680 2b3cef0dd7
commit b0e0e54d9d
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/webkit/SelectActionModeCallback.java
View File

@@ -137,7 +137,7 @@ class SelectActionModeCallback implements ActionMode.Callback {
@Override @Override
public void onDestroyActionMode(ActionMode mode) { public void onDestroyActionMode(ActionMode mode) {
mWebView.selectionDone(); mWebView.clearSelection();
} }
private void setMenuVisibility(Menu menu, boolean visible, int resourceId) { private void setMenuVisibility(Menu menu, boolean visible, int resourceId) {

9
core/java/android/webkit/WebViewClassic.java
View File

@@ -4478,6 +4478,13 @@ public final class WebViewClassic implements WebViewProvider, WebViewProvider.Sc
return selectText(x, y); 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. * Select the word at the indicated content coordinates.
*/ */
@@ -4495,7 +4502,7 @@ public final class WebViewClassic implements WebViewProvider, WebViewProvider.Sc
public void onConfigurationChanged(Configuration newConfig) { public void onConfigurationChanged(Configuration newConfig) {
mCachedOverlappingActionModeHeight = -1; mCachedOverlappingActionModeHeight = -1;
if (mSelectingText && mOrientation != newConfig.orientation) { if (mSelectingText && mOrientation != newConfig.orientation) {
selectionDone(); clearSelection();
} }
mOrientation = newConfig.orientation; mOrientation = newConfig.orientation;
if (mWebViewCore != null && !mBlockWebkitViewMessages) { if (mWebViewCore != null && !mBlockWebkitViewMessages) {