Merge "Update Material icons and backgrounds" into lmp-dev

2014-07-29 02:38:32 +00:00 · 2014-07-29 02:38:32 +00:00 · 8ca3eb67d2
commit 8ca3eb67d2
parent c6862ee699 e14c680078
78 changed files with 7 additions and 12 deletions
--- a/java/res/drawable-hdpi/ic_emoji_people_activated_lxx_dark.png
+++ b/java/res/drawable-hdpi/ic_emoji_people_activated_lxx_dark.png
--- a/java/res/drawable-hdpi/ic_emoji_people_activated_lxx_light.png
+++ b/java/res/drawable-hdpi/ic_emoji_people_activated_lxx_light.png
--- a/java/res/drawable-hdpi/ic_emoji_people_normal_lxx_dark.png
+++ b/java/res/drawable-hdpi/ic_emoji_people_normal_lxx_dark.png
--- a/java/res/drawable-hdpi/ic_emoji_people_normal_lxx_light.png
+++ b/java/res/drawable-hdpi/ic_emoji_people_normal_lxx_light.png
--- a/java/res/drawable-hdpi/ic_emoji_places_activated_lxx_dark.png
+++ b/java/res/drawable-hdpi/ic_emoji_places_activated_lxx_dark.png
--- a/java/res/drawable-hdpi/ic_emoji_places_activated_lxx_light.png
+++ b/java/res/drawable-hdpi/ic_emoji_places_activated_lxx_light.png
--- a/java/res/drawable-hdpi/ic_emoji_places_normal_lxx_dark.png
+++ b/java/res/drawable-hdpi/ic_emoji_places_normal_lxx_dark.png
--- a/java/res/drawable-hdpi/ic_emoji_places_normal_lxx_light.png
+++ b/java/res/drawable-hdpi/ic_emoji_places_normal_lxx_light.png
--- a/java/res/drawable-hdpi/ic_emoji_recents_activated_lxx_dark.png
+++ b/java/res/drawable-hdpi/ic_emoji_recents_activated_lxx_dark.png
--- a/java/res/drawable-hdpi/ic_emoji_recents_activated_lxx_light.png
+++ b/java/res/drawable-hdpi/ic_emoji_recents_activated_lxx_light.png
--- a/java/res/drawable-hdpi/ic_emoji_recents_normal_lxx_dark.png
+++ b/java/res/drawable-hdpi/ic_emoji_recents_normal_lxx_dark.png
--- a/java/res/drawable-hdpi/ic_emoji_recents_normal_lxx_light.png
+++ b/java/res/drawable-hdpi/ic_emoji_recents_normal_lxx_light.png
--- a/java/res/drawable-hdpi/keyboard_background_lxx_dark.9.png
+++ b/java/res/drawable-hdpi/keyboard_background_lxx_dark.9.png
--- a/java/res/drawable-hdpi/keyboard_background_lxx_light.9.png
+++ b/java/res/drawable-hdpi/keyboard_background_lxx_light.9.png
--- a/java/res/drawable-hdpi/keyboard_suggest_strip_lxx_dark.9.png
+++ b/java/res/drawable-hdpi/keyboard_suggest_strip_lxx_dark.9.png
--- a/java/res/drawable-hdpi/keyboard_suggest_strip_lxx_light.9.png
+++ b/java/res/drawable-hdpi/keyboard_suggest_strip_lxx_light.9.png
--- a/java/res/drawable-hdpi/sym_keyboard_space_lxx_dark.png
+++ b/java/res/drawable-hdpi/sym_keyboard_space_lxx_dark.png
--- a/java/res/drawable-hdpi/sym_keyboard_space_lxx_light.png
+++ b/java/res/drawable-hdpi/sym_keyboard_space_lxx_light.png
--- a/java/res/drawable-mdpi/ic_emoji_people_activated_lxx_dark.png
+++ b/java/res/drawable-mdpi/ic_emoji_people_activated_lxx_dark.png
--- a/java/res/drawable-mdpi/ic_emoji_people_activated_lxx_light.png
+++ b/java/res/drawable-mdpi/ic_emoji_people_activated_lxx_light.png
--- a/java/res/drawable-mdpi/ic_emoji_people_normal_lxx_dark.png
+++ b/java/res/drawable-mdpi/ic_emoji_people_normal_lxx_dark.png
--- a/java/res/drawable-mdpi/ic_emoji_people_normal_lxx_light.png
+++ b/java/res/drawable-mdpi/ic_emoji_people_normal_lxx_light.png
--- a/java/res/drawable-mdpi/ic_emoji_places_activated_lxx_dark.png
+++ b/java/res/drawable-mdpi/ic_emoji_places_activated_lxx_dark.png
--- a/java/res/drawable-mdpi/ic_emoji_places_activated_lxx_light.png
+++ b/java/res/drawable-mdpi/ic_emoji_places_activated_lxx_light.png
--- a/java/res/drawable-mdpi/ic_emoji_places_normal_lxx_dark.png
+++ b/java/res/drawable-mdpi/ic_emoji_places_normal_lxx_dark.png
--- a/java/res/drawable-mdpi/ic_emoji_places_normal_lxx_light.png
+++ b/java/res/drawable-mdpi/ic_emoji_places_normal_lxx_light.png
--- a/java/res/drawable-mdpi/ic_emoji_recents_activated_lxx_dark.png
+++ b/java/res/drawable-mdpi/ic_emoji_recents_activated_lxx_dark.png
--- a/java/res/drawable-mdpi/ic_emoji_recents_activated_lxx_light.png
+++ b/java/res/drawable-mdpi/ic_emoji_recents_activated_lxx_light.png
--- a/java/res/drawable-mdpi/ic_emoji_recents_normal_lxx_dark.png
+++ b/java/res/drawable-mdpi/ic_emoji_recents_normal_lxx_dark.png
--- a/java/res/drawable-mdpi/ic_emoji_recents_normal_lxx_light.png
+++ b/java/res/drawable-mdpi/ic_emoji_recents_normal_lxx_light.png
--- a/java/res/drawable-mdpi/keyboard_background_lxx_dark.9.png
+++ b/java/res/drawable-mdpi/keyboard_background_lxx_dark.9.png
--- a/java/res/drawable-mdpi/keyboard_background_lxx_light.9.png
+++ b/java/res/drawable-mdpi/keyboard_background_lxx_light.9.png
--- a/java/res/drawable-mdpi/keyboard_suggest_strip_lxx_dark.9.png
+++ b/java/res/drawable-mdpi/keyboard_suggest_strip_lxx_dark.9.png
--- a/java/res/drawable-mdpi/keyboard_suggest_strip_lxx_light.9.png
+++ b/java/res/drawable-mdpi/keyboard_suggest_strip_lxx_light.9.png
--- a/java/res/drawable-mdpi/sym_keyboard_space_lxx_dark.png
+++ b/java/res/drawable-mdpi/sym_keyboard_space_lxx_dark.png
--- a/java/res/drawable-mdpi/sym_keyboard_space_lxx_light.png
+++ b/java/res/drawable-mdpi/sym_keyboard_space_lxx_light.png
--- a/java/res/drawable-xhdpi/ic_emoji_people_activated_lxx_dark.png
+++ b/java/res/drawable-xhdpi/ic_emoji_people_activated_lxx_dark.png
--- a/java/res/drawable-xhdpi/ic_emoji_people_activated_lxx_light.png
+++ b/java/res/drawable-xhdpi/ic_emoji_people_activated_lxx_light.png
--- a/java/res/drawable-xhdpi/ic_emoji_people_normal_lxx_dark.png
+++ b/java/res/drawable-xhdpi/ic_emoji_people_normal_lxx_dark.png
--- a/java/res/drawable-xhdpi/ic_emoji_people_normal_lxx_light.png
+++ b/java/res/drawable-xhdpi/ic_emoji_people_normal_lxx_light.png
--- a/java/res/drawable-xhdpi/ic_emoji_places_activated_lxx_dark.png
+++ b/java/res/drawable-xhdpi/ic_emoji_places_activated_lxx_dark.png
--- a/java/res/drawable-xhdpi/ic_emoji_places_activated_lxx_light.png
+++ b/java/res/drawable-xhdpi/ic_emoji_places_activated_lxx_light.png
--- a/java/res/drawable-xhdpi/ic_emoji_places_normal_lxx_dark.png
+++ b/java/res/drawable-xhdpi/ic_emoji_places_normal_lxx_dark.png
--- a/java/res/drawable-xhdpi/ic_emoji_places_normal_lxx_light.png
+++ b/java/res/drawable-xhdpi/ic_emoji_places_normal_lxx_light.png
--- a/java/res/drawable-xhdpi/ic_emoji_recents_activated_lxx_dark.png
+++ b/java/res/drawable-xhdpi/ic_emoji_recents_activated_lxx_dark.png
--- a/java/res/drawable-xhdpi/ic_emoji_recents_activated_lxx_light.png
+++ b/java/res/drawable-xhdpi/ic_emoji_recents_activated_lxx_light.png
--- a/java/res/drawable-xhdpi/ic_emoji_recents_normal_lxx_dark.png
+++ b/java/res/drawable-xhdpi/ic_emoji_recents_normal_lxx_dark.png
--- a/java/res/drawable-xhdpi/ic_emoji_recents_normal_lxx_light.png
+++ b/java/res/drawable-xhdpi/ic_emoji_recents_normal_lxx_light.png
--- a/java/res/drawable-xhdpi/keyboard_background_lxx_dark.9.png
+++ b/java/res/drawable-xhdpi/keyboard_background_lxx_dark.9.png
--- a/java/res/drawable-xhdpi/keyboard_background_lxx_light.9.png
+++ b/java/res/drawable-xhdpi/keyboard_background_lxx_light.9.png
--- a/java/res/drawable-xhdpi/keyboard_suggest_strip_lxx_dark.9.png
+++ b/java/res/drawable-xhdpi/keyboard_suggest_strip_lxx_dark.9.png
--- a/java/res/drawable-xhdpi/keyboard_suggest_strip_lxx_light.9.png
+++ b/java/res/drawable-xhdpi/keyboard_suggest_strip_lxx_light.9.png
--- a/java/res/drawable-xhdpi/sym_keyboard_space_lxx_dark.png
+++ b/java/res/drawable-xhdpi/sym_keyboard_space_lxx_dark.png
--- a/java/res/drawable-xhdpi/sym_keyboard_space_lxx_light.png
+++ b/java/res/drawable-xhdpi/sym_keyboard_space_lxx_light.png
--- a/java/res/drawable-xxhdpi/ic_emoji_people_activated_lxx_dark.png
+++ b/java/res/drawable-xxhdpi/ic_emoji_people_activated_lxx_dark.png
--- a/java/res/drawable-xxhdpi/ic_emoji_people_activated_lxx_light.png
+++ b/java/res/drawable-xxhdpi/ic_emoji_people_activated_lxx_light.png
--- a/java/res/drawable-xxhdpi/ic_emoji_people_normal_lxx_dark.png
+++ b/java/res/drawable-xxhdpi/ic_emoji_people_normal_lxx_dark.png
--- a/java/res/drawable-xxhdpi/ic_emoji_people_normal_lxx_light.png
+++ b/java/res/drawable-xxhdpi/ic_emoji_people_normal_lxx_light.png
--- a/java/res/drawable-xxhdpi/ic_emoji_places_activated_lxx_dark.png
+++ b/java/res/drawable-xxhdpi/ic_emoji_places_activated_lxx_dark.png
--- a/java/res/drawable-xxhdpi/ic_emoji_places_activated_lxx_light.png
+++ b/java/res/drawable-xxhdpi/ic_emoji_places_activated_lxx_light.png
--- a/java/res/drawable-xxhdpi/ic_emoji_places_normal_lxx_dark.png
+++ b/java/res/drawable-xxhdpi/ic_emoji_places_normal_lxx_dark.png
--- a/java/res/drawable-xxhdpi/ic_emoji_places_normal_lxx_light.png
+++ b/java/res/drawable-xxhdpi/ic_emoji_places_normal_lxx_light.png
--- a/java/res/drawable-xxhdpi/ic_emoji_recents_activated_lxx_dark.png
+++ b/java/res/drawable-xxhdpi/ic_emoji_recents_activated_lxx_dark.png
--- a/java/res/drawable-xxhdpi/ic_emoji_recents_activated_lxx_light.png
+++ b/java/res/drawable-xxhdpi/ic_emoji_recents_activated_lxx_light.png
--- a/java/res/drawable-xxhdpi/ic_emoji_recents_normal_lxx_dark.png
+++ b/java/res/drawable-xxhdpi/ic_emoji_recents_normal_lxx_dark.png
--- a/java/res/drawable-xxhdpi/ic_emoji_recents_normal_lxx_light.png
+++ b/java/res/drawable-xxhdpi/ic_emoji_recents_normal_lxx_light.png
--- a/java/res/drawable-xxhdpi/keyboard_background_lxx_dark.9.png
+++ b/java/res/drawable-xxhdpi/keyboard_background_lxx_dark.9.png
--- a/java/res/drawable-xxhdpi/keyboard_background_lxx_light.9.png
+++ b/java/res/drawable-xxhdpi/keyboard_background_lxx_light.9.png
--- a/java/res/drawable-xxhdpi/keyboard_suggest_strip_lxx_dark.9.png
+++ b/java/res/drawable-xxhdpi/keyboard_suggest_strip_lxx_dark.9.png
--- a/java/res/drawable-xxhdpi/keyboard_suggest_strip_lxx_light.9.png
+++ b/java/res/drawable-xxhdpi/keyboard_suggest_strip_lxx_light.9.png
--- a/java/res/drawable-xxhdpi/sym_keyboard_space_lxx_dark.png
+++ b/java/res/drawable-xxhdpi/sym_keyboard_space_lxx_dark.png
--- a/java/res/drawable-xxhdpi/sym_keyboard_space_lxx_light.png
+++ b/java/res/drawable-xxhdpi/sym_keyboard_space_lxx_light.png
--- a/java/res/layout/suggestion_divider.xml
+++ b/java/res/layout/suggestion_divider.xml
@ -31,4 +31,5 @@
    android:longClickable="false"
    android:hapticFeedbackEnabled="false"
    android:soundEffectsEnabled="false"
