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

Commit fbeaead2 authored by Bryan Mawhinney's avatar Bryan Mawhinney Committed by Android Git Automerger
Browse files

am 3e90363e: am 64ccca0d: am d5d3525a: Store actions passed to... 

am 3e90363e: am 64ccca0d: am d5d3525a: Store actions passed to MediaStyle.setShowActionsInCompactView in extras

* commit '3e90363e815629318d65bb8e2b98b2b9efa9c882':
  Store actions passed to MediaStyle.setShowActionsInCompactView in extras
parents 3cf87144 645a63bc

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -4588,6 +4588,7 @@ package android.app { 
    field public static final int DEFAULT_SOUND = 1; // 0x1

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

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

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

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

    field public static final java.lang.String EXTRA_LARGE_ICON = "android.largeIcon";

    field public static final java.lang.String EXTRA_LARGE_ICON_BIG = "android.largeIcon.big";

core/java/android/app/Notification.java

+9 −0
Original line number Diff line number Diff line
@@ -798,6 +798,12 @@ public class Notification implements Parcelable 
     */

    public static final String EXTRA_MEDIA_SESSION = "android.mediaSession";



    /**

     * {@link #extras} key: the indices of actions to be shown in the compact view,

     * as supplied to (e.g.) {@link MediaStyle#setShowActionsInCompactView(int...)}.

     */

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



    /**

     * Value for {@link #EXTRA_AS_HEADS_UP} that indicates this notification should not be

     * displayed in the heads up space.
@@ -3362,6 +3368,9 @@ public class Notification implements Parcelable 
            if (mToken != null) {

                extras.putParcelable(EXTRA_MEDIA_SESSION, mToken);

            }

            if (mActionsToShowInCompact != null) {

                extras.putIntArray(EXTRA_COMPACT_ACTIONS, mActionsToShowInCompact);

            }

        }



        private RemoteViews generateMediaActionButton(Action action) {