From 9f9565e03597431903a0063a27a60eb93ef569b0 Mon Sep 17 00:00:00 2001
From: Marcelo Arteiro <arteiro@google.com>
Date: Fri, 18 Oct 2024 11:51:50 +0000
Subject: Migrate materialColor* attributes into colors

TLDR:
* This change should not break anything or change any color.
* Simplifies theming and styling while improving developer experience.
* With this  developers can often skip styling for color entirely, while ensuring consistency and preventing accidental overrides.

Bug: 374273611
Test: presubmit
Flag: EXEMPT bugfix
Change-Id: Ibf06926ca0489a5daed54dd234f3eb4dd557ada0
---
 java/res/color/resolver_profile_tab_text.xml          | 4 ++--
 java/res/drawable/bottomsheet_background.xml          | 2 +-
 java/res/drawable/chevron_right.xml                   | 2 +-
 java/res/drawable/chooser_action_button_bg.xml        | 2 +-
 java/res/drawable/chooser_content_preview_rounded.xml | 2 +-
 java/res/drawable/chooser_row_layer_list.xml          | 2 +-
 java/res/drawable/edit_action_background.xml          | 2 +-
 java/res/drawable/ic_drag_handle.xml                  | 2 +-
 java/res/drawable/resolver_outlined_button_bg.xml     | 2 +-
 java/res/drawable/resolver_profile_tab_bg.xml         | 4 ++--
 java/res/layout-h480dp/image_preview_image_item.xml   | 4 ++--
 java/res/layout-h480dp/image_preview_loading_item.xml | 2 +-
 java/res/layout/chooser_action_row.xml                | 2 +-
 java/res/layout/chooser_action_view.xml               | 4 ++--
 java/res/layout/chooser_grid_item.xml                 | 4 ++--
 java/res/layout/chooser_grid_item_hover.xml           | 8 ++++----
 java/res/layout/chooser_grid_preview_file.xml         | 6 +++---
 java/res/layout/chooser_grid_preview_files_text.xml   | 4 ++--
 java/res/layout/chooser_grid_preview_image.xml        | 2 +-
 java/res/layout/chooser_grid_preview_text.xml         | 8 ++++----
 java/res/layout/chooser_grid_scrollable_preview.xml   | 4 ++--
 java/res/layout/chooser_headline_row.xml              | 4 ++--
 java/res/layout/chooser_list_per_profile_wrap.xml     | 2 +-
 java/res/layout/chooser_row.xml                       | 2 +-
 java/res/layout/image_preview_loading_item.xml        | 2 +-
 java/res/layout/resolve_grid_item.xml                 | 4 ++--
 java/res/layout/resolver_empty_states.xml             | 2 +-
 27 files changed, 44 insertions(+), 44 deletions(-)

(limited to 'java')

diff --git a/java/res/color/resolver_profile_tab_text.xml b/java/res/color/resolver_profile_tab_text.xml
index 7c2723ce..ffeba854 100644
--- a/java/res/color/resolver_profile_tab_text.xml
+++ b/java/res/color/resolver_profile_tab_text.xml
@@ -15,6 +15,6 @@
 -->
 <selector xmlns:android="http://schemas.android.com/apk/res/android"
           xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">
-    <item android:color="?androidprv:attr/materialColorOnPrimary" android:state_selected="true"/>
-    <item android:color="?androidprv:attr/materialColorOnSurfaceVariant"/>
+    <item android:color="@androidprv:color/materialColorOnPrimary" android:state_selected="true"/>
+    <item android:color="@androidprv:color/materialColorOnSurfaceVariant"/>
 </selector>
diff --git a/java/res/drawable/bottomsheet_background.xml b/java/res/drawable/bottomsheet_background.xml
index f4386b7d..ec676cea 100644
--- a/java/res/drawable/bottomsheet_background.xml
+++ b/java/res/drawable/bottomsheet_background.xml
@@ -20,5 +20,5 @@
     <corners
         android:topLeftRadius="@*android:dimen/config_bottomDialogCornerRadius"
         android:topRightRadius="@*android:dimen/config_bottomDialogCornerRadius"/>
