Merge "Remove bubble API added & deprecated in Q" into qt-dev
This commit is contained in:
@@ -5502,8 +5502,6 @@ package android.app {
|
||||
method @DimenRes public int getDesiredHeightResId();
|
||||
method @NonNull public android.graphics.drawable.Icon getIcon();
|
||||
method @NonNull public android.app.PendingIntent getIntent();
|
||||
method @Deprecated public boolean getSuppressInitialNotification();
|
||||
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;
|
||||
@@ -5518,7 +5516,6 @@ package android.app {
|
||||
method @NonNull public android.app.Notification.BubbleMetadata.Builder setDesiredHeightResId(@DimenRes int);
|
||||
method @NonNull public android.app.Notification.BubbleMetadata.Builder setIcon(@NonNull android.graphics.drawable.Icon);
|
||||
method @NonNull public android.app.Notification.BubbleMetadata.Builder setIntent(@NonNull android.app.PendingIntent);
|
||||
method @Deprecated @NonNull public android.app.Notification.BubbleMetadata.Builder setSuppressInitialNotification(boolean);
|
||||
method @NonNull public android.app.Notification.BubbleMetadata.Builder setSuppressNotification(boolean);
|
||||
}
|
||||
|
||||
|
||||
@@ -8641,27 +8641,6 @@ public class Notification implements Parcelable
|
||||
return (mFlags & FLAG_AUTO_EXPAND_BUBBLE) != 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return whether this bubble should suppress the initial notification when it is posted.
|
||||
*
|
||||
* @see BubbleMetadata.Builder#setSuppressInitialNotification(boolean)
|
||||
* @deprecated TO BE REMOVED, use {@link #isNotificationSuppressed()} instead.
|
||||
*/
|
||||
@Deprecated
|
||||
public boolean getSuppressInitialNotification() {
|
||||
return isNotificationSuppressed();
|
||||
}
|
||||
|
||||
/**
|
||||
* @return whether this bubble should suppress the notification when it is posted.
|
||||
*
|
||||
* @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.
|
||||
*
|
||||
@@ -8817,27 +8796,6 @@ public class Notification implements Parcelable
|
||||
return this;
|
||||
}
|
||||
|
||||
/**
|
||||
* If set and the app creating the bubble is in the foreground, the bubble will be
|
||||
* posted <b>without</b> the associated notification in the notification shade.
|
||||
* Subsequent update notifications to this bubble will post a notification in the shade.
|
||||
*
|
||||
* <p>If the app creating the bubble is not in the foreground this flag has no effect.
|
||||
* </p>
|
||||
*
|
||||
* <p>Generally this flag should only be set if the user has performed an action to
|
||||
* request or create a bubble.</p>
|
||||
*
|
||||
* @deprecated TO BE REMOVED, use {@link #setSuppressNotification(boolean)} instead.
|
||||
*/
|
||||
@Deprecated
|
||||
@NonNull
|
||||
public BubbleMetadata.Builder setSuppressInitialNotification(
|
||||
boolean shouldSupressNotif) {
|
||||
setFlag(FLAG_SUPPRESS_NOTIFICATION, shouldSupressNotif);
|
||||
return this;
|
||||
}
|
||||
|
||||
/**
|
||||
* If set and the app posting the bubble is in the foreground, the bubble will be
|
||||
* posted <b>without</b> the associated notification in the notification shade.
|
||||
|
||||
Reference in New Issue
Block a user