From e98a95c156a877213ae1a3e7458ebacebe4a8879 Mon Sep 17 00:00:00 2001 From: Brian Attwell Date: Tue, 22 Jul 2014 20:53:59 -0700 Subject: [PATCH] Add PICK_JOIN_CONTACT_ACTION action contact This ContactsContract change is needed by ag/509090 Bug: 16190113 Change-Id: I0f96286bdf45015148d2e84f7fe7aac5b23e1ba2 --- core/java/android/provider/ContactsContract.java | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/core/java/android/provider/ContactsContract.java b/core/java/android/provider/ContactsContract.java index 829d459ed02e8..d0dbd96b3d4d1 100644 --- a/core/java/android/provider/ContactsContract.java +++ b/core/java/android/provider/ContactsContract.java @@ -8535,6 +8535,12 @@ public final class ContactsContract { public static final String LIST_FREQUENT_ACTION = "com.android.contacts.action.LIST_FREQUENT"; + /** + * The action for the "Join Contact" picker. + */ + public static final String PICK_JOIN_CONTACT_ACTION = + "com.android.contacts.action.JOIN_CONTACT"; + /** * The action for the "strequent" contacts list tab. It first lists the starred * contacts in alphabetical order and then the frequent contacts in descending @@ -8567,6 +8573,15 @@ public final class ContactsContract { */ public static final String FILTER_TEXT_EXTRA_KEY = "com.android.contacts.extra.FILTER_TEXT"; + + /** + * Used with JOIN_CONTACT action to set the target for aggregation. This action type + * uses contact ids instead of contact uris for the sake of backwards compatibility. + *

+ * Type: LONG + */ + public static final String TARGET_CONTACT_ID_EXTRA_KEY + = "com.android.contacts.action.CONTACT_ID"; } /**