LatinIME: Clean-up Material You definitions

* We really want to apply a theme to the shift key
* And to the emoji category ...

Includes Ibd69d0f980c13343b7b333506213f51b32b519f5.

Change-Id: I83388b2cebc88f697bd558ef1ad9d7cc1880f3f4

java/res/drawable/btn_keyboard_key_functional_normal_you.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/functional_normal_color_you" />
+    <solid android:color="@color/keyboard_key_functional_normal_color_you" />
 
     <padding android:left="1dp"
              android:top="1dp"

java/res/drawable/btn_keyboard_key_functional_pressed_you.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/functional_pressed_color_you"/>
-             
+    <solid android:color="@color/keyboard_key_functional_pressed_color_you"/>
+
     <padding android:left="1dp"
              android:top="1dp"
              android:right="1dp"

java/res/drawable/btn_keyboard_key_you.xml

@@ -21,6 +21,23 @@
     <item android:state_active="true"
           android:drawable="@drawable/btn_keyboard_key_normal_you" />
 
+    <!-- Toggle keys. Use checkable/checked state. -->
+    <item android:state_checkable="true" android:state_checked="true" android:state_pressed="true"
+          android:drawable="@drawable/btn_keyboard_key_functional_pressed_you" />
+    <item android:state_checkable="true" android:state_pressed="true"
+          android:drawable="@drawable/btn_keyboard_key_functional_pressed_you" />
+    <item android:state_checkable="true" android:state_checked="true"
+          android:drawable="@drawable/btn_keyboard_key_functional_pressed_you" />
+    <item android:state_checkable="true"
+          android:drawable="@drawable/btn_keyboard_key_functional_normal_you" />
+
+    <!-- Empty background keys. -->
+    <item android:state_empty="true" android:state_pressed="true"
+          android:drawable="@color/keyboard_key_pressed_color_you" />
+    <item android:state_empty="true"
+          android:drawable="@android:color/transparent" />
+
+    <!-- Normal keys. -->
     <item android:state_pressed="true"
           android:drawable="@drawable/btn_keyboard_key_pressed_you" />
     <item android:drawable="@drawable/btn_keyboard_key_normal_you" />

java/res/values-night/themes-you-colors.xml

 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
     <color name="keyboard_background_you">@android:color/system_neutral1_1000</color>
+    <!-- Keys -->
     <color name="keyboard_key_normal_color_you">@android:color/system_neutral1_800</color>
     <color name="keyboard_key_pressed_color_you">@android:color/system_neutral1_900</color>
     <color name="keyboard_key_text_color_you">@android:color/system_accent1_10</color>
-    <color name="functional_text_color_you">@color/keyboard_key_text_color_you</color>
-    <color name="category_page_indicator_color">@android:color/system_accent3_200</color>
-    <color name="icon_color_you">@android:color/system_accent3_100</color>
-    <color name="functional_normal_color_you">@android:color/system_neutral2_800</color>
-    <color name="functional_pressed_color_you">@android:color/system_neutral2_900</color>
+    <color name="keyboard_key_functional_normal_color_you">@android:color/system_neutral2_800</color>
+    <color name="keyboard_key_functional_pressed_color_you">@android:color/system_neutral2_900</color>
+    <color name="keyboard_key_functional_text_color_you">@color/keyboard_key_text_color_you</color>
     <color name="shift_normal_color_you">@android:color/system_neutral1_400</color>
     <color name="shift_locked_color_you">@android:color/system_accent1_10</color>
+    <color name="icon_color_you">@android:color/system_accent3_100</color>
     <color name="key_hint_letter_color_you">@color/key_hint_letter_color_lxx_dark</color>
+    <!-- Suggestion bar -->
     <color name="typed_word_color_you">@color/typed_word_color_lxx_dark</color>
     <color name="auto_correct_color_you">@color/auto_correct_color_lxx_dark</color>
     <color name="suggested_word_color_you">@color/suggested_word_color_lxx_dark</color>
-    <color name="highlight_color_you">@color/highlight_color_lxx_dark</color>
+    <!-- Gesture input -->
     <color name="gesture_trail_color_you">@android:color/system_accent3_100</color>
     <color name="gesture_floating_preview_text_color_you">@android:color/system_neutral1_0</color>
+    <!-- Misc -->
+    <color name="highlight_color_you">@color/highlight_color_lxx_dark</color>
+    <color name="emoji_tab_page_indicator_background_you">@android:color/system_accent3_200</color>
 </resources>

