diff options
| author | Daniel Sandler <dsandler@android.com> | 2014-06-09 10:54:01 -0400 |
|---|---|---|
| committer | Dan Sandler <dsandler@android.com> | 2014-06-09 16:53:51 +0000 |
| commit | 01df1c680abdce58d873220cfce9163b59eacbd2 (patch) | |
| tree | 12b47b3ab6804cf3e325acbc98ab3b74aa60c80a /core/java/android | |
| parent | 89b3b4a0b214eea12a5f48b61a021103cdc5c10e (diff) | |
Move CATEGORY_NOTIFICATION_PREFERENCES to Notification.
It sprouts an additional INTENT_ prefix to distinguish it
from the Notification.category constants in the same file.
Bug: 15022240
Change-Id: Icbc09bfc5ce78964272def66934fe4a7c848e12b
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/app/Notification.java | 11 | ||||
| -rw-r--r-- | core/java/android/content/Intent.java | 8 |
2 files changed, 11 insertions, 8 deletions
diff --git a/core/java/android/app/Notification.java b/core/java/android/app/Notification.java index 72b5cd90d5c5..a1cdf59ec2fb 100644 --- a/core/java/android/app/Notification.java +++ b/core/java/android/app/Notification.java @@ -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; @@ -74,6 +76,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). */ public static final int DEFAULT_ALL = ~0; diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java index bd07470ee583..fad3851f55b8 100644 --- a/core/java/android/content/Intent.java +++ b/core/java/android/content/Intent.java @@ -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()). |