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

Commit 00959495 authored by Sally Yuen's avatar Sally Yuen Committed by Automerger Merge Worker
Browse files

Merge "Update Notification content description API" into sc-dev am: 9ac5677b 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13816924

Change-Id: Id99a1592fe4817f4db4a90ff95911657d96839a4
parents ee37b7d6 9ac5677b

core/api/current.txt

+1 −1
Original line number Original line Diff line number Diff line
@@ -5830,8 +5830,8 @@ package android.app { 
    method @NonNull public android.app.Notification.BigPictureStyle bigLargeIcon(@Nullable android.graphics.drawable.Icon);

    method @NonNull public android.app.Notification.BigPictureStyle bigLargeIcon(@Nullable android.graphics.drawable.Icon);

    method @NonNull public android.app.Notification.BigPictureStyle bigPicture(@Nullable android.graphics.Bitmap);

    method @NonNull public android.app.Notification.BigPictureStyle bigPicture(@Nullable android.graphics.Bitmap);

    method @NonNull public android.app.Notification.BigPictureStyle bigPicture(@Nullable android.graphics.drawable.Icon);

    method @NonNull public android.app.Notification.BigPictureStyle bigPicture(@Nullable android.graphics.drawable.Icon);

    method @NonNull public android.app.Notification.BigPictureStyle bigPictureContentDescription(@Nullable CharSequence);

    method @NonNull public android.app.Notification.BigPictureStyle setBigContentTitle(@Nullable CharSequence);

    method @NonNull public android.app.Notification.BigPictureStyle setBigContentTitle(@Nullable CharSequence);

    method @NonNull public android.app.Notification.BigPictureStyle setContentDescription(@Nullable CharSequence);

    method @NonNull public android.app.Notification.BigPictureStyle setSummaryText(@Nullable CharSequence);

    method @NonNull public android.app.Notification.BigPictureStyle setSummaryText(@Nullable CharSequence);

    method @NonNull public android.app.Notification.BigPictureStyle showBigPictureWhenCollapsed(boolean);

    method @NonNull public android.app.Notification.BigPictureStyle showBigPictureWhenCollapsed(boolean);

  }

  }

core/java/android/app/Notification.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -1216,7 +1216,7 @@ public class Notification implements Parcelable 
    /**

    /**

     * {@link #extras} key: this is a content description of the big picture supplied from

     * {@link #extras} key: this is a content description of the big picture supplied from

     * {@link BigPictureStyle#bigPicture(Bitmap)}, supplied to

     * {@link BigPictureStyle#bigPicture(Bitmap)}, supplied to

     * {@link BigPictureStyle#bigPictureContentDescription(CharSequence)}.

     * {@link BigPictureStyle#setContentDescription(CharSequence)}.

     */

     */

    public static final String EXTRA_PICTURE_CONTENT_DESCRIPTION =

    public static final String EXTRA_PICTURE_CONTENT_DESCRIPTION =

            "android.pictureContentDescription";

            "android.pictureContentDescription";
@@ -7292,7 +7292,7 @@ public class Notification implements Parcelable 
         * Set the content description of the big picture.

         * Set the content description of the big picture.

         */

         */

        @NonNull

        @NonNull

        public BigPictureStyle bigPictureContentDescription(

        public BigPictureStyle setContentDescription(

                @Nullable CharSequence contentDescription) {

                @Nullable CharSequence contentDescription) {

            mPictureContentDescription = contentDescription;

            mPictureContentDescription = contentDescription;

            return this;

            return this;