diff --git a/java/res/drawable-hdpi/btn_candidate_normal.9.png b/java/res/drawable-hdpi/btn_candidate_normal.9.png
deleted file mode 100644
index 7cab5a899c29d2d71f3daf2db16ea4247a94a88a..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-hdpi/btn_candidate_normal.9.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/btn_keyboard_key_dark_normal.9.png b/java/res/drawable-hdpi/btn_keyboard_key_dark_normal.9.png
index 50cc49fdb0a201dae42f2613223a50d61f5d73dd..01fc8ca780342b16e22a395f702af499a2eb21b3 100644
Binary files a/java/res/drawable-hdpi/btn_keyboard_key_dark_normal.9.png and b/java/res/drawable-hdpi/btn_keyboard_key_dark_normal.9.png differ
diff --git a/java/res/drawable-hdpi/btn_keyboard_key_dark_normal_off.9.png b/java/res/drawable-hdpi/btn_keyboard_key_dark_normal_off.9.png
index dabf77ec676fcd6d4c5f31bcf38ad0b0c5f92a72..af4017e2c6f7e8ec7b98fb9641d81b25e9bc138f 100644
Binary files a/java/res/drawable-hdpi/btn_keyboard_key_dark_normal_off.9.png and b/java/res/drawable-hdpi/btn_keyboard_key_dark_normal_off.9.png differ
diff --git a/java/res/drawable-hdpi/btn_keyboard_key_dark_normal_on.9.png b/java/res/drawable-hdpi/btn_keyboard_key_dark_normal_on.9.png
index 6e7d74c887ee3672d0b6dfbb0a85ba7dfba9bf04..4c35aca95dd88e92c4bc76673d2509917b0383c3 100644
Binary files a/java/res/drawable-hdpi/btn_keyboard_key_dark_normal_on.9.png and b/java/res/drawable-hdpi/btn_keyboard_key_dark_normal_on.9.png differ
diff --git a/java/res/drawable-hdpi/btn_keyboard_key_dark_pressed.9.png b/java/res/drawable-hdpi/btn_keyboard_key_dark_pressed.9.png
index ddb77c224bc1e1d9cbf264fbd4b1c3104e371b31..174f3452c684ba190fc3aa012a825ba1dd3c1e06 100644
Binary files a/java/res/drawable-hdpi/btn_keyboard_key_dark_pressed.9.png and b/java/res/drawable-hdpi/btn_keyboard_key_dark_pressed.9.png differ
diff --git a/java/res/drawable-hdpi/btn_keyboard_key_dark_pressed_off.9.png b/java/res/drawable-hdpi/btn_keyboard_key_dark_pressed_off.9.png
index 1e9227e1cbb3830595520b310459721a1093adab..1fcbd9a887085ef01807d36e6309f95457beab4a 100644
Binary files a/java/res/drawable-hdpi/btn_keyboard_key_dark_pressed_off.9.png and b/java/res/drawable-hdpi/btn_keyboard_key_dark_pressed_off.9.png differ
diff --git a/java/res/drawable-hdpi/btn_keyboard_key_dark_pressed_on.9.png b/java/res/drawable-hdpi/btn_keyboard_key_dark_pressed_on.9.png
index 7207b2ece8b47c0aeb3a07a0c2867d417c01bd8a..072753f37dfc12ec6c24858aae888bbd9f58d426 100644
Binary files a/java/res/drawable-hdpi/btn_keyboard_key_dark_pressed_on.9.png and b/java/res/drawable-hdpi/btn_keyboard_key_dark_pressed_on.9.png differ
diff --git a/java/res/drawable-hdpi/btn_keyboard_key_fulltrans_normal.9.png b/java/res/drawable-hdpi/btn_keyboard_key_fulltrans_normal.9.png
index a524168c9cf150925552f4b37c776d5808b82ab9..b6c234c046bd256293110e015253412db8167735 100644
Binary files a/java/res/drawable-hdpi/btn_keyboard_key_fulltrans_normal.9.png and b/java/res/drawable-hdpi/btn_keyboard_key_fulltrans_normal.9.png differ
diff --git a/java/res/drawable-hdpi/btn_keyboard_key_fulltrans_pressed.9.png b/java/res/drawable-hdpi/btn_keyboard_key_fulltrans_pressed.9.png
index 4395e978a447ec0d25879575330f5685efe870ae..73a8cd1c3c618d5b5a385e65d545f8ee78071024 100644
Binary files a/java/res/drawable-hdpi/btn_keyboard_key_fulltrans_pressed.9.png and b/java/res/drawable-hdpi/btn_keyboard_key_fulltrans_pressed.9.png differ
diff --git a/java/res/drawable-hdpi/btn_keyboard_key_light_normal.9.png b/java/res/drawable-hdpi/btn_keyboard_key_light_normal.9.png
index 9d85c7b742b7fdcb8642cdf3484a0edd241275bd..1ad746053df532f5b8fa9f87c5558456dc2bd725 100644
Binary files a/java/res/drawable-hdpi/btn_keyboard_key_light_normal.9.png and b/java/res/drawable-hdpi/btn_keyboard_key_light_normal.9.png differ
diff --git a/java/res/drawable-hdpi/btn_keyboard_key_light_popup_normal.9.png b/java/res/drawable-hdpi/btn_keyboard_key_light_popup_normal.9.png
index 2ed1b3447b41999edfe2021e0778d60dd66451bc..e3a77d61b32ba4705f29f4e34389cc225762a9f4 100644
Binary files a/java/res/drawable-hdpi/btn_keyboard_key_light_popup_normal.9.png and b/java/res/drawable-hdpi/btn_keyboard_key_light_popup_normal.9.png differ
diff --git a/java/res/drawable-hdpi/btn_keyboard_key_light_popup_selected.9.png b/java/res/drawable-hdpi/btn_keyboard_key_light_popup_selected.9.png
index 77e17dbaef701da8f1461bb076ecee7643f461a5..431c44967f4c7022a2082b6b7c83d8c8c75abca4 100644
Binary files a/java/res/drawable-hdpi/btn_keyboard_key_light_popup_selected.9.png and b/java/res/drawable-hdpi/btn_keyboard_key_light_popup_selected.9.png differ
diff --git a/java/res/drawable-hdpi/btn_keyboard_key_light_pressed.9.png b/java/res/drawable-hdpi/btn_keyboard_key_light_pressed.9.png
index a409639e7a07101fc0aa45b3f05f71a2921cb65d..ccd59d5fa6e3b25756993299aac599a65e636685 100644
Binary files a/java/res/drawable-hdpi/btn_keyboard_key_light_pressed.9.png and b/java/res/drawable-hdpi/btn_keyboard_key_light_pressed.9.png differ
diff --git a/java/res/drawable-hdpi/btn_keyboard_key_normal.9.png b/java/res/drawable-hdpi/btn_keyboard_key_normal.9.png
index 6ec7e6592306d9c3f6948fff2ebd154956097f5b..42c7c146d67525b6b97af6b4edb42e75ad2851da 100644
Binary files a/java/res/drawable-hdpi/btn_keyboard_key_normal.9.png and b/java/res/drawable-hdpi/btn_keyboard_key_normal.9.png differ
diff --git a/java/res/drawable-hdpi/btn_keyboard_key_normal_off.9.png b/java/res/drawable-hdpi/btn_keyboard_key_normal_off.9.png
index 995780cbfbee7f1038fcda56dc88857441401b05..01e2506b0fa38481381570397249b2af89bcd9c8 100644
Binary files a/java/res/drawable-hdpi/btn_keyboard_key_normal_off.9.png and b/java/res/drawable-hdpi/btn_keyboard_key_normal_off.9.png differ
diff --git a/java/res/drawable-hdpi/btn_keyboard_key_normal_off_stone.9.png b/java/res/drawable-hdpi/btn_keyboard_key_normal_off_stone.9.png
index 1388b669450154bff5a418cf1a11484849ce74b2..fad0ec4586104a5cc559efe898d72ce436cd1df7 100644
Binary files a/java/res/drawable-hdpi/btn_keyboard_key_normal_off_stone.9.png and b/java/res/drawable-hdpi/btn_keyboard_key_normal_off_stone.9.png differ
diff --git a/java/res/drawable-hdpi/btn_keyboard_key_normal_on.9.png b/java/res/drawable-hdpi/btn_keyboard_key_normal_on.9.png
index 7215782eb9a07c6fccc3d70af3ab2c9692f20a5f..83c6eb3fc1a8c7264b5554016f1a30a25dcf3b1a 100644
Binary files a/java/res/drawable-hdpi/btn_keyboard_key_normal_on.9.png and b/java/res/drawable-hdpi/btn_keyboard_key_normal_on.9.png differ
diff --git a/java/res/drawable-hdpi/btn_keyboard_key_normal_on_stone.9.png b/java/res/drawable-hdpi/btn_keyboard_key_normal_on_stone.9.png
index 5a94cb6acb44dcdf7f6078eeece980154bd59783..215f8157c3b7306760178bc0e1715afd675fbd76 100644
Binary files a/java/res/drawable-hdpi/btn_keyboard_key_normal_on_stone.9.png and b/java/res/drawable-hdpi/btn_keyboard_key_normal_on_stone.9.png differ
diff --git a/java/res/drawable-hdpi/btn_keyboard_key_normal_stone.9.png b/java/res/drawable-hdpi/btn_keyboard_key_normal_stone.9.png
index c6373a8afba7af21b6e273175fa4689542f9cf54..88acdd7483f4eaf257c1b64331c7ae3046ff53f7 100644
Binary files a/java/res/drawable-hdpi/btn_keyboard_key_normal_stone.9.png and b/java/res/drawable-hdpi/btn_keyboard_key_normal_stone.9.png differ
diff --git a/java/res/drawable-hdpi/btn_keyboard_key_pressed.9.png b/java/res/drawable-hdpi/btn_keyboard_key_pressed.9.png
index 0bd49a0e7d0aeaf28d4e87c39182dd58ac3ad2ca..e047eaff156e610e1a898175fb966b73861ea1a4 100644
Binary files a/java/res/drawable-hdpi/btn_keyboard_key_pressed.9.png and b/java/res/drawable-hdpi/btn_keyboard_key_pressed.9.png differ
diff --git a/java/res/drawable-hdpi/btn_keyboard_key_pressed_off.9.png b/java/res/drawable-hdpi/btn_keyboard_key_pressed_off.9.png
index 634419f1b4ab31a3586acafe788ccfb785ea4080..218a2d29ee0ce205540e727471d76629375ba275 100644
Binary files a/java/res/drawable-hdpi/btn_keyboard_key_pressed_off.9.png and b/java/res/drawable-hdpi/btn_keyboard_key_pressed_off.9.png differ
diff --git a/java/res/drawable-hdpi/btn_keyboard_key_pressed_on.9.png b/java/res/drawable-hdpi/btn_keyboard_key_pressed_on.9.png
index 8474f9f427bc23acf15376ec50d0373d8f299bb1..afe49512e9ec9756f6126b852ea40db9178dea3a 100644
Binary files a/java/res/drawable-hdpi/btn_keyboard_key_pressed_on.9.png and b/java/res/drawable-hdpi/btn_keyboard_key_pressed_on.9.png differ
diff --git a/java/res/drawable-hdpi/cancel.png b/java/res/drawable-hdpi/cancel.png
deleted file mode 100644
index fdf01dba68285196ef77c56f11332bd9c2a7d225..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/candidate_feedback_background.9.png b/java/res/drawable-hdpi/candidate_feedback_background.9.png
index 16499002e822c0ac4852673b57e2b90b67f11908..203c4e640d8369111e7e09102e1ef502d60fcff8 100644
Binary files a/java/res/drawable-hdpi/candidate_feedback_background.9.png and b/java/res/drawable-hdpi/candidate_feedback_background.9.png differ
diff --git a/java/res/drawable-hdpi/caution.png b/java/res/drawable-hdpi/caution.png
index caed9419d4bec83729199c8a464e5170d4bf1e69..5cb6c54b93459214c352dde5285d29647173d680 100644
Binary files a/java/res/drawable-hdpi/caution.png and b/java/res/drawable-hdpi/caution.png 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 2a3ac18c0c0e3e2871d2e0c077201130c4214b8a..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 0a5046b075004046db9196e4ab25dea72821e9c4..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-hdpi/dialog_bubble_step07.9.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/highlight_pressed.png b/java/res/drawable-hdpi/highlight_pressed.png
deleted file mode 100644
index 638df19bc9c3bc99f3ecc71b3139d5e1362064f4..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-hdpi/highlight_pressed.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/hint_popup.9.png b/java/res/drawable-hdpi/hint_popup.9.png
index 5b2ad538861f7cceae3d058ba8deec49f74f62ff..b5ec003e655b5cd6de5ca98e10bbf849aed0fe37 100644
Binary files a/java/res/drawable-hdpi/hint_popup.9.png and b/java/res/drawable-hdpi/hint_popup.9.png differ
diff --git a/java/res/drawable-hdpi/ic_dialog_keyboard.png b/java/res/drawable-hdpi/ic_dialog_keyboard.png
index fb6d8987966344b2429fab427ddb13e4b9f4e95b..c7729566c241f096bde71b5da5f46453e9507f53 100644
Binary files a/java/res/drawable-hdpi/ic_dialog_keyboard.png and b/java/res/drawable-hdpi/ic_dialog_keyboard.png differ
diff --git a/java/res/drawable-hdpi/ic_mic_dialog.png b/java/res/drawable-hdpi/ic_mic_dialog.png
index 6498cd589f73e978465a622ade934584c3c6aab4..349dc4b37c6a5530cd2846eeba3024f976cab75a 100644
Binary files a/java/res/drawable-hdpi/ic_mic_dialog.png and b/java/res/drawable-hdpi/ic_mic_dialog.png differ
diff --git a/java/res/drawable-hdpi/ic_subtype_keyboard.png b/java/res/drawable-hdpi/ic_subtype_keyboard.png
index b5a9fa866a0726f6ee2fde91f7628bb4e1a2a70b..7015e266a297927bd2275c633fcffe724c4a8eb1 100644
Binary files a/java/res/drawable-hdpi/ic_subtype_keyboard.png and b/java/res/drawable-hdpi/ic_subtype_keyboard.png differ
diff --git a/java/res/drawable-hdpi/ic_subtype_mic.png b/java/res/drawable-hdpi/ic_subtype_mic.png
index 5d68e85a61c18c715e1cbfd7fefc7a1881d8d81b..cb86a5598a7a9213a0755ea1670f6e27d25e9528 100644
Binary files a/java/res/drawable-hdpi/ic_subtype_mic.png and b/java/res/drawable-hdpi/ic_subtype_mic.png differ
diff --git a/java/res/drawable-hdpi/ic_suggest_strip_microphone.png b/java/res/drawable-hdpi/ic_suggest_strip_microphone.png
index 0462bdd16ec81f80a7852745be5451e13499535b..c00b4aaa645b244f89b209b540668737795f29f3 100644
Binary files a/java/res/drawable-hdpi/ic_suggest_strip_microphone.png and b/java/res/drawable-hdpi/ic_suggest_strip_microphone.png differ
diff --git a/java/res/drawable-hdpi/ic_suggest_strip_microphone_swipe.png b/java/res/drawable-hdpi/ic_suggest_strip_microphone_swipe.png
index 80c20f69110ddfb6853978cdd74fd7aee5080e60..256dc3d6155009d2ed7b495d911d661f59c100fa 100644
Binary files a/java/res/drawable-hdpi/ic_suggest_strip_microphone_swipe.png and b/java/res/drawable-hdpi/ic_suggest_strip_microphone_swipe.png 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_background.9.png b/java/res/drawable-hdpi/keyboard_background.9.png
index d57463fb615f9f09e2c801685e27c98aff30de9a..edffac5b8d236ab776b4f64ad80240b58a58a879 100644
Binary files a/java/res/drawable-hdpi/keyboard_background.9.png and b/java/res/drawable-hdpi/keyboard_background.9.png differ
diff --git a/java/res/drawable-hdpi/keyboard_dark_background.9.png b/java/res/drawable-hdpi/keyboard_dark_background.9.png
index fa3d449f7ac5e3f3ce9b54d48f0b71c81fb56693..f315cbdd4181a18947ec0e73cafc18c25aca051a 100644
Binary files a/java/res/drawable-hdpi/keyboard_dark_background.9.png and b/java/res/drawable-hdpi/keyboard_dark_background.9.png differ
diff --git a/java/res/drawable-hdpi/keyboard_hint_0.9.png b/java/res/drawable-hdpi/keyboard_hint_0.9.png
index da52e0f5b32e3515d693e8d8c66e804d312cdbd5..271264e92c36f17b72b7ee910cee45c351fc0bf4 100644
Binary files a/java/res/drawable-hdpi/keyboard_hint_0.9.png and b/java/res/drawable-hdpi/keyboard_hint_0.9.png differ
diff --git a/java/res/drawable-hdpi/keyboard_hint_1.9.png b/java/res/drawable-hdpi/keyboard_hint_1.9.png
index 7325c4cbbcfcf4af5d8b26d6891972e7084eb111..eaf3742627b21cbdb8442de2a012044e0c11b336 100644
Binary files a/java/res/drawable-hdpi/keyboard_hint_1.9.png and b/java/res/drawable-hdpi/keyboard_hint_1.9.png differ
diff --git a/java/res/drawable-hdpi/keyboard_hint_2.9.png b/java/res/drawable-hdpi/keyboard_hint_2.9.png
index 35b7f2527500b0c0b028be9db375d648476f4117..8a1657117a121f52ca65dc9ff6a28fb649e36e47 100644
Binary files a/java/res/drawable-hdpi/keyboard_hint_2.9.png and b/java/res/drawable-hdpi/keyboard_hint_2.9.png differ
diff --git a/java/res/drawable-hdpi/keyboard_hint_3.9.png b/java/res/drawable-hdpi/keyboard_hint_3.9.png
index 1ae284838e05a578162b592d75fece605870bc80..34b5011091f55725d5f63f7f60bd7e9f3c7eaa75 100644
Binary files a/java/res/drawable-hdpi/keyboard_hint_3.9.png and b/java/res/drawable-hdpi/keyboard_hint_3.9.png differ
diff --git a/java/res/drawable-hdpi/keyboard_hint_4.9.png b/java/res/drawable-hdpi/keyboard_hint_4.9.png
index b67d6dd519abcc5f14de3561eb6f4dd40f0d379b..d4cc250dd60f767fcbd24a7745eca1500433439f 100644
Binary files a/java/res/drawable-hdpi/keyboard_hint_4.9.png and b/java/res/drawable-hdpi/keyboard_hint_4.9.png differ
diff --git a/java/res/drawable-hdpi/keyboard_hint_5.9.png b/java/res/drawable-hdpi/keyboard_hint_5.9.png
index ec52198d8b25a20847ea44203999a2b427934395..6a054b42f3e54ba92238f30bef827e062d1f7150 100644
Binary files a/java/res/drawable-hdpi/keyboard_hint_5.9.png and b/java/res/drawable-hdpi/keyboard_hint_5.9.png differ
diff --git a/java/res/drawable-hdpi/keyboard_hint_6.9.png b/java/res/drawable-hdpi/keyboard_hint_6.9.png
index 66dcf67e5552e6e13a2217ec3d259bc050e08de7..66e91400a7fbc99b5ca1c5d9798fbc52ad46dd16 100644
Binary files a/java/res/drawable-hdpi/keyboard_hint_6.9.png and b/java/res/drawable-hdpi/keyboard_hint_6.9.png differ
diff --git a/java/res/drawable-hdpi/keyboard_hint_7.9.png b/java/res/drawable-hdpi/keyboard_hint_7.9.png
index 9d549927260a5d09623cbad44688366165d61bdb..5eae24f4fd2ac2a19c398ded1d7a8445c75300f5 100644
Binary files a/java/res/drawable-hdpi/keyboard_hint_7.9.png and b/java/res/drawable-hdpi/keyboard_hint_7.9.png differ
diff --git a/java/res/drawable-hdpi/keyboard_hint_8.9.png b/java/res/drawable-hdpi/keyboard_hint_8.9.png
index beba1624cdd7a22b5ab7c00eab50d5e0695d0f31..ea7f512fd6b4e0a7c538ffd9b422623e162f221d 100644
Binary files a/java/res/drawable-hdpi/keyboard_hint_8.9.png and b/java/res/drawable-hdpi/keyboard_hint_8.9.png differ
diff --git a/java/res/drawable-hdpi/keyboard_hint_9.9.png b/java/res/drawable-hdpi/keyboard_hint_9.9.png
index 31ea54f326f5c9b1388a0a8ed86a60516f91462c..0bf85de931823f0cefe4727c2c3e053cdaec786b 100644
Binary files a/java/res/drawable-hdpi/keyboard_hint_9.9.png and b/java/res/drawable-hdpi/keyboard_hint_9.9.png 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/keyboard_key_feedback_background.9.png b/java/res/drawable-hdpi/keyboard_key_feedback_background.9.png
index 27d992375fe98b805a5bddf2b43c44b70a2ff274..762a25704f20d449178579c6f83b212f8d1f953f 100644
Binary files a/java/res/drawable-hdpi/keyboard_key_feedback_background.9.png and b/java/res/drawable-hdpi/keyboard_key_feedback_background.9.png differ
diff --git a/java/res/drawable-hdpi/keyboard_key_feedback_background_holo.9.png b/java/res/drawable-hdpi/keyboard_key_feedback_background_holo.9.png
index 943f9e4bcdab341c94ce1c4cf28e91f7da34c1b7..8d6acacfb49c457061fe5a6a90980d6122ddfa33 100644
Binary files a/java/res/drawable-hdpi/keyboard_key_feedback_background_holo.9.png and b/java/res/drawable-hdpi/keyboard_key_feedback_background_holo.9.png differ
diff --git a/java/res/drawable-hdpi/keyboard_key_feedback_more_background.9.png b/java/res/drawable-hdpi/keyboard_key_feedback_more_background.9.png
index 33263b9d734da3c24ff92c0ed908a7d212e237f3..141d2d6bec4c473ae4dcc3d7559734f3a4f8f18f 100644
Binary files a/java/res/drawable-hdpi/keyboard_key_feedback_more_background.9.png and b/java/res/drawable-hdpi/keyboard_key_feedback_more_background.9.png differ
diff --git a/java/res/drawable-hdpi/keyboard_popup_panel_background.9.png b/java/res/drawable-hdpi/keyboard_popup_panel_background.9.png
index baff809503d132b0babba83330cee73246cc6a6e..d6b2c79366b5b9450a9c718fb0b9d99c31fe4872 100644
Binary files a/java/res/drawable-hdpi/keyboard_popup_panel_background.9.png and b/java/res/drawable-hdpi/keyboard_popup_panel_background.9.png differ
diff --git a/java/res/drawable-hdpi/keyboard_suggest_strip.9.png b/java/res/drawable-hdpi/keyboard_suggest_strip.9.png
index 7cab5a899c29d2d71f3daf2db16ea4247a94a88a..0ccdb6ab293eaaa169f335a05e1729d964e9aeeb 100644
Binary files a/java/res/drawable-hdpi/keyboard_suggest_strip.9.png and b/java/res/drawable-hdpi/keyboard_suggest_strip.9.png differ
diff --git a/java/res/drawable-hdpi/keyboard_suggest_strip_divider.png b/java/res/drawable-hdpi/keyboard_suggest_strip_divider.png
index 7fca8c60808e69b0980bda5b1fe795bffa0b42db..7ca3e6131b03adfd1b2d2fa7a29ce314d086a981 100644
Binary files a/java/res/drawable-hdpi/keyboard_suggest_strip_divider.png and b/java/res/drawable-hdpi/keyboard_suggest_strip_divider.png differ
diff --git a/java/res/drawable-hdpi/mic_slash.png b/java/res/drawable-hdpi/mic_slash.png
index 71f4dc506a23fc91e3a0afeb757bb10ddfbf8c35..dc8da625298c1440a858fe17845699898274831a 100644
Binary files a/java/res/drawable-hdpi/mic_slash.png and b/java/res/drawable-hdpi/mic_slash.png 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 48c00f094934cf87b411aa9d509e5fe266e224a9..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 31571f75b90348bbb8faaff51ce9879642d1a49e..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 c8d0aae5d0dc4a444df188639f2487df9d7d2ecb..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 123eea66eacfc4183673f98106e4ee93f8742827..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 a8a2c5cff992c689d766981e9909a13fc522f032..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 b84d7b0e95ca33fdce426b9b2c4ab441745ce234..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 8dd2b607f0e7d174ff0c493000515b3efcbfedd8..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 888d0e5c75d1daaf095db0d54e205c8606f77413..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_123_mic.png b/java/res/drawable-hdpi/sym_bkeyboard_123_mic.png
index 24edfaa1c8a4c9b35db18df24b4b5eaf56f30f51..3e4eff698b2e8ee2edfe92e3b5c31d199f51503e 100644
Binary files a/java/res/drawable-hdpi/sym_bkeyboard_123_mic.png and b/java/res/drawable-hdpi/sym_bkeyboard_123_mic.png differ
diff --git a/java/res/drawable-hdpi/sym_bkeyboard_delete.png b/java/res/drawable-hdpi/sym_bkeyboard_delete.png
index 4ccd218aca2111397f23c6b4d824c8ba6c7a1254..1d24cc85c020e8d4be1c390b6debe43595d87ce0 100644
Binary files a/java/res/drawable-hdpi/sym_bkeyboard_delete.png and b/java/res/drawable-hdpi/sym_bkeyboard_delete.png 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 6959aeeef26cbf5294724fd1f67ded71a2bd0fbd..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-hdpi/sym_bkeyboard_done.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/sym_bkeyboard_mic.png b/java/res/drawable-hdpi/sym_bkeyboard_mic.png
index 6876fb64a80f9b6ad12545ec8aac6fdac975273a..512f46080022eb99c3af40d970362a783264a78b 100644
Binary files a/java/res/drawable-hdpi/sym_bkeyboard_mic.png and b/java/res/drawable-hdpi/sym_bkeyboard_mic.png differ
diff --git a/java/res/drawable-hdpi/sym_bkeyboard_num0.png b/java/res/drawable-hdpi/sym_bkeyboard_num0.png
index 08df3f3dd69326247bdf12ce4f40fcf923639ba8..678a790ded5d6dfccdb79fa5470e371ce893f498 100644
Binary files a/java/res/drawable-hdpi/sym_bkeyboard_num0.png and b/java/res/drawable-hdpi/sym_bkeyboard_num0.png differ
diff --git a/java/res/drawable-hdpi/sym_bkeyboard_num1.png b/java/res/drawable-hdpi/sym_bkeyboard_num1.png
index 36d8e56960b7628b40dbc5a03f3f5624d5fa307f..4e68e35b353a9279a835b5ba6d2d3f32f9e08077 100644
Binary files a/java/res/drawable-hdpi/sym_bkeyboard_num1.png and b/java/res/drawable-hdpi/sym_bkeyboard_num1.png differ
diff --git a/java/res/drawable-hdpi/sym_bkeyboard_num2.png b/java/res/drawable-hdpi/sym_bkeyboard_num2.png
index c67fe2ea4a841ada50460de0ef7e0568fe88dacc..546663fda81cca268c00557ee0791b5952eb8102 100644
Binary files a/java/res/drawable-hdpi/sym_bkeyboard_num2.png and b/java/res/drawable-hdpi/sym_bkeyboard_num2.png differ
diff --git a/java/res/drawable-hdpi/sym_bkeyboard_num3.png b/java/res/drawable-hdpi/sym_bkeyboard_num3.png
index cf80b274559ecfbfc5e905cd96981765da9a2b67..57f9a8d8ebe93657ad2c8c514d8ceffeae6dde1f 100644
Binary files a/java/res/drawable-hdpi/sym_bkeyboard_num3.png and b/java/res/drawable-hdpi/sym_bkeyboard_num3.png differ
diff --git a/java/res/drawable-hdpi/sym_bkeyboard_num4.png b/java/res/drawable-hdpi/sym_bkeyboard_num4.png
index bfbb55a8f73e96ea6e73b8fb1e5a92950dd3f07f..de504388f63b2dc2999f2e7875fdf2752b40f04c 100644
Binary files a/java/res/drawable-hdpi/sym_bkeyboard_num4.png and b/java/res/drawable-hdpi/sym_bkeyboard_num4.png differ
diff --git a/java/res/drawable-hdpi/sym_bkeyboard_num5.png b/java/res/drawable-hdpi/sym_bkeyboard_num5.png
index 9f121ec1279753e85a30ffc9d1400ca7aed9c0f6..1d2e1ef89cb5b374b44ddfe08277a447a86d3003 100644
Binary files a/java/res/drawable-hdpi/sym_bkeyboard_num5.png and b/java/res/drawable-hdpi/sym_bkeyboard_num5.png differ
diff --git a/java/res/drawable-hdpi/sym_bkeyboard_num6.png b/java/res/drawable-hdpi/sym_bkeyboard_num6.png
index 256186f3ab7226722578c2e10a3186714321823b..39788b727b2e7738b210bce900b96b5f4643aa68 100644
Binary files a/java/res/drawable-hdpi/sym_bkeyboard_num6.png and b/java/res/drawable-hdpi/sym_bkeyboard_num6.png differ
diff --git a/java/res/drawable-hdpi/sym_bkeyboard_num7.png b/java/res/drawable-hdpi/sym_bkeyboard_num7.png
index 7c8ce205ef1ccf6acb4982dbb3e3255ce3c762c7..fff6f27bfb23d3767ef3323209256a280c64ae00 100644
Binary files a/java/res/drawable-hdpi/sym_bkeyboard_num7.png and b/java/res/drawable-hdpi/sym_bkeyboard_num7.png differ
diff --git a/java/res/drawable-hdpi/sym_bkeyboard_num8.png b/java/res/drawable-hdpi/sym_bkeyboard_num8.png
index 4cfe7b11cd33a114ef18da6fb6d558d6adf04366..8cc1a955ee5b2d91039f5af5292acbeb7971e45f 100644
Binary files a/java/res/drawable-hdpi/sym_bkeyboard_num8.png and b/java/res/drawable-hdpi/sym_bkeyboard_num8.png differ
diff --git a/java/res/drawable-hdpi/sym_bkeyboard_num9.png b/java/res/drawable-hdpi/sym_bkeyboard_num9.png
index d19c15cc820e1f759f893e15b231f92c3e836eef..0217425092c856e1da5ba5937772405432980057 100644
Binary files a/java/res/drawable-hdpi/sym_bkeyboard_num9.png and b/java/res/drawable-hdpi/sym_bkeyboard_num9.png differ
diff --git a/java/res/drawable-hdpi/sym_bkeyboard_numalt.png b/java/res/drawable-hdpi/sym_bkeyboard_numalt.png
index 762fd8cd715d850c2b8082a29475edd3d5e98019..200714f66d2df5b92b72ba95deddfcb4aa028db3 100644
Binary files a/java/res/drawable-hdpi/sym_bkeyboard_numalt.png and b/java/res/drawable-hdpi/sym_bkeyboard_numalt.png differ
diff --git a/java/res/drawable-hdpi/sym_bkeyboard_numpound.png b/java/res/drawable-hdpi/sym_bkeyboard_numpound.png
index 2bd800d6853ed69112cf11aedb2daea15030716e..0a46122b2ba72f4b100efdd11c8add1eb8bc4de0 100644
Binary files a/java/res/drawable-hdpi/sym_bkeyboard_numpound.png and b/java/res/drawable-hdpi/sym_bkeyboard_numpound.png differ
diff --git a/java/res/drawable-hdpi/sym_bkeyboard_numstar.png b/java/res/drawable-hdpi/sym_bkeyboard_numstar.png
index b574f83f387900e60f0ffc0213f1954c542f374d..ca22bd53509a2feddcc2a22fa872c14f249e7174 100644
Binary files a/java/res/drawable-hdpi/sym_bkeyboard_numstar.png and b/java/res/drawable-hdpi/sym_bkeyboard_numstar.png differ
diff --git a/java/res/drawable-hdpi/sym_bkeyboard_return.png b/java/res/drawable-hdpi/sym_bkeyboard_return.png
index 2f9631a2043d0a44ce0f038cfc8bd54914752c4f..426e1599ee26dcb27c8129fbea70f6df334d0746 100644
Binary files a/java/res/drawable-hdpi/sym_bkeyboard_return.png and b/java/res/drawable-hdpi/sym_bkeyboard_return.png differ
diff --git a/java/res/drawable-hdpi/sym_bkeyboard_search.png b/java/res/drawable-hdpi/sym_bkeyboard_search.png
index 7a5a0aab8be49f5030e2835cd3875e509287f462..1b6f884fa39a191cf08aca04df2bae8d77bb08de 100644
Binary files a/java/res/drawable-hdpi/sym_bkeyboard_search.png and b/java/res/drawable-hdpi/sym_bkeyboard_search.png differ
diff --git a/java/res/drawable-hdpi/sym_bkeyboard_settings.png b/java/res/drawable-hdpi/sym_bkeyboard_settings.png
index 8a8caa8956b95eee7508ce062949bf5a1eabc036..08ba18f28db90ae647f03e5ee4111cc29a2ebb27 100644
Binary files a/java/res/drawable-hdpi/sym_bkeyboard_settings.png and b/java/res/drawable-hdpi/sym_bkeyboard_settings.png differ
diff --git a/java/res/drawable-hdpi/sym_bkeyboard_shift.png b/java/res/drawable-hdpi/sym_bkeyboard_shift.png
index 1e3d5ec14093f1db131fb591c0110c6343ec3bb1..5a22dd30970f4bd04822e15ad7721ac16df176d5 100644
Binary files a/java/res/drawable-hdpi/sym_bkeyboard_shift.png and b/java/res/drawable-hdpi/sym_bkeyboard_shift.png differ
diff --git a/java/res/drawable-hdpi/sym_bkeyboard_shift_locked.png b/java/res/drawable-hdpi/sym_bkeyboard_shift_locked.png
index e8a4d6423b731334ee838584ad349655a068dab6..5664491267bfe10b0660f1b0b0474b99cc174e0d 100644
Binary files a/java/res/drawable-hdpi/sym_bkeyboard_shift_locked.png and b/java/res/drawable-hdpi/sym_bkeyboard_shift_locked.png differ
diff --git a/java/res/drawable-hdpi/sym_bkeyboard_space.png b/java/res/drawable-hdpi/sym_bkeyboard_space.png
index 9937a6288c9e2148187461a621213b994f0f3f0f..cd0ebe2f496a2ad911043ffeee11b49c2585cab8 100644
Binary files a/java/res/drawable-hdpi/sym_bkeyboard_space.png and b/java/res/drawable-hdpi/sym_bkeyboard_space.png differ
diff --git a/java/res/drawable-hdpi/sym_bkeyboard_tab.png b/java/res/drawable-hdpi/sym_bkeyboard_tab.png
index 8dee747d26139a49c88ceec14c1d6698555f3e53..3466e127101007166179df2ea81967b68ccd10ee 100644
Binary files a/java/res/drawable-hdpi/sym_bkeyboard_tab.png and b/java/res/drawable-hdpi/sym_bkeyboard_tab.png differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_123_mic.png b/java/res/drawable-hdpi/sym_keyboard_123_mic.png
index 6f8292912d1d945ee9e24df26ad2722e2e77bb4b..62669803d9c7c7b682ac2f0dfca532c3f9031f04 100644
Binary files a/java/res/drawable-hdpi/sym_keyboard_123_mic.png and b/java/res/drawable-hdpi/sym_keyboard_123_mic.png differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_delete.png b/java/res/drawable-hdpi/sym_keyboard_delete.png
index 8db099a7a95868b2f6a8a85738a2802c4692827e..459ebcff844ea408852f5593dfaca7940e5e4e22 100644
Binary files a/java/res/drawable-hdpi/sym_keyboard_delete.png and b/java/res/drawable-hdpi/sym_keyboard_delete.png 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 6ba51d58c46b49ac4568a9699e2a73444791e0d9..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_123_mic.png b/java/res/drawable-hdpi/sym_keyboard_feedback_123_mic.png
index 4867298fa4cdff35fde2bdba1dc72026cbb1c9fc..eef78968067da8ea308978e1d15227690e72cd3a 100644
Binary files a/java/res/drawable-hdpi/sym_keyboard_feedback_123_mic.png and b/java/res/drawable-hdpi/sym_keyboard_feedback_123_mic.png differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_feedback_delete.png b/java/res/drawable-hdpi/sym_keyboard_feedback_delete.png
index 7c12f79a164c36ce0346229e5a1860d074ec15ee..8322e8e1dfb597818ad3da9c3afea4110ccb2cd4 100644
Binary files a/java/res/drawable-hdpi/sym_keyboard_feedback_delete.png and b/java/res/drawable-hdpi/sym_keyboard_feedback_delete.png 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 e79bbb38277867ecc93e79bbcb2f0bda1b92fac5..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_language_arrows_left.png b/java/res/drawable-hdpi/sym_keyboard_feedback_language_arrows_left.png
index 4f4923b85a784df7f6308dd0e1c2cb6f193510fa..889477cfb0d6b32d956d65b05df4c0113f462911 100644
Binary files a/java/res/drawable-hdpi/sym_keyboard_feedback_language_arrows_left.png and b/java/res/drawable-hdpi/sym_keyboard_feedback_language_arrows_left.png differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_feedback_language_arrows_right.png b/java/res/drawable-hdpi/sym_keyboard_feedback_language_arrows_right.png
index ed2ebe66c1f43d40be1aa4554d393d2815469954..b0f6d7feba34837e4c2a097cef541ef3ead6bf71 100644
Binary files a/java/res/drawable-hdpi/sym_keyboard_feedback_language_arrows_right.png and b/java/res/drawable-hdpi/sym_keyboard_feedback_language_arrows_right.png differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_feedback_mic.png b/java/res/drawable-hdpi/sym_keyboard_feedback_mic.png
index f228910c3dcd39d157e233be0df9697e828c67cd..f82c33ae301f555db4c640eb2733e2126e83b493 100644
Binary files a/java/res/drawable-hdpi/sym_keyboard_feedback_mic.png and b/java/res/drawable-hdpi/sym_keyboard_feedback_mic.png differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_feedback_numalt.png b/java/res/drawable-hdpi/sym_keyboard_feedback_numalt.png
index bb69300d12225edd969a595c8f0afbc752264dc6..819236c8e598ef24edc57a9ce7b3d487cd8e9c07 100644
Binary files a/java/res/drawable-hdpi/sym_keyboard_feedback_numalt.png and b/java/res/drawable-hdpi/sym_keyboard_feedback_numalt.png differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_feedback_return.png b/java/res/drawable-hdpi/sym_keyboard_feedback_return.png
index 99fa13cae9ab03a4510f8a7c3e189e7f5ca24af5..f038d3abed4aab1590bf81a3157a259fe00323db 100644
Binary files a/java/res/drawable-hdpi/sym_keyboard_feedback_return.png and b/java/res/drawable-hdpi/sym_keyboard_feedback_return.png differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_feedback_search.png b/java/res/drawable-hdpi/sym_keyboard_feedback_search.png
index c006866d244348e6f1567d27bf540003b272c0da..337f9e4fe93f0226caf3c8b4f957b7a5ffcfa5f3 100644
Binary files a/java/res/drawable-hdpi/sym_keyboard_feedback_search.png and b/java/res/drawable-hdpi/sym_keyboard_feedback_search.png differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_feedback_settings.png b/java/res/drawable-hdpi/sym_keyboard_feedback_settings.png
index 5c685f9c396b496e60e9d23c42efbd2602805f82..8a02be07e8287623aa74e0e6c7b67b19f641aa11 100644
Binary files a/java/res/drawable-hdpi/sym_keyboard_feedback_settings.png and b/java/res/drawable-hdpi/sym_keyboard_feedback_settings.png differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_feedback_shift.png b/java/res/drawable-hdpi/sym_keyboard_feedback_shift.png
index 5b91afb8202eca199a4b5d6884a17fbf88aff7e4..abf15f8f9e7ea27dd652e8446e02564f330195fd 100644
Binary files a/java/res/drawable-hdpi/sym_keyboard_feedback_shift.png and b/java/res/drawable-hdpi/sym_keyboard_feedback_shift.png 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 77e6a5fe9e8eda457beff07b602ccf369f7921f8..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_feedback_space.png b/java/res/drawable-hdpi/sym_keyboard_feedback_space.png
index 2d1b4a4b448a3913ca68b654bd3742e436b70c37..70debca9b9257cd5c99a8c816a603ad9840543bb 100644
Binary files a/java/res/drawable-hdpi/sym_keyboard_feedback_space.png and b/java/res/drawable-hdpi/sym_keyboard_feedback_space.png differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_feedback_tab.png b/java/res/drawable-hdpi/sym_keyboard_feedback_tab.png
index 82280c6083e98acabe12efb8fdd97a7691d9ba4f..d2efb16190a4f3da5e0fa39a963c82feb3029cf2 100644
Binary files a/java/res/drawable-hdpi/sym_keyboard_feedback_tab.png and b/java/res/drawable-hdpi/sym_keyboard_feedback_tab.png differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_language_arrows_left.png b/java/res/drawable-hdpi/sym_keyboard_language_arrows_left.png
index 34b8e931aeb64b87847210bc9c4881d9edf2f2c1..dcc4bd59b51bfc92bde81ce215563feccd5e81bc 100644
Binary files a/java/res/drawable-hdpi/sym_keyboard_language_arrows_left.png and b/java/res/drawable-hdpi/sym_keyboard_language_arrows_left.png differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_language_arrows_right.png b/java/res/drawable-hdpi/sym_keyboard_language_arrows_right.png
index b6ea3362b6a2302f0004c5ba6f74f17643949290..ecf61a98e207f98b44b0dfd9c7f7f389f50de489 100644
Binary files a/java/res/drawable-hdpi/sym_keyboard_language_arrows_right.png and b/java/res/drawable-hdpi/sym_keyboard_language_arrows_right.png differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_mic.png b/java/res/drawable-hdpi/sym_keyboard_mic.png
index 7207f8a92e607b79d3634ea3301664402f529be4..c8dca62a08d1ac203b243a3e7a2a90ef0c030caf 100644
Binary files a/java/res/drawable-hdpi/sym_keyboard_mic.png and b/java/res/drawable-hdpi/sym_keyboard_mic.png 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_num0.png b/java/res/drawable-hdpi/sym_keyboard_num0.png
index 169efe21eff7663ce4bd5ecc1c0cf948a8335aac..10ac70b9dfd4f8040573322add4f14a320c2e9b0 100644
Binary files a/java/res/drawable-hdpi/sym_keyboard_num0.png and b/java/res/drawable-hdpi/sym_keyboard_num0.png differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_num1.png b/java/res/drawable-hdpi/sym_keyboard_num1.png
index 5b868489f434232a616abd70ba556e42eed1f81a..0fc03efa51f521d072ca42afdd2ef50b99cd1992 100644
Binary files a/java/res/drawable-hdpi/sym_keyboard_num1.png and b/java/res/drawable-hdpi/sym_keyboard_num1.png differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_num2.png b/java/res/drawable-hdpi/sym_keyboard_num2.png
index ddbe2199c226dcb43283d2b9df02d808073522f7..283560b3534377e6f41fbcb5539649f70bcf525b 100644
Binary files a/java/res/drawable-hdpi/sym_keyboard_num2.png and b/java/res/drawable-hdpi/sym_keyboard_num2.png differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_num3.png b/java/res/drawable-hdpi/sym_keyboard_num3.png
index 1de90f3b10d51f30f329949956cafb4ccba1559c..9a3b3294b90d521f26ead3af4e1e2c6e7d1726ea 100644
Binary files a/java/res/drawable-hdpi/sym_keyboard_num3.png and b/java/res/drawable-hdpi/sym_keyboard_num3.png differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_num4.png b/java/res/drawable-hdpi/sym_keyboard_num4.png
index c67ba520678ede62eb0af7b06d43c50bef9be79c..f13ff1ae91dbd24a1b557815d0d517e6a890be05 100644
Binary files a/java/res/drawable-hdpi/sym_keyboard_num4.png and b/java/res/drawable-hdpi/sym_keyboard_num4.png differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_num5.png b/java/res/drawable-hdpi/sym_keyboard_num5.png
index 8410f2537dec002ca7221326768326eae1c4da8d..c251329fa4ed1ae82b16466adeea756527e13a20 100644
Binary files a/java/res/drawable-hdpi/sym_keyboard_num5.png and b/java/res/drawable-hdpi/sym_keyboard_num5.png differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_num6.png b/java/res/drawable-hdpi/sym_keyboard_num6.png
index 22fa29d3fe1416a62ee576c622ffadfd617ac8e2..4acba4c9103d51005cb3c4720605ca1048697187 100644
Binary files a/java/res/drawable-hdpi/sym_keyboard_num6.png and b/java/res/drawable-hdpi/sym_keyboard_num6.png differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_num7.png b/java/res/drawable-hdpi/sym_keyboard_num7.png
index a3798ea343b9f8e3763ce5e50838e860d09a7f15..14931c18c53f6c781a61aee23c30030e7efd19ca 100644
Binary files a/java/res/drawable-hdpi/sym_keyboard_num7.png and b/java/res/drawable-hdpi/sym_keyboard_num7.png differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_num8.png b/java/res/drawable-hdpi/sym_keyboard_num8.png
index 7e963ad6b0ce39f9a96d7193690ac79ab665c68b..d4973fdc900ff3fd83ef267149fc58da64cec42e 100644
Binary files a/java/res/drawable-hdpi/sym_keyboard_num8.png and b/java/res/drawable-hdpi/sym_keyboard_num8.png differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_num9.png b/java/res/drawable-hdpi/sym_keyboard_num9.png
index 1160d8545413b31e3ed0939653dcb3b3e55f6ead..49cec66f4d277e1ec6da50a000a193a5b1b400da 100644
Binary files a/java/res/drawable-hdpi/sym_keyboard_num9.png and b/java/res/drawable-hdpi/sym_keyboard_num9.png differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_numalt.png b/java/res/drawable-hdpi/sym_keyboard_numalt.png
index f3a73deb035753ec84c7f06c90964c97df243957..3cc5311cd8059b6e9f1148caa191e40dbfebb5aa 100644
Binary files a/java/res/drawable-hdpi/sym_keyboard_numalt.png and b/java/res/drawable-hdpi/sym_keyboard_numalt.png differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_numpound.png b/java/res/drawable-hdpi/sym_keyboard_numpound.png
index 471f4fda3558567d34843861c76d5ce1fa8e7875..d091339296eca631931f1004e1e46967783eb9f8 100644
Binary files a/java/res/drawable-hdpi/sym_keyboard_numpound.png and b/java/res/drawable-hdpi/sym_keyboard_numpound.png differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_numstar.png b/java/res/drawable-hdpi/sym_keyboard_numstar.png
index 017c0f461a4c9368cc8e6c0aad2b7c7e3669cbe1..e838e169f3a96fc3957ef9f6ee85fda18bbd2561 100644
Binary files a/java/res/drawable-hdpi/sym_keyboard_numstar.png and b/java/res/drawable-hdpi/sym_keyboard_numstar.png differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_return.png b/java/res/drawable-hdpi/sym_keyboard_return.png
index 984db426ef7bd943c86d56fbd470f50d6ffeeed6..9d97e1efd4e71081af462243be27abf511d03098 100644
Binary files a/java/res/drawable-hdpi/sym_keyboard_return.png and b/java/res/drawable-hdpi/sym_keyboard_return.png differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_search.png b/java/res/drawable-hdpi/sym_keyboard_search.png
index 179e725f6d06466735ca99af6b3e90783a4f658b..1aa22d7e23ec73cffa924d72cee411c9fa0cbd30 100644
Binary files a/java/res/drawable-hdpi/sym_keyboard_search.png and b/java/res/drawable-hdpi/sym_keyboard_search.png differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_settings.png b/java/res/drawable-hdpi/sym_keyboard_settings.png
index 1641178127fd509461a0c16e9ab86fbfb7d7d602..35d1ed6e659bf663c3cb46396222e93b17f2e189 100644
Binary files a/java/res/drawable-hdpi/sym_keyboard_settings.png and b/java/res/drawable-hdpi/sym_keyboard_settings.png differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_shift.png b/java/res/drawable-hdpi/sym_keyboard_shift.png
index 2b3bd668d1fe80451665ea8c88247c94e1b0f798..bf217d14737a92c310befcaed6aaf875f6bdd39c 100644
Binary files a/java/res/drawable-hdpi/sym_keyboard_shift.png and b/java/res/drawable-hdpi/sym_keyboard_shift.png differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_shift_locked.png b/java/res/drawable-hdpi/sym_keyboard_shift_locked.png
index 8a34a98a32e975eebf5ff01184be7bab592da6da..d11b39712bc6396f4b24bfe14f1a4698793daaf8 100644
Binary files a/java/res/drawable-hdpi/sym_keyboard_shift_locked.png and b/java/res/drawable-hdpi/sym_keyboard_shift_locked.png 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.png b/java/res/drawable-hdpi/sym_keyboard_space.png
index dacc97d0a3f8839fd0bd4586bae3fd35b647d3da..fcd20de7decfe526f90183de2a944de4ae34ef4b 100644
Binary files a/java/res/drawable-hdpi/sym_keyboard_space.png and b/java/res/drawable-hdpi/sym_keyboard_space.png differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_space_led.9.png b/java/res/drawable-hdpi/sym_keyboard_space_led.9.png
index c76f64b946af3e9282ddefd5c6973d1cd1332903..2c6f4a925528add52aadddbf81d566b60fd0ccdb 100644
Binary files a/java/res/drawable-hdpi/sym_keyboard_space_led.9.png and b/java/res/drawable-hdpi/sym_keyboard_space_led.9.png differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_tab.png b/java/res/drawable-hdpi/sym_keyboard_tab.png
index efd740b5b471f5ae68750e8a57251e266632dcae..51d17d98962e2064b99da6fb8a253c9fffbc451d 100644
Binary files a/java/res/drawable-hdpi/sym_keyboard_tab.png and b/java/res/drawable-hdpi/sym_keyboard_tab.png differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_voice_off_holo.png b/java/res/drawable-hdpi/sym_keyboard_voice_off_holo.png
index 8a445eb565d84fbdd6185b0c7bb9e8fe97574229..6e6279a8a378b3040dde3abcb037fd7988034efa 100644
Binary files a/java/res/drawable-hdpi/sym_keyboard_voice_off_holo.png and b/java/res/drawable-hdpi/sym_keyboard_voice_off_holo.png 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 a604f497c51075e07bd4c05929bd85589e2b9ffd..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 976fd56d61a305cd0e00d285848d9de618b95ea3..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 100644
index c43439e93e5bc76bdbcf83406f4deda5682366d5..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/btn_candidate_normal.9.png b/java/res/drawable-mdpi/btn_candidate_normal.9.png
deleted file mode 100644
index fa6c0fefffbbda6e931438d6387cb1d967d1bf05..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-mdpi/btn_candidate_normal.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/highlight_pressed.png b/java/res/drawable-mdpi/highlight_pressed.png
deleted file mode 100644
index d27f1061ae9757e45d602d9f1334beeed38889da..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-mdpi/highlight_pressed.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/keyboard_key_feedback_background_holo.9.png b/java/res/drawable-mdpi/keyboard_key_feedback_background_holo.9.png
index a7acb4a4dd366d9f47e6e1bd30ab67f189bcdad9..286cf84fc3fe12e63516ae11cf844f1e824b88ec 100644
Binary files a/java/res/drawable-mdpi/keyboard_key_feedback_background_holo.9.png and b/java/res/drawable-mdpi/keyboard_key_feedback_background_holo.9.png 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_voice_off_holo.png b/java/res/drawable-mdpi/sym_keyboard_voice_off_holo.png
index 081a13096f45a372e05ef94092157e28a311fb46..44919dfccf1276e6a7053f5b1f1052dcf2f854f8 100644
Binary files a/java/res/drawable-mdpi/sym_keyboard_voice_off_holo.png and b/java/res/drawable-mdpi/sym_keyboard_voice_off_holo.png differ
diff --git a/java/res/drawable-mdpi/top_suggest_line_holo.9.png b/java/res/drawable-mdpi/top_suggest_line_holo.9.png
deleted file mode 100644
index 8fdffd3179083d2c4abef21d0b4a17d6fd024b23..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-mdpi/top_suggest_line_holo.9.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_candidate.xml b/java/res/drawable/btn_candidate.xml
index b0c1c3038411c27c090d9fc481e28e5d03429c17..efcee9f54bbabbd6e5eec0315c758cdd9e0276ac 100644
--- a/java/res/drawable/btn_candidate.xml
+++ b/java/res/drawable/btn_candidate.xml
@@ -24,6 +24,4 @@
     <item
         android:state_pressed="true"
         android:drawable="@drawable/btn_candidate_pressed" />
