diff options
author | Ekin Oguz <ekinoguz@google.com> | 2016-08-04 17:28:28 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-08-04 17:28:28 +0000 |
commit | e140d79a2a9e023710c0a880027cd8944f8b2485 (patch) | |
tree | 1b01687836c073169b8dd9fa09b2ac670a123395 | |
parent | 1006b1eb5cecafc1d317dcc5d7b05a850b7129af (diff) | |
parent | 5c36439515d92e217f14bc43a68093af937fb70e (diff) | |
download | chips-nougat-mr1.1-release.tar.gz |
Convert valid email addresses to a chip. am: dbe88c3002android-cts_7.1_r1android-cts-7.1_r9android-cts-7.1_r8android-cts-7.1_r7android-cts-7.1_r6android-cts-7.1_r5android-cts-7.1_r4android-cts-7.1_r3android-cts-7.1_r29android-cts-7.1_r28android-cts-7.1_r27android-cts-7.1_r26android-cts-7.1_r25android-cts-7.1_r24android-cts-7.1_r23android-cts-7.1_r22android-cts-7.1_r21android-cts-7.1_r20android-cts-7.1_r2android-cts-7.1_r19android-cts-7.1_r18android-cts-7.1_r17android-cts-7.1_r16android-cts-7.1_r15android-cts-7.1_r14android-cts-7.1_r13android-cts-7.1_r12android-cts-7.1_r11android-cts-7.1_r10android-cts-7.1_r1android-7.1.1_r9android-7.1.1_r8android-7.1.1_r7android-7.1.1_r61android-7.1.1_r60android-7.1.1_r6android-7.1.1_r59android-7.1.1_r58android-7.1.1_r57android-7.1.1_r56android-7.1.1_r55android-7.1.1_r54android-7.1.1_r53android-7.1.1_r52android-7.1.1_r51android-7.1.1_r50android-7.1.1_r49android-7.1.1_r48android-7.1.1_r47android-7.1.1_r46android-7.1.1_r45android-7.1.1_r44android-7.1.1_r43android-7.1.1_r42android-7.1.1_r41android-7.1.1_r40android-7.1.1_r4android-7.1.1_r39android-7.1.1_r38android-7.1.1_r35android-7.1.1_r33android-7.1.1_r32android-7.1.1_r31android-7.1.1_r3android-7.1.1_r28android-7.1.1_r27android-7.1.1_r26android-7.1.1_r25android-7.1.1_r24android-7.1.1_r23android-7.1.1_r22android-7.1.1_r21android-7.1.1_r20android-7.1.1_r2android-7.1.1_r17android-7.1.1_r16android-7.1.1_r15android-7.1.1_r14android-7.1.1_r13android-7.1.1_r12android-7.1.1_r11android-7.1.1_r10android-7.1.1_r1android-7.1.0_r7android-7.1.0_r6android-7.1.0_r5android-7.1.0_r4android-7.1.0_r3android-7.1.0_r2android-7.1.0_r1nougat-mr1.8-releasenougat-mr1.7-releasenougat-mr1.6-releasenougat-mr1.5-releasenougat-mr1.4-releasenougat-mr1.3-releasenougat-mr1.2-releasenougat-mr1.1-releasenougat-mr1-volantis-releasenougat-mr1-security-releasenougat-mr1-releasenougat-mr1-flounder-releasenougat-mr1-devnougat-mr1-cts-releasenougat-dr1-release
am: 5c36439515
Change-Id: Ia22def4231f8ff80d5a24aa1d33bafe1fdb344aa
-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; |