Merge "Don't let the native code target be included twice when unbundling."

303 files changed, 42 insertions, 26 deletions

diff --git a/Android.mk b/Android.mk
index 5396ed518..8f1acc55a 100755..100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,23 +1,17 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_SRC_FILES := $(call all-subdir-java-files)
-
-LOCAL_PACKAGE_NAME := LatinIME
-
-LOCAL_CERTIFICATE := shared
-
-LOCAL_JNI_SHARED_LIBRARIES := libjni_latinime
-
-LOCAL_STATIC_JAVA_LIBRARIES := android-common
-
-#LOCAL_AAPT_FLAGS := -0 .dict
-
-LOCAL_SDK_VERSION := current
-
-LOCAL_PROGUARD_FLAGS := -include $(LOCAL_PATH)/proguard.flags
-
-include $(BUILD_PACKAGE)
-include $(LOCAL_PATH)/dictionary/Android.mk
+# Copyright (C) 2010 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+LOCAL_PATH := $(call my-dir)
+
+include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/java/Android.mk b/java/Android.mk
new file mode 100755
index 000000000..4bb8986ee
--- /dev/null
+++ b/java/Android.mk
@@ -0,0 +1,22 @@
+LOCAL_PATH:= $(call my-dir)
+include $(CLEAR_VARS)
+
+LOCAL_MODULE_TAGS := optional
+
+LOCAL_SRC_FILES := $(call all-subdir-java-files)
+
+LOCAL_PACKAGE_NAME := LatinIME
+
+LOCAL_CERTIFICATE := shared
+
+LOCAL_JNI_SHARED_LIBRARIES := libjni_latinime
+
+LOCAL_STATIC_JAVA_LIBRARIES := android-common
+
+#LOCAL_AAPT_FLAGS := -0 .dict
+
+LOCAL_SDK_VERSION := current
+
+LOCAL_PROGUARD_FLAGS := -include $(LOCAL_PATH)/proguard.flags
+
+include $(BUILD_PACKAGE)
diff --git a/AndroidManifest.xml b/java/AndroidManifest.xml
index c42ad42ef..23dbf7564 100755
--- a/AndroidManifest.xml
+++ b/java/AndroidManifest.xml
@@ -32,6 +32,8 @@
                 android:label="@string/language_selection_title">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
+                <action android:name="com.android.inputmethod.latin.INPUT_LANGUAGE_SELECTION"/>
+                <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
     </application>
