nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Cherry pick Change I04497fa0: Merge from the private sandbox to the froyo-ub-latinimegoogle 

Change-Id: I6c0304c6befc1b105d5dca7f96bb7532812c30f6
main
satok 2010-08-27 15:54:02 +09:00
parent 5ef4577156
commit 6fd90f55f4
28 changed files with 64 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
java/AndroidManifest.xml
View File

@ -1,5 +1,11 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.android.inputmethod.latin">
package="com.android.inputmethod.latin"
android:versionCode="22"
android:versionName="0.22">
<uses-sdk android:minSdkVersion="8"></uses-sdk>
<original-package android:name="com.android.inputmethod.latin" />
<uses-permission android:name="android.permission.VIBRATE"/>
<uses-permission android:name="android.permission.READ_USER_DICTIONARY" />

4
java/res/values-cs/strings.xml
View File

@ -20,8 +20,8 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="english_ime_name" msgid="7252517407088836577">"Klávesnice Android"</string>
<string name="english_ime_settings" msgid="6661589557206947774">"Nastavení klávesnice Android"</string>
<string name="english_ime_name" msgid="7252517407088836577">"Klávesnice Android 2"</string>
<string name="english_ime_settings" msgid="6661589557206947774">"Nastavení klávesnice Android 2"</string>
<string name="vibrate_on_keypress" msgid="5258079494276955460">"Při stisku klávesy vibrovat"</string>
<string name="sound_on_keypress" msgid="6093592297198243644">"Zvuk při stisku klávesy"</string>
<!-- no translation found for popup_on_keypress (123894815723512944) -->

4
java/res/values-da/strings.xml
View File

@ -20,8 +20,8 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="english_ime_name" msgid="7252517407088836577">"Android-tastatur"</string>
<string name="english_ime_settings" msgid="6661589557206947774">"Indstillinger for Android-tastatur"</string>
<string name="english_ime_name" msgid="7252517407088836577">"Android-tastatur 2"</string>
<string name="english_ime_settings" msgid="6661589557206947774">"Indstillinger for Android-tastatur 2"</string>
<string name="vibrate_on_keypress" msgid="5258079494276955460">"Vibration ved tastetryk"</string>
<string name="sound_on_keypress" msgid="6093592297198243644">"Lyd ved tastetryk"</string>
<!-- no translation found for popup_on_keypress (123894815723512944) -->

4
java/res/values-de/strings.xml
View File

@ -20,8 +20,8 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="english_ime_name" msgid="7252517407088836577">"Android-Tastatur"</string>
<string name="english_ime_settings" msgid="6661589557206947774">"Android-Tastatureinstellungen"</string>
<string name="english_ime_name" msgid="7252517407088836577">"Android-Tastatur 2"</string>
<string name="english_ime_settings" msgid="6661589557206947774">"Android-Tastatur2einstellungen"</string>
<string name="vibrate_on_keypress" msgid="5258079494276955460">"Vibrieren b. Tastendruck"</string>
<string name="sound_on_keypress" msgid="6093592297198243644">"Ton bei Tastendruck"</string>
<!-- no translation found for popup_on_keypress (123894815723512944) -->

4
java/res/values-el/strings.xml
View File

@ -20,8 +20,8 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="english_ime_name" msgid="7252517407088836577">"Πληκτρολόγιο Android"</string>
<string name="english_ime_settings" msgid="6661589557206947774">"Ρυθμίσεις πληκτρολογίου Android"</string>
<string name="english_ime_name" msgid="7252517407088836577">"Πληκτρολόγιο Android 2"</string>
<string name="english_ime_settings" msgid="6661589557206947774">"Ρυθμίσεις πληκτρολογίου Android 2"</string>
<string name="vibrate_on_keypress" msgid="5258079494276955460">"Δόνηση κατά το πάτημα πλήκτρων"</string>
<string name="sound_on_keypress" msgid="6093592297198243644">"Ήχος κατά το πάτημα πλήκτρων"</string>
<!-- no translation found for popup_on_keypress (123894815723512944) -->

