diff --git a/java/res/drawable-hdpi/cancel.png b/java/res/drawable-hdpi/cancel.png
deleted file mode 100644
index 506cf99d0c22ab67f2f3fc64f7700dcfe5f74a18..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-hdpi/cancel.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/cancel_holo.9.png b/java/res/drawable-hdpi/cancel_holo.9.png
deleted file mode 100644
index 33548d6060104bab6b1827306d613d60a8369071..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-hdpi/cancel_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/dialog_bubble_step02.9.png b/java/res/drawable-hdpi/dialog_bubble_step02.9.png
deleted file mode 100644
index b338364c5fbef92c31d9d3fb5ba93993b3164166..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-hdpi/dialog_bubble_step02.9.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/dialog_bubble_step07.9.png b/java/res/drawable-hdpi/dialog_bubble_step07.9.png
deleted file mode 100644
index 94b915432d34e3acdd8b6130e42718ed7eda1d8e..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-hdpi/dialog_bubble_step07.9.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/key_hint_dash_holo.9.png b/java/res/drawable-hdpi/key_hint_dash_holo.9.png
deleted file mode 100644
index a2b2fceebcd517c64d9b64cbc7ac6ef0692450bf..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-hdpi/key_hint_dash_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/key_hint_doublecross_holo.9.png b/java/res/drawable-hdpi/key_hint_doublecross_holo.9.png
deleted file mode 100644
index d5af9f8c7dc58248059ec711e81bbe6709826e6d..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-hdpi/key_hint_doublecross_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/key_hint_equal_holo.9.png b/java/res/drawable-hdpi/key_hint_equal_holo.9.png
deleted file mode 100644
index 4acc3c3be7481ad0c9d4ea5791d99188f1be55d1..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-hdpi/key_hint_equal_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/key_hint_larger_holo.9.png b/java/res/drawable-hdpi/key_hint_larger_holo.9.png
deleted file mode 100644
index 10614d9fe9cd7dcb4ff252dbd47c9073dc2006aa..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-hdpi/key_hint_larger_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/key_hint_minus_holo.9.png b/java/res/drawable-hdpi/key_hint_minus_holo.9.png
deleted file mode 100644
index 2c34ef90b5f11df19a8f40710f891908676e260d..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-hdpi/key_hint_minus_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/key_hint_minus_large_holo.9.png b/java/res/drawable-hdpi/key_hint_minus_large_holo.9.png
deleted file mode 100644
index 0df056ee13cf76dd59ef46413a4b066034f6ca7e..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-hdpi/key_hint_minus_large_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/key_hint_parenclose_holo.9.png b/java/res/drawable-hdpi/key_hint_parenclose_holo.9.png
deleted file mode 100644
index 9096362e0ce68d0d3774a9a7d64817943a7b5e02..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-hdpi/key_hint_parenclose_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/key_hint_parenopen_holo.9.png b/java/res/drawable-hdpi/key_hint_parenopen_holo.9.png
deleted file mode 100644
index bb4cbd40dbb909b7d11207265bce7f3ebaf80838..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-hdpi/key_hint_parenopen_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/key_hint_period_holo.9.png b/java/res/drawable-hdpi/key_hint_period_holo.9.png
deleted file mode 100644
index 68f789b953a166e2cdea7b9172f989fb77c4e663..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-hdpi/key_hint_period_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/key_hint_semicolon_holo.9.png b/java/res/drawable-hdpi/key_hint_semicolon_holo.9.png
deleted file mode 100644
index ac3de374c17df848f598cbc09b49c07273b1484c..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-hdpi/key_hint_semicolon_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/key_hint_simplequote_holo.9.png b/java/res/drawable-hdpi/key_hint_simplequote_holo.9.png
deleted file mode 100644
index 20d56c5496c4342314c088a4a7e7200723b9b909..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-hdpi/key_hint_simplequote_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/key_hint_slash_holo.9.png b/java/res/drawable-hdpi/key_hint_slash_holo.9.png
deleted file mode 100644
index 3fe2c42713eb5bcd9403523489de4e3b2d21b8ad..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-hdpi/key_hint_slash_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/key_hint_slash_large_holo.9.png b/java/res/drawable-hdpi/key_hint_slash_large_holo.9.png
deleted file mode 100644
index 47e767557ceeab09496e01004a3db1b52977c5e1..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-hdpi/key_hint_slash_large_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/key_hint_smaller_holo.9.png b/java/res/drawable-hdpi/key_hint_smaller_holo.9.png
deleted file mode 100644
index 19a7d937ea22c14a2aaae8b85eb581433762899a..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-hdpi/key_hint_smaller_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/key_hint_star_holo.9.png b/java/res/drawable-hdpi/key_hint_star_holo.9.png
deleted file mode 100644
index 4e4340d63fc6c5d908c9c0df123e8cc9d6f42fe2..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-hdpi/key_hint_star_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/key_hint_underscore_holo.9.png b/java/res/drawable-hdpi/key_hint_underscore_holo.9.png
deleted file mode 100644
index e4f271918d0af626179838fbe20f56560cb1d58c..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-hdpi/key_hint_underscore_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/key_hint_underscore_large_holo.9.png b/java/res/drawable-hdpi/key_hint_underscore_large_holo.9.png
deleted file mode 100644
index dad34fc72dc3c9c83dd94af2407030bcada31378..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-hdpi/key_hint_underscore_large_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/keyboard_hint_at.9.png b/java/res/drawable-hdpi/keyboard_hint_at.9.png
deleted file mode 100644
index 4b49c0dd909cb03c7a015f0dd125b52ce33167a4..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-hdpi/keyboard_hint_at.9.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/keyboard_hint_colon.9.png b/java/res/drawable-hdpi/keyboard_hint_colon.9.png
deleted file mode 100644
index a91dc47f195719943a72529a1c9a70932c735f28..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-hdpi/keyboard_hint_colon.9.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/keyboard_hint_doublecross.9.png b/java/res/drawable-hdpi/keyboard_hint_doublecross.9.png
deleted file mode 100644
index c0917c200d0a1afba803461c81c7a88e2c4d9d92..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-hdpi/keyboard_hint_doublecross.9.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/keyboard_hint_exclamation.9.png b/java/res/drawable-hdpi/keyboard_hint_exclamation.9.png
deleted file mode 100644
index 98c07d94a461a7e048f29ce1e1e2340c5ce072e1..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-hdpi/keyboard_hint_exclamation.9.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/keyboard_hint_greater.9.png b/java/res/drawable-hdpi/keyboard_hint_greater.9.png
deleted file mode 100644
index f2bf37dc253f06ff6a1643154b50713e523a9040..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-hdpi/keyboard_hint_greater.9.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/keyboard_hint_plus.9.png b/java/res/drawable-hdpi/keyboard_hint_plus.9.png
deleted file mode 100644
index 586e9c158eb7fa6f12dbd43c69ce6bcd559d4a0f..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-hdpi/keyboard_hint_plus.9.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/keyboard_hint_question.9.png b/java/res/drawable-hdpi/keyboard_hint_question.9.png
deleted file mode 100644
index 6c7d4310a07edf95910a37cd6a10523dc2a5d513..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-hdpi/keyboard_hint_question.9.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/keyboard_hint_quote.9.png b/java/res/drawable-hdpi/keyboard_hint_quote.9.png
deleted file mode 100644
index 57f44e4a278fdae95bfaa51bdf5fd0dcfb24ca49..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-hdpi/keyboard_hint_quote.9.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/keyboard_hint_smaller.9.png b/java/res/drawable-hdpi/keyboard_hint_smaller.9.png
deleted file mode 100644
index 438b95ea8b11b1fe307dc6ee7a625b8b6a469a75..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-hdpi/keyboard_hint_smaller.9.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/keyboard_hint_star.9.png b/java/res/drawable-hdpi/keyboard_hint_star.9.png
deleted file mode 100644
index 33f8281b2fdf9e4ef55829d5c54792efcad8855b..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-hdpi/keyboard_hint_star.9.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/mic_slash_holo.png b/java/res/drawable-hdpi/mic_slash_holo.png
deleted file mode 100644
index 27a05dec314c4e9a40104a4c007801e690c404ee..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-hdpi/mic_slash_holo.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/ok_cancel.png b/java/res/drawable-hdpi/ok_cancel.png
deleted file mode 100644
index f11e57a38991396ccff91cd61604d01888b95eff..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-hdpi/ok_cancel.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/ok_cancel_holo.9.png b/java/res/drawable-hdpi/ok_cancel_holo.9.png
deleted file mode 100644
index 5be81c35ae96dfa4f2a6f141d4c8c5a445c38da9..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-hdpi/ok_cancel_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/speak_now_level0.png b/java/res/drawable-hdpi/speak_now_level0.png
deleted file mode 100644
index 342849cfeb13cd8f3a6dcd6befe53f3a6abca5d3..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-hdpi/speak_now_level0.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/speak_now_level0_holo.png b/java/res/drawable-hdpi/speak_now_level0_holo.png
deleted file mode 100644
index 29eef926bb3f68af6e0da1b782f7d354649356b0..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-hdpi/speak_now_level0_holo.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/speak_now_level1.png b/java/res/drawable-hdpi/speak_now_level1.png
deleted file mode 100644
index 8947a430610d5b8f9f9c58068a2afc57f640ab13..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-hdpi/speak_now_level1.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/speak_now_level1_holo.png b/java/res/drawable-hdpi/speak_now_level1_holo.png
deleted file mode 100644
index a76e990b759f070cbf5be388327f2f79481bbd20..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-hdpi/speak_now_level1_holo.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/speak_now_level2.png b/java/res/drawable-hdpi/speak_now_level2.png
deleted file mode 100644
index 44fc58c4e90ba49e1778f3cde3ce3b934752a703..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-hdpi/speak_now_level2.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/speak_now_level2_holo.png b/java/res/drawable-hdpi/speak_now_level2_holo.png
deleted file mode 100644
index 8cd462d2044aee28497c5dedc227c43ed883fcc0..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-hdpi/speak_now_level2_holo.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/speak_now_level3.png b/java/res/drawable-hdpi/speak_now_level3.png
deleted file mode 100644
index cfa5c1b8784559da1fd27139295dbb89a685e04a..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-hdpi/speak_now_level3.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/speak_now_level3_holo.png b/java/res/drawable-hdpi/speak_now_level3_holo.png
deleted file mode 100644
index b7371dc886476a7f6aa289a5f7c61f6543294fdf..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-hdpi/speak_now_level3_holo.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/speak_now_level4.png b/java/res/drawable-hdpi/speak_now_level4.png
deleted file mode 100644
index a050d88369757274e6a88f2645d3d8d5bcc85dfd..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-hdpi/speak_now_level4.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/speak_now_level4_holo.png b/java/res/drawable-hdpi/speak_now_level4_holo.png
deleted file mode 100644
index 74befc8c3280c833bc54b1f9231762b126ba2106..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-hdpi/speak_now_level4_holo.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/speak_now_level5.png b/java/res/drawable-hdpi/speak_now_level5.png
deleted file mode 100644
index 8cd5ae7ad212767b82152585cdbb4f552c3cb40a..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-hdpi/speak_now_level5.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/speak_now_level5_holo.png b/java/res/drawable-hdpi/speak_now_level5_holo.png
deleted file mode 100644
index b027e83439049b16d9b665c8582b04e58ebacb8a..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-hdpi/speak_now_level5_holo.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/speak_now_level6.png b/java/res/drawable-hdpi/speak_now_level6.png
deleted file mode 100644
index 9f4481eb4fabb88514141d4251122e1add120bdd..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-hdpi/speak_now_level6.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/speak_now_level6_holo.png b/java/res/drawable-hdpi/speak_now_level6_holo.png
deleted file mode 100644
index 17bb0345229758b50170653993c4dfaa1dfaf157..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-hdpi/speak_now_level6_holo.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/sym_bkeyboard_done.png b/java/res/drawable-hdpi/sym_bkeyboard_done.png
deleted file mode 100644
index b77803d21317d904f380cc4da98bff81351d8d08..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-hdpi/sym_bkeyboard_done.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_done.png b/java/res/drawable-hdpi/sym_keyboard_done.png
deleted file mode 100644
index 471c5021b88acefdbdabd722c10e9761c54eb40f..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-hdpi/sym_keyboard_done.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_feedback_done.png b/java/res/drawable-hdpi/sym_keyboard_feedback_done.png
deleted file mode 100644
index 7015e266a297927bd2275c633fcffe724c4a8eb1..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-hdpi/sym_keyboard_feedback_done.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_feedback_shift_locked.png b/java/res/drawable-hdpi/sym_keyboard_feedback_shift_locked.png
deleted file mode 100644
index 1fd822ea6d617e7bc768f334e7a7ddc211eadab7..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-hdpi/sym_keyboard_feedback_shift_locked.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_mic_disabled.png b/java/res/drawable-hdpi/sym_keyboard_mic_disabled.png
deleted file mode 100644
index c8dca62a08d1ac203b243a3e7a2a90ef0c030caf..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-hdpi/sym_keyboard_mic_disabled.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_smiley_holo.png b/java/res/drawable-hdpi/sym_keyboard_smiley_holo.png
deleted file mode 100644
index a3f5e840dcc69cbd0058bc9d63bbe01d3006ab23..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-hdpi/sym_keyboard_smiley_holo.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_space_holo.png b/java/res/drawable-hdpi/sym_keyboard_space_holo.png
deleted file mode 100644
index a8e5f7d5e89a989b64b50418f097f6f77bb16389..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-hdpi/sym_keyboard_space_holo.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/top_suggest_line_holo.9.png b/java/res/drawable-hdpi/top_suggest_line_holo.9.png
deleted file mode 100644
index dcce3015fb1c05155b83cd32d8acf589f78547c8..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-hdpi/top_suggest_line_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/voice_ime_background.9.png b/java/res/drawable-hdpi/voice_ime_background.9.png
deleted file mode 100644
index 42868522f40fa6ca5d97d8278083ca0d2ea183c7..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-hdpi/voice_ime_background.9.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/voice_swipe_hint.png b/java/res/drawable-hdpi/voice_swipe_hint.png
deleted file mode 100644
index 130f83a9cfa12a280db1fd3db0c29e28c814ca88..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-hdpi/voice_swipe_hint.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/working.png b/java/res/drawable-hdpi/working.png
deleted file mode 100755
index 5ea702307e93817de2905e5d012e86ec6b75e75f..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-hdpi/working.png and /dev/null differ
diff --git a/java/res/drawable-land-hdpi/key_hint_dash_holo.9.png b/java/res/drawable-land-hdpi/key_hint_dash_holo.9.png
deleted file mode 100644
index c045b8c5404a232ec8172aa98183eec051a4cc78..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-land-hdpi/key_hint_dash_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-land-hdpi/key_hint_doublecross_holo.9.png b/java/res/drawable-land-hdpi/key_hint_doublecross_holo.9.png
deleted file mode 100644
index 6975ab71fdf2b4054b609db3b870b392f7e4df89..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-land-hdpi/key_hint_doublecross_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-land-hdpi/key_hint_equal_holo.9.png b/java/res/drawable-land-hdpi/key_hint_equal_holo.9.png
deleted file mode 100644
index a619fb29fcf2a3fe18163e750b48683125cd4636..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-land-hdpi/key_hint_equal_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-land-hdpi/key_hint_larger_holo.9.png b/java/res/drawable-land-hdpi/key_hint_larger_holo.9.png
deleted file mode 100644
index f8d960f17f064de33a33c991d3d012a2606b188c..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-land-hdpi/key_hint_larger_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-land-hdpi/key_hint_minus_holo.9.png b/java/res/drawable-land-hdpi/key_hint_minus_holo.9.png
deleted file mode 100644
index 2c34ef90b5f11df19a8f40710f891908676e260d..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-land-hdpi/key_hint_minus_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-land-hdpi/key_hint_minus_large_holo.9.png b/java/res/drawable-land-hdpi/key_hint_minus_large_holo.9.png
deleted file mode 100644
index 0df056ee13cf76dd59ef46413a4b066034f6ca7e..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-land-hdpi/key_hint_minus_large_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-land-hdpi/key_hint_parenclose_holo.9.png b/java/res/drawable-land-hdpi/key_hint_parenclose_holo.9.png
deleted file mode 100644
index 9d8b057610fa3f968882c3ac9a2294fe343a4d38..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-land-hdpi/key_hint_parenclose_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-land-hdpi/key_hint_parenopen_holo.9.png b/java/res/drawable-land-hdpi/key_hint_parenopen_holo.9.png
deleted file mode 100644
index 8e2d8f2add8ae5fca869806d479c49d458fcd7ab..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-land-hdpi/key_hint_parenopen_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-land-hdpi/key_hint_period_holo.9.png b/java/res/drawable-land-hdpi/key_hint_period_holo.9.png
deleted file mode 100644
index bf8c6d722e642170a9973be6e61c3075502c6955..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-land-hdpi/key_hint_period_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-land-hdpi/key_hint_semicolon_holo.9.png b/java/res/drawable-land-hdpi/key_hint_semicolon_holo.9.png
deleted file mode 100644
index f3527585717d90966c790e4b34e8ac90249582a2..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-land-hdpi/key_hint_semicolon_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-land-hdpi/key_hint_simplequote_holo.9.png b/java/res/drawable-land-hdpi/key_hint_simplequote_holo.9.png
deleted file mode 100644
index e69a9696e175564435f15a4eedb79e9b2c7666a9..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-land-hdpi/key_hint_simplequote_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-land-hdpi/key_hint_slash_holo.9.png b/java/res/drawable-land-hdpi/key_hint_slash_holo.9.png
deleted file mode 100644
index 592ea4434b5f74010ef05513eb2adeea08c8057a..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-land-hdpi/key_hint_slash_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-land-hdpi/key_hint_slash_large_holo.9.png b/java/res/drawable-land-hdpi/key_hint_slash_large_holo.9.png
deleted file mode 100644
index b18be7bb5d92e5845001241fad0edec16188c202..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-land-hdpi/key_hint_slash_large_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-land-hdpi/key_hint_smaller_holo.9.png b/java/res/drawable-land-hdpi/key_hint_smaller_holo.9.png
deleted file mode 100644
index 145320dab600bdf75513e5b468c6ec2359e3ba57..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-land-hdpi/key_hint_smaller_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-land-hdpi/key_hint_star_holo.9.png b/java/res/drawable-land-hdpi/key_hint_star_holo.9.png
deleted file mode 100644
index 9bde78a2160b80ea193cc2e9fd3a202e70a5bfae..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-land-hdpi/key_hint_star_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-land-hdpi/key_hint_underscore_holo.9.png b/java/res/drawable-land-hdpi/key_hint_underscore_holo.9.png
deleted file mode 100644
index e4f271918d0af626179838fbe20f56560cb1d58c..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-land-hdpi/key_hint_underscore_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-land-hdpi/key_hint_underscore_large_holo.9.png b/java/res/drawable-land-hdpi/key_hint_underscore_large_holo.9.png
deleted file mode 100644
index dad34fc72dc3c9c83dd94af2407030bcada31378..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-land-hdpi/key_hint_underscore_large_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-land-mdpi/key_hint_dash_holo.9.png b/java/res/drawable-land-mdpi/key_hint_dash_holo.9.png
deleted file mode 100644
index 1cb0bdfaaf59239abc550cfeb410351db017c366..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-land-mdpi/key_hint_dash_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-land-mdpi/key_hint_doublecross_holo.9.png b/java/res/drawable-land-mdpi/key_hint_doublecross_holo.9.png
deleted file mode 100644
index 7e7ceb3fcfb7ed235cf115496f6537437e17e92d..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-land-mdpi/key_hint_doublecross_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-land-mdpi/key_hint_equal_holo.9.png b/java/res/drawable-land-mdpi/key_hint_equal_holo.9.png
deleted file mode 100644
index 8e570595cb073bd7a271891cefaf60eeb035b3cf..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-land-mdpi/key_hint_equal_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-land-mdpi/key_hint_larger_holo.9.png b/java/res/drawable-land-mdpi/key_hint_larger_holo.9.png
deleted file mode 100644
index 37c05275e3c463b00d8c10e084fc9ef8d7480add..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-land-mdpi/key_hint_larger_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-land-mdpi/key_hint_minus_holo.9.png b/java/res/drawable-land-mdpi/key_hint_minus_holo.9.png
deleted file mode 100644
index e59a315877b9aa4762bc5f0253e8d82a9188d8c2..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-land-mdpi/key_hint_minus_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-land-mdpi/key_hint_minus_large_holo.9.png b/java/res/drawable-land-mdpi/key_hint_minus_large_holo.9.png
deleted file mode 100644
index 52c28dd87ba6ac0f884d63509eb842af5403021f..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-land-mdpi/key_hint_minus_large_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-land-mdpi/key_hint_parenclose_holo.9.png b/java/res/drawable-land-mdpi/key_hint_parenclose_holo.9.png
deleted file mode 100644
index 97e1f1449eea592609de63965df74963fa36bf6b..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-land-mdpi/key_hint_parenclose_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-land-mdpi/key_hint_parenopen_holo.9.png b/java/res/drawable-land-mdpi/key_hint_parenopen_holo.9.png
deleted file mode 100644
index 36add5d519aec76af12e2561d442e2490fb834af..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-land-mdpi/key_hint_parenopen_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-land-mdpi/key_hint_period_holo.9.png b/java/res/drawable-land-mdpi/key_hint_period_holo.9.png
deleted file mode 100644
index 4a70f07dc234380a36b31c48e22c63f9c4c0dd44..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-land-mdpi/key_hint_period_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-land-mdpi/key_hint_semicolon_holo.9.png b/java/res/drawable-land-mdpi/key_hint_semicolon_holo.9.png
deleted file mode 100644
index 63a3875b5dc3d34f2153d2296bf89384bef50e8e..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-land-mdpi/key_hint_semicolon_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-land-mdpi/key_hint_simplequote_holo.9.png b/java/res/drawable-land-mdpi/key_hint_simplequote_holo.9.png
deleted file mode 100644
index 3c217b058b10fc0bac790bf9e8cdabd7769ea024..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-land-mdpi/key_hint_simplequote_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-land-mdpi/key_hint_slash_holo.9.png b/java/res/drawable-land-mdpi/key_hint_slash_holo.9.png
deleted file mode 100644
index 98545f0ac7957b27589faafcd9b26646b5071d14..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-land-mdpi/key_hint_slash_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-land-mdpi/key_hint_slash_large_holo.9.png b/java/res/drawable-land-mdpi/key_hint_slash_large_holo.9.png
deleted file mode 100644
index a3a02973cb3ef342c73232a952f0015c546a21c3..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-land-mdpi/key_hint_slash_large_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-land-mdpi/key_hint_smaller_holo.9.png b/java/res/drawable-land-mdpi/key_hint_smaller_holo.9.png
deleted file mode 100644
index 5af18364434a741952a528c845eb9c0aefaa1d53..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-land-mdpi/key_hint_smaller_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-land-mdpi/key_hint_star_holo.9.png b/java/res/drawable-land-mdpi/key_hint_star_holo.9.png
deleted file mode 100644
index 18304d738fcf375103ff977893f061a553db9fe4..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-land-mdpi/key_hint_star_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-land-mdpi/key_hint_underscore_holo.9.png b/java/res/drawable-land-mdpi/key_hint_underscore_holo.9.png
deleted file mode 100644
index 52e871e0a9c76fb1f1c5f415fb9587adb748be7f..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-land-mdpi/key_hint_underscore_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-land-mdpi/key_hint_underscore_large_holo.9.png b/java/res/drawable-land-mdpi/key_hint_underscore_large_holo.9.png
deleted file mode 100644
index ee0e83578cf6e60dcec1523e049f8d851126cbb3..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-land-mdpi/key_hint_underscore_large_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/cancel.png b/java/res/drawable-mdpi/cancel.png
deleted file mode 100644
index 713a37875261cd9d2e0ea1de7a5219d783a1b4a5..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-mdpi/cancel.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/cancel_holo.9.png b/java/res/drawable-mdpi/cancel_holo.9.png
deleted file mode 100644
index 74f967eb9de34f32bd8095c00f5423a46da3bd27..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-mdpi/cancel_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/dialog_bubble_step02.9.png b/java/res/drawable-mdpi/dialog_bubble_step02.9.png
deleted file mode 100644
index d77f85fe28e807d099c5bef39e8eb50c8aed60bb..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-mdpi/dialog_bubble_step02.9.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/dialog_bubble_step07.9.png b/java/res/drawable-mdpi/dialog_bubble_step07.9.png
deleted file mode 100644
index 80f4a0eaa6c8f1d33dca134745ec2fe3cc97eba4..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-mdpi/dialog_bubble_step07.9.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/key_hint_dash_holo.9.png b/java/res/drawable-mdpi/key_hint_dash_holo.9.png
deleted file mode 100644
index 2ee22ba798a04a1869c9a8785975fec7d31ae4b6..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-mdpi/key_hint_dash_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/key_hint_doublecross_holo.9.png b/java/res/drawable-mdpi/key_hint_doublecross_holo.9.png
deleted file mode 100644
index 0da9332394fe1aa6c6c8a702966dfae832a20bdb..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-mdpi/key_hint_doublecross_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/key_hint_equal_holo.9.png b/java/res/drawable-mdpi/key_hint_equal_holo.9.png
deleted file mode 100644
index f5a9ba2f4ea66a66833a444739b67ce8beabae00..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-mdpi/key_hint_equal_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/key_hint_larger_holo.9.png b/java/res/drawable-mdpi/key_hint_larger_holo.9.png
deleted file mode 100644
index 50652bb13848c0b5ba67b88000ee1e4e6eaee8c9..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-mdpi/key_hint_larger_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/key_hint_minus_holo.9.png b/java/res/drawable-mdpi/key_hint_minus_holo.9.png
deleted file mode 100644
index e59a315877b9aa4762bc5f0253e8d82a9188d8c2..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-mdpi/key_hint_minus_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/key_hint_minus_large_holo.9.png b/java/res/drawable-mdpi/key_hint_minus_large_holo.9.png
deleted file mode 100644
index 52c28dd87ba6ac0f884d63509eb842af5403021f..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-mdpi/key_hint_minus_large_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/key_hint_parenclose_holo.9.png b/java/res/drawable-mdpi/key_hint_parenclose_holo.9.png
deleted file mode 100644
index 52ee86a0fe5d5cec683ccb9480951b4bca982f7e..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-mdpi/key_hint_parenclose_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/key_hint_parenopen_holo.9.png b/java/res/drawable-mdpi/key_hint_parenopen_holo.9.png
deleted file mode 100644
index b0ed388adca652006518f29bca095f7c29660574..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-mdpi/key_hint_parenopen_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/key_hint_period_holo.9.png b/java/res/drawable-mdpi/key_hint_period_holo.9.png
deleted file mode 100644
index 8d798a57fa28ac2ba03b68ca0d446802ad5ab1d1..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-mdpi/key_hint_period_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/key_hint_semicolon_holo.9.png b/java/res/drawable-mdpi/key_hint_semicolon_holo.9.png
deleted file mode 100644
index 7f9e8c90e4bba1cfde0ff0cc5038ee1c916eb836..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-mdpi/key_hint_semicolon_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/key_hint_simplequote_holo.9.png b/java/res/drawable-mdpi/key_hint_simplequote_holo.9.png
deleted file mode 100644
index 5e1a45c0e6be0823c735f6b49f814b58c15e8a6f..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-mdpi/key_hint_simplequote_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/key_hint_slash_holo.9.png b/java/res/drawable-mdpi/key_hint_slash_holo.9.png
deleted file mode 100644
index 645586a3033164c376140197cc989dee0d66acdd..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-mdpi/key_hint_slash_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/key_hint_slash_large_holo.9.png b/java/res/drawable-mdpi/key_hint_slash_large_holo.9.png
deleted file mode 100644
index 75c3bb1a65ba7404faafd89274e6ea3605cbb7d5..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-mdpi/key_hint_slash_large_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/key_hint_smaller_holo.9.png b/java/res/drawable-mdpi/key_hint_smaller_holo.9.png
deleted file mode 100644
index 2a0587cbd4d650f3a817a412ff7f47c5fdfb424d..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-mdpi/key_hint_smaller_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/key_hint_star_holo.9.png b/java/res/drawable-mdpi/key_hint_star_holo.9.png
deleted file mode 100644
index 9f33b9830db9fb1ec2b48609533458c203c43613..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-mdpi/key_hint_star_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/key_hint_underscore_holo.9.png b/java/res/drawable-mdpi/key_hint_underscore_holo.9.png
deleted file mode 100644
index 52e871e0a9c76fb1f1c5f415fb9587adb748be7f..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-mdpi/key_hint_underscore_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/key_hint_underscore_large_holo.9.png b/java/res/drawable-mdpi/key_hint_underscore_large_holo.9.png
deleted file mode 100644
index ee0e83578cf6e60dcec1523e049f8d851126cbb3..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-mdpi/key_hint_underscore_large_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/keyboard_hint_at.9.png b/java/res/drawable-mdpi/keyboard_hint_at.9.png
deleted file mode 100644
index 69baedef41cc26b8c719e3ec1b05cf76e8729bb1..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-mdpi/keyboard_hint_at.9.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/keyboard_hint_colon.9.png b/java/res/drawable-mdpi/keyboard_hint_colon.9.png
deleted file mode 100644
index 9d0d7cbab57dc6804aba90f75f4a174db0991ab0..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-mdpi/keyboard_hint_colon.9.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/keyboard_hint_doublecross.9.png b/java/res/drawable-mdpi/keyboard_hint_doublecross.9.png
deleted file mode 100644
index d24aa0f074b243ba7d0687180a65b2df0d24c469..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-mdpi/keyboard_hint_doublecross.9.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/keyboard_hint_exclamation.9.png b/java/res/drawable-mdpi/keyboard_hint_exclamation.9.png
deleted file mode 100644
index f6cc7fe8486cf893f8f6bff668278857e608090c..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-mdpi/keyboard_hint_exclamation.9.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/keyboard_hint_greater.9.png b/java/res/drawable-mdpi/keyboard_hint_greater.9.png
deleted file mode 100644
index 5210392bf6dd75cf904ac444b48699aeb0065930..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-mdpi/keyboard_hint_greater.9.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/keyboard_hint_plus.9.png b/java/res/drawable-mdpi/keyboard_hint_plus.9.png
deleted file mode 100644
index d1d85ac87fdf46e693fe308a9cd4792637dacac9..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-mdpi/keyboard_hint_plus.9.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/keyboard_hint_question.9.png b/java/res/drawable-mdpi/keyboard_hint_question.9.png
deleted file mode 100644
index 37f6e5f366977583a0c01352f79253bc74a5c699..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-mdpi/keyboard_hint_question.9.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/keyboard_hint_quote.9.png b/java/res/drawable-mdpi/keyboard_hint_quote.9.png
deleted file mode 100644
index e7d2cb5e3d2cc22a07c537a5ec05600c3fef48dc..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-mdpi/keyboard_hint_quote.9.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/keyboard_hint_smaller.9.png b/java/res/drawable-mdpi/keyboard_hint_smaller.9.png
deleted file mode 100644
index 76553cf96b26d63a20a05202a5b20f6b493471dc..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-mdpi/keyboard_hint_smaller.9.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/keyboard_hint_star.9.png b/java/res/drawable-mdpi/keyboard_hint_star.9.png
deleted file mode 100644
index 47978c46cd82c686a8c8adce92d89f863d514ab4..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-mdpi/keyboard_hint_star.9.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/mic_slash_holo.png b/java/res/drawable-mdpi/mic_slash_holo.png
deleted file mode 100644
index 07181e6fa5991a83b68d789ec1d3fff585b24b5b..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-mdpi/mic_slash_holo.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/ok_cancel.png b/java/res/drawable-mdpi/ok_cancel.png
deleted file mode 100644
index 20d10f986b61ec0867c90255fbc1eef7b654c976..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-mdpi/ok_cancel.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/ok_cancel_holo.9.png b/java/res/drawable-mdpi/ok_cancel_holo.9.png
deleted file mode 100644
index 035a4f6f0d0f93e8c12eec885d3c73d8f72ec76e..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-mdpi/ok_cancel_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/speak_now_level0.png b/java/res/drawable-mdpi/speak_now_level0.png
deleted file mode 100644
index 5bd13603ea702570056d78cea1bd5c841f18fd59..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-mdpi/speak_now_level0.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/speak_now_level0_holo.png b/java/res/drawable-mdpi/speak_now_level0_holo.png
deleted file mode 100644
index 2090b95a57d2e929771ae62d12c4c1ec3e8a2ee7..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-mdpi/speak_now_level0_holo.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/speak_now_level1.png b/java/res/drawable-mdpi/speak_now_level1.png
deleted file mode 100644
index ccb76b879e6defd0d6347c4798b1c28315430c05..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-mdpi/speak_now_level1.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/speak_now_level1_holo.png b/java/res/drawable-mdpi/speak_now_level1_holo.png
deleted file mode 100644
index 8acf482aac9eef0994c37e0d4539ae297dc535e6..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-mdpi/speak_now_level1_holo.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/speak_now_level2.png b/java/res/drawable-mdpi/speak_now_level2.png
deleted file mode 100644
index 715f900818e156e0eadb5fe1e6ebd6aabdbcf22e..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-mdpi/speak_now_level2.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/speak_now_level2_holo.png b/java/res/drawable-mdpi/speak_now_level2_holo.png
deleted file mode 100644
index 4b307d5421999b80cf8f24bc86d71d192ab862b5..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-mdpi/speak_now_level2_holo.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/speak_now_level3.png b/java/res/drawable-mdpi/speak_now_level3.png
deleted file mode 100644
index 725248a25c5a6b691cd397b415b2b0ca2fcbba52..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-mdpi/speak_now_level3.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/speak_now_level3_holo.png b/java/res/drawable-mdpi/speak_now_level3_holo.png
deleted file mode 100644
index 7c7cd666f806e669b19a5345f3660369aba001df..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-mdpi/speak_now_level3_holo.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/speak_now_level4.png b/java/res/drawable-mdpi/speak_now_level4.png
deleted file mode 100644
index ff6c50b40eb8adc685d13603d75f70eb292aff7f..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-mdpi/speak_now_level4.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/speak_now_level4_holo.png b/java/res/drawable-mdpi/speak_now_level4_holo.png
deleted file mode 100644
index 362c4533749046570bd90dc8705ec8c2b99a0245..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-mdpi/speak_now_level4_holo.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/speak_now_level5.png b/java/res/drawable-mdpi/speak_now_level5.png
deleted file mode 100644
index a5d6b89d61f4d1a05d3efd33a4722175ced40bb6..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-mdpi/speak_now_level5.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/speak_now_level5_holo.png b/java/res/drawable-mdpi/speak_now_level5_holo.png
deleted file mode 100644
index 1886befff2b526bc2d417c75c32e209f0d423cd6..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-mdpi/speak_now_level5_holo.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/speak_now_level6.png b/java/res/drawable-mdpi/speak_now_level6.png
deleted file mode 100644
index dcdb48d085eeea9b7199c5c5ec0792c2ca0af26e..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-mdpi/speak_now_level6.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/speak_now_level6_holo.png b/java/res/drawable-mdpi/speak_now_level6_holo.png
deleted file mode 100644
index 88e4131c8f26b0e5574bdbfb556c4aae4b5d2e60..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-mdpi/speak_now_level6_holo.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/sym_bkeyboard_done.png b/java/res/drawable-mdpi/sym_bkeyboard_done.png
deleted file mode 100644
index 05ce7c643ec0d3945fb93c7abaf5f5975091a80d..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-mdpi/sym_bkeyboard_done.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/sym_keyboard_done.png b/java/res/drawable-mdpi/sym_keyboard_done.png
deleted file mode 100644
index c0d6d1394b4912a2508055ec7979f4a6c2bbc4ca..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-mdpi/sym_keyboard_done.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/sym_keyboard_feedback_done.png b/java/res/drawable-mdpi/sym_keyboard_feedback_done.png
deleted file mode 100644
index 0d7ebd4e579c01416b40087f968ca65aa8537804..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-mdpi/sym_keyboard_feedback_done.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/sym_keyboard_feedback_shift_locked.png b/java/res/drawable-mdpi/sym_keyboard_feedback_shift_locked.png
deleted file mode 100644
index 494524a665671f98d2e73ac985d1076899b2ff0b..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-mdpi/sym_keyboard_feedback_shift_locked.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/sym_keyboard_mic_disabled.png b/java/res/drawable-mdpi/sym_keyboard_mic_disabled.png
deleted file mode 100644
index e926b3fa6d5ea231ef4332f09ecec083f34ec01d..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-mdpi/sym_keyboard_mic_disabled.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/sym_keyboard_smiley_holo.png b/java/res/drawable-mdpi/sym_keyboard_smiley_holo.png
deleted file mode 100644
index 594fe211c1cea0aa27bb27ce1f9c8b89c9af7ebd..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-mdpi/sym_keyboard_smiley_holo.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/sym_keyboard_space_holo.png b/java/res/drawable-mdpi/sym_keyboard_space_holo.png
deleted file mode 100644
index 25e655d966fe89c09f8fe98009a6b3c2acc79f9c..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-mdpi/sym_keyboard_space_holo.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/voice_ime_background.9.png b/java/res/drawable-mdpi/voice_ime_background.9.png
deleted file mode 100644
index 9b15bc25f0e13e2514a37fe57f6a63399c283f94..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-mdpi/voice_ime_background.9.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/voice_swipe_hint.png b/java/res/drawable-mdpi/voice_swipe_hint.png
deleted file mode 100644
index bb88732510de9ee07ce4b8ad22c41b43b3d57424..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-mdpi/voice_swipe_hint.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/working.png b/java/res/drawable-mdpi/working.png
deleted file mode 100644
index 4a930c52da3cd9ae05103b38463202db6ec6e80d..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-mdpi/working.png and /dev/null differ
diff --git a/java/res/drawable/btn_keyboard_key2.xml b/java/res/drawable/btn_keyboard_key2.xml
deleted file mode 100644
index bd745b76e54316dfe2f3cc2fa4e5d0709e8b1892..0000000000000000000000000000000000000000
--- a/java/res/drawable/btn_keyboard_key2.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 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">
-
-    <!-- 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" />
-    <item android:state_checkable="true" android:state_pressed="true"
-          android:drawable="@drawable/btn_keyboard_key_fulltrans_pressed" />
-    <item android:state_checkable="true" android:state_checked="true"
-          android:drawable="@drawable/btn_keyboard_key_normal_on" />
-    <item android:state_checkable="true"
-          android:drawable="@drawable/btn_keyboard_key_fulltrans_normal" />
-
-    <!-- Normal keys -->
-
-    <item android:state_pressed="true"
-          android:drawable="@drawable/btn_keyboard_key_fulltrans_pressed" />
-    <item android:drawable="@drawable/btn_keyboard_key_fulltrans_normal" />
-</selector>
diff --git a/java/res/layout/bubble_text.xml b/java/res/layout/bubble_text.xml
deleted file mode 100644
index c3957b65ecbd3d4710a8fa68cbfd9af1de5de33e..0000000000000000000000000000000000000000
--- a/java/res/layout/bubble_text.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/* 
-**
-** Copyright 2009, 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.
-*/
--->
-
-<TextView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content" 
-    android:layout_height="wrap_content"
-    android:textSize="14sp"
-    android:textColor="?android:attr/textColorPrimary"
-    android:minWidth="32dip"
-    android:gravity="center"
-    android:shadowRadius="2.75"
-    android:shadowColor="#BB000000"
-    />
diff --git a/java/res/raw/type3.ogg b/java/res/raw/type3.ogg
deleted file mode 100644
index 20e67080772405e6edaecac314086486faec10ae..0000000000000000000000000000000000000000
Binary files a/java/res/raw/type3.ogg and /dev/null differ
diff --git a/java/res/values-ar/strings.xml b/java/res/values-ar/strings.xml
index df5b87ac1364d3a901f2873a9e88293ee8d5e7dc..f3fd1ffcb579e613c31427f869146a44d8fe5fec 100644
--- a/java/res/values-ar/strings.xml
+++ b/java/res/values-ar/strings.xml
@@ -105,7 +105,6 @@
     <string name="subtype_mode_en_GB_keyboard" msgid="7945856548410373708">"لوحة مفاتيح إنجليزية (بريطانيا)"</string>
     <string name="subtype_mode_en_US_keyboard" msgid="3708655163769735410">"لوحة مفاتيح إنجليزية (الولايات المتحدة)"</string>
     <string name="subtype_mode_es_keyboard" msgid="1775125478866113148">"لوحة مفاتيح إسبانية"</string>
