diff --git a/java/res/drawable-hdpi/btn_keyboard_key_dark_normal_off_lmp.9.png b/java/res/drawable-hdpi/btn_keyboard_key_dark_normal_off_lmp.9.png new file mode 100644 index 000000000..44308bfd8 Binary files /dev/null and b/java/res/drawable-hdpi/btn_keyboard_key_dark_normal_off_lmp.9.png differ diff --git a/java/res/drawable-hdpi/btn_keyboard_key_dark_normal_on_lmp.9.png b/java/res/drawable-hdpi/btn_keyboard_key_dark_normal_on_lmp.9.png index 814e40235..674783d7d 100644 Binary files a/java/res/drawable-hdpi/btn_keyboard_key_dark_normal_on_lmp.9.png and b/java/res/drawable-hdpi/btn_keyboard_key_dark_normal_on_lmp.9.png differ diff --git a/java/res/drawable-hdpi/btn_keyboard_key_dark_pressed_lmp.9.png b/java/res/drawable-hdpi/btn_keyboard_key_dark_pressed_lmp.9.png deleted file mode 100644 index 90abe3940..000000000 Binary files a/java/res/drawable-hdpi/btn_keyboard_key_dark_pressed_lmp.9.png and /dev/null differ diff --git a/java/res/drawable-hdpi/btn_keyboard_key_dark_pressed_off_lmp.9.png b/java/res/drawable-hdpi/btn_keyboard_key_dark_pressed_off_lmp.9.png index 48eeb3f54..96b625bd6 100644 Binary files a/java/res/drawable-hdpi/btn_keyboard_key_dark_pressed_off_lmp.9.png and b/java/res/drawable-hdpi/btn_keyboard_key_dark_pressed_off_lmp.9.png differ diff --git a/java/res/drawable-hdpi/btn_keyboard_key_dark_pressed_on_lmp.9.png b/java/res/drawable-hdpi/btn_keyboard_key_dark_pressed_on_lmp.9.png index 71e0683cd..20e53c2e5 100644 Binary files a/java/res/drawable-hdpi/btn_keyboard_key_dark_pressed_on_lmp.9.png and b/java/res/drawable-hdpi/btn_keyboard_key_dark_pressed_on_lmp.9.png differ diff --git a/java/res/drawable-hdpi/btn_keyboard_key_light_pressed_lmp.9.png b/java/res/drawable-hdpi/btn_keyboard_key_light_pressed_lmp.9.png deleted file mode 100644 index 6768241a7..000000000 Binary files a/java/res/drawable-hdpi/btn_keyboard_key_light_pressed_lmp.9.png and /dev/null differ diff --git a/java/res/drawable-mdpi/btn_keyboard_key_dark_normal_off_lmp.9.png b/java/res/drawable-mdpi/btn_keyboard_key_dark_normal_off_lmp.9.png new file mode 100644 index 000000000..837df83ce Binary files /dev/null and b/java/res/drawable-mdpi/btn_keyboard_key_dark_normal_off_lmp.9.png differ diff --git a/java/res/drawable-mdpi/btn_keyboard_key_dark_normal_on_lmp.9.png b/java/res/drawable-mdpi/btn_keyboard_key_dark_normal_on_lmp.9.png index b7b2dca43..977265214 100644 Binary files a/java/res/drawable-mdpi/btn_keyboard_key_dark_normal_on_lmp.9.png and b/java/res/drawable-mdpi/btn_keyboard_key_dark_normal_on_lmp.9.png differ diff --git a/java/res/drawable-mdpi/btn_keyboard_key_dark_pressed_lmp.9.png b/java/res/drawable-mdpi/btn_keyboard_key_dark_pressed_lmp.9.png deleted file mode 100644 index 4a92b80dd..000000000 Binary files a/java/res/drawable-mdpi/btn_keyboard_key_dark_pressed_lmp.9.png and /dev/null differ diff --git a/java/res/drawable-mdpi/btn_keyboard_key_dark_pressed_off_lmp.9.png b/java/res/drawable-mdpi/btn_keyboard_key_dark_pressed_off_lmp.9.png index 72125a065..d21363316 100644 Binary files a/java/res/drawable-mdpi/btn_keyboard_key_dark_pressed_off_lmp.9.png and b/java/res/drawable-mdpi/btn_keyboard_key_dark_pressed_off_lmp.9.png differ diff --git a/java/res/drawable-mdpi/btn_keyboard_key_dark_pressed_on_lmp.9.png b/java/res/drawable-mdpi/btn_keyboard_key_dark_pressed_on_lmp.9.png index 82413d4cc..6d20c540b 100644 Binary files a/java/res/drawable-mdpi/btn_keyboard_key_dark_pressed_on_lmp.9.png and b/java/res/drawable-mdpi/btn_keyboard_key_dark_pressed_on_lmp.9.png differ diff --git a/java/res/drawable-mdpi/btn_keyboard_key_light_pressed_lmp.9.png b/java/res/drawable-mdpi/btn_keyboard_key_light_pressed_lmp.9.png deleted file mode 100644 index 049385984..000000000 Binary files a/java/res/drawable-mdpi/btn_keyboard_key_light_pressed_lmp.9.png and /dev/null differ diff --git a/java/res/drawable-xhdpi/btn_keyboard_key_dark_normal_off_lmp.9.png b/java/res/drawable-xhdpi/btn_keyboard_key_dark_normal_off_lmp.9.png new file mode 100644 index 000000000..eeb447cc3 Binary files /dev/null and b/java/res/drawable-xhdpi/btn_keyboard_key_dark_normal_off_lmp.9.png differ diff --git a/java/res/drawable-xhdpi/btn_keyboard_key_dark_normal_on_lmp.9.png b/java/res/drawable-xhdpi/btn_keyboard_key_dark_normal_on_lmp.9.png index 20251a000..624ba8c27 100644 Binary files a/java/res/drawable-xhdpi/btn_keyboard_key_dark_normal_on_lmp.9.png and b/java/res/drawable-xhdpi/btn_keyboard_key_dark_normal_on_lmp.9.png differ diff --git a/java/res/drawable-xhdpi/btn_keyboard_key_dark_pressed_lmp.9.png b/java/res/drawable-xhdpi/btn_keyboard_key_dark_pressed_lmp.9.png deleted file mode 100644 index 84d173967..000000000 Binary files a/java/res/drawable-xhdpi/btn_keyboard_key_dark_pressed_lmp.9.png and /dev/null differ diff --git a/java/res/drawable-xhdpi/btn_keyboard_key_dark_pressed_off_lmp.9.png b/java/res/drawable-xhdpi/btn_keyboard_key_dark_pressed_off_lmp.9.png index ee4490eac..2bc16cfeb 100644 Binary files a/java/res/drawable-xhdpi/btn_keyboard_key_dark_pressed_off_lmp.9.png and b/java/res/drawable-xhdpi/btn_keyboard_key_dark_pressed_off_lmp.9.png differ diff --git a/java/res/drawable-xhdpi/btn_keyboard_key_dark_pressed_on_lmp.9.png b/java/res/drawable-xhdpi/btn_keyboard_key_dark_pressed_on_lmp.9.png index e8124776c..80dedd228 100644 Binary files a/java/res/drawable-xhdpi/btn_keyboard_key_dark_pressed_on_lmp.9.png and b/java/res/drawable-xhdpi/btn_keyboard_key_dark_pressed_on_lmp.9.png differ diff --git a/java/res/drawable-xhdpi/btn_keyboard_key_light_pressed_lmp.9.png b/java/res/drawable-xhdpi/btn_keyboard_key_light_pressed_lmp.9.png deleted file mode 100644 index f770962c3..000000000 Binary files a/java/res/drawable-xhdpi/btn_keyboard_key_light_pressed_lmp.9.png and /dev/null differ diff --git a/java/res/drawable-xxhdpi/btn_keyboard_key_dark_normal_off_lmp.9.png b/java/res/drawable-xxhdpi/btn_keyboard_key_dark_normal_off_lmp.9.png new file mode 100644 index 000000000..97b049eb0 Binary files /dev/null and b/java/res/drawable-xxhdpi/btn_keyboard_key_dark_normal_off_lmp.9.png differ diff --git a/java/res/drawable-xxhdpi/btn_keyboard_key_dark_normal_on_lmp.9.png b/java/res/drawable-xxhdpi/btn_keyboard_key_dark_normal_on_lmp.9.png index 97f96258e..2e8149709 100644 Binary files a/java/res/drawable-xxhdpi/btn_keyboard_key_dark_normal_on_lmp.9.png and b/java/res/drawable-xxhdpi/btn_keyboard_key_dark_normal_on_lmp.9.png differ diff --git a/java/res/drawable-xxhdpi/btn_keyboard_key_dark_pressed_lmp.9.png b/java/res/drawable-xxhdpi/btn_keyboard_key_dark_pressed_lmp.9.png deleted file mode 100644 index dfb16a76b..000000000 Binary files a/java/res/drawable-xxhdpi/btn_keyboard_key_dark_pressed_lmp.9.png and /dev/null differ diff --git a/java/res/drawable-xxhdpi/btn_keyboard_key_dark_pressed_off_lmp.9.png b/java/res/drawable-xxhdpi/btn_keyboard_key_dark_pressed_off_lmp.9.png index bf1d34686..d844b1713 100644 Binary files a/java/res/drawable-xxhdpi/btn_keyboard_key_dark_pressed_off_lmp.9.png and b/java/res/drawable-xxhdpi/btn_keyboard_key_dark_pressed_off_lmp.9.png differ diff --git a/java/res/drawable-xxhdpi/btn_keyboard_key_dark_pressed_on_lmp.9.png b/java/res/drawable-xxhdpi/btn_keyboard_key_dark_pressed_on_lmp.9.png index 962277165..9661f4a6e 100644 Binary files a/java/res/drawable-xxhdpi/btn_keyboard_key_dark_pressed_on_lmp.9.png and b/java/res/drawable-xxhdpi/btn_keyboard_key_dark_pressed_on_lmp.9.png differ diff --git a/java/res/drawable-xxhdpi/btn_keyboard_key_light_pressed_lmp.9.png b/java/res/drawable-xxhdpi/btn_keyboard_key_light_pressed_lmp.9.png deleted file mode 100644 index 17144b673..000000000 Binary files a/java/res/drawable-xxhdpi/btn_keyboard_key_light_pressed_lmp.9.png and /dev/null differ diff --git a/java/res/drawable/btn_keyboard_key_functional_lmp.xml b/java/res/drawable/btn_keyboard_key_functional_lmp.xml index 427b8d568..57a835596 100644 --- a/java/res/drawable/btn_keyboard_key_functional_lmp.xml +++ b/java/res/drawable/btn_keyboard_key_functional_lmp.xml @@ -17,6 +17,6 @@ - + android:drawable="@color/key_background_pressed_lmp" /> + diff --git a/java/res/drawable/btn_keyboard_key_lmp.xml b/java/res/drawable/btn_keyboard_key_lmp.xml index fdd19df68..4aaafb52f 100644 --- a/java/res/drawable/btn_keyboard_key_lmp.xml +++ b/java/res/drawable/btn_keyboard_key_lmp.xml @@ -17,32 +17,32 @@ + android:drawable="@color/key_background_pressed_lmp" /> + android:drawable="@color/key_background_lmp" /> + android:drawable="@color/key_background_pressed_lmp" /> + android:drawable="@color/key_background_lmp" /> + android:drawable="@drawable/btn_keyboard_key_dark_pressed_off_lmp" /> + android:drawable="@drawable/btn_keyboard_key_dark_normal_off_lmp" /> + android:drawable="@color/key_background_lmp" /> - + android:drawable="@color/key_background_pressed_lmp" /> + diff --git a/java/res/drawable/btn_keyboard_spacebar_lmp.xml b/java/res/drawable/btn_keyboard_spacebar_lmp.xml index 516cb0731..d05972fa1 100644 --- a/java/res/drawable/btn_keyboard_spacebar_lmp.xml +++ b/java/res/drawable/btn_keyboard_spacebar_lmp.xml @@ -16,6 +16,6 @@ - + android:drawable="@color/key_background_pressed_lmp" /> + diff --git a/java/res/drawable/btn_suggestion_lmp.xml b/java/res/drawable/btn_suggestion_lmp.xml index c778e236f..5c6b373f7 100644 --- a/java/res/drawable/btn_suggestion_lmp.xml +++ b/java/res/drawable/btn_suggestion_lmp.xml @@ -23,5 +23,5 @@ > + android:drawable="@color/suggested_word_background_selected_lmp" /> diff --git a/java/res/values/colors.xml b/java/res/values/colors.xml index baa0887bc..db9a27ae6 100644 --- a/java/res/values/colors.xml +++ b/java/res/values/colors.xml @@ -40,11 +40,17 @@ #B2F0F0F0 #99E0E0E0 - @android:color/white - #FFF0F0F0 - #D8F0F0F0 - #B2F0F0F0 - #99E0E0E0 + #808184 + #808184 + #7FCAC3 + #D87FCAC3 + #B27FCAC3 + #997FCAC3 + #384248 + #384248 + #546872 + #263238 + #384248 #FFEBEBEB #FF707070 diff --git a/java/res/values/themes-lmp.xml b/java/res/values/themes-lmp.xml index 41c4d09d5..c05190bae 100644 --- a/java/res/values/themes-lmp.xml +++ b/java/res/values/themes-lmp.xml @@ -35,7 +35,7 @@ parent="Keyboard" > - 0 + 3 @fraction/config_keyboard_top_padding_holo @fraction/config_keyboard_bottom_padding_holo @fraction/config_key_horizontal_gap_holo @@ -46,15 +46,15 @@ name="KeyboardView.LMP" parent="KeyboardView" > - @drawable/keyboard_background_holo + @color/keyboard_background_lmp @drawable/btn_keyboard_key_lmp bold @color/key_text_color_holo - @color/key_text_inactivated_color_holo + @color/key_text_inactive_color_lmp @color/key_hint_letter_color_lmp - @color/key_hint_label_color_holo - @color/key_shifted_letter_hint_inactivated_color_holo - @color/key_shifted_letter_hint_activated_color_holo + @color/key_text_inactive_color_lmp + @color/key_text_inactive_color_lmp + @color/key_text_color_holo @color/key_text_color_holo -1.0 @@ -70,9 +70,9 @@ @color/highlight_translucent_color_lmp false @drawable/sym_keyboard_space_led_holo - @color/spacebar_text_color_holo - 1.0 - @color/spacebar_text_shadow_color_holo + @color/key_text_inactive_color_lmp + + -1.0 @drawable/btn_keyboard_spacebar_lmp