-    <solid android:color="?androidprv:attr/materialColorSurfaceContainer" />
+    <solid android:color="@androidprv:color/materialColorSurfaceContainer" />
 </shape>
diff --git a/java/res/drawable/chevron_right.xml b/java/res/drawable/chevron_right.xml
index 747e06dd..09fd97a7 100644
--- a/java/res/drawable/chevron_right.xml
+++ b/java/res/drawable/chevron_right.xml
@@ -26,7 +26,7 @@
         android:viewportWidth="16"
         android:viewportHeight="24"
         android:autoMirrored="true"
-        android:tint="?androidprv:attr/materialColorOnSurface">
+        android:tint="@androidprv:color/materialColorOnSurface">
     <path
         android:fillColor="@android:color/white"
         android:pathData="M10,4.5L8.59,5.91 13.17,10.5l-4.58,4.59L10,16.5l6,-6 -6,-6z"/>
diff --git a/java/res/drawable/chooser_action_button_bg.xml b/java/res/drawable/chooser_action_button_bg.xml
index 300be831..88eac4ce 100644
--- a/java/res/drawable/chooser_action_button_bg.xml
+++ b/java/res/drawable/chooser_action_button_bg.xml
@@ -25,7 +25,7 @@
             android:insetBottom="8dp">
             <shape android:shape="rectangle">
                 <corners android:radius="@dimen/chooser_action_corner_radius" />
-                <solid android:color="?androidprv:attr/materialColorSurfaceContainerHigh"/>
+                <solid android:color="@androidprv:color/materialColorSurfaceContainerHigh"/>
             </shape>
         </inset>
     </item>
diff --git a/java/res/drawable/chooser_content_preview_rounded.xml b/java/res/drawable/chooser_content_preview_rounded.xml
index a1b204bd..00aa2912 100644
--- a/java/res/drawable/chooser_content_preview_rounded.xml
+++ b/java/res/drawable/chooser_content_preview_rounded.xml
@@ -21,7 +21,7 @@
     android:shape="rectangle">
 
     <solid
-        android:color="?androidprv:attr/materialColorSurfaceContainerHigh" />
+        android:color="@androidprv:color/materialColorSurfaceContainerHigh" />
 
     <corners android:radius="16dp" />
 </shape>
diff --git a/java/res/drawable/chooser_row_layer_list.xml b/java/res/drawable/chooser_row_layer_list.xml
index 868ac8aa..2f1e2046 100644
--- a/java/res/drawable/chooser_row_layer_list.xml
+++ b/java/res/drawable/chooser_row_layer_list.xml
@@ -20,7 +20,7 @@
             xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">
     <item>
         <shape android:shape="rectangle">
-            <solid android:color="?androidprv:attr/materialColorSecondary"/>
+            <solid android:color="@androidprv:color/materialColorSecondary"/>
             <size android:width="128dp" android:height="2dp"/>
             <corners android:radius="2dp" />
         </shape>
diff --git a/java/res/drawable/edit_action_background.xml b/java/res/drawable/edit_action_background.xml
index 91726f49..ebc6d814 100644
--- a/java/res/drawable/edit_action_background.xml
+++ b/java/res/drawable/edit_action_background.xml
@@ -22,7 +22,7 @@
         <inset android:inset="8dp">
             <shape android:shape="rectangle">
                 <corners android:radius="12dp" />
-                <solid android:color="?androidprv:attr/materialColorSecondaryFixed"/>
+                <solid android:color="@androidprv:color/materialColorSecondaryFixed"/>
             </shape>
         </inset>
     </item>