-    <item
-        android:drawable="@drawable/btn_candidate_normal" />
 </selector>
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/drawable/ic_suggest_scroll_background.xml b/java/res/drawable/ic_suggest_scroll_background.xml
deleted file mode 100644
index 9d246e40e82d4356543bb3750ce9a9d9283cfb20..0000000000000000000000000000000000000000
--- a/java/res/drawable/ic_suggest_scroll_background.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 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.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:state_pressed="false"
-        android:drawable="@android:color/transparent" />
-
-    <item android:state_pressed="true"
-        android:drawable="@drawable/highlight_pressed" />
-
-</selector>
\ No newline at end of file
diff --git a/java/res/drawable/keyboard_key_feedback_honeycomb.xml b/java/res/drawable/keyboard_key_feedback_honeycomb.xml
index dd9b53e463e94cfa396eee7b2c1556dc346a4b71..a3ea140cdbf03a9e9aa34db7ad5e4c70522f64d5 100644
--- a/java/res/drawable/keyboard_key_feedback_honeycomb.xml
+++ b/java/res/drawable/keyboard_key_feedback_honeycomb.xml
@@ -16,6 +16,6 @@
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_long_pressable="true"
-            android:drawable="@drawable/keyboard_key_feedback_more_background" />
+            android:drawable="@drawable/keyboard_key_feedback_more_background_holo" />
     <item android:drawable="@drawable/keyboard_key_feedback_background_holo" />
 </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 d1d70ff74b2c7883078b7cfb9db0a5d1668eb151..f4bc3cac91dbd6a8acc382960add2013fa6867a1 100644
