Merge "Remove replaced BubbleMetadata methods from SDK." into rvc-dev
diff --git a/api/current.txt b/api/current.txt
index ae02a02a..40347c7 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -5666,8 +5666,6 @@
public static final class Notification.BubbleMetadata implements android.os.Parcelable {
method public int describeContents();
method public boolean getAutoExpandBubble();
- method @Deprecated @Nullable public android.graphics.drawable.Icon getBubbleIcon();
- method @Deprecated @Nullable public android.app.PendingIntent getBubbleIntent();
method @Nullable public android.app.PendingIntent getDeleteIntent();
method @Dimension(unit=android.annotation.Dimension.DP) public int getDesiredHeight();
method @DimenRes public int getDesiredHeightResId();
@@ -5684,8 +5682,6 @@
ctor public Notification.BubbleMetadata.Builder(@NonNull String);
ctor public Notification.BubbleMetadata.Builder(@NonNull android.app.PendingIntent, @NonNull android.graphics.drawable.Icon);
method @NonNull public android.app.Notification.BubbleMetadata build();
- method @Deprecated @NonNull public android.app.Notification.BubbleMetadata.Builder createIntentBubble(@NonNull android.app.PendingIntent, @NonNull android.graphics.drawable.Icon);
- method @Deprecated @NonNull public android.app.Notification.BubbleMetadata.Builder createShortcutBubble(@NonNull String);
method @NonNull public android.app.Notification.BubbleMetadata.Builder setAutoExpandBubble(boolean);
method @NonNull public android.app.Notification.BubbleMetadata.Builder setDeleteIntent(@Nullable android.app.PendingIntent);
method @NonNull public android.app.Notification.BubbleMetadata.Builder setDesiredHeight(@Dimension(unit=android.annotation.Dimension.DP) int);
diff --git a/api/removed.txt b/api/removed.txt
index 077c915..cddccb3 100644
--- a/api/removed.txt
+++ b/api/removed.txt
@@ -20,6 +20,16 @@
method @Deprecated public void setLatestEventInfo(android.content.Context, CharSequence, CharSequence, android.app.PendingIntent);
}
+ public static final class Notification.BubbleMetadata implements android.os.Parcelable {
+ method @Deprecated @Nullable public android.graphics.drawable.Icon getBubbleIcon();
+ method @Deprecated @Nullable public android.app.PendingIntent getBubbleIntent();
+ }
+
+ public static final class Notification.BubbleMetadata.Builder {
+ method @Deprecated @NonNull public android.app.Notification.BubbleMetadata.Builder createIntentBubble(@NonNull android.app.PendingIntent, @NonNull android.graphics.drawable.Icon);
+ method @Deprecated @NonNull public android.app.Notification.BubbleMetadata.Builder createShortcutBubble(@NonNull String);
+ }
+
public static class Notification.Builder {
method @Deprecated public android.app.Notification.Builder setChannel(String);
method @Deprecated public android.app.Notification.Builder setTimeout(long);
diff --git a/core/java/android/app/Notification.java b/core/java/android/app/Notification.java
index 31fc2d0..e137acf 100644
--- a/core/java/android/app/Notification.java
+++ b/core/java/android/app/Notification.java
@@ -8859,6 +8859,7 @@
/**
* @deprecated use {@link #getIntent()} instead.
+ * @removed Removed from the R SDK but was never publicly stable.
*/
@Nullable
@Deprecated
@@ -8886,6 +8887,7 @@
/**
* @deprecated use {@link #getIcon()} instead.
+ * @removed Removed from the R SDK but was never publicly stable.
*/
@Nullable
@Deprecated
@@ -9089,6 +9091,7 @@
/**
* @deprecated use {@link Builder#Builder(String)} instead.
+ * @removed Removed from the R SDK but was never publicly stable.
*/
@NonNull
@Deprecated
@@ -9104,6 +9107,7 @@
/**
* @deprecated use {@link Builder#Builder(PendingIntent, Icon)} instead.
+ * @removed Removed from the R SDK but was never publicly stable.
*/
@NonNull
@Deprecated