diff --git a/java/res/drawable/ic_drag_handle.xml b/java/res/drawable/ic_drag_handle.xml
index f22e8c30..d6965209 100644
--- a/java/res/drawable/ic_drag_handle.xml
+++ b/java/res/drawable/ic_drag_handle.xml
@@ -17,6 +17,6 @@
     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="?androidprv:attr/materialColorOutlineVariant" />
+    <solid android:color="@androidprv:color/materialColorOutlineVariant" />
     <corners android:radius="2dp" />
 </shape>
diff --git a/java/res/drawable/resolver_outlined_button_bg.xml b/java/res/drawable/resolver_outlined_button_bg.xml
index 3469a06e..b018624c 100644
--- a/java/res/drawable/resolver_outlined_button_bg.xml
+++ b/java/res/drawable/resolver_outlined_button_bg.xml
@@ -26,7 +26,7 @@
             <shape android:shape="rectangle">
                 <corners android:radius="8dp" />
                 <stroke android:width="1dp"
-                        android:color="?androidprv:attr/materialColorPrimaryContainer"/>
+                        android:color="@androidprv:color/materialColorPrimaryContainer"/>
             </shape>
         </inset>
     </item>
diff --git a/java/res/drawable/resolver_profile_tab_bg.xml b/java/res/drawable/resolver_profile_tab_bg.xml
index 97f3b7e2..20f0be92 100644
--- a/java/res/drawable/resolver_profile_tab_bg.xml
+++ b/java/res/drawable/resolver_profile_tab_bg.xml
@@ -29,14 +29,14 @@
             <item android:state_selected="false">
                 <shape android:shape="rectangle">
                     <corners android:radius="12dp" />
-                    <solid android:color="?androidprv:attr/materialColorSurfaceContainerHighest" />
+                    <solid android:color="@androidprv:color/materialColorSurfaceContainerHighest" />
                 </shape>
             </item>
 
             <item android:state_selected="true">
                 <shape android:shape="rectangle">
                     <corners android:radius="12dp" />
-                    <solid android:color="?androidprv:attr/materialColorPrimary" />
+                    <solid android:color="@androidprv:color/materialColorPrimary" />
                 </shape>
             </item>
         </selector>
diff --git a/java/res/layout-h480dp/image_preview_image_item.xml b/java/res/layout-h480dp/image_preview_image_item.xml
index ac63b2d5..47dc7012 100644
--- a/java/res/layout-h480dp/image_preview_image_item.xml
+++ b/java/res/layout-h480dp/image_preview_image_item.xml
@@ -61,7 +61,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintBottom_toBottomOf="parent"
         android:background="@drawable/edit_action_background"
-        android:drawableTint="?androidprv:attr/materialColorSecondaryFixed"
+        android:drawableTint="@androidprv:color/materialColorSecondaryFixed"
         android:contentDescription="@string/screenshot_edit"
         android:visibility="gone"
         >
@@ -70,7 +70,7 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center"
             android:padding="4dp"
-            android:tint="?androidprv:attr/materialColorOnSecondaryFixed"
+            android:tint="@androidprv:color/materialColorOnSecondaryFixed"
             android:src="@androidprv:drawable/ic_screenshot_edit"
             />
     </FrameLayout>
diff --git a/java/res/layout-h480dp/image_preview_loading_item.xml b/java/res/layout-h480dp/image_preview_loading_item.xml
index 85020e9a..0bc2656f 100644
--- a/java/res/layout-h480dp/image_preview_loading_item.xml
+++ b/java/res/layout-h480dp/image_preview_loading_item.xml
@@ -26,7 +26,7 @@
         android:layout_height="wrap_content"
         android:layout_gravity="center"
         android:indeterminate="true"
-        android:indeterminateTint="?androidprv:attr/materialColorPrimary"
+        android:indeterminateTint="@androidprv:color/materialColorPrimary"
         android:indeterminateTintMode="src_in" />
 
 </FrameLayout>
