diff options
author | Scott Kennedy <skennedy@google.com> | 2013-03-14 13:11:56 -0700 |
---|---|---|
committer | Scott Kennedy <skennedy@google.com> | 2013-03-14 13:11:56 -0700 |
commit | 5727eeebd6f7afc15b773dd851a121f51a4ccd75 (patch) | |
tree | ab346b5390fb1f343ef582425d01ad59a0265685 /chips | |
parent | 4aa10b1bc14290397756b05e97ff9bc8a3b7564b (diff) | |
parent | 35d3af70da9740a81eb8eda5a7f87e6f396fb151 (diff) | |
download | android_frameworks_ex-5727eeebd6f7afc15b773dd851a121f51a4ccd75.tar.gz android_frameworks_ex-5727eeebd6f7afc15b773dd851a121f51a4ccd75.tar.bz2 android_frameworks_ex-5727eeebd6f7afc15b773dd851a121f51a4ccd75.zip |
resolved conflicts for merge of 35d3af70 to jb-mr2-dev
Change-Id: If85946ef3dbf82eb3a790adf320765e4a25d91dc
Diffstat (limited to 'chips')
-rw-r--r-- | chips/src/com/android/ex/chips/RecipientEditTextView.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chips/src/com/android/ex/chips/RecipientEditTextView.java b/chips/src/com/android/ex/chips/RecipientEditTextView.java index 67a5ca9..5e433fa 100644 --- a/chips/src/com/android/ex/chips/RecipientEditTextView.java +++ b/chips/src/com/android/ex/chips/RecipientEditTextView.java @@ -2347,12 +2347,12 @@ public class RecipientEditTextView extends MultiAutoCompleteTextView implements int originalTokenStart = mTokenizer.findTokenStart(text, getSelectionEnd()); String lastAddress = text.substring(originalTokenStart); int tokenStart = originalTokenStart; - int prevTokenStart = tokenStart; + int prevTokenStart = 0; DrawableRecipientChip findChip = null; ArrayList<DrawableRecipientChip> created = new ArrayList<DrawableRecipientChip>(); if (tokenStart != 0) { // There are things before this! - while (tokenStart != 0 && findChip == null) { + while (tokenStart != 0 && findChip == null && tokenStart != prevTokenStart) { prevTokenStart = tokenStart; tokenStart = mTokenizer.findTokenStart(text, tokenStart); findChip = findChip(tokenStart); |