From 31517150ad68a2b2caec25886db762c650cadc45 Mon Sep 17 00:00:00 2001
From: Quin Gillespie <trypsynth@gmail.com>
Date: Mon, 26 Oct 2026 06:59:58 -0600
Subject: [PATCH] Give watches before Android 12 fixed Wear material colors

The Wear material colors pointed at the system's dynamic colors, which only exist from Android 12,
and the watch's values-watch-v30 copy applied them on Wear OS 3 too, where the training list items
that use them could fail to load. The base colors are now close fixed colors, and values-v31 uses
the dynamic ones. Without the watch override, Android 12 and later watches still get the dynamic
colors, since a watch qualifier would outrank values-v31.
---
 lint-baseline.xml                             | 319 ------------------
 .../src/wear/res/values-watch-v30/colors.xml  |  30 --
 utils/src/main/res/values-v31/colors.xml      |  11 +-
 utils/src/main/res/values/colors.xml          |  21 +-
 4 files changed, 21 insertions(+), 360 deletions(-)
 delete mode 100644 talkback/src/wear/res/values-watch-v30/colors.xml

diff --git a/lint-baseline.xml b/lint-baseline.xml
index b8c648e41..2c52a5c5e 100644
--- a/lint-baseline.xml
+++ b/lint-baseline.xml
@@ -10652,105 +10652,6 @@
             column="12"/>
     </issue>
 
-    <issue
-        id="NewApi"
-        message="`@android:color/system_neutral1_900` requires API level 31 (current min is 26)"
-        errorLine1="  &lt;color name=&quot;a11y_wear_material_color_primary&quot;>@android:color/system_neutral1_900&lt;/color>"
-        errorLine2="                                                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/values/colors.xml"
-            line="47"
-            column="50"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="`@android:color/system_neutral1_50` requires API level 31 (current min is 26)"
-        errorLine1="  &lt;color name=&quot;a11y_wear_material_color_on_primary&quot;>@android:color/system_neutral1_50&lt;/color>"
-        errorLine2="                                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/values/colors.xml"
-            line="48"
-            column="53"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="`@android:color/system_accent1_600` requires API level 31 (current min is 26)"
-        errorLine1="  &lt;color name=&quot;a11y_wear_material_color_primary_variant&quot;>@android:color/system_accent1_600&lt;/color>"
-        errorLine2="                                                         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/values/colors.xml"
-            line="49"
-            column="58"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="`@android:color/system_neutral2_700` requires API level 31 (current min is 26)"
-        errorLine1="  &lt;color name=&quot;a11y_wear_material_color_secondary&quot;>@android:color/system_neutral2_700&lt;/color>"
-        errorLine2="                                                   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/values/colors.xml"
-            line="50"
-            column="52"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="`@android:color/system_neutral2_200` requires API level 31 (current min is 26)"
-        errorLine1="  &lt;color name=&quot;a11y_wear_material_color_on_secondary&quot;>@android:color/system_neutral2_200&lt;/color>"
-        errorLine2="                                                      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/values/colors.xml"
-            line="51"
-            column="55"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="`@android:color/system_neutral2_200` requires API level 31 (current min is 26)"
-        errorLine1="  &lt;color name=&quot;a11y_wear_material_color_secondary_variant&quot;>@android:color/system_neutral2_200&lt;/color>"
-        errorLine2="                                                           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/values/colors.xml"
-            line="52"
-            column="60"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="`@android:color/system_neutral1_10` requires API level 31 (current min is 26)"
-        errorLine1="  &lt;color name=&quot;a11y_wear_material_color_surface&quot;>@android:color/system_neutral1_10&lt;/color>"
-        errorLine2="                                                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/values/colors.xml"
-            line="53"
-            column="50"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="`@android:color/system_neutral1_800` requires API level 31 (current min is 26)"
-        errorLine1="  &lt;color name=&quot;a11y_wear_material_color_on_surface&quot;>@android:color/system_neutral1_800&lt;/color>"
-        errorLine2="                                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/values/colors.xml"
-            line="54"
-            column="53"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="`@android:color/system_neutral1_800` requires API level 31 (current min is 26)"
-        errorLine1="  &lt;color name=&quot;a11y_wear_material_color_surface_variant&quot;>@android:color/system_neutral1_800&lt;/color>"
-        errorLine2="                                                         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/values/colors.xml"
-            line="55"
-            column="58"/>
-    </issue>
-
     <issue
         id="OldTargetApi"
         message="Not targeting the latest versions of Android; compatibility modes apply. Consider testing and updating this version. Consult the `android.os.Build.VERSION_CODES` javadoc for details."
@@ -25628,127 +25529,6 @@
 
 
 
