summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Julia Reynolds <juliacr@google.com> 2019-05-02 17:20:25 -0400
committer Julia Reynolds <juliacr@google.com> 2019-05-03 13:32:04 +0000
commit3fd1b4949b0237fde1e30223e079194de409fa0a (patch)
treefdad203d95b16eeb09a56073a4ee51bd2676e500
parent3140044c6a8ddd84a4a4d2d47d3d44626753da8b (diff)
Colors updates for guts
For a11y and night mode and night mode a11y Fixes: 129507563 Test: manual Change-Id: I0b472db88feddb6f92aa265524e84afbe30c824b
-rw-r--r--packages/SystemUI/res/drawable/button_border_selected.xml2
-rw-r--r--packages/SystemUI/res/drawable/button_border_unselected.xml2
-rw-r--r--packages/SystemUI/res/values-night/colors.xml11
-rw-r--r--packages/SystemUI/res/values/colors.xml4
-rw-r--r--packages/SystemUI/res/values/styles.xml2
5 files changed, 13 insertions, 8 deletions
diff --git a/packages/SystemUI/res/drawable/button_border_selected.xml b/packages/SystemUI/res/drawable/button_border_selected.xml
index 1e40adefca2a..01e7099844a9 100644
--- a/packages/SystemUI/res/drawable/button_border_selected.xml
+++ b/packages/SystemUI/res/drawable/button_border_selected.xml
@@ -19,7 +19,7 @@
<solid
android:color="@color/notification_guts_selection_bg" />
<stroke
- android:width="2dp"
+ android:width="1dp"
android:color="@color/GM2_grey_300"/>
<corners android:radius="@dimen/rect_button_radius" />
</shape> \ No newline at end of file
diff --git a/packages/SystemUI/res/drawable/button_border_unselected.xml b/packages/SystemUI/res/drawable/button_border_unselected.xml
index 4ea37640780f..b9c4ced3631b 100644
--- a/packages/SystemUI/res/drawable/button_border_unselected.xml
+++ b/packages/SystemUI/res/drawable/button_border_unselected.xml
@@ -18,7 +18,7 @@
android:shape="rectangle"
android:color="@color/notification_guts_selection_bg">
<stroke
- android:width="2dp"
+ android:width="1dp"
android:color="@color/GM2_grey_300"/>
<corners android:radius="@dimen/rect_button_radius" />
diff --git a/packages/SystemUI/res/values-night/colors.xml b/packages/SystemUI/res/values-night/colors.xml
index f9bf47bb7d08..89d1a19737ee 100644
--- a/packages/SystemUI/res/values-night/colors.xml
+++ b/packages/SystemUI/res/values-night/colors.xml
@@ -37,16 +37,17 @@
<color name="notification_ripple_untinted_color">#30ffffff</color>
<!-- The "inside" of a notification, reached via longpress -->
- <color name="notification_guts_bg_color">@*android:color/notification_material_background_color</color>
+ <color name="notification_guts_bg_color">@color/GM2_grey_900</color>
<!-- The color of the text inside a notification -->
<color name="notification_primary_text_color">@*android:color/notification_primary_text_color_dark</color>
- <color name="notification_guts_selection_bg">#202124</color>
- <color name="notification_guts_selection_border">#669DF6</color>
- <color name="notification_guts_link_icon_tint">@color/GM2_grey_200</color>
+ <color name="notification_guts_selection_bg">@color/GM2_grey_800</color>
+ <color name="notification_guts_selection_border">@color/GM2_grey_700</color>
+ <color name="notification_guts_link_icon_tint">@color/GM2_grey_500</color>
<color name="notification_guts_sub_text_color">@color/GM2_grey_200</color>
- <color name="notification_guts_header_text_color">@color/GM2_grey_100</color>
+ <color name="notification_guts_header_text_color">@color/GM2_grey_200</color>
+ <color name="notification_guts_button_color">@color/GM2_blue_200</color>
<!-- The color of the background in the top part of QSCustomizer -->
<color name="qs_customize_background">@color/GM2_grey_900</color>
diff --git a/packages/SystemUI/res/values/colors.xml b/packages/SystemUI/res/values/colors.xml
index 4e1a7d07e687..b673e5207f80 100644
--- a/packages/SystemUI/res/values/colors.xml
+++ b/packages/SystemUI/res/values/colors.xml
@@ -95,6 +95,7 @@
<color name="notification_guts_header_text_color">@color/GM2_grey_900</color>
<color name="notification_silence_color">#FF32c1de</color>
<color name="notification_alert_color">#FFF87B2B</color>
+ <color name="notification_guts_button_color">@color/GM2_blue_700</color>
<color name="assist_orb_color">#ffffff</color>
@@ -177,6 +178,9 @@
<color name="GM2_red_300">#F28B82</color>
<color name="GM2_red_500">#B71C1C</color>
+ <color name="GM2_blue_200">#AECBFA</color>
+ <color name="GM2_blue_700">#1967D2</color>
+
<color name="GM2_yellow_500">#FFFBBC04</color>
<color name="GM2_green_500">#FF34A853</color>
</resources>
diff --git a/packages/SystemUI/res/values/styles.xml b/packages/SystemUI/res/values/styles.xml
index 23de2acf14c9..aa89dce4114a 100644
--- a/packages/SystemUI/res/values/styles.xml
+++ b/packages/SystemUI/res/values/styles.xml
@@ -452,7 +452,7 @@
<style name="TextAppearance.NotificationInfo.Button">
<item name="android:fontFamily">@*android:string/config_bodyFontFamilyMedium</item>
<item name="android:textSize">16sp</item>
- <item name="android:textColor">?android:attr/colorAccent</item>
+ <item name="android:textColor">@color/notification_guts_button_color</item>
<item name="android:background">@drawable/btn_borderless_rect</item>
<item name="android:gravity">center_vertical</item>
<item name="android:focusable">true</item>