diff --git a/java/res/layout/chooser_action_row.xml b/java/res/layout/chooser_action_row.xml
index 7bce113e..9b39ba67 100644
--- a/java/res/layout/chooser_action_row.xml
+++ b/java/res/layout/chooser_action_row.xml
@@ -30,7 +30,7 @@
         android:layout_marginTop="8dp"
         android:layout_marginHorizontal="@dimen/chooser_edge_margin_normal"
         android:layout_marginBottom="10dp"
-        android:background="?androidprv:attr/materialColorSurfaceContainerHighest"
+        android:background="@androidprv:color/materialColorSurfaceContainerHighest"
     />
 </merge>
 
diff --git a/java/res/layout/chooser_action_view.xml b/java/res/layout/chooser_action_view.xml
index b4859258..57cc59b7 100644
--- a/java/res/layout/chooser_action_view.xml
+++ b/java/res/layout/chooser_action_view.xml
@@ -22,10 +22,10 @@
     android:paddingHorizontal="@dimen/chooser_edge_margin_normal_half"
     android:clickable="true"
     android:drawablePadding="6dp"
-    android:drawableTint="?androidprv:attr/materialColorOnSurface"
+    android:drawableTint="@androidprv:color/materialColorOnSurface"
     android:drawableTintMode="src_in"
     android:ellipsize="end"
     android:gravity="center"
     android:maxLines="1"
-    android:textColor="?androidprv:attr/materialColorOnSurface"
+    android:textColor="@androidprv:color/materialColorOnSurface"
     android:textSize="@dimen/chooser_action_view_text_size" />
diff --git a/java/res/layout/chooser_grid_item.xml b/java/res/layout/chooser_grid_item.xml
index 547a9944..76d2e60f 100644
--- a/java/res/layout/chooser_grid_item.xml
+++ b/java/res/layout/chooser_grid_item.xml
@@ -50,7 +50,7 @@
               android:layout_width="match_parent"
               android:layout_height="wrap_content"
               android:textAppearance="?android:attr/textAppearanceSmall"
-              android:textColor="?androidprv:attr/materialColorOnSurface"
+              android:textColor="@androidprv:color/materialColorOnSurface"
               android:textSize="@dimen/chooser_grid_target_name_text_size"
               android:maxLines="1"
               android:ellipsize="end" />
@@ -59,7 +59,7 @@
     <TextView android:id="@android:id/text2"
               android:textAppearance="?android:attr/textAppearanceSmall"
               android:textSize="@dimen/chooser_grid_activity_name_text_size"
-              android:textColor="?androidprv:attr/materialColorOnSurfaceVariant"
+              android:textColor="@androidprv:color/materialColorOnSurfaceVariant"
               android:layout_width="match_parent"
               android:layout_height="wrap_content"
               android:lines="1"
diff --git a/java/res/layout/chooser_grid_item_hover.xml b/java/res/layout/chooser_grid_item_hover.xml
index 05206065..5e49c9fd 100644
--- a/java/res/layout/chooser_grid_item_hover.xml
+++ b/java/res/layout/chooser_grid_item_hover.xml
@@ -32,8 +32,8 @@
               android:defaultFocusHighlightEnabled="false"
               app:focusOutlineWidth="@dimen/chooser_item_focus_outline_width"
               app:focusOutlineCornerRadius="@dimen/chooser_item_focus_outline_corner_radius"
-              app:focusOutlineColor="?androidprv:attr/materialColorSecondaryFixed"
-              app:focusInnerOutlineColor="?androidprv:attr/materialColorOnSecondaryFixedVariant">
+              app:focusOutlineColor="@androidprv:color/materialColorSecondaryFixed"
+              app:focusInnerOutlineColor="@androidprv:color/materialColorOnSecondaryFixedVariant">
 
     <ImageView android:id="@android:id/icon"
                android:layout_width="@dimen/chooser_icon_width_with_padding"