-
-    <issue
-        id="MissingDefaultResource"
-        message="The color &quot;a11y_wear_material_color_primary&quot; in values-watch-v30 has no declaration in the base `values` folder; this can lead to crashes when the resource is queried in a configuration that does not match this qualifier"
-        errorLine1="    &lt;color name=&quot;a11y_wear_material_color_primary&quot;>@android:color/system_neutral1_900&lt;/color>"
-        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/wear/res/values-watch-v30/colors.xml"
-            line="19"
-            column="12"/>
-    </issue>
-
-    <issue
-        id="MissingDefaultResource"
-        message="The color &quot;a11y_wear_material_color_on_primary&quot; in values-watch-v30 has no declaration in the base `values` folder; this can lead to crashes when the resource is queried in a configuration that does not match this qualifier"
-        errorLine1="    &lt;color name=&quot;a11y_wear_material_color_on_primary&quot;>@android:color/system_neutral1_50&lt;/color>"
-        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/wear/res/values-watch-v30/colors.xml"
-            line="20"
-            column="12"/>
-    </issue>
-
-    <issue
-        id="MissingDefaultResource"
-        message="The color &quot;a11y_wear_material_color_primary_variant&quot; in values-watch-v30 has no declaration in the base `values` folder; this can lead to crashes when the resource is queried in a configuration that does not match this qualifier"
-        errorLine1="    &lt;color name=&quot;a11y_wear_material_color_primary_variant&quot;>@android:color/system_accent1_600&lt;/color>"
-        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/wear/res/values-watch-v30/colors.xml"
-            line="21"
-            column="12"/>
-    </issue>
-
-    <issue
-        id="MissingDefaultResource"
-        message="The color &quot;a11y_wear_material_color_secondary&quot; in values-watch-v30 has no declaration in the base `values` folder; this can lead to crashes when the resource is queried in a configuration that does not match this qualifier"
-        errorLine1="    &lt;color name=&quot;a11y_wear_material_color_secondary&quot;>@android:color/system_neutral2_700&lt;/color>"
-        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/wear/res/values-watch-v30/colors.xml"
-            line="22"
-            column="12"/>
-    </issue>
-
-    <issue
-        id="MissingDefaultResource"
-        message="The color &quot;a11y_wear_material_color_on_secondary&quot; in values-watch-v30 has no declaration in the base `values` folder; this can lead to crashes when the resource is queried in a configuration that does not match this qualifier"
-        errorLine1="    &lt;color name=&quot;a11y_wear_material_color_on_secondary&quot;>@android:color/system_neutral2_200&lt;/color>"
-        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/wear/res/values-watch-v30/colors.xml"
-            line="23"
-            column="12"/>
-    </issue>
-
-    <issue
-        id="MissingDefaultResource"
-        message="The color &quot;a11y_wear_material_color_secondary_variant&quot; in values-watch-v30 has no declaration in the base `values` folder; this can lead to crashes when the resource is queried in a configuration that does not match this qualifier"
-        errorLine1="    &lt;color name=&quot;a11y_wear_material_color_secondary_variant&quot;>@android:color/system_neutral2_200&lt;/color>"
-        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/wear/res/values-watch-v30/colors.xml"
-            line="24"
-            column="12"/>
-    </issue>
-
-    <issue
-        id="MissingDefaultResource"
-        message="The color &quot;a11y_wear_material_color_surface&quot; in values-watch-v30 has no declaration in the base `values` folder; this can lead to crashes when the resource is queried in a configuration that does not match this qualifier"
-        errorLine1="    &lt;color name=&quot;a11y_wear_material_color_surface&quot;>@android:color/system_neutral1_10&lt;/color>"
-        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/wear/res/values-watch-v30/colors.xml"
-            line="25"
-            column="12"/>
-    </issue>
-
-    <issue
-        id="MissingDefaultResource"
-        message="The color &quot;a11y_wear_material_color_on_surface&quot; in values-watch-v30 has no declaration in the base `values` folder; this can lead to crashes when the resource is queried in a configuration that does not match this qualifier"
-        errorLine1="    &lt;color name=&quot;a11y_wear_material_color_on_surface&quot;>@android:color/system_neutral1_800&lt;/color>"
-        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/wear/res/values-watch-v30/colors.xml"
-            line="26"
-            column="12"/>
-    </issue>
-
-    <issue
-        id="MissingDefaultResource"
-        message="The color &quot;a11y_wear_material_color_surface_variant&quot; in values-watch-v30 has no declaration in the base `values` folder; this can lead to crashes when the resource is queried in a configuration that does not match this qualifier"
-        errorLine1="    &lt;color name=&quot;a11y_wear_material_color_surface_variant&quot;>@android:color/system_neutral1_800&lt;/color>"
-        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/wear/res/values-watch-v30/colors.xml"
-            line="27"
-            column="12"/>
-    </issue>
-
-    <issue
-        id="MissingDefaultResource"
-        message="The color &quot;a11y_wear_material_color_background&quot; in values-watch-v30 has no declaration in the base `values` folder; this can lead to crashes when the resource is queried in a configuration that does not match this qualifier"
-        errorLine1="    &lt;color name=&quot;a11y_wear_material_color_background&quot;>@color/google_black&lt;/color>"
-        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/wear/res/values-watch-v30/colors.xml"
-            line="28"
-            column="12"/>
-    </issue>
-
-    <issue
-        id="MissingDefaultResource"
-        message="The color &quot;a11y_wear_material_color_on_background_wear&quot; in values-watch-v30 has no declaration in the base `values` folder; this can lead to crashes when the resource is queried in a configuration that does not match this qualifier"
-        errorLine1="    &lt;color name=&quot;a11y_wear_material_color_on_background_wear&quot;>@color/google_white&lt;/color>"
-        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/wear/res/values-watch-v30/colors.xml"
-            line="29"
-            column="12"/>
-    </issue>
 
     <issue
         id="NewApi"
