commit 44c07715c6a353db51ed79e68bc99a06eb4acc16
author Mindy Pereira <mindyp@google.com> Tue Jun 21 17:35:36 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jun 21 17:35:36 2011 -0700
tree 34ffeba105b0547053d248aac8e3adb3930d280d
parent faa944cfd66fc3ebba9a3a93614e55da4a66e812
parent e82e61f026fe8edfc12743fb038ddac9af5cf1ef

Merge "Clearselectedchip and unselectchip should not call each other."

src/com/android/ex/chips/RecipientEditTextView.java

diff --git a/src/com/android/ex/chips/RecipientEditTextView.java b/src/com/android/ex/chips/RecipientEditTextView.java
index aa29fc8..76b52db 100644
--- a/src/com/android/ex/chips/RecipientEditTextView.java
+++ b/src/com/android/ex/chips/RecipientEditTextView.java
@@ -1125,15 +1125,14 @@
         int start = getChipStart(chip);
         int end = getChipEnd(chip);
         Editable editable = getText();
+        mSelectedChip = null;
         if (start == -1 || end == -1) {
             Log.e(TAG, "The chip being unselected no longer exists but should.");
         } else {
-            getSpannable().removeSpan(this);
+            getSpannable().removeSpan(chip);
             QwertyKeyListener.markAsReplaced(editable, start, end, "");
             editable.replace(start, end, createChip(chip.getEntry(), false));
         }
-        mSelectedChip = null;
-        clearSelectedChip();
         setCursorVisible(true);
         setSelection(editable.length());
         if (mAlternatesPopup != null && mAlternatesPopup.isShowing()) {