Skip to content

Give watches before Android 12 fixed Wear material colors #281

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
trypsynth merged 1 commit into from
Oct 26, 2026
Merged

Give watches before Android 12 fixed Wear material colors #281

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
319 changes: 0 additions & 319 deletions lint-baseline.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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."
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down
30 changes: 0 additions & 30 deletions talkback/src/wear/res/values-watch-v30/colors.xml
View file
Open in desktop

This file was deleted.

11 changes: 10 additions & 1 deletion utils/src/main/res/values-v31/colors.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Loading
Loading