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

Commit 833762c8 authored by Jeff DeCew's avatar Jeff DeCew Committed by Automerger Merge Worker
Browse files

Merge "Rename public constant to EXTRA_SHOW_BIG_PICTURE_WHEN_COLLAPSED" into sc-dev am: 733d3bda 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie132c6589de55561188897d61d5e92f270fa53ca
parents 11453c61 733d3bda

core/api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -5587,10 +5587,10 @@ package android.app { 
    field public static final String EXTRA_PROGRESS = "android.progress";

    field public static final String EXTRA_PROGRESS_INDETERMINATE = "android.progressIndeterminate";

    field public static final String EXTRA_PROGRESS_MAX = "android.progressMax";

    field public static final String EXTRA_PROMOTE_PICTURE = "android.promotePicture";

    field public static final String EXTRA_REMOTE_INPUT_DRAFT = "android.remoteInputDraft";

    field public static final String EXTRA_REMOTE_INPUT_HISTORY = "android.remoteInputHistory";

    field @Deprecated public static final String EXTRA_SELF_DISPLAY_NAME = "android.selfDisplayName";

    field public static final String EXTRA_SHOW_BIG_PICTURE_WHEN_COLLAPSED = "android.showBigPictureWhenCollapsed";

    field public static final String EXTRA_SHOW_CHRONOMETER = "android.showChronometer";

    field public static final String EXTRA_SHOW_WHEN = "android.showWhen";

    field @Deprecated public static final String EXTRA_SMALL_ICON = "android.icon";

core/java/android/app/Notification.java

+8 −7
Original line number Diff line number Diff line
@@ -1208,7 +1208,8 @@ public class Notification implements Parcelable 
     * of a {@link BigPictureStyle} notification.  This will replace a

     * {@link Builder#setLargeIcon(Icon) large icon} in that state if one was provided.

     */

    public static final String EXTRA_PROMOTE_PICTURE = "android.promotePicture";

    public static final String EXTRA_SHOW_BIG_PICTURE_WHEN_COLLAPSED =

            "android.showBigPictureWhenCollapsed";



    /**

     * {@link #extras} key: An array of CharSequences to show in {@link InboxStyle} expanded
@@ -7059,7 +7060,7 @@ public class Notification implements Parcelable 
        private Icon mBigLargeIcon;

        private boolean mBigLargeIconSet = false;

        private CharSequence mPictureContentDescription;

        private boolean mPromotePicture;

        private boolean mShowBigPictureWhenCollapsed;



        public BigPictureStyle() {

        }
@@ -7124,7 +7125,7 @@ public class Notification implements Parcelable 
         */

        @NonNull

        public BigPictureStyle showBigPictureWhenCollapsed(boolean show) {

            mPromotePicture = show;

            mShowBigPictureWhenCollapsed = show;

            return this;

        }
@@ -7195,7 +7196,7 @@ public class Notification implements Parcelable 
         */

        @Override

        public RemoteViews makeContentView(boolean increasedHeight) {

            if (mPicture == null || !mPromotePicture) {

            if (mPicture == null || !mShowBigPictureWhenCollapsed) {

                return super.makeContentView(increasedHeight);

            }
@@ -7225,7 +7226,7 @@ public class Notification implements Parcelable 
         */

        @Override

        public RemoteViews makeHeadsUpContentView(boolean increasedHeight) {

            if (mPicture == null || !mPromotePicture) {

            if (mPicture == null || !mShowBigPictureWhenCollapsed) {

                return super.makeHeadsUpContentView(increasedHeight);

            }
@@ -7309,7 +7310,7 @@ public class Notification implements Parcelable 
                extras.putCharSequence(EXTRA_PICTURE_CONTENT_DESCRIPTION,

                        mPictureContentDescription);

            }

            extras.putBoolean(EXTRA_PROMOTE_PICTURE, mPromotePicture);

            extras.putBoolean(EXTRA_SHOW_BIG_PICTURE_WHEN_COLLAPSED, mShowBigPictureWhenCollapsed);

            extras.putParcelable(EXTRA_PICTURE, mPicture);

        }
@@ -7330,7 +7331,7 @@ public class Notification implements Parcelable 
                        extras.getCharSequence(EXTRA_PICTURE_CONTENT_DESCRIPTION);

            }



            mPromotePicture = extras.getBoolean(EXTRA_PROMOTE_PICTURE);

            mShowBigPictureWhenCollapsed = extras.getBoolean(EXTRA_SHOW_BIG_PICTURE_WHEN_COLLAPSED);

            mPicture = extras.getParcelable(EXTRA_PICTURE);

        }