diff options
Diffstat (limited to 'java/res')
-rw-r--r-- | java/res/values-xlarge/config.xml | 3 | ||||
-rw-r--r-- | java/res/values/config.xml | 4 | ||||
-rw-r--r-- | java/res/values/strings.xml | 16 | ||||
-rw-r--r-- | java/res/xml-xlarge/kbd_key_styles.xml | 3 | ||||
-rw-r--r-- | java/res/xml-xlarge/kbd_number.xml | 12 | ||||
-rw-r--r-- | java/res/xml-xlarge/kbd_numkey_styles.xml | 2 | ||||
-rw-r--r-- | java/res/xml-xlarge/kbd_phone.xml | 12 | ||||
-rw-r--r-- | java/res/xml-xlarge/kbd_phone_symbols.xml | 12 | ||||
-rw-r--r-- | java/res/xml-xlarge/kbd_qwerty_row4.xml | 10 | ||||
-rw-r--r-- | java/res/xml-xlarge/kbd_symbols.xml | 10 | ||||
-rw-r--r-- | java/res/xml-xlarge/kbd_symbols_shift.xml | 10 |
11 files changed, 66 insertions, 28 deletions
diff --git a/java/res/values-xlarge/config.xml b/java/res/values-xlarge/config.xml index 56b9a166f..410b5e19e 100644 --- a/java/res/values-xlarge/config.xml +++ b/java/res/values-xlarge/config.xml @@ -28,6 +28,9 @@ <bool name="config_digit_popup_characters_enabled">false</bool> <!-- Whether or not Popup on key press is enabled by default --> <bool name="config_default_popup_preview">false</bool> + <bool name="config_use_spacebar_language_switcher">false</bool> + <!-- The language is never displayed if == 0, always displayed if < 0 --> + <integer name="config_delay_before_fadeout_language_on_spacebar">1200</integer> <!-- This configuration is the index of the array {@link KeyboardSwitcher.KEYBOARD_THEMES}. --> <string name="config_default_keyboard_theme_id" translatable="false">5</string> <string name="config_text_size_of_language_on_spacebar" translatable="false">medium</string> diff --git a/java/res/values/config.xml b/java/res/values/config.xml index 63af9a9ba..adfec4c25 100644 --- a/java/res/values/config.xml +++ b/java/res/values/config.xml @@ -31,6 +31,10 @@ <bool name="config_digit_popup_characters_enabled">true</bool> <!-- Whether or not Popup on key press is enabled by default --> <bool name="config_default_popup_preview">true</bool> + <bool name="config_use_spacebar_language_switcher">true</bool> + <!-- The language is never displayed if == 0, always displayed if < 0 --> + <integer name="config_delay_before_fadeout_language_on_spacebar">-1</integer> + <integer name="config_duration_of_fadeout_language_on_spacebar">50</integer> <integer name="config_delay_before_preview">0</integer> <integer name="config_delay_after_preview">10</integer> <integer name="config_preview_fadein_anim_time">0</integer> diff --git a/java/res/values/strings.xml b/java/res/values/strings.xml index 6d05012e6..6f0f2fb72 100644 --- a/java/res/values/strings.xml +++ b/java/res/values/strings.xml @@ -22,7 +22,7 @@ <string name="english_ime_name">Android keyboard</string> <!-- Title for Latin keyboard settings activity / dialog --> <string name="english_ime_settings">Android keyboard settings</string> - <!-- Title for Latin keyboard input options dialog --> + <!-- Title for Latin keyboard input options dialog [CHAR LIMIT=25] --> <string name="english_ime_input_options">Input options</string> <!-- Option to provide vibrate/haptic feedback on keypress --> @@ -111,15 +111,15 @@ <string name="voice_warning_locale_not_supported">Voice input is not currently supported for your language, but does work in English.</string> <!-- Message of the warning dialog that shows when a user initiates voice input for - the first time, or turns it on in settings. --> + the first time, or turns it on in settings. [CHAR LIMIT=200] --> <string name="voice_warning_may_not_understand">Voice input uses Google\'s speech recognition. <a href="http://m.google.com/privacy">The Mobile Privacy Policy</a> applies.</string> <!-- An additional part of the warning dialog for voice input that only shows when the user - actually initiates voice input, rather than just turning it on in settings. --> + actually initiates voice input, rather than just turning it on in settings. [CHAR LIMIT=200] --> <string name="voice_warning_how_to_turn_off">To turn off voice input, go to input method settings.</string> <!-- Message to show when user enables the voice input settings (which says - "Press the microphone button"). --> + "Press the microphone button"). [CHAR LIMIT=100] --> <string name="voice_hint_dialog_message">To use voice input, press the microphone button.</string> <!-- Short message to tell the user the system is ready for them to speak. --> @@ -186,7 +186,7 @@ <!-- On settings screen, voice input pop-up menu summary text to never show voice key [CHAR LIMIT=20] --> <string name="voice_input_modes_summary_off">Voice input is disabled</string> - <!-- Menu item for launching Input method picker --> + <!-- Title of the dialog for selecting input methods. [CHAR LIMIT=20] --> <string name="selectInputMethod">Select input method</string> <!-- Title for input language selection screen --> @@ -204,12 +204,12 @@ <string name="prefs_enable_log">Enable user feedback</string> <!-- Description for enabling to send user statistics to Google --> <string name="prefs_description_log">Help improve this input method editor by automatically sending usage statistics and crash reports to Google.</string> - <!-- Preferences item for enabling to correct suggestions by touching words you have typed --> + <!-- Preferences item for enabling to correct suggestions by touching words you have typed [CHAR LIMIT= 35] --> <string name="prefs_enable_recorrection">Touch to correct words</string> - <!-- The summary for the preferences item for enabling to correct suggestions by touching words you have typed --> + <!-- The summary for the preferences item for enabling to correct suggestions by touching words you have typed [CHAR LIMIT= 100] --> <string name="prefs_enable_recorrection_summary">Touch entered words to correct them, only when suggestions are visible</string> - <!-- Description for keyboard theme switcher --> + <!-- Title of the item to change the keyboard theme [CHAR LIMIT=20]--> <string name="keyboard_layout">Keyboard Theme</string> <!-- Description for Czech keyboard subtype [CHAR LIMIT=35] --> diff --git a/java/res/xml-xlarge/kbd_key_styles.xml b/java/res/xml-xlarge/kbd_key_styles.xml index c6b785896..efbad5bab 100644 --- a/java/res/xml-xlarge/kbd_key_styles.xml +++ b/java/res/xml-xlarge/kbd_key_styles.xml @@ -57,7 +57,6 @@ <key-style latin:styleName="nonSpecialBackgroundSpaceKeyStyle" latin:code="@integer/key_space" - latin:keyIcon="@drawable/sym_keyboard_space_holo" latin:iconPreview="@drawable/sym_keyboard_feedback_space" /> <key-style latin:styleName="smileyKeyStyle" @@ -102,12 +101,10 @@ <key-style latin:styleName="spaceKeyStyle" latin:code="@integer/key_space" - latin:keyIcon="@drawable/sym_bkeyboard_space" latin:iconPreview="@drawable/sym_keyboard_feedback_space" /> <key-style latin:styleName="nonSpecialBackgroundSpaceKeyStyle" latin:code="@integer/key_space" - latin:keyIcon="@drawable/sym_bkeyboard_space" latin:iconPreview="@drawable/sym_keyboard_feedback_space" /> <key-style latin:styleName="smileyKeyStyle" diff --git a/java/res/xml-xlarge/kbd_number.xml b/java/res/xml-xlarge/kbd_number.xml index 93bc1363a..c2cbb31c4 100644 --- a/java/res/xml-xlarge/kbd_number.xml +++ b/java/res/xml-xlarge/kbd_number.xml @@ -132,9 +132,15 @@ latin:keyLabel="0" /> <Key latin:keyLabel="#" /> - <Key - latin:keyStyle="micKeyStyle" - latin:keyWidth="8.042%p" /> + <switch> + <case + latin:voiceKeyEnabled="true" + > + <Key + latin:keyStyle="micKeyStyle" + latin:keyWidth="8.042%p" /> + </case> + </switch> <!-- There is an empty area bellow the "Enter" key and right of the "#" key. To ignore the touch event on the area, "#" is intentionally not marked as a right edge key. --> </Row> diff --git a/java/res/xml-xlarge/kbd_numkey_styles.xml b/java/res/xml-xlarge/kbd_numkey_styles.xml index 3c62cb017..e27db94c7 100644 --- a/java/res/xml-xlarge/kbd_numkey_styles.xml +++ b/java/res/xml-xlarge/kbd_numkey_styles.xml @@ -81,7 +81,6 @@ <key-style latin:styleName="numSpaceKeyStyle" latin:code="@integer/key_space" - latin:keyIcon="@drawable/sym_keyboard_space_holo" latin:iconPreview="@drawable/sym_keyboard_feedback_space" /> </case> <case @@ -143,7 +142,6 @@ <key-style latin:styleName="numSpaceKeyStyle" latin:code="@integer/key_space" - latin:keyIcon="@drawable/sym_bkeyboard_space" latin:iconPreview="@drawable/sym_keyboard_feedback_space" /> </case> </switch> diff --git a/java/res/xml-xlarge/kbd_phone.xml b/java/res/xml-xlarge/kbd_phone.xml index 45c298362..c320ebbbc 100644 --- a/java/res/xml-xlarge/kbd_phone.xml +++ b/java/res/xml-xlarge/kbd_phone.xml @@ -140,9 +140,15 @@ latin:keyStyle="num0KeyStyle" /> <Key latin:keyStyle="numPoundKeyStyle" /> - <Key - latin:keyStyle="micKeyStyle" - latin:keyWidth="8.042%p" /> + <switch> + <case + latin:voiceKeyEnabled="true" + > + <Key + latin:keyStyle="micKeyStyle" + latin:keyWidth="8.042%p" /> + </case> + </switch> <!-- There is an empty area bellow the "Enter" key and right of the "#" key. To ignore the touch event on the area, "#" is intentionally not marked as a right edge key. --> </Row> diff --git a/java/res/xml-xlarge/kbd_phone_symbols.xml b/java/res/xml-xlarge/kbd_phone_symbols.xml index 891ceacbe..da15b5ad0 100644 --- a/java/res/xml-xlarge/kbd_phone_symbols.xml +++ b/java/res/xml-xlarge/kbd_phone_symbols.xml @@ -152,9 +152,15 @@ latin:keyStyle="num0KeyStyle" /> <Key latin:keyStyle="numPoundKeyStyle" /> - <Key - latin:keyStyle="micKeyStyle" - latin:keyWidth="8.042%p" /> + <switch> + <case + latin:voiceKeyEnabled="true" + > + <Key + latin:keyStyle="micKeyStyle" + latin:keyWidth="8.042%p" /> + </case> + </switch> <!-- There is an empty area bellow the "Enter" key and right of the "#" key. To ignore the touch event on the area, "#" is intentionally not marked as a right edge key. --> </Row> diff --git a/java/res/xml-xlarge/kbd_qwerty_row4.xml b/java/res/xml-xlarge/kbd_qwerty_row4.xml index e222a6bb0..98acfc162 100644 --- a/java/res/xml-xlarge/kbd_qwerty_row4.xml +++ b/java/res/xml-xlarge/kbd_qwerty_row4.xml @@ -114,7 +114,13 @@ latin:popupCharacters="_" /> </default> </switch> - <Key - latin:keyStyle="micKeyStyle" /> + <switch> + <case + latin:voiceKeyEnabled="true" + > + <Key + latin:keyStyle="micKeyStyle" /> + </case> + </switch> </Row> </merge> diff --git a/java/res/xml-xlarge/kbd_symbols.xml b/java/res/xml-xlarge/kbd_symbols.xml index 50b8e5307..d804f7909 100644 --- a/java/res/xml-xlarge/kbd_symbols.xml +++ b/java/res/xml-xlarge/kbd_symbols.xml @@ -162,7 +162,13 @@ latin:popupCharacters="“,”,«,»,˝" /> <Key latin:keyLabel="_" /> - <Key - latin:keyStyle="micKeyStyle" /> + <switch> + <case + latin:voiceKeyEnabled="true" + > + <Key + latin:keyStyle="micKeyStyle" /> + </case> + </switch> </Row> </Keyboard> diff --git a/java/res/xml-xlarge/kbd_symbols_shift.xml b/java/res/xml-xlarge/kbd_symbols_shift.xml index f586b1a28..db33aaaca 100644 --- a/java/res/xml-xlarge/kbd_symbols_shift.xml +++ b/java/res/xml-xlarge/kbd_symbols_shift.xml @@ -139,7 +139,13 @@ <Key latin:keyStyle="spaceKeyStyle" latin:keyWidth="37.454%p" /> - <Key - latin:keyStyle="micKeyStyle" /> + <switch> + <case + latin:voiceKeyEnabled="true" + > + <Key + latin:keyStyle="micKeyStyle" /> + </case> + </switch> </Row> </Keyboard> |