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

Commit d343aff2 authored by Daniel Sandler's avatar Daniel Sandler Committed by Android Git Automerger
Browse files

am e7078cf9: Move CATEGORY_NOTIFICATION_PREFERENCES to Notification. 

* commit 'e7078cf9c41f5e3581a80b2129ae77719b0f69a4':
  Move CATEGORY_NOTIFICATION_PREFERENCES to Notification.
parents dc920984 01df1c68

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -4489,6 +4489,7 @@ package android.app { 
    field public static final int FLAG_ONGOING_EVENT = 2; // 0x2

    field public static final int FLAG_ONLY_ALERT_ONCE = 8; // 0x8

    field public static final int FLAG_SHOW_LIGHTS = 1; // 0x1

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

    field public static final int PRIORITY_DEFAULT = 0; // 0x0

    field public static final int PRIORITY_HIGH = 1; // 0x1

    field public static final int PRIORITY_LOW = -1; // 0xffffffff
@@ -7475,7 +7476,6 @@ 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/app/Notification.java

+11 −0
Original line number Diff line number Diff line
@@ -17,6 +17,8 @@ 
package android.app;



import android.annotation.IntDef;

import android.annotation.SdkConstant;

import android.annotation.SdkConstant.SdkConstantType;

import android.content.Context;

import android.content.Intent;

import android.content.res.Resources;
@@ -73,6 +75,15 @@ public class Notification implements Parcelable 
{

    private static final String TAG = "Notification";



    /**

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

            = "android.intent.category.NOTIFICATION_PREFERENCES";



    /**

     * Use all default values (where applicable).

     */

core/java/android/content/Intent.java

+0 −8
Original line number Diff line number Diff line
@@ -2976,14 +2976,6 @@ 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()).