@@ -53,7 +53,7 @@
               android:layout_width="match_parent"
               android:layout_height="wrap_content"
               android:textAppearance="?android:attr/textAppearanceSmall"
-              android:textColor="?androidprv:attr/materialColorOnSurface"
+              android:textColor="@androidprv:color/materialColorOnSurface"
               android:textSize="@dimen/chooser_grid_target_name_text_size"
               android:maxLines="1"
               android:ellipsize="end" />
@@ -62,7 +62,7 @@
     <TextView android:id="@android:id/text2"
               android:textAppearance="?android:attr/textAppearanceSmall"
               android:textSize="@dimen/chooser_grid_activity_name_text_size"
-              android:textColor="?androidprv:attr/materialColorOnSurfaceVariant"
+              android:textColor="@androidprv:color/materialColorOnSurfaceVariant"
               android:layout_width="match_parent"
               android:layout_height="wrap_content"
               android:lines="1"
diff --git a/java/res/layout/chooser_grid_preview_file.xml b/java/res/layout/chooser_grid_preview_file.xml
index 4e8cf7ba..9584ec9a 100644
--- a/java/res/layout/chooser_grid_preview_file.xml
+++ b/java/res/layout/chooser_grid_preview_file.xml
@@ -24,7 +24,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
-    android:background="?androidprv:attr/materialColorSurfaceContainer">
+    android:background="@androidprv:color/materialColorSurfaceContainer">
 
     <RelativeLayout
         android:layout_width="match_parent"
@@ -63,7 +63,7 @@
                 android:gravity="start|top"
                 android:singleLine="true"
                 android:textStyle="bold"
-                android:textColor="?androidprv:attr/materialColorOnSurface"
+                android:textColor="@androidprv:color/materialColorOnSurface"
                 android:textSize="12sp"
                 android:lineHeight="16sp"
                 android:textAppearance="@style/TextAppearance.ChooserDefault"/>
@@ -74,7 +74,7 @@
                 android:layout_height="wrap_content"
                 android:gravity="start|top"
                 android:singleLine="true"
-                android:textColor="?androidprv:attr/materialColorOnSurfaceVariant"
+                android:textColor="@androidprv:color/materialColorOnSurfaceVariant"
                 android:textSize="12sp"
                 android:lineHeight="16sp"
                 android:textAppearance="@style/TextAppearance.ChooserDefault"/>
diff --git a/java/res/layout/chooser_grid_preview_files_text.xml b/java/res/layout/chooser_grid_preview_files_text.xml
index 65c62f82..9e2bde67 100644
--- a/java/res/layout/chooser_grid_preview_files_text.xml
+++ b/java/res/layout/chooser_grid_preview_files_text.xml
@@ -23,7 +23,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
-    android:background="?androidprv:attr/materialColorSurfaceContainer">
+    android:background="@androidprv:color/materialColorSurfaceContainer">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -53,7 +53,7 @@
             android:maxLines="@integer/text_preview_lines"
             android:ellipsize="end"
             android:linksClickable="false"
-            android:textColor="?androidprv:attr/materialColorOnSurfaceVariant"
+            android:textColor="@androidprv:color/materialColorOnSurfaceVariant"
             android:textAppearance="@style/TextAppearance.ChooserDefault"/>
     </LinearLayout>
 
diff --git a/java/res/layout/chooser_grid_preview_image.xml b/java/res/layout/chooser_grid_preview_image.xml
index f1aad727..199963b1 100644
--- a/java/res/layout/chooser_grid_preview_image.xml
+++ b/java/res/layout/chooser_grid_preview_image.xml
@@ -24,7 +24,7 @@
     android:layout_height="wrap_content"
     android:orientation="vertical"
     android:importantForAccessibility="no"
-    android:background="?androidprv:attr/materialColorSurfaceContainer">
+    android:background="@androidprv:color/materialColorSurfaceContainer">
 
     <ViewStub
         android:id="@+id/chooser_headline_row_stub"
