From e04484851a230d356af177129a4e7aa667177e6d Mon Sep 17 00:00:00 2001 From: The Android Open Source Project Date: Thu, 19 Mar 2009 23:08:57 -0700 Subject: [PATCH 01/26] auto import from //branches/cupcake_rel/...@141571 --- res/drawable/dialog_bubble_step02.9.png | Bin 1036 -> 100 bytes res/layout/bubble_text.xml | 1 + res/values-cs/donottranslate.xml | 27 +++++++++++++++ res/values/donottranslate.xml | 6 ++++ res/xml/kbd_qwerty.xml | 16 ++++++--- res/xml/prefs.xml | 1 - .../android/inputmethod/latin/LatinIME.java | 31 +++++++++++++---- .../android/inputmethod/latin/Tutorial.java | 32 +++++++++--------- 8 files changed, 86 insertions(+), 28 deletions(-) create mode 100644 res/values-cs/donottranslate.xml diff --git a/res/drawable/dialog_bubble_step02.9.png b/res/drawable/dialog_bubble_step02.9.png index d77f85fe28e807d099c5bef39e8eb50c8aed60bb..62386f2975631501e6836d8c16484a3341895d44 100755 GIT binary patch literal 100 zcmeAS@N?(olHy`uVBq!ia0vp^>_9BV!3HF&rQD_gDQ!;|$B>F!$q5du|0ORpF6w$z zUt%Mn`k#Nwlm7>wEf7@jbTM-Dy6}IZuo=TK{=LremnP`~wJ~_Q`njxgN@xNA1Z5tt literal 1036 zcmV+n1oQieP)w3|#000BiNkl2Z|b2sHNiA*(cRs(xqR*)_ZF~wFKz4M>4#%~)=Fn*%^sSX zQ0lp26mS7;nV9Hypy-RInpL#fgn(Y?3Ep<>LA{L15SVNO5H~+RFouGL?jx++xmyU0 zJq5Hj21lWXnR2t?OzjCoaA}_xEEJG-g5Q)?)QW*k&ZcRWEFTV98T_}Lsrp#l${1+EnqEbxE{UGlNM#1+RKmZH4uoW#91y^ zT`jEWdA&yisCBs<_#&J|o;&=#2FhNDY31(3X+d#u@$nPG!_CgAsopWI&9N3WsHFg@ zIhNGG4g6?{`>}VCO~UuUgBN=0000 diff --git a/res/values-cs/donottranslate.xml b/res/values-cs/donottranslate.xml new file mode 100644 index 000000000..41431388a --- /dev/null +++ b/res/values-cs/donottranslate.xml @@ -0,0 +1,27 @@ + + + + + ď + + ř + + ť + diff --git a/res/values/donottranslate.xml b/res/values/donottranslate.xml index 8a879bdd5..e766dba77 100644 --- a/res/values/donottranslate.xml +++ b/res/values/donottranslate.xml @@ -22,4 +22,10 @@ .\u0020,;:!?\n()[]*&@{}/<>_+=|\u0022 .,;:!? + + + + + + diff --git a/res/xml/kbd_qwerty.xml b/res/xml/kbd_qwerty.xml index 34e991239..979471059 100755 --- a/res/xml/kbd_qwerty.xml +++ b/res/xml/kbd_qwerty.xml @@ -32,8 +32,12 @@ android:popupKeyboard="@xml/kbd_popup_template" android:popupCharacters="@string/alternates_for_e" /> - - + + - + @@ -76,7 +82,9 @@ android:keyWidth="15%p" android:isModifier="true" android:iconPreview="@drawable/sym_keyboard_feedback_shift" android:isSticky="true" android:keyEdgeFlags="left"/> - + diff --git a/src/com/android/inputmethod/latin/LatinIME.java b/src/com/android/inputmethod/latin/LatinIME.java index bde04d15a..e5ad75bca 100644 --- a/src/com/android/inputmethod/latin/LatinIME.java +++ b/src/com/android/inputmethod/latin/LatinIME.java @@ -190,6 +190,7 @@ public class LatinIME extends InputMethodService } if (!mTutorialShownBefore && mTutorial != null) { mTutorial.close(false); + mTutorial = null; } super.onConfigurationChanged(conf); } @@ -299,13 +300,24 @@ public class LatinIME extends InputMethodService if (mSuggest != null) { mSuggest.setCorrectionMode(mCorrectionMode); } - if (!mTutorialShownBefore && mTutorial == null) { - mHandler.sendEmptyMessageDelayed(MSG_CHECK_TUTORIAL, 1000); - } mPredictionOn = mPredictionOn && mCorrectionMode > 0; + if (!mTutorialShownBefore && mTutorial == null) { + mHandler.sendEmptyMessageDelayed(MSG_CHECK_TUTORIAL, + mInputView.isShown() ? 100 : 3000); + } if (TRACE) Debug.startMethodTracing("latinime"); } + @Override + public void onWindowShown() { + super.onWindowShown(); + // Bring the tutorial up faster, if window just shown + if (!mTutorialShownBefore && mTutorial == null) { + mHandler.removeMessages(MSG_CHECK_TUTORIAL); + mHandler.sendEmptyMessageDelayed(MSG_CHECK_TUTORIAL, 1000); + } + } + @Override public void onFinishInput() { super.onFinishInput(); @@ -313,9 +325,10 @@ public class LatinIME extends InputMethodService if (mInputView != null) { mInputView.closing(); } - if (!mTutorialShownBefore && mTutorial != null) { - mTutorial.close(false); - } +// if (!mTutorialShownBefore && mTutorial != null) { +// mTutorial.close(false); +// mTutorial = null; +// } } @Override @@ -346,6 +359,10 @@ public class LatinIME extends InputMethodService @Override public void hideWindow() { if (TRACE) Debug.stopMethodTracing(); + if (!mTutorialShownBefore && mTutorial != null) { + mTutorial.close(false); + mTutorial = null; + } super.hideWindow(); TextEntryState.endSession(); } @@ -982,7 +999,7 @@ public class LatinIME extends InputMethodService // Get the settings preferences SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(this); mProximityCorrection = sp.getBoolean(PREF_PROXIMITY_CORRECTION, true); - mVibrateOn = sp.getBoolean(PREF_VIBRATE_ON, true); + mVibrateOn = sp.getBoolean(PREF_VIBRATE_ON, false); mSoundOn = sp.getBoolean(PREF_SOUND_ON, false); String predictionBasic = getString(R.string.prediction_basic); String mode = sp.getString(PREF_PREDICTION, predictionBasic); diff --git a/src/com/android/inputmethod/latin/Tutorial.java b/src/com/android/inputmethod/latin/Tutorial.java index 2b3138bf9..d944d17bf 100644 --- a/src/com/android/inputmethod/latin/Tutorial.java +++ b/src/com/android/inputmethod/latin/Tutorial.java @@ -168,22 +168,22 @@ public class Tutorial { R.string.tip_dismiss, false, true); mBubbles.add(b0); - Bubble b1 = new Bubble(context, inputView, - R.drawable.dialog_bubble_step03, - (int) (inputWidth * 0.85) + mBubblePointerOffset, inputHeight / 5, - (int) (inputWidth * 0.45), - Gravity.TOP | Gravity.RIGHT, - R.string.tip_long_press, - true, false); - mBubbles.add(b1); - Bubble b2 = new Bubble(inputView.getContext(), inputView, - R.drawable.dialog_bubble_step04, - inputWidth / 10 - mBubblePointerOffset, inputHeight - inputHeight / 5, - (int) (inputWidth * 0.45), - Gravity.BOTTOM | Gravity.LEFT, - R.string.tip_access_symbols, - true, false); - mBubbles.add(b2); +// Bubble b1 = new Bubble(context, inputView, +// R.drawable.dialog_bubble_step03, +// (int) (inputWidth * 0.85) + mBubblePointerOffset, inputHeight / 5, +// (int) (inputWidth * 0.45), +// Gravity.TOP | Gravity.RIGHT, +// R.string.tip_long_press, +// true, false); +// mBubbles.add(b1); +// Bubble b2 = new Bubble(inputView.getContext(), inputView, +// R.drawable.dialog_bubble_step04, +// inputWidth / 10 - mBubblePointerOffset, inputHeight - inputHeight / 5, +// (int) (inputWidth * 0.45), +// Gravity.BOTTOM | Gravity.LEFT, +// R.string.tip_access_symbols, +// true, false); +// mBubbles.add(b2); mInputView = inputView; } From 715ce04133e62ddfcb14802515b0eb8e70caa10a Mon Sep 17 00:00:00 2001 From: Eric Fischer <> Date: Tue, 24 Mar 2009 18:33:43 -0700 Subject: [PATCH 02/26] Automated import from //branches/cupcake/...@141866,141866 --- res/values-cs/strings.xml | 101 ++++++++++++---------------------- res/values-de/strings.xml | 101 ++++++++++++---------------------- res/values-es/strings.xml | 101 ++++++++++++---------------------- res/values-fr/strings.xml | 101 ++++++++++++---------------------- res/values-it/strings.xml | 101 ++++++++++++---------------------- res/values-ko/strings.xml | 101 ++++++++++++---------------------- res/values-nb/strings.xml | 64 ++++++++------------- res/values-nl/strings.xml | 101 ++++++++++++---------------------- res/values-pl/strings.xml | 101 ++++++++++++---------------------- res/values-ru/strings.xml | 101 ++++++++++++---------------------- res/values-zh-rCN/strings.xml | 101 ++++++++++++---------------------- res/values-zh-rTW/strings.xml | 101 ++++++++++++---------------------- 12 files changed, 420 insertions(+), 755 deletions(-) diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml index 8c8045924..3facbc178 100644 --- a/res/values-cs/strings.xml +++ b/res/values-cs/strings.xml @@ -15,52 +15,35 @@ --> - - - - + "Klávesnice Android" + "Nastavení klávesnice Android" "Při stisku klávesy vibrovat" "Zvuk při stisku klávesy" - - - - - - - - - - - - - - - - - - - - - - - - - - - - + "Opravovat překlepy" + "Povolit opravu chyb vstupu" + "Chyby vstupu v zobrazení na šířku" + "Povolit opravu chyb vstupu" + "Návrhy slov" + "Automaticky opravit předchozí slovo" + "Návrhy slov" + "Nastavení návrhů slov" + "Povolit automatické dokončování při psaní" + "Automatické dokončování" + "Zvětšit textové pole" + "Skrýt návrhy slov v zobrazení na šířku" + "Velká písmena automaticky" + "Zahájit větu velkým písmenem" "Automatická interpunkce" - - - - - - - - - + + "Není" + "Základní" + "Pokročilé" + + "0" + "1" + "2" @@ -76,28 +59,16 @@ "ýÿ" - - - - - - - - - - - - - - - - - - - - - - - - + "Podržením klávesy zobrazíte diakritiku (ž, á atd.)" + "Stisknutím klávesy Zpět ↶ můžete klávesnici kdykoli zavřít" + "Přístup k číslům a symbolům" + "Stisknutím a podržením slova zcela vlevo toto slovo přidáte do slovníku" + "Přejít" + "Další" + "Hotovo" + "Odeslat" + "?123" + "123" + "ABC" + "Alt" diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml index 9ae62e101..f3665aecb 100644 --- a/res/values-de/strings.xml +++ b/res/values-de/strings.xml @@ -15,52 +15,35 @@ --> - - - - + "Android-Tastatur" + "Android-Tastatureinstellungen" "Vibrieren auf Tastendruck" "Sound bei Tastendruck" - - - - - - - - - - - - - - - - - - - - - - - - - - - - + "Eingabefehler korrigieren" + "Korrektur von Eingabefehlern aktivieren" + "Eingabefehler im Querformat" + "Korrektur von Eingabefehlern aktivieren" + "Wortvorschläge" + "Vorheriges Wort automatisch korrigieren" + "Wortvorschläge" + "Einstellungen für Wortvorschläge" + "Automatische Vervollständigung während der Eingabe aktivieren" + "Automatische Vervollständigung" + "Textfeld vergrößern" + "Wortvorschläge in Querformat ausblenden" + "Automatische Groß-/Kleinschreibung" + "Sätze mit Großbuchstaben beginnen" "Autom. Zeichensetzung" - - - - - - - - - + + "Keine" + "Standard" + "Erweitert" + + "0" + "1" + "2" @@ -76,28 +59,16 @@ "ýÿ" - - - - - - - - - - - - - - - - - - - - - - - - + "Zur Anzeige von Umlauten (ä, ö usw.) Taste gedrückt halten" + "Zum Schließen der Tastatur ↶ drücken" + "Auf Zahlen und Symbole zugreifen" + "Lange auf das Wort ganz links außen drücken, um es zum Wörterbuch hinzuzufügen" + "Los" + "Weiter" + "Fertig" + "Senden" + "?123" + "123" + "ABC" + "ALT" diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml index 5a824c662..74b488bda 100644 --- a/res/values-es/strings.xml +++ b/res/values-es/strings.xml @@ -15,52 +15,35 @@ --> - - - - + "Teclado de Android" + "Configuración del teclado de Android" "Vibrar al pulsar tecla" "Sonido al pulsar una tecla" - - - - - - - - - - - - - - - - - - - - - - - - - - - - + "Corregir errores de escritura" + "Habilitar la introducción de corrección de errores" + "Errores de introducción de datos en vista horizontal" + "Habilitar la introducción de corrección de errores" + "Sugerencias de palabras" + "Corregir automáticamente la palabra anterior" + "Sugerencias de palabras" + "Configuración de sugerencia de palabras" + "Habilitar Autocompletar al escribir" + "Autocompletar" + "Aumentar el tamaño del campo de texto" + "Ocultar sugerencias de palabras en la vista horizontal" + "Uso de mayúsculas automático" + "Escribir en mayúscula el principio de la frase" "Puntuación automática" - - - - - - - - - + + "Ninguno" + "Básico" + "Avanzado" + + "0" + "1" + "2" @@ -76,28 +59,16 @@ "ýÿ" - - - - - - - - - - - - - - - - - - - - - - - - + "Mantén pulsada una tecla para ver los caracteres acentuados (ø, ö, etc.)." + "Pulsa la tecla \"Atrás\" ↶ para cerrar el teclado en cualquier momento." + "Acceso a números y símbolos" + "Mantén pulsada la palabra situada más a la izquierda para añadirla al diccionario." + "Ir" + "Siguiente" + "Hecho" + "Enviar" + "?123" + "123" + "ABC" + "ALT" diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml index 4cf280b1c..07636e65c 100644 --- a/res/values-fr/strings.xml +++ b/res/values-fr/strings.xml @@ -15,52 +15,35 @@ --> - - - - + "Clavier Android" + "Paramètres du clavier Android" "Vibrer à chaque touche enfoncée" "Son à chaque touche enfoncée" - - - - - - - - - - - - - - - - - - - - - - - - - - - - + "Corriger les fautes de frappe" + "Activer la correction des erreurs de saisie" + "Erreurs de saisie en mode paysage" + "Activer la correction des erreurs de saisie" + "Saisie prédictive" + "Corriger automatiquement le mot précédent" + "Saisie prédictive" + "Paramètres de la saisie prédictive" + "Activer la saisie semi-automatique" + "Saisie semi-automatique" + "Agrandir le champ de texte" + "Masquer la saisie prédictive en mode paysage" + "Mise en majuscules automatique" + "Mettre en majuscule la première lettre de chaque phrase" "Ponctuation automatique" - - - - - - - - - + + "Aucun" + "Simple" + "Avancé" + + "0" + "1" + "2" @@ -76,28 +59,16 @@ "ýÿ" - - - - - - - - - - - - - - - - - - - - - - - - + "Maintenir une touche enfoncée pour afficher les accents (à, é, etc.)" + "Appuyez sur la touche Retour ↶ pour fermer le clavier à tout moment." + "Accéder aux chiffres et symboles" + "Appuyer et maintenir le doigt sur le mot le plus à gauche pour l\'ajouter au dictionnaire" + "OK" + "Suivant" + "Terminé" + "Envoyer" + "?123" + "123" + "ABC" + "ALT" diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml index 713d7af16..a465f1814 100644 --- a/res/values-it/strings.xml +++ b/res/values-it/strings.xml @@ -15,52 +15,35 @@ --> - - - - + "Tastiera Android" + "Impostazioni tastiera Android" "Vibra quando premi un tasto" "Suona quando premi un tasto" - - - - - - - - - - - - - - - - - - - - - - - - - - - - + "Correggi errori di digitazione" + "Attiva la correzione degli errori di inserimento" + "Errori di inserimento in visualizzazione orizzontale" + "Attiva la correzione degli errori di inserimento" + "Suggerimenti parola" + "Correggi automaticamente la parola precedente" + "Suggerimenti parola" + "Impostazioni suggerimento parole" + "Attiva il completamento automatico durante la digitazione" + "Completamento automatico" + "Aumenta dimensioni campo di testo" + "Nascondi i suggerimenti delle parole in visualizzazione orizzontale" + "Maiuscole automatiche" + "Rendi maiuscole le iniziali delle frasi" "Punteggiatura automatica" - - - - - - - - - + + "Nessuna" + "Base" + "Avanzate" + + "0" + "1" + "2" @@ -76,28 +59,16 @@ "ýÿ" - - - - - - - - - - - - - - - - - - - - - - - - + "Tieni premuto un tasto per vedere le lettere con segni diacritici (ø, ö etc.)" + "Premi il tasto Indietro ↶ per chiudere la tastiera in qualsiasi punto" + "Accedi a numeri e simboli" + "Tieni premuto sulla parola all\'estrema sinistra per aggiungerla al dizionario" + "Vai" + "Avanti" + "Fine" + "Invia" + "?123" + "123" + "ABC" + "ALT" diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml index bf7751a2b..3aabab2e7 100644 --- a/res/values-ko/strings.xml +++ b/res/values-ko/strings.xml @@ -15,52 +15,35 @@ --> - - - - + "Android 키보드" + "Android 키보드 설정" "키를 누를 때 진동 발생" "버튼을 누를 때 소리 발생" - - - - - - - - - - - - - - - - - - - - - - - - - - - - + "입력 오류 수정" + "입력 오류 수정 사용" + "가로 입력 오류" + "입력 오류 수정 사용" + "단어 추천" + "이전 단어를 자동으로 수정" + "단어 추천" + "단어 추천 설정" + "입력할 때 자동 완성 사용" + "자동 완성" + "입력란 크기 늘리기" + "가로 보기에서 단어 추천 숨기기" + "자동 대문자화" + "문장의 첫 글자를 대문자로 표시" "자동 구두점 입력" - - - - - - - - - + + "없음" + "기본" + "고급" + + "0" + "1" + "2" @@ -76,28 +59,16 @@ "ýÿ" - - - - - - - - - - - - - - - - - - - - - - - - + "키를 길게 누르면 악센트(ø, ö 등)가 표시됩니다." + "키보드를 닫으려면 언제든지 뒤로 키(↶)를 누르세요." + "숫자 및 기호 액세스" + "맨 왼쪽에 있는 단어를 길게 누르면 사전에 추가됩니다." + "이동" + "다음" + "완료" + "전송" + "?123" + "123" + "ABC" + "ALT" diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml index 5414e703e..a2b1ba3fe 100644 --- a/res/values-nb/strings.xml +++ b/res/values-nb/strings.xml @@ -15,43 +15,32 @@ --> - - - - + "Skjermtastatur" + "Innstillinger for skjermtastatur" "Vibrer ved tastetrykk" "Lyd ved tastetrykk" - - - - - - - - - - - "Autokorriger forrige ord ved mellomrom eller linjeskift" - - - - - - - - - - - - + "Rett opp skrivefeil" + "Slå på retting av skrivefeil" + "Rett opp skrivefeil i breddeformat" + "Slå på retting av skrivefeil" + "Autokorrektur" + "Autokorriger forrige ord" + "Ordforslag" + "Innstillinger for ordforslag" + "Skru på autofullføring under skriving" + "Autofullfør" + "Større tekstfelt" + "Skjul ordforslag i breddeformat" "Stor forbokstav" "Start automatisk setninger med stor bokstav" "Automatisk punktum" - - - + + "Ingen" + "Grunnleggende" + "Avansert" + @@ -73,18 +62,13 @@ "ýÿ" - - - - - - + "Hold en tast nede for å se aksenterte tegn (ø, ö, osv.)" + "Trykk tilbakeknappen, ↶, for å lukke tastaturet" + "Få tilgang til tall og symboler" "Trykk lenge på ordet lengst til venstre for å legge det til i ordlisten" "Gå" - - - - + "Neste" + "Utfør" "?123" diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml index a6ec5b3e2..4d60371b0 100644 --- a/res/values-nl/strings.xml +++ b/res/values-nl/strings.xml @@ -15,52 +15,35 @@ --> - - - - + "Android-toetsenbord" + "Instellingen voor Android-toetsenbord" "Trillen bij druk op een toets" "Geluid bij druk op een toets" - - - - - - - - - - - - - - - - - - - - - - - - - - - - + "Typefouten corrigeren" + "Foutcorrectie tijdens invoer inschakelen" + "Invoerfouten in liggende weergave" + "Foutcorrectie tijdens invoer inschakelen" + "Woordsuggesties" + "Het vorige woord automatisch corrigeren" + "Woordsuggesties" + "Instellingen voor woordsuggesties" + "Automatisch voltooien tijdens typen inschakelen" + "Automatisch voltooien" + "Tekstveld vergroten" + "Woordsuggesties verbergen in liggende weergave" + "Automatisch hoofdlettergebruik" + "Hoofdletter gebruiken aan het begin van een zin" "Automatische interpunctie" - - - - - - - - - + + "Geen" + "Basis" + "Geavanceerd" + + "0" + "1" + "2" @@ -76,28 +59,16 @@ "ýÿ" - - - - - - - - - - - - - - - - - - - - - - - - + "Houd een toets ingedrukt om diakritische tekens weer te geven (ø, ö, enzovoort)" + "Druk op elk gewenst moment op de toets Terug ↶ om het toetsenbord te sluiten" + "Toegang tot cijfers en symbolen" + "Blijf drukken op het meest linkse woord om het toe te voegen aan het woordenboek" + "Beginnen" + "Volgende" + "Gereed" + "Verzenden" + "?123" + "123" + "ABC" + "Alt" diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml index f9b4c92c3..3b6bd7078 100644 --- a/res/values-pl/strings.xml +++ b/res/values-pl/strings.xml @@ -15,52 +15,35 @@ --> - - - - + "Klawiatura Android" + "Ustawienia klawiatury Android" "Wibruj przy naciśnięciu klawisza" "Dźwięk przy naciśnięciu klawisza" - - - - - - - - - - - - - - - - - - - - - - - - - - - - + "Popraw błędy pisowni" + "Włącz poprawianie błędów wprowadzania" + "Błędy wprowadzania w orientacji poziomej" + "Włącz poprawianie błędów wprowadzania" + "Propozycje słów" + "Automatycznie poprawiaj poprzednie słowo" + "Propozycje słów" + "Ustawienia propozycji słów" + "Włącz autouzupełnianie podczas wpisywania" + "Autouzupełnianie" + "Zwiększ rozmiar pola tekstowego" + "Wyłącz propozycje słów w orientacji poziomej" + "Automatyczna zamiana na wielkie litery" + "Zamieniaj na wielką pierwszą literę zdania" "Automatyczna interpunkcja" - - - - - - - - - + + "Brak" + "Podstawowy" + "Zaawansowany" + + "0" + "1" + "2" @@ -76,28 +59,16 @@ "ýÿ" - - - - - - - - - - - - - - - - - - - - - - - - + "Przytrzymaj klawisz, aby wyświetlić znaki akcentowane (ø, ö itp.)" + "Naciśnij klawisz cofania ↶, aby zamknąć klawiaturę w dowolnym momencie" + "Przejdź do cyfr i symboli" + "Naciśnij i przytrzymaj słowo po lewej stronie w celu dodania go do słownika" + "Przejdź" + "Dalej" + "Gotowe" + "Wyślij" + "?123" + "123" + "ABC" + "ALT" diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml index 4b708aa88..80def1da6 100644 --- a/res/values-ru/strings.xml +++ b/res/values-ru/strings.xml @@ -15,52 +15,35 @@ --> - - - - + "Клавиатура Android" + "Настройки клавиатуры Android" "Вибрация при нажатии клавиш" "Звук при нажатии клавиш" - - - - - - - - - - - - - - - - - - - - - - - - - - - - + "Исправлять опечатки" + "Включить исправление ошибок при вводе" + "Ошибки при вводе в горизонтальной ориентации" + "Включить исправление ошибок при вводе" + "Предложение слов" + "Автоматически исправлять предыдущее слово" + "Предложение слов" + "Настройки предложения слов" + "Включить автоматическое завершение слов при вводе" + "Автоматическое завершение" + "Увеличить размер текстового поля" + "Скрывать предложение слов в горизонтальной ориентации" + "Автоматический перевод в верхний регистр" + "Делать заглавной первую букву предложения" "Автоматическая пунктуация" - - - - - - - - - + + "Нет" + "Основной" + "Расширенный" + + "0" + "1" + "2" @@ -76,28 +59,16 @@ "ýÿ" - - - - - - - - - - - - - - - - - - - - - - - - + "Удерживайте клавишу, чтобы увидеть варианты с диакритическими знаками (ø, ö и т.д.)" + "Нажмите клавишу \"Назад\" ↶, чтобы закрыть клавиатуру в любой момент" + "Открыть цифры и символы" + "Нажмите и удерживайте слово слева, чтобы добавить его в словарь" + "Перейти" + "Далее" + "Готово" + "Отправить" + "?123" + "123" + "АБВ" + "ALT" diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml index ae6e4a56b..fe034ce00 100644 --- a/res/values-zh-rCN/strings.xml +++ b/res/values-zh-rCN/strings.xml @@ -15,52 +15,35 @@ --> - - - - + "Android 键盘" + "Android 键盘设置" "按键时振动" "按键时发出声音" - - - - - - - - - - - - - - - - - - - - - - - - - - - - + "纠正键入错误" + "启用输入错误纠正" + "横向输入错误" + "启用输入错误纠正" + "字词建议" + "自动纠正之前的字词" + "字词建议" + "字词建议设置" + "键入时启用自动完成" + "自动完成" + "增加文本域的大小" + "在横向视图中隐藏字词建议" + "自动大写" + "句首字母大写" "自动加标点" - - - - - - - - - + + "无" + "基本模式" + "高级模式" + + "0" + "1" + "2" @@ -76,28 +59,16 @@ "ýÿ" - - - - - - - - - - - - - - - - - - - - - - - - + "按住某个键可以查看重音符号（ø、ö 等）" + "随时可以通过按后退键 ↶ 关闭键盘" + "访问数字和符号" + "按住最左侧的字词可以将其添加到字典中" + "开始" + "下一步" + "完成" + "发送" + "?123" + "123" + "ABC" + "ALT" diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml index 5ee0f7a46..b60637d48 100644 --- a/res/values-zh-rTW/strings.xml +++ b/res/values-zh-rTW/strings.xml @@ -15,52 +15,35 @@ --> - - - - + "Android 鍵盤" + "Android 鍵盤設定" "按下按鍵時震動" "按下按鍵時播放音效" - - - - - - - - - - - - - - - - - - - - - - - - - - - - + "修正輸入錯誤" + "啟用輸入錯誤修正功能" + "橫向輸入錯誤" + "啟用輸入錯誤修正功能" + "字詞建議" + "自動修正前一個字詞" + "字詞建議" + "字詞建議設定" + "輸入時啟用自動完成" + "自動完成" + "放大文字欄位大小" + "在橫向檢視模式中隱藏字詞建議" + "自動大寫" + "句首字母大寫" "自動標點" - - - - - - - - - + + "無" + "基本模式" + "進階模式" + + "0" + "1" + "2" @@ -76,28 +59,16 @@ "ýÿ" - - - - - - - - - - - - - - - - - - - - - - - - + "按住按鍵可查看重音符號 (ø、ö 等)" + "隨時可以透過按後退鍵 ↶ 關閉鍵盤" + "使用數字和符號" + "按住最左邊的字詞，將其新增到字典中" + "開始" + "下一步" + "完成" + "傳送" + "?123" + "123" + "ABC" + "ALT" From 18935a170c9fd17f7445dc8d95e676e9cd6bb016 Mon Sep 17 00:00:00 2001 From: Amith Yamasani <> Date: Wed, 25 Mar 2009 15:19:40 -0700 Subject: [PATCH 03/26] Automated import from //branches/cupcake/...@142634,142634 --- src/com/android/inputmethod/latin/LatinKeyboard.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/com/android/inputmethod/latin/LatinKeyboard.java b/src/com/android/inputmethod/latin/LatinKeyboard.java index 94b72b885..7720dfbe5 100644 --- a/src/com/android/inputmethod/latin/LatinKeyboard.java +++ b/src/com/android/inputmethod/latin/LatinKeyboard.java @@ -195,6 +195,10 @@ public class LatinKeyboard extends Keyboard { public LatinKey(Resources res, Keyboard.Row parent, int x, int y, XmlResourceParser parser) { super(res, parent, x, y, parser); + if (popupCharacters != null && popupCharacters.length() == 0) { + // If there is a keyboard with no keys specified in popupCharacters + popupResId = 0; + } } void enableShiftLock() { From 414744e728853f9c44943777c03d451048b4e5c7 Mon Sep 17 00:00:00 2001 From: Eric Fischer <> Date: Wed, 25 Mar 2009 15:22:44 -0700 Subject: [PATCH 04/26] Automated import from //branches/cupcake/...@142643,142643 --- res/values-ja/strings.xml | 101 ++++++++++++++------------------------ 1 file changed, 36 insertions(+), 65 deletions(-) diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml index a30a9589e..612fe8752 100644 --- a/res/values-ja/strings.xml +++ b/res/values-ja/strings.xml @@ -15,52 +15,35 @@ --> - - - - + "Androidキーボード" + "Androidキーボードの設定" "キーのバイブレーション" "キーを押したときの音" - - - - - - - - - - - - - - - - - - - - - - - - - - - - + "入力エラー修正" + "入力エラーを推測修正する" + "横表示での入力修正" + "入力間違いを自動修正する" + "入力候補表示" + "前の単語を自動修正する" + "入力候補表示" + "入力候補の設定" + "オートコンプリートを使用する" + "オートコンプリート" + "入力作業スペースを広げる" + "横表示では入力候補を表示しない" + "自動大文字変換" + "先頭文字を大文字に変換する" "句読点を自動入力" - - - - - - - - - + + "なし" + "基本" + "高度" + + "0" + "1" + "2" @@ -76,28 +59,16 @@ "ýÿ" - - - - - - - - - - - - - - - - - - - - - - - - + "キー長押しでアクセント文字を表示（ø、öなど）" + "戻るキーでキーボードを閉じます" + "数字と記号" + "一番左の語句を長押しすると辞書に追加されます" + "実行" + "次へ" + "完了" + "送信" + "?123" + "123" + "ABC" + "ALT" From 6a4fcadae3d2bf78f0eb4d0b3158c497a78c6543 Mon Sep 17 00:00:00 2001 From: Amith Yamasani <> Date: Wed, 25 Mar 2009 16:26:38 -0700 Subject: [PATCH 05/26] Automated import from //branches/cupcake/...@142786,142786 --- res/drawable/dialog_bubble_step02.9.png | Bin 100 -> 1036 bytes res/drawable/dialog_bubble_step03.9.png | Bin 1692 -> 0 bytes res/drawable/dialog_bubble_step04.9.png | Bin 1957 -> 0 bytes res/drawable/dialog_bubble_step07.9.png | Bin 0 -> 4646 bytes res/layout/bubble_text.xml | 2 + res/values/strings.xml | 43 ++++- res/xml/prefs.xml | 48 +++--- .../android/inputmethod/latin/LatinIME.java | 160 ++++++++---------- .../inputmethod/latin/LatinIMESettings.java | 58 ++----- .../android/inputmethod/latin/Tutorial.java | 158 +++++++++-------- 10 files changed, 241 insertions(+), 228 deletions(-) delete mode 100755 res/drawable/dialog_bubble_step03.9.png delete mode 100755 res/drawable/dialog_bubble_step04.9.png create mode 100755 res/drawable/dialog_bubble_step07.9.png diff --git a/res/drawable/dialog_bubble_step02.9.png b/res/drawable/dialog_bubble_step02.9.png index 62386f2975631501e6836d8c16484a3341895d44..d77f85fe28e807d099c5bef39e8eb50c8aed60bb 100755 GIT binary patch literal 1036 zcmV+n1oQieP)w3|#000BiNkl2Z|b2sHNiA*(cRs(xqR*)_ZF~wFKz4M>4#%~)=Fn*%^sSX zQ0lp26mS7;nV9Hypy-RInpL#fgn(Y?3Ep<>LA{L15SVNO5H~+RFouGL?jx++xmyU0 zJq5Hj21lWXnR2t?OzjCoaA}_xEEJG-g5Q)?)QW*k&ZcRWEFTV98T_}Lsrp#l${1+EnqEbxE{UGlNM#1+RKmZH4uoW#91y^ zT`jEWdA&yisCBs<_#&J|o;&=#2FhNDY31(3X+d#u@$nPG!_CgAsopWI&9N3WsHFg@ zIhNGG4g6?{`>}VCO~UuUgBN=0000_9BV!3HF&rQD_gDQ!;|$B>F!$q5du|0ORpF6w$z zUt%Mn`k#Nwlm7>wEf7@jbTM-Dy6}IZuo=TK{=LremnP`~wJ~_Q`njxgN@xNA1Z5tt diff --git a/res/drawable/dialog_bubble_step03.9.png b/res/drawable/dialog_bubble_step03.9.png deleted file mode 100755 index 16b4d0226d126ed137cc5234d905afeea9e23f15..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1692 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 literal 0 HcmV?d00001 diff --git a/res/layout/bubble_text.xml b/res/layout/bubble_text.xml index eae3ab6fe..c3957b65e 100644 --- a/res/layout/bubble_text.xml +++ b/res/layout/bubble_text.xml @@ -25,4 +25,6 @@ android:textColor="?android:attr/textColorPrimary" android:minWidth="32dip" android:gravity="center" + android:shadowRadius="2.75" + android:shadowColor="#BB000000" /> diff --git a/res/values/strings.xml b/res/values/strings.xml index 41809c15b..25d990e81 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -70,6 +70,21 @@ + + Quick fixes + + Corrects commonly typed mistakes + + + Show suggestions + + Display suggested words while typing + + + Auto-complete + + Spacebar and punctuation automatically insert highlighted word + None @@ -122,7 +137,33 @@ Press and hold the left-most word to add it to the dictionary - + + + Touch this hint to continue » + + + Touch here to close this hint and start typing! + + + The keyboard opens any time you touch a text field + + + Touch & hold a key to view accents\n(ø, ö, ô, ó, and so on) + + + + Switch to numbers and symbols by touching this key + + + Go back to letters by touching this key again + + + Touch & hold this key to change keyboard settings, like auto complete + + + Try it! + + Go diff --git a/res/xml/prefs.xml b/res/xml/prefs.xml index 037d5ff77..865269907 100644 --- a/res/xml/prefs.xml +++ b/res/xml/prefs.xml @@ -37,44 +37,34 @@ android:defaultValue="true" /> - - - - - + + + - \ No newline at end of file + diff --git a/src/com/android/inputmethod/latin/LatinIME.java b/src/com/android/inputmethod/latin/LatinIME.java index e5ad75bca..a36ff5747 100644 --- a/src/com/android/inputmethod/latin/LatinIME.java +++ b/src/com/android/inputmethod/latin/LatinIME.java @@ -23,7 +23,6 @@ import android.content.DialogInterface; import android.content.Intent; import android.content.IntentFilter; import android.content.SharedPreferences; -import android.content.SharedPreferences.Editor; import android.content.res.Configuration; import android.inputmethodservice.InputMethodService; import android.inputmethodservice.Keyboard; @@ -35,6 +34,7 @@ import android.os.Message; import android.os.SystemClock; import android.os.Vibrator; import android.preference.PreferenceManager; +import android.text.AutoText; import android.text.ClipboardManager; import android.text.TextUtils; import android.util.Log; @@ -64,14 +64,13 @@ public class LatinIME extends InputMethodService private static final String PREF_VIBRATE_ON = "vibrate_on"; private static final String PREF_SOUND_ON = "sound_on"; - private static final String PREF_PROXIMITY_CORRECTION = "hit_correction"; - private static final String PREF_PREDICTION = "prediction_mode"; - private static final String PREF_PREDICTION_LANDSCAPE = "prediction_landscape"; private static final String PREF_AUTO_CAP = "auto_cap"; - static final String PREF_TUTORIAL_RUN = "tutorial_run"; + private static final String PREF_QUICK_FIXES = "quick_fixes"; + private static final String PREF_SHOW_SUGGESTIONS = "show_suggestions"; + private static final String PREF_AUTO_COMPLETE = "auto_complete"; private static final int MSG_UPDATE_SUGGESTIONS = 0; - private static final int MSG_CHECK_TUTORIAL = 1; + private static final int MSG_START_TUTORIAL = 1; // How many continuous deletes at which to start deleting at a higher speed. private static final int DELETE_ACCELERATE_AT = 20; @@ -93,7 +92,7 @@ public class LatinIME extends InputMethodService private AlertDialog mOptionsDialog; - private KeyboardSwitcher mKeyboardSwitcher; + KeyboardSwitcher mKeyboardSwitcher; private UserDictionary mUserDictionary; @@ -106,20 +105,17 @@ public class LatinIME extends InputMethodService private CharSequence mBestWord; private boolean mPredictionOn; private boolean mCompletionOn; - private boolean mPasswordMode; private boolean mAutoSpace; private boolean mAutoCorrectOn; private boolean mCapsLock; - private long mLastShiftTime; private boolean mVibrateOn; private boolean mSoundOn; - private boolean mProximityCorrection; - private int mCorrectionMode; private boolean mAutoCap; - private boolean mAutoPunctuate; - private boolean mTutorialShownBefore; + private boolean mQuickFixes; + private boolean mShowSuggestions; + private boolean mAutoComplete; + private int mCorrectionMode; // Indicates whether the suggestion strip is to be on in landscape - private boolean mShowSuggestInLand; private boolean mJustAccepted; private CharSequence mJustRevertedSeparator; private int mDeleteCount; @@ -144,10 +140,15 @@ public class LatinIME extends InputMethodService case MSG_UPDATE_SUGGESTIONS: updateSuggestions(); break; - case MSG_CHECK_TUTORIAL: - if (!mTutorialShownBefore) { - mTutorial = new Tutorial(mInputView); - mTutorial.start(); + case MSG_START_TUTORIAL: + if (mTutorial == null) { + if (mInputView.isShown()) { + mTutorial = new Tutorial(LatinIME.this, mInputView); + mTutorial.start(); + } else { + // Try again soon if the view is not yet showing + sendMessageDelayed(obtainMessage(MSG_START_TUTORIAL), 100); + } } break; } @@ -188,10 +189,6 @@ public class LatinIME extends InputMethodService if (!TextUtils.equals(conf.locale.toString(), mLocale)) { initSuggest(conf.locale.toString()); } - if (!mTutorialShownBefore && mTutorial != null) { - mTutorial.close(false); - mTutorial = null; - } super.onConfigurationChanged(conf); } @@ -253,10 +250,7 @@ public class LatinIME extends InputMethodService int variation = attribute.inputType & EditorInfo.TYPE_MASK_VARIATION; if (variation == EditorInfo.TYPE_TEXT_VARIATION_PASSWORD || variation == EditorInfo.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD ) { - mPasswordMode = true; mPredictionOn = false; - } else { - mPasswordMode = false; } if (variation == EditorInfo.TYPE_TEXT_VARIATION_EMAIL_ADDRESS || variation == EditorInfo.TYPE_TEXT_VARIATION_PERSON_NAME) { @@ -296,28 +290,15 @@ public class LatinIME extends InputMethodService setCandidatesViewShown(false); if (mCandidateView != null) mCandidateView.setSuggestions(null, false, false, false); loadSettings(); - mInputView.setProximityCorrectionEnabled(mProximityCorrection); + mInputView.setProximityCorrectionEnabled(true); if (mSuggest != null) { mSuggest.setCorrectionMode(mCorrectionMode); } mPredictionOn = mPredictionOn && mCorrectionMode > 0; - if (!mTutorialShownBefore && mTutorial == null) { - mHandler.sendEmptyMessageDelayed(MSG_CHECK_TUTORIAL, - mInputView.isShown() ? 100 : 3000); - } + checkTutorial(attribute.privateImeOptions); if (TRACE) Debug.startMethodTracing("latinime"); } - @Override - public void onWindowShown() { - super.onWindowShown(); - // Bring the tutorial up faster, if window just shown - if (!mTutorialShownBefore && mTutorial == null) { - mHandler.removeMessages(MSG_CHECK_TUTORIAL); - mHandler.sendEmptyMessageDelayed(MSG_CHECK_TUTORIAL, 1000); - } - } - @Override public void onFinishInput() { super.onFinishInput(); @@ -325,10 +306,6 @@ public class LatinIME extends InputMethodService if (mInputView != null) { mInputView.closing(); } -// if (!mTutorialShownBefore && mTutorial != null) { -// mTutorial.close(false); -// mTutorial = null; -// } } @Override @@ -359,8 +336,12 @@ public class LatinIME extends InputMethodService @Override public void hideWindow() { if (TRACE) Debug.stopMethodTracing(); - if (!mTutorialShownBefore && mTutorial != null) { - mTutorial.close(false); + if (mOptionsDialog != null && mOptionsDialog.isShowing()) { + mOptionsDialog.dismiss(); + mOptionsDialog = null; + } + if (mTutorial != null) { + mTutorial.close(); mTutorial = null; } super.hideWindow(); @@ -417,11 +398,21 @@ public class LatinIME extends InputMethodService if (event.getRepeatCount() == 0 && mInputView != null) { if (mInputView.handleBack()) { return true; - } else if (!mTutorialShownBefore && mTutorial != null) { - mTutorial.close(true); + } else if (mTutorial != null) { + mTutorial.close(); + mTutorial = null; } } break; + case KeyEvent.KEYCODE_DPAD_DOWN: + case KeyEvent.KEYCODE_DPAD_UP: + case KeyEvent.KEYCODE_DPAD_LEFT: + case KeyEvent.KEYCODE_DPAD_RIGHT: + // If tutorial is visible, don't allow dpad to work + if (mTutorial != null) { + return true; + } + break; } return super.onKeyDown(keyCode, event); } @@ -433,6 +424,10 @@ public class LatinIME extends InputMethodService case KeyEvent.KEYCODE_DPAD_UP: case KeyEvent.KEYCODE_DPAD_LEFT: case KeyEvent.KEYCODE_DPAD_RIGHT: + // If tutorial is visible, don't allow dpad to work + if (mTutorial != null) { + return true; + } // Enable shift key and DPAD to do selections if (mInputView != null && mInputView.isShown() && mInputView.isShifted()) { event = new KeyEvent(event.getDownTime(), event.getEventTime(), @@ -596,9 +591,7 @@ public class LatinIME extends InputMethodService ic.deleteSurroundingText(1, 0); } } else { - //getCurrentInputConnection().deleteSurroundingText(1, 0); deleteChar = true; - //sendDownUpKeyEvents(KeyEvent.KEYCODE_DEL); } updateShiftKeyState(getCurrentInputEditorInfo()); TextEntryState.backspace(); @@ -697,9 +690,6 @@ public class LatinIME extends InputMethodService private void handleClose() { commitTyped(getCurrentInputConnection()); - if (!mTutorialShownBefore && mTutorial != null) { - mTutorial.close(true); - } requestHideSelf(0); mInputView.closing(); TextEntryState.endSession(); @@ -730,11 +720,7 @@ public class LatinIME extends InputMethodService } private boolean isCandidateStripVisible() { - boolean visible = isPredictionOn() && - (!isFullscreenMode() || - mCorrectionMode == Suggest.CORRECTION_FULL || - mShowSuggestInLand); - return visible; + return isPredictionOn() && mShowSuggestions; } private void updateSuggestions() { @@ -901,14 +887,6 @@ public class LatinIME extends InputMethodService mInputView.startPlaying(text.toString()); } } -// if (mAutoCorrectOn) { -// commitTyped(getCurrentInputConnection()); -// } else if (mPredicting) { -// pickDefaultSuggestion(); -// } -// if (mAutoSpace) { -// sendSpace(); -// } } public void swipeLeft() { @@ -987,6 +965,27 @@ public class LatinIME extends InputMethodService mVibrator.vibrate(mVibrateDuration); } + private void checkTutorial(String privateImeOptions) { + if (privateImeOptions == null) return; + if (privateImeOptions.equals("com.android.setupwizard:ShowTutorial")) { + if (mTutorial == null) startTutorial(); + } else if (privateImeOptions.equals("com.android.setupwizard:HideTutorial")) { + if (mTutorial != null) { + if (mTutorial.close()) { + mTutorial = null; + } + } + } + } + + private void startTutorial() { + mHandler.sendMessageDelayed(mHandler.obtainMessage(MSG_START_TUTORIAL), 500); + } + + void tutorialDone() { + mTutorial = null; + } + private void launchSettings() { handleClose(); Intent intent = new Intent(); @@ -998,24 +997,17 @@ public class LatinIME extends InputMethodService private void loadSettings() { // Get the settings preferences SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(this); - mProximityCorrection = sp.getBoolean(PREF_PROXIMITY_CORRECTION, true); mVibrateOn = sp.getBoolean(PREF_VIBRATE_ON, false); mSoundOn = sp.getBoolean(PREF_SOUND_ON, false); - String predictionBasic = getString(R.string.prediction_basic); - String mode = sp.getString(PREF_PREDICTION, predictionBasic); - if (mode.equals(getString(R.string.prediction_full))) { - mCorrectionMode = 2; - } else if (mode.equals(predictionBasic)) { - mCorrectionMode = 1; - } else { - mCorrectionMode = 0; - } - mAutoCorrectOn = mSuggest != null && mCorrectionMode > 0; - mAutoCap = sp.getBoolean(PREF_AUTO_CAP, true); - //mAutoPunctuate = sp.getBoolean(PREF_AUTO_PUNCTUATE, mCorrectionMode > 0); - mShowSuggestInLand = !sp.getBoolean(PREF_PREDICTION_LANDSCAPE, false); - mTutorialShownBefore = sp.getBoolean(PREF_TUTORIAL_RUN, false); + mQuickFixes = sp.getBoolean(PREF_QUICK_FIXES, true); + // If there is no auto text data, then quickfix is forced to "on", so that the other options + // will continue to work + if (AutoText.getSize(mInputView) < 1) mQuickFixes = true; + mShowSuggestions = sp.getBoolean(PREF_SHOW_SUGGESTIONS, true) & mQuickFixes; + mAutoComplete = sp.getBoolean(PREF_AUTO_COMPLETE, true) & mShowSuggestions; + mAutoCorrectOn = mSuggest != null && (mAutoComplete || mQuickFixes); + mCorrectionMode = mAutoComplete ? 2 : (mQuickFixes ? 1 : 0); } private void showOptionsMenu() { @@ -1079,11 +1071,7 @@ public class LatinIME extends InputMethodService p.println(" mSoundOn=" + mSoundOn); p.println(" mVibrateOn=" + mVibrateOn); } - - - private static final int[] KEY_SPACE = { KEYCODE_SPACE }; - - + // Characters per second measurement private static final boolean PERF_DEBUG = false; diff --git a/src/com/android/inputmethod/latin/LatinIMESettings.java b/src/com/android/inputmethod/latin/LatinIMESettings.java index 2c23263ea..e87c4a5a1 100644 --- a/src/com/android/inputmethod/latin/LatinIMESettings.java +++ b/src/com/android/inputmethod/latin/LatinIMESettings.java @@ -16,60 +16,38 @@ package com.android.inputmethod.latin; -import android.content.SharedPreferences; -import android.content.SharedPreferences.OnSharedPreferenceChangeListener; import android.os.Bundle; -import android.preference.ListPreference; -import android.preference.Preference; +import android.preference.CheckBoxPreference; import android.preference.PreferenceActivity; import android.preference.PreferenceGroup; +import android.text.AutoText; -public class LatinIMESettings extends PreferenceActivity - implements OnSharedPreferenceChangeListener{ +public class LatinIMESettings extends PreferenceActivity { - private static final String CORRECTION_MODE_KEY = "prediction_mode"; + private static final String QUICK_FIXES_KEY = "quick_fixes"; + private static final String SHOW_SUGGESTIONS_KEY = "show_suggestions"; private static final String PREDICTION_SETTINGS_KEY = "prediction_settings"; - private static final String PREDICTION_LANDSCAPE_KEY = "prediction_landscape"; - private ListPreference mCorrectionMode; - private PreferenceGroup mPredictionSettings; - private Preference mPredictionLandscape; + private CheckBoxPreference mQuickFixes; + private CheckBoxPreference mShowSuggestions; @Override protected void onCreate(Bundle icicle) { super.onCreate(icicle); addPreferencesFromResource(R.xml.prefs); - mCorrectionMode = (ListPreference) findPreference(CORRECTION_MODE_KEY); - mPredictionSettings = (PreferenceGroup) findPreference(PREDICTION_SETTINGS_KEY); - mPredictionLandscape = findPreference(PREDICTION_LANDSCAPE_KEY); - updatePredictionSettings(); - getPreferenceScreen().getSharedPreferences().registerOnSharedPreferenceChangeListener(this); - } - - @Override - protected void onDestroy() { - getPreferenceScreen().getSharedPreferences() - .unregisterOnSharedPreferenceChangeListener(this); - super.onDestroy(); - } - - private void updatePredictionSettings() { - if (mCorrectionMode != null && mPredictionSettings != null) { - String correctionMode = mCorrectionMode.getValue(); - if (correctionMode.equals(getResources().getString(R.string.prediction_none))) { - mPredictionSettings.setEnabled(false); - } else { - mPredictionSettings.setEnabled(true); - boolean suggestionsInLandscape = - !correctionMode.equals(getResources().getString(R.string.prediction_full)); - mPredictionLandscape.setEnabled(suggestionsInLandscape); - } - } + mQuickFixes = (CheckBoxPreference) findPreference(QUICK_FIXES_KEY); + mShowSuggestions = (CheckBoxPreference) findPreference(SHOW_SUGGESTIONS_KEY); } - public void onSharedPreferenceChanged(SharedPreferences preferences, String key) { - if (key.equals(CORRECTION_MODE_KEY)) { - updatePredictionSettings(); + @Override + protected void onResume() { + super.onResume(); + int autoTextSize = AutoText.getSize(getListView()); + if (autoTextSize < 1) { + ((PreferenceGroup) findPreference(PREDICTION_SETTINGS_KEY)) + .removePreference(mQuickFixes); + } else { + mShowSuggestions.setDependency(QUICK_FIXES_KEY); } } } diff --git a/src/com/android/inputmethod/latin/Tutorial.java b/src/com/android/inputmethod/latin/Tutorial.java index d944d17bf..750de054b 100644 --- a/src/com/android/inputmethod/latin/Tutorial.java +++ b/src/com/android/inputmethod/latin/Tutorial.java @@ -17,38 +17,38 @@ package com.android.inputmethod.latin; import android.content.Context; -import android.content.SharedPreferences; -import android.content.SharedPreferences.Editor; +import android.graphics.Rect; import android.graphics.drawable.Drawable; -import android.opengl.Visibility; import android.os.Handler; import android.os.Message; -import android.os.SystemClock; -import android.preference.PreferenceManager; import android.text.Layout; +import android.text.SpannableStringBuilder; import android.text.StaticLayout; import android.view.Gravity; import android.view.LayoutInflater; import android.view.MotionEvent; import android.view.View; +import android.view.View.OnTouchListener; import android.widget.PopupWindow; import android.widget.TextView; import java.util.ArrayList; import java.util.List; -public class Tutorial { +public class Tutorial implements OnTouchListener { private List mBubbles = new ArrayList(); private long mStartTime; private static final long MINIMUM_TIME = 6000; private static final long MAXIMUM_TIME = 20000; private View mInputView; + private LatinIME mIme; private int[] mLocation = new int[2]; private int mBubblePointerOffset; private static final int MSG_SHOW_BUBBLE = 0; - private static final int MSG_HIDE_ALL = 1; + + private int mBubbleIndex; Handler mHandler = new Handler() { @Override @@ -58,8 +58,6 @@ public class Tutorial { Bubble bubba = (Bubble) msg.obj; bubba.show(mLocation[0], mLocation[1]); break; - case MSG_HIDE_ALL: - close(true); } } }; @@ -70,7 +68,7 @@ public class Tutorial { int y; int width; int gravity; - String text; + CharSequence text; boolean dismissOnTouch; boolean dismissOnClose; PopupWindow window; @@ -78,16 +76,18 @@ public class Tutorial { View inputView; Bubble(Context context, View inputView, - int backgroundResource, int bx, int by, int bw, int gravity, int textResource, - boolean dismissOnTouch, boolean dismissOnClose) { + int backgroundResource, int bx, int by, int textResource1, int textResource2) { bubbleBackground = context.getResources().getDrawable(backgroundResource); - x = bx; + x = bx; y = by; - width = bw; - this.gravity = gravity; - text = context.getResources().getString(textResource); - this.dismissOnTouch = dismissOnTouch; - this.dismissOnClose = dismissOnClose; + width = (int) (inputView.getWidth() * 0.9); + this.gravity = Gravity.TOP | Gravity.LEFT; + text = new SpannableStringBuilder() + .append(context.getResources().getText(textResource1)) + .append("\n") + .append(context.getResources().getText(textResource2)); + this.dismissOnTouch = true; + this.dismissOnClose = false; this.inputView = inputView; window = new PopupWindow(context); window.setBackgroundDrawable(null); @@ -97,19 +97,20 @@ public class Tutorial { textView = (TextView) inflate.inflate(R.layout.bubble_text, null); textView.setBackgroundDrawable(bubbleBackground); textView.setText(text); + //textView.setText(textResource1); window.setContentView(textView); window.setFocusable(false); window.setTouchable(true); window.setOutsideTouchable(false); textView.setOnTouchListener(new View.OnTouchListener() { public boolean onTouch(View view, MotionEvent me) { - Tutorial.this.touched(); + Tutorial.this.next(); return true; } }); } - private void chooseSize(PopupWindow pop, View parentView, CharSequence text, TextView tv) { + private int chooseSize(PopupWindow pop, View parentView, CharSequence text, TextView tv) { int wid = tv.getPaddingLeft() + tv.getPaddingRight(); int ht = tv.getPaddingTop() + tv.getPaddingBottom(); @@ -131,10 +132,12 @@ public class Tutorial { */ pop.setWidth(width); pop.setHeight(ht + l.getHeight()); + return l.getHeight(); } void show(int offx, int offy) { - chooseSize(window, inputView, text, textView); + int textHeight = chooseSize(window, inputView, text, textView); + offy -= textView.getPaddingTop() + textHeight; if (inputView.getVisibility() == View.VISIBLE && inputView.getWindowVisibility() == View.VISIBLE) { try { @@ -155,72 +158,83 @@ public class Tutorial { } } - public Tutorial(LatinKeyboardView inputView) { + public Tutorial(LatinIME ime, LatinKeyboardView inputView) { Context context = inputView.getContext(); - int inputHeight = inputView.getHeight(); + mIme = ime; int inputWidth = inputView.getWidth(); + final int x = inputWidth / 20; // Half of 1/10th mBubblePointerOffset = inputView.getContext().getResources() .getDimensionPixelOffset(R.dimen.bubble_pointer_offset); - Bubble b0 = new Bubble(context, inputView, - R.drawable.dialog_bubble_step02, 0, 0, - inputWidth, - Gravity.BOTTOM | Gravity.LEFT, - R.string.tip_dismiss, - false, true); - mBubbles.add(b0); -// Bubble b1 = new Bubble(context, inputView, -// R.drawable.dialog_bubble_step03, -// (int) (inputWidth * 0.85) + mBubblePointerOffset, inputHeight / 5, -// (int) (inputWidth * 0.45), -// Gravity.TOP | Gravity.RIGHT, -// R.string.tip_long_press, -// true, false); -// mBubbles.add(b1); -// Bubble b2 = new Bubble(inputView.getContext(), inputView, -// R.drawable.dialog_bubble_step04, -// inputWidth / 10 - mBubblePointerOffset, inputHeight - inputHeight / 5, -// (int) (inputWidth * 0.45), -// Gravity.BOTTOM | Gravity.LEFT, -// R.string.tip_access_symbols, -// true, false); -// mBubbles.add(b2); + Bubble bWelcome = new Bubble(context, inputView, + R.drawable.dialog_bubble_step02, x, 0, + R.string.tip_to_open_keyboard, R.string.touch_to_continue); + mBubbles.add(bWelcome); + Bubble bAccents = new Bubble(context, inputView, + R.drawable.dialog_bubble_step02, x, 0, + R.string.tip_to_view_accents, R.string.touch_to_continue); + mBubbles.add(bAccents); + Bubble b123 = new Bubble(context, inputView, + R.drawable.dialog_bubble_step07, x, 0, + R.string.tip_to_open_symbols, R.string.touch_to_continue); + mBubbles.add(b123); + Bubble bABC = new Bubble(context, inputView, + R.drawable.dialog_bubble_step07, x, 0, + R.string.tip_to_close_symbols, R.string.touch_to_continue); + mBubbles.add(bABC); + Bubble bSettings = new Bubble(context, inputView, + R.drawable.dialog_bubble_step07, x, 0, + R.string.tip_to_launch_settings, R.string.touch_to_continue); + mBubbles.add(bSettings); + Bubble bDone = new Bubble(context, inputView, + R.drawable.dialog_bubble_step02, x, 0, + R.string.tip_to_start_typing, R.string.touch_to_finish); + mBubbles.add(bDone); mInputView = inputView; } void start() { mInputView.getLocationInWindow(mLocation); - long delayMillis = 0; - for (int i = 0; i < mBubbles.size(); i++) { - mHandler.sendMessageDelayed(mHandler.obtainMessage(MSG_SHOW_BUBBLE, mBubbles.get(i)), delayMillis); - delayMillis += 2000; + mBubbleIndex = -1; + mInputView.setOnTouchListener(this); + next(); + } + + boolean next() { + if (mBubbleIndex >= 0) { + mBubbles.get(mBubbleIndex).hide(); } - //mHandler.sendEmptyMessageDelayed(MSG_HIDE_ALL, MAXIMUM_TIME); - mStartTime = SystemClock.uptimeMillis(); + mBubbleIndex++; + if (mBubbleIndex >= mBubbles.size()) { + mInputView.setOnTouchListener(null); + mIme.sendDownUpKeyEvents(-1); // Inform the setupwizard that tutorial is in last bubble + mIme.tutorialDone(); + return false; + } + if (mBubbleIndex == 3 || mBubbleIndex == 4) { + mIme.mKeyboardSwitcher.toggleSymbols(); + } + mHandler.sendMessageDelayed( + mHandler.obtainMessage(MSG_SHOW_BUBBLE, mBubbles.get(mBubbleIndex)), 200); + return true; } - void touched() { - if (SystemClock.uptimeMillis() - mStartTime < MINIMUM_TIME) { - return; - } - for (int i = 0; i < mBubbles.size(); i++) { - Bubble bubba = mBubbles.get(i); - if (bubba.dismissOnTouch) { - bubba.hide(); - } - } - } - - void close(boolean completed) { - mHandler.removeMessages(MSG_SHOW_BUBBLE); + void hide() { for (int i = 0; i < mBubbles.size(); i++) { mBubbles.get(i).hide(); } - if (completed) { - SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences( - mInputView.getContext()); - Editor editor = sp.edit(); - editor.putBoolean(LatinIME.PREF_TUTORIAL_RUN, true); - editor.commit(); + mInputView.setOnTouchListener(null); + } + + boolean close() { + mHandler.removeMessages(MSG_SHOW_BUBBLE); + hide(); + return true; + } + + public boolean onTouch(View v, MotionEvent event) { + if (event.getAction() == MotionEvent.ACTION_UP) { + next(); } + return true; } } From e1d8c2e67a9bf8817fefe4cc2c5a68e29c69ad8e Mon Sep 17 00:00:00 2001 From: Amith Yamasani <> Date: Wed, 25 Mar 2009 18:04:14 -0700 Subject: [PATCH 06/26] Automated import from //branches/cupcake/...@142821,142821 --- .../android/inputmethod/latin/Tutorial.java | 31 +++++++++++++------ 1 file changed, 21 insertions(+), 10 deletions(-) diff --git a/src/com/android/inputmethod/latin/Tutorial.java b/src/com/android/inputmethod/latin/Tutorial.java index 750de054b..03d4858c4 100644 --- a/src/com/android/inputmethod/latin/Tutorial.java +++ b/src/com/android/inputmethod/latin/Tutorial.java @@ -102,12 +102,6 @@ public class Tutorial implements OnTouchListener { window.setFocusable(false); window.setTouchable(true); window.setOutsideTouchable(false); - textView.setOnTouchListener(new View.OnTouchListener() { - public boolean onTouch(View view, MotionEvent me) { - Tutorial.this.next(); - return true; - } - }); } private int chooseSize(PopupWindow pop, View parentView, CharSequence text, TextView tv) { @@ -143,6 +137,12 @@ public class Tutorial implements OnTouchListener { try { if ((gravity & Gravity.BOTTOM) == Gravity.BOTTOM) offy -= window.getHeight(); if ((gravity & Gravity.RIGHT) == Gravity.RIGHT) offx -= window.getWidth(); + textView.setOnTouchListener(new View.OnTouchListener() { + public boolean onTouch(View view, MotionEvent me) { + Tutorial.this.next(); + return true; + } + }); window.showAtLocation(inputView, Gravity.NO_GRAVITY, x + offx, y + offy); } catch (Exception e) { // Input view is not valid @@ -151,11 +151,15 @@ public class Tutorial implements OnTouchListener { } void hide() { - textView.setOnTouchListener(null); if (window.isShowing()) { + textView.setOnTouchListener(null); window.dismiss(); } } + + boolean isShowing() { + return window.isShowing(); + } } public Tutorial(LatinIME ime, LatinKeyboardView inputView) { @@ -201,7 +205,14 @@ public class Tutorial implements OnTouchListener { boolean next() { if (mBubbleIndex >= 0) { - mBubbles.get(mBubbleIndex).hide(); + // If the bubble is not yet showing, don't move to the next. + if (!mBubbles.get(mBubbleIndex).isShowing()) { + return true; + } + // Hide all previous bubbles as well, as they may have had a delayed show + for (int i = 0; i <= mBubbleIndex; i++) { + mBubbles.get(i).hide(); + } } mBubbleIndex++; if (mBubbleIndex >= mBubbles.size()) { @@ -214,7 +225,7 @@ public class Tutorial implements OnTouchListener { mIme.mKeyboardSwitcher.toggleSymbols(); } mHandler.sendMessageDelayed( - mHandler.obtainMessage(MSG_SHOW_BUBBLE, mBubbles.get(mBubbleIndex)), 200); + mHandler.obtainMessage(MSG_SHOW_BUBBLE, mBubbles.get(mBubbleIndex)), 500); return true; } @@ -232,7 +243,7 @@ public class Tutorial implements OnTouchListener { } public boolean onTouch(View v, MotionEvent event) { - if (event.getAction() == MotionEvent.ACTION_UP) { + if (event.getAction() == MotionEvent.ACTION_DOWN) { next(); } return true; From 02e387516e7357488716cd17a19793586f25ac82 Mon Sep 17 00:00:00 2001 From: Dianne Hackborn <> Date: Thu, 26 Mar 2009 16:28:26 -0700 Subject: [PATCH 07/26] Automated import from //branches/cupcake/...@143009,143009 --- res/drawable/sym_keyboard_feedback_numpound.png | Bin 478 -> 0 bytes res/drawable/sym_keyboard_feedback_numstar.png | Bin 464 -> 0 bytes 2 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 res/drawable/sym_keyboard_feedback_numpound.png delete mode 100644 res/drawable/sym_keyboard_feedback_numstar.png diff --git a/res/drawable/sym_keyboard_feedback_numpound.png b/res/drawable/sym_keyboard_feedback_numpound.png deleted file mode 100644 index 6b6561e806ffab06d2ad8082c9e68d6c57899394..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 478 zcmV<40U`d0P)FDb znD%uYk-(<>0x~7{*EA0tQRmM_75m5t$ zx*_bVfoFR8WNO654$mco_r!p2z^CvT+Gi7WOzXoTzU}MchXSsD>suqC5xEA;u;M1& diff --git a/res/drawable/sym_keyboard_feedback_numstar.png b/res/drawable/sym_keyboard_feedback_numstar.png deleted file mode 100644 index 05f7b4fc99bbf7a7b6b76718b40e0c89a24edd83..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 464 zcmV;>0WbcEP)$Y)l{a96*0^Vpw|^MmsRNh+*s*kpA5tCI?6ZCtC~; z5q(3zPg!mRjJModace|+BgZ})1RPwDgK0(QNPrI|Ks3Df;^Y|6!B5z8ZHqtxf%_JO zTi>#S1Y)2=0gZ2~728b!G34YL)tP8kWdi{iiye~y)hRX=o>>KDxq&RA>+0mpv~hF3 zZ^05zPF7kv?7NNu;_e&iu2e25_CCoPoGCr2A?7O}q@PTXL8n+B%3b1{wSGhTOjjDj zuC@5UsGy601O^@xiJhSo$QW}HfNisa1m;%F9H7|aK*~U58TzwyKuQ^gv@odiOz|iq zCT?1yG`HNRQIcO*ZcOk-AGvj3`t=`L1*sqv Date: Thu, 26 Mar 2009 16:45:45 -0700 Subject: [PATCH 08/26] Automated import from //branches/cupcake/...@143012,143012 --- res/values-ja/strings.xml | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml index 612fe8752..099b3dbc6 100644 --- a/res/values-ja/strings.xml +++ b/res/values-ja/strings.xml @@ -36,6 +36,18 @@ "句読点を自動入力" + + + + + + + + + + + + "なし" "基本" @@ -63,6 +75,22 @@ "戻るキーでキーボードを閉じます" "数字と記号" "一番左の語句を長押しすると辞書に追加されます" + + + + + + + + + + + + + + + + "実行" "次へ" "完了" From 8503b063d41f932284131aab95100f51917ed60c Mon Sep 17 00:00:00 2001 From: Amith Yamasani <> Date: Mon, 30 Mar 2009 07:28:43 -0700 Subject: [PATCH 09/26] AI 143472: Reduce dictionary size. Changed the tree structure to have variable length nodes to save an average of 21% on the dictionary size. Created a shortened English dictionary for Dream - 50K words. Added a shortened Spanish dictionary for Dream - 32K words. BUG=1743626 Automated import of CL 143472 --- dictionary/src/dictionary.cpp | 19 +++++++++++++------ dictionary/src/dictionary.h | 23 ++++++++++++++++------- 2 files changed, 29 insertions(+), 13 deletions(-) diff --git a/dictionary/src/dictionary.cpp b/dictionary/src/dictionary.cpp index 6aecb6374..b37f4c926 100644 --- a/dictionary/src/dictionary.cpp +++ b/dictionary/src/dictionary.cpp @@ -85,10 +85,14 @@ int Dictionary::getAddress(int *pos) { int address = 0; - address += (mDict[*pos] & 0x7F) << 16; - address += (mDict[*pos + 1] & 0xFF) << 8; - address += (mDict[*pos + 2] & 0xFF); - *pos += 3; + if ((mDict[*pos] & FLAG_ADDRESS_MASK) == 0) { + *pos += 1; + } else { + address += (mDict[*pos] & (ADDRESS_MASK >> 16)) << 16; + address += (mDict[*pos + 1] & 0xFF) << 8; + address += (mDict[*pos + 2] & 0xFF); + *pos += 3; + } return address; } @@ -193,7 +197,8 @@ Dictionary::getWordsRec(int pos, int depth, int maxDepth, bool completion, int s unsigned short lowerC = toLowerCase(c, depth); bool terminal = getTerminal(&pos); int childrenAddress = getAddress(&pos); - int freq = getFreq(&pos); + int freq = 1; + if (terminal) freq = getFreq(&pos); // If we are only doing completions, no need to look at the typed characters. if (completion) { mWord[depth] = c; @@ -266,7 +271,9 @@ Dictionary::isValidWordRec(int pos, unsigned short *word, int offset, int length } } } - getFreq(&pos); + if (terminal) { + getFreq(&pos); + } // There could be two instances of each alphabet - upper and lower case. So continue // looking ... } diff --git a/dictionary/src/dictionary.h b/dictionary/src/dictionary.h index 8574e0736..b13e97795 100644 --- a/dictionary/src/dictionary.h +++ b/dictionary/src/dictionary.h @@ -19,35 +19,44 @@ namespace latinime { +// 22-bit address = ~4MB dictionary size limit, which on average would be about 200k-300k words +#define ADDRESS_MASK 0x3FFFFF + +// The bit that decides if an address follows in the next 22 bits +#define FLAG_ADDRESS_MASK 0x40 +// The bit that decides if this is a terminal node for a word. The node could still have children, +// if the word has other endings. +#define FLAG_TERMINAL_MASK 0x80 + class Dictionary { public: Dictionary(void *dict, int typedLetterMultipler, int fullWordMultiplier); - int getSuggestions(int *codes, int codesSize, unsigned short *outWords, int *frequencies, + int getSuggestions(int *codes, int codesSize, unsigned short *outWords, int *frequencies, int maxWordLength, int maxWords, int maxAlternatives); bool isValidWord(unsigned short *word, int length); void setAsset(void *asset) { mAsset = asset; } void *getAsset() { return mAsset; } ~Dictionary(); - + private: int getAddress(int *pos); - bool getTerminal(int *pos) { return (mDict[*pos] & 0x80) > 0; } + bool getTerminal(int *pos) { return (mDict[*pos] & FLAG_TERMINAL_MASK) > 0; } int getFreq(int *pos) { return mDict[(*pos)++] & 0xFF; } int getCount(int *pos) { return mDict[(*pos)++] & 0xFF; } unsigned short getChar(int *pos); int wideStrLen(unsigned short *str); - + bool sameAsTyped(unsigned short *word, int length); bool addWord(unsigned short *word, int length, int frequency); unsigned short toLowerCase(unsigned short c, int depth); - void getWordsRec(int pos, int depth, int maxDepth, bool completion, int frequency, + void getWordsRec(int pos, int depth, int maxDepth, bool completion, int frequency, int inputIndex); bool isValidWordRec(int pos, unsigned short *word, int offset, int length); unsigned char *mDict; void *mAsset; - + int *mFrequencies; int mMaxWords; int mMaxWordLength; @@ -57,7 +66,7 @@ private: int mInputLength; int mMaxAlternatives; unsigned short mWord[128]; - + int mFullWordMultiplier; int mTypedLetterMultiplier; }; From fcc354695d2b204af0af899978122a8ae18817cb Mon Sep 17 00:00:00 2001 From: Eric Fischer <> Date: Mon, 30 Mar 2009 15:52:27 -0700 Subject: [PATCH 10/26] AI 143547: Import revised translations. BUG=1738388 Automated import of CL 143547 --- res/values-cs/strings.xml | 28 ++++++++++++++++++++++++++++ res/values-de/strings.xml | 28 ++++++++++++++++++++++++++++ res/values-es/strings.xml | 28 ++++++++++++++++++++++++++++ res/values-fr/strings.xml | 28 ++++++++++++++++++++++++++++ res/values-it/strings.xml | 28 ++++++++++++++++++++++++++++ res/values-ko/strings.xml | 28 ++++++++++++++++++++++++++++ res/values-nb/strings.xml | 28 ++++++++++++++++++++++++++++ res/values-nl/strings.xml | 28 ++++++++++++++++++++++++++++ res/values-pl/strings.xml | 28 ++++++++++++++++++++++++++++ res/values-ru/strings.xml | 28 ++++++++++++++++++++++++++++ res/values-zh-rCN/strings.xml | 28 ++++++++++++++++++++++++++++ res/values-zh-rTW/strings.xml | 28 ++++++++++++++++++++++++++++ 12 files changed, 336 insertions(+) diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml index 3facbc178..5c0a41032 100644 --- a/res/values-cs/strings.xml +++ b/res/values-cs/strings.xml @@ -36,6 +36,18 @@ "Automatická interpunkce" + + + + + + + + + + + + "Není" "Základní" @@ -63,6 +75,22 @@ "Stisknutím klávesy Zpět ↶ můžete klávesnici kdykoli zavřít" "Přístup k číslům a symbolům" "Stisknutím a podržením slova zcela vlevo toto slovo přidáte do slovníku" + + + + + + + + + + + + + + + + "Přejít" "Další" "Hotovo" diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml index f3665aecb..7550122a3 100644 --- a/res/values-de/strings.xml +++ b/res/values-de/strings.xml @@ -36,6 +36,18 @@ "Autom. Zeichensetzung" + + + + + + + + + + + + "Keine" "Standard" @@ -63,6 +75,22 @@ "Zum Schließen der Tastatur ↶ drücken" "Auf Zahlen und Symbole zugreifen" "Lange auf das Wort ganz links außen drücken, um es zum Wörterbuch hinzuzufügen" + + + + + + + + + + + + + + + + "Los" "Weiter" "Fertig" diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml index 74b488bda..347570091 100644 --- a/res/values-es/strings.xml +++ b/res/values-es/strings.xml @@ -36,6 +36,18 @@ "Puntuación automática" + + + + + + + + + + + + "Ninguno" "Básico" @@ -63,6 +75,22 @@ "Pulsa la tecla \"Atrás\" ↶ para cerrar el teclado en cualquier momento." "Acceso a números y símbolos" "Mantén pulsada la palabra situada más a la izquierda para añadirla al diccionario." + + + + + + + + + + + + + + + + "Ir" "Siguiente" "Hecho" diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml index 07636e65c..78c1caa4f 100644 --- a/res/values-fr/strings.xml +++ b/res/values-fr/strings.xml @@ -36,6 +36,18 @@ "Ponctuation automatique" + + + + + + + + + + + + "Aucun" "Simple" @@ -63,6 +75,22 @@ "Appuyez sur la touche Retour ↶ pour fermer le clavier à tout moment." "Accéder aux chiffres et symboles" "Appuyer et maintenir le doigt sur le mot le plus à gauche pour l\'ajouter au dictionnaire" + + + + + + + + + + + + + + + + "OK" "Suivant" "Terminé" diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml index a465f1814..d011e0772 100644 --- a/res/values-it/strings.xml +++ b/res/values-it/strings.xml @@ -36,6 +36,18 @@ "Punteggiatura automatica" + + + + + + + + + + + + "Nessuna" "Base" @@ -63,6 +75,22 @@ "Premi il tasto Indietro ↶ per chiudere la tastiera in qualsiasi punto" "Accedi a numeri e simboli" "Tieni premuto sulla parola all\'estrema sinistra per aggiungerla al dizionario" + + + + + + + + + + + + + + + + "Vai" "Avanti" "Fine" diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml index 3aabab2e7..5b4006117 100644 --- a/res/values-ko/strings.xml +++ b/res/values-ko/strings.xml @@ -36,6 +36,18 @@ "자동 구두점 입력" + + + + + + + + + + + + "없음" "기본" @@ -63,6 +75,22 @@ "키보드를 닫으려면 언제든지 뒤로 키(↶)를 누르세요." "숫자 및 기호 액세스" "맨 왼쪽에 있는 단어를 길게 누르면 사전에 추가됩니다." + + + + + + + + + + + + + + + + "이동" "다음" "완료" diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml index a2b1ba3fe..87273dd2f 100644 --- a/res/values-nb/strings.xml +++ b/res/values-nb/strings.xml @@ -36,6 +36,18 @@ "Automatisk punktum" + + + + + + + + + + + + "Ingen" "Grunnleggende" @@ -66,6 +78,22 @@ "Trykk tilbakeknappen, ↶, for å lukke tastaturet" "Få tilgang til tall og symboler" "Trykk lenge på ordet lengst til venstre for å legge det til i ordlisten" + + + + + + + + + + + + + + + + "Gå" "Neste" "Utfør" diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml index 4d60371b0..e1ec8c3d3 100644 --- a/res/values-nl/strings.xml +++ b/res/values-nl/strings.xml @@ -36,6 +36,18 @@ "Automatische interpunctie" + + + + + + + + + + + + "Geen" "Basis" @@ -63,6 +75,22 @@ "Druk op elk gewenst moment op de toets Terug ↶ om het toetsenbord te sluiten" "Toegang tot cijfers en symbolen" "Blijf drukken op het meest linkse woord om het toe te voegen aan het woordenboek" + + + + + + + + + + + + + + + + "Beginnen" "Volgende" "Gereed" diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml index 3b6bd7078..6bf876d74 100644 --- a/res/values-pl/strings.xml +++ b/res/values-pl/strings.xml @@ -36,6 +36,18 @@ "Automatyczna interpunkcja" + + + + + + + + + + + + "Brak" "Podstawowy" @@ -63,6 +75,22 @@ "Naciśnij klawisz cofania ↶, aby zamknąć klawiaturę w dowolnym momencie" "Przejdź do cyfr i symboli" "Naciśnij i przytrzymaj słowo po lewej stronie w celu dodania go do słownika" + + + + + + + + + + + + + + + + "Przejdź" "Dalej" "Gotowe" diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml index 80def1da6..981ee6dda 100644 --- a/res/values-ru/strings.xml +++ b/res/values-ru/strings.xml @@ -36,6 +36,18 @@ "Автоматическая пунктуация" + + + + + + + + + + + + "Нет" "Основной" @@ -63,6 +75,22 @@ "Нажмите клавишу \"Назад\" ↶, чтобы закрыть клавиатуру в любой момент" "Открыть цифры и символы" "Нажмите и удерживайте слово слева, чтобы добавить его в словарь" + + + + + + + + + + + + + + + + "Перейти" "Далее" "Готово" diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml index fe034ce00..789656d42 100644 --- a/res/values-zh-rCN/strings.xml +++ b/res/values-zh-rCN/strings.xml @@ -36,6 +36,18 @@ "自动加标点" + + + + + + + + + + + + "无" "基本模式" @@ -63,6 +75,22 @@ "随时可以通过按后退键 ↶ 关闭键盘" "访问数字和符号" "按住最左侧的字词可以将其添加到字典中" + + + + + + + + + + + + + + + + "开始" "下一步" "完成" diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml index b60637d48..8e67b340d 100644 --- a/res/values-zh-rTW/strings.xml +++ b/res/values-zh-rTW/strings.xml @@ -36,6 +36,18 @@ "自動標點" + + + + + + + + + + + + "無" "基本模式" @@ -63,6 +75,22 @@ "隨時可以透過按後退鍵 ↶ 關閉鍵盤" "使用數字和符號" "按住最左邊的字詞，將其新增到字典中" + + + + + + + + + + + + + + + + "開始" "下一步" "完成" From 16cd88928c976bd20ac9375e94cb17195dd5d748 Mon Sep 17 00:00:00 2001 From: Amith Yamasani <> Date: Tue, 31 Mar 2009 10:59:06 -0700 Subject: [PATCH 11/26] AI 143728: Fix # 1743137: Suggestion bubble doesn't go away after empty space on right end of suggestion strip is tapped. The empty space on right end sometimes registers as the word at the left end. Fixed this by checking for -1. Also fixed a bug where the strip moves in the wrong direction on drag, when it shouldn't move at all. BUG=1743137 Automated import of CL 143728 --- .../inputmethod/latin/CandidateView.java | 33 +++++++++++++------ 1 file changed, 23 insertions(+), 10 deletions(-) diff --git a/src/com/android/inputmethod/latin/CandidateView.java b/src/com/android/inputmethod/latin/CandidateView.java index 08c68dc12..f397363c3 100755 --- a/src/com/android/inputmethod/latin/CandidateView.java +++ b/src/com/android/inputmethod/latin/CandidateView.java @@ -148,16 +148,17 @@ public class CandidateView extends View { @Override public boolean onScroll(MotionEvent e1, MotionEvent e2, float distanceX, float distanceY) { + final int width = getWidth(); mScrolled = true; - mScrollX += distanceX; + mScrollX += (int) distanceX; if (mScrollX < 0) { mScrollX = 0; } - if (mScrollX + getWidth() > mTotalWidth) { - mScrollX -= distanceX; + if (distanceX > 0 && mScrollX + width > mTotalWidth) { + mScrollX -= (int) distanceX; } mTargetScrollX = mScrollX; - showPreview(OUT_OF_BOUNDS, null); + hidePreview(); invalidate(); return true; } @@ -236,7 +237,8 @@ public class CandidateView extends View { mWordX[i] = x; - if (touchX + scrollX >= x && touchX + scrollX < x + wordWidth && !scrolled) { + if (touchX + scrollX >= x && touchX + scrollX < x + wordWidth && !scrolled && + touchX != OUT_OF_BOUNDS) { if (canvas != null) { canvas.translate(x, 0); mSelectionHighlight.setBounds(0, bgPadding.top, wordWidth, height); @@ -399,7 +401,7 @@ public class CandidateView extends View { mSelectedString = null; mSelectedIndex = -1; removeHighlight(); - showPreview(OUT_OF_BOUNDS, null); + hidePreview(); requestLayout(); break; } @@ -425,16 +427,21 @@ public class CandidateView extends View { mHandler.sendMessageDelayed(mHandler.obtainMessage(MSG_REMOVE_THROUGH_PREVIEW), 200); } + private void hidePreview() { + mCurrentWordIndex = OUT_OF_BOUNDS; + if (mPreviewPopup.isShowing()) { + mHandler.sendMessageDelayed(mHandler + .obtainMessage(MSG_REMOVE_PREVIEW), 60); + } + } + private void showPreview(int wordIndex, String altText) { int oldWordIndex = mCurrentWordIndex; mCurrentWordIndex = wordIndex; // If index changed or changing text if (oldWordIndex != mCurrentWordIndex || altText != null) { if (wordIndex == OUT_OF_BOUNDS) { - if (mPreviewPopup.isShowing()) { - mHandler.sendMessageDelayed(mHandler - .obtainMessage(MSG_REMOVE_PREVIEW), 60); - } + hidePreview(); } else { CharSequence word = altText != null? altText : mSuggestions.get(wordIndex); mPreviewText.setText(word); @@ -475,4 +482,10 @@ public class CandidateView extends View { showPreview(0, getContext().getResources().getString(R.string.added_word, word)); } } + + @Override + public void onDetachedFromWindow() { + super.onDetachedFromWindow(); + hidePreview(); + } } From cde336915716fe2f791b9eea40f385575b164ef1 Mon Sep 17 00:00:00 2001 From: Eric Fischer <> Date: Thu, 2 Apr 2009 16:39:23 -0700 Subject: [PATCH 12/26] AI 144335: Import US Spanish translations, and a few Japanese changes. Automated import of CL 144335 --- res/values-es-rUS/strings.xml | 102 ++++++++++++++++++++++++++++++++++ 1 file changed, 102 insertions(+) create mode 100644 res/values-es-rUS/strings.xml diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml new file mode 100644 index 000000000..864e812d6 --- /dev/null +++ b/res/values-es-rUS/strings.xml @@ -0,0 +1,102 @@ + + + + "Teclado de Android" + "Configuración de teclado de Android" + "Vibrar al pulsar las teclas" + "Sonar al pulsar las teclas" + "Corregir errores de escritura" + "Habilitar corrección de error de entrada" + "Errores de entrada apaisada" + "Habilitar corrección de error de entrada" + "Sugerencias de palabras" + "Corregir automáticamente la palabra anterior" + "Sugerencias de palabras" + "Configuración de sugerencia de palabra" + "Habilitar finalización automática al escribir" + "Finalización automática" + "Aumentar el tamaño del campo de texto" + "Ocultar sugerencias de palabras en vista apaisada" + "Mayúsculas automáticas" + "Poner en mayúscula el inicio de una oración" + "Puntuación automática" + + + + + + + + + + + + + + + + "Ninguno" + "Básico" + "Avanzado" + + "0" + "1" + "2" + + + + "%s: guardada" + "àáâãäåæ" + "èéêë" + "ìíîï" + "òóôõöœø" + "ùúûü" + "§ß" + "ñ" + "ç" + "ýÿ" + + + "Mantén una tecla presionada para ver los acentos (ø, ö, etc.)" + "Pulsa la tecla hacia atrás ↶ para cerrar el teclado en cualquier momento" + "Acceder a números y símbolos" + "Presiona y mantén presionada la palabra de la izquierda para agregarla al diccionario" + + + + + + + + + + + + + + + + + "Ir" + "Siguiente" + "Finalizado" + "Enviar" + "?123" + "123" + "ABC" + "ALT" + From 431f6d22cc0baccb5942c882713f9e933e2e8091 Mon Sep 17 00:00:00 2001 From: Eric Fischer <> Date: Thu, 2 Apr 2009 21:42:07 -0700 Subject: [PATCH 13/26] AI 144355: Automated g4 rollback of changelist 144335. *** Reason for rollback *** Roll back US Spanish import because it made the build too big. *** Original change description *** Import US Spanish translations, and a few Japanese changes. Automated import of CL 144355 --- res/values-es-rUS/strings.xml | 102 ---------------------------------- 1 file changed, 102 deletions(-) delete mode 100644 res/values-es-rUS/strings.xml diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml deleted file mode 100644 index 864e812d6..000000000 --- a/res/values-es-rUS/strings.xml +++ /dev/null @@ -1,102 +0,0 @@ - - - - "Teclado de Android" - "Configuración de teclado de Android" - "Vibrar al pulsar las teclas" - "Sonar al pulsar las teclas" - "Corregir errores de escritura" - "Habilitar corrección de error de entrada" - "Errores de entrada apaisada" - "Habilitar corrección de error de entrada" - "Sugerencias de palabras" - "Corregir automáticamente la palabra anterior" - "Sugerencias de palabras" - "Configuración de sugerencia de palabra" - "Habilitar finalización automática al escribir" - "Finalización automática" - "Aumentar el tamaño del campo de texto" - "Ocultar sugerencias de palabras en vista apaisada" - "Mayúsculas automáticas" - "Poner en mayúscula el inicio de una oración" - "Puntuación automática" - - - - - - - - - - - - - - - - "Ninguno" - "Básico" - "Avanzado" - - "0" - "1" - "2" - - - - "%s: guardada" - "àáâãäåæ" - "èéêë" - "ìíîï" - "òóôõöœø" - "ùúûü" - "§ß" - "ñ" - "ç" - "ýÿ" - - - "Mantén una tecla presionada para ver los acentos (ø, ö, etc.)" - "Pulsa la tecla hacia atrás ↶ para cerrar el teclado en cualquier momento" - "Acceder a números y símbolos" - "Presiona y mantén presionada la palabra de la izquierda para agregarla al diccionario" - - - - - - - - - - - - - - - - - "Ir" - "Siguiente" - "Finalizado" - "Enviar" - "?123" - "123" - "ABC" - "ALT" - From 2f5e002ecc907271458fd9b88b3f186675ed2b88 Mon Sep 17 00:00:00 2001 From: Eric Fischer <> Date: Tue, 7 Apr 2009 11:48:30 -0700 Subject: [PATCH 14/26] AI 144891: Import a bunch of revised translations. Automated import of CL 144891 --- res/values-cs/strings.xml | 42 ++++++++++++---------------------- res/values-de/strings.xml | 42 ++++++++++++---------------------- res/values-es/strings.xml | 42 ++++++++++++---------------------- res/values-fr/strings.xml | 48 ++++++++++++++------------------------- res/values-it/strings.xml | 42 ++++++++++++---------------------- res/values-ja/strings.xml | 42 ++++++++++++---------------------- res/values-ko/strings.xml | 42 ++++++++++++---------------------- res/values-nl/strings.xml | 42 ++++++++++++---------------------- res/values-pl/strings.xml | 42 ++++++++++++---------------------- res/values-ru/strings.xml | 42 ++++++++++++---------------------- 10 files changed, 143 insertions(+), 283 deletions(-) diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml index 5c0a41032..745cdac3f 100644 --- a/res/values-cs/strings.xml +++ b/res/values-cs/strings.xml @@ -36,18 +36,12 @@ "Automatická interpunkce" - - - - - - - - - - - - + "Rychlé opravy" + "Opravuje běžné překlepy" + "Zobrazovat návrhy" + "Při psaní zobrazovat návrhy slov" + "Automatické dokončování" + "Stisknutí mezerníku nebo interpunkce automaticky vloží zvýrazněné slovo" "Není" "Základní" @@ -75,22 +69,14 @@ "Stisknutím klávesy Zpět ↶ můžete klávesnici kdykoli zavřít" "Přístup k číslům a symbolům" "Stisknutím a podržením slova zcela vlevo toto slovo přidáte do slovníku" - - - - - - - - - - - - - - - - + "Chcete-li pokračovat, dotkněte se této rady »" + "Chcete-li tuto radu zavřít a začít psát, dotkněte se zde." + "Klávesnice se zobrazí, kdykoli se dotknete textového pole." + "Stisknutím a podržením klávesy zobrazíte diakritiku"\n"(ó, ø, ö, ô atd.)" + "Stisknutím této klávesy přejdete do režimu číslic a symbolů" + "Opětovným stisknutím této klávesy se vrátíte zpět do režimu písmen" + "Chcete-li změnit nastavení klávesnice, jako například automatické dokončování, stiskněte tuto klávesu a podržte ji." + "Zkuste to." "Přejít" "Další" "Hotovo" diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml index 7550122a3..243292c43 100644 --- a/res/values-de/strings.xml +++ b/res/values-de/strings.xml @@ -36,18 +36,12 @@ "Autom. Zeichensetzung" - - - - - - - - - - - - + "Quick Fixes" + "Korrigiert gängige Tippfehler" + "Vorschläge anzeigen" + "Vorgeschlagene Wörter während des Tippens anzeigen" + "Automatische Vervollständigung" + "Leertaste und Interpunktion fügen automatisch ein hervorgehobenes Wort ein" "Keine" "Standard" @@ -75,22 +69,14 @@ "Zum Schließen der Tastatur ↶ drücken" "Auf Zahlen und Symbole zugreifen" "Lange auf das Wort ganz links außen drücken, um es zum Wörterbuch hinzuzufügen" - - - - - - - - - - - - - - - - + "Diesen Hinweis berühren, um fortzufahren »" + "Hier berühren, um diesen Hinweis zu schließen und mit dem Tippen zu beginnen!" + "Die Tastatur wird immer dann geöffnet, wenn Sie ein Textfeld berühren." + "Halten Sie eine Taste gedrückt, um Sonderzeichen anzuzeigen"\n"(ø, ö, ô, ó usw.)." + "Wechseln Sie zu Nummern und Symbolen, indem Sie diese Taste berühren." + "Gehen Sie zurück zu Buchstaben, indem Sie diese Taste erneut drücken." + "Halten Sie diese Taste gedrückt, um die Tastatureinstellungen, wie beispielsweise die automatische Vervollständigung, zu ändern." + "Probieren Sie es!" "Los" "Weiter" "Fertig" diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml index 347570091..aa65ef198 100644 --- a/res/values-es/strings.xml +++ b/res/values-es/strings.xml @@ -36,18 +36,12 @@ "Puntuación automática" - - - - - - - - - - - - + "Correcciones rápidas" + "Corrige los errores tipográficos que se cometen con más frecuencia." + "Mostrar sugerencias" + "Muestra las palabras sugeridas mientras se escribe." + "Autocompletar" + "La barra espaciadora y los signos de puntuación insertan automáticamente la palabra resaltada." "Ninguno" "Básico" @@ -75,22 +69,14 @@ "Pulsa la tecla \"Atrás\" ↶ para cerrar el teclado en cualquier momento." "Acceso a números y símbolos" "Mantén pulsada la palabra situada más a la izquierda para añadirla al diccionario." - - - - - - - - - - - - - - - - + "Toca esta sugerencia para continuar »" + "Toca aquí para cerrar la sugerencia y comenzar a escribir." + "El teclado se abre cada vez que tocas un campo de texto""." + "Mantén pulsada una tecla para ver los caracteres acentuados "\n"(ø, ö, ô, ó, etc.)" + "Toca esta tecla para cambiar al teclado de números y símbolos""." + "Toca esta tecla de nuevo para volver a las letras" + "Mantén pulsada esta tecla para cambiar la configuración del teclado como, por ejemplo, la opción de autocompletar""." + "¡Pruébalo!" "Ir" "Siguiente" "Hecho" diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml index 78c1caa4f..ce0903f4c 100644 --- a/res/values-fr/strings.xml +++ b/res/values-fr/strings.xml @@ -17,8 +17,8 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> "Clavier Android" "Paramètres du clavier Android" - "Vibrer à chaque touche enfoncée" - "Son à chaque touche enfoncée" + "Vibrer à chaque touche" + "Son à chaque touche" "Corriger les fautes de frappe" "Activer la correction des erreurs de saisie" "Erreurs de saisie en mode paysage" @@ -31,23 +31,17 @@ "Saisie semi-automatique" "Agrandir le champ de texte" "Masquer la saisie prédictive en mode paysage" - "Mise en majuscules automatique" + "Majuscules automatiques" "Mettre en majuscule la première lettre de chaque phrase" "Ponctuation automatique" - - - - - - - - - - - - + "Corrections rapides" + "Corrige les fautes de frappe courantes" + "Afficher les suggestions" + "Afficher les suggestions de terme lors de la saisie" + "Saisie semi-automatique" + "La barre d\'espace et la ponctuation insèrent automatiquement les termes en surbrillance." "Aucun" "Simple" @@ -75,22 +69,14 @@ "Appuyez sur la touche Retour ↶ pour fermer le clavier à tout moment." "Accéder aux chiffres et symboles" "Appuyer et maintenir le doigt sur le mot le plus à gauche pour l\'ajouter au dictionnaire" - - - - - - - - - - - - - - - - + "Appuyez sur ce conseil pour continuer »" + "Appuyez ici pour fermer ce conseil et commencer à saisir votre texte." + "Le clavier s\'affiche à chaque fois que vous appuyez sur une zone de texte." + "Maintenez une touche enfoncée pour afficher les accents"\n"(ø, ö, ô, ó, etc.)" + "Appuyez sur cette touche pour basculer vers les chiffres et les symboles." + "Retourner au clavier en appuyant de nouveau sur cette touche" + "Maintenez cette touche enfoncée afin de modifier les paramètres du clavier, tels que la saisie semi-automatique." + "Essayez !" "OK" "Suivant" "Terminé" diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml index d011e0772..8a814cb17 100644 --- a/res/values-it/strings.xml +++ b/res/values-it/strings.xml @@ -36,18 +36,12 @@ "Punteggiatura automatica" - - - - - - - - - - - - + "Correzioni veloci" + "Corregge gli errori di digitazione più comuni" + "Mostra suggerimenti" + "Visualizza le parole suggerite durante la digitazione" + "Completamento automatico" + "La barra spaziatrice e la punteggiatura inseriscono automaticamente la parola evidenziata" "Nessuna" "Base" @@ -75,22 +69,14 @@ "Premi il tasto Indietro ↶ per chiudere la tastiera in qualsiasi punto" "Accedi a numeri e simboli" "Tieni premuto sulla parola all\'estrema sinistra per aggiungerla al dizionario" - - - - - - - - - - - - - - - - + "Tocca questo suggerimento per continuare »" + "Tocca qui per chiudere questo suggerimento e iniziare a digitare." + "La tastiera si apre ogni volta che tocchi un campo di testo" + "Tocca e tieni premuto un tasto per visualizzare le lettere con segni diacritici"\n"(ø, ö, ô, ó e così via)" + "Passa a numeri e simboli toccando questo tasto" + "Torna all\'alfabeto toccando di nuovo questo tasto" + "Tocca e tieni premuto questo tasto per modificare le impostazioni della tastiera, come il completamento automatico" + "Prova." "Vai" "Avanti" "Fine" diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml index 099b3dbc6..7a8856f1d 100644 --- a/res/values-ja/strings.xml +++ b/res/values-ja/strings.xml @@ -36,18 +36,12 @@ "句読点を自動入力" - - - - - - - - - - - - + "クイックフィックス" + "よくある誤字・脱字を修正します" + "入力候補を表示" + "入力時に入力候補を表示します" + "オートコンプリート" + "スペースまたは句読点キーを押すと、ハイライトされたキーワードが自動入力されます" "なし" "基本" @@ -75,22 +69,14 @@ "戻るキーでキーボードを閉じます" "数字と記号" "一番左の語句を長押しすると辞書に追加されます" - - - - - - - - - - - - - - - - + "続けるにはヒントをタッチ >>" + "タッチしてこのヒントを終了し、入力を開始してください。" + "テキストフィールドを選択するとキーボードが表示されます" + "キーを長押しするとアクセント付き文字"\n"（ø、ö、ô、óなど）が表示されます" + "このキーを押すと、数字/記号入力に切り替わります" + "このキーを押すと、文字入力に再度切り替わります" + "オートコンプリートなどのキーボードの設定を変更するには、このキーを長押しします" + "試してみてください。" "実行" "次へ" "完了" diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml index 5b4006117..654a1f04b 100644 --- a/res/values-ko/strings.xml +++ b/res/values-ko/strings.xml @@ -36,18 +36,12 @@ "자동 구두점 입력" - - - - - - - - - - - - + "빠른 수정" + "일반적인 오타를 수정합니다." + "추천 단어 표시" + "글자를 입력하는 동안 추천 단어를 표시합니다." + "자동 완성" + "스페이스 바와 문장부호 키를 사용하면 강조 표시된 단어가 자동으로 삽입됩니다." "없음" "기본" @@ -75,22 +69,14 @@ "키보드를 닫으려면 언제든지 뒤로 키(↶)를 누르세요." "숫자 및 기호 액세스" "맨 왼쪽에 있는 단어를 길게 누르면 사전에 추가됩니다." - - - - - - - - - - - - - - - - + "계속하려면 힌트를 터치하세요. »" + "힌트를 닫고 입력을 시작하려면 여기를 터치하세요." + "입력란을 터치하면 키보드가 열립니다." + "키를 길게 누르면 악센트"\n"(ø, ö, ô, ó 등)를 볼 수 있습니다." + "이 키를 터치하면 숫자 및 기호 자판으로 변경됩니다." + "이 키를 다시 터치하면 키보드가 표시됩니다." + "자동 완성과 같은 키보드 설정을 변경하려면 이 키를 길게 누르세요." + "사용해 보세요." "이동" "다음" "완료" diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml index e1ec8c3d3..467fdbc21 100644 --- a/res/values-nl/strings.xml +++ b/res/values-nl/strings.xml @@ -36,18 +36,12 @@ "Automatische interpunctie" - - - - - - - - - - - - + "Snelle oplossingen" + "Hiermee worden veelvoorkomende typefouten gecorrigeerd" + "Suggesties weergeven" + "Voorgestelde woorden weergeven tijdens typen" + "Auto-aanvullen" + "Met de spatiebalk en interpunctie wordt het gemarkeerde woord automatisch ingevoegd" "Geen" "Basis" @@ -75,22 +69,14 @@ "Druk op elk gewenst moment op de toets Terug ↶ om het toetsenbord te sluiten" "Toegang tot cijfers en symbolen" "Blijf drukken op het meest linkse woord om het toe te voegen aan het woordenboek" - - - - - - - - - - - - - - - - + "Raak deze tip aan om door te gaan »" + "Raak dit punt aan om deze tip te sluiten en te beginnen met typen." + "Het toetsenbord wordt geopend wanneer u een tekstveld aanraakt" + "Blijf een toets aanraken om diakritische tekens weer te geven"\n" (ø, ö, ô, ó, enzovoort)" + "Schakel over naar cijfers en symbolen door deze toets aan te raken" + "Ga terug naar letters door deze toets nogmaals aan te raken" + "Blijf deze toets aanraken om toetsenbordinstellingen te wijzigen, zoals auto-aanvullen" + "Probeer het zelf!" "Beginnen" "Volgende" "Gereed" diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml index 6bf876d74..2cbf13173 100644 --- a/res/values-pl/strings.xml +++ b/res/values-pl/strings.xml @@ -36,18 +36,12 @@ "Automatyczna interpunkcja" - - - - - - - - - - - - + "Szybkie poprawki" + "Poprawia częste błędy wpisywania" + "Pokaż sugestie" + "Wyświetl sugerowane słowa podczas wpisywania" + "Autouzupełnianie" + "Spacja i znaki przestankowe automatycznie wstawiają wyróżnione słowo" "Brak" "Podstawowy" @@ -75,22 +69,14 @@ "Naciśnij klawisz cofania ↶, aby zamknąć klawiaturę w dowolnym momencie" "Przejdź do cyfr i symboli" "Naciśnij i przytrzymaj słowo po lewej stronie w celu dodania go do słownika" - - - - - - - - - - - - - - - - + "Dotknij tej podpowiedzi, aby kontynuować »" + "Dotknij tutaj, aby zamknąć tę podpowiedź i zacząć pisać!" + "Klawiatura jest otwierana po każdym dotknięciu pola tekstowego" + "Dotknij i przytrzymaj klawisz, aby wyświetlić znaki akcentowane"\n"(ø, ö, ô, ó itd.)" + "Przełącz na cyfry i symbole, dotykając tego klawisza" + "Wróć do trybu liter, dotykając ponownie tego klawisza" + "Dotknij i przytrzymaj ten klawisz, aby zmienić ustawienia klawiatury, takie jak autouzupełnianie" + "Wypróbuj!" "Przejdź" "Dalej" "Gotowe" diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml index 981ee6dda..644909929 100644 --- a/res/values-ru/strings.xml +++ b/res/values-ru/strings.xml @@ -36,18 +36,12 @@ "Автоматическая пунктуация" - - - - - - - - - - - - + "Быстрое исправление" + "Исправляет распространенные опечатки" + "Предлагать варианты" + "Предлагать варианты во время ввода" + "Автозавершение" + "При вводе пробела или знака препинания выделенное слово вставляется автоматически" "Нет" "Основной" @@ -75,22 +69,14 @@ "Нажмите клавишу \"Назад\" ↶, чтобы закрыть клавиатуру в любой момент" "Открыть цифры и символы" "Нажмите и удерживайте слово слева, чтобы добавить его в словарь" - - - - - - - - - - - - - - - - + "Чтобы продолжить, нажмите на эту подсказку »" + "Нажмите здесь, чтобы закрыть подсказку и начать вводить текст." + "Клавиатура появляется автоматически при касании текстового поля" + "Нажмите и удерживайте клавишу, чтобы появились спецсимволы "\n"(ø, ö, ô, ó и т. п.)" + "Чтобы перейти к вводу цифр и символов, нажмите на эту клавишу" + "Чтобы вернуться к буквенной клавиатуре, снова нажмите на эту клавишу" + "Чтобы сменить настройки клавиатуры (такие как автозавершение), нажмите и удерживайте эту клавишу" + "Попробуйте!" "Перейти" "Далее" "Готово" From 942d115f0974d6253eb5ea6f1539f7854c70337c Mon Sep 17 00:00:00 2001 From: Eric Fischer <> Date: Tue, 7 Apr 2009 18:15:15 -0700 Subject: [PATCH 15/26] AI 144977: Import revised translations. DO NOT MERGE Automated import of CL 144977 --- res/values-de/strings.xml | 2 +- res/values-es/strings.xml | 4 ++-- res/values-it/strings.xml | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml index 243292c43..441cd1f04 100644 --- a/res/values-de/strings.xml +++ b/res/values-de/strings.xml @@ -17,7 +17,7 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> "Android-Tastatur" "Android-Tastatureinstellungen" - "Vibrieren auf Tastendruck" + "Vibrieren bei Tastendruck" "Sound bei Tastendruck" "Eingabefehler korrigieren" "Korrektur von Eingabefehlern aktivieren" diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml index aa65ef198..277f6864d 100644 --- a/res/values-es/strings.xml +++ b/res/values-es/strings.xml @@ -18,7 +18,7 @@ "Teclado de Android" "Configuración del teclado de Android" "Vibrar al pulsar tecla" - "Sonido al pulsar una tecla" + "Sonido al pulsar tecla" "Corregir errores de escritura" "Habilitar la introducción de corrección de errores" "Errores de introducción de datos en vista horizontal" @@ -31,7 +31,7 @@ "Autocompletar" "Aumentar el tamaño del campo de texto" "Ocultar sugerencias de palabras en la vista horizontal" - "Uso de mayúsculas automático" + "Uso de mayúsculas auto." "Escribir en mayúscula el principio de la frase" "Puntuación automática" diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml index 8a814cb17..b332d659e 100644 --- a/res/values-it/strings.xml +++ b/res/values-it/strings.xml @@ -17,8 +17,8 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> "Tastiera Android" "Impostazioni tastiera Android" - "Vibra quando premi un tasto" - "Suona quando premi un tasto" + "Vibra se premi un tasto" + "Suona se premi un tasto" "Correggi errori di digitazione" "Attiva la correzione degli errori di inserimento" "Errori di inserimento in visualizzazione orizzontale" @@ -33,7 +33,7 @@ "Nascondi i suggerimenti delle parole in visualizzazione orizzontale" "Maiuscole automatiche" "Rendi maiuscole le iniziali delle frasi" - "Punteggiatura automatica" + "Punteggiatura automat." "Correzioni veloci" From 9112c8fdcfb369181f50c70b798217a95ced5d9f Mon Sep 17 00:00:00 2001 From: Eric Fischer <> Date: Wed, 8 Apr 2009 15:59:36 -0700 Subject: [PATCH 16/26] AI 145214: Update cupcake translations. Automated import of CL 145214 --- res/values-ja/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml index 7a8856f1d..67c9a5e37 100644 --- a/res/values-ja/strings.xml +++ b/res/values-ja/strings.xml @@ -18,7 +18,7 @@ "Androidキーボード" "Androidキーボードの設定" "キーのバイブレーション" - "キーを押したときの音" + "キー操作音" "入力エラー修正" "入力エラーを推測修正する" "横表示での入力修正" From e345055117701aa58d2af9623e413e4fa0430c0c Mon Sep 17 00:00:00 2001 From: Eric Fischer <> Date: Wed, 8 Apr 2009 18:43:30 -0700 Subject: [PATCH 17/26] AI 145225: Import more revised translations into cupcake. Automated import of CL 145225 --- res/values-de/strings.xml | 6 +++--- res/values-fr/strings.xml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml index 441cd1f04..703fe9caa 100644 --- a/res/values-de/strings.xml +++ b/res/values-de/strings.xml @@ -28,7 +28,7 @@ "Wortvorschläge" "Einstellungen für Wortvorschläge" "Automatische Vervollständigung während der Eingabe aktivieren" - "Automatische Vervollständigung" + "Autom. vervollständigen" "Textfeld vergrößern" "Wortvorschläge in Querformat ausblenden" "Automatische Groß-/Kleinschreibung" @@ -40,8 +40,8 @@ "Korrigiert gängige Tippfehler" "Vorschläge anzeigen" "Vorgeschlagene Wörter während des Tippens anzeigen" - "Automatische Vervollständigung" - "Leertaste und Interpunktion fügen automatisch ein hervorgehobenes Wort ein" + "Autom. vervollständigen" + "Leertaste und Interpunktion fügen autom. ein markiertes Wort ein" "Keine" "Standard" diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml index ce0903f4c..fca407b44 100644 --- a/res/values-fr/strings.xml +++ b/res/values-fr/strings.xml @@ -41,7 +41,7 @@ "Afficher les suggestions" "Afficher les suggestions de terme lors de la saisie" "Saisie semi-automatique" - "La barre d\'espace et la ponctuation insèrent automatiquement les termes en surbrillance." + "La barre d\'espace et la ponctuation insèrent les termes en surbrillance." "Aucun" "Simple" From e653fc559022bc2840902f3dce194746ace3ebce Mon Sep 17 00:00:00 2001 From: Amith Yamasani <> Date: Thu, 9 Apr 2009 14:36:39 -0700 Subject: [PATCH 18/26] AI 145516: Use the new binary format for the empty dictionary. This makes it compatible with the current code and avoid any possible crash. Automated import of CL 145516 --- res/raw/main.dict | Bin 42 -> 34 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/res/raw/main.dict b/res/raw/main.dict index 2b473be7567ff03beee2be146b0d0f846f1fd98a..a456cf3d39e5bdca3e04ba6b90a6c24d0be0aeca 100755 GIT binary patch literal 34 pcmZQ{bYNg*%yVGiVoY&h;AbpyU=U% Date: Thu, 9 Apr 2009 22:15:20 -0700 Subject: [PATCH 19/26] AI 145663: Disable auto-correction for Dream. Also fixes bug # 1776404. Have a boolean resource to specify auto correction default: Will be turned on/off for different targets and languages. Move English dictionary to raw-en so that French locale doesn't get the English suggestions. Make the LatinIME the default for supported latin languages. BUG=1776404 Automated import of CL 145663 --- res/values-cs/bools.xml | 22 ++++++++++++++++ res/values-de/bools.xml | 22 ++++++++++++++++ res/values-es/bools.xml | 22 ++++++++++++++++ res/values-fr/bools.xml | 22 ++++++++++++++++ res/values-it/bools.xml | 22 ++++++++++++++++ res/values-nl/bools.xml | 22 ++++++++++++++++ res/values-pl/bools.xml | 22 ++++++++++++++++ res/values/bools.xml | 26 +++++++++++++++++++ res/xml/prefs.xml | 2 +- .../android/inputmethod/latin/LatinIME.java | 3 ++- 10 files changed, 183 insertions(+), 2 deletions(-) create mode 100644 res/values-cs/bools.xml create mode 100644 res/values-de/bools.xml create mode 100644 res/values-es/bools.xml create mode 100644 res/values-fr/bools.xml create mode 100644 res/values-it/bools.xml create mode 100644 res/values-nl/bools.xml create mode 100644 res/values-pl/bools.xml create mode 100644 res/values/bools.xml diff --git a/res/values-cs/bools.xml b/res/values-cs/bools.xml new file mode 100644 index 000000000..897f4b3db --- /dev/null +++ b/res/values-cs/bools.xml @@ -0,0 +1,22 @@ + + + + true + diff --git a/res/values-de/bools.xml b/res/values-de/bools.xml new file mode 100644 index 000000000..897f4b3db --- /dev/null +++ b/res/values-de/bools.xml @@ -0,0 +1,22 @@ + + + + true + diff --git a/res/values-es/bools.xml b/res/values-es/bools.xml new file mode 100644 index 000000000..897f4b3db --- /dev/null +++ b/res/values-es/bools.xml @@ -0,0 +1,22 @@ + + + + true + diff --git a/res/values-fr/bools.xml b/res/values-fr/bools.xml new file mode 100644 index 000000000..897f4b3db --- /dev/null +++ b/res/values-fr/bools.xml @@ -0,0 +1,22 @@ + + + + true + diff --git a/res/values-it/bools.xml b/res/values-it/bools.xml new file mode 100644 index 000000000..897f4b3db --- /dev/null +++ b/res/values-it/bools.xml @@ -0,0 +1,22 @@ + + + + true + diff --git a/res/values-nl/bools.xml b/res/values-nl/bools.xml new file mode 100644 index 000000000..897f4b3db --- /dev/null +++ b/res/values-nl/bools.xml @@ -0,0 +1,22 @@ + + + + true + diff --git a/res/values-pl/bools.xml b/res/values-pl/bools.xml new file mode 100644 index 000000000..897f4b3db --- /dev/null +++ b/res/values-pl/bools.xml @@ -0,0 +1,22 @@ + + + + true + diff --git a/res/values/bools.xml b/res/values/bools.xml new file mode 100644 index 000000000..06aa8f308 --- /dev/null +++ b/res/values/bools.xml @@ -0,0 +1,26 @@ + + + + + false + + false + diff --git a/res/xml/prefs.xml b/res/xml/prefs.xml index 865269907..2fc82aadb 100644 --- a/res/xml/prefs.xml +++ b/res/xml/prefs.xml @@ -62,7 +62,7 @@ android:title="@string/auto_complete" android:summary="@string/auto_complete_summary" android:persistent="true" - android:defaultValue="true" + android:defaultValue="@bool/enable_autocorrect" android:dependency="show_suggestions" /> diff --git a/src/com/android/inputmethod/latin/LatinIME.java b/src/com/android/inputmethod/latin/LatinIME.java index a36ff5747..f81637580 100644 --- a/src/com/android/inputmethod/latin/LatinIME.java +++ b/src/com/android/inputmethod/latin/LatinIME.java @@ -1005,7 +1005,8 @@ public class LatinIME extends InputMethodService // will continue to work if (AutoText.getSize(mInputView) < 1) mQuickFixes = true; mShowSuggestions = sp.getBoolean(PREF_SHOW_SUGGESTIONS, true) & mQuickFixes; - mAutoComplete = sp.getBoolean(PREF_AUTO_COMPLETE, true) & mShowSuggestions; + mAutoComplete = sp.getBoolean(PREF_AUTO_COMPLETE, + getResources().getBoolean(R.bool.enable_autocorrect)) & mShowSuggestions; mAutoCorrectOn = mSuggest != null && (mAutoComplete || mQuickFixes); mCorrectionMode = mAutoComplete ? 2 : (mQuickFixes ? 1 : 0); } From bbb46d2ab9680be7cd3919474ab27d5cebc92e1f Mon Sep 17 00:00:00 2001 From: Amith Yamasani <> Date: Thu, 9 Apr 2009 22:17:04 -0700 Subject: [PATCH 20/26] AI 145664: Add Polish accents for "l". Move accents for "z" to donottranslate.xml from strings.xml BUG=1776395 Automated import of CL 145664 --- res/values-cs/donottranslate.xml | 2 ++ res/values-pl/donottranslate.xml | 25 +++++++++++++++++++++++++ res/values/donottranslate.xml | 4 ++++ res/values/strings.xml | 2 -- res/xml/kbd_qwerty.xml | 5 ++++- 5 files changed, 35 insertions(+), 3 deletions(-) create mode 100644 res/values-pl/donottranslate.xml diff --git a/res/values-cs/donottranslate.xml b/res/values-cs/donottranslate.xml index 41431388a..9c2a476a6 100644 --- a/res/values-cs/donottranslate.xml +++ b/res/values-cs/donottranslate.xml @@ -24,4 +24,6 @@ ř ť + + ž diff --git a/res/values-pl/donottranslate.xml b/res/values-pl/donottranslate.xml new file mode 100644 index 000000000..196e73c1d --- /dev/null +++ b/res/values-pl/donottranslate.xml @@ -0,0 +1,25 @@ + + + + + źż + + ł + diff --git a/res/values/donottranslate.xml b/res/values/donottranslate.xml index e766dba77..d9649f3b1 100644 --- a/res/values/donottranslate.xml +++ b/res/values/donottranslate.xml @@ -28,4 +28,8 @@ + + + + diff --git a/res/values/strings.xml b/res/values/strings.xml index 25d990e81..e1ef1260f 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -125,8 +125,6 @@ ç ýÿ - - Hold a key down to see accents (ø, ö, etc.) diff --git a/res/xml/kbd_qwerty.xml b/res/xml/kbd_qwerty.xml index 979471059..fb8c574e4 100755 --- a/res/xml/kbd_qwerty.xml +++ b/res/xml/kbd_qwerty.xml @@ -74,7 +74,10 @@ - + From d4c048b4ae7373a57c7abaf7c35cdd5b3da6ccc6 Mon Sep 17 00:00:00 2001 From: Eric Fischer <> Date: Fri, 10 Apr 2009 10:45:20 -0700 Subject: [PATCH 21/26] AI 145711: Import a few changed translations. DO NOT MERGE Automated import of CL 145711 --- res/values-ja/strings.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml index 67c9a5e37..97e7b59c0 100644 --- a/res/values-ja/strings.xml +++ b/res/values-ja/strings.xml @@ -17,10 +17,10 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> "Androidキーボード" "Androidキーボードの設定" - "キーのバイブレーション" + "キー操作バイブ" "キー操作音" - "入力エラー修正" - "入力エラーを推測修正する" + "入力ミス補正" + "入力間違いを自動修正する" "横表示での入力修正" "入力間違いを自動修正する" "入力候補表示" @@ -32,7 +32,7 @@ "入力作業スペースを広げる" "横表示では入力候補を表示しない" "自動大文字変換" - "先頭文字を大文字に変換する" + "英字入力で文頭文字を大文字にする" "句読点を自動入力" @@ -68,7 +68,7 @@ "キー長押しでアクセント文字を表示（ø、öなど）" "戻るキーでキーボードを閉じます" "数字と記号" - "一番左の語句を長押しすると辞書に追加されます" + "一番左の単語を長押しすると辞書に追加されます" "続けるにはヒントをタッチ >>" "タッチしてこのヒントを終了し、入力を開始してください。" "テキストフィールドを選択するとキーボードが表示されます" From d862f20cab1910a076791b0af6d9941e614d9c3f Mon Sep 17 00:00:00 2001 From: Eric Fischer <> Date: Fri, 10 Apr 2009 16:38:00 -0700 Subject: [PATCH 22/26] AI 145782: Import updated translations. DO NOT MERGE Automated import of CL 145782 --- res/values-cs/strings.xml | 2 -- res/values-de/strings.xml | 2 -- res/values-es/strings.xml | 2 -- res/values-fr/strings.xml | 2 -- res/values-it/strings.xml | 2 -- res/values-ja/strings.xml | 2 -- res/values-ko/strings.xml | 2 -- res/values-nb/strings.xml | 2 -- res/values-nl/strings.xml | 2 -- res/values-pl/strings.xml | 2 -- res/values-ru/strings.xml | 2 -- res/values-zh-rCN/strings.xml | 2 -- res/values-zh-rTW/strings.xml | 2 -- 13 files changed, 26 deletions(-) diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml index 745cdac3f..5f6437984 100644 --- a/res/values-cs/strings.xml +++ b/res/values-cs/strings.xml @@ -63,8 +63,6 @@ "ňñ" "čç" "ýÿ" - - "Podržením klávesy zobrazíte diakritiku (ž, á atd.)" "Stisknutím klávesy Zpět ↶ můžete klávesnici kdykoli zavřít" "Přístup k číslům a symbolům" diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml index 703fe9caa..02350f7f3 100644 --- a/res/values-de/strings.xml +++ b/res/values-de/strings.xml @@ -63,8 +63,6 @@ "ñ" "ç" "ýÿ" - - "Zur Anzeige von Umlauten (ä, ö usw.) Taste gedrückt halten" "Zum Schließen der Tastatur ↶ drücken" "Auf Zahlen und Symbole zugreifen" diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml index 277f6864d..c3079c5f4 100644 --- a/res/values-es/strings.xml +++ b/res/values-es/strings.xml @@ -63,8 +63,6 @@ "ñ" "ç" "ýÿ" - - "Mantén pulsada una tecla para ver los caracteres acentuados (ø, ö, etc.)." "Pulsa la tecla \"Atrás\" ↶ para cerrar el teclado en cualquier momento." "Acceso a números y símbolos" diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml index fca407b44..63169043e 100644 --- a/res/values-fr/strings.xml +++ b/res/values-fr/strings.xml @@ -63,8 +63,6 @@ "ñ" "ç" "ýÿ" - - "Maintenir une touche enfoncée pour afficher les accents (à, é, etc.)" "Appuyez sur la touche Retour ↶ pour fermer le clavier à tout moment." "Accéder aux chiffres et symboles" diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml index b332d659e..d154c90aa 100644 --- a/res/values-it/strings.xml +++ b/res/values-it/strings.xml @@ -63,8 +63,6 @@ "ñ" "ç" "ýÿ" - - "Tieni premuto un tasto per vedere le lettere con segni diacritici (ø, ö etc.)" "Premi il tasto Indietro ↶ per chiudere la tastiera in qualsiasi punto" "Accedi a numeri e simboli" diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml index 97e7b59c0..306529e18 100644 --- a/res/values-ja/strings.xml +++ b/res/values-ja/strings.xml @@ -63,8 +63,6 @@ "ñ" "ç" "ýÿ" - - "キー長押しでアクセント文字を表示（ø、öなど）" "戻るキーでキーボードを閉じます" "数字と記号" diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml index 654a1f04b..32d5d157e 100644 --- a/res/values-ko/strings.xml +++ b/res/values-ko/strings.xml @@ -63,8 +63,6 @@ "ñ" "ç" "ýÿ" - - "키를 길게 누르면 악센트(ø, ö 등)가 표시됩니다." "키보드를 닫으려면 언제든지 뒤로 키(↶)를 누르세요." "숫자 및 기호 액세스" diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml index 87273dd2f..6c7852a37 100644 --- a/res/values-nb/strings.xml +++ b/res/values-nb/strings.xml @@ -72,8 +72,6 @@ "ñ" "ç" "ýÿ" - - "Hold en tast nede for å se aksenterte tegn (ø, ö, osv.)" "Trykk tilbakeknappen, ↶, for å lukke tastaturet" "Få tilgang til tall og symboler" diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml index 467fdbc21..6e4b93397 100644 --- a/res/values-nl/strings.xml +++ b/res/values-nl/strings.xml @@ -63,8 +63,6 @@ "ñ" "ç" "ýÿ" - - "Houd een toets ingedrukt om diakritische tekens weer te geven (ø, ö, enzovoort)" "Druk op elk gewenst moment op de toets Terug ↶ om het toetsenbord te sluiten" "Toegang tot cijfers en symbolen" diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml index 2cbf13173..12ed05ab8 100644 --- a/res/values-pl/strings.xml +++ b/res/values-pl/strings.xml @@ -63,8 +63,6 @@ "ñ" "ç" "ýÿ" - - "Przytrzymaj klawisz, aby wyświetlić znaki akcentowane (ø, ö itp.)" "Naciśnij klawisz cofania ↶, aby zamknąć klawiaturę w dowolnym momencie" "Przejdź do cyfr i symboli" diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml index 644909929..672aa77c1 100644 --- a/res/values-ru/strings.xml +++ b/res/values-ru/strings.xml @@ -63,8 +63,6 @@ "ñ" "ç" "ýÿ" - - "Удерживайте клавишу, чтобы увидеть варианты с диакритическими знаками (ø, ö и т.д.)" "Нажмите клавишу \"Назад\" ↶, чтобы закрыть клавиатуру в любой момент" "Открыть цифры и символы" diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml index 789656d42..ac6c6d96b 100644 --- a/res/values-zh-rCN/strings.xml +++ b/res/values-zh-rCN/strings.xml @@ -69,8 +69,6 @@ "ñ" "ç" "ýÿ" - - "按住某个键可以查看重音符号（ø、ö 等）" "随时可以通过按后退键 ↶ 关闭键盘" "访问数字和符号" diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml index 8e67b340d..0d6285c66 100644 --- a/res/values-zh-rTW/strings.xml +++ b/res/values-zh-rTW/strings.xml @@ -69,8 +69,6 @@ "ñ" "ç" "ýÿ" - - "按住按鍵可查看重音符號 (ø、ö 等)" "隨時可以透過按後退鍵 ↶ 關閉鍵盤" "使用數字和符號" From edbab867fda21e94110868bb6a5dffd51eadcedb Mon Sep 17 00:00:00 2001 From: Eric Fischer <> Date: Mon, 13 Apr 2009 17:16:21 -0700 Subject: [PATCH 23/26] AI 146037: Import updated translations. Automated import of CL 146037 --- res/values-es/strings.xml | 2 +- res/values-pl/strings.xml | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml index c3079c5f4..91453a823 100644 --- a/res/values-es/strings.xml +++ b/res/values-es/strings.xml @@ -76,7 +76,7 @@ "Mantén pulsada esta tecla para cambiar la configuración del teclado como, por ejemplo, la opción de autocompletar""." "¡Pruébalo!" "Ir" - "Siguiente" + "Sig." "Hecho" "Enviar" "?123" diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml index 12ed05ab8..de8025f28 100644 --- a/res/values-pl/strings.xml +++ b/res/values-pl/strings.xml @@ -69,11 +69,11 @@ "Naciśnij i przytrzymaj słowo po lewej stronie w celu dodania go do słownika" "Dotknij tej podpowiedzi, aby kontynuować »" "Dotknij tutaj, aby zamknąć tę podpowiedź i zacząć pisać!" - "Klawiatura jest otwierana po każdym dotknięciu pola tekstowego" - "Dotknij i przytrzymaj klawisz, aby wyświetlić znaki akcentowane"\n"(ø, ö, ô, ó itd.)" - "Przełącz na cyfry i symbole, dotykając tego klawisza" - "Wróć do trybu liter, dotykając ponownie tego klawisza" - "Dotknij i przytrzymaj ten klawisz, aby zmienić ustawienia klawiatury, takie jak autouzupełnianie" + "Klawiatura jest otwierana po każdym dotknięciu pola tekstowego." + "Dotknij i przytrzymaj klawisz, aby wyświetlić znaki akcentowane"\n"(ø, ö, ô, ó itd.)." + "Przełącz na cyfry i symbole, dotykając tego klawisza." + "Wróć do trybu liter, dotykając ponownie tego klawisza." + "Dotknij i przytrzymaj ten klawisz, aby zmienić ustawienia klawiatury, takie jak autouzupełnianie." "Wypróbuj!" "Przejdź" "Dalej" From 6e137f4534fe853a5443203dae3152a202eccb89 Mon Sep 17 00:00:00 2001 From: Eric Fischer <> Date: Tue, 14 Apr 2009 12:10:44 -0700 Subject: [PATCH 24/26] AI 146175: Import updated translations. Automated import of CL 146175 --- res/values-de/strings.xml | 18 +++++++++++------- res/values-es/strings.xml | 16 +++++++++------- res/values-fr/strings.xml | 12 ++++++------ res/values-it/strings.xml | 14 +++++++------- res/values-nl/strings.xml | 2 +- 5 files changed, 34 insertions(+), 28 deletions(-) diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml index 02350f7f3..84f24a67c 100644 --- a/res/values-de/strings.xml +++ b/res/values-de/strings.xml @@ -54,15 +54,19 @@ "%s : Gespeichert" - "àáâãäåæ" - "èéêë" - "ìíîï" - "òóôõöœø" - "ùúûü" + "ä" + + + + + "ö" + "ü" "§ß" "ñ" - "ç" - "ýÿ" + + + + "Zur Anzeige von Umlauten (ä, ö usw.) Taste gedrückt halten" "Zum Schließen der Tastatur ↶ drücken" "Auf Zahlen und Symbole zugreifen" diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml index 91453a823..e561db920 100644 --- a/res/values-es/strings.xml +++ b/res/values-es/strings.xml @@ -54,15 +54,17 @@ "%s : Guardada" - "àáâãäåæ" - "èéêë" - "ìíîï" - "òóôõöœø" - "ùúûü" - "§ß" + "á" + "é" + "í" + "ó" + "úü" + + "ñ" "ç" - "ýÿ" + + "Mantén pulsada una tecla para ver los caracteres acentuados (ø, ö, etc.)." "Pulsa la tecla \"Atrás\" ↶ para cerrar el teclado en cualquier momento." "Acceso a números y símbolos" diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml index 63169043e..3a62d6612 100644 --- a/res/values-fr/strings.xml +++ b/res/values-fr/strings.xml @@ -31,7 +31,7 @@ "Saisie semi-automatique" "Agrandir le champ de texte" "Masquer la saisie prédictive en mode paysage" - "Majuscules automatiques" + "Majuscules auto" "Mettre en majuscule la première lettre de chaque phrase" "Ponctuation automatique" @@ -41,7 +41,7 @@ "Afficher les suggestions" "Afficher les suggestions de terme lors de la saisie" "Saisie semi-automatique" - "La barre d\'espace et la ponctuation insèrent les termes en surbrillance." + "La barre d\'espace et la ponctuation insèrent auto. le terme en surbrillance." "Aucun" "Simple" @@ -67,9 +67,9 @@ "Appuyez sur la touche Retour ↶ pour fermer le clavier à tout moment." "Accéder aux chiffres et symboles" "Appuyer et maintenir le doigt sur le mot le plus à gauche pour l\'ajouter au dictionnaire" - "Appuyez sur ce conseil pour continuer »" - "Appuyez ici pour fermer ce conseil et commencer à saisir votre texte." - "Le clavier s\'affiche à chaque fois que vous appuyez sur une zone de texte." + "Touchez ce conseil pour continuer »" + "Touchez ici pour fermer ce conseil et commencer à saisir votre texte." + "Le clavier s\'affiche à chaque fois que vous touchez une zone de texte." "Maintenez une touche enfoncée pour afficher les accents"\n"(ø, ö, ô, ó, etc.)" "Appuyez sur cette touche pour basculer vers les chiffres et les symboles." "Retourner au clavier en appuyant de nouveau sur cette touche" @@ -77,7 +77,7 @@ "Essayez !" "OK" "Suivant" - "Terminé" + "OK" "Envoyer" "?123" "123" diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml index d154c90aa..6728c378d 100644 --- a/res/values-it/strings.xml +++ b/res/values-it/strings.xml @@ -40,7 +40,7 @@ "Corregge gli errori di digitazione più comuni" "Mostra suggerimenti" "Visualizza le parole suggerite durante la digitazione" - "Completamento automatico" + "Completamento autom." "La barra spaziatrice e la punteggiatura inseriscono automaticamente la parola evidenziata" "Nessuna" @@ -54,12 +54,12 @@ "%s : parola salvata" - "àáâãäåæ" - "èéêë" - "ìíîï" - "òóôõöœø" - "ùúûü" - "§ß" + "àá" + "èé" + "ìí" + "òó" + "ùú" + "§" "ñ" "ç" "ýÿ" diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml index 6e4b93397..73d5e3fd4 100644 --- a/res/values-nl/strings.xml +++ b/res/values-nl/strings.xml @@ -70,7 +70,7 @@ "Raak deze tip aan om door te gaan »" "Raak dit punt aan om deze tip te sluiten en te beginnen met typen." "Het toetsenbord wordt geopend wanneer u een tekstveld aanraakt" - "Blijf een toets aanraken om diakritische tekens weer te geven"\n" (ø, ö, ô, ó, enzovoort)" + "Blijf een toets aanraken om diakritische tekens weer te geven"\n"(ø, ö, ô, ó, enzovoort)" "Schakel over naar cijfers en symbolen door deze toets aan te raken" "Ga terug naar letters door deze toets nogmaals aan te raken" "Blijf deze toets aanraken om toetsenbordinstellingen te wijzigen, zoals auto-aanvullen" From 53cbd3a1e5818922b6c3cd00f409dd6afa2141c7 Mon Sep 17 00:00:00 2001 From: Eric Fischer <> Date: Wed, 15 Apr 2009 13:30:20 -0700 Subject: [PATCH 25/26] AI 146365: Import revised translations. DO NOT MERGE Automated import of CL 146365 --- res/values-fr/strings.xml | 2 +- res/values-it/strings.xml | 4 ++-- res/values-ja/strings.xml | 2 +- res/values-nb/strings.xml | 45 +++++++++++++-------------------------- 4 files changed, 19 insertions(+), 34 deletions(-) diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml index 3a62d6612..282f9a768 100644 --- a/res/values-fr/strings.xml +++ b/res/values-fr/strings.xml @@ -41,7 +41,7 @@ "Afficher les suggestions" "Afficher les suggestions de terme lors de la saisie" "Saisie semi-automatique" - "La barre d\'espace et la ponctuation insèrent auto. le terme en surbrillance." + "La barre d\'espace/ponctuation insèrent auto. le terme surligné." "Aucun" "Simple" diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml index 6728c378d..112acc198 100644 --- a/res/values-it/strings.xml +++ b/res/values-it/strings.xml @@ -41,7 +41,7 @@ "Mostra suggerimenti" "Visualizza le parole suggerite durante la digitazione" "Completamento autom." - "La barra spaziatrice e la punteggiatura inseriscono automaticamente la parola evidenziata" + "Barra spaziatrice e punteggiatura inseriscono la parola evidenziata" "Nessuna" "Base" @@ -64,7 +64,7 @@ "ç" "ýÿ" "Tieni premuto un tasto per vedere le lettere con segni diacritici (ø, ö etc.)" - "Premi il tasto Indietro ↶ per chiudere la tastiera in qualsiasi punto" + "Premi il tasto Indietro ↶ per chiudere la tastiera" "Accedi a numeri e simboli" "Tieni premuto sulla parola all\'estrema sinistra per aggiungerla al dizionario" "Tocca questo suggerimento per continuare »" diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml index 306529e18..53bc60f25 100644 --- a/res/values-ja/strings.xml +++ b/res/values-ja/strings.xml @@ -41,7 +41,7 @@ "入力候補を表示" "入力時に入力候補を表示します" "オートコンプリート" - "スペースまたは句読点キーを押すと、ハイライトされたキーワードが自動入力されます" + "スペースまたは句読点キーで反転表示されている変換候補を挿入する" "なし" "基本" diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml index 6c7852a37..28df4d45a 100644 --- a/res/values-nb/strings.xml +++ b/res/values-nb/strings.xml @@ -36,18 +36,12 @@ "Automatisk punktum" - - - - - - - - - - - - + "Autokorrektur" + "Retter vanlige stavefeil" + "Vis forslag" + "Vis foreslåtte ord under skriving" + "Autokomplettering" + "Mellomrom og punktum setter automatisk inn valgt ord" "Ingen" "Grunnleggende" @@ -76,27 +70,18 @@ "Trykk tilbakeknappen, ↶, for å lukke tastaturet" "Få tilgang til tall og symboler" "Trykk lenge på ordet lengst til venstre for å legge det til i ordlisten" - - - - - - - - - - - - - - - - + "Trykk på dette hintet for å forsette »" + "Trykk her for å lukke dette hintet og begynne å skrive!" + "Tastaturet åpnes når du tar på et tekstfelt" + "Trykk på og hold nede en tast for å se aksenter"\n"(ø, ö, ô, ó, osv.)" + "Bytt til tall og symboler ved å trykke på denne tasten" + "Gå tilbake til bokstaver igjen ved å trykke på denne tasten" + "Trykk på og hold nede denne tasten for å endre tastaturinnstillinger, som autofullføring" + "Prøv det!" "Gå" "Neste" "Utfør" - - + "Send" "?123" "123" "ABC" From f693aec2b57b0d478381a52e7e0cdbdb68e6195b Mon Sep 17 00:00:00 2001 From: Eric Fischer <> Date: Wed, 22 Apr 2009 12:33:56 -0700 Subject: [PATCH 26/26] AI 147406: Import revised translations. Automated import of CL 147406 --- res/values-pl/strings.xml | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml index de8025f28..a10731c1d 100644 --- a/res/values-pl/strings.xml +++ b/res/values-pl/strings.xml @@ -17,8 +17,8 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> "Klawiatura Android" "Ustawienia klawiatury Android" - "Wibruj przy naciśnięciu klawisza" - "Dźwięk przy naciśnięciu klawisza" + "Wibracja przy naciśnięciu" + "Dźwięk przy naciśnięciu" "Popraw błędy pisowni" "Włącz poprawianie błędów wprowadzania" "Błędy wprowadzania w orientacji poziomej" @@ -31,7 +31,7 @@ "Autouzupełnianie" "Zwiększ rozmiar pola tekstowego" "Wyłącz propozycje słów w orientacji poziomej" - "Automatyczna zamiana na wielkie litery" + "Wstawiaj wielkie litery" "Zamieniaj na wielką pierwszą literę zdania" "Automatyczna interpunkcja" @@ -41,7 +41,7 @@ "Pokaż sugestie" "Wyświetl sugerowane słowa podczas wpisywania" "Autouzupełnianie" - "Spacja i znaki przestankowe automatycznie wstawiają wyróżnione słowo" + "Spacja i znaki przestankowe wstawiają wyróżnione słowo" "Brak" "Podstawowy" @@ -54,23 +54,23 @@ "%s : Zapisano" - "àáâãäåæ" - "èéêë" - "ìíîï" - "òóôõöœø" - "ùúûü" - "§ß" - "ñ" - "ç" - "ýÿ" - "Przytrzymaj klawisz, aby wyświetlić znaki akcentowane (ø, ö itp.)" + "ą" + "ę" + "" + "ó" + "" + "ś" + "ń" + "ć" + "" + "Przytrzymaj klawisz, aby wyświetlić znaki akcentowane (ą, ó itp.)" "Naciśnij klawisz cofania ↶, aby zamknąć klawiaturę w dowolnym momencie" "Przejdź do cyfr i symboli" "Naciśnij i przytrzymaj słowo po lewej stronie w celu dodania go do słownika" "Dotknij tej podpowiedzi, aby kontynuować »" "Dotknij tutaj, aby zamknąć tę podpowiedź i zacząć pisać!" "Klawiatura jest otwierana po każdym dotknięciu pola tekstowego." - "Dotknij i przytrzymaj klawisz, aby wyświetlić znaki akcentowane"\n"(ø, ö, ô, ó itd.)." + "Dotknij i przytrzymaj klawisz, aby wyświetlić znaki akcentowane"\n"(ą, ę, ł, ó itd.)." "Przełącz na cyfry i symbole, dotykając tego klawisza." "Wróć do trybu liter, dotykając ponownie tego klawisza." "Dotknij i przytrzymaj ten klawisz, aby zmienić ustawienia klawiatury, takie jak autouzupełnianie."