diff --git a/java/res/drawable-xlarge-land/btn_keyboard_key_dark_normal_holo.9.png b/java/res/drawable-hdpi/btn_keyboard_key_dark_normal_holo.9.png
similarity index 100%
rename from java/res/drawable-xlarge-land/btn_keyboard_key_dark_normal_holo.9.png
rename to java/res/drawable-hdpi/btn_keyboard_key_dark_normal_holo.9.png
diff --git a/java/res/drawable-xlarge-land/btn_keyboard_key_dark_normal_off_holo.9.png b/java/res/drawable-hdpi/btn_keyboard_key_dark_normal_off_holo.9.png
similarity index 100%
rename from java/res/drawable-xlarge-land/btn_keyboard_key_dark_normal_off_holo.9.png
rename to java/res/drawable-hdpi/btn_keyboard_key_dark_normal_off_holo.9.png
diff --git a/java/res/drawable-xlarge-land/btn_keyboard_key_dark_normal_on_holo.9.png b/java/res/drawable-hdpi/btn_keyboard_key_dark_normal_on_holo.9.png
similarity index 100%
rename from java/res/drawable-xlarge-land/btn_keyboard_key_dark_normal_on_holo.9.png
rename to java/res/drawable-hdpi/btn_keyboard_key_dark_normal_on_holo.9.png
diff --git a/java/res/drawable-xlarge-land/btn_keyboard_key_dark_pressed_holo.9.png b/java/res/drawable-hdpi/btn_keyboard_key_dark_pressed_holo.9.png
similarity index 100%
rename from java/res/drawable-xlarge-land/btn_keyboard_key_dark_pressed_holo.9.png
rename to java/res/drawable-hdpi/btn_keyboard_key_dark_pressed_holo.9.png
diff --git a/java/res/drawable-xlarge-land/btn_keyboard_key_dark_pressed_off_holo.9.png b/java/res/drawable-hdpi/btn_keyboard_key_dark_pressed_off_holo.9.png
similarity index 100%
rename from java/res/drawable-xlarge-land/btn_keyboard_key_dark_pressed_off_holo.9.png
rename to java/res/drawable-hdpi/btn_keyboard_key_dark_pressed_off_holo.9.png
diff --git a/java/res/drawable-xlarge-land/btn_keyboard_key_dark_pressed_on_holo.9.png b/java/res/drawable-hdpi/btn_keyboard_key_dark_pressed_on_holo.9.png
similarity index 100%
rename from java/res/drawable-xlarge-land/btn_keyboard_key_dark_pressed_on_holo.9.png
rename to java/res/drawable-hdpi/btn_keyboard_key_dark_pressed_on_holo.9.png
diff --git a/java/res/drawable-xlarge-land/btn_keyboard_key_light_normal_holo.9.png b/java/res/drawable-hdpi/btn_keyboard_key_light_normal_holo.9.png
similarity index 100%
rename from java/res/drawable-xlarge-land/btn_keyboard_key_light_normal_holo.9.png
rename to java/res/drawable-hdpi/btn_keyboard_key_light_normal_holo.9.png
diff --git a/java/res/drawable-xlarge-land/btn_keyboard_key_light_pressed_holo.9.png b/java/res/drawable-hdpi/btn_keyboard_key_light_pressed_holo.9.png
similarity index 100%
rename from java/res/drawable-xlarge-land/btn_keyboard_key_light_pressed_holo.9.png
rename to java/res/drawable-hdpi/btn_keyboard_key_light_pressed_holo.9.png
diff --git a/java/res/drawable-xlarge/key_hint_at_holo.9.png b/java/res/drawable-hdpi/key_hint_at_holo.9.png
similarity index 100%
rename from java/res/drawable-xlarge/key_hint_at_holo.9.png
rename to java/res/drawable-hdpi/key_hint_at_holo.9.png
diff --git a/java/res/drawable-xlarge/key_hint_at_large_holo.9.png b/java/res/drawable-hdpi/key_hint_at_large_holo.9.png
similarity index 100%
rename from java/res/drawable-xlarge/key_hint_at_large_holo.9.png
rename to java/res/drawable-hdpi/key_hint_at_large_holo.9.png
diff --git a/java/res/drawable-xlarge/key_hint_colon_holo.9.png b/java/res/drawable-hdpi/key_hint_colon_holo.9.png
similarity index 100%
rename from java/res/drawable-xlarge/key_hint_colon_holo.9.png
rename to java/res/drawable-hdpi/key_hint_colon_holo.9.png
diff --git a/java/res/drawable-xlarge/key_hint_colon_large_holo.9.png b/java/res/drawable-hdpi/key_hint_colon_large_holo.9.png
similarity index 100%
rename from java/res/drawable-xlarge/key_hint_colon_large_holo.9.png
rename to java/res/drawable-hdpi/key_hint_colon_large_holo.9.png
diff --git a/java/res/drawable-xlarge/key_hint_comma_holo.9.png b/java/res/drawable-hdpi/key_hint_comma_holo.9.png
similarity index 100%
rename from java/res/drawable-xlarge/key_hint_comma_holo.9.png
rename to java/res/drawable-hdpi/key_hint_comma_holo.9.png
diff --git a/java/res/drawable-xlarge/key_hint_dash_holo.9.png b/java/res/drawable-hdpi/key_hint_dash_holo.9.png
similarity index 100%
rename from java/res/drawable-xlarge/key_hint_dash_holo.9.png
rename to java/res/drawable-hdpi/key_hint_dash_holo.9.png
diff --git a/java/res/drawable-xlarge/key_hint_doublecross_holo.9.png b/java/res/drawable-hdpi/key_hint_doublecross_holo.9.png
similarity index 100%
rename from java/res/drawable-xlarge/key_hint_doublecross_holo.9.png
rename to java/res/drawable-hdpi/key_hint_doublecross_holo.9.png
diff --git a/java/res/drawable-xlarge/key_hint_equal_holo.9.png b/java/res/drawable-hdpi/key_hint_equal_holo.9.png
similarity index 100%
rename from java/res/drawable-xlarge/key_hint_equal_holo.9.png
rename to java/res/drawable-hdpi/key_hint_equal_holo.9.png
diff --git a/java/res/drawable-xlarge/key_hint_exclamation_holo.9.png b/java/res/drawable-hdpi/key_hint_exclamation_holo.9.png
similarity index 100%
rename from java/res/drawable-xlarge/key_hint_exclamation_holo.9.png
rename to java/res/drawable-hdpi/key_hint_exclamation_holo.9.png
diff --git a/java/res/drawable-xlarge/key_hint_exclamation_large_holo.9.png b/java/res/drawable-hdpi/key_hint_exclamation_large_holo.9.png
similarity index 100%
rename from java/res/drawable-xlarge/key_hint_exclamation_large_holo.9.png
rename to java/res/drawable-hdpi/key_hint_exclamation_large_holo.9.png
diff --git a/java/res/drawable-xlarge/key_hint_larger_holo.9.png b/java/res/drawable-hdpi/key_hint_larger_holo.9.png
similarity index 100%
rename from java/res/drawable-xlarge/key_hint_larger_holo.9.png
rename to java/res/drawable-hdpi/key_hint_larger_holo.9.png
diff --git a/java/res/drawable-xlarge/key_hint_parenclose_holo.9.png b/java/res/drawable-hdpi/key_hint_parenclose_holo.9.png
similarity index 100%
rename from java/res/drawable-xlarge/key_hint_parenclose_holo.9.png
rename to java/res/drawable-hdpi/key_hint_parenclose_holo.9.png
diff --git a/java/res/drawable-xlarge/key_hint_parenopen_holo.9.png b/java/res/drawable-hdpi/key_hint_parenopen_holo.9.png
similarity index 100%
rename from java/res/drawable-xlarge/key_hint_parenopen_holo.9.png
rename to java/res/drawable-hdpi/key_hint_parenopen_holo.9.png
diff --git a/java/res/drawable-xlarge/key_hint_period_holo.9.png b/java/res/drawable-hdpi/key_hint_period_holo.9.png
similarity index 100%
rename from java/res/drawable-xlarge/key_hint_period_holo.9.png
rename to java/res/drawable-hdpi/key_hint_period_holo.9.png
diff --git a/java/res/drawable-xlarge/key_hint_plus_holo.9.png b/java/res/drawable-hdpi/key_hint_plus_holo.9.png
similarity index 100%
rename from java/res/drawable-xlarge/key_hint_plus_holo.9.png
rename to java/res/drawable-hdpi/key_hint_plus_holo.9.png
diff --git a/java/res/drawable-xlarge/key_hint_plus_large_holo.9.png b/java/res/drawable-hdpi/key_hint_plus_large_holo.9.png
similarity index 100%
rename from java/res/drawable-xlarge/key_hint_plus_large_holo.9.png
rename to java/res/drawable-hdpi/key_hint_plus_large_holo.9.png
diff --git a/java/res/drawable-xlarge/key_hint_question_holo.9.png b/java/res/drawable-hdpi/key_hint_question_holo.9.png
similarity index 100%
rename from java/res/drawable-xlarge/key_hint_question_holo.9.png
rename to java/res/drawable-hdpi/key_hint_question_holo.9.png
diff --git a/java/res/drawable-xlarge/key_hint_question_large_holo.9.png b/java/res/drawable-hdpi/key_hint_question_large_holo.9.png
similarity index 100%
rename from java/res/drawable-xlarge/key_hint_question_large_holo.9.png
rename to java/res/drawable-hdpi/key_hint_question_large_holo.9.png
diff --git a/java/res/drawable-xlarge/key_hint_quote_holo.9.png b/java/res/drawable-hdpi/key_hint_quote_holo.9.png
similarity index 100%
rename from java/res/drawable-xlarge/key_hint_quote_holo.9.png
rename to java/res/drawable-hdpi/key_hint_quote_holo.9.png
diff --git a/java/res/drawable-xlarge/key_hint_quote_large_holo.9.png b/java/res/drawable-hdpi/key_hint_quote_large_holo.9.png
similarity index 100%
rename from java/res/drawable-xlarge/key_hint_quote_large_holo.9.png
rename to java/res/drawable-hdpi/key_hint_quote_large_holo.9.png
diff --git a/java/res/drawable-xlarge/key_hint_semicolon_holo.9.png b/java/res/drawable-hdpi/key_hint_semicolon_holo.9.png
similarity index 100%
rename from java/res/drawable-xlarge/key_hint_semicolon_holo.9.png
rename to java/res/drawable-hdpi/key_hint_semicolon_holo.9.png
diff --git a/java/res/drawable-xlarge/key_hint_simplequote_holo.9.png b/java/res/drawable-hdpi/key_hint_simplequote_holo.9.png
similarity index 100%
rename from java/res/drawable-xlarge/key_hint_simplequote_holo.9.png
rename to java/res/drawable-hdpi/key_hint_simplequote_holo.9.png
diff --git a/java/res/drawable-xlarge/key_hint_slash_holo.9.png b/java/res/drawable-hdpi/key_hint_slash_holo.9.png
similarity index 100%
rename from java/res/drawable-xlarge/key_hint_slash_holo.9.png
rename to java/res/drawable-hdpi/key_hint_slash_holo.9.png
diff --git a/java/res/drawable-xlarge/key_hint_slash_large_holo.9.png b/java/res/drawable-hdpi/key_hint_slash_large_holo.9.png
similarity index 100%
rename from java/res/drawable-xlarge/key_hint_slash_large_holo.9.png
rename to java/res/drawable-hdpi/key_hint_slash_large_holo.9.png
diff --git a/java/res/drawable-xlarge/key_hint_smaller_holo.9.png b/java/res/drawable-hdpi/key_hint_smaller_holo.9.png
similarity index 100%
rename from java/res/drawable-xlarge/key_hint_smaller_holo.9.png
rename to java/res/drawable-hdpi/key_hint_smaller_holo.9.png
diff --git a/java/res/drawable-xlarge/key_hint_star_holo.9.png b/java/res/drawable-hdpi/key_hint_star_holo.9.png
similarity index 100%
rename from java/res/drawable-xlarge/key_hint_star_holo.9.png
rename to java/res/drawable-hdpi/key_hint_star_holo.9.png
diff --git a/java/res/drawable-xlarge/key_hint_underline_holo.9.png b/java/res/drawable-hdpi/key_hint_underline_holo.9.png
similarity index 100%
rename from java/res/drawable-xlarge/key_hint_underline_holo.9.png
rename to java/res/drawable-hdpi/key_hint_underline_holo.9.png
diff --git a/java/res/drawable-xlarge-land/key_hint_at_holo.9.png b/java/res/drawable-land-mdpi/key_hint_at_holo.9.png
similarity index 100%
rename from java/res/drawable-xlarge-land/key_hint_at_holo.9.png
rename to java/res/drawable-land-mdpi/key_hint_at_holo.9.png
diff --git a/java/res/drawable-xlarge-land/key_hint_at_large_holo.9.png b/java/res/drawable-land-mdpi/key_hint_at_large_holo.9.png
similarity index 100%
rename from java/res/drawable-xlarge-land/key_hint_at_large_holo.9.png
rename to java/res/drawable-land-mdpi/key_hint_at_large_holo.9.png
diff --git a/java/res/drawable-xlarge-land/key_hint_colon_holo.9.png b/java/res/drawable-land-mdpi/key_hint_colon_holo.9.png
similarity index 100%
rename from java/res/drawable-xlarge-land/key_hint_colon_holo.9.png
rename to java/res/drawable-land-mdpi/key_hint_colon_holo.9.png
diff --git a/java/res/drawable-xlarge-land/key_hint_colon_large_holo.9.png b/java/res/drawable-land-mdpi/key_hint_colon_large_holo.9.png
similarity index 100%
rename from java/res/drawable-xlarge-land/key_hint_colon_large_holo.9.png
rename to java/res/drawable-land-mdpi/key_hint_colon_large_holo.9.png
diff --git a/java/res/drawable-xlarge-land/key_hint_comma_holo.9.png b/java/res/drawable-land-mdpi/key_hint_comma_holo.9.png
similarity index 100%
rename from java/res/drawable-xlarge-land/key_hint_comma_holo.9.png
rename to java/res/drawable-land-mdpi/key_hint_comma_holo.9.png
diff --git a/java/res/drawable-xlarge-land/key_hint_dash_holo.9.png b/java/res/drawable-land-mdpi/key_hint_dash_holo.9.png
similarity index 100%
rename from java/res/drawable-xlarge-land/key_hint_dash_holo.9.png
rename to java/res/drawable-land-mdpi/key_hint_dash_holo.9.png
diff --git a/java/res/drawable-xlarge-land/key_hint_doublecross_holo.9.png b/java/res/drawable-land-mdpi/key_hint_doublecross_holo.9.png
similarity index 100%
rename from java/res/drawable-xlarge-land/key_hint_doublecross_holo.9.png
rename to java/res/drawable-land-mdpi/key_hint_doublecross_holo.9.png
diff --git a/java/res/drawable-xlarge-land/key_hint_equal_holo.9.png b/java/res/drawable-land-mdpi/key_hint_equal_holo.9.png
similarity index 100%
rename from java/res/drawable-xlarge-land/key_hint_equal_holo.9.png
rename to java/res/drawable-land-mdpi/key_hint_equal_holo.9.png
diff --git a/java/res/drawable-xlarge-land/key_hint_exclamation_holo.9.png b/java/res/drawable-land-mdpi/key_hint_exclamation_holo.9.png
similarity index 100%
rename from java/res/drawable-xlarge-land/key_hint_exclamation_holo.9.png
rename to java/res/drawable-land-mdpi/key_hint_exclamation_holo.9.png
diff --git a/java/res/drawable-xlarge-land/key_hint_exclamation_large_holo.9.png b/java/res/drawable-land-mdpi/key_hint_exclamation_large_holo.9.png
similarity index 100%
rename from java/res/drawable-xlarge-land/key_hint_exclamation_large_holo.9.png
rename to java/res/drawable-land-mdpi/key_hint_exclamation_large_holo.9.png
diff --git a/java/res/drawable-xlarge-land/key_hint_larger_holo.9.png b/java/res/drawable-land-mdpi/key_hint_larger_holo.9.png
similarity index 100%
rename from java/res/drawable-xlarge-land/key_hint_larger_holo.9.png
rename to java/res/drawable-land-mdpi/key_hint_larger_holo.9.png
diff --git a/java/res/drawable-xlarge-land/key_hint_parenclose_holo.9.png b/java/res/drawable-land-mdpi/key_hint_parenclose_holo.9.png
similarity index 100%
rename from java/res/drawable-xlarge-land/key_hint_parenclose_holo.9.png
rename to java/res/drawable-land-mdpi/key_hint_parenclose_holo.9.png
diff --git a/java/res/drawable-xlarge-land/key_hint_parenopen_holo.9.png b/java/res/drawable-land-mdpi/key_hint_parenopen_holo.9.png
similarity index 100%
rename from java/res/drawable-xlarge-land/key_hint_parenopen_holo.9.png
rename to java/res/drawable-land-mdpi/key_hint_parenopen_holo.9.png
diff --git a/java/res/drawable-xlarge-land/key_hint_period_holo.9.png b/java/res/drawable-land-mdpi/key_hint_period_holo.9.png
similarity index 100%
rename from java/res/drawable-xlarge-land/key_hint_period_holo.9.png
rename to java/res/drawable-land-mdpi/key_hint_period_holo.9.png
diff --git a/java/res/drawable-xlarge-land/key_hint_plus_holo.9.png b/java/res/drawable-land-mdpi/key_hint_plus_holo.9.png
similarity index 100%
rename from java/res/drawable-xlarge-land/key_hint_plus_holo.9.png
rename to java/res/drawable-land-mdpi/key_hint_plus_holo.9.png
diff --git a/java/res/drawable-xlarge-land/key_hint_plus_large_holo.9.png b/java/res/drawable-land-mdpi/key_hint_plus_large_holo.9.png
similarity index 100%
rename from java/res/drawable-xlarge-land/key_hint_plus_large_holo.9.png
rename to java/res/drawable-land-mdpi/key_hint_plus_large_holo.9.png
diff --git a/java/res/drawable-xlarge-land/key_hint_question_holo.9.png b/java/res/drawable-land-mdpi/key_hint_question_holo.9.png
similarity index 100%
rename from java/res/drawable-xlarge-land/key_hint_question_holo.9.png
rename to java/res/drawable-land-mdpi/key_hint_question_holo.9.png
diff --git a/java/res/drawable-xlarge-land/key_hint_question_large_holo.9.png b/java/res/drawable-land-mdpi/key_hint_question_large_holo.9.png
similarity index 100%
rename from java/res/drawable-xlarge-land/key_hint_question_large_holo.9.png
rename to java/res/drawable-land-mdpi/key_hint_question_large_holo.9.png
diff --git a/java/res/drawable-xlarge-land/key_hint_quote_holo.9.png b/java/res/drawable-land-mdpi/key_hint_quote_holo.9.png
similarity index 100%
rename from java/res/drawable-xlarge-land/key_hint_quote_holo.9.png
rename to java/res/drawable-land-mdpi/key_hint_quote_holo.9.png
diff --git a/java/res/drawable-xlarge-land/key_hint_quote_large_holo.9.png b/java/res/drawable-land-mdpi/key_hint_quote_large_holo.9.png
similarity index 100%
rename from java/res/drawable-xlarge-land/key_hint_quote_large_holo.9.png
rename to java/res/drawable-land-mdpi/key_hint_quote_large_holo.9.png
diff --git a/java/res/drawable-xlarge-land/key_hint_semicolon_holo.9.png b/java/res/drawable-land-mdpi/key_hint_semicolon_holo.9.png
similarity index 100%
rename from java/res/drawable-xlarge-land/key_hint_semicolon_holo.9.png
rename to java/res/drawable-land-mdpi/key_hint_semicolon_holo.9.png
diff --git a/java/res/drawable-xlarge-land/key_hint_simplequote_holo.9.png b/java/res/drawable-land-mdpi/key_hint_simplequote_holo.9.png
similarity index 100%
rename from java/res/drawable-xlarge-land/key_hint_simplequote_holo.9.png
rename to java/res/drawable-land-mdpi/key_hint_simplequote_holo.9.png
diff --git a/java/res/drawable-xlarge-land/key_hint_slash_holo.9.png b/java/res/drawable-land-mdpi/key_hint_slash_holo.9.png
similarity index 100%
rename from java/res/drawable-xlarge-land/key_hint_slash_holo.9.png
rename to java/res/drawable-land-mdpi/key_hint_slash_holo.9.png
diff --git a/java/res/drawable-xlarge-land/key_hint_slash_large_holo.9.png b/java/res/drawable-land-mdpi/key_hint_slash_large_holo.9.png
similarity index 100%
rename from java/res/drawable-xlarge-land/key_hint_slash_large_holo.9.png
rename to java/res/drawable-land-mdpi/key_hint_slash_large_holo.9.png
diff --git a/java/res/drawable-xlarge-land/key_hint_smaller_holo.9.png b/java/res/drawable-land-mdpi/key_hint_smaller_holo.9.png
similarity index 100%
rename from java/res/drawable-xlarge-land/key_hint_smaller_holo.9.png
rename to java/res/drawable-land-mdpi/key_hint_smaller_holo.9.png
diff --git a/java/res/drawable-xlarge-land/key_hint_star_holo.9.png b/java/res/drawable-land-mdpi/key_hint_star_holo.9.png
similarity index 100%
rename from java/res/drawable-xlarge-land/key_hint_star_holo.9.png
rename to java/res/drawable-land-mdpi/key_hint_star_holo.9.png
diff --git a/java/res/drawable-xlarge-land/key_hint_underline_holo.9.png b/java/res/drawable-land-mdpi/key_hint_underline_holo.9.png
similarity index 100%
rename from java/res/drawable-xlarge-land/key_hint_underline_holo.9.png
rename to java/res/drawable-land-mdpi/key_hint_underline_holo.9.png
diff --git a/java/res/drawable-xlarge/btn_keyboard_key_dark_normal_holo.9.png b/java/res/drawable-mdpi/btn_keyboard_key_dark_normal_holo.9.png
similarity index 100%
rename from java/res/drawable-xlarge/btn_keyboard_key_dark_normal_holo.9.png
rename to java/res/drawable-mdpi/btn_keyboard_key_dark_normal_holo.9.png
diff --git a/java/res/drawable-xlarge/btn_keyboard_key_dark_normal_off_holo.9.png b/java/res/drawable-mdpi/btn_keyboard_key_dark_normal_off_holo.9.png
similarity index 100%
rename from java/res/drawable-xlarge/btn_keyboard_key_dark_normal_off_holo.9.png
rename to java/res/drawable-mdpi/btn_keyboard_key_dark_normal_off_holo.9.png
diff --git a/java/res/drawable-xlarge/btn_keyboard_key_dark_normal_on_holo.9.png b/java/res/drawable-mdpi/btn_keyboard_key_dark_normal_on_holo.9.png
similarity index 100%
rename from java/res/drawable-xlarge/btn_keyboard_key_dark_normal_on_holo.9.png
rename to java/res/drawable-mdpi/btn_keyboard_key_dark_normal_on_holo.9.png
diff --git a/java/res/drawable-xlarge/btn_keyboard_key_dark_pressed_holo.9.png b/java/res/drawable-mdpi/btn_keyboard_key_dark_pressed_holo.9.png
similarity index 100%
rename from java/res/drawable-xlarge/btn_keyboard_key_dark_pressed_holo.9.png
rename to java/res/drawable-mdpi/btn_keyboard_key_dark_pressed_holo.9.png
diff --git a/java/res/drawable-xlarge/btn_keyboard_key_dark_pressed_off_holo.9.png b/java/res/drawable-mdpi/btn_keyboard_key_dark_pressed_off_holo.9.png
similarity index 100%
rename from java/res/drawable-xlarge/btn_keyboard_key_dark_pressed_off_holo.9.png
rename to java/res/drawable-mdpi/btn_keyboard_key_dark_pressed_off_holo.9.png
diff --git a/java/res/drawable-xlarge/btn_keyboard_key_dark_pressed_on_holo.9.png b/java/res/drawable-mdpi/btn_keyboard_key_dark_pressed_on_holo.9.png
similarity index 100%
rename from java/res/drawable-xlarge/btn_keyboard_key_dark_pressed_on_holo.9.png
rename to java/res/drawable-mdpi/btn_keyboard_key_dark_pressed_on_holo.9.png
diff --git a/java/res/drawable-xlarge/btn_keyboard_key_light_normal_holo.9.png b/java/res/drawable-mdpi/btn_keyboard_key_light_normal_holo.9.png
similarity index 100%
rename from java/res/drawable-xlarge/btn_keyboard_key_light_normal_holo.9.png
rename to java/res/drawable-mdpi/btn_keyboard_key_light_normal_holo.9.png
diff --git a/java/res/drawable-xlarge/btn_keyboard_key_light_pressed_holo.9.png b/java/res/drawable-mdpi/btn_keyboard_key_light_pressed_holo.9.png
similarity index 100%
rename from java/res/drawable-xlarge/btn_keyboard_key_light_pressed_holo.9.png
rename to java/res/drawable-mdpi/btn_keyboard_key_light_pressed_holo.9.png
diff --git a/java/res/drawable-mdpi/key_hint_at_holo.9.png b/java/res/drawable-mdpi/key_hint_at_holo.9.png
new file mode 100644
index 000000000..2b8520a92
Binary files /dev/null and b/java/res/drawable-mdpi/key_hint_at_holo.9.png differ
diff --git a/java/res/drawable-mdpi/key_hint_at_large_holo.9.png b/java/res/drawable-mdpi/key_hint_at_large_holo.9.png
new file mode 100644
index 000000000..ff56845f8
Binary files /dev/null and b/java/res/drawable-mdpi/key_hint_at_large_holo.9.png differ
diff --git a/java/res/drawable-mdpi/key_hint_colon_holo.9.png b/java/res/drawable-mdpi/key_hint_colon_holo.9.png
new file mode 100644
index 000000000..14c46990d
Binary files /dev/null and b/java/res/drawable-mdpi/key_hint_colon_holo.9.png differ
diff --git a/java/res/drawable-mdpi/key_hint_colon_large_holo.9.png b/java/res/drawable-mdpi/key_hint_colon_large_holo.9.png
new file mode 100644
index 000000000..91e788323
Binary files /dev/null and b/java/res/drawable-mdpi/key_hint_colon_large_holo.9.png differ
diff --git a/java/res/drawable-mdpi/key_hint_comma_holo.9.png b/java/res/drawable-mdpi/key_hint_comma_holo.9.png
new file mode 100644
index 000000000..82e4a93b7
Binary files /dev/null and b/java/res/drawable-mdpi/key_hint_comma_holo.9.png 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
new file mode 100644
index 000000000..2ee22ba79
Binary files /dev/null and b/java/res/drawable-mdpi/key_hint_dash_holo.9.png 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
new file mode 100644
index 000000000..0da933239
Binary files /dev/null and b/java/res/drawable-mdpi/key_hint_doublecross_holo.9.png 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
new file mode 100644
index 000000000..f5a9ba2f4
Binary files /dev/null and b/java/res/drawable-mdpi/key_hint_equal_holo.9.png differ
diff --git a/java/res/drawable-mdpi/key_hint_exclamation_holo.9.png b/java/res/drawable-mdpi/key_hint_exclamation_holo.9.png
new file mode 100644
index 000000000..7230fb92a
Binary files /dev/null and b/java/res/drawable-mdpi/key_hint_exclamation_holo.9.png differ
diff --git a/java/res/drawable-mdpi/key_hint_exclamation_large_holo.9.png b/java/res/drawable-mdpi/key_hint_exclamation_large_holo.9.png
new file mode 100644
index 000000000..0152ce21b
Binary files /dev/null and b/java/res/drawable-mdpi/key_hint_exclamation_large_holo.9.png 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
new file mode 100644
index 000000000..50652bb13
Binary files /dev/null and b/java/res/drawable-mdpi/key_hint_larger_holo.9.png 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
new file mode 100644
index 000000000..52ee86a0f
Binary files /dev/null and b/java/res/drawable-mdpi/key_hint_parenclose_holo.9.png 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
new file mode 100644
index 000000000..b0ed388ad
Binary files /dev/null and b/java/res/drawable-mdpi/key_hint_parenopen_holo.9.png 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
new file mode 100644
index 000000000..8d798a57f
Binary files /dev/null and b/java/res/drawable-mdpi/key_hint_period_holo.9.png differ
diff --git a/java/res/drawable-mdpi/key_hint_plus_holo.9.png b/java/res/drawable-mdpi/key_hint_plus_holo.9.png
new file mode 100644
index 000000000..f1d232e99
Binary files /dev/null and b/java/res/drawable-mdpi/key_hint_plus_holo.9.png differ
diff --git a/java/res/drawable-mdpi/key_hint_plus_large_holo.9.png b/java/res/drawable-mdpi/key_hint_plus_large_holo.9.png
new file mode 100644
index 000000000..5f7d31563
Binary files /dev/null and b/java/res/drawable-mdpi/key_hint_plus_large_holo.9.png differ
diff --git a/java/res/drawable-mdpi/key_hint_question_holo.9.png b/java/res/drawable-mdpi/key_hint_question_holo.9.png
new file mode 100644
index 000000000..088550f5b
Binary files /dev/null and b/java/res/drawable-mdpi/key_hint_question_holo.9.png differ
diff --git a/java/res/drawable-mdpi/key_hint_question_large_holo.9.png b/java/res/drawable-mdpi/key_hint_question_large_holo.9.png
new file mode 100644
index 000000000..8a9dffbe2
Binary files /dev/null and b/java/res/drawable-mdpi/key_hint_question_large_holo.9.png differ
diff --git a/java/res/drawable-mdpi/key_hint_quote_holo.9.png b/java/res/drawable-mdpi/key_hint_quote_holo.9.png
new file mode 100644
index 000000000..51dcfac99
Binary files /dev/null and b/java/res/drawable-mdpi/key_hint_quote_holo.9.png differ
diff --git a/java/res/drawable-mdpi/key_hint_quote_large_holo.9.png b/java/res/drawable-mdpi/key_hint_quote_large_holo.9.png
new file mode 100644
index 000000000..6514e0bf7
Binary files /dev/null and b/java/res/drawable-mdpi/key_hint_quote_large_holo.9.png 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
new file mode 100644
index 000000000..7f9e8c90e
Binary files /dev/null and b/java/res/drawable-mdpi/key_hint_semicolon_holo.9.png 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
new file mode 100644
index 000000000..5e1a45c0e
Binary files /dev/null and b/java/res/drawable-mdpi/key_hint_simplequote_holo.9.png 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
new file mode 100644
index 000000000..645586a30
Binary files /dev/null and b/java/res/drawable-mdpi/key_hint_slash_holo.9.png 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
new file mode 100644
index 000000000..75c3bb1a6
Binary files /dev/null and b/java/res/drawable-mdpi/key_hint_slash_large_holo.9.png 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
new file mode 100644
index 000000000..2a0587cbd
Binary files /dev/null and b/java/res/drawable-mdpi/key_hint_smaller_holo.9.png 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
new file mode 100644
index 000000000..9f33b9830
Binary files /dev/null and b/java/res/drawable-mdpi/key_hint_star_holo.9.png differ
diff --git a/java/res/drawable-mdpi/key_hint_underline_holo.9.png b/java/res/drawable-mdpi/key_hint_underline_holo.9.png
new file mode 100644
index 000000000..fef1b6369
Binary files /dev/null and b/java/res/drawable-mdpi/key_hint_underline_holo.9.png differ
diff --git a/java/res/drawable-xlarge/btn_keyboard_key_gingerbread.xml b/java/res/drawable/btn_keyboard_key_honeycomb.xml
similarity index 100%
rename from java/res/drawable-xlarge/btn_keyboard_key_gingerbread.xml
rename to java/res/drawable/btn_keyboard_key_honeycomb.xml
diff --git a/java/res/layout/input_honeycomb.xml b/java/res/layout/input_honeycomb.xml
new file mode 100644
index 000000000..7bc0df427
--- /dev/null
+++ b/java/res/layout/input_honeycomb.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 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.
+*/
+-->
+
+<com.android.inputmethod.latin.LatinKeyboardView
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+        android:id="@+id/LatinkeyboardBaseView"
+        android:layout_alignParentBottom="true"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingTop="@dimen/keyboard_top_padding"
+        android:paddingBottom="@dimen/keyboard_bottom_padding"
+        android:background="@drawable/keyboard_dark_background"
+        android:textStyle="bold"
+
+        latin:keyBackground="@drawable/btn_keyboard_key_honeycomb"
+        latin:keyTextStyle="bold"
+        />
diff --git a/java/res/values/donottranslate.xml b/java/res/values/donottranslate.xml
index ffd6cce0d..453e188ff 100644
--- a/java/res/values/donottranslate.xml
+++ b/java/res/values/donottranslate.xml
@@ -42,4 +42,29 @@
     <!--  Default value of the visibility of the suggestion strip -->
     <string name="prefs_suggestion_visibility_default_value" translatable="false">0</string>
 