+    android:background="@null"
    style="?attr/suggestionStripViewStyle" />
--- a/java/res/values/colors.xml
+++ b/java/res/values/colors.xml
@ -53,10 +53,8 @@
    <color name="suggested_word_color_lxx_light">#B337474F</color>
    <color name="gesture_trail_color_lxx_light">#4DB6AC</color>
    <color name="sliding_key_input_preview_color_lxx_light">#B34DB6AC</color>
-    <color name="keyboard_background_lxx_light">#ECEFF1</color>
    <color name="key_background_lxx_light">#ECEFF1</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">#2637474F</color>
    <color name="gesture_floating_preview_color_lxx_light">#E6ECEFF1</color>
    <color name="emoji_tab_page_indicator_background_lxx_light">#E4E7E9</color>
@ -73,10 +71,8 @@
    <color name="suggested_word_color_lxx_dark">#B3FFFFFF</color>
    <color name="gesture_trail_color_lxx_dark">#80CBC4</color>
    <color name="sliding_key_input_preview_color_lxx_dark">#B380CBC4</color>
-    <color name="keyboard_background_lxx_dark">#263238</color>
    <color name="key_background_lxx_dark">#263238</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">#19FFFFFF</color>
    <color name="gesture_floating_preview_color_lxx_dark">#E621272B</color>
    <color name="emoji_tab_page_indicator_background_lxx_dark">#21272B</color>
