summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Julia Reynolds <juliacr@google.com> 2021-03-17 13:31:02 -0400
committer Julia Reynolds <juliacr@google.com> 2021-03-18 01:31:40 +0000
commit67a4b3714862f13396ce9f34bb0a3b31e8d0021c (patch)
tree7f14392ffccf8578f7412d508731139c7725c99b
parent0c8ed4ce88b2b4dfdde5ac6b1fec95d24d0cfd7f (diff)
Fix contrast issues in channel blocking ui
Test: manual Fixes: 181879902 Change-Id: Icc3dd9598bb3669afe5c0136b2dd85ec8b90d283
-rw-r--r--packages/SystemUI/res/layout/notif_half_shelf.xml6
-rw-r--r--packages/SystemUI/res/layout/notif_half_shelf_row.xml4
-rw-r--r--packages/SystemUI/res/values/colors.xml2
3 files changed, 5 insertions, 7 deletions
diff --git a/packages/SystemUI/res/layout/notif_half_shelf.xml b/packages/SystemUI/res/layout/notif_half_shelf.xml
index d36c1a8c961b..42f14f30da00 100644
--- a/packages/SystemUI/res/layout/notif_half_shelf.xml
+++ b/packages/SystemUI/res/layout/notif_half_shelf.xml
@@ -67,7 +67,7 @@
android:textSize="15sp"
android:ellipsize="end"
android:maxLines="1"
- style="@style/TextAppearance.NotificationInfo.Title" />
+ style="@style/TextAppearance.NotificationImportanceChannel" />
<Switch
android:id="@+id/toggle"
@@ -80,7 +80,7 @@
<View
android:layout_width="match_parent"
android:layout_height="1dp"
- android:background="@color/notification_channel_dialog_separator"
+ android:background="?android:attr/colorAccent"
/>
<!-- ChannelRows get added dynamically -->
@@ -90,7 +90,7 @@
<View
android:layout_width="match_parent"
android:layout_height="1dp"
- android:background="@color/notification_channel_dialog_separator"
+ android:background="?android:attr/colorAccent"
/>
<RelativeLayout
android:id="@+id/bottom_actions"
diff --git a/packages/SystemUI/res/layout/notif_half_shelf_row.xml b/packages/SystemUI/res/layout/notif_half_shelf_row.xml
index c863e02d5313..87de28650662 100644
--- a/packages/SystemUI/res/layout/notif_half_shelf_row.xml
+++ b/packages/SystemUI/res/layout/notif_half_shelf_row.xml
@@ -53,7 +53,7 @@
android:textSize="14sp"
android:ellipsize="end"
android:maxLines="1"
- style="@style/TextAppearance.NotificationInfo.Title"
+ style="@style/TextAppearance.NotificationImportanceChannel"
/>
<TextView
@@ -67,7 +67,7 @@
android:ellipsize="end"
android:maxLines="1"
android:layout_below="@id/channel_name"
- style="@style/TextAppearance.NotificationInfo.Secondary"
+ style="@style/TextAppearance.NotificationImportanceApp"
/>
</RelativeLayout>
diff --git a/packages/SystemUI/res/values/colors.xml b/packages/SystemUI/res/values/colors.xml
index d4783197e1f1..55365bd3c692 100644
--- a/packages/SystemUI/res/values/colors.xml
+++ b/packages/SystemUI/res/values/colors.xml
@@ -115,8 +115,6 @@
<color name="notification_section_header_label_color">@color/GM2_grey_900</color>
<color name="notification_section_clear_all_btn_color">@color/GM2_grey_700</color>
- <!-- The divider view for the notification channel editor half-shelf -->
- <color name="notification_channel_dialog_separator">@color/GM2_grey_200</color>
<color name="assist_orb_color">#ffffff</color>