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

Merge "Make Notification.Builder.SetFlag public"

Browse Source 
am: c8bd4aecb3

Change-Id: I3b8ff8e7c754b12778e40a9abcc829fb7a12671b
This commit is contained in:
cncn
2019-11-21 18:41:27 -08:00
committed by android-build-merger
parent 55e2207408 c8bd4aecb3
commit dca2d45630
2 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/current.txt
View File

@@ -5552,6 +5552,7 @@ package android.app {
method @Deprecated public android.app.Notification.Builder setDefaults(int);
method @NonNull public android.app.Notification.Builder setDeleteIntent(android.app.PendingIntent);
method @NonNull public android.app.Notification.Builder setExtras(android.os.Bundle);
method @NonNull public android.app.Notification.Builder setFlag(int, boolean);
method @NonNull public android.app.Notification.Builder setFullScreenIntent(android.app.PendingIntent, boolean);
method @NonNull public android.app.Notification.Builder setGroup(String);
method @NonNull public android.app.Notification.Builder setGroupAlertBehavior(int);

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

@@ -628,6 +628,13 @@ public class Notification implements Parcelable
*/
public static final int FLAG_BUBBLE = 0x00001000;
/** @hide */
@IntDef({FLAG_SHOW_LIGHTS, FLAG_ONGOING_EVENT, FLAG_INSISTENT, FLAG_ONLY_ALERT_ONCE,
FLAG_AUTO_CANCEL, FLAG_NO_CLEAR, FLAG_FOREGROUND_SERVICE, FLAG_HIGH_PRIORITY,
FLAG_LOCAL_ONLY, FLAG_GROUP_SUMMARY, FLAG_AUTOGROUP_SUMMARY, FLAG_BUBBLE})
@Retention(RetentionPolicy.SOURCE)
public @interface NotificationFlags{};
public int flags;
/** @hide */
@@ -4537,10 +4544,15 @@ public class Notification implements Parcelable
}
/**
* @hide
* Set the value for a notification flag
*
* @param mask Bit mask of the flag
* @param value Status (on/off) of the flag
*
* @return The same Builder.
*/
@NonNull
public Builder setFlag(int mask, boolean value) {
public Builder setFlag(@NotificationFlags int mask, boolean value) {
if (value) {
mN.flags |= mask;
} else {