java/res/values/themes-you-colors.xml

 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
     <color name="keyboard_background_you">@android:color/system_accent3_10</color>
+    <!-- Keys -->
     <color name="keyboard_key_normal_color_you">@android:color/system_neutral1_100</color>
     <color name="keyboard_key_pressed_color_you">@android:color/system_neutral1_200</color>
     <color name="keyboard_key_text_color_you">@android:color/system_accent1_900</color>
-    <color name="functional_text_color_you">@color/keyboard_key_text_color_you</color>
-    <color name="category_page_indicator_color">@android:color/system_accent3_200</color>
-    <color name="icon_color_you">@android:color/system_accent3_800</color>
-    <color name="functional_normal_color_you">@android:color/system_neutral2_100</color>
-    <color name="functional_pressed_color_you">@android:color/system_neutral2_200</color>
+    <color name="keyboard_key_functional_normal_color_you">@android:color/system_neutral2_100</color>
+    <color name="keyboard_key_functional_pressed_color_you">@android:color/system_neutral2_200</color>
+    <color name="keyboard_key_functional_text_color_you">@color/keyboard_key_text_color_you</color>
     <color name="shift_normal_color_you">@android:color/system_neutral1_800</color>
     <color name="shift_locked_color_you">@android:color/system_accent1_1000</color>
+    <color name="icon_color_you">@android:color/system_accent3_800</color>
     <color name="key_hint_letter_color_you">@color/key_hint_letter_color_lxx_light</color>
+    <!-- Suggestion bar -->
     <color name="typed_word_color_you">@color/typed_word_color_lxx_light</color>
     <color name="auto_correct_color_you">@color/auto_correct_color_lxx_light</color>
     <color name="suggested_word_color_you">@color/suggested_word_color_lxx_light</color>
-    <color name="highlight_color_you">@color/highlight_color_lxx_light</color>
+    <!-- Gesture input -->
     <color name="gesture_trail_color_you">@android:color/system_accent3_800</color>
     <color name="gesture_floating_preview_text_color_you">@android:color/system_neutral1_1000</color>
+    <!-- Misc -->
+    <color name="highlight_color_you">@color/highlight_color_lxx_light</color>
+    <color name="emoji_tab_page_indicator_background_you">@android:color/system_accent3_200</color>
 </resources>

java/res/values/themes-you.xml

@@ -75,10 +75,10 @@
         <item name="functionalKeyBackground">@drawable/btn_keyboard_key_functional_you</item>
         <item name="spacebarBackground">@drawable/btn_keyboard_key_you</item>
         <item name="keyTextColor">@color/keyboard_key_text_color_you</item>
-        <item name="keyTextInactivatedColor">@color/functional_text_color_you</item>
-        <item name="functionalTextColor">@color/functional_text_color_you</item>
+        <item name="keyTextInactivatedColor">@color/keyboard_key_functional_text_color_you</item>
+        <item name="functionalTextColor">@color/keyboard_key_functional_text_color_you</item>
         <item name="keyHintLetterColor">@color/key_hint_letter_color_you</item>
-        <item name="keyHintLabelColor">@color/key_text_inactive_color_lxx_dark</item>
+        <item name="keyHintLabelColor">@color/key_hint_letter_color_you</item>
         <item name="keyShiftedLetterHintInactivatedColor">@color/key_text_inactive_color_lxx_dark</item>
         <item name="keyShiftedLetterHintActivatedColor">@color/key_text_color_lxx_dark</item>
         <item name="keyPreviewTextColor">@color/keyboard_key_text_color_you</item>
@@ -111,8 +111,8 @@
         parent="MainKeyboardView.You"
     >
         <item name="categoryIndicatorEnabled">false</item>
-        <item name="categoryPageIndicatorColor">@color/category_page_indicator_color</item>
-        <item name="categoryPageIndicatorBackground">@null</item>
+        <item name="categoryPageIndicatorColor">@color/highlight_color_you</item>
+        <item name="categoryPageIndicatorBackground">@color/emoji_tab_page_indicator_background_you</item>
         <item name="iconEmojiRecentsTab">@drawable/ic_emoji_recents_lxx_dark</item>
         <item name="iconEmojiCategory1Tab">@drawable/ic_emoji_people_lxx_dark</item>
         <item name="iconEmojiCategory2Tab">@drawable/ic_emoji_objects_lxx_dark</item>