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 new file mode 100644 index 000000000..854c849cb Binary files /dev/null and b/java/res/drawable-hdpi/btn_keyboard_key_active_lxx_light.9.png differ 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 new file mode 100644 index 000000000..7a7e98297 Binary files /dev/null and b/java/res/drawable-hdpi/btn_keyboard_key_active_pressed_lxx_light.9.png differ 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 new file mode 100644 index 000000000..0802b11f8 Binary files /dev/null and b/java/res/drawable-hdpi/btn_keyboard_key_normal_off_lxx_light.9.png differ 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 new file mode 100644 index 000000000..f0a89c524 Binary files /dev/null and b/java/res/drawable-hdpi/btn_keyboard_key_normal_on_lxx_light.9.png differ 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 new file mode 100644 index 000000000..45d586570 Binary files /dev/null and b/java/res/drawable-hdpi/btn_keyboard_key_popup_selected_lxx_light.9.png differ 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 new file mode 100644 index 000000000..1b52bcc85 Binary files /dev/null and b/java/res/drawable-hdpi/btn_keyboard_key_pressed_off_lxx_light.9.png differ 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 new file mode 100644 index 000000000..1bc2a233f Binary files /dev/null and b/java/res/drawable-hdpi/btn_keyboard_key_pressed_on_lxx_light.9.png differ 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 new file mode 100644 index 000000000..615a40a3d Binary files /dev/null and b/java/res/drawable-hdpi/keyboard_key_feedback_background_lxx_light.9.png differ 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 new file mode 100644 index 000000000..c5871f699 Binary files /dev/null and b/java/res/drawable-hdpi/keyboard_key_feedback_more_background_lxx_light.9.png differ 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 new file mode 100644 index 000000000..41b0a1b35 Binary files /dev/null and b/java/res/drawable-hdpi/keyboard_popup_panel_background_lxx_light.9.png differ diff --git a/java/res/drawable-hdpi/suggestions_strip_divider_lxx_light.png b/java/res/drawable-hdpi/suggestions_strip_divider_lxx_light.png new file mode 100644 index 000000000..12485ef1a Binary files /dev/null and b/java/res/drawable-hdpi/suggestions_strip_divider_lxx_light.png differ diff --git a/java/res/drawable-hdpi/sym_keyboard_delete_lxx_light.png b/java/res/drawable-hdpi/sym_keyboard_delete_lxx_light.png new file mode 100644 index 000000000..e17d29715 Binary files /dev/null and b/java/res/drawable-hdpi/sym_keyboard_delete_lxx_light.png differ diff --git a/java/res/drawable-hdpi/sym_keyboard_done_lxx_light.png b/java/res/drawable-hdpi/sym_keyboard_done_lxx_light.png new file mode 100644 index 000000000..04eab599d Binary files /dev/null and b/java/res/drawable-hdpi/sym_keyboard_done_lxx_light.png differ diff --git a/java/res/drawable-hdpi/sym_keyboard_go_lxx_light.png b/java/res/drawable-hdpi/sym_keyboard_go_lxx_light.png new file mode 100644 index 000000000..189d609e1 Binary files /dev/null and b/java/res/drawable-hdpi/sym_keyboard_go_lxx_light.png differ 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 new file mode 100644 index 000000000..1c7af2018 Binary files /dev/null and b/java/res/drawable-hdpi/sym_keyboard_language_switch_lxx_light.png differ diff --git a/java/res/drawable-hdpi/sym_keyboard_next_lxx_light.png b/java/res/drawable-hdpi/sym_keyboard_next_lxx_light.png new file mode 100644 index 000000000..70679b028 Binary files /dev/null and b/java/res/drawable-hdpi/sym_keyboard_next_lxx_light.png differ diff --git a/java/res/drawable-hdpi/sym_keyboard_previous_lxx_light.png b/java/res/drawable-hdpi/sym_keyboard_previous_lxx_light.png new file mode 100644 index 000000000..952dd4fd2 Binary files /dev/null and b/java/res/drawable-hdpi/sym_keyboard_previous_lxx_light.png differ diff --git a/java/res/drawable-hdpi/sym_keyboard_return_lxx_light.png b/java/res/drawable-hdpi/sym_keyboard_return_lxx_light.png new file mode 100644 index 000000000..9ab1a3f50 Binary files /dev/null and b/java/res/drawable-hdpi/sym_keyboard_return_lxx_light.png differ diff --git a/java/res/drawable-hdpi/sym_keyboard_search_lxx_light.png b/java/res/drawable-hdpi/sym_keyboard_search_lxx_light.png new file mode 100644 index 000000000..ec7062723 Binary files /dev/null and b/java/res/drawable-hdpi/sym_keyboard_search_lxx_light.png differ diff --git a/java/res/drawable-hdpi/sym_keyboard_send_lxx_light.png b/java/res/drawable-hdpi/sym_keyboard_send_lxx_light.png new file mode 100644 index 000000000..bbc5094c9 Binary files /dev/null and b/java/res/drawable-hdpi/sym_keyboard_send_lxx_light.png differ diff --git a/java/res/drawable-hdpi/sym_keyboard_settings_lxx_light.png b/java/res/drawable-hdpi/sym_keyboard_settings_lxx_light.png new file mode 100644 index 000000000..144b15b0c Binary files /dev/null and b/java/res/drawable-hdpi/sym_keyboard_settings_lxx_light.png differ 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 new file mode 100644 index 000000000..657f65acc Binary files /dev/null and b/java/res/drawable-hdpi/sym_keyboard_shift_locked_lxx_light.png differ diff --git a/java/res/drawable-hdpi/sym_keyboard_shift_lxx_light.png b/java/res/drawable-hdpi/sym_keyboard_shift_lxx_light.png new file mode 100644 index 000000000..a46d65383 Binary files /dev/null and b/java/res/drawable-hdpi/sym_keyboard_shift_lxx_light.png differ diff --git a/java/res/drawable-hdpi/sym_keyboard_smiley_lxx_light.png b/java/res/drawable-hdpi/sym_keyboard_smiley_lxx_light.png new file mode 100644 index 000000000..2cfe1d406 Binary files /dev/null and b/java/res/drawable-hdpi/sym_keyboard_smiley_lxx_light.png differ 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 new file mode 100644 index 000000000..c27a36e81 Binary files /dev/null and b/java/res/drawable-hdpi/sym_keyboard_spacebar_lxx_light.9.png differ diff --git a/java/res/drawable-hdpi/sym_keyboard_voice_lxx_light.png b/java/res/drawable-hdpi/sym_keyboard_voice_lxx_light.png new file mode 100644 index 000000000..d6b070eb6 Binary files /dev/null and b/java/res/drawable-hdpi/sym_keyboard_voice_lxx_light.png differ 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 new file mode 100644 index 000000000..d33ab4e88 Binary files /dev/null and b/java/res/drawable-hdpi/sym_keyboard_voice_off_lxx_light.png differ 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 new file mode 100644 index 000000000..e7a585b70 Binary files /dev/null and b/java/res/drawable-mdpi/btn_keyboard_key_active_lxx_light.9.png differ 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 new file mode 100644 index 000000000..5a6513392 Binary files /dev/null and b/java/res/drawable-mdpi/btn_keyboard_key_active_pressed_lxx_light.9.png differ 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 new file mode 100644 index 000000000..afcb4f9b1 Binary files /dev/null and b/java/res/drawable-mdpi/btn_keyboard_key_normal_off_lxx_light.9.png differ 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 new file mode 100644 index 000000000..3323d2c7d Binary files /dev/null and b/java/res/drawable-mdpi/btn_keyboard_key_normal_on_lxx_light.9.png differ 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 new file mode 100644 index 000000000..e388cfb2f Binary files /dev/null and b/java/res/drawable-mdpi/btn_keyboard_key_popup_selected_lxx_light.9.png differ 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 new file mode 100644 index 000000000..d8e4355ce Binary files /dev/null and b/java/res/drawable-mdpi/btn_keyboard_key_pressed_off_lxx_light.9.png differ 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 new file mode 100644 index 000000000..b9a42fa72 Binary files /dev/null and b/java/res/drawable-mdpi/btn_keyboard_key_pressed_on_lxx_light.9.png differ 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 new file mode 100644 index 000000000..f97cfb913 Binary files /dev/null and b/java/res/drawable-mdpi/keyboard_key_feedback_background_lxx_light.9.png differ 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 new file mode 100644 index 000000000..1fe06f9fe Binary files /dev/null and b/java/res/drawable-mdpi/keyboard_key_feedback_more_background_lxx_light.9.png differ 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 new file mode 100644 index 000000000..1edf94fbf Binary files /dev/null and b/java/res/drawable-mdpi/keyboard_popup_panel_background_lxx_light.9.png differ diff --git a/java/res/drawable-mdpi/suggestions_strip_divider_lxx_light.png b/java/res/drawable-mdpi/suggestions_strip_divider_lxx_light.png new file mode 100644 index 000000000..051e66ccd Binary files /dev/null and b/java/res/drawable-mdpi/suggestions_strip_divider_lxx_light.png differ diff --git a/java/res/drawable-mdpi/sym_keyboard_delete_lxx_light.png b/java/res/drawable-mdpi/sym_keyboard_delete_lxx_light.png new file mode 100644 index 000000000..007b5ea49 Binary files /dev/null and b/java/res/drawable-mdpi/sym_keyboard_delete_lxx_light.png differ diff --git a/java/res/drawable-mdpi/sym_keyboard_done_lxx_light.png b/java/res/drawable-mdpi/sym_keyboard_done_lxx_light.png new file mode 100644 index 000000000..930f97111 Binary files /dev/null and b/java/res/drawable-mdpi/sym_keyboard_done_lxx_light.png differ diff --git a/java/res/drawable-mdpi/sym_keyboard_go_lxx_light.png b/java/res/drawable-mdpi/sym_keyboard_go_lxx_light.png new file mode 100644 index 000000000..f9975c34f Binary files /dev/null and b/java/res/drawable-mdpi/sym_keyboard_go_lxx_light.png differ 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 new file mode 100644 index 000000000..e1c1265d5 Binary files /dev/null and b/java/res/drawable-mdpi/sym_keyboard_language_switch_lxx_light.png differ diff --git a/java/res/drawable-mdpi/sym_keyboard_next_lxx_light.png b/java/res/drawable-mdpi/sym_keyboard_next_lxx_light.png new file mode 100644 index 000000000..e18b1cf1c Binary files /dev/null and b/java/res/drawable-mdpi/sym_keyboard_next_lxx_light.png differ diff --git a/java/res/drawable-mdpi/sym_keyboard_previous_lxx_light.png b/java/res/drawable-mdpi/sym_keyboard_previous_lxx_light.png new file mode 100644 index 000000000..2044db67e Binary files /dev/null and b/java/res/drawable-mdpi/sym_keyboard_previous_lxx_light.png differ diff --git a/java/res/drawable-mdpi/sym_keyboard_return_lxx_light.png b/java/res/drawable-mdpi/sym_keyboard_return_lxx_light.png new file mode 100644 index 000000000..bfc7d7108 Binary files /dev/null and b/java/res/drawable-mdpi/sym_keyboard_return_lxx_light.png differ diff --git a/java/res/drawable-mdpi/sym_keyboard_search_lxx_light.png b/java/res/drawable-mdpi/sym_keyboard_search_lxx_light.png new file mode 100644 index 000000000..05fbe83c8 Binary files /dev/null and b/java/res/drawable-mdpi/sym_keyboard_search_lxx_light.png differ diff --git a/java/res/drawable-mdpi/sym_keyboard_send_lxx_light.png b/java/res/drawable-mdpi/sym_keyboard_send_lxx_light.png new file mode 100644 index 000000000..2de9b5619 Binary files /dev/null and b/java/res/drawable-mdpi/sym_keyboard_send_lxx_light.png differ diff --git a/java/res/drawable-mdpi/sym_keyboard_settings_lxx_light.png b/java/res/drawable-mdpi/sym_keyboard_settings_lxx_light.png new file mode 100644 index 000000000..f70030ba3 Binary files /dev/null and b/java/res/drawable-mdpi/sym_keyboard_settings_lxx_light.png differ 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 new file mode 100644 index 000000000..298cb9526 Binary files /dev/null and b/java/res/drawable-mdpi/sym_keyboard_shift_locked_lxx_light.png differ diff --git a/java/res/drawable-mdpi/sym_keyboard_shift_lxx_light.png b/java/res/drawable-mdpi/sym_keyboard_shift_lxx_light.png new file mode 100644 index 000000000..056fc51d6 Binary files /dev/null and b/java/res/drawable-mdpi/sym_keyboard_shift_lxx_light.png differ diff --git a/java/res/drawable-mdpi/sym_keyboard_smiley_lxx_light.png b/java/res/drawable-mdpi/sym_keyboard_smiley_lxx_light.png new file mode 100644 index 000000000..ff49d58e1 Binary files /dev/null and b/java/res/drawable-mdpi/sym_keyboard_smiley_lxx_light.png differ 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 new file mode 100644 index 000000000..ab64cd642 Binary files /dev/null and b/java/res/drawable-mdpi/sym_keyboard_spacebar_lxx_light.9.png differ diff --git a/java/res/drawable-mdpi/sym_keyboard_voice_lxx_light.png b/java/res/drawable-mdpi/sym_keyboard_voice_lxx_light.png new file mode 100644 index 000000000..0ddcb792c Binary files /dev/null and b/java/res/drawable-mdpi/sym_keyboard_voice_lxx_light.png differ 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 new file mode 100644 index 000000000..8831bc04c Binary files /dev/null and b/java/res/drawable-mdpi/sym_keyboard_voice_off_lxx_light.png differ 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 new file mode 100644 index 000000000..dca7a3274 Binary files /dev/null and b/java/res/drawable-xhdpi/btn_keyboard_key_active_lxx_light.9.png differ 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 new file mode 100644 index 000000000..fa32a2c6e Binary files /dev/null and b/java/res/drawable-xhdpi/btn_keyboard_key_active_pressed_lxx_light.9.png differ 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 new file mode 100644 index 000000000..e58df5cb0 Binary files /dev/null and b/java/res/drawable-xhdpi/btn_keyboard_key_normal_off_lxx_light.9.png differ 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 new file mode 100644 index 000000000..5a9507387 Binary files /dev/null and b/java/res/drawable-xhdpi/btn_keyboard_key_normal_on_lxx_light.9.png differ 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 new file mode 100644 index 000000000..0b340e2cb Binary files /dev/null and b/java/res/drawable-xhdpi/btn_keyboard_key_popup_selected_lxx_light.9.png differ 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 new file mode 100644 index 000000000..58b705414 Binary files /dev/null and b/java/res/drawable-xhdpi/btn_keyboard_key_pressed_off_lxx_light.9.png differ 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 new file mode 100644 index 000000000..3da5f47b0 Binary files /dev/null and b/java/res/drawable-xhdpi/btn_keyboard_key_pressed_on_lxx_light.9.png differ 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 new file mode 100644 index 000000000..bd6ec94b8 Binary files /dev/null and b/java/res/drawable-xhdpi/keyboard_key_feedback_background_lxx_light.9.png differ 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 new file mode 100644 index 000000000..eef27a377 Binary files /dev/null and b/java/res/drawable-xhdpi/keyboard_key_feedback_more_background_lxx_light.9.png differ 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 new file mode 100644 index 000000000..8a51d7148 Binary files /dev/null and b/java/res/drawable-xhdpi/keyboard_popup_panel_background_lxx_light.9.png differ diff --git a/java/res/drawable-xhdpi/suggestions_strip_divider_lxx_light.png b/java/res/drawable-xhdpi/suggestions_strip_divider_lxx_light.png new file mode 100644 index 000000000..0047e5c17 Binary files /dev/null and b/java/res/drawable-xhdpi/suggestions_strip_divider_lxx_light.png differ diff --git a/java/res/drawable-xhdpi/sym_keyboard_delete_lxx_light.png b/java/res/drawable-xhdpi/sym_keyboard_delete_lxx_light.png new file mode 100644 index 000000000..df4e358a1 Binary files /dev/null and b/java/res/drawable-xhdpi/sym_keyboard_delete_lxx_light.png differ diff --git a/java/res/drawable-xhdpi/sym_keyboard_done_lxx_light.png b/java/res/drawable-xhdpi/sym_keyboard_done_lxx_light.png new file mode 100644 index 000000000..070fe8d7b Binary files /dev/null and b/java/res/drawable-xhdpi/sym_keyboard_done_lxx_light.png differ diff --git a/java/res/drawable-xhdpi/sym_keyboard_go_lxx_light.png b/java/res/drawable-xhdpi/sym_keyboard_go_lxx_light.png new file mode 100644 index 000000000..33bbe3c50 Binary files /dev/null and b/java/res/drawable-xhdpi/sym_keyboard_go_lxx_light.png differ 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 new file mode 100644 index 000000000..023e64720 Binary files /dev/null and b/java/res/drawable-xhdpi/sym_keyboard_language_switch_lxx_light.png differ diff --git a/java/res/drawable-xhdpi/sym_keyboard_next_lxx_light.png b/java/res/drawable-xhdpi/sym_keyboard_next_lxx_light.png new file mode 100644 index 000000000..2c1fe6d3c Binary files /dev/null and b/java/res/drawable-xhdpi/sym_keyboard_next_lxx_light.png differ diff --git a/java/res/drawable-xhdpi/sym_keyboard_previous_lxx_light.png b/java/res/drawable-xhdpi/sym_keyboard_previous_lxx_light.png new file mode 100644 index 000000000..49b2651f3 Binary files /dev/null and b/java/res/drawable-xhdpi/sym_keyboard_previous_lxx_light.png differ diff --git a/java/res/drawable-xhdpi/sym_keyboard_return_lxx_light.png b/java/res/drawable-xhdpi/sym_keyboard_return_lxx_light.png new file mode 100644 index 000000000..85473bc08 Binary files /dev/null and b/java/res/drawable-xhdpi/sym_keyboard_return_lxx_light.png differ diff --git a/java/res/drawable-xhdpi/sym_keyboard_search_lxx_light.png b/java/res/drawable-xhdpi/sym_keyboard_search_lxx_light.png new file mode 100644 index 000000000..a95d55441 Binary files /dev/null and b/java/res/drawable-xhdpi/sym_keyboard_search_lxx_light.png differ diff --git a/java/res/drawable-xhdpi/sym_keyboard_send_lxx_light.png b/java/res/drawable-xhdpi/sym_keyboard_send_lxx_light.png new file mode 100644 index 000000000..21b0ac0c5 Binary files /dev/null and b/java/res/drawable-xhdpi/sym_keyboard_send_lxx_light.png differ diff --git a/java/res/drawable-xhdpi/sym_keyboard_settings_lxx_light.png b/java/res/drawable-xhdpi/sym_keyboard_settings_lxx_light.png new file mode 100644 index 000000000..d46c26bc8 Binary files /dev/null and b/java/res/drawable-xhdpi/sym_keyboard_settings_lxx_light.png differ 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 new file mode 100644 index 000000000..64fdb1762 Binary files /dev/null and b/java/res/drawable-xhdpi/sym_keyboard_shift_locked_lxx_light.png differ diff --git a/java/res/drawable-xhdpi/sym_keyboard_shift_lxx_light.png b/java/res/drawable-xhdpi/sym_keyboard_shift_lxx_light.png new file mode 100644 index 000000000..3a56ed9dc Binary files /dev/null and b/java/res/drawable-xhdpi/sym_keyboard_shift_lxx_light.png differ diff --git a/java/res/drawable-xhdpi/sym_keyboard_smiley_lxx_light.png b/java/res/drawable-xhdpi/sym_keyboard_smiley_lxx_light.png new file mode 100644 index 000000000..df3eba750 Binary files /dev/null and b/java/res/drawable-xhdpi/sym_keyboard_smiley_lxx_light.png differ 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 new file mode 100644 index 000000000..0cf38f2af Binary files /dev/null and b/java/res/drawable-xhdpi/sym_keyboard_spacebar_lxx_light.9.png differ diff --git a/java/res/drawable-xhdpi/sym_keyboard_voice_lxx_light.png b/java/res/drawable-xhdpi/sym_keyboard_voice_lxx_light.png new file mode 100644 index 000000000..c9b25040c Binary files /dev/null and b/java/res/drawable-xhdpi/sym_keyboard_voice_lxx_light.png differ 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 new file mode 100644 index 000000000..1398a3ed6 Binary files /dev/null and b/java/res/drawable-xhdpi/sym_keyboard_voice_off_lxx_light.png differ 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 new file mode 100644 index 000000000..1f5f922dc Binary files /dev/null and b/java/res/drawable-xxhdpi/btn_keyboard_key_active_lxx_light.9.png differ 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 new file mode 100644 index 000000000..031014360 Binary files /dev/null and b/java/res/drawable-xxhdpi/btn_keyboard_key_active_pressed_lxx_light.9.png differ 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 new file mode 100644 index 000000000..fb1dc62d1 Binary files /dev/null and b/java/res/drawable-xxhdpi/btn_keyboard_key_normal_off_lxx_light.9.png differ 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 new file mode 100644 index 000000000..70346218f Binary files /dev/null and b/java/res/drawable-xxhdpi/btn_keyboard_key_normal_on_lxx_light.9.png differ 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 new file mode 100644 index 000000000..e58d6643f Binary files /dev/null and b/java/res/drawable-xxhdpi/btn_keyboard_key_popup_selected_lxx_light.9.png differ 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 new file mode 100644 index 000000000..8e01cfa2d Binary files /dev/null and b/java/res/drawable-xxhdpi/btn_keyboard_key_pressed_off_lxx_light.9.png differ 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 new file mode 100644 index 000000000..1619411b2 Binary files /dev/null and b/java/res/drawable-xxhdpi/btn_keyboard_key_pressed_on_lxx_light.9.png differ 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 new file mode 100644 index 000000000..dcc0ab084 Binary files /dev/null and b/java/res/drawable-xxhdpi/keyboard_key_feedback_background_lxx_light.9.png differ 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 new file mode 100644 index 000000000..5fd175187 Binary files /dev/null and b/java/res/drawable-xxhdpi/keyboard_key_feedback_more_background_lxx_light.9.png differ 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 new file mode 100644 index 000000000..1336d8005 Binary files /dev/null and b/java/res/drawable-xxhdpi/keyboard_popup_panel_background_lxx_light.9.png differ diff --git a/java/res/drawable-xxhdpi/suggestions_strip_divider_lxx_light.png b/java/res/drawable-xxhdpi/suggestions_strip_divider_lxx_light.png new file mode 100644 index 000000000..9b37dd094 Binary files /dev/null and b/java/res/drawable-xxhdpi/suggestions_strip_divider_lxx_light.png differ diff --git a/java/res/drawable-xxhdpi/sym_keyboard_delete_lxx_light.png b/java/res/drawable-xxhdpi/sym_keyboard_delete_lxx_light.png new file mode 100644 index 000000000..c3937c491 Binary files /dev/null and b/java/res/drawable-xxhdpi/sym_keyboard_delete_lxx_light.png differ diff --git a/java/res/drawable-xxhdpi/sym_keyboard_done_lxx_light.png b/java/res/drawable-xxhdpi/sym_keyboard_done_lxx_light.png new file mode 100644 index 000000000..0347327ff Binary files /dev/null and b/java/res/drawable-xxhdpi/sym_keyboard_done_lxx_light.png differ diff --git a/java/res/drawable-xxhdpi/sym_keyboard_go_lxx_light.png b/java/res/drawable-xxhdpi/sym_keyboard_go_lxx_light.png new file mode 100644 index 000000000..0c66a6bc1 Binary files /dev/null and b/java/res/drawable-xxhdpi/sym_keyboard_go_lxx_light.png differ 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 new file mode 100644 index 000000000..82b4d51e5 Binary files /dev/null and b/java/res/drawable-xxhdpi/sym_keyboard_language_switch_lxx_light.png differ diff --git a/java/res/drawable-xxhdpi/sym_keyboard_next_lxx_light.png b/java/res/drawable-xxhdpi/sym_keyboard_next_lxx_light.png new file mode 100644 index 000000000..4e1407012 Binary files /dev/null and b/java/res/drawable-xxhdpi/sym_keyboard_next_lxx_light.png differ diff --git a/java/res/drawable-xxhdpi/sym_keyboard_previous_lxx_light.png b/java/res/drawable-xxhdpi/sym_keyboard_previous_lxx_light.png new file mode 100644 index 000000000..78865cb0e Binary files /dev/null and b/java/res/drawable-xxhdpi/sym_keyboard_previous_lxx_light.png differ diff --git a/java/res/drawable-xxhdpi/sym_keyboard_return_lxx_light.png b/java/res/drawable-xxhdpi/sym_keyboard_return_lxx_light.png new file mode 100644 index 000000000..a429d6634 Binary files /dev/null and b/java/res/drawable-xxhdpi/sym_keyboard_return_lxx_light.png differ diff --git a/java/res/drawable-xxhdpi/sym_keyboard_search_lxx_light.png b/java/res/drawable-xxhdpi/sym_keyboard_search_lxx_light.png new file mode 100644 index 000000000..1b9952aa6 Binary files /dev/null and b/java/res/drawable-xxhdpi/sym_keyboard_search_lxx_light.png differ diff --git a/java/res/drawable-xxhdpi/sym_keyboard_send_lxx_light.png b/java/res/drawable-xxhdpi/sym_keyboard_send_lxx_light.png new file mode 100644 index 000000000..a886505e1 Binary files /dev/null and b/java/res/drawable-xxhdpi/sym_keyboard_send_lxx_light.png differ diff --git a/java/res/drawable-xxhdpi/sym_keyboard_settings_lxx_light.png b/java/res/drawable-xxhdpi/sym_keyboard_settings_lxx_light.png new file mode 100644 index 000000000..e5be02811 Binary files /dev/null and b/java/res/drawable-xxhdpi/sym_keyboard_settings_lxx_light.png differ 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 new file mode 100644 index 000000000..2da7b6514 Binary files /dev/null and b/java/res/drawable-xxhdpi/sym_keyboard_shift_locked_lxx_light.png differ diff --git a/java/res/drawable-xxhdpi/sym_keyboard_shift_lxx_light.png b/java/res/drawable-xxhdpi/sym_keyboard_shift_lxx_light.png new file mode 100644 index 000000000..ee51c562b Binary files /dev/null and b/java/res/drawable-xxhdpi/sym_keyboard_shift_lxx_light.png differ diff --git a/java/res/drawable-xxhdpi/sym_keyboard_smiley_lxx_light.png b/java/res/drawable-xxhdpi/sym_keyboard_smiley_lxx_light.png new file mode 100644 index 000000000..08d4f8adc Binary files /dev/null and b/java/res/drawable-xxhdpi/sym_keyboard_smiley_lxx_light.png differ 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 new file mode 100644 index 000000000..90c963733 Binary files /dev/null and b/java/res/drawable-xxhdpi/sym_keyboard_spacebar_lxx_light.9.png differ diff --git a/java/res/drawable-xxhdpi/sym_keyboard_voice_lxx_light.png b/java/res/drawable-xxhdpi/sym_keyboard_voice_lxx_light.png new file mode 100644 index 000000000..42331e920 Binary files /dev/null and b/java/res/drawable-xxhdpi/sym_keyboard_voice_lxx_light.png differ 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 new file mode 100644 index 000000000..5a3ed0d48 Binary files /dev/null and b/java/res/drawable-xxhdpi/sym_keyboard_voice_off_lxx_light.png differ 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 @@ + + + + + + + + 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 @@ + + + + + + + + + + + + + + + + + + + + + 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 @@ + + + + + + + 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 @@ + + + + + + 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 @@ + + + + + + + + + + + + + + + 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 @@ #D8F0F0F0 #B2F0F0F0 #99E0E0E0 + + #546E7A + #99546E7A + #99546E7A + #4DB6AC + #D84DB6AC + #B24DB6AC + #994DB6AC + #ECEFF1 + #ECEFF1 + #26546E7A + #E4E7E9 + #26546E7A + #C0000000 + #E4E7E9 #B3FFFFFF #66FFFFFF 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 @@ + + + + + + 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 @@ - + @string/keyboard_theme_material_light @string/keyboard_theme_material_dark @string/keyboard_theme_holo_white @string/keyboard_theme_holo_blue - 3 + 4 2 0 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" > - 3 + 4 @fraction/config_keyboard_top_padding_holo @fraction/config_keyboard_bottom_padding_holo @fraction/config_key_horizontal_gap_holo 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 @@ + + + + + + + + + + + + + + + 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 { 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 { 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_ILLEGAL, THEME_ID_LXX_DARK); + 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_LIGHT); } }