diff --git a/proguard.flags b/java/proguard.flags
index 0a5d2dda9..0a5d2dda9 100644
--- a/proguard.flags
+++ b/java/proguard.flags
diff --git a/res/drawable-en-hdpi/sym_keyboard_delete.png b/java/res/drawable-en-hdpi/sym_keyboard_delete.png
index 569369e79..569369e79 100755
--- a/res/drawable-en-hdpi/sym_keyboard_delete.png
+++ b/java/res/drawable-en-hdpi/sym_keyboard_delete.png
diff --git a/res/drawable-en-hdpi/sym_keyboard_feedback_delete.png b/java/res/drawable-en-hdpi/sym_keyboard_feedback_delete.png
index ca7637552..ca7637552 100755
--- a/res/drawable-en-hdpi/sym_keyboard_feedback_delete.png
+++ b/java/res/drawable-en-hdpi/sym_keyboard_feedback_delete.png
diff --git a/res/drawable-en-mdpi/sym_keyboard_delete.png b/java/res/drawable-en-mdpi/sym_keyboard_delete.png
index f1f7c58cf..f1f7c58cf 100644
--- a/res/drawable-en-mdpi/sym_keyboard_delete.png
+++ b/java/res/drawable-en-mdpi/sym_keyboard_delete.png
diff --git a/res/drawable-en-mdpi/sym_keyboard_feedback_delete.png b/java/res/drawable-en-mdpi/sym_keyboard_feedback_delete.png
index 3c9083972..3c9083972 100644
--- a/res/drawable-en-mdpi/sym_keyboard_feedback_delete.png
+++ b/java/res/drawable-en-mdpi/sym_keyboard_feedback_delete.png
diff --git a/res/drawable-hdpi/btn_keyboard_key_fulltrans_normal.9.png b/java/res/drawable-hdpi/btn_keyboard_key_fulltrans_normal.9.png
index b6c234c04..b6c234c04 100644
--- a/res/drawable-hdpi/btn_keyboard_key_fulltrans_normal.9.png
+++ b/java/res/drawable-hdpi/btn_keyboard_key_fulltrans_normal.9.png
diff --git a/res/drawable-hdpi/btn_keyboard_key_fulltrans_pressed.9.png b/java/res/drawable-hdpi/btn_keyboard_key_fulltrans_pressed.9.png
index 73a8cd1c3..73a8cd1c3 100644
--- a/res/drawable-hdpi/btn_keyboard_key_fulltrans_pressed.9.png
+++ b/java/res/drawable-hdpi/btn_keyboard_key_fulltrans_pressed.9.png
diff --git a/res/drawable-hdpi/btn_keyboard_key_normal.9.png b/java/res/drawable-hdpi/btn_keyboard_key_normal.9.png
index 42c7c146d..42c7c146d 100644
--- a/res/drawable-hdpi/btn_keyboard_key_normal.9.png
+++ b/java/res/drawable-hdpi/btn_keyboard_key_normal.9.png
diff --git a/res/drawable-hdpi/btn_keyboard_key_normal_off.9.png b/java/res/drawable-hdpi/btn_keyboard_key_normal_off.9.png
index 01e2506b0..01e2506b0 100644
--- a/res/drawable-hdpi/btn_keyboard_key_normal_off.9.png
+++ b/java/res/drawable-hdpi/btn_keyboard_key_normal_off.9.png
diff --git a/res/drawable-hdpi/btn_keyboard_key_normal_on.9.png b/java/res/drawable-hdpi/btn_keyboard_key_normal_on.9.png
index 83c6eb3fc..83c6eb3fc 100644
--- a/res/drawable-hdpi/btn_keyboard_key_normal_on.9.png
+++ b/java/res/drawable-hdpi/btn_keyboard_key_normal_on.9.png
diff --git a/res/drawable-hdpi/btn_keyboard_key_pressed.9.png b/java/res/drawable-hdpi/btn_keyboard_key_pressed.9.png
index e047eaff1..e047eaff1 100644
--- a/res/drawable-hdpi/btn_keyboard_key_pressed.9.png
+++ b/java/res/drawable-hdpi/btn_keyboard_key_pressed.9.png
diff --git a/res/drawable-hdpi/btn_keyboard_key_pressed_off.9.png b/java/res/drawable-hdpi/btn_keyboard_key_pressed_off.9.png
index 218a2d29e..218a2d29e 100644
--- a/res/drawable-hdpi/btn_keyboard_key_pressed_off.9.png
+++ b/java/res/drawable-hdpi/btn_keyboard_key_pressed_off.9.png
diff --git a/res/drawable-hdpi/btn_keyboard_key_pressed_on.9.png b/java/res/drawable-hdpi/btn_keyboard_key_pressed_on.9.png
index afe49512e..afe49512e 100644
--- a/res/drawable-hdpi/btn_keyboard_key_pressed_on.9.png
+++ b/java/res/drawable-hdpi/btn_keyboard_key_pressed_on.9.png
diff --git a/res/drawable-hdpi/cancel.png b/java/res/drawable-hdpi/cancel.png
index 6585bde17..6585bde17 100755
--- a/res/drawable-hdpi/cancel.png
+++ b/java/res/drawable-hdpi/cancel.png
diff --git a/res/drawable-hdpi/candidate_feedback_background.9.png b/java/res/drawable-hdpi/candidate_feedback_background.9.png
index 203c4e640..203c4e640 100755
--- a/res/drawable-hdpi/candidate_feedback_background.9.png
+++ b/java/res/drawable-hdpi/candidate_feedback_background.9.png
diff --git a/res/drawable-hdpi/caution.png b/java/res/drawable-hdpi/caution.png
index 5cb6c54b9..5cb6c54b9 100755
--- a/res/drawable-hdpi/caution.png
+++ b/java/res/drawable-hdpi/caution.png
diff --git a/res/drawable-hdpi/dialog_bubble_step02.9.png b/java/res/drawable-hdpi/dialog_bubble_step02.9.png
index b338364c5..b338364c5 100755
--- a/res/drawable-hdpi/dialog_bubble_step02.9.png
+++ b/java/res/drawable-hdpi/dialog_bubble_step02.9.png
diff --git a/res/drawable-hdpi/dialog_bubble_step07.9.png b/java/res/drawable-hdpi/dialog_bubble_step07.9.png
index 94b915432..94b915432 100755
--- a/res/drawable-hdpi/dialog_bubble_step07.9.png
+++ b/java/res/drawable-hdpi/dialog_bubble_step07.9.png
diff --git a/res/drawable-hdpi/dialog_top_dark_bottom_medium.png b/java/res/drawable-hdpi/dialog_top_dark_bottom_medium.png
index 7c79a4f90..7c79a4f90 100755
--- a/res/drawable-hdpi/dialog_top_dark_bottom_medium.png
+++ b/java/res/drawable-hdpi/dialog_top_dark_bottom_medium.png
diff --git a/res/drawable-hdpi/highlight_pressed.png b/java/res/drawable-hdpi/highlight_pressed.png
index ae04901a0..ae04901a0 100644
--- a/res/drawable-hdpi/highlight_pressed.png
+++ b/java/res/drawable-hdpi/highlight_pressed.png
diff --git a/res/drawable-hdpi/ic_dialog_alert_large.png b/java/res/drawable-hdpi/ic_dialog_alert_large.png
index 7e2646d65..7e2646d65 100755
--- a/res/drawable-hdpi/ic_dialog_alert_large.png
+++ b/java/res/drawable-hdpi/ic_dialog_alert_large.png
diff --git a/res/drawable-hdpi/ic_dialog_keyboard.png b/java/res/drawable-hdpi/ic_dialog_keyboard.png
index c7729566c..c7729566c 100755
--- a/res/drawable-hdpi/ic_dialog_keyboard.png
+++ b/java/res/drawable-hdpi/ic_dialog_keyboard.png
diff --git a/res/drawable-hdpi/ic_dialog_voice_input.png b/java/res/drawable-hdpi/ic_dialog_voice_input.png
index 11a3cfe77..11a3cfe77 100755
--- a/res/drawable-hdpi/ic_dialog_voice_input.png
+++ b/java/res/drawable-hdpi/ic_dialog_voice_input.png
diff --git a/res/drawable-hdpi/ic_dialog_wave_0_0.png b/java/res/drawable-hdpi/ic_dialog_wave_0_0.png
index 33023c3f7..33023c3f7 100755
--- a/res/drawable-hdpi/ic_dialog_wave_0_0.png
+++ b/java/res/drawable-hdpi/ic_dialog_wave_0_0.png
diff --git a/res/drawable-hdpi/ic_dialog_wave_1_3.png b/java/res/drawable-hdpi/ic_dialog_wave_1_3.png
index 662686c0f..662686c0f 100755
--- a/res/drawable-hdpi/ic_dialog_wave_1_3.png
+++ b/java/res/drawable-hdpi/ic_dialog_wave_1_3.png
diff --git a/res/drawable-hdpi/ic_dialog_wave_2_3.png b/java/res/drawable-hdpi/ic_dialog_wave_2_3.png
index e23ada57e..e23ada57e 100755
--- a/res/drawable-hdpi/ic_dialog_wave_2_3.png
+++ b/java/res/drawable-hdpi/ic_dialog_wave_2_3.png
diff --git a/res/drawable-hdpi/ic_dialog_wave_3_3.png b/java/res/drawable-hdpi/ic_dialog_wave_3_3.png
index 5fe5492ad..5fe5492ad 100755
--- a/res/drawable-hdpi/ic_dialog_wave_3_3.png
+++ b/java/res/drawable-hdpi/ic_dialog_wave_3_3.png
diff --git a/res/drawable-hdpi/ic_dialog_wave_4_3.png b/java/res/drawable-hdpi/ic_dialog_wave_4_3.png
index 81b803fd0..81b803fd0 100755
--- a/res/drawable-hdpi/ic_dialog_wave_4_3.png
+++ b/java/res/drawable-hdpi/ic_dialog_wave_4_3.png
diff --git a/res/drawable-hdpi/ic_mic_dialog.png b/java/res/drawable-hdpi/ic_mic_dialog.png
index 349dc4b37..349dc4b37 100644
--- a/res/drawable-hdpi/ic_mic_dialog.png
+++ b/java/res/drawable-hdpi/ic_mic_dialog.png
diff --git a/res/drawable-hdpi/ic_suggest_strip_microphone.png b/java/res/drawable-hdpi/ic_suggest_strip_microphone.png
index c00b4aaa6..c00b4aaa6 100644
--- a/res/drawable-hdpi/ic_suggest_strip_microphone.png
+++ b/java/res/drawable-hdpi/ic_suggest_strip_microphone.png
diff --git a/res/drawable-hdpi/ic_suggest_strip_microphone_swipe.png b/java/res/drawable-hdpi/ic_suggest_strip_microphone_swipe.png
index 256dc3d61..256dc3d61 100644
--- a/res/drawable-hdpi/ic_suggest_strip_microphone_swipe.png
+++ b/java/res/drawable-hdpi/ic_suggest_strip_microphone_swipe.png
diff --git a/res/drawable-hdpi/ic_suggest_strip_scroll_left_arrow.png b/java/res/drawable-hdpi/ic_suggest_strip_scroll_left_arrow.png
index e375f262f..e375f262f 100755
--- a/res/drawable-hdpi/ic_suggest_strip_scroll_left_arrow.png
+++ b/java/res/drawable-hdpi/ic_suggest_strip_scroll_left_arrow.png
diff --git a/res/drawable-hdpi/ic_suggest_strip_scroll_right_arrow.png b/java/res/drawable-hdpi/ic_suggest_strip_scroll_right_arrow.png
index d38ae7562..d38ae7562 100755
--- a/res/drawable-hdpi/ic_suggest_strip_scroll_right_arrow.png
+++ b/java/res/drawable-hdpi/ic_suggest_strip_scroll_right_arrow.png
diff --git a/res/drawable-hdpi/keyboard_background.9.png b/java/res/drawable-hdpi/keyboard_background.9.png
index edffac5b8..edffac5b8 100755
--- a/res/drawable-hdpi/keyboard_background.9.png
+++ b/java/res/drawable-hdpi/keyboard_background.9.png
diff --git a/res/drawable-hdpi/keyboard_suggest_strip.9.png b/java/res/drawable-hdpi/keyboard_suggest_strip.9.png
index 0cbb3ed86..0cbb3ed86 100755
--- a/res/drawable-hdpi/keyboard_suggest_strip.9.png
+++ b/java/res/drawable-hdpi/keyboard_suggest_strip.9.png
diff --git a/res/drawable-hdpi/keyboard_suggest_strip_divider.png b/java/res/drawable-hdpi/keyboard_suggest_strip_divider.png
index a5980388a..a5980388a 100644
--- a/res/drawable-hdpi/keyboard_suggest_strip_divider.png
+++ b/java/res/drawable-hdpi/keyboard_suggest_strip_divider.png
diff --git a/res/drawable-hdpi/list_selector_background_pressed.9.png b/java/res/drawable-hdpi/list_selector_background_pressed.9.png
index ba79cf7f8..ba79cf7f8 100644
--- a/res/drawable-hdpi/list_selector_background_pressed.9.png
+++ b/java/res/drawable-hdpi/list_selector_background_pressed.9.png
diff --git a/res/drawable-hdpi/mic_slash.png b/java/res/drawable-hdpi/mic_slash.png
index a7b734c71..a7b734c71 100644
--- a/res/drawable-hdpi/mic_slash.png
+++ b/java/res/drawable-hdpi/mic_slash.png
diff --git a/res/drawable-hdpi/ok_cancel.png b/java/res/drawable-hdpi/ok_cancel.png
index 6a99528ef..6a99528ef 100755
--- a/res/drawable-hdpi/ok_cancel.png
+++ b/java/res/drawable-hdpi/ok_cancel.png
diff --git a/res/drawable-hdpi/speak_now_level0.png b/java/res/drawable-hdpi/speak_now_level0.png
index a681da606..a681da606 100755
--- a/res/drawable-hdpi/speak_now_level0.png
+++ b/java/res/drawable-hdpi/speak_now_level0.png
diff --git a/res/drawable-hdpi/speak_now_level1.png b/java/res/drawable-hdpi/speak_now_level1.png
index 0dbec69a7..0dbec69a7 100755
--- a/res/drawable-hdpi/speak_now_level1.png
+++ b/java/res/drawable-hdpi/speak_now_level1.png
diff --git a/res/drawable-hdpi/speak_now_level2.png b/java/res/drawable-hdpi/speak_now_level2.png
index 45cbff2b7..45cbff2b7 100755
--- a/res/drawable-hdpi/speak_now_level2.png
+++ b/java/res/drawable-hdpi/speak_now_level2.png
diff --git a/res/drawable-hdpi/speak_now_level3.png b/java/res/drawable-hdpi/speak_now_level3.png
index abda8f683..abda8f683 100755
--- a/res/drawable-hdpi/speak_now_level3.png
+++ b/java/res/drawable-hdpi/speak_now_level3.png
diff --git a/res/drawable-hdpi/speak_now_level4.png b/java/res/drawable-hdpi/speak_now_level4.png
index 18356351a..18356351a 100755
--- a/res/drawable-hdpi/speak_now_level4.png
+++ b/java/res/drawable-hdpi/speak_now_level4.png
diff --git a/res/drawable-hdpi/speak_now_level5.png b/java/res/drawable-hdpi/speak_now_level5.png
index 7d4fd5f20..7d4fd5f20 100755
--- a/res/drawable-hdpi/speak_now_level5.png
+++ b/java/res/drawable-hdpi/speak_now_level5.png
diff --git a/res/drawable-hdpi/speak_now_level6.png b/java/res/drawable-hdpi/speak_now_level6.png
index e06990faa..e06990faa 100755
--- a/res/drawable-hdpi/speak_now_level6.png
+++ b/java/res/drawable-hdpi/speak_now_level6.png
diff --git a/res/drawable-hdpi/sym_keyboard_123_mic.png b/java/res/drawable-hdpi/sym_keyboard_123_mic.png
index 62669803d..62669803d 100644
--- a/res/drawable-hdpi/sym_keyboard_123_mic.png
+++ b/java/res/drawable-hdpi/sym_keyboard_123_mic.png
diff --git a/res/drawable-hdpi/sym_keyboard_delete.png b/java/res/drawable-hdpi/sym_keyboard_delete.png
index 59d78bec0..59d78bec0 100755
--- a/res/drawable-hdpi/sym_keyboard_delete.png
+++ b/java/res/drawable-hdpi/sym_keyboard_delete.png
diff --git a/res/drawable-hdpi/sym_keyboard_done.png b/java/res/drawable-hdpi/sym_keyboard_done.png
index 471c5021b..471c5021b 100755
--- a/res/drawable-hdpi/sym_keyboard_done.png
+++ b/java/res/drawable-hdpi/sym_keyboard_done.png
diff --git a/res/drawable-hdpi/sym_keyboard_feedback_123_mic.png b/java/res/drawable-hdpi/sym_keyboard_feedback_123_mic.png
index f57e581d5..f57e581d5 100644
--- a/res/drawable-hdpi/sym_keyboard_feedback_123_mic.png
+++ b/java/res/drawable-hdpi/sym_keyboard_feedback_123_mic.png
diff --git a/res/drawable-hdpi/sym_keyboard_feedback_delete.png b/java/res/drawable-hdpi/sym_keyboard_feedback_delete.png
index ca7637552..ca7637552 100755
--- a/res/drawable-hdpi/sym_keyboard_feedback_delete.png
+++ b/java/res/drawable-hdpi/sym_keyboard_feedback_delete.png
diff --git a/res/drawable-hdpi/sym_keyboard_feedback_done.png b/java/res/drawable-hdpi/sym_keyboard_feedback_done.png
index 7015e266a..7015e266a 100755
--- a/res/drawable-hdpi/sym_keyboard_feedback_done.png
+++ b/java/res/drawable-hdpi/sym_keyboard_feedback_done.png
diff --git a/res/drawable-hdpi/sym_keyboard_feedback_language_arrows_left.png b/java/res/drawable-hdpi/sym_keyboard_feedback_language_arrows_left.png
index c7638bff1..c7638bff1 100644
--- a/res/drawable-hdpi/sym_keyboard_feedback_language_arrows_left.png
+++ b/java/res/drawable-hdpi/sym_keyboard_feedback_language_arrows_left.png
diff --git a/res/drawable-hdpi/sym_keyboard_feedback_language_arrows_right.png b/java/res/drawable-hdpi/sym_keyboard_feedback_language_arrows_right.png
index 7acb07c86..7acb07c86 100644
--- a/res/drawable-hdpi/sym_keyboard_feedback_language_arrows_right.png
+++ b/java/res/drawable-hdpi/sym_keyboard_feedback_language_arrows_right.png
diff --git a/res/drawable-hdpi/sym_keyboard_feedback_mic.png b/java/res/drawable-hdpi/sym_keyboard_feedback_mic.png
index cb86a5598..cb86a5598 100644
--- a/res/drawable-hdpi/sym_keyboard_feedback_mic.png
+++ b/java/res/drawable-hdpi/sym_keyboard_feedback_mic.png
diff --git a/res/drawable-hdpi/sym_keyboard_feedback_numalt.png b/java/res/drawable-hdpi/sym_keyboard_feedback_numalt.png
index 728c6f7d4..728c6f7d4 100755
--- a/res/drawable-hdpi/sym_keyboard_feedback_numalt.png
+++ b/java/res/drawable-hdpi/sym_keyboard_feedback_numalt.png
diff --git a/res/drawable-hdpi/sym_keyboard_feedback_return.png b/java/res/drawable-hdpi/sym_keyboard_feedback_return.png
index ae57299e4..ae57299e4 100755
--- a/res/drawable-hdpi/sym_keyboard_feedback_return.png
+++ b/java/res/drawable-hdpi/sym_keyboard_feedback_return.png
diff --git a/res/drawable-hdpi/sym_keyboard_feedback_search.png b/java/res/drawable-hdpi/sym_keyboard_feedback_search.png
index d931b39e2..d931b39e2 100755
--- a/res/drawable-hdpi/sym_keyboard_feedback_search.png
+++ b/java/res/drawable-hdpi/sym_keyboard_feedback_search.png
diff --git a/res/drawable-hdpi/sym_keyboard_feedback_shift.png b/java/res/drawable-hdpi/sym_keyboard_feedback_shift.png
index 4db31c849..4db31c849 100755
--- a/res/drawable-hdpi/sym_keyboard_feedback_shift.png
+++ b/java/res/drawable-hdpi/sym_keyboard_feedback_shift.png
diff --git a/res/drawable-hdpi/sym_keyboard_feedback_shift_locked.png b/java/res/drawable-hdpi/sym_keyboard_feedback_shift_locked.png
index 3fd5659fd..3fd5659fd 100755
--- a/res/drawable-hdpi/sym_keyboard_feedback_shift_locked.png
+++ b/java/res/drawable-hdpi/sym_keyboard_feedback_shift_locked.png
diff --git a/res/drawable-hdpi/sym_keyboard_feedback_space.png b/java/res/drawable-hdpi/sym_keyboard_feedback_space.png
index 98266ee52..98266ee52 100755
--- a/res/drawable-hdpi/sym_keyboard_feedback_space.png
+++ b/java/res/drawable-hdpi/sym_keyboard_feedback_space.png
diff --git a/res/drawable-hdpi/sym_keyboard_feedback_tab.png b/java/res/drawable-hdpi/sym_keyboard_feedback_tab.png
index 7754752f3..7754752f3 100644
--- a/res/drawable-hdpi/sym_keyboard_feedback_tab.png
+++ b/java/res/drawable-hdpi/sym_keyboard_feedback_tab.png
diff --git a/res/drawable-hdpi/sym_keyboard_feedback_tabprev.png b/java/res/drawable-hdpi/sym_keyboard_feedback_tabprev.png
index 36f6b5364..36f6b5364 100644
--- a/res/drawable-hdpi/sym_keyboard_feedback_tabprev.png
+++ b/java/res/drawable-hdpi/sym_keyboard_feedback_tabprev.png
diff --git a/res/drawable-hdpi/sym_keyboard_globe.png b/java/res/drawable-hdpi/sym_keyboard_globe.png
index fa747642d..fa747642d 100644
--- a/res/drawable-hdpi/sym_keyboard_globe.png
+++ b/java/res/drawable-hdpi/sym_keyboard_globe.png
diff --git a/res/drawable-hdpi/sym_keyboard_language_arrows_left.png b/java/res/drawable-hdpi/sym_keyboard_language_arrows_left.png
index 65ccfda87..65ccfda87 100644
--- a/res/drawable-hdpi/sym_keyboard_language_arrows_left.png
+++ b/java/res/drawable-hdpi/sym_keyboard_language_arrows_left.png
diff --git a/res/drawable-hdpi/sym_keyboard_language_arrows_right.png b/java/res/drawable-hdpi/sym_keyboard_language_arrows_right.png
index 0d01bc224..0d01bc224 100644
--- a/res/drawable-hdpi/sym_keyboard_language_arrows_right.png
+++ b/java/res/drawable-hdpi/sym_keyboard_language_arrows_right.png
diff --git a/res/drawable-hdpi/sym_keyboard_mic.png b/java/res/drawable-hdpi/sym_keyboard_mic.png
index 0a0a68a96..0a0a68a96 100644
--- a/res/drawable-hdpi/sym_keyboard_mic.png
+++ b/java/res/drawable-hdpi/sym_keyboard_mic.png
diff --git a/res/drawable-hdpi/sym_keyboard_num0.png b/java/res/drawable-hdpi/sym_keyboard_num0.png
index 10ac70b9d..10ac70b9d 100755
--- a/res/drawable-hdpi/sym_keyboard_num0.png
+++ b/java/res/drawable-hdpi/sym_keyboard_num0.png
diff --git a/res/drawable-hdpi/sym_keyboard_num1.png b/java/res/drawable-hdpi/sym_keyboard_num1.png
index 0fc03efa5..0fc03efa5 100755
--- a/res/drawable-hdpi/sym_keyboard_num1.png
+++ b/java/res/drawable-hdpi/sym_keyboard_num1.png
diff --git a/res/drawable-hdpi/sym_keyboard_num2.png b/java/res/drawable-hdpi/sym_keyboard_num2.png
index 283560b35..283560b35 100755
--- a/res/drawable-hdpi/sym_keyboard_num2.png
+++ b/java/res/drawable-hdpi/sym_keyboard_num2.png
diff --git a/res/drawable-hdpi/sym_keyboard_num3.png b/java/res/drawable-hdpi/sym_keyboard_num3.png
index 9a3b3294b..9a3b3294b 100755
--- a/res/drawable-hdpi/sym_keyboard_num3.png
+++ b/java/res/drawable-hdpi/sym_keyboard_num3.png
diff --git a/res/drawable-hdpi/sym_keyboard_num4.png b/java/res/drawable-hdpi/sym_keyboard_num4.png
index f13ff1ae9..f13ff1ae9 100755
--- a/res/drawable-hdpi/sym_keyboard_num4.png
+++ b/java/res/drawable-hdpi/sym_keyboard_num4.png
diff --git a/res/drawable-hdpi/sym_keyboard_num5.png b/java/res/drawable-hdpi/sym_keyboard_num5.png
index c251329fa..c251329fa 100755
--- a/res/drawable-hdpi/sym_keyboard_num5.png
+++ b/java/res/drawable-hdpi/sym_keyboard_num5.png
diff --git a/res/drawable-hdpi/sym_keyboard_num6.png b/java/res/drawable-hdpi/sym_keyboard_num6.png
index 4acba4c91..4acba4c91 100755
--- a/res/drawable-hdpi/sym_keyboard_num6.png
+++ b/java/res/drawable-hdpi/sym_keyboard_num6.png
diff --git a/res/drawable-hdpi/sym_keyboard_num7.png b/java/res/drawable-hdpi/sym_keyboard_num7.png
index 14931c18c..14931c18c 100755
--- a/res/drawable-hdpi/sym_keyboard_num7.png
+++ b/java/res/drawable-hdpi/sym_keyboard_num7.png
diff --git a/res/drawable-hdpi/sym_keyboard_num8.png b/java/res/drawable-hdpi/sym_keyboard_num8.png
index d4973fdc9..d4973fdc9 100755
--- a/res/drawable-hdpi/sym_keyboard_num8.png
+++ b/java/res/drawable-hdpi/sym_keyboard_num8.png
diff --git a/res/drawable-hdpi/sym_keyboard_num9.png b/java/res/drawable-hdpi/sym_keyboard_num9.png
index 49cec66f4..49cec66f4 100755
--- a/res/drawable-hdpi/sym_keyboard_num9.png
+++ b/java/res/drawable-hdpi/sym_keyboard_num9.png
diff --git a/res/drawable-hdpi/sym_keyboard_numalt.png b/java/res/drawable-hdpi/sym_keyboard_numalt.png
index 3cc5311cd..3cc5311cd 100755
--- a/res/drawable-hdpi/sym_keyboard_numalt.png
+++ b/java/res/drawable-hdpi/sym_keyboard_numalt.png
diff --git a/res/drawable-hdpi/sym_keyboard_numpound.png b/java/res/drawable-hdpi/sym_keyboard_numpound.png
index d09133929..d09133929 100755
--- a/res/drawable-hdpi/sym_keyboard_numpound.png
+++ b/java/res/drawable-hdpi/sym_keyboard_numpound.png
diff --git a/res/drawable-hdpi/sym_keyboard_numstar.png b/java/res/drawable-hdpi/sym_keyboard_numstar.png
index e838e169f..e838e169f 100755
--- a/res/drawable-hdpi/sym_keyboard_numstar.png
+++ b/java/res/drawable-hdpi/sym_keyboard_numstar.png
diff --git a/res/drawable-hdpi/sym_keyboard_return.png b/java/res/drawable-hdpi/sym_keyboard_return.png
index 58505c5e0..58505c5e0 100755
--- a/res/drawable-hdpi/sym_keyboard_return.png
+++ b/java/res/drawable-hdpi/sym_keyboard_return.png
diff --git a/res/drawable-hdpi/sym_keyboard_search.png b/java/res/drawable-hdpi/sym_keyboard_search.png
index e72cde3bb..e72cde3bb 100755
--- a/res/drawable-hdpi/sym_keyboard_search.png
+++ b/java/res/drawable-hdpi/sym_keyboard_search.png
diff --git a/res/drawable-hdpi/sym_keyboard_shift.png b/java/res/drawable-hdpi/sym_keyboard_shift.png
index 814908178..814908178 100755
--- a/res/drawable-hdpi/sym_keyboard_shift.png
+++ b/java/res/drawable-hdpi/sym_keyboard_shift.png
diff --git a/res/drawable-hdpi/sym_keyboard_shift_locked.png b/java/res/drawable-hdpi/sym_keyboard_shift_locked.png
index 31ca27718..31ca27718 100755
--- a/res/drawable-hdpi/sym_keyboard_shift_locked.png
+++ b/java/res/drawable-hdpi/sym_keyboard_shift_locked.png
diff --git a/res/drawable-hdpi/sym_keyboard_space.png b/java/res/drawable-hdpi/sym_keyboard_space.png
index 3e98b3014..3e98b3014 100755
--- a/res/drawable-hdpi/sym_keyboard_space.png
+++ b/java/res/drawable-hdpi/sym_keyboard_space.png
diff --git a/res/drawable-hdpi/sym_keyboard_tab.png b/java/res/drawable-hdpi/sym_keyboard_tab.png
index 1d4d92bd1..1d4d92bd1 100644
--- a/res/drawable-hdpi/sym_keyboard_tab.png
+++ b/java/res/drawable-hdpi/sym_keyboard_tab.png
diff --git a/res/drawable-hdpi/sym_keyboard_tabprev.png b/java/res/drawable-hdpi/sym_keyboard_tabprev.png
index 51bff1bcd..51bff1bcd 100644
--- a/res/drawable-hdpi/sym_keyboard_tabprev.png
+++ b/java/res/drawable-hdpi/sym_keyboard_tabprev.png
diff --git a/res/drawable-hdpi/voice_ime_background.9.png b/java/res/drawable-hdpi/voice_ime_background.9.png
index 73fb0901e..73fb0901e 100755
--- a/res/drawable-hdpi/voice_ime_background.9.png
+++ b/java/res/drawable-hdpi/voice_ime_background.9.png
diff --git a/res/drawable-hdpi/working.png b/java/res/drawable-hdpi/working.png
index 8b51ed116..8b51ed116 100755
--- a/res/drawable-hdpi/working.png
+++ b/java/res/drawable-hdpi/working.png
diff --git a/res/drawable-land-hdpi/btn_keyboard_key_normal.9.png b/java/res/drawable-land-hdpi/btn_keyboard_key_normal.9.png
index 603bf0e15..603bf0e15 100755
--- a/res/drawable-land-hdpi/btn_keyboard_key_normal.9.png
+++ b/java/res/drawable-land-hdpi/btn_keyboard_key_normal.9.png
diff --git a/res/drawable-land-hdpi/btn_keyboard_key_normal_off.9.png b/java/res/drawable-land-hdpi/btn_keyboard_key_normal_off.9.png
index 6ddd516e7..6ddd516e7 100755
--- a/res/drawable-land-hdpi/btn_keyboard_key_normal_off.9.png
+++ b/java/res/drawable-land-hdpi/btn_keyboard_key_normal_off.9.png
diff --git a/res/drawable-land-hdpi/btn_keyboard_key_normal_on.9.png b/java/res/drawable-land-hdpi/btn_keyboard_key_normal_on.9.png
index 65fdeb353..65fdeb353 100755
--- a/res/drawable-land-hdpi/btn_keyboard_key_normal_on.9.png
+++ b/java/res/drawable-land-hdpi/btn_keyboard_key_normal_on.9.png
diff --git a/res/drawable-land-hdpi/btn_keyboard_key_pressed.9.png b/java/res/drawable-land-hdpi/btn_keyboard_key_pressed.9.png
index 7ec915fe8..7ec915fe8 100755
--- a/res/drawable-land-hdpi/btn_keyboard_key_pressed.9.png
+++ b/java/res/drawable-land-hdpi/btn_keyboard_key_pressed.9.png
diff --git a/res/drawable-land-hdpi/btn_keyboard_key_pressed_off.9.png b/java/res/drawable-land-hdpi/btn_keyboard_key_pressed_off.9.png
index 439271723..439271723 100755
--- a/res/drawable-land-hdpi/btn_keyboard_key_pressed_off.9.png
+++ b/java/res/drawable-land-hdpi/btn_keyboard_key_pressed_off.9.png
diff --git a/res/drawable-land-hdpi/btn_keyboard_key_pressed_on.9.png b/java/res/drawable-land-hdpi/btn_keyboard_key_pressed_on.9.png
index c2cc32044..c2cc32044 100755
--- a/res/drawable-land-hdpi/btn_keyboard_key_pressed_on.9.png
+++ b/java/res/drawable-land-hdpi/btn_keyboard_key_pressed_on.9.png
diff --git a/res/drawable-land-hdpi/keyboard_suggest_strip_divider.png b/java/res/drawable-land-hdpi/keyboard_suggest_strip_divider.png
index 1a03c52e6..1a03c52e6 100755
--- a/res/drawable-land-hdpi/keyboard_suggest_strip_divider.png
+++ b/java/res/drawable-land-hdpi/keyboard_suggest_strip_divider.png
diff --git a/res/drawable-land-mdpi/btn_keyboard_key_normal.9.png b/java/res/drawable-land-mdpi/btn_keyboard_key_normal.9.png
index ea2506c6d..ea2506c6d 100644
--- a/res/drawable-land-mdpi/btn_keyboard_key_normal.9.png
+++ b/java/res/drawable-land-mdpi/btn_keyboard_key_normal.9.png
diff --git a/res/drawable-land-mdpi/btn_keyboard_key_normal_off.9.png b/java/res/drawable-land-mdpi/btn_keyboard_key_normal_off.9.png
index bda9b8394..bda9b8394 100644
--- a/res/drawable-land-mdpi/btn_keyboard_key_normal_off.9.png
+++ b/java/res/drawable-land-mdpi/btn_keyboard_key_normal_off.9.png
diff --git a/res/drawable-land-mdpi/btn_keyboard_key_normal_on.9.png b/java/res/drawable-land-mdpi/btn_keyboard_key_normal_on.9.png
index 0c16ed509..0c16ed509 100644
--- a/res/drawable-land-mdpi/btn_keyboard_key_normal_on.9.png
+++ b/java/res/drawable-land-mdpi/btn_keyboard_key_normal_on.9.png
diff --git a/res/drawable-land-mdpi/btn_keyboard_key_pressed.9.png b/java/res/drawable-land-mdpi/btn_keyboard_key_pressed.9.png
index 6b5c718c7..6b5c718c7 100755
--- a/res/drawable-land-mdpi/btn_keyboard_key_pressed.9.png
+++ b/java/res/drawable-land-mdpi/btn_keyboard_key_pressed.9.png
diff --git a/res/drawable-land-mdpi/btn_keyboard_key_pressed_off.9.png b/java/res/drawable-land-mdpi/btn_keyboard_key_pressed_off.9.png
index bdcf06e1b..bdcf06e1b 100644
--- a/res/drawable-land-mdpi/btn_keyboard_key_pressed_off.9.png
+++ b/java/res/drawable-land-mdpi/btn_keyboard_key_pressed_off.9.png
diff --git a/res/drawable-land-mdpi/btn_keyboard_key_pressed_on.9.png b/java/res/drawable-land-mdpi/btn_keyboard_key_pressed_on.9.png
index 79621a9e6..79621a9e6 100644
--- a/res/drawable-land-mdpi/btn_keyboard_key_pressed_on.9.png
+++ b/java/res/drawable-land-mdpi/btn_keyboard_key_pressed_on.9.png
diff --git a/res/drawable-land-mdpi/keyboard_suggest_strip_divider.png b/java/res/drawable-land-mdpi/keyboard_suggest_strip_divider.png
index e54c5b099..e54c5b099 100644
--- a/res/drawable-land-mdpi/keyboard_suggest_strip_divider.png
+++ b/java/res/drawable-land-mdpi/keyboard_suggest_strip_divider.png
diff --git a/res/drawable-land/btn_keyboard_key.xml b/java/res/drawable-land/btn_keyboard_key.xml
index 45578e582..45578e582 100644
--- a/res/drawable-land/btn_keyboard_key.xml
+++ b/java/res/drawable-land/btn_keyboard_key.xml
diff --git a/res/drawable-mdpi/btn_keyboard_key_fulltrans_normal.9.png b/java/res/drawable-mdpi/btn_keyboard_key_fulltrans_normal.9.png
index 20f3d5087..20f3d5087 100644
--- a/res/drawable-mdpi/btn_keyboard_key_fulltrans_normal.9.png
+++ b/java/res/drawable-mdpi/btn_keyboard_key_fulltrans_normal.9.png
diff --git a/res/drawable-mdpi/btn_keyboard_key_fulltrans_pressed.9.png b/java/res/drawable-mdpi/btn_keyboard_key_fulltrans_pressed.9.png
index 1ed3065c5..1ed3065c5 100644
--- a/res/drawable-mdpi/btn_keyboard_key_fulltrans_pressed.9.png
+++ b/java/res/drawable-mdpi/btn_keyboard_key_fulltrans_pressed.9.png
diff --git a/res/drawable-mdpi/btn_keyboard_key_normal.9.png b/java/res/drawable-mdpi/btn_keyboard_key_normal.9.png
index 7ba18dd25..7ba18dd25 100644
--- a/res/drawable-mdpi/btn_keyboard_key_normal.9.png
+++ b/java/res/drawable-mdpi/btn_keyboard_key_normal.9.png
diff --git a/res/drawable-mdpi/btn_keyboard_key_normal_off.9.png b/java/res/drawable-mdpi/btn_keyboard_key_normal_off.9.png
index bda9b8394..bda9b8394 100644
--- a/res/drawable-mdpi/btn_keyboard_key_normal_off.9.png
+++ b/java/res/drawable-mdpi/btn_keyboard_key_normal_off.9.png
diff --git a/res/drawable-mdpi/btn_keyboard_key_normal_on.9.png b/java/res/drawable-mdpi/btn_keyboard_key_normal_on.9.png
index 0c16ed509..0c16ed509 100644
--- a/res/drawable-mdpi/btn_keyboard_key_normal_on.9.png
+++ b/java/res/drawable-mdpi/btn_keyboard_key_normal_on.9.png
diff --git a/res/drawable-mdpi/btn_keyboard_key_pressed.9.png b/java/res/drawable-mdpi/btn_keyboard_key_pressed.9.png
index 39b9314a1..39b9314a1 100644
--- a/res/drawable-mdpi/btn_keyboard_key_pressed.9.png
+++ b/java/res/drawable-mdpi/btn_keyboard_key_pressed.9.png
diff --git a/res/drawable-mdpi/btn_keyboard_key_pressed_off.9.png b/java/res/drawable-mdpi/btn_keyboard_key_pressed_off.9.png
index bdcf06e1b..bdcf06e1b 100644
--- a/res/drawable-mdpi/btn_keyboard_key_pressed_off.9.png
+++ b/java/res/drawable-mdpi/btn_keyboard_key_pressed_off.9.png
diff --git a/res/drawable-mdpi/btn_keyboard_key_pressed_on.9.png b/java/res/drawable-mdpi/btn_keyboard_key_pressed_on.9.png
index 79621a9e6..79621a9e6 100644
--- a/res/drawable-mdpi/btn_keyboard_key_pressed_on.9.png
+++ b/java/res/drawable-mdpi/btn_keyboard_key_pressed_on.9.png
diff --git a/res/drawable-mdpi/candidate_feedback_background.9.png b/java/res/drawable-mdpi/candidate_feedback_background.9.png
index 2a80f096d..2a80f096d 100644
--- a/res/drawable-mdpi/candidate_feedback_background.9.png
+++ b/java/res/drawable-mdpi/candidate_feedback_background.9.png
diff --git a/res/drawable-mdpi/dialog_bubble_step02.9.png b/java/res/drawable-mdpi/dialog_bubble_step02.9.png
index d77f85fe2..d77f85fe2 100755
--- a/res/drawable-mdpi/dialog_bubble_step02.9.png
+++ b/java/res/drawable-mdpi/dialog_bubble_step02.9.png
diff --git a/res/drawable-mdpi/dialog_bubble_step07.9.png b/java/res/drawable-mdpi/dialog_bubble_step07.9.png
index 80f4a0eaa..80f4a0eaa 100755
--- a/res/drawable-mdpi/dialog_bubble_step07.9.png
+++ b/java/res/drawable-mdpi/dialog_bubble_step07.9.png
diff --git a/res/drawable-mdpi/highlight_pressed.png b/java/res/drawable-mdpi/highlight_pressed.png
index d27f1061a..d27f1061a 100644
--- a/res/drawable-mdpi/highlight_pressed.png
+++ b/java/res/drawable-mdpi/highlight_pressed.png
diff --git a/res/drawable-mdpi/ic_dialog_keyboard.png b/java/res/drawable-mdpi/ic_dialog_keyboard.png
index 9a5aada8b..9a5aada8b 100644
--- a/res/drawable-mdpi/ic_dialog_keyboard.png
+++ b/java/res/drawable-mdpi/ic_dialog_keyboard.png
diff --git a/res/drawable-mdpi/ic_mic_dialog.png b/java/res/drawable-mdpi/ic_mic_dialog.png
index 77613ca05..77613ca05 100644
--- a/res/drawable-mdpi/ic_mic_dialog.png
+++ b/java/res/drawable-mdpi/ic_mic_dialog.png
diff --git a/res/drawable-mdpi/ic_suggest_strip_microphone.png b/java/res/drawable-mdpi/ic_suggest_strip_microphone.png
index 18f314a61..18f314a61 100644
--- a/res/drawable-mdpi/ic_suggest_strip_microphone.png
+++ b/java/res/drawable-mdpi/ic_suggest_strip_microphone.png
diff --git a/res/drawable-mdpi/ic_suggest_strip_microphone_swipe.png b/java/res/drawable-mdpi/ic_suggest_strip_microphone_swipe.png
index ff629b674..ff629b674 100644
--- a/res/drawable-mdpi/ic_suggest_strip_microphone_swipe.png
+++ b/java/res/drawable-mdpi/ic_suggest_strip_microphone_swipe.png
diff --git a/res/drawable-mdpi/ic_suggest_strip_scroll_left_arrow.png b/java/res/drawable-mdpi/ic_suggest_strip_scroll_left_arrow.png
index a9adef2ba..a9adef2ba 100644
--- a/res/drawable-mdpi/ic_suggest_strip_scroll_left_arrow.png
+++ b/java/res/drawable-mdpi/ic_suggest_strip_scroll_left_arrow.png
diff --git a/res/drawable-mdpi/ic_suggest_strip_scroll_right_arrow.png b/java/res/drawable-mdpi/ic_suggest_strip_scroll_right_arrow.png
index 639a28711..639a28711 100644
--- a/res/drawable-mdpi/ic_suggest_strip_scroll_right_arrow.png
+++ b/java/res/drawable-mdpi/ic_suggest_strip_scroll_right_arrow.png
diff --git a/res/drawable-mdpi/keyboard_background.9.png b/java/res/drawable-mdpi/keyboard_background.9.png
index 2bd4b628d..2bd4b628d 100644
--- a/res/drawable-mdpi/keyboard_background.9.png
+++ b/java/res/drawable-mdpi/keyboard_background.9.png
diff --git a/res/drawable-mdpi/keyboard_suggest_strip.9.png b/java/res/drawable-mdpi/keyboard_suggest_strip.9.png
index 71bf5e8f4..71bf5e8f4 100644
--- a/res/drawable-mdpi/keyboard_suggest_strip.9.png
+++ b/java/res/drawable-mdpi/keyboard_suggest_strip.9.png
diff --git a/res/drawable-mdpi/keyboard_suggest_strip_divider.png b/java/res/drawable-mdpi/keyboard_suggest_strip_divider.png
index c9413d7c1..c9413d7c1 100644
--- a/res/drawable-mdpi/keyboard_suggest_strip_divider.png
+++ b/java/res/drawable-mdpi/keyboard_suggest_strip_divider.png
diff --git a/res/drawable-mdpi/list_selector_background_pressed.9.png b/java/res/drawable-mdpi/list_selector_background_pressed.9.png
index 02b4e9a53..02b4e9a53 100644
--- a/res/drawable-mdpi/list_selector_background_pressed.9.png
+++ b/java/res/drawable-mdpi/list_selector_background_pressed.9.png
diff --git a/res/drawable-mdpi/sym_keyboard_123_mic.png b/java/res/drawable-mdpi/sym_keyboard_123_mic.png
index 35afe0821..35afe0821 100644
--- a/res/drawable-mdpi/sym_keyboard_123_mic.png
+++ b/java/res/drawable-mdpi/sym_keyboard_123_mic.png
diff --git a/res/drawable-mdpi/sym_keyboard_delete.png b/java/res/drawable-mdpi/sym_keyboard_delete.png
index 43a033ead..43a033ead 100644
--- a/res/drawable-mdpi/sym_keyboard_delete.png
+++ b/java/res/drawable-mdpi/sym_keyboard_delete.png
diff --git a/res/drawable-mdpi/sym_keyboard_done.png b/java/res/drawable-mdpi/sym_keyboard_done.png
index c0d6d1394..c0d6d1394 100755
--- a/res/drawable-mdpi/sym_keyboard_done.png
+++ b/java/res/drawable-mdpi/sym_keyboard_done.png
diff --git a/res/drawable-mdpi/sym_keyboard_feedback_123_mic.png b/java/res/drawable-mdpi/sym_keyboard_feedback_123_mic.png
index bc11cf31a..bc11cf31a 100644
--- a/res/drawable-mdpi/sym_keyboard_feedback_123_mic.png
+++ b/java/res/drawable-mdpi/sym_keyboard_feedback_123_mic.png
diff --git a/res/drawable-mdpi/sym_keyboard_feedback_delete.png b/java/res/drawable-mdpi/sym_keyboard_feedback_delete.png
index 1edb10b4e..1edb10b4e 100644
--- a/res/drawable-mdpi/sym_keyboard_feedback_delete.png
+++ b/java/res/drawable-mdpi/sym_keyboard_feedback_delete.png
diff --git a/res/drawable-mdpi/sym_keyboard_feedback_done.png b/java/res/drawable-mdpi/sym_keyboard_feedback_done.png
index 0d7ebd4e5..0d7ebd4e5 100755
--- a/res/drawable-mdpi/sym_keyboard_feedback_done.png
+++ b/java/res/drawable-mdpi/sym_keyboard_feedback_done.png
diff --git a/res/drawable-mdpi/sym_keyboard_feedback_language_arrows_left.png b/java/res/drawable-mdpi/sym_keyboard_feedback_language_arrows_left.png
index e3f80fada..e3f80fada 100644
--- a/res/drawable-mdpi/sym_keyboard_feedback_language_arrows_left.png
+++ b/java/res/drawable-mdpi/sym_keyboard_feedback_language_arrows_left.png
diff --git a/res/drawable-mdpi/sym_keyboard_feedback_language_arrows_right.png b/java/res/drawable-mdpi/sym_keyboard_feedback_language_arrows_right.png
index 3cb0d9913..3cb0d9913 100644
--- a/res/drawable-mdpi/sym_keyboard_feedback_language_arrows_right.png
+++ b/java/res/drawable-mdpi/sym_keyboard_feedback_language_arrows_right.png
diff --git a/res/drawable-mdpi/sym_keyboard_feedback_mic.png b/java/res/drawable-mdpi/sym_keyboard_feedback_mic.png
index 247d5b3a9..247d5b3a9 100644
--- a/res/drawable-mdpi/sym_keyboard_feedback_mic.png
+++ b/java/res/drawable-mdpi/sym_keyboard_feedback_mic.png
diff --git a/res/drawable-mdpi/sym_keyboard_feedback_numalt.png b/java/res/drawable-mdpi/sym_keyboard_feedback_numalt.png
index aac737615..aac737615 100644
--- a/res/drawable-mdpi/sym_keyboard_feedback_numalt.png
+++ b/java/res/drawable-mdpi/sym_keyboard_feedback_numalt.png
diff --git a/res/drawable-mdpi/sym_keyboard_feedback_return.png b/java/res/drawable-mdpi/sym_keyboard_feedback_return.png
index 03d9c9b2d..03d9c9b2d 100644
--- a/res/drawable-mdpi/sym_keyboard_feedback_return.png
+++ b/java/res/drawable-mdpi/sym_keyboard_feedback_return.png
diff --git a/res/drawable-mdpi/sym_keyboard_feedback_search.png b/java/res/drawable-mdpi/sym_keyboard_feedback_search.png
index f4af341eb..f4af341eb 100755
--- a/res/drawable-mdpi/sym_keyboard_feedback_search.png
+++ b/java/res/drawable-mdpi/sym_keyboard_feedback_search.png
diff --git a/res/drawable-mdpi/sym_keyboard_feedback_shift.png b/java/res/drawable-mdpi/sym_keyboard_feedback_shift.png
index 97f4661f8..97f4661f8 100644
--- a/res/drawable-mdpi/sym_keyboard_feedback_shift.png
+++ b/java/res/drawable-mdpi/sym_keyboard_feedback_shift.png
diff --git a/res/drawable-mdpi/sym_keyboard_feedback_shift_locked.png b/java/res/drawable-mdpi/sym_keyboard_feedback_shift_locked.png
index 7194b30b0..7194b30b0 100755
--- a/res/drawable-mdpi/sym_keyboard_feedback_shift_locked.png
+++ b/java/res/drawable-mdpi/sym_keyboard_feedback_shift_locked.png
diff --git a/res/drawable-mdpi/sym_keyboard_feedback_space.png b/java/res/drawable-mdpi/sym_keyboard_feedback_space.png
index 739db6879..739db6879 100644
--- a/res/drawable-mdpi/sym_keyboard_feedback_space.png
+++ b/java/res/drawable-mdpi/sym_keyboard_feedback_space.png
diff --git a/res/drawable-mdpi/sym_keyboard_feedback_tab.png b/java/res/drawable-mdpi/sym_keyboard_feedback_tab.png
index 593fa6703..593fa6703 100644
--- a/res/drawable-mdpi/sym_keyboard_feedback_tab.png
+++ b/java/res/drawable-mdpi/sym_keyboard_feedback_tab.png
diff --git a/res/drawable-mdpi/sym_keyboard_feedback_tabprev.png b/java/res/drawable-mdpi/sym_keyboard_feedback_tabprev.png
index d4b3e7db3..d4b3e7db3 100644
--- a/res/drawable-mdpi/sym_keyboard_feedback_tabprev.png
+++ b/java/res/drawable-mdpi/sym_keyboard_feedback_tabprev.png
diff --git a/res/drawable-mdpi/sym_keyboard_globe.png b/java/res/drawable-mdpi/sym_keyboard_globe.png
index f30c1b640..f30c1b640 100644
--- a/res/drawable-mdpi/sym_keyboard_globe.png
+++ b/java/res/drawable-mdpi/sym_keyboard_globe.png
diff --git a/res/drawable-mdpi/sym_keyboard_language_arrows_left.png b/java/res/drawable-mdpi/sym_keyboard_language_arrows_left.png
index 91eda5f2d..91eda5f2d 100644
--- a/res/drawable-mdpi/sym_keyboard_language_arrows_left.png
+++ b/java/res/drawable-mdpi/sym_keyboard_language_arrows_left.png
diff --git a/res/drawable-mdpi/sym_keyboard_language_arrows_right.png b/java/res/drawable-mdpi/sym_keyboard_language_arrows_right.png
index 62a5beba4..62a5beba4 100644
--- a/res/drawable-mdpi/sym_keyboard_language_arrows_right.png
+++ b/java/res/drawable-mdpi/sym_keyboard_language_arrows_right.png
diff --git a/res/drawable-mdpi/sym_keyboard_mic.png b/java/res/drawable-mdpi/sym_keyboard_mic.png
index a75809549..a75809549 100644
--- a/res/drawable-mdpi/sym_keyboard_mic.png
+++ b/java/res/drawable-mdpi/sym_keyboard_mic.png
diff --git a/res/drawable-mdpi/sym_keyboard_num0.png b/java/res/drawable-mdpi/sym_keyboard_num0.png
index e7007c871..e7007c871 100644
--- a/res/drawable-mdpi/sym_keyboard_num0.png
+++ b/java/res/drawable-mdpi/sym_keyboard_num0.png
diff --git a/res/drawable-mdpi/sym_keyboard_num1.png b/java/res/drawable-mdpi/sym_keyboard_num1.png
index aaac11b0c..aaac11b0c 100644
--- a/res/drawable-mdpi/sym_keyboard_num1.png
+++ b/java/res/drawable-mdpi/sym_keyboard_num1.png
diff --git a/res/drawable-mdpi/sym_keyboard_num2.png b/java/res/drawable-mdpi/sym_keyboard_num2.png
index 4372eb8f0..4372eb8f0 100644
--- a/res/drawable-mdpi/sym_keyboard_num2.png
+++ b/java/res/drawable-mdpi/sym_keyboard_num2.png
diff --git a/res/drawable-mdpi/sym_keyboard_num3.png b/java/res/drawable-mdpi/sym_keyboard_num3.png
index 6f54c850f..6f54c850f 100644
--- a/res/drawable-mdpi/sym_keyboard_num3.png
+++ b/java/res/drawable-mdpi/sym_keyboard_num3.png
diff --git a/res/drawable-mdpi/sym_keyboard_num4.png b/java/res/drawable-mdpi/sym_keyboard_num4.png
index 3e50bb957..3e50bb957 100644
--- a/res/drawable-mdpi/sym_keyboard_num4.png
+++ b/java/res/drawable-mdpi/sym_keyboard_num4.png
diff --git a/res/drawable-mdpi/sym_keyboard_num5.png b/java/res/drawable-mdpi/sym_keyboard_num5.png
index c39ef4404..c39ef4404 100644
--- a/res/drawable-mdpi/sym_keyboard_num5.png
+++ b/java/res/drawable-mdpi/sym_keyboard_num5.png
diff --git a/res/drawable-mdpi/sym_keyboard_num6.png b/java/res/drawable-mdpi/sym_keyboard_num6.png
index ea88ceb94..ea88ceb94 100644
--- a/res/drawable-mdpi/sym_keyboard_num6.png
+++ b/java/res/drawable-mdpi/sym_keyboard_num6.png
diff --git a/res/drawable-mdpi/sym_keyboard_num7.png b/java/res/drawable-mdpi/sym_keyboard_num7.png
index ce800ba42..ce800ba42 100644
--- a/res/drawable-mdpi/sym_keyboard_num7.png
+++ b/java/res/drawable-mdpi/sym_keyboard_num7.png
diff --git a/res/drawable-mdpi/sym_keyboard_num8.png b/java/res/drawable-mdpi/sym_keyboard_num8.png
index 1a8ff94bf..1a8ff94bf 100644
--- a/res/drawable-mdpi/sym_keyboard_num8.png
+++ b/java/res/drawable-mdpi/sym_keyboard_num8.png
diff --git a/res/drawable-mdpi/sym_keyboard_num9.png b/java/res/drawable-mdpi/sym_keyboard_num9.png
index 8b344c0a6..8b344c0a6 100644
--- a/res/drawable-mdpi/sym_keyboard_num9.png
+++ b/java/res/drawable-mdpi/sym_keyboard_num9.png
diff --git a/res/drawable-mdpi/sym_keyboard_numalt.png b/java/res/drawable-mdpi/sym_keyboard_numalt.png
index 32a2cf3ca..32a2cf3ca 100644
--- a/res/drawable-mdpi/sym_keyboard_numalt.png
+++ b/java/res/drawable-mdpi/sym_keyboard_numalt.png
diff --git a/res/drawable-mdpi/sym_keyboard_numpound.png b/java/res/drawable-mdpi/sym_keyboard_numpound.png
index b2419d9ab..b2419d9ab 100644
--- a/res/drawable-mdpi/sym_keyboard_numpound.png
+++ b/java/res/drawable-mdpi/sym_keyboard_numpound.png
diff --git a/res/drawable-mdpi/sym_keyboard_numstar.png b/java/res/drawable-mdpi/sym_keyboard_numstar.png
index cb66f968f..cb66f968f 100644
--- a/res/drawable-mdpi/sym_keyboard_numstar.png
+++ b/java/res/drawable-mdpi/sym_keyboard_numstar.png
diff --git a/res/drawable-mdpi/sym_keyboard_return.png b/java/res/drawable-mdpi/sym_keyboard_return.png
index 17f257439..17f257439 100644
--- a/res/drawable-mdpi/sym_keyboard_return.png
+++ b/java/res/drawable-mdpi/sym_keyboard_return.png
diff --git a/res/drawable-mdpi/sym_keyboard_search.png b/java/res/drawable-mdpi/sym_keyboard_search.png
index 127755d6b..127755d6b 100755
--- a/res/drawable-mdpi/sym_keyboard_search.png
+++ b/java/res/drawable-mdpi/sym_keyboard_search.png
diff --git a/res/drawable-mdpi/sym_keyboard_shift.png b/java/res/drawable-mdpi/sym_keyboard_shift.png
index 0566e5a88..0566e5a88 100644
--- a/res/drawable-mdpi/sym_keyboard_shift.png
+++ b/java/res/drawable-mdpi/sym_keyboard_shift.png
diff --git a/res/drawable-mdpi/sym_keyboard_shift_locked.png b/java/res/drawable-mdpi/sym_keyboard_shift_locked.png
index ccaf05d3b..ccaf05d3b 100755
--- a/res/drawable-mdpi/sym_keyboard_shift_locked.png
+++ b/java/res/drawable-mdpi/sym_keyboard_shift_locked.png
diff --git a/res/drawable-mdpi/sym_keyboard_space.png b/java/res/drawable-mdpi/sym_keyboard_space.png
index 4e6273b89..4e6273b89 100644
--- a/res/drawable-mdpi/sym_keyboard_space.png
+++ b/java/res/drawable-mdpi/sym_keyboard_space.png
diff --git a/res/drawable-mdpi/sym_keyboard_tab.png b/java/res/drawable-mdpi/sym_keyboard_tab.png
index cd9daff08..cd9daff08 100644
--- a/res/drawable-mdpi/sym_keyboard_tab.png
+++ b/java/res/drawable-mdpi/sym_keyboard_tab.png
diff --git a/res/drawable-mdpi/sym_keyboard_tabprev.png b/java/res/drawable-mdpi/sym_keyboard_tabprev.png
index eb90872fc..eb90872fc 100644
--- a/res/drawable-mdpi/sym_keyboard_tabprev.png
+++ b/java/res/drawable-mdpi/sym_keyboard_tabprev.png
diff --git a/res/drawable/btn_keyboard_key.xml b/java/res/drawable/btn_keyboard_key.xml
index 45578e582..45578e582 100644
--- a/res/drawable/btn_keyboard_key.xml
+++ b/java/res/drawable/btn_keyboard_key.xml
diff --git a/res/drawable/btn_keyboard_key_fulltrans.xml b/java/res/drawable/btn_keyboard_key_fulltrans.xml
index bad2a931d..bad2a931d 100644
--- a/res/drawable/btn_keyboard_key_fulltrans.xml
+++ b/java/res/drawable/btn_keyboard_key_fulltrans.xml
diff --git a/res/drawable/cancel.png b/java/res/drawable/cancel.png
index 081532bec..081532bec 100644
--- a/res/drawable/cancel.png
+++ b/java/res/drawable/cancel.png
diff --git a/res/drawable/caution.png b/java/res/drawable/caution.png
index eaef53425..eaef53425 100644
--- a/res/drawable/caution.png
+++ b/java/res/drawable/caution.png
diff --git a/res/drawable/dialog_top_dark_bottom_medium.9.png b/java/res/drawable/dialog_top_dark_bottom_medium.9.png
index cf7ecaf1e..cf7ecaf1e 100644
--- a/res/drawable/dialog_top_dark_bottom_medium.9.png
+++ b/java/res/drawable/dialog_top_dark_bottom_medium.9.png
diff --git a/res/drawable/ic_dialog_alert_large.png b/java/res/drawable/ic_dialog_alert_large.png
index 2d4a164a7..2d4a164a7 100644
--- a/res/drawable/ic_dialog_alert_large.png
+++ b/java/res/drawable/ic_dialog_alert_large.png
diff --git a/res/drawable/ic_dialog_voice_input.png b/java/res/drawable/ic_dialog_voice_input.png
index d28914132..d28914132 100644
--- a/res/drawable/ic_dialog_voice_input.png
+++ b/java/res/drawable/ic_dialog_voice_input.png
diff --git a/res/drawable/ic_dialog_wave_0_0.png b/java/res/drawable/ic_dialog_wave_0_0.png
index 9c3c28f37..9c3c28f37 100644
--- a/res/drawable/ic_dialog_wave_0_0.png
+++ b/java/res/drawable/ic_dialog_wave_0_0.png
diff --git a/res/drawable/ic_dialog_wave_1_3.png b/java/res/drawable/ic_dialog_wave_1_3.png
index d33bd0d9b..d33bd0d9b 100644
--- a/res/drawable/ic_dialog_wave_1_3.png
+++ b/java/res/drawable/ic_dialog_wave_1_3.png
diff --git a/res/drawable/ic_dialog_wave_2_3.png b/java/res/drawable/ic_dialog_wave_2_3.png
index 5094a6e6c..5094a6e6c 100644
--- a/res/drawable/ic_dialog_wave_2_3.png
+++ b/java/res/drawable/ic_dialog_wave_2_3.png
diff --git a/res/drawable/ic_dialog_wave_3_3.png b/java/res/drawable/ic_dialog_wave_3_3.png
index 69917564d..69917564d 100644
--- a/res/drawable/ic_dialog_wave_3_3.png
+++ b/java/res/drawable/ic_dialog_wave_3_3.png
diff --git a/res/drawable/ic_dialog_wave_4_3.png b/java/res/drawable/ic_dialog_wave_4_3.png
index af5a84c31..af5a84c31 100644
--- a/res/drawable/ic_dialog_wave_4_3.png
+++ b/java/res/drawable/ic_dialog_wave_4_3.png
diff --git a/res/drawable/ic_suggest_scroll_background.xml b/java/res/drawable/ic_suggest_scroll_background.xml
index 9d246e40e..9d246e40e 100644
--- a/res/drawable/ic_suggest_scroll_background.xml
+++ b/java/res/drawable/ic_suggest_scroll_background.xml
diff --git a/res/drawable/mic_slash.png b/java/res/drawable/mic_slash.png
index 0b0fb5803..0b0fb5803 100644
--- a/res/drawable/mic_slash.png
+++ b/java/res/drawable/mic_slash.png
diff --git a/res/drawable/ok_cancel.png b/java/res/drawable/ok_cancel.png
index 0601d3231..0601d3231 100644
--- a/res/drawable/ok_cancel.png
+++ b/java/res/drawable/ok_cancel.png
diff --git a/res/drawable/speak_now_level0.png b/java/res/drawable/speak_now_level0.png
index abc845466..abc845466 100644
--- a/res/drawable/speak_now_level0.png
+++ b/java/res/drawable/speak_now_level0.png
diff --git a/res/drawable/speak_now_level1.png b/java/res/drawable/speak_now_level1.png
index 67cb235bf..67cb235bf 100644
--- a/res/drawable/speak_now_level1.png
+++ b/java/res/drawable/speak_now_level1.png
diff --git a/res/drawable/speak_now_level2.png b/java/res/drawable/speak_now_level2.png
index 1e07f26c6..1e07f26c6 100644
--- a/res/drawable/speak_now_level2.png
+++ b/java/res/drawable/speak_now_level2.png
diff --git a/res/drawable/speak_now_level3.png b/java/res/drawable/speak_now_level3.png
index 31991daee..31991daee 100644
--- a/res/drawable/speak_now_level3.png
+++ b/java/res/drawable/speak_now_level3.png
diff --git a/res/drawable/speak_now_level4.png b/java/res/drawable/speak_now_level4.png
index 7363ca892..7363ca892 100644
--- a/res/drawable/speak_now_level4.png
+++ b/java/res/drawable/speak_now_level4.png
diff --git a/res/drawable/speak_now_level5.png b/java/res/drawable/speak_now_level5.png
index 9034908f4..9034908f4 100644
--- a/res/drawable/speak_now_level5.png
+++ b/java/res/drawable/speak_now_level5.png
diff --git a/res/drawable/speak_now_level6.png b/java/res/drawable/speak_now_level6.png
index 3eaa9bdad..3eaa9bdad 100644
--- a/res/drawable/speak_now_level6.png
+++ b/java/res/drawable/speak_now_level6.png
diff --git a/res/drawable/voice_ime_background.9.png b/java/res/drawable/voice_ime_background.9.png
index 67802492a..67802492a 100644
--- a/res/drawable/voice_ime_background.9.png
+++ b/java/res/drawable/voice_ime_background.9.png
diff --git a/res/drawable/voice_swipe_hint.png b/java/res/drawable/voice_swipe_hint.png
index bb8873251..bb8873251 100644
--- a/res/drawable/voice_swipe_hint.png
+++ b/java/res/drawable/voice_swipe_hint.png
diff --git a/res/drawable/working.png b/java/res/drawable/working.png
index 6246a6d1c..6246a6d1c 100644
--- a/res/drawable/working.png
+++ b/java/res/drawable/working.png
diff --git a/res/layout/bubble_text.xml b/java/res/layout/bubble_text.xml
index c3957b65e..c3957b65e 100644
--- a/res/layout/bubble_text.xml
+++ b/java/res/layout/bubble_text.xml
diff --git a/res/layout/candidate_preview.xml b/java/res/layout/candidate_preview.xml
index fe2002d46..fe2002d46 100755
--- a/res/layout/candidate_preview.xml
+++ b/java/res/layout/candidate_preview.xml
diff --git a/res/layout/candidates.xml b/java/res/layout/candidates.xml
index 068c17e56..068c17e56 100755
--- a/res/layout/candidates.xml
+++ b/java/res/layout/candidates.xml
diff --git a/res/layout/input.xml b/java/res/layout/input.xml
index 1d7c6f746..1d7c6f746 100755
--- a/res/layout/input.xml
+++ b/java/res/layout/input.xml
diff --git a/res/layout/input_trans.xml b/java/res/layout/input_trans.xml
index a988bcc68..a988bcc68 100755
--- a/res/layout/input_trans.xml
+++ b/java/res/layout/input_trans.xml
diff --git a/res/layout/recognition_status.xml b/java/res/layout/recognition_status.xml
index 1ec06ba9a..1ec06ba9a 100644
--- a/res/layout/recognition_status.xml
+++ b/java/res/layout/recognition_status.xml
diff --git a/res/layout/voice_punctuation_hint.xml b/java/res/layout/voice_punctuation_hint.xml
index 629a7f2b5..629a7f2b5 100644
--- a/res/layout/voice_punctuation_hint.xml
+++ b/java/res/layout/voice_punctuation_hint.xml
diff --git a/res/layout/voice_swipe_hint.xml b/java/res/layout/voice_swipe_hint.xml
index 4e8859a71..4e8859a71 100644
--- a/res/layout/voice_swipe_hint.xml
+++ b/java/res/layout/voice_swipe_hint.xml
diff --git a/res/raw/main.dict b/java/res/raw/main.dict
index a456cf3d3..a456cf3d3 100755
--- a/res/raw/main.dict
+++ b/java/res/raw/main.dict
diff --git a/res/raw/type3.ogg b/java/res/raw/type3.ogg
index 20e670807..20e670807 100755
--- a/res/raw/type3.ogg
+++ b/java/res/raw/type3.ogg
diff --git a/res/values-cs/bools.xml b/java/res/values-cs/bools.xml
index 897f4b3db..897f4b3db 100644
--- a/res/values-cs/bools.xml
+++ b/java/res/values-cs/bools.xml
diff --git a/res/values-cs/donottranslate.xml b/java/res/values-cs/donottranslate.xml
index 9c2a476a6..9c2a476a6 100644
--- a/res/values-cs/donottranslate.xml
+++ b/java/res/values-cs/donottranslate.xml
diff --git a/res/values-cs/strings.xml b/java/res/values-cs/strings.xml
index 02361e1c1..02361e1c1 100644
--- a/res/values-cs/strings.xml
+++ b/java/res/values-cs/strings.xml
diff --git a/res/values-da/strings.xml b/java/res/values-da/strings.xml
index 15f6b1c6b..15f6b1c6b 100644
--- a/res/values-da/strings.xml
+++ b/java/res/values-da/strings.xml
diff --git a/res/values-de/bools.xml b/java/res/values-de/bools.xml
index 897f4b3db..897f4b3db 100644
--- a/res/values-de/bools.xml
+++ b/java/res/values-de/bools.xml
diff --git a/res/values-de/strings.xml b/java/res/values-de/strings.xml
index e203fb394..e203fb394 100644
--- a/res/values-de/strings.xml
+++ b/java/res/values-de/strings.xml
diff --git a/res/values-el/strings.xml b/java/res/values-el/strings.xml
index 85c18dff4..85c18dff4 100644
--- a/res/values-el/strings.xml
+++ b/java/res/values-el/strings.xml
diff --git a/res/values-en/bools.xml b/java/res/values-en/bools.xml
index 897f4b3db..897f4b3db 100644
--- a/res/values-en/bools.xml
+++ b/java/res/values-en/bools.xml
diff --git a/res/values-es-rUS/strings.xml b/java/res/values-es-rUS/strings.xml
index 541e153b3..541e153b3 100644
--- a/res/values-es-rUS/strings.xml
+++ b/java/res/values-es-rUS/strings.xml
diff --git a/res/values-es/bools.xml b/java/res/values-es/bools.xml
index 897f4b3db..897f4b3db 100644
--- a/res/values-es/bools.xml
+++ b/java/res/values-es/bools.xml
diff --git a/res/values-es/strings.xml b/java/res/values-es/strings.xml
index fbc597ed2..fbc597ed2 100644
--- a/res/values-es/strings.xml
+++ b/java/res/values-es/strings.xml
diff --git a/res/values-fr-rCA/strings.xml b/java/res/values-fr-rCA/strings.xml
index b56463ed9..b56463ed9 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/java/res/values-fr-rCA/strings.xml
diff --git a/res/values-fr/bools.xml b/java/res/values-fr/bools.xml
index 897f4b3db..897f4b3db 100644
--- a/res/values-fr/bools.xml
+++ b/java/res/values-fr/bools.xml
diff --git a/res/values-fr/donottranslate.xml b/java/res/values-fr/donottranslate.xml
index b79df7b37..b79df7b37 100644
--- a/res/values-fr/donottranslate.xml
+++ b/java/res/values-fr/donottranslate.xml
diff --git a/res/values-fr/strings.xml b/java/res/values-fr/strings.xml
index 085941415..085941415 100644
--- a/res/values-fr/strings.xml
+++ b/java/res/values-fr/strings.xml
diff --git a/res/values-it/bools.xml b/java/res/values-it/bools.xml
index 897f4b3db..897f4b3db 100644
--- a/res/values-it/bools.xml
+++ b/java/res/values-it/bools.xml
diff --git a/res/values-it/donottranslate.xml b/java/res/values-it/donottranslate.xml
index 3e3f3ef2a..3e3f3ef2a 100644
--- a/res/values-it/donottranslate.xml
+++ b/java/res/values-it/donottranslate.xml
diff --git a/res/values-it/strings.xml b/java/res/values-it/strings.xml
index 1135dd00a..1135dd00a 100644
--- a/res/values-it/strings.xml
+++ b/java/res/values-it/strings.xml
diff --git a/res/values-ja/strings.xml b/java/res/values-ja/strings.xml
index 9097bd936..9097bd936 100644
--- a/res/values-ja/strings.xml
+++ b/java/res/values-ja/strings.xml
diff --git a/res/values-ko/strings.xml b/java/res/values-ko/strings.xml
index 15000e655..15000e655 100644
--- a/res/values-ko/strings.xml
+++ b/java/res/values-ko/strings.xml
diff --git a/res/values-land/dimens.xml b/java/res/values-land/dimens.xml
index 43951552e..43951552e 100644
--- a/res/values-land/dimens.xml
+++ b/java/res/values-land/dimens.xml
diff --git a/res/values-nb/strings.xml b/java/res/values-nb/strings.xml
index a7ddc7533..a7ddc7533 100644
--- a/res/values-nb/strings.xml
+++ b/java/res/values-nb/strings.xml
diff --git a/res/values-nl/bools.xml b/java/res/values-nl/bools.xml
index 897f4b3db..897f4b3db 100644
--- a/res/values-nl/bools.xml
+++ b/java/res/values-nl/bools.xml
diff --git a/res/values-nl/strings.xml b/java/res/values-nl/strings.xml
index 9a69c128e..9a69c128e 100644
--- a/res/values-nl/strings.xml
+++ b/java/res/values-nl/strings.xml
diff --git a/res/values-pl/bools.xml b/java/res/values-pl/bools.xml
index 897f4b3db..897f4b3db 100644
--- a/res/values-pl/bools.xml
+++ b/java/res/values-pl/bools.xml
diff --git a/res/values-pl/donottranslate.xml b/java/res/values-pl/donottranslate.xml
index 196e73c1d..196e73c1d 100644
--- a/res/values-pl/donottranslate.xml
+++ b/java/res/values-pl/donottranslate.xml
diff --git a/res/values-pl/strings.xml b/java/res/values-pl/strings.xml
index a411cc213..a411cc213 100644
--- a/res/values-pl/strings.xml
+++ b/java/res/values-pl/strings.xml
diff --git a/res/values-pt-rPT/strings.xml b/java/res/values-pt-rPT/strings.xml
index 399975d88..399975d88 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/java/res/values-pt-rPT/strings.xml
diff --git a/res/values-pt/strings.xml b/java/res/values-pt/strings.xml
index 18ffdf011..18ffdf011 100644
--- a/res/values-pt/strings.xml
+++ b/java/res/values-pt/strings.xml
diff --git a/res/values-ru/strings.xml b/java/res/values-ru/strings.xml
index d4ebc6d60..d4ebc6d60 100644
--- a/res/values-ru/strings.xml
+++ b/java/res/values-ru/strings.xml
diff --git a/res/values-sv/strings.xml b/java/res/values-sv/strings.xml
index 2d07a076a..2d07a076a 100644
--- a/res/values-sv/strings.xml
+++ b/java/res/values-sv/strings.xml
diff --git a/res/values-tr/donottranslate.xml b/java/res/values-tr/donottranslate.xml
index 2154c16bb..2154c16bb 100644
--- a/res/values-tr/donottranslate.xml
+++ b/java/res/values-tr/donottranslate.xml
diff --git a/res/values-tr/strings.xml b/java/res/values-tr/strings.xml
index e150a5ee7..e150a5ee7 100644
--- a/res/values-tr/strings.xml
+++ b/java/res/values-tr/strings.xml
diff --git a/res/values-zh-rCN/strings.xml b/java/res/values-zh-rCN/strings.xml
index f3729914b..f3729914b 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/java/res/values-zh-rCN/strings.xml
diff --git a/res/values-zh-rTW/strings.xml b/java/res/values-zh-rTW/strings.xml
index f6b4e312f..f6b4e312f 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/java/res/values-zh-rTW/strings.xml
diff --git a/res/values/bools.xml b/java/res/values/bools.xml
index ebe2f04e5..ebe2f04e5 100644
--- a/res/values/bools.xml
+++ b/java/res/values/bools.xml
diff --git a/res/values/colors.xml b/java/res/values/colors.xml
index c90d9f6af..c90d9f6af 100644
--- a/res/values/colors.xml
+++ b/java/res/values/colors.xml
diff --git a/res/values/dimens.xml b/java/res/values/dimens.xml
index 5b2095c0e..5b2095c0e 100644
--- a/res/values/dimens.xml
+++ b/java/res/values/dimens.xml
diff --git a/res/values/donottranslate.xml b/java/res/values/donottranslate.xml
index d5017353d..d5017353d 100644
--- a/res/values/donottranslate.xml
+++ b/java/res/values/donottranslate.xml
diff --git a/res/values/durations.xml b/java/res/values/durations.xml
index 92af68e39..92af68e39 100644
--- a/res/values/durations.xml
+++ b/java/res/values/durations.xml
diff --git a/res/values/keycodes.xml b/java/res/values/keycodes.xml
index 8156c0e07..8156c0e07 100644
--- a/res/values/keycodes.xml
+++ b/java/res/values/keycodes.xml
diff --git a/res/values/strings.xml b/java/res/values/strings.xml
index 35dd3e089..35dd3e089 100644
--- a/res/values/strings.xml
+++ b/java/res/values/strings.xml
diff --git a/res/xml-de/kbd_qwerty.xml b/java/res/xml-de/kbd_qwerty.xml
index 4e57c6067..4e57c6067 100755
--- a/res/xml-de/kbd_qwerty.xml
+++ b/java/res/xml-de/kbd_qwerty.xml
diff --git a/res/xml-fr/kbd_qwerty.xml b/java/res/xml-fr/kbd_qwerty.xml
index 1b20c0438..1b20c0438 100644
--- a/res/xml-fr/kbd_qwerty.xml
+++ b/java/res/xml-fr/kbd_qwerty.xml
diff --git a/res/xml-ru/kbd_qwerty.xml b/java/res/xml-ru/kbd_qwerty.xml
index 45d355b0f..45d355b0f 100755
--- a/res/xml-ru/kbd_qwerty.xml
+++ b/java/res/xml-ru/kbd_qwerty.xml
diff --git a/res/xml/azerty.xml b/java/res/xml/azerty.xml
index 614aa4936..614aa4936 100644
--- a/res/xml/azerty.xml
+++ b/java/res/xml/azerty.xml
diff --git a/res/xml/kbd_alpha.xml b/java/res/xml/kbd_alpha.xml
index 4e8af3399..4e8af3399 100644
--- a/res/xml/kbd_alpha.xml
+++ b/java/res/xml/kbd_alpha.xml
diff --git a/res/xml/kbd_extension.xml b/java/res/xml/kbd_extension.xml
index c64f666d0..c64f666d0 100755
--- a/res/xml/kbd_extension.xml
+++ b/java/res/xml/kbd_extension.xml
diff --git a/res/xml/kbd_phone.xml b/java/res/xml/kbd_phone.xml
index d2bcdac52..d2bcdac52 100755
--- a/res/xml/kbd_phone.xml
+++ b/java/res/xml/kbd_phone.xml
diff --git a/res/xml/kbd_phone_symbols.xml b/java/res/xml/kbd_phone_symbols.xml
index 9604664fa..9604664fa 100755
--- a/res/xml/kbd_phone_symbols.xml
+++ b/java/res/xml/kbd_phone_symbols.xml
diff --git a/res/xml/kbd_popup_template.xml b/java/res/xml/kbd_popup_template.xml
index aca46930f..aca46930f 100644
--- a/res/xml/kbd_popup_template.xml
+++ b/java/res/xml/kbd_popup_template.xml
diff --git a/res/xml/kbd_qwerty.xml b/java/res/xml/kbd_qwerty.xml
index 1a9ea5c31..1a9ea5c31 100755
--- a/res/xml/kbd_qwerty.xml
+++ b/java/res/xml/kbd_qwerty.xml
diff --git a/res/xml/kbd_symbols.xml b/java/res/xml/kbd_symbols.xml
index ab5792fd1..ab5792fd1 100755
--- a/res/xml/kbd_symbols.xml
+++ b/java/res/xml/kbd_symbols.xml
diff --git a/res/xml/kbd_symbols_shift.xml b/java/res/xml/kbd_symbols_shift.xml
index 09b5c3f9d..09b5c3f9d 100755
--- a/res/xml/kbd_symbols_shift.xml
+++ b/java/res/xml/kbd_symbols_shift.xml
diff --git a/res/xml/language_prefs.xml b/java/res/xml/language_prefs.xml
index b7a4c07db..b7a4c07db 100644
--- a/res/xml/language_prefs.xml
+++ b/java/res/xml/language_prefs.xml
diff --git a/res/xml/method.xml b/java/res/xml/method.xml
index 195691b7b..195691b7b 100644
--- a/res/xml/method.xml
+++ b/java/res/xml/method.xml
diff --git a/res/xml/popup_domains.xml b/java/res/xml/popup_domains.xml
index b733fe24f..b733fe24f 100644
--- a/res/xml/popup_domains.xml
+++ b/java/res/xml/popup_domains.xml
diff --git a/res/xml/popup_punctuation.xml b/java/res/xml/popup_punctuation.xml
index a29fb520d..a29fb520d 100644
--- a/res/xml/popup_punctuation.xml
+++ b/java/res/xml/popup_punctuation.xml
diff --git a/res/xml/popup_smileys.xml b/java/res/xml/popup_smileys.xml
index 5663fefc8..5663fefc8 100644
--- a/res/xml/popup_smileys.xml
+++ b/java/res/xml/popup_smileys.xml
diff --git a/res/xml/prefs.xml b/java/res/xml/prefs.xml
index 29c43cba5..535b63f3b 100644
--- a/res/xml/prefs.xml
+++ b/java/res/xml/prefs.xml
@@ -50,9 +50,7 @@
             android:title="@string/language_selection_title"
             android:summary="@string/language_selection_summary">
         <intent
