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

Commit 53766bd7 authored by Julia Reynolds's avatar Julia Reynolds Committed by Android (Google) Code Review
Browse files

Merge "Sync internal notif categories with androidx"

parents 88319e97 1b665784

api/current.txt

+4 −0
Original line number Diff line number Diff line
@@ -5491,7 +5491,9 @@ package android.app { 
    field public static final String CATEGORY_EMAIL = "email";

    field public static final String CATEGORY_ERROR = "err";

    field public static final String CATEGORY_EVENT = "event";

    field public static final String CATEGORY_LOCATION_SHARING = "location_sharing";

    field public static final String CATEGORY_MESSAGE = "msg";

    field public static final String CATEGORY_MISSED_CALL = "missed_call";

    field public static final String CATEGORY_NAVIGATION = "navigation";

    field public static final String CATEGORY_PROGRESS = "progress";

    field public static final String CATEGORY_PROMO = "promo";
@@ -5500,8 +5502,10 @@ package android.app { 
    field public static final String CATEGORY_SERVICE = "service";

    field public static final String CATEGORY_SOCIAL = "social";

    field public static final String CATEGORY_STATUS = "status";

    field public static final String CATEGORY_STOPWATCH = "stopwatch";

    field public static final String CATEGORY_SYSTEM = "sys";

    field public static final String CATEGORY_TRANSPORT = "transport";

    field public static final String CATEGORY_WORKOUT = "workout";

    field @ColorInt public static final int COLOR_DEFAULT = 0; // 0x0

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

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

core/api/current.txt

+4 −0
Original line number Diff line number Diff line
@@ -5491,7 +5491,9 @@ package android.app { 
    field public static final String CATEGORY_EMAIL = "email";

    field public static final String CATEGORY_ERROR = "err";

    field public static final String CATEGORY_EVENT = "event";

    field public static final String CATEGORY_LOCATION_SHARING = "location_sharing";

    field public static final String CATEGORY_MESSAGE = "msg";

    field public static final String CATEGORY_MISSED_CALL = "missed_call";

    field public static final String CATEGORY_NAVIGATION = "navigation";

    field public static final String CATEGORY_PROGRESS = "progress";

    field public static final String CATEGORY_PROMO = "promo";
@@ -5500,8 +5502,10 @@ package android.app { 
    field public static final String CATEGORY_SERVICE = "service";

    field public static final String CATEGORY_SOCIAL = "social";

    field public static final String CATEGORY_STATUS = "status";

    field public static final String CATEGORY_STOPWATCH = "stopwatch";

    field public static final String CATEGORY_SYSTEM = "sys";

    field public static final String CATEGORY_TRANSPORT = "transport";

    field public static final String CATEGORY_WORKOUT = "workout";

    field @ColorInt public static final int COLOR_DEFAULT = 0; // 0x0

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

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

core/java/android/app/Notification.java

+20 −0
Original line number Diff line number Diff line
@@ -896,6 +896,26 @@ public class Notification implements Parcelable 
    @SystemApi

    public static final String CATEGORY_CAR_INFORMATION = "car_information";



    /**

     * Notification category: tracking a user's workout.

     */

    public static final String CATEGORY_WORKOUT = "workout";



    /**

     * Notification category: temporarily sharing location.

     */

    public static final String CATEGORY_LOCATION_SHARING = "location_sharing";



    /**

     * Notification category: running stopwatch.

     */

    public static final String CATEGORY_STOPWATCH = "stopwatch";



    /**

     * Notification category: missed call.

     */

    public static final String CATEGORY_MISSED_CALL = "missed_call";



    /**

     * One of the predefined notification categories (see the <code>CATEGORY_*</code> constants)

     * that best describes this Notification.  May be used by the system for ranking and filtering.