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

Commit 7870433c authored by Andrew Lee's avatar Andrew Lee Committed by Android (Google) Code Review
Browse files

Merge "Add intent for configuring RespondViaSms."

parents 56725501 866080f2

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -28747,6 +28747,7 @@ package android.telecom { 
    method public boolean isInCall();

    method public void showInCallScreen(boolean);

    field public static final java.lang.String ACTION_SHOW_CALL_SETTINGS = "android.telecom.action.SHOW_CALL_SETTINGS";

    field public static final java.lang.String ACTION_SHOW_RESPOND_VIA_SMS_SETTINGS = "android.telecom.action.SHOW_RESPOND_VIA_SMS_SETTINGS";

    field public static final char DTMF_CHARACTER_PAUSE = 44; // 0x002c ','

    field public static final char DTMF_CHARACTER_WAIT = 59; // 0x003b ';'

    field public static final java.lang.String EXTRA_CALL_DISCONNECT_CAUSE = "android.telecom.extra.CALL_DISCONNECT_CAUSE";

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -30867,6 +30867,7 @@ package android.telecom { 
    field public static final java.lang.String ACTION_CHANGE_PHONE_ACCOUNTS = "android.telecom.action.CHANGE_PHONE_ACCOUNTS";

    field public static final java.lang.String ACTION_CONNECTION_SERVICE_CONFIGURE = "android.telecom.action.CONNECTION_SERVICE_CONFIGURE";

    field public static final java.lang.String ACTION_SHOW_CALL_SETTINGS = "android.telecom.action.SHOW_CALL_SETTINGS";

    field public static final java.lang.String ACTION_SHOW_RESPOND_VIA_SMS_SETTINGS = "android.telecom.action.SHOW_RESPOND_VIA_SMS_SETTINGS";

    field public static final char DTMF_CHARACTER_PAUSE = 44; // 0x002c ','

    field public static final char DTMF_CHARACTER_WAIT = 59; // 0x003b ';'

    field public static final java.lang.String EXTRA_CALL_BACK_NUMBER = "android.telecom.extra.CALL_BACK_NUMBER";

telecomm/java/android/telecom/TelecomManager.java

+6 −0
Original line number Diff line number Diff line
@@ -82,6 +82,12 @@ public class TelecomManager { 
    public static final String ACTION_SHOW_CALL_SETTINGS =

            "android.telecom.action.SHOW_CALL_SETTINGS";



    /**

     * The {@link android.content.Intent} action used to show the respond via SMS settings page.

     */

    public static final String ACTION_SHOW_RESPOND_VIA_SMS_SETTINGS =

            "android.telecom.action.SHOW_RESPOND_VIA_SMS_SETTINGS";



    /**

     * The {@link android.content.Intent} action used to show the settings page used to configure

     * {@link PhoneAccount} preferences.