commit 0bb497b8d1bac2206df89a878ecb7e356d21fe99
author Elliott Hughes <enh@google.com> Fri Apr 26 18:41:47 2013 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Apr 26 18:41:47 2013 +0000
tree cd539fad1ebc68f95301093bf2f9975103020300
parent b0e0e54d9dbef720ac653ed87d8ed6b46e1abdbe
parent 48289433d878d679ecae0cd7d74371d6440285e3

Merge "Use the newer ZoneInfoDB API."

core/java/android/webkit/SelectActionModeCallback.java

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 @@
 
     @Override
     public void onDestroyActionMode(ActionMode mode) {
-        mWebView.selectionDone();
+        mWebView.clearSelection();
     }
 
     private void setMenuVisibility(Menu menu, boolean visible, int resourceId) {

core/java/android/webkit/WebViewClassic.java

diff --git a/core/java/android/webkit/WebViewClassic.java b/core/java/android/webkit/WebViewClassic.java
index 4db9f6c..c576546 100644
--- a/core/java/android/webkit/WebViewClassic.java
+++ b/core/java/android/webkit/WebViewClassic.java
@@ -4478,6 +4478,13 @@
         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 void onConfigurationChanged(Configuration newConfig) {
         mCachedOverlappingActionModeHeight = -1;
         if (mSelectingText && mOrientation != newConfig.orientation) {
-            selectionDone();
+            clearSelection();
         }
         mOrientation = newConfig.orientation;
         if (mWebViewCore != null && !mBlockWebkitViewMessages) {