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

Commit c361d7b5 authored by Julia Reynolds's avatar Julia Reynolds
Browse files

Update api name for clarity 

Test: cts
Fixes: 170705349
Change-Id: Id1355e8c93e2b88f701834c06669ed390cd503fb
parent 1968c20b

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -44150,13 +44150,13 @@ package android.service.notification { 
    method public boolean canBubble();

    method public boolean canShowBadge();

    method public android.app.NotificationChannel getChannel();

    method @Nullable public android.content.pm.ShortcutInfo getConversationShortcutInfo();

    method public int getImportance();

    method public CharSequence getImportanceExplanation();

    method public String getKey();

    method public long getLastAudiblyAlertedMillis();

    method public String getOverrideGroupKey();

    method public int getRank();

    method @Nullable public android.content.pm.ShortcutInfo getShortcutInfo();

    method @NonNull public java.util.List<android.app.Notification.Action> getSmartActions();

    method @NonNull public java.util.List<java.lang.CharSequence> getSmartReplies();

    method public int getSuppressedVisualEffects();

core/java/android/service/notification/NotificationListenerService.java

+1 −1
Original line number Diff line number Diff line
@@ -1885,7 +1885,7 @@ public abstract class NotificationListenerService extends Service { 
         * <p>This might be null even if the notification is a conversation notification, if

         * the posting app hasn't opted into the full conversation feature set yet.</p>

         */

        public @Nullable ShortcutInfo getShortcutInfo() {

        public @Nullable ShortcutInfo getConversationShortcutInfo() {

            return mShortcutInfo;

        }

non-updatable-api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -42276,13 +42276,13 @@ package android.service.notification { 
    method public boolean canBubble();

    method public boolean canShowBadge();

    method public android.app.NotificationChannel getChannel();

    method @Nullable public android.content.pm.ShortcutInfo getConversationShortcutInfo();

    method public int getImportance();

    method public CharSequence getImportanceExplanation();

    method public String getKey();

    method public long getLastAudiblyAlertedMillis();

    method public String getOverrideGroupKey();

    method public int getRank();

    method @Nullable public android.content.pm.ShortcutInfo getShortcutInfo();

    method @NonNull public java.util.List<android.app.Notification.Action> getSmartActions();

    method @NonNull public java.util.List<java.lang.CharSequence> getSmartReplies();

    method public int getSuppressedVisualEffects();

packages/SystemUI/src/com/android/systemui/bubbles/Bubble.java

+1 −1
Original line number Diff line number Diff line
@@ -403,7 +403,7 @@ class Bubble implements BubbleViewProvider { 
        mInstanceId = entry.getStatusBarNotification().getInstanceId();

        mFlyoutMessage = extractFlyoutMessage(entry);

        if (entry.getRanking() != null) {

            mShortcutInfo = entry.getRanking().getShortcutInfo();

            mShortcutInfo = entry.getRanking().getConversationShortcutInfo();

            mIsVisuallyInterruptive = entry.getRanking().visuallyInterruptive();

            if (entry.getRanking().getChannel() != null) {

                mIsImportantConversation =

packages/SystemUI/src/com/android/systemui/statusbar/notification/ConversationNotifications.kt

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ class ConversationNotificationProcessor @Inject constructor( 
                    Notification.MessagingStyle.CONVERSATION_TYPE_IMPORTANT

                else

                    Notification.MessagingStyle.CONVERSATION_TYPE_NORMAL

        entry.ranking.shortcutInfo?.let { shortcutInfo ->

        entry.ranking.conversationShortcutInfo?.let { shortcutInfo ->

            messagingStyle.shortcutIcon = launcherApps.getShortcutIcon(shortcutInfo)

            shortcutInfo.label?.let { label ->

                messagingStyle.conversationTitle = label