diff options
author | Ekin Oguz <ekinoguz@google.com> | 2016-08-04 17:25:59 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-08-04 17:25:59 +0000 |
commit | 5c36439515d92e217f14bc43a68093af937fb70e (patch) | |
tree | ab57deb3105b9e6deca62a17adc31ac2155779fd | |
parent | abbbd829406392d14925f124e985058232403778 (diff) | |
parent | dbe88c3002c8a8d7f8cceaef988462502e4c557b (diff) | |
download | chips-5c36439515d92e217f14bc43a68093af937fb70e.tar.gz |
Convert valid email addresses to a chip.
am: dbe88c3002
Change-Id: I104c02ff6ec2ef6b0075c7d4c6105fad4f77eef2
-rw-r--r-- | src/com/android/ex/chips/RecipientEditTextView.java | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/src/com/android/ex/chips/RecipientEditTextView.java b/src/com/android/ex/chips/RecipientEditTextView.java index 966325b..3cd0f41 100644 --- a/src/com/android/ex/chips/RecipientEditTextView.java +++ b/src/com/android/ex/chips/RecipientEditTextView.java @@ -1518,18 +1518,17 @@ public class RecipientEditTextView extends MultiAutoCompleteTextView implements private boolean commitChip(int start, int end, Editable editable) { int position = positionOfFirstEntryWithTypePerson(); if (position != -1 && enoughToFilter() - && end == getSelectionEnd() && !isPhoneQuery()) { + && end == getSelectionEnd() && !isPhoneQuery() + && !isValidEmailAddress(editable.toString().substring(start, end).trim())) { // let's choose the selected or first entry if only the input text is NOT an email // address so we won't try to replace the user's potentially correct but // new/unencountered email input - if (!isValidEmailAddress(editable.toString().substring(start, end).trim())) { - final int selectedPosition = getListSelection(); - if (selectedPosition == -1 || !isEntryAtPositionTypePerson(selectedPosition)) { - // Nothing is selected or selected item is not type person; use the first item - submitItemAtPosition(position); - } else { - submitItemAtPosition(selectedPosition); - } + final int selectedPosition = getListSelection(); + if (selectedPosition == -1 || !isEntryAtPositionTypePerson(selectedPosition)) { + // Nothing is selected or selected item is not type person; use the first item + submitItemAtPosition(position); + } else { + submitItemAtPosition(selectedPosition); } dismissDropDown(); return true; |