diff options
| author | David Brown <dab@google.com> | 2010-08-23 19:05:13 -0700 |
|---|---|---|
| committer | David Brown <dab@google.com> | 2010-08-24 21:18:29 -0700 |
| commit | 9694d37206416feaee0119cf7e620c7ae97f0a50 (patch) | |
| tree | bac22c152d2fe2d2cafa419282b5d4ba2c627c30 /res | |
| parent | e0e126bad38e267e5b4e31b9981ce2858b811e04 (diff) | |
| download | packages_apps_Contacts-9694d37206416feaee0119cf7e620c7ae97f0a50.tar.gz packages_apps_Contacts-9694d37206416feaee0119cf7e620c7ae97f0a50.tar.bz2 packages_apps_Contacts-9694d37206416feaee0119cf7e620c7ae97f0a50.zip | |
Add SipAddress to Contacts UI. DO NOT MERGE.
Update the contacts app to display and edit the new SipAddress field.
(See https://android-git.corp.google.com/g/62672 for the corresponding
ContactsContract change.)
The details:
- Updated ViewContactActivity to display the SIP address if present,
and to handle a click by firing off a CALL_PRIVILEGED intent with
the address in a sip: URI.
(Note: this code is wildly different in master, and the automerger
is guaranteed to fail, so I'm marking this change DO NOT MERGE.
I'll apply it manually in master as a separate change.)
- Updated FallbackSource and GoogleSource to know about SipAddress.
A SIP address is displayed using a regular "phone call" icon for now,
but we'll eventually want a SIP-specific variant. (I'll separately
ask the UI dudes for that.) The SIP address field is edited using the
"email address" style IME.
Note I didn't touch the ExchangeSource class, which means that (for
Exchange-synced contacts) we just won't allow editing this field.
(Alternatively, we *could* allow the user to edit SIP addresses, and
just have them silently not synced. I'll check with the product
guys about this.)
Also cleaned up a bunch of unnecessary method overrides in
GoogleSource.java.
- Updated QuickContactWindow to handle SIP addresses just like regular
phone numbers, except that they fire off a sip: intent rather than a
tel: intent.
I still need to figure out how to make the "call SIP" icon different
from the regular "call phone" icon though.
Bug: 2942998
Change-Id: I4f67641ef134be406606a99d9f9f07baeaadbf88
Diffstat (limited to 'res')
| -rw-r--r-- | res/values/strings.xml | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index facf34cec..e556dcd10 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -193,6 +193,9 @@ <!-- The label describing the Notes field of a contact. This field allows free form text entry about a contact --> <string name="label_notes">Notes</string> + <!-- The label describing the SIP address field of a contact. [CHAR LIMIT=20] --> + <string name="label_sip_address">SIP address</string> + <!-- The label describing the custom ringtone for a contact --> <string name="label_ringtone">Ringtone</string> |