4
java/res/values-es-rUS/strings.xml
View File

@ -20,8 +20,8 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="english_ime_name" msgid="7252517407088836577">"Teclado de Android"</string>
<string name="english_ime_settings" msgid="6661589557206947774">"Configuración de teclado de Android"</string>
<string name="english_ime_name" msgid="7252517407088836577">"Teclado de Android 2"</string>
<string name="english_ime_settings" msgid="6661589557206947774">"Configuración de teclado de Android 2"</string>
<string name="vibrate_on_keypress" msgid="5258079494276955460">"Vibrar al pulsar teclas"</string>
<string name="sound_on_keypress" msgid="6093592297198243644">"Sonar al pulsar las teclas"</string>
<!-- no translation found for popup_on_keypress (123894815723512944) -->

4
java/res/values-es/strings.xml
View File

@ -20,8 +20,8 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="english_ime_name" msgid="7252517407088836577">"Teclado de Android"</string>
<string name="english_ime_settings" msgid="6661589557206947774">"Ajustes del teclado de Android"</string>
<string name="english_ime_name" msgid="7252517407088836577">"Teclado de Android 2"</string>
<string name="english_ime_settings" msgid="6661589557206947774">"Ajustes del teclado de Android 2"</string>
<string name="vibrate_on_keypress" msgid="5258079494276955460">"Vibrar al pulsar tecla"</string>
<string name="sound_on_keypress" msgid="6093592297198243644">"Sonido al pulsar tecla"</string>
<!-- no translation found for popup_on_keypress (123894815723512944) -->

2
java/res/values-fr-rCA/strings.xml
View File

@ -15,5 +15,5 @@
-->
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="english_ime_name" msgid="7252517407088836577">"Clavier Android"</string>
<string name="english_ime_name" msgid="7252517407088836577">"Clavier Android 2"</string>
</resources>

4
java/res/values-fr/strings.xml
View File

@ -20,8 +20,8 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="english_ime_name" msgid="7252517407088836577">"Clavier Android"</string>
<string name="english_ime_settings" msgid="6661589557206947774">"Paramètres du clavier Android"</string>
<string name="english_ime_name" msgid="7252517407088836577">"Clavier Android 2"</string>
<string name="english_ime_settings" msgid="6661589557206947774">"Paramètres du clavier Android 2"</string>
<string name="vibrate_on_keypress" msgid="5258079494276955460">"Vibrer à chaque touche"</string>
<string name="sound_on_keypress" msgid="6093592297198243644">"Son à chaque touche"</string>
<!-- no translation found for popup_on_keypress (123894815723512944) -->

4
java/res/values-it/strings.xml
View File

@ -20,8 +20,8 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="english_ime_name" msgid="7252517407088836577">"Tastiera Android"</string>
<string name="english_ime_settings" msgid="6661589557206947774">"Impostazioni tastiera Android"</string>
<string name="english_ime_name" msgid="7252517407088836577">"Tastiera Android 2"</string>
<string name="english_ime_settings" msgid="6661589557206947774">"Impostazioni tastiera Android 2"</string>
<string name="vibrate_on_keypress" msgid="5258079494276955460">"Vibrazione tasti"</string>
<string name="sound_on_keypress" msgid="6093592297198243644">"Suono tasti"</string>
<!-- no translation found for popup_on_keypress (123894815723512944) -->

4
java/res/values-ja/strings.xml
View File

@ -20,8 +20,8 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="english_ime_name" msgid="7252517407088836577">"Androidキーボード"</string>
<string name="english_ime_settings" msgid="6661589557206947774">"Androidキーボードの設定"</string>
<string name="english_ime_name" msgid="7252517407088836577">"Androidキーボード 2"</string>
<string name="english_ime_settings" msgid="6661589557206947774">"Androidキーボード 2 の設定"</string>
<string name="vibrate_on_keypress" msgid="5258079494276955460">"キー操作バイブ"</string>
<string name="sound_on_keypress" msgid="6093592297198243644">"キー操作音"</string>
<!-- no translation found for popup_on_keypress (123894815723512944) -->

