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

Commit 4db015d0 authored by Jeff DeCew's avatar Jeff DeCew Committed by Android (Google) Code Review
Browse files

Merge changes from topic "notif_call_style_sc" into sc-dev 

* changes:
  Stop using ?attr/notificationHeaderTextAppearance
  Remove unused 'app_ops' from layout
  Implement Notification.CallStyle
parents f26c5a51 11a0b653

core/api/current.txt

+14 −0
Original line number Original line Diff line number Diff line
@@ -5555,15 +5555,19 @@ package android.app { 
    field public static final int DEFAULT_LIGHTS = 4; // 0x4

    field public static final int DEFAULT_LIGHTS = 4; // 0x4

    field public static final int DEFAULT_SOUND = 1; // 0x1

    field public static final int DEFAULT_SOUND = 1; // 0x1

    field public static final int DEFAULT_VIBRATE = 2; // 0x2

    field public static final int DEFAULT_VIBRATE = 2; // 0x2

    field public static final String EXTRA_ANSWER_INTENT = "android.answerIntent";

    field public static final String EXTRA_AUDIO_CONTENTS_URI = "android.audioContents";

    field public static final String EXTRA_AUDIO_CONTENTS_URI = "android.audioContents";

    field public static final String EXTRA_BACKGROUND_IMAGE_URI = "android.backgroundImageUri";

    field public static final String EXTRA_BACKGROUND_IMAGE_URI = "android.backgroundImageUri";

    field public static final String EXTRA_BIG_TEXT = "android.bigText";

    field public static final String EXTRA_BIG_TEXT = "android.bigText";

    field public static final String EXTRA_CALL_PERSON = "android.callPerson";

    field public static final String EXTRA_CHANNEL_GROUP_ID = "android.intent.extra.CHANNEL_GROUP_ID";

    field public static final String EXTRA_CHANNEL_GROUP_ID = "android.intent.extra.CHANNEL_GROUP_ID";

    field public static final String EXTRA_CHANNEL_ID = "android.intent.extra.CHANNEL_ID";

    field public static final String EXTRA_CHANNEL_ID = "android.intent.extra.CHANNEL_ID";

    field public static final String EXTRA_CHRONOMETER_COUNT_DOWN = "android.chronometerCountDown";

    field public static final String EXTRA_CHRONOMETER_COUNT_DOWN = "android.chronometerCountDown";

    field public static final String EXTRA_COLORIZED = "android.colorized";

    field public static final String EXTRA_COLORIZED = "android.colorized";

    field public static final String EXTRA_COMPACT_ACTIONS = "android.compactActions";

    field public static final String EXTRA_COMPACT_ACTIONS = "android.compactActions";

    field public static final String EXTRA_CONVERSATION_TITLE = "android.conversationTitle";

    field public static final String EXTRA_CONVERSATION_TITLE = "android.conversationTitle";

    field public static final String EXTRA_DECLINE_INTENT = "android.declineIntent";

    field public static final String EXTRA_HANG_UP_INTENT = "android.hangUpIntent";

    field public static final String EXTRA_HISTORIC_MESSAGES = "android.messages.historic";

    field public static final String EXTRA_HISTORIC_MESSAGES = "android.messages.historic";

    field public static final String EXTRA_INFO_TEXT = "android.infoText";

    field public static final String EXTRA_INFO_TEXT = "android.infoText";

    field public static final String EXTRA_IS_GROUP_CONVERSATION = "android.isGroupConversation";

    field public static final String EXTRA_IS_GROUP_CONVERSATION = "android.isGroupConversation";
@@ -5595,6 +5599,8 @@ package android.app { 
    field public static final String EXTRA_TEXT_LINES = "android.textLines";

    field public static final String EXTRA_TEXT_LINES = "android.textLines";

    field public static final String EXTRA_TITLE = "android.title";

    field public static final String EXTRA_TITLE = "android.title";

    field public static final String EXTRA_TITLE_BIG = "android.title.big";

    field public static final String EXTRA_TITLE_BIG = "android.title.big";

    field public static final String EXTRA_VERIFICATION_ICON = "android.verificationIcon";

    field public static final String EXTRA_VERIFICATION_TEXT = "android.verificationText";

    field public static final int FLAG_AUTO_CANCEL = 16; // 0x10

    field public static final int FLAG_AUTO_CANCEL = 16; // 0x10

    field public static final int FLAG_BUBBLE = 4096; // 0x1000

    field public static final int FLAG_BUBBLE = 4096; // 0x1000

    field public static final int FLAG_FOREGROUND_SERVICE = 64; // 0x40

    field public static final int FLAG_FOREGROUND_SERVICE = 64; // 0x40
@@ -5843,6 +5849,14 @@ package android.app { 
    method @NonNull public android.app.Notification.Builder setWhen(long);

    method @NonNull public android.app.Notification.Builder setWhen(long);

  }

  }













  public static class Notification.CallStyle extends android.app.Notification.Style {










    method @NonNull public static android.app.Notification.CallStyle forIncomingCall(@NonNull android.app.Person, @NonNull android.app.PendingIntent, @NonNull android.app.PendingIntent);










    method @NonNull public static android.app.Notification.CallStyle forOngoingCall(@NonNull android.app.Person, @NonNull android.app.PendingIntent);










    method @NonNull public static android.app.Notification.CallStyle forScreeningCall(@NonNull android.app.Person, @NonNull android.app.PendingIntent, @NonNull android.app.PendingIntent);










    method @NonNull public android.app.Notification.CallStyle setVerificationIcon(@Nullable android.graphics.drawable.Icon);










    method @NonNull public android.app.Notification.CallStyle setVerificationText(@Nullable CharSequence);










  }

















  public static final class Notification.CarExtender implements android.app.Notification.Extender {




  public static final class Notification.CarExtender implements android.app.Notification.Extender {








    ctor public Notification.CarExtender();




    ctor public Notification.CarExtender();








    ctor public Notification.CarExtender(android.app.Notification);




    ctor public Notification.CarExtender(android.app.Notification);