Commit e4adfa40 authored by Richard Knoll's avatar Richard Knoll Committed by Commit Bot

Set Click to Call notification icon color on L+.

The small icon of notifications on L+ are not colored by default.

Bug: 986848
Change-Id: If03bfa76c6c389fbdbc07015462638ee4867978f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1715184
Commit-Queue: Richard Knoll <knollr@chromium.org>
Commit-Queue: Peter Beverloo <peter@chromium.org>
Reviewed-by: default avatarMichael van Ouwerkerk <mvanouwerkerk@chromium.org>
Reviewed-by: default avatarPeter Beverloo <peter@chromium.org>
Cr-Commit-Position: refs/heads/master@{#680030}
parent fd636ef2
...@@ -31,6 +31,8 @@ public interface ChromeNotificationBuilder { ...@@ -31,6 +31,8 @@ public interface ChromeNotificationBuilder {
ChromeNotificationBuilder setSmallIcon(Icon icon); ChromeNotificationBuilder setSmallIcon(Icon icon);
ChromeNotificationBuilder setColor(int argb);
ChromeNotificationBuilder setTicker(CharSequence text); ChromeNotificationBuilder setTicker(CharSequence text);
ChromeNotificationBuilder setLocalOnly(boolean localOnly); ChromeNotificationBuilder setLocalOnly(boolean localOnly);
......
...@@ -88,6 +88,14 @@ public class NotificationBuilder implements ChromeNotificationBuilder { ...@@ -88,6 +88,14 @@ public class NotificationBuilder implements ChromeNotificationBuilder {
return this; return this;
} }
@Override
public ChromeNotificationBuilder setColor(int argb) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
mBuilder.setColor(argb);
}
return this;
}
@Override @Override
public ChromeNotificationBuilder setTicker(CharSequence text) { public ChromeNotificationBuilder setTicker(CharSequence text) {
mBuilder.setTicker(text); mBuilder.setTicker(text);
......
...@@ -85,6 +85,12 @@ public class NotificationCompatBuilder implements ChromeNotificationBuilder { ...@@ -85,6 +85,12 @@ public class NotificationCompatBuilder implements ChromeNotificationBuilder {
return this; return this;
} }
@Override
public ChromeNotificationBuilder setColor(int argb) {
mBuilder.setColor(argb);
return this;
}
@Override @Override
public ChromeNotificationBuilder setTicker(CharSequence text) { public ChromeNotificationBuilder setTicker(CharSequence text) {
mBuilder.setTicker(text); mBuilder.setTicker(text);
......
...@@ -14,6 +14,7 @@ import android.net.Uri; ...@@ -14,6 +14,7 @@ import android.net.Uri;
import android.support.v4.app.NotificationCompat; import android.support.v4.app.NotificationCompat;
import android.text.TextUtils; import android.text.TextUtils;
import org.chromium.base.ApiCompatibilityUtils;
import org.chromium.base.ContextUtils; import org.chromium.base.ContextUtils;
import org.chromium.base.annotations.CalledByNative; import org.chromium.base.annotations.CalledByNative;
import org.chromium.base.metrics.CachedMetrics; import org.chromium.base.metrics.CachedMetrics;
...@@ -81,6 +82,8 @@ public class ClickToCallMessageHandler { ...@@ -81,6 +82,8 @@ public class ClickToCallMessageHandler {
.setContentIntent(contentIntent) .setContentIntent(contentIntent)
.setContentTitle(phoneNumber) .setContentTitle(phoneNumber)
.setContentText(text) .setContentText(text)
.setColor(ApiCompatibilityUtils.getColor(
context.getResources(), R.color.default_icon_color_blue))
.setGroup(NotificationConstants.GROUP_CLICK_TO_CALL) .setGroup(NotificationConstants.GROUP_CLICK_TO_CALL)
.setPriorityBeforeO(NotificationCompat.PRIORITY_HIGH) .setPriorityBeforeO(NotificationCompat.PRIORITY_HIGH)
.setVibrate(new long[0]) .setVibrate(new long[0])
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment