Merge "add the Identity contacts mimetype Bug: 5061729" (f01e16a0) · Commits · e / os / android_frameworks_base

api/current.txt

+6 −0

Original line number	Original line	Diff line number	Diff line
	@@ -16037,6 +16037,12 @@ package android.provider {
	field public static final java.lang.String GROUP_SOURCE_ID = "group_sourceid";		field public static final java.lang.String GROUP_SOURCE_ID = "group_sourceid";
	}		}

			public static final class ContactsContract.CommonDataKinds.Identity implements android.provider.ContactsContract.DataColumnsWithJoins {
			field public static final java.lang.String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/identity";
			field public static final java.lang.String IDENTITY = "data1";
			field public static final java.lang.String NAMESPACE = "data2";
			}

	public static final class ContactsContract.CommonDataKinds.Im implements android.provider.ContactsContract.CommonDataKinds.CommonColumns android.provider.ContactsContract.DataColumnsWithJoins {		public static final class ContactsContract.CommonDataKinds.Im implements android.provider.ContactsContract.CommonDataKinds.CommonColumns android.provider.ContactsContract.DataColumnsWithJoins {
	method public static final java.lang.CharSequence getProtocolLabel(android.content.res.Resources, int, java.lang.CharSequence);		method public static final java.lang.CharSequence getProtocolLabel(android.content.res.Resources, int, java.lang.CharSequence);
	method public static final int getProtocolLabelResource(int);		method public static final int getProtocolLabelResource(int);

+31 −0

Original line number	Original line	Diff line number	Diff line
	@@ -6455,6 +6455,37 @@ public final class ContactsContract {
	}		}
	}		}
	}		}

			/**
			* A data kind representing an Identity related to the contact.
			* <p>
			* This can be used as a signal by the aggregator to combine raw contacts into
			* contacts, e.g. if two contacts have Identity rows with
			* the same NAMESPACE and IDENTITY values the aggregator can know that they refer
			* to the same person.
			* </p>
			*/
			public static final class Identity implements DataColumnsWithJoins {
			/**
			* This utility class cannot be instantiated
			*/
			private Identity() {}

			/** MIME type used when storing this in data table. */
			public static final String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/identity";

			/**
			* The identity string.
			* <P>Type: TEXT</P>
			*/
			public static final String IDENTITY = DataColumns.DATA1;

			/**
			* The namespace of the identity string, e.g. "com.google"
			* <P>Type: TEXT</P>
			*/
			public static final String NAMESPACE = DataColumns.DATA2;
			}
	}		}

	/**		/**