+    <!-- Keyboard theme names -->
+    <string name="layout_basic" translatable="false">Basic</string>
+    <string name="layout_high_contrast" translatable="false">Basic (High Contrast)</string>
+    <string name="layout_stone_bold"  translatable="false">Stone (bold)</string>
+    <string name="layout_stone_normal"  translatable="false">Stone (normal)</string>
+    <string name="layout_gingerbread"  translatable="false">Gingerbread</string>
+    <string name="layout_honeycomb"  translatable="false">Honeycomb</string>
+
+    <!-- For keyboard theme switcher dialog -->
+    <string-array name="keyboard_layout_modes" translatable="false">
+        <item>@string/layout_basic</item>
+        <item>@string/layout_high_contrast</item>
+        <item>@string/layout_stone_normal</item>
+        <item>@string/layout_stone_bold</item>
+        <item>@string/layout_gingerbread</item>
+        <item>@string/layout_honeycomb</item>
+    </string-array>
+    <string-array name="keyboard_layout_modes_values" translatable="false">
+        <item>0</item>
+        <item>1</item>
+        <item>2</item>
+        <item>3</item>
+        <item>4</item>
+        <item>5</item>
+    </string-array>
 </resources>
diff --git a/java/res/values/strings.xml b/java/res/values/strings.xml
index 30b348da9..cc513ae89 100644
--- a/java/res/values/strings.xml
+++ b/java/res/values/strings.xml
@@ -390,27 +390,6 @@
 
     <!-- Description for keyboard theme switcher -->
     <string name="keyboard_layout">Keyboard Theme</string>
