diff options
Diffstat (limited to 'java')
80 files changed, 26 insertions, 34 deletions
diff --git a/java/res/drawable-hdpi/btn_keyboard_key_light_popup_normal.9.png b/java/res/drawable-hdpi/btn_keyboard_key_light_popup_normal.9.png Binary files differindex 959c6d14a..66f83ebd3 100644 --- a/java/res/drawable-hdpi/btn_keyboard_key_light_popup_normal.9.png +++ b/java/res/drawable-hdpi/btn_keyboard_key_light_popup_normal.9.png diff --git a/java/res/drawable-hdpi/btn_keyboard_key_light_pressed.9.png b/java/res/drawable-hdpi/btn_keyboard_key_light_pressed.9.png Binary files differindex 597eb15b2..46c40a4cb 100644 --- a/java/res/drawable-hdpi/btn_keyboard_key_light_pressed.9.png +++ b/java/res/drawable-hdpi/btn_keyboard_key_light_pressed.9.png diff --git a/java/res/drawable-hdpi/cancel.png b/java/res/drawable-hdpi/cancel.png Binary files differindex 506cf99d0..506cf99d0 100755..100644 --- a/java/res/drawable-hdpi/cancel.png +++ b/java/res/drawable-hdpi/cancel.png diff --git a/java/res/drawable-hdpi/candidate_feedback_background.9.png b/java/res/drawable-hdpi/candidate_feedback_background.9.png Binary files differindex 203c4e640..203c4e640 100755..100644 --- a/java/res/drawable-hdpi/candidate_feedback_background.9.png +++ b/java/res/drawable-hdpi/candidate_feedback_background.9.png diff --git a/java/res/drawable-hdpi/caution.png b/java/res/drawable-hdpi/caution.png Binary files differindex 5cb6c54b9..5cb6c54b9 100755..100644 --- a/java/res/drawable-hdpi/caution.png +++ b/java/res/drawable-hdpi/caution.png diff --git a/java/res/drawable-hdpi/dialog_bubble_step02.9.png b/java/res/drawable-hdpi/dialog_bubble_step02.9.png Binary files differindex b338364c5..b338364c5 100755..100644 --- a/java/res/drawable-hdpi/dialog_bubble_step02.9.png +++ b/java/res/drawable-hdpi/dialog_bubble_step02.9.png diff --git a/java/res/drawable-hdpi/dialog_bubble_step07.9.png b/java/res/drawable-hdpi/dialog_bubble_step07.9.png Binary files differindex 94b915432..94b915432 100755..100644 --- a/java/res/drawable-hdpi/dialog_bubble_step07.9.png +++ b/java/res/drawable-hdpi/dialog_bubble_step07.9.png diff --git a/java/res/drawable-hdpi/ic_dialog_keyboard.png b/java/res/drawable-hdpi/ic_dialog_keyboard.png Binary files differindex c7729566c..c7729566c 100755..100644 --- a/java/res/drawable-hdpi/ic_dialog_keyboard.png +++ b/java/res/drawable-hdpi/ic_dialog_keyboard.png diff --git a/java/res/drawable-hdpi/ic_subtype_keyboard.png b/java/res/drawable-hdpi/ic_subtype_keyboard.png Binary files differindex 7015e266a..7015e266a 100755..100644 --- a/java/res/drawable-hdpi/ic_subtype_keyboard.png +++ b/java/res/drawable-hdpi/ic_subtype_keyboard.png diff --git a/java/res/drawable-hdpi/keyboard_background.9.png b/java/res/drawable-hdpi/keyboard_background.9.png Binary files differindex edffac5b8..edffac5b8 100755..100644 --- a/java/res/drawable-hdpi/keyboard_background.9.png +++ b/java/res/drawable-hdpi/keyboard_background.9.png diff --git a/java/res/drawable-hdpi/keyboard_dark_background.9.png b/java/res/drawable-hdpi/keyboard_dark_background.9.png Binary files differindex 2d5c02080..2d5c02080 100755..100644 --- a/java/res/drawable-hdpi/keyboard_dark_background.9.png +++ b/java/res/drawable-hdpi/keyboard_dark_background.9.png diff --git a/java/res/drawable-hdpi/keyboard_key_feedback_background.9.png b/java/res/drawable-hdpi/keyboard_key_feedback_background.9.png Binary files differindex 92b478854..dd0ce95c7 100644 --- a/java/res/drawable-hdpi/keyboard_key_feedback_background.9.png +++ b/java/res/drawable-hdpi/keyboard_key_feedback_background.9.png diff --git a/java/res/drawable-hdpi/keyboard_key_feedback_more_background.9.png b/java/res/drawable-hdpi/keyboard_key_feedback_more_background.9.png Binary files differindex cfeeefb22..e14f25c1a 100644 --- a/java/res/drawable-hdpi/keyboard_key_feedback_more_background.9.png +++ b/java/res/drawable-hdpi/keyboard_key_feedback_more_background.9.png diff --git a/java/res/drawable-hdpi/keyboard_suggest_strip.9.png b/java/res/drawable-hdpi/keyboard_suggest_strip.9.png Binary files differindex 0ccdb6ab2..0ccdb6ab2 100755..100644 --- a/java/res/drawable-hdpi/keyboard_suggest_strip.9.png +++ b/java/res/drawable-hdpi/keyboard_suggest_strip.9.png diff --git a/java/res/drawable-hdpi/mic_slash.png b/java/res/drawable-hdpi/mic_slash.png Binary files differindex dc8da6252..dc8da6252 100755..100644 --- a/java/res/drawable-hdpi/mic_slash.png +++ b/java/res/drawable-hdpi/mic_slash.png diff --git a/java/res/drawable-hdpi/ok_cancel.png b/java/res/drawable-hdpi/ok_cancel.png Binary files differindex f11e57a38..f11e57a38 100755..100644 --- a/java/res/drawable-hdpi/ok_cancel.png +++ b/java/res/drawable-hdpi/ok_cancel.png diff --git a/java/res/drawable-hdpi/speak_now_level0.png b/java/res/drawable-hdpi/speak_now_level0.png Binary files differindex 342849cfe..342849cfe 100755..100644 --- a/java/res/drawable-hdpi/speak_now_level0.png +++ b/java/res/drawable-hdpi/speak_now_level0.png diff --git a/java/res/drawable-hdpi/speak_now_level1.png b/java/res/drawable-hdpi/speak_now_level1.png Binary files differindex 8947a4306..8947a4306 100755..100644 --- a/java/res/drawable-hdpi/speak_now_level1.png +++ b/java/res/drawable-hdpi/speak_now_level1.png diff --git a/java/res/drawable-hdpi/speak_now_level2.png b/java/res/drawable-hdpi/speak_now_level2.png Binary files differindex 44fc58c4e..44fc58c4e 100755..100644 --- a/java/res/drawable-hdpi/speak_now_level2.png +++ b/java/res/drawable-hdpi/speak_now_level2.png diff --git a/java/res/drawable-hdpi/speak_now_level3.png b/java/res/drawable-hdpi/speak_now_level3.png Binary files differindex cfa5c1b87..cfa5c1b87 100755..100644 --- a/java/res/drawable-hdpi/speak_now_level3.png +++ b/java/res/drawable-hdpi/speak_now_level3.png diff --git a/java/res/drawable-hdpi/speak_now_level4.png b/java/res/drawable-hdpi/speak_now_level4.png Binary files differindex a050d8836..a050d8836 100755..100644 --- a/java/res/drawable-hdpi/speak_now_level4.png +++ b/java/res/drawable-hdpi/speak_now_level4.png diff --git a/java/res/drawable-hdpi/speak_now_level5.png b/java/res/drawable-hdpi/speak_now_level5.png Binary files differindex 8cd5ae7ad..8cd5ae7ad 100755..100644 --- a/java/res/drawable-hdpi/speak_now_level5.png +++ b/java/res/drawable-hdpi/speak_now_level5.png diff --git a/java/res/drawable-hdpi/speak_now_level6.png b/java/res/drawable-hdpi/speak_now_level6.png Binary files differindex 9f4481eb4..9f4481eb4 100755..100644 --- a/java/res/drawable-hdpi/speak_now_level6.png +++ b/java/res/drawable-hdpi/speak_now_level6.png diff --git a/java/res/drawable-hdpi/sym_keyboard_done.png b/java/res/drawable-hdpi/sym_keyboard_done.png Binary files differindex 471c5021b..471c5021b 100755..100644 --- a/java/res/drawable-hdpi/sym_keyboard_done.png +++ b/java/res/drawable-hdpi/sym_keyboard_done.png diff --git a/java/res/drawable-hdpi/sym_keyboard_feedback_done.png b/java/res/drawable-hdpi/sym_keyboard_feedback_done.png Binary files differindex 7015e266a..7015e266a 100755..100644 --- a/java/res/drawable-hdpi/sym_keyboard_feedback_done.png +++ b/java/res/drawable-hdpi/sym_keyboard_feedback_done.png diff --git a/java/res/drawable-hdpi/sym_keyboard_feedback_mic.png b/java/res/drawable-hdpi/sym_keyboard_feedback_mic.png Binary files differindex f82c33ae3..f82c33ae3 100755..100644 --- a/java/res/drawable-hdpi/sym_keyboard_feedback_mic.png +++ b/java/res/drawable-hdpi/sym_keyboard_feedback_mic.png diff --git a/java/res/drawable-hdpi/sym_keyboard_feedback_search.png b/java/res/drawable-hdpi/sym_keyboard_feedback_search.png Binary files differindex 337f9e4fe..337f9e4fe 100755..100644 --- a/java/res/drawable-hdpi/sym_keyboard_feedback_search.png +++ b/java/res/drawable-hdpi/sym_keyboard_feedback_search.png diff --git a/java/res/drawable-hdpi/sym_keyboard_feedback_settings.png b/java/res/drawable-hdpi/sym_keyboard_feedback_settings.png Binary files differindex 7dee8984f..b72ec7bc0 100755..100644 --- a/java/res/drawable-hdpi/sym_keyboard_feedback_settings.png +++ b/java/res/drawable-hdpi/sym_keyboard_feedback_settings.png diff --git a/java/res/drawable-hdpi/sym_keyboard_feedback_shift.png b/java/res/drawable-hdpi/sym_keyboard_feedback_shift.png Binary files differindex 4484d0306..5f319f5c6 100755..100644 --- a/java/res/drawable-hdpi/sym_keyboard_feedback_shift.png +++ b/java/res/drawable-hdpi/sym_keyboard_feedback_shift.png diff --git a/java/res/drawable-hdpi/sym_keyboard_feedback_shift_locked.png b/java/res/drawable-hdpi/sym_keyboard_feedback_shift_locked.png Binary files differindex 26000da50..26000da50 100755..100644 --- a/java/res/drawable-hdpi/sym_keyboard_feedback_shift_locked.png +++ b/java/res/drawable-hdpi/sym_keyboard_feedback_shift_locked.png diff --git a/java/res/drawable-hdpi/sym_keyboard_feedback_space.png b/java/res/drawable-hdpi/sym_keyboard_feedback_space.png Binary files differindex 70debca9b..70debca9b 100755..100644 --- a/java/res/drawable-hdpi/sym_keyboard_feedback_space.png +++ b/java/res/drawable-hdpi/sym_keyboard_feedback_space.png diff --git a/java/res/drawable-hdpi/sym_keyboard_feedback_tab.png b/java/res/drawable-hdpi/sym_keyboard_feedback_tab.png Binary files differindex d2efb1619..d2efb1619 100755..100644 --- a/java/res/drawable-hdpi/sym_keyboard_feedback_tab.png +++ b/java/res/drawable-hdpi/sym_keyboard_feedback_tab.png diff --git a/java/res/drawable-hdpi/sym_keyboard_mic.png b/java/res/drawable-hdpi/sym_keyboard_mic.png Binary files differindex c8dca62a0..c8dca62a0 100755..100644 --- a/java/res/drawable-hdpi/sym_keyboard_mic.png +++ b/java/res/drawable-hdpi/sym_keyboard_mic.png diff --git a/java/res/drawable-hdpi/sym_keyboard_num0.png b/java/res/drawable-hdpi/sym_keyboard_num0.png Binary files differindex 10ac70b9d..10ac70b9d 100755..100644 --- a/java/res/drawable-hdpi/sym_keyboard_num0.png +++ b/java/res/drawable-hdpi/sym_keyboard_num0.png diff --git a/java/res/drawable-hdpi/sym_keyboard_num1.png b/java/res/drawable-hdpi/sym_keyboard_num1.png Binary files differindex 0fc03efa5..0fc03efa5 100755..100644 --- a/java/res/drawable-hdpi/sym_keyboard_num1.png +++ b/java/res/drawable-hdpi/sym_keyboard_num1.png diff --git a/java/res/drawable-hdpi/sym_keyboard_num2.png b/java/res/drawable-hdpi/sym_keyboard_num2.png Binary files differindex 283560b35..283560b35 100755..100644 --- a/java/res/drawable-hdpi/sym_keyboard_num2.png +++ b/java/res/drawable-hdpi/sym_keyboard_num2.png diff --git a/java/res/drawable-hdpi/sym_keyboard_num3.png b/java/res/drawable-hdpi/sym_keyboard_num3.png Binary files differindex 9a3b3294b..9a3b3294b 100755..100644 --- a/java/res/drawable-hdpi/sym_keyboard_num3.png +++ b/java/res/drawable-hdpi/sym_keyboard_num3.png diff --git a/java/res/drawable-hdpi/sym_keyboard_num4.png b/java/res/drawable-hdpi/sym_keyboard_num4.png Binary files differindex f13ff1ae9..f13ff1ae9 100755..100644 --- a/java/res/drawable-hdpi/sym_keyboard_num4.png +++ b/java/res/drawable-hdpi/sym_keyboard_num4.png diff --git a/java/res/drawable-hdpi/sym_keyboard_num5.png b/java/res/drawable-hdpi/sym_keyboard_num5.png Binary files differindex c251329fa..c251329fa 100755..100644 --- a/java/res/drawable-hdpi/sym_keyboard_num5.png +++ b/java/res/drawable-hdpi/sym_keyboard_num5.png diff --git a/java/res/drawable-hdpi/sym_keyboard_num6.png b/java/res/drawable-hdpi/sym_keyboard_num6.png Binary files differindex 4acba4c91..4acba4c91 100755..100644 --- a/java/res/drawable-hdpi/sym_keyboard_num6.png +++ b/java/res/drawable-hdpi/sym_keyboard_num6.png diff --git a/java/res/drawable-hdpi/sym_keyboard_num7.png b/java/res/drawable-hdpi/sym_keyboard_num7.png Binary files differindex 14931c18c..14931c18c 100755..100644 --- a/java/res/drawable-hdpi/sym_keyboard_num7.png +++ b/java/res/drawable-hdpi/sym_keyboard_num7.png diff --git a/java/res/drawable-hdpi/sym_keyboard_num8.png b/java/res/drawable-hdpi/sym_keyboard_num8.png Binary files differindex d4973fdc9..d4973fdc9 100755..100644 --- a/java/res/drawable-hdpi/sym_keyboard_num8.png +++ b/java/res/drawable-hdpi/sym_keyboard_num8.png diff --git a/java/res/drawable-hdpi/sym_keyboard_num9.png b/java/res/drawable-hdpi/sym_keyboard_num9.png Binary files differindex 49cec66f4..49cec66f4 100755..100644 --- a/java/res/drawable-hdpi/sym_keyboard_num9.png +++ b/java/res/drawable-hdpi/sym_keyboard_num9.png diff --git a/java/res/drawable-hdpi/sym_keyboard_numalt.png b/java/res/drawable-hdpi/sym_keyboard_numalt.png Binary files differindex 3cc5311cd..3cc5311cd 100755..100644 --- a/java/res/drawable-hdpi/sym_keyboard_numalt.png +++ b/java/res/drawable-hdpi/sym_keyboard_numalt.png diff --git a/java/res/drawable-hdpi/sym_keyboard_numpound.png b/java/res/drawable-hdpi/sym_keyboard_numpound.png Binary files differindex d09133929..d09133929 100755..100644 --- a/java/res/drawable-hdpi/sym_keyboard_numpound.png +++ b/java/res/drawable-hdpi/sym_keyboard_numpound.png diff --git a/java/res/drawable-hdpi/sym_keyboard_numstar.png b/java/res/drawable-hdpi/sym_keyboard_numstar.png Binary files differindex e838e169f..e838e169f 100755..100644 --- a/java/res/drawable-hdpi/sym_keyboard_numstar.png +++ b/java/res/drawable-hdpi/sym_keyboard_numstar.png diff --git a/java/res/drawable-hdpi/sym_keyboard_return.png b/java/res/drawable-hdpi/sym_keyboard_return.png Binary files differindex 9d97e1efd..9d97e1efd 100755..100644 --- a/java/res/drawable-hdpi/sym_keyboard_return.png +++ b/java/res/drawable-hdpi/sym_keyboard_return.png diff --git a/java/res/drawable-hdpi/sym_keyboard_search.png b/java/res/drawable-hdpi/sym_keyboard_search.png Binary files differindex 1aa22d7e2..1aa22d7e2 100755..100644 --- a/java/res/drawable-hdpi/sym_keyboard_search.png +++ b/java/res/drawable-hdpi/sym_keyboard_search.png diff --git a/java/res/drawable-hdpi/sym_keyboard_settings.png b/java/res/drawable-hdpi/sym_keyboard_settings.png Binary files differindex d57f7a43a..35d1ed6e6 100755..100644 --- a/java/res/drawable-hdpi/sym_keyboard_settings.png +++ b/java/res/drawable-hdpi/sym_keyboard_settings.png diff --git a/java/res/drawable-hdpi/sym_keyboard_shift.png b/java/res/drawable-hdpi/sym_keyboard_shift.png Binary files differindex 1a64dcce6..f433dca74 100755..100644 --- a/java/res/drawable-hdpi/sym_keyboard_shift.png +++ b/java/res/drawable-hdpi/sym_keyboard_shift.png diff --git a/java/res/drawable-hdpi/sym_keyboard_shift_locked.png b/java/res/drawable-hdpi/sym_keyboard_shift_locked.png Binary files differindex 807e97751..6cb5372bb 100755..100644 --- a/java/res/drawable-hdpi/sym_keyboard_shift_locked.png +++ b/java/res/drawable-hdpi/sym_keyboard_shift_locked.png diff --git a/java/res/drawable-hdpi/sym_keyboard_space.png b/java/res/drawable-hdpi/sym_keyboard_space.png Binary files differindex fcd20de7d..fcd20de7d 100755..100644 --- a/java/res/drawable-hdpi/sym_keyboard_space.png +++ b/java/res/drawable-hdpi/sym_keyboard_space.png diff --git a/java/res/drawable-hdpi/sym_keyboard_space_led.9.png b/java/res/drawable-hdpi/sym_keyboard_space_led.9.png Binary files differindex af5c7d80f..2c6f4a925 100644 --- a/java/res/drawable-hdpi/sym_keyboard_space_led.9.png +++ b/java/res/drawable-hdpi/sym_keyboard_space_led.9.png diff --git a/java/res/drawable-hdpi/sym_keyboard_tab.png b/java/res/drawable-hdpi/sym_keyboard_tab.png Binary files differindex 51d17d989..51d17d989 100755..100644 --- a/java/res/drawable-hdpi/sym_keyboard_tab.png +++ b/java/res/drawable-hdpi/sym_keyboard_tab.png diff --git a/java/res/values-cs/strings.xml b/java/res/values-cs/strings.xml index 877c2019a..e0fbc9b92 100644 --- a/java/res/values-cs/strings.xml +++ b/java/res/values-cs/strings.xml @@ -127,7 +127,6 @@ <string name="popular_domain_2" msgid="3036812463748402878">".org"</string> <string name="popular_domain_3" msgid="8718639560809452028">".net"</string> <string name="popular_domain_4" msgid="35359437471311470">".eu"</string> - <string name="inputMethod" msgid="7854532062009028116">"Metoda zadávání dat"</string> <string name="language_selection_title" msgid="1651299598555326750">"Vstupní jazyky"</string> <string name="language_selection_summary" msgid="187110938289512256">"Jazyk můžete změnit posunutím prstu po mezerníku."</string> <string name="hint_add_to_dictionary" msgid="8058519710062071085">"← Uložte slovo opětovným klepnutím"</string> diff --git a/java/res/values-da/strings.xml b/java/res/values-da/strings.xml index 78941429c..0b0aff254 100644 --- a/java/res/values-da/strings.xml +++ b/java/res/values-da/strings.xml @@ -127,7 +127,6 @@ <string name="popular_domain_2" msgid="3036812463748402878">".org"</string> <string name="popular_domain_3" msgid="8718639560809452028">".gov"</string> <string name="popular_domain_4" msgid="35359437471311470">".edu"</string> - <string name="inputMethod" msgid="7854532062009028116">"Inputmetode"</string> <string name="language_selection_title" msgid="1651299598555326750">"Inputsprog"</string> <string name="language_selection_summary" msgid="187110938289512256">"Træk fingeren på mellemrumstasten for at skifte sprog"</string> <string name="hint_add_to_dictionary" msgid="8058519710062071085">"← Tast igen for at gemme"</string> diff --git a/java/res/values-de/strings.xml b/java/res/values-de/strings.xml index dc3151df9..b0ae766f1 100644 --- a/java/res/values-de/strings.xml +++ b/java/res/values-de/strings.xml @@ -127,7 +127,6 @@ <string name="popular_domain_2" msgid="3036812463748402878">".org"</string> <string name="popular_domain_3" msgid="8718639560809452028">".gov"</string> <string name="popular_domain_4" msgid="35359437471311470">".edu"</string> - <string name="inputMethod" msgid="7854532062009028116">"Eingabemethode"</string> <string name="language_selection_title" msgid="1651299598555326750">"Eingabesprachen"</string> <string name="language_selection_summary" msgid="187110938289512256">"Finger über die Leertaste bewegen, um die Eingabesprache zu wechseln"</string> <string name="hint_add_to_dictionary" msgid="8058519710062071085">"← Zum Speichern erneut tippen"</string> diff --git a/java/res/values-el/strings.xml b/java/res/values-el/strings.xml index de579586b..09a98f413 100644 --- a/java/res/values-el/strings.xml +++ b/java/res/values-el/strings.xml @@ -127,7 +127,6 @@ <string name="popular_domain_2" msgid="3036812463748402878">".org"</string> <string name="popular_domain_3" msgid="8718639560809452028">".gov"</string> <string name="popular_domain_4" msgid="35359437471311470">".edu"</string> - <string name="inputMethod" msgid="7854532062009028116">"Μέθοδος εισόδου"</string> <string name="language_selection_title" msgid="1651299598555326750">"Γλώσσες εισόδου"</string> <string name="language_selection_summary" msgid="187110938289512256">"Σύρετε το δάχτυλο στο πλήκτρο διαστήματος για να αλλάξετε γλώσσα"</string> <string name="hint_add_to_dictionary" msgid="8058519710062071085">"← Πατήστε ξανά για αποθήκευση"</string> diff --git a/java/res/values-es-rUS/strings.xml b/java/res/values-es-rUS/strings.xml index 448feb7cd..effd5b9c2 100644 --- a/java/res/values-es-rUS/strings.xml +++ b/java/res/values-es-rUS/strings.xml @@ -127,7 +127,6 @@ <string name="popular_domain_2" msgid="3036812463748402878">".org"</string> <string name="popular_domain_3" msgid="8718639560809452028">".gov"</string> <string name="popular_domain_4" msgid="35359437471311470">".edu"</string> - <string name="inputMethod" msgid="7854532062009028116">"Método de entrada"</string> <string name="language_selection_title" msgid="1651299598555326750">"Idiomas de entrada"</string> <string name="language_selection_summary" msgid="187110938289512256">"Deslizarse manualmente por la barra espaciadora para cambiar el idioma"</string> <string name="hint_add_to_dictionary" msgid="8058519710062071085">"← Presionar nuevamente para guardar"</string> diff --git a/java/res/values-es/strings.xml b/java/res/values-es/strings.xml index 09114757a..bc98bce92 100644 --- a/java/res/values-es/strings.xml +++ b/java/res/values-es/strings.xml @@ -127,7 +127,6 @@ <string name="popular_domain_2" msgid="3036812463748402878">".org"</string> <string name="popular_domain_3" msgid="8718639560809452028">".gov"</string> <string name="popular_domain_4" msgid="35359437471311470">".edu"</string> - <string name="inputMethod" msgid="7854532062009028116">"Método de introducción de texto"</string> <string name="language_selection_title" msgid="1651299598555326750">"Idiomas"</string> <string name="language_selection_summary" msgid="187110938289512256">"Deslizar el dedo por la barra espaciadora para cambiar el idioma"</string> <string name="hint_add_to_dictionary" msgid="8058519710062071085">"← Volver a tocar para guardar"</string> diff --git a/java/res/values-fr/strings.xml b/java/res/values-fr/strings.xml index d2c7df852..a9f03e56e 100644 --- a/java/res/values-fr/strings.xml +++ b/java/res/values-fr/strings.xml @@ -127,7 +127,6 @@ <string name="popular_domain_2" msgid="3036812463748402878">".org"</string> <string name="popular_domain_3" msgid="8718639560809452028">".gouv"</string> <string name="popular_domain_4" msgid="35359437471311470">".edu"</string> - <string name="inputMethod" msgid="7854532062009028116">"Mode de saisie"</string> <string name="language_selection_title" msgid="1651299598555326750">"Langues de saisie"</string> <string name="language_selection_summary" msgid="187110938289512256">"Faites glisser votre doigt sur la barre d\'espacement pour changer la langue."</string> <string name="hint_add_to_dictionary" msgid="8058519710062071085">"← Appuyer de nouveau pour enregistrer"</string> diff --git a/java/res/values-it/strings.xml b/java/res/values-it/strings.xml index 8acd65aed..2063488be 100644 --- a/java/res/values-it/strings.xml +++ b/java/res/values-it/strings.xml @@ -127,7 +127,6 @@ <string name="popular_domain_2" msgid="3036812463748402878">".org"</string> <string name="popular_domain_3" msgid="8718639560809452028">".gov"</string> <string name="popular_domain_4" msgid="35359437471311470">".edu"</string> - <string name="inputMethod" msgid="7854532062009028116">"Metodo inserimento"</string> <string name="language_selection_title" msgid="1651299598555326750">"Lingue comandi"</string> <string name="language_selection_summary" msgid="187110938289512256">"Scorri il dito sulla barra spaziatrice per cambiare la lingua"</string> <string name="hint_add_to_dictionary" msgid="8058519710062071085">"← Tocca di nuovo per salvare"</string> diff --git a/java/res/values-ja/strings.xml b/java/res/values-ja/strings.xml index e3dbe23cb..e7d3bda7a 100644 --- a/java/res/values-ja/strings.xml +++ b/java/res/values-ja/strings.xml @@ -127,7 +127,6 @@ <string name="popular_domain_2" msgid="3036812463748402878">".org"</string> <string name="popular_domain_3" msgid="8718639560809452028">".gov"</string> <string name="popular_domain_4" msgid="35359437471311470">".edu"</string> - <string name="inputMethod" msgid="7854532062009028116">"入力方法"</string> <string name="language_selection_title" msgid="1651299598555326750">"入力言語"</string> <string name="language_selection_summary" msgid="187110938289512256">"スペースバーで指をスライドさせて言語を変更する"</string> <string name="hint_add_to_dictionary" msgid="8058519710062071085">"←保存するにはもう一度タップ"</string> diff --git a/java/res/values-ko/strings.xml b/java/res/values-ko/strings.xml index 610f165dc..cf8d285e3 100644 --- a/java/res/values-ko/strings.xml +++ b/java/res/values-ko/strings.xml @@ -127,7 +127,6 @@ <string name="popular_domain_2" msgid="3036812463748402878">".org"</string> <string name="popular_domain_3" msgid="8718639560809452028">".gov"</string> <string name="popular_domain_4" msgid="35359437471311470">".edu"</string> - <string name="inputMethod" msgid="7854532062009028116">"입력 방법"</string> <string name="language_selection_title" msgid="1651299598555326750">"입력 언어"</string> <string name="language_selection_summary" msgid="187110938289512256">"손가락을 스페이스바에서 미끄러지듯 움직여 언어 변경"</string> <string name="hint_add_to_dictionary" msgid="8058519710062071085">"← 저장하려면 다시 누르세요."</string> diff --git a/java/res/values-nb/strings.xml b/java/res/values-nb/strings.xml index 786ae242c..7d49c669c 100644 --- a/java/res/values-nb/strings.xml +++ b/java/res/values-nb/strings.xml @@ -127,7 +127,6 @@ <string name="popular_domain_2" msgid="3036812463748402878">".net"</string> <string name="popular_domain_3" msgid="8718639560809452028">".org"</string> <string name="popular_domain_4" msgid="35359437471311470">".info"</string> - <string name="inputMethod" msgid="7854532062009028116">"Inndatametode"</string> <string name="language_selection_title" msgid="1651299598555326750">"Inndataspråk"</string> <string name="language_selection_summary" msgid="187110938289512256">"Dra fingeren på mellomromstasten for å endre språk"</string> <string name="hint_add_to_dictionary" msgid="8058519710062071085">"← Trykk på nytt for å lagre"</string> diff --git a/java/res/values-nl/strings.xml b/java/res/values-nl/strings.xml index ba8840201..d1cfd53ab 100644 --- a/java/res/values-nl/strings.xml +++ b/java/res/values-nl/strings.xml @@ -127,7 +127,6 @@ <string name="popular_domain_2" msgid="3036812463748402878">".org"</string> <string name="popular_domain_3" msgid="8718639560809452028">".gov"</string> <string name="popular_domain_4" msgid="35359437471311470">".edu"</string> - <string name="inputMethod" msgid="7854532062009028116">"Invoermethode"</string> <string name="language_selection_title" msgid="1651299598555326750">"Invoertalen"</string> <string name="language_selection_summary" msgid="187110938289512256">"Schuif uw vinger over de spatiebalk om de taal te wijzigen"</string> <string name="hint_add_to_dictionary" msgid="8058519710062071085">"← Tik nogmaals om op te slaan"</string> diff --git a/java/res/values-pl/strings.xml b/java/res/values-pl/strings.xml index d4f31f737..cfdfcc69d 100644 --- a/java/res/values-pl/strings.xml +++ b/java/res/values-pl/strings.xml @@ -127,7 +127,6 @@ <string name="popular_domain_2" msgid="3036812463748402878">".org"</string> <string name="popular_domain_3" msgid="8718639560809452028">".gov"</string> <string name="popular_domain_4" msgid="35359437471311470">".edu"</string> - <string name="inputMethod" msgid="7854532062009028116">"Metoda wprowadzania"</string> <string name="language_selection_title" msgid="1651299598555326750">"Języki wprowadzania"</string> <string name="language_selection_summary" msgid="187110938289512256">"Przesuń palcem po spacji, aby zmienić język"</string> <string name="hint_add_to_dictionary" msgid="8058519710062071085">"← Dotknij ponownie, aby zapisać"</string> diff --git a/java/res/values-pt-rPT/strings.xml b/java/res/values-pt-rPT/strings.xml index 8d27de9eb..f79ae8f41 100644 --- a/java/res/values-pt-rPT/strings.xml +++ b/java/res/values-pt-rPT/strings.xml @@ -127,7 +127,6 @@ <string name="popular_domain_2" msgid="3036812463748402878">".org"</string> <string name="popular_domain_3" msgid="8718639560809452028">".gov"</string> <string name="popular_domain_4" msgid="35359437471311470">".edu"</string> - <string name="inputMethod" msgid="7854532062009028116">"Método de entrada"</string> <string name="language_selection_title" msgid="1651299598555326750">"Idiomas de entrada"</string> <string name="language_selection_summary" msgid="187110938289512256">"Deslize o dedo pela barra de espaço para alterar o idioma"</string> <string name="hint_add_to_dictionary" msgid="8058519710062071085">"← Toque novamente para guardar"</string> diff --git a/java/res/values-pt/strings.xml b/java/res/values-pt/strings.xml index 5a348ce31..5492da60c 100644 --- a/java/res/values-pt/strings.xml +++ b/java/res/values-pt/strings.xml @@ -127,7 +127,6 @@ <string name="popular_domain_2" msgid="3036812463748402878">".org"</string> <string name="popular_domain_3" msgid="8718639560809452028">".gov"</string> <string name="popular_domain_4" msgid="35359437471311470">".edu"</string> - <string name="inputMethod" msgid="7854532062009028116">"Método de entrada"</string> <string name="language_selection_title" msgid="1651299598555326750">"Idiomas de entrada"</string> <string name="language_selection_summary" msgid="187110938289512256">"Deslize o dedo na barra de espaços para alterar o idioma"</string> <string name="hint_add_to_dictionary" msgid="8058519710062071085">"← Toque novamente para salvar"</string> diff --git a/java/res/values-rm/strings.xml b/java/res/values-rm/strings.xml index f30b41fa2..a93cd1f65 100644 --- a/java/res/values-rm/strings.xml +++ b/java/res/values-rm/strings.xml @@ -129,7 +129,6 @@ <string name="popular_domain_2" msgid="3036812463748402878">".org"</string> <string name="popular_domain_3" msgid="8718639560809452028">".gov"</string> <string name="popular_domain_4" msgid="35359437471311470">".edu"</string> - <string name="inputMethod" msgid="7854532062009028116">"Metoda d\'endataziun"</string> <string name="language_selection_title" msgid="1651299598555326750">"Linguas da cumonds vocals"</string> <string name="language_selection_summary" msgid="187110938289512256">"Stritgar cun il det sur la tasta da vid per midar la lingua"</string> <string name="hint_add_to_dictionary" msgid="8058519710062071085">"← Tippar danovamain per memorisar"</string> diff --git a/java/res/values-ru/strings.xml b/java/res/values-ru/strings.xml index 99c576eb8..91d9edf17 100644 --- a/java/res/values-ru/strings.xml +++ b/java/res/values-ru/strings.xml @@ -127,7 +127,6 @@ <string name="popular_domain_2" msgid="3036812463748402878">".org"</string> <string name="popular_domain_3" msgid="8718639560809452028">".gov"</string> <string name="popular_domain_4" msgid="35359437471311470">".edu"</string> - <string name="inputMethod" msgid="7854532062009028116">"Способ ввода"</string> <string name="language_selection_title" msgid="1651299598555326750">"Языки ввода"</string> <string name="language_selection_summary" msgid="187110938289512256">"Для изменения языка проведите пальцем по пробелу"</string> <string name="hint_add_to_dictionary" msgid="8058519710062071085">"← Нажмите повторно, чтобы сохранить"</string> diff --git a/java/res/values-sr/strings.xml b/java/res/values-sr/strings.xml index f706ebc3d..4da1c05b0 100644 --- a/java/res/values-sr/strings.xml +++ b/java/res/values-sr/strings.xml @@ -286,9 +286,6 @@ <!-- popular web domains for the locale - item 4, displayed in the popup --> <string name="popular_domain_4">".edu"</string> - <!-- Menu item for launching Input method switcher --> - <string name="inputMethod">Метод за унос</string> - <!-- Title for input language selection screen --> <string name="language_selection_title">Језици за унос</string> <!-- Title summary for input language selection screen --> diff --git a/java/res/values-sv/strings.xml b/java/res/values-sv/strings.xml index 28faaa914..86f375f14 100644 --- a/java/res/values-sv/strings.xml +++ b/java/res/values-sv/strings.xml @@ -127,7 +127,6 @@ <string name="popular_domain_2" msgid="3036812463748402878">".org"</string> <string name="popular_domain_3" msgid="8718639560809452028">".gov"</string> <string name="popular_domain_4" msgid="35359437471311470">".edu"</string> - <string name="inputMethod" msgid="7854532062009028116">"Indatametod"</string> <string name="language_selection_title" msgid="1651299598555326750">"Inmatningsspråk"</string> <string name="language_selection_summary" msgid="187110938289512256">"Dra med fingret på blanksteg om du vill ändra språk"</string> <string name="hint_add_to_dictionary" msgid="8058519710062071085">"← Peka igen för att spara"</string> diff --git a/java/res/values-tr/strings.xml b/java/res/values-tr/strings.xml index fee07338d..34438f7f6 100644 --- a/java/res/values-tr/strings.xml +++ b/java/res/values-tr/strings.xml @@ -127,7 +127,6 @@ <string name="popular_domain_2" msgid="3036812463748402878">".org"</string> <string name="popular_domain_3" msgid="8718639560809452028">".gov"</string> <string name="popular_domain_4" msgid="35359437471311470">".edu"</string> - <string name="inputMethod" msgid="7854532062009028116">"Giriş yöntemi"</string> <string name="language_selection_title" msgid="1651299598555326750">"Giriş dilleri"</string> <string name="language_selection_summary" msgid="187110938289512256">"Dili değiştirmek için parmağınızı boşluk çubuğu üzerinde kaydırın"</string> <string name="hint_add_to_dictionary" msgid="8058519710062071085">"← Kaydetmek için tekrar dokunun"</string> diff --git a/java/res/values-zh-rCN/strings.xml b/java/res/values-zh-rCN/strings.xml index cbf287723..c04f2e02b 100644 --- a/java/res/values-zh-rCN/strings.xml +++ b/java/res/values-zh-rCN/strings.xml @@ -127,7 +127,6 @@ <string name="popular_domain_2" msgid="3036812463748402878">".org"</string> <string name="popular_domain_3" msgid="8718639560809452028">".gov"</string> <string name="popular_domain_4" msgid="35359437471311470">".edu"</string> - <string name="inputMethod" msgid="7854532062009028116">"输入法"</string> <string name="language_selection_title" msgid="1651299598555326750">"输入语言"</string> <string name="language_selection_summary" msgid="187110938289512256">"在空格键上滑动手指可更改语言"</string> <string name="hint_add_to_dictionary" msgid="8058519710062071085">"← 再次点按即可保存"</string> diff --git a/java/res/values-zh-rTW/strings.xml b/java/res/values-zh-rTW/strings.xml index 78ede4ac3..54d93117e 100644 --- a/java/res/values-zh-rTW/strings.xml +++ b/java/res/values-zh-rTW/strings.xml @@ -127,7 +127,6 @@ <string name="popular_domain_2" msgid="3036812463748402878">".org"</string> <string name="popular_domain_3" msgid="8718639560809452028">".gov"</string> <string name="popular_domain_4" msgid="35359437471311470">".edu"</string> - <string name="inputMethod" msgid="7854532062009028116">"輸入方式"</string> <string name="language_selection_title" msgid="1651299598555326750">"輸入語言"</string> <string name="language_selection_summary" msgid="187110938289512256">"以手指在空白鍵上滑動可變更語言"</string> <string name="hint_add_to_dictionary" msgid="8058519710062071085">"← 再次輕按可儲存"</string> diff --git a/java/res/values/strings.xml b/java/res/values/strings.xml index 771577018..bb90825de 100644 --- a/java/res/values/strings.xml +++ b/java/res/values/strings.xml @@ -22,6 +22,8 @@ <string name="english_ime_name">Android keyboard 2</string> <!-- Title for Latin keyboard settings activity / dialog --> <string name="english_ime_settings">Android keyboard 2 settings</string> + <!-- Title for Latin keyboard input options dialog --> + <string name="english_ime_input_options">Input options</string> <!-- Option to provide vibrate/haptic feedback on keypress --> <string name="vibrate_on_keypress">Vibrate on keypress</string> @@ -318,9 +320,6 @@ <!-- popular web domains for the locale - item 4, displayed in the popup --> <string name="popular_domain_4">".edu"</string> - <!-- Menu item for launching Input method switcher --> - <string name="inputMethod">Input method</string> - <!-- Menu item for launching Input method picker --> <string name="selectInputMethod">Select input method</string> diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java index 335778980..7097844e2 100644 --- a/java/src/com/android/inputmethod/latin/LatinIME.java +++ b/java/src/com/android/inputmethod/latin/LatinIME.java @@ -150,8 +150,8 @@ public class LatinIME extends InputMethodService static final int KEYCODE_PERIOD = '.'; // Contextual menu positions - private static final int POS_SETTINGS = 0; - private static final int POS_METHOD = 1; + private static final int POS_METHOD = 0; + private static final int POS_SETTINGS = 1; //private LatinKeyboardView mInputView; private LinearLayout mCandidateViewContainer; @@ -1212,6 +1212,10 @@ public class LatinIME extends InputMethodService mEnteredText = text; } + public void onCancel() { + // User released a finger outside any key + } + private void handleBackspace() { if (VOICE_INSTALLED && mVoiceInputHighlighted) { mVoiceInput.incrementTextModificationDeleteCount( @@ -2449,7 +2453,7 @@ public class LatinIME extends InputMethodService CharSequence itemSettings = getString(R.string.english_ime_settings); CharSequence itemInputMethod = getString(R.string.selectInputMethod); builder.setItems(new CharSequence[] { - itemSettings, itemInputMethod}, + itemInputMethod, itemSettings}, new DialogInterface.OnClickListener() { public void onClick(DialogInterface di, int position) { @@ -2465,7 +2469,7 @@ public class LatinIME extends InputMethodService } } }); - builder.setTitle(mResources.getString(R.string.english_ime_name)); + builder.setTitle(mResources.getString(R.string.english_ime_input_options)); mOptionsDialog = builder.create(); Window window = mOptionsDialog.getWindow(); WindowManager.LayoutParams lp = window.getAttributes(); diff --git a/java/src/com/android/inputmethod/latin/LatinKeyboardBaseView.java b/java/src/com/android/inputmethod/latin/LatinKeyboardBaseView.java index a0366c273..8f1ec6591 100644 --- a/java/src/com/android/inputmethod/latin/LatinKeyboardBaseView.java +++ b/java/src/com/android/inputmethod/latin/LatinKeyboardBaseView.java @@ -124,6 +124,11 @@ public class LatinKeyboardBaseView extends View implements PointerTracker.UIProx void onText(CharSequence text); /** + * Called when user released a finger outside any key. + */ + void onCancel(); + + /** * Called when the user quickly moves the finger from right to * left. */ @@ -1005,6 +1010,10 @@ public class LatinKeyboardBaseView extends View implements PointerTracker.UIProx dismissPopupKeyboard(); } + public void onCancel() { + dismissPopupKeyboard(); + } + public void swipeLeft() { } public void swipeRight() { diff --git a/java/src/com/android/inputmethod/latin/PointerTracker.java b/java/src/com/android/inputmethod/latin/PointerTracker.java index f849158ae..8b1f019d4 100644 --- a/java/src/com/android/inputmethod/latin/PointerTracker.java +++ b/java/src/com/android/inputmethod/latin/PointerTracker.java @@ -389,9 +389,13 @@ public class PointerTracker { } private void detectAndSendKey(int index, int x, int y, long eventTime) { - if (isValidKeyIndex(index)) { - final Key key = mKeys[index]; - OnKeyboardActionListener listener = mListener; + final OnKeyboardActionListener listener = mListener; + final Key key = getKey(index); + + if (key == null) { + if (listener != null) + listener.onCancel(); + } else { if (key.text != null) { if (listener != null) { listener.onText(key.text); |
