Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4f3afa60 authored by Brian Attwell's avatar Brian Attwell Committed by Android Git Automerger
Browse files

am 16846152: am 1a038e57: am 41b62ac7: Add PICK_JOIN_CONTACT_ACTION action contact 

* commit '16846152b19b9487cf3403b3d3b7e4d4af6e6f46':
  Add PICK_JOIN_CONTACT_ACTION action contact
parents f8a740e8 85511418

core/java/android/provider/ContactsContract.java

+15 −0
Original line number Diff line number Diff line
@@ -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.

             * <p>

             * Type: LONG

             */

            public static final String TARGET_CONTACT_ID_EXTRA_KEY

                    = "com.android.contacts.action.CONTACT_ID";

        }



        /**