summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--core/java/android/widget/Editor.java2
-rw-r--r--core/java/android/widget/TextView.java4
2 files changed, 5 insertions, 1 deletions
diff --git a/core/java/android/widget/Editor.java b/core/java/android/widget/Editor.java
index bb658c153ead..1fef7cbd1953 100644
--- a/core/java/android/widget/Editor.java
+++ b/core/java/android/widget/Editor.java
@@ -2016,7 +2016,7 @@ public class Editor {
/**
* Asynchronously invalidates an action mode using the TextClassifier.
*/
- private void invalidateActionModeAsync() {
+ void invalidateActionModeAsync() {
getSelectionActionModeHelper().invalidateActionModeAsync();
}
diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java
index d2606a3353b5..77f27d983e17 100644
--- a/core/java/android/widget/TextView.java
+++ b/core/java/android/widget/TextView.java
@@ -10772,7 +10772,11 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
switch (id) {
case ID_SELECT_ALL:
+ final boolean hadSelection = hasSelection();
selectAllText();
+ if (mEditor != null && hadSelection) {
+ mEditor.invalidateActionModeAsync();
+ }
return true;
case ID_UNDO: