diff --git a/java/res/drawable-sw600dp-hdpi/btn_keyboard_key_popup_selected_holo.9.png b/java/res/drawable-large-hdpi/btn_keyboard_key_popup_selected_holo.9.png
similarity index 100%
rename from java/res/drawable-sw600dp-hdpi/btn_keyboard_key_popup_selected_holo.9.png
rename to java/res/drawable-large-hdpi/btn_keyboard_key_popup_selected_holo.9.png
diff --git a/java/res/drawable-sw600dp-hdpi/hint_popup_holo.9.png b/java/res/drawable-large-hdpi/hint_popup_holo.9.png
similarity index 100%
rename from java/res/drawable-sw600dp-hdpi/hint_popup_holo.9.png
rename to java/res/drawable-large-hdpi/hint_popup_holo.9.png
diff --git a/java/res/drawable-sw600dp-hdpi/sym_keyboard_numsymbol_holo.png b/java/res/drawable-large-hdpi/sym_keyboard_numsymbol_holo.png
similarity index 100%
rename from java/res/drawable-sw600dp-hdpi/sym_keyboard_numsymbol_holo.png
rename to java/res/drawable-large-hdpi/sym_keyboard_numsymbol_holo.png
diff --git a/java/res/drawable-sw600dp-hdpi/sym_keyboard_tab_holo.png b/java/res/drawable-large-hdpi/sym_keyboard_tab_holo.png
similarity index 100%
rename from java/res/drawable-sw600dp-hdpi/sym_keyboard_tab_holo.png
rename to java/res/drawable-large-hdpi/sym_keyboard_tab_holo.png
diff --git a/java/res/drawable-sw600dp-land-hdpi/hint_popup_holo.9.png b/java/res/drawable-large-land-hdpi/hint_popup_holo.9.png
similarity index 100%
rename from java/res/drawable-sw600dp-land-hdpi/hint_popup_holo.9.png
rename to java/res/drawable-large-land-hdpi/hint_popup_holo.9.png
diff --git a/java/res/drawable-sw600dp-land-mdpi/hint_popup_holo.9.png b/java/res/drawable-large-land-mdpi/hint_popup_holo.9.png
similarity index 100%
rename from java/res/drawable-sw600dp-land-mdpi/hint_popup_holo.9.png
rename to java/res/drawable-large-land-mdpi/hint_popup_holo.9.png
diff --git a/java/res/drawable-sw600dp-land-xhdpi/hint_popup_holo.9.png b/java/res/drawable-large-land-xhdpi/hint_popup_holo.9.png
similarity index 100%
rename from java/res/drawable-sw600dp-land-xhdpi/hint_popup_holo.9.png
rename to java/res/drawable-large-land-xhdpi/hint_popup_holo.9.png
diff --git a/java/res/drawable-sw600dp-mdpi/btn_keyboard_key_dark_normal_holo.9.png b/java/res/drawable-large-mdpi/btn_keyboard_key_dark_normal_holo.9.png
similarity index 100%
rename from java/res/drawable-sw600dp-mdpi/btn_keyboard_key_dark_normal_holo.9.png
rename to java/res/drawable-large-mdpi/btn_keyboard_key_dark_normal_holo.9.png
diff --git a/java/res/drawable-sw600dp-mdpi/btn_keyboard_key_dark_normal_off_holo.9.png b/java/res/drawable-large-mdpi/btn_keyboard_key_dark_normal_off_holo.9.png
similarity index 100%
rename from java/res/drawable-sw600dp-mdpi/btn_keyboard_key_dark_normal_off_holo.9.png
rename to java/res/drawable-large-mdpi/btn_keyboard_key_dark_normal_off_holo.9.png
diff --git a/java/res/drawable-sw600dp-mdpi/btn_keyboard_key_dark_normal_on_holo.9.png b/java/res/drawable-large-mdpi/btn_keyboard_key_dark_normal_on_holo.9.png
similarity index 100%
rename from java/res/drawable-sw600dp-mdpi/btn_keyboard_key_dark_normal_on_holo.9.png
rename to java/res/drawable-large-mdpi/btn_keyboard_key_dark_normal_on_holo.9.png
diff --git a/java/res/drawable-sw600dp-mdpi/btn_keyboard_key_dark_pressed_holo.9.png b/java/res/drawable-large-mdpi/btn_keyboard_key_dark_pressed_holo.9.png
similarity index 100%
rename from java/res/drawable-sw600dp-mdpi/btn_keyboard_key_dark_pressed_holo.9.png
rename to java/res/drawable-large-mdpi/btn_keyboard_key_dark_pressed_holo.9.png
diff --git a/java/res/drawable-sw600dp-mdpi/btn_keyboard_key_dark_pressed_off_holo.9.png b/java/res/drawable-large-mdpi/btn_keyboard_key_dark_pressed_off_holo.9.png
similarity index 100%
rename from java/res/drawable-sw600dp-mdpi/btn_keyboard_key_dark_pressed_off_holo.9.png
rename to java/res/drawable-large-mdpi/btn_keyboard_key_dark_pressed_off_holo.9.png
diff --git a/java/res/drawable-sw600dp-mdpi/btn_keyboard_key_dark_pressed_on_holo.9.png b/java/res/drawable-large-mdpi/btn_keyboard_key_dark_pressed_on_holo.9.png
similarity index 100%
rename from java/res/drawable-sw600dp-mdpi/btn_keyboard_key_dark_pressed_on_holo.9.png
rename to java/res/drawable-large-mdpi/btn_keyboard_key_dark_pressed_on_holo.9.png
diff --git a/java/res/drawable-sw600dp-mdpi/btn_keyboard_key_light_normal_holo.9.png b/java/res/drawable-large-mdpi/btn_keyboard_key_light_normal_holo.9.png
similarity index 100%
rename from java/res/drawable-sw600dp-mdpi/btn_keyboard_key_light_normal_holo.9.png
rename to java/res/drawable-large-mdpi/btn_keyboard_key_light_normal_holo.9.png
diff --git a/java/res/drawable-sw600dp-mdpi/btn_keyboard_key_light_pressed_holo.9.png b/java/res/drawable-large-mdpi/btn_keyboard_key_light_pressed_holo.9.png
similarity index 100%
rename from java/res/drawable-sw600dp-mdpi/btn_keyboard_key_light_pressed_holo.9.png
rename to java/res/drawable-large-mdpi/btn_keyboard_key_light_pressed_holo.9.png
diff --git a/java/res/drawable-sw600dp-mdpi/btn_keyboard_key_popup_selected_holo.9.png b/java/res/drawable-large-mdpi/btn_keyboard_key_popup_selected_holo.9.png
similarity index 100%
rename from java/res/drawable-sw600dp-mdpi/btn_keyboard_key_popup_selected_holo.9.png
rename to java/res/drawable-large-mdpi/btn_keyboard_key_popup_selected_holo.9.png
diff --git a/java/res/drawable-sw600dp-mdpi/hint_popup_holo.9.png b/java/res/drawable-large-mdpi/hint_popup_holo.9.png
similarity index 100%
rename from java/res/drawable-sw600dp-mdpi/hint_popup_holo.9.png
rename to java/res/drawable-large-mdpi/hint_popup_holo.9.png
diff --git a/java/res/drawable-sw600dp-mdpi/keyboard_background_holo.9.png b/java/res/drawable-large-mdpi/keyboard_background_holo.9.png
similarity index 100%
rename from java/res/drawable-sw600dp-mdpi/keyboard_background_holo.9.png
rename to java/res/drawable-large-mdpi/keyboard_background_holo.9.png
diff --git a/java/res/drawable-sw600dp-mdpi/keyboard_popup_panel_background_holo.9.png b/java/res/drawable-large-mdpi/keyboard_popup_panel_background_holo.9.png
similarity index 100%
rename from java/res/drawable-sw600dp-mdpi/keyboard_popup_panel_background_holo.9.png
rename to java/res/drawable-large-mdpi/keyboard_popup_panel_background_holo.9.png
diff --git a/java/res/drawable-sw600dp-mdpi/keyboard_suggest_strip_holo.9.png b/java/res/drawable-large-mdpi/keyboard_suggest_strip_holo.9.png
similarity index 100%
rename from java/res/drawable-sw600dp-mdpi/keyboard_suggest_strip_holo.9.png
rename to java/res/drawable-large-mdpi/keyboard_suggest_strip_holo.9.png
diff --git a/java/res/drawable-sw600dp-mdpi/sym_keyboard_delete_holo.png b/java/res/drawable-large-mdpi/sym_keyboard_delete_holo.png
similarity index 100%
rename from java/res/drawable-sw600dp-mdpi/sym_keyboard_delete_holo.png
rename to java/res/drawable-large-mdpi/sym_keyboard_delete_holo.png
diff --git a/java/res/drawable-sw600dp-mdpi/sym_keyboard_num0_holo.png b/java/res/drawable-large-mdpi/sym_keyboard_num0_holo.png
similarity index 100%
rename from java/res/drawable-sw600dp-mdpi/sym_keyboard_num0_holo.png
rename to java/res/drawable-large-mdpi/sym_keyboard_num0_holo.png
diff --git a/java/res/drawable-sw600dp-mdpi/sym_keyboard_num1_holo.png b/java/res/drawable-large-mdpi/sym_keyboard_num1_holo.png
similarity index 100%
rename from java/res/drawable-sw600dp-mdpi/sym_keyboard_num1_holo.png
rename to java/res/drawable-large-mdpi/sym_keyboard_num1_holo.png
diff --git a/java/res/drawable-sw600dp-mdpi/sym_keyboard_num2_holo.png b/java/res/drawable-large-mdpi/sym_keyboard_num2_holo.png
similarity index 100%
rename from java/res/drawable-sw600dp-mdpi/sym_keyboard_num2_holo.png
rename to java/res/drawable-large-mdpi/sym_keyboard_num2_holo.png
diff --git a/java/res/drawable-sw600dp-mdpi/sym_keyboard_num3_holo.png b/java/res/drawable-large-mdpi/sym_keyboard_num3_holo.png
similarity index 100%
rename from java/res/drawable-sw600dp-mdpi/sym_keyboard_num3_holo.png
rename to java/res/drawable-large-mdpi/sym_keyboard_num3_holo.png
diff --git a/java/res/drawable-sw600dp-mdpi/sym_keyboard_num4_holo.png b/java/res/drawable-large-mdpi/sym_keyboard_num4_holo.png
similarity index 100%
rename from java/res/drawable-sw600dp-mdpi/sym_keyboard_num4_holo.png
rename to java/res/drawable-large-mdpi/sym_keyboard_num4_holo.png
diff --git a/java/res/drawable-sw600dp-mdpi/sym_keyboard_num5_holo.png b/java/res/drawable-large-mdpi/sym_keyboard_num5_holo.png
similarity index 100%
rename from java/res/drawable-sw600dp-mdpi/sym_keyboard_num5_holo.png
rename to java/res/drawable-large-mdpi/sym_keyboard_num5_holo.png
diff --git a/java/res/drawable-sw600dp-mdpi/sym_keyboard_num6_holo.png b/java/res/drawable-large-mdpi/sym_keyboard_num6_holo.png
similarity index 100%
rename from java/res/drawable-sw600dp-mdpi/sym_keyboard_num6_holo.png
rename to java/res/drawable-large-mdpi/sym_keyboard_num6_holo.png
diff --git a/java/res/drawable-sw600dp-mdpi/sym_keyboard_num7_holo.png b/java/res/drawable-large-mdpi/sym_keyboard_num7_holo.png
similarity index 100%
rename from java/res/drawable-sw600dp-mdpi/sym_keyboard_num7_holo.png
rename to java/res/drawable-large-mdpi/sym_keyboard_num7_holo.png
diff --git a/java/res/drawable-sw600dp-mdpi/sym_keyboard_num8_holo.png b/java/res/drawable-large-mdpi/sym_keyboard_num8_holo.png
similarity index 100%
rename from java/res/drawable-sw600dp-mdpi/sym_keyboard_num8_holo.png
rename to java/res/drawable-large-mdpi/sym_keyboard_num8_holo.png
diff --git a/java/res/drawable-sw600dp-mdpi/sym_keyboard_num9_holo.png b/java/res/drawable-large-mdpi/sym_keyboard_num9_holo.png
similarity index 100%
rename from java/res/drawable-sw600dp-mdpi/sym_keyboard_num9_holo.png
rename to java/res/drawable-large-mdpi/sym_keyboard_num9_holo.png
diff --git a/java/res/drawable-sw600dp-mdpi/sym_keyboard_numbpound_holo.png b/java/res/drawable-large-mdpi/sym_keyboard_numbpound_holo.png
similarity index 100%
rename from java/res/drawable-sw600dp-mdpi/sym_keyboard_numbpound_holo.png
rename to java/res/drawable-large-mdpi/sym_keyboard_numbpound_holo.png
diff --git a/java/res/drawable-sw600dp-mdpi/sym_keyboard_numbstar_holo.png b/java/res/drawable-large-mdpi/sym_keyboard_numbstar_holo.png
similarity index 100%
rename from java/res/drawable-sw600dp-mdpi/sym_keyboard_numbstar_holo.png
rename to java/res/drawable-large-mdpi/sym_keyboard_numbstar_holo.png
diff --git a/java/res/drawable-sw600dp-mdpi/sym_keyboard_numsymbol_holo.png b/java/res/drawable-large-mdpi/sym_keyboard_numsymbol_holo.png
similarity index 100%
rename from java/res/drawable-sw600dp-mdpi/sym_keyboard_numsymbol_holo.png
rename to java/res/drawable-large-mdpi/sym_keyboard_numsymbol_holo.png
diff --git a/java/res/drawable-sw600dp-mdpi/sym_keyboard_return_holo.png b/java/res/drawable-large-mdpi/sym_keyboard_return_holo.png
similarity index 100%
rename from java/res/drawable-sw600dp-mdpi/sym_keyboard_return_holo.png
rename to java/res/drawable-large-mdpi/sym_keyboard_return_holo.png
diff --git a/java/res/drawable-sw600dp-mdpi/sym_keyboard_settings_holo.png b/java/res/drawable-large-mdpi/sym_keyboard_settings_holo.png
similarity index 100%
rename from java/res/drawable-sw600dp-mdpi/sym_keyboard_settings_holo.png
rename to java/res/drawable-large-mdpi/sym_keyboard_settings_holo.png
diff --git a/java/res/drawable-sw600dp-mdpi/sym_keyboard_shift_holo.png b/java/res/drawable-large-mdpi/sym_keyboard_shift_holo.png
similarity index 100%
rename from java/res/drawable-sw600dp-mdpi/sym_keyboard_shift_holo.png
rename to java/res/drawable-large-mdpi/sym_keyboard_shift_holo.png
diff --git a/java/res/drawable-sw600dp-mdpi/sym_keyboard_shift_locked_holo.png b/java/res/drawable-large-mdpi/sym_keyboard_shift_locked_holo.png
similarity index 100%
rename from java/res/drawable-sw600dp-mdpi/sym_keyboard_shift_locked_holo.png
rename to java/res/drawable-large-mdpi/sym_keyboard_shift_locked_holo.png
diff --git a/java/res/drawable-sw600dp-mdpi/sym_keyboard_space_holo.png b/java/res/drawable-large-mdpi/sym_keyboard_space_holo.png
similarity index 100%
rename from java/res/drawable-sw600dp-mdpi/sym_keyboard_space_holo.png
rename to java/res/drawable-large-mdpi/sym_keyboard_space_holo.png
diff --git a/java/res/drawable-sw600dp-mdpi/sym_keyboard_tab_holo.png b/java/res/drawable-large-mdpi/sym_keyboard_tab_holo.png
similarity index 100%
rename from java/res/drawable-sw600dp-mdpi/sym_keyboard_tab_holo.png
rename to java/res/drawable-large-mdpi/sym_keyboard_tab_holo.png
diff --git a/java/res/drawable-sw600dp-mdpi/sym_keyboard_voice_holo.png b/java/res/drawable-large-mdpi/sym_keyboard_voice_holo.png
similarity index 100%
rename from java/res/drawable-sw600dp-mdpi/sym_keyboard_voice_holo.png
rename to java/res/drawable-large-mdpi/sym_keyboard_voice_holo.png
diff --git a/java/res/drawable-sw600dp-mdpi/sym_keyboard_voice_off_holo.png b/java/res/drawable-large-mdpi/sym_keyboard_voice_off_holo.png
similarity index 100%
rename from java/res/drawable-sw600dp-mdpi/sym_keyboard_voice_off_holo.png
rename to java/res/drawable-large-mdpi/sym_keyboard_voice_off_holo.png
diff --git a/java/res/drawable-sw600dp-xhdpi/btn_keyboard_key_popup_selected_holo.9.png b/java/res/drawable-large-xhdpi/btn_keyboard_key_popup_selected_holo.9.png
similarity index 100%
rename from java/res/drawable-sw600dp-xhdpi/btn_keyboard_key_popup_selected_holo.9.png
rename to java/res/drawable-large-xhdpi/btn_keyboard_key_popup_selected_holo.9.png
diff --git a/java/res/drawable-sw600dp-xhdpi/hint_popup_holo.9.png b/java/res/drawable-large-xhdpi/hint_popup_holo.9.png
similarity index 100%
rename from java/res/drawable-sw600dp-xhdpi/hint_popup_holo.9.png
rename to java/res/drawable-large-xhdpi/hint_popup_holo.9.png
diff --git a/java/res/drawable-sw600dp-xhdpi/sym_keyboard_numsymbol_holo.png b/java/res/drawable-large-xhdpi/sym_keyboard_numsymbol_holo.png
similarity index 100%
rename from java/res/drawable-sw600dp-xhdpi/sym_keyboard_numsymbol_holo.png
rename to java/res/drawable-large-xhdpi/sym_keyboard_numsymbol_holo.png
diff --git a/java/res/drawable-sw600dp-xhdpi/sym_keyboard_tab_holo.png b/java/res/drawable-large-xhdpi/sym_keyboard_tab_holo.png
similarity index 100%
rename from java/res/drawable-sw600dp-xhdpi/sym_keyboard_tab_holo.png
rename to java/res/drawable-large-xhdpi/sym_keyboard_tab_holo.png
diff --git a/java/res/drawable-sw768dp-hdpi/btn_keyboard_key_popup_selected_holo.9.png b/java/res/drawable-xlarge-hdpi/btn_keyboard_key_popup_selected_holo.9.png
similarity index 100%
rename from java/res/drawable-sw768dp-hdpi/btn_keyboard_key_popup_selected_holo.9.png
rename to java/res/drawable-xlarge-hdpi/btn_keyboard_key_popup_selected_holo.9.png
diff --git a/java/res/drawable-sw768dp-hdpi/hint_popup_holo.9.png b/java/res/drawable-xlarge-hdpi/hint_popup_holo.9.png
similarity index 100%
rename from java/res/drawable-sw768dp-hdpi/hint_popup_holo.9.png
rename to java/res/drawable-xlarge-hdpi/hint_popup_holo.9.png
diff --git a/java/res/drawable-sw768dp-land-hdpi/hint_popup_holo.9.png b/java/res/drawable-xlarge-land-hdpi/hint_popup_holo.9.png
similarity index 100%
rename from java/res/drawable-sw768dp-land-hdpi/hint_popup_holo.9.png
rename to java/res/drawable-xlarge-land-hdpi/hint_popup_holo.9.png
diff --git a/java/res/drawable-sw768dp-land-mdpi/hint_popup_holo.9.png b/java/res/drawable-xlarge-land-mdpi/hint_popup_holo.9.png
similarity index 100%
rename from java/res/drawable-sw768dp-land-mdpi/hint_popup_holo.9.png
rename to java/res/drawable-xlarge-land-mdpi/hint_popup_holo.9.png
diff --git a/java/res/drawable-sw768dp-land-xhdpi/hint_popup_holo.9.png b/java/res/drawable-xlarge-land-xhdpi/hint_popup_holo.9.png
similarity index 100%
rename from java/res/drawable-sw768dp-land-xhdpi/hint_popup_holo.9.png
rename to java/res/drawable-xlarge-land-xhdpi/hint_popup_holo.9.png
diff --git a/java/res/drawable-sw768dp-mdpi/btn_keyboard_key_dark_normal_holo.9.png b/java/res/drawable-xlarge-mdpi/btn_keyboard_key_dark_normal_holo.9.png
similarity index 100%
rename from java/res/drawable-sw768dp-mdpi/btn_keyboard_key_dark_normal_holo.9.png
rename to java/res/drawable-xlarge-mdpi/btn_keyboard_key_dark_normal_holo.9.png
diff --git a/java/res/drawable-sw768dp-mdpi/btn_keyboard_key_dark_normal_off_holo.9.png b/java/res/drawable-xlarge-mdpi/btn_keyboard_key_dark_normal_off_holo.9.png
similarity index 100%
rename from java/res/drawable-sw768dp-mdpi/btn_keyboard_key_dark_normal_off_holo.9.png
rename to java/res/drawable-xlarge-mdpi/btn_keyboard_key_dark_normal_off_holo.9.png
diff --git a/java/res/drawable-sw768dp-mdpi/btn_keyboard_key_dark_normal_on_holo.9.png b/java/res/drawable-xlarge-mdpi/btn_keyboard_key_dark_normal_on_holo.9.png
similarity index 100%
rename from java/res/drawable-sw768dp-mdpi/btn_keyboard_key_dark_normal_on_holo.9.png
rename to java/res/drawable-xlarge-mdpi/btn_keyboard_key_dark_normal_on_holo.9.png
diff --git a/java/res/drawable-sw768dp-mdpi/btn_keyboard_key_dark_pressed_holo.9.png b/java/res/drawable-xlarge-mdpi/btn_keyboard_key_dark_pressed_holo.9.png
similarity index 100%
rename from java/res/drawable-sw768dp-mdpi/btn_keyboard_key_dark_pressed_holo.9.png
rename to java/res/drawable-xlarge-mdpi/btn_keyboard_key_dark_pressed_holo.9.png
diff --git a/java/res/drawable-sw768dp-mdpi/btn_keyboard_key_dark_pressed_off_holo.9.png b/java/res/drawable-xlarge-mdpi/btn_keyboard_key_dark_pressed_off_holo.9.png
similarity index 100%
rename from java/res/drawable-sw768dp-mdpi/btn_keyboard_key_dark_pressed_off_holo.9.png
rename to java/res/drawable-xlarge-mdpi/btn_keyboard_key_dark_pressed_off_holo.9.png
diff --git a/java/res/drawable-sw768dp-mdpi/btn_keyboard_key_dark_pressed_on_holo.9.png b/java/res/drawable-xlarge-mdpi/btn_keyboard_key_dark_pressed_on_holo.9.png
similarity index 100%
rename from java/res/drawable-sw768dp-mdpi/btn_keyboard_key_dark_pressed_on_holo.9.png
rename to java/res/drawable-xlarge-mdpi/btn_keyboard_key_dark_pressed_on_holo.9.png
diff --git a/java/res/drawable-sw768dp-mdpi/btn_keyboard_key_light_normal_holo.9.png b/java/res/drawable-xlarge-mdpi/btn_keyboard_key_light_normal_holo.9.png
similarity index 100%
rename from java/res/drawable-sw768dp-mdpi/btn_keyboard_key_light_normal_holo.9.png
rename to java/res/drawable-xlarge-mdpi/btn_keyboard_key_light_normal_holo.9.png
diff --git a/java/res/drawable-sw768dp-mdpi/btn_keyboard_key_light_pressed_holo.9.png b/java/res/drawable-xlarge-mdpi/btn_keyboard_key_light_pressed_holo.9.png
similarity index 100%
rename from java/res/drawable-sw768dp-mdpi/btn_keyboard_key_light_pressed_holo.9.png
rename to java/res/drawable-xlarge-mdpi/btn_keyboard_key_light_pressed_holo.9.png
diff --git a/java/res/drawable-sw768dp-mdpi/btn_keyboard_key_popup_selected_holo.9.png b/java/res/drawable-xlarge-mdpi/btn_keyboard_key_popup_selected_holo.9.png
similarity index 100%
rename from java/res/drawable-sw768dp-mdpi/btn_keyboard_key_popup_selected_holo.9.png
rename to java/res/drawable-xlarge-mdpi/btn_keyboard_key_popup_selected_holo.9.png
diff --git a/java/res/drawable-sw768dp-mdpi/hint_popup_holo.9.png b/java/res/drawable-xlarge-mdpi/hint_popup_holo.9.png
similarity index 100%
rename from java/res/drawable-sw768dp-mdpi/hint_popup_holo.9.png
rename to java/res/drawable-xlarge-mdpi/hint_popup_holo.9.png
diff --git a/java/res/drawable-sw768dp-mdpi/keyboard_background_holo.9.png b/java/res/drawable-xlarge-mdpi/keyboard_background_holo.9.png
similarity index 100%
rename from java/res/drawable-sw768dp-mdpi/keyboard_background_holo.9.png
rename to java/res/drawable-xlarge-mdpi/keyboard_background_holo.9.png
diff --git a/java/res/drawable-sw768dp-mdpi/keyboard_popup_panel_background_holo.9.png b/java/res/drawable-xlarge-mdpi/keyboard_popup_panel_background_holo.9.png
similarity index 100%
rename from java/res/drawable-sw768dp-mdpi/keyboard_popup_panel_background_holo.9.png
rename to java/res/drawable-xlarge-mdpi/keyboard_popup_panel_background_holo.9.png
diff --git a/java/res/drawable-sw768dp-mdpi/keyboard_suggest_strip_holo.9.png b/java/res/drawable-xlarge-mdpi/keyboard_suggest_strip_holo.9.png
similarity index 100%
rename from java/res/drawable-sw768dp-mdpi/keyboard_suggest_strip_holo.9.png
rename to java/res/drawable-xlarge-mdpi/keyboard_suggest_strip_holo.9.png
diff --git a/java/res/drawable-sw768dp-mdpi/sym_keyboard_delete_holo.png b/java/res/drawable-xlarge-mdpi/sym_keyboard_delete_holo.png
similarity index 100%
rename from java/res/drawable-sw768dp-mdpi/sym_keyboard_delete_holo.png
rename to java/res/drawable-xlarge-mdpi/sym_keyboard_delete_holo.png
diff --git a/java/res/drawable-sw768dp-mdpi/sym_keyboard_num0_holo.png b/java/res/drawable-xlarge-mdpi/sym_keyboard_num0_holo.png
similarity index 100%
rename from java/res/drawable-sw768dp-mdpi/sym_keyboard_num0_holo.png
rename to java/res/drawable-xlarge-mdpi/sym_keyboard_num0_holo.png
diff --git a/java/res/drawable-sw768dp-mdpi/sym_keyboard_num1_holo.png b/java/res/drawable-xlarge-mdpi/sym_keyboard_num1_holo.png
similarity index 100%
rename from java/res/drawable-sw768dp-mdpi/sym_keyboard_num1_holo.png
rename to java/res/drawable-xlarge-mdpi/sym_keyboard_num1_holo.png
diff --git a/java/res/drawable-sw768dp-mdpi/sym_keyboard_num2_holo.png b/java/res/drawable-xlarge-mdpi/sym_keyboard_num2_holo.png
similarity index 100%
rename from java/res/drawable-sw768dp-mdpi/sym_keyboard_num2_holo.png
rename to java/res/drawable-xlarge-mdpi/sym_keyboard_num2_holo.png
diff --git a/java/res/drawable-sw768dp-mdpi/sym_keyboard_num3_holo.png b/java/res/drawable-xlarge-mdpi/sym_keyboard_num3_holo.png
similarity index 100%
rename from java/res/drawable-sw768dp-mdpi/sym_keyboard_num3_holo.png
rename to java/res/drawable-xlarge-mdpi/sym_keyboard_num3_holo.png
diff --git a/java/res/drawable-sw768dp-mdpi/sym_keyboard_num4_holo.png b/java/res/drawable-xlarge-mdpi/sym_keyboard_num4_holo.png
similarity index 100%
rename from java/res/drawable-sw768dp-mdpi/sym_keyboard_num4_holo.png
rename to java/res/drawable-xlarge-mdpi/sym_keyboard_num4_holo.png
diff --git a/java/res/drawable-sw768dp-mdpi/sym_keyboard_num5_holo.png b/java/res/drawable-xlarge-mdpi/sym_keyboard_num5_holo.png
similarity index 100%
rename from java/res/drawable-sw768dp-mdpi/sym_keyboard_num5_holo.png
rename to java/res/drawable-xlarge-mdpi/sym_keyboard_num5_holo.png
diff --git a/java/res/drawable-sw768dp-mdpi/sym_keyboard_num6_holo.png b/java/res/drawable-xlarge-mdpi/sym_keyboard_num6_holo.png
similarity index 100%
rename from java/res/drawable-sw768dp-mdpi/sym_keyboard_num6_holo.png
rename to java/res/drawable-xlarge-mdpi/sym_keyboard_num6_holo.png
diff --git a/java/res/drawable-sw768dp-mdpi/sym_keyboard_num7_holo.png b/java/res/drawable-xlarge-mdpi/sym_keyboard_num7_holo.png
similarity index 100%
rename from java/res/drawable-sw768dp-mdpi/sym_keyboard_num7_holo.png
rename to java/res/drawable-xlarge-mdpi/sym_keyboard_num7_holo.png
diff --git a/java/res/drawable-sw768dp-mdpi/sym_keyboard_num8_holo.png b/java/res/drawable-xlarge-mdpi/sym_keyboard_num8_holo.png
similarity index 100%
rename from java/res/drawable-sw768dp-mdpi/sym_keyboard_num8_holo.png
rename to java/res/drawable-xlarge-mdpi/sym_keyboard_num8_holo.png
diff --git a/java/res/drawable-sw768dp-mdpi/sym_keyboard_num9_holo.png b/java/res/drawable-xlarge-mdpi/sym_keyboard_num9_holo.png
similarity index 100%
rename from java/res/drawable-sw768dp-mdpi/sym_keyboard_num9_holo.png
rename to java/res/drawable-xlarge-mdpi/sym_keyboard_num9_holo.png
diff --git a/java/res/drawable-sw768dp-mdpi/sym_keyboard_numbpound_holo.png b/java/res/drawable-xlarge-mdpi/sym_keyboard_numbpound_holo.png
similarity index 100%
rename from java/res/drawable-sw768dp-mdpi/sym_keyboard_numbpound_holo.png
rename to java/res/drawable-xlarge-mdpi/sym_keyboard_numbpound_holo.png
diff --git a/java/res/drawable-sw768dp-mdpi/sym_keyboard_numbstar_holo.png b/java/res/drawable-xlarge-mdpi/sym_keyboard_numbstar_holo.png
similarity index 100%
rename from java/res/drawable-sw768dp-mdpi/sym_keyboard_numbstar_holo.png
rename to java/res/drawable-xlarge-mdpi/sym_keyboard_numbstar_holo.png
diff --git a/java/res/drawable-sw768dp-mdpi/sym_keyboard_return_holo.png b/java/res/drawable-xlarge-mdpi/sym_keyboard_return_holo.png
similarity index 100%
rename from java/res/drawable-sw768dp-mdpi/sym_keyboard_return_holo.png
rename to java/res/drawable-xlarge-mdpi/sym_keyboard_return_holo.png
diff --git a/java/res/drawable-sw768dp-mdpi/sym_keyboard_settings_holo.png b/java/res/drawable-xlarge-mdpi/sym_keyboard_settings_holo.png
similarity index 100%
rename from java/res/drawable-sw768dp-mdpi/sym_keyboard_settings_holo.png
rename to java/res/drawable-xlarge-mdpi/sym_keyboard_settings_holo.png
diff --git a/java/res/drawable-sw768dp-mdpi/sym_keyboard_shift_holo.png b/java/res/drawable-xlarge-mdpi/sym_keyboard_shift_holo.png
similarity index 100%
rename from java/res/drawable-sw768dp-mdpi/sym_keyboard_shift_holo.png
rename to java/res/drawable-xlarge-mdpi/sym_keyboard_shift_holo.png
diff --git a/java/res/drawable-sw768dp-mdpi/sym_keyboard_shift_locked_holo.png b/java/res/drawable-xlarge-mdpi/sym_keyboard_shift_locked_holo.png
similarity index 100%
rename from java/res/drawable-sw768dp-mdpi/sym_keyboard_shift_locked_holo.png
rename to java/res/drawable-xlarge-mdpi/sym_keyboard_shift_locked_holo.png
diff --git a/java/res/drawable-sw768dp-mdpi/sym_keyboard_space_holo.png b/java/res/drawable-xlarge-mdpi/sym_keyboard_space_holo.png
similarity index 100%
rename from java/res/drawable-sw768dp-mdpi/sym_keyboard_space_holo.png
rename to java/res/drawable-xlarge-mdpi/sym_keyboard_space_holo.png
diff --git a/java/res/drawable-sw768dp-mdpi/sym_keyboard_voice_holo.png b/java/res/drawable-xlarge-mdpi/sym_keyboard_voice_holo.png
similarity index 100%
rename from java/res/drawable-sw768dp-mdpi/sym_keyboard_voice_holo.png
rename to java/res/drawable-xlarge-mdpi/sym_keyboard_voice_holo.png
diff --git a/java/res/drawable-sw768dp-mdpi/sym_keyboard_voice_off_holo.png b/java/res/drawable-xlarge-mdpi/sym_keyboard_voice_off_holo.png
similarity index 100%
rename from java/res/drawable-sw768dp-mdpi/sym_keyboard_voice_off_holo.png
rename to java/res/drawable-xlarge-mdpi/sym_keyboard_voice_off_holo.png
diff --git a/java/res/drawable-sw768dp-xhdpi/btn_keyboard_key_popup_selected_holo.9.png b/java/res/drawable-xlarge-xhdpi/btn_keyboard_key_popup_selected_holo.9.png
similarity index 100%
rename from java/res/drawable-sw768dp-xhdpi/btn_keyboard_key_popup_selected_holo.9.png
rename to java/res/drawable-xlarge-xhdpi/btn_keyboard_key_popup_selected_holo.9.png
diff --git a/java/res/drawable-sw768dp-xhdpi/hint_popup_holo.9.png b/java/res/drawable-xlarge-xhdpi/hint_popup_holo.9.png
similarity index 100%
rename from java/res/drawable-sw768dp-xhdpi/hint_popup_holo.9.png
rename to java/res/drawable-xlarge-xhdpi/hint_popup_holo.9.png
diff --git a/java/res/layout-sw768dp/recognition_status.xml b/java/res/layout-xlarge/recognition_status.xml
similarity index 100%
rename from java/res/layout-sw768dp/recognition_status.xml
rename to java/res/layout-xlarge/recognition_status.xml
diff --git a/java/res/values-sw600dp-land/dimens.xml b/java/res/values-large-land/dimens.xml
similarity index 100%
rename from java/res/values-sw600dp-land/dimens.xml
rename to java/res/values-large-land/dimens.xml
diff --git a/java/res/values-sw600dp/config.xml b/java/res/values-large/config.xml
similarity index 100%
rename from java/res/values-sw600dp/config.xml
rename to java/res/values-large/config.xml
diff --git a/java/res/values-sw600dp/dimens.xml b/java/res/values-large/dimens.xml
similarity index 100%
rename from java/res/values-sw600dp/dimens.xml
rename to java/res/values-large/dimens.xml
diff --git a/java/res/values-sw600dp/donottranslate.xml b/java/res/values-large/donottranslate.xml
similarity index 100%
rename from java/res/values-sw600dp/donottranslate.xml
rename to java/res/values-large/donottranslate.xml
diff --git a/java/res/values-sw768dp-land/dimens.xml b/java/res/values-xlarge-land/dimens.xml
similarity index 100%
rename from java/res/values-sw768dp-land/dimens.xml
rename to java/res/values-xlarge-land/dimens.xml
diff --git a/java/res/values-sw768dp/config.xml b/java/res/values-xlarge/config.xml
similarity index 100%
rename from java/res/values-sw768dp/config.xml
rename to java/res/values-xlarge/config.xml
diff --git a/java/res/values-sw768dp/dimens.xml b/java/res/values-xlarge/dimens.xml
similarity index 100%
rename from java/res/values-sw768dp/dimens.xml
rename to java/res/values-xlarge/dimens.xml
diff --git a/java/res/values-sw768dp/donottranslate.xml b/java/res/values-xlarge/donottranslate.xml
similarity index 100%
rename from java/res/values-sw768dp/donottranslate.xml
rename to java/res/values-xlarge/donottranslate.xml
diff --git a/java/res/values/keyboard-icons-ics.xml b/java/res/values/keyboard-icons-ics.xml
index 3029695e6..9507d74da 100644
--- a/java/res/values/keyboard-icons-ics.xml
+++ b/java/res/values/keyboard-icons-ics.xml
@@ -15,7 +15,7 @@
 -->
 
 <resources>
