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

Merge "API feedback: getSuppressNotification -> isNotificationSuppressed" into qt-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2019-04-18 03:27:45 +00:00
committed by Android (Google) Code Review
parent cb397d7031 c529d6d49f
commit 6e0668c784
3 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
api/current.txt
View File

@@ -5485,7 +5485,8 @@ package android.app {
method @NonNull public android.graphics.drawable.Icon getIcon();
method @NonNull public android.app.PendingIntent getIntent();
method @Deprecated public boolean getSuppressInitialNotification();
method public boolean getSuppressNotification();
method @Deprecated public boolean getSuppressNotification();
method public boolean isNotificationSuppressed();
method public void writeToParcel(android.os.Parcel, int);
field @NonNull public static final android.os.Parcelable.Creator<android.app.Notification.BubbleMetadata> CREATOR;
}

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

@@ -8645,19 +8645,29 @@ public class Notification implements Parcelable
* @return whether this bubble should suppress the initial notification when it is posted.
*
* @see BubbleMetadata.Builder#setSuppressInitialNotification(boolean)
* @deprecated TO BE REMOVED, use {@link #getSuppressNotification()} instead.
* @deprecated TO BE REMOVED, use {@link #isNotificationSuppressed()} instead.
*/
@Deprecated
public boolean getSuppressInitialNotification() {
return (mFlags & FLAG_SUPPRESS_NOTIFICATION) != 0;
return isNotificationSuppressed();
}
/**
* @return whether this bubble should suppress the notification when it is posted.
*
* @see BubbleMetadata.Builder#setSuppressInitialNotification(boolean)
* @see BubbleMetadata.Builder#setSuppressNotification(boolean)
* @deprecated TO BE REMOVED, use {@link #isNotificationSuppressed()} instead.
*/
public boolean getSuppressNotification() {
return isNotificationSuppressed();
}
/**
* @return whether this bubble should suppress the notification when it is posted.
*
* @see BubbleMetadata.Builder#setSuppressNotification(boolean)
*/
public boolean isNotificationSuppressed() {
return (mFlags & FLAG_SUPPRESS_NOTIFICATION) != 0;
}

2
packages/SystemUI/src/com/android/systemui/bubbles/BubbleController.java
View File

@@ -595,7 +595,7 @@ public class BubbleController implements ConfigurationController.ConfigurationLi
private void updateShowInShadeForSuppressNotification(NotificationEntry entry) {
boolean suppressNotification = entry.getBubbleMetadata() != null
&& entry.getBubbleMetadata().getSuppressNotification()
&& entry.getBubbleMetadata().isNotificationSuppressed()
&& isForegroundApp(mContext, entry.notification.getPackageName());
entry.setShowInShadeWhenBubble(!suppressNotification);
}