diff options
Diffstat (limited to 'java')
29 files changed, 64 insertions, 211 deletions
diff --git a/java/AndroidManifest.xml b/java/AndroidManifest.xml index 642c717d3..e229bc76a 100755 --- a/java/AndroidManifest.xml +++ b/java/AndroidManifest.xml @@ -1,6 +1,8 @@ <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.android.inputmethod.latin"> + <original-package android:name="com.android.inputmethod.latin" /> + <uses-permission android:name="android.permission.VIBRATE"/> <uses-permission android:name="android.permission.READ_USER_DICTIONARY" /> <uses-permission android:name="android.permission.WRITE_USER_DICTIONARY" /> diff --git a/java/res/values-cs/strings.xml b/java/res/values-cs/strings.xml index 1269658dd..877c2019a 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"</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) --> diff --git a/java/res/values-da/strings.xml b/java/res/values-da/strings.xml index ff9dec5f5..78941429c 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"</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) --> diff --git a/java/res/values-de/strings.xml b/java/res/values-de/strings.xml index d00a7d1d0..dc3151df9 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"</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) --> diff --git a/java/res/values-el/strings.xml b/java/res/values-el/strings.xml index 7f5c1f761..de579586b 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"</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) --> diff --git a/java/res/values-es-rUS/strings.xml b/java/res/values-es-rUS/strings.xml index 068555a9d..448feb7cd 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"</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) --> diff --git a/java/res/values-es/strings.xml b/java/res/values-es/strings.xml index 0fdb509fb..09114757a 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"</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) --> diff --git a/java/res/values-fr-rCA/strings.xml b/java/res/values-fr-rCA/strings.xml index b56463ed9..e0d456d00 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"</string> + <string name="english_ime_name" msgid="7252517407088836577">"Clavier Android 2"</string> </resources> diff --git a/java/res/values-fr/strings.xml b/java/res/values-fr/strings.xml index 56643bc88..d2c7df852 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"</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) --> diff --git a/java/res/values-it/strings.xml b/java/res/values-it/strings.xml index c1d44bc22..8acd65aed 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"</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) --> diff --git a/java/res/values-ja/strings.xml b/java/res/values-ja/strings.xml index c5757597b..e3dbe23cb 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キーボード"</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) --> diff --git a/java/res/values-ko/strings.xml b/java/res/values-ko/strings.xml index b61285253..610f165dc 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 키보드"</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) --> diff --git a/java/res/values-nb/strings.xml b/java/res/values-nb/strings.xml index 53eeab9f1..786ae242c 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"</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) --> diff --git a/java/res/values-nl/strings.xml b/java/res/values-nl/strings.xml index 8e33a3463..ba8840201 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"</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) --> diff --git a/java/res/values-pl/strings.xml b/java/res/values-pl/strings.xml index a4b5210b9..d4f31f737 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"</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) --> diff --git a/java/res/values-pt-rPT/strings.xml b/java/res/values-pt-rPT/strings.xml index 2fd97f0d9..8d27de9eb 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"</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) --> diff --git a/java/res/values-pt/strings.xml b/java/res/values-pt/strings.xml index 88f2ce151..5a348ce31 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"</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) --> diff --git a/java/res/values-ru/strings.xml b/java/res/values-ru/strings.xml index dabbf036d..99c576eb8 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"</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) --> diff --git a/java/res/values-sv/strings.xml b/java/res/values-sv/strings.xml index 397672884..28faaa914 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"</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) --> diff --git a/java/res/values-tr/strings.xml b/java/res/values-tr/strings.xml index 1dc55a777..fee07338d 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"</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) --> diff --git a/java/res/values-xlarge/bools.xml b/java/res/values-xlarge/bools.xml deleted file mode 100644 index fe8fc5838..000000000 --- a/java/res/values-xlarge/bools.xml +++ /dev/null @@ -1,23 +0,0 @@ -<?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> - <!-- Whether or not Popup on key press is enabled by default --> - <bool name="default_popup_preview">false</bool> -</resources> diff --git a/java/res/values-xlarge/dimens.xml b/java/res/values-xlarge/dimens.xml deleted file mode 100644 index 4e1c52877..000000000 --- a/java/res/values-xlarge/dimens.xml +++ /dev/null @@ -1,26 +0,0 @@ -<?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> - <dimen name="key_text_size">35sp</dimen> -</resources> diff --git a/java/res/values-zh-rCN/strings.xml b/java/res/values-zh-rCN/strings.xml index fd37c2bd6..cbf287723 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 键盘"</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) --> diff --git a/java/res/values-zh-rTW/strings.xml b/java/res/values-zh-rTW/strings.xml index 0ef399e85..78ede4ac3 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 鍵盤"</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) --> diff --git a/java/res/values/strings.xml b/java/res/values/strings.xml index 65b4c59a7..771577018 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</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> @@ -29,7 +29,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> <!-- Option to enable using nearby keys when correcting/predicting --> diff --git a/java/res/xml/method.xml b/java/res/xml/method.xml index fab4bd72b..e5654e96d 100644 --- a/java/res/xml/method.xml +++ b/java/res/xml/method.xml @@ -20,114 +20,7 @@ <!-- The attributes in this XML file provide configuration information --> <!-- for the Input Method Manager. --> -<!-- cs, da, de, en, es, fr, it, iw, nb, nl, ru, sr, sv --> -<!-- TODO: use <lang>_keyboard icon instead of a common keyboard icon. --> -<!-- TODO: use <lang>_mic icon instead of a common mic icon. --> <input-method xmlns:android="http://schemas.android.com/apk/res/android" android:settingsActivity="com.android.inputmethod.latin.LatinIMESettings" - android:isDefault="@bool/im_is_default"> - <subtype android:icon="@drawable/ic_subtype_keyboard" - android:imeSubtypeLocale="cs" - android:imeSubtypeMode="@string/subtype_mode_keyboard" - /> - <subtype android:icon="@drawable/ic_subtype_keyboard" - android:imeSubtypeLocale="da" - android:imeSubtypeMode="@string/subtype_mode_keyboard" - /> - <subtype android:icon="@drawable/ic_subtype_keyboard" - android:imeSubtypeLocale="de" - android:imeSubtypeMode="@string/subtype_mode_keyboard" - /> - <subtype android:icon="@drawable/ic_subtype_keyboard" - android:imeSubtypeLocale="en" - android:imeSubtypeMode="@string/subtype_mode_keyboard" - /> - <subtype android:icon="@drawable/ic_subtype_keyboard" - android:imeSubtypeLocale="es" - android:imeSubtypeMode="@string/subtype_mode_keyboard" - /> - <subtype android:icon="@drawable/ic_subtype_keyboard" - android:imeSubtypeLocale="fr" - android:imeSubtypeMode="@string/subtype_mode_keyboard" - /> - <subtype android:icon="@drawable/ic_subtype_keyboard" - android:imeSubtypeLocale="it" - android:imeSubtypeMode="@string/subtype_mode_keyboard" - /> - <subtype android:icon="@drawable/ic_subtype_keyboard" - android:imeSubtypeLocale="iw" - android:imeSubtypeMode="@string/subtype_mode_keyboard" - /> - <subtype android:icon="@drawable/ic_subtype_keyboard" - android:imeSubtypeLocale="nb" - android:imeSubtypeMode="@string/subtype_mode_keyboard" - /> - <subtype android:icon="@drawable/ic_subtype_keyboard" - android:imeSubtypeLocale="nl" - android:imeSubtypeMode="@string/subtype_mode_keyboard" - /> - <subtype android:icon="@drawable/ic_subtype_keyboard" - android:imeSubtypeLocale="ru" - android:imeSubtypeMode="@string/subtype_mode_keyboard" - /> - <subtype android:icon="@drawable/ic_subtype_keyboard" - android:imeSubtypeLocale="sr" - android:imeSubtypeMode="@string/subtype_mode_keyboard" - /> - <subtype android:icon="@drawable/ic_subtype_keyboard" - android:imeSubtypeLocale="sv" - android:imeSubtypeMode="@string/subtype_mode_keyboard" - /> - <subtype android:icon="@drawable/ic_subtype_mic" - android:imeSubtypeLocale="cs" - android:imeSubtypeMode="@string/subtype_mode_voice" - /> - <subtype android:icon="@drawable/ic_subtype_mic" - android:imeSubtypeLocale="da" - android:imeSubtypeMode="@string/subtype_mode_voice" - /> - <subtype android:icon="@drawable/ic_subtype_mic" - android:imeSubtypeLocale="de" - android:imeSubtypeMode="@string/subtype_mode_voice" - /> - <subtype android:icon="@drawable/ic_subtype_mic" - android:imeSubtypeLocale="en" - android:imeSubtypeMode="@string/subtype_mode_voice" - /> - <subtype android:icon="@drawable/ic_subtype_mic" - android:imeSubtypeLocale="es" - android:imeSubtypeMode="@string/subtype_mode_voice" - /> - <subtype android:icon="@drawable/ic_subtype_mic" - android:imeSubtypeLocale="fr" - android:imeSubtypeMode="@string/subtype_mode_voice" - /> - <subtype android:icon="@drawable/ic_subtype_mic" - android:imeSubtypeLocale="it" - android:imeSubtypeMode="@string/subtype_mode_voice" - /> - <subtype android:icon="@drawable/ic_subtype_mic" - android:imeSubtypeLocale="iw" - android:imeSubtypeMode="@string/subtype_mode_voice" - /> - <subtype android:icon="@drawable/ic_subtype_mic" - android:imeSubtypeLocale="nb" - android:imeSubtypeMode="@string/subtype_mode_voice" - /> - <subtype android:icon="@drawable/ic_subtype_mic" - android:imeSubtypeLocale="nl" - android:imeSubtypeMode="@string/subtype_mode_voice" - /> - <subtype android:icon="@drawable/ic_subtype_mic" - android:imeSubtypeLocale="ru" - android:imeSubtypeMode="@string/subtype_mode_voice" - /> - <subtype android:icon="@drawable/ic_subtype_mic" - android:imeSubtypeLocale="sr" - android:imeSubtypeMode="@string/subtype_mode_voice" - /> - <subtype android:icon="@drawable/ic_subtype_mic" - android:imeSubtypeLocale="sv" - android:imeSubtypeMode="@string/subtype_mode_voice" - /> -</input-method> + android:isDefault="@bool/im_is_default" +/> diff --git a/java/res/xml/prefs.xml b/java/res/xml/prefs.xml index a9ff8cabf..cd0a12f77 100644 --- a/java/res/xml/prefs.xml +++ b/java/res/xml/prefs.xml @@ -56,7 +56,7 @@ android:title="@string/prefs_enable_log" android:summary="@string/prefs_description_log" android:persistent="true" - android:defaultValue="false" + android:defaultValue="true" /> <ListPreference @@ -68,14 +68,14 @@ android:defaultValue="@string/voice_mode_main" /> - <!-- <ListPreference - android:key="keyboard_layout" + <ListPreference + android:key="pref_keyboard_layout_20100902" android:title="@string/keyboard_layout" android:persistent="true" android:entryValues="@array/keyboard_layout_modes_values" android:entries="@array/keyboard_layout_modes" android:defaultValue="4" - />--> + /> <PreferenceScreen android:title="@string/language_selection_title" @@ -123,4 +123,11 @@ /> </PreferenceCategory> + <CheckBoxPreference + android:key="debug_mode" + android:title="Debug Mode" + android:persistent="true" + android:defaultValue="false" + /> + </PreferenceScreen> diff --git a/java/src/com/android/inputmethod/latin/BinaryDictionary.java b/java/src/com/android/inputmethod/latin/BinaryDictionary.java index d0e143dd0..b081242a9 100644 --- a/java/src/com/android/inputmethod/latin/BinaryDictionary.java +++ b/java/src/com/android/inputmethod/latin/BinaryDictionary.java @@ -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"); } } diff --git a/java/src/com/android/inputmethod/voice/VoiceInputLogger.java b/java/src/com/android/inputmethod/voice/VoiceInputLogger.java index 4d50f5ee8..fbd90d318 100644 --- a/java/src/com/android/inputmethod/voice/VoiceInputLogger.java +++ b/java/src/com/android/inputmethod/voice/VoiceInputLogger.java @@ -182,12 +182,12 @@ public class VoiceInputLogger { int index, String before, String after) { Intent i = newLoggingBroadcast(LoggingEvents.VoiceIme.TEXT_MODIFIED); i.putExtra(LoggingEvents.VoiceIme.EXTRA_TEXT_MODIFIED_LENGTH, suggestionLength); - i.putExtra(LoggingEvents.VoiceIme.EXTRA_TEXT_REPLACED_LENGTH, replacedPhraseLength); + i.putExtra("rlength", replacedPhraseLength); i.putExtra(LoggingEvents.VoiceIme.EXTRA_TEXT_MODIFIED_TYPE, LoggingEvents.VoiceIme.TEXT_MODIFIED_TYPE_CHOOSE_SUGGESTION); i.putExtra(LoggingEvents.VoiceIme.EXTRA_N_BEST_CHOOSE_INDEX, index); - i.putExtra(LoggingEvents.VoiceIme.EXTRA_BEFORE_N_BEST_CHOOSE, before); - i.putExtra(LoggingEvents.VoiceIme.EXTRA_AFTER_N_BEST_CHOOSE, after); + i.putExtra("before", before); + i.putExtra("after", after); mContext.sendBroadcast(i); } |