diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2022-02-07 20:30:23 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2022-02-07 20:30:23 +0000 |
| commit | 018ffd309da475f023f7910bd674335ae76e7569 (patch) | |
| tree | 88638dab07cbf6fa5f9922e1c77ec80509cd0fc7 /core/java/android | |
| parent | b9d43091d6e76577b29520f0ad5a3436c671ab84 (diff) | |
| parent | 11bd64482249c9257ee22390de15f69f9c834247 (diff) | |
Merge "Fix the empty selection issue when onCreateActionMode returns false"
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/widget/SelectionActionModeHelper.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/core/java/android/widget/SelectionActionModeHelper.java b/core/java/android/widget/SelectionActionModeHelper.java index 2d1f17a420fa..a0ec48bc6beb 100644 --- a/core/java/android/widget/SelectionActionModeHelper.java +++ b/core/java/android/widget/SelectionActionModeHelper.java @@ -297,12 +297,12 @@ public final class SelectionActionModeHelper { } else { mTextClassification = null; } - final SelectionModifierCursorController controller = mEditor.getSelectionController(); - if (controller != null - && (mTextView.isTextSelectable() || mTextView.isTextEditable())) { - controller.show(); - } if (mEditor.startActionModeInternal(actionMode)) { + final SelectionModifierCursorController controller = mEditor.getSelectionController(); + if (controller != null + && (mTextView.isTextSelectable() || mTextView.isTextEditable())) { + controller.show(); + } if (result != null) { switch (actionMode) { case Editor.TextActionMode.SELECTION: |