--- a/java/res/values/keyboard-icons-lxx-dark.xml
+++ b/java/res/values/keyboard-icons-lxx-dark.xml
@ -34,8 +34,7 @@
        <item name="iconPreviousKey">@drawable/sym_keyboard_previous_lxx_dark</item>
        <item name="iconTabKey">@drawable/sym_keyboard_tab_lxx_dark</item>
        <item name="iconShortcutKey">@drawable/sym_keyboard_voice_lxx_dark</item>
-        <!-- TODO: Update this icon for LXX_Dark theme. -->
-        <item name="iconSpaceKeyForNumberLayout">@drawable/sym_keyboard_space_holo_dark</item>
+        <item name="iconSpaceKeyForNumberLayout">@drawable/sym_keyboard_space_lxx_dark</item>
        <item name="iconShiftKeyShifted">@drawable/sym_keyboard_shift_locked_lxx_dark</item>
        <item name="iconShortcutKeyDisabled">@drawable/sym_keyboard_voice_off_lxx_dark</item>
        <item name="iconLanguageSwitchKey">@drawable/sym_keyboard_language_switch_lxx_dark</item>
--- a/java/res/values/keyboard-icons-lxx-light.xml
+++ b/java/res/values/keyboard-icons-lxx-light.xml
@ -34,8 +34,7 @@
        <item name="iconPreviousKey">@drawable/sym_keyboard_previous_lxx_light</item>
        <item name="iconTabKey">@drawable/sym_keyboard_tab_lxx_light</item>
        <item name="iconShortcutKey">@drawable/sym_keyboard_voice_lxx_light</item>
