Merge change 6679 (12f7a7b5) · Commits · e / os / android_frameworks_base

core/java/android/provider/ContactsContract.java

+16 −75

Original line number	Diff line number	Diff line
		@@ -36,75 +36,6 @@ public final class ContactsContract {
		/** A content:// style uri to the authority for the contacts provider */
		public static final Uri AUTHORITY_URI = Uri.parse("content://" + AUTHORITY);

		public interface AccountsColumns {
		/**
		* The name of this account data
		* <P>Type: TEXT</P>
		*/
		public static final String NAME = "name";
		/**
		* The name of this account data
		* <P>Type: TEXT</P>
		*/
		public static final String TYPE = "type";
		/**
		* The name of this account data
		* <P>Type: TEXT</P>
		*/
		public static final String DATA1 = "data1";

		/**
		* The value for this account data
		* <P>Type: INTEGER</P>
		*/
		public static final String DATA2 = "data2";

		/**
		* The value for this account data
		* <P>Type: INTEGER</P>
		*/
		public static final String DATA3 = "data3";

		/**
		* The value for this account data
		* <P>Type: INTEGER</P>
		*/
		public static final String DATA4 = "data4";

		/**
		* The value for this account data
		* <P>Type: INTEGER</P>
		*/
		public static final String DATA5 = "data5";
		}

		/**
		* Constants for the aggregates table, which contains a record per group
		* of contact representing the same person.
		*/
		public static final class Accounts implements BaseColumns, AccountsColumns {
		/**
		* This utility class cannot be instantiated
		*/
		private Accounts() {}

		/**
		* The content:// style URI for this table
		*/
		public static final Uri CONTENT_URI = Uri.withAppendedPath(AUTHORITY_URI, "accounts");

		/**
		* The MIME type of {@link #CONTENT_URI} providing a directory of
		* account data.
		*/
		public static final String CONTENT_TYPE = "vnd.android.cursor.dir/contacts_account";

		/**
		* The MIME type of a {@link #CONTENT_URI} subdirectory of a account
		*/
		public static final String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/contacts_account";
		}

		public interface AggregatesColumns {
		/**
		* The display name for the contact.
		@@ -290,9 +221,14 @@ public final class ContactsContract {
		public static final String IS_RESTRICTED = "is_restricted";

		/**
		* A reference to the {@link Accounts#_ID} that this data belongs to.
		* A reference to the name of the account to which this data belongs
		*/
		public static final String ACCOUNT_NAME = "account_name";

		/**
		* A reference to the type of the account to which this data belongs
		*/
		public static final String ACCOUNTS_ID = "accounts_id";
		public static final String ACCOUNT_TYPE = "account_type";

		/**
		* A reference to the {@link Aggregates#_ID} that this data belongs to.
		@@ -328,7 +264,7 @@ public final class ContactsContract {

		/**
		* A string that uniquely identifies this contact to its source, which is referred to
		* by the {@link #ACCOUNTS_ID}
		* by the {@link #ACCOUNT_NAME} and {@link #ACCOUNT_TYPE}
		*/
		public static final String SOURCE_ID = "sourceid";

		@@ -1017,13 +953,18 @@ public final class ContactsContract {
		public static final String SUMMARY_WITH_PHONES = "summ_phones";

		/**
		* A reference to the {@link Accounts#_ID} that this data belongs to.
		* A reference to the name of the account to which this data belongs
		*/
		public static final String ACCOUNT_NAME = "account_name";

		/**
		* A reference to the type of the account to which this data belongs
		*/
		public static final String ACCOUNTS_ID = "accounts_id";
		public static final String ACCOUNT_TYPE = "account_type";

		/**
		* A string that uniquely identifies this contact to its source, which is referred to
		* by the {@link #ACCOUNTS_ID}
		* by the {@link #ACCOUNT_NAME} and {@link #ACCOUNT_TYPE}
		*/
		public static final String SOURCE_ID = "sourceid";