-                android:action="android.intent.action.MAIN"
-                android:targetPackage="com.android.inputmethod.latin"
-                android:targetClass="com.android.inputmethod.latin.InputLanguageSelection" />
+                android:action="com.android.inputmethod.latin.INPUT_LANGUAGE_SELECTION"/>
     </PreferenceScreen>
 
     <PreferenceCategory
diff --git a/src/com/android/inputmethod/latin/AutoDictionary.java b/java/src/com/android/inputmethod/latin/AutoDictionary.java
index 3d76dc301..3d76dc301 100644
--- a/src/com/android/inputmethod/latin/AutoDictionary.java
+++ b/java/src/com/android/inputmethod/latin/AutoDictionary.java
diff --git a/src/com/android/inputmethod/latin/BinaryDictionary.java b/java/src/com/android/inputmethod/latin/BinaryDictionary.java
index 43f4c4cb6..43f4c4cb6 100644
--- a/src/com/android/inputmethod/latin/BinaryDictionary.java
+++ b/java/src/com/android/inputmethod/latin/BinaryDictionary.java
diff --git a/src/com/android/inputmethod/latin/CandidateView.java b/java/src/com/android/inputmethod/latin/CandidateView.java
index 0c0373b3b..0c0373b3b 100755
--- a/src/com/android/inputmethod/latin/CandidateView.java
+++ b/java/src/com/android/inputmethod/latin/CandidateView.java
diff --git a/src/com/android/inputmethod/latin/CandidateViewContainer.java b/java/src/com/android/inputmethod/latin/CandidateViewContainer.java
index e13f2738c..e13f2738c 100644
--- a/src/com/android/inputmethod/latin/CandidateViewContainer.java
+++ b/java/src/com/android/inputmethod/latin/CandidateViewContainer.java
diff --git a/src/com/android/inputmethod/latin/ContactsDictionary.java b/java/src/com/android/inputmethod/latin/ContactsDictionary.java
index f53ebf3f5..f53ebf3f5 100644
--- a/src/com/android/inputmethod/latin/ContactsDictionary.java
+++ b/java/src/com/android/inputmethod/latin/ContactsDictionary.java
diff --git a/src/com/android/inputmethod/latin/Dictionary.java b/java/src/com/android/inputmethod/latin/Dictionary.java
index b656d04dc..b656d04dc 100644
--- a/src/com/android/inputmethod/latin/Dictionary.java
+++ b/java/src/com/android/inputmethod/latin/Dictionary.java
diff --git a/src/com/android/inputmethod/latin/ExpandableDictionary.java b/java/src/com/android/inputmethod/latin/ExpandableDictionary.java
index 006593700..006593700 100644
--- a/src/com/android/inputmethod/latin/ExpandableDictionary.java
+++ b/java/src/com/android/inputmethod/latin/ExpandableDictionary.java
diff --git a/src/com/android/inputmethod/latin/Hints.java b/java/src/com/android/inputmethod/latin/Hints.java
index 689c8d852..689c8d852 100644
--- a/src/com/android/inputmethod/latin/Hints.java
+++ b/java/src/com/android/inputmethod/latin/Hints.java
diff --git a/src/com/android/inputmethod/latin/InputLanguageSelection.java b/java/src/com/android/inputmethod/latin/InputLanguageSelection.java
index b1ddb2175..b1ddb2175 100644
--- a/src/com/android/inputmethod/latin/InputLanguageSelection.java
+++ b/java/src/com/android/inputmethod/latin/InputLanguageSelection.java
diff --git a/src/com/android/inputmethod/latin/KeyboardSwitcher.java b/java/src/com/android/inputmethod/latin/KeyboardSwitcher.java
index 438680cf8..438680cf8 100644
--- a/src/com/android/inputmethod/latin/KeyboardSwitcher.java
+++ b/java/src/com/android/inputmethod/latin/KeyboardSwitcher.java
diff --git a/src/com/android/inputmethod/latin/LanguageSwitcher.java b/java/src/com/android/inputmethod/latin/LanguageSwitcher.java
index 12045125f..12045125f 100644
--- a/src/com/android/inputmethod/latin/LanguageSwitcher.java
+++ b/java/src/com/android/inputmethod/latin/LanguageSwitcher.java
diff --git a/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java
index 43972d98b..43972d98b 100644
--- a/src/com/android/inputmethod/latin/LatinIME.java
+++ b/java/src/com/android/inputmethod/latin/LatinIME.java
diff --git a/src/com/android/inputmethod/latin/LatinIMEBackupAgent.java b/java/src/com/android/inputmethod/latin/LatinIMEBackupAgent.java
index 62da86cd4..62da86cd4 100644
--- a/src/com/android/inputmethod/latin/LatinIMEBackupAgent.java
+++ b/java/src/com/android/inputmethod/latin/LatinIMEBackupAgent.java
diff --git a/src/com/android/inputmethod/latin/LatinIMESettings.java b/java/src/com/android/inputmethod/latin/LatinIMESettings.java
index f76ec99b6..f76ec99b6 100644
--- a/src/com/android/inputmethod/latin/LatinIMESettings.java
+++ b/java/src/com/android/inputmethod/latin/LatinIMESettings.java
diff --git a/src/com/android/inputmethod/latin/LatinKeyboard.java b/java/src/com/android/inputmethod/latin/LatinKeyboard.java
index 58e1dc767..58e1dc767 100644
--- a/src/com/android/inputmethod/latin/LatinKeyboard.java
+++ b/java/src/com/android/inputmethod/latin/LatinKeyboard.java
diff --git a/src/com/android/inputmethod/latin/LatinKeyboardView.java b/java/src/com/android/inputmethod/latin/LatinKeyboardView.java
index 2686a93c6..2686a93c6 100644
--- a/src/com/android/inputmethod/latin/LatinKeyboardView.java
+++ b/java/src/com/android/inputmethod/latin/LatinKeyboardView.java
diff --git a/src/com/android/inputmethod/latin/Suggest.java b/java/src/com/android/inputmethod/latin/Suggest.java
index 712b9cf37..712b9cf37 100755
--- a/src/com/android/inputmethod/latin/Suggest.java
+++ b/java/src/com/android/inputmethod/latin/Suggest.java
diff --git a/src/com/android/inputmethod/latin/TextEntryState.java b/java/src/com/android/inputmethod/latin/TextEntryState.java
index c5e8ad9a1..c5e8ad9a1 100644
--- a/src/com/android/inputmethod/latin/TextEntryState.java
+++ b/java/src/com/android/inputmethod/latin/TextEntryState.java
diff --git a/src/com/android/inputmethod/latin/Tutorial.java b/java/src/com/android/inputmethod/latin/Tutorial.java
index 03d4858c4..03d4858c4 100644
--- a/src/com/android/inputmethod/latin/Tutorial.java
+++ b/java/src/com/android/inputmethod/latin/Tutorial.java
diff --git a/src/com/android/inputmethod/latin/UserDictionary.java b/java/src/com/android/inputmethod/latin/UserDictionary.java
index 4b98eacce..4b98eacce 100644
--- a/src/com/android/inputmethod/latin/UserDictionary.java
+++ b/java/src/com/android/inputmethod/latin/UserDictionary.java
diff --git a/src/com/android/inputmethod/latin/WordComposer.java b/java/src/com/android/inputmethod/latin/WordComposer.java
index e97cb24ba..e97cb24ba 100644
--- a/src/com/android/inputmethod/latin/WordComposer.java
+++ b/java/src/com/android/inputmethod/latin/WordComposer.java
diff --git a/src/com/android/inputmethod/voice/EditingUtil.java b/java/src/com/android/inputmethod/voice/EditingUtil.java
index 6316d8ccf..6316d8ccf 100644
--- a/src/com/android/inputmethod/voice/EditingUtil.java
+++ b/java/src/com/android/inputmethod/voice/EditingUtil.java
diff --git a/src/com/android/inputmethod/voice/FieldContext.java b/java/src/com/android/inputmethod/voice/FieldContext.java
index 5fbacfb6c..5fbacfb6c 100644
--- a/src/com/android/inputmethod/voice/FieldContext.java
+++ b/java/src/com/android/inputmethod/voice/FieldContext.java
diff --git a/src/com/android/inputmethod/voice/LatinIMEWithVoice.java b/java/src/com/android/inputmethod/voice/LatinIMEWithVoice.java
index ccbf5b6bc..ccbf5b6bc 100644
--- a/src/com/android/inputmethod/voice/LatinIMEWithVoice.java
+++ b/java/src/com/android/inputmethod/voice/LatinIMEWithVoice.java
diff --git a/src/com/android/inputmethod/voice/LatinIMEWithVoiceSettings.java b/java/src/com/android/inputmethod/voice/LatinIMEWithVoiceSettings.java
index 13a58e14d..13a58e14d 100644
--- a/src/com/android/inputmethod/voice/LatinIMEWithVoiceSettings.java
+++ b/java/src/com/android/inputmethod/voice/LatinIMEWithVoiceSettings.java
diff --git a/src/com/android/inputmethod/voice/RecognitionView.java b/java/src/com/android/inputmethod/voice/RecognitionView.java
index 1e99c3cf7..1e99c3cf7 100644
--- a/src/com/android/inputmethod/voice/RecognitionView.java
+++ b/java/src/com/android/inputmethod/voice/RecognitionView.java
diff --git a/src/com/android/inputmethod/voice/SettingsUtil.java b/java/src/com/android/inputmethod/voice/SettingsUtil.java
index abf52047f..abf52047f 100644
--- a/src/com/android/inputmethod/voice/SettingsUtil.java
+++ b/java/src/com/android/inputmethod/voice/SettingsUtil.java
diff --git a/src/com/android/inputmethod/voice/VoiceInput.java b/java/src/com/android/inputmethod/voice/VoiceInput.java
index e881856dd..e881856dd 100644
--- a/src/com/android/inputmethod/voice/VoiceInput.java
+++ b/java/src/com/android/inputmethod/voice/VoiceInput.java
diff --git a/src/com/android/inputmethod/voice/VoiceInputLogger.java b/java/src/com/android/inputmethod/voice/VoiceInputLogger.java
index 659033340..659033340 100644
--- a/src/com/android/inputmethod/voice/VoiceInputLogger.java
+++ b/java/src/com/android/inputmethod/voice/VoiceInputLogger.java
diff --git a/src/com/android/inputmethod/voice/WaveformImage.java b/java/src/com/android/inputmethod/voice/WaveformImage.java
index 08d87c8f3..08d87c8f3 100644
--- a/src/com/android/inputmethod/voice/WaveformImage.java
+++ b/java/src/com/android/inputmethod/voice/WaveformImage.java
diff --git a/src/com/android/inputmethod/voice/Whitelist.java b/java/src/com/android/inputmethod/voice/Whitelist.java
index 167b688ca..167b688ca 100644
--- a/src/com/android/inputmethod/voice/Whitelist.java
+++ b/java/src/com/android/inputmethod/voice/Whitelist.java
diff --git a/src/com/google/android/voicesearch/LatinIMEWithVoice.java b/java/src/com/google/android/voicesearch/LatinIMEWithVoice.java
index 8a339d14a..8a339d14a 100644
--- a/src/com/google/android/voicesearch/LatinIMEWithVoice.java
+++ b/java/src/com/google/android/voicesearch/LatinIMEWithVoice.java
diff --git a/src/com/google/android/voicesearch/LatinIMEWithVoiceSettings.java b/java/src/com/google/android/voicesearch/LatinIMEWithVoiceSettings.java
index a53cebfd9..a53cebfd9 100644
--- a/src/com/google/android/voicesearch/LatinIMEWithVoiceSettings.java
+++ b/java/src/com/google/android/voicesearch/LatinIMEWithVoiceSettings.java
diff --git a/dictionary/Android.mk b/native/Android.mk
index 9ba9f75ec..9ba9f75ec 100644
--- a/dictionary/Android.mk
+++ b/native/Android.mk
diff --git a/dictionary/jni/com_android_inputmethod_latin_BinaryDictionary.cpp b/native/jni/com_android_inputmethod_latin_BinaryDictionary.cpp
index d068f3faf..d068f3faf 100644
--- a/dictionary/jni/com_android_inputmethod_latin_BinaryDictionary.cpp
+++ b/native/jni/com_android_inputmethod_latin_BinaryDictionary.cpp
diff --git a/dictionary/src/basechars.h b/native/src/basechars.h
index 5a4406606..5a4406606 100644
--- a/dictionary/src/basechars.h
+++ b/native/src/basechars.h
diff --git a/dictionary/src/dictionary.cpp b/native/src/dictionary.cpp
index 6e6f44182..6e6f44182 100644
--- a/dictionary/src/dictionary.cpp
+++ b/native/src/dictionary.cpp
diff --git a/dictionary/src/dictionary.h b/native/src/dictionary.h
index 3749f3d88..3749f3d88 100644
--- a/dictionary/src/dictionary.h
+++ b/native/src/dictionary.h