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

Commit ca19e327 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes I818e8db9,Ie24468be 

* changes:
  Added a new API to colorize notifications
  Modified the interpolators when opening an ambient notification
parents 2a27b2ca 7b9605b7

api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -5050,6 +5050,7 @@ package android.app { 
    field public static final java.lang.String EXTRA_BACKGROUND_IMAGE_URI = "android.backgroundImageUri";

    field public static final java.lang.String EXTRA_BIG_TEXT = "android.bigText";

    field public static final java.lang.String EXTRA_CHRONOMETER_COUNT_DOWN = "android.chronometerCountDown";

    field public static final java.lang.String EXTRA_COLORIZED = "android.colorized";

    field public static final java.lang.String EXTRA_COMPACT_ACTIONS = "android.compactActions";

    field public static final java.lang.String EXTRA_CONVERSATION_TITLE = "android.conversationTitle";

    field public static final java.lang.String EXTRA_HISTORIC_MESSAGES = "android.messages.historic";
@@ -5215,6 +5216,7 @@ package android.app { 
    method public android.app.Notification.Builder setChannel(java.lang.String);

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

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

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

    method public deprecated android.app.Notification.Builder setContent(android.widget.RemoteViews);

    method public deprecated android.app.Notification.Builder setContentInfo(java.lang.CharSequence);

    method public android.app.Notification.Builder setContentIntent(android.app.PendingIntent);

api/system-current.txt

+2 −0
Original line number Diff line number Diff line
@@ -5211,6 +5211,7 @@ package android.app { 
    field public static final java.lang.String EXTRA_BACKGROUND_IMAGE_URI = "android.backgroundImageUri";

    field public static final java.lang.String EXTRA_BIG_TEXT = "android.bigText";

    field public static final java.lang.String EXTRA_CHRONOMETER_COUNT_DOWN = "android.chronometerCountDown";

    field public static final java.lang.String EXTRA_COLORIZED = "android.colorized";

    field public static final java.lang.String EXTRA_COMPACT_ACTIONS = "android.compactActions";

    field public static final java.lang.String EXTRA_CONVERSATION_TITLE = "android.conversationTitle";

    field public static final java.lang.String EXTRA_HISTORIC_MESSAGES = "android.messages.historic";
@@ -5378,6 +5379,7 @@ package android.app { 
    method public android.app.Notification.Builder setChannel(java.lang.String);

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

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

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

    method public deprecated android.app.Notification.Builder setContent(android.widget.RemoteViews);

    method public deprecated android.app.Notification.Builder setContentInfo(java.lang.CharSequence);

    method public android.app.Notification.Builder setContentIntent(android.app.PendingIntent);

api/test-current.txt

+2 −0
Original line number Diff line number Diff line
@@ -5060,6 +5060,7 @@ package android.app { 
    field public static final java.lang.String EXTRA_BACKGROUND_IMAGE_URI = "android.backgroundImageUri";

    field public static final java.lang.String EXTRA_BIG_TEXT = "android.bigText";

    field public static final java.lang.String EXTRA_CHRONOMETER_COUNT_DOWN = "android.chronometerCountDown";

    field public static final java.lang.String EXTRA_COLORIZED = "android.colorized";

    field public static final java.lang.String EXTRA_COMPACT_ACTIONS = "android.compactActions";

    field public static final java.lang.String EXTRA_CONVERSATION_TITLE = "android.conversationTitle";

    field public static final java.lang.String EXTRA_HISTORIC_MESSAGES = "android.messages.historic";
@@ -5225,6 +5226,7 @@ package android.app { 
    method public android.app.Notification.Builder setChannel(java.lang.String);

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

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

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

    method public deprecated android.app.Notification.Builder setContent(android.widget.RemoteViews);

    method public deprecated android.app.Notification.Builder setContentInfo(java.lang.CharSequence);

    method public android.app.Notification.Builder setContentIntent(android.app.PendingIntent);

core/java/android/app/Notification.java

+165 −19

File changed.

Preview size limit exceeded, changes collapsed.

core/java/com/android/internal/util/NotificationColorUtil.java

+62 −2

File changed.

Preview size limit exceeded, changes collapsed.