summaryrefslogtreecommitdiffstats
path: root/chips
diff options
context:
space:
mode:
authorPaul Westbrook <pwestbro@google.com>2013-04-23 22:24:32 -0700
committerPaul Westbrook <pwestbro@google.com>2013-04-23 22:24:32 -0700
commit2d3f2bcfdcd4593edd23b17868289d5a5c2f34da (patch)
tree3cea6f6ab01711edc72cd89c400607cc1a173546 /chips
parent305bea9dc5f0fc8a3cdd1390c03178ff55e4d324 (diff)
parent0a3140bf243b406da59e74a32fec6929a94de24e (diff)
downloadandroid_frameworks_ex-2d3f2bcfdcd4593edd23b17868289d5a5c2f34da.tar.gz
android_frameworks_ex-2d3f2bcfdcd4593edd23b17868289d5a5c2f34da.tar.bz2
android_frameworks_ex-2d3f2bcfdcd4593edd23b17868289d5a5c2f34da.zip
Merge jb-ub-mail-ur10' into master
Change-Id: I9717293c60c311834c7c643cd27cee06149ec07a
Diffstat (limited to 'chips')
-rw-r--r--chips/src/com/android/ex/chips/RecipientEditTextView.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/chips/src/com/android/ex/chips/RecipientEditTextView.java b/chips/src/com/android/ex/chips/RecipientEditTextView.java
index 8b6367f..62a60b0 100644
--- a/chips/src/com/android/ex/chips/RecipientEditTextView.java
+++ b/chips/src/com/android/ex/chips/RecipientEditTextView.java
@@ -2566,7 +2566,8 @@ public class RecipientEditTextView extends MultiAutoCompleteTextView implements
if (start != -1) {
// Replacing the entirety of what the chip represented,
// including the extra space dividing it from other chips.
- final int end = text.getSpanEnd(chip) + 1;
+ final int end =
+ Math.min(text.getSpanEnd(chip) + 1, text.length());
text.removeSpan(chip);
// Make sure we always have just 1 space at the end to
// separate this chip from the next chip.