Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 4b5e7d90: Merge change 25874 into eclair

Browse Source 
Merge commit '4b5e7d908bfda633fea72f5d20dae63328019c93' into eclair-plus-aosp

* commit '4b5e7d908bfda633fea72f5d20dae63328019c93':
  ContactsContract: Adding joined columns to the CommonDataKind class definitions.
This commit is contained in:
Dmitri Plotnikov
2009-09-18 19:39:41 -07:00
committed by Android Git Automerger
parent f44ddb6b45 4b5e7d908b
commit 7235e015ac
1 changed files with 23 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
core/java/android/provider/ContactsContract.java
View File

@@ -676,14 +676,21 @@ public final class ContactsContract {
public static final String SYNC4 = "data_sync4"; public static final String SYNC4 = "data_sync4";
} }
/**
* Combines all columns returned by {@link Data} table queries.
*/
private interface DataColumnsWithJoins extends BaseColumns, DataColumns, RawContactsColumns,
ContactsColumns, ContactOptionsColumns {
}
/** /**
* Constants for the data table, which contains data points tied to a raw contact. * Constants for the data table, which contains data points tied to a raw contact.
* For example, a phone number or email address. Each row in this table contains a type * For example, a phone number or email address. Each row in this table contains a type
* definition and some generic columns. Each data type can define the meaning for each of * definition and some generic columns. Each data type can define the meaning for each of
* the generic columns. * the generic columns.
*/ */
public static final class Data implements BaseColumns, DataColumns, RawContactsColumns, public final static class Data implements DataColumnsWithJoins {
ContactsColumns {
/** /**
* This utility class cannot be instantiated * This utility class cannot be instantiated
*/ */
@@ -951,7 +958,7 @@ public final class ContactsContract {
/** /**
* Parts of the name. * Parts of the name.
*/ */
public static final class StructuredName implements BaseCommonColumns { public static final class StructuredName implements DataColumnsWithJoins {
private StructuredName() {} private StructuredName() {}
/** MIME type used when storing this in data table. */ /** MIME type used when storing this in data table. */
@@ -1017,7 +1024,7 @@ public final class ContactsContract {
/** /**
* A nickname. * A nickname.
*/ */
public static final class Nickname implements CommonColumns, BaseCommonColumns { public static final class Nickname implements DataColumnsWithJoins, CommonColumns {
private Nickname() {} private Nickname() {}
/** MIME type used when storing this in data table. */ /** MIME type used when storing this in data table. */
@@ -1038,7 +1045,7 @@ public final class ContactsContract {
/** /**
* Common data definition for telephone numbers. * Common data definition for telephone numbers.
*/ */
public static final class Phone implements BaseCommonColumns, CommonColumns { public static final class Phone implements DataColumnsWithJoins, CommonColumns {
private Phone() {} private Phone() {}
/** MIME type used when storing this in data table. */ /** MIME type used when storing this in data table. */
@@ -1124,7 +1131,7 @@ public final class ContactsContract {
/** /**
* Common data definition for email addresses. * Common data definition for email addresses.
*/ */
public static final class Email implements BaseCommonColumns, CommonColumns { public static final class Email implements DataColumnsWithJoins, CommonColumns {
private Email() {} private Email() {}
/** MIME type used when storing this in data table. */ /** MIME type used when storing this in data table. */
@@ -1173,7 +1180,7 @@ public final class ContactsContract {
/** /**
* Common data definition for postal addresses. * Common data definition for postal addresses.
*/ */
public static final class StructuredPostal implements BaseCommonColumns, CommonColumns { public static final class StructuredPostal implements DataColumnsWithJoins, CommonColumns {
private StructuredPostal() { private StructuredPostal() {
} }
@@ -1267,7 +1274,7 @@ public final class ContactsContract {
/** /**
* Common data definition for IM addresses. * Common data definition for IM addresses.
*/ */
public static final class Im implements BaseCommonColumns, CommonColumns { public static final class Im implements DataColumnsWithJoins, CommonColumns {
private Im() {} private Im() {}
/** MIME type used when storing this in data table. */ /** MIME type used when storing this in data table. */
@@ -1305,7 +1312,7 @@ public final class ContactsContract {
/** /**
* Common data definition for organizations. * Common data definition for organizations.
*/ */
public static final class Organization implements BaseCommonColumns, CommonColumns { public static final class Organization implements DataColumnsWithJoins, CommonColumns {
private Organization() {} private Organization() {}
/** MIME type used when storing this in data table. */ /** MIME type used when storing this in data table. */
@@ -1354,7 +1361,7 @@ public final class ContactsContract {
/** /**
* Common data definition for miscellaneous information. * Common data definition for miscellaneous information.
*/ */
public static final class Miscellaneous implements BaseCommonColumns { public static final class Miscellaneous implements DataColumnsWithJoins {
private Miscellaneous() {} private Miscellaneous() {}
/** MIME type used when storing this in data table. */ /** MIME type used when storing this in data table. */
@@ -1376,7 +1383,7 @@ public final class ContactsContract {
/** /**
* Common data definition for relations. * Common data definition for relations.
*/ */
public static final class Relation implements BaseCommonColumns, CommonColumns { public static final class Relation implements DataColumnsWithJoins, CommonColumns {
private Relation() {} private Relation() {}
/** MIME type used when storing this in data table. */ /** MIME type used when storing this in data table. */
@@ -1407,7 +1414,7 @@ public final class ContactsContract {
/** /**
* Common data definition for events. * Common data definition for events.
*/ */
public static final class Event implements BaseCommonColumns, CommonColumns { public static final class Event implements DataColumnsWithJoins, CommonColumns {
private Event() {} private Event() {}
/** MIME type used when storing this in data table. */ /** MIME type used when storing this in data table. */
@@ -1426,7 +1433,7 @@ public final class ContactsContract {
/** /**
* Photo of the contact. * Photo of the contact.
*/ */
public static final class Photo implements BaseCommonColumns { public static final class Photo implements DataColumnsWithJoins {
private Photo() {} private Photo() {}
/** MIME type used when storing this in data table. */ /** MIME type used when storing this in data table. */
@@ -1444,7 +1451,7 @@ public final class ContactsContract {
/** /**
* Notes about the contact. * Notes about the contact.
*/ */
public static final class Note implements BaseCommonColumns { public static final class Note implements DataColumnsWithJoins {
private Note() {} private Note() {}
/** MIME type used when storing this in data table. */ /** MIME type used when storing this in data table. */
@@ -1460,7 +1467,7 @@ public final class ContactsContract {
/** /**
* Group Membership. * Group Membership.
*/ */
public static final class GroupMembership implements BaseCommonColumns { public static final class GroupMembership implements DataColumnsWithJoins {
private GroupMembership() {} private GroupMembership() {}
/** MIME type used when storing this in data table. */ /** MIME type used when storing this in data table. */
@@ -1485,7 +1492,7 @@ public final class ContactsContract {
/** /**
* Website related to the contact. * Website related to the contact.
*/ */
public static final class Website implements BaseCommonColumns, CommonColumns { public static final class Website implements DataColumnsWithJoins, CommonColumns {
private Website() {} private Website() {}
/** MIME type used when storing this in data table. */ /** MIME type used when storing this in data table. */