diff options
| author | David Brown <dab@google.com> | 2010-08-26 14:52:10 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-26 14:52:10 -0700 |
| commit | b4298cd8ba48db21625a396311e01ed6ad9f516c (patch) | |
| tree | 391cd85437dc262528c6f4e0fb014904b074b11e /core/java/android/provider | |
| parent | 409b71201a982e188c05238d95a2eb53ea9e0cf7 (diff) | |
| parent | 846eb30f78a9153102c743c2c1b49de1a4079fb1 (diff) | |
| download | frameworks_base-b4298cd8ba48db21625a396311e01ed6ad9f516c.zip frameworks_base-b4298cd8ba48db21625a396311e01ed6ad9f516c.tar.gz frameworks_base-b4298cd8ba48db21625a396311e01ed6ad9f516c.tar.bz2 | |
am 846eb30f: Add SipAddress to ContactsContract.
Merge commit '846eb30f78a9153102c743c2c1b49de1a4079fb1' into gingerbread-plus-aosp
* commit '846eb30f78a9153102c743c2c1b49de1a4079fb1':
Add SipAddress to ContactsContract.
Diffstat (limited to 'core/java/android/provider')
| -rw-r--r-- | core/java/android/provider/ContactsContract.java | 47 |
1 files changed, 47 insertions, 0 deletions
diff --git a/core/java/android/provider/ContactsContract.java b/core/java/android/provider/ContactsContract.java index f0ee838..13cbda8 100644 --- a/core/java/android/provider/ContactsContract.java +++ b/core/java/android/provider/ContactsContract.java @@ -2305,6 +2305,7 @@ public final class ContactsContract { * <li>{@link CommonDataKinds.Website Website.CONTENT_ITEM_TYPE}</li> * <li>{@link CommonDataKinds.Event Event.CONTENT_ITEM_TYPE}</li> * <li>{@link CommonDataKinds.Relation Relation.CONTENT_ITEM_TYPE}</li> + * <li>{@link CommonDataKinds.SipAddress SipAddress.CONTENT_ITEM_TYPE}</li> * </ul> * </p> * </td> @@ -4860,6 +4861,52 @@ public final class ContactsContract { */ public static final String URL = DATA; } + + /** + * <p> + * A data kind representing a SIP address for the contact. + * </p> + * <p> + * You can use all columns defined for {@link ContactsContract.Data} as + * well as the following aliases. + * </p> + * <h2>Column aliases</h2> + * <table class="jd-sumtable"> + * <tr> + * <th>Type</th> + * <th>Alias</th><th colspan='2'>Data column</th> + * </tr> + * <tr> + * <td>String</td> + * <td>{@link #SIP_ADDRESS}</td> + * <td>{@link #DATA1}</td> + * <td></td> + * </tr> + * </table> + */ + public static final class SipAddress implements DataColumnsWithJoins { + // TODO: Ultimately this class will probably implement + // CommonColumns too (in addition to DataColumnsWithJoins) + // since it may make sense to have multiple SIP addresses with + // different types+labels, just like with phone numbers. + // + // But that can be extended in the future without breaking any + // public API, so let's keep this class ultra-simple for now. + + /** + * This utility class cannot be instantiated + */ + private SipAddress() {} + + /** MIME type used when storing this in data table. */ + public static final String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/sip_address"; + + /** + * The SIP address. + * <P>Type: TEXT</P> + */ + public static final String SIP_ADDRESS = DATA1; + } } /** |