@@ -25794,105 +25574,6 @@
             column="29"/>
     </issue>
 
-    <issue
-        id="NewApi"
-        message="`@android:color/system_neutral1_900` requires API level 31 (current min is 30)"
-        errorLine1="    &lt;color name=&quot;a11y_wear_material_color_primary&quot;>@android:color/system_neutral1_900&lt;/color>"
-        errorLine2="                                                   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/wear/res/values-watch-v30/colors.xml"
-            line="19"
-            column="52"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="`@android:color/system_neutral1_50` requires API level 31 (current min is 30)"
-        errorLine1="    &lt;color name=&quot;a11y_wear_material_color_on_primary&quot;>@android:color/system_neutral1_50&lt;/color>"
-        errorLine2="                                                      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/wear/res/values-watch-v30/colors.xml"
-            line="20"
-            column="55"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="`@android:color/system_accent1_600` requires API level 31 (current min is 30)"
-        errorLine1="    &lt;color name=&quot;a11y_wear_material_color_primary_variant&quot;>@android:color/system_accent1_600&lt;/color>"
-        errorLine2="                                                           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/wear/res/values-watch-v30/colors.xml"
-            line="21"
-            column="60"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="`@android:color/system_neutral2_700` requires API level 31 (current min is 30)"
-        errorLine1="    &lt;color name=&quot;a11y_wear_material_color_secondary&quot;>@android:color/system_neutral2_700&lt;/color>"
-        errorLine2="                                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/wear/res/values-watch-v30/colors.xml"
-            line="22"
-            column="54"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="`@android:color/system_neutral2_200` requires API level 31 (current min is 30)"
-        errorLine1="    &lt;color name=&quot;a11y_wear_material_color_on_secondary&quot;>@android:color/system_neutral2_200&lt;/color>"
-        errorLine2="                                                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/wear/res/values-watch-v30/colors.xml"
-            line="23"
-            column="57"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="`@android:color/system_neutral2_200` requires API level 31 (current min is 30)"
-        errorLine1="    &lt;color name=&quot;a11y_wear_material_color_secondary_variant&quot;>@android:color/system_neutral2_200&lt;/color>"
-        errorLine2="                                                             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/wear/res/values-watch-v30/colors.xml"
-            line="24"
-            column="62"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="`@android:color/system_neutral1_10` requires API level 31 (current min is 30)"
-        errorLine1="    &lt;color name=&quot;a11y_wear_material_color_surface&quot;>@android:color/system_neutral1_10&lt;/color>"
-        errorLine2="                                                   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/wear/res/values-watch-v30/colors.xml"
-            line="25"
-            column="52"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="`@android:color/system_neutral1_800` requires API level 31 (current min is 30)"
-        errorLine1="    &lt;color name=&quot;a11y_wear_material_color_on_surface&quot;>@android:color/system_neutral1_800&lt;/color>"
-        errorLine2="                                                      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/wear/res/values-watch-v30/colors.xml"
-            line="26"
-            column="55"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="`@android:color/system_neutral1_800` requires API level 31 (current min is 30)"
-        errorLine1="    &lt;color name=&quot;a11y_wear_material_color_surface_variant&quot;>@android:color/system_neutral1_800&lt;/color>"
-        errorLine2="                                                           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/wear/res/values-watch-v30/colors.xml"
-            line="27"
-            column="60"/>
-    </issue>
-
     <issue
         id="WearStandaloneAppFlag"
         message="Missing `&lt;meta-data android:name=&quot;com.google.android.wearable.standalone&quot; ../>` element"
