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

Commit 414250d6 authored by Adora Zhang's avatar Adora Zhang Committed by android-build-merger
Browse files

Merge "Add notification category: CATEGORY_NAVIGATION; Add @SystemApi @hide... 

Merge "Add notification category: CATEGORY_NAVIGATION; Add @SystemApi @hide notification categories: CATEGORY_CAR_EMERGENCY, CATEGORY_CAR_WARNING, and CATEGORY_CAR_INFORMATION." into pi-dev am: 5d9617c4
am: d8a94c6a

Change-Id: I86b7d0c8e72c7b9dcae683c78203931264602171
parents c1544af8 d8a94c6a

api/current.txt

+1 −0
Original line number Original line Diff line number Diff line
@@ -5196,6 +5196,7 @@ package android.app { 
    field public static final java.lang.String CATEGORY_ERROR = "err";

    field public static final java.lang.String CATEGORY_ERROR = "err";

    field public static final java.lang.String CATEGORY_EVENT = "event";

    field public static final java.lang.String CATEGORY_EVENT = "event";

    field public static final java.lang.String CATEGORY_MESSAGE = "msg";

    field public static final java.lang.String CATEGORY_MESSAGE = "msg";

    field public static final java.lang.String CATEGORY_NAVIGATION = "navigation";

    field public static final java.lang.String CATEGORY_PROGRESS = "progress";

    field public static final java.lang.String CATEGORY_PROGRESS = "progress";

    field public static final java.lang.String CATEGORY_PROMO = "promo";

    field public static final java.lang.String CATEGORY_PROMO = "promo";

    field public static final java.lang.String CATEGORY_RECOMMENDATION = "recommendation";

    field public static final java.lang.String CATEGORY_RECOMMENDATION = "recommendation";

api/system-current.txt

+3 −0
Original line number Original line Diff line number Diff line
@@ -336,6 +336,9 @@ package android.app { 
  }

  }





  public class Notification implements android.os.Parcelable {

  public class Notification implements android.os.Parcelable {

    field public static final java.lang.String CATEGORY_CAR_EMERGENCY = "car_emergency";

    field public static final java.lang.String CATEGORY_CAR_INFORMATION = "car_information";

    field public static final java.lang.String CATEGORY_CAR_WARNING = "car_warning";

    field public static final java.lang.String EXTRA_ALLOW_DURING_SETUP = "android.allowDuringSetup";

    field public static final java.lang.String EXTRA_ALLOW_DURING_SETUP = "android.allowDuringSetup";

    field public static final java.lang.String EXTRA_SUBSTITUTE_APP_NAME = "android.substName";

    field public static final java.lang.String EXTRA_SUBSTITUTE_APP_NAME = "android.substName";

    field public static final int FLAG_AUTOGROUP_SUMMARY = 1024; // 0x400

    field public static final int FLAG_AUTOGROUP_SUMMARY = 1024; // 0x400

core/java/android/app/Notification.java

+26 −0
Original line number Original line Diff line number Diff line
@@ -762,6 +762,11 @@ public class Notification implements Parcelable 
     */

     */

    public static final String CATEGORY_CALL = "call";

    public static final String CATEGORY_CALL = "call";





    /**

     * Notification category: map turn-by-turn navigation.

     */

    public static final String CATEGORY_NAVIGATION = "navigation";



    /**

    /**

     * Notification category: incoming direct message (SMS, instant message, etc.).

     * Notification category: incoming direct message (SMS, instant message, etc.).

     */

     */
@@ -834,6 +839,27 @@ public class Notification implements Parcelable 
     */

     */

    public static final String CATEGORY_REMINDER = "reminder";

    public static final String CATEGORY_REMINDER = "reminder";





    /**

     * Notification category: extreme car emergencies.

     * @hide

     */

    @SystemApi

    public static final String CATEGORY_CAR_EMERGENCY = "car_emergency";



    /**

     * Notification category: car warnings.

     * @hide

     */

    @SystemApi

    public static final String CATEGORY_CAR_WARNING = "car_warning";



    /**

     * Notification category: general car system information.

     * @hide

     */

    @SystemApi

    public static final String CATEGORY_CAR_INFORMATION = "car_information";



    /**

    /**

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

     * 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.

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