4
java/res/values-ko/strings.xml
View File

@ -20,8 +20,8 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="english_ime_name" msgid="7252517407088836577">"Android 키보드"</string>
<string name="english_ime_settings" msgid="6661589557206947774">"Android 키보드 설정"</string>
<string name="english_ime_name" msgid="7252517407088836577">"Android 키보드 2"</string>
<string name="english_ime_settings" msgid="6661589557206947774">"Android 키보드 2 설정"</string>
<string name="vibrate_on_keypress" msgid="5258079494276955460">"키를 누를 때 진동 발생"</string>
<string name="sound_on_keypress" msgid="6093592297198243644">"키를 누를 때 소리 발생"</string>
<!-- no translation found for popup_on_keypress (123894815723512944) -->

4
java/res/values-nb/strings.xml
View File

@ -20,8 +20,8 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="english_ime_name" msgid="7252517407088836577">"Skjermtastatur"</string>
<string name="english_ime_settings" msgid="6661589557206947774">"Innstillinger for skjermtastatur"</string>
<string name="english_ime_name" msgid="7252517407088836577">"Skjermtastatur 2"</string>
<string name="english_ime_settings" msgid="6661589557206947774">"Innstillinger for skjermtastatur 2"</string>
<string name="vibrate_on_keypress" msgid="5258079494276955460">"Vibrer ved tastetrykk"</string>
<string name="sound_on_keypress" msgid="6093592297198243644">"Lyd ved tastetrykk"</string>
<!-- no translation found for popup_on_keypress (123894815723512944) -->

4
java/res/values-nl/strings.xml
View File

@ -20,8 +20,8 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="english_ime_name" msgid="7252517407088836577">"Android-toetsenbord"</string>
<string name="english_ime_settings" msgid="6661589557206947774">"Instellingen voor Android-toetsenbord"</string>
<string name="english_ime_name" msgid="7252517407088836577">"Android-toetsenbord 2"</string>
<string name="english_ime_settings" msgid="6661589557206947774">"Instellingen voor Android-toetsenbord 2"</string>
<string name="vibrate_on_keypress" msgid="5258079494276955460">"Trillen bij druk op toets"</string>
<string name="sound_on_keypress" msgid="6093592297198243644">"Geluid bij druk op een toets"</string>
<!-- no translation found for popup_on_keypress (123894815723512944) -->

4
java/res/values-pl/strings.xml
View File

@ -20,8 +20,8 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="english_ime_name" msgid="7252517407088836577">"Klawiatura Android"</string>
<string name="english_ime_settings" msgid="6661589557206947774">"Ustawienia klawiatury Android"</string>
<string name="english_ime_name" msgid="7252517407088836577">"Klawiatura Android 2"</string>
<string name="english_ime_settings" msgid="6661589557206947774">"Ustawienia klawiatury Android 2"</string>
<string name="vibrate_on_keypress" msgid="5258079494276955460">"Wibracja przy naciśnięciu"</string>
<string name="sound_on_keypress" msgid="6093592297198243644">"Dźwięk przy naciśnięciu"</string>
<!-- no translation found for popup_on_keypress (123894815723512944) -->

4
java/res/values-pt-rPT/strings.xml
View File

@ -20,8 +20,8 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="english_ime_name" msgid="7252517407088836577">"Teclado do Android"</string>
<string name="english_ime_settings" msgid="6661589557206947774">"Definições de teclado do Android"</string>
<string name="english_ime_name" msgid="7252517407088836577">"Teclado do Android 2"</string>
<string name="english_ime_settings" msgid="6661589557206947774">"Definições de teclado do Android 2"</string>
<string name="vibrate_on_keypress" msgid="5258079494276955460">"Vibrar ao primir as teclas"</string>
<string name="sound_on_keypress" msgid="6093592297198243644">"Som ao premir as teclas"</string>
<!-- no translation found for popup_on_keypress (123894815723512944) -->