-    <string name="layout_basic" translatable="false">Basic</string>
-    <string name="layout_high_contrast" translatable="false">Basic (High Contrast)</string>
-    <string name="layout_stone_bold"  translatable="false">Stone (bold)</string>
-    <string name="layout_stone_normal"  translatable="false">Stone (normal)</string>
-    <string name="layout_gingerbread"  translatable="false">Gingerbread</string>
-
-    <string-array name="keyboard_layout_modes" translatable="false">
-        <item>@string/layout_basic</item>
-        <item>@string/layout_high_contrast</item>
-        <item>@string/layout_stone_normal</item>
-        <item>@string/layout_stone_bold</item>
-        <item>@string/layout_gingerbread</item>
-    </string-array>
-
-    <string-array name="keyboard_layout_modes_values" translatable="false">
-        <item>0</item>
-        <item>1</item>
-        <item>2</item>
-        <item>3</item>
-        <item>4</item>
-    </string-array>
 
     <string name="subtype_mode_keyboard">keyboard</string>
     <string name="subtype_mode_voice">voice</string>
diff --git a/java/res/xml/prefs_for_debug.xml b/java/res/xml/prefs_for_debug.xml
index 8177d3c6a..c42fe6602 100644
--- a/java/res/xml/prefs_for_debug.xml
+++ b/java/res/xml/prefs_for_debug.xml
@@ -32,7 +32,7 @@
             android:persistent="true"
             android:entryValues="@array/keyboard_layout_modes_values"
             android:entries="@array/keyboard_layout_modes"
