diff options
author | Clara Bayarri <clarabayarri@google.com> | 2015-06-02 20:03:45 +0100 |
---|---|---|
committer | Clara Bayarri <clarabayarri@google.com> | 2015-06-04 20:46:19 +0100 |
commit | 7938cdbf985f88017f994e69cfe517970cb65b4d (patch) | |
tree | 23d94c4c5efec4b4ff06a6dcf37543e4a772b353 /core/java/android/inputmethodservice | |
parent | b8da5340f23620630e2875922845689197272273 (diff) | |
download | frameworks_base-7938cdbf985f88017f994e69cfe517970cb65b4d.zip frameworks_base-7938cdbf985f88017f994e69cfe517970cb65b4d.tar.gz frameworks_base-7938cdbf985f88017f994e69cfe517970cb65b4d.tar.bz2 |
Separate the SelectionActionMode into Insertion and Selection.
When we got rid of the paste popup, we merged it into the Selection
ActionMode and moved all its invocations to the ActionMode. Some apps
actually want the paste popup without the Selection ActionMode, hence
separating them again allows them to cancel the one they want.
Bug: 21571422
Change-Id: I91bcd0d9c3e68d9c736698fe0bec010b4c9f5cf3
Diffstat (limited to 'core/java/android/inputmethodservice')
-rw-r--r-- | core/java/android/inputmethodservice/ExtractEditText.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/inputmethodservice/ExtractEditText.java b/core/java/android/inputmethodservice/ExtractEditText.java index 48b604c..f965f54 100644 --- a/core/java/android/inputmethodservice/ExtractEditText.java +++ b/core/java/android/inputmethodservice/ExtractEditText.java @@ -106,7 +106,7 @@ public class ExtractEditText extends EditText { if (mIME != null && mIME.onExtractTextContextMenuItem(id)) { // Mode was started on Extracted, needs to be stopped here. // Cut and paste will change the text, which stops selection mode. - if (id == android.R.id.copy) stopSelectionActionMode(); + if (id == android.R.id.copy) stopTextActionMode(); return true; } return super.onTextContextMenuItem(id); |