-    <string name="subtype_mode_es_US_keyboard" msgid="3702125193532262008">"لوحة مفاتيح إسبانية (الولايات المتحدة)"</string>
     <string name="subtype_mode_fr_keyboard" msgid="8016515336759761014">"لوحة مفاتيح فرنسية"</string>
     <string name="subtype_mode_fr_CA_keyboard" msgid="2628517247158376263">"لوحة مفاتيح فرنسية (كندا)"</string>
     <string name="subtype_mode_fr_CH_keyboard" msgid="6742806653181621228">"لوحة مفاتيح فرنسية (سويسرا)"</string>
diff --git a/java/res/values-bg/strings.xml b/java/res/values-bg/strings.xml
index 7f59a13dbe69b00346951a2fe5e80889043ef232..79a1330dc02fae7170a95dbb7862b91ac41279fb 100644
--- a/java/res/values-bg/strings.xml
+++ b/java/res/values-bg/strings.xml
@@ -105,7 +105,6 @@
     <string name="subtype_mode_en_GB_keyboard" msgid="7945856548410373708">"английска (Великобрит.) клавиатура"</string>
     <string name="subtype_mode_en_US_keyboard" msgid="3708655163769735410">"английска (САЩ) клавиатура"</string>
     <string name="subtype_mode_es_keyboard" msgid="1775125478866113148">"испанска клавиатура"</string>
