diff options
| author | Dan Sandler <dsandler@android.com> | 2014-03-28 18:51:18 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-03-28 18:51:19 +0000 |
| commit | 6c3051c4224e72e58e217d9080c9ce3599ff5740 (patch) | |
| tree | 89be502cbd361b941dab7382d69396525dc9b38a | |
| parent | 08c96b5515f061f61e13b348f6022ce7c586e4c4 (diff) | |
| parent | a55734aaed35bc15dd604d9364b1aec4f191cb7a (diff) | |
| download | frameworks_base-6c3051c4224e72e58e217d9080c9ce3599ff5740.zip frameworks_base-6c3051c4224e72e58e217d9080c9ce3599ff5740.tar.gz frameworks_base-6c3051c4224e72e58e217d9080c9ce3599ff5740.tar.bz2 | |
Merge "Introduce CATEGORY_NOTIFICATION_PREFERENCES."
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/content/Intent.java | 8 |
2 files changed, 9 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index 190397b..6da1a5d 100644 --- a/api/current.txt +++ b/api/current.txt @@ -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"; diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java index 102433b..d189a34 100644 --- a/core/java/android/content/Intent.java +++ b/core/java/android/content/Intent.java @@ -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()). |