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 0000000000000000000000000000000000000000..854c849cbff45f8a6da76d7b4ee51785a6df5c6a
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 0000000000000000000000000000000000000000..7a7e9829787e91e247d7a86d8a9eed32a26eee51
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 0000000000000000000000000000000000000000..0802b11f823b9a47525d6f7e0278af0b7cdbbcc9
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 0000000000000000000000000000000000000000..f0a89c5246d1e75e158f1421653771e6ea9c23de
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 0000000000000000000000000000000000000000..45d5865705c8d99e11500eebc1e7449706d2d7cf
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 0000000000000000000000000000000000000000..1b52bcc85b908cd0f6ec2b36b842ab43d41fe0b1
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 0000000000000000000000000000000000000000..1bc2a233fda8b6c1d04d3bb9e764a0036c22965b
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 0000000000000000000000000000000000000000..615a40a3dc11fc952f14ef1c03d659e05de0c976
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 0000000000000000000000000000000000000000..c5871f699f7a48c382218341e1d27a42083e8f2c
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 0000000000000000000000000000000000000000..41b0a1b35ed656ef552f4be398927b350aec596b
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 0000000000000000000000000000000000000000..12485ef1a3b8dc0ae301afd6486e157b398a38d7
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 0000000000000000000000000000000000000000..e17d2971521689c54f5e52a2d462bfcb56901f36
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 0000000000000000000000000000000000000000..04eab599d8573e7c762af9df7062ef756adfac77
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 0000000000000000000000000000000000000000..189d609e1d20ae2a44b5713e6d1a526e1b548ab3
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 0000000000000000000000000000000000000000..1c7af2018c58e4505a302b1815d500dd08d36c5a
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 0000000000000000000000000000000000000000..70679b0282d5118a600c0ce6c9b8471ea250fd1e
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 0000000000000000000000000000000000000000..952dd4fd2f4174ea190fa352f0e11b7ba2f22321
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 0000000000000000000000000000000000000000..9ab1a3f5074482de8bd21f9a00f6dae1324c0d6f
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 0000000000000000000000000000000000000000..ec70627235e77ef465a46c047e036f875cb12de7
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 0000000000000000000000000000000000000000..bbc5094c938a4020209df14111db352d0089b035
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 0000000000000000000000000000000000000000..144b15b0cdf1e926451781b0f3962dd451411c54
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 0000000000000000000000000000000000000000..657f65acc63de50cb5cdfcb85f2d6e57ff6d9dfb
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 0000000000000000000000000000000000000000..a46d65383221eec152df7167c60febc959d4b759
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 0000000000000000000000000000000000000000..2cfe1d4060eef4c2df1de2408bc362314a3b0537
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 0000000000000000000000000000000000000000..c27a36e815822b76c1fad645303edc5bed78a7b3
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 0000000000000000000000000000000000000000..d6b070eb60aedfac302c3f5100074a773aa1c29f
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 0000000000000000000000000000000000000000..d33ab4e88a3a6f611efbb433b5ab4ed3757b6bcc
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 0000000000000000000000000000000000000000..e7a585b70b83af0070fc7dff49951f3ffc12d14f
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 0000000000000000000000000000000000000000..5a65133923c91c798905d0b426771dfbf5448efb
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 0000000000000000000000000000000000000000..afcb4f9b13c7b3e431f0c9f81397a77c1bae84a6
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 0000000000000000000000000000000000000000..3323d2c7da66843b7368191c26be694f65108b4c
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 0000000000000000000000000000000000000000..e388cfb2fca25c71e71cb0f39e96effc681dd138
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 0000000000000000000000000000000000000000..d8e4355ce448b24ac73aeaf1638782ecc3bd0187
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 0000000000000000000000000000000000000000..b9a42fa72820c8dbe65ba3928cbd16c9f37315a0
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 0000000000000000000000000000000000000000..f97cfb913025fc17b30d8d8fbae6277822371e47
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 0000000000000000000000000000000000000000..1fe06f9fe9c3456c2f5896b1a09ad1ded08fb1be
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 0000000000000000000000000000000000000000..1edf94fbf70b98b9161736fd9108dcceb553efc5
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 0000000000000000000000000000000000000000..051e66ccda0c6c6384e43ea69c54ea1199951fed
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 0000000000000000000000000000000000000000..007b5ea499c52d8b60a43a9a2860c1e2b7c0c66a
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 0000000000000000000000000000000000000000..930f97111f2f1a5c212977c9ee9f3f53d18f3556
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 0000000000000000000000000000000000000000..f9975c34fcd8e5b64d72ebbc193cefc60c4e85f4
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 0000000000000000000000000000000000000000..e1c1265d575f2f705e3b90ff4d65bea3b19295db
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 0000000000000000000000000000000000000000..e18b1cf1cd491ce39eb7ccf19a4857e93e39eda3
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 0000000000000000000000000000000000000000..2044db67ebe1e99b9c45bad2435831bee0097f4b
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 0000000000000000000000000000000000000000..bfc7d7108120784f9be6836e7ecdf2c551cb11f6
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 0000000000000000000000000000000000000000..05fbe83c8449729bdf29f0a904a58f7dde188eb1
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 0000000000000000000000000000000000000000..2de9b561937f0e06f243ff5166d250b814bf76ed
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 0000000000000000000000000000000000000000..f70030ba39ef023aa9a5d3ab8fa4bebbfe0cb269
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 0000000000000000000000000000000000000000..298cb9526d8f78a274e2b0e514bce30b6104748b
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 0000000000000000000000000000000000000000..056fc51d6e7f9c459b603442a92357cb1828da19
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 0000000000000000000000000000000000000000..ff49d58e1f5534687dd86f7c7b2eee21a6c07f44
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 0000000000000000000000000000000000000000..ab64cd64283bed09d65925a765a5e59d46b5c465
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 0000000000000000000000000000000000000000..0ddcb792ccdf9c8b1d5c4e3aa90274116943b80e
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 0000000000000000000000000000000000000000..8831bc04cddd7b31e78ff9ec61facf0bd1caa76c
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 0000000000000000000000000000000000000000..dca7a32747bd88e09a086beb767535d65aff965e
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 0000000000000000000000000000000000000000..fa32a2c6e1dae9c7862b34c3e255fb9f9d69f5f5
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 0000000000000000000000000000000000000000..e58df5cb031a068c7e8fa272a6c77b9068de1991
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 0000000000000000000000000000000000000000..5a950738770bb94eaab396b25630bbdb09d43529
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 0000000000000000000000000000000000000000..0b340e2cbc58f59dd8c23a91303cb8457c26cefd
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 0000000000000000000000000000000000000000..58b70541489f1042b5a64692d478d4adb4f06f75
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 0000000000000000000000000000000000000000..3da5f47b013d92f08fa0bd5efbd2fa797a11990a
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 0000000000000000000000000000000000000000..bd6ec94b8d67ad813abc28d70ad00ed085bf10d4
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 0000000000000000000000000000000000000000..eef27a377164fb9a3f61ded51217368bb4710193
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 0000000000000000000000000000000000000000..8a51d7148f3713b4095794ccc0fac9b91b4931e4
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 0000000000000000000000000000000000000000..0047e5c17b8e2e9c77adc74e1544d12b488fe018
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 0000000000000000000000000000000000000000..df4e358a1365e6029f9181d59e0d5ec38a6c75a1
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 0000000000000000000000000000000000000000..070fe8d7b960570337e49554ea51bb2e125231c9
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 0000000000000000000000000000000000000000..33bbe3c50aae7ee351df90849f06f1a309c1fd83
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 0000000000000000000000000000000000000000..023e64720193e44bedb1396958914e20743b772d
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 0000000000000000000000000000000000000000..2c1fe6d3cd99b09b3dbd9eb9b31da1057beb5c40
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 0000000000000000000000000000000000000000..49b2651f3fba678b783d87ac9e2d34e8f6e2aaa5
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 0000000000000000000000000000000000000000..85473bc08799cb1b8de7b3e832c67dd5a0043ef0
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 0000000000000000000000000000000000000000..a95d554410cdb034762591adb8948aaa1c14522a
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 0000000000000000000000000000000000000000..21b0ac0c536c38916a34b351fd4fd51ac8a3a8a3
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 0000000000000000000000000000000000000000..d46c26bc8315833a5f0b66403681b3c61b43c479
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 0000000000000000000000000000000000000000..64fdb1762d33da694954e9709c9003f36c4618bc
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 0000000000000000000000000000000000000000..3a56ed9dcfcf72d42c52bb6c2ae4ad9a3abd3947
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 0000000000000000000000000000000000000000..df3eba75070c651a41adbacfa1ba255ab0e558eb
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 0000000000000000000000000000000000000000..0cf38f2afb3c00de8be6dce3ae4b941af30b1d65
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 0000000000000000000000000000000000000000..c9b25040c288e0dde735d1620aa3761633386fe3
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 0000000000000000000000000000000000000000..1398a3ed65f467b81dcf0ced13f1092c6949734f
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 0000000000000000000000000000000000000000..1f5f922dcfb27a828f62f97b5bfa0272643287c3
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 0000000000000000000000000000000000000000..031014360bd0b6c38cf7345e83f87b8cf3004885
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 0000000000000000000000000000000000000000..fb1dc62d18d8feae9fd692ce18622319a9c286ce
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 0000000000000000000000000000000000000000..70346218f958d9384a09a6104d848a7db2cc0a7a
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 0000000000000000000000000000000000000000..e58d6643fd25aa6755d12aa2e2e4f600f7780cd5
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 0000000000000000000000000000000000000000..8e01cfa2de5400ee383725844832ad12bb66616b
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 0000000000000000000000000000000000000000..1619411b2dcb3fb58c1412e3c15b0c2061080933
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 0000000000000000000000000000000000000000..dcc0ab084913667c8d0f85a9e300a155bd25f7e9
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 0000000000000000000000000000000000000000..5fd175187cb3f8397d4e7a536e68bb7a07346e62
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 0000000000000000000000000000000000000000..1336d8005065035b12c21afb0f1920c5a07b79e3
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 0000000000000000000000000000000000000000..9b37dd094cc6b3b4f80e0978cef6ea74fb4c13f1
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 0000000000000000000000000000000000000000..c3937c4910b941d3a588ea844c467d209d9b48e3
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 0000000000000000000000000000000000000000..0347327ff4db68a1211cd580f98d2c63a6cf5462
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 0000000000000000000000000000000000000000..0c66a6bc1636100f5301bae711240ec096afb433
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 0000000000000000000000000000000000000000..82b4d51e5add864b03ebfb649af68eb4d655559a
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 0000000000000000000000000000000000000000..4e14070122faba6598063f06dd19aab8af08e9a4
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 0000000000000000000000000000000000000000..78865cb0e00830f900fbf77694fd7bb28f747acc
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 0000000000000000000000000000000000000000..a429d66348a88c76f17d366f7dcb51855e347309
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 0000000000000000000000000000000000000000..1b9952aa666368add0943dc375447199478f8965
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 0000000000000000000000000000000000000000..a886505e1b137488489d81c040925eff9864a918
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 0000000000000000000000000000000000000000..e5be0281192e70332ad13990ee2cc86396cecb6c
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 0000000000000000000000000000000000000000..2da7b651441e0eaf2819f102ef531b3dd56c6183
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 0000000000000000000000000000000000000000..ee51c562b90764f84afd32ee89f653dc0a7cf850
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 0000000000000000000000000000000000000000..08d4f8adc84d65c50a5f845182657fdba7117882
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 0000000000000000000000000000000000000000..90c963733b46e1ae37e2b848a5e2e90d85347878
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 0000000000000000000000000000000000000000..42331e9208b2f8195e69e39be6804f4e97b450b8
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 0000000000000000000000000000000000000000..5a3ed0d4830ed47a6cdb27fd8934827afc5d43bb
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 0000000000000000000000000000000000000000..e518ca11d83b87a3d747b30b52e23868a1959f71
--- /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 0000000000000000000000000000000000000000..60fe02dd2e795563d74bc763304e16b0b1148d73
--- /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 0000000000000000000000000000000000000000..acd19fda4ad22e234ad6a3339edb5166396aa720
--- /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 0000000000000000000000000000000000000000..84a91209ed83ffc76401a75a217a920fec1d879a
--- /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 0000000000000000000000000000000000000000..f4341c9b594bb2f5709d77cbdad8eb4e5b8d235e
--- /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 c85710d6a30c1bd429d6ea452396a8ef32d2df5a..ad7a04ebf70161bb63ff53f3588c5b286e86cf14 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 0000000000000000000000000000000000000000..651e75ce233c6396e97f2bcdee7c5d07173c9547
--- /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 28a34c31514de250d291643fb13891c0aac5a8af..9d772c4e794178270439a8409b3877e78c5ba5fa 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 8d6be3b851409fdc67874952488d39869f37daf2..c04e04d5667efd49c695568e62f7fbbbc42f82ee 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 0000000000000000000000000000000000000000..3695f8046e6db898e2b43f1ab52636b0d9616386
--- /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 7b41dfef657b679e99feb8480f165889f335f6ff..4c2e0dd1d4bb244090b4787bca4d0ef2af0b4160 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 f9d98afa2dc58dcb6512d5edd8c08ee66b1c79fa..0c7e4000e0a44a5048d7e59e7975eddd883d4fd7 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);
}
}