4
java/res/values-pt/strings.xml
View File

@ -20,8 +20,8 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="english_ime_name" msgid="7252517407088836577">"Teclado Android"</string>
<string name="english_ime_settings" msgid="6661589557206947774">"Configurações de teclado Android"</string>
<string name="english_ime_name" msgid="7252517407088836577">"Teclado Android 2"</string>
<string name="english_ime_settings" msgid="6661589557206947774">"Configurações de teclado Android 2"</string>
<string name="vibrate_on_keypress" msgid="5258079494276955460">"Vibrar ao tocar a tecla"</string>
<string name="sound_on_keypress" msgid="6093592297198243644">"Som ao tocar a tecla"</string>
<!-- no translation found for popup_on_keypress (123894815723512944) -->

4
java/res/values-ru/strings.xml
View File

@ -20,8 +20,8 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="english_ime_name" msgid="7252517407088836577">"Клавиатура Android"</string>
<string name="english_ime_settings" msgid="6661589557206947774">"Настройки клавиатуры Android"</string>
<string name="english_ime_name" msgid="7252517407088836577">"Клавиатура Android 2"</string>
<string name="english_ime_settings" msgid="6661589557206947774">"Настройки клавиатуры Android 2"</string>
<string name="vibrate_on_keypress" msgid="5258079494276955460">"Виброотклик клавиш"</string>
<string name="sound_on_keypress" msgid="6093592297198243644">"Звук клавиш"</string>
<!-- no translation found for popup_on_keypress (123894815723512944) -->

4
java/res/values-sv/strings.xml
View File

@ -20,8 +20,8 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="english_ime_name" msgid="7252517407088836577">"Androids tangentbord"</string>
<string name="english_ime_settings" msgid="6661589557206947774">"Inställningar för Androids tangentbord"</string>
<string name="english_ime_name" msgid="7252517407088836577">"Androids tangentbord 2"</string>
<string name="english_ime_settings" msgid="6661589557206947774">"Inställningar för Androids tangentbord 2"</string>
<string name="vibrate_on_keypress" msgid="5258079494276955460">"Vibrera vid tangenttryck"</string>
<string name="sound_on_keypress" msgid="6093592297198243644">"Knappljud"</string>
<!-- no translation found for popup_on_keypress (123894815723512944) -->

4
java/res/values-tr/strings.xml
View File

@ -20,8 +20,8 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="english_ime_name" msgid="7252517407088836577">"Android klavyesi"</string>
<string name="english_ime_settings" msgid="6661589557206947774">"Android klavye ayarları"</string>
<string name="english_ime_name" msgid="7252517407088836577">"Android klavyesi 2"</string>
<string name="english_ime_settings" msgid="6661589557206947774">"Android klavye 2 ayarları"</string>
<string name="vibrate_on_keypress" msgid="5258079494276955460">"Tuşa basıldığında titret"</string>
<string name="sound_on_keypress" msgid="6093592297198243644">"Tuşa basıldığında ses çıkar"</string>
<!-- no translation found for popup_on_keypress (123894815723512944) -->

4
java/res/values-zh-rCN/strings.xml
View File

@ -20,8 +20,8 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="english_ime_name" msgid="7252517407088836577">"Android 键盘"</string>
<string name="english_ime_settings" msgid="6661589557206947774">"Android 键盘设置"</string>
<string name="english_ime_name" msgid="7252517407088836577">"Android 键盘 2"</string>
<string name="english_ime_settings" msgid="6661589557206947774">"Android 键盘 2 设置"</string>
<string name="vibrate_on_keypress" msgid="5258079494276955460">"按键时振动"</string>
<string name="sound_on_keypress" msgid="6093592297198243644">"按键时播放音效"</string>
<!-- no translation found for popup_on_keypress (123894815723512944) -->

4
java/res/values-zh-rTW/strings.xml
View File

