diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2015-02-02 13:20:35 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2015-02-02 13:20:35 -0800 |
| commit | 6258700ef6210562f7afd144f6e934673aa315f5 (patch) | |
| tree | b7cd47199b7f367719e9d3d0b9c5578355b6d5ca | |
| parent | 50ebf3e8dc6887dec448fcc12e7da08d63acce12 (diff) | |
| parent | ca3324e2b73a53c18675a4735d43e9c3ed37d7d9 (diff) | |
| download | android_frameworks_opt_chips-6258700ef6210562f7afd144f6e934673aa315f5.tar.gz android_frameworks_opt_chips-6258700ef6210562f7afd144f6e934673aa315f5.tar.bz2 android_frameworks_opt_chips-6258700ef6210562f7afd144f6e934673aa315f5.zip | |
Merge "Chips: Add more logic to dismiss selection dialog"
| -rw-r--r-- | src/com/android/ex/chips/RecipientEditTextView.java | 6 |
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 461b198..cf2a16f 100644 --- a/src/com/android/ex/chips/RecipientEditTextView.java +++ b/src/com/android/ex/chips/RecipientEditTextView.java @@ -524,8 +524,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) { @@ -2272,6 +2271,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(); } |