From ed0c87e7cdd2f641b6ed78df62b20a9f08ac16bb Mon Sep 17 00:00:00 2001 From: Griff Hazen Date: Mon, 5 May 2014 15:15:12 -0700 Subject: [PATCH] DO NOT MERGE Hide Notification categories from API 20 (KKWT) Bug: 14116162 Change-Id: I59e499dde9a06a4bf455eecb3665afaa1b574dae --- api/current.txt | 16 ---------------- core/java/android/app/Notification.java | 16 ++++++++++++++++ 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/api/current.txt b/api/current.txt index 5fd2952909b49..b24bb57993f42 100644 --- a/api/current.txt +++ b/api/current.txt @@ -3922,20 +3922,6 @@ package android.app { method public int describeContents(); method public deprecated void setLatestEventInfo(android.content.Context, java.lang.CharSequence, java.lang.CharSequence, android.app.PendingIntent); method public void writeToParcel(android.os.Parcel, int); - field public static final java.lang.String CATEGORY_ALARM = "alarm"; - field public static final java.lang.String CATEGORY_CALL = "call"; - field public static final java.lang.String CATEGORY_EMAIL = "email"; - 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_MESSAGE = "msg"; - 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_RECOMMENDATION = "recommendation"; - field public static final java.lang.String CATEGORY_SERVICE = "service"; - field public static final java.lang.String CATEGORY_SOCIAL = "social"; - field public static final java.lang.String CATEGORY_STATUS = "status"; - field public static final java.lang.String CATEGORY_SYSTEM = "sys"; - field public static final java.lang.String CATEGORY_TRANSPORT = "transport"; field public static final android.os.Parcelable.Creator CREATOR; field public static final int DEFAULT_ALL = -1; // 0xffffffff field public static final int DEFAULT_LIGHTS = 4; // 0x4 @@ -3976,7 +3962,6 @@ package android.app { field public android.app.Notification.Action[] actions; field public int audioStreamType; field public android.widget.RemoteViews bigContentView; - field public java.lang.String category; field public android.app.PendingIntent contentIntent; field public android.widget.RemoteViews contentView; field public int defaults; @@ -4035,7 +4020,6 @@ package android.app { method public android.os.Bundle getExtras(); method public deprecated android.app.Notification getNotification(); method public android.app.Notification.Builder setAutoCancel(boolean); - method public android.app.Notification.Builder setCategory(java.lang.String); method public android.app.Notification.Builder setContent(android.widget.RemoteViews); method public android.app.Notification.Builder setContentInfo(java.lang.CharSequence); method public android.app.Notification.Builder setContentIntent(android.app.PendingIntent); diff --git a/core/java/android/app/Notification.java b/core/java/android/app/Notification.java index 55e7470d15d33..298022e6ea4de 100644 --- a/core/java/android/app/Notification.java +++ b/core/java/android/app/Notification.java @@ -402,61 +402,73 @@ public class Notification implements Parcelable /** * Notification category: incoming call (voice or video) or similar synchronous communication request. + * @hide */ public static final String CATEGORY_CALL = "call"; /** * Notification category: incoming direct message (SMS, instant message, etc.). + * @hide */ public static final String CATEGORY_MESSAGE = "msg"; /** * Notification category: asynchronous bulk message (email). + * @hide */ public static final String CATEGORY_EMAIL = "email"; /** * Notification category: calendar event. + * @hide */ public static final String CATEGORY_EVENT = "event"; /** * Notification category: promotion or advertisement. + * @hide */ public static final String CATEGORY_PROMO = "promo"; /** * Notification category: alarm or timer. + * @hide */ public static final String CATEGORY_ALARM = "alarm"; /** * Notification category: progress of a long-running background operation. + * @hide */ public static final String CATEGORY_PROGRESS = "progress"; /** * Notification category: social network or sharing update. + * @hide */ public static final String CATEGORY_SOCIAL = "social"; /** * Notification category: error in background operation or authentication status. + * @hide */ public static final String CATEGORY_ERROR = "err"; /** * Notification category: media transport control for playback. + * @hide */ public static final String CATEGORY_TRANSPORT = "transport"; /** * Notification category: system or device status update. Reserved for system use. + * @hide */ public static final String CATEGORY_SYSTEM = "sys"; /** * Notification category: indication of running background service. + * @hide */ public static final String CATEGORY_SERVICE = "service"; @@ -464,17 +476,20 @@ public class Notification implements Parcelable * Notification category: a specific, timely recommendation for a single thing. * For example, a news app might want to recommend a news story it believes the user will * want to read next. + * @hide */ public static final String CATEGORY_RECOMMENDATION = "recommendation"; /** * Notification category: ongoing information about device or contextual status. + * @hide */ public static final String CATEGORY_STATUS = "status"; /** * One of the predefined notification categories (see the CATEGORY_* constants) * that best describes this Notification. May be used by the system for ranking and filtering. + * @hide */ public String category; @@ -1611,6 +1626,7 @@ public class Notification implements Parcelable * Set the notification category. * * @see Notification#category + * @hide */ public Builder setCategory(String category) { mCategory = category;