Chips: Add more logic to dismiss selection dialogstable/cm-12.0-YNG1I

Check for address popup in addition to alternates with dismissing
On shrink, dismiss phone generated contact chips

Change-Id: I0e8b467e3faad15c0e7c46a03c8d8e4af8c3963e

1 files changed, 4 insertions, 2 deletions

diff --git a/src/com/android/ex/chips/RecipientEditTextView.java b/src/com/android/ex/chips/RecipientEditTextView.java
index 8d06516..e1dedf6 100644
--- a/src/com/android/ex/chips/RecipientEditTextView.java
+++ b/src/com/android/ex/chips/RecipientEditTextView.java
@@ -526,8 +526,7 @@ public class RecipientEditTextView extends MultiAutoCompleteTextView implements
             return;
         }
         long contactId = mSelectedChip != null ? mSelectedChip.getEntry().getContactId() : -1;
-        if (mSelectedChip != null && contactId != RecipientEntry.INVALID_CONTACT
-                && (!isPhoneQuery() && contactId != RecipientEntry.GENERATED_CONTACT)) {
+        if (mSelectedChip != null && contactId != RecipientEntry.INVALID_CONTACT) {
             clearSelectedChip();
         } else {
             if (getWidth() <= 0) {
@@ -2268,6 +2267,9 @@ public class RecipientEditTextView extends MultiAutoCompleteTextView implements
         }
         setCursorVisible(true);
         setSelection(editable.length());
+        if (mAddressPopup != null && mAddressPopup.isShowing()) {
+            mAddressPopup.dismiss();
+        }
         if (mAlternatesPopup != null && mAlternatesPopup.isShowing()) {
             mAlternatesPopup.dismiss();
         }