diff --git a/talkback/src/wear/res/values-watch-v30/colors.xml b/talkback/src/wear/res/values-watch-v30/colors.xml
deleted file mode 100644
index 5b2415903..000000000
--- a/talkback/src/wear/res/values-watch-v30/colors.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2022 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<resources>
-    <!-- Wear material color -->
-    <color name="a11y_wear_material_color_primary">@android:color/system_neutral1_900</color>
-    <color name="a11y_wear_material_color_on_primary">@android:color/system_neutral1_50</color>
-    <color name="a11y_wear_material_color_primary_variant">@android:color/system_accent1_600</color>
-    <color name="a11y_wear_material_color_secondary">@android:color/system_neutral2_700</color>
-    <color name="a11y_wear_material_color_on_secondary">@android:color/system_neutral2_200</color>
-    <color name="a11y_wear_material_color_secondary_variant">@android:color/system_neutral2_200</color>
-    <color name="a11y_wear_material_color_surface">@android:color/system_neutral1_10</color>
-    <color name="a11y_wear_material_color_on_surface">@android:color/system_neutral1_800</color>
-    <color name="a11y_wear_material_color_surface_variant">@android:color/system_neutral1_800</color>
-    <color name="a11y_wear_material_color_background">@color/google_black</color>
-    <color name="a11y_wear_material_color_on_background_wear">@color/google_white</color>
-</resources>
diff --git a/utils/src/main/res/values-v31/colors.xml b/utils/src/main/res/values-v31/colors.xml
index 34008b0b9..a6fde95be 100644
--- a/utils/src/main/res/values-v31/colors.xml
+++ b/utils/src/main/res/values-v31/colors.xml
@@ -15,5 +15,14 @@
      limitations under the License.
 -->
 <resources>
-
+  <!-- Wear material color -->
+  <color name="a11y_wear_material_color_primary">@android:color/system_neutral1_900</color>
+  <color name="a11y_wear_material_color_on_primary">@android:color/system_neutral1_50</color>
+  <color name="a11y_wear_material_color_primary_variant">@android:color/system_accent1_600</color>
+  <color name="a11y_wear_material_color_secondary">@android:color/system_neutral2_700</color>
+  <color name="a11y_wear_material_color_on_secondary">@android:color/system_neutral2_200</color>
+  <color name="a11y_wear_material_color_secondary_variant">@android:color/system_neutral2_200</color>
+  <color name="a11y_wear_material_color_surface">@android:color/system_neutral1_10</color>
+  <color name="a11y_wear_material_color_on_surface">@android:color/system_neutral1_800</color>
+  <color name="a11y_wear_material_color_surface_variant">@android:color/system_neutral1_800</color>
 </resources>
diff --git a/utils/src/main/res/values/colors.xml b/utils/src/main/res/values/colors.xml
index be70f4530..55d460702 100644
--- a/utils/src/main/res/values/colors.xml
+++ b/utils/src/main/res/values/colors.xml
@@ -43,16 +43,17 @@
 
   <color name="a11y_activity_background_color">@color/google_black</color>
 
-  <!-- Wear material color -->
-  <color name="a11y_wear_material_color_primary">@android:color/system_neutral1_900</color>
-  <color name="a11y_wear_material_color_on_primary">@android:color/system_neutral1_50</color>
-  <color name="a11y_wear_material_color_primary_variant">@android:color/system_accent1_600</color>
-  <color name="a11y_wear_material_color_secondary">@android:color/system_neutral2_700</color>
-  <color name="a11y_wear_material_color_on_secondary">@android:color/system_neutral2_200</color>
-  <color name="a11y_wear_material_color_secondary_variant">@android:color/system_neutral2_200</color>
-  <color name="a11y_wear_material_color_surface">@android:color/system_neutral1_10</color>
-  <color name="a11y_wear_material_color_on_surface">@android:color/system_neutral1_800</color>
-  <color name="a11y_wear_material_color_surface_variant">@android:color/system_neutral1_800</color>
+  <!-- Wear material color. The system's dynamic colors only exist from Android 12, so these are
+       close fixed colors, and values-v31 uses the dynamic ones. -->
+  <color name="a11y_wear_material_color_primary">@color/google_grey900</color>
+  <color name="a11y_wear_material_color_on_primary">@color/google_grey50</color>
+  <color name="a11y_wear_material_color_primary_variant">@color/google_blue600</color>
+  <color name="a11y_wear_material_color_secondary">@color/google_grey700</color>
+  <color name="a11y_wear_material_color_on_secondary">@color/google_grey200</color>
+  <color name="a11y_wear_material_color_secondary_variant">@color/google_grey200</color>
+  <color name="a11y_wear_material_color_surface">@color/google_grey50</color>
+  <color name="a11y_wear_material_color_on_surface">@color/google_grey800</color>
+  <color name="a11y_wear_material_color_surface_variant">@color/google_grey800</color>
   <color name="a11y_wear_material_color_background">@color/google_black</color>
   <color name="a11y_wear_material_color_on_background_wear">@color/google_white</color>
 </resources>