-    <string name="subtype_mode_es_US_keyboard" msgid="3702125193532262008">"испанска (САЩ) клавиатура"</string>
     <string name="subtype_mode_fr_keyboard" msgid="8016515336759761014">"френска клавиатура"</string>
     <string name="subtype_mode_fr_CA_keyboard" msgid="2628517247158376263">"френска (Канада) клавиатура"</string>
     <string name="subtype_mode_fr_CH_keyboard" msgid="6742806653181621228">"френска (Швейцария) клавиатура"</string>
diff --git a/java/res/values-ca/strings.xml b/java/res/values-ca/strings.xml
index 36939fef7a8ba71d449ada6c32f8b4b7465b58f4..10ee70c689cd1fec5b06679fef55ec63163be0a0 100644
--- a/java/res/values-ca/strings.xml
+++ b/java/res/values-ca/strings.xml
@@ -105,7 +105,6 @@
     <string name="subtype_mode_en_GB_keyboard" msgid="7945856548410373708">"Teclat anglès (Regne Unit)"</string>
     <string name="subtype_mode_en_US_keyboard" msgid="3708655163769735410">"Teclat anglès (Estats Units)"</string>
     <string name="subtype_mode_es_keyboard" msgid="1775125478866113148">"Teclat espanyol"</string>
