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

Commit 6c3051c4 authored by Dan Sandler's avatar Dan Sandler Committed by Android (Google) Code Review
Browse files

Merge "Introduce CATEGORY_NOTIFICATION_PREFERENCES."

parents 08c96b55 a55734aa

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -6920,6 +6920,7 @@ package android.content { 
    field public static final java.lang.String CATEGORY_LEANBACK_LAUNCHER = "android.intent.category.LEANBACK_LAUNCHER";

    field public static final java.lang.String CATEGORY_LE_DESK_DOCK = "android.intent.category.LE_DESK_DOCK";

    field public static final java.lang.String CATEGORY_MONKEY = "android.intent.category.MONKEY";

    field public static final java.lang.String CATEGORY_NOTIFICATION_PREFERENCES = "android.intent.category.NOTIFICATION_PREFERENCES";

    field public static final java.lang.String CATEGORY_OPENABLE = "android.intent.category.OPENABLE";

    field public static final java.lang.String CATEGORY_PREFERENCE = "android.intent.category.PREFERENCE";

    field public static final java.lang.String CATEGORY_SAMPLE_CODE = "android.intent.category.SAMPLE_CODE";

core/java/android/content/Intent.java

+8 −0
Original line number Diff line number Diff line
@@ -2884,6 +2884,14 @@ public class Intent implements Parcelable, Cloneable { 
    @SdkConstant(SdkConstantType.INTENT_CATEGORY)

    public static final String CATEGORY_CAR_MODE = "android.intent.category.CAR_MODE";



    /**

     * An activity that provides a user interface for adjusting notification preferences for its

     * containing application. Optional but recommended for apps that post

     * {@link android.app.Notification Notifications}.

     */

    @SdkConstant(SdkConstantType.INTENT_CATEGORY)

    public static final String CATEGORY_NOTIFICATION_PREFERENCES = "android.intent.category.NOTIFICATION_PREFERENCES";



    // ---------------------------------------------------------------------

    // ---------------------------------------------------------------------

    // Application launch intent categories (see addCategory()).