Update Material theme colors
This CL also fixes a bug of pressed state color of suggestions strip
in Material Light theme.
Bug: 16208167
Change-Id: I4315893bd129f65f34c863b003c8b2cfab4d2d84
diff --git a/java/res/drawable/btn_suggestion_lxx_light.xml b/java/res/drawable/btn_suggestion_lxx_light.xml
index 84a9120..8dce195 100644
--- a/java/res/drawable/btn_suggestion_lxx_light.xml
+++ b/java/res/drawable/btn_suggestion_lxx_light.xml
@@ -23,5 +23,5 @@
>
<item
android:state_pressed="true"
- android:drawable="@color/suggested_word_background_selected_lxx_dark" />
+ android:drawable="@color/suggested_word_background_selected_lxx_light" />
</selector>
diff --git a/java/res/values/colors.xml b/java/res/values/colors.xml
index ad7a04e..ae4730c 100644
--- a/java/res/values/colors.xml
+++ b/java/res/values/colors.xml
@@ -40,34 +40,38 @@
<color name="typed_word_color_klp">#D8F0F0F0</color>
<color name="suggested_word_color_klp">#B2F0F0F0</color>
<color name="highlight_translucent_color_klp">#99E0E0E0</color>
- <!-- Color resources for LXX_Light theme. -->
- <color name="key_text_color_lxx_light">#546E7A</color>
- <color name="key_text_inactive_color_lxx_light">#99546E7A</color>
- <color name="key_hint_letter_color_lxx_light">#99546E7A</color>
+ <!-- Color resources for LXX_Light theme.
+ 15%:0x26 60%:0x99 70%:0xB3 75%:0xC0 80%:0xCC 85%:0xD9 -->
+ <color name="key_text_color_lxx_light">#37474F</color>
+ <color name="key_functional_text_color_lxx_light">#CC37474F</color>
+ <color name="key_text_inactive_color_lxx_light">#B337474F</color>
+ <color name="key_hint_letter_color_lxx_light">#B337474F</color>
<color name="highlight_color_lxx_light">#4DB6AC</color>
- <color name="typed_word_color_lxx_light">#D84DB6AC</color>
- <color name="suggested_word_color_lxx_light">#B24DB6AC</color>
+ <color name="typed_word_color_lxx_light">#D94DB6AC</color>
+ <color name="suggested_word_color_lxx_light">#B34DB6AC</color>
<color name="highlight_translucent_color_lxx_light">#994DB6AC</color>
<color name="keyboard_background_lxx_light">#ECEFF1</color>
<color name="key_background_lxx_light">#ECEFF1</color>
- <color name="key_background_pressed_lxx_light">#26546E7A</color>
+ <color name="key_background_pressed_lxx_light">#2637474F</color>
<color name="suggestions_strip_background_lxx_light">#E4E7E9</color>
- <color name="suggested_word_background_selected_lxx_light">#26546E7A</color>
+ <color name="suggested_word_background_selected_lxx_light">#2637474F</color>
<color name="gesture_floating_preview_color_lxx_light">#C0000000</color>
<color name="emoji_tab_page_indicator_background_lxx_light">#E4E7E9</color>
- <!-- Color resources for LXX_Dark theme. -->
- <color name="key_text_color_lxx_dark">#B3FFFFFF</color>
- <color name="key_text_inactive_color_lxx_dark">#66FFFFFF</color>
- <color name="key_hint_letter_color_lxx_dark">#66FFFFFF</color>
+ <!-- Color resources for LXX_Dark theme.
+ 10%:0x19 50%:0x80 60%:0x99 70%:0xB3 75%:0xC0 80%:0xCC 85%:0xD9 -->
+ <color name="key_text_color_lxx_dark">#CCFFFFFF</color>
+ <color name="key_functional_text_color_lxx_dark">#CCFFFFFF</color>
+ <color name="key_text_inactive_color_lxx_dark">#80FFFFFF</color>
+ <color name="key_hint_letter_color_lxx_dark">#80FFFFFF</color>
<color name="highlight_color_lxx_dark">#80CBC4</color>
- <color name="typed_word_color_lxx_dark">#D880CBC4</color>
- <color name="suggested_word_color_lxx_dark">#B280CBC4</color>
+ <color name="typed_word_color_lxx_dark">#D980CBC4</color>
+ <color name="suggested_word_color_lxx_dark">#B380CBC4</color>
<color name="highlight_translucent_color_lxx_dark">#9980CBC4</color>
<color name="keyboard_background_lxx_dark">#263238</color>
<color name="key_background_lxx_dark">#263238</color>
- <color name="key_background_pressed_lxx_dark">#26CFD8DC</color>
+ <color name="key_background_pressed_lxx_dark">#19FFFFFF</color>
<color name="suggestions_strip_background_lxx_dark">#21272B</color>
- <color name="suggested_word_background_selected_lxx_dark">#26CFD8DC</color>
+ <color name="suggested_word_background_selected_lxx_dark">#19FFFFFF</color>
<color name="gesture_floating_preview_color_lxx_dark">#C0000000</color>
<color name="emoji_tab_page_indicator_background_lxx_dark">#21272B</color>
<!-- Color resources for setup wizard and tutorial -->
diff --git a/java/res/values/themes-lxx-dark.xml b/java/res/values/themes-lxx-dark.xml
index f01b1f5..2385151 100644
--- a/java/res/values/themes-lxx-dark.xml
+++ b/java/res/values/themes-lxx-dark.xml
@@ -52,8 +52,8 @@
<item name="spacebarIconWidthRatio">0.9</item>
<item name="keyTypeface">normal</item>
<item name="keyTextColor">@color/key_text_color_lxx_dark</item>
- <item name="keyTextInactivatedColor">@color/key_text_inactive_color_lxx_dark</item>
- <item name="functionalTextColor">@color/key_hint_letter_color_lxx_dark</item>
+ <item name="keyTextInactivatedColor">@color/key_functional_text_color_lxx_dark</item>
+ <item name="functionalTextColor">@color/key_text_color_lxx_dark</item>
<item name="keyHintLetterColor">@color/key_hint_letter_color_lxx_dark</item>
<item name="keyHintLabelColor">@color/key_text_inactive_color_lxx_dark</item>
<item name="keyShiftedLetterHintInactivatedColor">@color/key_text_inactive_color_lxx_dark</item>
diff --git a/java/res/values/themes-lxx-light.xml b/java/res/values/themes-lxx-light.xml
index ba3dc9d..8f694d4 100644
--- a/java/res/values/themes-lxx-light.xml
+++ b/java/res/values/themes-lxx-light.xml
@@ -53,7 +53,7 @@
<item name="keyTypeface">normal</item>
<item name="keyTextColor">@color/key_text_color_lxx_light</item>
<item name="keyTextInactivatedColor">@color/key_text_inactive_color_lxx_light</item>
- <item name="functionalTextColor">@color/key_hint_letter_color_lxx_light</item>
+ <item name="functionalTextColor">@color/key_functional_text_color_lxx_light</item>
<item name="keyHintLetterColor">@color/key_hint_letter_color_lxx_light</item>
<item name="keyHintLabelColor">@color/key_text_inactive_color_lxx_light</item>
<item name="keyShiftedLetterHintInactivatedColor">@color/key_text_inactive_color_lxx_light</item>