diff --git a/java/res/layout/chooser_grid_preview_text.xml b/java/res/layout/chooser_grid_preview_text.xml
index ee54c0ae..951abfc7 100644
--- a/java/res/layout/chooser_grid_preview_text.xml
+++ b/java/res/layout/chooser_grid_preview_text.xml
@@ -25,7 +25,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
-    android:background="?androidprv:attr/materialColorSurfaceContainer">
+    android:background="@androidprv:color/materialColorSurfaceContainer">
 
   <androidx.constraintlayout.widget.ConstraintLayout
       android:layout_width="match_parent"
@@ -67,7 +67,7 @@
         android:textAlignment="gravity"
         android:textDirection="locale"
         android:textStyle="bold"
-        android:textColor="?androidprv:attr/materialColorOnSurface"
+        android:textColor="@androidprv:color/materialColorOnSurface"
         android:fontFamily="@androidprv:string/config_headlineFontFamily"/>
 
     <TextView
@@ -82,7 +82,7 @@
         app:layout_goneMarginStart="0dp"
         android:ellipsize="end"
         android:fontFamily="@androidprv:string/config_headlineFontFamily"
-        android:textColor="?androidprv:attr/materialColorOnSurfaceVariant"
+        android:textColor="@androidprv:color/materialColorOnSurfaceVariant"
         android:textAlignment="gravity"
         android:textDirection="locale"
         android:maxLines="@integer/text_preview_lines"
@@ -105,7 +105,7 @@
           android:layout_width="wrap_content"
           android:layout_height="wrap_content"
           android:layout_gravity="center"
-          android:tint="?androidprv:attr/materialColorOnSurfaceVariant"
+          android:tint="@androidprv:color/materialColorOnSurfaceVariant"
           android:src="@androidprv:drawable/ic_menu_copy_material"
           />
     </FrameLayout>
diff --git a/java/res/layout/chooser_grid_scrollable_preview.xml b/java/res/layout/chooser_grid_scrollable_preview.xml
index 02584d27..f8c7a541 100644
--- a/java/res/layout/chooser_grid_scrollable_preview.xml
+++ b/java/res/layout/chooser_grid_scrollable_preview.xml
@@ -65,7 +65,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:layout_alwaysShow="true"
-        android:background="?androidprv:attr/materialColorSurfaceContainer">
+        android:background="@androidprv:color/materialColorSurfaceContainer">
 
         <ViewStub
             android:id="@+id/chooser_headline_row_stub"
@@ -99,7 +99,7 @@
                 android:layout_height="wrap_content"
                 android:layout_alignParentTop="true"
                 android:layout_centerHorizontal="true"
-                android:background="?androidprv:attr/materialColorSurfaceContainer">
+                android:background="@androidprv:color/materialColorSurfaceContainer">
                 <LinearLayout
                     android:orientation="vertical"
                     android:layout_width="match_parent"
diff --git a/java/res/layout/chooser_headline_row.xml b/java/res/layout/chooser_headline_row.xml
index 4e19249b..1c8a0ac9 100644
--- a/java/res/layout/chooser_headline_row.xml
+++ b/java/res/layout/chooser_headline_row.xml
@@ -74,7 +74,7 @@
         android:paddingHorizontal="@dimen/chooser_edge_margin_normal_half"
         style="?android:attr/borderlessButtonStyle"
         android:drawableEnd="@drawable/chevron_right"
-        android:textColor="?androidprv:attr/materialColorOnSurface"
+        android:textColor="@androidprv:color/materialColorOnSurface"
         android:textSize="12sp"
         />
 
@@ -90,7 +90,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toBottomOf="@id/reselection_action"
         android:layout_alignWithParentIfMissing="true"
-        android:textColor="?androidprv:attr/materialColorOnSurface"
+        android:textColor="@androidprv:color/materialColorOnSurface"
         android:visibility="gone" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/java/res/layout/chooser_list_per_profile_wrap.xml b/java/res/layout/chooser_list_per_profile_wrap.xml