-            android:defaultValue="4"
+            android:defaultValue="5"
             />
 
     <CheckBoxPreference
diff --git a/java/src/com/android/inputmethod/latin/KeyboardSwitcher.java b/java/src/com/android/inputmethod/latin/KeyboardSwitcher.java
index 15a2279fa..5f78cb91e 100644
--- a/java/src/com/android/inputmethod/latin/KeyboardSwitcher.java
+++ b/java/src/com/android/inputmethod/latin/KeyboardSwitcher.java
@@ -40,11 +40,17 @@ public class KeyboardSwitcher implements SharedPreferences.OnSharedPreferenceCha
     public static final int MODE_WEB = 4;
     public static final int MODE_PHONE = 5;
 
-    public static final String DEFAULT_LAYOUT_ID = "4";
+    // Changing DEFAULT_LAYOUT_ID also requires prefs_for_debug.xml to be matched with.
+    public static final String DEFAULT_LAYOUT_ID = "5";
     public static final String PREF_KEYBOARD_LAYOUT = "pref_keyboard_layout_20100902";
     private static final int[] THEMES = new int [] {
-        R.layout.input_basic, R.layout.input_basic_highcontrast, R.layout.input_stone_normal,
-        R.layout.input_stone_bold, R.layout.input_gingerbread};
+        R.layout.input_basic,
+        R.layout.input_basic_highcontrast,
+        R.layout.input_stone_normal,
+        R.layout.input_stone_bold,
+        R.layout.input_gingerbread,
+        R.layout.input_honeycomb, // DEFAULT_LAYOUT_ID
+    };
 
     // Ids for each characters' color in the keyboard
     private static final int CHAR_THEME_COLOR_WHITE = 0;