--- a/java/res/values-ar/strings.xml
+++ b/java/res/values-ar/strings.xml
@@ -111,7 +111,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 418bb18a1c6793d5dce650ddff49b7d21a6ae0e2..939fd75c833eb778ada1c84b0238a1c9bbd9f60d 100644
--- a/java/res/values-bg/strings.xml
+++ b/java/res/values-bg/strings.xml
@@ -111,7 +111,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 1bfa3a9abfdb00ff95d2c316862218a6fea0e55a..f596a37af6643e477b4dda7dcef4958ef7278ac8 100644
--- a/java/res/values-ca/strings.xml
+++ b/java/res/values-ca/strings.xml
@@ -111,7 +111,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 b0cb7daf7a8cc3020ffac2a7f452d7d56eba2618..a8091bb57ac2d1c7e2eccdd784bc2e2d0d3cfdbf 100644
--- a/java/res/values-cs/strings.xml
+++ b/java/res/values-cs/strings.xml
@@ -111,7 +111,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 eb79888d60b0bef7fb27f6f2787dee88edac6756..5c23ccf5f3a487001230ee1342ac32b6a8f57b94 100644
--- a/java/res/values-da/strings.xml
+++ b/java/res/values-da/strings.xml
@@ -111,7 +111,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 e79d2c833b0f482f64508f130a021e23dea4712f..23eeb5b915cdd941901b95913fb0bccf7d155faf 100644
--- a/java/res/values-de/strings.xml
+++ b/java/res/values-de/strings.xml
@@ -111,7 +111,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 4412fa45d34d18c812abf8b743e2747198a6629c..355d7a3c6c2d05da90b950f5d9530bc540ebb624 100644
--- a/java/res/values-el/strings.xml
+++ b/java/res/values-el/strings.xml
@@ -111,7 +111,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 b2e62b0cd23a3cc57d057322669d55c686c4d3d9..89a6a2e782891678555215580cdba5afd3f4b08f 100644
--- a/java/res/values-en-rGB/strings.xml
+++ b/java/res/values-en-rGB/strings.xml
@@ -111,7 +111,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 02f36ff793a105e56d51a70aa71f349a27f14c0f..9a45219b00d6b049412c2b72d2f8d021d3a6f24a 100644
--- a/java/res/values-es-rUS/strings.xml
+++ b/java/res/values-es-rUS/strings.xml
@@ -111,7 +111,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 24e975baab6d4f5f024920f03310a37d70bf7e2b..1e72a0c37d83a8cc15ab42fc62d4b6d3aea25830 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 b594411accaa4b5691819123b0ff6e409c6aae15..ceeee52d92def4a0b698af5010bafa486b0cc719 100644
--- a/java/res/values-fa/strings.xml
+++ b/java/res/values-fa/strings.xml
@@ -111,7 +111,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 0bf385552b9b1a82cc245807312854209f34f3c1..ee49c998f61114ee43f569961019adced41740a2 100644
--- a/java/res/values-fi/strings.xml
+++ b/java/res/values-fi/strings.xml
@@ -111,7 +111,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 65e88c1ff1e48c0ca89841977bce66cef271a317..59a1387cf4230589be4c3147e259818c2b53a346 100644
--- a/java/res/values-fr/strings.xml
+++ b/java/res/values-fr/strings.xml
@@ -111,7 +111,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 e6879a6d1cc7e01ab6dd9982008d03d607bbebef..34476d4c684d300197fd3a98f2bf23bd3dbd0db3 100644
--- a/java/res/values-hr/strings.xml
+++ b/java/res/values-hr/strings.xml
@@ -111,7 +111,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 a8bf98367c8cd4cb6edb9a74234ba4976aba9d17..923103bce558c84b618f80b7dd27bced318488ad 100644
--- a/java/res/values-hu/strings.xml
+++ b/java/res/values-hu/strings.xml
@@ -111,7 +111,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 4df7f1e7f397c94af35bb965160d2b4f0d373ace..3322109c4710af5624579fda97dba683c15c7150 100644
--- a/java/res/values-in/strings.xml
+++ b/java/res/values-in/strings.xml
@@ -111,7 +111,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 9bf4f9e301a57aa19daac67a23353d81dbc1a2df..337a04e07b2f70c669d5a1b33e0c71482aafb730 100644
--- a/java/res/values-it/strings.xml
+++ b/java/res/values-it/strings.xml
@@ -111,7 +111,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 af0854c97f5beb2390db2ce67def10e7f509a782..e71ab56c3b4837d0008772393cebd819f7875a2c 100644
--- a/java/res/values-iw/strings.xml
+++ b/java/res/values-iw/strings.xml
@@ -111,7 +111,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 cd2cf8070de092aaf8be68d5310b25f5757db9cc..5d82a453bbf183dd6313edf3a63cfc8bcdd258d8 100644
--- a/java/res/values-ja/strings.xml
+++ b/java/res/values-ja/strings.xml
@@ -111,7 +111,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 7a09da880893bc13e570ad3e81da67311fcf37af..2cf0ec2aa31a6154dadfaf55139268bdce237675 100644
--- a/java/res/values-ko/strings.xml
+++ b/java/res/values-ko/strings.xml
@@ -111,7 +111,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-lt/strings.xml b/java/res/values-lt/strings.xml
index c12c62aaaffef2bb3fc0c387d672e88a600e5dda..3ff1543c655d5dbe3dc5d02cfacb4a34525953ab 100644
--- a/java/res/values-lt/strings.xml
+++ b/java/res/values-lt/strings.xml
@@ -111,7 +111,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 8b975b0331fa8493f80d6b773a2947bdb4ba1c9c..11e768fce0a4cab95330bb5ee75d003c1401cc36 100644
--- a/java/res/values-lv/strings.xml
+++ b/java/res/values-lv/strings.xml
@@ -111,7 +111,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 0471e74c30c2103c126cb361403c1ad06dc8eba2..db163b963a556512a83157455e41b1e80e02ba14 100644
--- a/java/res/values-nb/strings.xml
+++ b/java/res/values-nb/strings.xml
@@ -111,7 +111,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 a1213ec33dd12dfd69823fb68e9ec31901380c71..6dece4885a760e47f393e5e0597dc3a3810080c7 100644
--- a/java/res/values-nl/strings.xml
+++ b/java/res/values-nl/strings.xml
@@ -111,7 +111,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 633b159c99d481a788abccb43076335588b2babb..70c4b18dfb39a38495062ee7e7ae8aa3198bf18d 100644
--- a/java/res/values-pl/strings.xml
+++ b/java/res/values-pl/strings.xml
@@ -111,7 +111,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 f06d64c70641c96f1e28dcdbfecc8a2133c331ce..5845ebc59710bd3a1b6701af6b0247dea51cf189 100644
--- a/java/res/values-pt-rPT/strings.xml
+++ b/java/res/values-pt-rPT/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 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 9fc1a97f216707af2fc4ca5dc76cb9f78a46ad5b..f1203c671cc082f15b7736a5f03ef5422886b1a3 100644
--- a/java/res/values-pt/strings.xml
+++ b/java/res/values-pt/strings.xml
@@ -111,7 +111,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 57548b5e41dd9770d8b29306bdc86b3be8187ce5..9c51cad72514a6d500487e54e5d5b3d63cf101a7 100644
--- a/java/res/values-rm/strings.xml
+++ b/java/res/values-rm/strings.xml
@@ -156,8 +156,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 9c973922a4d5c6a78c758ffa909cafc39fd08213..0a80911cebefed8a74a68bfacb2f40f730656518 100644
--- a/java/res/values-ro/strings.xml
+++ b/java/res/values-ro/strings.xml
@@ -111,7 +111,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 f8fdab021944d912c9ec4b2de04b9e7d7f5de3a7..6dab43cb92a33462ebc2234aef03a3f7b089edcb 100644
--- a/java/res/values-ru/strings.xml
+++ b/java/res/values-ru/strings.xml
@@ -111,7 +111,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 569f273a41ea0c96c32be01fc92d980ad7f1e2df..e7a7cd194cde702421e4372eac661def462b13f5 100644
--- a/java/res/values-sk/strings.xml
+++ b/java/res/values-sk/strings.xml
@@ -111,7 +111,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 715e6c567d1e5905e7bf8423b5384b6b568d2867..6bb0b36c82ad591a8d71986033af718869f18d55 100644
--- a/java/res/values-sl/strings.xml
+++ b/java/res/values-sl/strings.xml
@@ -111,7 +111,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 115732779c9161d70580cb6805d115c6d46666aa..02e7593ca31cde4cf69604f4585690b2b4844873 100644
--- a/java/res/values-sr/strings.xml
+++ b/java/res/values-sr/strings.xml
@@ -111,7 +111,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 b8c62f46ed27a78d9bcf715a1381bd82cba57892..eaf3505832c22d308c1a7df3fe356cfcfa77f949 100644
--- a/java/res/values-sv/strings.xml
+++ b/java/res/values-sv/strings.xml
@@ -111,7 +111,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 836b987245de17af4d7abba5e77772971fba93c7..6dc813b749467e0423beb56a02b95149a8da9ae8 100644
--- a/java/res/values-th/strings.xml
+++ b/java/res/values-th/strings.xml
@@ -111,7 +111,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 386b1fdd81e948bae0bb696aa7f92743701f697b..bdd700b677d910fc1349b7a262c2160d062cbe41 100644
--- a/java/res/values-tl/strings.xml
+++ b/java/res/values-tl/strings.xml
@@ -111,7 +111,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 71a6215dd6b150aa10fb34189f235faee7afc5a8..a88b50960b8c6e0ceacdf94863e704cad528a014 100644
--- a/java/res/values-tr/strings.xml
+++ b/java/res/values-tr/strings.xml
@@ -111,7 +111,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 26906329aa6806608cacafc54317d08cf8e72bda..5010ee9b5a5cb8bc59fa9ac57af5fc5dc865cf29 100644
--- a/java/res/values-uk/strings.xml
+++ b/java/res/values-uk/strings.xml
@@ -111,7 +111,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 70defe3b7df129ef296e45da6ae6493a8c7b7945..8dac2f922d19ecff824442f34dbd63d854e6a170 100644
--- a/java/res/values-vi/strings.xml
+++ b/java/res/values-vi/strings.xml
@@ -111,7 +111,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 3b092bfcc2b1a6bf1f6ebb0fcf3c4dcfbdefc1a8..9d768915343fe741e4b0a85f87801f04afb543e0 100644
--- a/java/res/values-zh-rCN/strings.xml
+++ b/java/res/values-zh-rCN/strings.xml
@@ -111,7 +111,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 a3bf911a1f90ed321329d203e70996c3295b5bf1..9ba7284616966646976f02d056147612a993181c 100644
--- a/java/res/values-zh-rTW/strings.xml
+++ b/java/res/values-zh-rTW/strings.xml
@@ -111,7 +111,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/colors.xml b/java/res/values/colors.xml
index 0161589a45c407ebe023c2a1ac3517a9e0a66182..741171f88627bc3258c5011a4e7cd232b7a5d87c 100644
--- a/java/res/values/colors.xml
+++ b/java/res/values/colors.xml
@@ -25,7 +25,6 @@
     <color name="latinkeyboard_bar_language_shadow_white">#80000000</color>
     <color name="latinkeyboard_bar_language_shadow_black">#80FFFFFF</color>
     <color name="latinkeyboard_bar_language_text">#FFC0C0C0</color>
