From 7f0db1ab153489100e2f6e457860ddb0281d85d0 Mon Sep 17 00:00:00 2001
From: pekingme <8545955+pekingme@users.noreply.github.com>
Date: Fri, 13 Jan 2023 17:37:08 +0000
Subject: [PATCH] [RadioButton] Integrated tokens.

Unselected icon color is changed from colorOnSurface to colorOnSurfaceVariant.

PiperOrigin-RevId: 501869216
---
 .../res/color/m3_radiobutton_button_tint.xml  | 25 ++++++++-
 .../res/color/m3_radiobutton_ripple_tint.xml  | 24 +++++---
 .../radiobutton/res/values/tokens.xml         | 56 +++++++++++++++++++
 3 files changed, 94 insertions(+), 11 deletions(-)
 create mode 100644 lib/java/com/google/android/material/radiobutton/res/values/tokens.xml

diff --git a/lib/java/com/google/android/material/radiobutton/res/color/m3_radiobutton_button_tint.xml b/lib/java/com/google/android/material/radiobutton/res/color/m3_radiobutton_button_tint.xml
index f1c0b7fe7b7..168e2e3cb4c 100644
--- a/lib/java/com/google/android/material/radiobutton/res/color/m3_radiobutton_button_tint.xml
+++ b/lib/java/com/google/android/material/radiobutton/res/color/m3_radiobutton_button_tint.xml
@@ -16,11 +16,30 @@
 -->
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
   <!-- Disabled -->
-  <item android:alpha="@dimen/material_emphasis_disabled" android:color="?attr/colorOnSurface" android:state_enabled="false"/>
+  <item android:alpha="@dimen/m3_comp_radio_button_disabled_unselected_icon_opacity"
+      android:color="@macro/m3_comp_radio_button_disabled_unselected_icon_color"
+      android:state_enabled="false"/>
+  <item android:alpha="@dimen/m3_comp_radio_button_disabled_selected_icon_opacity"
+      android:color="@macro/m3_comp_radio_button_disabled_selected_icon_color"
+      android:state_enabled="false" android:state_pressed="true"/>
 
   <!-- Checked -->
-  <item android:color="?attr/colorPrimary" android:state_checked="true"/>
+  <item android:color="@macro/m3_comp_radio_button_selected_pressed_icon_color"
+      android:state_pressed="true" android:state_checked="true"/>
+  <item android:color="@macro/m3_comp_radio_button_selected_focus_icon_color"
+      android:state_focused="true" android:state_checked="true"/>
+  <item android:color="@macro/m3_comp_radio_button_selected_hover_icon_color"
+      android:state_hovered="true" android:state_checked="true"/>
+  <item android:color="@macro/m3_comp_radio_button_selected_icon_color"
+      android:state_checked="true"/>
 
   <!-- Unchecked -->
-  <item android:color="?attr/colorOnSurface" android:state_checked="false"/>
+  <item android:color="@macro/m3_comp_radio_button_unselected_pressed_icon_color"
+      android:state_pressed="true" android:state_checked="true"/>
+  <item android:color="@macro/m3_comp_radio_button_unselected_focus_icon_color"
+      android:state_focused="true" android:state_checked="true"/>
+  <item android:color="@macro/m3_comp_radio_button_unselected_hover_icon_color"
+      android:state_hovered="true" android:state_checked="true"/>
+  <item android:color="@macro/m3_comp_radio_button_unselected_icon_color"
+      android:state_checked="false"/>
 </selector>
diff --git a/lib/java/com/google/android/material/radiobutton/res/color/m3_radiobutton_ripple_tint.xml b/lib/java/com/google/android/material/radiobutton/res/color/m3_radiobutton_ripple_tint.xml
index f6fb9099969..40af942a92a 100644
--- a/lib/java/com/google/android/material/radiobutton/res/color/m3_radiobutton_ripple_tint.xml
+++ b/lib/java/com/google/android/material/radiobutton/res/color/m3_radiobutton_ripple_tint.xml
@@ -19,25 +19,33 @@
   <!-- Checked. -->
 
   <!-- Uses the primary state layer since tapping a checked radiobutton keeps it checked. -->
-  <item android:alpha="@dimen/m3_ripple_pressed_alpha" android:color="?attr/colorPrimary"
+  <item android:alpha="@dimen/m3_comp_radio_button_selected_pressed_state_layer_opacity"
+      android:color="@macro/m3_comp_radio_button_selected_pressed_state_layer_color"
       android:state_pressed="true" android:state_checked="true"/>
-  <item android:alpha="@dimen/m3_ripple_focused_alpha" android:color="?attr/colorPrimary"
+  <item android:alpha="@dimen/m3_comp_radio_button_selected_focus_state_layer_opacity"
+      android:color="@macro/m3_comp_radio_button_selected_focus_state_layer_color"
       android:state_focused="true" android:state_checked="true"/>
-  <item android:alpha="@dimen/m3_ripple_hovered_alpha" android:color="?attr/colorPrimary"
+  <item android:alpha="@dimen/m3_comp_radio_button_selected_hover_state_layer_opacity"
+      android:color="@macro/m3_comp_radio_button_selected_hover_state_layer_color"
       android:state_hovered="true" android:state_checked="true"/>
-  <item android:alpha="@dimen/m3_ripple_default_alpha" android:color="?attr/colorPrimary"
+  <item android:alpha="@dimen/m3_ripple_default_alpha"
+      android:color="?attr/colorPrimary"
       android:state_checked="true"/>
 
   <!-- Unchecked. -->
 
   <!-- Uses the primary state layer since tapping an unchecked radiobutton will turn it blue
        (checked). -->
