Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

DO NOT MERGE Hide Notification categories from API 20 (KKWT)

Browse Source 
Bug: 14116162

Change-Id: I59e499dde9a06a4bf455eecb3665afaa1b574dae
This commit is contained in:
Griff Hazen
2014-05-05 15:15:12 -07:00
parent 1e822a8fe1
commit ed0c87e7cd
2 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
api/current.txt
View File

@@ -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);

16
core/java/android/app/Notification.java
View File

@@ -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 <code>CATEGORY_*</code> 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;