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

Commit c7229847 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes from topic "jr-ranking-convo" 

* changes:
  Add flag for pendingintent
  Allow NLSes to see conversation information
parents 83b68280 e57d36d4

api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -44101,11 +44101,13 @@ package android.service.notification { 
    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();

    method public int getUserSentiment();

    method public boolean isAmbient();

    method public boolean isConversation();

    method public boolean isSuspended();

    method public boolean matchesInterruptionFilter();

    field public static final int USER_SENTIMENT_NEGATIVE = -1; // 0xffffffff

core/java/android/app/Notification.java

+2 −1
Original line number Diff line number Diff line
@@ -2240,7 +2240,8 @@ public class Notification implements Parcelable 
                .setTicker(tickerText)

                .setContentTitle(contentTitle)

                .setContentText(contentText)

                .setContentIntent(PendingIntent.getActivity(context, 0, contentIntent, 0))

                .setContentIntent(PendingIntent.getActivity(

                        context, 0, contentIntent, PendingIntent.FLAG_MUTABLE))

                .buildInto(this);

    }

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

+7 −3
Original line number Diff line number Diff line
@@ -1865,8 +1865,9 @@ public abstract class NotificationListenerService extends Service { 
        }



        /**

         * Returns whether this notification is a conversation notification.

         * @hide

         * Returns whether this notification is a conversation notification, and would appear

         * in the conversation section of the notification shade, on devices that separate that

         * type of notification.

         */

        public boolean isConversation() {

            return mIsConversation;
@@ -1881,7 +1882,10 @@ public abstract class NotificationListenerService extends Service { 
        }



        /**

         * @hide

         * Returns the shortcut information associated with this notification, if it is a

         * {@link #isConversation() conversation notification}.

         * <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() {

            return mShortcutInfo;

non-updatable-api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -42235,11 +42235,13 @@ package android.service.notification { 
    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();

    method public int getUserSentiment();

    method public boolean isAmbient();

    method public boolean isConversation();

    method public boolean isSuspended();

    method public boolean matchesInterruptionFilter();

    field public static final int USER_SENTIMENT_NEGATIVE = -1; // 0xffffffff