-    <string name="subtype_mode_es_US_keyboard" msgid="3702125193532262008">"Teclat espanyol (Estats Units)"</string>
     <string name="subtype_mode_fr_keyboard" msgid="8016515336759761014">"Teclat francès"</string>
     <string name="subtype_mode_fr_CA_keyboard" msgid="2628517247158376263">"Teclat francès (Canadà)"</string>
     <string name="subtype_mode_fr_CH_keyboard" msgid="6742806653181621228">"Teclat francès (Suïssa)"</string>
diff --git a/java/res/values-cs/strings.xml b/java/res/values-cs/strings.xml
index 132bc1c2999cf89e71512b626a17fa85d22cba72..1b07c847047f548a8741ec889a225b59cc304638 100644
--- a/java/res/values-cs/strings.xml
+++ b/java/res/values-cs/strings.xml
@@ -105,7 +105,6 @@
     <string name="subtype_mode_en_GB_keyboard" msgid="7945856548410373708">"Klávesnice – angličtina (VB)"</string>
     <string name="subtype_mode_en_US_keyboard" msgid="3708655163769735410">"Klávesnice – angličtina (USA)"</string>
     <string name="subtype_mode_es_keyboard" msgid="1775125478866113148">"Klávesnice – španělština"</string>
-    <string name="subtype_mode_es_US_keyboard" msgid="3702125193532262008">"Klávesnice – španělština (USA)"</string>
     <string name="subtype_mode_fr_keyboard" msgid="8016515336759761014">"Klávesnice – francouzština"</string>
     <string name="subtype_mode_fr_CA_keyboard" msgid="2628517247158376263">"Klávesnice – francouzština (Kanada)"</string>
     <string name="subtype_mode_fr_CH_keyboard" msgid="6742806653181621228">"Klávesnice – francouzština (Švýc.)"</string>
diff --git a/java/res/values-da/strings.xml b/java/res/values-da/strings.xml
index ad92b24d129617246371b766e6f97dc43fdfcd26..aaa65e8d8fc244970366d44987df4ef91de5e6a2 100644
--- a/java/res/values-da/strings.xml
+++ b/java/res/values-da/strings.xml
@@ -105,7 +105,6 @@
     <string name="subtype_mode_en_GB_keyboard" msgid="7945856548410373708">"Engelsk tastatur (Storbritannien)"</string>
     <string name="subtype_mode_en_US_keyboard" msgid="3708655163769735410">"Engelsk tastatur (USA)"</string>
     <string name="subtype_mode_es_keyboard" msgid="1775125478866113148">"Spansk tastatur"</string>
-    <string name="subtype_mode_es_US_keyboard" msgid="3702125193532262008">"Spansk tastatur (USA)"</string>
     <string name="subtype_mode_fr_keyboard" msgid="8016515336759761014">"Fransk tastatur"</string>
     <string name="subtype_mode_fr_CA_keyboard" msgid="2628517247158376263">"Fransk tastatur (Canada)"</string>
     <string name="subtype_mode_fr_CH_keyboard" msgid="6742806653181621228">"Fransk tastatur (Schweiz)"</string>
diff --git a/java/res/values-de/strings.xml b/java/res/values-de/strings.xml
index 65f0faa32cfb789a796ac7b639a87eff5f69307a..cc3bf6c8df7d188341c051c774b88df82dc5f125 100644
--- a/java/res/values-de/strings.xml
+++ b/java/res/values-de/strings.xml
@@ -105,7 +105,6 @@
     <string name="subtype_mode_en_GB_keyboard" msgid="7945856548410373708">"Englische Tastatur (GB)"</string>
     <string name="subtype_mode_en_US_keyboard" msgid="3708655163769735410">"Englische Tastatur (USA)"</string>
     <string name="subtype_mode_es_keyboard" msgid="1775125478866113148">"Spanische Tastatur"</string>
-    <string name="subtype_mode_es_US_keyboard" msgid="3702125193532262008">"Spanische Tastatur (USA)"</string>
     <string name="subtype_mode_fr_keyboard" msgid="8016515336759761014">"Französische Tastatur"</string>
     <string name="subtype_mode_fr_CA_keyboard" msgid="2628517247158376263">"Französische Tastatur (Kanada)"</string>
     <string name="subtype_mode_fr_CH_keyboard" msgid="6742806653181621228">"Französische Tastatur (Schweiz)"</string>
diff --git a/java/res/values-el/strings.xml b/java/res/values-el/strings.xml
index 5cee959a03d3a7ebf103d431fcb9a9fb34f44d74..f0754023a580d985a74d348c38283ada87c8d38c 100644
--- a/java/res/values-el/strings.xml
+++ b/java/res/values-el/strings.xml
@@ -105,7 +105,6 @@
     <string name="subtype_mode_en_GB_keyboard" msgid="7945856548410373708">"Αγγλικό (ΗΒ) πληκτρολόγιο"</string>
     <string name="subtype_mode_en_US_keyboard" msgid="3708655163769735410">"Αγγλικό (ΗΠΑ) πληκτρολόγιο"</string>
     <string name="subtype_mode_es_keyboard" msgid="1775125478866113148">"Ισπανικό πληκτρολόγιο"</string>
-    <string name="subtype_mode_es_US_keyboard" msgid="3702125193532262008">"Ισπανικό (ΗΠΑ) πληκτρολόγιο"</string>
     <string name="subtype_mode_fr_keyboard" msgid="8016515336759761014">"Γαλλικό πληκτρολόγιο"</string>
     <string name="subtype_mode_fr_CA_keyboard" msgid="2628517247158376263">"Γαλλικό (Καναδάς) πληκτρολόγιο"</string>
     <string name="subtype_mode_fr_CH_keyboard" msgid="6742806653181621228">"Γαλλικό (Ελβετία) πληκτρολόγιο"</string>
