diff options
| author | 2016-02-05 19:22:00 +0000 | |
|---|---|---|
| committer | 2016-02-05 19:22:01 +0000 | |
| commit | 2a7fc72ac405db4726679314f1f2dd277b35ea04 (patch) | |
| tree | 13e550e8579da9cb56062e221b8b2427f649cbf8 | |
| parent | 39d1b5b0f74962a4f2a6b8125f841ecf6e7cb2ee (diff) | |
| parent | aef485a32a36fd80f65613bd5de4d1ca23c54432 (diff) | |
Merge "Adapted the notification header colors to spec"
| -rw-r--r-- | core/java/android/app/Notification.java | 1 | ||||
| -rw-r--r-- | core/res/res/values/colors_material.xml | 2 | ||||
| -rw-r--r-- | core/res/res/values/styles_material.xml | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/core/java/android/app/Notification.java b/core/java/android/app/Notification.java index 34c90c165490..a78076bdfa6f 100644 --- a/core/java/android/app/Notification.java +++ b/core/java/android/app/Notification.java @@ -3236,6 +3236,7 @@ public class Notification implements Parcelable return; } contentView.setTextViewText(R.id.app_name_text, appName); + contentView.setTextColor(R.id.app_name_text, resolveColor()); } private void bindSmallIcon(RemoteViews contentView) { diff --git a/core/res/res/values/colors_material.xml b/core/res/res/values/colors_material.xml index dd18544783a5..7399fa9d58ce 100644 --- a/core/res/res/values/colors_material.xml +++ b/core/res/res/values/colors_material.xml @@ -48,8 +48,6 @@ <color name="primary_text_default_material_light">#de000000</color> <!-- 54% black --> <color name="secondary_text_default_material_light">#8a000000</color> - <!-- 38% black --> - <color name="tertiary_text_default_material_light">#61000000</color> <!-- 100% white --> <color name="primary_text_default_material_dark">#ffffffff</color> diff --git a/core/res/res/values/styles_material.xml b/core/res/res/values/styles_material.xml index 0a52f41e3603..9efcfdace11b 100644 --- a/core/res/res/values/styles_material.xml +++ b/core/res/res/values/styles_material.xml @@ -444,7 +444,7 @@ please see styles_device_defaults.xml. </style> <style name="TextAppearance.Material.Notification.Info"> - <item name="textColor">@color/tertiary_text_default_material_light</item> + <item name="textColor">@color/secondary_text_default_material_light</item> <item name="textSize">@dimen/notification_subtext_size</item> </style> |