Make sure when we reverse lookup a recipient, we replace the underlying text string as well.

Fixes b/7146034 Conversation message header doesn't show friendly names

Change-Id: I043d352e1c6546e5a8c07854e832f31c3a71d24d

1 files changed, 6 insertions, 2 deletions

diff --git a/chips/src/com/android/ex/chips/RecipientEditTextView.java b/chips/src/com/android/ex/chips/RecipientEditTextView.java
index b1cab6c..d3ac919 100644
--- a/chips/src/com/android/ex/chips/RecipientEditTextView.java
+++ b/chips/src/com/android/ex/chips/RecipientEditTextView.java
@@ -2344,10 +2344,14 @@ public class RecipientEditTextView extends MultiAutoCompleteTextView implements
                             if (start != -1) {
                                 end = oldText.getSpanEnd(chip);
                                 oldText.removeSpan(chip);
-                                // Leave a spot for the space!
                                 RecipientChip replacement = replacements.get(i);
-                                text.setSpan(replacement, start, end,
+                                // Trim any whitespace, as we will already have
+                                // it added if these are replacement chips.
+                                SpannableString displayText = new SpannableString(
+                                        createAddressText(replacement.getEntry()).trim());
+                                displayText.setSpan(replacement, 0, displayText.length(),
                                         Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+                                text.replace(start, end, displayText);
                                 replacement.setOriginalText(text.toString().substring(start, end));
                             }
                             i++;