diff options
Diffstat (limited to 'java')
28 files changed, 138 insertions, 54 deletions
diff --git a/java/Android.mk b/java/Android.mk index 172f35a89..c89e1c6bb 100755 --- a/java/Android.mk +++ b/java/Android.mk @@ -5,17 +5,18 @@ LOCAL_MODULE_TAGS := optional LOCAL_SRC_FILES := $(call all-subdir-java-files) -LOCAL_PACKAGE_NAME := LatinIme2Google +LOCAL_PACKAGE_NAME := LatinIME -LOCAL_CERTIFICATE := vendor/google/certs/app +LOCAL_CERTIFICATE := shared -LOCAL_JNI_SHARED_LIBRARIES := libjni_latinime2 +LOCAL_JNI_SHARED_LIBRARIES := libjni_latinime LOCAL_STATIC_JAVA_LIBRARIES := android-common #LOCAL_AAPT_FLAGS := -0 .dict # The following flag is required because we use a different package name -# com.google.android.inputmethod.latin in the LatinIME sandbox. +# com.google.android.inputmethod.latin than Java package name +# com.android.inputmethod.latin LOCAL_AAPT_FLAGS := --custom-package com.android.inputmethod.latin LOCAL_SDK_VERSION := 8 diff --git a/java/AndroidManifest.xml b/java/AndroidManifest.xml index d14ca32e5..f87ce013b 100755 --- a/java/AndroidManifest.xml +++ b/java/AndroidManifest.xml @@ -1,9 +1,5 @@ <manifest xmlns:android="http://schemas.android.com/apk/res/android" - package="com.google.android.inputmethod.latin" - android:versionCode="21" - android:versionName="0.21"> - - <uses-sdk android:minSdkVersion="8"></uses-sdk> + package="com.google.android.inputmethod.latin"> <original-package android:name="com.android.inputmethod.latin" /> diff --git a/java/res/layout-xlarge/input.xml b/java/res/layout-xlarge/input.xml new file mode 100644 index 000000000..6b0bb12a6 --- /dev/null +++ b/java/res/layout-xlarge/input.xml @@ -0,0 +1,31 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright 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. +*/ +--> + +<com.android.inputmethod.latin.LatinKeyboardView + xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@android:id/keyboardView" + android:layout_alignParentBottom="true" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:background="@drawable/keyboard_background" + android:keyBackground="@drawable/btn_keyboard_key" + android:keyTextSize="32sp" + android:verticalCorrection="0dip" + /> diff --git a/java/res/layout-xlarge/input_trans.xml b/java/res/layout-xlarge/input_trans.xml new file mode 100755 index 000000000..1dfdc1555 --- /dev/null +++ b/java/res/layout-xlarge/input_trans.xml @@ -0,0 +1,31 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright 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. +*/ +--> + +<com.android.inputmethod.latin.LatinKeyboardView + xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@android:id/keyboardView" + android:layout_alignParentBottom="true" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:background="@color/latinkeyboard_extension_background" + android:verticalCorrection="0dip" + android:keyTextSize="32sp" + android:keyBackground="@drawable/btn_keyboard_key_fulltrans" + /> diff --git a/java/res/values-cs/strings.xml b/java/res/values-cs/strings.xml index e063c8a28..4bc1f5543 100644 --- a/java/res/values-cs/strings.xml +++ b/java/res/values-cs/strings.xml @@ -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 2"</string> - <string name="english_ime_settings" msgid="6661589557206947774">"Nastavení klávesnice Android 2"</string> + <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="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> <string name="hit_correction" msgid="4855351009261318389">"Opravovat překlepy"</string> diff --git a/java/res/values-da/strings.xml b/java/res/values-da/strings.xml index 09cb8c90c..750d67b20 100644 --- a/java/res/values-da/strings.xml +++ b/java/res/values-da/strings.xml @@ -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 2"</string> - <string name="english_ime_settings" msgid="6661589557206947774">"Indstillinger for Android-tastatur 2"</string> + <string name="english_ime_name" msgid="7252517407088836577">"Android-tastatur"</string> + <string name="english_ime_settings" msgid="6661589557206947774">"Indstillinger for Android-tastatur"</string> <string name="vibrate_on_keypress" msgid="5258079494276955460">"Vibration ved tastetryk"</string> <string name="sound_on_keypress" msgid="6093592297198243644">"Lyd ved tastetryk"</string> <string name="hit_correction" msgid="4855351009261318389">"Ret stavefejl"</string> diff --git a/java/res/values-de/strings.xml b/java/res/values-de/strings.xml index 02ed5a662..ed6408dde 100644 --- a/java/res/values-de/strings.xml +++ b/java/res/values-de/strings.xml @@ -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 2"</string> - <string name="english_ime_settings" msgid="6661589557206947774">"Android-Tastatur2einstellungen"</string> + <string name="english_ime_name" msgid="7252517407088836577">"Android-Tastatur"</string> + <string name="english_ime_settings" msgid="6661589557206947774">"Android-Tastatureinstellungen"</string> <string name="vibrate_on_keypress" msgid="5258079494276955460">"Vibrieren b. Tastendruck"</string> <string name="sound_on_keypress" msgid="6093592297198243644">"Ton bei Tastendruck"</string> <string name="hit_correction" msgid="4855351009261318389">"Eingabefehler korrigieren"</string> diff --git a/java/res/values-el/strings.xml b/java/res/values-el/strings.xml index fbe705fd2..c4a50771a 100644 --- a/java/res/values-el/strings.xml +++ b/java/res/values-el/strings.xml @@ -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 2"</string> - <string name="english_ime_settings" msgid="6661589557206947774">"Ρυθμίσεις πληκτρολογίου Android 2"</string> + <string name="english_ime_name" msgid="7252517407088836577">"Πληκτρολόγιο Android"</string> + <string name="english_ime_settings" msgid="6661589557206947774">"Ρυθμίσεις πληκτρολογίου Android"</string> <string name="vibrate_on_keypress" msgid="5258079494276955460">"Δόνηση κατά το πάτημα πλήκτρων"</string> <string name="sound_on_keypress" msgid="6093592297198243644">"Ήχος κατά το πάτημα πλήκτρων"</string> <string name="hit_correction" msgid="4855351009261318389">"Διόρθωση σφαλμάτων πληκτρολόγησης"</string> diff --git a/java/res/values-es-rUS/strings.xml b/java/res/values-es-rUS/strings.xml index 150ff7574..cd17dba31 100644 --- a/java/res/values-es-rUS/strings.xml +++ b/java/res/values-es-rUS/strings.xml @@ -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 2"</string> - <string name="english_ime_settings" msgid="6661589557206947774">"Configuración de teclado de Android 2"</string> + <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="vibrate_on_keypress" msgid="5258079494276955460">"Vibrar al pulsar teclas"</string> <string name="sound_on_keypress" msgid="6093592297198243644">"Sonar al pulsar las teclas"</string> <string name="hit_correction" msgid="4855351009261318389">"Corregir errores de escritura"</string> diff --git a/java/res/values-es/strings.xml b/java/res/values-es/strings.xml index 4ef3eac31..fbe3ad347 100644 --- a/java/res/values-es/strings.xml +++ b/java/res/values-es/strings.xml @@ -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 2"</string> - <string name="english_ime_settings" msgid="6661589557206947774">"Ajustes del teclado de Android 2"</string> + <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="vibrate_on_keypress" msgid="5258079494276955460">"Vibrar al pulsar tecla"</string> <string name="sound_on_keypress" msgid="6093592297198243644">"Sonido al pulsar tecla"</string> <string name="hit_correction" msgid="4855351009261318389">"Corregir errores de escritura"</string> diff --git a/java/res/values-fr-rCA/strings.xml b/java/res/values-fr-rCA/strings.xml index e0d456d00..b56463ed9 100644 --- a/java/res/values-fr-rCA/strings.xml +++ b/java/res/values-fr-rCA/strings.xml @@ -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 2"</string> + <string name="english_ime_name" msgid="7252517407088836577">"Clavier Android"</string> </resources> diff --git a/java/res/values-fr/strings.xml b/java/res/values-fr/strings.xml index d4ec8789e..2cabe40d9 100644 --- a/java/res/values-fr/strings.xml +++ b/java/res/values-fr/strings.xml @@ -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 2"</string> - <string name="english_ime_settings" msgid="6661589557206947774">"Paramètres du clavier Android 2"</string> + <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="vibrate_on_keypress" msgid="5258079494276955460">"Vibrer à chaque touche"</string> <string name="sound_on_keypress" msgid="6093592297198243644">"Son à chaque touche"</string> <string name="hit_correction" msgid="4855351009261318389">"Corriger les fautes de frappe"</string> diff --git a/java/res/values-it/strings.xml b/java/res/values-it/strings.xml index 297ea5c03..8100175b3 100644 --- a/java/res/values-it/strings.xml +++ b/java/res/values-it/strings.xml @@ -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 2"</string> - <string name="english_ime_settings" msgid="6661589557206947774">"Impostazioni tastiera Android 2"</string> + <string name="english_ime_name" msgid="7252517407088836577">"Tastiera Android"</string> + <string name="english_ime_settings" msgid="6661589557206947774">"Impostazioni tastiera Android"</string> <string name="vibrate_on_keypress" msgid="5258079494276955460">"Vibrazione tasti"</string> <string name="sound_on_keypress" msgid="6093592297198243644">"Suono tasti"</string> <string name="hit_correction" msgid="4855351009261318389">"Correggi errori di digitazione"</string> diff --git a/java/res/values-ja/strings.xml b/java/res/values-ja/strings.xml index f77cb210c..7867684cb 100644 --- a/java/res/values-ja/strings.xml +++ b/java/res/values-ja/strings.xml @@ -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キーボード 2"</string> - <string name="english_ime_settings" msgid="6661589557206947774">"Androidキーボード 2 の設定"</string> + <string name="english_ime_name" msgid="7252517407088836577">"Androidキーボード"</string> + <string name="english_ime_settings" msgid="6661589557206947774">"Androidキーボードの設定"</string> <string name="vibrate_on_keypress" msgid="5258079494276955460">"キー操作バイブ"</string> <string name="sound_on_keypress" msgid="6093592297198243644">"キー操作音"</string> <string name="hit_correction" msgid="4855351009261318389">"入力ミス補正"</string> diff --git a/java/res/values-ko/strings.xml b/java/res/values-ko/strings.xml index 414a149bb..94d1ff4ef 100644 --- a/java/res/values-ko/strings.xml +++ b/java/res/values-ko/strings.xml @@ -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 키보드 2"</string> - <string name="english_ime_settings" msgid="6661589557206947774">"Android 키보드 2 설정"</string> + <string name="english_ime_name" msgid="7252517407088836577">"Android 키보드"</string> + <string name="english_ime_settings" msgid="6661589557206947774">"Android 키보드 설정"</string> <string name="vibrate_on_keypress" msgid="5258079494276955460">"키를 누를 때 진동 발생"</string> <string name="sound_on_keypress" msgid="6093592297198243644">"키를 누를 때 소리 발생"</string> <string name="hit_correction" msgid="4855351009261318389">"입력 오류 수정"</string> diff --git a/java/res/values-nb/strings.xml b/java/res/values-nb/strings.xml index 5c1bbf1c4..041d07eb3 100644 --- a/java/res/values-nb/strings.xml +++ b/java/res/values-nb/strings.xml @@ -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 2"</string> - <string name="english_ime_settings" msgid="6661589557206947774">"Innstillinger for skjermtastatur 2"</string> + <string name="english_ime_name" msgid="7252517407088836577">"Skjermtastatur"</string> + <string name="english_ime_settings" msgid="6661589557206947774">"Innstillinger for skjermtastatur"</string> <string name="vibrate_on_keypress" msgid="5258079494276955460">"Vibrer ved tastetrykk"</string> <string name="sound_on_keypress" msgid="6093592297198243644">"Lyd ved tastetrykk"</string> <string name="hit_correction" msgid="4855351009261318389">"Rett opp skrivefeil"</string> diff --git a/java/res/values-nl/strings.xml b/java/res/values-nl/strings.xml index c5771c8b7..00b197bf1 100644 --- a/java/res/values-nl/strings.xml +++ b/java/res/values-nl/strings.xml @@ -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 2"</string> - <string name="english_ime_settings" msgid="6661589557206947774">"Instellingen voor Android-toetsenbord 2"</string> + <string name="english_ime_name" msgid="7252517407088836577">"Android-toetsenbord"</string> + <string name="english_ime_settings" msgid="6661589557206947774">"Instellingen voor Android-toetsenbord"</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> <string name="hit_correction" msgid="4855351009261318389">"Typefouten corrigeren"</string> diff --git a/java/res/values-pl/strings.xml b/java/res/values-pl/strings.xml index 561191d98..0c72727ce 100644 --- a/java/res/values-pl/strings.xml +++ b/java/res/values-pl/strings.xml @@ -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 2"</string> - <string name="english_ime_settings" msgid="6661589557206947774">"Ustawienia klawiatury Android 2"</string> + <string name="english_ime_name" msgid="7252517407088836577">"Klawiatura Android"</string> + <string name="english_ime_settings" msgid="6661589557206947774">"Ustawienia klawiatury Android"</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> <string name="hit_correction" msgid="4855351009261318389">"Popraw błędy pisowni"</string> diff --git a/java/res/values-pt-rPT/strings.xml b/java/res/values-pt-rPT/strings.xml index 39007c130..35a9cb715 100644 --- a/java/res/values-pt-rPT/strings.xml +++ b/java/res/values-pt-rPT/strings.xml @@ -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 2"</string> - <string name="english_ime_settings" msgid="6661589557206947774">"Definições de teclado do Android 2"</string> + <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="vibrate_on_keypress" msgid="5258079494276955460">"Vibrar ao primir as teclas"</string> <string name="sound_on_keypress" msgid="6093592297198243644">"Som ao premir as teclas"</string> <string name="hit_correction" msgid="4855351009261318389">"Corrigir erros de escrita"</string> diff --git a/java/res/values-pt/strings.xml b/java/res/values-pt/strings.xml index 38890d8ff..235fd65ac 100644 --- a/java/res/values-pt/strings.xml +++ b/java/res/values-pt/strings.xml @@ -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 2"</string> - <string name="english_ime_settings" msgid="6661589557206947774">"Configurações de teclado Android 2"</string> + <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="vibrate_on_keypress" msgid="5258079494276955460">"Vibrar ao tocar a tecla"</string> <string name="sound_on_keypress" msgid="6093592297198243644">"Som ao tocar a tecla"</string> <string name="hit_correction" msgid="4855351009261318389">"Corrigir erros de digitação"</string> diff --git a/java/res/values-ru/strings.xml b/java/res/values-ru/strings.xml index f1a8a1c0b..e27402c7f 100644 --- a/java/res/values-ru/strings.xml +++ b/java/res/values-ru/strings.xml @@ -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 2"</string> - <string name="english_ime_settings" msgid="6661589557206947774">"Настройки клавиатуры Android 2"</string> + <string name="english_ime_name" msgid="7252517407088836577">"Клавиатура Android"</string> + <string name="english_ime_settings" msgid="6661589557206947774">"Настройки клавиатуры Android"</string> <string name="vibrate_on_keypress" msgid="5258079494276955460">"Виброотклик клавиш"</string> <string name="sound_on_keypress" msgid="6093592297198243644">"Звук клавиш"</string> <string name="hit_correction" msgid="4855351009261318389">"Исправлять опечатки"</string> diff --git a/java/res/values-sv/strings.xml b/java/res/values-sv/strings.xml index 8970a05f7..9c6c22159 100644 --- a/java/res/values-sv/strings.xml +++ b/java/res/values-sv/strings.xml @@ -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 2"</string> - <string name="english_ime_settings" msgid="6661589557206947774">"Inställningar för Androids tangentbord 2"</string> + <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="vibrate_on_keypress" msgid="5258079494276955460">"Vibrera vid tangenttryck"</string> <string name="sound_on_keypress" msgid="6093592297198243644">"Knappljud"</string> <string name="hit_correction" msgid="4855351009261318389">"Rätta skrivfel"</string> diff --git a/java/res/values-tr/strings.xml b/java/res/values-tr/strings.xml index 86d956971..0fbdc7da3 100644 --- a/java/res/values-tr/strings.xml +++ b/java/res/values-tr/strings.xml @@ -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 2"</string> - <string name="english_ime_settings" msgid="6661589557206947774">"Android klavye 2 ayarları"</string> + <string name="english_ime_name" msgid="7252517407088836577">"Android klavyesi"</string> + <string name="english_ime_settings" msgid="6661589557206947774">"Android klavye 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> <string name="hit_correction" msgid="4855351009261318389">"Yazım hatalarını düzelt"</string> diff --git a/java/res/values-xlarge/dimens.xml b/java/res/values-xlarge/dimens.xml new file mode 100644 index 000000000..433176274 --- /dev/null +++ b/java/res/values-xlarge/dimens.xml @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright 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. +*/ +--> + +<resources> + <dimen name="key_height">72dip</dimen> + <dimen name="candidate_strip_height">46dip</dimen> + <dimen name="spacebar_vertical_correction">0dip</dimen> +</resources> diff --git a/java/res/values-zh-rCN/strings.xml b/java/res/values-zh-rCN/strings.xml index b0a07817f..175ed6094 100644 --- a/java/res/values-zh-rCN/strings.xml +++ b/java/res/values-zh-rCN/strings.xml @@ -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 键盘 2"</string> - <string name="english_ime_settings" msgid="6661589557206947774">"Android 键盘 2 设置"</string> + <string name="english_ime_name" msgid="7252517407088836577">"Android 键盘"</string> + <string name="english_ime_settings" msgid="6661589557206947774">"Android 键盘 设置"</string> <string name="vibrate_on_keypress" msgid="5258079494276955460">"按键时振动"</string> <string name="sound_on_keypress" msgid="6093592297198243644">"按键时播放音效"</string> <string name="hit_correction" msgid="4855351009261318389">"纠正输入错误"</string> diff --git a/java/res/values-zh-rTW/strings.xml b/java/res/values-zh-rTW/strings.xml index 89b2eac9f..4f83be405 100644 --- a/java/res/values-zh-rTW/strings.xml +++ b/java/res/values-zh-rTW/strings.xml @@ -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 鍵盤 2"</string> - <string name="english_ime_settings" msgid="6661589557206947774">"Android 鍵盤 2 設定"</string> + <string name="english_ime_name" msgid="7252517407088836577">"Android 鍵盤"</string> + <string name="english_ime_settings" msgid="6661589557206947774">"Android 鍵盤設定"</string> <string name="vibrate_on_keypress" msgid="5258079494276955460">"按鍵時震動"</string> <string name="sound_on_keypress" msgid="6093592297198243644">"按鍵時播放音效"</string> <string name="hit_correction" msgid="4855351009261318389">"修正輸入錯誤"</string> diff --git a/java/res/values/strings.xml b/java/res/values/strings.xml index 6c7aa8324..e77155d50 100644 --- a/java/res/values/strings.xml +++ b/java/res/values/strings.xml @@ -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 2</string> + <string name="english_ime_name">Android keyboard</string> <!-- Title for Latin keyboard settings activity / dialog --> - <string name="english_ime_settings">Android keyboard 2 settings</string> + <string name="english_ime_settings">Android keyboard settings</string> <!-- Option to provide vibrate/haptic feedback on keypress --> <string name="vibrate_on_keypress">Vibrate on keypress</string> diff --git a/java/src/com/android/inputmethod/latin/BinaryDictionary.java b/java/src/com/android/inputmethod/latin/BinaryDictionary.java index a1e9adf2e..0a2af0662 100644 --- a/java/src/com/android/inputmethod/latin/BinaryDictionary.java +++ b/java/src/com/android/inputmethod/latin/BinaryDictionary.java @@ -53,9 +53,9 @@ public class BinaryDictionary extends Dictionary { static { try { - System.loadLibrary("jni_latinime2"); + System.loadLibrary("jni_latinime"); } catch (UnsatisfiedLinkError ule) { - Log.e("BinaryDictionary", "Could not load native library jni_latinime2"); + Log.e("BinaryDictionary", "Could not load native library jni_latinime"); } } |