diff options
author | Yorke Lee <yorkelee@google.com> | 2014-08-19 16:48:27 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-08-18 21:31:41 +0000 |
commit | edd93afc109cd404154ca92e89d71b08b8da0745 (patch) | |
tree | dde63f2581f55f4e74106eca7b24f719f26767d9 | |
parent | 226fb0be0dcc17566d39d69e6f94c61c34e1bc28 (diff) | |
parent | d93e7715264ab7e47176860aeb9b2065e6e57f44 (diff) |
Merge "Add theme color for notifications (4/4)" into lmp-dev
-rw-r--r-- | InCallUI/res/drawable-hdpi/ic_call_white_24dp.png | bin | 0 -> 451 bytes | |||
-rw-r--r-- | InCallUI/res/drawable-mdpi/ic_call_white_24dp.png | bin | 0 -> 348 bytes | |||
-rw-r--r-- | InCallUI/res/drawable-xhdpi/ic_call_white_24dp.png | bin | 0 -> 535 bytes | |||
-rw-r--r-- | InCallUI/res/drawable-xxhdpi/ic_call_white_24dp.png | bin | 0 -> 750 bytes | |||
-rw-r--r-- | InCallUI/src/com/android/incallui/StatusBarNotifier.java | 3 |
5 files changed, 2 insertions, 1 deletions
diff --git a/InCallUI/res/drawable-hdpi/ic_call_white_24dp.png b/InCallUI/res/drawable-hdpi/ic_call_white_24dp.png Binary files differnew file mode 100644 index 000000000..1902e721b --- /dev/null +++ b/InCallUI/res/drawable-hdpi/ic_call_white_24dp.png diff --git a/InCallUI/res/drawable-mdpi/ic_call_white_24dp.png b/InCallUI/res/drawable-mdpi/ic_call_white_24dp.png Binary files differnew file mode 100644 index 000000000..d4e5f5d7d --- /dev/null +++ b/InCallUI/res/drawable-mdpi/ic_call_white_24dp.png diff --git a/InCallUI/res/drawable-xhdpi/ic_call_white_24dp.png b/InCallUI/res/drawable-xhdpi/ic_call_white_24dp.png Binary files differnew file mode 100644 index 000000000..cde9cea3a --- /dev/null +++ b/InCallUI/res/drawable-xhdpi/ic_call_white_24dp.png diff --git a/InCallUI/res/drawable-xxhdpi/ic_call_white_24dp.png b/InCallUI/res/drawable-xxhdpi/ic_call_white_24dp.png Binary files differnew file mode 100644 index 000000000..b761bc466 --- /dev/null +++ b/InCallUI/res/drawable-xxhdpi/ic_call_white_24dp.png diff --git a/InCallUI/src/com/android/incallui/StatusBarNotifier.java b/InCallUI/src/com/android/incallui/StatusBarNotifier.java index 7efaa12b8..809d294a7 100644 --- a/InCallUI/src/com/android/incallui/StatusBarNotifier.java +++ b/InCallUI/src/com/android/incallui/StatusBarNotifier.java @@ -291,6 +291,7 @@ public class StatusBarNotifier implements InCallPresenter.InCallStateListener { builder.setSmallIcon(iconResId); builder.setContentTitle(contentTitle); builder.setLargeIcon(largeIcon); + builder.setColor(mContext.getResources().getColor(R.color.dialer_theme_color)); if (isVideoUpgradeRequest) { builder.setUsesChronometer(false); @@ -440,7 +441,7 @@ public class StatusBarNotifier implements InCallPresenter.InCallStateListener { == Call.SessionModificationState.RECEIVED_UPGRADE_TO_VIDEO_REQUEST) { return R.drawable.ic_videocam; } - return R.drawable.fab_ic_call; + return R.drawable.ic_call_white_24dp; } /** |