@ -20,8 +20,8 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="english_ime_name" msgid="7252517407088836577">"Android 鍵盤"</string>
<string name="english_ime_settings" msgid="6661589557206947774">"Android 鍵盤設定"</string>
<string name="english_ime_name" msgid="7252517407088836577">"Android 鍵盤 2"</string>
<string name="english_ime_settings" msgid="6661589557206947774">"Android 鍵盤 2 設定"</string>
<string name="vibrate_on_keypress" msgid="5258079494276955460">"按鍵時震動"</string>
<string name="sound_on_keypress" msgid="6093592297198243644">"按鍵時播放音效"</string>
<!-- no translation found for popup_on_keypress (123894815723512944) -->

4
java/res/values/strings.xml
View File

@ -19,9 +19,9 @@
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<!-- Title for Latin keyboard -->
<string name="english_ime_name">Android keyboard</string>
<string name="english_ime_name">Android keyboard 2</string>
<!-- Title for Latin keyboard settings activity / dialog -->
<string name="english_ime_settings">Android keyboard settings</string>
<string name="english_ime_settings">Android keyboard 2 settings</string>
<!-- Option to provide vibrate/haptic feedback on keypress -->
<string name="vibrate_on_keypress">Vibrate on keypress</string>

2
java/res/xml/prefs.xml
View File

@ -49,7 +49,7 @@
android:title="@string/prefs_enable_log"
android:summary="@string/prefs_description_log"
android:persistent="true"
android:defaultValue="false"
android:defaultValue="true"
/>
<ListPreference

4
java/src/com/android/inputmethod/latin/BinaryDictionary.java
View File

@ -61,9 +61,9 @@ public class BinaryDictionary extends Dictionary {
static {
try {
System.loadLibrary("jni_latinime");
System.loadLibrary("jni_latinime2");
} catch (UnsatisfiedLinkError ule) {
Log.e("BinaryDictionary", "Could not load native library jni_latinime");
Log.e("BinaryDictionary", "Could not load native library jni_latinime2");
}
}

4
java/src/com/android/inputmethod/latin/LatinIME.java
View File

@ -768,6 +768,9 @@ public class LatinIME extends InputMethodService
// Check if we should go in or out of correction mode.
// TODO: Uncomment this block when we enable re-editing feature
// If a word is selected
/*
if (isPredictionOn() && mJustRevertedSeparator == null
&& (candidatesStart == candidatesEnd || newSelStart != oldSelStart
|| TextEntryState.isCorrecting())
@ -779,6 +782,7 @@ public class LatinIME extends InputMethodService
abortCorrection(false);
}
}
*/
}
@Override

8
native/Android.mk
View File

@ -1,7 +1,7 @@
LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
LOCAL_C_INCLUDES += $(LOCAL_PATH)/src
LOCAL_C_INCLUDES += $(LOCAL_PATH)/src $(JNI_H_INCLUDE)
LOCAL_SRC_FILES := \
jni/com_android_inputmethod_latin_BinaryDictionary.cpp \
@ -11,8 +11,10 @@ LOCAL_SRC_FILES := \
LOCAL_NDK_VERSION := 4
LOCAL_SDK_VERSION := 8
LOCAL_MODULE := libjni_latinime
LOCAL_PRELINK_MODULE := false
LOCAL_MODULE_TAGS := user
LOCAL_MODULE := libjni_latinime2
LOCAL_MODULE_TAGS := optional
include $(BUILD_SHARED_LIBRARY)

4
tests/Android.mk
View File

@ -10,8 +10,8 @@ LOCAL_JAVA_LIBRARIES := android.test.runner
# Include all test java files.
LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_PACKAGE_NAME := LatinIMETests
LOCAL_PACKAGE_NAME := LatinIME2Tests
LOCAL_INSTRUMENTATION_FOR := LatinIME
LOCAL_INSTRUMENTATION_FOR := LatinIme2Google
include $(BUILD_PACKAGE)