diff options
| author | 2017-04-17 15:01:46 +0000 | |
|---|---|---|
| committer | 2017-04-17 15:01:54 +0000 | |
| commit | bbcf5fba1c9dc5e67d54b75187bfd9fdf212ee32 (patch) | |
| tree | 23e163dd3a7a10bb6c2a88ac28adf3c7ffa9cc21 | |
| parent | 676590d060778f7e1fb896f03ba53817eb910f93 (diff) | |
| parent | ad1e9c982525fa496ae85af7fe462f68ea826feb (diff) | |
Merge "Remove @removed method" into oc-dev
| -rw-r--r-- | api/removed.txt | 4 | ||||
| -rw-r--r-- | api/system-removed.txt | 4 | ||||
| -rw-r--r-- | api/test-removed.txt | 4 | ||||
| -rw-r--r-- | core/java/android/app/Notification.java | 15 |
4 files changed, 0 insertions, 27 deletions
diff --git a/api/removed.txt b/api/removed.txt index 82705fd981f9..1e8370e97dc5 100644 --- a/api/removed.txt +++ b/api/removed.txt @@ -5,10 +5,6 @@ package android.app { method public deprecated void setLatestEventInfo(android.content.Context, java.lang.CharSequence, java.lang.CharSequence, android.app.PendingIntent); } - public static class Notification.Builder { - method public deprecated android.app.Notification.Builder chooseBadgeIcon(int); - } - public final class RecoverableSecurityException extends java.lang.SecurityException implements android.os.Parcelable { method public deprecated void showAsNotification(android.content.Context); } diff --git a/api/system-removed.txt b/api/system-removed.txt index bdcafae9b079..7bdb9571bad0 100644 --- a/api/system-removed.txt +++ b/api/system-removed.txt @@ -5,10 +5,6 @@ package android.app { method public deprecated void setLatestEventInfo(android.content.Context, java.lang.CharSequence, java.lang.CharSequence, android.app.PendingIntent); } - public static class Notification.Builder { - method public deprecated android.app.Notification.Builder chooseBadgeIcon(int); - } - public final class RecoverableSecurityException extends java.lang.SecurityException implements android.os.Parcelable { method public deprecated void showAsNotification(android.content.Context); } diff --git a/api/test-removed.txt b/api/test-removed.txt index 82705fd981f9..1e8370e97dc5 100644 --- a/api/test-removed.txt +++ b/api/test-removed.txt @@ -5,10 +5,6 @@ package android.app { method public deprecated void setLatestEventInfo(android.content.Context, java.lang.CharSequence, java.lang.CharSequence, android.app.PendingIntent); } - public static class Notification.Builder { - method public deprecated android.app.Notification.Builder chooseBadgeIcon(int); - } - public final class RecoverableSecurityException extends java.lang.SecurityException implements android.os.Parcelable { method public deprecated void showAsNotification(android.content.Context); } diff --git a/core/java/android/app/Notification.java b/core/java/android/app/Notification.java index 7f26f4fd7050..9a22d2a87e48 100644 --- a/core/java/android/app/Notification.java +++ b/core/java/android/app/Notification.java @@ -2729,21 +2729,6 @@ public class Notification implements Parcelable } /** - * @removed - * Sets which icon to display as a badge for this notification. - * - * Must be one of {@link #BADGE_ICON_NONE}, {@link #BADGE_ICON_SMALL}, - * {@link #BADGE_ICON_LARGE}. - * - * Note: This value might be ignored, for launchers that don't support badge icons. - */ - @Deprecated - public Builder chooseBadgeIcon(int icon) { - mN.mBadgeIcon = icon; - return this; - } - - /** * Sets which icon to display as a badge for this notification. * * Must be one of {@link #BADGE_ICON_NONE}, {@link #BADGE_ICON_SMALL}, |