Migrate materialColor* attributes into colors

The new color were already introduces in a previous CL ag/30322786

This CL is about replacing the attribute usage by the new color resources, which should work the same but cannot be overwritten, or styled, guaranteeing consistency across the OS.

The old attributes are also being removed here.

Bug: 374273611
Bug: 355006667
Bug: 379465927
Test: presubmit
Flag: EXEMPT Un-flaggable refactor of private color resources
Change-Id: I0305e6d8a879a9fc98295f2a9de43517a3a9992e

6 files changed, 13 insertions, 13 deletions

diff --git a/packages/CredentialManager/res/drawable/fill_dialog_dynamic_list_item_middle.xml b/packages/CredentialManager/res/drawable/fill_dialog_dynamic_list_item_middle.xml
index 781373dfbd0b..327f42209cdb 100644
--- a/packages/CredentialManager/res/drawable/fill_dialog_dynamic_list_item_middle.xml
+++ b/packages/CredentialManager/res/drawable/fill_dialog_dynamic_list_item_middle.xml
@@ -19,6 +19,6 @@
     xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
         xmlns:tools="http://schemas.android.com/tools" tools:ignore="NewApi">
         <shape android:shape="rectangle">
-            <solid android:color="?androidprv:attr/materialColorSurfaceContainer" />
+            <solid android:color="@androidprv:color/materialColorSurfaceContainer" />
         </shape>
 </inset>
\ No newline at end of file
diff --git a/packages/CredentialManager/res/drawable/fill_dialog_dynamic_list_item_one.xml b/packages/CredentialManager/res/drawable/fill_dialog_dynamic_list_item_one.xml
index f28c354b898d..992fe3341f26 100644
--- a/packages/CredentialManager/res/drawable/fill_dialog_dynamic_list_item_one.xml
+++ b/packages/CredentialManager/res/drawable/fill_dialog_dynamic_list_item_one.xml
@@ -21,6 +21,6 @@
         <shape android:shape="rectangle">
             <corners android:topLeftRadius="4dp" android:topRightRadius="4dp"
             android:bottomLeftRadius="0dp" android:bottomRightRadius="0dp"/>
-            <solid android:color="?androidprv:attr/materialColorSurfaceContainer" />
+            <solid android:color="@androidprv:color/materialColorSurfaceContainer" />
         </shape>
 </inset>
\ No newline at end of file
diff --git a/packages/CredentialManager/res/drawable/more_options_list_item.xml b/packages/CredentialManager/res/drawable/more_options_list_item.xml
index 3f9d8157bfd2..991b3ff3c440 100644
--- a/packages/CredentialManager/res/drawable/more_options_list_item.xml
+++ b/packages/CredentialManager/res/drawable/more_options_list_item.xml
@@ -24,7 +24,7 @@
     <shape>
         <corners android:topLeftRadius="0dp" android:topRightRadius="0dp"
             android:bottomLeftRadius="4dp" android:bottomRightRadius="4dp"/>
-        <solid android:color="?androidprv:attr/materialColorSurfaceContainer"/>
-        <stroke android:color="?androidprv:attr/materialColorOutlineVariant" android:width="1dp"/>
+        <solid android:color="@androidprv:color/materialColorSurfaceContainer"/>
+        <stroke android:color="@androidprv:color/materialColorOutlineVariant" android:width="1dp"/>
     </shape>
 </inset>
\ No newline at end of file
diff --git a/packages/CredentialManager/res/layout/credman_dropdown_bottom_sheet.xml b/packages/CredentialManager/res/layout/credman_dropdown_bottom_sheet.xml
index 914987ac4650..6f04bd99877e 100644
--- a/packages/CredentialManager/res/layout/credman_dropdown_bottom_sheet.xml
+++ b/packages/CredentialManager/res/layout/credman_dropdown_bottom_sheet.xml
@@ -35,7 +35,7 @@
             android:layout_gravity="center"
             android:paddingStart="@dimen/autofill_view_left_padding"
             android:src="@drawable/more_horiz_24px"
-            android:tint="?androidprv:attr/materialColorOnSurface"
+            android:tint="@androidprv:color/materialColorOnSurface"
             android:contentDescription="@string/more_options_content_description"
             android:background="@null"/>
 
@@ -53,7 +53,7 @@
             android:id="@android:id/text1"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textColor="?androidprv:attr/materialColorOnSurface"
+            android:textColor="@androidprv:color/materialColorOnSurface"
             style="@style/autofill.TextTitle"/>
     </LinearLayout>
 
diff --git a/packages/CredentialManager/res/layout/credman_dropdown_presentation_layout.xml b/packages/CredentialManager/res/layout/credman_dropdown_presentation_layout.xml
index 3fc61545a713..d00a2295e43a 100644
--- a/packages/CredentialManager/res/layout/credman_dropdown_presentation_layout.xml
+++ b/packages/CredentialManager/res/layout/credman_dropdown_presentation_layout.xml
@@ -35,7 +35,7 @@
                     android:layout_gravity="center"
                     android:layout_alignParentStart="true"
                     android:paddingStart="@dimen/autofill_view_left_padding"
-                    app:tint="?androidprv:attr/materialColorOnSurface"
+                    app:tint="@androidprv:color/materialColorOnSurface"
                     android:background="@null"/>
 
                 <LinearLayout
@@ -53,7 +53,7 @@
                             android:id="@android:id/text1"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:textColor="?androidprv:attr/materialColorOnSurface"
+                            android:textColor="@androidprv:color/materialColorOnSurface"
                             android:textDirection="locale"
                             style="@style/autofill.TextTitle"/>
 
@@ -61,7 +61,7 @@
                             android:id="@android:id/text2"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:textColor="?androidprv:attr/materialColorOnSurfaceVariant"
+                            android:textColor="@androidprv:color/materialColorOnSurfaceVariant"
                             android:textDirection="locale"
                             style="@style/autofill.TextSubtitle"/>
 
diff --git a/packages/CredentialManager/res/values/colors.xml b/packages/CredentialManager/res/values/colors.xml
index 9d31b350b4a0..8d37d47cc9fe 100644
--- a/packages/CredentialManager/res/values/colors.xml
+++ b/packages/CredentialManager/res/values/colors.xml
@@ -19,8 +19,8 @@
     xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">
 
     <!-- These colors are used for Remote Views. -->
-    <color name="onSurface">?androidprv:attr/materialColorOnSurface</color>
-    <color name="onSurfaceVariant">?androidprv:attr/materialColorOnSurfaceVariant</color>
-    <color name="surfaceDim">?androidprv:attr/materialColorSurfaceDim</color>
-    <color name="surfaceContainer">?androidprv:attr/materialColorSurfaceContainer</color>
+    <color name="onSurface">@androidprv:color/materialColorOnSurface</color>
+    <color name="onSurfaceVariant">@androidprv:color/materialColorOnSurfaceVariant</color>
+    <color name="surfaceDim">@androidprv:color/materialColorSurfaceDim</color>
+    <color name="surfaceContainer">@androidprv:color/materialColorSurfaceContainer</color>
 </resources>
\ No newline at end of file