diff --git a/java/res/values-en-rGB/strings.xml b/java/res/values-en-rGB/strings.xml
index 7d5d50177dcfdd6c0a031619db71e65976b1cf6c..4a7c7e7d0c617190c9ea4463f4efe5dd47b945d1 100644
--- a/java/res/values-en-rGB/strings.xml
+++ b/java/res/values-en-rGB/strings.xml
@@ -105,7 +105,6 @@
     <string name="subtype_mode_en_GB_keyboard" msgid="7945856548410373708">"English (UK) Keyboard"</string>
     <string name="subtype_mode_en_US_keyboard" msgid="3708655163769735410">"English (US) Keyboard"</string>
     <string name="subtype_mode_es_keyboard" msgid="1775125478866113148">"Spanish Keyboard"</string>
-    <string name="subtype_mode_es_US_keyboard" msgid="3702125193532262008">"Spanish (US) Keyboard"</string>
     <string name="subtype_mode_fr_keyboard" msgid="8016515336759761014">"French Keyboard"</string>
     <string name="subtype_mode_fr_CA_keyboard" msgid="2628517247158376263">"French (Canada) Keyboard"</string>
     <string name="subtype_mode_fr_CH_keyboard" msgid="6742806653181621228">"French (Switzerland) Keyboard"</string>
diff --git a/java/res/values-es-rUS/strings.xml b/java/res/values-es-rUS/strings.xml
index e40f98b3bdd4e88793400674de5acca6570fe872..4aefbbc9a40a4be396eee41709f619482e311ee0 100644
--- a/java/res/values-es-rUS/strings.xml
+++ b/java/res/values-es-rUS/strings.xml
@@ -105,7 +105,6 @@
     <string name="subtype_mode_en_GB_keyboard" msgid="7945856548410373708">"Teclado en inglés (Reino Unido)"</string>
     <string name="subtype_mode_en_US_keyboard" msgid="3708655163769735410">"Teclado en inglés (EE.UU.)"</string>
     <string name="subtype_mode_es_keyboard" msgid="1775125478866113148">"Teclado en español"</string>
-    <string name="subtype_mode_es_US_keyboard" msgid="3702125193532262008">"Teclado en español (EE.UU.)"</string>
     <string name="subtype_mode_fr_keyboard" msgid="8016515336759761014">"Teclado en francés"</string>
     <string name="subtype_mode_fr_CA_keyboard" msgid="2628517247158376263">"Teclado en francés (Canadá)"</string>
     <string name="subtype_mode_fr_CH_keyboard" msgid="6742806653181621228">"Teclado en francés (Suiza)"</string>
diff --git a/java/res/values-es/strings.xml b/java/res/values-es/strings.xml
index e1532427a9cdab9965858718b03ab2f0a5b703b0..b5dc908d90d37192ad0fe1d4f5427abc358352f1 100644
--- a/java/res/values-es/strings.xml
+++ b/java/res/values-es/strings.xml
@@ -111,7 +111,6 @@
     <string name="subtype_mode_en_GB_keyboard" msgid="7945856548410373708">"Teclado inglés (Reino Unido)"</string>
     <string name="subtype_mode_en_US_keyboard" msgid="3708655163769735410">"Teclado de inglés (EE.UU.)"</string>
     <string name="subtype_mode_es_keyboard" msgid="1775125478866113148">"Teclado español"</string>
-    <string name="subtype_mode_es_US_keyboard" msgid="3702125193532262008">"Teclado en español (EE.UU.)"</string>
     <string name="subtype_mode_fr_keyboard" msgid="8016515336759761014">"Teclado francés"</string>
     <string name="subtype_mode_fr_CA_keyboard" msgid="2628517247158376263">"Teclado francés (Canadá)"</string>
     <string name="subtype_mode_fr_CH_keyboard" msgid="6742806653181621228">"Teclado francés (Suiza)"</string>
diff --git a/java/res/values-fa/strings.xml b/java/res/values-fa/strings.xml
index 25ee9dff89b698be57e4bf86e1f769ea225a69ec..824babe046d8d975db5d662cc5cacdae395c9463 100644
--- a/java/res/values-fa/strings.xml
+++ b/java/res/values-fa/strings.xml
@@ -105,7 +105,6 @@
     <string name="subtype_mode_en_GB_keyboard" msgid="7945856548410373708">"صفحه کلید انگلیسی (بریتانیایی)"</string>
     <string name="subtype_mode_en_US_keyboard" msgid="3708655163769735410">"صفحه کلید انگلیسی (آمریکایی)"</string>
     <string name="subtype_mode_es_keyboard" msgid="1775125478866113148">"صفحه کلید اسپانیایی"</string>
-    <string name="subtype_mode_es_US_keyboard" msgid="3702125193532262008">"صفحه کلید اسپانیایی (آمریکایی)"</string>
     <string name="subtype_mode_fr_keyboard" msgid="8016515336759761014">"صفحه کلید فرانسوی"</string>
     <string name="subtype_mode_fr_CA_keyboard" msgid="2628517247158376263">"صفحه کلید فرانسوی (کانادایی)"</string>
     <string name="subtype_mode_fr_CH_keyboard" msgid="6742806653181621228">"صفحه کلید فرانسوی (سوئیس)"</string>
diff --git a/java/res/values-fi/strings.xml b/java/res/values-fi/strings.xml
index f02e8217dfb3f55ce5e2e67900a10cd600eb1f0f..4f711368ca16617d67aca1bc8800439c4ec913d7 100644
--- a/java/res/values-fi/strings.xml
+++ b/java/res/values-fi/strings.xml
@@ -105,7 +105,6 @@
     <string name="subtype_mode_en_GB_keyboard" msgid="7945856548410373708">"Näppäimistö: englanti (UK)"</string>
     <string name="subtype_mode_en_US_keyboard" msgid="3708655163769735410">"Näppäimistö: englanti (US)"</string>
     <string name="subtype_mode_es_keyboard" msgid="1775125478866113148">"Näppäimistö: espanja"</string>
-    <string name="subtype_mode_es_US_keyboard" msgid="3702125193532262008">"Näppäimistö: espanja (US)"</string>
     <string name="subtype_mode_fr_keyboard" msgid="8016515336759761014">"Näppäimistö: ranska"</string>
     <string name="subtype_mode_fr_CA_keyboard" msgid="2628517247158376263">"Näppäimistö: ranska (Kanada)"</string>
     <string name="subtype_mode_fr_CH_keyboard" msgid="6742806653181621228">"Näppäimistö: ranska (Sveitsi)"</string>
diff --git a/java/res/values-fr/strings.xml b/java/res/values-fr/strings.xml
index 276aed2c5a9ffd2509f13a28ae84494f54affe35..1f86d572edc02a985ff525c719befe7a05c76cc6 100644
--- a/java/res/values-fr/strings.xml
+++ b/java/res/values-fr/strings.xml
@@ -105,7 +105,6 @@
     <string name="subtype_mode_en_GB_keyboard" msgid="7945856548410373708">"Clavier anglais (Royaume-Uni)"</string>
     <string name="subtype_mode_en_US_keyboard" msgid="3708655163769735410">"Clavier anglais (États-Unis)"</string>
     <string name="subtype_mode_es_keyboard" msgid="1775125478866113148">"Clavier espagnol"</string>
-    <string name="subtype_mode_es_US_keyboard" msgid="3702125193532262008">"Clavier espagnol (États-Unis)"</string>
     <string name="subtype_mode_fr_keyboard" msgid="8016515336759761014">"Clavier français"</string>
     <string name="subtype_mode_fr_CA_keyboard" msgid="2628517247158376263">"Clavier français (Canada)"</string>
     <string name="subtype_mode_fr_CH_keyboard" msgid="6742806653181621228">"Clavier français (Suisse)"</string>
diff --git a/java/res/values-hr/strings.xml b/java/res/values-hr/strings.xml
index 6117821ee648b9811811f566e9a6f888eadec785..43edac07665f2116f6af49d38ce05ff2d7ad22b2 100644
--- a/java/res/values-hr/strings.xml
+++ b/java/res/values-hr/strings.xml
@@ -105,7 +105,6 @@
     <string name="subtype_mode_en_GB_keyboard" msgid="7945856548410373708">"Engleska (UK) tipkovnica"</string>
     <string name="subtype_mode_en_US_keyboard" msgid="3708655163769735410">"Engleska (SAD) tipkovnica"</string>
     <string name="subtype_mode_es_keyboard" msgid="1775125478866113148">"Å panjolska tipkovnica"</string>
-    <string name="subtype_mode_es_US_keyboard" msgid="3702125193532262008">"Tipkovnica za Å¡panjolski (SAD)"</string>
     <string name="subtype_mode_fr_keyboard" msgid="8016515336759761014">"Francuska tipkovnica"</string>
     <string name="subtype_mode_fr_CA_keyboard" msgid="2628517247158376263">"Francuska (Kanada) tipkovnica"</string>
     <string name="subtype_mode_fr_CH_keyboard" msgid="6742806653181621228">"Francuska (Å vicarska) tipkovnica"</string>
diff --git a/java/res/values-hu/strings.xml b/java/res/values-hu/strings.xml
index 81255d719a3086974cae11dcad714336fec22a3d..f57dc37b682c942503b4ce6737429543754b2220 100644
--- a/java/res/values-hu/strings.xml
+++ b/java/res/values-hu/strings.xml
@@ -105,7 +105,6 @@
     <string name="subtype_mode_en_GB_keyboard" msgid="7945856548410373708">"Angol (UK) billentyűzet"</string>
     <string name="subtype_mode_en_US_keyboard" msgid="3708655163769735410">"Angol (US) billentyűzet"</string>
     <string name="subtype_mode_es_keyboard" msgid="1775125478866113148">"Spanyol billentyűzet"</string>
-    <string name="subtype_mode_es_US_keyboard" msgid="3702125193532262008">"Spanyol (US) billentyűzet"</string>
     <string name="subtype_mode_fr_keyboard" msgid="8016515336759761014">"Francia billentyűzet"</string>
     <string name="subtype_mode_fr_CA_keyboard" msgid="2628517247158376263">"Francia (kanadai) billentyűzet"</string>
     <string name="subtype_mode_fr_CH_keyboard" msgid="6742806653181621228">"Francia (svájci) billentyűzet"</string>
diff --git a/java/res/values-in/strings.xml b/java/res/values-in/strings.xml
index 32ef38d35f96e2af75115cfbf1100d98fc635c21..5ba0423694b6aad8a7cde7101c29707c4b563b6f 100644
--- a/java/res/values-in/strings.xml
+++ b/java/res/values-in/strings.xml
@@ -105,7 +105,6 @@
     <string name="subtype_mode_en_GB_keyboard" msgid="7945856548410373708">"Keyboard Inggris (Britania Raya)"</string>
     <string name="subtype_mode_en_US_keyboard" msgid="3708655163769735410">"Keyboard Inggris (AS)"</string>
     <string name="subtype_mode_es_keyboard" msgid="1775125478866113148">"Keyboard Spanyol"</string>
-    <string name="subtype_mode_es_US_keyboard" msgid="3702125193532262008">"Keyboard Spanyol (AS)"</string>
     <string name="subtype_mode_fr_keyboard" msgid="8016515336759761014">"Keyboard Prancis"</string>
     <string name="subtype_mode_fr_CA_keyboard" msgid="2628517247158376263">"Keyboard Prancis (Kanada)"</string>
     <string name="subtype_mode_fr_CH_keyboard" msgid="6742806653181621228">"Keyboard Prancis (Swiss)"</string>
diff --git a/java/res/values-it/strings.xml b/java/res/values-it/strings.xml
index 3a896fcd748affa89db4aa539ffbdf0cb2f10820..a18596b89dc578115cbf3e41a1d6a0058e4038ca 100644
--- a/java/res/values-it/strings.xml
+++ b/java/res/values-it/strings.xml
@@ -105,7 +105,6 @@
     <string name="subtype_mode_en_GB_keyboard" msgid="7945856548410373708">"Tastiera inglese (Regno Unito)"</string>
     <string name="subtype_mode_en_US_keyboard" msgid="3708655163769735410">"Tastiera inglese (Stati Uniti)"</string>
     <string name="subtype_mode_es_keyboard" msgid="1775125478866113148">"Tastiera spagnola"</string>
