Merge "Can not mark the same content of browser page after copy" (b0e0e54d) · Commits · e / os / android_frameworks_base

core/java/android/webkit/SelectActionModeCallback.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -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) {

+8 −1

Original line number	Diff line number	Diff line
		@@ -4478,6 +4478,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.
		*/
		@@ -4495,7 +4502,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) {