index d48fcb50..e556bc94 100644
--- a/java/res/layout/chooser_list_per_profile_wrap.xml
+++ b/java/res/layout/chooser_list_per_profile_wrap.xml
@@ -26,7 +26,7 @@
         app:layoutManager="com.android.intentresolver.ChooserGridLayoutManager"
         android:id="@androidprv:id/resolver_list"
         android:clipToPadding="false"
-        android:background="?androidprv:attr/materialColorSurfaceContainer"
+        android:background="@androidprv:color/materialColorSurfaceContainer"
         android:scrollbars="none"
         android:nestedScrollingEnabled="true" />
 
diff --git a/java/res/layout/chooser_row.xml b/java/res/layout/chooser_row.xml
index 4a5e28c3..bbe65a85 100644
--- a/java/res/layout/chooser_row.xml
+++ b/java/res/layout/chooser_row.xml
@@ -28,7 +28,7 @@
       android:layout_height="wrap_content"
       android:gravity="center"
       android:layout_gravity="center"
-      android:textColor="?androidprv:attr/materialColorOnSurfaceVariant"
+      android:textColor="@androidprv:color/materialColorOnSurfaceVariant"
       android:visibility="gone" />
 </LinearLayout>
 
diff --git a/java/res/layout/image_preview_loading_item.xml b/java/res/layout/image_preview_loading_item.xml
index a8a8f264..edcfb3d1 100644
--- a/java/res/layout/image_preview_loading_item.xml
+++ b/java/res/layout/image_preview_loading_item.xml
@@ -27,7 +27,7 @@
         android:layout_height="wrap_content"
         android:layout_gravity="center"
         android:indeterminate="true"
-        android:indeterminateTint="?androidprv:attr/materialColorPrimary"
+        android:indeterminateTint="@androidprv:color/materialColorPrimary"
         android:indeterminateTintMode="src_in" />
 
 </FrameLayout>
diff --git a/java/res/layout/resolve_grid_item.xml b/java/res/layout/resolve_grid_item.xml
index e5a00429..f9d433de 100644
--- a/java/res/layout/resolve_grid_item.xml
+++ b/java/res/layout/resolve_grid_item.xml
@@ -49,7 +49,7 @@
               android:layout_width="match_parent"
               android:layout_height="wrap_content"
               android:textAppearance="?android:attr/textAppearanceSmall"
-              android:textColor="?androidprv:attr/materialColorOnSurface"
+              android:textColor="@androidprv:color/materialColorOnSurface"
               android:textSize="@dimen/chooser_grid_target_name_text_size"
               android:gravity="top|center_horizontal"
               android:maxLines="1"
@@ -59,7 +59,7 @@
     <TextView android:id="@android:id/text2"
               android:textAppearance="?android:attr/textAppearanceSmall"
               android:textSize="@dimen/chooser_grid_activity_name_text_size"
-              android:textColor="?androidprv:attr/materialColorOnSurfaceVariant"
+              android:textColor="@androidprv:color/materialColorOnSurfaceVariant"
               android:layout_width="match_parent"
               android:layout_height="wrap_content"
               android:lines="1"
diff --git a/java/res/layout/resolver_empty_states.xml b/java/res/layout/resolver_empty_states.xml
index 0cf6e955..4dac23ab 100644
--- a/java/res/layout/resolver_empty_states.xml
+++ b/java/res/layout/resolver_empty_states.xml
@@ -84,7 +84,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="@string/noApplications"
-            android:textColor="?androidprv:attr/materialColorOnSurfaceVariant"
+            android:textColor="@androidprv:color/materialColorOnSurfaceVariant"
             android:padding="@dimen/chooser_edge_margin_normal"
             android:gravity="center"/>
     </RelativeLayout>
-- 
cgit v1.2.3-59-g8ed1b