diff options
Diffstat (limited to 'java/res/values')
| -rw-r--r-- | java/res/values/attrs.xml | 4 | ||||
| -rw-r--r-- | java/res/values/donottranslate-config-spacing-and-punctuations.xml | 7 | ||||
| -rw-r--r-- | java/res/values/donottranslate.xml | 6 | ||||
| -rw-r--r-- | java/res/values/keyboard-themes.xml | 4 | ||||
| -rw-r--r-- | java/res/values/strings.xml | 8 |
5 files changed, 26 insertions, 3 deletions
diff --git a/java/res/values/attrs.xml b/java/res/values/attrs.xml index f1253b40c..8ee859bc7 100644 --- a/java/res/values/attrs.xml +++ b/java/res/values/attrs.xml @@ -483,6 +483,8 @@ <attr name="localeCode" format="string" /> <attr name="languageCode" format="string" /> <attr name="countryCode" format="string" /> + <!-- Enable split keyboard layout. Disabled by default. --> + <attr name="isSplitLayout" format="boolean" /> </declare-styleable> <declare-styleable name="Keyboard_KeyStyle"> @@ -514,6 +516,8 @@ <attr name="elementKeyboard" format="reference"/> <!-- Enable proximity characters correction. Disabled by default. --> <attr name="enableProximityCharsCorrection" format="boolean" /> + <!-- Indicates if the keyboard layout supports being split or not. false by default --> + <attr name="supportsSplitLayout" format="boolean" /> </declare-styleable> <declare-styleable name="KeyboardLayoutSet_Feature"> diff --git a/java/res/values/donottranslate-config-spacing-and-punctuations.xml b/java/res/values/donottranslate-config-spacing-and-punctuations.xml index 2faf578d2..06144d021 100644 --- a/java/res/values/donottranslate-config-spacing-and-punctuations.xml +++ b/java/res/values/donottranslate-config-spacing-and-punctuations.xml @@ -33,9 +33,14 @@ <string name="symbols_word_separators">"	 
 "()[]{}*&<>+=|.,;:!?/_\"</string> <!-- Word connectors --> <string name="symbols_word_connectors">\'-</string> - <!-- The sentence separator code point, for capitalization --> + <!-- The sentence separator code point, for capitalization and auto-insertion --> <!-- U+002E: "." FULL STOP ; 2Eh = 46d --> <integer name="sentence_separator">46</integer> + <!-- The abbreviation marker code point --> + <!-- U+002E: "." FULL STOP ; 2Eh = 46d --> + <integer name="abbreviation_marker">46</integer> + <!-- Symbols that terminate sentences and require capitalization on the next char --> + <string name="symbols_sentence_terminators">.?!</string> <!-- Whether this language uses spaces between words --> <bool name="current_language_has_spaces">true</bool> </resources> diff --git a/java/res/values/donottranslate.xml b/java/res/values/donottranslate.xml index c54b995f8..74988f90f 100644 --- a/java/res/values/donottranslate.xml +++ b/java/res/values/donottranslate.xml @@ -30,6 +30,12 @@ <item>en_US</item> <item>en_GB</item> <item>es_US</item> + <item>hi_ZZ</item> + </string-array> + + <!-- Subtype locale whose name should be displayed in Locale.ROOT. --> + <string-array name="subtype_locale_displayed_in_root_locale"> + <item>hi_ZZ</item> </string-array> <!-- Generic subtype label --> diff --git a/java/res/values/keyboard-themes.xml b/java/res/values/keyboard-themes.xml index 9d772c4e7..b0bae9647 100644 --- a/java/res/values/keyboard-themes.xml +++ b/java/res/values/keyboard-themes.xml @@ -26,10 +26,10 @@ <item>@string/keyboard_theme_holo_blue</item> </string-array> <!-- An element must be a keyboard theme id of {@link KeyboardTheme#THEME_ID_*}. --> - <string-array name="keyboard_theme_ids" translatable="false"> + <integer-array name="keyboard_theme_ids" translatable="false"> <item>3</item> <item>4</item> <item>2</item> <item>0</item> - </string-array> + </integer-array> </resources> diff --git a/java/res/values/strings.xml b/java/res/values/strings.xml index 2f8b3800d..73fb7bd7a 100644 --- a/java/res/values/strings.xml +++ b/java/res/values/strings.xml @@ -51,6 +51,9 @@ <!-- Settings screen title for keyboard theme settings [CHAR LIMIT=33] --> <string name="settings_screen_theme">Theme</string> + <!-- Option for enabling or disabling the split keyboard layout. [CHAR LIMIT=65]--> + <string name="enable_split_keyboard">Enable split keyboard</string> + <!-- Option name for including other IMEs in the language switch list [CHAR LIMIT=30] --> <string name="include_other_imes_in_language_switch_list">Switch to other input methods</string> <!-- Option summary for including other IMEs in the language switch list [CHAR LIMIT=65] --> @@ -183,6 +186,8 @@ <!-- Description for Spanish (US) keyboard subtype [CHAR LIMIT=25] (US) should be an abbreviation of United States to fit in the CHAR LIMIT. --> <string name="subtype_es_US">Spanish (US)</string> + <!-- Description for Hinglish (https://en.wikipedia.org/wiki/Hinglish) keyboard subtype [CHAR LIMIT=25] --> + <string name="subtype_hi_ZZ">Hinglish</string> <!-- Description for English (UK) keyboard subtype with explicit keyboard layout [CHAR LIMIT=25] (UK) should be an abbreviation of United Kingdom to fit in the CHAR LIMIT. This should be identical to subtype_en_GB aside from the trailing (%s). --> @@ -195,6 +200,9 @@ (US) should be an abbreviation of United Statesn to fit in the CHAR LIMIT. This should be identical to subtype_es_US aside from the trailing (%s). --> <string name="subtype_with_layout_es_US">Spanish (US) (<xliff:g id="KEYBOARD_LAYOUT" example="QWERTY">%s</xliff:g>)</string> + <!-- Description for Hinglish (https://en.wikipedia.org/wiki/Hinglish) keyboard subtype with explicit keyboard layout [CHAR LIMIT=25] + This should be identical to subtype_hi_ZZ aside from the trailing (%s). --> + <string name="subtype_with_layout_hi_ZZ">Hinglish (<xliff:g id="KEYBOARD_LAYOUT" example="QWERTY">%s</xliff:g>)</string> <!-- Description for "LANGUAGE_NAME" (Traditional) keyboard subtype [CHAR LIMIT=25] (Traditional) can be an abbreviation to fit in the CHAR LIMIT. --> <string name="subtype_generic_traditional"><xliff:g id="LANGUAGE_NAME" example="Nepali">%s</xliff:g> (Traditional)</string> |