Merge "Fix Toolbar is not refreshed after Select All" into mnc-dev

2 files changed, 18 insertions, 3 deletions

diff --git a/core/java/android/widget/Editor.java b/core/java/android/widget/Editor.java
index 4c98abf..0c4b1e1 100644
--- a/core/java/android/widget/Editor.java
+++ b/core/java/android/widget/Editor.java
@@ -1756,6 +1756,12 @@ public class Editor {
         if (!checkFieldAndSelectCurrentWord()) {
             return false;
         }
+
+        // Avoid dismissing the selection if it exists.
+        mPreserveDetachedSelection = true;
+        stopTextActionMode();
+        mPreserveDetachedSelection = false;
+
         getSelectionController().enterDrag();
         return true;
     }
@@ -3129,7 +3135,9 @@ public class Editor {
             Callback customCallback = getCustomCallback();
             if (customCallback != null) {
                 if (!customCallback.onCreateActionMode(mode, menu)) {
-                    // The custom mode can choose to cancel the action mode
+                    // The custom mode can choose to cancel the action mode, dismiss selection.
+                    Selection.setSelection((Spannable) mTextView.getText(),
+                            mTextView.getSelectionEnd());
                     return false;
                 }
             }
diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java
index 6872caa..b0411c9 100644
--- a/core/java/android/widget/TextView.java
+++ b/core/java/android/widget/TextView.java
@@ -9072,9 +9072,16 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
 
         switch (id) {
             case ID_SELECT_ALL:
-                // This does not enter text selection mode. Text is highlighted, so that it can be
-                // bulk edited, like selectAllOnFocus does. Returns true even if text is empty.
+                // This starts an action mode if triggered from another action mode. Text is
+                // highlighted, so that it can be bulk edited, like selectAllOnFocus does. Returns
+                // true even if text is empty.
+                boolean shouldRestartActionMode =
+                        mEditor != null && mEditor.mTextActionMode != null;
+                stopTextActionMode();
                 selectAllText();
+                if (shouldRestartActionMode) {
+                    mEditor.startSelectionActionMode();
+                }
                 return true;
 
             case ID_UNDO: