146 files changed, 12 insertions, 238 deletions

diff --git a/java/Android.mk b/java/Android.mk
index 60c321ab2..1bbcd5315 100644
--- a/java/Android.mk
+++ b/java/Android.mk
@@ -9,7 +9,7 @@ LOCAL_PACKAGE_NAME := LatinIME
 
 LOCAL_CERTIFICATE := shared
 
-LOCAL_JNI_SHARED_LIBRARIES := libjni_latinime
+LOCAL_JNI_SHARED_LIBRARIES := libjni_latinime2
 
 LOCAL_STATIC_JAVA_LIBRARIES := android-common
 
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
index 544ed7f78..544ed7f78 100644
--- 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
diff --git a/java/res/drawable-sw600dp-hdpi/hint_popup_holo.9.png b/java/res/drawable-large-hdpi/hint_popup_holo.9.png
index 2ffc6ea2b..2ffc6ea2b 100644
--- a/java/res/drawable-sw600dp-hdpi/hint_popup_holo.9.png
+++ b/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
index 398eaea12..398eaea12 100644
--- a/java/res/drawable-sw600dp-hdpi/sym_keyboard_numsymbol_holo.png
+++ b/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
index 1780f682b..1780f682b 100644
--- a/java/res/drawable-sw600dp-hdpi/sym_keyboard_tab_holo.png
+++ b/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
index 2ffc6ea2b..2ffc6ea2b 100644
--- a/java/res/drawable-sw600dp-land-hdpi/hint_popup_holo.9.png
+++ b/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
index f5d15b728..f5d15b728 100644
--- a/java/res/drawable-sw600dp-land-mdpi/hint_popup_holo.9.png
+++ b/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
index bc37fa844..bc37fa844 100644
--- a/java/res/drawable-sw600dp-land-xhdpi/hint_popup_holo.9.png
+++ b/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
index 2ad73041e..2ad73041e 100644
--- 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
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
index fc21e79c4..fc21e79c4 100644
--- 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
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
index 76cfbb221..76cfbb221 100644
--- 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
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
index 73748c2fb..73748c2fb 100644
--- 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
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
index 059d4ac2e..059d4ac2e 100644
--- 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
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
index e5cfdec88..e5cfdec88 100644
--- 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
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
index 060524a53..060524a53 100644
--- 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
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
index f4b061e07..f4b061e07 100644
--- 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
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
index ffa7386df..ffa7386df 100644
--- 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
diff --git a/java/res/drawable-sw600dp-mdpi/hint_popup_holo.9.png b/java/res/drawable-large-mdpi/hint_popup_holo.9.png
index f5d15b728..f5d15b728 100644
--- a/java/res/drawable-sw600dp-mdpi/hint_popup_holo.9.png
+++ b/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
index a93966c92..a93966c92 100644
--- a/java/res/drawable-sw600dp-mdpi/keyboard_background_holo.9.png
+++ b/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
index 7be7ab7e2..7be7ab7e2 100644
--- 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
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
index 1f87a68e9..1f87a68e9 100644
--- a/java/res/drawable-sw600dp-mdpi/keyboard_suggest_strip_holo.9.png
+++ b/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
index 155579169..155579169 100644
--- a/java/res/drawable-sw600dp-mdpi/sym_keyboard_delete_holo.png
+++ b/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
index e1d395b45..e1d395b45 100644
--- a/java/res/drawable-sw600dp-mdpi/sym_keyboard_num0_holo.png
+++ b/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
index 225436ac2..225436ac2 100644
--- a/java/res/drawable-sw600dp-mdpi/sym_keyboard_num1_holo.png
+++ b/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
index e513fa4a0..e513fa4a0 100644
--- a/java/res/drawable-sw600dp-mdpi/sym_keyboard_num2_holo.png
+++ b/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
index b91e005fc..b91e005fc 100644
--- a/java/res/drawable-sw600dp-mdpi/sym_keyboard_num3_holo.png
+++ b/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
index 65f88245b..65f88245b 100644
--- a/java/res/drawable-sw600dp-mdpi/sym_keyboard_num4_holo.png
+++ b/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
index b89ef07eb..b89ef07eb 100644
--- a/java/res/drawable-sw600dp-mdpi/sym_keyboard_num5_holo.png
+++ b/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
index 931275a9e..931275a9e 100644
--- a/java/res/drawable-sw600dp-mdpi/sym_keyboard_num6_holo.png
+++ b/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
index 9396c4c8f..9396c4c8f 100644
--- a/java/res/drawable-sw600dp-mdpi/sym_keyboard_num7_holo.png
+++ b/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
index 12e3eef45..12e3eef45 100644
--- a/java/res/drawable-sw600dp-mdpi/sym_keyboard_num8_holo.png
+++ b/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
index 6911c2b4f..6911c2b4f 100644
--- a/java/res/drawable-sw600dp-mdpi/sym_keyboard_num9_holo.png
+++ b/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
index e3a8b4900..e3a8b4900 100644
--- a/java/res/drawable-sw600dp-mdpi/sym_keyboard_numbpound_holo.png
+++ b/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
index e80e9345f..e80e9345f 100644
--- a/java/res/drawable-sw600dp-mdpi/sym_keyboard_numbstar_holo.png
+++ b/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
index 73153849c..73153849c 100644
--- a/java/res/drawable-sw600dp-mdpi/sym_keyboard_numsymbol_holo.png
+++ b/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
index d519ccecf..d519ccecf 100644
--- a/java/res/drawable-sw600dp-mdpi/sym_keyboard_return_holo.png
+++ b/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
index 784a45054..784a45054 100644
--- a/java/res/drawable-sw600dp-mdpi/sym_keyboard_settings_holo.png
+++ b/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
index 91d6e32f9..91d6e32f9 100644
--- a/java/res/drawable-sw600dp-mdpi/sym_keyboard_shift_holo.png
+++ b/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
index 2bd053656..2bd053656 100644
--- a/java/res/drawable-sw600dp-mdpi/sym_keyboard_shift_locked_holo.png
+++ b/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
index 25e655d96..25e655d96 100644
--- a/java/res/drawable-sw600dp-mdpi/sym_keyboard_space_holo.png
+++ b/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
index 5acd12cc4..5acd12cc4 100644
--- a/java/res/drawable-sw600dp-mdpi/sym_keyboard_tab_holo.png
+++ b/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
index c1116dc17..c1116dc17 100644
--- a/java/res/drawable-sw600dp-mdpi/sym_keyboard_voice_holo.png
+++ b/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
index 081a13096..081a13096 100644
--- a/java/res/drawable-sw600dp-mdpi/sym_keyboard_voice_off_holo.png
+++ b/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
index 8b5d1b098..8b5d1b098 100644
--- 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
diff --git a/java/res/drawable-sw600dp-xhdpi/hint_popup_holo.9.png b/java/res/drawable-large-xhdpi/hint_popup_holo.9.png
index bc37fa844..bc37fa844 100644
--- a/java/res/drawable-sw600dp-xhdpi/hint_popup_holo.9.png
+++ b/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
index c7a8b286a..c7a8b286a 100644
--- a/java/res/drawable-sw600dp-xhdpi/sym_keyboard_numsymbol_holo.png
+++ b/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
index fd9f8cce6..fd9f8cce6 100644
--- a/java/res/drawable-sw600dp-xhdpi/sym_keyboard_tab_holo.png
+++ b/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
index 544ed7f78..544ed7f78 100644
--- 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
diff --git a/java/res/drawable-sw768dp-hdpi/hint_popup_holo.9.png b/java/res/drawable-xlarge-hdpi/hint_popup_holo.9.png
index 2ffc6ea2b..2ffc6ea2b 100644
--- a/java/res/drawable-sw768dp-hdpi/hint_popup_holo.9.png
+++ b/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
index 2b93014e1..2b93014e1 100644
--- a/java/res/drawable-sw768dp-land-hdpi/hint_popup_holo.9.png
+++ b/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
index c409cea00..c409cea00 100644
--- a/java/res/drawable-sw768dp-land-mdpi/hint_popup_holo.9.png
+++ b/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
index 3cd20d34f..3cd20d34f 100644
--- a/java/res/drawable-sw768dp-land-xhdpi/hint_popup_holo.9.png
+++ b/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
index 2ad73041e..2ad73041e 100644
--- 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
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
index fc21e79c4..fc21e79c4 100644
--- 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
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
index 76cfbb221..76cfbb221 100644
--- 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
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
index 73748c2fb..73748c2fb 100644
--- 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
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
index 059d4ac2e..059d4ac2e 100644
--- 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
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
index e5cfdec88..e5cfdec88 100644
--- 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
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
index 060524a53..060524a53 100644
--- 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
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
index f4b061e07..f4b061e07 100644
--- 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
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
index ffa7386df..ffa7386df 100644
--- 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
diff --git a/java/res/drawable-sw768dp-mdpi/hint_popup_holo.9.png b/java/res/drawable-xlarge-mdpi/hint_popup_holo.9.png
index 01d1139d8..01d1139d8 100644
--- a/java/res/drawable-sw768dp-mdpi/hint_popup_holo.9.png
+++ b/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
index a93966c92..a93966c92 100644
--- a/java/res/drawable-sw768dp-mdpi/keyboard_background_holo.9.png
+++ b/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
index 7be7ab7e2..7be7ab7e2 100644
--- 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
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
index 1f87a68e9..1f87a68e9 100644
--- a/java/res/drawable-sw768dp-mdpi/keyboard_suggest_strip_holo.9.png
+++ b/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
index 155579169..155579169 100644
--- a/java/res/drawable-sw768dp-mdpi/sym_keyboard_delete_holo.png
+++ b/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
index e1d395b45..e1d395b45 100644
--- a/java/res/drawable-sw768dp-mdpi/sym_keyboard_num0_holo.png
+++ b/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
index 225436ac2..225436ac2 100644
--- a/java/res/drawable-sw768dp-mdpi/sym_keyboard_num1_holo.png
+++ b/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
index e513fa4a0..e513fa4a0 100644
--- a/java/res/drawable-sw768dp-mdpi/sym_keyboard_num2_holo.png
+++ b/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
index b91e005fc..b91e005fc 100644
--- a/java/res/drawable-sw768dp-mdpi/sym_keyboard_num3_holo.png
+++ b/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
index 65f88245b..65f88245b 100644
--- a/java/res/drawable-sw768dp-mdpi/sym_keyboard_num4_holo.png
+++ b/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
index b89ef07eb..b89ef07eb 100644
--- a/java/res/drawable-sw768dp-mdpi/sym_keyboard_num5_holo.png
+++ b/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
index 931275a9e..931275a9e 100644
--- a/java/res/drawable-sw768dp-mdpi/sym_keyboard_num6_holo.png
+++ b/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
index 9396c4c8f..9396c4c8f 100644
--- a/java/res/drawable-sw768dp-mdpi/sym_keyboard_num7_holo.png
+++ b/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
index 12e3eef45..12e3eef45 100644
--- a/java/res/drawable-sw768dp-mdpi/sym_keyboard_num8_holo.png
+++ b/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
index 6911c2b4f..6911c2b4f 100644
--- a/java/res/drawable-sw768dp-mdpi/sym_keyboard_num9_holo.png
+++ b/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
index e3a8b4900..e3a8b4900 100644
--- a/java/res/drawable-sw768dp-mdpi/sym_keyboard_numbpound_holo.png
+++ b/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
index e80e9345f..e80e9345f 100644
--- a/java/res/drawable-sw768dp-mdpi/sym_keyboard_numbstar_holo.png
+++ b/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
index d519ccecf..d519ccecf 100644
--- a/java/res/drawable-sw768dp-mdpi/sym_keyboard_return_holo.png
+++ b/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
index 784a45054..784a45054 100644
--- a/java/res/drawable-sw768dp-mdpi/sym_keyboard_settings_holo.png
+++ b/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
index 91d6e32f9..91d6e32f9 100644
--- a/java/res/drawable-sw768dp-mdpi/sym_keyboard_shift_holo.png
+++ b/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
index 2bd053656..2bd053656 100644
--- a/java/res/drawable-sw768dp-mdpi/sym_keyboard_shift_locked_holo.png
+++ b/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
index 25e655d96..25e655d96 100644
--- a/java/res/drawable-sw768dp-mdpi/sym_keyboard_space_holo.png
+++ b/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
index c1116dc17..c1116dc17 100644
--- a/java/res/drawable-sw768dp-mdpi/sym_keyboard_voice_holo.png
+++ b/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
index 081a13096..081a13096 100644
--- a/java/res/drawable-sw768dp-mdpi/sym_keyboard_voice_off_holo.png
+++ b/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
index 8b5d1b098..8b5d1b098 100644
--- 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
diff --git a/java/res/drawable-sw768dp-xhdpi/hint_popup_holo.9.png b/java/res/drawable-xlarge-xhdpi/hint_popup_holo.9.png
index bc37fa844..bc37fa844 100644
--- a/java/res/drawable-sw768dp-xhdpi/hint_popup_holo.9.png
+++ b/java/res/drawable-xlarge-xhdpi/hint_popup_holo.9.png
diff --git a/java/res/drawable/btn_center.xml b/java/res/drawable/btn_center.xml
index 9998b56e2..19b298f75 100644
--- a/java/res/drawable/btn_center.xml
+++ b/java/res/drawable/btn_center.xml
@@ -19,8 +19,7 @@
 -->
 
 <selector
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:exitFadeDuration="@android:integer/config_mediumAnimTime">
+        xmlns:android="http://schemas.android.com/apk/res/android">
     <item
         android:state_window_focused="false"
         android:state_enabled="true"
@@ -37,4 +36,4 @@
         android:drawable="@drawable/btn_center_default" />
     <item
         android:drawable="@drawable/btn_center_default" />
-</selector>
\ No newline at end of file
+</selector>
diff --git a/java/res/layout-sw768dp/recognition_status.xml b/java/res/layout-xlarge/recognition_status.xml
index 40bc09823..40bc09823 100644
--- a/java/res/layout-sw768dp/recognition_status.xml
+++ b/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
index 5d1fbc748..5d1fbc748 100644
--- a/java/res/values-sw600dp-land/dimens.xml
+++ b/java/res/values-large-land/dimens.xml
diff --git a/java/res/values-sw600dp/config.xml b/java/res/values-large/config.xml
index 75c0edf87..75c0edf87 100644
--- a/java/res/values-sw600dp/config.xml
+++ b/java/res/values-large/config.xml
diff --git a/java/res/values-sw600dp/dimens.xml b/java/res/values-large/dimens.xml
index 675f40c2e..675f40c2e 100644
--- a/java/res/values-sw600dp/dimens.xml
+++ b/java/res/values-large/dimens.xml
diff --git a/java/res/values-sw600dp/donottranslate.xml b/java/res/values-large/donottranslate.xml
index 6d94c2811..6d94c2811 100644
--- a/java/res/values-sw600dp/donottranslate.xml
+++ b/java/res/values-large/donottranslate.xml
diff --git a/java/res/values-sw768dp-land/dimens.xml b/java/res/values-xlarge-land/dimens.xml
index 2201ce8a3..2201ce8a3 100644
--- a/java/res/values-sw768dp-land/dimens.xml
+++ b/java/res/values-xlarge-land/dimens.xml
diff --git a/java/res/values-sw768dp/config.xml b/java/res/values-xlarge/config.xml
index 4025b0e41..4025b0e41 100644
--- a/java/res/values-sw768dp/config.xml
+++ b/java/res/values-xlarge/config.xml
diff --git a/java/res/values-sw768dp/dimens.xml b/java/res/values-xlarge/dimens.xml
index 2e41db52a..2e41db52a 100644
--- a/java/res/values-sw768dp/dimens.xml
+++ b/java/res/values-xlarge/dimens.xml
diff --git a/java/res/values-sw768dp/donottranslate.xml b/java/res/values-xlarge/donottranslate.xml
index 672dea589..672dea589 100644
--- a/java/res/values-sw768dp/donottranslate.xml
+++ b/java/res/values-xlarge/donottranslate.xml
diff --git a/java/res/values/strings.xml b/java/res/values/strings.xml
index a6ef5e533..08cd35db3 100644
--- a/java/res/values/strings.xml
+++ b/java/res/values/strings.xml
@@ -31,7 +31,7 @@
     <!-- Option to play back sound on keypress in soft keyboard -->
     <string name="sound_on_keypress">Sound on keypress</string>
 
-    <!-- Option to control whether or not to show a popup with a larger font on each key press. -->
+    <!-- Option to pop up the character with a larger font above soft keyboard -->
     <string name="popup_on_keypress">Popup on keypress</string>
 
     <!-- Category title for general settings for Android keyboard -->
diff --git a/java/res/xml-sw600dp-land/kbd_popup_template.xml b/java/res/xml-large-land/kbd_popup_template.xml
index 2c1d1902e..2c1d1902e 100644
--- a/java/res/xml-sw600dp-land/kbd_popup_template.xml
+++ b/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
index dbea4dcfd..dbea4dcfd 100644
--- a/java/res/xml-sw600dp/kbd_key_styles.xml
+++ b/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
index b3a1010d7..b3a1010d7 100644
--- a/java/res/xml-sw600dp/kbd_number.xml
+++ b/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
index dd53a206a..dd53a206a 100644
--- a/java/res/xml-sw600dp/kbd_phone.xml
+++ b/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
index d083ecb60..d083ecb60 100644
--- a/java/res/xml-sw600dp/kbd_phone_symbols.xml
+++ b/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
index fff2659be..fff2659be 100644
--- a/java/res/xml-sw600dp/kbd_popup_template.xml
+++ b/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
index 7638ee4b4..7638ee4b4 100644
--- a/java/res/xml-sw600dp/kbd_qwerty_f2.xml
+++ b/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
index b781d681e..b781d681e 100644
--- a/java/res/xml-sw600dp/kbd_qwerty_row1.xml
+++ b/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
index 05b005af1..05b005af1 100644
--- a/java/res/xml-sw600dp/kbd_qwerty_row2.xml
+++ b/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
index 278db13fc..278db13fc 100644
--- a/java/res/xml-sw600dp/kbd_qwerty_row3.xml
+++ b/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
index 4f41c17b4..4f41c17b4 100644
--- a/java/res/xml-sw600dp/kbd_qwerty_row4.xml
+++ b/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
index 5e9584f2d..5e9584f2d 100644
--- a/java/res/xml-sw600dp/kbd_row3_right.xml
+++ b/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
index bc37d5a9f..bc37d5a9f 100644
--- a/java/res/xml-sw600dp/kbd_rows_arabic.xml
+++ b/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
index 7ba716bc5..7ba716bc5 100644
--- a/java/res/xml-sw600dp/kbd_rows_azerty.xml
+++ b/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
index a1475376b..a1475376b 100644
--- a/java/res/xml-sw600dp/kbd_rows_hebrew.xml
+++ b/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
index a2d26b3de..a2d26b3de 100644
--- a/java/res/xml-sw600dp/kbd_rows_qwerty.xml
+++ b/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
index 7f85fe778..7f85fe778 100644
--- a/java/res/xml-sw600dp/kbd_rows_qwertz.xml
+++ b/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
index b72324745..b72324745 100644
--- a/java/res/xml-sw600dp/kbd_rows_russian.xml
+++ b/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
index 645ef625a..645ef625a 100644
--- a/java/res/xml-sw600dp/kbd_rows_scandinavian.xml
+++ b/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
index 4dfe94400..4dfe94400 100644
--- a/java/res/xml-sw600dp/kbd_rows_serbian.xml
+++ b/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
index 7ef44bb53..7ef44bb53 100644
--- a/java/res/xml-sw600dp/kbd_rows_spanish.xml
+++ b/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
index 77849f6fd..77849f6fd 100644
--- a/java/res/xml-sw600dp/kbd_symbols.xml
+++ b/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
index b25292f27..b25292f27 100644
--- a/java/res/xml-sw600dp/kbd_symbols_shift.xml
+++ b/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
index 3caae1a60..3caae1a60 100644
--- a/java/res/xml-sw768dp-land/kbd_popup_template.xml
+++ b/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
index 4c1e3b63e..4c1e3b63e 100644
--- a/java/res/xml-sw768dp/kbd_key_styles.xml
+++ b/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
index a3bed2f3a..a3bed2f3a 100644
--- a/java/res/xml-sw768dp/kbd_number.xml
+++ b/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
index 0935992fd..0935992fd 100644
--- a/java/res/xml-sw768dp/kbd_phone.xml
+++ b/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
index 6ee57d6a5..6ee57d6a5 100644
--- a/java/res/xml-sw768dp/kbd_phone_symbols.xml
+++ b/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
index 7d39d1a3a..7d39d1a3a 100644
--- a/java/res/xml-sw768dp/kbd_popup_template.xml
+++ b/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
index 3727cf34e..3727cf34e 100644
--- a/java/res/xml-sw768dp/kbd_qwerty_row1.xml
+++ b/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
index 45af120e2..45af120e2 100644
--- a/java/res/xml-sw768dp/kbd_qwerty_row2.xml
+++ b/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
index 7297ea512..7297ea512 100644
--- a/java/res/xml-sw768dp/kbd_qwerty_row3.xml
+++ b/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
index bdef89dcc..bdef89dcc 100644
--- a/java/res/xml-sw768dp/kbd_qwerty_row4.xml
+++ b/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
index 25453160f..25453160f 100644
--- a/java/res/xml-sw768dp/kbd_row3_right2.xml
+++ b/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
index c1810026b..c1810026b 100644
--- a/java/res/xml-sw768dp/kbd_rows_arabic.xml
+++ b/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
index 373bda9ce..373bda9ce 100644
--- a/java/res/xml-sw768dp/kbd_rows_azerty.xml
+++ b/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
index 5275a1f15..5275a1f15 100644
--- a/java/res/xml-sw768dp/kbd_rows_hebrew.xml
+++ b/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
index 6237712f6..6237712f6 100644
--- a/java/res/xml-sw768dp/kbd_rows_qwerty.xml
+++ b/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
index 6567c3166..6567c3166 100644
--- a/java/res/xml-sw768dp/kbd_rows_qwertz.xml
+++ b/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
index ee91481c1..ee91481c1 100644
--- a/java/res/xml-sw768dp/kbd_rows_russian.xml
+++ b/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
index 7e9f604f5..7e9f604f5 100644
--- a/java/res/xml-sw768dp/kbd_rows_scandinavian.xml
+++ b/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
index 4997dabb9..4997dabb9 100644
--- a/java/res/xml-sw768dp/kbd_rows_serbian.xml
+++ b/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
index 300592e6a..300592e6a 100644
--- a/java/res/xml-sw768dp/kbd_rows_spanish.xml
+++ b/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
index 0e6103ab9..0e6103ab9 100644
--- a/java/res/xml-sw768dp/kbd_symbols.xml
+++ b/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
index b36814104..b36814104 100644
--- a/java/res/xml-sw768dp/kbd_symbols_shift.xml
+++ b/java/res/xml-xlarge/kbd_symbols_shift.xml
diff --git a/java/res/xml/method.xml b/java/res/xml/method.xml
index c9c920378..3b700b136 100644
--- a/java/res/xml/method.xml
+++ b/java/res/xml/method.xml
@@ -30,229 +30,4 @@
 <input-method xmlns:android="http://schemas.android.com/apk/res/android"
         android:settingsActivity="com.android.inputmethod.latin.Settings"
         android:isDefault="@bool/im_is_default">
-    <subtype android:icon="@drawable/ic_subtype_keyboard"
-            android:label="@string/subtype_mode_en_US_keyboard"
-            android:imeSubtypeLocale="en_US"
-            android:imeSubtypeMode="keyboard"
-    />
-<!--     <subtype android:icon="@drawable/ic_subtype_mic" -->
-<!--             android:label="@string/subtype_mode_en_voice" -->
-<!--             android:imeSubtypeLocale="en" -->
-<!--             android:imeSubtypeMode="voice" -->
-<!--             android:imeSubtypeExtraValue="excludeFromLastInputMethod,requireNetworkConnectivity" -->
-<!--     /> -->
-    <subtype android:icon="@drawable/ic_subtype_keyboard"
-            android:label="@string/subtype_mode_en_GB_keyboard"
-            android:imeSubtypeLocale="en_GB"
-            android:imeSubtypeMode="keyboard"
-    />
-    <!-- The file for Arabic layout is an alpha version. It needs to be run through UX. -->
-    <subtype android:icon="@drawable/ic_subtype_keyboard"
-            android:label="@string/subtype_mode_ar_keyboard"
-            android:imeSubtypeLocale="ar"
-            android:imeSubtypeMode="keyboard"
-    />
-    <subtype android:icon="@drawable/ic_subtype_keyboard"
-            android:label="@string/subtype_mode_cs_keyboard"
-            android:imeSubtypeLocale="cs"
-            android:imeSubtypeMode="keyboard"
-    />
-<!--     <subtype android:icon="@drawable/ic_subtype_mic" -->
-<!--             android:label="@string/subtype_mode_cs_voice" -->
-<!--             android:imeSubtypeLocale="cs" -->
-<!--             android:imeSubtypeMode="voice" -->
-<!--             android:imeSubtypeExtraValue="excludeFromLastInputMethod,requireNetworkConnectivity" -->
-<!--     /> -->
-    <subtype android:icon="@drawable/ic_subtype_keyboard"
-            android:label="@string/subtype_mode_da_keyboard"
-            android:imeSubtypeLocale="da"
-            android:imeSubtypeMode="keyboard"
-    />
-    <subtype android:icon="@drawable/ic_subtype_keyboard"
-            android:label="@string/subtype_mode_de_keyboard"
-            android:imeSubtypeLocale="de"
-            android:imeSubtypeMode="keyboard"
-    />
-    <subtype android:icon="@drawable/ic_subtype_keyboard"
-            android:label="@string/subtype_mode_de_qwerty_keyboard"
-            android:imeSubtypeLocale="de_ZZ"
-            android:imeSubtypeMode="keyboard"
-    />
-<!--     <subtype android:icon="@drawable/ic_subtype_mic" -->
-<!--             android:label="@string/subtype_mode_de_voice" -->
-<!--             android:imeSubtypeLocale="de" -->
-<!--             android:imeSubtypeMode="voice" -->
-<!--             android:imeSubtypeExtraValue="excludeFromLastInputMethod,requireNetworkConnectivity" -->
-<!--     /> -->
-    <subtype android:icon="@drawable/ic_subtype_keyboard"
-            android:label="@string/subtype_mode_es_keyboard"
-            android:imeSubtypeLocale="es"
-            android:imeSubtypeMode="keyboard"
-    />
-<!--     <subtype android:icon="@drawable/ic_subtype_mic" -->
-<!--             android:label="@string/subtype_mode_es_voice" -->
-<!--             android:imeSubtypeLocale="es" -->
-<!--             android:imeSubtypeMode="voice" -->
-<!--             android:imeSubtypeExtraValue="excludeFromLastInputMethod,requireNetworkConnectivity" -->
-<!--     /> -->
-    <subtype android:icon="@drawable/ic_subtype_keyboard"
-            android:label="@string/subtype_mode_fi_keyboard"
-            android:imeSubtypeLocale="fi"
-            android:imeSubtypeMode="keyboard"
-    />
-    <subtype android:icon="@drawable/ic_subtype_keyboard"
-            android:label="@string/subtype_mode_fr_keyboard"
-            android:imeSubtypeLocale="fr"
-            android:imeSubtypeMode="keyboard"
-    />
-<!--     <subtype android:icon="@drawable/ic_subtype_mic" -->
-<!--             android:label="@string/subtype_mode_fr_voice" -->
-<!--             android:imeSubtypeLocale="fr" -->
-<!--             android:imeSubtypeMode="voice" -->
-<!--             android:imeSubtypeExtraValue="excludeFromLastInputMethod,requireNetworkConnectivity" -->
-<!--     /> -->
-    <subtype android:icon="@drawable/ic_subtype_keyboard"
-            android:label="@string/subtype_mode_fr_CA_keyboard"
-            android:imeSubtypeLocale="fr_CA"
-            android:imeSubtypeMode="keyboard"
-    />
-    <subtype android:icon="@drawable/ic_subtype_keyboard"
-            android:label="@string/subtype_mode_fr_CH_keyboard"
-            android:imeSubtypeLocale="fr_CH"
-            android:imeSubtypeMode="keyboard"
-    />
-    <subtype android:icon="@drawable/ic_subtype_keyboard"
-            android:label="@string/subtype_mode_hr_keyboard"
-            android:imeSubtypeLocale="hr"
-            android:imeSubtypeMode="keyboard"
-    />
-    <subtype android:icon="@drawable/ic_subtype_keyboard"
-            android:label="@string/subtype_mode_hu_keyboard"
-            android:imeSubtypeLocale="hu"
-            android:imeSubtypeMode="keyboard"
-    />
-    <subtype android:icon="@drawable/ic_subtype_keyboard"
-            android:label="@string/subtype_mode_it_keyboard"
-            android:imeSubtypeLocale="it"
-            android:imeSubtypeMode="keyboard"
-    />
-    <!-- Java uses the deprecated "iw" code instead of the standard "he" code for Hebrew. -->
-    <!-- The file for Hebrew layout is an alpha version. It needs to be run through UX. -->
-    <subtype android:icon="@drawable/ic_subtype_keyboard"
-            android:label="@string/subtype_mode_iw_keyboard"
-            android:imeSubtypeLocale="iw"
-            android:imeSubtypeMode="keyboard"
-    />
-<!--     <subtype android:icon="@drawable/ic_subtype_mic" -->
-<!--             android:label="@string/subtype_mode_it_voice" -->
-<!--             android:imeSubtypeLocale="it" -->
-<!--             android:imeSubtypeMode="voice" -->
-<!--             android:imeSubtypeExtraValue="excludeFromLastInputMethod,requireNetworkConnectivity" -->
-<!--     /> -->
-    <subtype android:icon="@drawable/ic_subtype_keyboard"
-            android:label="@string/subtype_mode_nb_keyboard"
-            android:imeSubtypeLocale="nb"
-            android:imeSubtypeMode="keyboard"
-    />
-    <subtype android:icon="@drawable/ic_subtype_keyboard"
-            android:label="@string/subtype_mode_nl_keyboard"
-            android:imeSubtypeLocale="nl"
-            android:imeSubtypeMode="keyboard"
-    />
-<!--     <subtype android:icon="@drawable/ic_subtype_mic" -->
-<!--             android:label="@string/subtype_mode_nl_voice" -->
-<!--             android:imeSubtypeLocale="nl" -->
-<!--             android:imeSubtypeMode="voice" -->
-<!--             android:imeSubtypeExtraValue="excludeFromLastInputMethod,requireNetworkConnectivity" -->
-<!--     /> -->
-    <subtype android:icon="@drawable/ic_subtype_keyboard"
-            android:label="@string/subtype_mode_pl_keyboard"
-            android:imeSubtypeLocale="pl"
-            android:imeSubtypeMode="keyboard"
-    />
-    <subtype android:icon="@drawable/ic_subtype_keyboard"
-            android:label="@string/subtype_mode_pt_keyboard"
-            android:imeSubtypeLocale="pt"
-            android:imeSubtypeMode="keyboard"
-    />
-    <subtype android:icon="@drawable/ic_subtype_keyboard"
-            android:label="@string/subtype_mode_ru_keyboard"
-            android:imeSubtypeLocale="ru"
-            android:imeSubtypeMode="keyboard"
-    />
-    <subtype android:icon="@drawable/ic_subtype_keyboard"
-            android:label="@string/subtype_mode_sr_keyboard"
-            android:imeSubtypeLocale="sr"
-            android:imeSubtypeMode="keyboard"
-    />
-    <subtype android:icon="@drawable/ic_subtype_keyboard"
-            android:label="@string/subtype_mode_sv_keyboard"
-            android:imeSubtypeLocale="sv"
-            android:imeSubtypeMode="keyboard"
-    />
-    <subtype android:icon="@drawable/ic_subtype_keyboard"
-            android:label="@string/subtype_mode_tr_keyboard"
-            android:imeSubtypeLocale="tr"
-            android:imeSubtypeMode="keyboard"
-    />
-<!--     <subtype android:icon="@drawable/ic_subtype_mic" -->
-<!--             android:label="@string/subtype_mode_af_voice" -->
-<!--             android:imeSubtypeLocale="af" -->
-<!--             android:imeSubtypeMode="voice" -->
-<!--             android:imeSubtypeExtraValue="excludeFromLastInputMethod,requireNetworkConnectivity" -->
-<!--     /> -->
-<!--     <subtype android:icon="@drawable/ic_subtype_mic" -->
-<!--             android:label="@string/subtype_mode_ja_voice" -->
-<!--             android:imeSubtypeLocale="ja" -->
-<!--             android:imeSubtypeMode="voice" -->
-<!--             android:imeSubtypeExtraValue="excludeFromLastInputMethod,requireNetworkConnectivity" -->
-<!--     /> -->
-<!--     <subtype android:icon="@drawable/ic_subtype_mic" -->
-<!--             android:label="@string/subtype_mode_ko_voice" -->
-<!--             android:imeSubtypeLocale="ko" -->
-<!--             android:imeSubtypeMode="voice" -->
-<!--             android:imeSubtypeExtraValue="excludeFromLastInputMethod,requireNetworkConnectivity" -->
-<!--     /> -->
-<!--     <subtype android:icon="@drawable/ic_subtype_mic" -->
-<!--             android:label="@string/subtype_mode_pl_voice" -->
-<!--             android:imeSubtypeLocale="pl" -->
-<!--             android:imeSubtypeMode="voice" -->
-<!--             android:imeSubtypeExtraValue="excludeFromLastInputMethod,requireNetworkConnectivity" -->
-<!--     /> -->
-<!--     <subtype android:icon="@drawable/ic_subtype_mic" -->
-<!--             android:label="@string/subtype_mode_pt_voice" -->
-<!--             android:imeSubtypeLocale="pt" -->
-<!--             android:imeSubtypeMode="voice" -->
-<!--             android:imeSubtypeExtraValue="excludeFromLastInputMethod,requireNetworkConnectivity" -->
-<!--     /> -->
-<!--     <subtype android:icon="@drawable/ic_subtype_mic" -->
-<!--             android:label="@string/subtype_mode_ru_voice" -->
-<!--             android:imeSubtypeLocale="ru" -->
-<!--             android:imeSubtypeMode="voice" -->
-<!--             android:imeSubtypeExtraValue="excludeFromLastInputMethod,requireNetworkConnectivity" -->
-<!--     /> -->
-<!--     <subtype android:icon="@drawable/ic_subtype_mic" -->
-<!--             android:label="@string/subtype_mode_tr_voice" -->
-<!--             android:imeSubtypeLocale="tr" -->
-<!--             android:imeSubtypeMode="voice" -->
-<!--             android:imeSubtypeExtraValue="excludeFromLastInputMethod,requireNetworkConnectivity" -->
-<!--     /> -->
-<!--     <subtype android:icon="@drawable/ic_subtype_mic" -->
-<!--             android:label="@string/subtype_mode_yue_voice" -->
-<!--             android:imeSubtypeLocale="yue" -->
-<!--             android:imeSubtypeMode="voice" -->
-<!--             android:imeSubtypeExtraValue="excludeFromLastInputMethod,requireNetworkConnectivity" -->
-<!--     /> -->
-<!--     <subtype android:icon="@drawable/ic_subtype_mic" -->
-<!--             android:label="@string/subtype_mode_zh_voice" -->
-<!--             android:imeSubtypeLocale="zh" -->
-<!--             android:imeSubtypeMode="voice" -->
-<!--             android:imeSubtypeExtraValue="excludeFromLastInputMethod,requireNetworkConnectivity" -->
-<!--     /> -->
-<!--     <subtype android:icon="@drawable/ic_subtype_mic" -->
-<!--             android:label="@string/subtype_mode_zu_voice" -->
-<!--             android:imeSubtypeLocale="zu" -->
-<!--             android:imeSubtypeMode="voice" -->
-<!--             android:imeSubtypeExtraValue="excludeFromLastInputMethod,requireNetworkConnectivity" -->
-<!--     /> -->
 </input-method>
diff --git a/java/src/com/android/inputmethod/compat/InputMethodServiceCompatWrapper.java b/java/src/com/android/inputmethod/compat/InputMethodServiceCompatWrapper.java
index 7d8c745c3..ec7250c2a 100644
--- a/java/src/com/android/inputmethod/compat/InputMethodServiceCompatWrapper.java
+++ b/java/src/com/android/inputmethod/compat/InputMethodServiceCompatWrapper.java
@@ -17,7 +17,7 @@
 package com.android.inputmethod.compat;
 
 import android.inputmethodservice.InputMethodService;
-import android.view.inputmethod.InputMethodSubtype;
+// import android.view.inputmethod.InputMethodSubtype;
 
 import com.android.inputmethod.deprecated.LanguageSwitcherProxy;
 import com.android.inputmethod.latin.SubtypeSwitcher;
@@ -28,7 +28,7 @@ public class InputMethodServiceCompatWrapper extends InputMethodService {
     // For the API level 11 or later, LatinIME should override onCurrentInputMethodSubtypeChanged().
     // For the API level 10 or previous, we handle the "subtype changed" events by ourselves
     // without having support from framework -- onCurrentInputMethodSubtypeChanged().
-    public static final boolean CAN_HANDLE_ON_CURRENT_INPUT_METHOD_SUBTYPE_CHANGED = true;
+    public static final boolean CAN_HANDLE_ON_CURRENT_INPUT_METHOD_SUBTYPE_CHANGED = false;
 
     private InputMethodManagerCompatWrapper mImm;
 
@@ -68,17 +68,17 @@ public class InputMethodServiceCompatWrapper extends InputMethodService {
     //////////////////////////////////////
     // Functions using API v11 or later //
     //////////////////////////////////////
-    @Override
+    /*@Override
     public void onCurrentInputMethodSubtypeChanged(InputMethodSubtype subtype) {
         // Do nothing when the API level is 10 or previous
         if (!CAN_HANDLE_ON_CURRENT_INPUT_METHOD_SUBTYPE_CHANGED) return;
         SubtypeSwitcher.getInstance().updateSubtype(
                 new InputMethodSubtypeCompatWrapper(subtype));
-    }
+    }*/
 
     protected static void setTouchableRegionCompat(InputMethodService.Insets outInsets,
             int x, int y, int width, int height) {
-        outInsets.touchableInsets = InputMethodService.Insets.TOUCHABLE_INSETS_REGION;
-        outInsets.touchableRegion.set(x, y, width, height);
+        //outInsets.touchableInsets = InputMethodService.Insets.TOUCHABLE_INSETS_REGION;
+        //outInsets.touchableRegion.set(x, y, width, height);
     }
 }
diff --git a/java/src/com/android/inputmethod/latin/Utils.java b/java/src/com/android/inputmethod/latin/Utils.java
index 6bdc0a857..245fc20bc 100644
--- a/java/src/com/android/inputmethod/latin/Utils.java
+++ b/java/src/com/android/inputmethod/latin/Utils.java
@@ -606,9 +606,9 @@ public class Utils {
 
     public static void loadNativeLibrary() {
         try {
-            System.loadLibrary("jni_latinime");
+            System.loadLibrary("jni_latinime2");
         } catch (UnsatisfiedLinkError ule) {
-            Log.e(TAG, "Could not load native library jni_latinime");
+            Log.e(TAG, "Could not load native library jni_latinime2");
         }
     }