diff options
| author | 2021-04-15 13:25:58 +0000 | |
|---|---|---|
| committer | 2021-04-15 13:25:58 +0000 | |
| commit | 2f69e9ff46346af117cebe6761cffb2ea441fc56 (patch) | |
| tree | 300f8eb308cd8959b3c64b593e78aede51b9264f | |
| parent | a900a21aae73f33441b034ad1786fc173c05777b (diff) | |
| parent | ff988dc8ccbd3460199e3c911f11414b1fc5b484 (diff) | |
Merge "Manage/Clear all pill color" into sc-dev
4 files changed, 4 insertions, 3 deletions
diff --git a/packages/SystemUI/res/drawable/notif_footer_btn_background.xml b/packages/SystemUI/res/drawable/notif_footer_btn_background.xml index f35f5d1f9d76..6725a26c102c 100644 --- a/packages/SystemUI/res/drawable/notif_footer_btn_background.xml +++ b/packages/SystemUI/res/drawable/notif_footer_btn_background.xml @@ -15,10 +15,12 @@ ~ limitations under the License. --> + <shape xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:androidprv="http://schemas.android.com/apk/prv/res/android" android:shape="rectangle"> <solid - android:color="@color/notif_pill_background" + android:color="?androidprv:attr/colorSurface" /> <corners android:radius="20dp" /> diff --git a/packages/SystemUI/res/layout/status_bar_notification_footer.xml b/packages/SystemUI/res/layout/status_bar_notification_footer.xml index 5c77d16f2b36..91220e504a7e 100644 --- a/packages/SystemUI/res/layout/status_bar_notification_footer.xml +++ b/packages/SystemUI/res/layout/status_bar_notification_footer.xml @@ -46,6 +46,7 @@ android:layout_gravity="end" android:background="@drawable/notif_footer_btn_background" android:focusable="true" + android:textColor="@color/notif_pill_text" android:contentDescription="@string/accessibility_clear_all" android:text="@string/clear_all_notifications_text" /> diff --git a/packages/SystemUI/res/values-night/colors.xml b/packages/SystemUI/res/values-night/colors.xml index e6c5bd0265ed..8f88950b0524 100644 --- a/packages/SystemUI/res/values-night/colors.xml +++ b/packages/SystemUI/res/values-night/colors.xml @@ -33,7 +33,6 @@ <!-- The color of the text inside a notification --> <color name="notification_primary_text_color">@*android:color/notification_primary_text_color_dark</color> - <color name="notif_pill_background">@*android:color/surface_dark</color> <color name="notif_pill_text">@android:color/system_neutral1_50</color> <color name="notification_guts_link_icon_tint">@color/GM2_grey_500</color> diff --git a/packages/SystemUI/res/values/colors.xml b/packages/SystemUI/res/values/colors.xml index f699198f93d9..bf13c2178d45 100644 --- a/packages/SystemUI/res/values/colors.xml +++ b/packages/SystemUI/res/values/colors.xml @@ -157,7 +157,6 @@ <color name="minimize_dock_shadow_end">#00000000</color> <color name="default_remote_input_background">@*android:color/notification_default_color</color> - <color name="notif_pill_background">@*android:color/surface_light</color> <color name="notif_pill_text">@android:color/system_neutral1_900</color> <color name="remote_input_accent">?android:attr/colorAccent</color> |