[snowflake] Remove some do-not-use colors and reformat color names

1. update some color names to sync between codebase and go/clankcolors, most of which are marked as "needs update" 2. update colors which are marked as "do not use" Bug: 775198 Change-Id: I57c1f33a405616bd7bfec3648949a27aff94dd1a Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2073140 Commit-Queue: Lijin Shen <lazzzis@chromium.org> Reviewed-by: Theresa <twellington@chromium.org> Cr-Commit-Position: refs/heads/master@{#745335}
Denger-Network · Feb 28, 2020 · 68e4443 · 68e4443
1 parent 3a033a6
commit 68e4443
Show file tree

Hide file tree

Showing 10 changed files with 27 additions and 24 deletions.
diff --git a/...oid/features/autofill_assistant/java/res/drawable-night/autofill_assistant_details_bg.xml b/...oid/features/autofill_assistant/java/res/drawable-night/autofill_assistant_details_bg.xml
diff --git a/...e/android/features/autofill_assistant/java/res/drawable/autofill_assistant_details_bg.xml b/...e/android/features/autofill_assistant/java/res/drawable/autofill_assistant_details_bg.xml
@@ -6,8 +6,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
   <corners android:radius="8dp" />
-  <!-- TODO(b/146413939): Move to @color/default_chip_outline_color once available. -->
   <stroke
-      android:color="@color/modern_grey_300"
+      android:color="@color/default_chip_outline_color"
       android:width="1dp" />
-</shape>
+</shape>
diff --git a/chrome/android/features/autofill_assistant/java/res/values-v17/colors.xml b/chrome/android/features/autofill_assistant/java/res/values-v17/colors.xml
@@ -9,6 +9,6 @@
 
     Please see src/ui/android/java/res/values/colors.xml for the shared common colors.
     -->
-    <color name="autofill_assistant_light_blue">#E9F0FD</color>
-    <color name="autofill_assistant_actions_shadow_color">#40CCCCCC</color>
+    <color name="autofill_assistant_light_blue">@color/modern_blue_600_alpha_10</color>
+    <color name="autofill_assistant_actions_shadow_color">@color/modern_grey_100</color>
 </resources>
diff --git a/ui/android/java/res/color/chip_background_color.xml b/ui/android/java/res/color/chip_background_color.xml
@@ -17,5 +17,14 @@
     <item android:alpha="@dimen/default_focused_alpha"
         android:color="@color/modern_grey_800"
         android:state_focused="true" />
+    <item android:alpha="@dimen/chip_background_selected_hover_alpha"
+        android:color="@color/filled_button_bg_color"
+        android:state_focused="true"
+        android:state_hovered="true" />
+    <item android:alpha="@dimen/chip_background_selected_hover_focused_alpha"
+        android:color="@color/filled_button_bg_color"
+        android:state_focused="true"
+        android:state_hovered="true"
+        android:state_selected="true" />
     <item android:color="@android:color/transparent" />
 </selector>
diff --git a/ui/android/java/res/color/chip_text_color.xml b/ui/android/java/res/color/chip_text_color.xml
@@ -9,7 +9,7 @@
         android:color="@color/chip_text_color_selected"
         android:state_selected="true" android:state_enabled="false"/>
     <item android:alpha="@dimen/default_disabled_alpha"
-        android:color="@color/chip_text_color_default" android:state_enabled="false" />
+        android:color="@color/default_chip_assistive_text_color" android:state_enabled="false" />
     <item android:color="@color/chip_text_color_selected" android:state_selected="true" />
-    <item android:color="@color/chip_text_color_default" />
+    <item android:color="@color/default_chip_assistive_text_color" />
 </selector>
diff --git a/ui/android/java/res/color/chip_text_color_secondary.xml b/ui/android/java/res/color/chip_text_color_secondary.xml
@@ -9,7 +9,7 @@
         android:color="@color/chip_text_color_selected"
         android:state_selected="true" android:state_enabled="false" />
     <item android:alpha="@dimen/default_disabled_alpha"
-        android:color="@color/chip_text_color_secondary_default" android:state_enabled="false" />
+        android:color="@color/default_chip_assistive_text_color_secondary" android:state_enabled="false" />
     <item android:color="@color/chip_text_color_selected" android:state_selected="true" />
-    <item android:color="@color/chip_text_color_secondary_default" />
+    <item android:color="@color/default_chip_assistive_text_color_secondary" />
 </selector>
diff --git a/ui/android/java/res/values-night/colors.xml b/ui/android/java/res/values-night/colors.xml
@@ -44,6 +44,7 @@
     <color name="chip_text_color_selected">@color/default_text_color_dark</color>
     <color name="chip_background_color_disabled">@color/modern_grey_300_alpha_38</color>
     <color name="chip_ripple_color_default">@android:color/white</color>
+    <color name="default_chip_outline_color">@color/default_chip_outline_color_dark</color>
 
     <!-- CircularProgressView colors -->
     <color name="circular_progress_inner_background_color_small">@color/modern_blue_300</color>

diff --git a/ui/android/java/res/values/colors.xml b/ui/android/java/res/values/colors.xml
@@ -88,11 +88,12 @@
     <color name="ripple_color_blue">@color/modern_blue_600</color>
 
     <!-- Chip colors -->
-    <color name="chip_text_color_default">@color/default_text_color</color>
+    <color name="default_chip_assistive_text_color">@color/default_text_color</color>
     <color name="chip_text_color_selected">@color/modern_blue_700</color>
-    <color name="chip_text_color_secondary_default">@color/default_text_color_secondary</color>
+    <color name="default_chip_assistive_text_color_secondary">@color/default_text_color_secondary</color>
     <color name="chip_background_color_disabled">@color/modern_grey_100_alpha_38</color>
     <color name="chip_ripple_color_default">@color/modern_grey_800</color>
+    <color name="default_chip_outline_color" tools:ignore="UnusedResources">@color/default_chip_outline_color_light</color>
 
     <!-- CircularProgressView colors -->
     <color name="circular_progress_inner_background_color_small" tools:ignore="UnusedResources">@color/modern_grey_300</color>

diff --git a/ui/android/java/res/values/dimens.xml b/ui/android/java/res/values/dimens.xml
@@ -39,6 +39,8 @@
     <dimen name="chip_bg_vertical_inset">8dp</dimen>
     <item name="chip_background_selected_focused_alpha" format="float" type="dimen">0.12</item>
     <item name="chip_background_selected_alpha" format="float" type="dimen">0.06</item>
+    <item name="chip_background_selected_hover_alpha" format="float" type="dimen">0.10</item>
+    <item name="chip_background_selected_hover_focused_alpha" format="float" type="dimen">0.12</item>
     <dimen name="chip_icon_size">20dp</dimen>
 
     <!-- Dropdown default measures -->

diff --git a/ui/android/java/res/values/semantic_colors.xml b/ui/android/java/res/values/semantic_colors.xml
@@ -59,6 +59,10 @@
     <color name="divider_bg_color_dark">@color/modern_grey_300</color>
     <color name="divider_bg_color_light">@color/white_alpha_12</color>
 
+    <!-- Chip Colors -->
+    <color name="default_chip_outline_color_light">@color/modern_grey_300</color>
+    <color name="default_chip_outline_color_dark">@color/modern_grey_700</color>
+
     <!-- Colors used for Widgets (checkboxes, switches, buttons, etc)-->
     <color name="control_active_color_light" tools:ignore="UnusedResources">@color/modern_blue_600</color>
     <color name="control_active_color_dark" tools:ignore="UnusedResources">@color/modern_blue_300</color>