-    <color name="latinkeyboard_extension_background">#A0000000</color>
     <color name="latinkeyboard_feedback_language_text">#FFFFFFFF</color>
     <color name="latinkeyboard_key_color_white">#FFFFFFFF</color>
     <color name="latinkeyboard_key_color_black">#FF000000</color>
diff --git a/java/res/values/config.xml b/java/res/values/config.xml
index bdb4409f0b522add7fe65ec4dfc054389cc438f0..7c100c367821b3526b966267a717b6fa50b37ead 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>
@@ -51,8 +50,6 @@
     <integer name="config_delay_after_preview">10</integer>
     <integer name="config_preview_fadein_anim_time">0</integer>
     <integer name="config_preview_fadeout_anim_time">70</integer>
-    <integer name="config_mini_keyboard_fadein_anim_time">0</integer>
-    <integer name="config_mini_keyboard_fadeout_anim_time">100</integer>
     <integer name="config_delay_before_key_repeat_start">400</integer>
     <integer name="config_key_repeat_interval">50</integer>
     <integer name="config_keyboard_grid_width">32</integer>
@@ -65,9 +62,7 @@
     <!-- This configuration is the index of the array {@link KeyboardSwitcher.KEYBOARD_THEMES}. -->
     <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">10</integer>
-    <!-- Whether or not auto-correction should be enabled by default -->
-    <bool name="enable_autocorrect">true</bool>
+    <integer name="config_max_popup_keyboard_column">5</integer>
     <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 7f00cdba305e5fff376a4e7ebd36a3f79250f0aa..d28b9232b9fe58f9485e67ccd120cb9b2c7cc0e8 100644
--- a/java/res/values/dimens.xml
+++ b/java/res/values/dimens.xml
@@ -57,7 +57,6 @@
     <!-- 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/strings.xml b/java/res/values/strings.xml
index 3c0a9c1a2366962a1e167727107b87d5cda8ca63..ac14a208262438e214d5f7739dc49cffd5b867fb 100644
--- a/java/res/values/strings.xml
+++ b/java/res/values/strings.xml
@@ -252,8 +252,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] -->