diff options
81 files changed, 338 insertions, 432 deletions
diff --git a/java/res/layout-sw768dp/recognition_status.xml b/java/res/layout-sw768dp/recognition_status.xml index 40bc09823..d476651c6 100644 --- a/java/res/layout-sw768dp/recognition_status.xml +++ b/java/res/layout-sw768dp/recognition_status.xml @@ -26,8 +26,8 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/popup_layout" android:orientation="vertical" - android:layout_height="371dip" - android:layout_width="500dip" + android:layout_height="371dp" + android:layout_width="500dp" android:layout_centerInParent="true" android:background="@drawable/vs_dialog_red"> <TextView @@ -36,13 +36,13 @@ android:layout_height="wrap_content" android:layout_width="wrap_content" android:singleLine="true" - android:layout_marginTop="10dip" + android:layout_marginTop="10dp" android:textSize="28sp" android:textColor="#ffffff" android:layout_gravity="center" android:visibility="invisible"/> <RelativeLayout - android:layout_height="0dip" + android:layout_height="0dp" android:layout_width="match_parent" android:layout_weight="1.0"> <com.android.inputmethod.deprecated.voice.SoundIndicator @@ -65,8 +65,8 @@ android:id="@+id/progress" android:indeterminate="true" android:indeterminateOnly="false" - android:layout_height="60dip" - android:layout_width="60dip" + android:layout_height="60dp" + android:layout_width="60dp" android:layout_centerInParent="true" android:visibility="gone"/> </RelativeLayout> @@ -82,14 +82,14 @@ android:layout_width="wrap_content" android:singleLine="true" android:textSize="14sp" - android:layout_marginBottom="3dip" + android:layout_marginBottom="3dp" android:layout_gravity="center" android:textColor="#ffffff" android:visibility="invisible"/> <Button android:id="@+id/button" android:layout_width="match_parent" - android:layout_height="54dip" + android:layout_height="54dp" android:singleLine="true" android:focusable="true" android:text="@string/cancel" diff --git a/java/res/layout/input_view.xml b/java/res/layout/input_view.xml index 0a8d71f30..3863534be 100644 --- a/java/res/layout/input_view.xml +++ b/java/res/layout/input_view.xml @@ -28,7 +28,7 @@ <View android:id="@+id/key_preview_backing" android:layout_width="match_parent" - android:layout_height="0dip" /> + android:layout_height="0dp" /> <!-- On tablets, the suggestions strip is centered with horizontal paddings on both sides because width of the landscape mode is too long for the suggestions strip. This diff --git a/java/res/layout/key_preview.xml b/java/res/layout/key_preview.xml index b620d07d8..6ed892e28 100644 --- a/java/res/layout/key_preview.xml +++ b/java/res/layout/key_preview.xml @@ -20,8 +20,8 @@ <TextView xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="wrap_content" - android:layout_height="80sp" - android:textSize="40sp" - android:minWidth="32dip" + android:layout_height="80dp" + android:textSize="40dp" + android:minWidth="32dp" android:gravity="center" /> diff --git a/java/res/layout/recognition_status.xml b/java/res/layout/recognition_status.xml index a2ddb7c50..578788831 100644 --- a/java/res/layout/recognition_status.xml +++ b/java/res/layout/recognition_status.xml @@ -26,8 +26,8 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/popup_layout" android:orientation="vertical" - android:layout_height="371dip" - android:layout_width="500dip" + android:layout_height="371dp" + android:layout_width="500dp" android:layout_centerInParent="true" android:background="@drawable/vs_dialog_red"> <TextView @@ -36,13 +36,13 @@ android:layout_height="wrap_content" android:layout_width="wrap_content" android:singleLine="true" - android:layout_marginTop="10dip" + android:layout_marginTop="10dp" android:textSize="20sp" android:textColor="#ffffff" android:layout_gravity="center" android:visibility="invisible"/> <RelativeLayout - android:layout_height="0dip" + android:layout_height="0dp" android:layout_width="match_parent" android:layout_weight="1.0"> <com.android.inputmethod.deprecated.voice.SoundIndicator @@ -65,8 +65,8 @@ android:id="@+id/progress" android:indeterminate="true" android:indeterminateOnly="false" - android:layout_height="60dip" - android:layout_width="60dip" + android:layout_height="60dp" + android:layout_width="60dp" android:layout_centerInParent="true" android:visibility="gone"/> </RelativeLayout> @@ -82,15 +82,15 @@ android:layout_width="wrap_content" android:singleLine="true" android:textSize="15sp" - android:layout_marginTop="3dip" - android:layout_marginBottom="3dip" + android:layout_marginTop="3dp" + android:layout_marginBottom="3dp" android:layout_gravity="center" android:textColor="#ffffff" android:visibility="invisible"/> <Button android:id="@+id/button" android:layout_width="match_parent" - android:layout_height="30dip" + android:layout_height="30dp" android:singleLine="true" android:focusable="true" android:text="@string/cancel" diff --git a/java/res/layout/sound_effect_volume_dialog.xml b/java/res/layout/sound_effect_volume_dialog.xml index c5b2f10e2..294663006 100644 --- a/java/res/layout/sound_effect_volume_dialog.xml +++ b/java/res/layout/sound_effect_volume_dialog.xml @@ -23,22 +23,22 @@ android:orientation="vertical" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_margin="10dip"> + android:layout_margin="10dp"> <LinearLayout android:orientation="horizontal" android:layout_width="match_parent" android:layout_height="wrap_content" android:gravity="center_horizontal" - android:layout_margin="10dip"> + android:layout_margin="10dp"> <TextView android:id="@+id/sound_effect_volume_value" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textSize="20dip"/> + android:textSize="20dp"/> </LinearLayout> <SeekBar android:id="@+id/sound_effect_volume_bar" android:layout_width="match_parent" android:layout_height="wrap_content" android:max="100" - android:layout_margin="10dip"/> + android:layout_margin="10dp"/> </LinearLayout> diff --git a/java/res/layout/suggestion_info.xml b/java/res/layout/suggestion_info.xml index a364d46aa..a4ad6df25 100644 --- a/java/res/layout/suggestion_info.xml +++ b/java/res/layout/suggestion_info.xml @@ -22,6 +22,6 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textSize="6sp" + android:textSize="6dp" android:textColor="@android:color/white" style="?attr/suggestionBackgroundStyle" /> diff --git a/java/res/layout/suggestion_preview.xml b/java/res/layout/suggestion_preview.xml index 3c026ae0e..856447bba 100644 --- a/java/res/layout/suggestion_preview.xml +++ b/java/res/layout/suggestion_preview.xml @@ -21,8 +21,8 @@ <TextView xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textSize="18sp" + android:textSize="18dp" android:textColor="?android:attr/textColorPrimaryInverse" - android:minWidth="32dip" + android:minWidth="32dp" android:gravity="center" style="?attr/suggestionPreviewBackgroundStyle" /> diff --git a/java/res/layout/vibration_settings_dialog.xml b/java/res/layout/vibration_settings_dialog.xml index 981ba9be0..c9fb6ec4e 100644 --- a/java/res/layout/vibration_settings_dialog.xml +++ b/java/res/layout/vibration_settings_dialog.xml @@ -23,27 +23,27 @@ android:orientation="vertical" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_margin="10dip"> + android:layout_margin="10dp"> <LinearLayout android:orientation="horizontal" android:layout_width="match_parent" android:layout_height="wrap_content" android:gravity="center_horizontal" - android:layout_margin="10dip"> + android:layout_margin="10dp"> <TextView android:id="@+id/vibration_value" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textSize="20dip"/> + android:textSize="20dp"/> <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/settings_ms" - android:textSize="20dip"/> + android:textSize="20dp"/> </LinearLayout> <SeekBar android:id="@+id/vibration_settings" android:layout_width="match_parent" android:layout_height="wrap_content" android:max="250" - android:layout_margin="10dip"/> + android:layout_margin="10dp"/> </LinearLayout> diff --git a/java/res/layout/voice_punctuation_hint.xml b/java/res/layout/voice_punctuation_hint.xml index 629a7f2b5..b32feb6e2 100644 --- a/java/res/layout/voice_punctuation_hint.xml +++ b/java/res/layout/voice_punctuation_hint.xml @@ -29,8 +29,8 @@ <ImageView android:id="@+id/image" android:layout_height="wrap_content" android:layout_width="wrap_content" - android:paddingLeft="8dip" - android:paddingRight="8dip" + android:paddingLeft="8dp" + android:paddingRight="8dp" android:layout_gravity="center_horizontal" android:src="@drawable/ic_suggest_strip_microphone" /> @@ -39,8 +39,8 @@ android:text="@string/voice_punctuation_hint" android:layout_height="wrap_content" android:layout_width="wrap_content" - android:paddingTop="2dip" - android:paddingRight="3dip" + android:paddingTop="2dp" + android:paddingRight="3dp" android:textSize="13sp" android:textColor="#888888" android:layout_gravity="center_horizontal" diff --git a/java/res/layout/voice_swipe_hint.xml b/java/res/layout/voice_swipe_hint.xml index 4e8859a71..b1e27c281 100644 --- a/java/res/layout/voice_swipe_hint.xml +++ b/java/res/layout/voice_swipe_hint.xml @@ -25,14 +25,14 @@ android:layout_height="wrap_content" android:background="@drawable/keyboard_suggest_strip" android:gravity="center_horizontal" - android:paddingTop="2dip"> + android:paddingTop="2dp"> <TextView android:id="@+id/text" android:text="@string/voice_swipe_hint" android:layout_height="wrap_content" android:layout_width="wrap_content" - android:paddingTop="10dip" - android:paddingRight="6dip" + android:paddingTop="10dp" + android:paddingRight="6dp" android:textSize="13sp" android:textColor="#888888" android:layout_gravity="center_horizontal" diff --git a/java/res/values-be/strings.xml b/java/res/values-be/strings.xml index ac4433feb..fb72634b0 100644 --- a/java/res/values-be/strings.xml +++ b/java/res/values-be/strings.xml @@ -37,12 +37,9 @@ <string name="misc_category" msgid="6894192814868233453">"Іншыя параметры"</string> <string name="advanced_settings" msgid="362895144495591463">"Адмысловыя налады"</string> <string name="advanced_settings_summary" msgid="4487980456152830271">"Функцыi для спецыялістаў"</string> - <!-- no translation found for include_other_imes_in_language_switch_list (4533689960308565519) --> - <skip /> - <!-- no translation found for include_other_imes_in_language_switch_list_summary (840637129103317635) --> - <skip /> - <!-- no translation found for suppress_language_switch_key (8003788410354806368) --> - <skip /> + <string name="include_other_imes_in_language_switch_list" msgid="4533689960308565519">"Перакл. да інш. спос. ув."</string> + <string name="include_other_imes_in_language_switch_list_summary" msgid="840637129103317635">"Кнопка пераключэння мовы звязана i з iншымi спосабамi ўводу"</string> + <string name="suppress_language_switch_key" msgid="8003788410354806368">"Забаранiць кнопку пераключэння мовы"</string> <string name="key_preview_popup_dismiss_delay" msgid="6213164897443068248">"Затрым. скр. падк. клав."</string> <string name="key_preview_popup_dismiss_no_delay" msgid="2096123151571458064">"Няма затрымкі"</string> <string name="key_preview_popup_dismiss_default_delay" msgid="2166964333903906734">"Па змаўчанні"</string> diff --git a/java/res/values-bg/strings.xml b/java/res/values-bg/strings.xml index f3b9347a4..c92b95c21 100644 --- a/java/res/values-bg/strings.xml +++ b/java/res/values-bg/strings.xml @@ -37,12 +37,9 @@ <string name="misc_category" msgid="6894192814868233453">"Други опции"</string> <string name="advanced_settings" msgid="362895144495591463">"Разширени настройки"</string> <string name="advanced_settings_summary" msgid="4487980456152830271">"Опции за експерти"</string> - <!-- no translation found for include_other_imes_in_language_switch_list (4533689960308565519) --> - <skip /> - <!-- no translation found for include_other_imes_in_language_switch_list_summary (840637129103317635) --> - <skip /> - <!-- no translation found for suppress_language_switch_key (8003788410354806368) --> - <skip /> + <string name="include_other_imes_in_language_switch_list" msgid="4533689960308565519">"Други методи за въвеждане"</string> + <string name="include_other_imes_in_language_switch_list_summary" msgid="840637129103317635">"Клавишът за превкл. на езика обхваща и други методи за въвеждане"</string> + <string name="suppress_language_switch_key" msgid="8003788410354806368">"Потискане"</string> <string name="key_preview_popup_dismiss_delay" msgid="6213164897443068248">"Отхвърляне на подсказката"</string> <string name="key_preview_popup_dismiss_no_delay" msgid="2096123151571458064">"Без задържане"</string> <string name="key_preview_popup_dismiss_default_delay" msgid="2166964333903906734">"По подразбиране"</string> diff --git a/java/res/values-ca/strings.xml b/java/res/values-ca/strings.xml index 619dc38af..9d69eb2e7 100644 --- a/java/res/values-ca/strings.xml +++ b/java/res/values-ca/strings.xml @@ -37,12 +37,9 @@ <string name="misc_category" msgid="6894192814868233453">"Altres opcions"</string> <string name="advanced_settings" msgid="362895144495591463">"Configuració avançada"</string> <string name="advanced_settings_summary" msgid="4487980456152830271">"Opcions per a experts"</string> - <!-- no translation found for include_other_imes_in_language_switch_list (4533689960308565519) --> - <skip /> - <!-- no translation found for include_other_imes_in_language_switch_list_summary (840637129103317635) --> - <skip /> - <!-- no translation found for suppress_language_switch_key (8003788410354806368) --> - <skip /> + <string name="include_other_imes_in_language_switch_list" msgid="4533689960308565519">"Canvia de mètode entrada"</string> + <string name="include_other_imes_in_language_switch_list_summary" msgid="840637129103317635">"La tecla de canvi d\'idioma també cobreix altres mètodes d\'entrada"</string> + <string name="suppress_language_switch_key" msgid="8003788410354806368">"Suprimeix la tecla d\'idioma"</string> <string name="key_preview_popup_dismiss_delay" msgid="6213164897443068248">"Retard d\'om. em. de tecla"</string> <string name="key_preview_popup_dismiss_no_delay" msgid="2096123151571458064">"Sense retard"</string> <string name="key_preview_popup_dismiss_default_delay" msgid="2166964333903906734">"Predeterminat"</string> diff --git a/java/res/values-cs/strings.xml b/java/res/values-cs/strings.xml index 6305f6e64..d5989d791 100644 --- a/java/res/values-cs/strings.xml +++ b/java/res/values-cs/strings.xml @@ -37,12 +37,9 @@ <string name="misc_category" msgid="6894192814868233453">"Další možnosti"</string> <string name="advanced_settings" msgid="362895144495591463">"Pokročilá nastavení"</string> <string name="advanced_settings_summary" msgid="4487980456152830271">"Možnosti pro odborníky"</string> - <!-- no translation found for include_other_imes_in_language_switch_list (4533689960308565519) --> - <skip /> - <!-- no translation found for include_other_imes_in_language_switch_list_summary (840637129103317635) --> - <skip /> - <!-- no translation found for suppress_language_switch_key (8003788410354806368) --> - <skip /> + <string name="include_other_imes_in_language_switch_list" msgid="4533689960308565519">"Přep. na jiné metody zad."</string> + <string name="include_other_imes_in_language_switch_list_summary" msgid="840637129103317635">"Klávesa pro přepínání jazyka ovládá i další metody zadávání"</string> + <string name="suppress_language_switch_key" msgid="8003788410354806368">"Zakázat kl. přep. jazyka"</string> <string name="key_preview_popup_dismiss_delay" msgid="6213164897443068248">"Prodleva vysk. okna kláv."</string> <string name="key_preview_popup_dismiss_no_delay" msgid="2096123151571458064">"Bez prodlevy"</string> <string name="key_preview_popup_dismiss_default_delay" msgid="2166964333903906734">"Výchozí"</string> diff --git a/java/res/values-da/strings.xml b/java/res/values-da/strings.xml index df5dfa58b..97dec329b 100644 --- a/java/res/values-da/strings.xml +++ b/java/res/values-da/strings.xml @@ -37,12 +37,9 @@ <string name="misc_category" msgid="6894192814868233453">"Andre valgmuligheder"</string> <string name="advanced_settings" msgid="362895144495591463">"Avancerede indstillinger"</string> <string name="advanced_settings_summary" msgid="4487980456152830271">"Muligheder for eksperter"</string> - <!-- no translation found for include_other_imes_in_language_switch_list (4533689960308565519) --> - <skip /> - <!-- no translation found for include_other_imes_in_language_switch_list_summary (840637129103317635) --> - <skip /> - <!-- no translation found for suppress_language_switch_key (8003788410354806368) --> - <skip /> + <string name="include_other_imes_in_language_switch_list" msgid="4533689960308565519">"Skift inputmetode"</string> + <string name="include_other_imes_in_language_switch_list_summary" msgid="840637129103317635">"Tasten til sprogskift gælder også for andre inputmetoder"</string> + <string name="suppress_language_switch_key" msgid="8003788410354806368">"Ignorer sprogskifttast"</string> <string name="key_preview_popup_dismiss_delay" msgid="6213164897443068248">"Forsink. afvis. af taste-pop op"</string> <string name="key_preview_popup_dismiss_no_delay" msgid="2096123151571458064">"Ingen forsink."</string> <string name="key_preview_popup_dismiss_default_delay" msgid="2166964333903906734">"Standard"</string> diff --git a/java/res/values-de/config.xml b/java/res/values-de/donottranslate-config.xml index 272ff326f..272ff326f 100644 --- a/java/res/values-de/config.xml +++ b/java/res/values-de/donottranslate-config.xml diff --git a/java/res/values-de/strings.xml b/java/res/values-de/strings.xml index a2584bc2f..75ef10655 100644 --- a/java/res/values-de/strings.xml +++ b/java/res/values-de/strings.xml @@ -37,12 +37,9 @@ <string name="misc_category" msgid="6894192814868233453">"Sonstige Optionen"</string> <string name="advanced_settings" msgid="362895144495591463">"Erweiterte Einstellungen"</string> <string name="advanced_settings_summary" msgid="4487980456152830271">"Optionen für Experten"</string> - <!-- no translation found for include_other_imes_in_language_switch_list (4533689960308565519) --> - <skip /> - <!-- no translation found for include_other_imes_in_language_switch_list_summary (840637129103317635) --> - <skip /> - <!-- no translation found for suppress_language_switch_key (8003788410354806368) --> - <skip /> + <string name="include_other_imes_in_language_switch_list" msgid="4533689960308565519">"Eingabemethoden wechseln"</string> + <string name="include_other_imes_in_language_switch_list_summary" msgid="840637129103317635">"Sprachwechseltaste umfasst auch andere Eingabemethoden."</string> + <string name="suppress_language_switch_key" msgid="8003788410354806368">"Sprachwechsel unterdrücken"</string> <string name="key_preview_popup_dismiss_delay" msgid="6213164897443068248">"Tasten-Pop-up"</string> <string name="key_preview_popup_dismiss_no_delay" msgid="2096123151571458064">"Keine Verzögerung"</string> <string name="key_preview_popup_dismiss_default_delay" msgid="2166964333903906734">"Standard"</string> diff --git a/java/res/values-el/strings.xml b/java/res/values-el/strings.xml index 1d6fc10f4..fb2bff331 100644 --- a/java/res/values-el/strings.xml +++ b/java/res/values-el/strings.xml @@ -37,12 +37,9 @@ <string name="misc_category" msgid="6894192814868233453">"Άλλες επιλογές"</string> <string name="advanced_settings" msgid="362895144495591463">"Σύνθετες ρυθμίσεις"</string> <string name="advanced_settings_summary" msgid="4487980456152830271">"Επιλογές για έμπειρους χρήστες"</string> - <!-- no translation found for include_other_imes_in_language_switch_list (4533689960308565519) --> - <skip /> - <!-- no translation found for include_other_imes_in_language_switch_list_summary (840637129103317635) --> - <skip /> - <!-- no translation found for suppress_language_switch_key (8003788410354806368) --> - <skip /> + <string name="include_other_imes_in_language_switch_list" msgid="4533689960308565519">"Άλλη μέθοδος εισόδου"</string> + <string name="include_other_imes_in_language_switch_list_summary" msgid="840637129103317635">"Το κλειδί αλλαγής γλώσσας καλύπτει και άλλες μεθόδους εισόδου"</string> + <string name="suppress_language_switch_key" msgid="8003788410354806368">"Κατάργ.κλειδ.αλλαγ.γλωσσ."</string> <string name="key_preview_popup_dismiss_delay" msgid="6213164897443068248">"Χρόνος εξαφ. αναδ. παραθ."</string> <string name="key_preview_popup_dismiss_no_delay" msgid="2096123151571458064">"Χωρίς καθυστέρ."</string> <string name="key_preview_popup_dismiss_default_delay" msgid="2166964333903906734">"Προεπιλογή"</string> diff --git a/java/res/values-et/strings.xml b/java/res/values-et/strings.xml index c8e98a1d8..010891ce6 100644 --- a/java/res/values-et/strings.xml +++ b/java/res/values-et/strings.xml @@ -37,12 +37,9 @@ <string name="misc_category" msgid="6894192814868233453">"Muud valikud"</string> <string name="advanced_settings" msgid="362895144495591463">"Täpsemad seaded"</string> <string name="advanced_settings_summary" msgid="4487980456152830271">"Valikud ekspertidele"</string> - <!-- no translation found for include_other_imes_in_language_switch_list (4533689960308565519) --> - <skip /> - <!-- no translation found for include_other_imes_in_language_switch_list_summary (840637129103317635) --> - <skip /> - <!-- no translation found for suppress_language_switch_key (8003788410354806368) --> - <skip /> + <string name="include_other_imes_in_language_switch_list" msgid="4533689960308565519">"Vaheta sisestusmeetodit"</string> + <string name="include_other_imes_in_language_switch_list_summary" msgid="840637129103317635">"Keelevahetuse võti hõlmab ka muid sisestusmeetodeid"</string> + <string name="suppress_language_switch_key" msgid="8003788410354806368">"Keela keelevahetuse võti"</string> <string name="key_preview_popup_dismiss_delay" msgid="6213164897443068248">"Hüpiku loobumisviivitus"</string> <string name="key_preview_popup_dismiss_no_delay" msgid="2096123151571458064">"Viivituseta"</string> <string name="key_preview_popup_dismiss_default_delay" msgid="2166964333903906734">"Vaikeseade"</string> diff --git a/java/res/values-fi/strings.xml b/java/res/values-fi/strings.xml index ecb7a4d02..012f628ac 100644 --- a/java/res/values-fi/strings.xml +++ b/java/res/values-fi/strings.xml @@ -37,12 +37,9 @@ <string name="misc_category" msgid="6894192814868233453">"Muut vaihtoehdot"</string> <string name="advanced_settings" msgid="362895144495591463">"Lisäasetukset"</string> <string name="advanced_settings_summary" msgid="4487980456152830271">"Valinnat asiantuntijoille"</string> - <!-- no translation found for include_other_imes_in_language_switch_list (4533689960308565519) --> - <skip /> - <!-- no translation found for include_other_imes_in_language_switch_list_summary (840637129103317635) --> - <skip /> - <!-- no translation found for suppress_language_switch_key (8003788410354806368) --> - <skip /> + <string name="include_other_imes_in_language_switch_list" msgid="4533689960308565519">"Käytä toista syöttötapaa"</string> + <string name="include_other_imes_in_language_switch_list_summary" msgid="840637129103317635">"Kielenvaihtonäppäin kattaa myös muut syöttötavat"</string> + <string name="suppress_language_switch_key" msgid="8003788410354806368">"Piilota kielenvaihtonäpp."</string> <string name="key_preview_popup_dismiss_delay" msgid="6213164897443068248">"Näppäimen hylkäysviive"</string> <string name="key_preview_popup_dismiss_no_delay" msgid="2096123151571458064">"Ei viivettä"</string> <string name="key_preview_popup_dismiss_default_delay" msgid="2166964333903906734">"Oletus"</string> diff --git a/java/res/values-fr/strings.xml b/java/res/values-fr/strings.xml index 3a5f6a1b3..1998be550 100644 --- a/java/res/values-fr/strings.xml +++ b/java/res/values-fr/strings.xml @@ -37,12 +37,9 @@ <string name="misc_category" msgid="6894192814868233453">"Autres options"</string> <string name="advanced_settings" msgid="362895144495591463">"Paramètres avancés"</string> <string name="advanced_settings_summary" msgid="4487980456152830271">"Options destinées aux experts"</string> - <!-- no translation found for include_other_imes_in_language_switch_list (4533689960308565519) --> - <skip /> - <!-- no translation found for include_other_imes_in_language_switch_list_summary (840637129103317635) --> - <skip /> - <!-- no translation found for suppress_language_switch_key (8003788410354806368) --> - <skip /> + <string name="include_other_imes_in_language_switch_list" msgid="4533689960308565519">"Autres modes de saisie"</string> + <string name="include_other_imes_in_language_switch_list_summary" msgid="840637129103317635">"La touche de sélection de langue couvre d\'autres modes de saisie."</string> + <string name="suppress_language_switch_key" msgid="8003788410354806368">"Suppr. touche sélect. langue"</string> <string name="key_preview_popup_dismiss_delay" msgid="6213164897443068248">"Masquer touche agrandie"</string> <string name="key_preview_popup_dismiss_no_delay" msgid="2096123151571458064">"Sans délai"</string> <string name="key_preview_popup_dismiss_default_delay" msgid="2166964333903906734">"Par défaut"</string> diff --git a/java/res/values-hi/strings.xml b/java/res/values-hi/strings.xml index c20e50ff0..5c5ec884b 100644 --- a/java/res/values-hi/strings.xml +++ b/java/res/values-hi/strings.xml @@ -37,12 +37,9 @@ <string name="misc_category" msgid="6894192814868233453">"अन्य विकल्प"</string> <string name="advanced_settings" msgid="362895144495591463">"उन्नत सेटिंग"</string> <string name="advanced_settings_summary" msgid="4487980456152830271">"विशेषज्ञों के लिए विकल्प"</string> - <!-- no translation found for include_other_imes_in_language_switch_list (4533689960308565519) --> - <skip /> - <!-- no translation found for include_other_imes_in_language_switch_list_summary (840637129103317635) --> - <skip /> - <!-- no translation found for suppress_language_switch_key (8003788410354806368) --> - <skip /> + <string name="include_other_imes_in_language_switch_list" msgid="4533689960308565519">"अन्य इनपुट पद्धतियों पर जाएं"</string> + <string name="include_other_imes_in_language_switch_list_summary" msgid="840637129103317635">"भाषा स्विच कुंजी में अन्य इनपुट पद्धतियां भी शामिल हैं"</string> + <string name="suppress_language_switch_key" msgid="8003788410354806368">"भाषा स्विच कुंजी रोकें"</string> <string name="key_preview_popup_dismiss_delay" msgid="6213164897443068248">"कुंजी पॉपअप खारिज़ विलंब"</string> <string name="key_preview_popup_dismiss_no_delay" msgid="2096123151571458064">"कोई विलंब नहीं"</string> <string name="key_preview_popup_dismiss_default_delay" msgid="2166964333903906734">"डिफ़ॉल्ट"</string> diff --git a/java/res/values-hr/strings.xml b/java/res/values-hr/strings.xml index ef491f43a..2c227061d 100644 --- a/java/res/values-hr/strings.xml +++ b/java/res/values-hr/strings.xml @@ -37,12 +37,9 @@ <string name="misc_category" msgid="6894192814868233453">"Ostale opcije"</string> <string name="advanced_settings" msgid="362895144495591463">"Napredne postavke"</string> <string name="advanced_settings_summary" msgid="4487980456152830271">"Opcije za stručnjake"</string> - <!-- no translation found for include_other_imes_in_language_switch_list (4533689960308565519) --> - <skip /> - <!-- no translation found for include_other_imes_in_language_switch_list_summary (840637129103317635) --> - <skip /> - <!-- no translation found for suppress_language_switch_key (8003788410354806368) --> - <skip /> + <string name="include_other_imes_in_language_switch_list" msgid="4533689960308565519">"Prebaci na druge unose"</string> + <string name="include_other_imes_in_language_switch_list_summary" msgid="840637129103317635">"Tipka za prebacivanje jezika pokriva i druge načine unosa"</string> + <string name="suppress_language_switch_key" msgid="8003788410354806368">"Spriječi tipku za jezike"</string> <string name="key_preview_popup_dismiss_delay" msgid="6213164897443068248">"Odgoda prikaza tipki"</string> <string name="key_preview_popup_dismiss_no_delay" msgid="2096123151571458064">"Bez odgode"</string> <string name="key_preview_popup_dismiss_default_delay" msgid="2166964333903906734">"Zadano"</string> diff --git a/java/res/values-hu/strings.xml b/java/res/values-hu/strings.xml index 4ac6bf3c2..e4b63634a 100644 --- a/java/res/values-hu/strings.xml +++ b/java/res/values-hu/strings.xml @@ -37,12 +37,9 @@ <string name="misc_category" msgid="6894192814868233453">"Egyéb beállítások"</string> <string name="advanced_settings" msgid="362895144495591463">"Speciális beállítások"</string> <string name="advanced_settings_summary" msgid="4487980456152830271">"Beállítások gyakorlott felhasználóknak"</string> - <!-- no translation found for include_other_imes_in_language_switch_list (4533689960308565519) --> - <skip /> - <!-- no translation found for include_other_imes_in_language_switch_list_summary (840637129103317635) --> - <skip /> - <!-- no translation found for suppress_language_switch_key (8003788410354806368) --> - <skip /> + <string name="include_other_imes_in_language_switch_list" msgid="4533689960308565519">"Váltás más beviteli módra"</string> + <string name="include_other_imes_in_language_switch_list_summary" msgid="840637129103317635">"A nyelvkapcsoló gomb egyéb beviteli módokat is tartalmaz"</string> + <string name="suppress_language_switch_key" msgid="8003788410354806368">"A nyelvkapcsoló elrejtése"</string> <string name="key_preview_popup_dismiss_delay" msgid="6213164897443068248">"Gombeltüntetés késése"</string> <string name="key_preview_popup_dismiss_no_delay" msgid="2096123151571458064">"Nincs késés"</string> <string name="key_preview_popup_dismiss_default_delay" msgid="2166964333903906734">"Alapbeállítás"</string> diff --git a/java/res/values-in/strings.xml b/java/res/values-in/strings.xml index f10d613f2..519730815 100644 --- a/java/res/values-in/strings.xml +++ b/java/res/values-in/strings.xml @@ -37,12 +37,9 @@ <string name="misc_category" msgid="6894192814868233453">"Opsi lain"</string> <string name="advanced_settings" msgid="362895144495591463">"Setelan lanjutan"</string> <string name="advanced_settings_summary" msgid="4487980456152830271">"Opsi untuk ahli"</string> - <!-- no translation found for include_other_imes_in_language_switch_list (4533689960308565519) --> - <skip /> - <!-- no translation found for include_other_imes_in_language_switch_list_summary (840637129103317635) --> - <skip /> - <!-- no translation found for suppress_language_switch_key (8003788410354806368) --> - <skip /> + <string name="include_other_imes_in_language_switch_list" msgid="4533689960308565519">"Alihkn k mtode msukn lain"</string> + <string name="include_other_imes_in_language_switch_list_summary" msgid="840637129103317635">"Tombol beralih bahasa juga mencakup metode masukan lain"</string> + <string name="suppress_language_switch_key" msgid="8003788410354806368">"Redam tombol alih bahasa"</string> <string name="key_preview_popup_dismiss_delay" msgid="6213164897443068248">"Tundaan singkir munculan kunci"</string> <string name="key_preview_popup_dismiss_no_delay" msgid="2096123151571458064">"Tanpa penundaan"</string> <string name="key_preview_popup_dismiss_default_delay" msgid="2166964333903906734">"Default"</string> diff --git a/java/res/values-ja/strings.xml b/java/res/values-ja/strings.xml index 052c4c8db..42b54fb50 100644 --- a/java/res/values-ja/strings.xml +++ b/java/res/values-ja/strings.xml @@ -37,12 +37,9 @@ <string name="misc_category" msgid="6894192814868233453">"他のオプション"</string> <string name="advanced_settings" msgid="362895144495591463">"詳細設定"</string> <string name="advanced_settings_summary" msgid="4487980456152830271">"上級者向けオプション"</string> - <!-- no translation found for include_other_imes_in_language_switch_list (4533689960308565519) --> - <skip /> - <!-- no translation found for include_other_imes_in_language_switch_list_summary (840637129103317635) --> - <skip /> - <!-- no translation found for suppress_language_switch_key (8003788410354806368) --> - <skip /> + <string name="include_other_imes_in_language_switch_list" msgid="4533689960308565519">"他の入力方法に切り替え"</string> + <string name="include_other_imes_in_language_switch_list_summary" msgid="840637129103317635">"言語切り替えキーは他の入力方法にも対応しています"</string> + <string name="suppress_language_switch_key" msgid="8003788410354806368">"言語切り替えキーを非表示"</string> <string name="key_preview_popup_dismiss_delay" msgid="6213164897443068248">"キーのポップアップ時間"</string> <string name="key_preview_popup_dismiss_no_delay" msgid="2096123151571458064">"すぐに消去"</string> <string name="key_preview_popup_dismiss_default_delay" msgid="2166964333903906734">"デフォルト"</string> diff --git a/java/res/values-ko/strings.xml b/java/res/values-ko/strings.xml index 8ec334d24..8543f2e85 100644 --- a/java/res/values-ko/strings.xml +++ b/java/res/values-ko/strings.xml @@ -37,12 +37,9 @@ <string name="misc_category" msgid="6894192814868233453">"기타 옵션"</string> <string name="advanced_settings" msgid="362895144495591463">"고급 설정"</string> <string name="advanced_settings_summary" msgid="4487980456152830271">"전문가용 옵션"</string> - <!-- no translation found for include_other_imes_in_language_switch_list (4533689960308565519) --> - <skip /> - <!-- no translation found for include_other_imes_in_language_switch_list_summary (840637129103317635) --> - <skip /> - <!-- no translation found for suppress_language_switch_key (8003788410354806368) --> - <skip /> + <string name="include_other_imes_in_language_switch_list" msgid="4533689960308565519">"다른 입력 방법으로 전환"</string> + <string name="include_other_imes_in_language_switch_list_summary" msgid="840637129103317635">"언어 전환 키가 제공하는 기타 입력 방법"</string> + <string name="suppress_language_switch_key" msgid="8003788410354806368">"언어 전환 키 제거"</string> <string name="key_preview_popup_dismiss_delay" msgid="6213164897443068248">"키 팝업 해제 지연"</string> <string name="key_preview_popup_dismiss_no_delay" msgid="2096123151571458064">"지연 없음"</string> <string name="key_preview_popup_dismiss_default_delay" msgid="2166964333903906734">"기본값"</string> diff --git a/java/res/values-land/dimens.xml b/java/res/values-land/dimens.xml index 73192d944..6cdcf891c 100644 --- a/java/res/values-land/dimens.xml +++ b/java/res/values-land/dimens.xml @@ -44,7 +44,7 @@ <fraction name="key_horizontal_gap_ics">1.020%p</fraction> <!-- left or right padding of label alignment --> - <dimen name="key_label_horizontal_padding">8dip</dimen> + <dimen name="key_label_horizontal_padding">8dp</dimen> <fraction name="key_letter_ratio">65%</fraction> <fraction name="key_large_letter_ratio">74%</fraction> @@ -60,8 +60,8 @@ <!-- popup_key_height x -0.5 --> <dimen name="more_keys_keyboard_vertical_correction_ics">-0.140in</dimen> - <dimen name="suggestions_strip_height">36dip</dimen> - <dimen name="more_suggestions_row_height">36dip</dimen> + <dimen name="suggestions_strip_height">36dp</dimen> + <dimen name="more_suggestions_row_height">36dp</dimen> <integer name="max_more_suggestions_row">2</integer> <fraction name="min_more_suggestions_width">60%</fraction> <!-- Amount of allowance for selecting keys in a mini popup keyboard by sliding finger. --> diff --git a/java/res/values-lt/strings.xml b/java/res/values-lt/strings.xml index 09b017a12..a0192b859 100644 --- a/java/res/values-lt/strings.xml +++ b/java/res/values-lt/strings.xml @@ -37,12 +37,9 @@ <string name="misc_category" msgid="6894192814868233453">"Kitos parinktys"</string> <string name="advanced_settings" msgid="362895144495591463">"Išplėstiniai nustatymai"</string> <string name="advanced_settings_summary" msgid="4487980456152830271">"Parinktys ekspertams"</string> - <!-- no translation found for include_other_imes_in_language_switch_list (4533689960308565519) --> - <skip /> - <!-- no translation found for include_other_imes_in_language_switch_list_summary (840637129103317635) --> - <skip /> - <!-- no translation found for suppress_language_switch_key (8003788410354806368) --> - <skip /> + <string name="include_other_imes_in_language_switch_list" msgid="4533689960308565519">"Perj. į kt. įvesties būd."</string> + <string name="include_other_imes_in_language_switch_list_summary" msgid="840637129103317635">"Kalbos perjungimo klavišu taip pat perjungiami įvesties būdai"</string> + <string name="suppress_language_switch_key" msgid="8003788410354806368">"Nerodyti klb. keit. klav."</string> <string name="key_preview_popup_dismiss_delay" msgid="6213164897443068248">"Pagr. išš. l. atsis. d."</string> <string name="key_preview_popup_dismiss_no_delay" msgid="2096123151571458064">"Be delsos"</string> <string name="key_preview_popup_dismiss_default_delay" msgid="2166964333903906734">"Numatytasis"</string> diff --git a/java/res/values-lv/strings.xml b/java/res/values-lv/strings.xml index d358a8485..2ba1293ad 100644 --- a/java/res/values-lv/strings.xml +++ b/java/res/values-lv/strings.xml @@ -37,12 +37,9 @@ <string name="misc_category" msgid="6894192814868233453">"Citas opcijas"</string> <string name="advanced_settings" msgid="362895144495591463">"Papildu iestatījumi"</string> <string name="advanced_settings_summary" msgid="4487980456152830271">"Opcijas ekspertiem"</string> - <!-- no translation found for include_other_imes_in_language_switch_list (4533689960308565519) --> - <skip /> - <!-- no translation found for include_other_imes_in_language_switch_list_summary (840637129103317635) --> - <skip /> - <!-- no translation found for suppress_language_switch_key (8003788410354806368) --> - <skip /> + <string name="include_other_imes_in_language_switch_list" msgid="4533689960308565519">"Pārsl. uz citām iev. met."</string> + <string name="include_other_imes_in_language_switch_list_summary" msgid="840637129103317635">"Valodas pārslēgš. taustiņu var lietot arī citām ievades metodēm."</string> + <string name="suppress_language_switch_key" msgid="8003788410354806368">"Atsp. val. pārsl. taust."</string> <string name="key_preview_popup_dismiss_delay" msgid="6213164897443068248">"Taust. uzn. loga noraid. aizk."</string> <string name="key_preview_popup_dismiss_no_delay" msgid="2096123151571458064">"Bez aizkaves"</string> <string name="key_preview_popup_dismiss_default_delay" msgid="2166964333903906734">"Noklusējums"</string> diff --git a/java/res/values-nb/strings.xml b/java/res/values-nb/strings.xml index 8114cd50c..183312806 100644 --- a/java/res/values-nb/strings.xml +++ b/java/res/values-nb/strings.xml @@ -37,12 +37,9 @@ <string name="misc_category" msgid="6894192814868233453">"Andre alternativer"</string> <string name="advanced_settings" msgid="362895144495591463">"Avanserte innstillinger"</string> <string name="advanced_settings_summary" msgid="4487980456152830271">"Alternativer for eksperter"</string> - <!-- no translation found for include_other_imes_in_language_switch_list (4533689960308565519) --> - <skip /> - <!-- no translation found for include_other_imes_in_language_switch_list_summary (840637129103317635) --> - <skip /> - <!-- no translation found for suppress_language_switch_key (8003788410354806368) --> - <skip /> + <string name="include_other_imes_in_language_switch_list" msgid="4533689960308565519">"Bytt inndatametode"</string> + <string name="include_other_imes_in_language_switch_list_summary" msgid="840637129103317635">"Nøkkelen for språkbytte dekker også andre inndatametoder"</string> + <string name="suppress_language_switch_key" msgid="8003788410354806368">"Skjul språkbyttenøkkelen"</string> <string name="key_preview_popup_dismiss_delay" msgid="6213164897443068248">"Tregt tastevindu"</string> <string name="key_preview_popup_dismiss_no_delay" msgid="2096123151571458064">"U/ forsinkelse"</string> <string name="key_preview_popup_dismiss_default_delay" msgid="2166964333903906734">"Standard"</string> diff --git a/java/res/values-nl/strings.xml b/java/res/values-nl/strings.xml index 56d423a29..2bbf5da12 100644 --- a/java/res/values-nl/strings.xml +++ b/java/res/values-nl/strings.xml @@ -37,12 +37,9 @@ <string name="misc_category" msgid="6894192814868233453">"Andere opties"</string> <string name="advanced_settings" msgid="362895144495591463">"Geavanceerde instellingen"</string> <string name="advanced_settings_summary" msgid="4487980456152830271">"Opties voor experts"</string> - <!-- no translation found for include_other_imes_in_language_switch_list (4533689960308565519) --> - <skip /> - <!-- no translation found for include_other_imes_in_language_switch_list_summary (840637129103317635) --> - <skip /> - <!-- no translation found for suppress_language_switch_key (8003788410354806368) --> - <skip /> + <string name="include_other_imes_in_language_switch_list" msgid="4533689960308565519">"Invoermeth. overschakelen"</string> + <string name="include_other_imes_in_language_switch_list_summary" msgid="840637129103317635">"Schakelknop voor taal ook van toepassing op andere invoermethoden"</string> + <string name="suppress_language_switch_key" msgid="8003788410354806368">"Taal onderdr. schakelen"</string> <string name="key_preview_popup_dismiss_delay" msgid="6213164897443068248">"Afwijz.vertr. toetspop-up"</string> <string name="key_preview_popup_dismiss_no_delay" msgid="2096123151571458064">"Geen vertraging"</string> <string name="key_preview_popup_dismiss_default_delay" msgid="2166964333903906734">"Standaard"</string> diff --git a/java/res/values-pl/strings.xml b/java/res/values-pl/strings.xml index ec9e01441..2c91bb5ba 100644 --- a/java/res/values-pl/strings.xml +++ b/java/res/values-pl/strings.xml @@ -37,12 +37,9 @@ <string name="misc_category" msgid="6894192814868233453">"Inne opcje"</string> <string name="advanced_settings" msgid="362895144495591463">"Ustawienia zaawansowane"</string> <string name="advanced_settings_summary" msgid="4487980456152830271">"Opcje dla ekspertów"</string> - <!-- no translation found for include_other_imes_in_language_switch_list (4533689960308565519) --> - <skip /> - <!-- no translation found for include_other_imes_in_language_switch_list_summary (840637129103317635) --> - <skip /> - <!-- no translation found for suppress_language_switch_key (8003788410354806368) --> - <skip /> + <string name="include_other_imes_in_language_switch_list" msgid="4533689960308565519">"Włącz inne metody wprowadzania"</string> + <string name="include_other_imes_in_language_switch_list_summary" msgid="840637129103317635">"Klawisz zmiany języka obejmuje też inne metody wprowadzania"</string> + <string name="suppress_language_switch_key" msgid="8003788410354806368">"Wyłącz klawisz zmiany języka"</string> <string name="key_preview_popup_dismiss_delay" msgid="6213164897443068248">"Opóźnienie znikania klawiszy"</string> <string name="key_preview_popup_dismiss_no_delay" msgid="2096123151571458064">"Bez opóźnienia"</string> <string name="key_preview_popup_dismiss_default_delay" msgid="2166964333903906734">"Wartość domyślna"</string> diff --git a/java/res/values-pt-rPT/strings.xml b/java/res/values-pt-rPT/strings.xml index 4e0cf4c5c..6d59c6eaf 100644 --- a/java/res/values-pt-rPT/strings.xml +++ b/java/res/values-pt-rPT/strings.xml @@ -37,12 +37,9 @@ <string name="misc_category" msgid="6894192814868233453">"Outras opções"</string> <string name="advanced_settings" msgid="362895144495591463">"Definições avançadas"</string> <string name="advanced_settings_summary" msgid="4487980456152830271">"Opções para especialistas"</string> - <!-- no translation found for include_other_imes_in_language_switch_list (4533689960308565519) --> - <skip /> - <!-- no translation found for include_other_imes_in_language_switch_list_summary (840637129103317635) --> - <skip /> - <!-- no translation found for suppress_language_switch_key (8003788410354806368) --> - <skip /> + <string name="include_other_imes_in_language_switch_list" msgid="4533689960308565519">"Mudar p/ outros mét. ent."</string> + <string name="include_other_imes_in_language_switch_list_summary" msgid="840637129103317635">"A tecla de mudança de idioma abrange outros métodos de entrada"</string> + <string name="suppress_language_switch_key" msgid="8003788410354806368">"Suprimir tecla mud idioma"</string> <string name="key_preview_popup_dismiss_delay" msgid="6213164897443068248">"Atraso p/ ignorar pop-up"</string> <string name="key_preview_popup_dismiss_no_delay" msgid="2096123151571458064">"Sem atraso"</string> <string name="key_preview_popup_dismiss_default_delay" msgid="2166964333903906734">"Predefinido"</string> diff --git a/java/res/values-pt/strings.xml b/java/res/values-pt/strings.xml index b3af6f051..e89db807f 100644 --- a/java/res/values-pt/strings.xml +++ b/java/res/values-pt/strings.xml @@ -37,12 +37,9 @@ <string name="misc_category" msgid="6894192814868233453">"Outras opções"</string> <string name="advanced_settings" msgid="362895144495591463">"Configurações avançadas"</string> <string name="advanced_settings_summary" msgid="4487980456152830271">"Opções para especialistas"</string> - <!-- no translation found for include_other_imes_in_language_switch_list (4533689960308565519) --> - <skip /> - <!-- no translation found for include_other_imes_in_language_switch_list_summary (840637129103317635) --> - <skip /> - <!-- no translation found for suppress_language_switch_key (8003788410354806368) --> - <skip /> + <string name="include_other_imes_in_language_switch_list" msgid="4533689960308565519">"Outros métodos de entrada"</string> + <string name="include_other_imes_in_language_switch_list_summary" msgid="840637129103317635">"A tecla para mudar o idioma também cobre outro métodos de entrada"</string> + <string name="suppress_language_switch_key" msgid="8003788410354806368">"Ocult. tecla mudar idioma"</string> <string name="key_preview_popup_dismiss_delay" msgid="6213164897443068248">"Dispens. atraso chave princ."</string> <string name="key_preview_popup_dismiss_no_delay" msgid="2096123151571458064">"Sem atraso"</string> <string name="key_preview_popup_dismiss_default_delay" msgid="2166964333903906734">"Padrão"</string> diff --git a/java/res/values-ro/strings.xml b/java/res/values-ro/strings.xml index 2445075f9..bd62d62c9 100644 --- a/java/res/values-ro/strings.xml +++ b/java/res/values-ro/strings.xml @@ -37,12 +37,9 @@ <string name="misc_category" msgid="6894192814868233453">"Alte opţiuni"</string> <string name="advanced_settings" msgid="362895144495591463">"Setări avansate"</string> <string name="advanced_settings_summary" msgid="4487980456152830271">"Opţiuni pentru experţi"</string> - <!-- no translation found for include_other_imes_in_language_switch_list (4533689960308565519) --> - <skip /> - <!-- no translation found for include_other_imes_in_language_switch_list_summary (840637129103317635) --> - <skip /> - <!-- no translation found for suppress_language_switch_key (8003788410354806368) --> - <skip /> + <string name="include_other_imes_in_language_switch_list" msgid="4533689960308565519">"Comut. alte metode de introd."</string> + <string name="include_other_imes_in_language_switch_list_summary" msgid="840637129103317635">"Tasta de comutare între limbi include şi alte metode de introd."</string> + <string name="suppress_language_switch_key" msgid="8003788410354806368">"Suprim. tasta comut. limbi"</string> <string name="key_preview_popup_dismiss_delay" msgid="6213164897443068248">"Înt. înch. pop-up esenţ."</string> <string name="key_preview_popup_dismiss_no_delay" msgid="2096123151571458064">"Fără întârziere"</string> <string name="key_preview_popup_dismiss_default_delay" msgid="2166964333903906734">"Prestabilit"</string> diff --git a/java/res/values-ru/strings.xml b/java/res/values-ru/strings.xml index 0d3d21de0..ef759b129 100644 --- a/java/res/values-ru/strings.xml +++ b/java/res/values-ru/strings.xml @@ -37,12 +37,9 @@ <string name="misc_category" msgid="6894192814868233453">"Другие варианты"</string> <string name="advanced_settings" msgid="362895144495591463">"Расширенные настройки"</string> <string name="advanced_settings_summary" msgid="4487980456152830271">"Для опытных пользователей"</string> - <!-- no translation found for include_other_imes_in_language_switch_list (4533689960308565519) --> - <skip /> - <!-- no translation found for include_other_imes_in_language_switch_list_summary (840637129103317635) --> - <skip /> - <!-- no translation found for suppress_language_switch_key (8003788410354806368) --> - <skip /> + <string name="include_other_imes_in_language_switch_list" msgid="4533689960308565519">"Другой способ ввода"</string> + <string name="include_other_imes_in_language_switch_list_summary" msgid="840637129103317635">"Клавиша переключения языков также служит для смены способа ввода"</string> + <string name="suppress_language_switch_key" msgid="8003788410354806368">"Блок. кл. перекл. языков"</string> <string name="key_preview_popup_dismiss_delay" msgid="6213164897443068248">"Задержка закрытия"</string> <string name="key_preview_popup_dismiss_no_delay" msgid="2096123151571458064">"Без задержки"</string> <string name="key_preview_popup_dismiss_default_delay" msgid="2166964333903906734">"По умолчанию"</string> diff --git a/java/res/values-sk/strings.xml b/java/res/values-sk/strings.xml index 91896d01c..3b06d5a84 100644 --- a/java/res/values-sk/strings.xml +++ b/java/res/values-sk/strings.xml @@ -37,12 +37,9 @@ <string name="misc_category" msgid="6894192814868233453">"Ďalšie možnosti"</string> <string name="advanced_settings" msgid="362895144495591463">"Rozšírené nastavenia"</string> <string name="advanced_settings_summary" msgid="4487980456152830271">"Možnosti pre odborníkov"</string> - <!-- no translation found for include_other_imes_in_language_switch_list (4533689960308565519) --> - <skip /> - <!-- no translation found for include_other_imes_in_language_switch_list_summary (840637129103317635) --> - <skip /> - <!-- no translation found for suppress_language_switch_key (8003788410354806368) --> - <skip /> + <string name="include_other_imes_in_language_switch_list" msgid="4533689960308565519">"Prepnúť na iné metódy vstupu"</string> + <string name="include_other_imes_in_language_switch_list_summary" msgid="840637129103317635">"Kláves na prepnutie jazyka pokrýva aj ďalšie metódy vstupu"</string> + <string name="suppress_language_switch_key" msgid="8003788410354806368">"Blok. kláves na prep. jazyka"</string> <string name="key_preview_popup_dismiss_delay" msgid="6213164897443068248">"Onesk. zrušenia kľúč. kon. okna"</string> <string name="key_preview_popup_dismiss_no_delay" msgid="2096123151571458064">"Bez oneskorenia"</string> <string name="key_preview_popup_dismiss_default_delay" msgid="2166964333903906734">"Predvolená"</string> diff --git a/java/res/values-sl/strings.xml b/java/res/values-sl/strings.xml index 88d29a9e6..984fd9cba 100644 --- a/java/res/values-sl/strings.xml +++ b/java/res/values-sl/strings.xml @@ -37,12 +37,9 @@ <string name="misc_category" msgid="6894192814868233453">"Druge možnosti"</string> <string name="advanced_settings" msgid="362895144495591463">"Dodatne nastavitve"</string> <string name="advanced_settings_summary" msgid="4487980456152830271">"Možnosti za strokovnjake"</string> - <!-- no translation found for include_other_imes_in_language_switch_list (4533689960308565519) --> - <skip /> - <!-- no translation found for include_other_imes_in_language_switch_list_summary (840637129103317635) --> - <skip /> - <!-- no translation found for suppress_language_switch_key (8003788410354806368) --> - <skip /> + <string name="include_other_imes_in_language_switch_list" msgid="4533689960308565519">"Prekl. na drug nač. vnosa"</string> + <string name="include_other_imes_in_language_switch_list_summary" msgid="840637129103317635">"Tipka za preklop jezika, ki vključuje tudi druge načine vnosa"</string> + <string name="suppress_language_switch_key" msgid="8003788410354806368">"Onemogoči preklop jezika"</string> <string name="key_preview_popup_dismiss_delay" msgid="6213164897443068248">"Trajanje povečanja tipke"</string> <string name="key_preview_popup_dismiss_no_delay" msgid="2096123151571458064">"Brez zakasnitve"</string> <string name="key_preview_popup_dismiss_default_delay" msgid="2166964333903906734">"Privzeto"</string> diff --git a/java/res/values-sr/strings.xml b/java/res/values-sr/strings.xml index 463165b6f..745ed1e33 100644 --- a/java/res/values-sr/strings.xml +++ b/java/res/values-sr/strings.xml @@ -37,12 +37,9 @@ <string name="misc_category" msgid="6894192814868233453">"Друге опције"</string> <string name="advanced_settings" msgid="362895144495591463">"Напредна подешавања"</string> <string name="advanced_settings_summary" msgid="4487980456152830271">"Опције за стручњаке"</string> - <!-- no translation found for include_other_imes_in_language_switch_list (4533689960308565519) --> - <skip /> - <!-- no translation found for include_other_imes_in_language_switch_list_summary (840637129103317635) --> - <skip /> - <!-- no translation found for suppress_language_switch_key (8003788410354806368) --> - <skip /> + <string name="include_other_imes_in_language_switch_list" msgid="4533689960308565519">"Пребаци на друге методе уноса"</string> + <string name="include_other_imes_in_language_switch_list_summary" msgid="840637129103317635">"Тастер за пребацивање језика обухвата и друге методе уноса"</string> + <string name="suppress_language_switch_key" msgid="8003788410354806368">"Искључи тастер за језике"</string> <string name="key_preview_popup_dismiss_delay" msgid="6213164897443068248">"Одложи одбац. иск. прозора тастера"</string> <string name="key_preview_popup_dismiss_no_delay" msgid="2096123151571458064">"Без одлагања"</string> <string name="key_preview_popup_dismiss_default_delay" msgid="2166964333903906734">"Подразумевано"</string> diff --git a/java/res/values-sv/strings.xml b/java/res/values-sv/strings.xml index 992604a41..9cac393e7 100644 --- a/java/res/values-sv/strings.xml +++ b/java/res/values-sv/strings.xml @@ -37,12 +37,9 @@ <string name="misc_category" msgid="6894192814868233453">"Andra alternativ"</string> <string name="advanced_settings" msgid="362895144495591463">"Avancerade inställningar"</string> <string name="advanced_settings_summary" msgid="4487980456152830271">"Alternativ för experter"</string> - <!-- no translation found for include_other_imes_in_language_switch_list (4533689960308565519) --> - <skip /> - <!-- no translation found for include_other_imes_in_language_switch_list_summary (840637129103317635) --> - <skip /> - <!-- no translation found for suppress_language_switch_key (8003788410354806368) --> - <skip /> + <string name="include_other_imes_in_language_switch_list" msgid="4533689960308565519">"Byt till annan inmatning"</string> + <string name="include_other_imes_in_language_switch_list_summary" msgid="840637129103317635">"Språkbytesknappen omfattar även andra inmatningsmetoder"</string> + <string name="suppress_language_switch_key" msgid="8003788410354806368">"Stäng av språkbytesknapp"</string> <string name="key_preview_popup_dismiss_delay" msgid="6213164897443068248">"Ta bort popup-fördröjning"</string> <string name="key_preview_popup_dismiss_no_delay" msgid="2096123151571458064">"Fördröj inte"</string> <string name="key_preview_popup_dismiss_default_delay" msgid="2166964333903906734">"Standard"</string> diff --git a/java/res/values-sw/strings.xml b/java/res/values-sw/strings.xml index 12185cacb..4a7a1ff85 100644 --- a/java/res/values-sw/strings.xml +++ b/java/res/values-sw/strings.xml @@ -37,12 +37,9 @@ <string name="misc_category" msgid="6894192814868233453">"Chaguo zingine"</string> <string name="advanced_settings" msgid="362895144495591463">"Mipangilio mahiri"</string> <string name="advanced_settings_summary" msgid="4487980456152830271">"Chaguo za wataalamu"</string> - <!-- no translation found for include_other_imes_in_language_switch_list (4533689960308565519) --> - <skip /> - <!-- no translation found for include_other_imes_in_language_switch_list_summary (840637129103317635) --> - <skip /> - <!-- no translation found for suppress_language_switch_key (8003788410354806368) --> - <skip /> + <string name="include_other_imes_in_language_switch_list" msgid="4533689960308565519">"Badilisha kwa mbinu zingine za ingizo"</string> + <string name="include_other_imes_in_language_switch_list_summary" msgid="840637129103317635">"Ufunguo wa kubadilisha lugha unashughulikia mbinu zingine za ingizo pia"</string> + <string name="suppress_language_switch_key" msgid="8003788410354806368">"Zuia ufunguo wa kubadili lugha"</string> <string name="key_preview_popup_dismiss_delay" msgid="6213164897443068248">"Kuchelewesha kutupa kitufe ibukizi"</string> <string name="key_preview_popup_dismiss_no_delay" msgid="2096123151571458064">"Hakuna kuchelewa"</string> <string name="key_preview_popup_dismiss_default_delay" msgid="2166964333903906734">"Chaguo-msingi"</string> diff --git a/java/res/values-sw600dp-land/dimens.xml b/java/res/values-sw600dp-land/dimens.xml index 68083b534..5dce47ee3 100644 --- a/java/res/values-sw600dp-land/dimens.xml +++ b/java/res/values-sw600dp-land/dimens.xml @@ -40,7 +40,7 @@ <dimen name="popup_key_height">13.0mm</dimen> <!-- left or right padding of label alignment --> - <dimen name="key_label_horizontal_padding">18dip</dimen> + <dimen name="key_label_horizontal_padding">18dp</dimen> <fraction name="key_letter_ratio">45%</fraction> <fraction name="key_large_letter_ratio">48%</fraction> diff --git a/java/res/values-sw600dp/dimens.xml b/java/res/values-sw600dp/dimens.xml index a86102421..0f256a302 100644 --- a/java/res/values-sw600dp/dimens.xml +++ b/java/res/values-sw600dp/dimens.xml @@ -40,7 +40,7 @@ <fraction name="keyboard_bottom_padding_ics">0.0%p</fraction> - <dimen name="more_keys_keyboard_key_horizontal_padding">6dip</dimen> + <dimen name="more_keys_keyboard_key_horizontal_padding">6dp</dimen> <!-- Amount of allowance for selecting keys in a mini popup keyboard by sliding finger. --> <!-- popup_key_height x 1.2 --> <dimen name="more_keys_keyboard_slide_allowance">15.6mm</dimen> @@ -48,7 +48,7 @@ <dimen name="more_keys_keyboard_vertical_correction">-13.0mm</dimen> <!-- left or right padding of label alignment --> - <dimen name="key_label_horizontal_padding">6dip</dimen> + <dimen name="key_label_horizontal_padding">6dp</dimen> <dimen name="key_hint_letter_padding">3dp</dimen> <dimen name="key_uppercase_letter_padding">3dp</dimen> @@ -63,18 +63,17 @@ <dimen name="key_preview_height">15.0mm</dimen> <dimen name="key_preview_offset">0.1in</dimen> - <dimen name="key_preview_height_ics">15.0mm</dimen> <dimen name="key_preview_offset_ics">0.05in</dimen> <!-- popup_key_height x -0.5 --> <dimen name="more_keys_keyboard_vertical_correction_ics">-5mm</dimen> - <dimen name="suggestions_strip_height">44dip</dimen> - <dimen name="more_suggestions_row_height">44dip</dimen> + <dimen name="suggestions_strip_height">44dp</dimen> + <dimen name="more_suggestions_row_height">44dp</dimen> <integer name="max_more_suggestions_row">6</integer> <fraction name="min_more_suggestions_width">90%</fraction> <dimen name="suggestions_strip_padding">15.0mm</dimen> <dimen name="suggestion_min_width">0.3in</dimen> - <dimen name="suggestion_padding">12dip</dimen> - <dimen name="suggestion_text_size">22dip</dimen> - <dimen name="more_suggestions_hint_text_size">33dip</dimen> + <dimen name="suggestion_padding">12dp</dimen> + <dimen name="suggestion_text_size">22dp</dimen> + <dimen name="more_suggestions_hint_text_size">33dp</dimen> </resources> diff --git a/java/res/values-sw768dp-land/dimens.xml b/java/res/values-sw768dp-land/dimens.xml index ef39f4393..535c62308 100644 --- a/java/res/values-sw768dp-land/dimens.xml +++ b/java/res/values-sw768dp-land/dimens.xml @@ -44,7 +44,7 @@ <dimen name="popup_key_height">13.0mm</dimen> <!-- left or right padding of label alignment --> - <dimen name="key_label_horizontal_padding">18dip</dimen> + <dimen name="key_label_horizontal_padding">18dp</dimen> <fraction name="key_letter_ratio">43%</fraction> <fraction name="key_large_letter_ratio">42%</fraction> @@ -55,7 +55,6 @@ <fraction name="spacebar_text_ratio">24.00%</fraction> <dimen name="key_preview_height">17.0mm</dimen> - <dimen name="key_preview_height_ics">26.5mm</dimen> <dimen name="key_preview_offset_ics">0.05in</dimen> <dimen name="suggestions_strip_padding">40.0mm</dimen> diff --git a/java/res/values-sw768dp/dimens.xml b/java/res/values-sw768dp/dimens.xml index a9ad030fe..7aefa26af 100644 --- a/java/res/values-sw768dp/dimens.xml +++ b/java/res/values-sw768dp/dimens.xml @@ -43,7 +43,7 @@ <dimen name="popup_key_height">10.0mm</dimen> - <dimen name="more_keys_keyboard_key_horizontal_padding">12dip</dimen> + <dimen name="more_keys_keyboard_key_horizontal_padding">12dp</dimen> <!-- Amount of allowance for selecting keys in a mini popup keyboard by sliding finger. --> <!-- popup_key_height x 1.2 --> <dimen name="more_keys_keyboard_slide_allowance">15.6mm</dimen> @@ -51,7 +51,7 @@ <dimen name="more_keys_keyboard_vertical_correction">-13.0mm</dimen> <!-- left or right padding of label alignment --> - <dimen name="key_label_horizontal_padding">6dip</dimen> + <dimen name="key_label_horizontal_padding">6dp</dimen> <dimen name="key_hint_letter_padding">3dp</dimen> <dimen name="key_uppercase_letter_padding">3dp</dimen> @@ -66,18 +66,17 @@ <dimen name="key_preview_height">15.0mm</dimen> <dimen name="key_preview_offset">0.1in</dimen> - <dimen name="key_preview_height_ics">15.0mm</dimen> <dimen name="key_preview_offset_ics">0.05in</dimen> <!-- popup_key_height x -0.5 --> <dimen name="more_keys_keyboard_vertical_correction_ics">-5mm</dimen> - <dimen name="suggestions_strip_height">44dip</dimen> - <dimen name="more_suggestions_row_height">44dip</dimen> + <dimen name="suggestions_strip_height">44dp</dimen> + <dimen name="more_suggestions_row_height">44dp</dimen> <integer name="max_more_suggestions_row">6</integer> <fraction name="min_more_suggestions_width">90%</fraction> <dimen name="suggestions_strip_padding">15.0mm</dimen> - <dimen name="suggestion_min_width">46dip</dimen> - <dimen name="suggestion_padding">8dip</dimen> - <dimen name="suggestion_text_size">22dip</dimen> - <dimen name="more_suggestions_hint_text_size">33dip</dimen> + <dimen name="suggestion_min_width">46dp</dimen> + <dimen name="suggestion_padding">8dp</dimen> + <dimen name="suggestion_text_size">22dp</dimen> + <dimen name="more_suggestions_hint_text_size">33dp</dimen> </resources> diff --git a/java/res/values-th/strings.xml b/java/res/values-th/strings.xml index f291fcce7..d255f44cf 100644 --- a/java/res/values-th/strings.xml +++ b/java/res/values-th/strings.xml @@ -37,12 +37,9 @@ <string name="misc_category" msgid="6894192814868233453">"ตัวเลือกอื่นๆ"</string> <string name="advanced_settings" msgid="362895144495591463">"การตั้งค่าขั้นสูง"</string> <string name="advanced_settings_summary" msgid="4487980456152830271">"ตัวเลือกสำหรับผู้เชี่ยวชาญ"</string> - <!-- no translation found for include_other_imes_in_language_switch_list (4533689960308565519) --> - <skip /> - <!-- no translation found for include_other_imes_in_language_switch_list_summary (840637129103317635) --> - <skip /> - <!-- no translation found for suppress_language_switch_key (8003788410354806368) --> - <skip /> + <string name="include_other_imes_in_language_switch_list" msgid="4533689960308565519">"ใช้วิธีการป้อนข้อมูลอื่น"</string> + <string name="include_other_imes_in_language_switch_list_summary" msgid="840637129103317635">"แป้นสลับภาษาครอบคลุมวิธีการป้อนข้อมูลอื่นๆ ด้วย"</string> + <string name="suppress_language_switch_key" msgid="8003788410354806368">"ยกเลิกแป้นสลับภาษา"</string> <string name="key_preview_popup_dismiss_delay" msgid="6213164897443068248">"หน่วงเวลาก่อนปิดป๊อปอัพหลัก"</string> <string name="key_preview_popup_dismiss_no_delay" msgid="2096123151571458064">"ไม่มีการหน่วงเวลา"</string> <string name="key_preview_popup_dismiss_default_delay" msgid="2166964333903906734">"ค่าเริ่มต้น"</string> diff --git a/java/res/values-tl/strings.xml b/java/res/values-tl/strings.xml index 53ae616f1..336a0831e 100644 --- a/java/res/values-tl/strings.xml +++ b/java/res/values-tl/strings.xml @@ -37,12 +37,9 @@ <string name="misc_category" msgid="6894192814868233453">"Iba pang mga pagpipilian"</string> <string name="advanced_settings" msgid="362895144495591463">"Mga advanced na setting"</string> <string name="advanced_settings_summary" msgid="4487980456152830271">"Mga pagpipilian para sa mga dalubhasa"</string> - <!-- no translation found for include_other_imes_in_language_switch_list (4533689960308565519) --> - <skip /> - <!-- no translation found for include_other_imes_in_language_switch_list_summary (840637129103317635) --> - <skip /> - <!-- no translation found for suppress_language_switch_key (8003788410354806368) --> - <skip /> + <string name="include_other_imes_in_language_switch_list" msgid="4533689960308565519">"Lipat iba paraan ng input"</string> + <string name="include_other_imes_in_language_switch_list_summary" msgid="840637129103317635">"Saklaw din ng key ng pagpalit ng wika ang ibang paraan ng input"</string> + <string name="suppress_language_switch_key" msgid="8003788410354806368">"Pigilan key pagpalit wika"</string> <string name="key_preview_popup_dismiss_delay" msgid="6213164897443068248">"Balewala antala key popup"</string> <string name="key_preview_popup_dismiss_no_delay" msgid="2096123151571458064">"Walang antala"</string> <string name="key_preview_popup_dismiss_default_delay" msgid="2166964333903906734">"Default"</string> diff --git a/java/res/values-tr/strings.xml b/java/res/values-tr/strings.xml index 01acfbf60..8689adcbe 100644 --- a/java/res/values-tr/strings.xml +++ b/java/res/values-tr/strings.xml @@ -37,12 +37,9 @@ <string name="misc_category" msgid="6894192814868233453">"Diğer seçenekler"</string> <string name="advanced_settings" msgid="362895144495591463">"Gelişmiş ayarlar"</string> <string name="advanced_settings_summary" msgid="4487980456152830271">"Uzmanlar için seçenekler"</string> - <!-- no translation found for include_other_imes_in_language_switch_list (4533689960308565519) --> - <skip /> - <!-- no translation found for include_other_imes_in_language_switch_list_summary (840637129103317635) --> - <skip /> - <!-- no translation found for suppress_language_switch_key (8003788410354806368) --> - <skip /> + <string name="include_other_imes_in_language_switch_list" msgid="4533689960308565519">"Diğ. giriş yöntem. geç"</string> + <string name="include_other_imes_in_language_switch_list_summary" msgid="840637129103317635">"Dil geçiş tuşu diğer giriş yöntemlerini de kapsar"</string> + <string name="suppress_language_switch_key" msgid="8003788410354806368">"Dil geçiş tuşunu gösterme"</string> <string name="key_preview_popup_dismiss_delay" msgid="6213164897443068248">"Tuş popup içn kaptm ertlm"</string> <string name="key_preview_popup_dismiss_no_delay" msgid="2096123151571458064">"Gecikme yok"</string> <string name="key_preview_popup_dismiss_default_delay" msgid="2166964333903906734">"Varsayılan"</string> diff --git a/java/res/values-uk/strings.xml b/java/res/values-uk/strings.xml index ea970fe04..f449becec 100644 --- a/java/res/values-uk/strings.xml +++ b/java/res/values-uk/strings.xml @@ -37,12 +37,9 @@ <string name="misc_category" msgid="6894192814868233453">"Інші опції"</string> <string name="advanced_settings" msgid="362895144495591463">"Розширені налаштування"</string> <string name="advanced_settings_summary" msgid="4487980456152830271">"Налаштування для досвідчених користувачів"</string> - <!-- no translation found for include_other_imes_in_language_switch_list (4533689960308565519) --> - <skip /> - <!-- no translation found for include_other_imes_in_language_switch_list_summary (840637129103317635) --> - <skip /> - <!-- no translation found for suppress_language_switch_key (8003788410354806368) --> - <skip /> + <string name="include_other_imes_in_language_switch_list" msgid="4533689960308565519">"Інші методи введення"</string> + <string name="include_other_imes_in_language_switch_list_summary" msgid="840637129103317635">"Клавіша зміни мови дозволяє змінювати методи введення"</string> + <string name="suppress_language_switch_key" msgid="8003788410354806368">"Заблок.клавішу зміни мови"</string> <string name="key_preview_popup_dismiss_delay" msgid="6213164897443068248">"Затримка клавіши закриття"</string> <string name="key_preview_popup_dismiss_no_delay" msgid="2096123151571458064">"Без затримки"</string> <string name="key_preview_popup_dismiss_default_delay" msgid="2166964333903906734">"За умовчанням"</string> diff --git a/java/res/values-vi/strings.xml b/java/res/values-vi/strings.xml index 25d1f289f..01179845f 100644 --- a/java/res/values-vi/strings.xml +++ b/java/res/values-vi/strings.xml @@ -37,12 +37,9 @@ <string name="misc_category" msgid="6894192814868233453">"Tùy chọn khác"</string> <string name="advanced_settings" msgid="362895144495591463">"Cài đặt nâng cao"</string> <string name="advanced_settings_summary" msgid="4487980456152830271">"Tùy chọn dành cho chuyên gia"</string> - <!-- no translation found for include_other_imes_in_language_switch_list (4533689960308565519) --> - <skip /> - <!-- no translation found for include_other_imes_in_language_switch_list_summary (840637129103317635) --> - <skip /> - <!-- no translation found for suppress_language_switch_key (8003788410354806368) --> - <skip /> + <string name="include_other_imes_in_language_switch_list" msgid="4533689960308565519">"Phương thức nhập khác"</string> + <string name="include_other_imes_in_language_switch_list_summary" msgid="840637129103317635">"Khóa chuyển ngôn ngữ bao gồm cả các phương thức nhập liệu khác"</string> + <string name="suppress_language_switch_key" msgid="8003788410354806368">"Bỏ khóa chuyển ngôn ngữ"</string> <string name="key_preview_popup_dismiss_delay" msgid="6213164897443068248">"Loại bỏ hiển thị phím trễ"</string> <string name="key_preview_popup_dismiss_no_delay" msgid="2096123151571458064">"Không có tgian trễ"</string> <string name="key_preview_popup_dismiss_default_delay" msgid="2166964333903906734">"Mặc định"</string> diff --git a/java/res/values-zh-rCN/strings.xml b/java/res/values-zh-rCN/strings.xml index ef42b7f7f..0e94806a7 100644 --- a/java/res/values-zh-rCN/strings.xml +++ b/java/res/values-zh-rCN/strings.xml @@ -37,12 +37,9 @@ <string name="misc_category" msgid="6894192814868233453">"其他选项"</string> <string name="advanced_settings" msgid="362895144495591463">"高级设置"</string> <string name="advanced_settings_summary" msgid="4487980456152830271">"高级选项"</string> - <!-- no translation found for include_other_imes_in_language_switch_list (4533689960308565519) --> - <skip /> - <!-- no translation found for include_other_imes_in_language_switch_list_summary (840637129103317635) --> - <skip /> - <!-- no translation found for suppress_language_switch_key (8003788410354806368) --> - <skip /> + <string name="include_other_imes_in_language_switch_list" msgid="4533689960308565519">"切换到其他输入法"</string> + <string name="include_other_imes_in_language_switch_list_summary" msgid="840637129103317635">"语言切换键也可用于切换其他输入法"</string> + <string name="suppress_language_switch_key" msgid="8003788410354806368">"隐藏语言切换键"</string> <string name="key_preview_popup_dismiss_delay" msgid="6213164897443068248">"关闭弹出键时的延迟"</string> <string name="key_preview_popup_dismiss_no_delay" msgid="2096123151571458064">"无延迟"</string> <string name="key_preview_popup_dismiss_default_delay" msgid="2166964333903906734">"默认"</string> diff --git a/java/res/values-zh-rTW/strings.xml b/java/res/values-zh-rTW/strings.xml index a2c2f0250..ac8da4325 100644 --- a/java/res/values-zh-rTW/strings.xml +++ b/java/res/values-zh-rTW/strings.xml @@ -37,12 +37,9 @@ <string name="misc_category" msgid="6894192814868233453">"其他選項"</string> <string name="advanced_settings" msgid="362895144495591463">"進階設定"</string> <string name="advanced_settings_summary" msgid="4487980456152830271">"進階選項"</string> - <!-- no translation found for include_other_imes_in_language_switch_list (4533689960308565519) --> - <skip /> - <!-- no translation found for include_other_imes_in_language_switch_list_summary (840637129103317635) --> - <skip /> - <!-- no translation found for suppress_language_switch_key (8003788410354806368) --> - <skip /> + <string name="include_other_imes_in_language_switch_list" msgid="4533689960308565519">"切換至其他輸入法"</string> + <string name="include_other_imes_in_language_switch_list_summary" msgid="840637129103317635">"使語言切換鍵包含其他輸入法"</string> + <string name="suppress_language_switch_key" msgid="8003788410354806368">"隱藏語言切換鍵"</string> <string name="key_preview_popup_dismiss_delay" msgid="6213164897443068248">"關閉彈出式鍵盤的延遲時間"</string> <string name="key_preview_popup_dismiss_no_delay" msgid="2096123151571458064">"不延遲"</string> <string name="key_preview_popup_dismiss_default_delay" msgid="2166964333903906734">"預設"</string> diff --git a/java/res/values-zu/strings.xml b/java/res/values-zu/strings.xml index 3646a85ed..799a262b6 100644 --- a/java/res/values-zu/strings.xml +++ b/java/res/values-zu/strings.xml @@ -38,7 +38,7 @@ <string name="advanced_settings" msgid="362895144495591463">"Izilungiselelo ezithuthukisiwe"</string> <string name="advanced_settings_summary" msgid="4487980456152830271">"Izinketho zezingcwenti"</string> <string name="include_other_imes_in_language_switch_list" msgid="4533689960308565519">"Shintshela kwezinye izindlela zokungena"</string> - <string name="include_other_imes_in_language_switch_list_summary" msgid="840637129103317635">"Ukhiye wokushintsha ilimi ubandakanya ezinye izindlela zokungenayo"</string> + <string name="include_other_imes_in_language_switch_list_summary" msgid="840637129103317635">"Ukhiye wokushintsha ulimi ubandakanya ezinye izindlela zokungenayo"</string> <string name="suppress_language_switch_key" msgid="8003788410354806368">"Ukhiye wokushintshela wokuvimbela ulimi"</string> <string name="key_preview_popup_dismiss_delay" msgid="6213164897443068248">"Ukuvela kokhiye cashisa ukulibazisa"</string> <string name="key_preview_popup_dismiss_no_delay" msgid="2096123151571458064">"Cha ukulibazisa"</string> diff --git a/java/res/values/config.xml b/java/res/values/config.xml index c51800fb0..cccec635e 100644 --- a/java/res/values/config.xml +++ b/java/res/values/config.xml @@ -98,5 +98,4 @@ 4 = ? --> <integer name="log_screen_metrics">0</integer> - <bool name="config_require_umlaut_processing">false</bool> </resources> diff --git a/java/res/values/dimens.xml b/java/res/values/dimens.xml index 37720ce72..5f74fa746 100644 --- a/java/res/values/dimens.xml +++ b/java/res/values/dimens.xml @@ -26,8 +26,8 @@ <dimen name="popup_key_height">0.330in</dimen> - <dimen name="more_keys_keyboard_horizontal_edges_padding">16dip</dimen> - <dimen name="more_keys_keyboard_key_horizontal_padding">8dip</dimen> + <dimen name="more_keys_keyboard_horizontal_edges_padding">16dp</dimen> + <dimen name="more_keys_keyboard_key_horizontal_padding">8dp</dimen> <fraction name="keyboard_top_padding">1.556%p</fraction> <fraction name="keyboard_bottom_padding">4.669%p</fraction> @@ -48,7 +48,7 @@ <fraction name="keyboard_bottom_padding_ics">4.669%p</fraction> <fraction name="key_bottom_gap_ics">6.127%p</fraction> <fraction name="key_horizontal_gap_ics">1.739%p</fraction> - <dimen name="more_keys_keyboard_horizontal_edges_padding_ics">4dip</dimen> + <dimen name="more_keys_keyboard_horizontal_edges_padding_ics">4dp</dimen> <!-- Amount of allowance for selecting keys in a mini popup keyboard by sliding finger. --> <!-- popup_key_height x 1.2 --> @@ -67,33 +67,32 @@ <fraction name="key_uppercase_letter_ratio">35%</fraction> <fraction name="key_preview_text_ratio">82%</fraction> <fraction name="spacebar_text_ratio">33.735%</fraction> - <dimen name="key_preview_height">80sp</dimen> + <dimen name="key_preview_height">80dp</dimen> <dimen name="key_preview_offset">0.1in</dimen> - <dimen name="key_label_horizontal_padding">4dip</dimen> + <dimen name="key_label_horizontal_padding">4dp</dimen> <dimen name="key_hint_letter_padding">1dp</dimen> <dimen name="key_popup_hint_letter_padding">2dp</dimen> <dimen name="key_uppercase_letter_padding">2dp</dimen> - <dimen name="key_preview_height_ics">80sp</dimen> <dimen name="key_preview_offset_ics">0.05in</dimen> <!-- popup_key_height x -0.5 --> <dimen name="more_keys_keyboard_vertical_correction_ics">-0.165in</dimen> - <dimen name="suggestions_strip_height">40dip</dimen> - <dimen name="more_suggestions_key_horizontal_padding">12dip</dimen> - <dimen name="more_suggestions_row_height">40dip</dimen> - <dimen name="more_suggestions_bottom_gap">6dip</dimen> + <dimen name="suggestions_strip_height">40dp</dimen> + <dimen name="more_suggestions_key_horizontal_padding">12dp</dimen> + <dimen name="more_suggestions_row_height">40dp</dimen> + <dimen name="more_suggestions_bottom_gap">6dp</dimen> <dimen name="more_suggestions_modal_tolerance">0.2in</dimen> <dimen name="more_suggestions_slide_allowance">0.1in</dimen> <integer name="max_more_suggestions_row">6</integer> <fraction name="min_more_suggestions_width">90%</fraction> <fraction name="more_suggestions_info_ratio">18%</fraction> - <dimen name="suggestions_strip_padding">0dip</dimen> - <dimen name="suggestion_min_width">44dip</dimen> - <dimen name="suggestion_padding">6dip</dimen> - <dimen name="suggestion_text_size">18dip</dimen> - <dimen name="more_suggestions_hint_text_size">27dip</dimen> + <dimen name="suggestions_strip_padding">0dp</dimen> + <dimen name="suggestion_min_width">44dp</dimen> + <dimen name="suggestion_padding">6dp</dimen> + <dimen name="suggestion_text_size">18dp</dimen> + <dimen name="more_suggestions_hint_text_size">27dp</dimen> <integer name="suggestions_count_in_strip">3</integer> <integer name="center_suggestion_percentile">36</integer> </resources> diff --git a/java/res/values/donottranslate-config.xml b/java/res/values/donottranslate-config.xml new file mode 100644 index 000000000..9b94272e2 --- /dev/null +++ b/java/res/values/donottranslate-config.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright 2012, The Android Open Source Project +** +** Licensed under the Apache License, Version 2.0 (the "License"); +** you may not use this file except in compliance with the License. +** You may obtain a copy of the License at +** +** http://www.apache.org/licenses/LICENSE-2.0 +** +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and +** limitations under the License. +*/ +--> + +<resources> + <bool name="config_require_umlaut_processing">false</bool> +</resources> diff --git a/java/res/values/styles.xml b/java/res/values/styles.xml index 7d8b7ddf2..5628f271c 100644 --- a/java/res/values/styles.xml +++ b/java/res/values/styles.xml @@ -95,9 +95,9 @@ name="MoreKeysKeyboard" parent="Keyboard" > - <item name="keyboardTopPadding">0dip</item> - <item name="keyboardBottomPadding">0dip</item> - <item name="horizontalGap">0dip</item> + <item name="keyboardTopPadding">0dp</item> + <item name="keyboardBottomPadding">0dp</item> + <item name="horizontalGap">0dp</item> </style> <style name="MoreKeysKeyboardView" @@ -205,9 +205,9 @@ name="MoreKeysKeyboard.Stone" parent="Keyboard.Stone" > - <item name="keyboardTopPadding">0dip</item> - <item name="keyboardBottomPadding">0dip</item> - <item name="horizontalGap">0dip</item> + <item name="keyboardTopPadding">0dp</item> + <item name="keyboardBottomPadding">0dp</item> + <item name="horizontalGap">0dp</item> </style> <style name="MoreKeysKeyboardView.Stone" @@ -274,9 +274,9 @@ name="MoreKeysKeyboard.Gingerbread" parent="Keyboard.Gingerbread" > - <item name="keyboardTopPadding">0dip</item> - <item name="keyboardBottomPadding">0dip</item> - <item name="horizontalGap">0dip</item> + <item name="keyboardTopPadding">0dp</item> + <item name="keyboardBottomPadding">0dp</item> + <item name="horizontalGap">0dp</item> </style> <style name="MoreKeysKeyboardView.Gingerbread" @@ -315,7 +315,6 @@ <item name="keyPreviewBackgroundWidth">@dimen/keyboard_key_feedback_background_holo_width</item> <item name="keyPreviewBackgroundHeight">@dimen/keyboard_key_feedback_background_holo_height</item> <item name="keyPreviewTextColor">#FFFFFFFF</item> - <item name="keyPreviewHeight">@dimen/key_preview_height_ics</item> <item name="keyPreviewOffset">@dimen/key_preview_offset_ics</item> <item name="shadowColor">#00000000</item> <item name="shadowRadius">0.0</item> @@ -334,9 +333,9 @@ name="MoreKeysKeyboard.IceCreamSandwich" parent="Keyboard.IceCreamSandwich" > - <item name="keyboardTopPadding">0dip</item> - <item name="keyboardBottomPadding">0dip</item> - <item name="horizontalGap">0dip</item> + <item name="keyboardTopPadding">0dp</item> + <item name="keyboardBottomPadding">0dp</item> + <item name="horizontalGap">0dp</item> </style> <style name="MoreKeysKeyboardView.IceCreamSandwich" diff --git a/java/res/values/sudden-jumping-touch-event-device-list.xml b/java/res/values/sudden-jumping-touch-event-device-list.xml index ba828a758..543992a81 100644 --- a/java/res/values/sudden-jumping-touch-event-device-list.xml +++ b/java/res/values/sudden-jumping-touch-event-device-list.xml @@ -19,9 +19,9 @@ --> <resources> <string-array name="sudden_jumping_touch_event_device_list" translatable="false"> - <!-- Nexus One --> - <item>mahimahi</item> - <!-- Droid --> - <item>sholes</item> + <!-- "Build.HARDWARE,true" that needs "sudden jump touch event" hack. + See {@link com.android.inputmethod.keyboard.SuddenJumpingTouchEventHandler}. --> + <item>mahimahi,true</item> <!-- Nexus One --> + <item>sholes,true</item> <!-- Droid --> </string-array> </resources> diff --git a/java/src/com/android/inputmethod/keyboard/KeyboardView.java b/java/src/com/android/inputmethod/keyboard/KeyboardView.java index 847174c0a..24eb7592b 100644 --- a/java/src/com/android/inputmethod/keyboard/KeyboardView.java +++ b/java/src/com/android/inputmethod/keyboard/KeyboardView.java @@ -99,7 +99,7 @@ public class KeyboardView extends View implements PointerTracker.DrawingProxy { // Main keyboard private Keyboard mKeyboard; - private final KeyDrawParams mKeyDrawParams; + protected final KeyDrawParams mKeyDrawParams; // Key preview private final int mKeyPreviewLayoutId; @@ -171,7 +171,7 @@ public class KeyboardView extends View implements PointerTracker.DrawingProxy { } } - /* package */ static class KeyDrawParams { + protected static class KeyDrawParams { // XML attributes public final int mKeyTextColor; public final int mKeyTextInactivatedColor; @@ -351,7 +351,6 @@ public class KeyboardView extends View implements PointerTracker.DrawingProxy { mDelayAfterPreview = mKeyPreviewDrawParams.mLingerTimeout; mPaint.setAntiAlias(true); - mPaint.setTextAlign(Align.CENTER); } // Read fraction value in TypedArray as float. @@ -729,10 +728,10 @@ public class KeyboardView extends View implements PointerTracker.DrawingProxy { } } - private static int getCharGeometryCacheKey(char reference, Paint paint) { + private static int getCharGeometryCacheKey(char referenceChar, Paint paint) { final int labelSize = (int)paint.getTextSize(); final Typeface face = paint.getTypeface(); - final int codePointOffset = reference << 15; + final int codePointOffset = referenceChar << 15; if (face == Typeface.DEFAULT) { return codePointOffset + labelSize; } else if (face == Typeface.DEFAULT_BOLD) { @@ -747,41 +746,35 @@ public class KeyboardView extends View implements PointerTracker.DrawingProxy { // Working variable for the following methods. private final Rect mTextBounds = new Rect(); - private float getCharHeight(char[] character, Paint paint) { - final Integer key = getCharGeometryCacheKey(character[0], paint); + private float getCharHeight(char[] referenceChar, Paint paint) { + final Integer key = getCharGeometryCacheKey(referenceChar[0], paint); final Float cachedValue = sTextHeightCache.get(key); if (cachedValue != null) return cachedValue; - paint.getTextBounds(character, 0, 1, mTextBounds); + paint.getTextBounds(referenceChar, 0, 1, mTextBounds); final float height = mTextBounds.height(); sTextHeightCache.put(key, height); return height; } - private float getCharWidth(char[] character, Paint paint) { - final Integer key = getCharGeometryCacheKey(character[0], paint); + private float getCharWidth(char[] referenceChar, Paint paint) { + final Integer key = getCharGeometryCacheKey(referenceChar[0], paint); final Float cachedValue = sTextWidthCache.get(key); if (cachedValue != null) return cachedValue; - paint.getTextBounds(character, 0, 1, mTextBounds); + paint.getTextBounds(referenceChar, 0, 1, mTextBounds); final float width = mTextBounds.width(); sTextWidthCache.put(key, width); return width; } - protected float getLabelWidth(CharSequence label, Paint paint) { + public float getLabelWidth(String label, Paint paint) { paint.getTextBounds(label.toString(), 0, label.length(), mTextBounds); return mTextBounds.width(); } - public float getDefaultLabelWidth(String label, Paint paint) { - paint.setTextSize(mKeyDrawParams.mKeyLabelSize); - paint.setTypeface(mKeyDrawParams.mKeyTextStyle); - return getLabelWidth(label, paint); - } - protected static void drawIcon(Canvas canvas, Drawable icon, int x, int y, int width, int height) { canvas.translate(x, y); @@ -815,6 +808,14 @@ public class KeyboardView extends View implements PointerTracker.DrawingProxy { canvas.translate(-x, -y); } + public Paint newDefaultLabelPaint() { + final Paint paint = new Paint(); + paint.setAntiAlias(true); + paint.setTypeface(mKeyDrawParams.mKeyTextStyle); + paint.setTextSize(mKeyDrawParams.mKeyLabelSize); + return paint; + } + public void cancelAllMessages() { mDrawingHandler.cancelAllMessages(); } diff --git a/java/src/com/android/inputmethod/keyboard/LatinKeyboardView.java b/java/src/com/android/inputmethod/keyboard/LatinKeyboardView.java index b869059e4..da7d01af4 100644 --- a/java/src/com/android/inputmethod/keyboard/LatinKeyboardView.java +++ b/java/src/com/android/inputmethod/keyboard/LatinKeyboardView.java @@ -54,6 +54,7 @@ import com.android.inputmethod.latin.StringUtils; import com.android.inputmethod.latin.SubtypeUtils; import com.android.inputmethod.latin.Utils; import com.android.inputmethod.latin.Utils.UsabilityStudyLogUtils; +import com.android.inputmethod.latin.Utils.UsabilityStudyLogUtils.LogGroup; import java.util.Locale; import java.util.WeakHashMap; @@ -701,7 +702,7 @@ public class LatinKeyboardView extends KeyboardView implements PointerTracker.Ke break; } if (!TextUtils.isEmpty(eventTag)) { - UsabilityStudyLogUtils.getInstance().write( + UsabilityStudyLogUtils.getInstance().write(LogGroup.MOTION_EVENT, eventTag + eventTime + "," + id + "," + x + "," + y + "," + me.getSize(index) + "," + me.getPressure(index)); } @@ -764,9 +765,10 @@ public class LatinKeyboardView extends KeyboardView implements PointerTracker.Ke } tracker.onMoveEvent(px, py, eventTime); if (ENABLE_USABILITY_STUDY_LOG) { - UsabilityStudyLogUtils.getInstance().write("[Move]" + eventTime + "," - + me.getPointerId(i) + "," + px + "," + py + "," - + me.getSize(i) + "," + me.getPressure(i)); + UsabilityStudyLogUtils.getInstance().write( + LogGroup.MOTION_EVENT, + "[Move]" + eventTime + "," + me.getPointerId(i) + "," + px + "," + py + + "," + me.getSize(i) + "," + me.getPressure(i)); } } } else { diff --git a/java/src/com/android/inputmethod/keyboard/MoreKeysKeyboard.java b/java/src/com/android/inputmethod/keyboard/MoreKeysKeyboard.java index 904a81de4..72a5d0f05 100644 --- a/java/src/com/android/inputmethod/keyboard/MoreKeysKeyboard.java +++ b/java/src/com/android/inputmethod/keyboard/MoreKeysKeyboard.java @@ -296,17 +296,16 @@ public class MoreKeysKeyboard extends Keyboard { final int padding = (int)(view.getResources() .getDimension(R.dimen.more_keys_keyboard_key_horizontal_padding) + (parentKey.hasLabelsInMoreKeys() ? minKeyWidth * LABEL_PADDING_RATIO : 0)); - Paint paint = null; + final Paint paint = view.newDefaultLabelPaint(); + paint.setTextSize(parentKey.hasLabelsInMoreKeys() + ? view.mKeyDrawParams.mKeyLabelSize + : view.mKeyDrawParams.mKeyLetterSize); int maxWidth = minKeyWidth; for (String moreKeySpec : parentKey.mMoreKeys) { final String label = KeySpecParser.getLabel(moreKeySpec); // If the label is single letter, minKeyWidth is enough to hold the label. if (label != null && StringUtils.codePointCount(label) > 1) { - if (paint == null) { - paint = new Paint(); - paint.setAntiAlias(true); - } - final int width = (int)view.getDefaultLabelWidth(label, paint) + padding; + final int width = (int)view.getLabelWidth(label, paint) + padding; if (maxWidth < width) { maxWidth = width; } diff --git a/java/src/com/android/inputmethod/keyboard/SuddenJumpingTouchEventHandler.java b/java/src/com/android/inputmethod/keyboard/SuddenJumpingTouchEventHandler.java index 62a9259f9..347383f95 100644 --- a/java/src/com/android/inputmethod/keyboard/SuddenJumpingTouchEventHandler.java +++ b/java/src/com/android/inputmethod/keyboard/SuddenJumpingTouchEventHandler.java @@ -17,12 +17,12 @@ package com.android.inputmethod.keyboard; import android.content.Context; -import android.os.Build; import android.util.Log; import android.view.MotionEvent; import com.android.inputmethod.latin.LatinImeLogger; import com.android.inputmethod.latin.R; +import com.android.inputmethod.latin.Utils; public class SuddenJumpingTouchEventHandler { private static final String TAG = SuddenJumpingTouchEventHandler.class.getSimpleName(); @@ -49,18 +49,8 @@ public class SuddenJumpingTouchEventHandler { public SuddenJumpingTouchEventHandler(Context context, ProcessMotionEvent view) { mView = view; - final String[] deviceList = context.getResources().getStringArray( - R.array.sudden_jumping_touch_event_device_list); - mNeedsSuddenJumpingHack = needsSuddenJumpingHack(Build.HARDWARE, deviceList); - } - - private static boolean needsSuddenJumpingHack(String deviceName, String[] deviceList) { - for (String device : deviceList) { - if (device.equalsIgnoreCase(deviceName)) { - return true; - } - } - return false; + mNeedsSuddenJumpingHack = Boolean.parseBoolean(Utils.getDeviceOverrideValue( + context.getResources(), R.array.sudden_jumping_touch_event_device_list, "false")); } public void setKeyboard(Keyboard newKeyboard) { diff --git a/java/src/com/android/inputmethod/latin/BinaryDictionary.java b/java/src/com/android/inputmethod/latin/BinaryDictionary.java index 31ff4e7b4..dfc8c8e9d 100644 --- a/java/src/com/android/inputmethod/latin/BinaryDictionary.java +++ b/java/src/com/android/inputmethod/latin/BinaryDictionary.java @@ -149,6 +149,9 @@ public class BinaryDictionary extends Dictionary { int count = getBigramsNative(mNativeDict, chars, chars.length, mInputCodes, codesSize, mOutputChars_bigrams, mBigramScores, MAX_WORD_LENGTH, MAX_BIGRAMS, MAX_PROXIMITY_CHARS_SIZE); + if (count > MAX_BIGRAMS) { + count = MAX_BIGRAMS; + } for (int j = 0; j < count; ++j) { if (codesSize > 0 && mBigramScores[j] < 1) break; diff --git a/java/src/com/android/inputmethod/latin/BinaryDictionaryFileDumper.java b/java/src/com/android/inputmethod/latin/BinaryDictionaryFileDumper.java index 9ffc7d0a2..8ec440500 100644 --- a/java/src/com/android/inputmethod/latin/BinaryDictionaryFileDumper.java +++ b/java/src/com/android/inputmethod/latin/BinaryDictionaryFileDumper.java @@ -196,8 +196,8 @@ public class BinaryDictionaryFileDumper { } finally { // Ignore exceptions while closing files. try { - // afd.close() will close inputStream, we should not call inputStream.close(). - if (null != afd) afd.close(); + // inputStream.close() will close afd, we should not call afd.close(). + if (null != inputStream) inputStream.close(); } catch (Exception e) { Log.e(TAG, "Exception while closing a cross-process file descriptor : " + e); } diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java index 99a4d54d8..e67f0ea05 100644 --- a/java/src/com/android/inputmethod/latin/LatinIME.java +++ b/java/src/com/android/inputmethod/latin/LatinIME.java @@ -1288,7 +1288,7 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar mDeleteCount++; mExpectingUpdateSelection = true; mShouldSwitchToLastSubtype = true; - LatinImeLogger.logOnDelete(); + LatinImeLogger.logOnDelete(x, y); break; case Keyboard.CODE_SHIFT: case Keyboard.CODE_SWITCH_ALPHA_SYMBOL: diff --git a/java/src/com/android/inputmethod/latin/LatinImeLogger.java b/java/src/com/android/inputmethod/latin/LatinImeLogger.java index 683dafa86..079f3b5dd 100644 --- a/java/src/com/android/inputmethod/latin/LatinImeLogger.java +++ b/java/src/com/android/inputmethod/latin/LatinImeLogger.java @@ -51,7 +51,7 @@ public class LatinImeLogger implements SharedPreferences.OnSharedPreferenceChang public static void logOnAutoCorrectionCancelled() { } - public static void logOnDelete() { + public static void logOnDelete(int x, int y) { } public static void logOnInputChar() { diff --git a/java/src/com/android/inputmethod/latin/SettingsValues.java b/java/src/com/android/inputmethod/latin/SettingsValues.java index 9fc047b75..c1335fdfe 100644 --- a/java/src/com/android/inputmethod/latin/SettingsValues.java +++ b/java/src/com/android/inputmethod/latin/SettingsValues.java @@ -19,7 +19,6 @@ package com.android.inputmethod.latin; import android.content.Context; import android.content.SharedPreferences; import android.content.res.Resources; -import android.os.Build; import android.util.Log; import android.view.inputmethod.EditorInfo; @@ -322,14 +321,8 @@ public class SettingsValues { return volume; } - final String[] volumePerHardwareList = res.getStringArray(R.array.keypress_volumes); - final String hardwarePrefix = Build.HARDWARE + ","; - for (final String element : volumePerHardwareList) { - if (element.startsWith(hardwarePrefix)) { - return Float.parseFloat(element.substring(element.lastIndexOf(',') + 1)); - } - } - return -1.0f; + return Float.parseFloat( + Utils.getDeviceOverrideValue(res, R.array.keypress_volumes, "-1.0f")); } // Likewise @@ -340,15 +333,9 @@ public class SettingsValues { if (ms >= 0) { return ms; } - final String[] durationPerHardwareList = res.getStringArray( - R.array.keypress_vibration_durations); - final String hardwarePrefix = Build.HARDWARE + ","; - for (final String element : durationPerHardwareList) { - if (element.startsWith(hardwarePrefix)) { - return (int)Long.parseLong(element.substring(element.lastIndexOf(',') + 1)); - } - } - return -1; + + return Integer.parseInt( + Utils.getDeviceOverrideValue(res, R.array.keypress_vibration_durations, "-1")); } // Likewise diff --git a/java/src/com/android/inputmethod/latin/Utils.java b/java/src/com/android/inputmethod/latin/Utils.java index a7de47c58..e2ce08323 100644 --- a/java/src/com/android/inputmethod/latin/Utils.java +++ b/java/src/com/android/inputmethod/latin/Utils.java @@ -19,9 +19,11 @@ package com.android.inputmethod.latin; import android.content.Context; import android.content.Intent; import android.content.pm.PackageManager; +import android.content.res.Resources; import android.inputmethodservice.InputMethodService; import android.net.Uri; import android.os.AsyncTask; +import android.os.Build; import android.os.Environment; import android.os.Handler; import android.os.HandlerThread; @@ -43,6 +45,7 @@ import java.io.PrintWriter; import java.nio.channels.FileChannel; import java.text.SimpleDateFormat; import java.util.Date; +import java.util.HashMap; public class Utils { private Utils() { @@ -260,8 +263,25 @@ public class Utils { } } - public static void writeBackSpace() { - UsabilityStudyLogUtils.getInstance().write("<backspace>\t0\t0"); + /** + * Represents a category of logging events that share the same subfield structure. + */ + public static enum LogGroup { + MOTION_EVENT("m"), + KEY("k"), + CORRECTION("c"), + STATE_CHANGE("s"); + + private final String mLogString; + + private LogGroup(String logString) { + mLogString = logString; + } + } + + public static void writeBackSpace(int x, int y) { + UsabilityStudyLogUtils.getInstance().write( + LogGroup.KEY, "<backspace>\t" + x + "\t" + y); } public void writeChar(char c, int x, int y) { @@ -277,11 +297,12 @@ public class Utils { inputChar = "<space>"; break; } - UsabilityStudyLogUtils.getInstance().write(inputChar + "\t" + x + "\t" + y); + UsabilityStudyLogUtils.getInstance().write(LogGroup.KEY, + inputChar + "\t" + x + "\t" + y); LatinImeLogger.onPrintAllUsabilityStudyLogs(); } - public void write(final String log) { + public void write(final LogGroup logGroup, final String log) { mLoggingHandler.post(new Runnable() { @Override public void run() { @@ -289,8 +310,8 @@ public class Utils { final long currentTime = System.currentTimeMillis(); mDate.setTime(currentTime); - final String printString = String.format("%s\t%d\t%s\n", - mDateFormat.format(mDate), currentTime, log); + final String printString = String.format("%s\t%d\t%s\t%s\n", + mDateFormat.format(mDate), currentTime, logGroup.mLogString, log); if (LatinImeLogger.sDBG) { Log.d(USABILITY_TAG, "Write: " + log); } @@ -465,4 +486,23 @@ public class Utils { if (TextUtils.isEmpty(info)) return null; return info; } + + private static final String HARDWARE_PREFIX = Build.HARDWARE + ","; + private static final HashMap<Integer, String> sDeviceOverrideValueMap = + new HashMap<Integer, String>(); + + public static String getDeviceOverrideValue(Resources res, int overrideResId, String defValue) { + final Integer key = overrideResId; + if (!sDeviceOverrideValueMap.containsKey(key)) { + String overrideValue = defValue; + for (final String element : res.getStringArray(overrideResId)) { + if (element.startsWith(HARDWARE_PREFIX)) { + overrideValue = element.substring(HARDWARE_PREFIX.length()); + break; + } + } + sDeviceOverrideValueMap.put(key, overrideValue); + } + return sDeviceOverrideValueMap.get(key); + } } diff --git a/tools/makedict/src/com/android/inputmethod/latin/makedict/BinaryDictInputOutput.java b/java/src/com/android/inputmethod/latin/makedict/BinaryDictInputOutput.java index 42dd4df34..42dd4df34 100644 --- a/tools/makedict/src/com/android/inputmethod/latin/makedict/BinaryDictInputOutput.java +++ b/java/src/com/android/inputmethod/latin/makedict/BinaryDictInputOutput.java diff --git a/tools/makedict/src/com/android/inputmethod/latin/makedict/CharGroupInfo.java b/java/src/com/android/inputmethod/latin/makedict/CharGroupInfo.java index 444b11732..444b11732 100644 --- a/tools/makedict/src/com/android/inputmethod/latin/makedict/CharGroupInfo.java +++ b/java/src/com/android/inputmethod/latin/makedict/CharGroupInfo.java diff --git a/java/src/com/android/inputmethod/latin/makedict/Dummy.java b/java/src/com/android/inputmethod/latin/makedict/Dummy.java deleted file mode 100644 index 27ea5ace6..000000000 --- a/java/src/com/android/inputmethod/latin/makedict/Dummy.java +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Copyright (C) 2012 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ - -package com.android.inputmethod.latin.makedict; - -public class Dummy { - -} diff --git a/tools/makedict/src/com/android/inputmethod/latin/makedict/FusionDictionary.java b/java/src/com/android/inputmethod/latin/makedict/FusionDictionary.java index d19672181..d19672181 100644 --- a/tools/makedict/src/com/android/inputmethod/latin/makedict/FusionDictionary.java +++ b/java/src/com/android/inputmethod/latin/makedict/FusionDictionary.java diff --git a/tools/makedict/src/com/android/inputmethod/latin/makedict/MakedictLog.java b/java/src/com/android/inputmethod/latin/makedict/MakedictLog.java index cff8d6fd0..cff8d6fd0 100644 --- a/tools/makedict/src/com/android/inputmethod/latin/makedict/MakedictLog.java +++ b/java/src/com/android/inputmethod/latin/makedict/MakedictLog.java diff --git a/tools/makedict/src/com/android/inputmethod/latin/makedict/PendingAttribute.java b/java/src/com/android/inputmethod/latin/makedict/PendingAttribute.java index 5b41d27f2..5b41d27f2 100644 --- a/tools/makedict/src/com/android/inputmethod/latin/makedict/PendingAttribute.java +++ b/java/src/com/android/inputmethod/latin/makedict/PendingAttribute.java diff --git a/tools/makedict/src/com/android/inputmethod/latin/makedict/UnsupportedFormatException.java b/java/src/com/android/inputmethod/latin/makedict/UnsupportedFormatException.java index bd42fb8fa..bd42fb8fa 100644 --- a/tools/makedict/src/com/android/inputmethod/latin/makedict/UnsupportedFormatException.java +++ b/java/src/com/android/inputmethod/latin/makedict/UnsupportedFormatException.java diff --git a/tools/makedict/src/com/android/inputmethod/latin/makedict/Word.java b/java/src/com/android/inputmethod/latin/makedict/Word.java index c2c01e1f8..c2c01e1f8 100644 --- a/tools/makedict/src/com/android/inputmethod/latin/makedict/Word.java +++ b/java/src/com/android/inputmethod/latin/makedict/Word.java diff --git a/java/src/com/android/inputmethod/latin/suggestions/MoreSuggestions.java b/java/src/com/android/inputmethod/latin/suggestions/MoreSuggestions.java index 3a17f1f64..dd83a0c4e 100644 --- a/java/src/com/android/inputmethod/latin/suggestions/MoreSuggestions.java +++ b/java/src/com/android/inputmethod/latin/suggestions/MoreSuggestions.java @@ -23,7 +23,6 @@ import android.graphics.drawable.Drawable; import com.android.inputmethod.keyboard.Key; import com.android.inputmethod.keyboard.Keyboard; import com.android.inputmethod.keyboard.KeyboardSwitcher; -import com.android.inputmethod.keyboard.KeyboardView; import com.android.inputmethod.keyboard.internal.KeyboardIconsSet; import com.android.inputmethod.latin.R; import com.android.inputmethod.latin.SuggestedWords; @@ -53,10 +52,8 @@ public class MoreSuggestions extends Keyboard { public int mDividerWidth; public int layout(SuggestedWords suggestions, int fromPos, int maxWidth, int minWidth, - int maxRow, KeyboardView view) { + int maxRow, MoreSuggestionsView view) { clearKeys(); - final Paint paint = new Paint(); - paint.setAntiAlias(true); final Resources res = view.getContext().getResources(); mDivider = res.getDrawable(R.drawable.more_suggestions_divider); // TODO: Drawable itself should have an alpha value. @@ -64,6 +61,7 @@ public class MoreSuggestions extends Keyboard { mDividerWidth = mDivider.getIntrinsicWidth(); final int padding = (int) res.getDimension( R.dimen.more_suggestions_key_horizontal_padding); + final Paint paint = view.newDefaultLabelPaint(); int row = 0; int pos = fromPos, rowStartPos = fromPos; @@ -71,7 +69,7 @@ public class MoreSuggestions extends Keyboard { while (pos < size) { final String word = suggestions.getWord(pos).toString(); // TODO: Should take care of text x-scaling. - mWidths[pos] = (int)view.getDefaultLabelWidth(word, paint) + padding; + mWidths[pos] = (int)view.getLabelWidth(word, paint) + padding; final int numColumn = pos - rowStartPos + 1; final int columnWidth = (maxWidth - mDividerWidth * (numColumn - 1)) / numColumn; diff --git a/java/src/com/android/inputmethod/latin/suggestions/MoreSuggestionsView.java b/java/src/com/android/inputmethod/latin/suggestions/MoreSuggestionsView.java index f11b1a4c1..e64e7a685 100644 --- a/java/src/com/android/inputmethod/latin/suggestions/MoreSuggestionsView.java +++ b/java/src/com/android/inputmethod/latin/suggestions/MoreSuggestionsView.java @@ -43,17 +43,17 @@ import com.android.inputmethod.latin.R; public class MoreSuggestionsView extends KeyboardView implements MoreKeysPanel { private final int[] mCoordinates = new int[2]; - private final KeyDetector mModalPanelKeyDetector; + final KeyDetector mModalPanelKeyDetector; private final KeyDetector mSlidingPanelKeyDetector; private Controller mController; - private KeyboardActionListener mListener; + KeyboardActionListener mListener; private int mOriginX; private int mOriginY; - private static final TimerProxy EMPTY_TIMER_PROXY = new TimerProxy.Adapter(); + static final TimerProxy EMPTY_TIMER_PROXY = new TimerProxy.Adapter(); - private final KeyboardActionListener mSuggestionsPaneListener = + final KeyboardActionListener mSuggestionsPaneListener = new KeyboardActionListener.Adapter() { @Override public void onPressKey(int primaryCode) { diff --git a/native/src/bigram_dictionary.cpp b/native/src/bigram_dictionary.cpp index 84048d77d..fa69de854 100644 --- a/native/src/bigram_dictionary.cpp +++ b/native/src/bigram_dictionary.cpp @@ -137,9 +137,10 @@ int BigramDictionary::getBigrams(unsigned short *prevWord, int prevWordLength, i // codesSize == 0 means we are trying to find bigram predictions. if (codesSize < 1 || checkFirstCharacter(bigramBuffer)) { const int frequency = UnigramDictionary::MASK_ATTRIBUTE_FREQUENCY & bigramFlags; - addWordBigram(bigramBuffer, length, frequency); + if (addWordBigram(bigramBuffer, length, frequency)) { + ++bigramCount; + } } - ++bigramCount; } while (0 != (UnigramDictionary::FLAG_ATTRIBUTE_HAS_NEXT & bigramFlags)); return bigramCount; } diff --git a/tools/makedict/Android.mk b/tools/makedict/Android.mk index 6832b1cb6..facbbf7b8 100644 --- a/tools/makedict/Android.mk +++ b/tools/makedict/Android.mk @@ -13,15 +13,15 @@ # See the License for the specific language governing permissions and # limitations under the License. # -LOCAL_PATH := $(call my-dir) -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := $(call all-java-files-under,src) -LOCAL_SRC_FILES += $(call all-java-files-under,tests) -LOCAL_JAR_MANIFEST := etc/manifest.txt -LOCAL_MODULE_TAGS := eng -LOCAL_MODULE := makedict -LOCAL_JAVA_LIBRARIES := junit - -include $(BUILD_HOST_JAVA_LIBRARY) -include $(LOCAL_PATH)/etc/Android.mk +#LOCAL_PATH := $(call my-dir) +#include $(CLEAR_VARS) +# +#LOCAL_SRC_FILES := $(call all-java-files-under,src) +#LOCAL_SRC_FILES += $(call all-java-files-under,tests) +#LOCAL_JAR_MANIFEST := etc/manifest.txt +#LOCAL_MODULE_TAGS := eng +#LOCAL_MODULE := makedict +#LOCAL_JAVA_LIBRARIES := junit +# +#include $(BUILD_HOST_JAVA_LIBRARY) +#include $(LOCAL_PATH)/etc/Android.mk |