-        <!-- TODO: Update this icon for LXX_Light theme. -->
-        <item name="iconSpaceKeyForNumberLayout">@drawable/sym_keyboard_space_holo_dark</item>
+        <item name="iconSpaceKeyForNumberLayout">@drawable/sym_keyboard_space_lxx_light</item>
        <item name="iconShiftKeyShifted">@drawable/sym_keyboard_shift_locked_lxx_light</item>
        <item name="iconShortcutKeyDisabled">@drawable/sym_keyboard_voice_off_lxx_light</item>
        <item name="iconLanguageSwitchKey">@drawable/sym_keyboard_language_switch_lxx_light</item>
--- a/java/res/values/themes-lxx-dark.xml
+++ b/java/res/values/themes-lxx-dark.xml
@ -45,7 +45,7 @@
        name="KeyboardView.LXX_Dark"
        parent="KeyboardView"
    >
-        <item name="android:background">@color/keyboard_background_lxx_dark</item>
+        <item name="android:background">@drawable/keyboard_background_lxx_dark</item>
        <item name="keyBackground">@drawable/btn_keyboard_key_lxx_dark</item>
        <item name="functionalKeyBackground">@drawable/btn_keyboard_key_functional_lxx_dark</item>
        <item name="spacebarBackground">@drawable/btn_keyboard_spacebar_lxx_dark</item>