-    <string name="subtype_mode_es_US_keyboard" msgid="3702125193532262008">"Tastiera spagnola (Stati Uniti)"</string>
     <string name="subtype_mode_fr_keyboard" msgid="8016515336759761014">"Tastiera francese"</string>
     <string name="subtype_mode_fr_CA_keyboard" msgid="2628517247158376263">"Tastiera francese (Canada)"</string>
     <string name="subtype_mode_fr_CH_keyboard" msgid="6742806653181621228">"Tastiera francese (Svizzera)"</string>
diff --git a/java/res/values-iw/strings.xml b/java/res/values-iw/strings.xml
index 0b26ed9fefc6a11bd165b3bea7dc5676099a35cf..210f4a042e840cd4c71d0a990bc7415f3da1ef07 100644
--- a/java/res/values-iw/strings.xml
+++ b/java/res/values-iw/strings.xml
@@ -105,7 +105,6 @@
     <string name="subtype_mode_en_GB_keyboard" msgid="7945856548410373708">"מקלדת אנגלית (בריטניה)"</string>
     <string name="subtype_mode_en_US_keyboard" msgid="3708655163769735410">"מקלדת אנגלית (ארה\"ב)"</string>
     <string name="subtype_mode_es_keyboard" msgid="1775125478866113148">"מקלדת ספרדית"</string>
-    <string name="subtype_mode_es_US_keyboard" msgid="3702125193532262008">"מקלדת ספרדית (ארה\"ב)"</string>
     <string name="subtype_mode_fr_keyboard" msgid="8016515336759761014">"מקלדת צרפתית"</string>
     <string name="subtype_mode_fr_CA_keyboard" msgid="2628517247158376263">"מקלדת צרפתית (קנדה)"</string>
     <string name="subtype_mode_fr_CH_keyboard" msgid="6742806653181621228">"מקלדת צרפתית (שוויץ)"</string>
diff --git a/java/res/values-ja/strings.xml b/java/res/values-ja/strings.xml
index 402c35675a009a376db5370a3a6ede355ad854a4..68e2eb7d8201884a07f37c952bb3b5d36d093f76 100644
--- a/java/res/values-ja/strings.xml
+++ b/java/res/values-ja/strings.xml
@@ -105,7 +105,6 @@
     <string name="subtype_mode_en_GB_keyboard" msgid="7945856548410373708">"英語(英国)のキーボード"</string>
     <string name="subtype_mode_en_US_keyboard" msgid="3708655163769735410">"英語(米国)のキーボード"</string>
     <string name="subtype_mode_es_keyboard" msgid="1775125478866113148">"スペイン語のキーボード"</string>
-    <string name="subtype_mode_es_US_keyboard" msgid="3702125193532262008">"スペイン語(米国)のキーボード"</string>
     <string name="subtype_mode_fr_keyboard" msgid="8016515336759761014">"フランス語のキーボード"</string>
     <string name="subtype_mode_fr_CA_keyboard" msgid="2628517247158376263">"フランス語(カナダ)のキーボード"</string>
     <string name="subtype_mode_fr_CH_keyboard" msgid="6742806653181621228">"フランス語(スイス)のキーボード"</string>
diff --git a/java/res/values-ko/strings.xml b/java/res/values-ko/strings.xml
index ca2f570a811794dc99d08918f36aa5b6e97ef86e..cf6b551a4b6c49a5f550d2827aa1987fca6f9571 100644
--- a/java/res/values-ko/strings.xml
+++ b/java/res/values-ko/strings.xml
@@ -105,7 +105,6 @@
     <string name="subtype_mode_en_GB_keyboard" msgid="7945856548410373708">"영어(영국) 키보드"</string>
     <string name="subtype_mode_en_US_keyboard" msgid="3708655163769735410">"영어(미국) 키보드"</string>
     <string name="subtype_mode_es_keyboard" msgid="1775125478866113148">"스페인어 키보드"</string>
-    <string name="subtype_mode_es_US_keyboard" msgid="3702125193532262008">"스페인어(미국) 키보드"</string>
     <string name="subtype_mode_fr_keyboard" msgid="8016515336759761014">"프랑스어 키보드"</string>
     <string name="subtype_mode_fr_CA_keyboard" msgid="2628517247158376263">"프랑스어(캐나다) 키보드"</string>
     <string name="subtype_mode_fr_CH_keyboard" msgid="6742806653181621228">"프랑스어(스위스) 키보드"</string>
diff --git a/java/res/values-land/dimens.xml b/java/res/values-land/dimens.xml
index 8af3cb005e6c91c5713017597adb4f5f0a1a1670..6b52ad4e1183acdccdd636f289a921f5adfd1f7b 100644
--- a/java/res/values-land/dimens.xml
+++ b/java/res/values-land/dimens.xml
@@ -35,7 +35,6 @@
     <fraction name="key_preview_text_ratio">90%</fraction>
     <dimen name="candidate_strip_height">38dip</dimen>
     <dimen name="candidate_strip_fading_edge_length">63dip</dimen>
-    <dimen name="spacebar_vertical_correction">2dip</dimen>
     <!-- Amount of allowance for selecting keys in a mini popup keyboard by sliding finger. -->
     <!-- popup_key_height x 1.2 -->
     <dimen name="mini_keyboard_slide_allowance">0.336in</dimen>
diff --git a/java/res/values-lt/strings.xml b/java/res/values-lt/strings.xml
index fbe50e0052384ca82e32917342c9397da41e0a57..b5578fd83f2048e3987ce417b22cb503cdeb4762 100644
--- a/java/res/values-lt/strings.xml
+++ b/java/res/values-lt/strings.xml
@@ -105,7 +105,6 @@
     <string name="subtype_mode_en_GB_keyboard" msgid="7945856548410373708">"Angliška (JK) klaviatūra"</string>
     <string name="subtype_mode_en_US_keyboard" msgid="3708655163769735410">"Angliška (JAV) klaviatūra"</string>
     <string name="subtype_mode_es_keyboard" msgid="1775125478866113148">"Ispaniška klaviatūra"</string>
-    <string name="subtype_mode_es_US_keyboard" msgid="3702125193532262008">"Ispaniška (JAV) klaviatūra"</string>
     <string name="subtype_mode_fr_keyboard" msgid="8016515336759761014">"Prancūziška klaviatūra"</string>
     <string name="subtype_mode_fr_CA_keyboard" msgid="2628517247158376263">"Prancūziška (Kanada) klaviatūra"</string>
     <string name="subtype_mode_fr_CH_keyboard" msgid="6742806653181621228">"Prancūziška (Šveicarija) klaviatūra"</string>
diff --git a/java/res/values-lv/strings.xml b/java/res/values-lv/strings.xml
index 84bee538291d2986db5fed0ebbc571f72c0398bd..8633438892a36d20c56b2b5084a02733054c381e 100644
--- a/java/res/values-lv/strings.xml
+++ b/java/res/values-lv/strings.xml
@@ -105,7 +105,6 @@
     <string name="subtype_mode_en_GB_keyboard" msgid="7945856548410373708">"Angļu (Lielbritānija) tastatūra"</string>
     <string name="subtype_mode_en_US_keyboard" msgid="3708655163769735410">"Angļu (ASV) tastatūra"</string>
     <string name="subtype_mode_es_keyboard" msgid="1775125478866113148">"Spāņu tastatūra"</string>
-    <string name="subtype_mode_es_US_keyboard" msgid="3702125193532262008">"Spāņu (ASV) tastatūra"</string>
     <string name="subtype_mode_fr_keyboard" msgid="8016515336759761014">"Franču tastatūra"</string>
     <string name="subtype_mode_fr_CA_keyboard" msgid="2628517247158376263">"Franču (Kanāda) tastatūra"</string>
     <string name="subtype_mode_fr_CH_keyboard" msgid="6742806653181621228">"Franču (Šveices) tastatūra"</string>
diff --git a/java/res/values-nb/strings.xml b/java/res/values-nb/strings.xml
index e20c9515e3c34b029c6c9b237a57a814af1f2e56..34dc4e8408f5bd59af15687f18a739b37349d12e 100644
--- a/java/res/values-nb/strings.xml
+++ b/java/res/values-nb/strings.xml
@@ -105,7 +105,6 @@
     <string name="subtype_mode_en_GB_keyboard" msgid="7945856548410373708">"Engelsk tastatur (Storbritannia)"</string>
     <string name="subtype_mode_en_US_keyboard" msgid="3708655163769735410">"Engelsk tastatur (USA)"</string>
     <string name="subtype_mode_es_keyboard" msgid="1775125478866113148">"Spansk tastatur"</string>
-    <string name="subtype_mode_es_US_keyboard" msgid="3702125193532262008">"Spansk tastatur (USA)"</string>
     <string name="subtype_mode_fr_keyboard" msgid="8016515336759761014">"Fransk tastatur"</string>
     <string name="subtype_mode_fr_CA_keyboard" msgid="2628517247158376263">"Fransk tastatur (Canada)"</string>
     <string name="subtype_mode_fr_CH_keyboard" msgid="6742806653181621228">"Fransk tastatur (Sveits)"</string>
diff --git a/java/res/values-nl/strings.xml b/java/res/values-nl/strings.xml
index 89b714bc84c4925737c64f68f9625ea4b0e3de16..383ce22588806aa7f5184b055d8382ffd869d84f 100644
--- a/java/res/values-nl/strings.xml
+++ b/java/res/values-nl/strings.xml
@@ -105,7 +105,6 @@
     <string name="subtype_mode_en_GB_keyboard" msgid="7945856548410373708">"Engels toetsenbord (VK)"</string>
     <string name="subtype_mode_en_US_keyboard" msgid="3708655163769735410">"Engels toetsenbord (VS)"</string>
     <string name="subtype_mode_es_keyboard" msgid="1775125478866113148">"Spaans toetsenbord"</string>
-    <string name="subtype_mode_es_US_keyboard" msgid="3702125193532262008">"Spaans toetsenbord (VS)"</string>
     <string name="subtype_mode_fr_keyboard" msgid="8016515336759761014">"Frans toetsenbord"</string>
     <string name="subtype_mode_fr_CA_keyboard" msgid="2628517247158376263">"Frans toetsenbord (Canada)"</string>
     <string name="subtype_mode_fr_CH_keyboard" msgid="6742806653181621228">"Frans toetsenbord (Zwitserland)"</string>
diff --git a/java/res/values-pl/strings.xml b/java/res/values-pl/strings.xml
index 65240d748be26e0d9f5d73e6947f36af41815cff..2dda91de2ac7cad5ba4531cd42b42b64efd2fc1c 100644
--- a/java/res/values-pl/strings.xml
+++ b/java/res/values-pl/strings.xml
@@ -105,7 +105,6 @@
     <string name="subtype_mode_en_GB_keyboard" msgid="7945856548410373708">"Klawiatura angielska (UK)"</string>
     <string name="subtype_mode_en_US_keyboard" msgid="3708655163769735410">"Klawiatura angielska (USA)"</string>
     <string name="subtype_mode_es_keyboard" msgid="1775125478866113148">"Klawiatura hiszpańska"</string>
-    <string name="subtype_mode_es_US_keyboard" msgid="3702125193532262008">"Klawiatura hiszpańska (USA)"</string>
     <string name="subtype_mode_fr_keyboard" msgid="8016515336759761014">"Klawiatura francuska"</string>
     <string name="subtype_mode_fr_CA_keyboard" msgid="2628517247158376263">"Klawiatura francuska (Kanada)"</string>
     <string name="subtype_mode_fr_CH_keyboard" msgid="6742806653181621228">"Klawiatura francuska (Szwajcaria)"</string>
diff --git a/java/res/values-pt-rPT/strings.xml b/java/res/values-pt-rPT/strings.xml
index b972ce049c5ba9f592bc785ea94a9fbc9a40a6a7..fa84520aa5252e30cb04e345542494bde793508e 100644
--- a/java/res/values-pt-rPT/strings.xml
+++ b/java/res/values-pt-rPT/strings.xml
@@ -105,7 +105,6 @@
     <string name="subtype_mode_en_GB_keyboard" msgid="7945856548410373708">"Teclado inglês (Reino Unido)"</string>
     <string name="subtype_mode_en_US_keyboard" msgid="3708655163769735410">"Teclado inglês (EUA)"</string>
     <string name="subtype_mode_es_keyboard" msgid="1775125478866113148">"Teclado espanhol"</string>
