Commit a409ae52 authored by Becky Zhou's avatar Becky Zhou Committed by Commit Bot

[Snowflake] Update touch highlight color to 38% v2 Grey 800

+ Update control highlight to 38% v2 grey 800. This would affect all
  theme selectable background
+ Update control normal color (toggles, switches etc) to grey 700

Bug: 835050
Change-Id: Ifc75ddb92490ad6d8a54a3610a315eb68b8decac
Reviewed-on: https://chromium-review.googlesource.com/c/1316247Reviewed-by: default avatarTheresa <twellington@chromium.org>
Commit-Queue: Becky Zhou <huayinz@chromium.org>
Cr-Commit-Position: refs/heads/master@{#605402}
parent bf7ad46d
...@@ -5,5 +5,5 @@ ...@@ -5,5 +5,5 @@
--> -->
<selector xmlns:android="http://schemas.android.com/apk/res/android"> <selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_checked="true" android:color="@color/light_active_color" /> <item android:state_checked="true" android:color="@color/light_active_color" />
<item android:color="@color/light_normal_color"/> <item android:color="@color/control_normal_color"/>
</selector> </selector>
...@@ -27,9 +27,9 @@ ...@@ -27,9 +27,9 @@
<item name="android:statusBarColor" tools:targetApi="21">@android:color/black</item> <item name="android:statusBarColor" tools:targetApi="21">@android:color/black</item>
<!-- Overriding AppCompat values --> <!-- Overriding AppCompat values -->
<!-- TODO(huayinz): Change this when the color for checkboxes are updated to modern. --> <item name="colorControlNormal">@color/control_normal_color</item>
<item name="colorControlNormal">@color/light_normal_color</item>
<item name="colorControlActivated">@color/light_active_color</item> <item name="colorControlActivated">@color/light_active_color</item>
<item name="colorControlHighlight">@color/control_highlight_color</item>
<!-- Navigation Transitions, requires API level 21 --> <!-- Navigation Transitions, requires API level 21 -->
<item name="android:windowAllowEnterTransitionOverlap" tools:targetApi="21">false</item> <item name="android:windowAllowEnterTransitionOverlap" tools:targetApi="21">false</item>
...@@ -70,6 +70,7 @@ ...@@ -70,6 +70,7 @@
<item name="colorPrimaryDark">@android:color/black</item> <item name="colorPrimaryDark">@android:color/black</item>
<item name="colorPrimary">@color/light_active_color</item> <item name="colorPrimary">@color/light_active_color</item>
<item name="colorAccent">@color/light_active_color</item> <item name="colorAccent">@color/light_active_color</item>
<item name="colorControlHighlight">@color/control_highlight_color</item>
<item name="windowNoTitle">true</item> <item name="windowNoTitle">true</item>
</style> </style>
<style name="FullscreenWhite" parent="FullscreenWhiteBase" /> <style name="FullscreenWhite" parent="FullscreenWhiteBase" />
...@@ -80,6 +81,7 @@ ...@@ -80,6 +81,7 @@
<item name="android:windowIsFloating">true</item> <item name="android:windowIsFloating">true</item>
<item name="android:colorBackgroundCacheHint">@null</item> <item name="android:colorBackgroundCacheHint">@null</item>
<item name="android:windowIsTranslucent">true</item> <item name="android:windowIsTranslucent">true</item>
<item name="colorControlHighlight">@color/control_highlight_color</item>
<item name="windowNoTitle">true</item> <item name="windowNoTitle">true</item>
</style> </style>
...@@ -103,7 +105,8 @@ ...@@ -103,7 +105,8 @@
<!-- Overriding AppCompat values --> <!-- Overriding AppCompat values -->
<item name="colorAccent">@color/light_active_color</item> <item name="colorAccent">@color/light_active_color</item>
<item name="colorControlActivated">@color/light_active_color</item> <item name="colorControlActivated">@color/light_active_color</item>
<item name="colorControlNormal">@color/light_normal_color</item> <item name="colorControlNormal">@color/control_normal_color</item>
<item name="colorControlHighlight">@color/control_highlight_color</item>
<item name="colorPrimary">@color/light_active_color</item> <item name="colorPrimary">@color/light_active_color</item>
</style> </style>
...@@ -220,6 +223,7 @@ ...@@ -220,6 +223,7 @@
<item name="colorPrimaryDark">@android:color/black</item> <item name="colorPrimaryDark">@android:color/black</item>
<!-- Color of checkboxes, switches, buttons, etc. --> <!-- Color of checkboxes, switches, buttons, etc. -->
<item name="colorAccent">@color/pref_accent_color</item> <item name="colorAccent">@color/pref_accent_color</item>
<item name="colorControlHighlight">@color/control_highlight_color</item>
</style> </style>
<style name="ThemeWithActionBar" parent="ThemeWithActionBarBase" /> <style name="ThemeWithActionBar" parent="ThemeWithActionBarBase" />
...@@ -277,6 +281,7 @@ ...@@ -277,6 +281,7 @@
<item name="android:listDivider">@null</item> <item name="android:listDivider">@null</item>
<item name="android:listPreferredItemHeightSmall">48dp</item> <item name="android:listPreferredItemHeightSmall">48dp</item>
<item name="android:textAppearance">@style/BlackTitle1</item> <item name="android:textAppearance">@style/BlackTitle1</item>
<item name="colorControlHighlight">@color/control_highlight_color</item>
</style> </style>
<style name="OverflowMenuButton"> <style name="OverflowMenuButton">
<item name="android:layout_width">0dp</item> <item name="android:layout_width">0dp</item>
...@@ -452,6 +457,7 @@ ...@@ -452,6 +457,7 @@
<item name="android:textColorLink">@color/default_text_color_link</item> <item name="android:textColorLink">@color/default_text_color_link</item>
<item name="colorPrimaryDark">@android:color/black</item> <item name="colorPrimaryDark">@android:color/black</item>
<item name="colorAccent">@color/light_active_color</item> <item name="colorAccent">@color/light_active_color</item>
<item name="colorControlHighlight">@color/control_highlight_color</item>
<!-- Remove ActionBar --> <!-- Remove ActionBar -->
<item name="windowNoTitle">true</item> <item name="windowNoTitle">true</item>
......
...@@ -13,10 +13,11 @@ ...@@ -13,10 +13,11 @@
<color name="text_highlight_color">#C6DAFC</color> <color name="text_highlight_color">#C6DAFC</color>
<color name="error_text_color">@color/google_red_700</color> <color name="error_text_color">@color/google_red_700</color>
<!-- Control colors for toggles, checkboxes, ratio buttons and accent. --> <!-- Control colors for toggles, checkboxes, ratio buttons, list item highlight, and accent.
<!-- Deprecated. Use dark_mode_tint or default_icon_color for icons instead. --> Note that these should NOT be used for icon tint. -->
<color name="light_normal_color">#5A5A5A</color> <color name="control_normal_color">@color/modern_grey_700</color>
<color name="light_active_color">@color/modern_blue_600</color> <color name="light_active_color">@color/modern_blue_600</color>
<color name="control_highlight_color">@color/modern_grey_800_alpha_38</color>
<!-- Icon colors for drawables. --> <!-- Icon colors for drawables. -->
<color name="light_icon_color">@color/modern_grey_500</color> <color name="light_icon_color">@color/modern_grey_500</color>
...@@ -38,6 +39,8 @@ ...@@ -38,6 +39,8 @@
<color name="white_alpha_65">#A6FFFFFF</color> <color name="white_alpha_65">#A6FFFFFF</color>
<color name="white_alpha_90">#E6FFFFFF</color> <color name="white_alpha_90">#E6FFFFFF</color>
<color name="modern_grey_800_alpha_38">#613C4043</color>
<!-- Old color palette --> <!-- Old color palette -->
<color name="google_blue_grey_500">#607D8B</color> <color name="google_blue_grey_500">#607D8B</color>
<color name="google_blue_50">#E3F2FD</color> <color name="google_blue_50">#E3F2FD</color>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment