diff options
Diffstat (limited to 'java/res')
19 files changed, 7 insertions, 22 deletions
diff --git a/java/res/drawable-hdpi/sym_keyboard_feedback_mic.png b/java/res/drawable-hdpi/sym_keyboard_feedback_mic.png Binary files differdeleted file mode 100644 index a88a19d0d..000000000 --- a/java/res/drawable-hdpi/sym_keyboard_feedback_mic.png +++ /dev/null diff --git a/java/res/drawable-hdpi/sym_keyboard_feedback_settings.png b/java/res/drawable-hdpi/sym_keyboard_feedback_settings.png Binary files differdeleted file mode 100644 index 6304b00ed..000000000 --- a/java/res/drawable-hdpi/sym_keyboard_feedback_settings.png +++ /dev/null diff --git a/java/res/drawable-hdpi/sym_keyboard_feedback_settings_holo.png b/java/res/drawable-hdpi/sym_keyboard_feedback_settings_holo.png Binary files differdeleted file mode 100644 index 960dd7873..000000000 --- a/java/res/drawable-hdpi/sym_keyboard_feedback_settings_holo.png +++ /dev/null diff --git a/java/res/drawable-mdpi/sym_keyboard_feedback_mic.png b/java/res/drawable-mdpi/sym_keyboard_feedback_mic.png Binary files differdeleted file mode 100644 index 3ed0782d3..000000000 --- a/java/res/drawable-mdpi/sym_keyboard_feedback_mic.png +++ /dev/null diff --git a/java/res/drawable-mdpi/sym_keyboard_feedback_settings.png b/java/res/drawable-mdpi/sym_keyboard_feedback_settings.png Binary files differdeleted file mode 100644 index 03bad1843..000000000 --- a/java/res/drawable-mdpi/sym_keyboard_feedback_settings.png +++ /dev/null diff --git a/java/res/drawable-mdpi/sym_keyboard_feedback_settings_holo.png b/java/res/drawable-mdpi/sym_keyboard_feedback_settings_holo.png Binary files differdeleted file mode 100644 index 453991ef3..000000000 --- a/java/res/drawable-mdpi/sym_keyboard_feedback_settings_holo.png +++ /dev/null diff --git a/java/res/drawable-xhdpi/sym_keyboard_feedback_mic.png b/java/res/drawable-xhdpi/sym_keyboard_feedback_mic.png Binary files differdeleted file mode 100644 index 5ac27ebad..000000000 --- a/java/res/drawable-xhdpi/sym_keyboard_feedback_mic.png +++ /dev/null diff --git a/java/res/drawable-xhdpi/sym_keyboard_feedback_settings.png b/java/res/drawable-xhdpi/sym_keyboard_feedback_settings.png Binary files differdeleted file mode 100644 index 021cafacb..000000000 --- a/java/res/drawable-xhdpi/sym_keyboard_feedback_settings.png +++ /dev/null diff --git a/java/res/drawable-xhdpi/sym_keyboard_feedback_settings_holo.png b/java/res/drawable-xhdpi/sym_keyboard_feedback_settings_holo.png Binary files differdeleted file mode 100644 index bc9a629ed..000000000 --- a/java/res/drawable-xhdpi/sym_keyboard_feedback_settings_holo.png +++ /dev/null diff --git a/java/res/values-hi/strings.xml b/java/res/values-hi/strings.xml index de95ab8d7..58d515d9d 100644 --- a/java/res/values-hi/strings.xml +++ b/java/res/values-hi/strings.xml @@ -37,7 +37,7 @@ <string name="advanced_settings_summary" msgid="5193513161106637254">"विशेषज्ञ उपयोगकर्ताओं के लिए विकल्प"</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> + <string name="key_preview_popup_dismiss_default_delay" msgid="2166964333903906734">"डिफ़ॉल्ट"</string> <string name="use_contacts_dict" msgid="4435317977804180815">"संपर्क नाम सुझाएं"</string> <string name="use_contacts_dict_summary" msgid="6599983334507879959">"सुझाव और सुधार के लिए संपर्क से नामों का उपयोग करें"</string> <string name="enable_span_insert" msgid="7204653105667167620">"पुन: सुधार सक्षम करें"</string> diff --git a/java/res/values-vi/strings.xml b/java/res/values-vi/strings.xml index ba831a452..fbfe93a76 100644 --- a/java/res/values-vi/strings.xml +++ b/java/res/values-vi/strings.xml @@ -65,7 +65,7 @@ <string name="label_go_key" msgid="1635148082137219148">"Đến"</string> <string name="label_next_key" msgid="362972844525672568">"Tiếp theo"</string> <string name="label_done_key" msgid="2441578748772529288">"Xong"</string> - <string name="label_send_key" msgid="2815056534433717444">"Gửi"</string> + <string name="label_send_key" msgid="2815056534433717444">"Gửi"</string> <string name="label_to_alpha_key" msgid="4793983863798817523">"ABC"</string> <string name="label_to_symbol_key" msgid="8516904117128967293">"?123"</string> <string name="label_to_symbol_with_microphone_key" msgid="9035925553010061906">"123"</string> @@ -116,7 +116,7 @@ <string name="voice_listening" msgid="467518160751321844">"Xin mời nói"</string> <string name="voice_working" msgid="6666937792815731889">"Đang hoạt động"</string> <string name="voice_initializing" msgid="661962047129906646"></string> - <string name="voice_error" msgid="5140896300312186162">"Lỗi. Vui lòng thử lại."</string> + <string name="voice_error" msgid="5140896300312186162">"Lỗi. Vui lòng thử lại."</string> <string name="voice_network_error" msgid="6649556447401862563">"Không thể kết nối"</string> <string name="voice_too_much_speech" msgid="5746973620134227376">"Lỗi, quá nhiều câu thoại."</string> <string name="voice_audio_error" msgid="5072707727016414454">"Sự cố âm thanh"</string> @@ -143,7 +143,7 @@ <string name="has_dictionary" msgid="6071847973466625007">"Có sẵn từ điển"</string> <string name="prefs_enable_log" msgid="6620424505072963557">"Bật phản hồi của người dùng"</string> <string name="prefs_description_log" msgid="5827825607258246003">"Giúp nâng cao trình chỉnh sửa phương thức nhập này bằng cách tự động gửi thống kê sử dụng và báo cáo sự cố cho Google."</string> - <string name="keyboard_layout" msgid="8451164783510487501">"Chủ đề bàn phím"</string> + <string name="keyboard_layout" msgid="8451164783510487501">"Chủ đề bàn phím"</string> <string name="subtype_de_qwerty" msgid="3358900499589259491">"Bàn phím QWERTY tiếng Đức"</string> <string name="subtype_en_GB" msgid="88170601942311355">"Tiếng Anh (Anh)"</string> <string name="subtype_en_US" msgid="6160452336634534239">"Tiếng Anh (Mỹ)"</string> diff --git a/java/res/values/attrs.xml b/java/res/values/attrs.xml index e569e83b1..0c9ca4f4a 100644 --- a/java/res/values/attrs.xml +++ b/java/res/values/attrs.xml @@ -180,8 +180,6 @@ <attr name="iconShortcutForLabel" format="reference" /> <attr name="iconShiftedShiftKey" format="reference" /> <attr name="iconPreviewTabKey" format="reference" /> - <attr name="iconPreviewSettingsKey" format="reference" /> - <attr name="iconPreviewShortcutKey" format="reference" /> </declare-styleable> <declare-styleable name="Keyboard_Key"> @@ -246,8 +244,6 @@ <attr name="keyIconPreview" format="enum"> <!-- This should be aligned with KeyboardIcons.ICON_PREVIEW_* --> <enum name="iconPreviewTabKey" value="11" /> - <enum name="iconPreviewSettingsKey" value="12" /> - <enum name="iconPreviewShortcutKey" value="13" /> </attr> <!-- The key style to specify a set of key attributes defined by <key_style/> --> <attr name="keyStyle" format="string" /> diff --git a/java/res/values/config.xml b/java/res/values/config.xml index e2422d231..bad4bc625 100644 --- a/java/res/values/config.xml +++ b/java/res/values/config.xml @@ -63,6 +63,7 @@ <integer name="config_long_press_space_key_timeout">@integer/config_long_press_key_timeout</integer> <integer name="config_touch_noise_threshold_millis">40</integer> <integer name="config_double_spaces_turn_into_period_timeout">1100</integer> + <integer name="config_ignore_special_key_timeout">700</integer> <dimen name="config_touch_noise_threshold_distance">2.0mm</dimen> <!-- This configuration is the index of the array {@link KeyboardSwitcher.KEYBOARD_THEMES}. --> <string name="config_default_keyboard_theme_id" translatable="false">5</string> @@ -80,8 +81,8 @@ will be subject to auto-correction. --> <item>0</item> </string-array> - <!-- Threshold of the normalized score of the best suggestion for the spell checker to declare a word to be "likely" --> - <string name="spellchecker_likely_threshold_value" translatable="false">0.11</string> + <!-- Threshold of the normalized score of the best suggestion for the spell checker to declare a word to be "recommended" --> + <string name="spellchecker_recommended_threshold_value" translatable="false">0.11</string> <!-- Threshold of the normalized score of any dictionary lookup to be offered as a suggestion by the spell checker --> <string name="spellchecker_suggestion_threshold_value" translatable="false">0.03</string> <!-- Screen metrics for logging. diff --git a/java/res/values/keyboard-icons-black.xml b/java/res/values/keyboard-icons-black.xml index 23d163c69..f767cb349 100644 --- a/java/res/values/keyboard-icons-black.xml +++ b/java/res/values/keyboard-icons-black.xml @@ -32,8 +32,6 @@ <item name="iconShortcutForLabel">@drawable/sym_bkeyboard_label_mic</item> <item name="iconShiftedShiftKey">@drawable/sym_bkeyboard_shift_locked</item> <item name="iconPreviewTabKey">@drawable/sym_keyboard_feedback_tab</item> - <item name="iconPreviewSettingsKey">@drawable/sym_keyboard_feedback_settings</item> - <item name="iconPreviewShortcutKey">@drawable/sym_keyboard_feedback_mic</item> <!-- LatinKeyboard icons --> <item name="autoCorrectionSpacebarLedIcon">@drawable/sym_keyboard_space_led</item> <item name="disabledShortcutIcon">@drawable/sym_bkeyboard_voice_off</item> diff --git a/java/res/values/keyboard-icons-ics.xml b/java/res/values/keyboard-icons-ics.xml index 28859b670..f1021433d 100644 --- a/java/res/values/keyboard-icons-ics.xml +++ b/java/res/values/keyboard-icons-ics.xml @@ -31,8 +31,6 @@ <item name="iconShortcutForLabel">@drawable/sym_keyboard_label_mic_holo</item> <item name="iconShiftedShiftKey">@drawable/sym_keyboard_shift_locked_holo</item> <item name="iconPreviewTabKey">@drawable/sym_keyboard_feedback_tab</item> - <item name="iconPreviewSettingsKey">@drawable/sym_keyboard_feedback_settings_holo</item> - <item name="iconPreviewShortcutKey">@drawable/sym_keyboard_feedback_mic</item> <!-- LatinKeyboard icons --> <item name="autoCorrectionSpacebarLedIcon">@drawable/sym_keyboard_space_led_holo</item> <item name="disabledShortcutIcon">@drawable/sym_keyboard_voice_off_holo</item> diff --git a/java/res/values/keyboard-icons-white.xml b/java/res/values/keyboard-icons-white.xml index a1765a44d..07ece66b1 100644 --- a/java/res/values/keyboard-icons-white.xml +++ b/java/res/values/keyboard-icons-white.xml @@ -28,8 +28,6 @@ <item name="iconShortcutForLabel">@drawable/sym_keyboard_label_mic</item> <item name="iconShiftedShiftKey">@drawable/sym_keyboard_shift_locked</item> <item name="iconPreviewTabKey">@drawable/sym_keyboard_feedback_tab</item> - <item name="iconPreviewSettingsKey">@drawable/sym_keyboard_feedback_settings</item> - <item name="iconPreviewShortcutKey">@drawable/sym_keyboard_feedback_mic</item> <!-- LatinKeyboard icons --> <item name="autoCorrectionSpacebarLedIcon">@drawable/sym_keyboard_space_led</item> <item name="disabledShortcutIcon">@drawable/sym_keyboard_voice_off_holo</item> diff --git a/java/res/xml-sw600dp/kbd_key_styles.xml b/java/res/xml-sw600dp/kbd_key_styles.xml index 0b6d87126..25fa8b265 100644 --- a/java/res/xml-sw600dp/kbd_key_styles.xml +++ b/java/res/xml-sw600dp/kbd_key_styles.xml @@ -73,13 +73,11 @@ latin:styleName="shortcutKeyStyle" latin:code="@integer/key_shortcut" latin:keyIcon="iconShortcutKey" - latin:keyIconPreview="iconPreviewShortcutKey" latin:parentStyle="f2PopupStyle" /> <key-style latin:styleName="settingsKeyStyle" latin:code="@integer/key_settings" latin:keyIcon="iconSettingsKey" - latin:keyIconPreview="iconPreviewSettingsKey" latin:backgroundType="functional" /> <key-style latin:styleName="tabKeyStyle" diff --git a/java/res/xml-sw768dp/kbd_key_styles.xml b/java/res/xml-sw768dp/kbd_key_styles.xml index 686e7b66c..f16f5b6af 100644 --- a/java/res/xml-sw768dp/kbd_key_styles.xml +++ b/java/res/xml-sw768dp/kbd_key_styles.xml @@ -55,13 +55,11 @@ latin:styleName="settingsKeyStyle" latin:code="@integer/key_settings" latin:keyIcon="iconSettingsKey" - latin:keyIconPreview="iconPreviewSettingsKey" latin:backgroundType="functional" /> <key-style latin:styleName="shortcutKeyStyle" latin:code="@integer/key_shortcut" latin:keyIcon="iconShortcutKey" - latin:keyIconPreview="iconPreviewShortcutKey" latin:backgroundType="functional" /> <key-style latin:styleName="tabKeyStyle" diff --git a/java/res/xml/kbd_key_styles.xml b/java/res/xml/kbd_key_styles.xml index 11b1abb2a..453b05dff 100644 --- a/java/res/xml/kbd_key_styles.xml +++ b/java/res/xml/kbd_key_styles.xml @@ -154,13 +154,11 @@ latin:styleName="shortcutKeyStyle" latin:code="@integer/key_shortcut" latin:keyIcon="iconShortcutKey" - latin:keyIconPreview="iconPreviewShortcutKey" latin:parentStyle="f1PopupStyle" /> <key-style latin:styleName="settingsKeyStyle" latin:code="@integer/key_settings" latin:keyIcon="iconSettingsKey" - latin:keyIconPreview="iconPreviewSettingsKey" latin:backgroundType="functional" /> <key-style latin:styleName="tabKeyStyle" |