-    <string name="subtype_mode_es_US_keyboard" msgid="3702125193532262008">"Teclado espanhol (EUA)"</string>
     <string name="subtype_mode_fr_keyboard" msgid="8016515336759761014">"Teclado francês"</string>
     <string name="subtype_mode_fr_CA_keyboard" msgid="2628517247158376263">"Teclado francês (Canadá)"</string>
     <string name="subtype_mode_fr_CH_keyboard" msgid="6742806653181621228">"Teclado francês (Suíça)"</string>
diff --git a/java/res/values-pt/strings.xml b/java/res/values-pt/strings.xml
index a999dc67e3d4430ea5d7e57ea23dc4f7f5c8b490..3f680cdc45a7c4544ea182fcc01b58de1dd8c1a8 100644
--- a/java/res/values-pt/strings.xml
+++ b/java/res/values-pt/strings.xml
@@ -105,7 +105,6 @@
     <string name="subtype_mode_en_GB_keyboard" msgid="7945856548410373708">"Teclado para inglês (Reino Unido)"</string>
     <string name="subtype_mode_en_US_keyboard" msgid="3708655163769735410">"Teclado para inglês (EUA)"</string>
     <string name="subtype_mode_es_keyboard" msgid="1775125478866113148">"Teclado para espanhol"</string>
-    <string name="subtype_mode_es_US_keyboard" msgid="3702125193532262008">"Teclado para espanhol"</string>
     <string name="subtype_mode_fr_keyboard" msgid="8016515336759761014">"Teclado para francês"</string>
     <string name="subtype_mode_fr_CA_keyboard" msgid="2628517247158376263">"Teclado para francês (Canadá)"</string>
     <string name="subtype_mode_fr_CH_keyboard" msgid="6742806653181621228">"Teclado para francês (Suíça)"</string>
diff --git a/java/res/values-rm/strings.xml b/java/res/values-rm/strings.xml
index b0c1bea2426018f63fa2bd6fad6d02ff65321a97..aa0f3e344c006e42062b20d5f18aec65c35e29f4 100644
--- a/java/res/values-rm/strings.xml
+++ b/java/res/values-rm/strings.xml
@@ -145,8 +145,6 @@
     <skip />
     <!-- no translation found for subtype_mode_es_keyboard (1775125478866113148) -->
     <skip />
-    <!-- no translation found for subtype_mode_es_US_keyboard (3702125193532262008) -->
-    <skip />
     <!-- no translation found for subtype_mode_fr_keyboard (8016515336759761014) -->
     <skip />
     <!-- no translation found for subtype_mode_fr_CA_keyboard (2628517247158376263) -->
diff --git a/java/res/values-ro/strings.xml b/java/res/values-ro/strings.xml
index 0fcefd1f21eee33c07430f10d4aebdceeebdaf6b..220f1d79134299908d31c6224478ae8e89c5129b 100644
--- a/java/res/values-ro/strings.xml
+++ b/java/res/values-ro/strings.xml
@@ -105,7 +105,6 @@
     <string name="subtype_mode_en_GB_keyboard" msgid="7945856548410373708">"Tastatură engleză (Marea Britanie)"</string>
     <string name="subtype_mode_en_US_keyboard" msgid="3708655163769735410">"Tastatură engleză (S.U.A.)"</string>
     <string name="subtype_mode_es_keyboard" msgid="1775125478866113148">"Tastatură spaniolă"</string>
-    <string name="subtype_mode_es_US_keyboard" msgid="3702125193532262008">"Tastatură spaniolă (S.U.A.)"</string>
     <string name="subtype_mode_fr_keyboard" msgid="8016515336759761014">"Tastatură franceză"</string>
     <string name="subtype_mode_fr_CA_keyboard" msgid="2628517247158376263">"Tastatură franceză (Canada)"</string>
     <string name="subtype_mode_fr_CH_keyboard" msgid="6742806653181621228">"Tastatură franceză (Elveţia)"</string>
diff --git a/java/res/values-ru/strings.xml b/java/res/values-ru/strings.xml
index 2e8577ea1237241795ae8ebd1b60f32a2d6d3088..b8a25eb86ea7d6c844b3ac5eb2dc3d795ebca7d6 100644
--- a/java/res/values-ru/strings.xml
+++ b/java/res/values-ru/strings.xml
@@ -105,7 +105,6 @@
     <string name="subtype_mode_en_GB_keyboard" msgid="7945856548410373708">"Клавиатура: английская (Великобритания)"</string>
     <string name="subtype_mode_en_US_keyboard" msgid="3708655163769735410">"Клавиатура: английская (США)"</string>
     <string name="subtype_mode_es_keyboard" msgid="1775125478866113148">"Клавиатура: испанская"</string>
-    <string name="subtype_mode_es_US_keyboard" msgid="3702125193532262008">"Клавиатура: испанская (США)"</string>
     <string name="subtype_mode_fr_keyboard" msgid="8016515336759761014">"Клавиатура: французская"</string>
     <string name="subtype_mode_fr_CA_keyboard" msgid="2628517247158376263">"Клавиатура: французская"</string>
     <string name="subtype_mode_fr_CH_keyboard" msgid="6742806653181621228">"Клавиатура: французская (Швейцария)"</string>
diff --git a/java/res/values-sk/strings.xml b/java/res/values-sk/strings.xml
index eeefa820f06946cb649e30ee810f580a54a2bab6..0ecc65a01c0b37ea3ddc04579af32c7bdc1c9369 100644
--- a/java/res/values-sk/strings.xml
+++ b/java/res/values-sk/strings.xml
@@ -105,7 +105,6 @@
     <string name="subtype_mode_en_GB_keyboard" msgid="7945856548410373708">"klávesnica – angličtina (br.)"</string>
     <string name="subtype_mode_en_US_keyboard" msgid="3708655163769735410">"klávesnica – angličtina (am.)"</string>
     <string name="subtype_mode_es_keyboard" msgid="1775125478866113148">"klávesnica – španielčina"</string>
-    <string name="subtype_mode_es_US_keyboard" msgid="3702125193532262008">"klávesnica – španielčina (am.)"</string>
     <string name="subtype_mode_fr_keyboard" msgid="8016515336759761014">"klávesnica – francúzština"</string>
     <string name="subtype_mode_fr_CA_keyboard" msgid="2628517247158376263">"klávesnica – francúzština (Kanada)"</string>
     <string name="subtype_mode_fr_CH_keyboard" msgid="6742806653181621228">"klávesnica – francúzština (Švajč.)"</string>
diff --git a/java/res/values-sl/strings.xml b/java/res/values-sl/strings.xml
index 91f9036e6de3378a70b84d4bb1837a120a3fd3a6..f02c1ac131437e085e5c15800f9b8067069779b3 100644
--- a/java/res/values-sl/strings.xml
+++ b/java/res/values-sl/strings.xml
@@ -105,7 +105,6 @@
     <string name="subtype_mode_en_GB_keyboard" msgid="7945856548410373708">"Tipkovnica za britansko angleščino"</string>
     <string name="subtype_mode_en_US_keyboard" msgid="3708655163769735410">"Tipkovnica za ameriško angleščino"</string>
     <string name="subtype_mode_es_keyboard" msgid="1775125478866113148">"Å panska tipkovnica"</string>
-    <string name="subtype_mode_es_US_keyboard" msgid="3702125193532262008">"Tipkovnica za ameriško španščino"</string>
     <string name="subtype_mode_fr_keyboard" msgid="8016515336759761014">"Francoska tipkovnica"</string>
     <string name="subtype_mode_fr_CA_keyboard" msgid="2628517247158376263">"Tipkovnica za kanadsko francoščino"</string>
     <string name="subtype_mode_fr_CH_keyboard" msgid="6742806653181621228">"Tipkovnica za švicarsko francoščino"</string>
diff --git a/java/res/values-sr/strings.xml b/java/res/values-sr/strings.xml
index b20f1df2e708c9657370e6591f3123654121f793..88332a9d19aeb710a2f8706fce145a201b5f32e5 100644
--- a/java/res/values-sr/strings.xml
+++ b/java/res/values-sr/strings.xml
@@ -105,7 +105,6 @@
     <string name="subtype_mode_en_GB_keyboard" msgid="7945856548410373708">"Језик тастатуре: енглески (УК)"</string>
     <string name="subtype_mode_en_US_keyboard" msgid="3708655163769735410">"Језик тастатуре: енглески (САД)"</string>
     <string name="subtype_mode_es_keyboard" msgid="1775125478866113148">"Језик тастатуре: шпански"</string>
-    <string name="subtype_mode_es_US_keyboard" msgid="3702125193532262008">"Језик тастатуре: шпански (САД)"</string>
     <string name="subtype_mode_fr_keyboard" msgid="8016515336759761014">"Језик тастатуре: француски"</string>
     <string name="subtype_mode_fr_CA_keyboard" msgid="2628517247158376263">"Језик тастатуре: француски (Канада)"</string>
     <string name="subtype_mode_fr_CH_keyboard" msgid="6742806653181621228">"Језик тастатуре: француски (Швајц.)"</string>
diff --git a/java/res/values-sv/strings.xml b/java/res/values-sv/strings.xml
index 2d35fd87b934000c73686edb17fcc6ea8e710058..b5d43e7ef6a047bc56d7039daaf8ed6cf6a37504 100644
--- a/java/res/values-sv/strings.xml
+++ b/java/res/values-sv/strings.xml
@@ -105,7 +105,6 @@
     <string name="subtype_mode_en_GB_keyboard" msgid="7945856548410373708">"Engelskt tangentbord (Storbrit.)"</string>
     <string name="subtype_mode_en_US_keyboard" msgid="3708655163769735410">"Engelskt tangentbord (USA)"</string>
     <string name="subtype_mode_es_keyboard" msgid="1775125478866113148">"Spanskt tangentbord"</string>
-    <string name="subtype_mode_es_US_keyboard" msgid="3702125193532262008">"Spanskt tangentbord (USA)"</string>
     <string name="subtype_mode_fr_keyboard" msgid="8016515336759761014">"Franskt tangentbord"</string>
     <string name="subtype_mode_fr_CA_keyboard" msgid="2628517247158376263">"Franskt tangentbord (Kanada)"</string>
     <string name="subtype_mode_fr_CH_keyboard" msgid="6742806653181621228">"Franskt tangentbord (Schweiz)"</string>
diff --git a/java/res/values-th/strings.xml b/java/res/values-th/strings.xml
index cd7fe95c03a25437fc3dd1eaed99282068c5dbcd..8c0db1784198e980c332e32a5f08eb22531d3290 100644
--- a/java/res/values-th/strings.xml
+++ b/java/res/values-th/strings.xml
@@ -105,7 +105,6 @@
     <string name="subtype_mode_en_GB_keyboard" msgid="7945856548410373708">"แป้นพิมพ์ภาษาอังกฤษ (สหราชอาณาจักร)"</string>
     <string name="subtype_mode_en_US_keyboard" msgid="3708655163769735410">"แป้นพิมพ์ภาษาอังกฤษ (สหรัฐอเมริกา)"</string>
     <string name="subtype_mode_es_keyboard" msgid="1775125478866113148">"แปันพิมพ์ภาษาสเปน"</string>
-    <string name="subtype_mode_es_US_keyboard" msgid="3702125193532262008">"แป้นพิมพ์ภาษาสเปน (สหรัฐอเมริกา)"</string>
     <string name="subtype_mode_fr_keyboard" msgid="8016515336759761014">"แป้นพิมพ์ภาษาฝรั่งเศส"</string>
     <string name="subtype_mode_fr_CA_keyboard" msgid="2628517247158376263">"แป้นพิมพ์ภาษาฝรั่งเศส (แคนาดา)"</string>
     <string name="subtype_mode_fr_CH_keyboard" msgid="6742806653181621228">"แป้นพิมพ์ภาษาฝรั่งเศส (สวิตเซอร์แลนด์)"</string>
diff --git a/java/res/values-tl/strings.xml b/java/res/values-tl/strings.xml
index da62eafc60fa797d2a0a77517f46bbc63805a79f..435eac5e8b204a82baa3c5643de31932eeba22d4 100644
--- a/java/res/values-tl/strings.xml
+++ b/java/res/values-tl/strings.xml
@@ -105,7 +105,6 @@
     <string name="subtype_mode_en_GB_keyboard" msgid="7945856548410373708">"Ingles (UK) na Keyboard"</string>
     <string name="subtype_mode_en_US_keyboard" msgid="3708655163769735410">"Ingles (US) na Keyboard"</string>
     <string name="subtype_mode_es_keyboard" msgid="1775125478866113148">"Spanish na Keyboard"</string>
