diff options
Diffstat (limited to 'java')
| -rw-r--r-- | java/Android.mk | 2 | ||||
| -rw-r--r-- | java/res/drawable/btn_center.xml | 5 | ||||
| -rw-r--r-- | java/res/values/strings.xml | 2 | ||||
| -rw-r--r-- | java/res/xml/method.xml | 200 | ||||
| -rw-r--r-- | java/src/com/android/inputmethod/compat/InputMethodServiceCompatWrapper.java | 12 | ||||
| -rw-r--r-- | java/src/com/android/inputmethod/latin/Utils.java | 4 |
6 files changed, 12 insertions, 213 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/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/values/strings.xml b/java/res/values/strings.xml index 88f07f558..ac6082f22 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/method.xml b/java/res/xml/method.xml index aba6974a8..31ba650f1 100644 --- a/java/res/xml/method.xml +++ b/java/res/xml/method.xml @@ -30,204 +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_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_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_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_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 828aea41f..c04181b55 100644 --- a/java/src/com/android/inputmethod/compat/InputMethodServiceCompatWrapper.java +++ b/java/src/com/android/inputmethod/compat/InputMethodServiceCompatWrapper.java @@ -20,7 +20,7 @@ import com.android.inputmethod.deprecated.LanguageSwitcherProxy; import com.android.inputmethod.latin.SubtypeSwitcher; import android.inputmethodservice.InputMethodService; -import android.view.inputmethod.InputMethodSubtype; +// import android.view.inputmethod.InputMethodSubtype; public class InputMethodServiceCompatWrapper extends InputMethodService { // CAN_HANDLE_ON_CURRENT_INPUT_METHOD_SUBTYPE_CHANGED needs to be false if the API level is 10 @@ -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 d165de32d..47890e643 100644 --- a/java/src/com/android/inputmethod/latin/Utils.java +++ b/java/src/com/android/inputmethod/latin/Utils.java @@ -577,9 +577,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"); } } |