-    <style name="KeyboardIcons.IceCreamSandwich" parent="android:Theme.Holo">
+    <style name="KeyboardIcons.IceCreamSandwich" parent="android:Theme">
         <!-- Keyboard icons -->
 <!--         <item name="iconShiftKey">@drawable/sym_keyboard_shift_holo</item> -->
         <item name="iconShiftKey">@drawable/sym_keyboard_shift</item>
diff --git a/java/res/xml-sw600dp-land/kbd_popup_template.xml b/java/res/xml-large-land/kbd_popup_template.xml
similarity index 100%
rename from java/res/xml-sw600dp-land/kbd_popup_template.xml
rename to java/res/xml-large-land/kbd_popup_template.xml
diff --git a/java/res/xml-sw600dp/kbd_key_styles.xml b/java/res/xml-large/kbd_key_styles.xml
similarity index 100%
rename from java/res/xml-sw600dp/kbd_key_styles.xml
rename to java/res/xml-large/kbd_key_styles.xml
diff --git a/java/res/xml-sw600dp/kbd_number.xml b/java/res/xml-large/kbd_number.xml
similarity index 100%
rename from java/res/xml-sw600dp/kbd_number.xml
rename to java/res/xml-large/kbd_number.xml
diff --git a/java/res/xml-sw600dp/kbd_phone.xml b/java/res/xml-large/kbd_phone.xml
similarity index 100%
rename from java/res/xml-sw600dp/kbd_phone.xml
rename to java/res/xml-large/kbd_phone.xml
diff --git a/java/res/xml-sw600dp/kbd_phone_symbols.xml b/java/res/xml-large/kbd_phone_symbols.xml
similarity index 100%
rename from java/res/xml-sw600dp/kbd_phone_symbols.xml
rename to java/res/xml-large/kbd_phone_symbols.xml
diff --git a/java/res/xml-sw600dp/kbd_popup_template.xml b/java/res/xml-large/kbd_popup_template.xml
similarity index 100%
rename from java/res/xml-sw600dp/kbd_popup_template.xml
rename to java/res/xml-large/kbd_popup_template.xml
diff --git a/java/res/xml-sw600dp/kbd_qwerty_f2.xml b/java/res/xml-large/kbd_qwerty_f2.xml
similarity index 100%
rename from java/res/xml-sw600dp/kbd_qwerty_f2.xml
rename to java/res/xml-large/kbd_qwerty_f2.xml
diff --git a/java/res/xml-sw600dp/kbd_qwerty_row1.xml b/java/res/xml-large/kbd_qwerty_row1.xml
similarity index 100%
rename from java/res/xml-sw600dp/kbd_qwerty_row1.xml
rename to java/res/xml-large/kbd_qwerty_row1.xml
diff --git a/java/res/xml-sw600dp/kbd_qwerty_row2.xml b/java/res/xml-large/kbd_qwerty_row2.xml
similarity index 100%
rename from java/res/xml-sw600dp/kbd_qwerty_row2.xml
rename to java/res/xml-large/kbd_qwerty_row2.xml
diff --git a/java/res/xml-sw600dp/kbd_qwerty_row3.xml b/java/res/xml-large/kbd_qwerty_row3.xml
similarity index 100%
rename from java/res/xml-sw600dp/kbd_qwerty_row3.xml
rename to java/res/xml-large/kbd_qwerty_row3.xml
diff --git a/java/res/xml-sw600dp/kbd_qwerty_row4.xml b/java/res/xml-large/kbd_qwerty_row4.xml
similarity index 100%
rename from java/res/xml-sw600dp/kbd_qwerty_row4.xml
rename to java/res/xml-large/kbd_qwerty_row4.xml
diff --git a/java/res/xml-sw600dp/kbd_row3_right.xml b/java/res/xml-large/kbd_row3_right.xml
similarity index 100%
rename from java/res/xml-sw600dp/kbd_row3_right.xml
rename to java/res/xml-large/kbd_row3_right.xml
diff --git a/java/res/xml-sw600dp/kbd_rows_arabic.xml b/java/res/xml-large/kbd_rows_arabic.xml
similarity index 100%
rename from java/res/xml-sw600dp/kbd_rows_arabic.xml
rename to java/res/xml-large/kbd_rows_arabic.xml
diff --git a/java/res/xml-sw600dp/kbd_rows_azerty.xml b/java/res/xml-large/kbd_rows_azerty.xml
similarity index 100%
rename from java/res/xml-sw600dp/kbd_rows_azerty.xml
rename to java/res/xml-large/kbd_rows_azerty.xml
diff --git a/java/res/xml-sw600dp/kbd_rows_hebrew.xml b/java/res/xml-large/kbd_rows_hebrew.xml
similarity index 100%
rename from java/res/xml-sw600dp/kbd_rows_hebrew.xml
rename to java/res/xml-large/kbd_rows_hebrew.xml
diff --git a/java/res/xml-sw600dp/kbd_rows_qwerty.xml b/java/res/xml-large/kbd_rows_qwerty.xml
similarity index 100%
rename from java/res/xml-sw600dp/kbd_rows_qwerty.xml
rename to java/res/xml-large/kbd_rows_qwerty.xml
diff --git a/java/res/xml-sw600dp/kbd_rows_qwertz.xml b/java/res/xml-large/kbd_rows_qwertz.xml
similarity index 100%
rename from java/res/xml-sw600dp/kbd_rows_qwertz.xml
rename to java/res/xml-large/kbd_rows_qwertz.xml
diff --git a/java/res/xml-sw600dp/kbd_rows_russian.xml b/java/res/xml-large/kbd_rows_russian.xml
similarity index 100%
rename from java/res/xml-sw600dp/kbd_rows_russian.xml
rename to java/res/xml-large/kbd_rows_russian.xml
diff --git a/java/res/xml-sw600dp/kbd_rows_scandinavian.xml b/java/res/xml-large/kbd_rows_scandinavian.xml
similarity index 100%
rename from java/res/xml-sw600dp/kbd_rows_scandinavian.xml
rename to java/res/xml-large/kbd_rows_scandinavian.xml
diff --git a/java/res/xml-sw600dp/kbd_rows_serbian.xml b/java/res/xml-large/kbd_rows_serbian.xml
similarity index 100%
rename from java/res/xml-sw600dp/kbd_rows_serbian.xml
rename to java/res/xml-large/kbd_rows_serbian.xml
diff --git a/java/res/xml-sw600dp/kbd_rows_spanish.xml b/java/res/xml-large/kbd_rows_spanish.xml
similarity index 100%
rename from java/res/xml-sw600dp/kbd_rows_spanish.xml
rename to java/res/xml-large/kbd_rows_spanish.xml
diff --git a/java/res/xml-sw600dp/kbd_symbols.xml b/java/res/xml-large/kbd_symbols.xml
similarity index 100%
rename from java/res/xml-sw600dp/kbd_symbols.xml
rename to java/res/xml-large/kbd_symbols.xml
diff --git a/java/res/xml-sw600dp/kbd_symbols_shift.xml b/java/res/xml-large/kbd_symbols_shift.xml
similarity index 100%
rename from java/res/xml-sw600dp/kbd_symbols_shift.xml
rename to java/res/xml-large/kbd_symbols_shift.xml
diff --git a/java/res/xml-sw768dp-land/kbd_popup_template.xml b/java/res/xml-xlarge-land/kbd_popup_template.xml
similarity index 100%
rename from java/res/xml-sw768dp-land/kbd_popup_template.xml
rename to java/res/xml-xlarge-land/kbd_popup_template.xml
diff --git a/java/res/xml-sw768dp/kbd_key_styles.xml b/java/res/xml-xlarge/kbd_key_styles.xml
similarity index 100%
rename from java/res/xml-sw768dp/kbd_key_styles.xml
rename to java/res/xml-xlarge/kbd_key_styles.xml
diff --git a/java/res/xml-sw768dp/kbd_number.xml b/java/res/xml-xlarge/kbd_number.xml
similarity index 100%
rename from java/res/xml-sw768dp/kbd_number.xml
rename to java/res/xml-xlarge/kbd_number.xml
diff --git a/java/res/xml-sw768dp/kbd_phone.xml b/java/res/xml-xlarge/kbd_phone.xml
similarity index 100%
rename from java/res/xml-sw768dp/kbd_phone.xml
rename to java/res/xml-xlarge/kbd_phone.xml
diff --git a/java/res/xml-sw768dp/kbd_phone_symbols.xml b/java/res/xml-xlarge/kbd_phone_symbols.xml
similarity index 100%
rename from java/res/xml-sw768dp/kbd_phone_symbols.xml
rename to java/res/xml-xlarge/kbd_phone_symbols.xml
diff --git a/java/res/xml-sw768dp/kbd_popup_template.xml b/java/res/xml-xlarge/kbd_popup_template.xml
similarity index 100%
rename from java/res/xml-sw768dp/kbd_popup_template.xml
rename to java/res/xml-xlarge/kbd_popup_template.xml
diff --git a/java/res/xml-sw768dp/kbd_qwerty_row1.xml b/java/res/xml-xlarge/kbd_qwerty_row1.xml
similarity index 100%
rename from java/res/xml-sw768dp/kbd_qwerty_row1.xml
rename to java/res/xml-xlarge/kbd_qwerty_row1.xml
diff --git a/java/res/xml-sw768dp/kbd_qwerty_row2.xml b/java/res/xml-xlarge/kbd_qwerty_row2.xml
similarity index 100%
rename from java/res/xml-sw768dp/kbd_qwerty_row2.xml
rename to java/res/xml-xlarge/kbd_qwerty_row2.xml
diff --git a/java/res/xml-sw768dp/kbd_qwerty_row3.xml b/java/res/xml-xlarge/kbd_qwerty_row3.xml
similarity index 100%
rename from java/res/xml-sw768dp/kbd_qwerty_row3.xml
rename to java/res/xml-xlarge/kbd_qwerty_row3.xml
diff --git a/java/res/xml-sw768dp/kbd_qwerty_row4.xml b/java/res/xml-xlarge/kbd_qwerty_row4.xml
similarity index 100%
rename from java/res/xml-sw768dp/kbd_qwerty_row4.xml
rename to java/res/xml-xlarge/kbd_qwerty_row4.xml
diff --git a/java/res/xml-sw768dp/kbd_row3_right2.xml b/java/res/xml-xlarge/kbd_row3_right2.xml
similarity index 100%
rename from java/res/xml-sw768dp/kbd_row3_right2.xml
rename to java/res/xml-xlarge/kbd_row3_right2.xml
diff --git a/java/res/xml-sw768dp/kbd_rows_arabic.xml b/java/res/xml-xlarge/kbd_rows_arabic.xml
similarity index 100%
rename from java/res/xml-sw768dp/kbd_rows_arabic.xml
rename to java/res/xml-xlarge/kbd_rows_arabic.xml
diff --git a/java/res/xml-sw768dp/kbd_rows_azerty.xml b/java/res/xml-xlarge/kbd_rows_azerty.xml
similarity index 100%
rename from java/res/xml-sw768dp/kbd_rows_azerty.xml
rename to java/res/xml-xlarge/kbd_rows_azerty.xml
diff --git a/java/res/xml-sw768dp/kbd_rows_hebrew.xml b/java/res/xml-xlarge/kbd_rows_hebrew.xml
similarity index 100%
rename from java/res/xml-sw768dp/kbd_rows_hebrew.xml
rename to java/res/xml-xlarge/kbd_rows_hebrew.xml
diff --git a/java/res/xml-sw768dp/kbd_rows_qwerty.xml b/java/res/xml-xlarge/kbd_rows_qwerty.xml
similarity index 100%
rename from java/res/xml-sw768dp/kbd_rows_qwerty.xml
rename to java/res/xml-xlarge/kbd_rows_qwerty.xml
diff --git a/java/res/xml-sw768dp/kbd_rows_qwertz.xml b/java/res/xml-xlarge/kbd_rows_qwertz.xml
similarity index 100%
rename from java/res/xml-sw768dp/kbd_rows_qwertz.xml
rename to java/res/xml-xlarge/kbd_rows_qwertz.xml
diff --git a/java/res/xml-sw768dp/kbd_rows_russian.xml b/java/res/xml-xlarge/kbd_rows_russian.xml
similarity index 100%
rename from java/res/xml-sw768dp/kbd_rows_russian.xml
rename to java/res/xml-xlarge/kbd_rows_russian.xml
diff --git a/java/res/xml-sw768dp/kbd_rows_scandinavian.xml b/java/res/xml-xlarge/kbd_rows_scandinavian.xml
similarity index 100%
rename from java/res/xml-sw768dp/kbd_rows_scandinavian.xml
rename to java/res/xml-xlarge/kbd_rows_scandinavian.xml
diff --git a/java/res/xml-sw768dp/kbd_rows_serbian.xml b/java/res/xml-xlarge/kbd_rows_serbian.xml
similarity index 100%
rename from java/res/xml-sw768dp/kbd_rows_serbian.xml
rename to java/res/xml-xlarge/kbd_rows_serbian.xml
diff --git a/java/res/xml-sw768dp/kbd_rows_spanish.xml b/java/res/xml-xlarge/kbd_rows_spanish.xml
similarity index 100%
rename from java/res/xml-sw768dp/kbd_rows_spanish.xml
rename to java/res/xml-xlarge/kbd_rows_spanish.xml
diff --git a/java/res/xml-sw768dp/kbd_symbols.xml b/java/res/xml-xlarge/kbd_symbols.xml
similarity index 100%
rename from java/res/xml-sw768dp/kbd_symbols.xml
rename to java/res/xml-xlarge/kbd_symbols.xml
diff --git a/java/res/xml-sw768dp/kbd_symbols_shift.xml b/java/res/xml-xlarge/kbd_symbols_shift.xml
similarity index 100%
rename from java/res/xml-sw768dp/kbd_symbols_shift.xml
rename to java/res/xml-xlarge/kbd_symbols_shift.xml