diff options
author | Tom Taylor <tomtaylor@google.com> | 2013-03-21 10:28:50 -0700 |
---|---|---|
committer | Scott Kennedy <skennedy@google.com> | 2013-03-21 13:09:23 -0700 |
commit | f9171bb324685aef7d274cd43427512a56f22522 (patch) | |
tree | e4a7532b6e3622847029e06066c3565b22bcc301 /chips/src/com/android/ex | |
parent | 52dba50b0e2dfe735484248c6f729950fe4fb7b8 (diff) | |
download | android_frameworks_ex-f9171bb324685aef7d274cd43427512a56f22522.tar.gz android_frameworks_ex-f9171bb324685aef7d274cd43427512a56f22522.tar.bz2 android_frameworks_ex-f9171bb324685aef7d274cd43427512a56f22522.zip |
Cherry-pick: Area code gets eaten in Chips
Bug 8436028
New code for tokenizing an address stripped the area code from a manually
entered phone number. When chips is in "phone number" mode, call a new
function (essentially the old function before the change) to create
a fake entry directly from the phone number.
Cherry-pick of: I2d62ff24aacd8eadb9086840bd4d003cf39db177
Change-Id: I08d98c2e358fc1b8a70bacf358497a511fd71069
Diffstat (limited to 'chips/src/com/android/ex')
-rw-r--r-- | chips/src/com/android/ex/chips/RecipientEditTextView.java | 2 | ||||
-rw-r--r-- | chips/src/com/android/ex/chips/RecipientEntry.java | 10 |
2 files changed, 11 insertions, 1 deletions
diff --git a/chips/src/com/android/ex/chips/RecipientEditTextView.java b/chips/src/com/android/ex/chips/RecipientEditTextView.java index 4347202..a2e037f 100644 --- a/chips/src/com/android/ex/chips/RecipientEditTextView.java +++ b/chips/src/com/android/ex/chips/RecipientEditTextView.java @@ -972,7 +972,7 @@ public class RecipientEditTextView extends MultiAutoCompleteTextView implements return null; } if (isPhoneQuery() && isPhoneNumber(token)) { - return RecipientEntry.constructFakeEntry(token, true); + return RecipientEntry.constructFakePhoneEntry(token, true); } Rfc822Token[] tokens = Rfc822Tokenizer.tokenize(token); String display = null; diff --git a/chips/src/com/android/ex/chips/RecipientEntry.java b/chips/src/com/android/ex/chips/RecipientEntry.java index f7155b0..44bc767 100644 --- a/chips/src/com/android/ex/chips/RecipientEntry.java +++ b/chips/src/com/android/ex/chips/RecipientEntry.java @@ -118,6 +118,16 @@ public class RecipientEntry { } /** + * Construct a RecipientEntry from just a phone number. + */ + public static RecipientEntry constructFakePhoneEntry(final String phoneNumber, + final boolean isValid) { + return new RecipientEntry(ENTRY_TYPE_PERSON, phoneNumber, phoneNumber, + INVALID_DESTINATION_TYPE, null, + INVALID_CONTACT, INVALID_CONTACT, null, true, isValid); + } + + /** * @return the display name for the entry. If the display name source is larger than * {@link DisplayNameSources#PHONE} we use the contact's display name, but if not, * i.e. the display name came from an email address or a phone number, we don't use it |