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

Merge "Remove replaced BubbleMetadata methods from SDK." into rvc-dev am: 603713009e am: 40a333403b am: b7daef2c6b

Browse Source 
Change-Id: I8e0c0bb586aa626fca374b9e88c6e662b83ce249
This commit is contained in:
Michael Wright
2020-03-30 21:55:31 +00:00
committed by Automerger Merge Worker
parent b62a42ec8c b7daef2c6b
commit 59e6c65491
3 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
api/current.txt
View File

@@ -5666,8 +5666,6 @@ package android.app {
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 @@ package android.app {
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);

10
api/removed.txt
View File

@@ -20,6 +20,16 @@ package android.app {
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);

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

@@ -8859,6 +8859,7 @@ public class Notification implements Parcelable
/**
* @deprecated use {@link #getIntent()} instead.
* @removed Removed from the R SDK but was never publicly stable.
*/
@Nullable
@Deprecated
@@ -8886,6 +8887,7 @@ public class Notification implements Parcelable
/**
* @deprecated use {@link #getIcon()} instead.
* @removed Removed from the R SDK but was never publicly stable.
*/
@Nullable
@Deprecated
@@ -9089,6 +9091,7 @@ public class Notification implements Parcelable
/**
* @deprecated use {@link Builder#Builder(String)} instead.
* @removed Removed from the R SDK but was never publicly stable.
*/
@NonNull
@Deprecated
@@ -9104,6 +9107,7 @@ public class Notification implements Parcelable
/**
* @deprecated use {@link Builder#Builder(PendingIntent, Icon)} instead.
* @removed Removed from the R SDK but was never publicly stable.
*/
@NonNull
@Deprecated