Merge "API feedback: getSuppressNotification -> isNotificationSuppressed" into qt-dev (6e0668c7) · Commits · e / os / android_frameworks_base

api/current.txt

+2 −1

Original line number	Diff line number	Diff line
		@@ -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;
		}

+13 −3

Original line number	Diff line number	Diff line
		@@ -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;
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -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);
		}