-    <string name="subtype_mode_es_US_keyboard" msgid="3702125193532262008">"Spanish (US) na Keyboard"</string>
     <string name="subtype_mode_fr_keyboard" msgid="8016515336759761014">"French na Keyboard"</string>
     <string name="subtype_mode_fr_CA_keyboard" msgid="2628517247158376263">"French (Canada) na Keyboard"</string>
     <string name="subtype_mode_fr_CH_keyboard" msgid="6742806653181621228">"French (Switzerland) na Keyboard"</string>
diff --git a/java/res/values-tr/strings.xml b/java/res/values-tr/strings.xml
index 2607ae257bc9dc75ea0ec45dd37d1e254e157f96..78d2d88560a8621d1504ca6d6de9fd28520770c5 100644
--- a/java/res/values-tr/strings.xml
+++ b/java/res/values-tr/strings.xml
@@ -105,7 +105,6 @@
     <string name="subtype_mode_en_GB_keyboard" msgid="7945856548410373708">"Ä°ngilizce (Ä°ngiltere) Klavye"</string>
     <string name="subtype_mode_en_US_keyboard" msgid="3708655163769735410">"Ä°ngilizce (ABD) Klavye"</string>
     <string name="subtype_mode_es_keyboard" msgid="1775125478866113148">"Ä°spanyolca Klavye"</string>
-    <string name="subtype_mode_es_US_keyboard" msgid="3702125193532262008">"Ä°spanyolca (ABD) Klavye"</string>
     <string name="subtype_mode_fr_keyboard" msgid="8016515336759761014">"Fransızca Klavye"</string>
     <string name="subtype_mode_fr_CA_keyboard" msgid="2628517247158376263">"Fransızca (Kanada) Klavye"</string>
     <string name="subtype_mode_fr_CH_keyboard" msgid="6742806653181621228">"Fransızca (İsviçre) Klavye"</string>
diff --git a/java/res/values-uk/strings.xml b/java/res/values-uk/strings.xml
index a2f589d1d278d62b8174c368d4db80ede06998e6..bafe11e6bc06e96fd9e93cbb72272f85ab3f53dd 100644
--- a/java/res/values-uk/strings.xml
+++ b/java/res/values-uk/strings.xml
@@ -105,7 +105,6 @@
     <string name="subtype_mode_en_GB_keyboard" msgid="7945856548410373708">"Англ. розкладка (Великобританія)"</string>
     <string name="subtype_mode_en_US_keyboard" msgid="3708655163769735410">"Англійська розкладка (США)"</string>
     <string name="subtype_mode_es_keyboard" msgid="1775125478866113148">"Іспанська розкладка"</string>
-    <string name="subtype_mode_es_US_keyboard" msgid="3702125193532262008">"Іспанська розкладка (США)"</string>
     <string name="subtype_mode_fr_keyboard" msgid="8016515336759761014">"Французька розкладка"</string>
     <string name="subtype_mode_fr_CA_keyboard" msgid="2628517247158376263">"Французька розкладка (Канада)"</string>
     <string name="subtype_mode_fr_CH_keyboard" msgid="6742806653181621228">"Французька розкладка (Швейцарія)"</string>
diff --git a/java/res/values-vi/strings.xml b/java/res/values-vi/strings.xml
index 81be8264eee5d6b065e9525633f617750769e72c..edf64468e8647bb9cff333b0ec28e01149b1dd0e 100644
--- a/java/res/values-vi/strings.xml
+++ b/java/res/values-vi/strings.xml
@@ -105,7 +105,6 @@
     <string name="subtype_mode_en_GB_keyboard" msgid="7945856548410373708">"Bàn phím tiếng Anh (Anh)"</string>
     <string name="subtype_mode_en_US_keyboard" msgid="3708655163769735410">"Bàn phím tiếng Anh (Mỹ)"</string>
     <string name="subtype_mode_es_keyboard" msgid="1775125478866113148">"Bàn phím tiếng Tây Ban Nha"</string>
-    <string name="subtype_mode_es_US_keyboard" msgid="3702125193532262008">"Bàn phím tiếng Tây Ban Nha (Mỹ)"</string>
     <string name="subtype_mode_fr_keyboard" msgid="8016515336759761014">"Bàn phím tiếng Pháp"</string>
     <string name="subtype_mode_fr_CA_keyboard" msgid="2628517247158376263">"Bàn phím tiếng Pháp (Canada)"</string>
     <string name="subtype_mode_fr_CH_keyboard" msgid="6742806653181621228">"Bàn phím tiếng Pháp (Thụy Sĩ)"</string>
diff --git a/java/res/values-zh-rCN/strings.xml b/java/res/values-zh-rCN/strings.xml
index 1f15831b36cff974ac65baa7f63c67e614977a2b..be35ba360828c7b9eebbc0f44d933f682e449ce3 100644
--- a/java/res/values-zh-rCN/strings.xml
+++ b/java/res/values-zh-rCN/strings.xml
@@ -105,7 +105,6 @@
     <string name="subtype_mode_en_GB_keyboard" msgid="7945856548410373708">"英语(英国)键盘"</string>
     <string name="subtype_mode_en_US_keyboard" msgid="3708655163769735410">"英语(美国)键盘"</string>
     <string name="subtype_mode_es_keyboard" msgid="1775125478866113148">"西班牙语键盘"</string>
-    <string name="subtype_mode_es_US_keyboard" msgid="3702125193532262008">"西班牙语(美国)键盘"</string>
     <string name="subtype_mode_fr_keyboard" msgid="8016515336759761014">"法语键盘"</string>
     <string name="subtype_mode_fr_CA_keyboard" msgid="2628517247158376263">"法语(加拿大)键盘"</string>
     <string name="subtype_mode_fr_CH_keyboard" msgid="6742806653181621228">"法语(瑞士)键盘"</string>
diff --git a/java/res/values-zh-rTW/strings.xml b/java/res/values-zh-rTW/strings.xml
index 8a89aeb0811d9aecc743f35fa903d6f8e07d7228..89a292000c0c64dd18277731c793c66ebd52e44b 100644
--- a/java/res/values-zh-rTW/strings.xml
+++ b/java/res/values-zh-rTW/strings.xml
@@ -105,7 +105,6 @@
     <string name="subtype_mode_en_GB_keyboard" msgid="7945856548410373708">"英文 (英國) 鍵盤"</string>
     <string name="subtype_mode_en_US_keyboard" msgid="3708655163769735410">"英文 (美國) 鍵盤"</string>
     <string name="subtype_mode_es_keyboard" msgid="1775125478866113148">"西班牙文鍵盤"</string>
-    <string name="subtype_mode_es_US_keyboard" msgid="3702125193532262008">"西班牙文 (美國) 鍵盤"</string>
     <string name="subtype_mode_fr_keyboard" msgid="8016515336759761014">"法文鍵盤"</string>
     <string name="subtype_mode_fr_CA_keyboard" msgid="2628517247158376263">"法文 (加拿大) 鍵盤"</string>
     <string name="subtype_mode_fr_CH_keyboard" msgid="6742806653181621228">"法文 (瑞士) 鍵盤"</string>
diff --git a/java/res/values/bools.xml b/java/res/values/bools.xml
index 2a181e17d3d82dbad2455fd6f0b6481c4bc4df30..889d8f784f662456e13a54602cdf7311c95523b8 100644
--- a/java/res/values/bools.xml
+++ b/java/res/values/bools.xml
@@ -21,6 +21,4 @@
     <!-- Whether this input method should be used as the default for a locale. Override it
          for latin languages. -->
     <bool name="im_is_default">false</bool>
-    <!-- Whether or not voice input is enabled by default. -->
-    <bool name="voice_input_default">true</bool>
 </resources>
diff --git a/java/res/values/config.xml b/java/res/values/config.xml
index 1d24b108855eb57995ebd7a30e0dad35ecff101a..ad0804988b0d5c06acabbb97f5d78383357ca9cd 100644
--- a/java/res/values/config.xml
+++ b/java/res/values/config.xml
@@ -20,7 +20,6 @@
 
 <resources>
     <bool name="config_swipeDisambiguation">true</bool>
-    <bool name="config_long_press_comma_for_settings_enabled">true</bool>
     <bool name="config_enable_show_settings_key_option">true</bool>
     <bool name="config_enable_show_subtype_settings">true</bool>
     <bool name="config_enable_show_voice_key_option">true</bool>
@@ -72,8 +71,6 @@
     <string name="config_default_keyboard_theme_id" translatable="false">4</string>
     <string name="config_text_size_of_language_on_spacebar" translatable="false">small</string>
     <integer name="config_max_popup_keyboard_column">5</integer>
-    <!-- Whether or not auto-correction should be enabled by default -->
-    <bool name="enable_autocorrect">true</bool>
     <string-array name="auto_correction_threshold_values" translatable="false">
         <!-- Off, When auto correction setting is Off, this value is not used. -->
         <item></item>
diff --git a/java/res/values/dimens.xml b/java/res/values/dimens.xml
index 4708611e0786d6df5750146bd835f6ce0a6f74c4..e26cad3f21eb19a931351e4acb85cbc8e8915dde 100644
--- a/java/res/values/dimens.xml
+++ b/java/res/values/dimens.xml
@@ -62,11 +62,9 @@
     <dimen name="candidate_min_width">32dip</dimen>
     <dimen name="candidate_padding">6dip</dimen>
     <dimen name="candidate_text_size">18dip</dimen>
-    <dimen name="spacebar_vertical_correction">4dip</dimen>
     <!-- If the screen height in landscape is larger than the below value, then the keyboard
          will not go into extract (fullscreen) mode. -->
     <dimen name="max_height_for_fullscreen">2.5in</dimen>
-    <dimen name="bubble_pointer_offset">22dip</dimen>
 
     <dimen name="key_hysteresis_distance">0.05in</dimen>
 </resources>
diff --git a/java/res/values/durations.xml b/java/res/values/durations.xml
deleted file mode 100644
index 92af68e390de524d79989f23972c92cbd38829aa..0000000000000000000000000000000000000000
--- a/java/res/values/durations.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/* 
-**
-** Copyright 2008, 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>
-    <!-- Vibration duration in milliseconds, for key presses in the IME. This can be hardware
-        dependent and may require overriding with a device specific overlay. -->
-    <integer name="vibrate_duration_ms">40</integer>
-</resources>
diff --git a/java/res/values/keycodes.xml b/java/res/values/keycodes.xml
index d5926ecfd013eb2668266de1a079b6c7c808f528..ee345291a37f485a3408710a0842de802712a64e 100644
--- a/java/res/values/keycodes.xml
+++ b/java/res/values/keycodes.xml
@@ -23,9 +23,6 @@
     <integer name="key_tab">9</integer>
     <integer name="key_return">10</integer>
     <integer name="key_space">32</integer>
-    <integer name="key_dash">45</integer>
-    <integer name="key_single_quote">39</integer>
-    <integer name="key_double_quote">34</integer>
     <integer name="key_shift">-1</integer>
     <integer name="key_switch_alpha_symbol">-2</integer>
     <integer name="key_delete">-5</integer>
diff --git a/java/res/values/strings.xml b/java/res/values/strings.xml
index 88f07f558c34ab6a8e04fcc103a239b607f6e3dc..b75b21a8478dc3a6092774d1372b31ab69fe2ebf 100644
--- a/java/res/values/strings.xml
+++ b/java/res/values/strings.xml
@@ -253,8 +253,6 @@
     <string name="subtype_mode_en_US_keyboard">English (US) Keyboard</string>
     <!-- Description for Spanish keyboard subtype [CHAR LIMIT=35] -->
     <string name="subtype_mode_es_keyboard">Spanish Keyboard</string>
-    <!-- Description for Spanish (United States) keyboard subtype [CHAR LIMIT=35] -->
-    <string name="subtype_mode_es_US_keyboard">Spanish (US) Keyboard</string>
     <!-- Description for French keyboard subtype [CHAR LIMIT=35] -->
     <string name="subtype_mode_fr_keyboard">French Keyboard</string>
     <!-- Description for French (Canada) keyboard subtype [CHAR LIMIT=35] -->