@ -119,7 +119,7 @@
        <item name="centerSuggestionPercentile">@fraction/config_center_suggestion_percentile</item>
        <item name="maxMoreSuggestionsRow">@integer/config_max_more_suggestions_row</item>
        <item name="minMoreSuggestionsWidth">@fraction/config_min_more_suggestions_width</item>
-        <item name="android:background">@color/suggestions_strip_background_lxx_dark</item>
+        <item name="android:background">@drawable/keyboard_suggest_strip_lxx_dark</item>
        <item name="android:src">@drawable/suggestions_strip_divider_lxx_dark</item>
        <item name="suggestionStripOptions">autoCorrectBold|validTypedWordBold</item>
        <item name="colorValidTypedWord">@color/typed_word_color_lxx_dark</item>
--- a/java/res/values/themes-lxx-light.xml
+++ b/java/res/values/themes-lxx-light.xml
@ -45,7 +45,7 @@
        name="KeyboardView.LXX_Light"
        parent="KeyboardView"
    >
-        <item name="android:background">@color/keyboard_background_lxx_light</item>
+        <item name="android:background">@drawable/keyboard_background_lxx_light</item>
        <item name="keyBackground">@drawable/btn_keyboard_key_lxx_light</item>
        <item name="functionalKeyBackground">@drawable/btn_keyboard_key_functional_lxx_light</item>
        <item name="spacebarBackground">@drawable/btn_keyboard_spacebar_lxx_light</item>
@ -120,7 +120,7 @@
        <item name="centerSuggestionPercentile">@fraction/config_center_suggestion_percentile</item>
        <item name="maxMoreSuggestionsRow">@integer/config_max_more_suggestions_row</item>
        <item name="minMoreSuggestionsWidth">@fraction/config_min_more_suggestions_width</item>
-        <item name="android:background">@color/suggestions_strip_background_lxx_light</item>
+        <item name="android:background">@drawable/keyboard_suggest_strip_lxx_light</item>
        <item name="android:src">@drawable/suggestions_strip_divider_lxx_light</item>
        <item name="suggestionStripOptions">autoCorrectBold|validTypedWordBold</item>
        <item name="colorValidTypedWord">@color/typed_word_color_lxx_light</item>