-  <item android:alpha="@dimen/m3_ripple_selectable_pressed_alpha" android:color="?attr/colorPrimary"
+  <item android:alpha="@dimen/m3_comp_radio_button_unselected_pressed_state_layer_opacity"
+      android:color="@macro/m3_comp_radio_button_unselected_pressed_state_layer_color"
       android:state_pressed="true"/>
-  <item android:alpha="@dimen/m3_ripple_focused_alpha" android:color="?attr/colorOnSurface"
+  <item android:alpha="@dimen/m3_comp_radio_button_unselected_focus_state_layer_opacity"
+      android:color="@macro/m3_comp_radio_button_unselected_focus_state_layer_color"
       android:state_focused="true"/>
-  <item android:alpha="@dimen/m3_ripple_hovered_alpha" android:color="?attr/colorOnSurface"
+  <item android:alpha="@dimen/m3_comp_radio_button_unselected_hover_state_layer_opacity"
+      android:color="@macro/m3_comp_radio_button_unselected_hover_state_layer_color"
       android:state_hovered="true"/>
-  <item android:alpha="@dimen/m3_ripple_default_alpha" android:color="?attr/colorOnSurface"/>
+  <item android:alpha="@dimen/m3_ripple_default_alpha"
+      android:color="?attr/colorOnSurface"/>
 
 </selector>
diff --git a/lib/java/com/google/android/material/radiobutton/res/values/tokens.xml b/lib/java/com/google/android/material/radiobutton/res/values/tokens.xml
new file mode 100644
index 00000000000..739dc485dba
--- /dev/null
+++ b/lib/java/com/google/android/material/radiobutton/res/values/tokens.xml
@@ -0,0 +1,56 @@
+<?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.
+-->
+<!-- AUTOGENERATED FILE. DO NOT MODIFY. -->
+<!-- Version: v0.147 -->
+
+<resources>
+
+  <!-- Generated from token set (md.comp.radio-button) in context (platform=android, audience=3p). -->
+  <!-- Enabled - Icon -->
+  <macro name="m3_comp_radio_button_selected_icon_color">?attr/colorPrimary</macro>
+  <macro name="m3_comp_radio_button_unselected_icon_color">?attr/colorOnSurfaceVariant</macro>
+  <!-- Disabled - Icon -->
+  <macro name="m3_comp_radio_button_disabled_selected_icon_color">?attr/colorOnSurface</macro>
+  <item name="m3_comp_radio_button_disabled_selected_icon_opacity" format="float" type="dimen">0.38</item>
+  <macro name="m3_comp_radio_button_disabled_unselected_icon_color">?attr/colorOnSurface</macro>
+  <item name="m3_comp_radio_button_disabled_unselected_icon_opacity" format="float" type="dimen">0.38</item>
+  <!-- Hovered - State layer -->
+  <macro name="m3_comp_radio_button_selected_hover_state_layer_color">?attr/colorPrimary</macro>
+  <dimen name="m3_comp_radio_button_selected_hover_state_layer_opacity">@dimen/m3_sys_state_hover_state_layer_opacity</dimen>
+  <macro name="m3_comp_radio_button_unselected_hover_state_layer_color">?attr/colorOnSurface</macro>
+  <dimen name="m3_comp_radio_button_unselected_hover_state_layer_opacity">@dimen/m3_sys_state_hover_state_layer_opacity</dimen>
+  <!-- Hovered - Icon -->
+  <macro name="m3_comp_radio_button_selected_hover_icon_color">?attr/colorPrimary</macro>
+  <macro name="m3_comp_radio_button_unselected_hover_icon_color">?attr/colorOnSurface</macro>
+  <!-- Focused - State layer -->
+  <macro name="m3_comp_radio_button_selected_focus_state_layer_color">?attr/colorPrimary</macro>
+  <dimen name="m3_comp_radio_button_selected_focus_state_layer_opacity">@dimen/m3_sys_state_focus_state_layer_opacity</dimen>
+  <macro name="m3_comp_radio_button_unselected_focus_state_layer_color">?attr/colorOnSurface</macro>
+  <dimen name="m3_comp_radio_button_unselected_focus_state_layer_opacity">@dimen/m3_sys_state_focus_state_layer_opacity</dimen>
+  <!-- Focused - Icon -->
+  <macro name="m3_comp_radio_button_selected_focus_icon_color">?attr/colorPrimary</macro>
+  <macro name="m3_comp_radio_button_unselected_focus_icon_color">?attr/colorOnSurface</macro>
+  <!-- Pressed (rippple) - State layer -->
+  <macro name="m3_comp_radio_button_selected_pressed_state_layer_color">?attr/colorOnSurface</macro>
+  <dimen name="m3_comp_radio_button_selected_pressed_state_layer_opacity">@dimen/m3_sys_state_pressed_state_layer_opacity</dimen>
+  <macro name="m3_comp_radio_button_unselected_pressed_state_layer_color">?attr/colorPrimary</macro>
+  <dimen name="m3_comp_radio_button_unselected_pressed_state_layer_opacity">@dimen/m3_sys_state_pressed_state_layer_opacity</dimen>
+  <!-- Pressed (rippple) - Icon -->
+  <macro name="m3_comp_radio_button_selected_pressed_icon_color">?attr/colorPrimary</macro>
+  <macro name="m3_comp_radio_button_unselected_pressed_icon_color">?attr/colorOnSurface</macro>
+
+</resources>