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

Commit bfd10ebc authored by Okan Kolak's avatar Okan Kolak Committed by Android (Google) Code Review
Browse files

Merge "Voice Messaging Intent API."

parents acd89398 813fb1e9

api/current.txt

+1 −0
Original line number Original line Diff line number Diff line
@@ -33878,6 +33878,7 @@ package android.provider { 
    field public static final java.lang.String EXTRA_RECIPIENT_CONTACT_CHAT_ID = "android.provider.extra.RECIPIENT_CONTACT_CHAT_ID";

    field public static final java.lang.String EXTRA_RECIPIENT_CONTACT_CHAT_ID = "android.provider.extra.RECIPIENT_CONTACT_CHAT_ID";

    field public static final java.lang.String EXTRA_RECIPIENT_CONTACT_NAME = "android.provider.extra.RECIPIENT_CONTACT_NAME";

    field public static final java.lang.String EXTRA_RECIPIENT_CONTACT_NAME = "android.provider.extra.RECIPIENT_CONTACT_NAME";

    field public static final java.lang.String EXTRA_RECIPIENT_CONTACT_URI = "android.provider.extra.RECIPIENT_CONTACT_URI";

    field public static final java.lang.String EXTRA_RECIPIENT_CONTACT_URI = "android.provider.extra.RECIPIENT_CONTACT_URI";

    field public static final java.lang.String EXTRA_SENDER_ACCOUNT_HASH = "android.provider.extra.SENDER_ACCOUNT_HASH";

    field public static final java.lang.String INVITE_CONTACT = "com.android.contacts.action.INVITE_CONTACT";

    field public static final java.lang.String INVITE_CONTACT = "com.android.contacts.action.INVITE_CONTACT";

    field public static final java.lang.String METADATA_ACCOUNT_TYPE = "android.provider.account_type";

    field public static final java.lang.String METADATA_ACCOUNT_TYPE = "android.provider.account_type";

    field public static final java.lang.String METADATA_MIMETYPE = "android.provider.mimetype";

    field public static final java.lang.String METADATA_MIMETYPE = "android.provider.mimetype";

api/system-current.txt

+1 −0
Original line number Original line Diff line number Diff line
@@ -36758,6 +36758,7 @@ package android.provider { 
    field public static final java.lang.String EXTRA_RECIPIENT_CONTACT_CHAT_ID = "android.provider.extra.RECIPIENT_CONTACT_CHAT_ID";

    field public static final java.lang.String EXTRA_RECIPIENT_CONTACT_CHAT_ID = "android.provider.extra.RECIPIENT_CONTACT_CHAT_ID";

    field public static final java.lang.String EXTRA_RECIPIENT_CONTACT_NAME = "android.provider.extra.RECIPIENT_CONTACT_NAME";

    field public static final java.lang.String EXTRA_RECIPIENT_CONTACT_NAME = "android.provider.extra.RECIPIENT_CONTACT_NAME";

    field public static final java.lang.String EXTRA_RECIPIENT_CONTACT_URI = "android.provider.extra.RECIPIENT_CONTACT_URI";

    field public static final java.lang.String EXTRA_RECIPIENT_CONTACT_URI = "android.provider.extra.RECIPIENT_CONTACT_URI";

    field public static final java.lang.String EXTRA_SENDER_ACCOUNT_HASH = "android.provider.extra.SENDER_ACCOUNT_HASH";

    field public static final java.lang.String INVITE_CONTACT = "com.android.contacts.action.INVITE_CONTACT";

    field public static final java.lang.String INVITE_CONTACT = "com.android.contacts.action.INVITE_CONTACT";

    field public static final java.lang.String METADATA_ACCOUNT_TYPE = "android.provider.account_type";

    field public static final java.lang.String METADATA_ACCOUNT_TYPE = "android.provider.account_type";

    field public static final java.lang.String METADATA_MIMETYPE = "android.provider.mimetype";

    field public static final java.lang.String METADATA_MIMETYPE = "android.provider.mimetype";

api/test-current.txt

+1 −0
Original line number Original line Diff line number Diff line
@@ -34005,6 +34005,7 @@ package android.provider { 
    field public static final java.lang.String EXTRA_RECIPIENT_CONTACT_CHAT_ID = "android.provider.extra.RECIPIENT_CONTACT_CHAT_ID";

    field public static final java.lang.String EXTRA_RECIPIENT_CONTACT_CHAT_ID = "android.provider.extra.RECIPIENT_CONTACT_CHAT_ID";

    field public static final java.lang.String EXTRA_RECIPIENT_CONTACT_NAME = "android.provider.extra.RECIPIENT_CONTACT_NAME";

    field public static final java.lang.String EXTRA_RECIPIENT_CONTACT_NAME = "android.provider.extra.RECIPIENT_CONTACT_NAME";

    field public static final java.lang.String EXTRA_RECIPIENT_CONTACT_URI = "android.provider.extra.RECIPIENT_CONTACT_URI";

    field public static final java.lang.String EXTRA_RECIPIENT_CONTACT_URI = "android.provider.extra.RECIPIENT_CONTACT_URI";

    field public static final java.lang.String EXTRA_SENDER_ACCOUNT_HASH = "android.provider.extra.SENDER_ACCOUNT_HASH";

    field public static final java.lang.String INVITE_CONTACT = "com.android.contacts.action.INVITE_CONTACT";

    field public static final java.lang.String INVITE_CONTACT = "com.android.contacts.action.INVITE_CONTACT";

    field public static final java.lang.String METADATA_ACCOUNT_TYPE = "android.provider.account_type";

    field public static final java.lang.String METADATA_ACCOUNT_TYPE = "android.provider.account_type";

    field public static final java.lang.String METADATA_MIMETYPE = "android.provider.mimetype";

    field public static final java.lang.String METADATA_MIMETYPE = "android.provider.mimetype";

core/java/android/provider/ContactsContract.java

+14 −1
Original line number Original line Diff line number Diff line
@@ -44,7 +44,6 @@ import android.text.TextUtils; 
import android.util.DisplayMetrics;

import android.util.DisplayMetrics;

import android.util.Pair;

import android.util.Pair;

import android.view.View;

import android.view.View;



import java.io.ByteArrayInputStream;

import java.io.ByteArrayInputStream;

import java.io.IOException;

import java.io.IOException;

import java.io.InputStream;

import java.io.InputStream;
@@ -8913,11 +8912,15 @@ public final class ContactsContract { 
         * ambiguous then the activity should prompt the user for the recipient to send the message

         * ambiguous then the activity should prompt the user for the recipient to send the message

         * to.

         * to.

         * <p>

         * <p>

         * Voice Assistant may provide additional information to messaging app about which account

         * to use for sending a message by populating {@link #EXTRA_SENDER_ACCOUNT_HASH}.

         * <p>

         * Output: nothing

         * Output: nothing

         *

         *

         * @see #EXTRA_RECIPIENT_CONTACT_URI

         * @see #EXTRA_RECIPIENT_CONTACT_URI

         * @see #EXTRA_RECIPIENT_CONTACT_CHAT_ID

         * @see #EXTRA_RECIPIENT_CONTACT_CHAT_ID

         * @see #EXTRA_RECIPIENT_CONTACT_NAME

         * @see #EXTRA_RECIPIENT_CONTACT_NAME

         * @see #EXTRA_SENDER_ACCOUNT_HASH

         * @see #METADATA_ACCOUNT_TYPE

         * @see #METADATA_ACCOUNT_TYPE

         * @see #METADATA_MIMETYPE

         * @see #METADATA_MIMETYPE

         */

         */
@@ -8974,6 +8977,16 @@ public final class ContactsContract { 
        public static final String EXTRA_RECIPIENT_CONTACT_NAME =

        public static final String EXTRA_RECIPIENT_CONTACT_NAME =

                "android.provider.extra.RECIPIENT_CONTACT_NAME";

                "android.provider.extra.RECIPIENT_CONTACT_NAME";





        /**

         * This optional extra specifies the hash of the account that should be used by messaging

         * app for sending voice message with {@link #ACTION_VOICE_SEND_MESSAGE_TO_CONTACTS}. The

         * value of this extra is a {@code String} and should be the value of {@link

         * android.accounts.Account#hashCode()} for some account returned by {@link

         * android.accounts.AccountManager#getAccounts()}.

         */

        public static final String EXTRA_SENDER_ACCOUNT_HASH =

                "android.provider.extra.SENDER_ACCOUNT_HASH";



        /**

        /**

         * A string associated with an {@link #ACTION_VOICE_SEND_MESSAGE_TO_CONTACTS} activity

         * A string associated with an {@link #ACTION_VOICE_SEND_MESSAGE_TO_CONTACTS} activity

         * describing {@link RawContacts#ACCOUNT_TYPE} for the corresponding Contacts Provider

         * describing {@link RawContacts#ACCOUNT_TYPE} for the corresponding Contacts Provider