commit e142d9c74bb36dc9fe219debe7890eff3cc08bd0
author Caitlin Shkuratov <caitlinshk@google.com> Tue Apr 04 16:00:30 2023 +0000
committer Caitlin Shkuratov <caitlinshk@google.com> Tue Apr 11 12:40:35 2023 +0000
tree 5b48be48411e568c071affb0fddf2e37eefbb186
parent 577441d131f7a66d90ac35a24bf81babc4469850

[Chipbar] Update to material colors.

Note: I removed the common <color> reference because it can't reference
attributes. I added a lint IfChange/ThenChange, which isn't supported by
our linters (yet?) but will at least point people to the other file that
needs to be modified.

Fixes: 267821684
Test: media push to receiver flow w/ app icon (light & dark theme)
Test: media pull to phone flow w/ generic icon (light & dark theme)
Test: active unlock flow (light & dark theme)

Change-Id: I7fcac406a56d71be355d46e180c47a4562f7abff

packages/SystemUI/res/layout/chipbar.xml

diff --git a/packages/SystemUI/res/layout/chipbar.xml b/packages/SystemUI/res/layout/chipbar.xml
index 90e436d..8fa975b 100644
--- a/packages/SystemUI/res/layout/chipbar.xml
+++ b/packages/SystemUI/res/layout/chipbar.xml
@@ -49,15 +49,17 @@
             android:alpha="0.0"
             />
 
+        <!-- LINT.IfChange textColor -->
         <TextView
             android:id="@+id/text"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
             style="@style/Chipbar.Text"
-            android:textColor="@color/chipbar_text_and_icon_color"
+            android:textColor="?androidprv:attr/materialColorOnSecondaryFixed"
             android:alpha="0.0"
             />
+        <!-- LINT.ThenChange(systemui.temporarydisplay.chipbar.ChipbarInfo.kt) -->
 
         <!-- At most one of [loading, failure_icon, undo] will be visible at a time. -->
         <ImageView
@@ -66,7 +68,7 @@
             android:layout_height="@dimen/chipbar_end_icon_size"
             android:layout_marginStart="@dimen/chipbar_end_item_start_margin"
             android:src="@drawable/ic_progress_activity"
-            android:tint="@android:color/system_accent2_700"
+            android:tint="?androidprv:attr/materialColorOnSecondaryFixedVariant"
             android:alpha="0.0"
             />
 
@@ -86,7 +88,7 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="@dimen/chipbar_end_item_start_margin"
             style="@style/Chipbar.Text"
-            android:textColor="?androidprv:attr/textColorOnAccent"
+            android:textColor="?androidprv:attr/materialColorOnPrimaryFixed"
             android:paddingStart="@dimen/chipbar_outer_padding"
             android:paddingEnd="@dimen/chipbar_outer_padding"
             android:paddingTop="@dimen/chipbar_end_button_vertical_padding"