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

Commit 3feba764 authored by Kodlee Yin's avatar Kodlee Yin Committed by Android (Google) Code Review
Browse files

Merge "Add Notification.Action.SEMANTIC_ACTION_CALL"

parents 0e5972d8 cda5b09e

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -5312,6 +5312,7 @@ package android.app { 
    method public void writeToParcel(android.os.Parcel, int);

    field public static final android.os.Parcelable.Creator<android.app.Notification.Action> CREATOR;

    field public static final int SEMANTIC_ACTION_ARCHIVE = 5; // 0x5

    field public static final int SEMANTIC_ACTION_CALL = 10; // 0xa

    field public static final int SEMANTIC_ACTION_DELETE = 4; // 0x4

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

    field public static final int SEMANTIC_ACTION_MARK_AS_UNREAD = 3; // 0x3

core/java/android/app/Notification.java

+6 −1
Original line number Diff line number Diff line
@@ -1332,6 +1332,10 @@ public class Notification implements Parcelable 
         */

        public static final int SEMANTIC_ACTION_THUMBS_DOWN = 9;



        /**

         * {@code SemanticAction}: Call a contact, group, etc.

         */

        public static final int SEMANTIC_ACTION_CALL = 10;



        private final Bundle mExtras;

        private Icon mIcon;
@@ -1946,7 +1950,8 @@ public class Notification implements Parcelable 
                SEMANTIC_ACTION_MUTE,

                SEMANTIC_ACTION_UNMUTE,

                SEMANTIC_ACTION_THUMBS_UP,

                SEMANTIC_ACTION_THUMBS_DOWN

                SEMANTIC_ACTION_THUMBS_DOWN,

                SEMANTIC_ACTION_CALL

        })

        @Retention(RetentionPolicy.SOURCE)

        public @interface SemanticAction {}