diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2014-05-19 11:34:11 +0900 |
|---|---|---|
| committer | Tadashi G. Takaoka <takaoka@google.com> | 2014-07-10 07:43:04 +0900 |
| commit | f9f409530ccdc975ef965b1d1fee44bbd341d718 (patch) | |
| tree | a697d64dd02a44d4e64485b927ac48a9502eedcc | |
| parent | 8e7260a014f419744f3d1921b232b5efbd5d5086 (diff) | |
| download | latinime-f9f409530ccdc975ef965b1d1fee44bbd341d718.tar.gz latinime-f9f409530ccdc975ef965b1d1fee44bbd341d718.tar.xz latinime-f9f409530ccdc975ef965b1d1fee44bbd341d718.zip | |
Add Material Light theme
Bug: 15782668
Change-Id: Id2ae47cfb2065d73f13701b9c6a041129dfd08ae
120 files changed, 388 insertions, 27 deletions
diff --git a/java/res/drawable-hdpi/btn_keyboard_key_active_lxx_light.9.png b/java/res/drawable-hdpi/btn_keyboard_key_active_lxx_light.9.png Binary files differnew file mode 100644 index 000000000..854c849cb --- /dev/null +++ b/java/res/drawable-hdpi/btn_keyboard_key_active_lxx_light.9.png diff --git a/java/res/drawable-hdpi/btn_keyboard_key_active_pressed_lxx_light.9.png b/java/res/drawable-hdpi/btn_keyboard_key_active_pressed_lxx_light.9.png Binary files differnew file mode 100644 index 000000000..7a7e98297 --- /dev/null +++ b/java/res/drawable-hdpi/btn_keyboard_key_active_pressed_lxx_light.9.png diff --git a/java/res/drawable-hdpi/btn_keyboard_key_normal_off_lxx_light.9.png b/java/res/drawable-hdpi/btn_keyboard_key_normal_off_lxx_light.9.png Binary files differnew file mode 100644 index 000000000..0802b11f8 --- /dev/null +++ b/java/res/drawable-hdpi/btn_keyboard_key_normal_off_lxx_light.9.png diff --git a/java/res/drawable-hdpi/btn_keyboard_key_normal_on_lxx_light.9.png b/java/res/drawable-hdpi/btn_keyboard_key_normal_on_lxx_light.9.png Binary files differnew file mode 100644 index 000000000..f0a89c524 --- /dev/null +++ b/java/res/drawable-hdpi/btn_keyboard_key_normal_on_lxx_light.9.png diff --git a/java/res/drawable-hdpi/btn_keyboard_key_popup_selected_lxx_light.9.png b/java/res/drawable-hdpi/btn_keyboard_key_popup_selected_lxx_light.9.png Binary files differnew file mode 100644 index 000000000..45d586570 --- /dev/null +++ b/java/res/drawable-hdpi/btn_keyboard_key_popup_selected_lxx_light.9.png diff --git a/java/res/drawable-hdpi/btn_keyboard_key_pressed_off_lxx_light.9.png b/java/res/drawable-hdpi/btn_keyboard_key_pressed_off_lxx_light.9.png Binary files differnew file mode 100644 index 000000000..1b52bcc85 --- /dev/null +++ b/java/res/drawable-hdpi/btn_keyboard_key_pressed_off_lxx_light.9.png diff --git a/java/res/drawable-hdpi/btn_keyboard_key_pressed_on_lxx_light.9.png b/java/res/drawable-hdpi/btn_keyboard_key_pressed_on_lxx_light.9.png Binary files differnew file mode 100644 index 000000000..1bc2a233f --- /dev/null +++ b/java/res/drawable-hdpi/btn_keyboard_key_pressed_on_lxx_light.9.png diff --git a/java/res/drawable-hdpi/keyboard_key_feedback_background_lxx_light.9.png b/java/res/drawable-hdpi/keyboard_key_feedback_background_lxx_light.9.png Binary files differnew file mode 100644 index 000000000..615a40a3d --- /dev/null +++ b/java/res/drawable-hdpi/keyboard_key_feedback_background_lxx_light.9.png diff --git a/java/res/drawable-hdpi/keyboard_key_feedback_more_background_lxx_light.9.png b/java/res/drawable-hdpi/keyboard_key_feedback_more_background_lxx_light.9.png Binary files differnew file mode 100644 index 000000000..c5871f699 --- /dev/null +++ b/java/res/drawable-hdpi/keyboard_key_feedback_more_background_lxx_light.9.png diff --git a/java/res/drawable-hdpi/keyboard_popup_panel_background_lxx_light.9.png b/java/res/drawable-hdpi/keyboard_popup_panel_background_lxx_light.9.png Binary files differnew file mode 100644 index 000000000..41b0a1b35 --- /dev/null +++ b/java/res/drawable-hdpi/keyboard_popup_panel_background_lxx_light.9.png diff --git a/java/res/drawable-hdpi/suggestions_strip_divider_lxx_light.png b/java/res/drawable-hdpi/suggestions_strip_divider_lxx_light.png Binary files differnew file mode 100644 index 000000000..12485ef1a --- /dev/null +++ b/java/res/drawable-hdpi/suggestions_strip_divider_lxx_light.png diff --git a/java/res/drawable-hdpi/sym_keyboard_delete_lxx_light.png b/java/res/drawable-hdpi/sym_keyboard_delete_lxx_light.png Binary files differnew file mode 100644 index 000000000..e17d29715 --- /dev/null +++ b/java/res/drawable-hdpi/sym_keyboard_delete_lxx_light.png diff --git a/java/res/drawable-hdpi/sym_keyboard_done_lxx_light.png b/java/res/drawable-hdpi/sym_keyboard_done_lxx_light.png Binary files differnew file mode 100644 index 000000000..04eab599d --- /dev/null +++ b/java/res/drawable-hdpi/sym_keyboard_done_lxx_light.png diff --git a/java/res/drawable-hdpi/sym_keyboard_go_lxx_light.png b/java/res/drawable-hdpi/sym_keyboard_go_lxx_light.png Binary files differnew file mode 100644 index 000000000..189d609e1 --- /dev/null +++ b/java/res/drawable-hdpi/sym_keyboard_go_lxx_light.png diff --git a/java/res/drawable-hdpi/sym_keyboard_language_switch_lxx_light.png b/java/res/drawable-hdpi/sym_keyboard_language_switch_lxx_light.png Binary files differnew file mode 100644 index 000000000..1c7af2018 --- /dev/null +++ b/java/res/drawable-hdpi/sym_keyboard_language_switch_lxx_light.png diff --git a/java/res/drawable-hdpi/sym_keyboard_next_lxx_light.png b/java/res/drawable-hdpi/sym_keyboard_next_lxx_light.png Binary files differnew file mode 100644 index 000000000..70679b028 --- /dev/null +++ b/java/res/drawable-hdpi/sym_keyboard_next_lxx_light.png diff --git a/java/res/drawable-hdpi/sym_keyboard_previous_lxx_light.png b/java/res/drawable-hdpi/sym_keyboard_previous_lxx_light.png Binary files differnew file mode 100644 index 000000000..952dd4fd2 --- /dev/null +++ b/java/res/drawable-hdpi/sym_keyboard_previous_lxx_light.png diff --git a/java/res/drawable-hdpi/sym_keyboard_return_lxx_light.png b/java/res/drawable-hdpi/sym_keyboard_return_lxx_light.png Binary files differnew file mode 100644 index 000000000..9ab1a3f50 --- /dev/null +++ b/java/res/drawable-hdpi/sym_keyboard_return_lxx_light.png diff --git a/java/res/drawable-hdpi/sym_keyboard_search_lxx_light.png b/java/res/drawable-hdpi/sym_keyboard_search_lxx_light.png Binary files differnew file mode 100644 index 000000000..ec7062723 --- /dev/null +++ b/java/res/drawable-hdpi/sym_keyboard_search_lxx_light.png diff --git a/java/res/drawable-hdpi/sym_keyboard_send_lxx_light.png b/java/res/drawable-hdpi/sym_keyboard_send_lxx_light.png Binary files differnew file mode 100644 index 000000000..bbc5094c9 --- /dev/null +++ b/java/res/drawable-hdpi/sym_keyboard_send_lxx_light.png diff --git a/java/res/drawable-hdpi/sym_keyboard_settings_lxx_light.png b/java/res/drawable-hdpi/sym_keyboard_settings_lxx_light.png Binary files differnew file mode 100644 index 000000000..144b15b0c --- /dev/null +++ b/java/res/drawable-hdpi/sym_keyboard_settings_lxx_light.png diff --git a/java/res/drawable-hdpi/sym_keyboard_shift_locked_lxx_light.png b/java/res/drawable-hdpi/sym_keyboard_shift_locked_lxx_light.png Binary files differnew file mode 100644 index 000000000..657f65acc --- /dev/null +++ b/java/res/drawable-hdpi/sym_keyboard_shift_locked_lxx_light.png diff --git a/java/res/drawable-hdpi/sym_keyboard_shift_lxx_light.png b/java/res/drawable-hdpi/sym_keyboard_shift_lxx_light.png Binary files differnew file mode 100644 index 000000000..a46d65383 --- /dev/null +++ b/java/res/drawable-hdpi/sym_keyboard_shift_lxx_light.png diff --git a/java/res/drawable-hdpi/sym_keyboard_smiley_lxx_light.png b/java/res/drawable-hdpi/sym_keyboard_smiley_lxx_light.png Binary files differnew file mode 100644 index 000000000..2cfe1d406 --- /dev/null +++ b/java/res/drawable-hdpi/sym_keyboard_smiley_lxx_light.png diff --git a/java/res/drawable-hdpi/sym_keyboard_spacebar_lxx_light.9.png b/java/res/drawable-hdpi/sym_keyboard_spacebar_lxx_light.9.png Binary files differnew file mode 100644 index 000000000..c27a36e81 --- /dev/null +++ b/java/res/drawable-hdpi/sym_keyboard_spacebar_lxx_light.9.png diff --git a/java/res/drawable-hdpi/sym_keyboard_voice_lxx_light.png b/java/res/drawable-hdpi/sym_keyboard_voice_lxx_light.png Binary files differnew file mode 100644 index 000000000..d6b070eb6 --- /dev/null +++ b/java/res/drawable-hdpi/sym_keyboard_voice_lxx_light.png diff --git a/java/res/drawable-hdpi/sym_keyboard_voice_off_lxx_light.png b/java/res/drawable-hdpi/sym_keyboard_voice_off_lxx_light.png Binary files differnew file mode 100644 index 000000000..d33ab4e88 --- /dev/null +++ b/java/res/drawable-hdpi/sym_keyboard_voice_off_lxx_light.png diff --git a/java/res/drawable-mdpi/btn_keyboard_key_active_lxx_light.9.png b/java/res/drawable-mdpi/btn_keyboard_key_active_lxx_light.9.png Binary files differnew file mode 100644 index 000000000..e7a585b70 --- /dev/null +++ b/java/res/drawable-mdpi/btn_keyboard_key_active_lxx_light.9.png diff --git a/java/res/drawable-mdpi/btn_keyboard_key_active_pressed_lxx_light.9.png b/java/res/drawable-mdpi/btn_keyboard_key_active_pressed_lxx_light.9.png Binary files differnew file mode 100644 index 000000000..5a6513392 --- /dev/null +++ b/java/res/drawable-mdpi/btn_keyboard_key_active_pressed_lxx_light.9.png diff --git a/java/res/drawable-mdpi/btn_keyboard_key_normal_off_lxx_light.9.png b/java/res/drawable-mdpi/btn_keyboard_key_normal_off_lxx_light.9.png Binary files differnew file mode 100644 index 000000000..afcb4f9b1 --- /dev/null +++ b/java/res/drawable-mdpi/btn_keyboard_key_normal_off_lxx_light.9.png diff --git a/java/res/drawable-mdpi/btn_keyboard_key_normal_on_lxx_light.9.png b/java/res/drawable-mdpi/btn_keyboard_key_normal_on_lxx_light.9.png Binary files differnew file mode 100644 index 000000000..3323d2c7d --- /dev/null +++ b/java/res/drawable-mdpi/btn_keyboard_key_normal_on_lxx_light.9.png diff --git a/java/res/drawable-mdpi/btn_keyboard_key_popup_selected_lxx_light.9.png b/java/res/drawable-mdpi/btn_keyboard_key_popup_selected_lxx_light.9.png Binary files differnew file mode 100644 index 000000000..e388cfb2f --- /dev/null +++ b/java/res/drawable-mdpi/btn_keyboard_key_popup_selected_lxx_light.9.png diff --git a/java/res/drawable-mdpi/btn_keyboard_key_pressed_off_lxx_light.9.png b/java/res/drawable-mdpi/btn_keyboard_key_pressed_off_lxx_light.9.png Binary files differnew file mode 100644 index 000000000..d8e4355ce --- /dev/null +++ b/java/res/drawable-mdpi/btn_keyboard_key_pressed_off_lxx_light.9.png diff --git a/java/res/drawable-mdpi/btn_keyboard_key_pressed_on_lxx_light.9.png b/java/res/drawable-mdpi/btn_keyboard_key_pressed_on_lxx_light.9.png Binary files differnew file mode 100644 index 000000000..b9a42fa72 --- /dev/null +++ b/java/res/drawable-mdpi/btn_keyboard_key_pressed_on_lxx_light.9.png diff --git a/java/res/drawable-mdpi/keyboard_key_feedback_background_lxx_light.9.png b/java/res/drawable-mdpi/keyboard_key_feedback_background_lxx_light.9.png Binary files differnew file mode 100644 index 000000000..f97cfb913 --- /dev/null +++ b/java/res/drawable-mdpi/keyboard_key_feedback_background_lxx_light.9.png diff --git a/java/res/drawable-mdpi/keyboard_key_feedback_more_background_lxx_light.9.png b/java/res/drawable-mdpi/keyboard_key_feedback_more_background_lxx_light.9.png Binary files differnew file mode 100644 index 000000000..1fe06f9fe --- /dev/null +++ b/java/res/drawable-mdpi/keyboard_key_feedback_more_background_lxx_light.9.png diff --git a/java/res/drawable-mdpi/keyboard_popup_panel_background_lxx_light.9.png b/java/res/drawable-mdpi/keyboard_popup_panel_background_lxx_light.9.png Binary files differnew file mode 100644 index 000000000..1edf94fbf --- /dev/null +++ b/java/res/drawable-mdpi/keyboard_popup_panel_background_lxx_light.9.png diff --git a/java/res/drawable-mdpi/suggestions_strip_divider_lxx_light.png b/java/res/drawable-mdpi/suggestions_strip_divider_lxx_light.png Binary files differnew file mode 100644 index 000000000..051e66ccd --- /dev/null +++ b/java/res/drawable-mdpi/suggestions_strip_divider_lxx_light.png diff --git a/java/res/drawable-mdpi/sym_keyboard_delete_lxx_light.png b/java/res/drawable-mdpi/sym_keyboard_delete_lxx_light.png Binary files differnew file mode 100644 index 000000000..007b5ea49 --- /dev/null +++ b/java/res/drawable-mdpi/sym_keyboard_delete_lxx_light.png diff --git a/java/res/drawable-mdpi/sym_keyboard_done_lxx_light.png b/java/res/drawable-mdpi/sym_keyboard_done_lxx_light.png Binary files differnew file mode 100644 index 000000000..930f97111 --- /dev/null +++ b/java/res/drawable-mdpi/sym_keyboard_done_lxx_light.png diff --git a/java/res/drawable-mdpi/sym_keyboard_go_lxx_light.png b/java/res/drawable-mdpi/sym_keyboard_go_lxx_light.png Binary files differnew file mode 100644 index 000000000..f9975c34f --- /dev/null +++ b/java/res/drawable-mdpi/sym_keyboard_go_lxx_light.png diff --git a/java/res/drawable-mdpi/sym_keyboard_language_switch_lxx_light.png b/java/res/drawable-mdpi/sym_keyboard_language_switch_lxx_light.png Binary files differnew file mode 100644 index 000000000..e1c1265d5 --- /dev/null +++ b/java/res/drawable-mdpi/sym_keyboard_language_switch_lxx_light.png diff --git a/java/res/drawable-mdpi/sym_keyboard_next_lxx_light.png b/java/res/drawable-mdpi/sym_keyboard_next_lxx_light.png Binary files differnew file mode 100644 index 000000000..e18b1cf1c --- /dev/null +++ b/java/res/drawable-mdpi/sym_keyboard_next_lxx_light.png diff --git a/java/res/drawable-mdpi/sym_keyboard_previous_lxx_light.png b/java/res/drawable-mdpi/sym_keyboard_previous_lxx_light.png Binary files differnew file mode 100644 index 000000000..2044db67e --- /dev/null +++ b/java/res/drawable-mdpi/sym_keyboard_previous_lxx_light.png diff --git a/java/res/drawable-mdpi/sym_keyboard_return_lxx_light.png b/java/res/drawable-mdpi/sym_keyboard_return_lxx_light.png Binary files differnew file mode 100644 index 000000000..bfc7d7108 --- /dev/null +++ b/java/res/drawable-mdpi/sym_keyboard_return_lxx_light.png diff --git a/java/res/drawable-mdpi/sym_keyboard_search_lxx_light.png b/java/res/drawable-mdpi/sym_keyboard_search_lxx_light.png Binary files differnew file mode 100644 index 000000000..05fbe83c8 --- /dev/null +++ b/java/res/drawable-mdpi/sym_keyboard_search_lxx_light.png diff --git a/java/res/drawable-mdpi/sym_keyboard_send_lxx_light.png b/java/res/drawable-mdpi/sym_keyboard_send_lxx_light.png Binary files differnew file mode 100644 index 000000000..2de9b5619 --- /dev/null +++ b/java/res/drawable-mdpi/sym_keyboard_send_lxx_light.png diff --git a/java/res/drawable-mdpi/sym_keyboard_settings_lxx_light.png b/java/res/drawable-mdpi/sym_keyboard_settings_lxx_light.png Binary files differnew file mode 100644 index 000000000..f70030ba3 --- /dev/null +++ b/java/res/drawable-mdpi/sym_keyboard_settings_lxx_light.png diff --git a/java/res/drawable-mdpi/sym_keyboard_shift_locked_lxx_light.png b/java/res/drawable-mdpi/sym_keyboard_shift_locked_lxx_light.png Binary files differnew file mode 100644 index 000000000..298cb9526 --- /dev/null +++ b/java/res/drawable-mdpi/sym_keyboard_shift_locked_lxx_light.png diff --git a/java/res/drawable-mdpi/sym_keyboard_shift_lxx_light.png b/java/res/drawable-mdpi/sym_keyboard_shift_lxx_light.png Binary files differnew file mode 100644 index 000000000..056fc51d6 --- /dev/null +++ b/java/res/drawable-mdpi/sym_keyboard_shift_lxx_light.png diff --git a/java/res/drawable-mdpi/sym_keyboard_smiley_lxx_light.png b/java/res/drawable-mdpi/sym_keyboard_smiley_lxx_light.png Binary files differnew file mode 100644 index 000000000..ff49d58e1 --- /dev/null +++ b/java/res/drawable-mdpi/sym_keyboard_smiley_lxx_light.png diff --git a/java/res/drawable-mdpi/sym_keyboard_spacebar_lxx_light.9.png b/java/res/drawable-mdpi/sym_keyboard_spacebar_lxx_light.9.png Binary files differnew file mode 100644 index 000000000..ab64cd642 --- /dev/null +++ b/java/res/drawable-mdpi/sym_keyboard_spacebar_lxx_light.9.png diff --git a/java/res/drawable-mdpi/sym_keyboard_voice_lxx_light.png b/java/res/drawable-mdpi/sym_keyboard_voice_lxx_light.png Binary files differnew file mode 100644 index 000000000..0ddcb792c --- /dev/null +++ b/java/res/drawable-mdpi/sym_keyboard_voice_lxx_light.png diff --git a/java/res/drawable-mdpi/sym_keyboard_voice_off_lxx_light.png b/java/res/drawable-mdpi/sym_keyboard_voice_off_lxx_light.png Binary files differnew file mode 100644 index 000000000..8831bc04c --- /dev/null +++ b/java/res/drawable-mdpi/sym_keyboard_voice_off_lxx_light.png diff --git a/java/res/drawable-xhdpi/btn_keyboard_key_active_lxx_light.9.png b/java/res/drawable-xhdpi/btn_keyboard_key_active_lxx_light.9.png Binary files differnew file mode 100644 index 000000000..dca7a3274 --- /dev/null +++ b/java/res/drawable-xhdpi/btn_keyboard_key_active_lxx_light.9.png diff --git a/java/res/drawable-xhdpi/btn_keyboard_key_active_pressed_lxx_light.9.png b/java/res/drawable-xhdpi/btn_keyboard_key_active_pressed_lxx_light.9.png Binary files differnew file mode 100644 index 000000000..fa32a2c6e --- /dev/null +++ b/java/res/drawable-xhdpi/btn_keyboard_key_active_pressed_lxx_light.9.png diff --git a/java/res/drawable-xhdpi/btn_keyboard_key_normal_off_lxx_light.9.png b/java/res/drawable-xhdpi/btn_keyboard_key_normal_off_lxx_light.9.png Binary files differnew file mode 100644 index 000000000..e58df5cb0 --- /dev/null +++ b/java/res/drawable-xhdpi/btn_keyboard_key_normal_off_lxx_light.9.png diff --git a/java/res/drawable-xhdpi/btn_keyboard_key_normal_on_lxx_light.9.png b/java/res/drawable-xhdpi/btn_keyboard_key_normal_on_lxx_light.9.png Binary files differnew file mode 100644 index 000000000..5a9507387 --- /dev/null +++ b/java/res/drawable-xhdpi/btn_keyboard_key_normal_on_lxx_light.9.png diff --git a/java/res/drawable-xhdpi/btn_keyboard_key_popup_selected_lxx_light.9.png b/java/res/drawable-xhdpi/btn_keyboard_key_popup_selected_lxx_light.9.png Binary files differnew file mode 100644 index 000000000..0b340e2cb --- /dev/null +++ b/java/res/drawable-xhdpi/btn_keyboard_key_popup_selected_lxx_light.9.png diff --git a/java/res/drawable-xhdpi/btn_keyboard_key_pressed_off_lxx_light.9.png b/java/res/drawable-xhdpi/btn_keyboard_key_pressed_off_lxx_light.9.png Binary files differnew file mode 100644 index 000000000..58b705414 --- /dev/null +++ b/java/res/drawable-xhdpi/btn_keyboard_key_pressed_off_lxx_light.9.png diff --git a/java/res/drawable-xhdpi/btn_keyboard_key_pressed_on_lxx_light.9.png b/java/res/drawable-xhdpi/btn_keyboard_key_pressed_on_lxx_light.9.png Binary files differnew file mode 100644 index 000000000..3da5f47b0 --- /dev/null +++ b/java/res/drawable-xhdpi/btn_keyboard_key_pressed_on_lxx_light.9.png diff --git a/java/res/drawable-xhdpi/keyboard_key_feedback_background_lxx_light.9.png b/java/res/drawable-xhdpi/keyboard_key_feedback_background_lxx_light.9.png Binary files differnew file mode 100644 index 000000000..bd6ec94b8 --- /dev/null +++ b/java/res/drawable-xhdpi/keyboard_key_feedback_background_lxx_light.9.png diff --git a/java/res/drawable-xhdpi/keyboard_key_feedback_more_background_lxx_light.9.png b/java/res/drawable-xhdpi/keyboard_key_feedback_more_background_lxx_light.9.png Binary files differnew file mode 100644 index 000000000..eef27a377 --- /dev/null +++ b/java/res/drawable-xhdpi/keyboard_key_feedback_more_background_lxx_light.9.png diff --git a/java/res/drawable-xhdpi/keyboard_popup_panel_background_lxx_light.9.png b/java/res/drawable-xhdpi/keyboard_popup_panel_background_lxx_light.9.png Binary files differnew file mode 100644 index 000000000..8a51d7148 --- /dev/null +++ b/java/res/drawable-xhdpi/keyboard_popup_panel_background_lxx_light.9.png diff --git a/java/res/drawable-xhdpi/suggestions_strip_divider_lxx_light.png b/java/res/drawable-xhdpi/suggestions_strip_divider_lxx_light.png Binary files differnew file mode 100644 index 000000000..0047e5c17 --- /dev/null +++ b/java/res/drawable-xhdpi/suggestions_strip_divider_lxx_light.png diff --git a/java/res/drawable-xhdpi/sym_keyboard_delete_lxx_light.png b/java/res/drawable-xhdpi/sym_keyboard_delete_lxx_light.png Binary files differnew file mode 100644 index 000000000..df4e358a1 --- /dev/null +++ b/java/res/drawable-xhdpi/sym_keyboard_delete_lxx_light.png diff --git a/java/res/drawable-xhdpi/sym_keyboard_done_lxx_light.png b/java/res/drawable-xhdpi/sym_keyboard_done_lxx_light.png Binary files differnew file mode 100644 index 000000000..070fe8d7b --- /dev/null +++ b/java/res/drawable-xhdpi/sym_keyboard_done_lxx_light.png diff --git a/java/res/drawable-xhdpi/sym_keyboard_go_lxx_light.png b/java/res/drawable-xhdpi/sym_keyboard_go_lxx_light.png Binary files differnew file mode 100644 index 000000000..33bbe3c50 --- /dev/null +++ b/java/res/drawable-xhdpi/sym_keyboard_go_lxx_light.png diff --git a/java/res/drawable-xhdpi/sym_keyboard_language_switch_lxx_light.png b/java/res/drawable-xhdpi/sym_keyboard_language_switch_lxx_light.png Binary files differnew file mode 100644 index 000000000..023e64720 --- /dev/null +++ b/java/res/drawable-xhdpi/sym_keyboard_language_switch_lxx_light.png diff --git a/java/res/drawable-xhdpi/sym_keyboard_next_lxx_light.png b/java/res/drawable-xhdpi/sym_keyboard_next_lxx_light.png Binary files differnew file mode 100644 index 000000000..2c1fe6d3c --- /dev/null +++ b/java/res/drawable-xhdpi/sym_keyboard_next_lxx_light.png diff --git a/java/res/drawable-xhdpi/sym_keyboard_previous_lxx_light.png b/java/res/drawable-xhdpi/sym_keyboard_previous_lxx_light.png Binary files differnew file mode 100644 index 000000000..49b2651f3 --- /dev/null +++ b/java/res/drawable-xhdpi/sym_keyboard_previous_lxx_light.png diff --git a/java/res/drawable-xhdpi/sym_keyboard_return_lxx_light.png b/java/res/drawable-xhdpi/sym_keyboard_return_lxx_light.png Binary files differnew file mode 100644 index 000000000..85473bc08 --- /dev/null +++ b/java/res/drawable-xhdpi/sym_keyboard_return_lxx_light.png diff --git a/java/res/drawable-xhdpi/sym_keyboard_search_lxx_light.png b/java/res/drawable-xhdpi/sym_keyboard_search_lxx_light.png Binary files differnew file mode 100644 index 000000000..a95d55441 --- /dev/null +++ b/java/res/drawable-xhdpi/sym_keyboard_search_lxx_light.png diff --git a/java/res/drawable-xhdpi/sym_keyboard_send_lxx_light.png b/java/res/drawable-xhdpi/sym_keyboard_send_lxx_light.png Binary files differnew file mode 100644 index 000000000..21b0ac0c5 --- /dev/null +++ b/java/res/drawable-xhdpi/sym_keyboard_send_lxx_light.png diff --git a/java/res/drawable-xhdpi/sym_keyboard_settings_lxx_light.png b/java/res/drawable-xhdpi/sym_keyboard_settings_lxx_light.png Binary files differnew file mode 100644 index 000000000..d46c26bc8 --- /dev/null +++ b/java/res/drawable-xhdpi/sym_keyboard_settings_lxx_light.png diff --git a/java/res/drawable-xhdpi/sym_keyboard_shift_locked_lxx_light.png b/java/res/drawable-xhdpi/sym_keyboard_shift_locked_lxx_light.png Binary files differnew file mode 100644 index 000000000..64fdb1762 --- /dev/null +++ b/java/res/drawable-xhdpi/sym_keyboard_shift_locked_lxx_light.png diff --git a/java/res/drawable-xhdpi/sym_keyboard_shift_lxx_light.png b/java/res/drawable-xhdpi/sym_keyboard_shift_lxx_light.png Binary files differnew file mode 100644 index 000000000..3a56ed9dc --- /dev/null +++ b/java/res/drawable-xhdpi/sym_keyboard_shift_lxx_light.png diff --git a/java/res/drawable-xhdpi/sym_keyboard_smiley_lxx_light.png b/java/res/drawable-xhdpi/sym_keyboard_smiley_lxx_light.png Binary files differnew file mode 100644 index 000000000..df3eba750 --- /dev/null +++ b/java/res/drawable-xhdpi/sym_keyboard_smiley_lxx_light.png diff --git a/java/res/drawable-xhdpi/sym_keyboard_spacebar_lxx_light.9.png b/java/res/drawable-xhdpi/sym_keyboard_spacebar_lxx_light.9.png Binary files differnew file mode 100644 index 000000000..0cf38f2af --- /dev/null +++ b/java/res/drawable-xhdpi/sym_keyboard_spacebar_lxx_light.9.png diff --git a/java/res/drawable-xhdpi/sym_keyboard_voice_lxx_light.png b/java/res/drawable-xhdpi/sym_keyboard_voice_lxx_light.png Binary files differnew file mode 100644 index 000000000..c9b25040c --- /dev/null +++ b/java/res/drawable-xhdpi/sym_keyboard_voice_lxx_light.png diff --git a/java/res/drawable-xhdpi/sym_keyboard_voice_off_lxx_light.png b/java/res/drawable-xhdpi/sym_keyboard_voice_off_lxx_light.png Binary files differnew file mode 100644 index 000000000..1398a3ed6 --- /dev/null +++ b/java/res/drawable-xhdpi/sym_keyboard_voice_off_lxx_light.png diff --git a/java/res/drawable-xxhdpi/btn_keyboard_key_active_lxx_light.9.png b/java/res/drawable-xxhdpi/btn_keyboard_key_active_lxx_light.9.png Binary files differnew file mode 100644 index 000000000..1f5f922dc --- /dev/null +++ b/java/res/drawable-xxhdpi/btn_keyboard_key_active_lxx_light.9.png diff --git a/java/res/drawable-xxhdpi/btn_keyboard_key_active_pressed_lxx_light.9.png b/java/res/drawable-xxhdpi/btn_keyboard_key_active_pressed_lxx_light.9.png Binary files differnew file mode 100644 index 000000000..031014360 --- /dev/null +++ b/java/res/drawable-xxhdpi/btn_keyboard_key_active_pressed_lxx_light.9.png diff --git a/java/res/drawable-xxhdpi/btn_keyboard_key_normal_off_lxx_light.9.png b/java/res/drawable-xxhdpi/btn_keyboard_key_normal_off_lxx_light.9.png Binary files differnew file mode 100644 index 000000000..fb1dc62d1 --- /dev/null +++ b/java/res/drawable-xxhdpi/btn_keyboard_key_normal_off_lxx_light.9.png diff --git a/java/res/drawable-xxhdpi/btn_keyboard_key_normal_on_lxx_light.9.png b/java/res/drawable-xxhdpi/btn_keyboard_key_normal_on_lxx_light.9.png Binary files differnew file mode 100644 index 000000000..70346218f --- /dev/null +++ b/java/res/drawable-xxhdpi/btn_keyboard_key_normal_on_lxx_light.9.png diff --git a/java/res/drawable-xxhdpi/btn_keyboard_key_popup_selected_lxx_light.9.png b/java/res/drawable-xxhdpi/btn_keyboard_key_popup_selected_lxx_light.9.png Binary files differnew file mode 100644 index 000000000..e58d6643f --- /dev/null +++ b/java/res/drawable-xxhdpi/btn_keyboard_key_popup_selected_lxx_light.9.png diff --git a/java/res/drawable-xxhdpi/btn_keyboard_key_pressed_off_lxx_light.9.png b/java/res/drawable-xxhdpi/btn_keyboard_key_pressed_off_lxx_light.9.png Binary files differnew file mode 100644 index 000000000..8e01cfa2d --- /dev/null +++ b/java/res/drawable-xxhdpi/btn_keyboard_key_pressed_off_lxx_light.9.png diff --git a/java/res/drawable-xxhdpi/btn_keyboard_key_pressed_on_lxx_light.9.png b/java/res/drawable-xxhdpi/btn_keyboard_key_pressed_on_lxx_light.9.png Binary files differnew file mode 100644 index 000000000..1619411b2 --- /dev/null +++ b/java/res/drawable-xxhdpi/btn_keyboard_key_pressed_on_lxx_light.9.png diff --git a/java/res/drawable-xxhdpi/keyboard_key_feedback_background_lxx_light.9.png b/java/res/drawable-xxhdpi/keyboard_key_feedback_background_lxx_light.9.png Binary files differnew file mode 100644 index 000000000..dcc0ab084 --- /dev/null +++ b/java/res/drawable-xxhdpi/keyboard_key_feedback_background_lxx_light.9.png diff --git a/java/res/drawable-xxhdpi/keyboard_key_feedback_more_background_lxx_light.9.png b/java/res/drawable-xxhdpi/keyboard_key_feedback_more_background_lxx_light.9.png Binary files differnew file mode 100644 index 000000000..5fd175187 --- /dev/null +++ b/java/res/drawable-xxhdpi/keyboard_key_feedback_more_background_lxx_light.9.png diff --git a/java/res/drawable-xxhdpi/keyboard_popup_panel_background_lxx_light.9.png b/java/res/drawable-xxhdpi/keyboard_popup_panel_background_lxx_light.9.png Binary files differnew file mode 100644 index 000000000..1336d8005 --- /dev/null +++ b/java/res/drawable-xxhdpi/keyboard_popup_panel_background_lxx_light.9.png diff --git a/java/res/drawable-xxhdpi/suggestions_strip_divider_lxx_light.png b/java/res/drawable-xxhdpi/suggestions_strip_divider_lxx_light.png Binary files differnew file mode 100644 index 000000000..9b37dd094 --- /dev/null +++ b/java/res/drawable-xxhdpi/suggestions_strip_divider_lxx_light.png diff --git a/java/res/drawable-xxhdpi/sym_keyboard_delete_lxx_light.png b/java/res/drawable-xxhdpi/sym_keyboard_delete_lxx_light.png Binary files differnew file mode 100644 index 000000000..c3937c491 --- /dev/null +++ b/java/res/drawable-xxhdpi/sym_keyboard_delete_lxx_light.png diff --git a/java/res/drawable-xxhdpi/sym_keyboard_done_lxx_light.png b/java/res/drawable-xxhdpi/sym_keyboard_done_lxx_light.png Binary files differnew file mode 100644 index 000000000..0347327ff --- /dev/null +++ b/java/res/drawable-xxhdpi/sym_keyboard_done_lxx_light.png diff --git a/java/res/drawable-xxhdpi/sym_keyboard_go_lxx_light.png b/java/res/drawable-xxhdpi/sym_keyboard_go_lxx_light.png Binary files differnew file mode 100644 index 000000000..0c66a6bc1 --- /dev/null +++ b/java/res/drawable-xxhdpi/sym_keyboard_go_lxx_light.png diff --git a/java/res/drawable-xxhdpi/sym_keyboard_language_switch_lxx_light.png b/java/res/drawable-xxhdpi/sym_keyboard_language_switch_lxx_light.png Binary files differnew file mode 100644 index 000000000..82b4d51e5 --- /dev/null +++ b/java/res/drawable-xxhdpi/sym_keyboard_language_switch_lxx_light.png diff --git a/java/res/drawable-xxhdpi/sym_keyboard_next_lxx_light.png b/java/res/drawable-xxhdpi/sym_keyboard_next_lxx_light.png Binary files differnew file mode 100644 index 000000000..4e1407012 --- /dev/null +++ b/java/res/drawable-xxhdpi/sym_keyboard_next_lxx_light.png diff --git a/java/res/drawable-xxhdpi/sym_keyboard_previous_lxx_light.png b/java/res/drawable-xxhdpi/sym_keyboard_previous_lxx_light.png Binary files differnew file mode 100644 index 000000000..78865cb0e --- /dev/null +++ b/java/res/drawable-xxhdpi/sym_keyboard_previous_lxx_light.png diff --git a/java/res/drawable-xxhdpi/sym_keyboard_return_lxx_light.png b/java/res/drawable-xxhdpi/sym_keyboard_return_lxx_light.png Binary files differnew file mode 100644 index 000000000..a429d6634 --- /dev/null +++ b/java/res/drawable-xxhdpi/sym_keyboard_return_lxx_light.png diff --git a/java/res/drawable-xxhdpi/sym_keyboard_search_lxx_light.png b/java/res/drawable-xxhdpi/sym_keyboard_search_lxx_light.png Binary files differnew file mode 100644 index 000000000..1b9952aa6 --- /dev/null +++ b/java/res/drawable-xxhdpi/sym_keyboard_search_lxx_light.png diff --git a/java/res/drawable-xxhdpi/sym_keyboard_send_lxx_light.png b/java/res/drawable-xxhdpi/sym_keyboard_send_lxx_light.png Binary files differnew file mode 100644 index 000000000..a886505e1 --- /dev/null +++ b/java/res/drawable-xxhdpi/sym_keyboard_send_lxx_light.png diff --git a/java/res/drawable-xxhdpi/sym_keyboard_settings_lxx_light.png b/java/res/drawable-xxhdpi/sym_keyboard_settings_lxx_light.png Binary files differnew file mode 100644 index 000000000..e5be02811 --- /dev/null +++ b/java/res/drawable-xxhdpi/sym_keyboard_settings_lxx_light.png diff --git a/java/res/drawable-xxhdpi/sym_keyboard_shift_locked_lxx_light.png b/java/res/drawable-xxhdpi/sym_keyboard_shift_locked_lxx_light.png Binary files differnew file mode 100644 index 000000000..2da7b6514 --- /dev/null +++ b/java/res/drawable-xxhdpi/sym_keyboard_shift_locked_lxx_light.png diff --git a/java/res/drawable-xxhdpi/sym_keyboard_shift_lxx_light.png b/java/res/drawable-xxhdpi/sym_keyboard_shift_lxx_light.png Binary files differnew file mode 100644 index 000000000..ee51c562b --- /dev/null +++ b/java/res/drawable-xxhdpi/sym_keyboard_shift_lxx_light.png diff --git a/java/res/drawable-xxhdpi/sym_keyboard_smiley_lxx_light.png b/java/res/drawable-xxhdpi/sym_keyboard_smiley_lxx_light.png Binary files differnew file mode 100644 index 000000000..08d4f8adc --- /dev/null +++ b/java/res/drawable-xxhdpi/sym_keyboard_smiley_lxx_light.png diff --git a/java/res/drawable-xxhdpi/sym_keyboard_spacebar_lxx_light.9.png b/java/res/drawable-xxhdpi/sym_keyboard_spacebar_lxx_light.9.png Binary files differnew file mode 100644 index 000000000..90c963733 --- /dev/null +++ b/java/res/drawable-xxhdpi/sym_keyboard_spacebar_lxx_light.9.png diff --git a/java/res/drawable-xxhdpi/sym_keyboard_voice_lxx_light.png b/java/res/drawable-xxhdpi/sym_keyboard_voice_lxx_light.png Binary files differnew file mode 100644 index 000000000..42331e920 --- /dev/null +++ b/java/res/drawable-xxhdpi/sym_keyboard_voice_lxx_light.png diff --git a/java/res/drawable-xxhdpi/sym_keyboard_voice_off_lxx_light.png b/java/res/drawable-xxhdpi/sym_keyboard_voice_off_lxx_light.png Binary files differnew file mode 100644 index 000000000..5a3ed0d48 --- /dev/null +++ b/java/res/drawable-xxhdpi/sym_keyboard_voice_off_lxx_light.png diff --git a/java/res/drawable/btn_keyboard_key_functional_lxx_light.xml b/java/res/drawable/btn_keyboard_key_functional_lxx_light.xml new file mode 100644 index 000000000..e518ca11d --- /dev/null +++ b/java/res/drawable/btn_keyboard_key_functional_lxx_light.xml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2014 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<selector xmlns:android="http://schemas.android.com/apk/res/android"> + <!-- Functional keys. --> + <item android:state_pressed="true" + android:drawable="@color/key_background_pressed_lxx_light" /> + <item android:drawable="@color/key_background_lxx_light" /> +</selector> diff --git a/java/res/drawable/btn_keyboard_key_lxx_light.xml b/java/res/drawable/btn_keyboard_key_lxx_light.xml new file mode 100644 index 000000000..60fe02dd2 --- /dev/null +++ b/java/res/drawable/btn_keyboard_key_lxx_light.xml @@ -0,0 +1,42 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2014 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<selector xmlns:android="http://schemas.android.com/apk/res/android"> + <!-- Action keys. --> + <item android:state_active="true" android:state_pressed="true" + android:drawable="@drawable/btn_keyboard_key_active_pressed_lxx_light" /> + <item android:state_active="true" + android:drawable="@drawable/btn_keyboard_key_active_lxx_light" /> + + <!-- 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_pressed_on_lxx_light" /> + <item android:state_checkable="true" android:state_pressed="true" + android:drawable="@drawable/btn_keyboard_key_pressed_off_lxx_light" /> + <item android:state_checkable="true" android:state_checked="true" + android:drawable="@drawable/btn_keyboard_key_normal_on_lxx_light" /> + <item android:state_checkable="true" + android:drawable="@drawable/btn_keyboard_key_normal_off_lxx_light" /> + + <!-- Empty background keys. --> + <item android:state_empty="true" + android:drawable="@color/key_background_lxx_light" /> + + <!-- Normal keys. --> + <item android:state_pressed="true" + android:drawable="@color/key_background_pressed_lxx_light" /> + <item android:drawable="@color/key_background_lxx_light" /> +</selector> diff --git a/java/res/drawable/btn_keyboard_spacebar_lxx_light.xml b/java/res/drawable/btn_keyboard_spacebar_lxx_light.xml new file mode 100644 index 000000000..acd19fda4 --- /dev/null +++ b/java/res/drawable/btn_keyboard_spacebar_lxx_light.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2014 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<selector xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:state_pressed="true" + android:drawable="@color/key_background_pressed_lxx_light" /> + <item android:drawable="@color/key_background_lxx_light" /> +</selector> diff --git a/java/res/drawable/btn_suggestion_lxx_light.xml b/java/res/drawable/btn_suggestion_lxx_light.xml new file mode 100644 index 000000000..84a91209e --- /dev/null +++ b/java/res/drawable/btn_suggestion_lxx_light.xml @@ -0,0 +1,27 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright 2014, The Android Open Source Project +** +** Licensed under the Apache License, Version 2.0 (the "License"); +** you may not use this file except in compliance with the License. +** You may obtain a copy of the License at +** +** http://www.apache.org/licenses/LICENSE-2.0 +** +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and +** limitations under the License. +*/ +--> + +<selector + xmlns:android="http://schemas.android.com/apk/res/android" +> + <item + android:state_pressed="true" + android:drawable="@color/suggested_word_background_selected_lxx_dark" /> +</selector> diff --git a/java/res/drawable/keyboard_key_feedback_lxx_light.xml b/java/res/drawable/keyboard_key_feedback_lxx_light.xml new file mode 100644 index 000000000..f4341c9b5 --- /dev/null +++ b/java/res/drawable/keyboard_key_feedback_lxx_light.xml @@ -0,0 +1,36 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2014 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<selector + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" +> + <!-- Left edge --> + <item latin:state_left_edge="true" latin:state_has_morekeys="true" + android:drawable="@drawable/keyboard_key_feedback_more_background_lxx_light" /> + <item latin:state_left_edge="true" + android:drawable="@drawable/keyboard_key_feedback_background_lxx_light" /> + + <!-- Right edge --> + <item latin:state_right_edge="true" latin:state_has_morekeys="true" + android:drawable="@drawable/keyboard_key_feedback_more_background_lxx_light" /> + <item latin:state_right_edge="true" + android:drawable="@drawable/keyboard_key_feedback_background_lxx_light" /> + + <item latin:state_has_morekeys="true" + android:drawable="@drawable/keyboard_key_feedback_more_background_lxx_light" /> + <item android:drawable="@drawable/keyboard_key_feedback_background_lxx_light" /> +</selector> diff --git a/java/res/values/colors.xml b/java/res/values/colors.xml index c85710d6a..ad7a04ebf 100644 --- a/java/res/values/colors.xml +++ b/java/res/values/colors.xml @@ -40,6 +40,21 @@ <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 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="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="suggestions_strip_background_lxx_light">#E4E7E9</color> + <color name="suggested_word_background_selected_lxx_light">#26546E7A</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> diff --git a/java/res/values/keyboard-icons-lxx-light.xml b/java/res/values/keyboard-icons-lxx-light.xml new file mode 100644 index 000000000..651e75ce2 --- /dev/null +++ b/java/res/values/keyboard-icons-lxx-light.xml @@ -0,0 +1,46 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright 2014, The Android Open Source Project +** +** Licensed under the Apache License, Version 2.0 (the "License"); +** you may not use this file except in compliance with the License. +** You may obtain a copy of the License at +** +** http://www.apache.org/licenses/LICENSE-2.0 +** +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and +** limitations under the License. +*/ +--> + +<resources xmlns:android="http://schemas.android.com/apk/res/android"> + <style name="KeyboardIcons.LXX_Light"> + <!-- Keyboard icons --> + <!-- TODO: Update those icons for LXX_Light theme. --> + <item name="iconShiftKey">@drawable/sym_keyboard_shift_lxx_light</item> + <item name="iconDeleteKey">@drawable/sym_keyboard_delete_lxx_light</item> + <item name="iconSettingsKey">@drawable/sym_keyboard_settings_lxx_light</item> + <item name="iconSpaceKey">@drawable/sym_keyboard_spacebar_lxx_light</item> + <item name="iconEnterKey">@drawable/sym_keyboard_return_lxx_light</item> + <item name="iconGoKey">@drawable/sym_keyboard_go_lxx_light</item> + <item name="iconSearchKey">@drawable/sym_keyboard_search_lxx_light</item> + <item name="iconSendKey">@drawable/sym_keyboard_send_lxx_light</item> + <item name="iconNextKey">@drawable/sym_keyboard_next_lxx_light</item> + <item name="iconDoneKey">@drawable/sym_keyboard_done_lxx_light</item> + <item name="iconPreviousKey">@drawable/sym_keyboard_previous_lxx_light</item> + <item name="iconTabKey">@drawable/sym_keyboard_tab_holo_dark</item> + <item name="iconShortcutKey">@drawable/sym_keyboard_voice_lxx_light</item> + <item name="iconSpaceKeyForNumberLayout">@drawable/sym_keyboard_space_holo_dark</item> + <item name="iconShiftKeyShifted">@drawable/sym_keyboard_shift_locked_lxx_dark</item> + <item name="iconShortcutKeyDisabled">@drawable/sym_keyboard_voice_off_lxx_light</item> + <item name="iconLanguageSwitchKey">@drawable/sym_keyboard_language_switch_lxx_light</item> + <item name="iconZwnjKey">@drawable/sym_keyboard_zwnj_holo_dark</item> + <item name="iconZwjKey">@drawable/sym_keyboard_zwj_holo_dark</item> + <item name="iconEmojiKey">@drawable/sym_keyboard_smiley_lxx_light</item> + </style> +</resources> diff --git a/java/res/values/keyboard-themes.xml b/java/res/values/keyboard-themes.xml index 28a34c315..9d772c4e7 100644 --- a/java/res/values/keyboard-themes.xml +++ b/java/res/values/keyboard-themes.xml @@ -20,15 +20,15 @@ <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <!-- For keyboard color scheme option dialog. --> <string-array name="keyboard_theme_names" translatable="false"> - <!-- TODO: Implement Material Light theme. --> + <item>@string/keyboard_theme_material_light</item> <item>@string/keyboard_theme_material_dark</item> <item>@string/keyboard_theme_holo_white</item> <item>@string/keyboard_theme_holo_blue</item> </string-array> <!-- An element must be a keyboard theme id of {@link KeyboardTheme#THEME_ID_*}. --> <string-array name="keyboard_theme_ids" translatable="false"> - <!-- TODO: Implement Material Light theme. --> <item>3</item> + <item>4</item> <item>2</item> <item>0</item> </string-array> diff --git a/java/res/values/themes-lxx-dark.xml b/java/res/values/themes-lxx-dark.xml index 8d6be3b85..c04e04d56 100644 --- a/java/res/values/themes-lxx-dark.xml +++ b/java/res/values/themes-lxx-dark.xml @@ -34,7 +34,7 @@ parent="Keyboard" > <!-- This should be aligned with KeyboardSwitcher.KEYBOARD_THEMES[] --> - <item name="themeId">3</item> + <item name="themeId">4</item> <item name="keyboardTopPadding">@fraction/config_keyboard_top_padding_holo</item> <item name="keyboardBottomPadding">@fraction/config_keyboard_bottom_padding_holo</item> <item name="horizontalGap">@fraction/config_key_horizontal_gap_holo</item> diff --git a/java/res/values/themes-lxx-light.xml b/java/res/values/themes-lxx-light.xml new file mode 100644 index 000000000..3695f8046 --- /dev/null +++ b/java/res/values/themes-lxx-light.xml @@ -0,0 +1,140 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright 2014, The Android Open Source Project +** +** Licensed under the Apache License, Version 2.0 (the "License"); +** you may not use this file except in compliance with the License. +** You may obtain a copy of the License at +** +** http://www.apache.org/licenses/LICENSE-2.0 +** +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and +** limitations under the License. +*/ +--> + +<resources xmlns:android="http://schemas.android.com/apk/res/android"> + <style name="KeyboardTheme.LXX_Light" parent="KeyboardIcons.LXX_Light"> + <item name="keyboardStyle">@style/Keyboard.LXX_Light</item> + <item name="keyboardViewStyle">@style/KeyboardView.LXX_Light</item> + <item name="mainKeyboardViewStyle">@style/MainKeyboardView.LXX_Light</item> + <item name="emojiPalettesViewStyle">@style/EmojiPalettesView.LXX_Light</item> + <item name="moreKeysKeyboardStyle">@style/MoreKeysKeyboard.LXX_Light</item> + <item name="moreKeysKeyboardViewStyle">@style/MoreKeysKeyboardView.LXX_Light</item> + <item name="suggestionStripViewStyle">@style/SuggestionStripView.LXX_Light</item> + <item name="suggestionWordStyle">@style/SuggestionWord.LXX_Light</item> + </style> + <style + name="Keyboard.LXX_Light" + parent="Keyboard" + > + <!-- This should be aligned with KeyboardSwitcher.KEYBOARD_THEMES[] --> + <item name="themeId">3</item> + <item name="keyboardTopPadding">@fraction/config_keyboard_top_padding_holo</item> + <item name="keyboardBottomPadding">@fraction/config_keyboard_bottom_padding_holo</item> + <item name="horizontalGap">@fraction/config_key_horizontal_gap_holo</item> + <item name="verticalGap">@fraction/config_key_vertical_gap_holo</item> + <item name="touchPositionCorrectionData">@array/touch_position_correction_data_holo</item> + </style> + <style + name="KeyboardView.LXX_Light" + parent="KeyboardView" + > + <item name="android:background">@color/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> + <item name="spacebarIconWidthRatio">0.9</item> + <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="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> + <item name="keyShiftedLetterHintActivatedColor">@color/key_text_color_lxx_light</item> + <item name="keyPreviewTextColor">@color/key_text_color_lxx_light</item> + <!-- A negative value to disable key text shadow layer. --> + <item name="keyTextShadowRadius">-1.0</item> + </style> + <style + name="MainKeyboardView.LXX_Light" + parent="KeyboardView.LXX_Light" + > + <item name="keyPreviewBackground">@drawable/keyboard_key_feedback_lxx_light</item> + <item name="keyPreviewOffset">@dimen/config_key_preview_offset_holo</item> + <item name="gestureFloatingPreviewTextColor">@color/highlight_color_lxx_light</item> + <item name="gestureFloatingPreviewColor">@color/gesture_floating_preview_color_lxx_light</item> + <item name="gestureTrailColor">@color/highlight_color_lxx_light</item> + <item name="slidingKeyInputPreviewColor">@color/highlight_translucent_color_lxx_light</item> + <item name="languageOnSpacebarTextColor">@color/key_text_inactive_color_lxx_light</item> + <!-- A negative value to disable text shadow layer. --> + <item name="languageOnSpacebarTextShadowRadius">-1.0</item> + </style> + <!-- Though {@link EmojiPalettesView} doesn't extend {@link KeyboardView}, some views inside it, + for instance delete button, need themed {@link KeyboardView} attributes. --> + <style + name="EmojiPalettesView.LXX_Light" + parent="MainKeyboardView.LXX_Light" + > + <item name="categoryIndicatorEnabled">false</item> + <item name="categoryPageIndicatorColor">@color/highlight_color_lxx_light</item> + <item name="categoryPageIndicatorBackground">@color/emoji_tab_page_indicator_background_lxx_light</item> + <!-- TODO: Update those icons to LXX_Light theme. --> + <item name="iconEmojiRecentsTab">@drawable/ic_emoji_recents_holo_dark</item> + <item name="iconEmojiCategory1Tab">@drawable/ic_emoji_people_holo_dark</item> + <item name="iconEmojiCategory2Tab">@drawable/ic_emoji_objects_holo_dark</item> + <item name="iconEmojiCategory3Tab">@drawable/ic_emoji_nature_holo_dark</item> + <item name="iconEmojiCategory4Tab">@drawable/ic_emoji_places_holo_dark</item> + <item name="iconEmojiCategory5Tab">@drawable/ic_emoji_symbols_holo_dark</item> + <item name="iconEmojiCategory6Tab">@drawable/ic_emoji_emoticons_holo_dark</item> + </style> + <style + name="MoreKeysKeyboard.LXX_Light" + parent="Keyboard.LXX_Light" + > + <item name="keyboardTopPadding">0%p</item> + <item name="keyboardBottomPadding">0%p</item> + <item name="horizontalGap">0%p</item> + <item name="touchPositionCorrectionData">@null</item> + </style> + <style + name="MoreKeysKeyboardView.LXX_Light" + parent="KeyboardView.LXX_Light" + > + <item name="android:background">@drawable/keyboard_popup_panel_background_lxx_light</item> + <!-- Reuse KLP key background --> + <item name="keyBackground">@drawable/btn_keyboard_key_popup_klp</item> + <item name="keyTypeface">normal</item> + <item name="verticalCorrection">@dimen/config_more_keys_keyboard_vertical_correction_holo</item> + </style> + <style + name="SuggestionStripView.LXX_Light" + parent="KeyboardView.LXX_Light" + > + <item name="suggestionsCountInStrip">@integer/config_suggestions_count_in_strip</item> + <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:src">@drawable/suggestions_strip_divider_lxx_light</item> + <item name="suggestionStripOptions">autoCorrectBold|validTypedWordBold</item> + <item name="colorValidTypedWord">@color/typed_word_color_lxx_light</item> + <item name="colorTypedWord">@color/typed_word_color_lxx_light</item> + <item name="colorAutoCorrect">@color/highlight_color_lxx_light</item> + <item name="colorSuggested">@color/suggested_word_color_lxx_light</item> + <item name="alphaObsoleted">70%</item> + </style> + <style + name="SuggestionWord.LXX_Light" + parent="SuggestionWord" + > + <item name="android:background">@drawable/btn_suggestion_lxx_light</item> + <item name="android:textColor">@color/highlight_color_lxx_light</item> + </style> +</resources> diff --git a/java/src/com/android/inputmethod/keyboard/KeyboardTheme.java b/java/src/com/android/inputmethod/keyboard/KeyboardTheme.java index 7b41dfef6..4c2e0dd1d 100644 --- a/java/src/com/android/inputmethod/keyboard/KeyboardTheme.java +++ b/java/src/com/android/inputmethod/keyboard/KeyboardTheme.java @@ -34,7 +34,8 @@ public final class KeyboardTheme implements Comparable<KeyboardTheme> { public static final int THEME_ID_ICS = 0; public static final int THEME_ID_KLP = 2; - public static final int THEME_ID_LXX_DARK = 3; + public static final int THEME_ID_LXX_LIGHT = 3; + public static final int THEME_ID_LXX_DARK = 4; public static final int DEFAULT_THEME_ID = THEME_ID_KLP; private static final KeyboardTheme[] KEYBOARD_THEMES = { @@ -44,10 +45,12 @@ public final class KeyboardTheme implements Comparable<KeyboardTheme> { new KeyboardTheme(THEME_ID_KLP, R.style.KeyboardTheme_KLP, // Default theme for ICS, JB, and KLP. VERSION_CODES.ICE_CREAM_SANDWICH), - new KeyboardTheme(THEME_ID_LXX_DARK, R.style.KeyboardTheme_LXX_Dark, + new KeyboardTheme(THEME_ID_LXX_LIGHT, R.style.KeyboardTheme_LXX_Light, // Default theme for LXX. // TODO: Update this constant once the *next* version becomes available. VERSION_CODES.CUR_DEVELOPMENT), + new KeyboardTheme(THEME_ID_LXX_DARK, R.style.KeyboardTheme_LXX_Dark, + VERSION_CODES.BASE), }; static { diff --git a/tests/src/com/android/inputmethod/keyboard/KeyboardThemeTests.java b/tests/src/com/android/inputmethod/keyboard/KeyboardThemeTests.java index f9d98afa2..0c7e4000e 100644 --- a/tests/src/com/android/inputmethod/keyboard/KeyboardThemeTests.java +++ b/tests/src/com/android/inputmethod/keyboard/KeyboardThemeTests.java @@ -16,6 +16,11 @@ package com.android.inputmethod.keyboard; +import static com.android.inputmethod.keyboard.KeyboardTheme.THEME_ID_ICS; +import static com.android.inputmethod.keyboard.KeyboardTheme.THEME_ID_KLP; +import static com.android.inputmethod.keyboard.KeyboardTheme.THEME_ID_LXX_DARK; +import static com.android.inputmethod.keyboard.KeyboardTheme.THEME_ID_LXX_LIGHT; + import android.content.SharedPreferences; import android.os.Build.VERSION_CODES; import android.preference.PreferenceManager; @@ -33,9 +38,6 @@ public class KeyboardThemeTests extends AndroidTestCase { private static final int THEME_ID_UNKNOWN = -2; private static final int THEME_ID_ILLEGAL = -3; private static final String ILLEGAL_THEME_ID_STRING = "ThisCausesNumberFormatExecption"; - private static final int THEME_ID_ICS = KeyboardTheme.THEME_ID_ICS; - private static final int THEME_ID_KLP = KeyboardTheme.THEME_ID_KLP; - private static final int THEME_ID_LXX_DARK = KeyboardTheme.THEME_ID_LXX_DARK; @Override protected void setUp() throws Exception { @@ -51,6 +53,7 @@ public class KeyboardThemeTests extends AndroidTestCase { switch (themeId) { case THEME_ID_ICS: case THEME_ID_KLP: + case THEME_ID_LXX_LIGHT: case THEME_ID_LXX_DARK: return true; default: @@ -99,6 +102,7 @@ public class KeyboardThemeTests extends AndroidTestCase { assertKeyboardThemePreference(sdkVersion, THEME_ID_NULL, defaultThemeId); assertKeyboardThemePreference(sdkVersion, THEME_ID_ICS, THEME_ID_ICS); assertKeyboardThemePreference(sdkVersion, THEME_ID_KLP, THEME_ID_KLP); + assertKeyboardThemePreference(sdkVersion, THEME_ID_LXX_LIGHT, THEME_ID_LXX_LIGHT); assertKeyboardThemePreference(sdkVersion, THEME_ID_LXX_DARK, THEME_ID_LXX_DARK); assertKeyboardThemePreference(sdkVersion, THEME_ID_UNKNOWN, defaultThemeId); assertKeyboardThemePreference(sdkVersion, THEME_ID_ILLEGAL, defaultThemeId); @@ -114,10 +118,11 @@ public class KeyboardThemeTests extends AndroidTestCase { } private void assertKeyboardThemePreferenceOnLxx(final int sdkVersion) { - final int defaultThemeId = THEME_ID_LXX_DARK; + final int defaultThemeId = THEME_ID_LXX_LIGHT; assertKeyboardThemePreference(sdkVersion, THEME_ID_NULL, defaultThemeId); assertKeyboardThemePreference(sdkVersion, THEME_ID_ICS, THEME_ID_ICS); assertKeyboardThemePreference(sdkVersion, THEME_ID_KLP, THEME_ID_KLP); + assertKeyboardThemePreference(sdkVersion, THEME_ID_LXX_LIGHT, THEME_ID_LXX_LIGHT); assertKeyboardThemePreference(sdkVersion, THEME_ID_LXX_DARK, THEME_ID_LXX_DARK); assertKeyboardThemePreference(sdkVersion, THEME_ID_UNKNOWN, defaultThemeId); assertKeyboardThemePreference(sdkVersion, THEME_ID_ILLEGAL, defaultThemeId); @@ -169,11 +174,11 @@ public class KeyboardThemeTests extends AndroidTestCase { private void assertDefaultKeyboardThemeOnLxx(final int sdkVersion) { // Forced to switch to LXX theme. - assertDefaultKeyboardTheme(sdkVersion, THEME_ID_NULL, THEME_ID_LXX_DARK); - assertDefaultKeyboardTheme(sdkVersion, THEME_ID_ICS, THEME_ID_LXX_DARK); - assertDefaultKeyboardTheme(sdkVersion, THEME_ID_KLP, THEME_ID_LXX_DARK); - assertDefaultKeyboardTheme(sdkVersion, THEME_ID_UNKNOWN, THEME_ID_LXX_DARK); - assertDefaultKeyboardTheme(sdkVersion, THEME_ID_ILLEGAL, THEME_ID_LXX_DARK); + assertDefaultKeyboardTheme(sdkVersion, THEME_ID_NULL, THEME_ID_LXX_LIGHT); + assertDefaultKeyboardTheme(sdkVersion, THEME_ID_ICS, THEME_ID_LXX_LIGHT); + assertDefaultKeyboardTheme(sdkVersion, THEME_ID_KLP, THEME_ID_LXX_LIGHT); + assertDefaultKeyboardTheme(sdkVersion, THEME_ID_UNKNOWN, THEME_ID_LXX_LIGHT); + assertDefaultKeyboardTheme(sdkVersion, THEME_ID_ILLEGAL, THEME_ID_LXX_LIGHT); } public void testDefaultKeyboardThemeOnLxx() { @@ -234,11 +239,11 @@ public class KeyboardThemeTests extends AndroidTestCase { private void assertUpgradeKeyboardToLxxOnLxx(final int sdkVersion) { // Forced to switch to LXX theme. - assertUpgradeKeyboardToLxxOn(sdkVersion, THEME_ID_NULL, THEME_ID_LXX_DARK); - assertUpgradeKeyboardToLxxOn(sdkVersion, THEME_ID_ICS, THEME_ID_LXX_DARK); - assertUpgradeKeyboardToLxxOn(sdkVersion, THEME_ID_KLP, THEME_ID_LXX_DARK); - assertUpgradeKeyboardToLxxOn(sdkVersion, THEME_ID_UNKNOWN, THEME_ID_LXX_DARK); - assertUpgradeKeyboardToLxxOn(sdkVersion, THEME_ID_ILLEGAL, THEME_ID_LXX_DARK); + assertUpgradeKeyboardToLxxOn(sdkVersion, THEME_ID_NULL, THEME_ID_LXX_LIGHT); + assertUpgradeKeyboardToLxxOn(sdkVersion, THEME_ID_ICS, THEME_ID_LXX_LIGHT); + assertUpgradeKeyboardToLxxOn(sdkVersion, THEME_ID_KLP, THEME_ID_LXX_LIGHT); + assertUpgradeKeyboardToLxxOn(sdkVersion, THEME_ID_UNKNOWN, THEME_ID_LXX_LIGHT); + assertUpgradeKeyboardToLxxOn(sdkVersion, THEME_ID_ILLEGAL, THEME_ID_LXX_LIGHT); } // Upgrading keyboard on L. @@ -298,15 +303,15 @@ public class KeyboardThemeTests extends AndroidTestCase { // Forced to switch to LXX theme. final int newSdkVersion = VERSION_CODES_LXX; assertUpgradePlatformFromTo( - oldSdkVersion, newSdkVersion, THEME_ID_NULL, THEME_ID_LXX_DARK); + oldSdkVersion, newSdkVersion, THEME_ID_NULL, THEME_ID_LXX_LIGHT); assertUpgradePlatformFromTo( - oldSdkVersion, newSdkVersion, THEME_ID_ICS, THEME_ID_LXX_DARK); + oldSdkVersion, newSdkVersion, THEME_ID_ICS, THEME_ID_LXX_LIGHT); assertUpgradePlatformFromTo( - oldSdkVersion, newSdkVersion, THEME_ID_KLP, THEME_ID_LXX_DARK); + oldSdkVersion, newSdkVersion, THEME_ID_KLP, THEME_ID_LXX_LIGHT); assertUpgradePlatformFromTo( - oldSdkVersion, newSdkVersion, THEME_ID_UNKNOWN, THEME_ID_LXX_DARK); + oldSdkVersion, newSdkVersion, THEME_ID_UNKNOWN, THEME_ID_LXX_LIGHT); assertUpgradePlatformFromTo( - oldSdkVersion, newSdkVersion, THEME_ID_ILLEGAL, THEME_ID_LXX_DARK); + oldSdkVersion, newSdkVersion, THEME_ID_ILLEGAL, THEME_ID_LXX_LIGHT); } // Update platform from I,J, and K to L @@ -324,14 +329,18 @@ public class KeyboardThemeTests extends AndroidTestCase { final int oldSdkVersion = VERSION_CODES_LXX; final int newSdkVersion = VERSION_CODES_LXX; assertUpgradePlatformFromTo( - oldSdkVersion, newSdkVersion, THEME_ID_NULL, THEME_ID_LXX_DARK); + oldSdkVersion, newSdkVersion, THEME_ID_NULL, THEME_ID_LXX_LIGHT); assertUpgradePlatformFromTo( oldSdkVersion, newSdkVersion, THEME_ID_ICS, THEME_ID_ICS); assertUpgradePlatformFromTo( oldSdkVersion, newSdkVersion, THEME_ID_KLP, THEME_ID_KLP); assertUpgradePlatformFromTo( - oldSdkVersion, newSdkVersion, THEME_ID_UNKNOWN, THEME_ID_LXX_DARK); + oldSdkVersion, newSdkVersion, THEME_ID_LXX_LIGHT, THEME_ID_LXX_LIGHT); + assertUpgradePlatformFromTo( + oldSdkVersion, newSdkVersion, THEME_ID_LXX_DARK, THEME_ID_LXX_DARK); + assertUpgradePlatformFromTo( + oldSdkVersion, newSdkVersion, THEME_ID_UNKNOWN, THEME_ID_LXX_LIGHT); assertUpgradePlatformFromTo( - oldSdkVersion, newSdkVersion, THEME_ID_ILLEGAL, THEME_ID_LXX_DARK); + oldSdkVersion, newSdkVersion, THEME_ID_ILLEGAL, THEME_ID_LXX_LIGHT); } } |
