diff options
author | David Brown <dab@google.com> | 2010-09-15 13:34:13 -0700 |
---|---|---|
committer | David Brown <dab@google.com> | 2010-09-15 18:05:29 -0700 |
commit | 747c61535281b4d2958e293e83245a19ba58f6a0 (patch) | |
tree | 46cdb4cb17ae7fbe0404bd52977c174bf91af609 /api | |
parent | 134b28a7f049719cb74fd5baadbbcc5915bc861b (diff) | |
download | frameworks_base-747c61535281b4d2958e293e83245a19ba58f6a0.zip frameworks_base-747c61535281b4d2958e293e83245a19ba58f6a0.tar.gz frameworks_base-747c61535281b4d2958e293e83245a19ba58f6a0.tar.bz2 |
ContactsContract: update SipAddress to be multi-valued
This is step (1) of the device-side changes to deal with SIP addresses
becoming first-class objects in focus.
It'll be multi-valued in focus, so make it multi-valued on the device
(just like Phone, Email, Im, etc.)
Possible types are CUSTOM, HOME, WORK, and OTHER.
Also while I was in there, fixed the typo in "TYPE_MAINDEN_NAME" in the
Nickname class. (I can't remove it, since it's public API, so I added a
new constant with the correct spelling and deprecated the misspelled
one.)
Bug: 3004838
TESTED: on passion:
- Flashed this change onto a device that already had a contact with a
SipAddress, verified that it still shows up fine in the UI.
- Wiped data, rerean SetupWizard and logged in, made sure that SIP
addresses got synced down properly.
- Edited SIP address on the device, made sure it got correctly synced
up to the SIP user-defined field.
Change-Id: I6ecf551b64f87de03a7807e6212297d91f9e3981
Diffstat (limited to 'api')
-rw-r--r-- | api/current.xml | 78 |
1 files changed, 77 insertions, 1 deletions
diff --git a/api/current.xml b/api/current.xml index d22f9b9..81090a4 100644 --- a/api/current.xml +++ b/api/current.xml @@ -136919,7 +136919,7 @@ visibility="public" > </field> -<field name="TYPE_MAINDEN_NAME" +<field name="TYPE_MAIDEN_NAME" type="int" transient="false" volatile="false" @@ -136930,6 +136930,17 @@ visibility="public" > </field> +<field name="TYPE_MAINDEN_NAME" + type="int" + transient="false" + volatile="false" + value="3" + static="true" + final="true" + deprecated="deprecated" + visibility="public" +> +</field> <field name="TYPE_OTHER_NAME" type="int" transient="false" @@ -137685,8 +137696,40 @@ deprecated="not deprecated" visibility="public" > +<implements name="android.provider.ContactsContract.CommonDataKinds.CommonColumns"> +</implements> <implements name="android.provider.ContactsContract.DataColumnsWithJoins"> </implements> +<method name="getTypeLabel" + return="java.lang.CharSequence" + abstract="false" + native="false" + synchronized="false" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +<parameter name="res" type="android.content.res.Resources"> +</parameter> +<parameter name="type" type="int"> +</parameter> +<parameter name="label" type="java.lang.CharSequence"> +</parameter> +</method> +<method name="getTypeLabelResource" + return="int" + abstract="false" + native="false" + synchronized="false" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +<parameter name="type" type="int"> +</parameter> +</method> <field name="CONTENT_ITEM_TYPE" type="java.lang.String" transient="false" @@ -137709,6 +137752,39 @@ visibility="public" > </field> +<field name="TYPE_HOME" + type="int" + transient="false" + volatile="false" + value="1" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="TYPE_OTHER" + type="int" + transient="false" + volatile="false" + value="3" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="TYPE_WORK" + type="int" + transient="false" + volatile="false" + value="2" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> </class> <class name="ContactsContract.CommonDataKinds.StructuredName" extends="java.lang.Object" |