Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 52e063ee authored by Julia Reynolds's avatar Julia Reynolds Committed by android-build-merger
Browse files

Merge "Rename badge icon method" into oc-dev 

am: ed8d07f2

Change-Id: I26f8b9cf46ebd30608bd038dde946e7139c9f25a
parents 523faba7 ed8d07f2

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -5299,7 +5299,6 @@ package android.app { 
    method public android.app.Notification.Builder addExtras(android.os.Bundle);

    method public android.app.Notification.Builder addPerson(java.lang.String);

    method public android.app.Notification build();

    method public android.app.Notification.Builder chooseBadgeIconType(int);

    method public android.widget.RemoteViews createBigContentView();

    method public android.widget.RemoteViews createContentView();

    method public android.widget.RemoteViews createHeadsUpContentView();
@@ -5309,6 +5308,7 @@ package android.app { 
    method public static android.app.Notification.Builder recoverBuilder(android.content.Context, android.app.Notification);

    method public android.app.Notification.Builder setActions(android.app.Notification.Action...);

    method public android.app.Notification.Builder setAutoCancel(boolean);

    method public android.app.Notification.Builder setBadgeIconType(int);

    method public android.app.Notification.Builder setCategory(java.lang.String);

    method public android.app.Notification.Builder setChannel(java.lang.String);

    method public android.app.Notification.Builder setChronometerCountDown(boolean);

api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -5474,7 +5474,6 @@ package android.app { 
    method public android.app.Notification.Builder addExtras(android.os.Bundle);

    method public android.app.Notification.Builder addPerson(java.lang.String);

    method public android.app.Notification build();

    method public android.app.Notification.Builder chooseBadgeIconType(int);

    method public android.widget.RemoteViews createBigContentView();

    method public android.widget.RemoteViews createContentView();

    method public android.widget.RemoteViews createHeadsUpContentView();
@@ -5484,6 +5483,7 @@ package android.app { 
    method public static android.app.Notification.Builder recoverBuilder(android.content.Context, android.app.Notification);

    method public android.app.Notification.Builder setActions(android.app.Notification.Action...);

    method public android.app.Notification.Builder setAutoCancel(boolean);

    method public android.app.Notification.Builder setBadgeIconType(int);

    method public android.app.Notification.Builder setCategory(java.lang.String);

    method public android.app.Notification.Builder setChannel(java.lang.String);

    method public android.app.Notification.Builder setChronometerCountDown(boolean);

api/test-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -5311,7 +5311,6 @@ package android.app { 
    method public android.app.Notification.Builder addExtras(android.os.Bundle);

    method public android.app.Notification.Builder addPerson(java.lang.String);

    method public android.app.Notification build();

    method public android.app.Notification.Builder chooseBadgeIconType(int);

    method public android.widget.RemoteViews createBigContentView();

    method public android.widget.RemoteViews createContentView();

    method public android.widget.RemoteViews createHeadsUpContentView();
@@ -5321,6 +5320,7 @@ package android.app { 
    method public static android.app.Notification.Builder recoverBuilder(android.content.Context, android.app.Notification);

    method public android.app.Notification.Builder setActions(android.app.Notification.Action...);

    method public android.app.Notification.Builder setAutoCancel(boolean);

    method public android.app.Notification.Builder setBadgeIconType(int);

    method public android.app.Notification.Builder setCategory(java.lang.String);

    method public android.app.Notification.Builder setChannel(java.lang.String);

    method public android.app.Notification.Builder setChronometerCountDown(boolean);

core/java/android/app/Notification.java

+1 −1
Original line number Diff line number Diff line
@@ -2715,7 +2715,7 @@ public class Notification implements Parcelable 
         *

         * Note: This value might be ignored, for launchers that don't support badge icons.

         */

        public Builder chooseBadgeIconType(int icon) {

        public Builder setBadgeIconType(int icon) {

            mN.mBadgeIcon = icon;

            return this;

        }