diff options
Diffstat (limited to 'java/res/xml')
211 files changed, 4982 insertions, 3682 deletions
diff --git a/java/res/xml/kbd_armenian_phonetic.xml b/java/res/xml/kbd_armenian_phonetic.xml index 1eb3c7e7d..da12870ed 100644 --- a/java/res/xml/kbd_armenian_phonetic.xml +++ b/java/res/xml/kbd_armenian_phonetic.xml @@ -21,9 +21,9 @@ <Keyboard xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" latin:rowHeight="20%p" - latin:verticalGap="@fraction/key_bottom_gap_5row" - latin:keyLetterSize="@fraction/key_letter_ratio_5row" - latin:keyShiftedLetterHintRatio="@fraction/key_uppercase_letter_ratio_5row" + latin:verticalGap="@fraction/config_key_vertical_gap_5row" + latin:keyLetterSize="@fraction/config_key_letter_ratio_5row" + latin:keyShiftedLetterHintRatio="@fraction/config_key_shifted_letter_hint_ratio_5row" latin:touchPositionCorrectionData="@array/touch_position_correction_data_default" > <include diff --git a/java/res/xml/key_colemak_colon.xml b/java/res/xml/kbd_bengali.xml index 307b4ebca..879a897df 100644 --- a/java/res/xml/key_colemak_colon.xml +++ b/java/res/xml/kbd_bengali.xml @@ -2,7 +2,7 @@ <!-- /* ** -** Copyright 2012, The Android Open Source Project +** Copyright 2014, 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. @@ -18,24 +18,9 @@ */ --> -<merge +<Keyboard xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" > - <switch> - <case - latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLockShifted" - > - <Key - latin:keyLabel=";" - latin:keyHintLabel="0" - latin:additionalMoreKeys="0" /> - </case> - <default> - <Key - latin:keyLabel=":" - latin:keyHintLabel="0" - latin:additionalMoreKeys="0" - latin:moreKeys=";" /> - </default> - </switch> -</merge> + <include + latin:keyboardLayout="@xml/rows_bengali" /> +</Keyboard> diff --git a/java/res/xml/kbd_emoji_category1.xml b/java/res/xml/kbd_emoji_category1.xml index c11a83017..5145ea9d3 100644 --- a/java/res/xml/kbd_emoji_category1.xml +++ b/java/res/xml/kbd_emoji_category1.xml @@ -20,9 +20,9 @@ <Keyboard xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" - latin:keyWidth="@fraction/emoji_keyboard_key_width" + latin:keyWidth="@fraction/config_emoji_keyboard_key_width" latin:keyLetterSize="90%p" - latin:rowHeight="@fraction/emoji_keyboard_row_height" + latin:rowHeight="@fraction/config_emoji_keyboard_row_height" > <GridRows latin:codesArray="@array/emoji_faces" diff --git a/java/res/xml/kbd_emoji_category2.xml b/java/res/xml/kbd_emoji_category2.xml index d3e5890ea..ac8784f4b 100644 --- a/java/res/xml/kbd_emoji_category2.xml +++ b/java/res/xml/kbd_emoji_category2.xml @@ -20,9 +20,9 @@ <Keyboard xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" - latin:keyWidth="@fraction/emoji_keyboard_key_width" + latin:keyWidth="@fraction/config_emoji_keyboard_key_width" latin:keyLetterSize="90%p" - latin:rowHeight="@fraction/emoji_keyboard_row_height" + latin:rowHeight="@fraction/config_emoji_keyboard_row_height" > <GridRows latin:codesArray="@array/emoji_objects" diff --git a/java/res/xml/kbd_emoji_category3.xml b/java/res/xml/kbd_emoji_category3.xml index 0efafa814..88c4db92b 100644 --- a/java/res/xml/kbd_emoji_category3.xml +++ b/java/res/xml/kbd_emoji_category3.xml @@ -20,9 +20,9 @@ <Keyboard xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" - latin:keyWidth="@fraction/emoji_keyboard_key_width" + latin:keyWidth="@fraction/config_emoji_keyboard_key_width" latin:keyLetterSize="90%p" - latin:rowHeight="@fraction/emoji_keyboard_row_height" + latin:rowHeight="@fraction/config_emoji_keyboard_row_height" > <GridRows latin:codesArray="@array/emoji_nature" diff --git a/java/res/xml/kbd_emoji_category4.xml b/java/res/xml/kbd_emoji_category4.xml index e5291207f..262384d80 100644 --- a/java/res/xml/kbd_emoji_category4.xml +++ b/java/res/xml/kbd_emoji_category4.xml @@ -20,9 +20,9 @@ <Keyboard xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" - latin:keyWidth="@fraction/emoji_keyboard_key_width" + latin:keyWidth="@fraction/config_emoji_keyboard_key_width" latin:keyLetterSize="90%p" - latin:rowHeight="@fraction/emoji_keyboard_row_height" + latin:rowHeight="@fraction/config_emoji_keyboard_row_height" > <GridRows latin:codesArray="@array/emoji_places" diff --git a/java/res/xml/kbd_emoji_category5.xml b/java/res/xml/kbd_emoji_category5.xml index 1836879d6..bf823f978 100644 --- a/java/res/xml/kbd_emoji_category5.xml +++ b/java/res/xml/kbd_emoji_category5.xml @@ -20,9 +20,9 @@ <Keyboard xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" - latin:keyWidth="@fraction/emoji_keyboard_key_width" + latin:keyWidth="@fraction/config_emoji_keyboard_key_width" latin:keyLetterSize="90%p" - latin:rowHeight="@fraction/emoji_keyboard_row_height" + latin:rowHeight="@fraction/config_emoji_keyboard_row_height" > <GridRows latin:codesArray="@array/emoji_symbols" diff --git a/java/res/xml/kbd_emoji_category6.xml b/java/res/xml/kbd_emoji_category6.xml index b47ebfec0..edb82fc64 100644 --- a/java/res/xml/kbd_emoji_category6.xml +++ b/java/res/xml/kbd_emoji_category6.xml @@ -20,10 +20,10 @@ <Keyboard xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" - latin:keyWidth="@fraction/emoji_keyboard_key_width" + latin:keyWidth="@fraction/config_emoji_keyboard_key_width" latin:keyLetterSize="90%p" latin:keyLabelSize="60%p" - latin:rowHeight="@fraction/emoji_keyboard_row_height" + latin:rowHeight="@fraction/config_emoji_keyboard_row_height" > <GridRows latin:textsArray="@array/emoji_emoticons" diff --git a/java/res/xml/kbd_emoji_recents.xml b/java/res/xml/kbd_emoji_recents.xml index 73926ecc0..edf3872c1 100644 --- a/java/res/xml/kbd_emoji_recents.xml +++ b/java/res/xml/kbd_emoji_recents.xml @@ -20,10 +20,10 @@ <Keyboard xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" - latin:keyWidth="@fraction/emoji_keyboard_key_width" - latin:keyLetterSize="@fraction/emoji_keyboard_key_letter_size" + latin:keyWidth="@fraction/config_emoji_keyboard_key_width" + latin:keyLetterSize="@fraction/config_emoji_keyboard_key_letter_size" latin:keyLabelSize="60%p" - latin:rowHeight="@fraction/emoji_keyboard_row_height" + latin:rowHeight="@fraction/config_emoji_keyboard_row_height" > <GridRows latin:codesArray="@array/emoji_recents" diff --git a/java/res/xml/key_greek_semicolon.xml b/java/res/xml/kbd_hindi_compact.xml index ae73a59f6..7502bba9e 100644 --- a/java/res/xml/key_greek_semicolon.xml +++ b/java/res/xml/kbd_hindi_compact.xml @@ -2,7 +2,7 @@ <!-- /* ** -** Copyright 2012, The Android Open Source Project +** Copyright 2014, 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. @@ -18,25 +18,9 @@ */ --> -<merge +<Keyboard xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" > - <switch> - <case - latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLockShifted" - > - <Key - latin:keyLabel=":" - latin:keyHintLabel="1" - latin:moreKeys=";" - latin:additionalMoreKeys="1" /> - </case> - <default> - <Key - latin:keyLabel=";" - latin:keyHintLabel="1" - latin:moreKeys=":" - latin:additionalMoreKeys="1" /> - </default> - </switch> -</merge> + <include + latin:keyboardLayout="@xml/rows_hindi_compact" /> +</Keyboard> diff --git a/java/res/xml/kbd_khmer.xml b/java/res/xml/kbd_khmer.xml index 7a2337a48..d703e78f7 100644 --- a/java/res/xml/kbd_khmer.xml +++ b/java/res/xml/kbd_khmer.xml @@ -21,9 +21,9 @@ <Keyboard xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" latin:rowHeight="20%p" - latin:verticalGap="@fraction/key_bottom_gap_5row" - latin:keyLetterSize="@fraction/key_letter_ratio_5row" - latin:keyShiftedLetterHintRatio="@fraction/key_uppercase_letter_ratio_5row" + latin:verticalGap="@fraction/config_key_vertical_gap_5row" + latin:keyLetterSize="@fraction/config_key_letter_ratio_5row" + latin:keyShiftedLetterHintRatio="@fraction/config_key_shifted_letter_hint_ratio_5row" latin:touchPositionCorrectionData="@array/touch_position_correction_data_default" > <include diff --git a/java/res/xml/kbd_lao.xml b/java/res/xml/kbd_lao.xml index 2bba330de..6f7709562 100644 --- a/java/res/xml/kbd_lao.xml +++ b/java/res/xml/kbd_lao.xml @@ -21,9 +21,9 @@ <Keyboard xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" latin:rowHeight="20%p" - latin:verticalGap="@fraction/key_bottom_gap_5row" - latin:keyLetterSize="@fraction/key_letter_ratio_5row" - latin:keyShiftedLetterHintRatio="@fraction/key_uppercase_letter_ratio_5row" + latin:verticalGap="@fraction/config_key_vertical_gap_5row" + latin:keyLetterSize="@fraction/config_key_letter_ratio_5row" + latin:keyShiftedLetterHintRatio="@fraction/config_key_shifted_letter_hint_ratio_5row" latin:touchPositionCorrectionData="@array/touch_position_correction_data_default" > <include diff --git a/java/res/xml/kbd_marathi.xml b/java/res/xml/kbd_marathi.xml new file mode 100644 index 000000000..4328cd6d3 --- /dev/null +++ b/java/res/xml/kbd_marathi.xml @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright 2014, 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. +*/ +--> + +<Keyboard + xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" +> + <include + latin:keyboardLayout="@xml/rows_marathi" /> +</Keyboard> diff --git a/java/res/xml/kbd_more_keys_keyboard_template.xml b/java/res/xml/kbd_more_keys_keyboard_template.xml index 537973d03..7104ec7e0 100644 --- a/java/res/xml/kbd_more_keys_keyboard_template.xml +++ b/java/res/xml/kbd_more_keys_keyboard_template.xml @@ -20,7 +20,7 @@ <Keyboard xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" latin:keyWidth="10%p" - latin:rowHeight="@dimen/popup_key_height" + latin:rowHeight="@dimen/config_more_keys_keyboard_key_height" style="?attr/moreKeysKeyboardStyle" > </Keyboard> diff --git a/java/res/xml/kbd_myanmar.xml b/java/res/xml/kbd_myanmar.xml new file mode 100644 index 000000000..af997b1c8 --- /dev/null +++ b/java/res/xml/kbd_myanmar.xml @@ -0,0 +1,31 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright 2014, 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. +*/ +--> + +<Keyboard + xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" + latin:rowHeight="20%p" + latin:verticalGap="@fraction/config_key_vertical_gap_5row" + latin:keyLetterSize="@fraction/config_key_letter_ratio_5row" + latin:keyShiftedLetterHintRatio="@fraction/config_key_shifted_letter_hint_ratio_5row" + latin:touchPositionCorrectionData="@array/touch_position_correction_data_default" +> + <include + latin:keyboardLayout="@xml/rows_myanmar" /> +</Keyboard> diff --git a/java/res/xml/kbd_pcqwerty.xml b/java/res/xml/kbd_pcqwerty.xml index 5155bc510..045696451 100644 --- a/java/res/xml/kbd_pcqwerty.xml +++ b/java/res/xml/kbd_pcqwerty.xml @@ -21,9 +21,9 @@ <Keyboard xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" latin:rowHeight="20%p" - latin:verticalGap="@fraction/key_bottom_gap_5row" - latin:keyLetterSize="@fraction/key_letter_ratio_5row" - latin:keyShiftedLetterHintRatio="@fraction/key_uppercase_letter_ratio_5row" + latin:verticalGap="@fraction/config_key_vertical_gap_5row" + latin:keyLetterSize="@fraction/config_key_letter_ratio_5row" + latin:keyShiftedLetterHintRatio="@fraction/config_key_shifted_letter_hint_ratio_5row" latin:touchPositionCorrectionData="@array/touch_position_correction_data_default" > <include diff --git a/java/res/xml/kbd_sinhala.xml b/java/res/xml/kbd_sinhala.xml new file mode 100644 index 000000000..6c0f4bc05 --- /dev/null +++ b/java/res/xml/kbd_sinhala.xml @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright 2014, 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. +*/ +--> + +<Keyboard + xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" +> + <include + latin:keyboardLayout="@xml/rows_sinhala" /> +</Keyboard> diff --git a/java/res/xml/kbd_suggestions_pane_template.xml b/java/res/xml/kbd_suggestions_pane_template.xml index 21316e6bb..5b4f60673 100644 --- a/java/res/xml/kbd_suggestions_pane_template.xml +++ b/java/res/xml/kbd_suggestions_pane_template.xml @@ -20,6 +20,6 @@ <Keyboard xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" latin:keyWidth="10%p" - latin:rowHeight="@dimen/more_suggestions_row_height" + latin:rowHeight="@dimen/config_more_suggestions_row_height" > </Keyboard> diff --git a/java/res/xml/key_devanagari_sign_anusvara.xml b/java/res/xml/kbd_swiss.xml index 0acd3bcd4..c64ad1103 100644 --- a/java/res/xml/key_devanagari_sign_anusvara.xml +++ b/java/res/xml/kbd_swiss.xml @@ -18,17 +18,9 @@ */ --> -<!-- The code point U+25CC for key label is needed because the font rendering system prior to - API version 16 can't automatically render dotted circle for incomplete combining letter - of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the - counterpart files named res/xml-v16/key_*.xml don't have this hack. --> -<merge +<Keyboard xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" > - <!-- U+25CC: "◌" DOTTED CIRCLE - U+0902: "ं" DEVANAGARI SIGN ANUSVARA --> - <Key - latin:keyLabel="◌ं" - latin:code="0x0902" - latin:keyLabelFlags="fontNormal|followKeyLetterRatio" /> -</merge> + <include + latin:keyboardLayout="@xml/rows_swiss" /> +</Keyboard> diff --git a/java/res/xml/kbd_thai.xml b/java/res/xml/kbd_thai.xml index 294bffb5b..7e65217f9 100644 --- a/java/res/xml/kbd_thai.xml +++ b/java/res/xml/kbd_thai.xml @@ -21,9 +21,9 @@ <Keyboard xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" latin:rowHeight="20%p" - latin:verticalGap="@fraction/key_bottom_gap_5row" - latin:keyLetterSize="@fraction/key_letter_ratio_5row" - latin:keyShiftedLetterHintRatio="@fraction/key_uppercase_letter_ratio_5row" + latin:verticalGap="@fraction/config_key_vertical_gap_5row" + latin:keyLetterSize="@fraction/config_key_letter_ratio_5row" + latin:keyShiftedLetterHintRatio="@fraction/config_key_shifted_letter_hint_ratio_5row" latin:touchPositionCorrectionData="@array/touch_position_correction_data_default" > <include diff --git a/java/res/xml/key_armenian_sha.xml b/java/res/xml/key_armenian_sha.xml index 3865c1984..111d4263b 100644 --- a/java/res/xml/key_armenian_sha.xml +++ b/java/res/xml/key_armenian_sha.xml @@ -23,6 +23,5 @@ > <!-- U+0577: "շ" ARMENIAN SMALL LETTER SHA --> <Key - latin:keyLabel="շ" - latin:keyLabelFlags="fontNormal" /> + latin:keySpec="շ" /> </merge> diff --git a/java/res/xml/key_armenian_xeh.xml b/java/res/xml/key_armenian_xeh.xml index 007a5802d..3bbc405dc 100644 --- a/java/res/xml/key_armenian_xeh.xml +++ b/java/res/xml/key_armenian_xeh.xml @@ -23,6 +23,5 @@ > <!-- U+056D: "խ" ARMENIAN SMALL LETTER XEH --> <Key - latin:keyLabel="խ" - latin:keyLabelFlags="fontNormal" /> + latin:keySpec="խ" /> </merge> diff --git a/java/res/xml/key_f1.xml b/java/res/xml/key_f1.xml index 72e38cb1a..7bd7385a1 100644 --- a/java/res/xml/key_f1.xml +++ b/java/res/xml/key_f1.xml @@ -26,29 +26,21 @@ latin:mode="url" > <Key - latin:keyLabel="/" - latin:keyStyle="f1MoreKeysStyle" /> + latin:keySpec="/" + latin:keyStyle="settingsMoreKeysStyle" /> </case> <case latin:mode="email" > <Key - latin:keyLabel="\@" - latin:keyStyle="f1MoreKeysStyle" /> + latin:keySpec="\@" + latin:keyStyle="settingsMoreKeysStyle" /> </case> - <case - latin:hasShortcutKey="true" - > - <Key - latin:keyStyle="shortcutKeyStyle" /> - </case> - <!-- latin:hasShortcutKey="false" --> <default> <Key - latin:keyLabel="!text/keylabel_for_comma" + latin:keySpec="!text/keyspec_comma" latin:keyLabelFlags="hasPopupHint" - latin:additionalMoreKeys="!text/more_keys_for_comma,!text/shortcut_as_more_key" - latin:keyStyle="f1MoreKeysStyle" /> + latin:keyStyle="settingsMoreKeysStyle" /> </default> </switch> </merge> diff --git a/java/res/xml/key_nepali_traditional_period.xml b/java/res/xml/key_period.xml index 1c389b009..e1d4bbdf7 100644 --- a/java/res/xml/key_nepali_traditional_period.xml +++ b/java/res/xml/key_period.xml @@ -18,32 +18,42 @@ */ --> -<!-- The code point U+25CC for key label is needed because the font rendering system prior to - API version 16 can't automatically render dotted circle for incomplete combining letter - of Hindi. The files named res/xml/{key,keys}_nepali*.xml have this U+25CC hack, although the - counterpart files named res/xml-v16/{key,keys}_nepali*.xml don't have this hack. --> <merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" > <switch> <case - latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted" + latin:languageCode="hi" + latin:keyboardLayoutSet="hindi_compact" > + <!-- U+0964: "।" DEVANAGARI DANDA --> <Key - latin:keyLabel="," + latin:keySpec="\u0964" + latin:keyLabelFlags="hasPopupHint" + latin:moreKeys="!autoColumnOrder!9,\\,,.,?,!,#,),(,/,;,',@,:,-,",+,\\%,&" latin:backgroundType="functional" /> </case> - <default> + <case + latin:languageCode="ne" + latin:keyboardLayoutSet="nepali_traditional" + > <!-- Because the font rendering system prior to API version 16 can't automatically render dotted circle for incomplete combining letter of some scripts, different set of Key definitions are needed based on the API version. --> <include latin:keyboardLayout="@xml/keystyle_devanagari_sign_virama" /> - <!-- U+002E: "." FULL STOP --> <Key latin:keyStyle="baseKeyDevanagariSignVirama" latin:keyLabelFlags="hasPopupHint" - latin:moreKeys="!fixedColumnOrder!9,.,!text/more_keys_for_punctuation" + latin:moreKeys="!text/morekeys_punctuation" + latin:backgroundType="functional" /> + </case> + <default> + <Key + latin:keySpec="!text/keyspec_period" + latin:keyHintLabel="!text/keyhintlabel_period" + latin:keyLabelFlags="hasPopupHint|hasShiftedLetterHint" + latin:moreKeys="!text/morekeys_period" latin:backgroundType="functional" /> </default> </switch> diff --git a/java/res/xml/key_space_symbols.xml b/java/res/xml/key_space_symbols.xml index 1efc4ff4e..0ce522889 100644 --- a/java/res/xml/key_space_symbols.xml +++ b/java/res/xml/key_space_symbols.xml @@ -21,6 +21,8 @@ <merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" > - <include - latin:keyboardLayout="@xml/key_space_3kw" /> + <Key + latin:backgroundType="normal" + latin:keyStyle="spaceKeyStyle" + latin:keyWidth="30%p" /> </merge> diff --git a/java/res/xml/key_styles_common.xml b/java/res/xml/key_styles_common.xml index c9d87bfd4..8b3bb2e5c 100644 --- a/java/res/xml/key_styles_common.xml +++ b/java/res/xml/key_styles_common.xml @@ -35,14 +35,13 @@ latin:keyLabelFlags="hasShiftedLetterHint" /> </default> </switch> - <!-- Base key style for the key which may have settings or tab key as popup key. --> + <!-- Base key style for the key which may have settings key as more keys. --> <include - latin:keyboardLayout="@xml/key_styles_f1" /> + latin:keyboardLayout="@xml/key_styles_settings" /> <!-- Functional key styles --> <!-- Base style for shift key. A single space is used for dummy label in moreKeys. --> <key-style latin:styleName="baseForShiftKeyStyle" - latin:code="!code/key_shift" latin:keyActionFlags="noKeyPreview" latin:keyLabelFlags="preserveCase" latin:moreKeys="!noPanelAutoMoreKey!, |!code/key_capslock" /> @@ -52,7 +51,7 @@ > <key-style latin:styleName="shiftKeyStyle" - latin:keyIcon="!icon/shift_key_shifted" + latin:keySpec="!icon/shift_key_shifted|!code/key_shift" latin:backgroundType="stickyOff" latin:parentStyle="baseForShiftKeyStyle" /> </case> @@ -61,155 +60,98 @@ > <key-style latin:styleName="shiftKeyStyle" - latin:keyIcon="!icon/shift_key_shifted" + latin:keySpec="!icon/shift_key_shifted|!code/key_shift" latin:backgroundType="stickyOn" latin:parentStyle="baseForShiftKeyStyle" /> </case> <default> <key-style latin:styleName="shiftKeyStyle" - latin:keyIcon="!icon/shift_key" + latin:keySpec="!icon/shift_key|!code/key_shift" latin:backgroundType="stickyOff" latin:parentStyle="baseForShiftKeyStyle" /> </default> </switch> <key-style latin:styleName="deleteKeyStyle" - latin:code="!code/key_delete" - latin:keyIcon="!icon/delete_key" + latin:keySpec="!icon/delete_key|!code/key_delete" latin:keyActionFlags="isRepeatable|noKeyPreview" latin:backgroundType="functional" /> + <!-- emojiKeyStyle must be defined before including @xml/key_syles_enter. --> + <key-style + latin:styleName="emojiKeyStyle" + latin:keySpec="!icon/emoji_key|!code/key_emoji" + latin:keyActionFlags="noKeyPreview" + latin:backgroundType="action" /> <include latin:keyboardLayout="@xml/key_styles_enter" /> + <!-- TODO: Currently there is no way to specify icon alignment per theme. --> <key-style latin:styleName="spaceKeyStyle" - latin:code="!code/key_space" + latin:keySpec="!icon/space_key|!code/key_space" latin:keyActionFlags="noKeyPreview|enableLongPress" /> <!-- U+200C: ZERO WIDTH NON-JOINER U+200D: ZERO WIDTH JOINER --> <key-style latin:styleName="zwnjKeyStyle" - latin:code="0x200C" - latin:keyIcon="!icon/zwnj_key" + latin:keySpec="!icon/zwnj_key|‌" latin:moreKeys="!icon/zwj_key|‍" latin:keyLabelFlags="hasPopupHint" latin:keyActionFlags="noKeyPreview" /> <key-style latin:styleName="shortcutKeyStyle" - latin:code="!code/key_shortcut" - latin:keyIcon="!icon/shortcut_key" + latin:keySpec="!icon/shortcut_key|!code/key_shortcut" latin:keyIconDisabled="!icon/shortcut_key_disabled" latin:keyActionFlags="noKeyPreview|altCodeWhileTyping" latin:altCode="!code/key_space" - latin:parentStyle="f1MoreKeysStyle" /> + latin:parentStyle="settingsMoreKeysStyle" /> <key-style latin:styleName="settingsKeyStyle" - latin:code="!code/key_settings" - latin:keyIcon="!icon/settings_key" + latin:keySpec="!icon/settings_key|!code/key_settings" latin:keyActionFlags="noKeyPreview|altCodeWhileTyping" latin:altCode="!code/key_space" latin:backgroundType="functional" /> <key-style latin:styleName="languageSwitchKeyStyle" - latin:code="!code/key_language_switch" - latin:keyIcon="!icon/language_switch_key" + latin:keySpec="!icon/language_switch_key|!code/key_language_switch" latin:keyActionFlags="noKeyPreview|altCodeWhileTyping|enableLongPress" latin:altCode="!code/key_space" /> <key-style - latin:styleName="emojiKeyStyle" - latin:code="!code/key_emoji" - latin:keyIcon="!icon/emoji_key" - latin:keyActionFlags="noKeyPreview" - latin:backgroundType="functional" /> - <!-- Overriding EnterKeyStyle here --> - <switch> - <!-- Shift + Enter in textMultiLine field. --> - <case - latin:isMultiLine="true" - latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLockShifted" - > - <key-style - latin:styleName="enterKeyStyle" - latin:parentStyle="shiftEnterKeyStyle" /> - </case> - <!-- Smiley in textShortMessage field. - Overrides common enter key style. --> - <case - latin:mode="im" - > - <key-style - latin:styleName="enterKeyStyle" - latin:parentStyle="emojiKeyStyle" /> - </case> - </switch> - <key-style latin:styleName="tabKeyStyle" - latin:code="!code/key_tab" - latin:keyIcon="!icon/tab_key" + latin:keySpec="!icon/tab_key|!code/key_tab" latin:keyIconPreview="!icon/tab_key_preview" latin:backgroundType="functional" /> <!-- Note: This key style is not for functional tab key. This is used for the tab key which is laid out as normal letter key. --> <key-style latin:styleName="nonSpecialBackgroundTabKeyStyle" - latin:code="!code/key_tab" - latin:keyIcon="!icon/tab_key" + latin:keySpec="!icon/tab_key|!code/key_tab" latin:keyIconPreview="!icon/tab_key_preview" /> <key-style latin:styleName="baseForLayoutSwitchKeyStyle" - latin:keyLabelFlags="preserveCase" + latin:keyLabelFlags="preserveCase|followFunctionalTextColor" latin:keyActionFlags="noKeyPreview" latin:backgroundType="functional" /> - <switch> - <!-- When this qwerty keyboard has no shortcut keys but shortcut key is enabled, then symbol - keyboard will have a shortcut key. That means we should use label_to_symbol_key label - and shortcut_for_label icon. --> - <case - latin:shortcutKeyOnSymbols="true" - > - <key-style - latin:styleName="baseForToSymbolKeyStyle" - latin:keyIcon="!icon/shortcut_for_label" - latin:keyLabel="!text/label_to_symbol_with_microphone_key" - latin:keyLabelFlags="withIconRight|preserveCase" - latin:parentStyle="baseForLayoutSwitchKeyStyle" /> - </case> - <default> - <key-style - latin:styleName="baseForToSymbolKeyStyle" - latin:keyLabel="!text/label_to_symbol_key" - latin:parentStyle="baseForLayoutSwitchKeyStyle" /> - </default> - </switch> <key-style latin:styleName="toSymbolKeyStyle" - latin:code="!code/key_switch_alpha_symbol" - latin:parentStyle="baseForToSymbolKeyStyle" /> + latin:keySpec="!text/keylabel_to_symbol|!code/key_switch_alpha_symbol" + latin:parentStyle="baseForLayoutSwitchKeyStyle" /> <key-style latin:styleName="toAlphaKeyStyle" - latin:code="!code/key_switch_alpha_symbol" - latin:keyLabel="!text/label_to_alpha_key" + latin:keySpec="!text/keylabel_to_alpha|!code/key_switch_alpha_symbol" latin:parentStyle="baseForLayoutSwitchKeyStyle" /> <key-style latin:styleName="toMoreSymbolKeyStyle" - latin:code="!code/key_shift" - latin:keyLabel="!text/label_to_more_symbol_key" + latin:keySpec="!text/keylabel_to_more_symbol|!code/key_shift" latin:parentStyle="baseForLayoutSwitchKeyStyle" /> <key-style latin:styleName="backFromMoreSymbolKeyStyle" - latin:code="!code/key_shift" - latin:parentStyle="baseForToSymbolKeyStyle" /> - <key-style - latin:styleName="punctuationKeyStyle" - latin:keyLabel="." - latin:keyLabelFlags="hasPopupHint" - latin:moreKeys="!text/more_keys_for_punctuation" - latin:backgroundType="functional" /> + latin:keySpec="!text/keylabel_to_symbol|!code/key_shift" + latin:parentStyle="baseForLayoutSwitchKeyStyle" /> <key-style latin:styleName="comKeyStyle" - latin:keyLabel="!text/keylabel_for_popular_domain" + latin:keySpec="!text/keyspec_popular_domain" latin:keyLabelFlags="autoXScale|fontNormal|hasPopupHint|preserveCase" - latin:keyOutputText="!text/keylabel_for_popular_domain" - latin:moreKeys="!text/more_keys_for_popular_domain" + latin:moreKeys="!text/morekeys_popular_domain" latin:backgroundType="functional" /> </merge> diff --git a/java/res/xml/key_styles_currency.xml b/java/res/xml/key_styles_currency.xml index 84c2abc08..f576d0465 100644 --- a/java/res/xml/key_styles_currency.xml +++ b/java/res/xml/key_styles_currency.xml @@ -50,7 +50,7 @@ 19. San Marino (it_SM) 20. Slovakia (sk_SK) 21. Slovenia (sl_SI) - 22. Spain (es_ES, ca_ES) + 22. Spain (es_ES, ca_ES, eu_ES, gl_ES) 23. Vatican City (it_VA) --> <case latin:countryCode="AD|AT|BE|CY|EE|FI|FR|DE|GR|IE|IT|XK|LU|MT|MO|ME|NL|PT|SM|SK|SI|ES|VA" @@ -92,7 +92,34 @@ <include latin:keyboardLayout="@xml/key_styles_currency_euro" /> </case> - <!-- fa: Persian (Rial and Afgahni) + <!-- IN: India (Rupee) --> + <case + latin:countryCode="IN" + > + <!-- U+20B9: "₹" INDIAN RUPEE SIGN + U+00A3: "£" POUND SIGN + U+20AC: "€" EURO SIGN + U+00A2: "¢" CENT SIGN --> + <key-style + latin:styleName="currencyKeyStyle" + latin:keySpec="₹" + latin:moreKeys="!text/morekeys_currency" /> + <key-style + latin:styleName="moreCurrency1KeyStyle" + latin:keySpec="£" /> + <key-style + latin:styleName="moreCurrency2KeyStyle" + latin:keySpec="€" /> + <key-style + latin:styleName="moreCurrency3KeyStyle" + latin:keySpec="$" + latin:moreKeys="¢" /> + <key-style + latin:styleName="moreCurrency4KeyStyle" + latin:keySpec="¢" /> + </case> + <!-- bn: Bengali (Bangladesh Taka) + fa: Persian (Rial and Afgahni) hi: Hindi (Indian Rupee) iw: Hebrew (New Sheqel) lo: Lao (Kip) @@ -106,28 +133,28 @@ <!-- TODO: The currency sign of Armenian Dram was created in 2012 and assigned U+058F for its unicode, although there is no font glyph for it as of September 2013. --> <case - latin:languageCode="fa|hi|iw|lo|mn|ne|th|uk|vi" + latin:languageCode="bn|fa|hi|iw|lo|mn|ne|th|uk|vi" > <!-- U+00A3: "£" POUND SIGN U+20AC: "€" EURO SIGN U+00A2: "¢" CENT SIGN --> <key-style latin:styleName="currencyKeyStyle" - latin:keyLabel="!text/keylabel_for_currency" - latin:moreKeys="!text/more_keys_for_currency" /> + latin:keySpec="!text/keyspec_currency" + latin:moreKeys="!text/morekeys_currency" /> <key-style latin:styleName="moreCurrency1KeyStyle" - latin:keyLabel="£" /> + latin:keySpec="£" /> <key-style latin:styleName="moreCurrency2KeyStyle" - latin:keyLabel="€" /> + latin:keySpec="€" /> <key-style latin:styleName="moreCurrency3KeyStyle" - latin:keyLabel="$" + latin:keySpec="$" latin:moreKeys="¢" /> <key-style latin:styleName="moreCurrency4KeyStyle" - latin:keyLabel="¢" /> + latin:keySpec="¢" /> </case> <!-- GB: United Kingdom (Pound) --> <case @@ -140,21 +167,21 @@ U+20B1: "₱" PESO SIGN --> <key-style latin:styleName="currencyKeyStyle" - latin:keyLabel="£" + latin:keySpec="£" latin:moreKeys="¢,$,€,¥,₱" /> <key-style latin:styleName="moreCurrency1KeyStyle" - latin:keyLabel="€" /> + latin:keySpec="€" /> <key-style latin:styleName="moreCurrency2KeyStyle" - latin:keyLabel="¥" /> + latin:keySpec="¥" /> <key-style latin:styleName="moreCurrency3KeyStyle" - latin:keyLabel="$" + latin:keySpec="$" latin:moreKeys="¢" /> <key-style latin:styleName="moreCurrency4KeyStyle" - latin:keyLabel="¢" /> + latin:keySpec="¢" /> </case> <!-- ar: Arabic (Dollar and Rial) --> <default> diff --git a/java/res/xml/key_styles_currency_dollar.xml b/java/res/xml/key_styles_currency_dollar.xml index 674a3966d..d3211bd69 100644 --- a/java/res/xml/key_styles_currency_dollar.xml +++ b/java/res/xml/key_styles_currency_dollar.xml @@ -25,18 +25,18 @@ U+00A5: "¥" YEN SIGN --> <key-style latin:styleName="currencyKeyStyle" - latin:keyLabel="$" - latin:moreKeys="!text/more_keys_for_currency_dollar" /> + latin:keySpec="$" + latin:moreKeys="!text/morekeys_currency_dollar" /> <key-style latin:styleName="moreCurrency1KeyStyle" - latin:keyLabel="£" /> + latin:keySpec="£" /> <key-style latin:styleName="moreCurrency2KeyStyle" - latin:keyLabel="¢" /> + latin:keySpec="¢" /> <key-style latin:styleName="moreCurrency3KeyStyle" - latin:keyLabel="€" /> + latin:keySpec="€" /> <key-style latin:styleName="moreCurrency4KeyStyle" - latin:keyLabel="¥" /> + latin:keySpec="¥" /> </merge> diff --git a/java/res/xml/key_styles_currency_euro.xml b/java/res/xml/key_styles_currency_euro.xml index c1b5e0384..c2ae87bea 100644 --- a/java/res/xml/key_styles_currency_euro.xml +++ b/java/res/xml/key_styles_currency_euro.xml @@ -26,19 +26,19 @@ U+20B1: "₱" PESO SIGN --> <key-style latin:styleName="currencyKeyStyle" - latin:keyLabel="€" + latin:keySpec="€" latin:moreKeys="¢,£,$,¥,₱" /> <key-style latin:styleName="moreCurrency1KeyStyle" - latin:keyLabel="£" /> + latin:keySpec="£" /> <key-style latin:styleName="moreCurrency2KeyStyle" - latin:keyLabel="¥" /> + latin:keySpec="¥" /> <key-style latin:styleName="moreCurrency3KeyStyle" - latin:keyLabel="$" + latin:keySpec="$" latin:moreKeys="¢" /> <key-style latin:styleName="moreCurrency4KeyStyle" - latin:keyLabel="¢" /> + latin:keySpec="¢" /> </merge> diff --git a/java/res/xml/key_styles_enter.xml b/java/res/xml/key_styles_enter.xml index 083e6a67d..50530e1bf 100644 --- a/java/res/xml/key_styles_enter.xml +++ b/java/res/xml/key_styles_enter.xml @@ -21,7 +21,7 @@ <merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" > - <!-- TODO: Stop using many conditional cases for emoji_key_as_more_key. There are way too many to maintain. --> + <!-- TODO: Stop using many conditional cases for keyspec_emoji_key. There are way too many to maintain. --> <!-- Navigate more keys style --> <switch> <!-- latin:passwordInput="true" --> @@ -33,7 +33,7 @@ <key-style latin:styleName="navigateMoreKeysStyle" latin:keyLabelFlags="hasPopupHint|preserveCase" - latin:moreKeys="!text/action_previous_as_more_key" /> + latin:moreKeys="!text/keyspec_action_previous" /> </case> <case latin:imeAction="actionNext" @@ -51,7 +51,7 @@ <key-style latin:styleName="navigateMoreKeysStyle" latin:keyLabelFlags="hasPopupHint|preserveCase" - latin:moreKeys="!text/action_next_as_more_key" /> + latin:moreKeys="!text/keyspec_action_next" /> </case> <case latin:imeAction="actionPrevious" @@ -69,7 +69,7 @@ <key-style latin:styleName="navigateMoreKeysStyle" latin:keyLabelFlags="hasPopupHint|preserveCase" - latin:moreKeys="!fixedColumnOrder!2,!needsDividers!,!text/action_previous_as_more_key,!text/action_next_as_more_key" /> + latin:moreKeys="!fixedColumnOrder!2,!needsDividers!,!text/keyspec_action_previous,!text/keyspec_action_next" /> </case> <case latin:navigateNext="true" @@ -79,7 +79,7 @@ <key-style latin:styleName="navigateMoreKeysStyle" latin:keyLabelFlags="hasPopupHint|preserveCase" - latin:moreKeys="!text/action_next_as_more_key" /> + latin:moreKeys="!text/keyspec_action_next" /> </case> <case latin:navigateNext="false" @@ -89,7 +89,7 @@ <key-style latin:styleName="navigateMoreKeysStyle" latin:keyLabelFlags="hasPopupHint|preserveCase" - latin:moreKeys="!text/action_previous_as_more_key" /> + latin:moreKeys="!text/keyspec_action_previous" /> </case> <case latin:navigateNext="false" @@ -108,7 +108,7 @@ <key-style latin:styleName="navigateMoreKeysStyle" latin:keyLabelFlags="hasPopupHint|preserveCase" - latin:moreKeys="!text/action_previous_as_more_key" /> + latin:moreKeys="!text/keyspec_action_previous" /> </case> <case latin:imeAction="actionNext" @@ -126,7 +126,7 @@ <key-style latin:styleName="navigateMoreKeysStyle" latin:keyLabelFlags="hasPopupHint|preserveCase" - latin:moreKeys="!text/action_next_as_more_key" /> + latin:moreKeys="!text/keyspec_action_next" /> </case> <case latin:imeAction="actionPrevious" @@ -144,7 +144,7 @@ <key-style latin:styleName="navigateMoreKeysStyle" latin:keyLabelFlags="hasPopupHint|preserveCase" - latin:moreKeys="!fixedColumnOrder!2,!needsDividers!,!text/action_previous_as_more_key,!text/action_next_as_more_key" /> + latin:moreKeys="!fixedColumnOrder!2,!needsDividers!,!text/keyspec_action_previous,!text/keyspec_action_next" /> </case> <case latin:navigateNext="true" @@ -154,7 +154,7 @@ <key-style latin:styleName="navigateMoreKeysStyle" latin:keyLabelFlags="hasPopupHint|preserveCase" - latin:moreKeys="!text/action_next_as_more_key" /> + latin:moreKeys="!text/keyspec_action_next" /> </case> <case latin:navigateNext="false" @@ -164,7 +164,7 @@ <key-style latin:styleName="navigateMoreKeysStyle" latin:keyLabelFlags="hasPopupHint|preserveCase" - latin:moreKeys="!text/action_previous_as_more_key" /> + latin:moreKeys="!text/keyspec_action_previous" /> </case> <case latin:navigateNext="false" @@ -182,7 +182,7 @@ <key-style latin:styleName="navigateMoreKeysStyle" latin:keyLabelFlags="hasPopupHint|preserveCase" - latin:moreKeys="!fixedColumnOrder!2,!needsDividers!,!text/emoji_key_as_more_key,!text/action_previous_as_more_key" /> + latin:moreKeys="!fixedColumnOrder!2,!needsDividers!,!text/keyspec_emoji_key,!text/keyspec_action_previous" /> </case> <case latin:imeAction="actionNext" @@ -191,7 +191,7 @@ <key-style latin:styleName="navigateMoreKeysStyle" latin:keyLabelFlags="hasPopupHint|preserveCase" - latin:moreKeys="!text/emoji_key_as_more_key" /> + latin:moreKeys="!text/keyspec_emoji_key" /> </case> <case latin:imeAction="actionPrevious" @@ -200,7 +200,7 @@ <key-style latin:styleName="navigateMoreKeysStyle" latin:keyLabelFlags="hasPopupHint|preserveCase" - latin:moreKeys="!fixedColumnOrder!2,!needsDividers!,!text/emoji_key_as_more_key,!text/action_next_as_more_key" /> + latin:moreKeys="!fixedColumnOrder!2,!needsDividers!,!text/keyspec_emoji_key,!text/keyspec_action_next" /> </case> <case latin:imeAction="actionPrevious" @@ -209,7 +209,7 @@ <key-style latin:styleName="navigateMoreKeysStyle" latin:keyLabelFlags="hasPopupHint|preserveCase" - latin:moreKeys="!text/emoji_key_as_more_key" /> + latin:moreKeys="!text/keyspec_emoji_key" /> </case> <case latin:navigateNext="true" @@ -218,7 +218,7 @@ <key-style latin:styleName="navigateMoreKeysStyle" latin:keyLabelFlags="hasPopupHint|preserveCase" - latin:moreKeys="!fixedColumnOrder!3,!needsDividers!,!text/emoji_key_as_more_key,!text/action_previous_as_more_key,!text/action_next_as_more_key" /> + latin:moreKeys="!fixedColumnOrder!3,!needsDividers!,!text/keyspec_emoji_key,!text/keyspec_action_previous,!text/keyspec_action_next" /> </case> <case latin:navigateNext="true" @@ -227,7 +227,7 @@ <key-style latin:styleName="navigateMoreKeysStyle" latin:keyLabelFlags="hasPopupHint|preserveCase" - latin:moreKeys="!fixedColumnOrder!2,!needsDividers!,!text/emoji_key_as_more_key,!text/action_next_as_more_key" /> + latin:moreKeys="!fixedColumnOrder!2,!needsDividers!,!text/keyspec_emoji_key,!text/keyspec_action_next" /> </case> <case latin:navigateNext="false" @@ -236,7 +236,7 @@ <key-style latin:styleName="navigateMoreKeysStyle" latin:keyLabelFlags="hasPopupHint|preserveCase" - latin:moreKeys="!fixedColumnOrder!2,!needsDividers!,!text/emoji_key_as_more_key,!text/action_previous_as_more_key" /> + latin:moreKeys="!fixedColumnOrder!2,!needsDividers!,!text/keyspec_emoji_key,!text/keyspec_action_previous" /> </case> <case latin:navigateNext="false" @@ -245,7 +245,7 @@ <key-style latin:styleName="navigateMoreKeysStyle" latin:keyLabelFlags="hasPopupHint|preserveCase" - latin:moreKeys="!text/emoji_key_as_more_key" /> + latin:moreKeys="!text/keyspec_emoji_key" /> </case> <default> <key-style @@ -255,21 +255,13 @@ <!-- Enter key style --> <key-style latin:styleName="defaultEnterKeyStyle" - latin:code="!code/key_enter" - latin:keyIcon="!icon/enter_key" - latin:keyLabelFlags="preserveCase|autoXScale|followKeyLabelRatio" + latin:keyLabelFlags="preserveCase|autoXScale|followKeyLabelRatio|followFunctionalTextColor" latin:keyActionFlags="noKeyPreview" - latin:backgroundType="functional" + latin:backgroundType="action" latin:parentStyle="navigateMoreKeysStyle" /> <key-style latin:styleName="shiftEnterKeyStyle" - latin:code="!code/key_shift_enter" - latin:parentStyle="defaultEnterKeyStyle" /> - <key-style - latin:styleName="defaultActionEnterKeyStyle" - latin:code="!code/key_enter" - latin:keyIcon="!icon/undefined" - latin:backgroundType="action" + latin:keySpec="!icon/enter_key|!code/key_shift_enter" latin:parentStyle="defaultEnterKeyStyle" /> <switch> <!-- Shift + Enter in textMultiLine field. --> @@ -281,66 +273,137 @@ latin:styleName="enterKeyStyle" latin:parentStyle="shiftEnterKeyStyle" /> </case> + <!-- Smiley in textShortMessage field. + This <case> should be after Shift + Enter <case> and before any of action <case>. --> + <case + latin:mode="im" + > + <key-style + latin:styleName="enterKeyStyle" + latin:parentStyle="emojiKeyStyle" /> + </case> <case latin:imeAction="actionGo" + latin:isIconDefined="go_key" > <key-style latin:styleName="enterKeyStyle" - latin:keyLabel="!text/label_go_key" - latin:parentStyle="defaultActionEnterKeyStyle" /> + latin:keySpec="!icon/go_key|!code/key_enter" + latin:backgroundType="action" + latin:parentStyle="defaultEnterKeyStyle" /> + </case> + <case + latin:imeAction="actionGo" + > + <key-style + latin:styleName="enterKeyStyle" + latin:keySpec="!text/label_go_key|!code/key_enter" + latin:parentStyle="defaultEnterKeyStyle" /> + </case> + <case + latin:imeAction="actionNext" + latin:isIconDefined="next_key" + > + <key-style + latin:styleName="enterKeyStyle" + latin:keySpec="!icon/next_key|!code/key_enter" + latin:backgroundType="action" + latin:parentStyle="defaultEnterKeyStyle" /> </case> <case latin:imeAction="actionNext" > <key-style latin:styleName="enterKeyStyle" - latin:keyLabel="!text/label_next_key" - latin:parentStyle="defaultActionEnterKeyStyle" /> + latin:keySpec="!text/label_next_key|!code/key_enter" + latin:parentStyle="defaultEnterKeyStyle" /> + </case> + <case + latin:imeAction="actionPrevious" + latin:isIconDefined="previous_key" + > + <key-style + latin:styleName="enterKeyStyle" + latin:keySpec="!icon/previous_key|!code/key_enter" + latin:backgroundType="action" + latin:parentStyle="defaultEnterKeyStyle" /> </case> <case latin:imeAction="actionPrevious" > <key-style latin:styleName="enterKeyStyle" - latin:keyLabel="!text/label_previous_key" - latin:parentStyle="defaultActionEnterKeyStyle" /> + latin:keySpec="!text/label_previous_key|!code/key_enter" + latin:parentStyle="defaultEnterKeyStyle" /> </case> <case latin:imeAction="actionDone" + latin:isIconDefined="done_key" > <key-style latin:styleName="enterKeyStyle" - latin:keyLabel="!text/label_done_key" - latin:parentStyle="defaultActionEnterKeyStyle" /> + latin:keySpec="!icon/done_key|!code/key_enter" + latin:backgroundType="action" + latin:parentStyle="defaultEnterKeyStyle" /> + </case> + <case + latin:imeAction="actionDone" + > + <key-style + latin:styleName="enterKeyStyle" + latin:keySpec="!text/label_done_key|!code/key_enter" + latin:parentStyle="defaultEnterKeyStyle" /> </case> <case latin:imeAction="actionSend" + latin:isIconDefined="send_key" > <key-style latin:styleName="enterKeyStyle" - latin:keyLabel="!text/label_send_key" - latin:parentStyle="defaultActionEnterKeyStyle" /> + latin:keySpec="!icon/send_key|!code/key_enter" + latin:backgroundType="action" + latin:parentStyle="defaultEnterKeyStyle" /> + </case> + <case + latin:imeAction="actionSend" + > + <key-style + latin:styleName="enterKeyStyle" + latin:keySpec="!text/label_send_key|!code/key_enter" + latin:parentStyle="defaultEnterKeyStyle" /> + </case> + <case + latin:imeAction="actionSearch" + latin:isIconDefined="search_key" + > + <key-style + latin:styleName="enterKeyStyle" + latin:keySpec="!icon/search_key|!code/key_enter" + latin:backgroundType="action" + latin:parentStyle="defaultEnterKeyStyle" /> </case> <case latin:imeAction="actionSearch" > <key-style latin:styleName="enterKeyStyle" - latin:keyIcon="!icon/search_key" - latin:parentStyle="defaultActionEnterKeyStyle" /> + latin:keySpec="!text/label_search_key|!code/key_enter" + latin:parentStyle="defaultEnterKeyStyle" /> </case> <case latin:imeAction="actionCustomLabel" > <key-style latin:styleName="enterKeyStyle" + latin:keySpec="dummy_label|!code/key_enter" latin:keyLabelFlags="fromCustomActionLabel" - latin:parentStyle="defaultActionEnterKeyStyle" /> + latin:parentStyle="defaultEnterKeyStyle" /> </case> <!-- imeAction is either actionNone or actionUnspecified. --> <default> <key-style latin:styleName="enterKeyStyle" + latin:keySpec="!icon/enter_key|!code/key_enter" latin:parentStyle="defaultEnterKeyStyle" /> </default> </switch> diff --git a/java/res/xml/keys_less_greater.xml b/java/res/xml/key_styles_less_greater.xml index 56d0727dd..db4c7984b 100644 --- a/java/res/xml/keys_less_greater.xml +++ b/java/res/xml/key_styles_less_greater.xml @@ -21,34 +21,34 @@ <merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" > + <!-- The less and greater keys' style which may have different label depending on locale. --> + <!-- Kept as a separate file for cleaner overriding by an overlay. --> <switch> <case latin:languageCode="fa" > - <!-- U+00AB: "«" LEFT-POINTING DOUBLE ANGLE QUOTATION MARK - U+00BB: "»" RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK --> - <Key - latin:keyLabel="«" - latin:code="0x00BB" + <key-style + latin:styleName="lessKeyStyle" + latin:keySpec="!text/keyspec_left_double_angle_quote" latin:backgroundType="functional" - latin:moreKeys="!text/more_keys_for_less_than" /> - <Key - latin:keyLabel="»" - latin:code="0x00AB" + latin:moreKeys="!text/morekeys_less_than" /> + <key-style + latin:styleName="greaterKeyStyle" + latin:keySpec="!text/keyspec_right_double_angle_quote" latin:backgroundType="functional" - latin:moreKeys="!text/more_keys_for_greater_than" /> + latin:moreKeys="!text/morekeys_greater_than" /> </case> <default> - <Key - latin:keyLabel="<" - latin:code="!code/key_less_than" + <key-style + latin:styleName="lessKeyStyle" + latin:keySpec="!text/keyspec_less_than" latin:backgroundType="functional" - latin:moreKeys="!text/more_keys_for_less_than" /> - <Key - latin:keyLabel=">" - latin:code="!code/key_greater_than" + latin:moreKeys="!text/morekeys_less_than" /> + <key-style + latin:styleName="greaterKeyStyle" + latin:keySpec="!text/keyspec_greater_than" latin:backgroundType="functional" - latin:moreKeys="!text/more_keys_for_greater_than" /> + latin:moreKeys="!text/morekeys_greater_than" /> </default> </switch> </merge> diff --git a/java/res/xml/key_styles_number.xml b/java/res/xml/key_styles_number.xml index 2e5a601b0..8a76fe397 100644 --- a/java/res/xml/key_styles_number.xml +++ b/java/res/xml/key_styles_number.xml @@ -30,7 +30,7 @@ latin:parentStyle="numKeyBaseStyle" /> <key-style latin:styleName="numModeKeyStyle" - latin:keyLabelFlags="fontNormal|followKeyLetterRatio" + latin:keyLabelFlags="fontNormal|followKeyLetterRatio|followFunctionalTextColor" latin:parentStyle="numKeyBaseStyle" /> <key-style latin:styleName="numFunctionalKeyStyle" @@ -43,82 +43,74 @@ latin:parentStyle="numKeyStyle" /> <key-style latin:styleName="num0KeyStyle" - latin:keyLabel="0" + latin:keySpec="0" latin:parentStyle="numberKeyStyle" /> <key-style latin:styleName="num1KeyStyle" - latin:keyLabel="1" + latin:keySpec="1" latin:parentStyle="numberKeyStyle" /> <key-style latin:styleName="num2KeyStyle" - latin:keyLabel="2" + latin:keySpec="2" latin:keyHintLabel="ABC" latin:parentStyle="numberKeyStyle" /> <key-style latin:styleName="num3KeyStyle" - latin:keyLabel="3" + latin:keySpec="3" latin:keyHintLabel="DEF" latin:parentStyle="numberKeyStyle" /> <key-style latin:styleName="num4KeyStyle" - latin:keyLabel="4" + latin:keySpec="4" latin:keyHintLabel="GHI" latin:parentStyle="numberKeyStyle" /> <key-style latin:styleName="num5KeyStyle" - latin:keyLabel="5" + latin:keySpec="5" latin:keyHintLabel="JKL" latin:parentStyle="numberKeyStyle" /> <key-style latin:styleName="num6KeyStyle" - latin:keyLabel="6" + latin:keySpec="6" latin:keyHintLabel="MNO" latin:parentStyle="numberKeyStyle" /> <key-style latin:styleName="num7KeyStyle" - latin:keyLabel="7" + latin:keySpec="7" latin:keyHintLabel="PQRS" latin:parentStyle="numberKeyStyle" /> <key-style latin:styleName="num8KeyStyle" - latin:keyLabel="8" + latin:keySpec="8" latin:keyHintLabel="TUV" latin:parentStyle="numberKeyStyle" /> <key-style latin:styleName="num9KeyStyle" - latin:keyLabel="9" + latin:keySpec="9" latin:keyHintLabel="WXYZ" latin:parentStyle="numberKeyStyle" /> - <!-- U+002A: "*" ASTERISK - U+FF0A: "＊" FULLWIDTH ASTERISK --> + <!-- U+FF0A: "＊" FULLWIDTH ASTERISK --> <key-style latin:styleName="numStarKeyStyle" - latin:code="0x002A" - latin:keyLabel="＊" + latin:keySpec="＊|*" latin:parentStyle="numKeyStyle" /> <!-- Only for non-tablet device --> <key-style latin:styleName="numPhoneToSymbolKeyStyle" - latin:code="!code/key_switch_alpha_symbol" - latin:keyLabel="!text/label_to_phone_symbols_key" + latin:keySpec="!text/keylabel_to_phone_symbols|!code/key_switch_alpha_symbol" latin:parentStyle="numModeKeyStyle" /> <key-style latin:styleName="numPhoneToNumericKeyStyle" - latin:code="!code/key_switch_alpha_symbol" - latin:keyLabel="!text/label_to_phone_numeric_key" + latin:keySpec="!text/keylabel_to_phone_numeric|!code/key_switch_alpha_symbol" latin:parentStyle="numModeKeyStyle" /> - <!-- U+002C: "," COMMA --> <key-style latin:styleName="numPauseKeyStyle" - latin:code="0x002C" - latin:keyLabel="!text/label_pause_key" + latin:keySpec="!text/label_pause_key|," latin:keyLabelFlags="followKeyHintLabelRatio|autoXScale" latin:parentStyle="numKeyBaseStyle" /> - <!-- U+003B: ";" SEMICOLON --> <key-style latin:styleName="numWaitKeyStyle" - latin:code="0x003B" - latin:keyLabel="!text/label_wait_key" + latin:keySpec="!text/label_wait_key|;" latin:keyLabelFlags="followKeyHintLabelRatio|autoXScale" latin:parentStyle="numKeyBaseStyle" /> <key-style @@ -127,15 +119,14 @@ latin:parentStyle="tabKeyStyle" /> <key-style latin:styleName="numSpaceKeyStyle" - latin:code="!code/key_space" - latin:keyIcon="!icon/space_key_for_number_layout" + latin:keySpec="!icon/space_key_for_number_layout|!code/key_space" + latin:keyLabelFlags="alignButtom" latin:keyActionFlags="enableLongPress" latin:parentStyle="numKeyBaseStyle" /> <!-- Override defaultEnterKeyStyle in key_styles_enter.xml --> <key-style latin:styleName="defaultEnterKeyStyle" - latin:code="!code/key_enter" - latin:keyIcon="!icon/enter_key" + latin:keySpec="!icon/enter_key|!code/key_enter" latin:keyLabelFlags="preserveCase|autoXScale|followKeyLargeLabelRatio" latin:keyActionFlags="noKeyPreview" latin:backgroundType="functional" diff --git a/java/res/xml/key_styles_f1.xml b/java/res/xml/key_styles_settings.xml index 8dfc3cb84..956b40235 100644 --- a/java/res/xml/key_styles_f1.xml +++ b/java/res/xml/key_styles_settings.xml @@ -21,22 +21,22 @@ <merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" > - <!-- Base key style for the key which may have settings or tab key as popup key. --> + <!-- Base key style for the key which may have settings key as more keys. --> <!-- Kept as a separate file for cleaner overriding by an overlay. --> <switch> <case latin:clobberSettingsKey="true" > <key-style - latin:styleName="f1MoreKeysStyle" + latin:styleName="settingsMoreKeysStyle" latin:backgroundType="functional" /> </case> <!-- clobberSettingsKey="false" --> <default> <key-style - latin:styleName="f1MoreKeysStyle" + latin:styleName="settingsMoreKeysStyle" latin:keyLabelFlags="hasPopupHint" - latin:moreKeys="!text/settings_as_more_key" + latin:moreKeys="!text/keyspec_settings" latin:backgroundType="functional" /> </default> </switch> diff --git a/java/res/xml/key_symbols_period.xml b/java/res/xml/key_symbols_period.xml deleted file mode 100644 index 6efc9dee3..000000000 --- a/java/res/xml/key_symbols_period.xml +++ /dev/null @@ -1,47 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* -** -** Copyright 2013, 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. -*/ ---> - -<merge - xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" -> - <!-- U+2105: "℅" CARE OF - U+2122: "™" TRADE MARK SIGN - U+00AE: "®" REGISTERED SIGN - U+00A9: "©" COPYRIGHT SIGN - U+00A7: "§" SECTION SIGN - U+00B6: "¶" PILCROW SIGN - U+002C: "," COMMA - U+2022: "•" BULLET --> - <!-- U+00B0: "°" DEGREE SIGN - U+2032: "′" PRIME - U+2033: "″" DOUBLE PRIME - U+2191: "↑" UPWARDS ARROW - U+2193: "↓" DOWNWARDS ARROW - U+2190: "←" LEFTWARDS ARROW - U+2192: "→" RIGHTWARDS ARROW - U+2026: "…" HORIZONTAL ELLIPSIS --> - <!-- U+0394: "Δ" GREEK CAPITAL LETTER DELTA - U+03A0: "Π" GREEK CAPITAL LETTER PI - U+03C0: "π" GREEK SMALL LETTER PI --> - <Key - latin:keyLabel="." - latin:keyLabelFlags="hasPopupHint" - latin:moreKeys="!fixedColumnOrder!8,℅,™,®,©,§,¶,\\,,•,°,′,″,↑,↓,←,→,…,!text/more_keys_for_bullet,Δ,Π,π" /> -</merge> diff --git a/java/res/xml/key_thai_kho_khuat.xml b/java/res/xml/key_thai_kho_khuat.xml index 0ffd0f924..a43a87ccd 100644 --- a/java/res/xml/key_thai_kho_khuat.xml +++ b/java/res/xml/key_thai_kho_khuat.xml @@ -27,14 +27,12 @@ > <!-- U+0E05: "ฅ" THAI CHARACTER KHO KHON --> <Key - latin:keyLabel="ฅ" - latin:keyLabelFlags="fontNormal" /> + latin:keySpec="ฅ" /> </case> <default> <!-- U+0E03: "ฃ" THAI CHARACTER KHO KHUAT --> <Key - latin:keyLabel="ฃ" - latin:keyLabelFlags="fontNormal" /> + latin:keySpec="ฃ" /> </default> </switch> </merge> diff --git a/java/res/xml/keyboard_layout_set_arabic.xml b/java/res/xml/keyboard_layout_set_arabic.xml index 10e95bd30..1bf8c6295 100644 --- a/java/res/xml/keyboard_layout_set_arabic.xml +++ b/java/res/xml/keyboard_layout_set_arabic.xml @@ -20,6 +20,8 @@ <KeyboardLayoutSet xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"> + <Feature + latin:supportedScript="arabic" /> <Element latin:elementName="alphabet" latin:elementKeyboard="@xml/kbd_arabic" diff --git a/java/res/xml/keyboard_layout_set_armenian_phonetic.xml b/java/res/xml/keyboard_layout_set_armenian_phonetic.xml index 35bd43fb9..c3a11898d 100644 --- a/java/res/xml/keyboard_layout_set_armenian_phonetic.xml +++ b/java/res/xml/keyboard_layout_set_armenian_phonetic.xml @@ -20,6 +20,8 @@ <KeyboardLayoutSet xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"> + <Feature + latin:supportedScript="armenian" /> <Element latin:elementName="alphabet" latin:elementKeyboard="@xml/kbd_armenian_phonetic" diff --git a/java/res/xml/keyboard_layout_set_bengali.xml b/java/res/xml/keyboard_layout_set_bengali.xml new file mode 100644 index 000000000..6e40e6de4 --- /dev/null +++ b/java/res/xml/keyboard_layout_set_bengali.xml @@ -0,0 +1,42 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright 2014, 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. +*/ +--> + +<KeyboardLayoutSet + xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"> + <Element + latin:elementName="alphabet" + latin:elementKeyboard="@xml/kbd_bengali" + latin:enableProximityCharsCorrection="true" /> + <Element + latin:elementName="symbols" + latin:elementKeyboard="@xml/kbd_symbols" /> + <Element + latin:elementName="symbolsShifted" + latin:elementKeyboard="@xml/kbd_symbols_shift" /> + <Element + latin:elementName="phone" + latin:elementKeyboard="@xml/kbd_phone" /> + <Element + latin:elementName="phoneSymbols" + latin:elementKeyboard="@xml/kbd_phone_symbols" /> + <Element + latin:elementName="number" + latin:elementKeyboard="@xml/kbd_number" /> +</KeyboardLayoutSet> diff --git a/java/res/xml/keyboard_layout_set_bulgarian.xml b/java/res/xml/keyboard_layout_set_bulgarian.xml index c6fdff9a2..3f53865d4 100644 --- a/java/res/xml/keyboard_layout_set_bulgarian.xml +++ b/java/res/xml/keyboard_layout_set_bulgarian.xml @@ -20,6 +20,8 @@ <KeyboardLayoutSet xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"> + <Feature + latin:supportedScript="cyrillic" /> <Element latin:elementName="alphabet" latin:elementKeyboard="@xml/kbd_bulgarian" diff --git a/java/res/xml/keyboard_layout_set_bulgarian_bds.xml b/java/res/xml/keyboard_layout_set_bulgarian_bds.xml index a36b3bd52..8e92f7054 100644 --- a/java/res/xml/keyboard_layout_set_bulgarian_bds.xml +++ b/java/res/xml/keyboard_layout_set_bulgarian_bds.xml @@ -20,6 +20,8 @@ <KeyboardLayoutSet xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"> + <Feature + latin:supportedScript="cyrillic" /> <Element latin:elementName="alphabet" latin:elementKeyboard="@xml/kbd_bulgarian_bds" diff --git a/java/res/xml/keyboard_layout_set_east_slavic.xml b/java/res/xml/keyboard_layout_set_east_slavic.xml index 8d66faf8f..ef080643b 100644 --- a/java/res/xml/keyboard_layout_set_east_slavic.xml +++ b/java/res/xml/keyboard_layout_set_east_slavic.xml @@ -20,6 +20,8 @@ <KeyboardLayoutSet xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"> + <Feature + latin:supportedScript="cyrillic" /> <Element latin:elementName="alphabet" latin:elementKeyboard="@xml/kbd_east_slavic" diff --git a/java/res/xml/keyboard_layout_set_farsi.xml b/java/res/xml/keyboard_layout_set_farsi.xml index b9a91e3a8..9b44b7b8b 100644 --- a/java/res/xml/keyboard_layout_set_farsi.xml +++ b/java/res/xml/keyboard_layout_set_farsi.xml @@ -20,6 +20,8 @@ <KeyboardLayoutSet xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"> + <Feature + latin:supportedScript="arabic" /> <Element latin:elementName="alphabet" latin:elementKeyboard="@xml/kbd_farsi" diff --git a/java/res/xml/keyboard_layout_set_georgian.xml b/java/res/xml/keyboard_layout_set_georgian.xml index 36d091653..a0a060832 100644 --- a/java/res/xml/keyboard_layout_set_georgian.xml +++ b/java/res/xml/keyboard_layout_set_georgian.xml @@ -20,6 +20,8 @@ <KeyboardLayoutSet xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"> + <Feature + latin:supportedScript="georgian" /> <Element latin:elementName="alphabet" latin:elementKeyboard="@xml/kbd_georgian" diff --git a/java/res/xml/keyboard_layout_set_greek.xml b/java/res/xml/keyboard_layout_set_greek.xml index b376e4fe3..a1e738f3a 100644 --- a/java/res/xml/keyboard_layout_set_greek.xml +++ b/java/res/xml/keyboard_layout_set_greek.xml @@ -20,6 +20,8 @@ <KeyboardLayoutSet xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"> + <Feature + latin:supportedScript="greek" /> <Element latin:elementName="alphabet" latin:elementKeyboard="@xml/kbd_greek" diff --git a/java/res/xml/keyboard_layout_set_hebrew.xml b/java/res/xml/keyboard_layout_set_hebrew.xml index d5b25b36c..d3d4b7633 100644 --- a/java/res/xml/keyboard_layout_set_hebrew.xml +++ b/java/res/xml/keyboard_layout_set_hebrew.xml @@ -20,6 +20,8 @@ <KeyboardLayoutSet xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"> + <Feature + latin:supportedScript="hebrew" /> <Element latin:elementName="alphabet" latin:elementKeyboard="@xml/kbd_hebrew" diff --git a/java/res/xml/keyboard_layout_set_hindi_compact.xml b/java/res/xml/keyboard_layout_set_hindi_compact.xml new file mode 100644 index 000000000..77d02fbbc --- /dev/null +++ b/java/res/xml/keyboard_layout_set_hindi_compact.xml @@ -0,0 +1,42 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright 2014, 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. +*/ +--> + +<KeyboardLayoutSet + xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"> + <Element + latin:elementName="alphabet" + latin:elementKeyboard="@xml/kbd_hindi_compact" + latin:enableProximityCharsCorrection="true" /> + <Element + latin:elementName="symbols" + latin:elementKeyboard="@xml/kbd_symbols" /> + <Element + latin:elementName="symbolsShifted" + latin:elementKeyboard="@xml/kbd_symbols_shift" /> + <Element + latin:elementName="phone" + latin:elementKeyboard="@xml/kbd_phone" /> + <Element + latin:elementName="phoneSymbols" + latin:elementKeyboard="@xml/kbd_phone_symbols" /> + <Element + latin:elementName="number" + latin:elementKeyboard="@xml/kbd_number" /> +</KeyboardLayoutSet> diff --git a/java/res/xml/keyboard_layout_set_marathi.xml b/java/res/xml/keyboard_layout_set_marathi.xml new file mode 100644 index 000000000..e5c68e7ce --- /dev/null +++ b/java/res/xml/keyboard_layout_set_marathi.xml @@ -0,0 +1,42 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright 2014, 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. +*/ +--> + +<KeyboardLayoutSet + xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"> + <Element + latin:elementName="alphabet" + latin:elementKeyboard="@xml/kbd_marathi" + latin:enableProximityCharsCorrection="true" /> + <Element + latin:elementName="symbols" + latin:elementKeyboard="@xml/kbd_symbols" /> + <Element + latin:elementName="symbolsShifted" + latin:elementKeyboard="@xml/kbd_symbols_shift" /> + <Element + latin:elementName="phone" + latin:elementKeyboard="@xml/kbd_phone" /> + <Element + latin:elementName="phoneSymbols" + latin:elementKeyboard="@xml/kbd_phone_symbols" /> + <Element + latin:elementName="number" + latin:elementKeyboard="@xml/kbd_number" /> +</KeyboardLayoutSet> diff --git a/java/res/xml/keyboard_layout_set_mongolian.xml b/java/res/xml/keyboard_layout_set_mongolian.xml index 2d364f682..977fc687b 100644 --- a/java/res/xml/keyboard_layout_set_mongolian.xml +++ b/java/res/xml/keyboard_layout_set_mongolian.xml @@ -20,6 +20,8 @@ <KeyboardLayoutSet xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"> + <Feature + latin:supportedScript="cyrillic" /> <Element latin:elementName="alphabet" latin:elementKeyboard="@xml/kbd_mongolian" diff --git a/java/res/xml/keyboard_layout_set_myanmar.xml b/java/res/xml/keyboard_layout_set_myanmar.xml new file mode 100644 index 000000000..5c823b263 --- /dev/null +++ b/java/res/xml/keyboard_layout_set_myanmar.xml @@ -0,0 +1,58 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright 2014, 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. +*/ +--> + +<KeyboardLayoutSet + xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"> + <Element + latin:elementName="alphabet" + latin:elementKeyboard="@xml/kbd_myanmar" + latin:enableProximityCharsCorrection="true" /> + <Element + latin:elementName="alphabetAutomaticShifted" + latin:elementKeyboard="@xml/kbd_myanmar" + latin:enableProximityCharsCorrection="true" /> + <!-- On these shifted alphabet layouts the proximity characters correction should be disabled + because the letters on these layouts aren't the ones in different case of the above + unshifted layouts. --> + <Element + latin:elementName="alphabetManualShifted" + latin:elementKeyboard="@xml/kbd_myanmar" /> + <Element + latin:elementName="alphabetShiftLocked" + latin:elementKeyboard="@xml/kbd_myanmar" /> + <Element + latin:elementName="alphabetShiftLockShifted" + latin:elementKeyboard="@xml/kbd_myanmar" /> + <Element + latin:elementName="symbols" + latin:elementKeyboard="@xml/kbd_symbols" /> + <Element + latin:elementName="symbolsShifted" + latin:elementKeyboard="@xml/kbd_symbols_shift" /> + <Element + latin:elementName="phone" + latin:elementKeyboard="@xml/kbd_phone" /> + <Element + latin:elementName="phoneSymbols" + latin:elementKeyboard="@xml/kbd_phone_symbols" /> + <Element + latin:elementName="number" + latin:elementKeyboard="@xml/kbd_number" /> +</KeyboardLayoutSet> diff --git a/java/res/xml/keyboard_layout_set_sinhala.xml b/java/res/xml/keyboard_layout_set_sinhala.xml new file mode 100644 index 000000000..8e6e619d2 --- /dev/null +++ b/java/res/xml/keyboard_layout_set_sinhala.xml @@ -0,0 +1,58 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright 2014, 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. +*/ +--> + +<KeyboardLayoutSet + xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"> + <Element + latin:elementName="alphabet" + latin:elementKeyboard="@xml/kbd_sinhala" + latin:enableProximityCharsCorrection="true" /> + <Element + latin:elementName="alphabetAutomaticShifted" + latin:elementKeyboard="@xml/kbd_sinhala" + latin:enableProximityCharsCorrection="true" /> + <!-- On these shifted alphabet layouts the proximity characters correction should be disabled + because the letters on these layouts aren't the ones in different case of the above + unshifted layouts. --> + <Element + latin:elementName="alphabetManualShifted" + latin:elementKeyboard="@xml/kbd_sinhala" /> + <Element + latin:elementName="alphabetShiftLocked" + latin:elementKeyboard="@xml/kbd_sinhala" /> + <Element + latin:elementName="alphabetShiftLockShifted" + latin:elementKeyboard="@xml/kbd_sinhala" /> + <Element + latin:elementName="symbols" + latin:elementKeyboard="@xml/kbd_symbols" /> + <Element + latin:elementName="symbolsShifted" + latin:elementKeyboard="@xml/kbd_symbols_shift" /> + <Element + latin:elementName="phone" + latin:elementKeyboard="@xml/kbd_phone" /> + <Element + latin:elementName="phoneSymbols" + latin:elementKeyboard="@xml/kbd_phone_symbols" /> + <Element + latin:elementName="number" + latin:elementKeyboard="@xml/kbd_number" /> +</KeyboardLayoutSet> diff --git a/java/res/xml/keyboard_layout_set_south_slavic.xml b/java/res/xml/keyboard_layout_set_south_slavic.xml index 36666b91b..b851a999e 100644 --- a/java/res/xml/keyboard_layout_set_south_slavic.xml +++ b/java/res/xml/keyboard_layout_set_south_slavic.xml @@ -20,6 +20,8 @@ <KeyboardLayoutSet xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"> + <Feature + latin:supportedScript="cyrillic" /> <Element latin:elementName="alphabet" latin:elementKeyboard="@xml/kbd_south_slavic" diff --git a/java/res/xml/keyboard_layout_set_swiss.xml b/java/res/xml/keyboard_layout_set_swiss.xml new file mode 100644 index 000000000..e17a5ab8b --- /dev/null +++ b/java/res/xml/keyboard_layout_set_swiss.xml @@ -0,0 +1,42 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright 2013, 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. +*/ +--> + +<KeyboardLayoutSet + xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"> + <Element + latin:elementName="alphabet" + latin:elementKeyboard="@xml/kbd_swiss" + latin:enableProximityCharsCorrection="true" /> + <Element + latin:elementName="symbols" + latin:elementKeyboard="@xml/kbd_symbols" /> + <Element + latin:elementName="symbolsShifted" + latin:elementKeyboard="@xml/kbd_symbols_shift" /> + <Element + latin:elementName="phone" + latin:elementKeyboard="@xml/kbd_phone" /> + <Element + latin:elementName="phoneSymbols" + latin:elementKeyboard="@xml/kbd_phone_symbols" /> + <Element + latin:elementName="number" + latin:elementKeyboard="@xml/kbd_number" /> +</KeyboardLayoutSet> diff --git a/java/res/xml/keys_arabic3_left.xml b/java/res/xml/keys_arabic3_left.xml index 157af4a52..05ba6d8f3 100644 --- a/java/res/xml/keys_arabic3_left.xml +++ b/java/res/xml/keys_arabic3_left.xml @@ -23,6 +23,5 @@ > <!-- U+0630: "ذ" ARABIC LETTER THAL --> <Key - latin:keyLabel="ذ" - latin:keyLabelFlags="fontNormal" /> + latin:keySpec="ذ" /> </merge> diff --git a/java/res/xml/keys_comma_period.xml b/java/res/xml/keys_comma_period.xml deleted file mode 100644 index 1b51e45ed..000000000 --- a/java/res/xml/keys_comma_period.xml +++ /dev/null @@ -1,87 +0,0 @@ -<?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. -*/ ---> - -<merge - xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" -> - <switch> - <case - latin:languageCode="ar" - > - <Key - latin:keyLabel="!text/keylabel_for_apostrophe" - latin:keyHintLabel="!text/keyhintlabel_for_apostrophe" - latin:moreKeys="!text/more_keys_for_apostrophe" - latin:backgroundType="functional" - latin:keyStyle="hasShiftedLetterHintStyle" /> - <Key - latin:keyLabel="." - latin:keyHintLabel="!text/keyhintlabel_for_arabic_diacritics" - latin:keyLabelFlags="hasPopupHint" - latin:moreKeys="!text/more_keys_for_arabic_diacritics" - latin:backgroundType="functional" - latin:keyStyle="hasShiftedLetterHintStyle" /> - </case> - <case - latin:languageCode="fa" - > - <Key - latin:keyLabel="!text/keylabel_for_apostrophe" - latin:keyHintLabel="!text/keyhintlabel_for_apostrophe" - latin:keyLabelFlags="hasPopupHint" - latin:moreKeys="!text/more_keys_for_apostrophe" - latin:backgroundType="functional" - latin:keyStyle="hasShiftedLetterHintStyle" /> - <Key - latin:keyLabel="." - latin:keyHintLabel="!text/keyhintlabel_for_arabic_diacritics" - latin:keyLabelFlags="hasPopupHint" - latin:moreKeys="!text/more_keys_for_arabic_diacritics" - latin:backgroundType="functional" - latin:keyStyle="hasShiftedLetterHintStyle" /> - </case> - <case - latin:languageCode="hy" - > - <!-- U+055D: "՝" ARMENIAN COMMA --> - <Key - latin:keyLabel="՝" - latin:backgroundType="functional" /> - <!-- U+0589: "։" ARMENIAN FULL STOP --> - <Key - latin:keyLabel="։" - latin:keyLabelFlags="hasPopupHint" - latin:backgroundType="functional" - latin:moreKeys="!text/more_keys_for_punctuation" /> - </case> - <default> - <Key - latin:keyLabel="!text/keylabel_for_tablet_comma" - latin:keyHintLabel="!text/keyhintlabel_for_tablet_comma" - latin:backgroundType="functional" - latin:moreKeys="!text/more_keys_for_tablet_comma" /> - <Key - latin:keyLabel="." - latin:keyHintLabel="!text/keyhintlabel_for_period" - latin:backgroundType="functional" - latin:moreKeys="!text/more_keys_for_period" /> - </default> - </switch> -</merge> diff --git a/java/res/xml/keys_curly_brackets.xml b/java/res/xml/keys_curly_brackets.xml index 6a4b1a945..596516af3 100644 --- a/java/res/xml/keys_curly_brackets.xml +++ b/java/res/xml/keys_curly_brackets.xml @@ -22,9 +22,7 @@ xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" > <Key - latin:keyLabel="{" - latin:code="!code/key_left_curly_bracket" /> + latin:keySpec="!text/keyspec_left_curly_bracket" /> <Key - latin:keyLabel="}" - latin:code="!code/key_right_curly_bracket" /> + latin:keySpec="!text/keyspec_right_curly_bracket" /> </merge> diff --git a/java/res/xml/keys_dvorak_123.xml b/java/res/xml/keys_dvorak_123.xml index fa94f1f28..6efc7f2c5 100644 --- a/java/res/xml/keys_dvorak_123.xml +++ b/java/res/xml/keys_dvorak_123.xml @@ -26,7 +26,7 @@ latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted" > <Key - latin:keyLabel=""" + latin:keySpec=""" latin:keyHintLabel="1" latin:additionalMoreKeys="1" /> </case> @@ -34,7 +34,7 @@ latin:mode="url" > <Key - latin:keyLabel="/" + latin:keySpec="/" latin:keyHintLabel="1" latin:additionalMoreKeys="1" /> </case> @@ -42,13 +42,13 @@ latin:mode="email" > <Key - latin:keyLabel="\@" + latin:keySpec="\@" latin:keyHintLabel="1" latin:additionalMoreKeys="1" /> </case> <default> <Key - latin:keyLabel="\'" + latin:keySpec="\'" latin:keyHintLabel="1" latin:additionalMoreKeys="1" latin:moreKeys="!,"" /> @@ -59,22 +59,22 @@ latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted" > <Key - latin:keyLabel="<" + latin:keySpec="<" latin:keyHintLabel="2" latin:additionalMoreKeys="2" /> <Key - latin:keyLabel=">" + latin:keySpec=">" latin:keyHintLabel="3" latin:additionalMoreKeys="3" /> </case> <default> <Key - latin:keyLabel="," + latin:keySpec="," latin:keyHintLabel="2" latin:additionalMoreKeys="2" latin:moreKeys="\?,<" /> <Key - latin:keyLabel="." + latin:keySpec="." latin:keyHintLabel="3" latin:additionalMoreKeys="3" latin:moreKeys=">" /> diff --git a/java/res/xml/keys_farsi3_right.xml b/java/res/xml/keys_farsi3_right.xml index 77efb0a21..867c02143 100644 --- a/java/res/xml/keys_farsi3_right.xml +++ b/java/res/xml/keys_farsi3_right.xml @@ -23,6 +23,5 @@ > <!-- U+0686: "چ" ARABIC LETTER TCHEH --> <Key - latin:keyLabel="چ" - latin:keyLabelFlags="fontNormal" /> + latin:keySpec="چ" /> </merge> diff --git a/java/res/xml/keys_parentheses.xml b/java/res/xml/keys_parentheses.xml index 25e89c930..320b109a8 100644 --- a/java/res/xml/keys_parentheses.xml +++ b/java/res/xml/keys_parentheses.xml @@ -22,11 +22,9 @@ xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" > <Key - latin:keyLabel="(" - latin:code="!code/key_left_parenthesis" - latin:moreKeys="!text/more_keys_for_left_parenthesis" /> + latin:keySpec="!text/keyspec_left_parenthesis" + latin:moreKeys="!text/morekeys_left_parenthesis" /> <Key - latin:keyLabel=")" - latin:code="!code/key_right_parenthesis" - latin:moreKeys="!text/more_keys_for_right_parenthesis" /> + latin:keySpec="!text/keyspec_right_parenthesis" + latin:moreKeys="!text/morekeys_right_parenthesis" /> </merge> diff --git a/java/res/xml/keys_pcqwerty2_right3.xml b/java/res/xml/keys_pcqwerty2_right3.xml index 6f86477da..b188cffab 100644 --- a/java/res/xml/keys_pcqwerty2_right3.xml +++ b/java/res/xml/keys_pcqwerty2_right3.xml @@ -23,26 +23,26 @@ > <switch> <case - latin:keyboardLayoutSetElement="alphabet|alphabetAutomaticShifted" + latin:keyboardLayoutSetElement="alphabet|alphabetAutomaticShifted|alphabetShiftLocked" > <Key - latin:keyLabel="[" + latin:keySpec="[" latin:additionalMoreKeys="{" /> <Key - latin:keyLabel="]" + latin:keySpec="]" latin:additionalMoreKeys="}" /> <Key - latin:keyLabel="\\" + latin:keySpec="\\" latin:additionalMoreKeys="\\|" /> </case> <!-- keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted" --> <default> <Key - latin:keyLabel="{" /> + latin:keySpec="{" /> <Key - latin:keyLabel="}" /> + latin:keySpec="}" /> <Key - latin:keyLabel="|" /> + latin:keySpec="|" /> </default> </switch> </merge> diff --git a/java/res/xml/keys_pcqwerty3_right2.xml b/java/res/xml/keys_pcqwerty3_right2.xml index 8da145b20..8a1f60fae 100644 --- a/java/res/xml/keys_pcqwerty3_right2.xml +++ b/java/res/xml/keys_pcqwerty3_right2.xml @@ -23,22 +23,22 @@ > <switch> <case - latin:keyboardLayoutSetElement="alphabet|alphabetAutomaticShifted" + latin:keyboardLayoutSetElement="alphabet|alphabetAutomaticShifted|alphabetShiftLocked" > <Key - latin:keyLabel=";" + latin:keySpec=";" latin:additionalMoreKeys=":" /> <Key - latin:keyLabel="\'" + latin:keySpec="\'" latin:additionalMoreKeys=""" latin:moreKeys="!fixedColumnOrder!4,!text/double_quotes,%,!text/single_quotes" /> </case> <!-- keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted" --> <default> <Key - latin:keyLabel=":" /> + latin:keySpec=":" /> <Key - latin:keyLabel=""" + latin:keySpec=""" latin:moreKeys="!fixedColumnOrder!3,!text/double_quotes,!text/single_quotes" /> </default> </switch> diff --git a/java/res/xml/keys_pcqwerty4_right3.xml b/java/res/xml/keys_pcqwerty4_right3.xml index e6084cb45..a87f550f7 100644 --- a/java/res/xml/keys_pcqwerty4_right3.xml +++ b/java/res/xml/keys_pcqwerty4_right3.xml @@ -23,18 +23,18 @@ > <switch> <case - latin:keyboardLayoutSetElement="alphabet|alphabetAutomaticShifted" + latin:keyboardLayoutSetElement="alphabet|alphabetAutomaticShifted|alphabetShiftLocked" > <Key - latin:keyLabel="," + latin:keySpec="," latin:additionalMoreKeys="<" /> <Key - latin:keyLabel="." + latin:keySpec="." latin:additionalMoreKeys=">" /> <Key - latin:keyLabel="/" + latin:keySpec="/" latin:additionalMoreKeys="\?" - latin:moreKeys="!text/more_keys_for_symbols_question" /> + latin:moreKeys="!text/morekeys_question" /> </case> <!-- keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted" --> <default> @@ -45,14 +45,14 @@ U+00AB: "«" LEFT-POINTING DOUBLE ANGLE QUOTATION MARK U+00BB: "»" RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK --> <Key - latin:keyLabel="<" + latin:keySpec="<" latin:moreKeys="!fixedColumnOrder!3,‹,≤,«" /> <Key - latin:keyLabel=">" + latin:keySpec=">" latin:moreKeys="!fixedColumnOrder!3,›,≥,»" /> <Key - latin:keyLabel="\?" - latin:moreKeys="!text/more_keys_for_symbols_question" /> + latin:keySpec="\?" + latin:moreKeys="!text/morekeys_question" /> </default> </switch> </merge> diff --git a/java/res/xml/keys_square_brackets.xml b/java/res/xml/keys_square_brackets.xml index 5c128fd0c..076b2c2d9 100644 --- a/java/res/xml/keys_square_brackets.xml +++ b/java/res/xml/keys_square_brackets.xml @@ -22,9 +22,7 @@ xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" > <Key - latin:keyLabel="[" - latin:code="!code/key_left_square_bracket" /> + latin:keySpec="!text/keyspec_left_square_bracket" /> <Key - latin:keyLabel="]" - latin:code="!code/key_right_square_bracket" /> + latin:keySpec="!text/keyspec_right_square_bracket" /> </merge> diff --git a/java/res/xml/keystyle_devanagari_sign_anusvara.xml b/java/res/xml/keystyle_devanagari_sign_anusvara.xml new file mode 100644 index 000000000..2517ac562 --- /dev/null +++ b/java/res/xml/keystyle_devanagari_sign_anusvara.xml @@ -0,0 +1,55 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright 2013, 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. +*/ +--> + +<!-- The code point U+25CC for key label is needed because the font rendering system prior to + API version 16 can't automatically render dotted circle for incomplete combining letter + of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the + counterpart files named res/xml-v16/key_*.xml don't have this hack. --> +<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"> + <switch> + <case latin:keyboardLayoutSet="hindi_compact"> + <!-- U+25CC: "◌" DOTTED CIRCLE + U+0903: "ः" DEVANAGARI SIGN VISARGA + U+0901: "ँ" DEVANAGARI SIGN CANDRABINDU + U+093C: "़" DEVANAGARI SIGN NUKTA --> + <key-style + latin:styleName="moreKeysDevanagariSignAnusvara" + latin:moreKeys="◌ः|ः,◌ँ|ँ,◌़|़" /> + </case> + <case latin:keyboardLayoutSet="marathi"> + <!-- U+25CC: "◌" DOTTED CIRCLE + U+0903: "ः" DEVANAGARI SIGN VISARGA + U+0901: "ँ" DEVANAGARI SIGN CANDRABINDU --> + <key-style + latin:styleName="moreKeysDevanagariSignAnusvara" + latin:moreKeys="◌ः|ः,◌ँ|ँ" /> + </case> + <default> + <key-style latin:styleName="moreKeysDevanagariSignAnusvara" /> + </default> + </switch> + <!-- U+25CC: "◌" DOTTED CIRCLE + U+0902: "ं" DEVANAGARI SIGN ANUSVARA --> + <key-style + latin:styleName="baseKeyDevanagariSignAnusvara" + latin:parentStyle="moreKeysDevanagariSignAnusvara" + latin:keySpec="◌ं|ं" + latin:keyLabelFlags="followKeyLetterRatio" /> +</merge> diff --git a/java/res/xml/key_devanagari_sign_candrabindu.xml b/java/res/xml/keystyle_devanagari_sign_candrabindu.xml index df0c4e054..3eb6ca0c0 100644 --- a/java/res/xml/key_devanagari_sign_candrabindu.xml +++ b/java/res/xml/keystyle_devanagari_sign_candrabindu.xml @@ -22,13 +22,9 @@ API version 16 can't automatically render dotted circle for incomplete combining letter of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the counterpart files named res/xml-v16/key_*.xml don't have this hack. --> -<merge - xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" -> +<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"> <switch> - <case - latin:keyboardLayoutSet="hindi" - > + <case latin:keyboardLayoutSet="hindi"> <!-- U+25CC: "◌" DOTTED CIRCLE U+0945: "ॅ" DEVANAGARI VOWEL SIGN CANDRA E --> <key-style @@ -36,15 +32,14 @@ latin:moreKeys="◌ॅ|ॅ" /> </case> <default> - <key-style - latin:styleName="moreKeysDevanagariSignCandrabindu" /> + <key-style latin:styleName="moreKeysDevanagariSignCandrabindu" /> </default> </switch> <!-- U+25CC: "◌" DOTTED CIRCLE U+0901: "ँ" DEVANAGARI SIGN CANDRABINDU --> - <Key - latin:keyStyle="moreKeysDevanagariSignCandrabindu" - latin:keyLabel="◌ँ" - latin:code="0x0901" - latin:keyLabelFlags="fontNormal|followKeyLetterRatio" /> + <key-style + latin:styleName="baseKeyDevanagariSignCandrabindu" + latin:parentStyle="moreKeysDevanagariSignCandrabindu" + latin:keySpec="◌ँ|ँ" + latin:keyLabelFlags="followKeyLetterRatio" /> </merge> diff --git a/java/res/xml/key_devanagari_sign_nukta.xml b/java/res/xml/keystyle_devanagari_sign_nukta.xml index f7a03ee90..e12848c6c 100644 --- a/java/res/xml/key_devanagari_sign_nukta.xml +++ b/java/res/xml/keystyle_devanagari_sign_nukta.xml @@ -22,31 +22,33 @@ API version 16 can't automatically render dotted circle for incomplete combining letter of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the counterpart files named res/xml-v16/key_*.xml don't have this hack. --> -<merge - xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" -> +<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"> <switch> - <case - latin:keyboardLayoutSet="hindi" - > + <case latin:keyboardLayoutSet="hindi"> <!-- U+25CC: "◌" DOTTED CIRCLE U+097D: "ॽ" DEVANAGARI LETTER GLOTTAL STOP U+0970: "॰" DEVANAGARI ABBREVIATION SIGN U+093D: "ऽ" DEVANAGARI SIGN AVAGRAHA --> - <key-style + <key-style latin:styleName="moreKeysDevanagariSignNukta" latin:moreKeys="◌ॽ|ॽ,◌॰|॰,◌ऽ|ऽ" /> </case> + <case latin:keyboardLayoutSet="nepali_romanized"> + <!-- U+25CC: "◌" DOTTED CIRCLE + U+093C: "़" DEVANAGARI SIGN NUKTA --> + <key-style + latin:styleName="moreKeysDevanagariSignNukta" + latin:moreKeys="◌़|़" /> + </case> <default> - <key-style - latin:styleName="moreKeysDevanagariSignNukta" /> + <key-style latin:styleName="moreKeysDevanagariSignNukta" /> </default> </switch> <!-- U+25CC: "◌" DOTTED CIRCLE U+093C: "़" DEVANAGARI SIGN NUKTA --> - <Key - latin:keyStyle="moreKeysDevanagariSignNukta" - latin:keyLabel="◌़" - latin:code="0x093C" - latin:keyLabelFlags="fontNormal|followKeyLetterRatio" /> + <key-style + latin:styleName="baseKeyDevanagariSignNukta" + latin:parentStyle="moreKeysDevanagariSignNukta" + latin:keySpec="◌़|़" + latin:keyLabelFlags="followKeyLetterRatio" /> </merge> diff --git a/java/res/xml/keystyle_devanagari_sign_virama.xml b/java/res/xml/keystyle_devanagari_sign_virama.xml index b22fbe842..a7c5998ef 100644 --- a/java/res/xml/keystyle_devanagari_sign_virama.xml +++ b/java/res/xml/keystyle_devanagari_sign_virama.xml @@ -22,14 +22,30 @@ API version 16 can't automatically render dotted circle for incomplete combining letter of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the counterpart files named res/xml-v16/key_*.xml don't have this hack. --> -<merge - xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" -> +<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"> + <switch> + <case latin:keyboardLayoutSet="hindi_compact"> + <!-- U+25CC: "◌" DOTTED CIRCLE + U+094D: "्" DEVANAGARI SIGN VIRAMA --> + <key-style + latin:styleName="moreKeysDevanagariSignVirama" + latin:moreKeys="◌्|्" /> + </case> + <case latin:keyboardLayoutSet="marathi"> + <!-- U+0905: "अ" DEVANAGARI LETTER A --> + <key-style + latin:styleName="moreKeysDevanagariSignVirama" + latin:moreKeys="अ" /> + </case> + <default> + <key-style latin:styleName="moreKeysDevanagariSignVirama" /> + </default> + </switch> <!-- U+25CC: "◌" DOTTED CIRCLE U+094D: "्" DEVANAGARI SIGN VIRAMA --> <key-style latin:styleName="baseKeyDevanagariSignVirama" - latin:keyLabel="◌्" - latin:code="0x094D" - latin:keyLabelFlags="fontNormal|followKeyLetterRatio" /> - </merge> + latin:parentStyle="moreKeysDevanagariSignVirama" + latin:keySpec="◌्|्" + latin:keyLabelFlags="followKeyLetterRatio" /> +</merge> diff --git a/java/res/xml/keystyle_devanagari_sign_visarga.xml b/java/res/xml/keystyle_devanagari_sign_visarga.xml index cb294951f..d66e8e244 100644 --- a/java/res/xml/keystyle_devanagari_sign_visarga.xml +++ b/java/res/xml/keystyle_devanagari_sign_visarga.xml @@ -22,14 +22,11 @@ API version 16 can't automatically render dotted circle for incomplete combining letter of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the counterpart files named res/xml-v16/key_*.xml don't have this hack. --> -<merge - xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" -> +<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"> <!-- U+25CC: "◌" DOTTED CIRCLE U+0903: "ः" DEVANAGARI SIGN VISARGA --> <key-style latin:styleName="baseKeyDevanagariSignVisarga" - latin:keyLabel="◌ः" - latin:code="0x0903" - latin:keyLabelFlags="fontNormal|followKeyLetterRatio" /> + latin:keySpec="◌ः|ः" + latin:keyLabelFlags="followKeyLetterRatio" /> </merge> diff --git a/java/res/xml/keystyle_devanagari_vowel_sign_aa.xml b/java/res/xml/keystyle_devanagari_vowel_sign_aa.xml index 2e78c53ec..6a62a1f1c 100644 --- a/java/res/xml/keystyle_devanagari_vowel_sign_aa.xml +++ b/java/res/xml/keystyle_devanagari_vowel_sign_aa.xml @@ -22,13 +22,9 @@ API version 16 can't automatically render dotted circle for incomplete combining letter of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the counterpart files named res/xml-v16/key_*.xml don't have this hack. --> -<merge - xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" -> +<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"> <switch> - <case - latin:keyboardLayoutSet="hindi" - > + <case latin:keyboardLayoutSet="hindi"> <!-- U+25CC: "◌" DOTTED CIRCLE U+093E/U+0902: "ां" DEVANAGARI VOWEL SIGN AA/DEVANAGARI SIGN ANUSVARA U+093E/U+0901: "ाँ" DEVANAGARI VOWEL SIGN AA/DEVANAGARI SIGN CANDRABINDU --> @@ -36,9 +32,21 @@ latin:styleName="moreKeysDevanagariVowelSignAa" latin:moreKeys="◌ां|ां,◌ाँ|ाँ,%" /> </case> - <default> + <case latin:keyboardLayoutSet="hindi_compact"> + <!-- U+25CC: "◌" DOTTED CIRCLE + U+093E: "ा" DEVANAGARI VOWEL SIGN AA --> + <key-style + latin:styleName="moreKeysDevanagariVowelSignAa" + latin:moreKeys="◌ा|ा,%" /> + </case> + <case latin:keyboardLayoutSet="marathi"> + <!-- U+0906: "आ" DEVANAGARI LETTER AA --> <key-style - latin:styleName="moreKeysDevanagariVowelSignAa" /> + latin:styleName="moreKeysDevanagariVowelSignAa" + latin:moreKeys="आ,%" /> + </case> + <default> + <key-style latin:styleName="moreKeysDevanagariVowelSignAa" /> </default> </switch> <!-- U+25CC: "◌" DOTTED CIRCLE @@ -46,7 +54,6 @@ <key-style latin:styleName="baseKeyDevanagariVowelSignAa" latin:parentStyle="moreKeysDevanagariVowelSignAa" - latin:keyLabel="◌ा" - latin:code="0x093E" - latin:keyLabelFlags="fontNormal|followKeyLetterRatio" /> + latin:keySpec="◌ा|ा" + latin:keyLabelFlags="followKeyLetterRatio" /> </merge> diff --git a/java/res/xml/keystyle_devanagari_vowel_sign_ai.xml b/java/res/xml/keystyle_devanagari_vowel_sign_ai.xml index 0554c0e15..53f831725 100644 --- a/java/res/xml/keystyle_devanagari_vowel_sign_ai.xml +++ b/java/res/xml/keystyle_devanagari_vowel_sign_ai.xml @@ -22,30 +22,36 @@ API version 16 can't automatically render dotted circle for incomplete combining letter of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the counterpart files named res/xml-v16/key_*.xml don't have this hack. --> -<merge - xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" -> +<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"> <switch> - <case - latin:keyboardLayoutSet="hindi" - > + <case latin:keyboardLayoutSet="hindi"> <!-- U+25CC: "◌" DOTTED CIRCLE U+0948/U+0902: "ैं" DEVANAGARI VOWEL SIGN AI/DEVANAGARI SIGN ANUSVARA --> <key-style latin:styleName="moreKeysDevanagariVowelSignAi" latin:moreKeys="◌ैं|ैं,%" /> </case> - <case - latin:keyboardLayoutSet="nepali_traditional" - > + <case latin:keyboardLayoutSet="hindi_compact"> + <!-- U+25CC: "◌" DOTTED CIRCLE + U+0948: "ै" DEVANAGARI VOWEL SIGN AI --> + <key-style + latin:styleName="moreKeysDevanagariVowelSignAi" + latin:moreKeys="◌ै|ै,%" /> + </case> + <case latin:keyboardLayoutSet="marathi"> + <!-- U+0910: "ऐ" DEVANAGARI LETTER AI --> + <key-style + latin:styleName="moreKeysDevanagariVowelSignAi" + latin:moreKeys="ऐ,%" /> + </case> + <case latin:keyboardLayoutSet="nepali_traditional"> <!-- U+0936/U+094D/U+0930: "श्र" DEVANAGARI LETTER SHA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER RA --> <key-style latin:styleName="moreKeysDevanagariVowelSignAi" latin:moreKeys="श्र" /> </case> <default> - <key-style - latin:styleName="moreKeysDevanagariVowelSignAi" /> + <key-style latin:styleName="moreKeysDevanagariVowelSignAi" /> </default> </switch> <!-- U+25CC: "◌" DOTTED CIRCLE @@ -53,7 +59,6 @@ <key-style latin:styleName="baseKeyDevanagariVowelSignAi" latin:parentStyle="moreKeysDevanagariVowelSignAi" - latin:keyLabel="◌ै" - latin:code="0x0948" - latin:keyLabelFlags="fontNormal|followKeyLetterRatio" /> + latin:keySpec="◌ै|ै" + latin:keyLabelFlags="followKeyLetterRatio" /> </merge> diff --git a/java/res/xml/keystyle_devanagari_vowel_sign_au.xml b/java/res/xml/keystyle_devanagari_vowel_sign_au.xml index 29a11a82e..04f84562d 100644 --- a/java/res/xml/keystyle_devanagari_vowel_sign_au.xml +++ b/java/res/xml/keystyle_devanagari_vowel_sign_au.xml @@ -22,29 +22,36 @@ API version 16 can't automatically render dotted circle for incomplete combining letter of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the counterpart files named res/xml-v16/key_*.xml don't have this hack. --> -<merge - xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" -> +<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"> <switch> - <case - latin:keyboardLayoutSet="hindi" - > + <case latin:keyboardLayoutSet="hindi"> <!-- U+25CC: "◌" DOTTED CIRCLE - U+094C/U+0902: "ौं" DEVANAGARI VOWEL SIGN AU/DEVANAGARI SIGN ANUSVARA --> + U+094C/U+0902: "ौं" DEVANAGARI VOWEL SIGN AU/DEVANAGARI SIGN ANUSVARA --> <key-style latin:styleName="moreKeysDevanagariVowelSignAu" latin:moreKeys="◌ौं|ौं,%" /> </case> + <case latin:keyboardLayoutSet="hindi_compact"> + <!-- U+25CC: "◌" DOTTED CIRCLE + U+094C: "ौ" DEVANAGARI VOWEL SIGN AU --> + <key-style + latin:styleName="moreKeysDevanagariVowelSignAu" + latin:moreKeys="◌ौ|ौ,%" /> + </case> + <case latin:keyboardLayoutSet="marathi"> + <!-- U+0914: "औ" DEVANAGARI LETTER AU --> + <key-style + latin:styleName="moreKeysDevanagariVowelSignAu" + latin:moreKeys="औ,%" /> + </case> <default> - <key-style - latin:styleName="moreKeysDevanagariVowelSignAu" /> + <key-style latin:styleName="moreKeysDevanagariVowelSignAu" /> </default> </switch> <!-- U+094C: "ौ" DEVANAGARI VOWEL SIGN AU --> <key-style latin:styleName="baseKeyDevanagariVowelSignAu" latin:parentStyle="moreKeysDevanagariVowelSignAu" - latin:keyLabel="◌ौ" - latin:code="0x094C" - latin:keyLabelFlags="fontNormal|followKeyLetterRatio" /> + latin:keySpec="◌ौ|ौ" + latin:keyLabelFlags="followKeyLetterRatio" /> </merge> diff --git a/java/res/xml/keystyle_devanagari_vowel_sign_candra_e.xml b/java/res/xml/keystyle_devanagari_vowel_sign_candra_e.xml new file mode 100644 index 000000000..2f2998fb8 --- /dev/null +++ b/java/res/xml/keystyle_devanagari_vowel_sign_candra_e.xml @@ -0,0 +1,51 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright 2014, 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. +*/ +--> + +<!-- The code point U+25CC for key label is needed because the font rendering system prior to + API version 16 can't automatically render dotted circle for incomplete combining letter + of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the + counterpart files named res/xml-v16/key_*.xml don't have this hack. --> +<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"> + <switch> + <case latin:keyboardLayoutSet="hindi_compact"> + <!-- U+25CC: "◌" DOTTED CIRCLE + U+0945: "ॅ" DEVANAGARI VOWEL SIGN CANDRA E --> + <key-style + latin:styleName="moreKeysDevanagariVowelSignCandraE" + latin:moreKeys="◌ॅ|ॅ" /> + </case> + <case latin:keyboardLayoutSet="marathi"> + <!-- U+090D: "ऍ" DEVANAGARI LETTER CANDRA E --> + <key-style + latin:styleName="moreKeysDevanagariVowelSignCandraE" + latin:moreKeys="ऍ" /> + </case> + <default> + <key-style latin:styleName="moreKeysDevanagariVowelSignCandraE" /> + </default> + </switch> + <!-- U+25CC: "◌" DOTTED CIRCLE + U+0945: "ॅ" DEVANAGARI VOWEL SIGN CANDRA E --> + <key-style + latin:styleName="baseKeyDevanagariVowelSignCandraE" + latin:parentStyle="moreKeysDevanagariVowelSignCandraE" + latin:keySpec="◌ॅ|ॅ" + latin:keyLabelFlags="followKeyLetterRatio" /> +</merge> diff --git a/java/res/xml/key_devanagari_vowel_sign_candra_o.xml b/java/res/xml/keystyle_devanagari_vowel_sign_candra_o.xml index 370fc5405..c36e3fbac 100644 --- a/java/res/xml/key_devanagari_vowel_sign_candra_o.xml +++ b/java/res/xml/keystyle_devanagari_vowel_sign_candra_o.xml @@ -22,13 +22,30 @@ API version 16 can't automatically render dotted circle for incomplete combining letter of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the counterpart files named res/xml-v16/key_*.xml don't have this hack. --> -<merge - xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" -> +<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"> + <switch> + <case latin:keyboardLayoutSet="hindi_compact"> + <!-- U+25CC: "◌" DOTTED CIRCLE + U+0949: "ॉ" DEVANAGARI VOWEL SIGN CANDRA O --> + <key-style + latin:styleName="moreKeysDevanagariVowelSignCandraO" + latin:moreKeys="◌ॉ|ॉ" /> + </case> + <case latin:keyboardLayoutSet="marathi"> + <!-- U+0911: "ऑ" DEVANAGARI LETTER CANDRA O --> + <key-style + latin:styleName="moreKeysDevanagariVowelSignCandraO" + latin:moreKeys="ऑ" /> + </case> + <default> + <key-style latin:styleName="moreKeysDevanagariVowelSignCandraO" /> + </default> + </switch> <!-- U+25CC: "◌" DOTTED CIRCLE U+0949: "ॉ" DEVANAGARI VOWEL SIGN CANDRA O --> - <Key - latin:keyLabel="◌ॉ" - latin:code="0x0949" - latin:keyLabelFlags="fontNormal|followKeyLetterRatio" /> + <key-style + latin:styleName="baseKeyDevanagariVowelSignCandraO" + latin:parentStyle="moreKeysDevanagariVowelSignCandraO" + latin:keySpec="◌ॉ|ॉ" + latin:keyLabelFlags="followKeyLetterRatio" /> </merge> diff --git a/java/res/xml/keystyle_devanagari_vowel_sign_e.xml b/java/res/xml/keystyle_devanagari_vowel_sign_e.xml index edd29c791..481e53eb4 100644 --- a/java/res/xml/keystyle_devanagari_vowel_sign_e.xml +++ b/java/res/xml/keystyle_devanagari_vowel_sign_e.xml @@ -22,22 +22,29 @@ API version 16 can't automatically render dotted circle for incomplete combining letter of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the counterpart files named res/xml-v16/key_*.xml don't have this hack. --> -<merge - xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" -> +<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"> <switch> - <case - latin:keyboardLayoutSet="hindi" - > + <case latin:keyboardLayoutSet="hindi"> <!-- U+25CC: "◌" DOTTED CIRCLE U+0947/U+0902: "ें" DEVANAGARI VOWEL SIGN E/DEVANAGARI SIGN ANUSVARA --> <key-style latin:styleName="moreKeysDevanagariVowelSignE" latin:moreKeys="◌ें|ें" /> </case> - <case - latin:keyboardLayoutSet="nepali_traditional" - > + <case latin:keyboardLayoutSet="hindi_compact"> + <!-- U+25CC: "◌" DOTTED CIRCLE + U+0947: "े" DEVANAGARI VOWEL SIGN E --> + <key-style + latin:styleName="moreKeysDevanagariVowelSignE" + latin:moreKeys="◌े|े" /> + </case> + <case latin:keyboardLayoutSet="marathi"> + <!-- U+090F: "ए" DEVANAGARI LETTER SHORT E --> + <key-style + latin:styleName="moreKeysDevanagariVowelSignE" + latin:moreKeys="ए" /> + </case> + <case latin:keyboardLayoutSet="nepali_traditional"> <!-- U+25CC: "◌" DOTTED CIRCLE U+0903: "ः" DEVANAGARI SIGN VISARGA U+093D: "ऽ" DEVANAGARI SIGN AVAGRAHA --> @@ -46,14 +53,14 @@ latin:moreKeys="◌ः|ः,ऽ" /> </case> <default> - <key-style - latin:styleName="moreKeysDevanagariVowelSignE" /> + <key-style latin:styleName="moreKeysDevanagariVowelSignE" /> </default> </switch> + <!-- U+25CC: "◌" DOTTED CIRCLE + U+0947: "े" DEVANAGARI VOWEL SIGN E --> <key-style latin:styleName="baseKeyDevanagariVowelSignE" latin:parentStyle="moreKeysDevanagariVowelSignE" - latin:keyLabel="◌े" - latin:code="0x0947" - latin:keyLabelFlags="fontNormal|followKeyLetterRatio" /> + latin:keySpec="◌े|े" + latin:keyLabelFlags="followKeyLetterRatio" /> </merge> diff --git a/java/res/xml/keystyle_devanagari_vowel_sign_i.xml b/java/res/xml/keystyle_devanagari_vowel_sign_i.xml index 200fed29f..4b3a240b9 100644 --- a/java/res/xml/keystyle_devanagari_vowel_sign_i.xml +++ b/java/res/xml/keystyle_devanagari_vowel_sign_i.xml @@ -22,22 +22,30 @@ API version 16 can't automatically render dotted circle for incomplete combining letter of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the counterpart files named res/xml-v16/key_*.xml don't have this hack. --> -<merge - xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" -> +<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"> <switch> - <case - latin:keyboardLayoutSet="hindi" - > + <case latin:keyboardLayoutSet="hindi"> <!-- U+25CC: "◌" DOTTED CIRCLE U+093F/U+0902: "िं" DEVANAGARI VOWEL SIGN I/DEVANAGARI SIGN ANUSVARA --> <key-style latin:styleName="moreKeysDevanagariVowelSignI" latin:moreKeys="ि◌ं|िं" /> </case> + <case latin:keyboardLayoutSet="hindi_compact"> + <!-- U+25CC: "◌" DOTTED CIRCLE + U+093F: "ि" DEVANAGARI VOWEL SIGN I --> + <key-style + latin:styleName="moreKeysDevanagariVowelSignI" + latin:moreKeys="◌ि|ि" /> + </case> + <case latin:keyboardLayoutSet="marathi"> + <!-- U+0907: "इ" DEVANAGARI LETTER I --> + <key-style + latin:styleName="moreKeysDevanagariVowelSignI" + latin:moreKeys="इ" /> + </case> <default> - <key-style - latin:styleName="moreKeysDevanagariVowelSignI" /> + <key-style latin:styleName="moreKeysDevanagariVowelSignI" /> </default> </switch> <!-- U+25CC: "◌" DOTTED CIRCLE @@ -45,7 +53,6 @@ <key-style latin:styleName="baseKeyDevanagariVowelSignI" latin:parentStyle="moreKeysDevanagariVowelSignI" - latin:keyLabel="◌ि" - latin:code="0x093F" - latin:keyLabelFlags="fontNormal|followKeyLetterRatio" /> + latin:keySpec="◌ि|ि" + latin:keyLabelFlags="followKeyLetterRatio" /> </merge> diff --git a/java/res/xml/keystyle_devanagari_vowel_sign_ii.xml b/java/res/xml/keystyle_devanagari_vowel_sign_ii.xml index 6dc9951df..8ade6efc8 100644 --- a/java/res/xml/keystyle_devanagari_vowel_sign_ii.xml +++ b/java/res/xml/keystyle_devanagari_vowel_sign_ii.xml @@ -22,22 +22,30 @@ API version 16 can't automatically render dotted circle for incomplete combining letter of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the counterpart files named res/xml-v16/key_*.xml don't have this hack. --> -<merge - xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" -> +<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"> <switch> - <case - latin:keyboardLayoutSet="hindi" - > - <!-- U+0940: "ी" DEVANAGARI VOWEL SIGN II + <case latin:keyboardLayoutSet="hindi"> + <!-- U+25CC: "◌" DOTTED CIRCLE U+0940/U+0902: "ीं" DEVANAGARI VOWEL SIGN II/DEVANAGARI SIGN ANUSVARA --> <key-style latin:styleName="moreKeysDevanagariVowelSignIi" latin:moreKeys="◌ीं|ीं,%" /> </case> + <case latin:keyboardLayoutSet="hindi_compact"> + <!-- U+25CC: "◌" DOTTED CIRCLE + U+0940: "ी" DEVANAGARI VOWEL SIGN II --> + <key-style + latin:styleName="moreKeysDevanagariVowelSignIi" + latin:moreKeys="◌ी|ी,%" /> + </case> + <case latin:keyboardLayoutSet="marathi"> + <!-- U+0908: "ई" DEVANAGARI LETTER II --> + <key-style + latin:styleName="moreKeysDevanagariVowelSignIi" + latin:moreKeys="ई,%" /> + </case> <default> - <key-style - latin:styleName="moreKeysDevanagariVowelSignIi" /> + <key-style latin:styleName="moreKeysDevanagariVowelSignIi" /> </default> </switch> <!-- U+25CC: "◌" DOTTED CIRCLE @@ -45,7 +53,6 @@ <key-style latin:styleName="baseKeyDevanagariVowelSignIi" latin:parentStyle="moreKeysDevanagariVowelSignIi" - latin:keyLabel="◌ी" - latin:code="0x0940" - latin:keyLabelFlags="fontNormal|followKeyLetterRatio" /> + latin:keySpec="◌ी|ी" + latin:keyLabelFlags="followKeyLetterRatio" /> </merge> diff --git a/java/res/xml/keystyle_devanagari_vowel_sign_o.xml b/java/res/xml/keystyle_devanagari_vowel_sign_o.xml index 233ac8609..3afded426 100644 --- a/java/res/xml/keystyle_devanagari_vowel_sign_o.xml +++ b/java/res/xml/keystyle_devanagari_vowel_sign_o.xml @@ -22,24 +22,32 @@ API version 16 can't automatically render dotted circle for incomplete combining letter of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the counterpart files named res/xml-v16/key_*.xml don't have this hack. --> -<merge - xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" -> +<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"> <switch> - <case - latin:keyboardLayoutSet="hindi" - > + <case latin:keyboardLayoutSet="hindi"> <!-- U+25CC: "◌" DOTTED CIRCLE - U+094B/U+0902: "қं" DEVANAGARI VOWEL SIGN O/DEVANAGARI SIGN ANUSVARA + U+094B/U+0902: "ों" DEVANAGARI VOWEL SIGN O/DEVANAGARI SIGN ANUSVARA U+0949: "ॉ" DEVANAGARI VOWEL SIGN CANDRA O U+094A: "ॊ" DEVANAGARI VOWEL SIGN SHORT O --> <key-style latin:styleName="moreKeysDevanagariVowelSignO" latin:moreKeys="◌ों|ों,◌ॉ|ॉ,◌ॊ|ॊ" /> </case> + <case latin:keyboardLayoutSet="hindi_compact"> + <!-- U+25CC: "◌" DOTTED CIRCLE + U+094B: "ो" DEVANAGARI VOWEL SIGN O --> + <key-style + latin:styleName="moreKeysDevanagariVowelSignO" + latin:moreKeys="◌ो|ो" /> + </case> + <case latin:keyboardLayoutSet="marathi"> + <!-- U+0913: "ओ" DEVANAGARI LETTER O --> + <key-style + latin:styleName="moreKeysDevanagariVowelSignO" + latin:moreKeys="ओ" /> + </case> <default> - <key-style - latin:styleName="moreKeysDevanagariVowelSignO" /> + <key-style latin:styleName="moreKeysDevanagariVowelSignO" /> </default> </switch> <!-- U+25CC: "◌" DOTTED CIRCLE @@ -47,7 +55,6 @@ <key-style latin:styleName="baseKeyDevanagariVowelSignO" latin:parentStyle="moreKeysDevanagariVowelSignO" - latin:keyLabel="◌ो" - latin:code="0x094B" - latin:keyLabelFlags="fontNormal|followKeyLetterRatio" /> + latin:keySpec="◌ो|ो" + latin:keyLabelFlags="followKeyLetterRatio" /> </merge> diff --git a/java/res/xml/keystyle_devanagari_vowel_sign_u.xml b/java/res/xml/keystyle_devanagari_vowel_sign_u.xml index 7291b7099..1eb19b573 100644 --- a/java/res/xml/keystyle_devanagari_vowel_sign_u.xml +++ b/java/res/xml/keystyle_devanagari_vowel_sign_u.xml @@ -22,13 +22,9 @@ API version 16 can't automatically render dotted circle for incomplete combining letter of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the counterpart files named res/xml-v16/key_*.xml don't have this hack. --> -<merge - xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" -> +<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"> <switch> - <case - latin:keyboardLayoutSet="hindi" - > + <case latin:keyboardLayoutSet="hindi"> <!-- U+25CC: "◌" DOTTED CIRCLE U+0941/U+0902: "ुं" DEVANAGARI VOWEL SIGN U/DEVANAGARI SIGN ANUSVARA U+0941/U+0901: "ुँ" DEVANAGARI VOWEL SIGN U/DEVANAGARI SIGN CANDRABINDU --> @@ -36,9 +32,21 @@ latin:styleName="moreKeysDevanagariVowelSignU" latin:moreKeys="◌ुं|ुं,◌ुँ|ुँ" /> </case> + <case latin:keyboardLayoutSet="hindi_compact"> + <!-- U+25CC: "◌" DOTTED CIRCLE + U+0941: "ु" DEVANAGARI VOWEL SIGN U --> + <key-style + latin:styleName="moreKeysDevanagariVowelSignU" + latin:moreKeys="◌ु|ु" /> + </case> + <case latin:keyboardLayoutSet="marathi"> + <!-- U+0909: "उ" DEVANAGARI LETTER U --> + <key-style + latin:styleName="moreKeysDevanagariVowelSignU" + latin:moreKeys="उ" /> + </case> <default> - <key-style - latin:styleName="moreKeysDevanagariVowelSignU" /> + <key-style latin:styleName="moreKeysDevanagariVowelSignU" /> </default> </switch> <!-- U+25CC: "◌" DOTTED CIRCLE @@ -46,7 +54,6 @@ <key-style latin:styleName="baseKeyDevanagariVowelSignU" latin:parentStyle="moreKeysDevanagariVowelSignU" - latin:keyLabel="◌ु" - latin:code="0x0941" - latin:keyLabelFlags="fontNormal|followKeyLetterRatio" /> + latin:keySpec="◌ु|ु" + latin:keyLabelFlags="followKeyLetterRatio" /> </merge> diff --git a/java/res/xml/keystyle_devanagari_vowel_sign_uu.xml b/java/res/xml/keystyle_devanagari_vowel_sign_uu.xml index a95ab822d..0bb3426e4 100644 --- a/java/res/xml/keystyle_devanagari_vowel_sign_uu.xml +++ b/java/res/xml/keystyle_devanagari_vowel_sign_uu.xml @@ -22,13 +22,9 @@ API version 16 can't automatically render dotted circle for incomplete combining letter of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the counterpart files named res/xml-v16/key_*.xml don't have this hack. --> -<merge - xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" -> +<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"> <switch> - <case - latin:keyboardLayoutSet="hindi" - > + <case latin:keyboardLayoutSet="hindi"> <!-- U+25CC: "◌" DOTTED CIRCLE U+0942/U+0902: "ूं" DEVANAGARI VOWEL SIGN UU/DEVANAGARI SIGN ANUSVARA U+0942/U+0901: "ूँ" DEVANAGARI VOWEL SIGN UU/DEVANAGARI SIGN CANDRABINDU --> @@ -36,9 +32,21 @@ latin:styleName="moreKeysDevanagariVowelSignUu" latin:moreKeys="◌ूं|ूं,◌ूँ|ूँ,%" /> </case> + <case latin:keyboardLayoutSet="hindi_compact"> + <!-- U+25CC: "◌" DOTTED CIRCLE + U+0942: "ू" DEVANAGARI VOWEL SIGN UU --> + <key-style + latin:styleName="moreKeysDevanagariVowelSignUu" + latin:moreKeys="◌ू|ू,%" /> + </case> + <case latin:keyboardLayoutSet="marathi"> + <!-- U+090A: "ऊ" DEVANAGARI LETTER UU --> + <key-style + latin:styleName="moreKeysDevanagariVowelSignUu" + latin:moreKeys="ऊ,%" /> + </case> <default> - <key-style - latin:styleName="moreKeysDevanagariVowelSignUu" /> + <key-style latin:styleName="moreKeysDevanagariVowelSignUu" /> </default> </switch> <!-- U+25CC: "◌" DOTTED CIRCLE @@ -46,7 +54,6 @@ <key-style latin:styleName="baseKeyDevanagariVowelSignUu" latin:parentStyle="moreKeysDevanagariVowelSignUu" - latin:keyLabel="◌ू" - latin:code="0x0942" - latin:keyLabelFlags="fontNormal|followKeyLetterRatio" /> + latin:keySpec="◌ू|ू" + latin:keyLabelFlags="followKeyLetterRatio" /> </merge> diff --git a/java/res/xml/key_devanagari_vowel_sign_vocalic_r.xml b/java/res/xml/keystyle_devanagari_vowel_sign_vocalic_r.xml index f150d7ed9..688826a43 100644 --- a/java/res/xml/key_devanagari_vowel_sign_vocalic_r.xml +++ b/java/res/xml/keystyle_devanagari_vowel_sign_vocalic_r.xml @@ -22,37 +22,47 @@ API version 16 can't automatically render dotted circle for incomplete combining letter of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the counterpart files named res/xml-v16/key_*.xml don't have this hack. --> -<merge - xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" -> +<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"> <switch> - <case - latin:keyboardLayoutSet="hindi" - > + <case latin:keyboardLayoutSet="hindi"> <!-- U+25CC: "◌" DOTTED CIRCLE U+0944: "ॄ" DEVANAGARI VOWEL SIGN VOCALIC RR --> <key-style latin:styleName="moreKeysDevanagariVowelSignVocalicR" latin:moreKeys="◌ॄ|ॄ" /> </case> - <case - latin:keyboardLayoutSet="nepali_traditional" - > + <case latin:keyboardLayoutSet="hindi_compact"> + <!-- U+090B: "ऋ" DEVANAGARI LETTER VOCALIC R + U+25CC: "◌" DOTTED CIRCLE + U+0943: "ृ" DEVANAGARI VOWEL SIGN VOCALIC R --> + <key-style + latin:styleName="moreKeysDevanagariVowelSignVocalicR" + latin:moreKeys="ऋ,◌ृ|ृ" /> + </case> + <case latin:keyboardLayoutSet="marathi"> + <!-- U+0931: "ऱ" DEVANAGARI LETTER RRA + U+090B: "ऋ" DEVANAGARI LETTER VOCALIC R + U+25CC: "◌" DOTTED CIRCLE + U+0943: "ृ" DEVANAGARI VOWEL SIGN VOCALIC R --> + <key-style + latin:styleName="moreKeysDevanagariVowelSignVocalicR" + latin:moreKeys="ऱ,ऋ,◌ृ|ृ" /> + </case> + <case latin:keyboardLayoutSet="nepali_traditional"> <!-- U+0913: "ओ" DEVANAGARI LETTER O --> <key-style latin:styleName="moreKeysDevanagariVowelSignVocalicR" latin:moreKeys="ओ" /> </case> <default> - <key-style - latin:styleName="moreKeysDevanagariVowelSignVocalicR" /> + <key-style latin:styleName="moreKeysDevanagariVowelSignVocalicR" /> </default> </switch> <!-- U+25CC: "◌" DOTTED CIRCLE U+0943: "ृ" DEVANAGARI VOWEL SIGN VOCALIC R --> - <Key - latin:keyStyle="moreKeysDevanagariVowelSignVocalicR" - latin:keyLabel="◌ृ" - latin:code="0x0943" - latin:keyLabelFlags="fontNormal|followKeyLetterRatio" /> + <key-style + latin:styleName="baseKeyDevanagariVowelSignVocalicR" + latin:parentStyle="moreKeysDevanagariVowelSignVocalicR" + latin:keySpec="◌ृ|ृ" + latin:keyLabelFlags="followKeyLetterRatio" /> </merge> diff --git a/java/res/xml/method.xml b/java/res/xml/method.xml index 0a27da93f..67be24256 100644 --- a/java/res/xml/method.xml +++ b/java/res/xml/method.xml @@ -24,54 +24,65 @@ keyboard_locale: script_name/keyboard_layout_set af: Afrikaans/qwerty ar: Arabic/arabic - (az: Azerbaijani/qwerty) # disabled temporarily. waiting for string resources. - be: Belarusian/east_slavic + az_AZ: Azerbaijani (Azerbaijan)/qwerty + be_BY: Belarusian (Belarus)/east_slavic bg: Bulgarian/bulgarian bg: Bulgarian/bulgarian_bds + (bn_IN: Bengali (India)/bengali) # This is a preliminary keyboard layout. ca: Catalan/spanish cs: Czech/qwertz da: Danish/nordic de: German/qwertz + de_CH: German (Switzerland)/swiss el: Greek/greek - en_US: English United States/qwerty - en_GB: English Great Britain/qwerty + en_IN: English (India)/qwerty + en_US: English (United States)/qwerty + en_GB: English (Great Britain)/qwerty eo: Esperanto/spanish es: Spanish/spanish - es_US: Spanish United States/spanish - (es_419: Spanish Latin America/qwerty) - et_EE: Estonian/nordic - fa: Persian/arabic + es_US: Spanish (United States)/spanish + es_419: Spanish (Latin America)/spanish + et_EE: Estonian (Estonia)/nordic + eu_ES: Basque (Spain)/spanish + fa: Persian/farsi fi: Finnish/nordic fr: French/azerty - fr_CA: French Canada/qwerty + fr_CA: French (Canada)/qwerty + fr_CH: French (Switzerland)/swiss + gl_ES: Galician (Spain)/spanish hi: Hindi/hindi + (hi: Hindi/hindi_compact) # This is a preliminary keyboard layout. hr: Croatian/qwertz hu: Hungarian/qwertz - hy_AM: Armenian Phonetic/armenian_phonetic - in: Indonesian/qwerty # "id" is official language code of Indonesian. + hy_AM: Armenian (Armenia) Phonetic/armenian_phonetic + in: Indonesian/qwerty # "id" is the official language code of Indonesian. is: Icelandic/qwerty it: Italian/qwerty - iw: Hebrew/hebrew # "he" is official language code of Hebrew. - ka_GE: Georgian/georgian - (kk: Kazakh/east_slavic) # disabled temporarily. waiting for string resources. - km_KH: Khmer/khmer + it_CH: Italian (Switzerland)/swiss + iw: Hebrew/hebrew # "he" is the official language code of Hebrew. + ka_GE: Georgian (Georgia)/georgian + kk: Kazakh/east_slavic + km_KH: Khmer (Cambodia)/khmer ky: Kyrgyz/east_slavic - lo_LA: Lao/lao + lo_LA: Lao (Laos)/lao lt: Lithuanian/qwerty lv: Latvian/qwerty mk: Macedonian/south_slavic - mn_MN: Mongolian/mongolian - ms_MY: Malay/qwerty + mn_MN: Mongolian (Mongolia)/mongolian + (mr_IN: Marathi (India)/marathi) # This is a preliminary keyboard layout. + ms_MY: Malay (Malaysia)/qwerty + (my_MM: Myanmar (Myanmar)/myanmar) # This is a preliminary keyboard layout. nb: Norwegian Bokmål/nordic - (ne: Nepali Romanized/nepali_romanized) # disabled temporarily - (ne: Nepali Traditional/nepali_traditional) # disabled temporarily + ne_NP: Nepali (Nepal) Romanized/nepali_romanized + ne_NP: Nepali (Nepal) Traditional/nepali_traditional nl: Dutch/qwerty - nl_BE: Dutch Belgium/azerty + nl_BE: Dutch (Belgium)/azerty pl: Polish/qwerty - pt_BR: Portuguese Brazil/qwerty - pt_PT: Portuguese Portugal/qwerty + pt_BR: Portuguese (Brazil)/qwerty + pt_PT: Portuguese (Portugal)/qwerty ro: Romanian/qwerty ru: Russian/east_slavic + (si_LK: Sinhala (Sri Lanka)/sinhala) # This is a preliminary keyboard layout. sk: Slovak/qwerty sl: Slovenian/qwerty sr: Serbian/south_slavic @@ -88,19 +99,22 @@ (zz: Emoji/emoji) --> <!-- TODO: use <lang>_keyboard icon instead of a common keyboard icon. --> +<!-- TODO: Remove "AsciiCapable" from the extra values when we can stop supporting JB-MR1 --> <!-- Note: SupportTouchPositionCorrection extra value is obsolete and maintained for backward compatibility. --> <!-- If IME doesn't have an applicable subtype, the first subtype will be used as a default subtype.--> <input-method xmlns:android="http://schemas.android.com/apk/res/android" android:settingsActivity="com.android.inputmethod.latin.settings.SettingsActivity" - android:isDefault="@bool/im_is_default"> + android:isDefault="@bool/im_is_default" + android:supportsSwitchingToNextInputMethod="true"> <subtype android:icon="@drawable/ic_ime_switcher_dark" android:label="@string/subtype_en_US" android:subtypeId="0xc9194f98" android:imeSubtypeLocale="en_US" android:imeSubtypeMode="keyboard" android:imeSubtypeExtraValue="TrySuppressingImeSwitcher,AsciiCapable,SupportTouchPositionCorrection,EmojiCapable" + android:isAsciiCapable="true" /> <subtype android:icon="@drawable/ic_ime_switcher_dark" android:label="@string/subtype_en_GB" @@ -108,6 +122,7 @@ android:imeSubtypeLocale="en_GB" android:imeSubtypeMode="keyboard" android:imeSubtypeExtraValue="TrySuppressingImeSwitcher,AsciiCapable,SupportTouchPositionCorrection,EmojiCapable" + android:isAsciiCapable="true" /> <subtype android:icon="@drawable/ic_ime_switcher_dark" android:label="@string/subtype_generic" @@ -115,6 +130,7 @@ android:imeSubtypeLocale="af" android:imeSubtypeMode="keyboard" android:imeSubtypeExtraValue="KeyboardLayoutSet=qwerty,AsciiCapable,EmojiCapable" + android:isAsciiCapable="true" /> <subtype android:icon="@drawable/ic_ime_switcher_dark" android:label="@string/subtype_generic" @@ -122,22 +138,23 @@ android:imeSubtypeLocale="ar" android:imeSubtypeMode="keyboard" android:imeSubtypeExtraValue="SupportTouchPositionCorrection,EmojiCapable" + android:isAsciiCapable="false" /> - <!-- <subtype android:icon="@drawable/ic_ime_switcher_dark" android:label="@string/subtype_generic" android:subtypeId="0x70b0f974" - android:imeSubtypeLocale="az" + android:imeSubtypeLocale="az_AZ" android:imeSubtypeMode="keyboard" android:imeSubtypeExtraValue="KeyboardLayoutSet=qwerty,AsciiCapable,EmojiCapable" + android:isAsciiCapable="true" /> - --> <subtype android:icon="@drawable/ic_ime_switcher_dark" android:label="@string/subtype_generic" android:subtypeId="0x1dc3a859" - android:imeSubtypeLocale="be" + android:imeSubtypeLocale="be_BY" android:imeSubtypeMode="keyboard" android:imeSubtypeExtraValue="KeyboardLayoutSet=east_slavic,EmojiCapable" + android:isAsciiCapable="false" /> <subtype android:icon="@drawable/ic_ime_switcher_dark" android:label="@string/subtype_generic" @@ -145,6 +162,7 @@ android:imeSubtypeLocale="bg" android:imeSubtypeMode="keyboard" android:imeSubtypeExtraValue="KeyboardLayoutSet=bulgarian,EmojiCapable" + android:isAsciiCapable="false" /> <subtype android:icon="@drawable/ic_ime_switcher_dark" android:label="@string/subtype_bulgarian_bds" @@ -152,6 +170,17 @@ android:imeSubtypeLocale="bg" android:imeSubtypeMode="keyboard" android:imeSubtypeExtraValue="KeyboardLayoutSet=bulgarian_bds,EmojiCapable" + android:isAsciiCapable="false" + /> + <!-- TODO: This bengali keyboard is a preliminary layout. + This isn't based on the final specification. --> + <subtype android:icon="@drawable/ic_ime_switcher_dark" + android:label="@string/subtype_generic" + android:subtypeId="0xbff5986c" + android:imeSubtypeLocale="bn_IN" + android:imeSubtypeMode="keyboard" + android:imeSubtypeExtraValue="KeyboardLayoutSet=bengali,EmojiCapable" + android:isAsciiCapable="false" /> <subtype android:icon="@drawable/ic_ime_switcher_dark" android:label="@string/subtype_generic" @@ -159,6 +188,7 @@ android:imeSubtypeLocale="ca" android:imeSubtypeMode="keyboard" android:imeSubtypeExtraValue="KeyboardLayoutSet=spanish,AsciiCapable,EmojiCapable" + android:isAsciiCapable="true" /> <subtype android:icon="@drawable/ic_ime_switcher_dark" android:label="@string/subtype_generic" @@ -166,6 +196,7 @@ android:imeSubtypeLocale="cs" android:imeSubtypeMode="keyboard" android:imeSubtypeExtraValue="AsciiCapable,SupportTouchPositionCorrection,EmojiCapable" + android:isAsciiCapable="true" /> <subtype android:icon="@drawable/ic_ime_switcher_dark" android:label="@string/subtype_generic" @@ -173,6 +204,7 @@ android:imeSubtypeLocale="da" android:imeSubtypeMode="keyboard" android:imeSubtypeExtraValue="AsciiCapable,SupportTouchPositionCorrection,EmojiCapable" + android:isAsciiCapable="true" /> <subtype android:icon="@drawable/ic_ime_switcher_dark" android:label="@string/subtype_generic" @@ -180,6 +212,15 @@ android:imeSubtypeLocale="de" android:imeSubtypeMode="keyboard" android:imeSubtypeExtraValue="AsciiCapable,SupportTouchPositionCorrection,EmojiCapable" + android:isAsciiCapable="true" + /> + <subtype android:icon="@drawable/ic_ime_switcher_dark" + android:label="@string/subtype_generic" + android:subtypeId="0x7acfd0aa" + android:imeSubtypeLocale="de_CH" + android:imeSubtypeMode="keyboard" + android:imeSubtypeExtraValue="KeyboardLayoutSet=swiss,AsciiCapable,SupportTouchPositionCorrection,EmojiCapable" + android:isAsciiCapable="true" /> <subtype android:icon="@drawable/ic_ime_switcher_dark" android:label="@string/subtype_generic" @@ -187,6 +228,15 @@ android:imeSubtypeLocale="el" android:imeSubtypeMode="keyboard" android:imeSubtypeExtraValue="KeyboardLayoutSet=greek,EmojiCapable" + android:isAsciiCapable="false" + /> + <subtype android:icon="@drawable/ic_ime_switcher_dark" + android:label="@string/subtype_generic" + android:subtypeId="0x8d58fc2d" + android:imeSubtypeLocale="en_IN" + android:imeSubtypeMode="keyboard" + android:imeSubtypeExtraValue="KeyboardLayoutSet=qwerty,AsciiCapable,EmojiCapable" + android:isAsciiCapable="true" /> <subtype android:icon="@drawable/ic_ime_switcher_dark" android:label="@string/subtype_generic" @@ -194,6 +244,7 @@ android:imeSubtypeLocale="eo" android:imeSubtypeMode="keyboard" android:imeSubtypeExtraValue="KeyboardLayoutSet=spanish,EmojiCapable" + android:isAsciiCapable="false" /> <subtype android:icon="@drawable/ic_ime_switcher_dark" android:label="@string/subtype_generic" @@ -201,6 +252,7 @@ android:imeSubtypeLocale="es" android:imeSubtypeMode="keyboard" android:imeSubtypeExtraValue="AsciiCapable,SupportTouchPositionCorrection,EmojiCapable" + android:isAsciiCapable="true" /> <subtype android:icon="@drawable/ic_ime_switcher_dark" android:label="@string/subtype_es_US" @@ -208,22 +260,31 @@ android:imeSubtypeLocale="es_US" android:imeSubtypeMode="keyboard" android:imeSubtypeExtraValue="KeyboardLayoutSet=spanish,AsciiCapable,EmojiCapable" + android:isAsciiCapable="true" /> - <!-- <subtype android:icon="@drawable/ic_ime_switcher_dark" android:label="@string/subtype_generic" - android:subtypeId="0x623f9286" + android:subtypeId="0xa23e5d19" android:imeSubtypeLocale="es_419" android:imeSubtypeMode="keyboard" android:imeSubtypeExtraValue="KeyboardLayoutSet=spanish,AsciiCapable,EmojiCapable" + android:isAsciiCapable="true" /> - --> <subtype android:icon="@drawable/ic_ime_switcher_dark" android:label="@string/subtype_generic" android:subtypeId="0xec2d3955" android:imeSubtypeLocale="et_EE" android:imeSubtypeMode="keyboard" android:imeSubtypeExtraValue="KeyboardLayoutSet=nordic,AsciiCapable,EmojiCapable" + android:isAsciiCapable="true" + /> + <subtype android:icon="@drawable/ic_ime_switcher_dark" + android:label="@string/subtype_generic" + android:subtypeId="0x070e5c07" + android:imeSubtypeLocale="eu_ES" + android:imeSubtypeMode="keyboard" + android:imeSubtypeExtraValue="KeyboardLayoutSet=spanish,AsciiCapable,EmojiCapable" + android:isAsciiCapable="true" /> <subtype android:icon="@drawable/ic_ime_switcher_dark" android:label="@string/subtype_generic" @@ -231,6 +292,7 @@ android:imeSubtypeLocale="fa" android:imeSubtypeMode="keyboard" android:imeSubtypeExtraValue="KeyboardLayoutSet=farsi,EmojiCapable" + android:isAsciiCapable="false" /> <subtype android:icon="@drawable/ic_ime_switcher_dark" android:label="@string/subtype_generic" @@ -238,6 +300,7 @@ android:imeSubtypeLocale="fi" android:imeSubtypeMode="keyboard" android:imeSubtypeExtraValue="AsciiCapable,SupportTouchPositionCorrection,EmojiCapable" + android:isAsciiCapable="true" /> <subtype android:icon="@drawable/ic_ime_switcher_dark" android:label="@string/subtype_generic" @@ -245,6 +308,7 @@ android:imeSubtypeLocale="fr" android:imeSubtypeMode="keyboard" android:imeSubtypeExtraValue="AsciiCapable,SupportTouchPositionCorrection,EmojiCapable" + android:isAsciiCapable="true" /> <subtype android:icon="@drawable/ic_ime_switcher_dark" android:label="@string/subtype_generic" @@ -252,6 +316,23 @@ android:imeSubtypeLocale="fr_CA" android:imeSubtypeMode="keyboard" android:imeSubtypeExtraValue="AsciiCapable,SupportTouchPositionCorrection,EmojiCapable" + android:isAsciiCapable="true" + /> + <subtype android:icon="@drawable/ic_ime_switcher_dark" + android:label="@string/subtype_generic" + android:subtypeId="0xeadc55f5" + android:imeSubtypeLocale="fr_CH" + android:imeSubtypeMode="keyboard" + android:imeSubtypeExtraValue="KeyboardLayoutSet=swiss,AsciiCapable,SupportTouchPositionCorrection,EmojiCapable" + android:isAsciiCapable="true" + /> + <subtype android:icon="@drawable/ic_ime_switcher_dark" + android:label="@string/subtype_generic" + android:subtypeId="0xb939573c" + android:imeSubtypeLocale="gl_ES" + android:imeSubtypeMode="keyboard" + android:imeSubtypeExtraValue="KeyboardLayoutSet=spanish,AsciiCapable,EmojiCapable" + android:isAsciiCapable="true" /> <subtype android:icon="@drawable/ic_ime_switcher_dark" android:label="@string/subtype_generic" @@ -259,6 +340,17 @@ android:imeSubtypeLocale="hi" android:imeSubtypeMode="keyboard" android:imeSubtypeExtraValue="KeyboardLayoutSet=hindi,EmojiCapable" + android:isAsciiCapable="false" + /> + <!-- TODO: This hindi_compact keyboard is a preliminary layout. + This isn't based on the final specification. --> + <subtype android:icon="@drawable/ic_ime_switcher_dark" + android:label="@string/subtype_generic_compact" + android:subtypeId="0xe49c89a1" + android:imeSubtypeLocale="hi" + android:imeSubtypeMode="keyboard" + android:imeSubtypeExtraValue="KeyboardLayoutSet=hindi_compact,EmojiCapable" + android:isAsciiCapable="false" /> <subtype android:icon="@drawable/ic_ime_switcher_dark" android:label="@string/subtype_generic" @@ -266,6 +358,7 @@ android:imeSubtypeLocale="hr" android:imeSubtypeMode="keyboard" android:imeSubtypeExtraValue="AsciiCapable,SupportTouchPositionCorrection,EmojiCapable" + android:isAsciiCapable="true" /> <subtype android:icon="@drawable/ic_ime_switcher_dark" android:label="@string/subtype_generic" @@ -273,6 +366,7 @@ android:imeSubtypeLocale="hu" android:imeSubtypeMode="keyboard" android:imeSubtypeExtraValue="AsciiCapable,SupportTouchPositionCorrection,EmojiCapable" + android:isAsciiCapable="true" /> <subtype android:icon="@drawable/ic_ime_switcher_dark" android:label="@string/subtype_generic" @@ -280,6 +374,7 @@ android:imeSubtypeLocale="hy_AM" android:imeSubtypeMode="keyboard" android:imeSubtypeExtraValue="KeyboardLayoutSet=armenian_phonetic,EmojiCapable" + android:isAsciiCapable="false" /> <!-- Java uses the deprecated "in" code instead of the standard "id" code for Indonesian. --> <subtype android:icon="@drawable/ic_ime_switcher_dark" @@ -288,6 +383,7 @@ android:imeSubtypeLocale="in" android:imeSubtypeMode="keyboard" android:imeSubtypeExtraValue="KeyboardLayoutSet=qwerty,AsciiCapable,EmojiCapable" + android:isAsciiCapable="true" /> <subtype android:icon="@drawable/ic_ime_switcher_dark" android:label="@string/subtype_generic" @@ -295,6 +391,7 @@ android:imeSubtypeLocale="is" android:imeSubtypeMode="keyboard" android:imeSubtypeExtraValue="KeyboardLayoutSet=qwerty,AsciiCapable,EmojiCapable" + android:isAsciiCapable="true" /> <subtype android:icon="@drawable/ic_ime_switcher_dark" android:label="@string/subtype_generic" @@ -302,6 +399,15 @@ android:imeSubtypeLocale="it" android:imeSubtypeMode="keyboard" android:imeSubtypeExtraValue="AsciiCapable,SupportTouchPositionCorrection,EmojiCapable" + android:isAsciiCapable="true" + /> + <subtype android:icon="@drawable/ic_ime_switcher_dark" + android:label="@string/subtype_generic" + android:subtypeId="0xd914fe1a" + android:imeSubtypeLocale="it_CH" + android:imeSubtypeMode="keyboard" + android:imeSubtypeExtraValue="KeyboardLayoutSet=swiss,AsciiCapable,EmojiCapable" + android:isAsciiCapable="true" /> <!-- Java uses the deprecated "iw" code instead of the standard "he" code for Hebrew. --> <subtype android:icon="@drawable/ic_ime_switcher_dark" @@ -310,6 +416,7 @@ android:imeSubtypeLocale="iw" android:imeSubtypeMode="keyboard" android:imeSubtypeExtraValue="SupportTouchPositionCorrection,EmojiCapable" + android:isAsciiCapable="false" /> <subtype android:icon="@drawable/ic_ime_switcher_dark" android:label="@string/subtype_generic" @@ -317,22 +424,23 @@ android:imeSubtypeLocale="ka_GE" android:imeSubtypeMode="keyboard" android:imeSubtypeExtraValue="KeyboardLayoutSet=georgian,EmojiCapable" + android:isAsciiCapable="false" /> - <!-- <subtype android:icon="@drawable/ic_ime_switcher_dark" android:label="@string/subtype_generic" android:subtypeId="0x2d73d2f6" android:imeSubtypeLocale="kk" android:imeSubtypeMode="keyboard" android:imeSubtypeExtraValue="KeyboardLayoutSet=east_slavic,EmojiCapable" + android:isAsciiCapable="false" /> - --> <subtype android:icon="@drawable/ic_ime_switcher_dark" android:label="@string/subtype_generic" android:subtypeId="0x1365683a" android:imeSubtypeLocale="km_KH" android:imeSubtypeMode="keyboard" android:imeSubtypeExtraValue="KeyboardLayoutSet=khmer,EmojiCapable" + android:isAsciiCapable="false" /> <subtype android:icon="@drawable/ic_ime_switcher_dark" android:label="@string/subtype_generic" @@ -340,6 +448,7 @@ android:imeSubtypeLocale="ky" android:imeSubtypeMode="keyboard" android:imeSubtypeExtraValue="KeyboardLayoutSet=east_slavic,EmojiCapable" + android:isAsciiCapable="false" /> <subtype android:icon="@drawable/ic_ime_switcher_dark" android:label="@string/subtype_generic" @@ -347,6 +456,7 @@ android:imeSubtypeLocale="lo_LA" android:imeSubtypeMode="keyboard" android:imeSubtypeExtraValue="KeyboardLayoutSet=lao,EmojiCapable" + android:isAsciiCapable="false" /> <subtype android:icon="@drawable/ic_ime_switcher_dark" android:label="@string/subtype_generic" @@ -354,6 +464,7 @@ android:imeSubtypeLocale="lt" android:imeSubtypeMode="keyboard" android:imeSubtypeExtraValue="KeyboardLayoutSet=qwerty,AsciiCapable,EmojiCapable" + android:isAsciiCapable="true" /> <subtype android:icon="@drawable/ic_ime_switcher_dark" android:label="@string/subtype_generic" @@ -361,6 +472,7 @@ android:imeSubtypeLocale="lv" android:imeSubtypeMode="keyboard" android:imeSubtypeExtraValue="KeyboardLayoutSet=qwerty,AsciiCapable,EmojiCapable" + android:isAsciiCapable="true" /> <subtype android:icon="@drawable/ic_ime_switcher_dark" android:label="@string/subtype_generic" @@ -368,6 +480,7 @@ android:imeSubtypeLocale="mk" android:imeSubtypeMode="keyboard" android:imeSubtypeExtraValue="KeyboardLayoutSet=south_slavic,EmojiCapable" + android:isAsciiCapable="false" /> <subtype android:icon="@drawable/ic_ime_switcher_dark" android:label="@string/subtype_generic" @@ -375,6 +488,17 @@ android:imeSubtypeLocale="mn_MN" android:imeSubtypeMode="keyboard" android:imeSubtypeExtraValue="KeyboardLayoutSet=mongolian,EmojiCapable" + android:isAsciiCapable="false" + /> + <!-- TODO: This marathi keyboard is a preliminary layout. + This isn't based on the final specification. --> + <subtype android:icon="@drawable/ic_ime_switcher_dark" + android:label="@string/subtype_generic" + android:subtypeId="0x747b9f03" + android:imeSubtypeLocale="mr_IN" + android:imeSubtypeMode="keyboard" + android:imeSubtypeExtraValue="KeyboardLayoutSet=marathi,EmojiCapable" + android:isAsciiCapable="false" /> <subtype android:icon="@drawable/ic_ime_switcher_dark" android:label="@string/subtype_generic" @@ -382,6 +506,17 @@ android:imeSubtypeLocale="ms_MY" android:imeSubtypeMode="keyboard" android:imeSubtypeExtraValue="KeyboardLayoutSet=qwerty,AsciiCapable,EmojiCapable" + android:isAsciiCapable="true" + /> + <!-- TODO: This Myanmar keyboard is a preliminary layout. + This isn't based on the final specification. --> + <subtype android:icon="@drawable/ic_ime_switcher_dark" + android:label="@string/subtype_generic" + android:subtypeId="0xea266ea4" + android:imeSubtypeLocale="my_MM" + android:imeSubtypeMode="keyboard" + android:imeSubtypeExtraValue="KeyboardLayoutSet=myanmar,EmojiCapable,CombiningRules=MyanmarReordering" + android:isAsciiCapable="false" /> <subtype android:icon="@drawable/ic_ime_switcher_dark" android:label="@string/subtype_generic" @@ -389,29 +524,31 @@ android:imeSubtypeLocale="nb" android:imeSubtypeMode="keyboard" android:imeSubtypeExtraValue="AsciiCapable,SupportTouchPositionCorrection,EmojiCapable" + android:isAsciiCapable="true" /> - <!-- <subtype android:icon="@drawable/ic_ime_switcher_dark" android:label="@string/subtype_generic" android:subtypeId="0xd80a4cee" - android:imeSubtypeLocale="ne" + android:imeSubtypeLocale="ne_NP" android:imeSubtypeMode="keyboard" android:imeSubtypeExtraValue="KeyboardLayoutSet=nepali_romanized,EmojiCapable" + android:isAsciiCapable="false" /> <subtype android:icon="@drawable/ic_ime_switcher_dark" - android:label="@string/subtype_nepali_traditional" + android:label="@string/subtype_generic_traditional" android:subtypeId="0x5fafea88" - android:imeSubtypeLocale="ne" + android:imeSubtypeLocale="ne_NP" android:imeSubtypeMode="keyboard" android:imeSubtypeExtraValue="KeyboardLayoutSet=nepali_traditional,EmojiCapable" + android:isAsciiCapable="false" /> - --> <subtype android:icon="@drawable/ic_ime_switcher_dark" android:label="@string/subtype_generic" android:subtypeId="0x3f9fd91e" android:imeSubtypeLocale="nl" android:imeSubtypeMode="keyboard" android:imeSubtypeExtraValue="AsciiCapable,SupportTouchPositionCorrection,EmojiCapable" + android:isAsciiCapable="true" /> <subtype android:icon="@drawable/ic_ime_switcher_dark" android:label="@string/subtype_generic" @@ -419,6 +556,7 @@ android:imeSubtypeLocale="nl_BE" android:imeSubtypeMode="keyboard" android:imeSubtypeExtraValue="KeyboardLayoutSet=azerty,AsciiCapable,EmojiCapable" + android:isAsciiCapable="true" /> <subtype android:icon="@drawable/ic_ime_switcher_dark" android:label="@string/subtype_generic" @@ -426,6 +564,7 @@ android:imeSubtypeLocale="pl" android:imeSubtypeMode="keyboard" android:imeSubtypeExtraValue="AsciiCapable,SupportTouchPositionCorrection,EmojiCapable" + android:isAsciiCapable="true" /> <subtype android:icon="@drawable/ic_ime_switcher_dark" android:label="@string/subtype_generic" @@ -433,6 +572,7 @@ android:imeSubtypeLocale="pt_BR" android:imeSubtypeMode="keyboard" android:imeSubtypeExtraValue="KeyboardLayoutSet=qwerty,AsciiCapable,EmojiCapable" + android:isAsciiCapable="true" /> <subtype android:icon="@drawable/ic_ime_switcher_dark" android:label="@string/subtype_generic" @@ -440,6 +580,7 @@ android:imeSubtypeLocale="pt_PT" android:imeSubtypeMode="keyboard" android:imeSubtypeExtraValue="KeyboardLayoutSet=qwerty,AsciiCapable,EmojiCapable" + android:isAsciiCapable="true" /> <subtype android:icon="@drawable/ic_ime_switcher_dark" android:label="@string/subtype_generic" @@ -447,6 +588,7 @@ android:imeSubtypeLocale="ro" android:imeSubtypeMode="keyboard" android:imeSubtypeExtraValue="KeyboardLayoutSet=qwerty,AsciiCapable,EmojiCapable" + android:isAsciiCapable="true" /> <subtype android:icon="@drawable/ic_ime_switcher_dark" android:label="@string/subtype_generic" @@ -454,6 +596,17 @@ android:imeSubtypeLocale="ru" android:imeSubtypeMode="keyboard" android:imeSubtypeExtraValue="SupportTouchPositionCorrection,EmojiCapable" + android:isAsciiCapable="false" + /> + <!-- TODO: This sinhala keyboard is a preliminary layout. + This isn't based on the final specification. --> + <subtype android:icon="@drawable/ic_ime_switcher_dark" + android:label="@string/subtype_generic" + android:subtypeId="0x5c6b3bde" + android:imeSubtypeLocale="si_LK" + android:imeSubtypeMode="keyboard" + android:imeSubtypeExtraValue="KeyboardLayoutSet=sinhala,EmojiCapable" + android:isAsciiCapable="false" /> <subtype android:icon="@drawable/ic_ime_switcher_dark" android:label="@string/subtype_generic" @@ -461,6 +614,7 @@ android:imeSubtypeLocale="sk" android:imeSubtypeMode="keyboard" android:imeSubtypeExtraValue="KeyboardLayoutSet=qwerty,AsciiCapable,EmojiCapable" + android:isAsciiCapable="true" /> <subtype android:icon="@drawable/ic_ime_switcher_dark" android:label="@string/subtype_generic" @@ -468,6 +622,7 @@ android:imeSubtypeLocale="sl" android:imeSubtypeMode="keyboard" android:imeSubtypeExtraValue="KeyboardLayoutSet=qwerty,AsciiCapable,EmojiCapable" + android:isAsciiCapable="true" /> <subtype android:icon="@drawable/ic_ime_switcher_dark" android:label="@string/subtype_generic" @@ -475,6 +630,7 @@ android:imeSubtypeLocale="sr" android:imeSubtypeMode="keyboard" android:imeSubtypeExtraValue="SupportTouchPositionCorrection,EmojiCapable" + android:isAsciiCapable="false" /> <!-- TODO: Uncomment once we can handle IETF language tag with script name specified. <subtype android:icon="@drawable/ic_ime_switcher_dark" @@ -483,6 +639,7 @@ android:imeSubtypeLocale="sr" android:imeSubtypeMode="keyboard" android:imeSubtypeExtraValue="SupportTouchPositionCorrection,EmojiCapable" + android:isAsciiCapable="false" /> <subtype android:icon="@drawable/ic_ime_switcher_dark" android:label="@string/subtype_serbian_latin" @@ -490,6 +647,7 @@ android:imeSubtypeLocale="sr-Latn" android:imeSubtypeMode="keyboard" android:imeSubtypeExtraValue="KeyboardLayoutSet=qwerty,AsciiCapable,EmojiCapable" + android:isAsciiCapable="true" /> --> <subtype android:icon="@drawable/ic_ime_switcher_dark" @@ -498,6 +656,7 @@ android:imeSubtypeLocale="sv" android:imeSubtypeMode="keyboard" android:imeSubtypeExtraValue="AsciiCapable,SupportTouchPositionCorrection,EmojiCapable" + android:isAsciiCapable="true" /> <subtype android:icon="@drawable/ic_ime_switcher_dark" android:label="@string/subtype_generic" @@ -505,6 +664,7 @@ android:imeSubtypeLocale="sw" android:imeSubtypeMode="keyboard" android:imeSubtypeExtraValue="KeyboardLayoutSet=qwerty,AsciiCapable,EmojiCapable" + android:isAsciiCapable="true" /> <subtype android:icon="@drawable/ic_ime_switcher_dark" android:label="@string/subtype_generic" @@ -512,6 +672,7 @@ android:imeSubtypeLocale="th" android:imeSubtypeMode="keyboard" android:imeSubtypeExtraValue="KeyboardLayoutSet=thai,EmojiCapable" + android:isAsciiCapable="false" /> <subtype android:icon="@drawable/ic_ime_switcher_dark" android:label="@string/subtype_generic" @@ -519,6 +680,7 @@ android:imeSubtypeLocale="tl" android:imeSubtypeMode="keyboard" android:imeSubtypeExtraValue="KeyboardLayoutSet=spanish,AsciiCapable,EmojiCapable" + android:isAsciiCapable="true" /> <subtype android:icon="@drawable/ic_ime_switcher_dark" android:label="@string/subtype_generic" @@ -526,6 +688,7 @@ android:imeSubtypeLocale="tr" android:imeSubtypeMode="keyboard" android:imeSubtypeExtraValue="AsciiCapable,SupportTouchPositionCorrection,EmojiCapable" + android:isAsciiCapable="true" /> <subtype android:icon="@drawable/ic_ime_switcher_dark" android:label="@string/subtype_generic" @@ -533,6 +696,7 @@ android:imeSubtypeLocale="uk" android:imeSubtypeMode="keyboard" android:imeSubtypeExtraValue="KeyboardLayoutSet=east_slavic,EmojiCapable" + android:isAsciiCapable="false" /> <subtype android:icon="@drawable/ic_ime_switcher_dark" android:label="@string/subtype_generic" @@ -540,6 +704,7 @@ android:imeSubtypeLocale="vi" android:imeSubtypeMode="keyboard" android:imeSubtypeExtraValue="KeyboardLayoutSet=qwerty,AsciiCapable,EmojiCapable" + android:isAsciiCapable="true" /> <subtype android:icon="@drawable/ic_ime_switcher_dark" android:label="@string/subtype_generic" @@ -547,6 +712,7 @@ android:imeSubtypeLocale="zu" android:imeSubtypeMode="keyboard" android:imeSubtypeExtraValue="KeyboardLayoutSet=qwerty,AsciiCapable,EmojiCapable" + android:isAsciiCapable="true" /> <subtype android:icon="@drawable/ic_ime_switcher_dark" android:label="@string/subtype_no_language_qwerty" @@ -554,6 +720,7 @@ android:imeSubtypeLocale="zz" android:imeSubtypeMode="keyboard" android:imeSubtypeExtraValue="KeyboardLayoutSet=qwerty,AsciiCapable,EnabledWhenDefaultIsNotAsciiCapable,EmojiCapable" + android:isAsciiCapable="true" /> <!-- Emoji subtype has to be an addtional subtype added at boot time because ICS doesn't support Emoji. --> @@ -564,6 +731,7 @@ android:imeSubtypeLocale="zz" android:imeSubtypeMode="keyboard" android:imeSubtypeExtraValue="KeyboardLayoutSet=emoji,EmojiCapable" + android:isAsciiCapable="false" /> --> </input-method> diff --git a/java/res/xml/prefs.xml b/java/res/xml/prefs.xml index bf3b62353..e71d9517c 100644 --- a/java/res/xml/prefs.xml +++ b/java/res/xml/prefs.xml @@ -18,15 +18,21 @@ xmlns:android="http://schemas.android.com/apk/res/android" xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" android:key="english_ime_settings"> - <PreferenceCategory - android:title="@string/general_category" - android:key="general_settings"> + <PreferenceScreen + android:title="@string/settings_screen_input" + android:key="screen_input"> <CheckBoxPreference android:key="auto_cap" android:title="@string/auto_cap" android:summary="@string/auto_cap_summary" - android:persistent="true" - android:defaultValue="true" /> + android:defaultValue="true" + android:persistent="true" /> + <CheckBoxPreference + android:key="pref_key_use_double_space_period" + android:title="@string/use_double_space_period" + android:summary="@string/use_double_space_period_summary" + android:defaultValue="true" + android:persistent="true" /> <CheckBoxPreference android:key="vibrate_on" android:title="@string/vibrate_on_keypress" @@ -40,17 +46,67 @@ <CheckBoxPreference android:key="popup_on" android:title="@string/popup_on_keypress" - android:persistent="true" - android:defaultValue="@bool/config_default_key_preview_popup" /> + android:defaultValue="@bool/config_default_key_preview_popup" + android:persistent="true" /> <CheckBoxPreference android:key="pref_voice_input_key" android:title="@string/voice_input" - android:persistent="true" - android:defaultValue="true" /> - </PreferenceCategory> - <PreferenceCategory - android:title="@string/correction_category" - android:key="correction_settings"> + android:defaultValue="true" + android:persistent="true" /> + </PreferenceScreen> + <ListPreference + android:key="pref_keyboard_theme" + android:title="@string/keyboard_theme" + android:entryValues="@array/keyboard_theme_ids" + android:entries="@array/keyboard_theme_names" + android:persistent="true" /> + <PreferenceScreen + android:title="@string/settings_screen_multi_lingual" + android:key="screen_multi_lingual"> + <CheckBoxPreference + android:key="pref_show_language_switch_key" + android:title="@string/show_language_switch_key" + android:summary="@string/show_language_switch_key_summary" + android:defaultValue="true" + android:persistent="true" /> + <CheckBoxPreference + android:key="pref_include_other_imes_in_language_switch_list" + android:dependency="pref_show_language_switch_key" + android:title="@string/include_other_imes_in_language_switch_list" + android:summary="@string/include_other_imes_in_language_switch_list_summary" + android:defaultValue="false" + android:persistent="true" /> + <PreferenceScreen + android:fragment="com.android.inputmethod.latin.settings.AdditionalSubtypeSettings" + android:key="custom_input_styles" + android:title="@string/custom_input_styles_title" /> + </PreferenceScreen> + <PreferenceScreen + android:title="@string/settings_screen_gesture" + android:key="screen_gesture"> + <CheckBoxPreference + android:key="gesture_input" + android:title="@string/gesture_input" + android:summary="@string/gesture_input_summary" + android:defaultValue="true" + android:persistent="true" /> + <CheckBoxPreference + android:key="pref_gesture_floating_preview_text" + android:dependency="gesture_input" + android:title="@string/gesture_floating_preview_text" + android:summary="@string/gesture_floating_preview_text_summary" + android:defaultValue="true" + android:persistent="true" /> + <CheckBoxPreference + android:key="pref_gesture_preview_trail" + android:dependency="gesture_input" + android:title="@string/gesture_preview_trail" + android:defaultValue="true" + android:persistent="true" /> + </PreferenceScreen> + <PreferenceScreen + android:title="@string/settings_screen_correction" + android:key="screen_correction"> <PreferenceScreen android:key="edit_personal_dictionary" android:title="@string/edit_personal_dictionary"> @@ -71,137 +127,74 @@ android:key="pref_key_block_potentially_offensive" android:title="@string/prefs_block_potentially_offensive_title" android:summary="@string/prefs_block_potentially_offensive_summary" - android:persistent="true" - android:defaultValue="@bool/config_block_potentially_offensive" /> + android:defaultValue="@bool/config_block_potentially_offensive" + android:persistent="true" /> <ListPreference android:key="auto_correction_threshold" android:title="@string/auto_correction" android:summary="@string/auto_correction_summary" - android:persistent="true" android:entryValues="@array/auto_correction_threshold_mode_indexes" android:entries="@array/auto_correction_threshold_modes" - android:defaultValue="@string/auto_correction_threshold_mode_index_modest" /> + android:defaultValue="@string/auto_correction_threshold_mode_index_modest" + android:persistent="true" /> <ListPreference android:key="show_suggestions_setting" android:summary="@string/prefs_show_suggestions_summary" android:title="@string/prefs_show_suggestions" - android:persistent="true" android:entryValues="@array/prefs_suggestion_visibility_values" android:entries="@array/prefs_suggestion_visibilities" - android:defaultValue="@string/prefs_suggestion_visibility_default_value" /> - </PreferenceCategory> - <PreferenceCategory - android:title="@string/gesture_typing_category" - android:key="gesture_typing_settings"> - <CheckBoxPreference - android:key="gesture_input" - android:title="@string/gesture_input" - android:summary="@string/gesture_input_summary" - android:persistent="true" - android:defaultValue="true" /> - <!-- TODO: Move these two options to the advanced settings. --> + android:defaultValue="@string/prefs_suggestion_visibility_default_value" + android:persistent="true" /> <CheckBoxPreference - android:key="pref_gesture_floating_preview_text" - android:dependency="gesture_input" - android:title="@string/gesture_floating_preview_text" - android:summary="@string/gesture_floating_preview_text_summary" - android:persistent="true" - android:defaultValue="true" /> + android:key="pref_key_use_personalized_dicts" + android:title="@string/use_personalized_dicts" + android:summary="@string/use_personalized_dicts_summary" + android:defaultValue="true" + android:persistent="true" /> <CheckBoxPreference - android:key="pref_gesture_preview_trail" - android:dependency="gesture_input" - android:title="@string/gesture_preview_trail" - android:persistent="true" - android:defaultValue="true" /> - </PreferenceCategory> - <PreferenceCategory - android:title="@string/misc_category" - android:key="misc_settings"> + android:key="pref_key_use_contacts_dict" + android:title="@string/use_contacts_dict" + android:summary="@string/use_contacts_dict_summary" + android:defaultValue="true" + android:persistent="true" /> <CheckBoxPreference android:key="next_word_prediction" android:title="@string/bigram_prediction" android:summary="@string/bigram_prediction_summary" - android:persistent="true" - android:defaultValue="true" /> - <PreferenceScreen - android:key="pref_advanced_settings" - android:title="@string/advanced_settings" - android:summary="@string/advanced_settings_summary"> - <CheckBoxPreference - android:key="pref_key_use_contacts_dict" - android:title="@string/use_contacts_dict" - android:summary="@string/use_contacts_dict_summary" - android:persistent="true" - android:defaultValue="true" /> - <CheckBoxPreference - android:key="pref_key_use_double_space_period" - android:title="@string/use_double_space_period" - android:summary="@string/use_double_space_period_summary" - android:persistent="true" - android:defaultValue="true" /> - <CheckBoxPreference - android:key="pref_show_language_switch_key" - android:title="@string/show_language_switch_key" - android:summary="@string/show_language_switch_key_summary" - android:persistent="true" - android:defaultValue="true" /> - <CheckBoxPreference - android:key="pref_include_other_imes_in_language_switch_list" - android:title="@string/include_other_imes_in_language_switch_list" - android:summary="@string/include_other_imes_in_language_switch_list_summary" - android:persistent="true" - android:defaultValue="false" /> - <!-- Values for popup dismiss delay are added programmatically --> - <CheckBoxPreference - android:key="pref_sliding_key_input_preview" - android:title="@string/sliding_key_input_preview" - android:summary="@string/sliding_key_input_preview_summary" - android:persistent="true" - android:defaultValue="true" /> - <ListPreference - android:key="pref_keyboard_layout_20110916" - android:title="@string/keyboard_color_scheme" - android:persistent="true" - android:entryValues="@array/keyboard_color_schemes_values" - android:entries="@array/keyboard_color_schemes" - android:defaultValue="@string/config_default_keyboard_theme_index" /> - <PreferenceScreen - android:fragment="com.android.inputmethod.latin.settings.AdditionalSubtypeSettings" - android:key="custom_input_styles" - android:title="@string/custom_input_styles_title" /> - <ListPreference - android:key="pref_key_preview_popup_dismiss_delay" - android:title="@string/key_preview_popup_dismiss_delay" /> - <com.android.inputmethod.latin.settings.SeekBarDialogPreference - android:key="pref_key_longpress_timeout" - android:title="@string/prefs_key_longpress_timeout_settings" - latin:minValue="@integer/config_min_longpress_timeout" - latin:maxValue="@integer/config_max_longpress_timeout" - latin:stepValue="@integer/config_longpress_timeout_step" /> - <com.android.inputmethod.latin.settings.SeekBarDialogPreference - android:key="pref_vibration_duration_settings" - android:title="@string/prefs_keypress_vibration_duration_settings" - latin:maxValue="@integer/config_max_vibration_duration" /> - <com.android.inputmethod.latin.settings.SeekBarDialogPreference - android:key="pref_keypress_sound_volume" - android:title="@string/prefs_keypress_sound_volume_settings" - latin:maxValue="100" /> <!-- percent --> - <!-- The settigs for showing setup wizard application icon shouldn't be persistent and - the default value is added programmatically. --> - <CheckBoxPreference - android:key="pref_show_setup_wizard_icon" - android:title="@string/show_setup_wizard_icon" - android:summary="@string/show_setup_wizard_icon_summary" /> + android:defaultValue="true" + android:persistent="true" /> </PreferenceScreen> + <PreferenceScreen + android:title="@string/settings_screen_advanced" + android:key="screen_advanced"> + <!-- TODO: consolidate key preview dismiss delay with the key preview animation parameters. --> + <ListPreference + android:key="pref_key_preview_popup_dismiss_delay" + android:title="@string/key_preview_popup_dismiss_delay" /> + <com.android.inputmethod.latin.settings.SeekBarDialogPreference + android:key="pref_vibration_duration_settings" + android:title="@string/prefs_keypress_vibration_duration_settings" + latin:maxValue="@integer/config_max_vibration_duration" /> + <com.android.inputmethod.latin.settings.SeekBarDialogPreference + android:key="pref_keypress_sound_volume" + android:title="@string/prefs_keypress_sound_volume_settings" + latin:maxValue="100" /> <!-- percent --> + <!-- The settigs for showing setup wizard application icon shouldn't be persistent and + the default value is added programmatically. --> + <CheckBoxPreference + android:key="pref_show_setup_wizard_icon" + android:title="@string/show_setup_wizard_icon" + android:summary="@string/show_setup_wizard_icon_summary" /> + <!-- title will be set programmatically to embed application name --> + <CheckBoxPreference + android:key="pref_enable_metrics_logging" + android:summary="@string/enable_metrics_logging_summary" + android:defaultValue="true" + android:persistent="true" /> <PreferenceScreen - android:key="send_feedback" - android:title="@string/send_feedback" /> - <PreferenceScreen - android:key="about_keyboard" /> - <PreferenceScreen - android:key="debug_settings" + android:key="screen_debug" android:title="Debug settings" - android:persistent="true" - android:defaultValue="false" /> - </PreferenceCategory> + android:defaultValue="false" + android:persistent="true" /> + </PreferenceScreen> </PreferenceScreen> diff --git a/java/res/xml/prefs_for_debug.xml b/java/res/xml/prefs_for_debug.xml index 8d9508e38..ae29a8a82 100644 --- a/java/res/xml/prefs_for_debug.xml +++ b/java/res/xml/prefs_for_debug.xml @@ -14,51 +14,55 @@ limitations under the License. --> -<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" - android:title="@string/prefs_debug_mode" - android:key="english_ime_debug_settings"> - - <CheckBoxPreference - android:key="enable_logging" - android:title="@string/prefs_enable_log" - android:summary="@string/prefs_description_log" - android:persistent="true" - android:defaultValue="false" /> - - <ListPreference - android:key="pref_keyboard_layout_20110916" - android:title="@string/keyboard_layout" - android:summary="%s" - android:persistent="true" - android:entryValues="@array/keyboard_layout_modes_values" - android:entries="@array/keyboard_layout_modes" - android:defaultValue="@string/config_default_keyboard_theme_index" /> - - <CheckBoxPreference - android:key="debug_mode" - android:title="@string/prefs_debug_mode" - android:persistent="true" - android:defaultValue="false" /> - +<PreferenceScreen + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" + android:title="@string/prefs_debug_mode" + android:key="english_ime_debug_settings" +> <CheckBoxPreference - android:key="force_non_distinct_multitouch" - android:title="@string/prefs_force_non_distinct_multitouch" - android:persistent="true" - android:defaultValue="false" /> - - <CheckBoxPreference - android:key="usability_study_mode" - android:title="@string/prefs_usability_study_mode" - android:persistent="true" - android:defaultValue="false" /> - + android:key="debug_mode" + android:title="@string/prefs_debug_mode" + android:defaultValue="false" + android:persistent="true" /> <CheckBoxPreference + android:key="force_non_distinct_multitouch" + android:title="@string/prefs_force_non_distinct_multitouch" android:defaultValue="false" - android:key="use_only_personalization_dictionary_for_debug" - android:persistent="true" - android:title="@string/prefs_use_only_personalization_dictionary" /> - + android:persistent="true" /> + <CheckBoxPreference + android:key="pref_sliding_key_input_preview" + android:title="@string/sliding_key_input_preview" + android:summary="@string/sliding_key_input_preview_summary" + android:defaultValue="true" + android:persistent="true" /> + <com.android.inputmethod.latin.settings.SeekBarDialogPreference + android:key="pref_key_longpress_timeout" + android:title="@string/prefs_key_longpress_timeout_settings" + latin:minValue="@integer/config_min_longpress_timeout" + latin:maxValue="@integer/config_max_longpress_timeout" + latin:stepValue="@integer/config_longpress_timeout_step" /> + <com.android.inputmethod.latin.settings.SeekBarDialogPreference + android:key="pref_key_preview_show_up_start_scale" + android:title="@string/prefs_key_popup_show_up_start_scale_settings" + latin:maxValue="100" /> <!-- percent --> + <com.android.inputmethod.latin.settings.SeekBarDialogPreference + android:key="pref_key_preview_dismiss_end_scale" + android:title="@string/prefs_key_popup_dismiss_end_scale_settings" + latin:maxValue="100" /> <!-- percent --> + <com.android.inputmethod.latin.settings.SeekBarDialogPreference + android:key="pref_key_preview_show_up_duration" + android:title="@string/prefs_key_popup_show_up_duration_settings" + latin:maxValue="100" /> <!-- milliseconds --> + <com.android.inputmethod.latin.settings.SeekBarDialogPreference + android:key="pref_key_preview_dismiss_duration" + android:title="@string/prefs_key_popup_dismiss_duration_settings" + latin:maxValue="100" /> <!-- milliseconds --> <PreferenceScreen android:key="read_external_dictionary" android:title="@string/prefs_read_external_dictionary" /> + <PreferenceCategory + android:key="pref_key_dump_dictionaries" + android:title="@string/prefs_dump_dynamic_dicts"> + </PreferenceCategory> </PreferenceScreen> diff --git a/java/res/xml/row_dvorak4.xml b/java/res/xml/row_dvorak4.xml index b78872fe4..e7a3ee736 100644 --- a/java/res/xml/row_dvorak4.xml +++ b/java/res/xml/row_dvorak4.xml @@ -28,17 +28,16 @@ latin:keyStyle="toSymbolKeyStyle" latin:keyWidth="15%p" /> <Key - latin:keyLabel="q" + latin:keySpec="q" latin:backgroundType="normal" - latin:additionalMoreKeys="!text/shortcut_as_more_key" - latin:keyStyle="f1MoreKeysStyle" /> + latin:keyStyle="settingsMoreKeysStyle" /> <include latin:keyXPos="25%p" latin:keyboardLayout="@xml/key_space_5kw" /> <Key - latin:keyLabel="z" + latin:keySpec="z" latin:keyLabelFlags="hasPopupHint" - latin:moreKeys="!text/more_keys_for_punctuation,!text/more_keys_for_z" /> + latin:moreKeys="!text/morekeys_punctuation,!text/morekeys_z" /> <Key latin:keyStyle="enterKeyStyle" latin:keyWidth="fillRight" /> diff --git a/java/res/xml/row_pcqwerty5.xml b/java/res/xml/row_pcqwerty5.xml index 4ec908ba1..32c5389cc 100644 --- a/java/res/xml/row_pcqwerty5.xml +++ b/java/res/xml/row_pcqwerty5.xml @@ -24,23 +24,14 @@ <Row latin:keyWidth="7.692%p" > - <Spacer - latin:keyWidth="11.538%p" /> <switch> <case - latin:shortcutKeyEnabled="true" - > - <Key - latin:keyStyle="shortcutKeyStyle" - latin:keyWidth="11.538%p" /> - </case> - <case latin:clobberSettingsKey="false" > <Key latin:keyStyle="settingsKeyStyle" latin:keyWidth="11.538%p" /> - </case> + </case> </switch> <switch> <case @@ -48,33 +39,23 @@ > <Key latin:keyStyle="languageSwitchKeyStyle" + latin:keyXPos="19.231%p" latin:keyWidth="11.538%p" /> <Key latin:keyStyle="spaceKeyStyle" - latin:keyWidth="38.464%p" /> - </case> + latin:keyWidth="42.308%p" /> + </case> <!-- languageSwitchKeyEnabled="false" --> <default> <Key latin:keyStyle="spaceKeyStyle" - latin:keyWidth="50.002%p" /> + latin:keyXPos="26.923%p" + latin:keyWidth="46.154%p" /> </default> </switch> <Key - latin:keyStyle="defaultEnterKeyStyle" - latin:keyWidth="15.384%p" /> - <switch> - <case - latin:keyboardLayoutSetElement="alphabet|alphabetAutomaticShifted" - > - <Spacer /> - </case> - <!-- keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted" --> - <default> - <Key - latin:keyStyle="emojiKeyStyle" - latin:keyWidth="fillRight" /> - </default> - </switch> + latin:keyStyle="enterKeyStyle" + latin:keyXPos="-19.231%p" + latin:keyWidth="fillRight" /> </Row> </merge> diff --git a/java/res/xml/row_qwerty4.xml b/java/res/xml/row_qwerty4.xml index 578bc1234..509092d96 100644 --- a/java/res/xml/row_qwerty4.xml +++ b/java/res/xml/row_qwerty4.xml @@ -32,36 +32,8 @@ <include latin:keyXPos="25%p" latin:keyboardLayout="@xml/key_space_5kw" /> - <switch> - <case - latin:languageCode="ar|fa" - > - <Key - latin:keyHintLabel="!text/keyhintlabel_for_arabic_diacritics" - latin:keyLabelFlags="hasPopupHint|hasShiftedLetterHint" - latin:moreKeys="!text/more_keys_for_arabic_diacritics" - latin:keyStyle="punctuationKeyStyle" /> - </case> - <case - latin:languageCode="ne" - latin:keyboardLayoutSet="nepali_traditional" - > - <include - latin:keyboardLayout="@xml/key_nepali_traditional_period" /> - </case> - <case - latin:languageCode="hy" - > - <!-- U+0589: "։" ARMENIAN FULL STOP --> - <Key - latin:keyLabel="։" - latin:keyStyle="punctuationKeyStyle" /> - </case> - <default> - <Key - latin:keyStyle="punctuationKeyStyle" /> - </default> - </switch> + <include + latin:keyboardLayout="@xml/key_period" /> <Key latin:keyStyle="enterKeyStyle" latin:keyWidth="fillRight" /> diff --git a/java/res/xml/row_symbols4.xml b/java/res/xml/row_symbols4.xml index fbfdc5f72..2be03bd6d 100644 --- a/java/res/xml/row_symbols4.xml +++ b/java/res/xml/row_symbols4.xml @@ -19,24 +19,16 @@ --> <merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" > - <Key - latin:backgroundType="functional" - latin:keyLabel="_" /> + latin:keySpec="!text/keyspec_comma" /> <Key - latin:backgroundType="functional" - latin:keyLabel="/" /> - - <switch> - <case latin:hasShortcutKey="true" > - <Key latin:keyStyle="shortcutKeyStyle" /> - </case> - <!-- latin:hasShortcutKey="false" --> - <default> - </default> - </switch> - - <include latin:keyboardLayout="@xml/key_space_symbols" /> - <include latin:keyboardLayout="@xml/keys_comma_period" /> - + latin:keySpec="_" /> + <include + latin:keyboardLayout="@xml/key_space_symbols" /> + <Key + latin:keySpec="/" /> + <!-- U+2026: "…" HORIZONTAL ELLIPSIS --> + <Key + latin:keySpec="." + latin:moreKeys="…" /> </merge> diff --git a/java/res/xml/row_symbols_shift4.xml b/java/res/xml/row_symbols_shift4.xml index 0909374f4..4fc63c2c5 100644 --- a/java/res/xml/row_symbols_shift4.xml +++ b/java/res/xml/row_symbols_shift4.xml @@ -18,9 +18,18 @@ */ --> <merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" > - - <include latin:keyboardLayout="@xml/keys_less_greater" /> + <include + latin:keyboardLayout="@xml/key_styles_less_greater" /> + <Key + latin:keySpec="!text/keyspec_comma" /> + <Key + latin:keyStyle="lessKeyStyle" /> <include latin:keyboardLayout="@xml/key_space_symbols" /> - <include latin:keyboardLayout="@xml/keys_comma_period" /> + <Key + latin:keyStyle="greaterKeyStyle" /> + <!-- U+2026: "…" HORIZONTAL ELLIPSIS --> + <Key + latin:keySpec="." + latin:moreKeys="…" /> </merge> diff --git a/java/res/xml/rowkeys_arabic1.xml b/java/res/xml/rowkeys_arabic1.xml index 3c0acf112..9f83fef50 100644 --- a/java/res/xml/rowkeys_arabic1.xml +++ b/java/res/xml/rowkeys_arabic1.xml @@ -18,95 +18,82 @@ */ --> -<merge - xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" -> +<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"> <!-- U+0636: "ض" ARABIC LETTER DAD U+0661: "١" ARABIC-INDIC DIGIT ONE --> <Key - latin:keyLabel="ض" + latin:keySpec="ض" latin:keyHintLabel="1" - latin:additionalMoreKeys="1,١" - latin:keyLabelFlags="fontNormal" /> + latin:additionalMoreKeys="1,١" /> <!-- U+0635: "ص" ARABIC LETTER SAD U+0662: "٢" ARABIC-INDIC DIGIT TWO --> <Key - latin:keyLabel="ص" + latin:keySpec="ص" latin:keyHintLabel="2" - latin:additionalMoreKeys="2,٢" - latin:keyLabelFlags="fontNormal" /> + latin:additionalMoreKeys="2,٢" /> <!-- U+062B: "ث" ARABIC LETTER THEH U+0663: "٣" ARABIC-INDIC DIGIT THREE --> <Key - latin:keyLabel="ث" + latin:keySpec="ث" latin:keyHintLabel="3" - latin:additionalMoreKeys="3,٣" - latin:keyLabelFlags="fontNormal" /> + latin:additionalMoreKeys="3,٣" /> <!-- U+0642: "ق" ARABIC LETTER QAF - U+06A8: "ڨ" ARABIC LETTER QAF WITH THREE DOTS ABOVE - U+0664: "٤" ARABIC-INDIC DIGIT FOUR --> + U+0664: "٤" ARABIC-INDIC DIGIT FOUR + U+06A8: "ڨ" ARABIC LETTER QAF WITH THREE DOTS ABOVE --> <!-- TODO: DroidSansArabic lacks the glyph of U+06A8 ARABIC LETTER QAF WITH THREE DOTS ABOVE --> <Key - latin:keyLabel="ق" + latin:keySpec="ق" latin:keyHintLabel="4" latin:additionalMoreKeys="4,٤" - latin:moreKeys="ڨ" - latin:keyLabelFlags="fontNormal" /> + latin:moreKeys="ڨ" /> <!-- U+0641: "ف" ARABIC LETTER FEH + U+0665: "٥" ARABIC-INDIC DIGIT FIVE U+06A4: "ڤ" ARABIC LETTER VEH U+06A2: "ڢ" ARABIC LETTER FEH WITH DOT MOVED BELOW - U+06A5: "ڥ" ARABIC LETTER FEH WITH THREE DOTS BELOW - U+0665: "٥" ARABIC-INDIC DIGIT FIVE --> + U+06A5: "ڥ" ARABIC LETTER FEH WITH THREE DOTS BELOW --> <!-- TODO: DroidSansArabic lacks the glyph of U+06A2 ARABIC LETTER FEH WITH DOT MOVED BELOW --> <!-- TODO: DroidSansArabic lacks the glyph of U+06A5 ARABIC LETTER FEH WITH THREE DOTS BELOW --> <Key - latin:keyLabel="ف" + latin:keySpec="ف" latin:keyHintLabel="5" latin:additionalMoreKeys="5,٥" - latin:moreKeys="ڤ,ڢ,ڥ" - latin:keyLabelFlags="fontNormal" /> + latin:moreKeys="ڤ,ڢ,ڥ" /> <!-- U+063A: "غ" ARABIC LETTER GHAIN U+0666: "٦" ARABIC-INDIC DIGIT SIX --> <Key - latin:keyLabel="غ" + latin:keySpec="غ" latin:keyHintLabel="6" - latin:additionalMoreKeys="6,٦" - latin:keyLabelFlags="fontNormal" /> + latin:additionalMoreKeys="6,٦" /> <!-- U+0639: "ع" ARABIC LETTER AIN U+0667: "٧" ARABIC-INDIC DIGIT SEVEN --> <Key - latin:keyLabel="ع" + latin:keySpec="ع" latin:keyHintLabel="7" - latin:additionalMoreKeys="7,٧" - latin:keyLabelFlags="fontNormal" /> + latin:additionalMoreKeys="7,٧" /> <!-- U+0647: "ه" ARABIC LETTER HEH + U+0668: "٨" ARABIC-INDIC DIGIT EIGHT U+FEEB: "ﻫ" ARABIC LETTER HEH INITIAL FORM - U+0647 U+200D: ARABIC LETTER HEH + ZERO WIDTH JOINER - U+0668: "٨" ARABIC-INDIC DIGIT EIGHT --> + U+0647 U+200D: ARABIC LETTER HEH + ZERO WIDTH JOINER --> <Key - latin:keyLabel="ه" + latin:keySpec="ه" latin:keyHintLabel="8" latin:additionalMoreKeys="8,٨" - latin:moreKeys="ﻫ|ه‍" - latin:keyLabelFlags="fontNormal" /> + latin:moreKeys="ﻫ|ه‍" /> <!-- U+062E: "خ" ARABIC LETTER KHAH U+0669: "٩" ARABIC-INDIC DIGIT NINE --> <Key - latin:keyLabel="خ" + latin:keySpec="خ" latin:keyHintLabel="9" - latin:additionalMoreKeys="9,٩" - latin:keyLabelFlags="fontNormal" /> + latin:additionalMoreKeys="9,٩" /> <!-- U+062D: "ح" ARABIC LETTER HAH U+0660: "٠" ARABIC-INDIC DIGIT ZERO --> <Key - latin:keyLabel="ح" + latin:keySpec="ح" latin:keyHintLabel="0" - latin:additionalMoreKeys="0,٠" - latin:keyLabelFlags="fontNormal" /> + latin:additionalMoreKeys="0,٠" /> <!-- U+062C: "ج" ARABIC LETTER JEEM U+0686: "چ" ARABIC LETTER TCHEH --> <Key - latin:keyLabel="ج" - latin:moreKeys="چ" - latin:keyLabelFlags="fontNormal" /> + latin:keySpec="ج" + latin:moreKeys="چ" /> </merge> diff --git a/java/res/xml/rowkeys_arabic2.xml b/java/res/xml/rowkeys_arabic2.xml index 4f8090d01..4f401e8bc 100644 --- a/java/res/xml/rowkeys_arabic2.xml +++ b/java/res/xml/rowkeys_arabic2.xml @@ -18,33 +18,26 @@ */ --> -<merge - xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" -> +<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"> <!-- U+0634: "ش" ARABIC LETTER SHEEN U+069C: "ڜ" ARABIC LETTER SEEN WITH THREE DOTS BELOW AND THREE DOTS ABOVE --> <!-- TODO: DroidSansArabic lacks the glyph of U+069C ARABIC LETTER SEEN WITH THREE DOTS BELOW AND THREE DOTS ABOVE --> <Key - latin:keyLabel="ش" - latin:moreKeys="ڜ" - latin:keyLabelFlags="fontNormal" /> + latin:keySpec="ش" + latin:moreKeys="ڜ" /> <!-- U+0633: "س" ARABIC LETTER SEEN --> - <Key - latin:keyLabel="س" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="س" /> <!-- U+064A: "ي" ARABIC LETTER YEH U+0626: "ئ" ARABIC LETTER YEH WITH HAMZA ABOVE U+0649: "ى" ARABIC LETTER ALEF MAKSURA --> <Key - latin:keyLabel="ي" - latin:moreKeys="ئ,ى" - latin:keyLabelFlags="fontNormal" /> + latin:keySpec="ي" + latin:moreKeys="ئ,ى" /> <!-- U+0628: "ب" ARABIC LETTER BEH U+067E: "پ" ARABIC LETTER PEH --> <Key - latin:keyLabel="ب" - latin:moreKeys="پ" - latin:keyLabelFlags="fontNormal" /> + latin:keySpec="ب" + latin:moreKeys="پ" /> <!-- U+0644: "ل" ARABIC LETTER LAM U+FEFB: "ﻻ" ARABIC LIGATURE LAM WITH ALEF ISOLATED FORM U+0627: "ا" ARABIC LETTER ALEF @@ -55,9 +48,8 @@ U+FEF5: "ﻵ" ARABIC LIGATURE LAM WITH ALEF WITH MADDA ABOVE ISOLATED FORM U+0622: "آ" ARABIC LETTER ALEF WITH MADDA ABOVE --> <Key - latin:keyLabel="ل" - latin:moreKeys="ﻻ|لا,ﻷ|لأ,ﻹ|لإ,ﻵ|لآ" - latin:keyLabelFlags="fontNormal" /> + latin:keySpec="ل" + latin:moreKeys="ﻻ|لا,ﻷ|لأ,ﻹ|لإ,ﻵ|لآ" /> <!-- U+0627: "ا" ARABIC LETTER ALEF U+0622: "آ" ARABIC LETTER ALEF WITH MADDA ABOVE U+0621: "ء" ARABIC LETTER HAMZA @@ -65,30 +57,20 @@ U+0625: "إ" ARABIC LETTER ALEF WITH HAMZA BELOW U+0671: "ٱ" ARABIC LETTER ALEF WASLA --> <Key - latin:keyLabel="ا" - latin:moreKeys="!fixedColumnOrder!5,آ,ء,أ,إ,ٱ" - latin:keyLabelFlags="fontNormal" /> + latin:keySpec="ا" + latin:moreKeys="!fixedColumnOrder!5,آ,ء,أ,إ,ٱ" /> <!-- U+062A: "ت" ARABIC LETTER TEH --> - <Key - latin:keyLabel="ت" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ت" /> <!-- U+0646: "ن" ARABIC LETTER NOON --> - <Key - latin:keyLabel="ن" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ن" /> <!-- U+0645: "م" ARABIC LETTER MEEM --> - <Key - latin:keyLabel="م" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="م" /> <!-- U+0643: "ك" ARABIC LETTER KAF U+06AF: "گ" ARABIC LETTER GAF U+06A9: "ک" ARABIC LETTER KEHEH --> <Key - latin:keyLabel="ك" - latin:moreKeys="گ,ک" - latin:keyLabelFlags="fontNormal" /> + latin:keySpec="ك" + latin:moreKeys="گ,ک" /> <!-- U+0637: "ط" ARABIC LETTER TAH --> - <Key - latin:keyLabel="ط" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ط" /> </merge> diff --git a/java/res/xml/rowkeys_arabic3.xml b/java/res/xml/rowkeys_arabic3.xml index 8a17b4b98..8b178013e 100644 --- a/java/res/xml/rowkeys_arabic3.xml +++ b/java/res/xml/rowkeys_arabic3.xml @@ -18,49 +18,30 @@ */ --> -<merge - xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" -> - <include - latin:keyboardLayout="@xml/keys_arabic3_left" /> +<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"> + <include latin:keyboardLayout="@xml/keys_arabic3_left" /> <!-- U+0621: "ء" ARABIC LETTER HAMZA --> - <Key - latin:keyLabel="ء" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ء" /> <!-- U+0624: "ؤ" ARABIC LETTER WAW WITH HAMZA ABOVE --> - <Key - latin:keyLabel="ؤ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ؤ" /> <!-- U+0631: "ر" ARABIC LETTER REH --> - <Key - latin:keyLabel="ر" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ر" /> <!-- U+0649: "ى" ARABIC LETTER ALEF MAKSURA U+0626: "ئ" ARABIC LETTER YEH WITH HAMZA ABOVE --> <Key - latin:keyLabel="ى" - latin:moreKeys="ئ" - latin:keyLabelFlags="fontNormal" /> + latin:keySpec="ى" + latin:moreKeys="ئ" /> <!-- U+0629: "ة" ARABIC LETTER TEH MARBUTA --> - <Key - latin:keyLabel="ة" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ة" /> <!-- U+0648: "و" ARABIC LETTER WAW --> - <Key - latin:keyLabel="و" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="و" /> <!-- U+0632: "ز" ARABIC LETTER ZAIN U+0698: "ژ" ARABIC LETTER JEH --> <Key - latin:keyLabel="ز" - latin:moreKeys="ژ" - latin:keyLabelFlags="fontNormal" /> + latin:keySpec="ز" + latin:moreKeys="ژ" /> <!-- U+0638: "ظ" ARABIC LETTER ZAH --> - <Key - latin:keyLabel="ظ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ظ" /> <!-- U+062F: "د" ARABIC LETTER DAL --> - <Key - latin:keyLabel="د" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="د" /> </merge> diff --git a/java/res/xml/rowkeys_armenian_phonetic1.xml b/java/res/xml/rowkeys_armenian_phonetic1.xml index 1984fae8a..8d54b179c 100644 --- a/java/res/xml/rowkeys_armenian_phonetic1.xml +++ b/java/res/xml/rowkeys_armenian_phonetic1.xml @@ -18,67 +18,55 @@ */ --> -<merge - xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" -> +<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"> <!-- U+0567: "է" ARMENIAN SMALL LETTER EH --> <Key - latin:keyLabel="է" + latin:keySpec="է" latin:keyHintLabel="1" - latin:additionalMoreKeys="1" - latin:keyLabelFlags="fontNormal" /> + latin:additionalMoreKeys="1" /> <!-- U+0569: "թ" ARMENIAN SMALL LETTER TO --> <Key - latin:keyLabel="թ" + latin:keySpec="թ" latin:keyHintLabel="2" - latin:additionalMoreKeys="2" - latin:keyLabelFlags="fontNormal" /> + latin:additionalMoreKeys="2" /> <!-- U+0583: "փ" ARMENIAN SMALL LETTER PIWR --> <Key - latin:keyLabel="փ" + latin:keySpec="փ" latin:keyHintLabel="3" - latin:additionalMoreKeys="3" - latin:keyLabelFlags="fontNormal" /> + latin:additionalMoreKeys="3" /> <!-- U+0571: "ձ" ARMENIAN SMALL LETTER JA --> <Key - latin:keyLabel="ձ" + latin:keySpec="ձ" latin:keyHintLabel="4" - latin:additionalMoreKeys="4" - latin:keyLabelFlags="fontNormal" /> + latin:additionalMoreKeys="4" /> <!-- U+057B: "ջ" ARMENIAN SMALL LETTER JHEH --> <Key - latin:keyLabel="ջ" + latin:keySpec="ջ" latin:keyHintLabel="5" - latin:additionalMoreKeys="5" - latin:keyLabelFlags="fontNormal" /> + latin:additionalMoreKeys="5" /> <!-- U+0580: "ր" ARMENIAN SMALL LETTER REH --> <Key - latin:keyLabel="ր" + latin:keySpec="ր" latin:keyHintLabel="6" - latin:additionalMoreKeys="6" - latin:keyLabelFlags="fontNormal" /> + latin:additionalMoreKeys="6" /> <!-- U+0579: "չ" ARMENIAN SMALL LETTER CHA --> <Key - latin:keyLabel="չ" + latin:keySpec="չ" latin:keyHintLabel="7" - latin:additionalMoreKeys="7" - latin:keyLabelFlags="fontNormal" /> + latin:additionalMoreKeys="7" /> <!-- U+0573: "ճ" ARMENIAN SMALL LETTER CHEH --> <Key - latin:keyLabel="ճ" + latin:keySpec="ճ" latin:keyHintLabel="8" - latin:additionalMoreKeys="8" - latin:keyLabelFlags="fontNormal" /> + latin:additionalMoreKeys="8" /> <!-- U+056A: "ժ" ARMENIAN SMALL LETTER ZHE --> <Key - latin:keyLabel="ժ" + latin:keySpec="ժ" latin:keyHintLabel="9" - latin:additionalMoreKeys="9" - latin:keyLabelFlags="fontNormal" /> + latin:additionalMoreKeys="9" /> <!-- U+056E: "ծ" ARMENIAN SMALL LETTER CA --> <Key - latin:keyLabel="ծ" + latin:keySpec="ծ" latin:keyHintLabel="0" - latin:additionalMoreKeys="0" - latin:keyLabelFlags="fontNormal" /> + latin:additionalMoreKeys="0" /> </merge> diff --git a/java/res/xml/rowkeys_armenian_phonetic2.xml b/java/res/xml/rowkeys_armenian_phonetic2.xml index 5dcabc301..cb1b932b9 100644 --- a/java/res/xml/rowkeys_armenian_phonetic2.xml +++ b/java/res/xml/rowkeys_armenian_phonetic2.xml @@ -18,49 +18,29 @@ */ --> -<merge - xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" -> +<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"> <!-- U+0584: "ք" ARMENIAN SMALL LETTER KEH --> - <Key - latin:keyLabel="ք" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ք" /> <!-- U+0578: "ո" ARMENIAN SMALL LETTER VO --> - <Key - latin:keyLabel="ո" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ո" /> <!-- U+0565: "ե" ARMENIAN SMALL LETTER ECH U+0587: "և" ARMENIAN SMALL LIGATURE ECH YIWN --> <Key - latin:keyLabel="ե" + latin:keySpec="ե" latin:moreKeys="և" - latin:keyLabelFlags="fontNormal" /> + latin:keyHintLabel="և" /> <!-- U+057C: "ռ" ARMENIAN SMALL LETTER RA --> - <Key - latin:keyLabel="ռ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ռ" /> <!-- U+057F: "տ" ARMENIAN SMALL LETTER TIWN --> - <Key - latin:keyLabel="տ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="տ" /> <!-- U+0568: "ը" ARMENIAN SMALL LETTER ET --> - <Key - latin:keyLabel="ը" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ը" /> <!-- U+0582: "ւ" ARMENIAN SMALL LETTER YIWN --> - <Key - latin:keyLabel="ւ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ւ" /> <!-- U+056B: "ի" ARMENIAN SMALL LETTER INI --> - <Key - latin:keyLabel="ի" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ի" /> <!-- U+0585: "օ" ARMENIAN SMALL LETTER OH --> - <Key - latin:keyLabel="օ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="օ" /> <!-- U+057A: "պ" ARMENIAN SMALL LETTER PEH --> - <Key - latin:keyLabel="պ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="պ" /> </merge> diff --git a/java/res/xml/rowkeys_armenian_phonetic3.xml b/java/res/xml/rowkeys_armenian_phonetic3.xml index 3116811b3..33db4529f 100644 --- a/java/res/xml/rowkeys_armenian_phonetic3.xml +++ b/java/res/xml/rowkeys_armenian_phonetic3.xml @@ -18,43 +18,23 @@ */ --> -<merge - xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" -> +<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"> <!-- U+0561: "ա" ARMENIAN SMALL LETTER AYB --> - <Key - latin:keyLabel="ա" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ա" /> <!-- U+057D: "ս" ARMENIAN SMALL LETTER SEH --> - <Key - latin:keyLabel="ս" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ս" /> <!-- U+0564: "դ" ARMENIAN SMALL LETTER DA --> - <Key - latin:keyLabel="դ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="դ" /> <!-- U+0586: "ֆ" ARMENIAN SMALL LETTER FEH --> - <Key - latin:keyLabel="ֆ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ֆ" /> <!-- U+0563: "գ" ARMENIAN SMALL LETTER GIM --> - <Key - latin:keyLabel="գ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="գ" /> <!-- U+0570: "հ" ARMENIAN SMALL LETTER HO --> - <Key - latin:keyLabel="հ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="հ" /> <!-- U+0575: "յ" ARMENIAN SMALL LETTER YI --> - <Key - latin:keyLabel="յ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="յ" /> <!-- U+056F: "կ" ARMENIAN SMALL LETTER KEN --> - <Key - latin:keyLabel="կ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="կ" /> <!-- U+056C: "լ" ARMENIAN SMALL LETTER LIWN --> - <Key - latin:keyLabel="լ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="լ" /> </merge> diff --git a/java/res/xml/rowkeys_armenian_phonetic4.xml b/java/res/xml/rowkeys_armenian_phonetic4.xml index 922481add..c7db25b73 100644 --- a/java/res/xml/rowkeys_armenian_phonetic4.xml +++ b/java/res/xml/rowkeys_armenian_phonetic4.xml @@ -18,35 +18,19 @@ */ --> -<merge - xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" -> +<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"> <!-- U+0566: "զ" ARMENIAN SMALL LETTER ZA --> - <Key - latin:keyLabel="զ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="զ" /> <!-- U+0572: "ղ" ARMENIAN SMALL LETTER GHAD --> - <Key - latin:keyLabel="ղ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ղ" /> <!-- U+0581: "ց" ARMENIAN SMALL LETTER CO --> - <Key - latin:keyLabel="ց" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ց" /> <!-- U+057E: "վ" ARMENIAN SMALL LETTER VEW --> - <Key - latin:keyLabel="վ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="վ" /> <!-- U+0562: "բ" ARMENIAN SMALL LETTER BEN --> - <Key - latin:keyLabel="բ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="բ" /> <!-- U+0576: "ն" ARMENIAN SMALL LETTER NOW --> - <Key - latin:keyLabel="ն" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ն" /> <!-- U+0574: "մ" ARMENIAN SMALL LETTER MEN --> - <Key - latin:keyLabel="մ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="մ" /> </merge> diff --git a/java/res/xml/rowkeys_azerty1.xml b/java/res/xml/rowkeys_azerty1.xml index 42b27463f..67be342c0 100644 --- a/java/res/xml/rowkeys_azerty1.xml +++ b/java/res/xml/rowkeys_azerty1.xml @@ -22,52 +22,52 @@ xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" > <Key - latin:keyLabel="a" + latin:keySpec="a" latin:keyHintLabel="1" latin:additionalMoreKeys="1" - latin:moreKeys="!text/more_keys_for_a" /> + latin:moreKeys="!text/morekeys_a" /> <Key - latin:keyLabel="z" + latin:keySpec="z" latin:keyHintLabel="2" latin:additionalMoreKeys="2" - latin:moreKeys="!text/more_keys_for_z" /> + latin:moreKeys="!text/morekeys_z" /> <Key - latin:keyLabel="e" + latin:keySpec="e" latin:keyHintLabel="3" latin:additionalMoreKeys="3" - latin:moreKeys="!text/more_keys_for_e" /> + latin:moreKeys="!text/morekeys_e" /> <Key - latin:keyLabel="r" + latin:keySpec="r" latin:keyHintLabel="4" latin:additionalMoreKeys="4" - latin:moreKeys="!text/more_keys_for_r" /> + latin:moreKeys="!text/morekeys_r" /> <Key - latin:keyLabel="t" + latin:keySpec="t" latin:keyHintLabel="5" latin:additionalMoreKeys="5" - latin:moreKeys="!text/more_keys_for_t" /> + latin:moreKeys="!text/morekeys_t" /> <Key - latin:keyLabel="y" + latin:keySpec="y" latin:keyHintLabel="6" latin:additionalMoreKeys="6" - latin:moreKeys="!text/more_keys_for_y" /> + latin:moreKeys="!text/morekeys_y" /> <Key - latin:keyLabel="u" + latin:keySpec="u" latin:keyHintLabel="7" latin:additionalMoreKeys="7" - latin:moreKeys="!text/more_keys_for_u" /> + latin:moreKeys="!text/morekeys_u" /> <Key - latin:keyLabel="i" + latin:keySpec="i" latin:keyHintLabel="8" latin:additionalMoreKeys="8" - latin:moreKeys="!text/more_keys_for_i" /> + latin:moreKeys="!text/morekeys_i" /> <Key - latin:keyLabel="o" + latin:keySpec="o" latin:keyHintLabel="9" latin:additionalMoreKeys="9" - latin:moreKeys="!text/more_keys_for_o" /> + latin:moreKeys="!text/morekeys_o" /> <Key - latin:keyLabel="p" + latin:keySpec="p" latin:keyHintLabel="0" latin:additionalMoreKeys="0" /> </merge> diff --git a/java/res/xml/rowkeys_azerty2.xml b/java/res/xml/rowkeys_azerty2.xml index 2eee214e5..116417f08 100644 --- a/java/res/xml/rowkeys_azerty2.xml +++ b/java/res/xml/rowkeys_azerty2.xml @@ -22,30 +22,30 @@ xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" > <Key - latin:keyLabel="q" /> + latin:keySpec="q" /> <Key - latin:keyLabel="s" - latin:moreKeys="!text/more_keys_for_s" /> + latin:keySpec="s" + latin:moreKeys="!text/morekeys_s" /> <Key - latin:keyLabel="d" - latin:moreKeys="!text/more_keys_for_d" /> + latin:keySpec="d" + latin:moreKeys="!text/morekeys_d" /> <Key - latin:keyLabel="f" /> + latin:keySpec="f" /> <Key - latin:keyLabel="g" - latin:moreKeys="!text/more_keys_for_g" /> + latin:keySpec="g" + latin:moreKeys="!text/morekeys_g" /> <Key - latin:keyLabel="h" - latin:moreKeys="!text/more_keys_for_h" /> + latin:keySpec="h" + latin:moreKeys="!text/morekeys_h" /> <Key - latin:keyLabel="j" - latin:moreKeys="!text/more_keys_for_j" /> + latin:keySpec="j" + latin:moreKeys="!text/morekeys_j" /> <Key - latin:keyLabel="k" - latin:moreKeys="!text/more_keys_for_k" /> + latin:keySpec="k" + latin:moreKeys="!text/morekeys_k" /> <Key - latin:keyLabel="l" - latin:moreKeys="!text/more_keys_for_l" /> + latin:keySpec="l" + latin:moreKeys="!text/morekeys_l" /> <Key - latin:keyLabel="m" /> + latin:keySpec="m" /> </merge> diff --git a/java/res/xml/rowkeys_azerty3.xml b/java/res/xml/rowkeys_azerty3.xml index 2643f3283..48d3a5280 100644 --- a/java/res/xml/rowkeys_azerty3.xml +++ b/java/res/xml/rowkeys_azerty3.xml @@ -22,21 +22,32 @@ xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" > <Key - latin:keyLabel="w" - latin:moreKeys="!text/more_keys_for_w" /> + latin:keySpec="w" + latin:moreKeys="!text/morekeys_w" /> <Key - latin:keyLabel="x" /> + latin:keySpec="x" /> <Key - latin:keyLabel="c" - latin:moreKeys="!text/more_keys_for_c" /> + latin:keySpec="c" + latin:moreKeys="!text/morekeys_c" /> <Key - latin:keyLabel="v" - latin:moreKeys="!text/more_keys_for_v" /> + latin:keySpec="v" + latin:moreKeys="!text/morekeys_v" /> <Key - latin:keyLabel="b" /> + latin:keySpec="b" /> <Key - latin:keyLabel="n" - latin:moreKeys="!text/more_keys_for_n" /> - <include - latin:keyboardLayout="@xml/key_azerty3_right" /> + latin:keySpec="n" + latin:moreKeys="!text/morekeys_n" /> + <switch> + <case + latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLockShifted" + > + <Key + latin:keySpec="\?" /> + </case> + <default> + <Key + latin:keySpec="\'" + latin:moreKeys="!text/morekeys_single_quote" /> + </default> + </switch> </merge> diff --git a/java/res/xml/rowkeys_bengali1.xml b/java/res/xml/rowkeys_bengali1.xml new file mode 100644 index 000000000..c1fd8b434 --- /dev/null +++ b/java/res/xml/rowkeys_bengali1.xml @@ -0,0 +1,96 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright 2014, 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. +*/ +--> + +<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"> + <!-- U+0994: "ঔ" BENGALI LETTER AU + U+09E7: "১" BENGALI DIGIT ONE --> + <Key + latin:keySpec="ঔ" + latin:keyHintLabel="১" + latin:additionalMoreKeys="১,1" /> + <!-- U+0990: "ঐ" BENGALI LETTER AI + U+09E8: "২" BENGALI DIGIT TWO --> + <Key + latin:keySpec="ঐ" + latin:keyHintLabel="২" + latin:additionalMoreKeys="২,2" /> + <!-- U+0986: "আ" BENGALI LETTER AA + U+09E9: "৩" BENGALI DIGIT THREE --> + <Key + latin:keySpec="আ" + latin:keyHintLabel="৩" + latin:additionalMoreKeys="৩,3" /> + <!-- U+0988: "ঈ" BENGALI LETTER II + U+09EA: "৪" BENGALI DIGIT FOUR --> + <Key + latin:keySpec="ঈ" + latin:keyHintLabel="৪" + latin:additionalMoreKeys="৪,4" /> + <!-- U+098A: "ঊ" BENGALI LETTER UU + U+09EB: "৫" BENGALI DIGIT FIVE --> + <Key + latin:keySpec="ঊ" + latin:keyHintLabel="৫" + latin:additionalMoreKeys="৫,5" /> + <!-- U+09AC: "ব" BENGALI LETTER BA + U+09AD: "ভ" BENGALI LETTER BHA + U+09EC: "৬" BENGALI DIGIT SIX --> + <Key + latin:keySpec="ব" + latin:moreKeys="ভ,%" + latin:keyHintLabel="৬" + latin:additionalMoreKeys="৬,6" /> + <!-- U+09B9: "হ" BENGALI LETTER HA + U+09ED: "৭" BENGALI DIGIT SEVEN --> + <Key + latin:keySpec="হ" + latin:keyHintLabel="৭" + latin:additionalMoreKeys="৭,7" /> + <!-- U+0997: "গ" BENGALI LETTER GA + U+0998: "ঘ" BENGALI LETTER GHA + U+09EE: "৮" BENGALI DIGIT EIGHT --> + <Key + latin:keySpec="গ" + latin:moreKeys="ঘ,%" + latin:keyHintLabel="৮" + latin:additionalMoreKeys="৮,8" /> + <!-- U+09A6: "দ" BENGALI LETTER DA + U+09A7: "ধ" BENGALI LETTER DHA + U+09EF: "৯" BENGALI DIGIT NINE --> + <Key + latin:keySpec="দ" + latin:moreKeys="ধ,%" + latin:keyHintLabel="৯" + latin:additionalMoreKeys="৯,9" /> + <!-- U+099C: "জ" BENGALI LETTER JA + U+099D: "ঝ" BENGALI LETTER JHA + U+099C/U+09CD/U+099E: "জ্ঞ" BENGALI LETTER JA/BENGALI SIGN VIRAMA/BENGALI LETTER NYA + U+09E6: "০" BENGALI DIGIT ZERO --> + <Key + latin:keySpec="জ" + latin:moreKeys="ঝ,জ্ঞ,%" + latin:keyHintLabel="০" + latin:additionalMoreKeys="০,0" /> + <!-- U+09A1: "ড" BENGALI LETTER DDA + U+09A1/U+09BC: "ড়" BENGALI LETTER DDA/BENGALI SIGN NUKTA --> + <Key + latin:keySpec="ড" + latin:moreKeys="ড়" /> +</merge> diff --git a/java/res/xml/rowkeys_bengali2.xml b/java/res/xml/rowkeys_bengali2.xml new file mode 100644 index 000000000..44b361797 --- /dev/null +++ b/java/res/xml/rowkeys_bengali2.xml @@ -0,0 +1,81 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright 2014, 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. +*/ +--> + +<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"> + <!-- U+0993: "ও" BENGALI LETTER O + U+09CB: "ো" BENGALI VOWEL SIGN O --> + <Key + latin:keySpec="ও" + latin:moreKeys="ো" /> + <!-- U+098F: "এ" BENGALI LETTER E + U+09C7: "ে" BENGALI VOWEL SIGN E --> + <Key + latin:keySpec="এ" + latin:moreKeys="ে" /> + <!-- U+0985: "অ" BENGALI LETTER A + U+09CD: "্" BENGALI SIGN VIRAMA --> + <Key + latin:keySpec="অ" + latin:moreKeys="্" /> + <!-- U+0987: "ই" BENGALI LETTER I + U+09BF: "ি" BENGALI VOWEL SIGN I --> + <Key + latin:keySpec="ই" + latin:moreKeys="ি" /> + <!-- U+0989: "উ" BENGALI LETTER U + U+09C1: "ু" BENGALI VOWEL SIGN U --> + <Key + latin:keySpec="উ" + latin:moreKeys="ু" /> + <!-- U+09AA: "প" BENGALI LETTER PA + U+09AB: "ফ" BENGALI LETTER PHA --> + <Key + latin:keySpec="প" + latin:moreKeys="ফ" /> + <!-- U+09B0: "র" BENGALI LETTER RA + U+09C3: "ৃ" BENGALI VOWEL SIGN VOCALIC R + U+098B: "ঋ" BENGALI LETTER VOCALIC R + U+09A4/U+09CD/U+09B0: "ত্র" BENGALI LETTER TA/BENGALI SIGN VIRAMA/BENGALI LETTER RA --> + <Key + latin:keySpec="র" + latin:moreKeys="ৃ,ঋ,ত্র" /> + <!-- U+0995: "ক" BENGALI LETTER KA + U+0996: "খ" BENGALI LETTER KHA --> + <Key + latin:keySpec="ক" + latin:moreKeys="খ" /> + <!-- U+09A4: "ত" BENGALI LETTER TA + U+09CE: "ৎ" BENGALI LETTER KHANDA TA + U+09A5: "থ" BENGALI LETTER THA + U+09A4/U+09CD/U+09A4: "ত্ত" BENGALI LETTER TA/BENGALI SIGN VIRAMA/BENGALI LETTER TA --> + <Key + latin:keySpec="ত" + latin:moreKeys="ৎ,থ,ত্ত" /> + <!-- U+099A: "চ" BENGALI LETTER CA + U+099B: "ছ" BENGALI LETTER CHA --> + <Key + latin:keySpec="চ" + latin:moreKeys="ছ" /> + <!-- U+099F: "ট" BENGALI LETTER TTA + U+09A0: "ঠ" BENGALI LETTER TTHA --> + <Key + latin:keySpec="ট" + latin:moreKeys="ঠ" /> +</merge> diff --git a/java/res/xml/rowkeys_bengali3.xml b/java/res/xml/rowkeys_bengali3.xml new file mode 100644 index 000000000..5222b096b --- /dev/null +++ b/java/res/xml/rowkeys_bengali3.xml @@ -0,0 +1,68 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright 2014, 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. +*/ +--> + +<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"> + <!-- U+0981: "ঁ" BENGALI SIGN CANDRABINDU + U+0983: "ঃ" BENGALI SIGN VISARGA + U+0982: "ং" BENGALI SIGN ANUSVARA --> + <Key + latin:keySpec="ঁ" + latin:moreKeys="ঃ,ং" /> + <!-- U+09A2: "ঢ" BENGALI LETTER DDHA + U+09A2/U+09BC: "ঢ়" BENGALI LETTER DDHA/BENGALI SIGN NUKTA --> + <Key + latin:keySpec="ঢ" + latin:moreKeys="ঢ়" /> + <!-- U+09AE: "ম" BENGALI LETTER MA --> + <Key latin:keySpec="ম" /> + <!-- U+09A8: "ন" BENGALI LETTER NA + U+09A3: "ণ" BENGALI LETTER NNA --> + <Key + latin:keySpec="ন" + latin:moreKeys="ণ" /> + <!-- U+099E: "ঞ" BENGALI LETTER NYA + U+0999: "ঙ" BENGALI LETTER NGA + U+099E/U+09CD/U+099C: "ঞ্জ" BENGALI LETTER NYA/BENGALI SIGN VIRAMA/BENGALI LETTER JA --> + <Key + latin:keySpec="ঞ" + latin:moreKeys="ঙ,ঞ্জ" /> + <!-- U+09B2: "ল" BENGALI LETTER LA --> + <Key latin:keySpec="ল" /> + <!-- U+09B7: "ষ" BENGALI LETTER SSA + U+0995/U+09CD/U+09B7: "ক্ষ" BENGALI LETTER KA/BENGALI SIGN VIRAMA/BENGALI LETTER SSA --> + <Key + latin:keySpec="ষ" + latin:moreKeys="ক্ষ" /> + <!-- U+09B8: "স" BENGALI LETTER SA + U+09B6: "শ" BENGALI LETTER SHA --> + <Key + latin:keySpec="স" + latin:moreKeys="শ" /> + <!-- U+09DF: "য়" BENGALI LETTER YYA + U+09AF: "য" BENGALI LETTER YA --> + <Key + latin:keySpec="য়" + latin:moreKeys="য" /> + <!-- U+0964: "।" DEVANAGARI DANDA + U+0965: "॥" DEVANAGARI DOUBLE DANDA --> + <Key + latin:keySpec="।" + latin:moreKeys="॥" /> +</merge> diff --git a/java/res/xml/rowkeys_bulgarian1.xml b/java/res/xml/rowkeys_bulgarian1.xml index 441b079f1..e84719302 100644 --- a/java/res/xml/rowkeys_bulgarian1.xml +++ b/java/res/xml/rowkeys_bulgarian1.xml @@ -23,57 +23,57 @@ > <!-- U+044F: "я" CYRILLIC SMALL LETTER YA --> <Key - latin:keyLabel="я" + latin:keySpec="я" latin:keyHintLabel="1" latin:additionalMoreKeys="1" /> <!-- U+0432: "в" CYRILLIC SMALL LETTER VE --> <Key - latin:keyLabel="в" + latin:keySpec="в" latin:keyHintLabel="2" latin:additionalMoreKeys="2" /> <!-- U+0435: "е" CYRILLIC SMALL LETTER IE --> <Key - latin:keyLabel="е" + latin:keySpec="е" latin:keyHintLabel="3" latin:additionalMoreKeys="3" /> <!-- U+0440: "р" CYRILLIC SMALL LETTER ER --> <Key - latin:keyLabel="р" + latin:keySpec="р" latin:keyHintLabel="4" latin:additionalMoreKeys="4" /> <!-- U+0442: "т" CYRILLIC SMALL LETTER TE --> <Key - latin:keyLabel="т" + latin:keySpec="т" latin:keyHintLabel="5" latin:additionalMoreKeys="5" /> <!-- U+044A: "ъ" CYRILLIC SMALL LETTER HARD SIGN --> <Key - latin:keyLabel="ъ" + latin:keySpec="ъ" latin:keyHintLabel="6" latin:additionalMoreKeys="6" /> <!-- U+0443: "у" CYRILLIC SMALL LETTER U --> <Key - latin:keyLabel="у" + latin:keySpec="у" latin:keyHintLabel="7" latin:additionalMoreKeys="7" /> <!-- U+0438: "и" CYRILLIC SMALL LETTER I U+045D: "ѝ" CYRILLIC SMALL LETTER I WITH GRAVE --> <Key - latin:keyLabel="и" + latin:keySpec="и" latin:keyHintLabel="8" latin:additionalMoreKeys="8" latin:moreKeys="ѝ" /> <!-- U+043E: "о" CYRILLIC SMALL LETTER O --> <Key - latin:keyLabel="о" + latin:keySpec="о" latin:keyHintLabel="9" latin:additionalMoreKeys="9" /> <!-- U+043F: "п" CYRILLIC SMALL LETTER PE --> <Key - latin:keyLabel="п" + latin:keySpec="п" latin:keyHintLabel="0" latin:additionalMoreKeys="0" /> <!-- U+0447: "ч" CYRILLIC SMALL LETTER CHE --> <Key - latin:keyLabel="ч" /> + latin:keySpec="ч" /> </merge> diff --git a/java/res/xml/rowkeys_bulgarian2.xml b/java/res/xml/rowkeys_bulgarian2.xml index a4e93d862..e572a221d 100644 --- a/java/res/xml/rowkeys_bulgarian2.xml +++ b/java/res/xml/rowkeys_bulgarian2.xml @@ -23,35 +23,35 @@ > <!-- U+0430: "а" CYRILLIC SMALL LETTER A --> <Key - latin:keyLabel="а" /> + latin:keySpec="а" /> <!-- U+0441: "с" CYRILLIC SMALL LETTER ES --> <Key - latin:keyLabel="с" /> + latin:keySpec="с" /> <!-- U+0434: "д" CYRILLIC SMALL LETTER DE --> <Key - latin:keyLabel="д" /> + latin:keySpec="д" /> <!-- U+0444: "ф" CYRILLIC SMALL LETTER EF --> <Key - latin:keyLabel="ф" /> + latin:keySpec="ф" /> <!-- U+0433: "г" CYRILLIC SMALL LETTER GHE --> <Key - latin:keyLabel="г" /> + latin:keySpec="г" /> <!-- U+0445: "х" CYRILLIC SMALL LETTER HA --> <Key - latin:keyLabel="х" /> + latin:keySpec="х" /> <!-- U+0439: "й" CYRILLIC SMALL LETTER SHORT I --> <Key - latin:keyLabel="й" /> + latin:keySpec="й" /> <!-- U+043A: "к" CYRILLIC SMALL LETTER KA --> <Key - latin:keyLabel="к" /> + latin:keySpec="к" /> <!-- U+043B: "л" CYRILLIC SMALL LETTER EL --> <Key - latin:keyLabel="л" /> + latin:keySpec="л" /> <!-- U+0448: "ш" CYRILLIC SMALL LETTER SHA --> <Key - latin:keyLabel="ш" /> + latin:keySpec="ш" /> <!-- U+0449: "щ" CYRILLIC SMALL LETTER SHCHA --> <Key - latin:keyLabel="щ" /> + latin:keySpec="щ" /> </merge> diff --git a/java/res/xml/rowkeys_bulgarian3.xml b/java/res/xml/rowkeys_bulgarian3.xml index 258219c27..2509793b2 100644 --- a/java/res/xml/rowkeys_bulgarian3.xml +++ b/java/res/xml/rowkeys_bulgarian3.xml @@ -23,26 +23,26 @@ > <!-- U+0437: "з" CYRILLIC SMALL LETTER ZE --> <Key - latin:keyLabel="з" /> + latin:keySpec="з" /> <!-- U+044C: "ь" CYRILLIC SMALL LETTER SOFT SIGN --> <Key - latin:keyLabel="ь" /> + latin:keySpec="ь" /> <!-- U+0446: "ц" CYRILLIC SMALL LETTER TSE --> <Key - latin:keyLabel="ц" /> + latin:keySpec="ц" /> <!-- U+0436: "ж" CYRILLIC SMALL LETTER ZHE --> <Key - latin:keyLabel="ж" /> + latin:keySpec="ж" /> <!-- U+0431: "б" CYRILLIC SMALL LETTER BE --> <Key - latin:keyLabel="б" /> + latin:keySpec="б" /> <!-- U+043D: "н" CYRILLIC SMALL LETTER EN --> <Key - latin:keyLabel="н" /> + latin:keySpec="н" /> <!-- U+043C: "м" CYRILLIC SMALL LETTER EM --> <Key - latin:keyLabel="м" /> + latin:keySpec="м" /> <!-- U+044E: "ю" CYRILLIC SMALL LETTER YU --> <Key - latin:keyLabel="ю" /> + latin:keySpec="ю" /> </merge> diff --git a/java/res/xml/rowkeys_bulgarian_bds1.xml b/java/res/xml/rowkeys_bulgarian_bds1.xml index eed1fcb8f..9d6428268 100644 --- a/java/res/xml/rowkeys_bulgarian_bds1.xml +++ b/java/res/xml/rowkeys_bulgarian_bds1.xml @@ -23,57 +23,57 @@ > <!-- U+0443: "у" CYRILLIC SMALL LETTER U --> <Key - latin:keyLabel="у" + latin:keySpec="у" latin:keyHintLabel="1" latin:additionalMoreKeys="1" /> <!-- U+0435: "е" CYRILLIC SMALL LETTER IE --> <Key - latin:keyLabel="е" + latin:keySpec="е" latin:keyHintLabel="2" latin:additionalMoreKeys="2" /> <!-- U+0438: "и" CYRILLIC SMALL LETTER I U+045D: "ѝ" CYRILLIC SMALL LETTER I WITH GRAVE --> <Key - latin:keyLabel="и" + latin:keySpec="и" latin:keyHintLabel="3" latin:additionalMoreKeys="3" latin:moreKeys="ѝ" /> <!-- U+0448: "ш" CYRILLIC SMALL LETTER SHA --> <Key - latin:keyLabel="ш" + latin:keySpec="ш" latin:keyHintLabel="4" latin:additionalMoreKeys="4" /> <!-- U+0449: "щ" CYRILLIC SMALL LETTER SHCHA --> <Key - latin:keyLabel="щ" + latin:keySpec="щ" latin:keyHintLabel="5" latin:additionalMoreKeys="5" /> <!-- U+043A: "к" CYRILLIC SMALL LETTER KA --> <Key - latin:keyLabel="к" + latin:keySpec="к" latin:keyHintLabel="6" latin:additionalMoreKeys="6" /> <!-- U+0441: "с" CYRILLIC SMALL LETTER ES --> <Key - latin:keyLabel="с" + latin:keySpec="с" latin:keyHintLabel="7" latin:additionalMoreKeys="7" /> <!-- U+0434: "д" CYRILLIC SMALL LETTER DE --> <Key - latin:keyLabel="д" + latin:keySpec="д" latin:keyHintLabel="8" latin:additionalMoreKeys="8" /> <!-- U+0437: "з" CYRILLIC SMALL LETTER ZE --> <Key - latin:keyLabel="з" + latin:keySpec="з" latin:keyHintLabel="9" latin:additionalMoreKeys="9" /> <!-- U+0446: "ц" CYRILLIC SMALL LETTER TSE --> <Key - latin:keyLabel="ц" + latin:keySpec="ц" latin:keyHintLabel="0" latin:additionalMoreKeys="0" /> <!-- U+0431: "б" CYRILLIC SMALL LETTER BE --> <Key - latin:keyLabel="б" /> + latin:keySpec="б" /> </merge> diff --git a/java/res/xml/rowkeys_bulgarian_bds2.xml b/java/res/xml/rowkeys_bulgarian_bds2.xml index ff1bff895..e078ae7d3 100644 --- a/java/res/xml/rowkeys_bulgarian_bds2.xml +++ b/java/res/xml/rowkeys_bulgarian_bds2.xml @@ -23,35 +23,35 @@ > <!-- U+044C: "ь" CYRILLIC SMALL LETTER SOFT SIGN --> <Key - latin:keyLabel="ь" /> + latin:keySpec="ь" /> <!-- U+044F: "я" CYRILLIC SMALL LETTER YA --> <Key - latin:keyLabel="я" /> + latin:keySpec="я" /> <!-- U+0430: "а" CYRILLIC SMALL LETTER A --> <Key - latin:keyLabel="а" /> + latin:keySpec="а" /> <!-- U+043E: "о" CYRILLIC SMALL LETTER O --> <Key - latin:keyLabel="о" /> + latin:keySpec="о" /> <!-- U+0436: "ж" CYRILLIC SMALL LETTER ZHE --> <Key - latin:keyLabel="ж" /> + latin:keySpec="ж" /> <!-- U+0433: "г" CYRILLIC SMALL LETTER GHE --> <Key - latin:keyLabel="г" /> + latin:keySpec="г" /> <!-- U+0442: "т" CYRILLIC SMALL LETTER TE --> <Key - latin:keyLabel="т" /> + latin:keySpec="т" /> <!-- U+043D: "н" CYRILLIC SMALL LETTER EN --> <Key - latin:keyLabel="н" /> + latin:keySpec="н" /> <!-- U+0432: "в" CYRILLIC SMALL LETTER VE --> <Key - latin:keyLabel="в" /> + latin:keySpec="в" /> <!-- U+043C: "м" CYRILLIC SMALL LETTER EM --> <Key - latin:keyLabel="м" /> + latin:keySpec="м" /> <!-- U+0447: "ч" CYRILLIC SMALL LETTER CHE --> <Key - latin:keyLabel="ч" /> + latin:keySpec="ч" /> </merge> diff --git a/java/res/xml/rowkeys_bulgarian_bds3.xml b/java/res/xml/rowkeys_bulgarian_bds3.xml index 7bb780ac7..8302d6922 100644 --- a/java/res/xml/rowkeys_bulgarian_bds3.xml +++ b/java/res/xml/rowkeys_bulgarian_bds3.xml @@ -23,29 +23,29 @@ > <!-- U+044E: "ю" CYRILLIC SMALL LETTER YU --> <Key - latin:keyLabel="ю" /> + latin:keySpec="ю" /> <!-- U+0439: "й" CYRILLIC SMALL LETTER SHORT I --> <Key - latin:keyLabel="й" /> + latin:keySpec="й" /> <!-- U+044A: "ъ" CYRILLIC SMALL LETTER HARD SIGN --> <Key - latin:keyLabel="ъ" /> + latin:keySpec="ъ" /> <!-- U+044D: "э" CYRILLIC SMALL LETTER E --> <Key - latin:keyLabel="э" /> + latin:keySpec="э" /> <!-- U+0444: "ф" CYRILLIC SMALL LETTER EF --> <Key - latin:keyLabel="ф" /> + latin:keySpec="ф" /> <!-- U+0445: "х" CYRILLIC SMALL LETTER HA --> <Key - latin:keyLabel="х" /> + latin:keySpec="х" /> <!-- U+043F: "п" CYRILLIC SMALL LETTER PE --> <Key - latin:keyLabel="п" /> + latin:keySpec="п" /> <!-- U+0440: "р" CYRILLIC SMALL LETTER ER --> <Key - latin:keyLabel="р" /> + latin:keySpec="р" /> <!-- U+043B: "л" CYRILLIC SMALL LETTER EL --> <Key - latin:keyLabel="л" /> + latin:keySpec="л" /> </merge> diff --git a/java/res/xml/rowkeys_colemak1.xml b/java/res/xml/rowkeys_colemak1.xml index f1c30756b..199d285f9 100644 --- a/java/res/xml/rowkeys_colemak1.xml +++ b/java/res/xml/rowkeys_colemak1.xml @@ -22,45 +22,62 @@ xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" > <Key - latin:keyLabel="q" + latin:keySpec="q" latin:keyHintLabel="1" latin:additionalMoreKeys="1" /> <Key - latin:keyLabel="w" + latin:keySpec="w" latin:keyHintLabel="2" latin:additionalMoreKeys="2" - latin:moreKeys="!text/more_keys_for_w" /> + latin:moreKeys="!text/morekeys_w" /> <Key - latin:keyLabel="f" + latin:keySpec="f" latin:keyHintLabel="3" latin:additionalMoreKeys="3" /> <Key - latin:keyLabel="p" + latin:keySpec="p" latin:keyHintLabel="4" latin:additionalMoreKeys="4" /> <Key - latin:keyLabel="g" + latin:keySpec="g" latin:keyHintLabel="5" latin:additionalMoreKeys="5" - latin:moreKeys="!text/more_keys_for_g" /> + latin:moreKeys="!text/morekeys_g" /> <Key - latin:keyLabel="j" + latin:keySpec="j" latin:keyHintLabel="6" latin:additionalMoreKeys="6" - latin:moreKeys="!text/more_keys_for_j" /> + latin:moreKeys="!text/morekeys_j" /> <Key - latin:keyLabel="l" + latin:keySpec="l" latin:keyHintLabel="7" latin:additionalMoreKeys="7" - latin:moreKeys="!text/more_keys_for_l" /> + latin:moreKeys="!text/morekeys_l" /> <Key - latin:keyLabel="u" + latin:keySpec="u" latin:keyHintLabel="8" latin:additionalMoreKeys="8" - latin:moreKeys="!text/more_keys_for_u" /> + latin:moreKeys="!text/morekeys_u" /> <Key - latin:keyLabel="y" + latin:keySpec="y" latin:keyHintLabel="9" latin:additionalMoreKeys="9" - latin:moreKeys="!text/more_keys_for_y" /> + latin:moreKeys="!text/morekeys_y" /> + <switch> + <case + latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLockShifted" + > + <Key + latin:keySpec=":" + latin:keyHintLabel="0" + latin:additionalMoreKeys="0" /> + </case> + <default> + <Key + latin:keySpec=";" + latin:keyHintLabel="0" + latin:additionalMoreKeys="0" + latin:moreKeys=":" /> + </default> + </switch> </merge> diff --git a/java/res/xml/rowkeys_colemak2.xml b/java/res/xml/rowkeys_colemak2.xml index f73d7e95f..a8e93bf0e 100644 --- a/java/res/xml/rowkeys_colemak2.xml +++ b/java/res/xml/rowkeys_colemak2.xml @@ -22,33 +22,33 @@ xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" > <Key - latin:keyLabel="a" - latin:moreKeys="!text/more_keys_for_a" /> + latin:keySpec="a" + latin:moreKeys="!text/morekeys_a" /> <Key - latin:keyLabel="r" - latin:moreKeys="!text/more_keys_for_r" /> + latin:keySpec="r" + latin:moreKeys="!text/morekeys_r" /> <Key - latin:keyLabel="s" - latin:moreKeys="!text/more_keys_for_s" /> + latin:keySpec="s" + latin:moreKeys="!text/morekeys_s" /> <Key - latin:keyLabel="t" - latin:moreKeys="!text/more_keys_for_t" /> + latin:keySpec="t" + latin:moreKeys="!text/morekeys_t" /> <Key - latin:keyLabel="d" - latin:moreKeys="!text/more_keys_for_d" /> + latin:keySpec="d" + latin:moreKeys="!text/morekeys_d" /> <Key - latin:keyLabel="h" - latin:moreKeys="!text/more_keys_for_h" /> + latin:keySpec="h" + latin:moreKeys="!text/morekeys_h" /> <Key - latin:keyLabel="n" - latin:moreKeys="!text/more_keys_for_n" /> + latin:keySpec="n" + latin:moreKeys="!text/morekeys_n" /> <Key - latin:keyLabel="e" - latin:moreKeys="!text/more_keys_for_e" /> + latin:keySpec="e" + latin:moreKeys="!text/morekeys_e" /> <Key - latin:keyLabel="i" - latin:moreKeys="!text/more_keys_for_i" /> + latin:keySpec="i" + latin:moreKeys="!text/morekeys_i" /> <Key - latin:keyLabel="o" - latin:moreKeys="!text/more_keys_for_o" /> + latin:keySpec="o" + latin:moreKeys="!text/morekeys_o" /> </merge> diff --git a/java/res/xml/rowkeys_colemak3.xml b/java/res/xml/rowkeys_colemak3.xml index f0f915142..df4d9936e 100644 --- a/java/res/xml/rowkeys_colemak3.xml +++ b/java/res/xml/rowkeys_colemak3.xml @@ -22,21 +22,21 @@ xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" > <Key - latin:keyLabel="z" - latin:moreKeys="!text/more_keys_for_z" /> + latin:keySpec="z" + latin:moreKeys="!text/morekeys_z" /> <Key - latin:keyLabel="x" /> + latin:keySpec="x" /> <Key - latin:keyLabel="c" - latin:moreKeys="!text/more_keys_for_c" /> + latin:keySpec="c" + latin:moreKeys="!text/morekeys_c" /> <Key - latin:keyLabel="v" - latin:moreKeys="!text/more_keys_for_v" /> + latin:keySpec="v" + latin:moreKeys="!text/morekeys_v" /> <Key - latin:keyLabel="b" /> + latin:keySpec="b" /> <Key - latin:keyLabel="k" - latin:moreKeys="!text/more_keys_for_k" /> + latin:keySpec="k" + latin:moreKeys="!text/morekeys_k" /> <Key - latin:keyLabel="m" /> + latin:keySpec="m" /> </merge> diff --git a/java/res/xml/rowkeys_dvorak1.xml b/java/res/xml/rowkeys_dvorak1.xml index 033308acb..170e31664 100644 --- a/java/res/xml/rowkeys_dvorak1.xml +++ b/java/res/xml/rowkeys_dvorak1.xml @@ -24,36 +24,36 @@ <include latin:keyboardLayout="@xml/keys_dvorak_123" /> <Key - latin:keyLabel="p" + latin:keySpec="p" latin:keyHintLabel="4" latin:additionalMoreKeys="4" /> <Key - latin:keyLabel="y" + latin:keySpec="y" latin:keyHintLabel="5" latin:additionalMoreKeys="5" - latin:moreKeys="!text/more_keys_for_y" /> + latin:moreKeys="!text/morekeys_y" /> <Key - latin:keyLabel="f" + latin:keySpec="f" latin:keyHintLabel="6" latin:additionalMoreKeys="6" /> <Key - latin:keyLabel="g" + latin:keySpec="g" latin:keyHintLabel="7" latin:additionalMoreKeys="7" - latin:moreKeys="!text/more_keys_for_g" /> + latin:moreKeys="!text/morekeys_g" /> <Key - latin:keyLabel="c" + latin:keySpec="c" latin:keyHintLabel="8" latin:additionalMoreKeys="8" - latin:moreKeys="!text/more_keys_for_c" /> + latin:moreKeys="!text/morekeys_c" /> <Key - latin:keyLabel="r" + latin:keySpec="r" latin:keyHintLabel="9" latin:additionalMoreKeys="9" - latin:moreKeys="!text/more_keys_for_r" /> + latin:moreKeys="!text/morekeys_r" /> <Key - latin:keyLabel="l" + latin:keySpec="l" latin:keyHintLabel="0" latin:additionalMoreKeys="0" - latin:moreKeys="!text/more_keys_for_l" /> + latin:moreKeys="!text/morekeys_l" /> </merge> diff --git a/java/res/xml/rowkeys_dvorak2.xml b/java/res/xml/rowkeys_dvorak2.xml index 943e3f549..0840a6cfc 100644 --- a/java/res/xml/rowkeys_dvorak2.xml +++ b/java/res/xml/rowkeys_dvorak2.xml @@ -22,33 +22,33 @@ xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" > <Key - latin:keyLabel="a" - latin:moreKeys="!text/more_keys_for_a" /> + latin:keySpec="a" + latin:moreKeys="!text/morekeys_a" /> <Key - latin:keyLabel="o" - latin:moreKeys="!text/more_keys_for_o" /> + latin:keySpec="o" + latin:moreKeys="!text/morekeys_o" /> <Key - latin:keyLabel="e" - latin:moreKeys="!text/more_keys_for_e" /> + latin:keySpec="e" + latin:moreKeys="!text/morekeys_e" /> <Key - latin:keyLabel="u" - latin:moreKeys="!text/more_keys_for_u" /> + latin:keySpec="u" + latin:moreKeys="!text/morekeys_u" /> <Key - latin:keyLabel="i" - latin:moreKeys="!text/more_keys_for_i" /> + latin:keySpec="i" + latin:moreKeys="!text/morekeys_i" /> <Key - latin:keyLabel="d" - latin:moreKeys="!text/more_keys_for_d" /> + latin:keySpec="d" + latin:moreKeys="!text/morekeys_d" /> <Key - latin:keyLabel="h" - latin:moreKeys="!text/more_keys_for_h" /> + latin:keySpec="h" + latin:moreKeys="!text/morekeys_h" /> <Key - latin:keyLabel="t" - latin:moreKeys="!text/more_keys_for_t" /> + latin:keySpec="t" + latin:moreKeys="!text/morekeys_t" /> <Key - latin:keyLabel="n" - latin:moreKeys="!text/more_keys_for_n" /> + latin:keySpec="n" + latin:moreKeys="!text/morekeys_n" /> <Key - latin:keyLabel="s" - latin:moreKeys="!text/more_keys_for_s" /> + latin:keySpec="s" + latin:moreKeys="!text/morekeys_s" /> </merge> diff --git a/java/res/xml/rowkeys_dvorak3.xml b/java/res/xml/rowkeys_dvorak3.xml index b035f41cd..e53908c91 100644 --- a/java/res/xml/rowkeys_dvorak3.xml +++ b/java/res/xml/rowkeys_dvorak3.xml @@ -22,21 +22,21 @@ xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" > <Key - latin:keyLabel="j" - latin:moreKeys="!text/more_keys_for_j" /> + latin:keySpec="j" + latin:moreKeys="!text/morekeys_j" /> <Key - latin:keyLabel="k" - latin:moreKeys="!text/more_keys_for_k" /> + latin:keySpec="k" + latin:moreKeys="!text/morekeys_k" /> <Key - latin:keyLabel="x" /> + latin:keySpec="x" /> <Key - latin:keyLabel="b" /> + latin:keySpec="b" /> <Key - latin:keyLabel="m" /> + latin:keySpec="m" /> <Key - latin:keyLabel="w" - latin:moreKeys="!text/more_keys_for_w" /> + latin:keySpec="w" + latin:moreKeys="!text/morekeys_w" /> <Key - latin:keyLabel="v" - latin:moreKeys="!text/more_keys_for_v" /> + latin:keySpec="v" + latin:moreKeys="!text/morekeys_v" /> </merge> diff --git a/java/res/xml/rowkeys_east_slavic1.xml b/java/res/xml/rowkeys_east_slavic1.xml index 5b3b4b48d..88d95fffb 100644 --- a/java/res/xml/rowkeys_east_slavic1.xml +++ b/java/res/xml/rowkeys_east_slavic1.xml @@ -23,59 +23,59 @@ > <!-- U+0439: "й" CYRILLIC SMALL LETTER SHORT I --> <Key - latin:keyLabel="й" + latin:keySpec="й" latin:keyHintLabel="1" latin:additionalMoreKeys="1" /> <!-- U+0446: "ц" CYRILLIC SMALL LETTER TSE --> <Key - latin:keyLabel="ц" + latin:keySpec="ц" latin:keyHintLabel="2" latin:additionalMoreKeys="2" /> <!-- U+0443: "у" CYRILLIC SMALL LETTER U --> <Key - latin:keyLabel="у" + latin:keySpec="у" latin:keyHintLabel="3" latin:additionalMoreKeys="3" - latin:moreKeys="!text/more_keys_for_cyrillic_u" /> + latin:moreKeys="!text/morekeys_cyrillic_u" /> <!-- U+043A: "к" CYRILLIC SMALL LETTER KA --> <Key - latin:keyLabel="к" + latin:keySpec="к" latin:keyHintLabel="4" latin:additionalMoreKeys="4" - latin:moreKeys="!text/more_keys_for_cyrillic_ka" /> + latin:moreKeys="!text/morekeys_cyrillic_ka" /> <!-- U+0435: "е" CYRILLIC SMALL LETTER IE --> <Key - latin:keyLabel="е" + latin:keySpec="е" latin:keyHintLabel="5" latin:additionalMoreKeys="5" - latin:moreKeys="!text/more_keys_for_cyrillic_ie" /> + latin:moreKeys="!text/morekeys_cyrillic_ie" /> <!-- U+043D: "н" CYRILLIC SMALL LETTER EN --> <Key - latin:keyLabel="н" + latin:keySpec="н" latin:keyHintLabel="6" latin:additionalMoreKeys="6" - latin:moreKeys="!text/more_keys_for_cyrillic_en" /> + latin:moreKeys="!text/morekeys_cyrillic_en" /> <!-- U+0433: "г" CYRILLIC SMALL LETTER GHE --> <Key - latin:keyLabel="г" + latin:keySpec="г" latin:keyHintLabel="7" latin:additionalMoreKeys="7" - latin:moreKeys="!text/more_keys_for_cyrillic_ghe" /> + latin:moreKeys="!text/morekeys_cyrillic_ghe" /> <!-- U+0448: "ш" CYRILLIC SMALL LETTER SHA --> <Key - latin:keyLabel="ш" + latin:keySpec="ш" latin:keyHintLabel="8" latin:additionalMoreKeys="8" /> <Key - latin:keyLabel="!text/keylabel_for_east_slavic_row1_9" + latin:keySpec="!text/keyspec_east_slavic_row1_9" latin:keyHintLabel="9" latin:additionalMoreKeys="9" /> <!-- U+0437: "з" CYRILLIC SMALL LETTER ZE --> <Key - latin:keyLabel="з" + latin:keySpec="з" latin:keyHintLabel="0" latin:additionalMoreKeys="0" /> <!-- U+0445: "х" CYRILLIC SMALL LETTER HA --> <Key - latin:keyLabel="х" /> + latin:keySpec="х" /> </merge> diff --git a/java/res/xml/rowkeys_east_slavic2.xml b/java/res/xml/rowkeys_east_slavic2.xml index 2e412f08c..21463fb7d 100644 --- a/java/res/xml/rowkeys_east_slavic2.xml +++ b/java/res/xml/rowkeys_east_slavic2.xml @@ -23,37 +23,37 @@ > <!-- U+0444: "ф" CYRILLIC SMALL LETTER EF --> <Key - latin:keyLabel="ф" /> + latin:keySpec="ф" /> <Key - latin:keyLabel="!text/keylabel_for_east_slavic_row2_1" - latin:moreKeys="!text/more_keys_for_east_slavic_row2_1" /> + latin:keySpec="!text/keyspec_east_slavic_row2_2" + latin:moreKeys="!text/morekeys_east_slavic_row2_2" /> <!-- U+0432: "в" CYRILLIC SMALL LETTER VE --> <Key - latin:keyLabel="в" /> + latin:keySpec="в" /> <!-- U+0430: "а" CYRILLIC SMALL LETTER A --> <Key - latin:keyLabel="а" - latin:moreKeys="!text/more_keys_for_cyrillic_a" /> + latin:keySpec="а" + latin:moreKeys="!text/morekeys_cyrillic_a" /> <!-- U+043F: "п" CYRILLIC SMALL LETTER PE --> <Key - latin:keyLabel="п" /> + latin:keySpec="п" /> <!-- U+0440: "р" CYRILLIC SMALL LETTER ER --> <Key - latin:keyLabel="р" /> + latin:keySpec="р" /> <!-- U+043E: "о" CYRILLIC SMALL LETTER O --> <Key - latin:keyLabel="о" - latin:moreKeys="!text/more_keys_for_cyrillic_o" /> + latin:keySpec="о" + latin:moreKeys="!text/morekeys_cyrillic_o" /> <!-- U+043B: "л" CYRILLIC SMALL LETTER EL --> <Key - latin:keyLabel="л" /> + latin:keySpec="л" /> <!-- U+0434: "д" CYRILLIC SMALL LETTER DE --> <Key - latin:keyLabel="д" /> + latin:keySpec="д" /> <!-- U+0436: "ж" CYRILLIC SMALL LETTER ZHE --> <Key - latin:keyLabel="ж" /> + latin:keySpec="ж" /> <Key - latin:keyLabel="!text/keylabel_for_east_slavic_row2_11" - latin:moreKeys="!text/more_keys_for_east_slavic_row2_11" /> + latin:keySpec="!text/keyspec_east_slavic_row2_11" + latin:moreKeys="!text/morekeys_east_slavic_row2_11" /> </merge> diff --git a/java/res/xml/rowkeys_east_slavic3.xml b/java/res/xml/rowkeys_east_slavic3.xml index c3a171b49..54802e878 100644 --- a/java/res/xml/rowkeys_east_slavic3.xml +++ b/java/res/xml/rowkeys_east_slavic3.xml @@ -23,29 +23,29 @@ > <!-- U+044F: "я" CYRILLIC SMALL LETTER YA --> <Key - latin:keyLabel="я" /> + latin:keySpec="я" /> <!-- U+0447: "ч" CYRILLIC SMALL LETTER CHE --> <Key - latin:keyLabel="ч" /> + latin:keySpec="ч" /> <!-- U+0441: "с" CYRILLIC SMALL LETTER ES --> <Key - latin:keyLabel="с" /> + latin:keySpec="с" /> <!-- U+043C: "м" CYRILLIC SMALL LETTER EM --> <Key - latin:keyLabel="м" /> + latin:keySpec="м" /> <Key - latin:keyLabel="!text/keylabel_for_east_slavic_row3_5" /> + latin:keySpec="!text/keyspec_east_slavic_row3_5" /> <!-- U+0442: "т" CYRILLIC SMALL LETTER TE --> <Key - latin:keyLabel="т" /> + latin:keySpec="т" /> <!-- U+044C: "ь" CYRILLIC SMALL LETTER SOFT SIGN --> <Key - latin:keyLabel="ь" - latin:moreKeys="!text/more_keys_for_cyrillic_soft_sign" /> + latin:keySpec="ь" + latin:moreKeys="!text/morekeys_cyrillic_soft_sign" /> <!-- U+0431: "б" CYRILLIC SMALL LETTER BE --> <Key - latin:keyLabel="б" /> + latin:keySpec="б" /> <!-- U+044E: "ю" CYRILLIC SMALL LETTER YU --> <Key - latin:keyLabel="ю" /> + latin:keySpec="ю" /> </merge> diff --git a/java/res/xml/rowkeys_farsi1.xml b/java/res/xml/rowkeys_farsi1.xml index 5a22a2462..abc2c9614 100644 --- a/java/res/xml/rowkeys_farsi1.xml +++ b/java/res/xml/rowkeys_farsi1.xml @@ -18,58 +18,49 @@ */ --> -<merge - xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" -> +<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"> <!-- U+0636: "ض" ARABIC LETTER DAD U+06F1: "۱" EXTENDED ARABIC-INDIC DIGIT ONE --> <Key - latin:keyLabel="ض" + latin:keySpec="ض" latin:keyHintLabel="۱" - latin:additionalMoreKeys="۱,1" - latin:keyLabelFlags="fontNormal" /> + latin:additionalMoreKeys="۱,1" /> <!-- U+0635: "ص" ARABIC LETTER SAD U+06F2: "۲" EXTENDED ARABIC-INDIC DIGIT TWO --> <Key - latin:keyLabel="ص" + latin:keySpec="ص" latin:keyHintLabel="۲" - latin:additionalMoreKeys="۲,2" - latin:keyLabelFlags="fontNormal" /> + latin:additionalMoreKeys="۲,2" /> <!-- U+062B: "ث" ARABIC LETTER THEH U+06F3: "۳" EXTENDED ARABIC-INDIC DIGIT THREE --> <Key - latin:keyLabel="ث" + latin:keySpec="ث" latin:keyHintLabel="۳" - latin:additionalMoreKeys="۳,3" - latin:keyLabelFlags="fontNormal" /> + latin:additionalMoreKeys="۳,3" /> <!-- U+0642: "ق" ARABIC LETTER QAF U+06F4: "۴" EXTENDED ARABIC-INDIC DIGIT FOUR --> <Key - latin:keyLabel="ق" + latin:keySpec="ق" latin:keyHintLabel="۴" - latin:additionalMoreKeys="۴,4" - latin:keyLabelFlags="fontNormal" /> + latin:additionalMoreKeys="۴,4" /> <!-- U+0641: "ف" ARABIC LETTER FEH U+06F5: "۵" EXTENDED ARABIC-INDIC DIGIT FIVE --> <Key - latin:keyLabel="ف" + latin:keySpec="ف" latin:keyHintLabel="۵" - latin:additionalMoreKeys="۵,5" - latin:keyLabelFlags="fontNormal" /> + latin:additionalMoreKeys="۵,5" /> <!-- U+063A: "غ" ARABIC LETTER GHAIN U+06F6: "۶" EXTENDED ARABIC-INDIC DIGIT SIX --> <Key - latin:keyLabel="غ" + latin:keySpec="غ" latin:keyHintLabel="۶" - latin:additionalMoreKeys="۶,6" - latin:keyLabelFlags="fontNormal" /> + latin:additionalMoreKeys="۶,6" /> <!-- U+0639: "ع" ARABIC LETTER AIN U+06F7: "۷" EXTENDED ARABIC-INDIC DIGIT SEVEN --> <Key - latin:keyLabel="ع" + latin:keySpec="ع" latin:keyHintLabel="۷" - latin:additionalMoreKeys="۷,7" - latin:keyLabelFlags="fontNormal" /> + latin:additionalMoreKeys="۷,7" /> <!-- U+0647: "ه" ARABIC LETTER HEH U+FEEB: "ﻫ" ARABIC LETTER HEH INITIAL FORM U+0647/U+200D: ARABIC LETTER HEH + ZERO WIDTH JOINER @@ -77,27 +68,22 @@ U+0629: "ة" ARABIC LETTER TEH MARBUTA U+06F8: "۸" EXTENDED ARABIC-INDIC DIGIT EIGHT --> <Key - latin:keyLabel="ه" + latin:keySpec="ه" latin:moreKeys="ﻫ|ه‍,هٔ,ة,%" latin:keyHintLabel="۸" - latin:additionalMoreKeys="۸,8" - latin:keyLabelFlags="fontNormal" /> + latin:additionalMoreKeys="۸,8" /> <!-- U+062E: "خ" ARABIC LETTER KHAH U+06F9: "۹" EXTENDED ARABIC-INDIC DIGIT NINE --> <Key - latin:keyLabel="خ" + latin:keySpec="خ" latin:keyHintLabel="۹" - latin:additionalMoreKeys="۹,9" - latin:keyLabelFlags="fontNormal" /> + latin:additionalMoreKeys="۹,9" /> <!-- U+062D: "ح" ARABIC LETTER HAH U+06F0: "۰" EXTENDED ARABIC-INDIC DIGIT ZERO --> <Key - latin:keyLabel="ح" + latin:keySpec="ح" latin:keyHintLabel="۰" - latin:additionalMoreKeys="۰,0" - latin:keyLabelFlags="fontNormal" /> + latin:additionalMoreKeys="۰,0" /> <!-- U+062C: "ج" ARABIC LETTER JEEM --> - <Key - latin:keyLabel="ج" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ج" /> </merge> diff --git a/java/res/xml/rowkeys_farsi2.xml b/java/res/xml/rowkeys_farsi2.xml index 590161f62..82f1903c7 100644 --- a/java/res/xml/rowkeys_farsi2.xml +++ b/java/res/xml/rowkeys_farsi2.xml @@ -18,34 +18,23 @@ */ --> -<merge - xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" -> +<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"> <!-- U+0634: "ش" ARABIC LETTER SHEEN --> - <Key - latin:keyLabel="ش" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ش" /> <!-- U+0633: "س" ARABIC LETTER SEEN --> - <Key - latin:keyLabel="س" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="س" /> <!-- U+06CC: "ی" ARABIC LETTER FARSI YEH U+0626: "ئ" ARABIC LETTER YEH WITH HAMZA ABOVE U+064A: "ي" ARABIC LETTER YEH U+FBE8: "ﯨ" ARABIC LETTER UIGHUR KAZAKH KIRGHIZ ALEF MAKSURA INITIAL FORM U+0649: "ى" ARABIC LETTER ALEF MAKSURA --> <Key - latin:keyLabel="ی" - latin:moreKeys="ئ,ي,ﯨ|ى" - latin:keyLabelFlags="fontNormal" /> + latin:keySpec="ی" + latin:moreKeys="ئ,ي,ﯨ|ى" /> <!-- U+0628: "ب" ARABIC LETTER BEH --> - <Key - latin:keyLabel="ب" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ب" /> <!-- U+0644: "ل" ARABIC LETTER LAM --> - <Key - latin:keyLabel="ل" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ل" /> <!-- U+0627: "ا" ARABIC LETTER ALEF U+0671: "ٱ" ARABIC LETTER ALEF WASLA U+0621: "ء" ARABIC LETTER HAMZA @@ -53,31 +42,22 @@ U+0623: "أ" ARABIC LETTER ALEF WITH HAMZA ABOVE U+0625: "إ" ARABIC LETTER ALEF WITH HAMZA BELOW --> <Key - latin:keyLabel="ا" - latin:moreKeys="!fixedColumnOrder!5,ٱ,ء,آ,أ,إ" - latin:keyLabelFlags="fontNormal" /> + latin:keySpec="ا" + latin:moreKeys="!fixedColumnOrder!5,ٱ,ء,آ,أ,إ" /> <!-- U+062A: "ت" ARABIC LETTER TEH U+0629: "ة": ARABIC LETTER TEH MARBUTA --> <Key - latin:keyLabel="ت" - latin:moreKeys="ة" - latin:keyLabelFlags="fontNormal" /> + latin:keySpec="ت" + latin:moreKeys="ة" /> <!-- U+0646: "ن" ARABIC LETTER NOON --> - <Key - latin:keyLabel="ن" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ن" /> <!-- U+0645: "م" ARABIC LETTER MEEM --> - <Key - latin:keyLabel="م" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="م" /> <!-- U+06A9: "ک" ARABIC LETTER KEHEH U+0643: "ك" ARABIC LETTER KAF --> <Key - latin:keyLabel="ک" - latin:moreKeys="ك" - latin:keyLabelFlags="fontNormal" /> + latin:keySpec="ک" + latin:moreKeys="ك" /> <!-- U+06AF: "گ" ARABIC LETTER GAF --> - <Key - latin:keyLabel="گ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="گ" /> </merge> diff --git a/java/res/xml/rowkeys_farsi3.xml b/java/res/xml/rowkeys_farsi3.xml index 98949f4c0..b825a36d5 100644 --- a/java/res/xml/rowkeys_farsi3.xml +++ b/java/res/xml/rowkeys_farsi3.xml @@ -18,47 +18,27 @@ */ --> -<merge - xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" -> +<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"> <!-- U+0638: "ظ" ARABIC LETTER ZAH --> - <Key - latin:keyLabel="ظ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ظ" /> <!-- U+0637: "ط" ARABIC LETTER TAH --> - <Key - latin:keyLabel="ط" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ط" /> <!-- U+0698: "ژ" ARABIC LETTER JEH --> - <Key - latin:keyLabel="ژ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ژ" /> <!-- U+0632: "ز" ARABIC LETTER ZAIN --> - <Key - latin:keyLabel="ز" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ز" /> <!-- U+0631: "ر" ARABIC LETTER REH --> - <Key - latin:keyLabel="ر" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ر" /> <!-- U+0630: "ذ" ARABIC LETTER THAL --> - <Key - latin:keyLabel="ذ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ذ" /> <!-- U+062F: "د" ARABIC LETTER DAL --> - <Key - latin:keyLabel="د" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="د" /> <!-- U+067E: "پ" ARABIC LETTER PEH --> - <Key - latin:keyLabel="پ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="پ" /> <!-- U+0648: "و" ARABIC LETTER WAW U+0624: "ؤ" ARABIC LETTER WAW WITH HAMZA ABOVE --> <Key - latin:keyLabel="و" - latin:moreKeys="ؤ" - latin:keyLabelFlags="fontNormal" /> - <include - latin:keyboardLayout="@xml/keys_farsi3_right" /> + latin:keySpec="و" + latin:moreKeys="ؤ" /> + <include latin:keyboardLayout="@xml/keys_farsi3_right" /> </merge> diff --git a/java/res/xml/rowkeys_georgian1.xml b/java/res/xml/rowkeys_georgian1.xml index d31a4c79c..c412aa3fa 100644 --- a/java/res/xml/rowkeys_georgian1.xml +++ b/java/res/xml/rowkeys_georgian1.xml @@ -26,104 +26,104 @@ latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted" > <Key - latin:keyLabel="Q" + latin:keySpec="Q" latin:keyHintLabel="1" latin:additionalMoreKeys="1" /> <!-- U+10ED: "ჭ" GEORGIAN LETTER CHAR --> <Key - latin:keyLabel="ჭ" + latin:keySpec="ჭ" latin:keyHintLabel="2" latin:additionalMoreKeys="2" /> <Key - latin:keyLabel="E" + latin:keySpec="E" latin:keyHintLabel="3" latin:additionalMoreKeys="3" /> <!-- U+10E6: "ღ" GEORGIAN LETTER GHAN --> <Key - latin:keyLabel="ღ" + latin:keySpec="ღ" latin:keyHintLabel="4" latin:additionalMoreKeys="4" /> <!-- U+10D7: "თ" GEORGIAN LETTER TAN --> <Key - latin:keyLabel="თ" + latin:keySpec="თ" latin:keyHintLabel="5" latin:additionalMoreKeys="5" /> <Key - latin:keyLabel="Y" + latin:keySpec="Y" latin:keyHintLabel="6" latin:additionalMoreKeys="6" /> <Key - latin:keyLabel="U" + latin:keySpec="U" latin:keyHintLabel="7" latin:additionalMoreKeys="7" /> <Key - latin:keyLabel="I" + latin:keySpec="I" latin:keyHintLabel="8" latin:additionalMoreKeys="8" /> <Key - latin:keyLabel="O" + latin:keySpec="O" latin:keyHintLabel="9" latin:additionalMoreKeys="9" /> <Key - latin:keyLabel="P" + latin:keySpec="P" latin:keyHintLabel="0" latin:additionalMoreKeys="0" /> </case> <default> <!-- U+10E5: "ქ" GEORGIAN LETTER GHAN --> <Key - latin:keyLabel="ქ" + latin:keySpec="ქ" latin:keyHintLabel="1" latin:additionalMoreKeys="1" /> <!-- U+10EC: "წ" GEORGIAN LETTER CIL --> <Key - latin:keyLabel="წ" + latin:keySpec="წ" latin:keyHintLabel="2" latin:additionalMoreKeys="2" /> <!-- U+10D4: "ე" GEORGIAN LETTER EN U+10F1: "ჱ" GEORGIAN LETTER HE --> <Key - latin:keyLabel="ე" + latin:keySpec="ე" latin:moreKeys="ჱ" latin:keyHintLabel="3" latin:additionalMoreKeys="3" /> <!-- U+10E0: "რ" GEORGIAN LETTER RAE --> <Key - latin:keyLabel="რ" + latin:keySpec="რ" latin:keyHintLabel="4" latin:additionalMoreKeys="4" /> <!-- U+10E2: "ტ" GEORGIAN LETTER TAR --> <Key - latin:keyLabel="ტ" + latin:keySpec="ტ" latin:keyHintLabel="5" latin:additionalMoreKeys="5" /> <!-- U+10E7: "ყ" GEORGIAN LETTER QAR U+10F8: "ჸ" GEORGIAN LETTER ELIFI --> <Key - latin:keyLabel="ყ" + latin:keySpec="ყ" latin:moreKeys="ჸ" latin:keyHintLabel="6" latin:additionalMoreKeys="6" /> <!-- U+10E3: "უ" GEORGIAN LETTER UN --> <Key - latin:keyLabel="უ" + latin:keySpec="უ" latin:keyHintLabel="7" latin:additionalMoreKeys="7" /> <!-- U+10D8: "ი" GEORGIAN LETTER IN U+10F2: "ჲ" GEORGIAN LETTER HIE --> <Key - latin:keyLabel="ი" + latin:keySpec="ი" latin:moreKeys="ჲ" latin:keyHintLabel="8" latin:additionalMoreKeys="8" /> <!-- U+10DD: "ო" GEORGIAN LETTER ON --> <Key - latin:keyLabel="ო" + latin:keySpec="ო" latin:keyHintLabel="9" latin:additionalMoreKeys="9" /> <!-- U+10DE: "პ" GEORGIAN LETTER PAR --> <Key - latin:keyLabel="პ" + latin:keySpec="პ" latin:keyHintLabel="0" latin:additionalMoreKeys="0" /> </default> diff --git a/java/res/xml/rowkeys_georgian2.xml b/java/res/xml/rowkeys_georgian2.xml index cdccda31f..162960d75 100644 --- a/java/res/xml/rowkeys_georgian2.xml +++ b/java/res/xml/rowkeys_georgian2.xml @@ -26,64 +26,64 @@ latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted" > <Key - latin:keyLabel="A" /> + latin:keySpec="A" /> <!-- U+10E8: "შ" GEORGIAN LETTER SHIN --> <Key - latin:keyLabel="შ" /> + latin:keySpec="შ" /> <Key - latin:keyLabel="D" /> + latin:keySpec="D" /> <Key - latin:keyLabel="F" /> + latin:keySpec="F" /> <Key - latin:keyLabel="G" /> + latin:keySpec="G" /> <Key - latin:keyLabel="H" /> + latin:keySpec="H" /> <!-- U+10DF: "ჟ" GEORGIAN LETTER ZHAR --> <Key - latin:keyLabel="ჟ" /> + latin:keySpec="ჟ" /> <Key - latin:keyLabel="K" /> + latin:keySpec="K" /> <Key - latin:keyLabel="L" /> + latin:keySpec="L" /> </case> <default> <!-- U+10D0: "ა" GEORGIAN LETTER AN U+10FA: "ჺ" GEORGIAN LETTER AIN --> <Key - latin:keyLabel="ა" + latin:keySpec="ა" latin:moreKeys="ჺ" /> <!-- U+10E1: "ს" GEORGIAN LETTER SAN --> <Key - latin:keyLabel="ს" /> + latin:keySpec="ს" /> <!-- U+10D3: "დ" GEORGIAN LETTER DON --> <Key - latin:keyLabel="დ" /> + latin:keySpec="დ" /> <!-- U+10E4: "ფ" GEORGIAN LETTER PHAR U+10F6: "ჶ" GEORGIAN LETTER FI --> <Key - latin:keyLabel="ფ" + latin:keySpec="ფ" latin:moreKeys="ჶ" /> <!-- U+10D2: "გ" GEORGIAN LETTER GAN U+10F9: "ჹ" GEORGIAN LETTER TURNED GAN --> <Key - latin:keyLabel="გ" + latin:keySpec="გ" latin:moreKeys="ჹ" /> <!-- U+10F0: "ჰ" GEORGIAN LETTER HAE U+10F5: "ჵ" GEORGIAN LETTER HOE --> <Key - latin:keyLabel="ჰ" + latin:keySpec="ჰ" latin:moreKeys="ჵ" /> <!-- U+10EF: "ჯ" GEORGIAN LETTER JHAN U+10F7: "ჷ" GEORGIAN LETTER YN --> <Key - latin:keyLabel="ჯ" + latin:keySpec="ჯ" latin:moreKeys="ჷ" /> <!-- U+10D9: "კ" GEORGIAN LETTER KAN --> <Key - latin:keyLabel="კ" /> + latin:keySpec="კ" /> <!-- U+10DA: "ლ" GEORGIAN LETTER LAS --> <Key - latin:keyLabel="ლ" /> + latin:keySpec="ლ" /> </default> </switch> </merge> diff --git a/java/res/xml/rowkeys_georgian3.xml b/java/res/xml/rowkeys_georgian3.xml index a3714586f..a16acf8d3 100644 --- a/java/res/xml/rowkeys_georgian3.xml +++ b/java/res/xml/rowkeys_georgian3.xml @@ -27,49 +27,49 @@ > <!-- U+10EB: "ძ" GEORGIAN LETTER JIL --> <Key - latin:keyLabel="ძ" /> + latin:keySpec="ძ" /> <Key - latin:keyLabel="X" /> + latin:keySpec="X" /> <!-- U+10E9: "ჩ" GEORGIAN LETTER CHIN --> <Key - latin:keyLabel="ჩ" /> + latin:keySpec="ჩ" /> <Key - latin:keyLabel="V" /> + latin:keySpec="V" /> <Key - latin:keyLabel="B" /> + latin:keySpec="B" /> <Key - latin:keyLabel="N" /> + latin:keySpec="N" /> <Key - latin:keyLabel="M" /> + latin:keySpec="M" /> </case> <default> <!-- U+10D6: "ზ" GEORGIAN LETTER ZEN --> <Key - latin:keyLabel="ზ" /> + latin:keySpec="ზ" /> <!-- U+10EE: "ხ" GEORGIAN LETTER XAN U+10F4: "ჴ" GEORGIAN LETTER HAR --> <Key - latin:keyLabel="ხ" + latin:keySpec="ხ" latin:moreKeys="ჴ" /> <!-- U+10EA: "ც" GEORGIAN LETTER CAN --> <Key - latin:keyLabel="ც" /> + latin:keySpec="ც" /> <!-- U+10D5: "ვ" GEORGIAN LETTER VIN U+10F3: "ჳ" GEORGIAN LETTER WE --> <Key - latin:keyLabel="ვ" + latin:keySpec="ვ" latin:moreKeys="ჳ" /> <!-- U+10D1: "ბ" GEORGIAN LETTER BAN --> <Key - latin:keyLabel="ბ" /> + latin:keySpec="ბ" /> <!-- U+10DC: "ნ" GEORGIAN LETTER NAR U+10FC: "ჼ" MODIFIER LETTER GEORGIAN NAR --> <Key - latin:keyLabel="ნ" + latin:keySpec="ნ" latin:moreKeys="ჼ" /> <!-- U+10DB: "მ" GEORGIAN LETTER MAN --> <Key - latin:keyLabel="მ" /> + latin:keySpec="მ" /> </default> </switch> </merge> diff --git a/java/res/xml/rowkeys_greek1.xml b/java/res/xml/rowkeys_greek1.xml index 5777d3b85..6d767794c 100644 --- a/java/res/xml/rowkeys_greek1.xml +++ b/java/res/xml/rowkeys_greek1.xml @@ -21,6 +21,24 @@ <merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" > + <switch> + <case + latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLockShifted" + > + <Key + latin:keySpec=":" + latin:keyHintLabel="1" + latin:moreKeys=";" + latin:additionalMoreKeys="1" /> + </case> + <default> + <Key + latin:keySpec=";" + latin:keyHintLabel="1" + latin:moreKeys=":" + latin:additionalMoreKeys="1" /> + </default> + </switch> <!-- TODO: Should find a way to compound Greek dialytika tonos and other Greek letters. --> <!-- <switch> @@ -29,7 +47,7 @@ > U+0385: "΅" GREEK DIALYTIKA TONOS <Key - latin:keyLabel="΅" + latin:keySpec="΅" latin:keyHintLabel="2" latin:additionalMoreKeys="2" /> </case> @@ -37,7 +55,7 @@ --> <!-- U+03C2: "ς" GREEK SMALL LETTER FINAL SIGMA --> <Key - latin:keyLabel="ς" + latin:keySpec="ς" latin:keyLabelFlags="preserveCase" latin:keyHintLabel="2" latin:additionalMoreKeys="2" /> @@ -48,18 +66,18 @@ <!-- U+03B5: "ε" GREEK SMALL LETTER EPSILON U+03AD: "έ" GREEK SMALL LETTER EPSILON WITH TONOS --> <Key - latin:keyLabel="ε" + latin:keySpec="ε" latin:keyHintLabel="3" latin:additionalMoreKeys="3" - latin:moreKeys="έ" /> + latin:moreKeys="έ,%" /> <!-- U+03C1: "ρ" GREEK SMALL LETTER RHO --> <Key - latin:keyLabel="ρ" + latin:keySpec="ρ" latin:keyHintLabel="4" latin:additionalMoreKeys="4" /> <!-- U+03C4: "τ" GREEK SMALL LETTER TAU --> <Key - latin:keyLabel="τ" + latin:keySpec="τ" latin:keyHintLabel="5" latin:additionalMoreKeys="5" /> <!-- U+03C5: "υ" GREEK SMALL LETTER UPSILON @@ -67,13 +85,13 @@ U+03CB: "ϋ" GREEK SMALL LETTER UPSILON WITH DIALYTIKA U+03B0: "ΰ" GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND TONOS --> <Key - latin:keyLabel="υ" + latin:keySpec="υ" latin:keyHintLabel="6" latin:additionalMoreKeys="6" - latin:moreKeys="ύ,ϋ,ΰ" /> + latin:moreKeys="ύ,%,ϋ,ΰ" /> <!-- U+03B8: "θ" GREEK SMALL LETTER THETA --> <Key - latin:keyLabel="θ" + latin:keySpec="θ" latin:keyHintLabel="7" latin:additionalMoreKeys="7" /> <!-- U+03B9: "ι" GREEK SMALL LETTER IOTA @@ -81,20 +99,20 @@ U+03CA: "ϊ" GREEK SMALL LETTER IOTA WITH DIALYTIKA U+0390: "ΐ" GREEK SMALL LETTER IOTA WITH DIALYTIKA AND TONOS --> <Key - latin:keyLabel="ι" + latin:keySpec="ι" latin:keyHintLabel="8" latin:additionalMoreKeys="8" - latin:moreKeys="ί,ϊ,ΐ" /> + latin:moreKeys="ί,%,ϊ,ΐ" /> <!-- U+03BF: "ο" GREEK SMALL LETTER OMICRON U+03CC: "ό" GREEK SMALL LETTER OMICRON WITH TONOS --> <Key - latin:keyLabel="ο" + latin:keySpec="ο" latin:keyHintLabel="9" latin:additionalMoreKeys="9" - latin:moreKeys="ό" /> + latin:moreKeys="ό,%" /> <!-- U+03C0: "π" GREEK SMALL LETTER PI --> <Key - latin:keyLabel="π" + latin:keySpec="π" latin:keyHintLabel="0" latin:additionalMoreKeys="0" /> </merge> diff --git a/java/res/xml/rowkeys_greek2.xml b/java/res/xml/rowkeys_greek2.xml index 91bdc1165..d8769caa9 100644 --- a/java/res/xml/rowkeys_greek2.xml +++ b/java/res/xml/rowkeys_greek2.xml @@ -24,32 +24,32 @@ <!-- U+03B1: "α" GREEK SMALL LETTER ALPHA U+03AC: "ά" GREEK SMALL LETTER ALPHA WITH TONOS --> <Key - latin:keyLabel="α" + latin:keySpec="α" latin:moreKeys="ά" /> <!-- U+03C3: "σ" GREEK SMALL LETTER SIGMA --> <Key - latin:keyLabel="σ" /> + latin:keySpec="σ" /> <!-- U+03B4: "δ" GREEK SMALL LETTER DELTA --> <Key - latin:keyLabel="δ" /> + latin:keySpec="δ" /> <!-- U+03C6: "φ" GREEK SMALL LETTER PHI --> <Key - latin:keyLabel="φ" /> + latin:keySpec="φ" /> <!-- U+03B3: "γ" GREEK SMALL LETTER GAMMA --> <Key - latin:keyLabel="γ" /> + latin:keySpec="γ" /> <!-- U+03B7: "η" GREEK SMALL LETTER ETA U+03AE: "ή" GREEK SMALL LETTER ETA WITH TONOS --> <Key - latin:keyLabel="η" + latin:keySpec="η" latin:moreKeys="ή" /> <!-- U+03BE: "ξ" GREEK SMALL LETTER XI --> <Key - latin:keyLabel="ξ" /> + latin:keySpec="ξ" /> <!-- U+03BA: "κ" GREEK SMALL LETTER KAPPA --> <Key - latin:keyLabel="κ" /> + latin:keySpec="κ" /> <!-- U+03BB: "λ" GREEK SMALL LETTER LAMDA --> <Key - latin:keyLabel="λ" /> + latin:keySpec="λ" /> </merge> diff --git a/java/res/xml/rowkeys_greek3.xml b/java/res/xml/rowkeys_greek3.xml index 8a99db925..3f989bc9c 100644 --- a/java/res/xml/rowkeys_greek3.xml +++ b/java/res/xml/rowkeys_greek3.xml @@ -23,25 +23,25 @@ > <!-- U+03B6: "ζ" GREEK SMALL LETTER ZETA --> <Key - latin:keyLabel="ζ" /> + latin:keySpec="ζ" /> <!-- U+03C7: "χ" GREEK SMALL LETTER CHI --> <Key - latin:keyLabel="χ" /> + latin:keySpec="χ" /> <!-- U+03C8: "ψ" GREEK SMALL LETTER PSI --> <Key - latin:keyLabel="ψ" /> + latin:keySpec="ψ" /> <!-- U+03C9: "ω" GREEK SMALL LETTER OMEGA U+03CE: "ώ" GREEK SMALL LETTER OMEGA WITH TONOS --> <Key - latin:keyLabel="ω" + latin:keySpec="ω" latin:moreKeys="ώ" /> <!-- U+03B2: "β" GREEK SMALL LETTER BETA --> <Key - latin:keyLabel="β" /> + latin:keySpec="β" /> <!-- U+03BD: "ν" GREEK SMALL LETTER NU --> <Key - latin:keyLabel="ν" /> + latin:keySpec="ν" /> <!-- U+03BC: "μ" GREEK SMALL LETTER MU --> <Key - latin:keyLabel="μ" /> + latin:keySpec="μ" /> </merge> diff --git a/java/res/xml/rowkeys_hebrew1.xml b/java/res/xml/rowkeys_hebrew1.xml index 81a00e367..e888977ae 100644 --- a/java/res/xml/rowkeys_hebrew1.xml +++ b/java/res/xml/rowkeys_hebrew1.xml @@ -26,22 +26,22 @@ latin:mode="email|url" > <Key - latin:keyLabel="-" + latin:keySpec="-" latin:keyHintLabel="1" latin:additionalMoreKeys="1" /> <Key - latin:keyLabel="_" + latin:keySpec="_" latin:keyHintLabel="2" latin:additionalMoreKeys="2" /> </case> <default> <Key - latin:keyLabel="\'" + latin:keySpec="\'" latin:keyHintLabel="1" latin:additionalMoreKeys="1" latin:moreKeys=""" /> <Key - latin:keyLabel="-" + latin:keySpec="-" latin:keyHintLabel="2" latin:additionalMoreKeys="2" latin:moreKeys="_" /> @@ -49,42 +49,42 @@ </switch> <!-- U+05E7: "ק" HEBREW LETTER QOF --> <Key - latin:keyLabel="ק" + latin:keySpec="ק" latin:keyHintLabel="3" latin:additionalMoreKeys="3" /> <!-- U+05E8: "ר" HEBREW LETTER RESH --> <Key - latin:keyLabel="ר" + latin:keySpec="ר" latin:keyHintLabel="4" latin:additionalMoreKeys="4" /> <!-- U+05D0: "א" HEBREW LETTER ALEF --> <Key - latin:keyLabel="א" + latin:keySpec="א" latin:keyHintLabel="5" latin:additionalMoreKeys="5" /> <!-- U+05D8: "ט" HEBREW LETTER TET --> <Key - latin:keyLabel="ט" + latin:keySpec="ט" latin:keyHintLabel="6" latin:additionalMoreKeys="6" /> <!-- U+05D5: "ו" HEBREW LETTER VAV --> <Key - latin:keyLabel="ו" + latin:keySpec="ו" latin:keyHintLabel="7" latin:additionalMoreKeys="7" /> <!-- U+05DF: "ן" HEBREW LETTER FINAL NUN --> <Key - latin:keyLabel="ן" + latin:keySpec="ן" latin:keyHintLabel="8" latin:additionalMoreKeys="8" /> <!-- U+05DD: "ם" HEBREW LETTER FINAL MEM --> <Key - latin:keyLabel="ם" + latin:keySpec="ם" latin:keyHintLabel="9" latin:additionalMoreKeys="9" /> <!-- U+05E4: "פ" HEBREW LETTER PE --> <Key - latin:keyLabel="פ" + latin:keySpec="פ" latin:keyHintLabel="0" latin:additionalMoreKeys="0" /> </merge> diff --git a/java/res/xml/rowkeys_hebrew2.xml b/java/res/xml/rowkeys_hebrew2.xml index e4ecac335..d43f5a8f2 100644 --- a/java/res/xml/rowkeys_hebrew2.xml +++ b/java/res/xml/rowkeys_hebrew2.xml @@ -23,38 +23,38 @@ > <!-- U+05E9: "ש" HEBREW LETTER SHIN --> <Key - latin:keyLabel="ש" /> + latin:keySpec="ש" /> <!-- U+05D3: "ד" HEBREW LETTER DALET --> <Key - latin:keyLabel="ד" /> + latin:keySpec="ד" /> <!-- U+05D2: "ג" HEBREW LETTER GIMEL U+05D2 U+05F3: "ג׳" HEBREW LETTER GIMEL + HEBREW PUNCTUATION GERESH --> <Key - latin:keyLabel="ג" + latin:keySpec="ג" latin:moreKeys="ג׳" /> <!-- U+05DB: "כ" HEBREW LETTER KAF --> <Key - latin:keyLabel="כ" /> + latin:keySpec="כ" /> <!-- U+05E2: "ע" HEBREW LETTER AYIN --> <Key - latin:keyLabel="ע" /> + latin:keySpec="ע" /> <!-- U+05D9: "י" HEBREW LETTER YOD U+05F2 U+05B7: "ײַ" HEBREW LIGATURE YIDDISH DOUBLE YOD + HEBREW POINT PATAH --> <Key - latin:keyLabel="י" + latin:keySpec="י" latin:moreKeys="ײַ" /> <!-- U+05D7: "ח" HEBREW LETTER HET U+05D7 U+05F3: "ח׳" HEBREW LETTER HET + HEBREW PUNCTUATION GERESH --> <Key - latin:keyLabel="ח" + latin:keySpec="ח" latin:moreKeys="ח׳" /> <!-- U+05DC: "ל" HEBREW LETTER LAMED --> <Key - latin:keyLabel="ל" /> + latin:keySpec="ל" /> <!-- U+05DA: "ך" HEBREW LETTER FINAL KAF --> <Key - latin:keyLabel="ך" /> + latin:keySpec="ך" /> <!-- U+05E3: "ף" HEBREW LETTER FINAL PE --> <Key - latin:keyLabel="ף" /> + latin:keySpec="ף" /> </merge> diff --git a/java/res/xml/rowkeys_hebrew3.xml b/java/res/xml/rowkeys_hebrew3.xml index 805a7a596..928e6b255 100644 --- a/java/res/xml/rowkeys_hebrew3.xml +++ b/java/res/xml/rowkeys_hebrew3.xml @@ -24,36 +24,36 @@ <!-- U+05D6: "ז" HEBREW LETTER ZAYIN U+05D6 U+05F3: "ז׳" HEBREW LETTER ZAYIN + HEBREW PUNCTUATION GERESH --> <Key - latin:keyLabel="ז" + latin:keySpec="ז" latin:moreKeys="ז׳" /> <!-- U+05E1: "ס" HEBREW LETTER SAMEKH --> <Key - latin:keyLabel="ס" /> + latin:keySpec="ס" /> <!-- U+05D1: "ב" HEBREW LETTER BET --> <Key - latin:keyLabel="ב" /> + latin:keySpec="ב" /> <!-- U+05D4: "ה" HEBREW LETTER HE --> <Key - latin:keyLabel="ה" /> + latin:keySpec="ה" /> <!-- U+05E0: "נ" HEBREW LETTER NUN --> <Key - latin:keyLabel="נ" /> + latin:keySpec="נ" /> <!-- U+05DE: "מ" HEBREW LETTER MEM --> <Key - latin:keyLabel="מ" /> + latin:keySpec="מ" /> <!-- U+05E6: "צ" HEBREW LETTER TSADI U+05E6 U+05F3: "צ׳" HEBREW LETTER TSADI + HEBREW PUNCTUATION GERESH --> <Key - latin:keyLabel="צ" + latin:keySpec="צ" latin:moreKeys="צ׳" /> <!-- U+05EA: "ת" HEBREW LETTER TAV U+05EA U+05F3: "ת׳" HEBREW LETTER TAV + HEBREW PUNCTUATION GERESH --> <Key - latin:keyLabel="ת" + latin:keySpec="ת" latin:moreKeys="ת׳" /> <!-- U+05E5: "ץ" HEBREW LETTER FINAL TSADI U+05E5 U+05F3: "ץ׳" HEBREW LETTER FINAL TSADI + HEBREW PUNCTUATION GERESH --> <Key - latin:keyLabel="ץ" + latin:keySpec="ץ" latin:moreKeys="ץ׳" /> </merge> diff --git a/java/res/xml/rowkeys_hindi1.xml b/java/res/xml/rowkeys_hindi1.xml index c0b3cb913..cd08e1600 100644 --- a/java/res/xml/rowkeys_hindi1.xml +++ b/java/res/xml/rowkeys_hindi1.xml @@ -18,83 +18,62 @@ */ --> -<merge - xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" -> +<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"> <switch> - <case - latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted" - > + <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"> <!-- U+0914: "औ" DEVANAGARI LETTER AU U+0912/U+0902: "ऒं" DEVANAGARI LETTER SHORT O//DEVANAGARI SIGN ANUSVARA --> <Key - latin:keyLabel="औ" - latin:moreKeys="ऒं" - latin:keyLabelFlags="fontNormal" /> + latin:keySpec="औ" + latin:moreKeys="ऒं" /> <!-- U+0910: "ऐ" DEVANAGARI LETTER AI U+0910/U+0902: "ऐं" DEVANAGARI LETTER AI/DEVANAGARI SIGN ANUSVARA --> <Key - latin:keyLabel="ऐ" - latin:moreKeys="ऐं" - latin:keyLabelFlags="fontNormal" /> + latin:keySpec="ऐ" + latin:moreKeys="ऐं" /> <!-- U+0906: "आ" DEVANAGARI LETTER AA U+0906/U+0902: "आं" DEVANAGARI LETTER AA/DEVANAGARI SIGN ANUSVARA U+0906/U+0901: "आँ" DEVANAGARI LETTER AA/DEVANAGARI SIGN CANDRABINDU --> <Key - latin:keyLabel="आ" - latin:moreKeys="आं,आँ" - latin:keyLabelFlags="fontNormal" /> + latin:keySpec="आ" + latin:moreKeys="आं,आँ" /> <!-- U+0908: "ई" DEVANAGARI LETTER II U+0908/U+0902: "ईं" DEVANAGARI LETTER II/DEVANAGARI SIGN ANUSVARA --> <Key - latin:keyLabel="ई" - latin:moreKeys="ईं" - latin:keyLabelFlags="fontNormal" /> + latin:keySpec="ई" + latin:moreKeys="ईं" /> <!-- U+090A: "ऊ" DEVANAGARI LETTER UU U+090A/U+0902: "ऊं" DEVANAGARI LETTER UU/DEVANAGARI SIGN ANUSVARA U+090A/U+0901: "ऊँ" DEVANAGARI LETTER UU/DEVANAGARI SIGN CANDRABINDU --> <Key - latin:keyLabel="ऊ" - latin:moreKeys="ऊं,ऊँ" - latin:keyLabelFlags="fontNormal" /> + latin:keySpec="ऊ" + latin:moreKeys="ऊं,ऊँ" /> <!-- U+092D: "भ" DEVANAGARI LETTER BHA --> - <Key - latin:keyLabel="भ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="भ" /> <!-- Because the font rendering system prior to API version 16 can't automatically render dotted circle for incomplete combining letter of some scripts, different set of Key definitions are needed based on the API version. --> - <include - latin:keyboardLayout="@xml/keystyle_devanagari_sign_visarga" /> - <Key - latin:keyStyle="baseKeyDevanagariSignVisarga" /> + <include latin:keyboardLayout="@xml/keystyle_devanagari_sign_visarga" /> + <Key latin:keyStyle="baseKeyDevanagariSignVisarga" /> <!-- U+0918: "घ" DEVANAGARI LETTER GHA --> - <Key - latin:keyLabel="घ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="घ" /> <!-- U+0927: "ध" DEVANAGARI LETTER DHA U+0915/U+094D/U+0937: "क्ष" DEVANAGARI LETTER KA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER SSA U+0936/U+094D/U+0930: "श्र" DEVANAGARI LETTER SHA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER RA --> <Key - latin:keyLabel="ध" - latin:moreKeys="क्ष,श्र" - latin:keyLabelFlags="fontNormal" /> + latin:keySpec="ध" + latin:moreKeys="क्ष,श्र" /> <!-- U+091D: "झ" DEVANAGARI LETTER JHA --> - <Key - latin:keyLabel="झ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="झ" /> <!-- U+0922: "ढ" DEVANAGARI LETTER DDHA --> - <Key - latin:keyLabel="ढ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ढ" /> </case> <default> <!-- Because the font rendering system prior to API version 16 can't automatically render dotted circle for incomplete combining letter of some scripts, different set of Key definitions are needed based on the API version. --> + <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_au" /> <!-- U+0967: "१" DEVANAGARI DIGIT ONE --> - <include - latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_au" /> <Key latin:keyStyle="baseKeyDevanagariVowelSignAu" latin:keyHintLabel="1" @@ -102,9 +81,8 @@ <!-- Because the font rendering system prior to API version 16 can't automatically render dotted circle for incomplete combining letter of some scripts, different set of Key definitions are needed based on the API version. --> + <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_ai" /> <!-- U+0968: "२" DEVANAGARI DIGIT TWO --> - <include - latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_ai" /> <Key latin:keyStyle="baseKeyDevanagariVowelSignAi" latin:keyHintLabel="2" @@ -112,9 +90,8 @@ <!-- Because the font rendering system prior to API version 16 can't automatically render dotted circle for incomplete combining letter of some scripts, different set of Key definitions are needed based on the API version. --> + <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_aa" /> <!-- U+0969: "३" DEVANAGARI DIGIT THREE --> - <include - latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_aa" /> <Key latin:keyStyle="baseKeyDevanagariVowelSignAa" latin:keyHintLabel="3" @@ -122,9 +99,8 @@ <!-- Because the font rendering system prior to API version 16 can't automatically render dotted circle for incomplete combining letter of some scripts, different set of Key definitions are needed based on the API version. --> + <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_ii" /> <!-- U+096A: "४" DEVANAGARI DIGIT FOUR --> - <include - latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_ii" /> <Key latin:keyStyle="baseKeyDevanagariVowelSignIi" latin:keyHintLabel="4" @@ -132,65 +108,58 @@ <!-- Because the font rendering system prior to API version 16 can't automatically render dotted circle for incomplete combining letter of some scripts, different set of Key definitions are needed based on the API version. --> + <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_uu" /> <!-- U+096B: "५" DEVANAGARI DIGIT FIVE --> - <include - latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_uu" /> <Key latin:keyStyle="baseKeyDevanagariVowelSignUu" latin:keyHintLabel="5" latin:additionalMoreKeys="५,5" /> <!-- U+092C: "ब" DEVANAGARI LETTER BA - U+096C: "६" DEVANAGARI DIGIT SIX - U+092C/U+0952: "ब॒" DEVANAGARI LETTER BA/DEVANAGARI STRESS SIGN ANUDATTA --> + U+092C/U+0952: "ब॒" DEVANAGARI LETTER BA/DEVANAGARI STRESS SIGN ANUDATTA + U+096C: "६" DEVANAGARI DIGIT SIX --> <Key - latin:keyLabel="ब" + latin:keySpec="ब" latin:moreKeys="ब॒,%" latin:keyHintLabel="6" - latin:additionalMoreKeys="६,6" - latin:keyLabelFlags="fontNormal" /> + latin:additionalMoreKeys="६,6" /> <!-- U+0939: "ह" DEVANAGARI LETTER HA U+096D: "७" DEVANAGARI DIGIT SEVEN --> <Key - latin:keyLabel="ह" + latin:keySpec="ह" latin:keyHintLabel="7" - latin:additionalMoreKeys="७,7" - latin:keyLabelFlags="fontNormal" /> + latin:additionalMoreKeys="७,7" /> <!-- U+0917: "ग" DEVANAGARI LETTER GA U+091C/U+094D/U+091E: "ज्ञ" DEVANAGARI LETTER JA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER NYA U+0917/U+093C: "ग़" DEVANAGARI LETTER GA/DEVANAGARI SIGN NUKTA U+0917/U+0952: "ग॒" DEVANAGARI LETTER GA/DEVANAGARI STRESS SIGN ANUDATTA U+096E: "८" DEVANAGARI DIGIT EIGHT --> <Key - latin:keyLabel="ग" + latin:keySpec="ग" latin:moreKeys="ज्ञ,ग़,ग॒,%" latin:keyHintLabel="8" - latin:additionalMoreKeys="८,8" - latin:keyLabelFlags="fontNormal" /> + latin:additionalMoreKeys="८,8" /> <!-- U+0926: "द" DEVANAGARI LETTER DA U+096F: "९" DEVANAGARI DIGIT NINE --> <Key - latin:keyLabel="द" + latin:keySpec="द" latin:keyHintLabel="9" - latin:additionalMoreKeys="९,9" - latin:keyLabelFlags="fontNormal" /> + latin:additionalMoreKeys="९,9" /> <!-- U+091C: "ज" DEVANAGARI LETTER JA U+091C/U+0952: "ज॒" DEVANAGARI LETTER JA/DEVANAGARI STRESS SIGN ANUDATTA U+091C/U+094D/U+091E: "ज्ञ" DEVANAGARI LETTER JA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER NYA U+091C/U+093C: "ज़" DEVANAGARI LETTER JA/DEVANAGARI SIGN NUKTA U+0966: "०" DEVANAGARI DIGIT ZERO --> <Key - latin:keyLabel="ज" + latin:keySpec="ज" latin:moreKeys="ज॒,ज्ञ,ज़,%" latin:keyHintLabel="0" - latin:additionalMoreKeys="०,0" - latin:keyLabelFlags="fontNormal" /> + latin:additionalMoreKeys="०,0" /> <!-- U+0921: "ड" DEVANAGARI LETTER DDA U+0921/U+0952: "ड॒" DEVANAGARI LETTER DDA/DEVANAGARI STRESS SIGN ANUDATTA U+0921/U+093C: "ड़" DEVANAGARI LETTER DDA/DEVANAGARI SIGN NUKTA --> <Key - latin:keyLabel="ड" - latin:moreKeys="ड॒,ड़" - latin:keyLabelFlags="fontNormal" /> - </default> + latin:keySpec="ड" + latin:moreKeys="ड॒,ड़" /> + </default> </switch> </merge> diff --git a/java/res/xml/rowkeys_hindi2.xml b/java/res/xml/rowkeys_hindi2.xml index 70ac66ee4..fec93f3c6 100644 --- a/java/res/xml/rowkeys_hindi2.xml +++ b/java/res/xml/rowkeys_hindi2.xml @@ -18,151 +18,114 @@ */ --> -<merge - xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" -> +<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"> <switch> - <case - latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted" - > + <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"> <!-- U+0913: "ओ" DEVANAGARI LETTER O U+0913/U+0902: "ओं" DEVANAGARI LETTER O/DEVANAGARI SIGN ANUSVARA U+0911: "ऑ" DEVANAGARI LETTER CANDRA O U+0912: "ऒ" DEVANAGARI LETTER SHORT O --> <Key - latin:keyLabel="ओ" - latin:moreKeys="ओं,ऑ,ऒ" - latin:keyLabelFlags="fontNormal" /> + latin:keySpec="ओ" + latin:moreKeys="ओं,ऑ,ऒ" /> <!-- U+090F: "ए" DEVANAGARI LETTER E U+090F/U+0902: "एं" DEVANAGARI LETTER E/DEVANAGARI SIGN ANUSVARA U+090F/U+0901: "एँ" DEVANAGARI LETTER E/DEVANAGARI SIGN CANDRABINDU U+090D: "ऍ" DEVANAGARI LETTER CANDRA E U+090E: "ऎ" DEVANAGARI LETTER SHORT E --> <Key - latin:keyLabel="ए" - latin:moreKeys="एं,एँ,ऍ,ऎ" - latin:keyLabelFlags="fontNormal" /> + latin:keySpec="ए" + latin:moreKeys="एं,एँ,ऍ,ऎ" /> <!-- U+0905: "अ" DEVANAGARI LETTER A U+0905/U+0902: "अं" DEVANAGARI LETTER A/DEVANAGARI SIGN ANUSVARA U+0905/U+0901: "अँ" DEVANAGARI LETTER A/DEVANAGARI SIGN CANDRABINDU --> <Key - latin:keyLabel="अ" - latin:moreKeys="अं,अँ" - latin:keyLabelFlags="fontNormal" /> + latin:keySpec="अ" + latin:moreKeys="अं,अँ" /> <!-- U+0907: "इ" DEVANAGARI LETTER I U+0907/U+0902: "इं" DEVANAGARI LETTER I/DEVANAGARI SIGN ANUSVARA U+0907/U+0901: "इं" DEVANAGARI LETTER I/DEVANAGARI SIGN CANDRABINDU --> <Key - latin:keyLabel="इ" - latin:moreKeys="इं,इँ" - latin:keyLabelFlags="fontNormal" /> + latin:keySpec="इ" + latin:moreKeys="इं,इँ" /> <!-- U+0909: "उ" DEVANAGARI LETTER U U+0909/U+0902: "उं" DEVANAGARI LETTER U/DEVANAGARI SIGN ANUSVARA U+0909/U+0901: "उँ" DEVANAGARI LETTER U/DEVANAGARI SIGN CANDRABINDU --> <Key - latin:keyLabel="उ" - latin:moreKeys="उं,उँ" - latin:keyLabelFlags="fontNormal" /> + latin:keySpec="उ" + latin:moreKeys="उं,उँ" /> <!-- U+092B: "फ" DEVANAGARI LETTER PHA U+092B/U+093C: "फ़" DEVANAGARI LETTER PHA/DEVANAGARI SIGN NUKTA --> <Key - latin:keyLabel="फ" - latin:moreKeys="फ़" - latin:keyLabelFlags="fontNormal" /> + latin:keySpec="फ" + latin:moreKeys="फ़" /> <!-- U+0931: "ऱ" DEVANAGARI LETTER RRA U+094D/U+0930: "्र" DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER RA U+0930/U+094D: "र्" DEVANAGARI LETTER RA/DEVANAGARI SIGN VIRAMA --> <Key - latin:keyLabel="ऱ" - latin:moreKeys="्र,र्" - latin:keyLabelFlags="fontNormal" /> + latin:keySpec="ऱ" + latin:moreKeys="्र,र्" /> <!-- U+0916: "ख" DEVANAGARI LETTER KHA U+0916/U+093C: "ख़" DEVANAGARI LETTER KHA/DEVANAGARI SIGN NUKTA --> <Key - latin:keyLabel="ख" - latin:moreKeys="ख़" - latin:keyLabelFlags="fontNormal" /> + latin:keySpec="ख" + latin:moreKeys="ख़" /> <!-- U+0925: "थ" DEVANAGARI LETTER THA --> - <Key - latin:keyLabel="थ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="थ" /> <!-- U+091B: "छ" DEVANAGARI LETTER CHA --> - <Key - latin:keyLabel="छ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="छ" /> <!-- U+0920: "ठ" DEVANAGARI LETTER TTHA --> - <Key - latin:keyLabel="ठ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ठ" /> </case> <default> <!-- Because the font rendering system prior to API version 16 can't automatically render dotted circle for incomplete combining letter of some scripts, different set of Key definitions are needed based on the API version. --> - <include - latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_o" /> - <Key - latin:keyStyle="baseKeyDevanagariVowelSignO" /> + <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_o" /> + <Key latin:keyStyle="baseKeyDevanagariVowelSignO" /> <!-- Because the font rendering system prior to API version 16 can't automatically render dotted circle for incomplete combining letter of some scripts, different set of Key definitions are needed based on the API version. --> - <include - latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_e" /> - <Key - latin:keyStyle="baseKeyDevanagariVowelSignE" /> + <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_e" /> + <Key latin:keyStyle="baseKeyDevanagariVowelSignE" /> <!-- Because the font rendering system prior to API version 16 can't automatically render dotted circle for incomplete combining letter of some scripts, different set of Key definitions are needed based on the API version. --> - <include - latin:keyboardLayout="@xml/keystyle_devanagari_sign_virama" /> - <Key - latin:keyStyle="baseKeyDevanagariSignVirama" /> + <include latin:keyboardLayout="@xml/keystyle_devanagari_sign_virama" /> + <Key latin:keyStyle="baseKeyDevanagariSignVirama" /> <!-- Because the font rendering system prior to API version 16 can't automatically render dotted circle for incomplete combining letter of some scripts, different set of Key definitions are needed based on the API version. --> - <include - latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_i" /> - <Key - latin:keyStyle="baseKeyDevanagariVowelSignI" /> + <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_i" /> + <Key latin:keyStyle="baseKeyDevanagariVowelSignI" /> <!-- Because the font rendering system prior to API version 16 can't automatically render dotted circle for incomplete combining letter of some scripts, different set of Key definitions are needed based on the API version. --> - <include - latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_u" /> - <Key - latin:keyStyle="baseKeyDevanagariVowelSignU" /> + <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_u" /> + <Key latin:keyStyle="baseKeyDevanagariVowelSignU" /> <!-- U+092A: "प" DEVANAGARI LETTER PA --> - <Key - latin:keyLabel="प" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="प" /> <!-- U+0930: "र" DEVANAGARI LETTER RA U+090B: "ऋ" DEVANAGARI LETTER VOCALIC R U+0930/U+093C: "ऱ" DEVANAGARI LETTER RA/DEVANAGARI SIGN NUKTA U+0960: "ॠ" DEVANAGARI LETTER VOCALIC RR --> <Key - latin:keyLabel="र" - latin:moreKeys="ऋ,ऱ,ॠ" - latin:keyLabelFlags="fontNormal" /> + latin:keySpec="र" + latin:moreKeys="ऋ,ऱ,ॠ" /> <!-- U+0915: "क" DEVANAGARI LETTER KA U+0915/U+093C: "क़" DEVANAGARI LETTER KA/DEVANAGARI SIGN NUKTA --> <Key - latin:keyLabel="क" - latin:moreKeys="क़" - latin:keyLabelFlags="fontNormal" /> + latin:keySpec="क" + latin:moreKeys="क़" /> <!-- U+0924: "त" DEVANAGARI LETTER TA U+0924/U+094D/U+0930: "त्र" DEVANAGARI LETTER TA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER RA --> <Key - latin:keyLabel="त" - latin:moreKeys="त्र" - latin:keyLabelFlags="fontNormal" /> + latin:keySpec="त" + latin:moreKeys="त्र" /> <!-- U+091A: "च" DEVANAGARI LETTER CA --> - <Key - latin:keyLabel="च" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="च" /> <!-- U+091F: "ट" DEVANAGARI LETTER TTA --> - <Key - latin:keyLabel="ट" - latin:keyLabelFlags="fontNormal" /> - </default> + <Key latin:keySpec="ट" /> + </default> </switch> </merge> diff --git a/java/res/xml/rowkeys_hindi3.xml b/java/res/xml/rowkeys_hindi3.xml index 136bc5f22..2e6d6864e 100644 --- a/java/res/xml/rowkeys_hindi3.xml +++ b/java/res/xml/rowkeys_hindi3.xml @@ -18,101 +18,80 @@ */ --> -<merge - xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" -> +<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"> <switch> - <case - latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted" - > + <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"> <!-- U+0911: "ऑ" DEVANAGARI LETTER CANDRA O --> - <Key - latin:keyLabel="ऑ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ऑ" /> <!-- Because the font rendering system prior to API version 16 can't automatically render dotted circle for incomplete combining letter of some scripts, different set of Key definitions are needed based on the API version. --> - <include - latin:keyboardLayout="@xml/key_devanagari_sign_candrabindu" /> + <include latin:keyboardLayout="@xml/keystyle_devanagari_sign_candrabindu" /> + <Key latin:keyStyle="baseKeyDevanagariSignCandrabindu" /> <!-- U+0923: "ण" DEVANAGARI LETTER NNA --> - <Key - latin:keyLabel="ण" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ण" /> <!-- U+0929: "ऩ" DEVANAGARI LETTER NNNA --> - <Key - latin:keyLabel="ऩ" /> + <Key latin:keySpec="ऩ" /> <!-- U+0933: "ळ" DEVANAGARI LETTER LLA U+0934: "ऴ" DEVANAGARI LETTER LLLA --> <Key - latin:keyLabel="ळ" - latin:moreKeys="ऴ" - latin:keyLabelFlags="fontNormal" /> + latin:keySpec="ळ" + latin:moreKeys="ऴ" /> <!-- U+0936: "श" DEVANAGARI LETTER SHA --> - <Key - latin:keyLabel="श" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="श" /> <!-- U+0937: "ष" DEVANAGARI LETTER SSA --> - <Key - latin:keyLabel="ष" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ष" /> <!-- Because the font rendering system prior to API version 16 can't automatically render dotted circle for incomplete combining letter of some scripts, different set of Key definitions are needed based on the API version. --> - <include - latin:keyboardLayout="@xml/key_devanagari_vowel_sign_vocalic_r" /> + <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_vocalic_r" /> + <Key latin:keyStyle="baseKeyDevanagariVowelSignVocalicR" /> <!-- U+091E: "ञ" DEVANAGARI LETTER NYA --> - <Key - latin:keyLabel="ञ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ञ" /> </case> <default> <!-- Because the font rendering system prior to API version 16 can't automatically render dotted circle for incomplete combining letter of some scripts, different set of Key definitions are needed based on the API version. --> - <include - latin:keyboardLayout="@xml/key_devanagari_vowel_sign_candra_o" /> - <include - latin:keyboardLayout="@xml/key_devanagari_sign_anusvara" /> + <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_candra_o" /> + <Key latin:keyStyle="baseKeyDevanagariVowelSignCandraO" /> + <!-- Because the font rendering system prior to API version 16 can't automatically + render dotted circle for incomplete combining letter of some scripts, different + set of Key definitions are needed based on the API version. --> + <include latin:keyboardLayout="@xml/keystyle_devanagari_sign_anusvara" /> + <Key latin:keyStyle="baseKeyDevanagariSignAnusvara" /> <!-- U+092E: "म" DEVANAGARI LETTER MA U+0950: "ॐ" DEVANAGARI OM --> <Key - latin:keyLabel="म" - latin:moreKeys="ॐ" - latin:keyLabelFlags="fontNormal" /> + latin:keySpec="म" + latin:moreKeys="ॐ" /> <!-- U+0928: "न" DEVANAGARI LETTER NA U+091E: "ञ" DEVANAGARI LETTER NYA U+0919: "ङ" DEVANAGARI LETTER NGA U+0928/U+093C: "ऩ" DEVANAGARI LETTER NA/DEVANAGARI SIGN NUKTA --> <Key - latin:keyLabel="न" - latin:moreKeys="ञ,ङ,ऩ" - latin:keyLabelFlags="fontNormal" /> + latin:keySpec="न" + latin:moreKeys="ञ,ङ,ऩ" /> <!-- U+0935: "व" DEVANAGARI LETTER VA --> - <Key - latin:keyLabel="व" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="व" /> <!-- U+0932: "ल" DEVANAGARI LETTER LA U+090C: "ऌ" DEVANAGARI LETTER VOCALIC L U+0961: "ॡ" DEVANAGARI LETTER VOCALIC LL --> <Key - latin:keyLabel="ल" - latin:moreKeys="ऌ,ॡ" - latin:keyLabelFlags="fontNormal" /> + latin:keySpec="ल" + latin:moreKeys="ऌ,ॡ" /> <!-- U+0938: "स" DEVANAGARI LETTER SA --> - <Key - latin:keyLabel="स" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="स" /> <!-- U+092F: "य" DEVANAGARI LETTER YA U+095F: "य़" DEVANAGARI LETTER YYA --> <Key - latin:keyLabel="य" - latin:moreKeys="य़" - latin:keyLabelFlags="fontNormal" /> + latin:keySpec="य" + latin:moreKeys="य़" /> <!-- Because the font rendering system prior to API version 16 can't automatically render dotted circle for incomplete combining letter of some scripts, different set of Key definitions are needed based on the API version. --> - <include - latin:keyboardLayout="@xml/key_devanagari_sign_nukta" /> - </default> + <include latin:keyboardLayout="@xml/keystyle_devanagari_sign_nukta" /> + <Key latin:keyStyle="baseKeyDevanagariSignNukta" /> + </default> </switch> </merge> diff --git a/java/res/xml/rowkeys_hindi_compact1.xml b/java/res/xml/rowkeys_hindi_compact1.xml new file mode 100644 index 000000000..06a014162 --- /dev/null +++ b/java/res/xml/rowkeys_hindi_compact1.xml @@ -0,0 +1,121 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright 2014, 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. +*/ +--> + +<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"> + <!-- Because the font rendering system prior to API version 16 can't automatically + render dotted circle for incomplete combining letter of some scripts, different + set of Key definitions are needed based on the API version. --> + <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_au" /> + <!-- U+0914: "औ" DEVANAGARI LETTER AU + U+0967: "१" DEVANAGARI DIGIT ONE --> + <Key + latin:keySpec="औ" + latin:keyStyle="moreKeysDevanagariVowelSignAu" + latin:keyHintLabel="1" + latin:additionalMoreKeys="१,1" /> + <!-- Because the font rendering system prior to API version 16 can't automatically + render dotted circle for incomplete combining letter of some scripts, different + set of Key definitions are needed based on the API version. --> + <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_ai" /> + <!-- U+0910: "ऐ" DEVANAGARI LETTER AI + U+0968: "२" DEVANAGARI DIGIT TWO --> + <Key + latin:keySpec="ऐ" + latin:keyStyle="moreKeysDevanagariVowelSignAi" + latin:keyHintLabel="2" + latin:additionalMoreKeys="२,2" /> + <!-- Because the font rendering system prior to API version 16 can't automatically + render dotted circle for incomplete combining letter of some scripts, different + set of Key definitions are needed based on the API version. --> + <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_aa" /> + <!-- U+0906: "आ" DEVANAGARI LETTER AA + U+0969: "३" DEVANAGARI DIGIT THREE --> + <Key + latin:keySpec="आ" + latin:keyStyle="moreKeysDevanagariVowelSignAa" + latin:keyHintLabel="3" + latin:additionalMoreKeys="३,3" /> + <!-- Because the font rendering system prior to API version 16 can't automatically + render dotted circle for incomplete combining letter of some scripts, different + set of Key definitions are needed based on the API version. --> + <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_ii" /> + <!-- U+0908: "ई" DEVANAGARI LETTER II + U+096A: "४" DEVANAGARI DIGIT FOUR --> + <Key + latin:keySpec="ई" + latin:keyStyle="moreKeysDevanagariVowelSignIi" + latin:keyHintLabel="4" + latin:additionalMoreKeys="४,4" /> + <!-- Because the font rendering system prior to API version 16 can't automatically + render dotted circle for incomplete combining letter of some scripts, different + set of Key definitions are needed based on the API version. --> + <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_uu" /> + <!-- U+090A: "ऊ" DEVANAGARI LETTER UU + U+096B: "५" DEVANAGARI DIGIT FIVE --> + <Key + latin:keySpec="ऊ" + latin:keyStyle="moreKeysDevanagariVowelSignUu" + latin:keyHintLabel="5" + latin:additionalMoreKeys="५,5" /> + <!-- U+092C: "ब" DEVANAGARI LETTER BA + U+092D: "भ" DEVANAGARI LETTER BHA + U+096C: "६" DEVANAGARI DIGIT SIX --> + <Key + latin:keySpec="ब" + latin:moreKeys="भ,%" + latin:keyHintLabel="6" + latin:additionalMoreKeys="६,6" /> + <!-- U+0939: "ह" DEVANAGARI LETTER HA + U+096D: "७" DEVANAGARI DIGIT SEVEN --> + <Key + latin:keySpec="ह" + latin:keyHintLabel="7" + latin:additionalMoreKeys="७,7" /> + <!-- U+0917: "ग" DEVANAGARI LETTER GA + U+0918: "घ" DEVANAGARI LETTER GHA + U+096E: "८" DEVANAGARI DIGIT EIGHT --> + <Key + latin:keySpec="ग" + latin:moreKeys="घ,%" + latin:keyHintLabel="8" + latin:additionalMoreKeys="८,8" /> + <!-- U+0926: "द" DEVANAGARI LETTER DA + U+0927: "ध" DEVANAGARI LETTER DHA + U+096F: "९" DEVANAGARI DIGIT NINE --> + <Key + latin:keySpec="द" + latin:moreKeys="ध,%" + latin:keyHintLabel="9" + latin:additionalMoreKeys="९,9" /> + <!-- U+091C: "ज" DEVANAGARI LETTER JA + U+091D: "झ" DEVANAGARI LETTER JHA + U+091C/U+094D/U+091E: "ज्ञ" DEVANAGARI LETTER JA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER NYA + U+0966: "०" DEVANAGARI DIGIT ZERO --> + <Key + latin:keySpec="ज" + latin:moreKeys="झ,ज्ञ,%" + latin:keyHintLabel="0" + latin:additionalMoreKeys="०,0" /> + <!-- U+0921: "ड" DEVANAGARI LETTER DDA + U+0922: "ढ" DEVANAGARI LETTER DDHA --> + <Key + latin:keySpec="ड" + latin:moreKeys="ढ" /> +</merge> diff --git a/java/res/xml/rowkeys_hindi_compact2.xml b/java/res/xml/rowkeys_hindi_compact2.xml new file mode 100644 index 000000000..7cbe5efbb --- /dev/null +++ b/java/res/xml/rowkeys_hindi_compact2.xml @@ -0,0 +1,96 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright 2014, 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. +*/ +--> + +<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"> + <!-- Because the font rendering system prior to API version 16 can't automatically + render dotted circle for incomplete combining letter of some scripts, different + set of Key definitions are needed based on the API version. --> + <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_o" /> + <!-- U+0913: "ओ" DEVANAGARI LETTER O --> + <Key + latin:keySpec="ओ" + latin:keyStyle="moreKeysDevanagariVowelSignO" /> + <!-- Because the font rendering system prior to API version 16 can't automatically + render dotted circle for incomplete combining letter of some scripts, different + set of Key definitions are needed based on the API version. --> + <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_e" /> + <!-- U+090F: "ए" DEVANAGARI LETTER E --> + <Key + latin:keySpec="ए" + latin:keyStyle="moreKeysDevanagariVowelSignE" /> + <!-- Because the font rendering system prior to API version 16 can't automatically + render dotted circle for incomplete combining letter of some scripts, different + set of Key definitions are needed based on the API version. --> + <include latin:keyboardLayout="@xml/keystyle_devanagari_sign_virama" /> + <!-- U+0905: "अ" DEVANAGARI LETTER A --> + <Key + latin:keySpec="अ" + latin:keyStyle="moreKeysDevanagariSignVirama" /> + <!-- Because the font rendering system prior to API version 16 can't automatically + render dotted circle for incomplete combining letter of some scripts, different + set of Key definitions are needed based on the API version. --> + <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_i" /> + <!-- U+0907: "इ" DEVANAGARI LETTER I --> + <Key + latin:keySpec="इ" + latin:keyStyle="moreKeysDevanagariVowelSignI" /> + <!-- Because the font rendering system prior to API version 16 can't automatically + render dotted circle for incomplete combining letter of some scripts, different + set of Key definitions are needed based on the API version. --> + <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_u" /> + <!-- U+0909: "उ" DEVANAGARI LETTER U --> + <Key + latin:keySpec="उ" + latin:keyStyle="moreKeysDevanagariVowelSignU" /> + <!-- U+092A: "प" DEVANAGARI LETTER PA + U+092B: "फ" DEVANAGARI LETTER PHA --> + <Key + latin:keySpec="प" + latin:moreKeys="फ" /> + <!-- Because the font rendering system prior to API version 16 can't automatically + render dotted circle for incomplete combining letter of some scripts, different + set of Key definitions are needed based on the API version. --> + <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_vocalic_r" /> + <!-- U+0930: "र" DEVANAGARI LETTER RA --> + <Key + latin:keySpec="र" + latin:keyStyle="moreKeysDevanagariVowelSignVocalicR" /> + <!-- U+0915: "क" DEVANAGARI LETTER KA + U+0916: "ख" DEVANAGARI LETTER KHA --> + <Key + latin:keySpec="क" + latin:moreKeys="ख" /> + <!-- U+0924: "त" DEVANAGARI LETTER TA + U+0925: "थ" DEVANAGARI LETTER THA + U+0924/U+094D/U+0930: "त्र" DEVANAGARI LETTER TA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER RA --> + <Key + latin:keySpec="त" + latin:moreKeys="थ,त्र" /> + <!-- U+091A: "च" DEVANAGARI LETTER CA + U+091B: "छ" DEVANAGARI LETTER CHA --> + <Key + latin:keySpec="च" + latin:moreKeys="छ" /> + <!-- U+091F: "ट" DEVANAGARI LETTER TTA + U+0920: "ठ" DEVANAGARI LETTER TTHA --> + <Key + latin:keySpec="ट" + latin:moreKeys="ठ" /> +</merge> diff --git a/java/res/xml/rowkeys_hindi_compact3.xml b/java/res/xml/rowkeys_hindi_compact3.xml new file mode 100644 index 000000000..89a9f9d60 --- /dev/null +++ b/java/res/xml/rowkeys_hindi_compact3.xml @@ -0,0 +1,72 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright 2014, 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. +*/ +--> + +<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"> + <!-- Because the font rendering system prior to API version 16 can't automatically + render dotted circle for incomplete combining letter of some scripts, different + set of Key definitions are needed based on the API version. --> + <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_candra_o" /> + <!-- U+0911: "ऑ" DEVANAGARI LETTER CANDRA O --> + <Key + latin:keySpec="ऑ" + latin:keyStyle="moreKeysDevanagariVowelSignCandraO" /> + <!-- Because the font rendering system prior to API version 16 can't automatically + render dotted circle for incomplete combining letter of some scripts, different + set of Key definitions are needed based on the API version. --> + <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_candra_e" /> + <!-- U+090D: "ऍ" DEVANAGARI LETTER CANDRA E --> + <Key + latin:keySpec="ऍ" + latin:keyStyle="moreKeysDevanagariVowelSignCandraE" /> + <!-- Because the font rendering system prior to API version 16 can't automatically + render dotted circle for incomplete combining letter of some scripts, different + set of Key definitions are needed based on the API version. --> + <include latin:keyboardLayout="@xml/keystyle_devanagari_sign_anusvara" /> + <Key latin:keyStyle="baseKeyDevanagariSignAnusvara" /> + <!-- U+092E: "म" DEVANAGARI LETTER MA + U+0950: "ॐ" DEVANAGARI OM --> + <Key + latin:keySpec="म" + latin:moreKeys="ॐ" /> + <!-- U+0928: "न" DEVANAGARI LETTER NA + U+0923: "ण" DEVANAGARI LETTER NNA + U+091E: "ञ" DEVANAGARI LETTER NYA + U+0919: "ङ" DEVANAGARI LETTER NGA --> + <Key + latin:keySpec="न" + latin:moreKeys="ण,ञ,ङ" /> + <!-- U+0935: "व" DEVANAGARI LETTER VA --> + <Key latin:keySpec="व" /> + <!-- U+0932: "ल" DEVANAGARI LETTER LA --> + <Key latin:keySpec="ल" /> + <!-- U+0938: "स" DEVANAGARI LETTER SA + U+0936: "श" DEVANAGARI LETTER SHA + U+0937: "ष" DEVANAGARI LETTER SSA + U+0936/U+094D/U+0930: "श्र" DEVANAGARI LETTER SHA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER RA --> + <Key + latin:keySpec="स" + latin:moreKeys="श,ष,श्र" /> + <!-- U+092F: "य" DEVANAGARI LETTER YA --> + <Key latin:keySpec="य" /> + <!-- U+0915/U+094D/U+0937: "क्ष" DEVANAGARI LETTER KA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER SSA --> + <Key + latin:keySpec="क्ष" + latin:keyLabelFlags="followKeyLetterRatio" /> +</merge> diff --git a/java/res/xml/rowkeys_khmer1.xml b/java/res/xml/rowkeys_khmer1.xml index 25da66400..79fd231a0 100644 --- a/java/res/xml/rowkeys_khmer1.xml +++ b/java/res/xml/rowkeys_khmer1.xml @@ -18,177 +18,159 @@ */ --> -<merge - xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" -> +<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"> <switch> - <case - latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted" - > + <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"> <!-- U+200D: ZERO WIDTH JOINER --> <Key - latin:keyLabel="!" - latin:moreKeys="!icon/zwj_key|‍" /> + latin:keySpec="!" + latin:moreKeys="!icon/zwj_key|‍" + latin:keyLabelFlags="fontDefault" /> <!-- U+17D7: "ៗ" KHMER SIGN LEK TOO U+200C: ZERO WIDTH NON-JOINER --> <Key - latin:keyLabel="ៗ" - latin:moreKeys="!icon/zwnj_key|‌" - latin:keyLabelFlags="fontNormal" /> + latin:keySpec="ៗ" + latin:moreKeys="!icon/zwnj_key|‌" /> <!-- U+17D1: "៑" KHMER SIGN VIRIAM --> <Key - latin:keyLabel=""" + latin:keySpec=""" latin:keyHintLabel="៑" - latin:moreKeys="៑" /> + latin:moreKeys="៑" + latin:keyLabelFlags="fontDefault" /> <!-- U+17DB: "៛" KHMER CURRENCY SYMBOL RIEL U+20AC: "€" EURO SIGN --> <Key - latin:keyLabel="៛" + latin:keySpec="៛" latin:keyHintLabel="$" - latin:moreKeys="$,€" - latin:keyLabelFlags="fontNormal" /> + latin:moreKeys="$,€" /> <!-- U+17D6: "៖" KHMER SIGN CAMNUC PII KUUH --> <Key - latin:keyLabel="%" + latin:keySpec="%" latin:keyHintLabel="៖" - latin:moreKeys="៖" /> + latin:moreKeys="៖" + latin:keyLabelFlags="fontDefault" /> <!-- U+17CD: "៍" KHMER SIGN TOANDAKHIAT U+17D9: "៙" KHMER SIGN PHNAEK MUAN --> <Key - latin:keyLabel="៍" + latin:keySpec="៍" latin:keyHintLabel="៙" - latin:moreKeys="៙" - latin:keyLabelFlags="fontNormal" /> + latin:moreKeys="៙" /> <!-- U+17D0: "័" KHMER SIGN SAMYOK SANNYA U+17DA: "៚" KHMER SIGN KOOMUUT --> <Key - latin:keyLabel="័" + latin:keySpec="័" latin:keyHintLabel="៚" - latin:moreKeys="៚" - latin:keyLabelFlags="fontNormal" /> + latin:keyHintLabelVerticalAdjustment="-30%" + latin:moreKeys="៚" /> <!-- U+17CF: "៏" KHMER SIGN AHSDA --> <Key - latin:keyLabel="៏" + latin:keySpec="៏" latin:keyHintLabel="*" - latin:moreKeys="*" - latin:keyLabelFlags="fontNormal" /> + latin:moreKeys="*" /> <!-- U+00AB: "«" LEFT-POINTING DOUBLE ANGLE QUOTATION MARK --> <Key - latin:keyLabel="(" + latin:keySpec="(" latin:keyHintLabel="{" - latin:moreKeys="{,«" /> + latin:moreKeys="{,«" + latin:keyLabelFlags="fontDefault" /> <!-- U+00BB: "»" RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK --> <Key - latin:keyLabel=")" + latin:keySpec=")" latin:keyHintLabel="}" - latin:moreKeys="},»" /> + latin:moreKeys="},»" + latin:keyLabelFlags="fontDefault" /> <!-- U+17CC: "៌" KHMER SIGN ROBAT U+00D7: "×" MULTIPLICATION SIGN --> <Key - latin:keyLabel="៌" + latin:keySpec="៌" latin:keyHintLabel="×" - latin:moreKeys="×" - latin:keyLabelFlags="fontNormal" /> + latin:moreKeys="×" /> <!-- U+17CE: "៎" KHMER SIGN KAKABAT --> - <Key - latin:keyLabel="៎" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="៎" /> </case> <default> <!-- U+17E1: "១" KHMER DIGIT ONE U+17F1: "៱" KHMER SYMBOL LEK ATTAK MUOY --> <Key - latin:keyLabel="១" + latin:keySpec="១" latin:keyHintLabel="1" latin:additionalMoreKeys="1" - latin:moreKeys="៱" - latin:keyLabelFlags="fontNormal" /> + latin:moreKeys="៱" /> <!-- U+17E2: "២" KHMER DIGIT TWO U+17F2: "៲" KHMER SYMBOL LEK ATTAK PII --> <Key - latin:keyLabel="២" + latin:keySpec="២" latin:keyHintLabel="2" latin:additionalMoreKeys="2" - latin:moreKeys="៲" - latin:keyLabelFlags="fontNormal" /> + latin:moreKeys="៲" /> <!-- U+17E3: "៣" KHMER DIGIT THREE U+17F3: "៳" KHMER SYMBOL LEK ATTAK BEI --> <Key - latin:keyLabel="៣" + latin:keySpec="៣" latin:keyHintLabel="3" latin:additionalMoreKeys="3" - latin:moreKeys="៳" - latin:keyLabelFlags="fontNormal" /> + latin:moreKeys="៳" /> <!-- U+17E4: "៤" KHMER DIGIT FOUR U+17F4: "៴" KHMER SYMBOL LEK ATTAK BUON --> <Key - latin:keyLabel="៤" + latin:keySpec="៤" latin:keyHintLabel="4" latin:additionalMoreKeys="4" - latin:moreKeys="៴" - latin:keyLabelFlags="fontNormal" /> + latin:moreKeys="៴" /> <!-- U+17E5: "៥" KHMER DIGIT FIVE U+17F5: "៵" KHMER SYMBOL LEK ATTAK PRAM --> <Key - latin:keyLabel="៥" + latin:keySpec="៥" latin:keyHintLabel="5" latin:additionalMoreKeys="5" - latin:moreKeys="៵" - latin:keyLabelFlags="fontNormal" /> + latin:moreKeys="៵" /> <!-- U+17E6: "៦" KHMER DIGIT SIX U+17F6: "៶" KHMER SYMBOL LEK ATTAK PRAM-MUOY --> <Key - latin:keyLabel="៦" + latin:keySpec="៦" latin:keyHintLabel="6" latin:additionalMoreKeys="6" - latin:moreKeys="៶" - latin:keyLabelFlags="fontNormal" /> + latin:moreKeys="៶" /> <!-- U+17E7: "៧" KHMER DIGIT SEVEN U+17F7: "៷" KHMER SYMBOL LEK ATTAK PRAM-PII --> <Key - latin:keyLabel="៧" + latin:keySpec="៧" latin:keyHintLabel="7" latin:additionalMoreKeys="7" - latin:moreKeys="៷" - latin:keyLabelFlags="fontNormal" /> + latin:moreKeys="៷" /> <!-- U+17E8: "៨" KHMER DIGIT EIGHT U+17F8: "៸" KHMER SYMBOL LEK ATTAK PRAM-BEI --> <Key - latin:keyLabel="៨" + latin:keySpec="៨" latin:keyHintLabel="8" latin:additionalMoreKeys="8" - latin:moreKeys="៸" - latin:keyLabelFlags="fontNormal" /> + latin:moreKeys="៸" /> <!-- U+17E9: "៩" KHMER DIGIT NINE U+17F9: "៹" KHMER SYMBOL LEK ATTAK PRAM-BUON --> <Key - latin:keyLabel="៩" + latin:keySpec="៩" latin:keyHintLabel="9" latin:additionalMoreKeys="9" - latin:moreKeys="៹" - latin:keyLabelFlags="fontNormal" /> + latin:moreKeys="៹" /> <!-- U+17E0: "០" KHMER DIGIT ZERO U+17F0: "៰" KHMER SYMBOL LEK ATTAK SON --> <Key - latin:keyLabel="០" + latin:keySpec="០" latin:keyHintLabel="0" latin:additionalMoreKeys="0" - latin:moreKeys="៰" - latin:keyLabelFlags="fontNormal" /> + latin:moreKeys="៰" /> <!-- U+17A5: "ឥ" KHMER INDEPENDENT VOWEL QI U+17A6: "ឦ" KHMER INDEPENDENT VOWEL QII --> <Key - latin:keyLabel="ឥ" + latin:keySpec="ឥ" latin:keyHintLabel="ឦ" - latin:moreKeys=",ឦ" - latin:keyLabelFlags="fontNormal" /> + latin:moreKeys=",ឦ" /> <!-- U+17B2: "ឲ" KHMER INDEPENDENT VOWEL QOO TYPE TWO U+17B1: "ឱ" KHMER INDEPENDENT VOWEL QOO TYPE ONE --> <Key - latin:keyLabel="ឲ" + latin:keySpec="ឲ" latin:keyHintLabel="ឱ" - latin:moreKeys="ឱ" - latin:keyLabelFlags="fontNormal" /> + latin:moreKeys="ឱ" /> </default> </switch> </merge> diff --git a/java/res/xml/rowkeys_khmer2.xml b/java/res/xml/rowkeys_khmer2.xml index cba2d3b90..04ca1e0df 100644 --- a/java/res/xml/rowkeys_khmer2.xml +++ b/java/res/xml/rowkeys_khmer2.xml @@ -18,116 +18,70 @@ */ --> -<merge - xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" -> +<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"> <switch> - <case - latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted" - > + <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"> <!-- U+1788: "ឈ" KHMER LETTER CHO U+17DC: "ៜ" KHMER SIGN AVAKRAHASANYA --> <Key - latin:keyLabel="ឈ" + latin:keySpec="ឈ" latin:keyHintLabel="ៜ" - latin:moreKeys="ៜ" - latin:keyLabelFlags="fontNormal" /> + latin:moreKeys="ៜ" /> <!-- U+17BA: "ឺ" KHMER VOWEL SIGN YY U+17DD: "៝" KHMER SIGN ATTHACAN --> <Key - latin:keyLabel="ឺ" + latin:keySpec="ឺ" latin:keyHintLabel="៝" - latin:moreKeys="៝" - latin:keyLabelFlags="fontNormal" /> + latin:keyHintLabelVerticalAdjustment="40%" + latin:moreKeys="៝" /> <!-- U+17C2: "ែ" KHMER VOWEL SIGN AE --> - <Key - latin:keyLabel="ែ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ែ" /> <!-- U+17AC: "ឬ" KHMER INDEPENDENT VOWEL RYY U+17AB: "ឫ" KHMER INDEPENDENT VOWEL RY --> <Key - latin:keyLabel="ឬ" + latin:keySpec="ឬ" latin:keyHintLabel="ឫ" - latin:moreKeys="ឫ" - latin:keyLabelFlags="fontNormal" /> + latin:moreKeys="ឫ" /> <!-- U+1791: "ទ" KHMER LETTER TO --> - <Key - latin:keyLabel="ទ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ទ" /> <!-- U+17BD: "ួ" KHMER VOWEL SIGN UA --> - <Key - latin:keyLabel="ួ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ួ" /> <!-- U+17BC: "ូ" KHMER VOWEL SIGN UU --> - <Key - latin:keyLabel="ូ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ូ" /> <!-- U+17B8: "ី" KHMER VOWEL SIGN II --> - <Key - latin:keyLabel="ី" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ី" /> <!-- U+17C5: "ៅ" KHMER VOWEL SIGN AU --> - <Key - latin:keyLabel="ៅ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ៅ" /> <!-- U+1797: "ភ" KHMER LETTER PHO --> - <Key - latin:keyLabel="ភ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ភ" /> <!-- U+17BF: "ឿ" KHMER VOWEL SIGN YA --> - <Key - latin:keyLabel="ឿ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ឿ" /> <!-- U+17B0: "ឰ" KHMER INDEPENDENT VOWEL QAI --> - <Key - latin:keyLabel="ឰ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ឰ" /> </case> <default> <!-- U+1786: "ឆ" KHMER LETTER CHA --> - <Key - latin:keyLabel="ឆ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ឆ" /> <!-- U+17B9: "ឹ" KHMER VOWEL SIGN Y --> - <Key - latin:keyLabel="ឹ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ឹ" /> <!-- U+17C1: "េ" KHMER VOWEL SIGN E --> - <Key - latin:keyLabel="េ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="េ" /> <!-- U+179A: "រ" KHMER LETTER RO --> - <Key - latin:keyLabel="រ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="រ" /> <!-- U+178F: "ត" KHMER LETTER TA --> - <Key - latin:keyLabel="ត" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ត" /> <!-- U+1799: "យ" KHMER LETTER YO --> - <Key - latin:keyLabel="យ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="យ" /> <!-- U+17BB: "ុ" KHMER VOWEL SIGN U --> - <Key - latin:keyLabel="ុ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ុ" /> <!-- U+17B7: "ិ" KHMER VOWEL SIGN I --> - <Key - latin:keyLabel="ិ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ិ" /> <!-- U+17C4: "ោ" KHMER VOWEL SIGN OO --> - <Key - latin:keyLabel="ោ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ោ" /> <!-- U+1795: "ផ" KHMER LETTER PHA --> - <Key - latin:keyLabel="ផ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ផ" /> <!-- U+17C0: "ៀ" KHMER VOWEL SIGN IE --> - <Key - latin:keyLabel="ៀ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ៀ" /> <!-- U+17AA: "ឪ" KHMER INDEPENDENT VOWEL QUUV U+17A7: "ឧ" KHMER INDEPENDENT VOWEL QU U+17B1: "ឱ" KHMER INDEPENDENT VOWEL QOO TYPE ONE @@ -135,10 +89,9 @@ U+17A9: "ឩ" KHMER INDEPENDENT VOWEL QUU U+17A8: "ឨ" KHMER INDEPENDENT VOWEL QUK --> <Key - latin:keyLabel="ឪ" + latin:keySpec="ឪ" latin:keyHintLabel="ឧ" - latin:moreKeys="ឧ,ឱ,ឳ,ឩ,ឨ" - latin:keyLabelFlags="fontNormal" /> + latin:moreKeys="ឧ,ឱ,ឳ,ឩ,ឨ" /> </default> </switch> </merge> diff --git a/java/res/xml/rowkeys_khmer3.xml b/java/res/xml/rowkeys_khmer3.xml index ff6c9ca51..c2db36449 100644 --- a/java/res/xml/rowkeys_khmer3.xml +++ b/java/res/xml/rowkeys_khmer3.xml @@ -18,121 +18,76 @@ */ --> -<merge - xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" -> +<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"> <switch> - <case - latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted" - > + <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"> <!-- U+17B6/U+17C6: "ាំ" KHMER VOWEL SIGN AA/KHMER SIGN NIKAHIT --> <Key - latin:keyLabel="ាំ" - latin:keyLabelFlags="fontNormal|followKeyLetterRatio" /> + latin:keySpec="ាំ" + latin:keyLabelFlags="followKeyLetterRatio" /> <!-- U+17C3: "ៃ" KHMER VOWEL SIGN AI --> - <Key - latin:keyLabel="ៃ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ៃ" /> <!-- U+178C: "ឌ" KHMER LETTER DO --> - <Key - latin:keyLabel="ឌ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ឌ" /> <!-- U+1792: "ធ" KHMER LETTER THO --> - <Key - latin:keyLabel="ធ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ធ" /> <!-- U+17A2: "អ" KHMER LETTER QA --> - <Key - latin:keyLabel="អ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="អ" /> <!-- U+17C7: "ះ" KHMER SIGN REAHMUK - U+17C8: "ៈ" KHMER SIGN YUUKALEAPINTU;--> + U+17C8: "ៈ" KHMER SIGN YUUKALEAPINTU --> <Key - latin:keyLabel="ះ" + latin:keySpec="ះ" latin:keyHintLabel="ៈ" - latin:moreKeys="ៈ" - latin:keyLabelFlags="fontNormal" /> + latin:moreKeys="ៈ" /> <!-- U+1789: "ញ" KHMER LETTER NYO --> - <Key - latin:keyLabel="ញ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ញ" /> <!-- U+1782: "គ" KHMER LETTER KO U+179D: "ឝ" KHMER LETTER SHA --> <Key - latin:keyLabel="គ" + latin:keySpec="គ" latin:keyHintLabel="ឝ" - latin:moreKeys="ឝ" - latin:keyLabelFlags="fontNormal" /> + latin:moreKeys="ឝ" /> <!-- U+17A1: "ឡ" KHMER LETTER LA --> - <Key - latin:keyLabel="ឡ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ឡ" /> <!-- U+17C4/U+17C7: "ោះ" KHMER VOWEL SIGN OO/KHMER SIGN REAHMUK --> <Key - latin:keyLabel="ោះ" - latin:keyLabelFlags="fontNormal" /> + latin:keySpec="ោះ" + latin:keyLabelFlags="followKeyLetterRatio|autoScale" /> <!-- U+17C9: "៉" KHMER SIGN MUUSIKATOAN --> - <Key - latin:keyLabel="៉" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="៉" /> <!-- U+17AF: "ឯ" KHMER INDEPENDENT VOWEL QE --> - <Key - latin:keyLabel="ឯ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ឯ" /> </case> <default> <!-- U+17B6: "ា" KHMER VOWEL SIGN AA --> - <Key - latin:keyLabel="ា" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ា" /> <!-- U+179F: "ស" KHMER LETTER SA --> - <Key - latin:keyLabel="ស" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ស" /> <!-- U+178A: "ដ" KHMER LETTER DA --> - <Key - latin:keyLabel="ដ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ដ" /> <!-- U+1790: "ថ" KHMER LETTER THA --> - <Key - latin:keyLabel="ថ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ថ" /> <!-- U+1784: "ង" KHMER LETTER NGO --> - <Key - latin:keyLabel="ង" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ង" /> <!-- U+17A0: "ហ" KHMER LETTER HA --> - <Key - latin:keyLabel="ហ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ហ" /> <!-- U+17D2: "្" KHMER SIGN COENG --> - <Key - latin:keyLabel="្" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="្" /> <!-- U+1780: "ក" KHMER LETTER KA --> - <Key - latin:keyLabel="ក" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ក" /> <!-- U+179B: "ល" KHMER LETTER LO --> - <Key - latin:keyLabel="ល" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ល" /> <!-- U+17BE: "ើ" KHMER VOWEL SIGN OE --> - <Key - latin:keyLabel="ើ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ើ" /> <!-- U+17CB: "់" KHMER SIGN BANTOC --> - <Key - latin:keyLabel="់" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="់" /> <!-- U+17AE: "ឮ" KHMER INDEPENDENT VOWEL LYY U+17AD: "ឭ" KHMER INDEPENDENT VOWEL LY U+17B0: "ឰ" KHMER INDEPENDENT VOWEL QAI --> <Key - latin:keyLabel="ឮ" + latin:keySpec="ឮ" latin:keyHintLabel="ឭ" - latin:moreKeys="ឭ,ឰ" - latin:keyLabelFlags="fontNormal" /> + latin:moreKeys="ឭ,ឰ" /> </default> </switch> </merge> diff --git a/java/res/xml/rowkeys_khmer4.xml b/java/res/xml/rowkeys_khmer4.xml index fe6c59125..70bdcf1bb 100644 --- a/java/res/xml/rowkeys_khmer4.xml +++ b/java/res/xml/rowkeys_khmer4.xml @@ -18,96 +18,62 @@ */ --> -<merge - xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" -> +<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"> <switch> - <case - latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted" - > + <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"> <!-- U+178D: "ឍ" KHMER LETTER TTHO --> - <Key - latin:keyLabel="ឍ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ឍ" /> <!-- U+1783: "ឃ" KHMER LETTER KHO --> - <Key - latin:keyLabel="ឃ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ឃ" /> <!-- U+1787: "ជ" KHMER LETTER CO --> - <Key - latin:keyLabel="ជ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ជ" /> <!-- U+17C1/U+17C7: "េះ" KHMER VOWEL SIGN E/KHMER SIGN REAHMUK --> <Key - latin:keyLabel="េះ" - latin:keyLabelFlags="fontNormal" /> + latin:keySpec="េះ" + latin:keyLabelFlags="followKeyLetterRatio" /> <!-- U+1796: "ព" KHMER LETTER PO U+179E: "ឞ" KHMER LETTER SSO --> <Key - latin:keyLabel="ព" + latin:keySpec="ព" latin:keyHintLabel="ឞ" - latin:moreKeys="ឞ" - latin:keyLabelFlags="fontNormal" /> + latin:moreKeys="ឞ" /> <!-- U+178E: "ណ" KHMER LETTER NNO --> - <Key - latin:keyLabel="ណ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ណ" /> <!-- U+17C6: "ំ" KHMER SIGN NIKAHIT --> - <Key - latin:keyLabel="ំ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ំ" /> <!-- U+17BB/U+17C7: "ុះ" KHMER VOWEL SIGN U/KHMER SIGN REAHMUK --> <Key - latin:keyLabel="ុះ" - latin:keyLabelFlags="fontNormal|followKeyLetterRatio" /> + latin:keySpec="ុះ" + latin:keyLabelFlags="followKeyLetterRatio" /> <!-- U+17D5: "៕" KHMER SIGN BARIYOOSAN --> + <Key latin:keySpec="៕" /> <Key - latin:keyLabel="៕" - latin:keyLabelFlags="fontNormal" /> - <Key - latin:keyLabel="\?" /> + latin:keySpec="\?" + latin:keyLabelFlags="fontDefault" /> </case> <default> <!-- U+178B: "ឋ" KHMER LETTER TTHA --> - <Key - latin:keyLabel="ឋ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ឋ" /> <!-- U+1781: "ខ" KHMER LETTER KHA --> - <Key - latin:keyLabel="ខ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ខ" /> <!-- U+1785: "ច" KHMER LETTER CA --> - <Key - latin:keyLabel="ច" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ច" /> <!-- U+179C: "វ" KHMER LETTER VO --> - <Key - latin:keyLabel="វ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="វ" /> <!-- U+1794: "ប" KHMER LETTER BA --> - <Key - latin:keyLabel="ប" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ប" /> <!-- U+1793: "ន" KHMER LETTER NO --> - <Key - latin:keyLabel="ន" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ន" /> <!-- U+1798: "ម" KHMER LETTER MO --> - <Key - latin:keyLabel="ម" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ម" /> <!-- U+17BB/U+17C6: "ុំ" KHMER VOWEL SIGN U/KHMER SIGN NIKAHIT --> <Key - latin:keyLabel="ុំ" - latin:keyLabelFlags="fontNormal|followKeyLetterRatio" /> + latin:keySpec="ុំ" + latin:keyLabelFlags="followKeyLetterRatio" /> <!-- U+17D4: "។" KHMER SIGN KHAN --> - <Key - latin:keyLabel="។" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="។" /> <!-- U+17CA: "៊" KHMER SIGN TRIISAP --> - <Key - latin:keyLabel="៊" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="៊" /> </default> </switch> </merge> diff --git a/java/res/xml/rowkeys_lao1.xml b/java/res/xml/rowkeys_lao1.xml index fa1ad97d8..f88d5fd66 100644 --- a/java/res/xml/rowkeys_lao1.xml +++ b/java/res/xml/rowkeys_lao1.xml @@ -18,147 +18,106 @@ */ --> -<merge - xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" -> +<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"> <switch> - <case - latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted" - > + <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"> <!-- U+0ED1: "໑" LAO DIGIT ONE --> - <Key - latin:keyLabel="໑" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="໑" /> <!-- U+0ED2: "໒" LAO DIGIT TWO --> - <Key - latin:keyLabel="໒" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="໒" /> <!-- U+0ED3: "໓" LAO DIGIT THREE --> - <Key - latin:keyLabel="໓" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="໓" /> <!-- U+0ED4: "໔" LAO DIGIT FOUR --> - <Key - latin:keyLabel="໔" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="໔" /> <!-- U+0ECC: "໌" LAO CANCELLATION MARK --> - <Key - latin:keyLabel="໌" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="໌" /> <!-- U+0EBC: "ຼ" LAO SEMIVOWEL SIGN LO --> - <Key - latin:keyLabel="ຼ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ຼ" /> <!-- U+0ED5: "໕" LAO DIGIT FIVE --> - <Key - latin:keyLabel="໕" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="໕" /> <!-- U+0ED6: "໖" LAO DIGIT SIX --> - <Key - latin:keyLabel="໖" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="໖" /> <!-- U+0ED7: "໗" LAO DIGIT SEVEN --> - <Key - latin:keyLabel="໗" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="໗" /> <!-- U+0ED8: "໘" LAO DIGIT EIGHT --> - <Key - latin:keyLabel="໘" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="໘" /> <!-- U+0ED9: "໙" LAO DIGIT NINE --> - <Key - latin:keyLabel="໙" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="໙" /> <!-- U+0ECD/U+0EC8: "ໍ່" LAO NIGGAHITA/LAO TONE MAI EK --> <Key - latin:keyLabel="ໍ່" - latin:keyLabelFlags="fontNormal|followKeyLetterRatio" /> + latin:keySpec="ໍ່" + latin:keyLabelFlags="followKeyLetterRatio" /> </case> <default> <!-- U+0EA2: "ຢ" LAO LETTER YO U+0ED1: "໑" LAO DIGIT ONE --> <Key - latin:keyLabel="ຢ" + latin:keySpec="ຢ" latin:keyHintLabel="1" latin:additionalMoreKeys="1" - latin:moreKeys="໑" - latin:keyLabelFlags="fontNormal" /> + latin:moreKeys="໑" /> <!-- U+0E9F: "ຟ" LAO LETTER FO SUNG U+0ED2: "໒" LAO DIGIT TWO --> <Key - latin:keyLabel="ຟ" + latin:keySpec="ຟ" latin:keyHintLabel="2" latin:additionalMoreKeys="2" - latin:moreKeys="໒" - latin:keyLabelFlags="fontNormal" /> + latin:moreKeys="໒" /> <!-- U+0EC2: "ໂ" LAO VOWEL SIGN O U+0ED3: "໓" LAO DIGIT THREE --> <Key - latin:keyLabel="ໂ" + latin:keySpec="ໂ" latin:keyHintLabel="3" latin:additionalMoreKeys="3" - latin:moreKeys="໓" - latin:keyLabelFlags="fontNormal" /> + latin:moreKeys="໓" /> <!-- U+0E96: "ຖ" LAO LETTER THO SUNG U+0ED4: "໔" LAO DIGIT FOUR --> <Key - latin:keyLabel="ຖ" + latin:keySpec="ຖ" latin:keyHintLabel="4" latin:additionalMoreKeys="4" - latin:moreKeys="໔" - latin:keyLabelFlags="fontNormal" /> + latin:moreKeys="໔" /> <!-- U+0EB8: "ຸ" LAO VOWEL SIGN U --> - <Key - latin:keyLabel="ຸ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ຸ" /> <!-- U+0EB9: "ູ" LAO VOWEL SIGN UU --> - <Key - latin:keyLabel="ູ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ູ" /> <!-- U+0E84: "ຄ" LAO LETTER KHO TAM U+0ED5: "໕" LAO DIGIT FIVE --> <Key - latin:keyLabel="ຄ" + latin:keySpec="ຄ" latin:keyHintLabel="5" latin:additionalMoreKeys="5" - latin:moreKeys="໕" - latin:keyLabelFlags="fontNormal" /> + latin:moreKeys="໕" /> <!-- U+0E95: "ຕ" LAO LETTER TO U+0ED6: "໖" LAO DIGIT SIX --> <Key - latin:keyLabel="ຕ" + latin:keySpec="ຕ" latin:keyHintLabel="6" latin:additionalMoreKeys="6" - latin:moreKeys="໖" - latin:keyLabelFlags="fontNormal" /> + latin:moreKeys="໖" /> <!-- U+0E88: "ຈ" LAO LETTER CO U+0ED7: "໗" LAO DIGIT SEVEN --> <Key - latin:keyLabel="ຈ" + latin:keySpec="ຈ" latin:keyHintLabel="7" latin:additionalMoreKeys="7" - latin:moreKeys="໗" - latin:keyLabelFlags="fontNormal" /> + latin:moreKeys="໗" /> <!-- U+0E82: "ຂ" LAO LETTER KHO SUNG U+0ED8: "໘" LAO DIGIT EIGHT --> <Key - latin:keyLabel="ຂ" + latin:keySpec="ຂ" latin:keyHintLabel="8" latin:additionalMoreKeys="8" - latin:moreKeys="໘" - latin:keyLabelFlags="fontNormal" /> + latin:moreKeys="໘" /> <!-- U+0E8A: "ຊ" LAO LETTER SO TAM U+0ED9: "໙" LAO DIGIT NINE --> <Key - latin:keyLabel="ຊ" + latin:keySpec="ຊ" latin:keyHintLabel="9" latin:additionalMoreKeys="9" - latin:moreKeys="໙" - latin:keyLabelFlags="fontNormal" /> + latin:moreKeys="໙" /> <!-- U+0ECD: "ໍ" LAO NIGGAHITA --> - <Key - latin:keyLabel="ໍ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ໍ" /> </default> </switch> </merge> diff --git a/java/res/xml/rowkeys_lao2.xml b/java/res/xml/rowkeys_lao2.xml index fca58ac0e..46b6395d7 100644 --- a/java/res/xml/rowkeys_lao2.xml +++ b/java/res/xml/rowkeys_lao2.xml @@ -18,110 +18,78 @@ */ --> -<merge - xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" -> +<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"> <switch> - <case - latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted" - > + <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"> <!-- U+0EBB/U+0EC9: "" LAO VOWEL SIGN MAI KON/LAO TONE MAI THO --> <Key - latin:keyLabel="ົ້" - latin:keyLabelFlags="fontNormal|followKeyLetterRatio" /> + latin:keySpec="ົ້" + latin:keyLabelFlags="followKeyLetterRatio" /> <!-- U+0ED0: "໐" LAO DIGIT ZERO --> - <Key - latin:keyLabel="໐" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="໐" /> <!-- U+0EB3/U+0EC9: "ຳ້" LAO VOWEL SIGN AM/LAO TONE MAI THO --> <Key - latin:keyLabel="ຳ້" - latin:keyLabelFlags="fontNormal|followKeyLetterRatio" /> + latin:keySpec="ຳ້" + latin:keyLabelFlags="followKeyLetterRatio" /> <Key - latin:keyLabel="_" /> + latin:keySpec="_" + latin:keyLabelFlags="fontDefault" /> <Key - latin:keyLabel="+" /> + latin:keySpec="+" + latin:keyLabelFlags="fontDefault" /> <!-- U+0EB4/U+0EC9: "ິ້" LAO VOWEL SIGN I/LAO TONE MAI THO --> <Key - latin:keyLabel="ິ້" - latin:keyLabelFlags="fontNormal|followKeyLetterRatio" /> + latin:keySpec="ິ້" + latin:keyLabelFlags="followKeyLetterRatio" /> <!-- U+0EB5/U+0EC9: "ີ້" LAO VOWEL SIGN II/LAO TONE MAI THO --> <Key - latin:keyLabel="ີ້" - latin:keyLabelFlags="fontNormal|followKeyLetterRatio" /> + latin:keySpec="ີ້" + latin:keyLabelFlags="followKeyLetterRatio" /> <!-- U+0EA3: "ຣ" LAO LETTER LO LING --> - <Key - latin:keyLabel="ຣ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ຣ" /> <!-- U+0EDC: "ໜ" LAO HO NO --> - <Key - latin:keyLabel="ໜ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ໜ" /> <!-- U+0EBD: "ຽ" LAO SEMIVOWEL SIGN NYO --> - <Key - latin:keyLabel="ຽ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ຽ" /> <!-- U+0EAB/U+0EBC: "" LAO LETTER HO SUNG/LAO SEMIVOWEL SIGN LO --> <Key - latin:keyLabel="ຫຼ" - latin:keyLabelFlags="fontNormal|followKeyLetterRatio" /> + latin:keySpec="ຫຼ" + latin:keyLabelFlags="followKeyLetterRatio" /> <!-- U+201D: "”" RIGHT DOUBLE QUOTATION MARK --> <Key - latin:keyLabel="”" /> + latin:keySpec="”" + latin:keyLabelFlags="fontDefault" /> </case> <default> <!-- U+0EBB: "ົ" LAO VOWEL SIGN MAI KON --> - <Key - latin:keyLabel="ົ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ົ" /> <!-- U+0EC4: "ໄ" LAO VOWEL SIGN AI U+0ED0: "໐" LAO DIGIT ZERO --> <Key - latin:keyLabel="ໄ" + latin:keySpec="ໄ" latin:keyHintLabel="0" latin:additionalMoreKeys="0" - latin:moreKeys="໐" - latin:keyLabelFlags="fontNormal" /> + latin:moreKeys="໐" /> <!-- U+0EB3: "ຳ" LAO VOWEL SIGN AM --> - <Key - latin:keyLabel="ຳ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ຳ" /> <!-- U+0E9E: "ພ" LAO LETTER PHO TAM --> - <Key - latin:keyLabel="ພ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ພ" /> <!-- U+0EB0: "ະ" LAO VOWEL SIGN A --> - <Key - latin:keyLabel="ະ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ະ" /> <!-- U+0EB4: "ິ" LAO VOWEL SIGN I --> - <Key - latin:keyLabel="ິ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ິ" /> <!-- U+0EB5: "ີ" LAO VOWEL SIGN II --> - <Key - latin:keyLabel="ີ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ີ" /> <!-- U+0EAE: "ຮ" LAO LETTER HO TAM --> - <Key - latin:keyLabel="ຮ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ຮ" /> <!-- U+0E99: "ນ" LAO LETTER NO --> - <Key - latin:keyLabel="ນ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ນ" /> <!-- U+0E8D: "ຍ" LAO LETTER NYO --> - <Key - latin:keyLabel="ຍ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ຍ" /> <!-- U+0E9A: "ບ" LAO LETTER BO --> - <Key - latin:keyLabel="ບ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ບ" /> <!-- U+0EA5: "ລ" LAO LETTER LO LOOT --> - <Key - latin:keyLabel="ລ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ລ" /> </default> </switch> </merge> diff --git a/java/res/xml/rowkeys_lao3.xml b/java/res/xml/rowkeys_lao3.xml index 2a6c2d1dd..ab3e25131 100644 --- a/java/res/xml/rowkeys_lao3.xml +++ b/java/res/xml/rowkeys_lao3.xml @@ -18,93 +18,73 @@ */ --> -<merge - xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" -> +<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"> <switch> - <case - latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted" - > + <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"> <!-- U+0EB1/U+0EC9: "ັ້" LAO VOWEL SIGN MAI KAN/LAO TONE MAI THO --> <Key - latin:keyLabel="ັ້" - latin:keyLabelFlags="fontNormal|followKeyLetterRatio" /> + latin:keySpec="ັ້" + latin:keyLabelFlags="followKeyLetterRatio" /> <Key - latin:keyLabel=";" /> + latin:keySpec=";" + latin:keyLabelFlags="fontDefault" /> <Key - latin:keyLabel="." /> + latin:keySpec="." + latin:keyLabelFlags="fontDefault" /> <Key - latin:keyLabel="," /> + latin:keySpec="," + latin:keyLabelFlags="fontDefault" /> <Key - latin:keyLabel=":" /> + latin:keySpec=":" + latin:keyLabelFlags="fontDefault" /> <!-- U+0ECA: "໊" LAO TONE MAI TI --> - <Key - latin:keyLabel="໊" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="໊" /> <!-- U+0ECB: "໋" LAO TONE MAI CATAWA --> + <Key latin:keySpec="໋" /> <Key - latin:keyLabel="໋" - latin:keyLabelFlags="fontNormal" /> - <Key - latin:keyLabel="!" /> + latin:keySpec="!" + latin:keyLabelFlags="fontDefault" /> <Key - latin:keyLabel="\?" /> + latin:keySpec="\?" + latin:keyLabelFlags="fontDefault" /> <Key - latin:keyLabel="%" /> + latin:keySpec="%" + latin:keyLabelFlags="fontDefault" /> <Key - latin:keyLabel="=" /> + latin:keySpec="=" + latin:keyLabelFlags="fontDefault" /> <!-- U+201C: "“" LEFT DOUBLE QUOTATION MARK --> <Key - latin:keyLabel="“" /> + latin:keySpec="“" + latin:keyLabelFlags="fontDefault" /> </case> <default> <!-- U+0EB1: "ັ" LAO VOWEL SIGN MAI KAN --> - <Key - latin:keyLabel="ັ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ັ" /> <!-- U+0EAB: "ຫ" LAO LETTER HO SUNG --> - <Key - latin:keyLabel="ຫ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ຫ" /> <!-- U+0E81: "ກ" LAO LETTER KO --> - <Key - latin:keyLabel="ກ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ກ" /> <!-- U+0E94: "ດ" LAO LETTER DO --> - <Key - latin:keyLabel="ດ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ດ" /> <!-- U+0EC0: "ເ" LAO VOWEL SIGN E --> - <Key - latin:keyLabel="ເ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ເ" /> <!-- U+0EC9: "້" LAO TONE MAI THO --> - <Key - latin:keyLabel="້" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="້" /> <!-- U+0EC8: "່" LAO TONE MAI EK --> - <Key - latin:keyLabel="່" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="່" /> <!-- U+0EB2: "າ" LAO VOWEL SIGN AA --> - <Key - latin:keyLabel="າ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="າ" /> <!-- U+0EAA: "ສ" LAO LETTER SO SUNG --> - <Key - latin:keyLabel="ສ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ສ" /> <!-- U+0EA7: "ວ" LAO LETTER WO --> - <Key - latin:keyLabel="ວ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ວ" /> <!-- U+0E87: "ງ" LAO LETTER NGO --> - <Key - latin:keyLabel="ງ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ງ" /> <!-- U+201C: "“" LEFT DOUBLE QUOTATION MARK --> <Key - latin:keyLabel="“" /> + latin:keySpec="“" + latin:keyLabelFlags="fontDefault" /> </default> </switch> </merge> diff --git a/java/res/xml/rowkeys_lao4.xml b/java/res/xml/rowkeys_lao4.xml index fae9cc923..5beb1cbcb 100644 --- a/java/res/xml/rowkeys_lao4.xml +++ b/java/res/xml/rowkeys_lao4.xml @@ -18,86 +18,60 @@ */ --> -<merge - xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" -> +<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"> <switch> - <case - latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted" - > + <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"> <!-- U+20AD: "₭" KIP SIGN --> <Key - latin:keyLabel="₭" /> + latin:keySpec="₭" + latin:keyLabelFlags="fontDefault" /> <Key - latin:keyLabel="(" /> - <!-- U+0EAF: "ຯ" LAO ELLIPSIS --> + latin:keySpec="(" + latin:keyLabelFlags="fontDefault" /> + <Key latin:keySpec="ຯ" /> <Key - latin:keyLabel="ຯ" - latin:keyLabelFlags="fontNormal" /> - <Key - latin:keyLabel="\@" /> + latin:keySpec="\@" + latin:keyLabelFlags="fontDefault" /> <!-- U+0EB6/U+0EC9: "ຶ້" LAO VOWEL SIGN Y/LAO TONE MAI THO --> <Key - latin:keyLabel="ຶ້" - latin:keyLabelFlags="fontNormal|followKeyLetterRatio" /> + latin:keySpec="ຶ້" + latin:keyLabelFlags="followKeyLetterRatio" /> <!-- U+0EB7/U+0EC9: "ື້" LAO VOWEL SIGN YY/LAO TONE MAI THO --> <Key - latin:keyLabel="ື້" - latin:keyLabelFlags="fontNormal|followKeyLetterRatio" /> + latin:keySpec="ື້" + latin:keyLabelFlags="followKeyLetterRatio" /> <!-- U+0EC6: "ໆ" LAO KO LA --> - <Key - latin:keyLabel="ໆ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ໆ" /> <!-- U+0EDD: "ໝ" LAO HO MO --> + <Key latin:keySpec="ໝ" /> <Key - latin:keyLabel="ໝ" - latin:keyLabelFlags="fontNormal" /> + latin:keySpec="$" + latin:keyLabelFlags="fontDefault" /> <Key - latin:keyLabel="$" /> - <Key - latin:keyLabel=")" /> + latin:keySpec=")" + latin:keyLabelFlags="fontDefault" /> </case> <default> <!-- U+0E9C: "ຜ" LAO LETTER PHO SUNG --> - <Key - latin:keyLabel="ຜ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ຜ" /> <!-- U+0E9B: "ປ" LAO LETTER PO --> - <Key - latin:keyLabel="ປ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ປ" /> <!-- U+0EC1: "ແ" LAO VOWEL SIGN EI --> - <Key - latin:keyLabel="ແ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ແ" /> <!-- U+0EAD: "ອ" LAO LETTER O --> - <Key - latin:keyLabel="ອ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ອ" /> <!-- U+0EB6: "ຶ" LAO VOWEL SIGN Y --> - <Key - latin:keyLabel="ຶ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ຶ" /> <!-- U+0EB7: "ື" LAO VOWEL SIGN YY --> - <Key - latin:keyLabel="ື" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ື" /> <!-- U+0E97: "ທ" LAO LETTER THO TAM --> - <Key - latin:keyLabel="ທ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ທ" /> <!-- U+0EA1: "ມ" LAO LETTER MO --> - <Key - latin:keyLabel="ມ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ມ" /> <!-- U+0EC3: "ໃ" LAO VOWEL SIGN AY --> - <Key - latin:keyLabel="ໃ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ໃ" /> <!-- U+0E9D: "ຝ" LAO LETTER FO TAM --> - <Key - latin:keyLabel="ຝ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ຝ" /> </default> </switch> </merge> diff --git a/java/res/xml/rowkeys_marathi1.xml b/java/res/xml/rowkeys_marathi1.xml new file mode 100644 index 000000000..596664bc6 --- /dev/null +++ b/java/res/xml/rowkeys_marathi1.xml @@ -0,0 +1,110 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright 2014, 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. +*/ +--> + +<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"> + <!-- Because the font rendering system prior to API version 16 can't automatically + render dotted circle for incomplete combining letter of some scripts, different + set of Key definitions are needed based on the API version. --> + <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_au" /> + <!-- U+0967: "१" DEVANAGARI DIGIT ONE --> + <Key + latin:keyStyle="baseKeyDevanagariVowelSignAu" + latin:keyHintLabel="1" + latin:additionalMoreKeys="१,1" /> + <!-- Because the font rendering system prior to API version 16 can't automatically + render dotted circle for incomplete combining letter of some scripts, different + set of Key definitions are needed based on the API version. --> + <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_ai" /> + <!-- U+0968: "२" DEVANAGARI DIGIT TWO --> + <Key + latin:keyStyle="baseKeyDevanagariVowelSignAi" + latin:keyHintLabel="2" + latin:additionalMoreKeys="२,2" /> + <!-- Because the font rendering system prior to API version 16 can't automatically + render dotted circle for incomplete combining letter of some scripts, different + set of Key definitions are needed based on the API version. --> + <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_aa" /> + <!-- U+0969: "३" DEVANAGARI DIGIT THREE --> + <Key + latin:keyStyle="baseKeyDevanagariVowelSignAa" + latin:keyHintLabel="3" + latin:additionalMoreKeys="३,3" /> + <!-- Because the font rendering system prior to API version 16 can't automatically + render dotted circle for incomplete combining letter of some scripts, different + set of Key definitions are needed based on the API version. --> + <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_ii" /> + <!-- U+096A: "४" DEVANAGARI DIGIT FOUR --> + <Key + latin:keyStyle="baseKeyDevanagariVowelSignIi" + latin:keyHintLabel="4" + latin:additionalMoreKeys="४,4" /> + <!-- Because the font rendering system prior to API version 16 can't automatically + render dotted circle for incomplete combining letter of some scripts, different + set of Key definitions are needed based on the API version. --> + <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_uu" /> + <!-- U+096B: "५" DEVANAGARI DIGIT FIVE --> + <Key + latin:keyStyle="baseKeyDevanagariVowelSignUu" + latin:keyHintLabel="5" + latin:additionalMoreKeys="५,5" /> + <!-- U+092C: "ब" DEVANAGARI LETTER BA + U+092D: "भ" DEVANAGARI LETTER BHA + U+096C: "६" DEVANAGARI DIGIT SIX --> + <Key + latin:keySpec="ब" + latin:moreKeys="भ,%" + latin:keyHintLabel="6" + latin:additionalMoreKeys="६,6" /> + <!-- U+0939: "ह" DEVANAGARI LETTER HA + U+096D: "७" DEVANAGARI DIGIT SEVEN --> + <Key + latin:keySpec="ह" + latin:keyHintLabel="7" + latin:additionalMoreKeys="७,7" /> + <!-- U+0917: "ग" DEVANAGARI LETTER GA + U+0918: "घ" DEVANAGARI LETTER GHA + U+096E: "८" DEVANAGARI DIGIT EIGHT --> + <Key + latin:keySpec="ग" + latin:moreKeys="घ,%" + latin:keyHintLabel="8" + latin:additionalMoreKeys="८,8" /> + <!-- U+0926: "द" DEVANAGARI LETTER DA + U+0927: "ध" DEVANAGARI LETTER DHA + U+096F: "९" DEVANAGARI DIGIT NINE --> + <Key + latin:keySpec="द" + latin:moreKeys="ध,%" + latin:keyHintLabel="9" + latin:additionalMoreKeys="९,9" /> + <!-- U+091C: "ज" DEVANAGARI LETTER JA + U+091D: "झ" DEVANAGARI LETTER JHA + U+091C/U+094D/U+091E: "ज्ञ" DEVANAGARI LETTER JA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER JHA --> + <Key + latin:keySpec="ज" + latin:moreKeys="झ,ज्ञ,%" + latin:keyHintLabel="0" + latin:additionalMoreKeys="०,0" /> + <!-- U+0921: "ड" DEVANAGARI LETTER DDA + U+0922: "ढ" DEVANAGARI LETTER DDHA --> + <Key + latin:keySpec="ड" + latin:moreKeys="ढ" /> +</merge> diff --git a/java/res/xml/rowkeys_marathi2.xml b/java/res/xml/rowkeys_marathi2.xml new file mode 100644 index 000000000..060822ee5 --- /dev/null +++ b/java/res/xml/rowkeys_marathi2.xml @@ -0,0 +1,81 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright 2014, 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. +*/ +--> + +<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"> + <!-- Because the font rendering system prior to API version 16 can't automatically + render dotted circle for incomplete combining letter of some scripts, different + set of Key definitions are needed based on the API version. --> + <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_o" /> + <Key latin:keyStyle="baseKeyDevanagariVowelSignO" /> + <!-- Because the font rendering system prior to API version 16 can't automatically + render dotted circle for incomplete combining letter of some scripts, different + set of Key definitions are needed based on the API version. --> + <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_e" /> + <Key latin:keyStyle="baseKeyDevanagariVowelSignE" /> + <!-- Because the font rendering system prior to API version 16 can't automatically + render dotted circle for incomplete combining letter of some scripts, different + set of Key definitions are needed based on the API version. --> + <include latin:keyboardLayout="@xml/keystyle_devanagari_sign_virama" /> + <Key latin:keyStyle="baseKeyDevanagariSignVirama" /> + <!-- Because the font rendering system prior to API version 16 can't automatically + render dotted circle for incomplete combining letter of some scripts, different + set of Key definitions are needed based on the API version. --> + <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_i" /> + <Key latin:keyStyle="baseKeyDevanagariVowelSignI" /> + <!-- Because the font rendering system prior to API version 16 can't automatically + render dotted circle for incomplete combining letter of some scripts, different + set of Key definitions are needed based on the API version. --> + <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_u" /> + <Key latin:keyStyle="baseKeyDevanagariVowelSignU" /> + <!-- U+092A: "प" DEVANAGARI LETTER PA + U+092B: "फ" DEVANAGARI LETTER PHA --> + <Key + latin:keySpec="प" + latin:moreKeys="फ" /> + <!-- Because the font rendering system prior to API version 16 can't automatically + render dotted circle for incomplete combining letter of some scripts, different + set of Key definitions are needed based on the API version. --> + <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_vocalic_r" /> + <!-- U+0930: "र" DEVANAGARI LETTER RA --> + <Key + latin:keySpec="र" + latin:keyStyle="moreKeysDevanagariVowelSignVocalicR" /> + <!-- U+0915: "क" DEVANAGARI LETTER KA + U+0916: "ख" DEVANAGARI LETTER KHA --> + <Key + latin:keySpec="क" + latin:moreKeys="ख" /> + <!-- U+0924: "त" DEVANAGARI LETTER TA + U+0925: "थ" DEVANAGARI LETTER THA + U+0924/U+094D/U+0930: "त्र" DEVANAGARI LETTER TA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER RA --> + <Key + latin:keySpec="त" + latin:moreKeys="थ,त्र" /> + <!-- U+091A: "च" DEVANAGARI LETTER CA + U+091B: "छ" DEVANAGARI LETTER CHA --> + <Key + latin:keySpec="च" + latin:moreKeys="छ" /> + <!-- U+091F: "ट" DEVANAGARI LETTER TTA + U+0920: "ठ" DEVANAGARI LETTER TTHA --> + <Key + latin:keySpec="ट" + latin:moreKeys="ठ" /> +</merge> diff --git a/java/res/xml/rowkeys_marathi3.xml b/java/res/xml/rowkeys_marathi3.xml new file mode 100644 index 000000000..661e79672 --- /dev/null +++ b/java/res/xml/rowkeys_marathi3.xml @@ -0,0 +1,66 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright 2014, 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. +*/ +--> + +<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"> + <!-- Because the font rendering system prior to API version 16 can't automatically + render dotted circle for incomplete combining letter of some scripts, different + set of Key definitions are needed based on the API version. --> + <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_candra_o" /> + <Key latin:keyStyle="baseKeyDevanagariVowelSignCandraO" /> + <!-- Because the font rendering system prior to API version 16 can't automatically + render dotted circle for incomplete combining letter of some scripts, different + set of Key definitions are needed based on the API version. --> + <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_candra_e" /> + <Key latin:keyStyle="baseKeyDevanagariVowelSignCandraE" /> + <!-- Because the font rendering system prior to API version 16 can't automatically + render dotted circle for incomplete combining letter of some scripts, different + set of Key definitions are needed based on the API version. --> + <include latin:keyboardLayout="@xml/keystyle_devanagari_sign_anusvara" /> + <Key latin:keyStyle="baseKeyDevanagariSignAnusvara" /> + <!-- U+092E: "म" DEVANAGARI LETTER MA --> + <Key latin:keySpec="म" /> + <!-- U+0928: "न" DEVANAGARI LETTER NA + U+0923: "ण" DEVANAGARI LETTER NNA + U+091E: "ञ" DEVANAGARI LETTER NYA + U+0919: "ङ" DEVANAGARI LETTER NGA --> + <Key + latin:keySpec="न" + latin:moreKeys="ण,ञ,ङ" /> + <!-- U+0935: "व" DEVANAGARI LETTER VA --> + <Key latin:keySpec="व" /> + <!-- U+0932: "ल" DEVANAGARI LETTER LA + U+0933: "ळ" DEVANAGARI LETTER LLA --> + <Key + latin:keySpec="ल" + latin:moreKeys="ळ" /> + <!-- U+0938: "स" DEVANAGARI LETTER SA + U+0936: "श" DEVANAGARI LETTER SHA + U+0937: "ष" DEVANAGARI LETTER SSA + U+0936/U+094D/U+0930: "श्र" DEVANAGARI LETTER SHA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER RA --> + <Key + latin:keySpec="स" + latin:moreKeys="श,ष,श्र" /> + <!-- U+092F: "य" DEVANAGARI LETTER YA --> + <Key latin:keySpec="य" /> + <!-- U+0915/U+094D/U+0937: "क्ष" DEVANAGARI LETTER KA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER SSA --> + <Key + latin:keySpec="क्ष" + latin:keyLabelFlags="followKeyLetterRatio" /> +</merge> diff --git a/java/res/xml/rowkeys_mongolian1.xml b/java/res/xml/rowkeys_mongolian1.xml index 6c8c8e2fd..2bd8097e2 100644 --- a/java/res/xml/rowkeys_mongolian1.xml +++ b/java/res/xml/rowkeys_mongolian1.xml @@ -23,61 +23,61 @@ > <!-- U+0444: "ф" CYRILLIC SMALL LETTER EF --> <Key - latin:keyLabel="ф" + latin:keySpec="ф" latin:keyHintLabel="1" latin:additionalMoreKeys="1" /> <!-- U+0446: "ц" CYRILLIC SMALL LETTER TSE --> <Key - latin:keyLabel="ц" + latin:keySpec="ц" latin:keyHintLabel="2" latin:additionalMoreKeys="2" /> <!-- U+0443: "у" CYRILLIC SMALL LETTER U --> <Key - latin:keyLabel="у" + latin:keySpec="у" latin:keyHintLabel="3" latin:additionalMoreKeys="3" - latin:moreKeys="!text/more_keys_for_cyrillic_u" /> + latin:moreKeys="!text/morekeys_cyrillic_u" /> <!-- U+0436: "ж" CYRILLIC SMALL LETTER ZHE --> <Key - latin:keyLabel="ж" + latin:keySpec="ж" latin:keyHintLabel="4" latin:additionalMoreKeys="4" /> <!-- U+044D: "э" CYRILLIC SMALL LETTER E --> <Key - latin:keyLabel="э" + latin:keySpec="э" latin:keyHintLabel="5" latin:additionalMoreKeys="5" - latin:moreKeys="!text/more_keys_for_cyrillic_ie" /> + latin:moreKeys="!text/morekeys_cyrillic_ie" /> <!-- U+043D: "н" CYRILLIC SMALL LETTER EN --> <Key - latin:keyLabel="н" + latin:keySpec="н" latin:keyHintLabel="6" latin:additionalMoreKeys="6" - latin:moreKeys="!text/more_keys_for_cyrillic_en" /> + latin:moreKeys="!text/morekeys_cyrillic_en" /> <!-- U+0433: "г" CYRILLIC SMALL LETTER GHE --> <Key - latin:keyLabel="г" + latin:keySpec="г" latin:keyHintLabel="7" latin:additionalMoreKeys="7" - latin:moreKeys="!text/more_keys_for_cyrillic_ghe" /> + latin:moreKeys="!text/morekeys_cyrillic_ghe" /> <!-- U+0448: "ш" CYRILLIC SMALL LETTER SHA U+0449: "щ" CYRILLIC SMALL LETTER SHCHA --> <Key - latin:keyLabel="ш" + latin:keySpec="ш" latin:keyHintLabel="8" latin:additionalMoreKeys="8" latin:moreKeys="щ" /> <!-- U+04AF: "ү" CYRILLIC SMALL LETTER STRAIGHT U --> <Key - latin:keyLabel="ү" + latin:keySpec="ү" latin:keyHintLabel="9" latin:additionalMoreKeys="9" /> <!-- U+0437: "з" CYRILLIC SMALL LETTER ZE --> <Key - latin:keyLabel="з" + latin:keySpec="з" latin:keyHintLabel="0" latin:additionalMoreKeys="0" /> <!-- U+043A: "к" CYRILLIC SMALL LETTER KA --> <Key - latin:keyLabel="к" /> + latin:keySpec="к" /> </merge> diff --git a/java/res/xml/rowkeys_mongolian2.xml b/java/res/xml/rowkeys_mongolian2.xml index a8aa00620..f11f4f230 100644 --- a/java/res/xml/rowkeys_mongolian2.xml +++ b/java/res/xml/rowkeys_mongolian2.xml @@ -23,35 +23,35 @@ > <!-- U+0439: "й" CYRILLIC SMALL LETTER SHORT I --> <Key - latin:keyLabel="й" /> + latin:keySpec="й" /> <!-- U+044B: "ы" CYRILLIC SMALL LETTER YERU --> <Key - latin:keyLabel="ы" /> + latin:keySpec="ы" /> <!-- U+0431: "б" CYRILLIC SMALL LETTER BE --> <Key - latin:keyLabel="б" /> + latin:keySpec="б" /> <!-- U+04E9: "ө" CYRILLIC SMALL LETTER BARRED O --> <Key - latin:keyLabel="ө" /> + latin:keySpec="ө" /> <!-- U+0430: "а" CYRILLIC SMALL LETTER A --> <Key - latin:keyLabel="а" /> + latin:keySpec="а" /> <!-- U+0445: "х" CYRILLIC SMALL LETTER HA --> <Key - latin:keyLabel="х" /> + latin:keySpec="х" /> <!-- U+0440: "р" CYRILLIC SMALL LETTER ER --> <Key - latin:keyLabel="р" /> + latin:keySpec="р" /> <!-- U+043E: "о" CYRILLIC SMALL LETTER O --> <Key - latin:keyLabel="о" /> + latin:keySpec="о" /> <!-- U+043B: "л" CYRILLIC SMALL LETTER EL --> <Key - latin:keyLabel="л" /> + latin:keySpec="л" /> <!-- U+0434: "д" CYRILLIC SMALL LETTER DE --> <Key - latin:keyLabel="д" /> + latin:keySpec="д" /> <!-- U+043F: "п" CYRILLIC SMALL LETTER PE --> <Key - latin:keyLabel="п" /> + latin:keySpec="п" /> </merge> diff --git a/java/res/xml/rowkeys_mongolian3.xml b/java/res/xml/rowkeys_mongolian3.xml index dc80c37ab..cf57d1c2a 100644 --- a/java/res/xml/rowkeys_mongolian3.xml +++ b/java/res/xml/rowkeys_mongolian3.xml @@ -23,35 +23,35 @@ > <!-- U+044F: "я" CYRILLIC SMALL LETTER YA --> <Key - latin:keyLabel="я" /> + latin:keySpec="я" /> <!-- U+0447: "ч" CYRILLIC SMALL LETTER CHE --> <Key - latin:keyLabel="ч" /> + latin:keySpec="ч" /> <!-- U+0451: "ё" CYRILLIC SMALL LETTER IO U+0435: "е" CYRILLIC SMALL LETTER IE --> <Key - latin:keyLabel="ё" + latin:keySpec="ё" latin:moreKeys="е" /> <!-- U+0441: "с" CYRILLIC SMALL LETTER ES --> <Key - latin:keyLabel="с" /> + latin:keySpec="с" /> <!-- U+043C: "м" CYRILLIC SMALL LETTER EM --> <Key - latin:keyLabel="м" /> + latin:keySpec="м" /> <!-- U+0438: "и" CYRILLIC SMALL LETTER I --> <Key - latin:keyLabel="и" /> + latin:keySpec="и" /> <!-- U+0442: "т" CYRILLIC SMALL LETTER TE --> <Key - latin:keyLabel="т" /> + latin:keySpec="т" /> <!-- U+044C: "ь" CYRILLIC SMALL LETTER SOFT SIGN U+044A: "ъ" CYRILLIC SMALL LETTER HARD SIGN --> <Key - latin:keyLabel="ь" + latin:keySpec="ь" latin:moreKeys="ъ" /> <!-- U+0432: "в" CYRILLIC SMALL LETTER VE U+044E: "ю" CYRILLIC SMALL LETTER YU --> <Key - latin:keyLabel="в" + latin:keySpec="в" latin:moreKeys="ю" /> </merge> diff --git a/java/res/xml/rowkeys_myanmar1.xml b/java/res/xml/rowkeys_myanmar1.xml new file mode 100644 index 000000000..117007431 --- /dev/null +++ b/java/res/xml/rowkeys_myanmar1.xml @@ -0,0 +1,105 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright 2014, 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. +*/ +--> + +<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"> + <switch> + <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"> + <!-- U+1027: "ဧ" MYANMAR LETTER E --> + <Key latin:keySpec="ဧ" /> + <!-- U+104F: "၏" MYANMAR SYMBOL GENITIVE --> + <Key latin:keySpec="၏" /> + <!-- U+1024: "ဤ" MYANMAR LETTER II --> + <Key latin:keySpec="ဤ" /> + <!-- U+1023: "ဣ" MYANMAR LETTER I --> + <Key latin:keySpec="ဣ" /> + <!-- U+104E: "၎" MYANMAR SYMBOL AFOREMENTIONED --> + <Key latin:keySpec="၎" /> + <!-- U+1000/U+103B/U+1015/U+103A: "ကျပ်" + MYANMAR LETTER KA/MYANMAR CONSONANT SIGN MEDIAL YA/MYANMAR LETTER PA/MYANMAR SIGN ASAT --> + <Key + latin:keySpec="ကျပ်" + latin:keyLabelFlags="followKeyLetterRatio|autoScale" /> + <!-- U+1029: "ဩ" MYANMAR LETTER O --> + <Key + latin:keySpec="ဩ" + latin:keyLabelFlags="autoScale" /> + <!-- U+102A: "ဪ" MYANMAR LETTER AU --> + <Key + latin:keySpec="ဪ" + latin:keyLabelFlags="autoScale" /> + <!-- U+104D: "၍" MYANMAR SYMBOL COMPLETED --> + <Key latin:keySpec="၍" /> + <!-- U+104C: "၌" MYANMAR SYMBOL LOCATIVE --> + <Key latin:keySpec="၌" /> + </case> + <default> + <!-- U+1041: "၁" MYANMAR DIGIT ONE --> + <Key + latin:keySpec="၁" + latin:keyHintLabel="1" + latin:additionalMoreKeys="1" /> + <!-- U+1042: "၂" MYANMAR DIGIT TWO --> + <Key + latin:keySpec="၂" + latin:keyHintLabel="2" + latin:additionalMoreKeys="2" /> + <!-- U+1043: "၃" MYANMAR DIGIT THREE --> + <Key + latin:keySpec="၃" + latin:keyHintLabel="3" + latin:additionalMoreKeys="3" /> + <!-- U+1044: "၄" MYANMAR DIGIT FOUR --> + <Key + latin:keySpec="၄" + latin:keyHintLabel="4" + latin:additionalMoreKeys="4" /> + <!-- U+1045: "၅" MYANMAR DIGIT FIVE --> + <Key + latin:keySpec="၅" + latin:keyHintLabel="5" + latin:additionalMoreKeys="5" /> + <!-- U+1046: "၆" MYANMAR DIGIT SIX --> + <Key + latin:keySpec="၆" + latin:keyHintLabel="6" + latin:additionalMoreKeys="6" /> + <!-- U+1047: "၇" MYANMAR DIGIT SEVEN --> + <Key + latin:keySpec="၇" + latin:keyHintLabel="7" + latin:additionalMoreKeys="7" /> + <!-- U+1048: "၈" MYANMAR DIGIT EIGHT --> + <Key + latin:keySpec="၈" + latin:keyHintLabel="8" + latin:additionalMoreKeys="8" /> + <!-- U+1049: "၉" MYANMAR DIGIT NINE --> + <Key + latin:keySpec="၉" + latin:keyHintLabel="9" + latin:additionalMoreKeys="9" /> + <!-- U+1040: "၀" MYANMAR DIGIT ZERO --> + <Key + latin:keySpec="၀" + latin:keyHintLabel="0" + latin:additionalMoreKeys="0" /> + </default> + </switch> +</merge> diff --git a/java/res/xml/rowkeys_myanmar2.xml b/java/res/xml/rowkeys_myanmar2.xml new file mode 100644 index 000000000..d7aca0063 --- /dev/null +++ b/java/res/xml/rowkeys_myanmar2.xml @@ -0,0 +1,68 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright 2014, 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. +*/ +--> + +<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"> + <switch> + <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"> + <!-- U+1017: "ဗ" MYANMAR LETTER BA --> + <Key latin:keySpec="ဗ" /> + <!-- U+1012: "ဒ" MYANMAR LETTER DA --> + <Key latin:keySpec="ဒ" /> + <!-- U+1013: "ဓ" MYANMAR LETTER DHA --> + <Key latin:keySpec="ဓ" /> + <!-- U+1003: "ဃ" MYANMAR LETTER GHA --> + <Key latin:keySpec="ဃ" /> + <!-- U+100E: "ဎ" MYANMAR LETTER DDHA --> + <Key latin:keySpec="ဎ" /> + <!-- U+103F: "ဿ" MYANMAR LETTER GREAT SA --> + <Key latin:keySpec="ဿ" /> + <!-- U+100F: "ဏ" MYANMAR LETTER NNA --> + <Key latin:keySpec="ဏ" /> + <!-- U+1008: "ဈ" MYANMAR LETTER JHA --> + <Key latin:keySpec="ဈ" /> + <!-- U+1007: "ဇ" MYANMAR LETTER JA --> + <Key latin:keySpec="ဇ" /> + <!-- U+1002: "ဂ" MYANMAR LETTER GA --> + <Key latin:keySpec="ဂ" /> + </case> + <default> + <!-- U+1006: "ဆ" MYANMAR LETTER CHA --> + <Key latin:keySpec="ဆ" /> + <!-- U+1010: "တ" MYANMAR LETTER TA --> + <Key latin:keySpec="တ" /> + <!-- U+1014: "န" MYANMAR LETTER NA --> + <Key latin:keySpec="န" /> + <!-- U+1019: "မ" MYANMAR LETTER MA --> + <Key latin:keySpec="မ" /> + <!-- U+1021: "အ" MYANMAR LETTER A --> + <Key latin:keySpec="အ" /> + <!-- U+1015: "ပ" MYANMAR LETTER PA --> + <Key latin:keySpec="ပ" /> + <!-- U+1000: "က" MYANMAR LETTER KA --> + <Key latin:keySpec="က" /> + <!-- U+1004: "င" MYANMAR LETTER NGA --> + <Key latin:keySpec="င" /> + <!-- U+101E: "သ" MYANMAR LETTER SA --> + <Key latin:keySpec="သ" /> + <!-- U+1005: "စ" MYANMAR LETTER CA --> + <Key latin:keySpec="စ" /> + </default> + </switch> +</merge> diff --git a/java/res/xml/rowkeys_myanmar3.xml b/java/res/xml/rowkeys_myanmar3.xml new file mode 100644 index 000000000..c5850689b --- /dev/null +++ b/java/res/xml/rowkeys_myanmar3.xml @@ -0,0 +1,86 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright 2014, 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. +*/ +--> + +<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"> + <switch> + <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"> + <!-- U+101A: "ယ" MYANMAR LETTER YA --> + <Key latin:keySpec="ယ" /> + <!-- U+1039: "္" MYANMAR SIGN VIRAMA --> + <Key latin:keySpec="္" /> + <!-- U+1004/U+103A/U+1039: "င်္င" MYANMAR LETTER NGA/MYANMAR SIGN ASAT/MYANMAR SIGN VIRAMA --> + <Key + latin:keySpec="င်္" + latin:keyLabelFlags="followKeyLetterRatio" /> + <!-- U+103E: "ှ" MYANMAR CONSONANT SIGN MEDIAL HA --> + <Key latin:keySpec="ှ" /> + <!-- U+102E: "ီ" MYANMAR VOWEL SIGN II --> + <Key latin:keySpec="ီ" /> + <!-- U+1030: "ူ" MYANMAR VOWEL SIGN UU --> + <Key latin:keySpec="ူ" /> + <!-- U+102B: "ါ" MYANMAR VOWEL SIGN TALL AA --> + <Key latin:keySpec="ါ" /> + <!-- U+1032: "ဲ" MYANMAR VOWEL SIGN AI --> + <Key latin:keySpec="ဲ" /> + <!-- U+1036: "ံ" MYANMAR SIGN ANUSVARA --> + <Key latin:keySpec="ံ" /> + <!-- U+101F: "ဟ" MYANMAR LETTER HA --> + <Key latin:keySpec="ဟ" /> + </case> + <default> + <!-- U+1031: "ေ" MYANMAR VOWEL SIGN E --> + <Key latin:keySpec="ေ" /> + <!-- U+103B: "ျ" MYANMAR CONSONANT SIGN MEDIAL YA --> + <Key latin:keySpec="ျ" /> + <!-- U+103C: "ြ" MYANMAR CONSONANT SIGN MEDIAL RA --> + <Key latin:keySpec="ြ" /> + <!-- U+103D: "ွ" MYANMAR CONSONANT SIGN MEDIAL WA + U+103E: "ှ" MYANMAR CONSONANT SIGN MEDIAL HA + U+103D/U+103E: "ွှ" MYANMAR CONSONANT SIGN MEDIAL WA/MYANMAR CONSONANT SIGN MEDIAL HA --> + <Key + latin:keySpec="ွ" + latin:moreKeys="ှ,ွှ" /> + <!-- U+102D: "ိ" MYANMAR VOWEL SIGN I + U+102E: "ီ" MYANMAR VOWEL SIGN II --> + <Key + latin:keySpec="ိ" + latin:moreKeys="ီ" /> + <!-- U+102F: "ု" MYANMAR VOWEL SIGN U + U+1030: "ူ" MYANMAR VOWEL SIGN UU --> + <Key + latin:keySpec="ု" + latin:moreKeys="ူ" /> + <!-- U+102C: "ာ" MYANMAR VOWEL SIGN AA --> + <Key latin:keySpec="ာ" /> + <!-- U+103A: "်" MYANMAR SIGN ASAT + U+1032: "ဲ" MYANMAR VOWEL SIGN AI --> + <Key + latin:keySpec="်" + latin:moreKeys="ဲ" /> + <!-- U+1037: "့" MYANMAR SIGN DOT BELOW + U+1036: "ံ" MYANMAR SIGN ANUSVARA --> + <Key + latin:keySpec="့" + latin:moreKeys="ံ" /> + <!-- U+1038: "း" MYANMAR SIGN VISARGA --> + <Key latin:keySpec="း" /> + </default> + </switch> +</merge> diff --git a/java/res/xml/rowkeys_myanmar4.xml b/java/res/xml/rowkeys_myanmar4.xml new file mode 100644 index 000000000..210ebaa8f --- /dev/null +++ b/java/res/xml/rowkeys_myanmar4.xml @@ -0,0 +1,69 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright 2014, 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. +*/ +--> + +<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"> + <switch> + <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"> + <!-- U+1025: "ဥ" MYANMAR LETTER U --> + <Key latin:keySpec="ဥ" /> + <!-- U+1026: "ဦ" MYANMAR LETTER UU --> + <Key latin:keySpec="ဦ" /> + <!-- U+100C: "ဌ" MYANMAR LETTER TTHA --> + <Key latin:keySpec="ဌ" /> + <!-- U+100B: "ဋ" MYANMAR LETTER TTA --> + <Key latin:keySpec="ဋ" /> + <!-- U+100D: "ဍ" MYANMAR LETTER DDA --> + <Key latin:keySpec="ဍ" /> + <!-- U+1020: "ဠ" MYANMAR LETTER LLA --> + <Key latin:keySpec="ဠ" /> + <!-- U+100B/U+1039/U+100C: "ဋ္ဌ" MYANMAR LETTER TTA/MYANMAR SIGN VIRAMA/MYANMAR LETTER TTHA --> + <Key + latin:keySpec="ဋ္ဌ" + latin:keyLabelFlags="followKeyLetterRatio" /> + <!-- U+100F/U+1039/U+100D: "ဏ္ဍ" MYANMAR LETTER NNA/MYANMAR SIGN VIRAMA/MYANMAR LETTER DDA + U+100F/U+1039/U+100C: "ဏ္ဌ" MYANMAR LETTER NNA/MYANMAR SIGN VIRAMA/MYANMAR LETTER TTHA --> + <Key + latin:keySpec="ဏ္ဍ" + latin:moreKeys="ဏ္ဌ" + latin:keyLabelFlags="followKeyLetterRatio" /> + </case> + <default> + <!-- U+1016: "ဖ" MYANMAR LETTER PHA --> + <Key latin:keySpec="ဖ" /> + <!-- U+1011: "ထ" MYANMAR LETTER THA --> + <Key latin:keySpec="ထ" /> + <!-- U+1001: "ခ" MYANMAR LETTER KHA --> + <Key latin:keySpec="ခ" /> + <!-- U+101C: "လ" MYANMAR LETTER LA --> + <Key latin:keySpec="လ" /> + <!-- U+1018: "ဘ" MYANMAR LETTER BHA --> + <Key latin:keySpec="ဘ" /> + <!-- U+100A: "ည" MYANMAR LETTER NNYA + U+1009: "ဉ" MYANMAR LETTER NYA --> + <Key + latin:keySpec="ည" + latin:moreKeys="ဉ" /> + <!-- U+101B: "ရ" MYANMAR LETTER RA --> + <Key latin:keySpec="ရ" /> + <!-- U+101D: "ဝ" MYANMAR LETTER WA --> + <Key latin:keySpec="ဝ" /> + </default> + </switch> +</merge> diff --git a/java/res/xml/rowkeys_nepali_romanized1.xml b/java/res/xml/rowkeys_nepali_romanized1.xml index 408a96648..67be51bb0 100644 --- a/java/res/xml/rowkeys_nepali_romanized1.xml +++ b/java/res/xml/rowkeys_nepali_romanized1.xml @@ -18,84 +18,61 @@ */ --> -<merge - xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" -> +<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"> <switch> - <case - latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted" - > + <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"> <!-- U+0920: "ठ" DEVANAGARI LETTER TTHA --> - <Key - latin:keyLabel="ठ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ठ" /> <!-- U+0914: "औ" DEVANAGARI LETTER AU --> - <Key - latin:keyLabel="औ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="औ" /> <!-- Because the font rendering system prior to API version 16 can't automatically render dotted circle for incomplete combining letter of some scripts, different set of Key definitions are needed based on the API version. --> - <include - latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_ai" /> - <Key - latin:keyStyle="baseKeyDevanagariVowelSignAi" /> + <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_ai" /> + <Key latin:keyStyle="baseKeyDevanagariVowelSignAi" /> <!-- Because the font rendering system prior to API version 16 can't automatically render dotted circle for incomplete combining letter of some scripts, different set of Key definitions are needed based on the API version. --> - <include - latin:keyboardLayout="@xml/key_devanagari_vowel_sign_vocalic_r" /> + <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_vocalic_r" /> + <Key latin:keyStyle="baseKeyDevanagariVowelSignVocalicR" /> <!-- U+0925: "थ" DEVANAGARI LETTER THA --> - <Key - latin:keyLabel="थ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="थ" /> <!-- U+091E: "ञ" DEVANAGARI LETTER NYA --> - <Key - latin:keyLabel="ञ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ञ" /> <!-- Because the font rendering system prior to API version 16 can't automatically render dotted circle for incomplete combining letter of some scripts, different set of Key definitions are needed based on the API version. --> - <include - latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_uu" /> - <Key - latin:keyStyle="baseKeyDevanagariVowelSignUu" /> + <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_uu" /> + <Key latin:keyStyle="baseKeyDevanagariVowelSignUu" /> <!-- Because the font rendering system prior to API version 16 can't automatically render dotted circle for incomplete combining letter of some scripts, different set of Key definitions are needed based on the API version. --> - <include - latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_ii" /> - <Key - latin:keyStyle="baseKeyDevanagariVowelSignIi" /> + <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_ii" /> + <Key latin:keyStyle="baseKeyDevanagariVowelSignIi" /> <!-- U+0913: "ओ" DEVANAGARI LETTER O --> - <Key - latin:keyLabel="ओ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ओ" /> <!-- U+092B: "फ" DEVANAGARI LETTER PHA --> - <Key - latin:keyLabel="फ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="फ" /> <!-- U+0908: "ई" DEVANAGARI LETTER II --> - <Key - latin:keyLabel="ई" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ई" /> </case> <default> + <!-- Because the font rendering system prior to API version 16 can't automatically + render dotted circle for incomplete combining letter of some scripts, different + set of Key definitions are needed based on the API version. --> + <include latin:keyboardLayout="@xml/keystyle_devanagari_sign_nukta" /> <!-- U+091F: "ट" DEVANAGARI LETTER TTA - U+0967: "१" DEVANAGARI DIGIT ONE - U+093C: "़" DEVANAGARI SIGN NUKTA --> + U+0967: "१" DEVANAGARI DIGIT ONE --> <Key - latin:keyLabel="ट" + latin:keySpec="ट" latin:keyHintLabel="1" latin:additionalMoreKeys="१,1" - latin:moreKeys="़" - latin:keyLabelFlags="fontNormal" /> + latin:keyStyle="moreKeysDevanagariSignNukta" /> <!-- Because the font rendering system prior to API version 16 can't automatically render dotted circle for incomplete combining letter of some scripts, different set of Key definitions are needed based on the API version. --> + <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_au" /> <!-- U+0968: "२" DEVANAGARI DIGIT TWO --> - <include - latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_au" /> <Key latin:keyStyle="baseKeyDevanagariVowelSignAu" latin:keyHintLabel="2" @@ -103,9 +80,8 @@ <!-- Because the font rendering system prior to API version 16 can't automatically render dotted circle for incomplete combining letter of some scripts, different set of Key definitions are needed based on the API version. --> + <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_e" /> <!-- U+0969: "३" DEVANAGARI DIGIT THREE --> - <include - latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_e" /> <Key latin:keyStyle="baseKeyDevanagariVowelSignE" latin:keyHintLabel="3" @@ -113,30 +89,26 @@ <!-- U+0930: "र" DEVANAGARI LETTER RA U+096A: "४" DEVANAGARI DIGIT FOUR --> <Key - latin:keyLabel="र" + latin:keySpec="र" latin:keyHintLabel="4" - latin:additionalMoreKeys="४,4" - latin:keyLabelFlags="fontNormal" /> + latin:additionalMoreKeys="४,4" /> <!-- U+0924: "त" DEVANAGARI LETTER TA U+096B: "५" DEVANAGARI DIGIT FIVE --> <Key - latin:keyLabel="त" + latin:keySpec="त" latin:keyHintLabel="5" - latin:additionalMoreKeys="५,5" - latin:keyLabelFlags="fontNormal" /> + latin:additionalMoreKeys="५,5" /> <!-- U+092F: "य" DEVANAGARI LETTER YA U+096C: "६" DEVANAGARI DIGIT SIX --> <Key - latin:keyLabel="य" + latin:keySpec="य" latin:keyHintLabel="6" - latin:additionalMoreKeys="६,6" - latin:keyLabelFlags="fontNormal" /> + latin:additionalMoreKeys="६,6" /> <!-- Because the font rendering system prior to API version 16 can't automatically render dotted circle for incomplete combining letter of some scripts, different set of Key definitions are needed based on the API version. --> + <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_u" /> <!-- U+096D: "७" DEVANAGARI DIGIT SEVEN --> - <include - latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_u" /> <Key latin:keyStyle="baseKeyDevanagariVowelSignU" latin:keyHintLabel="7" @@ -144,9 +116,8 @@ <!-- Because the font rendering system prior to API version 16 can't automatically render dotted circle for incomplete combining letter of some scripts, different set of Key definitions are needed based on the API version. --> + <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_i" /> <!-- U+096E: "८" DEVANAGARI DIGIT EIGHT --> - <include - latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_i" /> <Key latin:keyStyle="baseKeyDevanagariVowelSignI" latin:keyHintLabel="8" @@ -154,9 +125,8 @@ <!-- Because the font rendering system prior to API version 16 can't automatically render dotted circle for incomplete combining letter of some scripts, different set of Key definitions are needed based on the API version. --> + <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_o" /> <!-- U+096F: "९" DEVANAGARI DIGIT NINE --> - <include - latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_o" /> <Key latin:keyStyle="baseKeyDevanagariVowelSignO" latin:keyHintLabel="9" @@ -164,14 +134,11 @@ <!-- U+092A: "प" DEVANAGARI LETTER PA U+0966: "०" DEVANAGARI DIGIT ZERO --> <Key - latin:keyLabel="प" + latin:keySpec="प" latin:keyHintLabel="0" - latin:additionalMoreKeys="०,0" - latin:keyLabelFlags="fontNormal" /> + latin:additionalMoreKeys="०,0" /> <!-- U+0907: "इ" DEVANAGARI LETTER I --> - <Key - latin:keyLabel="इ" - latin:keyLabelFlags="fontNormal" /> - </default> + <Key latin:keySpec="इ" /> + </default> </switch> </merge> diff --git a/java/res/xml/rowkeys_nepali_romanized2.xml b/java/res/xml/rowkeys_nepali_romanized2.xml index 66359ffb5..2e2583cca 100644 --- a/java/res/xml/rowkeys_nepali_romanized2.xml +++ b/java/res/xml/rowkeys_nepali_romanized2.xml @@ -18,109 +18,61 @@ */ --> -<merge - xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" -> +<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"> <switch> - <case - latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted" - > + <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"> <!-- U+0906: "आ" DEVANAGARI LETTER AA --> - <Key - latin:keyLabel="आ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="आ" /> <!-- U+0936: "श" DEVANAGARI LETTER SHA --> - <Key - latin:keyLabel="श" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="श" /> <!-- U+0927: "ध" DEVANAGARI LETTER DHA --> - <Key - latin:keyLabel="ध" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ध" /> <!-- U+090A: "ऊ" DEVANAGARI LETTER UU --> - <Key - latin:keyLabel="ऊ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ऊ" /> <!-- U+0918: "घ" DEVANAGARI LETTER GHA --> - <Key - latin:keyLabel="घ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="घ" /> <!-- U+0905: "अ" DEVANAGARI LETTER A --> - <Key - latin:keyLabel="अ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="अ" /> <!-- U+091D: "झ" DEVANAGARI LETTER JHA --> - <Key - latin:keyLabel="झ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="झ" /> <!-- U+0916: "ख" DEVANAGARI LETTER KHA --> - <Key - latin:keyLabel="ख" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ख" /> <!-- U+0965: "॥" DEVANAGARI DOUBLE DANDA --> - <Key - latin:keyLabel="॥" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="॥" /> <!-- U+0910: "ऐ" DEVANAGARI LETTER AI --> - <Key - latin:keyLabel="ऐ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ऐ" /> <!-- Because the font rendering system prior to API version 16 can't automatically render dotted circle for incomplete combining letter of some scripts, different set of Key definitions are needed based on the API version. --> - <include - latin:keyboardLayout="@xml/keystyle_devanagari_sign_visarga" /> - <Key - latin:keyStyle="baseKeyDevanagariSignVisarga" /> + <include latin:keyboardLayout="@xml/keystyle_devanagari_sign_visarga" /> + <Key latin:keyStyle="baseKeyDevanagariSignVisarga" /> </case> <default> <!-- Because the font rendering system prior to API version 16 can't automatically render dotted circle for incomplete combining letter of some scripts, different set of Key definitions are needed based on the API version. --> - <include - latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_aa" /> - <Key - latin:keyStyle="baseKeyDevanagariVowelSignAa" /> + <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_aa" /> + <Key latin:keyStyle="baseKeyDevanagariVowelSignAa" /> <!-- U+0938: "स" DEVANAGARI LETTER SA --> - <Key - latin:keyLabel="स" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="स" /> <!-- U+0926: "द" DEVANAGARI LETTER DA --> - <Key - latin:keyLabel="द" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="द" /> <!-- U+0909: "उ" DEVANAGARI LETTER U --> - <Key - latin:keyLabel="उ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="उ" /> <!-- U+0917: "ग" DEVANAGARI LETTER GA --> - <Key - latin:keyLabel="ग" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ग" /> <!-- U+0939: "ह" DEVANAGARI LETTER HA --> - <Key - latin:keyLabel="ह" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ह" /> <!-- U+091C: "ज" DEVANAGARI LETTER JA --> - <Key - latin:keyLabel="ज" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ज" /> <!-- U+0915: "क" DEVANAGARI LETTER KA --> - <Key - latin:keyLabel="क" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="क" /> <!-- U+0932: "ल" DEVANAGARI LETTER LA --> - <Key - latin:keyLabel="ल" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ल" /> <!-- U+090F: "ए" DEVANAGARI LETTER E --> - <Key - latin:keyLabel="ए" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ए" /> <!-- U+0950: "ॐ" DEVANAGARI OM --> - <Key - latin:keyLabel="ॐ" - latin:keyLabelFlags="fontNormal" /> - </default> + <Key latin:keySpec="ॐ" /> + </default> </switch> </merge> diff --git a/java/res/xml/rowkeys_nepali_romanized3.xml b/java/res/xml/rowkeys_nepali_romanized3.xml index 166d028a3..24f590832 100644 --- a/java/res/xml/rowkeys_nepali_romanized3.xml +++ b/java/res/xml/rowkeys_nepali_romanized3.xml @@ -18,97 +18,62 @@ */ --> -<merge - xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" -> +<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"> <switch> - <case - latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted" - > + <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"> <!-- U+090B: "ऋ" DEVANAGARI LETTER VOCALIC R --> - <Key - latin:keyLabel="ऋ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ऋ" /> <!-- U+0922: "ढ" DEVANAGARI LETTER DDHA --> - <Key - latin:keyLabel="ढ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ढ" /> <!-- U+091B: "छ" DEVANAGARI LETTER CHA --> - <Key - latin:keyLabel="छ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="छ" /> <!-- Because the font rendering system prior to API version 16 can't automatically render dotted circle for incomplete combining letter of some scripts, different set of Key definitions are needed based on the API version. --> - <include - latin:keyboardLayout="@xml/key_devanagari_sign_candrabindu" /> + <include latin:keyboardLayout="@xml/keystyle_devanagari_sign_candrabindu" /> + <Key latin:keyStyle="baseKeyDevanagariSignCandrabindu" /> <!-- U+092D: "भ" DEVANAGARI LETTER BHA --> - <Key - latin:keyLabel="भ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="भ" /> <!-- U+0923: "ण" DEVANAGARI LETTER NNA --> - <Key - latin:keyLabel="ण" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ण" /> <!-- Because the font rendering system prior to API version 16 can't automatically render dotted circle for incomplete combining letter of some scripts, different set of Key definitions are needed based on the API version. --> - <include - latin:keyboardLayout="@xml/key_devanagari_sign_anusvara" /> + <include latin:keyboardLayout="@xml/keystyle_devanagari_sign_anusvara" /> + <Key latin:keyStyle="baseKeyDevanagariSignAnusvara" /> <!-- U+0919: "ङ" DEVANAGARI LETTER NGA --> - <Key - latin:keyLabel="ङ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ङ" /> <!-- Because the font rendering system prior to API version 16 can't automatically render dotted circle for incomplete combining letter of some scripts, different set of Key definitions are needed based on the API version. --> - <include - latin:keyboardLayout="@xml/keystyle_devanagari_sign_virama" /> - <Key - latin:keyStyle="baseKeyDevanagariSignVirama" /> + <include latin:keyboardLayout="@xml/keystyle_devanagari_sign_virama" /> + <Key latin:keyStyle="baseKeyDevanagariSignVirama" /> </case> <default> <!-- U+0937: "ष" DEVANAGARI LETTER SSA --> - <Key - latin:keyLabel="ष" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ष" /> <!-- U+0921: "ड" DEVANAGARI LETTER DDA --> - <Key - latin:keyLabel="ड" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ड" /> <!-- U+091A: "च" DEVANAGARI LETTER CA --> - <Key - latin:keyLabel="च" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="च" /> <!-- U+0935: "व" DEVANAGARI LETTER VA --> - <Key - latin:keyLabel="व" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="व" /> <!-- U+092C: "ब" DEVANAGARI LETTER BHA --> - <Key - latin:keyLabel="ब" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ब" /> <!-- U+0928: "न" DEVANAGARI LETTER NA --> - <Key - latin:keyLabel="न" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="न" /> <!-- U+092E: "म" DEVANAGARI LETTER MA --> - <Key - latin:keyLabel="म" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="म" /> <!-- U+0964: "।" DEVANAGARI DANDA U+093D: "ऽ" DEVANAGARI SIGN AVAGRAHA --> <Key - latin:keyLabel="।" - latin:moreKeys="ऽ" - latin:keyLabelFlags="fontNormal" /> + latin:keySpec="।" + latin:moreKeys="ऽ" /> <!-- Because the font rendering system prior to API version 16 can't automatically render dotted circle for incomplete combining letter of some scripts, different set of Key definitions are needed based on the API version. --> - <include - latin:keyboardLayout="@xml/keystyle_devanagari_sign_virama" /> - <Key - latin:keyStyle="baseKeyDevanagariSignVirama" /> + <include latin:keyboardLayout="@xml/keystyle_devanagari_sign_virama" /> + <Key latin:keyStyle="baseKeyDevanagariSignVirama" /> </default> </switch> </merge> diff --git a/java/res/xml/rowkeys_nepali_traditional1.xml b/java/res/xml/rowkeys_nepali_traditional1.xml index c7883c733..73b2275ef 100644 --- a/java/res/xml/rowkeys_nepali_traditional1.xml +++ b/java/res/xml/rowkeys_nepali_traditional1.xml @@ -18,158 +18,139 @@ */ --> -<merge - xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" -> +<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"> <switch> - <case - latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted" - > + <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"> <!-- U+0924/U+094D/U+0924: "त्त" DEVANAGARI LETTER TA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER TA U+091E: "ञ" DEVANAGARI LETTER NYA U+091C/U+094D/U+091E: "ज्ञ" DEVANAGARI LETTER JA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER NYA U+0965: "॥" DEVANAGARI DOUBLE DANDA --> <Key - latin:keyLabel="त्त" + latin:keySpec="त्त" latin:moreKeys="ञ,ज्ञ,॥" - latin:keyLabelFlags="fontNormal|followKeyLetterRatio" /> + latin:keyLabelFlags="followKeyLetterRatio" /> <!-- U+0921/U+094D/U+0922: "ड्ढ" DEVANAGARI LETTER DDA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER DDHA U+0908: "ई" DEVANAGARI LETTER II --> <Key - latin:keyLabel="ड्ढ" + latin:keySpec="ड्ढ" latin:moreKeys="ई" - latin:keyLabelFlags="fontNormal|followKeyLetterRatio" /> + latin:keyLabelFlags="followKeyLetterRatio" /> <!-- U+0910: "ऐ" DEVANAGARI LETTER AI U+0918: "घ" DEVANAGARI LETTER GHA --> <Key - latin:keyLabel="ऐ" - latin:moreKeys="घ" - latin:keyLabelFlags="fontNormal" /> + latin:keySpec="ऐ" + latin:moreKeys="घ" /> <!-- U+0926/U+094D/U+0935: "द्व" DEVANAGARI LETTER DA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER VA U+0926/U+094D/U+0927: "द्ध" DEVANAGARI LETTER DA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER DHA --> <Key - latin:keyLabel="द्व" + latin:keySpec="द्व" latin:moreKeys="द्ध" - latin:keyLabelFlags="fontNormal|followKeyLetterRatio" /> + latin:keyLabelFlags="followKeyLetterRatio" /> <!-- U+091F/U+094D/U+091F: "ट्ट" DEVANAGARI LETTER TTA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER TTA U+091B: "छ" DEVANAGARI LETTER CHA --> <Key - latin:keyLabel="ट्ट" + latin:keySpec="ट्ट" latin:moreKeys="छ" - latin:keyLabelFlags="fontNormal|followKeyLetterRatio" /> + latin:keyLabelFlags="followKeyLetterRatio" /> <!-- U+0920/U+094D/U+0920: "ठ्ठ" DEVANAGARI LETTER TTHA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER TTHA U+091F: "ट" DEVANAGARI LETTER TTA --> <Key - latin:keyLabel="ठ्ठ" + latin:keySpec="ठ्ठ" latin:moreKeys="ट" - latin:keyLabelFlags="fontNormal|followKeyLetterRatio" /> + latin:keyLabelFlags="followKeyLetterRatio" /> <!-- U+090A: "ऊ" DEVANAGARI LETTER UU U+0920: "ठ" DEVANAGARI LETTER TTHA --> <Key - latin:keyLabel="ऊ" - latin:moreKeys="ठ" - latin:keyLabelFlags="fontNormal" /> + latin:keySpec="ऊ" + latin:moreKeys="ठ" /> <!-- U+0915/U+094D/U+0937: "क्ष" DEVANAGARI LETTER KA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER SSA U+0921: "ड" DEVANAGARI LETTER DDA --> <Key - latin:keyLabel="क्ष" + latin:keySpec="क्ष" latin:moreKeys="ड" - latin:keyLabelFlags="fontNormal|followKeyLetterRatio" /> + latin:keyLabelFlags="followKeyLetterRatio" /> <!-- U+0907: "इ" DEVANAGARI LETTER I U+0922: "ढ" DEVANAGARI LETTER DDHA --> <Key - latin:keyLabel="इ" - latin:moreKeys="ढ" - latin:keyLabelFlags="fontNormal" /> + latin:keySpec="इ" + latin:moreKeys="ढ" /> <!-- U+090F: "ए" DEVANAGARI LETTER E U+0923: "ण" DEVANAGARI LETTER NNA --> <Key - latin:keyLabel="ए" - latin:moreKeys="ण" - latin:keyLabelFlags="fontNormal" /> + latin:keySpec="ए" + latin:moreKeys="ण" /> <!-- Because the font rendering system prior to API version 16 can't automatically render dotted circle for incomplete combining letter of some scripts, different set of Key definitions are needed based on the API version. --> - <include - latin:keyboardLayout="@xml/key_devanagari_vowel_sign_vocalic_r" /> + <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_vocalic_r" /> + <Key latin:keyStyle="baseKeyDevanagariVowelSignVocalicR" /> </case> <default> <!-- U+091F: "ट" DEVANAGARI LETTER TTA U+0967: "१" DEVANAGARI DIGIT ONE --> <Key - latin:keyLabel="ट" + latin:keySpec="ट" latin:keyHintLabel="1" - latin:additionalMoreKeys="१,1" - latin:keyLabelFlags="fontNormal" /> + latin:additionalMoreKeys="१,1" /> <!-- U+0927: "ध" DEVANAGARI LETTER DHA U+0968: "२" DEVANAGARI DIGIT TWO --> <Key - latin:keyLabel="ध" + latin:keySpec="ध" latin:keyHintLabel="2" - latin:additionalMoreKeys="२,2" - latin:keyLabelFlags="fontNormal" /> + latin:additionalMoreKeys="२,2" /> <!-- U+092D: "भ" DEVANAGARI LETTER BHA U+0969: "३" DEVANAGARI DIGIT THREE --> <Key - latin:keyLabel="भ" + latin:keySpec="भ" latin:keyHintLabel="3" - latin:additionalMoreKeys="३,3" - latin:keyLabelFlags="fontNormal" /> + latin:additionalMoreKeys="३,3" /> <!-- U+091A: "च" DEVANAGARI LETTER CA U+096A: "४" DEVANAGARI DIGIT FOUR --> <Key - latin:keyLabel="च" + latin:keySpec="च" latin:keyHintLabel="4" - latin:additionalMoreKeys="४,4" - latin:keyLabelFlags="fontNormal" /> + latin:additionalMoreKeys="४,4" /> <!-- U+0924: "त" DEVANAGARI LETTER TA U+096B: "५" DEVANAGARI DIGIT FIVE --> <Key - latin:keyLabel="त" + latin:keySpec="त" latin:keyHintLabel="5" - latin:additionalMoreKeys="५,5" - latin:keyLabelFlags="fontNormal" /> + latin:additionalMoreKeys="५,5" /> <!-- U+0925: "थ" DEVANAGARI LETTER THA U+096C: "६" DEVANAGARI DIGIT SIX --> <Key - latin:keyLabel="थ" + latin:keySpec="थ" latin:keyHintLabel="6" - latin:additionalMoreKeys="६,6" - latin:keyLabelFlags="fontNormal" /> + latin:additionalMoreKeys="६,6" /> <!-- U+0917: "ग" DEVANAGARI LETTER G U+096D: "७" DEVANAGARI DIGIT SEVEN --> <Key - latin:keyLabel="ग" + latin:keySpec="ग" latin:keyHintLabel="7" - latin:additionalMoreKeys="७,7" - latin:keyLabelFlags="fontNormal" /> + latin:additionalMoreKeys="७,7" /> <!-- U+0937: "ष" DEVANAGARI LETTER SSA U+096E: "८" DEVANAGARI DIGIT EIGHT --> <Key - latin:keyLabel="ष" + latin:keySpec="ष" latin:keyHintLabel="8" - latin:additionalMoreKeys="८,8" - latin:keyLabelFlags="fontNormal" /> + latin:additionalMoreKeys="८,8" /> <!-- U+092F: "य" DEVANAGARI LETTER YA U+096F: "९" DEVANAGARI DIGIT NINE --> <Key - latin:keyLabel="य" + latin:keySpec="य" latin:keyHintLabel="9" - latin:additionalMoreKeys="९,9" - latin:keyLabelFlags="fontNormal" /> + latin:additionalMoreKeys="९,9" /> <!-- U+0909: "उ" DEVANAGARI LETTER U U+0966: "०" DEVANAGARI DIGIT ZERO --> <Key - latin:keyLabel="उ" + latin:keySpec="उ" latin:keyHintLabel="0" - latin:additionalMoreKeys="०,0" - latin:keyLabelFlags="fontNormal" /> + latin:additionalMoreKeys="०,0" /> <!-- U+0907: "इ" DEVANAGARI LETTER I U+0914: "औ" DEVANAGARI LETTER AU --> <Key - latin:keyLabel="इ" - latin:moreKeys="औ" - latin:keyLabelFlags="fontNormal" /> - </default> + latin:keySpec="इ" + latin:moreKeys="औ" /> + </default> </switch> </merge> diff --git a/java/res/xml/rowkeys_nepali_traditional2.xml b/java/res/xml/rowkeys_nepali_traditional2.xml index 45620a9d7..c443daf5d 100644 --- a/java/res/xml/rowkeys_nepali_traditional2.xml +++ b/java/res/xml/rowkeys_nepali_traditional2.xml @@ -18,122 +18,84 @@ */ --> -<merge - xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" -> +<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"> <switch> - <case - latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted" - > + <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"> <!-- U+0906: "आ" DEVANAGARI LETTER AA --> - <Key - latin:keyLabel="आ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="आ" /> <!-- U+0919/U+094D: "ङ्" DEVANAGARI LETTER NGA/DEVANAGARI SIGN VIRAMA --> <Key - latin:keyLabel="ङ्" - latin:keyLabelFlags="fontNormal|followKeyLetterRatio" /> + latin:keySpec="ङ्" + latin:keyLabelFlags="followKeyLetterRatio" /> <!-- U+0921/U+094D/U+0921: "ड्ड" DEVANAGARI LETTER DDA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER DDA --> <Key - latin:keyLabel="ड्ड" - latin:keyLabelFlags="fontNormal|followKeyLetterRatio" /> + latin:keySpec="ड्ड" + latin:keyLabelFlags="followKeyLetterRatio" /> <!-- Because the font rendering system prior to API version 16 can't automatically render dotted circle for incomplete combining letter of some scripts, different set of Key definitions are needed based on the API version. --> - <include - latin:keyboardLayout="@xml/key_devanagari_sign_candrabindu" /> + <include latin:keyboardLayout="@xml/keystyle_devanagari_sign_candrabindu" /> + <Key latin:keyStyle="baseKeyDevanagariSignCandrabindu" /> <!-- U+0926/U+094D/U+0926: "द्द" DEVANAGARI LETTER DA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER DA --> <Key - latin:keyLabel="द्द" - latin:keyLabelFlags="fontNormal|followKeyLetterRatio" /> + latin:keySpec="द्द" + latin:keyLabelFlags="followKeyLetterRatio" /> <!-- U+091D: "झ" DEVANAGARI LETTER JHA --> - <Key - latin:keyLabel="झ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="झ" /> <!-- Because the font rendering system prior to API version 16 can't automatically render dotted circle for incomplete combining letter of some scripts, different set of Key definitions are needed based on the API version. --> - <include - latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_o" /> - <Key - latin:keyStyle="baseKeyDevanagariVowelSignO" /> + <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_o" /> + <Key latin:keyStyle="baseKeyDevanagariVowelSignO" /> <!-- U+092B: "फ" DEVANAGARI LETTER PHA --> - <Key - latin:keyLabel="फ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="फ" /> <!-- Because the font rendering system prior to API version 16 can't automatically render dotted circle for incomplete combining letter of some scripts, different set of Key definitions are needed based on the API version. --> - <include - latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_ii" /> - <Key - latin:keyStyle="baseKeyDevanagariVowelSignIi" /> + <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_ii" /> + <Key latin:keyStyle="baseKeyDevanagariVowelSignIi" /> <!-- U+091F/U+094D/U+0920: "ट्ठ" DEVANAGARI LETTER TTA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER TTHA --> <Key - latin:keyLabel="ट्ठ" - latin:keyLabelFlags="fontNormal|followKeyLetterRatio" /> + latin:keySpec="ट्ठ" + latin:keyLabelFlags="followKeyLetterRatio" /> <!-- Because the font rendering system prior to API version 16 can't automatically render dotted circle for incomplete combining letter of some scripts, different set of Key definitions are needed based on the API version. --> - <include - latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_uu" /> - <Key - latin:keyStyle="baseKeyDevanagariVowelSignUu" /> + <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_uu" /> + <Key latin:keyStyle="baseKeyDevanagariVowelSignUu" /> </case> <default> <!-- U+092C: "ब" DEVANAGARI LETTER BA --> - <Key - latin:keyLabel="ब" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ब" /> <!-- U+0915: "क" DEVANAGARI LETTER KA --> - <Key - latin:keyLabel="क" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="क" /> <!-- U+092E: "म" DEVANAGARI LETTER MA --> - <Key - latin:keyLabel="म" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="म" /> <!-- Because the font rendering system prior to API version 16 can't automatically render dotted circle for incomplete combining letter of some scripts, different set of Key definitions are needed based on the API version. --> - <include - latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_aa" /> - <Key - latin:keyStyle="baseKeyDevanagariVowelSignAa" /> + <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_aa" /> + <Key latin:keyStyle="baseKeyDevanagariVowelSignAa" /> <!-- U+0928: "न" DEVANAGARI LETTER NA --> - <Key - latin:keyLabel="न" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="न" /> <!-- U+091C: "ज" DEVANAGARI LETTER JA --> - <Key - latin:keyLabel="ज" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ज" /> <!-- U+0935: "व" DEVANAGARI LETTER VA --> - <Key - latin:keyLabel="व" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="व" /> <!-- U+092A: "प" DEVANAGARI LETTER PA --> - <Key - latin:keyLabel="प" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="प" /> <!-- Because the font rendering system prior to API version 16 can't automatically render dotted circle for incomplete combining letter of some scripts, different set of Key definitions are needed based on the API version. --> - <include - latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_i" /> - <Key - latin:keyStyle="baseKeyDevanagariVowelSignI" /> + <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_i" /> + <Key latin:keyStyle="baseKeyDevanagariVowelSignI" /> <!-- U+0938: "स" DEVANAGARI LETTER SA --> - <Key - latin:keyLabel="स" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="स" /> <!-- Because the font rendering system prior to API version 16 can't automatically render dotted circle for incomplete combining letter of some scripts, different set of Key definitions are needed based on the API version. --> - <include - latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_u" /> - <Key - latin:keyStyle="baseKeyDevanagariVowelSignU" /> - </default> + <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_u" /> + <Key latin:keyStyle="baseKeyDevanagariVowelSignU" /> + </default> </switch> </merge> diff --git a/java/res/xml/rowkeys_nepali_traditional3_left6.xml b/java/res/xml/rowkeys_nepali_traditional3_left6.xml index 1cacced83..ade278710 100644 --- a/java/res/xml/rowkeys_nepali_traditional3_left6.xml +++ b/java/res/xml/rowkeys_nepali_traditional3_left6.xml @@ -18,66 +18,44 @@ */ --> -<merge - xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" -> +<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"> <switch> - <case - latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted" - > + <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"> <!-- U+0915/U+094D: "क्" DEVANAGARI LETTER KA/DEVANAGARI SIGN VIRAMA --> <Key - latin:keyLabel="क्" - latin:keyLabelFlags="fontNormal|followKeyLetterRatio" /> + latin:keySpec="क्" + latin:keyLabelFlags="followKeyLetterRatio" /> <!-- U+0939/U+094D/U+092E: "ह्म" DEVANAGARI LETTER HA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER MA --> <Key - latin:keyLabel="ह्म" - latin:keyLabelFlags="fontNormal|followKeyLetterRatio" /> + latin:keySpec="ह्म" + latin:keyLabelFlags="followKeyLetterRatio" /> <!-- U+090B: "ऋ" DEVANAGARI LETTER VOCALIC R --> - <Key - latin:keyLabel="ऋ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ऋ" /> <!-- U+0950: "ॐ" DEVANAGARI OM --> - <Key - latin:keyLabel="ॐ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ॐ" /> <!-- Because the font rendering system prior to API version 16 can't automatically render dotted circle for incomplete combining letter of some scripts, different set of Key definitions are needed based on the API version. --> - <include - latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_au" /> - <Key - latin:keyStyle="baseKeyDevanagariVowelSignAu" /> + <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_au" /> + <Key latin:keyStyle="baseKeyDevanagariVowelSignAu" /> <!-- U+0926/U+094D/U+092F: "द्य" DEVANAGARI LETTER DA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER YA --> <Key - latin:keyLabel="द्य" - latin:keyLabelFlags="fontNormal|followKeyLetterRatio" /> + latin:keySpec="द्य" + latin:keyLabelFlags="followKeyLetterRatio" /> </case> <default> <!-- U+0936: "श" DEVANAGARI LETTER SHA --> - <Key - latin:keyLabel="श" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="श" /> <!-- U+0939: "ह" DEVANAGARI LETTER HA --> - <Key - latin:keyLabel="ह" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ह" /> <!-- U+0905: "अ" DEVANAGARI LETTER A --> - <Key - latin:keyLabel="अ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="अ" /> <!-- U+0916: "ख" DEVANAGARI LETTER KHA --> - <Key - latin:keyLabel="ख" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ख" /> <!-- U+0926: "द" DEVANAGARI LETTER DA --> - <Key - latin:keyLabel="द" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="द" /> <!-- U+0932: "ल" DEVANAGARI LETTER LA --> - <Key - latin:keyLabel="ल" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ल" /> </default> </switch> </merge> diff --git a/java/res/xml/rowkeys_nepali_traditional3_right3.xml b/java/res/xml/rowkeys_nepali_traditional3_right3.xml index b2e01e481..4db438d81 100644 --- a/java/res/xml/rowkeys_nepali_traditional3_right3.xml +++ b/java/res/xml/rowkeys_nepali_traditional3_right3.xml @@ -18,48 +18,35 @@ */ --> -<merge - xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" -> +<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"> <switch> - <case - latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted" - > + <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"> <!-- Because the font rendering system prior to API version 16 can't automatically render dotted circle for incomplete combining letter of some scripts, different set of Key definitions are needed based on the API version. --> - <include - latin:keyboardLayout="@xml/key_devanagari_sign_anusvara" /> + <include latin:keyboardLayout="@xml/keystyle_devanagari_sign_anusvara" /> + <Key latin:keyStyle="baseKeyDevanagariSignAnusvara" /> <!-- U+0919: "ङ" DEVANAGARI LETTER NGA --> - <Key - latin:keyLabel="ङ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ङ" /> <!-- Because the font rendering system prior to API version 16 can't automatically render dotted circle for incomplete combining letter of some scripts, different set of Key definitions are needed based on the API version. --> - <include - latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_ai" /> - <Key - latin:keyStyle="baseKeyDevanagariVowelSignAi" /> + <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_ai" /> + <Key latin:keyStyle="baseKeyDevanagariVowelSignAi" /> </case> <default> <!-- Because the font rendering system prior to API version 16 can't automatically render dotted circle for incomplete combining letter of some scripts, different set of Key definitions are needed based on the API version. --> - <include - latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_e" /> - <Key - latin:keyStyle="baseKeyDevanagariVowelSignE" /> + <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_e" /> + <Key latin:keyStyle="baseKeyDevanagariVowelSignE" /> <!-- U+0964: "।" DEVANAGARI DANDA --> + <Key latin:keySpec="।" /> + <!-- U+0930: "र" DEVANAGARI LETTER RA + U+0930/U+0941: "रु" DEVANAGARI LETTER RA/DEVANAGARI VOWEL SIGN U --> <Key - latin:keyLabel="।" - latin:keyLabelFlags="fontNormal" /> - <!-- U+0930: "र" DEVANAGARI LETTER RA - U+0930/U+0941: "रु" DEVANAGARI LETTER RA/DEVANAGARI VOWEL SIGN U --> - <Key - latin:keyLabel="र" - latin:moreKeys="रु" - latin:keyLabelFlags="fontNormal" /> - </default> + latin:keySpec="र" + latin:moreKeys="रु" /> + </default> </switch> </merge> diff --git a/java/res/xml/rowkeys_nepali_traditional3_right5.xml b/java/res/xml/rowkeys_nepali_traditional3_right5.xml index 87f061610..c7c73a446 100644 --- a/java/res/xml/rowkeys_nepali_traditional3_right5.xml +++ b/java/res/xml/rowkeys_nepali_traditional3_right5.xml @@ -18,71 +18,56 @@ */ --> -<merge - xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" -> +<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"> <switch> - <case - latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted" - > + <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"> <!-- Because the font rendering system prior to API version 16 can't automatically render dotted circle for incomplete combining letter of some scripts, different set of Key definitions are needed based on the API version. --> - <include - latin:keyboardLayout="@xml/key_devanagari_sign_anusvara" /> + <include latin:keyboardLayout="@xml/keystyle_devanagari_sign_anusvara" /> + <Key latin:keyStyle="baseKeyDevanagariSignAnusvara" /> <!-- U+0919: "ङ" DEVANAGARI LETTER NGA --> - <Key - latin:keyLabel="ङ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ङ" /> <!-- Because the font rendering system prior to API version 16 can't automatically render dotted circle for incomplete combining letter of some scripts, different set of Key definitions are needed based on the API version. --> - <include - latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_ai" /> - <Key - latin:keyStyle="baseKeyDevanagariVowelSignAi" /> + <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_ai" /> + <Key latin:keyStyle="baseKeyDevanagariVowelSignAi" /> <!-- U+0930/U+0941: "रु" DEVANAGARI LETTER RA/DEVANAGARI VOWEL SIGN U --> <Key - latin:keyLabel="रु" + latin:keySpec="रु" latin:moreKeys="!" - latin:keyLabelFlags="fontNormal|followKeyLetterRatio" /> + latin:keyLabelFlags="followKeyLetterRatio" /> <Key - latin:keyLabel="\?" /> + latin:keySpec="\?" + latin:keyLabelFlags="fontDefault" /> </case> <default> <!-- Because the font rendering system prior to API version 16 can't automatically render dotted circle for incomplete combining letter of some scripts, different set of Key definitions are needed based on the API version. --> + <include latin:keyboardLayout="@xml/keystyle_devanagari_sign_visarga" /> <!-- U+093D: "ऽ" DEVANAGARI SIGN AVAGRAHA --> - <include - latin:keyboardLayout="@xml/keystyle_devanagari_sign_visarga" /> <Key latin:keyStyle="baseKeyDevanagariSignVisarga" latin:moreKeys="ऽ" /> <!-- Because the font rendering system prior to API version 16 can't automatically render dotted circle for incomplete combining letter of some scripts, different set of Key definitions are needed based on the API version. --> - <include - latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_e" /> + <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_e" /> <!-- Override more keys with empty definition --> - <key-style - latin:styleName="moreKeysDevanagariVowelSignE" /> - <Key - latin:keyStyle="baseKeyDevanagariVowelSignE" /> + <key-style latin:styleName="moreKeysDevanagariVowelSignE" /> + <Key latin:keyStyle="baseKeyDevanagariVowelSignE" /> <!-- U+0964: "।" DEVANAGARI DANDA --> - <Key - latin:keyLabel="।" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="।" /> <!-- U+0930: "र" DEVANAGARI LETTER RA --> <Key - latin:keyLabel="र" - latin:moreKeys="!" - latin:keyLabelFlags="fontNormal" /> + latin:keySpec="र" + latin:moreKeys="!" /> <!-- Because the font rendering system prior to API version 16 can't automatically render dotted circle for incomplete combining letter of some scripts, different set of Key definitions are needed based on the API version. --> - <include - latin:keyboardLayout="@xml/keystyle_devanagari_sign_virama" /> + <include latin:keyboardLayout="@xml/keystyle_devanagari_sign_virama" /> <Key latin:keyStyle="baseKeyDevanagariSignVirama" latin:moreKeys="\?" /> diff --git a/java/res/xml/rowkeys_nordic1.xml b/java/res/xml/rowkeys_nordic1.xml index 72ac86b2e..ff589cc4a 100644 --- a/java/res/xml/rowkeys_nordic1.xml +++ b/java/res/xml/rowkeys_nordic1.xml @@ -24,5 +24,5 @@ <include latin:keyboardLayout="@xml/rowkeys_qwerty1" /> <Key - latin:keyLabel="!text/keylabel_for_nordic_row1_11" /> + latin:keySpec="!text/keyspec_nordic_row1_11" /> </merge> diff --git a/java/res/xml/rowkeys_nordic2.xml b/java/res/xml/rowkeys_nordic2.xml index 836214abf..0330c0f67 100644 --- a/java/res/xml/rowkeys_nordic2.xml +++ b/java/res/xml/rowkeys_nordic2.xml @@ -24,9 +24,9 @@ <include latin:keyboardLayout="@xml/rowkeys_qwerty2" /> <Key - latin:keyLabel="!text/keylabel_for_nordic_row2_10" - latin:moreKeys="!text/more_keys_for_nordic_row2_10" /> + latin:keySpec="!text/keyspec_nordic_row2_10" + latin:moreKeys="!text/morekeys_nordic_row2_10" /> <Key - latin:keyLabel="!text/keylabel_for_nordic_row2_11" - latin:moreKeys="!text/more_keys_for_nordic_row2_11" /> + latin:keySpec="!text/keyspec_nordic_row2_11" + latin:moreKeys="!text/morekeys_nordic_row2_11" /> </merge> diff --git a/java/res/xml/rowkeys_pcqwerty1.xml b/java/res/xml/rowkeys_pcqwerty1.xml index de548d0ba..564468a9a 100644 --- a/java/res/xml/rowkeys_pcqwerty1.xml +++ b/java/res/xml/rowkeys_pcqwerty1.xml @@ -21,61 +21,72 @@ <merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" > - <Key - latin:keyLabel="`" - latin:additionalMoreKeys="~" /> - <Key - latin:keyLabel="1" - latin:additionalMoreKeys="!,!text/more_keys_for_symbols_exclamation" - latin:moreKeys="!text/more_keys_for_symbols_1" /> - <Key - latin:keyLabel="2" - latin:additionalMoreKeys="\@" - latin:moreKeys="!text/more_keys_for_symbols_2" /> - <Key - latin:keyLabel="3" - latin:additionalMoreKeys="\#" - latin:moreKeys="!text/more_keys_for_symbols_3" /> - <Key - latin:keyLabel="4" - latin:additionalMoreKeys="$" - latin:moreKeys="!text/more_keys_for_symbols_4" /> - <Key - latin:keyLabel="5" - latin:additionalMoreKeys="\\%" - latin:moreKeys="!text/more_keys_for_symbols_5" /> - <Key - latin:keyLabel="6" - latin:additionalMoreKeys="^" - latin:moreKeys="!text/more_keys_for_symbols_6" /> - <Key - latin:keyLabel="7" - latin:additionalMoreKeys="&" - latin:moreKeys="!text/more_keys_for_symbols_7" /> - <Key - latin:keyLabel="8" - latin:additionalMoreKeys="*" - latin:moreKeys="!text/more_keys_for_symbols_8" /> - <Key - latin:keyLabel="9" - latin:additionalMoreKeys="(" - latin:moreKeys="!text/more_keys_for_symbols_9" /> - <Key - latin:keyLabel="0" - latin:additionalMoreKeys=")" - latin:moreKeys="!text/more_keys_for_symbols_0" /> - <!-- U+2013: "–" EN DASH - U+2014: "—" EM DASH - U+00B7: "·" MIDDLE DOT --> - <Key - latin:keyLabel="-" - latin:additionalMoreKeys="_" - latin:moreKeys="–,—,·" /> - <!-- U+221E: "∞" INFINITY - U+2260: "≠" NOT EQUAL TO - U+2248: "≈" ALMOST EQUAL TO --> - <Key - latin:keyLabel="=" - latin:additionalMoreKeys="+" - latin:moreKeys="!fixedColumnOrder!4,∞,≠,≈,%" /> + <switch> + <case + latin:keyboardLayoutSetElement="alphabet|alphabetAutomaticShifted|alphabetShiftLocked" + > + <Key + latin:keySpec="`" + latin:additionalMoreKeys="~" /> + <Key + latin:keySpec="1" + latin:additionalMoreKeys="!,!text/morekeys_exclamation" + latin:moreKeys="!text/morekeys_symbols_1" /> + <Key + latin:keySpec="2" + latin:additionalMoreKeys="\@" + latin:moreKeys="!text/morekeys_symbols_2" /> + <Key + latin:keySpec="3" + latin:additionalMoreKeys="\#" + latin:moreKeys="!text/morekeys_symbols_3" /> + <Key + latin:keySpec="4" + latin:additionalMoreKeys="$" + latin:moreKeys="!text/morekeys_symbols_4" /> + <Key + latin:keySpec="5" + latin:additionalMoreKeys="\\%" + latin:moreKeys="!text/morekeys_symbols_5" /> + <Key + latin:keySpec="6" + latin:additionalMoreKeys="^" + latin:moreKeys="!text/morekeys_symbols_6" /> + <Key + latin:keySpec="7" + latin:additionalMoreKeys="&" + latin:moreKeys="!text/morekeys_symbols_7" /> + <Key + latin:keySpec="8" + latin:additionalMoreKeys="*" + latin:moreKeys="!text/morekeys_symbols_8" /> + <Key + latin:keySpec="9" + latin:additionalMoreKeys="(" + latin:moreKeys="!text/morekeys_symbols_9" /> + <Key + latin:keySpec="0" + latin:additionalMoreKeys=")" + latin:moreKeys="!text/morekeys_symbols_0" /> + <!-- U+2013: "–" EN DASH + U+2014: "—" EM DASH + U+00B7: "·" MIDDLE DOT --> + <Key + latin:keySpec="-" + latin:additionalMoreKeys="_" + latin:moreKeys="–,—,·" /> + <!-- U+221E: "∞" INFINITY + U+2260: "≠" NOT EQUAL TO + U+2248: "≈" ALMOST EQUAL TO --> + <Key + latin:keySpec="=" + latin:additionalMoreKeys="+" + latin:moreKeys="!fixedColumnOrder!4,∞,≠,≈,%" /> + </case> + <!-- keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLockShifted" --> + <default> + <include + latin:keyboardLayout="@xml/rowkeys_pcqwerty1_shift" /> + </default> + </switch> </merge> diff --git a/java/res/xml/rowkeys_pcqwerty1_shift.xml b/java/res/xml/rowkeys_pcqwerty1_shift.xml index bc39f944e..c72040f8a 100644 --- a/java/res/xml/rowkeys_pcqwerty1_shift.xml +++ b/java/res/xml/rowkeys_pcqwerty1_shift.xml @@ -22,39 +22,38 @@ xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" > <Key - latin:keyLabel="~" /> + latin:keySpec="~" /> <Key - latin:keyLabel="!" - latin:additionalMoreKeys="!text/more_keys_for_symbols_exclamation" /> + latin:keySpec="!" + latin:additionalMoreKeys="!text/morekeys_exclamation" /> <Key - latin:keyLabel="\@" /> + latin:keySpec="\@" /> <Key - latin:keyLabel="\#" /> + latin:keySpec="\#" /> <Key - latin:keyLabel="$" - latin:additionalMoreKeys="!text/more_keys_for_currency_dollar" /> + latin:keySpec="$" + latin:additionalMoreKeys="!text/morekeys_currency_dollar" /> <Key - latin:keyLabel="%" - latin:additionalMoreKeys="!text/more_keys_for_symbols_percent" /> + latin:keySpec="%" + latin:additionalMoreKeys="!text/morekeys_symbols_percent" /> <Key - latin:keyLabel="^" /> + latin:keySpec="^" /> <Key - latin:keyLabel="&" /> + latin:keySpec="&" /> <Key - latin:keyLabel="*" - latin:additionalMoreKeys="!text/more_keys_for_star" /> + latin:keySpec="*" + latin:additionalMoreKeys="!text/morekeys_star" /> <Key - latin:keyLabel="(" /> + latin:keySpec="(" /> <Key - latin:keyLabel=")" /> + latin:keySpec=")" /> <Key - latin:keyLabel="_" /> - <!-- U+00B1: "±" PLUS-MINUS SIGN - U+00D7: "×" MULTIPLICATION SIGN + latin:keySpec="_" /> + <!-- U+00D7: "×" MULTIPLICATION SIGN U+00F7: "÷" DIVISION SIGN U+221A: "√" SQUARE ROOT --> <Key - latin:keyLabel="+" - latin:additionalMoreKeys="!text/more_keys_for_plus" - latin:moreKeys="±,×,÷,√" /> + latin:keySpec="+" + latin:additionalMoreKeys="!text/morekeys_plus" + latin:moreKeys="×,÷,√" /> </merge> diff --git a/java/res/xml/rowkeys_qwerty1.xml b/java/res/xml/rowkeys_qwerty1.xml index e7c9b590b..8f3b160fe 100644 --- a/java/res/xml/rowkeys_qwerty1.xml +++ b/java/res/xml/rowkeys_qwerty1.xml @@ -22,52 +22,52 @@ xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" > <Key - latin:keyLabel="!text/keylabel_for_q" + latin:keySpec="!text/keyspec_q" latin:keyHintLabel="1" latin:additionalMoreKeys="1" - latin:moreKeys="!text/more_keys_for_q" /> + latin:moreKeys="!text/morekeys_q" /> <Key - latin:keyLabel="!text/keylabel_for_w" + latin:keySpec="!text/keyspec_w" latin:keyHintLabel="2" latin:additionalMoreKeys="2" - latin:moreKeys="!text/more_keys_for_w" /> + latin:moreKeys="!text/morekeys_w" /> <Key - latin:keyLabel="e" + latin:keySpec="e" latin:keyHintLabel="3" latin:additionalMoreKeys="3" - latin:moreKeys="!text/more_keys_for_e" /> + latin:moreKeys="!text/morekeys_e" /> <Key - latin:keyLabel="r" + latin:keySpec="r" latin:keyHintLabel="4" latin:additionalMoreKeys="4" - latin:moreKeys="!text/more_keys_for_r" /> + latin:moreKeys="!text/morekeys_r" /> <Key - latin:keyLabel="t" + latin:keySpec="t" latin:keyHintLabel="5" latin:additionalMoreKeys="5" - latin:moreKeys="!text/more_keys_for_t" /> + latin:moreKeys="!text/morekeys_t" /> <Key - latin:keyLabel="!text/keylabel_for_y" + latin:keySpec="!text/keyspec_y" latin:keyHintLabel="6" latin:additionalMoreKeys="6" - latin:moreKeys="!text/more_keys_for_y" /> + latin:moreKeys="!text/morekeys_y" /> <Key - latin:keyLabel="u" + latin:keySpec="u" latin:keyHintLabel="7" latin:additionalMoreKeys="7" - latin:moreKeys="!text/more_keys_for_u" /> + latin:moreKeys="!text/morekeys_u" /> <Key - latin:keyLabel="i" + latin:keySpec="i" latin:keyHintLabel="8" latin:additionalMoreKeys="8" - latin:moreKeys="!text/more_keys_for_i" /> + latin:moreKeys="!text/morekeys_i" /> <Key - latin:keyLabel="o" + latin:keySpec="o" latin:keyHintLabel="9" latin:additionalMoreKeys="9" - latin:moreKeys="!text/more_keys_for_o" /> + latin:moreKeys="!text/morekeys_o" /> <Key - latin:keyLabel="p" + latin:keySpec="p" latin:keyHintLabel="0" latin:additionalMoreKeys="0" /> </merge> diff --git a/java/res/xml/rowkeys_qwerty2.xml b/java/res/xml/rowkeys_qwerty2.xml index d9777d920..4077beaf6 100644 --- a/java/res/xml/rowkeys_qwerty2.xml +++ b/java/res/xml/rowkeys_qwerty2.xml @@ -22,29 +22,29 @@ xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" > <Key - latin:keyLabel="a" - latin:moreKeys="!text/more_keys_for_a" /> + latin:keySpec="a" + latin:moreKeys="!text/morekeys_a" /> <Key - latin:keyLabel="s" - latin:moreKeys="!text/more_keys_for_s" /> + latin:keySpec="s" + latin:moreKeys="!text/morekeys_s" /> <Key - latin:keyLabel="d" - latin:moreKeys="!text/more_keys_for_d" /> + latin:keySpec="d" + latin:moreKeys="!text/morekeys_d" /> <Key - latin:keyLabel="f" /> + latin:keySpec="f" /> <Key - latin:keyLabel="g" - latin:moreKeys="!text/more_keys_for_g" /> + latin:keySpec="g" + latin:moreKeys="!text/morekeys_g" /> <Key - latin:keyLabel="h" - latin:moreKeys="!text/more_keys_for_h" /> + latin:keySpec="h" + latin:moreKeys="!text/morekeys_h" /> <Key - latin:keyLabel="j" - latin:moreKeys="!text/more_keys_for_j" /> + latin:keySpec="j" + latin:moreKeys="!text/morekeys_j" /> <Key - latin:keyLabel="k" - latin:moreKeys="!text/more_keys_for_k" /> + latin:keySpec="k" + latin:moreKeys="!text/morekeys_k" /> <Key - latin:keyLabel="l" - latin:moreKeys="!text/more_keys_for_l" /> + latin:keySpec="l" + latin:moreKeys="!text/morekeys_l" /> </merge> diff --git a/java/res/xml/rowkeys_qwerty3.xml b/java/res/xml/rowkeys_qwerty3.xml index b70fd729f..8562003d2 100644 --- a/java/res/xml/rowkeys_qwerty3.xml +++ b/java/res/xml/rowkeys_qwerty3.xml @@ -22,22 +22,22 @@ xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" > <Key - latin:keyLabel="z" - latin:moreKeys="!text/more_keys_for_z" /> + latin:keySpec="z" + latin:moreKeys="!text/morekeys_z" /> <Key - latin:keyLabel="!text/keylabel_for_x" - latin:moreKeys="!text/more_keys_for_x" /> + latin:keySpec="!text/keyspec_x" + latin:moreKeys="!text/morekeys_x" /> <Key - latin:keyLabel="c" - latin:moreKeys="!text/more_keys_for_c" /> + latin:keySpec="c" + latin:moreKeys="!text/morekeys_c" /> <Key - latin:keyLabel="v" - latin:moreKeys="!text/more_keys_for_v" /> + latin:keySpec="v" + latin:moreKeys="!text/morekeys_v" /> <Key - latin:keyLabel="b" /> + latin:keySpec="b" /> <Key - latin:keyLabel="n" - latin:moreKeys="!text/more_keys_for_n" /> + latin:keySpec="n" + latin:moreKeys="!text/morekeys_n" /> <Key - latin:keyLabel="m" /> + latin:keySpec="m" /> </merge> diff --git a/java/res/xml/rowkeys_qwertz1.xml b/java/res/xml/rowkeys_qwertz1.xml index d87f03ddc..c4edae339 100644 --- a/java/res/xml/rowkeys_qwertz1.xml +++ b/java/res/xml/rowkeys_qwertz1.xml @@ -22,51 +22,51 @@ xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" > <Key - latin:keyLabel="q" + latin:keySpec="q" latin:keyHintLabel="1" latin:additionalMoreKeys="1" /> <Key - latin:keyLabel="w" + latin:keySpec="w" latin:keyHintLabel="2" latin:additionalMoreKeys="2" - latin:moreKeys="!text/more_keys_for_w" /> + latin:moreKeys="!text/morekeys_w" /> <Key - latin:keyLabel="e" + latin:keySpec="e" latin:keyHintLabel="3" latin:additionalMoreKeys="3" - latin:moreKeys="!text/more_keys_for_e" /> + latin:moreKeys="!text/morekeys_e" /> <Key - latin:keyLabel="r" + latin:keySpec="r" latin:keyHintLabel="4" latin:additionalMoreKeys="4" - latin:moreKeys="!text/more_keys_for_r" /> + latin:moreKeys="!text/morekeys_r" /> <Key - latin:keyLabel="t" + latin:keySpec="t" latin:keyHintLabel="5" latin:additionalMoreKeys="5" - latin:moreKeys="!text/more_keys_for_t" /> + latin:moreKeys="!text/morekeys_t" /> <Key - latin:keyLabel="z" + latin:keySpec="z" latin:keyHintLabel="6" latin:additionalMoreKeys="6" - latin:moreKeys="!text/more_keys_for_z" /> + latin:moreKeys="!text/morekeys_z" /> <Key - latin:keyLabel="u" + latin:keySpec="u" latin:keyHintLabel="7" latin:additionalMoreKeys="7" - latin:moreKeys="!text/more_keys_for_u" /> + latin:moreKeys="!text/morekeys_u" /> <Key - latin:keyLabel="i" + latin:keySpec="i" latin:keyHintLabel="8" latin:additionalMoreKeys="8" - latin:moreKeys="!text/more_keys_for_i" /> + latin:moreKeys="!text/morekeys_i" /> <Key - latin:keyLabel="o" + latin:keySpec="o" latin:keyHintLabel="9" latin:additionalMoreKeys="9" - latin:moreKeys="!text/more_keys_for_o" /> + latin:moreKeys="!text/morekeys_o" /> <Key - latin:keyLabel="p" + latin:keySpec="p" latin:keyHintLabel="0" latin:additionalMoreKeys="0" /> </merge> diff --git a/java/res/xml/rowkeys_qwertz3.xml b/java/res/xml/rowkeys_qwertz3.xml index 9e39fe08e..a66c34868 100644 --- a/java/res/xml/rowkeys_qwertz3.xml +++ b/java/res/xml/rowkeys_qwertz3.xml @@ -22,21 +22,21 @@ xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" > <Key - latin:keyLabel="y" - latin:moreKeys="!text/more_keys_for_y" /> + latin:keySpec="y" + latin:moreKeys="!text/morekeys_y" /> <Key - latin:keyLabel="x" /> + latin:keySpec="x" /> <Key - latin:keyLabel="c" - latin:moreKeys="!text/more_keys_for_c" /> + latin:keySpec="c" + latin:moreKeys="!text/morekeys_c" /> <Key - latin:keyLabel="v" - latin:moreKeys="!text/more_keys_for_v" /> + latin:keySpec="v" + latin:moreKeys="!text/morekeys_v" /> <Key - latin:keyLabel="b" /> + latin:keySpec="b" /> <Key - latin:keyLabel="n" - latin:moreKeys="!text/more_keys_for_n" /> + latin:keySpec="n" + latin:moreKeys="!text/morekeys_n" /> <Key - latin:keyLabel="m" /> + latin:keySpec="m" /> </merge> diff --git a/java/res/xml/rowkeys_sinhala1.xml b/java/res/xml/rowkeys_sinhala1.xml new file mode 100644 index 000000000..fcad5eaa3 --- /dev/null +++ b/java/res/xml/rowkeys_sinhala1.xml @@ -0,0 +1,111 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright 2014, 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. +*/ +--> + +<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"> + <switch> + <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"> + <!-- U+0DD6: "ූ" SINHALA VOWEL SIGN DIGA PAA-PILLA --> + <Key latin:keySpec="ූ" /> + <!-- U+0D8B: "උ" SINHALA LETTER UYANNA --> + <Key latin:keySpec="උ" /> + <!-- U+0DD1: "ෑ" SINHALA VOWEL SIGN DIGA AEDA-PILLA --> + <Key latin:keySpec="ෑ" /> + <!-- U+0D8D: "ඍ" SINHALA LETTER IRUYANNA --> + <Key latin:keySpec="ඍ" /> + <!-- U+0D94: "ඔ" SINHALA LETTER OYANNA --> + <Key latin:keySpec="ඔ" /> + <!-- U+0DC1: "ශ" SINHALA LETTER TAALUJA SAYANNA --> + <Key latin:keySpec="ශ" /> + <!-- U+0DB9: "ඹ" SINHALA LETTER AMBA BAYANNA --> + <Key latin:keySpec="ඹ" /> + <!-- U+0DC2: "ෂ" SINHALA LETTER MUURDHAJA SAYANNA --> + <Key latin:keySpec="ෂ" /> + <!-- U+0DB0: "ධ" SINHALA LETTER MAHAAPRAANA DAYANNA --> + <Key latin:keySpec="ධ" /> + <!-- U+0DA1: "ඡ" SINHALA LETTER MAHAAPRAANA CAYANNA --> + <Key latin:keySpec="ඡ" /> + <!-- U+0DA5: "ඥ" SINHALA LETTER TAALUJA SANYOOGA NAAKSIKYAYA + U+0DF4: "෴" SINHALA PUNCTUATION KUNDDALIYA --> + <Key + latin:keySpec="ඥ" + latin:moreKeys="෴" + latin:keyLabelFlags="autoXScale" /> + </case> + <default> + <!-- U+0DD4: "ු" SINHALA VOWEL SIGN KETTI PAA-PILLA --> + <Key + latin:keySpec="ු" + latin:keyHintLabel="1" + latin:additionalMoreKeys="1" /> + <!-- U+0D85: "අ" SINHALA LETTER AYANNA --> + <Key + latin:keySpec="අ" + latin:keyHintLabel="2" + latin:additionalMoreKeys="2" /> + <!-- U+0DD0: "ැ" SINHALA VOWEL SIGN KETTI AEDA-PILLA --> + <Key + latin:keySpec="ැ" + latin:keyHintLabel="3" + latin:additionalMoreKeys="3" /> + <!-- U+0DBB: "ර" SINHALA LETTER RAYANNA --> + <Key + latin:keySpec="ර" + latin:keyHintLabel="4" + latin:additionalMoreKeys="4" /> + <!-- U+0D91: "එ" SINHALA LETTER EYANNA --> + <Key + latin:keySpec="එ" + latin:keyHintLabel="5" + latin:additionalMoreKeys="5" /> + <!-- U+0DC4: "හ" SINHALA LETTER HAYANNA --> + <Key + latin:keySpec="හ" + latin:keyHintLabel="6" + latin:additionalMoreKeys="6" /> + <!-- U+0DB8: "ම" SINHALA LETTER MAYANNA --> + <Key + latin:keySpec="ම" + latin:keyHintLabel="7" + latin:additionalMoreKeys="7" /> + <!-- U+0DC3: "ස" SINHALA LETTER DANTAJA SAYANNA --> + <Key + latin:keySpec="ස" + latin:keyHintLabel="8" + latin:additionalMoreKeys="8" /> + <!-- U+0DAF: "ද" SINHALA LETTER ALPAPRAANA DAYANNA + U+0DB3: "ඳ" SINHALA LETTER SANYAKA DAYANNA --> + <Key + latin:keySpec="ද" + latin:moreKeys="ඳ" + latin:keyHintLabel="9" + latin:additionalMoreKeys="9" /> + <!-- U+0DA0: "ච" SINHALA LETTER ALPAPRAANA CAYANNA --> + <Key + latin:keySpec="ච" + latin:keyHintLabel="0" + latin:additionalMoreKeys="0" /> + <!-- U+0DA4: "ඤ" SINHALA LETTER TAALUJA NAASIKYAYA + U+0DF4: "෴" SINHALA PUNCTUATION KUNDDALIYA --> + <Key + latin:keySpec="ඤ" + latin:moreKeys="෴" /> + </default> + </switch> +</merge> diff --git a/java/res/xml/rowkeys_sinhala2.xml b/java/res/xml/rowkeys_sinhala2.xml new file mode 100644 index 000000000..92c1e0892 --- /dev/null +++ b/java/res/xml/rowkeys_sinhala2.xml @@ -0,0 +1,72 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright 2014, 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. +*/ +--> + +<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"> + <switch> + <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"> + <!-- U+0DDF: "ෟ" SINHALA VOWEL SIGN GAYANUKITTA --> + <Key latin:keySpec="ෟ" /> + <!-- U+0DD3: "ී" SINHALA VOWEL SIGN DIGA IS-PILLA --> + <Key latin:keySpec="ී" /> + <!-- U+0DD8: "ෘ" SINHALA VOWEL SIGN GAETTA-PILLA --> + <Key latin:keySpec="ෘ" /> + <!-- U+0DC6: "ෆ" SINHALA LETTER FAYANNA --> + <Key latin:keySpec="ෆ" /> + <!-- U+0DA8: "ඨ" SINHALA LETTER MAHAAPRAANA TTAYANNA --> + <Key latin:keySpec="ඨ" /> + <!-- U+0DCA/U+200D/U+0DBA: "්ය" SINHALA SIGN AL-LAKUNA/ZERO WIDTH JOINER/SINHALA LETTER YAYANNA --> + <Key latin:keySpec="්‍ය" /> + <!-- U+0DC5/U+0DD4: "ළු" SINHALA LETTER MUURDHAJA LAYANNA/SINHALA VOWEL SIGN KETTI PAA-PILLA --> + <Key latin:keySpec="ළු" /> + <!-- U+0DAB: "ණ" SINHALA LETTER MUURDHAJA NAYANNA --> + <Key latin:keySpec="ණ" /> + <!-- U+0D9B: "ඛ" SINHALA LETTER MAHAAPRAANA KAYANNA --> + <Key latin:keySpec="ඛ" /> + <!-- U+0DAE: "ථ" SINHALA LETTER MAHAAPRAANA TAYANNA --> + <Key latin:keySpec="ථ" /> + <!-- U+0DCA/U+200D/U+0DBB: "්ර" SINHALA SIGN AL-LAKUNA/ZERO WIDTH JOINER/SINHALA LETTER RAYANNA --> + <Key latin:keySpec="්‍ර" /> + </case> + <default> + <!-- U+0DCA: "්" SINHALA SIGN AL-LAKUNA --> + <Key latin:keySpec="්" /> + <!-- U+0DD2: "ි" SINHALA VOWEL SIGN KETTI IS-PILLA --> + <Key latin:keySpec="ි" /> + <!-- U+0DCF: "ා" SINHALA VOWEL SIGN AELA-PILLA --> + <Key latin:keySpec="ා" /> + <!-- U+0DD9: "ෙ" SINHALA VOWEL SIGN KOMBUVA --> + <Key latin:keySpec="ෙ" /> + <!-- U+0DA7: "ට" SINHALA LETTER ALPAPRAANA TTAYANNA --> + <Key latin:keySpec="ට" /> + <!-- U+0DBA: "ය" SINHALA LETTER YAYANNA --> + <Key latin:keySpec="ය" /> + <!-- U+0DC0: "ව" SINHALA LETTER VAYANNA --> + <Key latin:keySpec="ව" /> + <!-- U+0DB1: "න" SINHALA LETTER DANTAJA NAYANNA --> + <Key latin:keySpec="න" /> + <!-- U+0D9A: "ක" SINHALA LETTER ALPAPRAANA KAYANNA --> + <Key latin:keySpec="ක" /> + <!-- U+0DAD: "ත" SINHALA LETTER ALPAPRAANA TAYANNA --> + <Key latin:keySpec="ත" /> + <!-- U+0D8F: "ඏ" SINHALA LETTER ILUYANNA --> + <Key latin:keySpec="ඏ" /> + </default> + </switch> +</merge> diff --git a/java/res/xml/rowkeys_sinhala3.xml b/java/res/xml/rowkeys_sinhala3.xml new file mode 100644 index 000000000..872787517 --- /dev/null +++ b/java/res/xml/rowkeys_sinhala3.xml @@ -0,0 +1,76 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright 2014, 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. +*/ +--> + +<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"> + <switch> + <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"> + <!-- U+0D9E: "ඞ" SINHALA LETTER KANTAJA NAASIKYAYA --> + <Key latin:keySpec="ඞ" /> + <!-- U+0DA3: "ඣ" SINHALA LETTER MAHAAPRAANA JAYANNA --> + <Key latin:keySpec="ඣ" /> + <!-- U+0DAA: "ඪ" SINHALA LETTER MAHAAPRAANA DDAYANNA --> + <Key latin:keySpec="ඪ" /> + <!-- U+0D8A: "ඊ" SINHALA LETTER IIYANNA --> + <Key latin:keySpec="ඊ" /> + <!-- U+0DB7: "භ" SINHALA LETTER MAHAAPRAANA BAYANNA --> + <Key latin:keySpec="භ" /> + <!-- U+0DB5: "ඵ" SINHALA LETTER MAHAAPRAANA PAYANNA --> + <Key latin:keySpec="ඵ" /> + <!-- U+0DC5: "ළ" SINHALA LETTER MUURDHAJA LAYANNA --> + <Key latin:keySpec="ළ" /> + <!-- U+0D9D: "ඝ" SINHALA LETTER MAHAAPRAANA GAYANNA --> + <Key latin:keySpec="ඝ" /> + <!-- U+0DBB/U+0DCA/U+200D: "ර්" SINHALA LETTER RAYANNA/SINHALA SIGN AL-LAKUNA/ZERO WIDTH JOINER --> + <Key latin:keySpec="ර්‍" /> + </case> + <default> + <!-- U+0D82: "ං" SINHALA SIGN ANUSVARAYA + U+0D83: "ඃ" SINHALA SIGN VISARGAYA --> + <Key + latin:keySpec="ං" + latin:moreKeys="ඃ" /> + <!-- U+0DA2: "ජ" SINHALA LETTER ALPAPRAANA JAYANNA + U+0DA6: "ඦ" SINHALA LETTER SANYAKA JAYANNA --> + <Key + latin:keySpec="ජ" + latin:moreKeys="ඦ" /> + <!-- U+0DA9: "ඩ" SINHALA LETTER ALPAPRAANA DDAYANNA + U+0DAC: "ඬ" SINHALA LETTER SANYAKA DDAYANNA --> + <Key + latin:keySpec="ඩ" + latin:moreKeys="ඬ" /> + <!-- U+0D89: "ඉ" SINHALA LETTER IYANNA --> + <Key latin:keySpec="ඉ" /> + <!-- U+0DB6: "බ" SINHALA LETTER ALPAPRAANA BAYANNA --> + <Key latin:keySpec="බ" /> + <!-- U+0DB4: "ප" SINHALA LETTER ALPAPRAANA PAYANNA --> + <Key latin:keySpec="ප" /> + <!-- U+0DBD: "ල" SINHALA LETTER DANTAJA LAYANNA --> + <Key latin:keySpec="ල" /> + <!-- U+0D9C: "ග" SINHALA LETTER ALPAPRAANA GAYANNA + U+0D9F: "ඟ" SINHALA LETTER SANYAKA GAYANNA --> + <Key + latin:keySpec="ග" + latin:moreKeys="ඟ" /> + <!-- U+0DF3: "ෳ" SINHALA VOWEL SIGN DIGA GAYANUKITTA --> + <Key latin:keySpec="ෳ" /> + </default> + </switch> +</merge> diff --git a/java/res/xml/rowkeys_south_slavic1.xml b/java/res/xml/rowkeys_south_slavic1.xml index 6117d46f1..064f164e8 100644 --- a/java/res/xml/rowkeys_south_slavic1.xml +++ b/java/res/xml/rowkeys_south_slavic1.xml @@ -23,56 +23,56 @@ > <!-- U+0459: "љ" CYRILLIC SMALL LETTER LJE --> <Key - latin:keyLabel="љ" + latin:keySpec="љ" latin:keyHintLabel="1" latin:additionalMoreKeys="1" /> <!-- U+045A: "њ" CYRILLIC SMALL LETTER NJE --> <Key - latin:keyLabel="њ" + latin:keySpec="њ" latin:keyHintLabel="2" latin:additionalMoreKeys="2" /> <!-- U+0435: "е" CYRILLIC SMALL LETTER IE --> <Key - latin:keyLabel="е" + latin:keySpec="е" latin:keyHintLabel="3" latin:additionalMoreKeys="3" - latin:moreKeys="!text/more_keys_for_cyrillic_ie" /> + latin:moreKeys="!text/morekeys_cyrillic_ie" /> <!-- U+0440: "р" CYRILLIC SMALL LETTER ER --> <Key - latin:keyLabel="р" + latin:keySpec="р" latin:keyHintLabel="4" latin:additionalMoreKeys="4" /> <!-- U+0442: "т" CYRILLIC SMALL LETTER TE --> <Key - latin:keyLabel="т" + latin:keySpec="т" latin:keyHintLabel="5" latin:additionalMoreKeys="5" /> <Key - latin:keyLabel="!text/keylabel_for_south_slavic_row1_6" + latin:keySpec="!text/keyspec_south_slavic_row1_6" latin:keyHintLabel="6" latin:additionalMoreKeys="6" /> <!-- U+0443: "у" CYRILLIC SMALL LETTER U --> <Key - latin:keyLabel="у" + latin:keySpec="у" latin:keyHintLabel="7" latin:additionalMoreKeys="7" /> <!-- U+0438: "и" CYRILLIC SMALL LETTER I --> <Key - latin:keyLabel="и" + latin:keySpec="и" latin:keyHintLabel="8" latin:additionalMoreKeys="8" - latin:moreKeys="!text/more_keys_for_cyrillic_i" /> + latin:moreKeys="!text/morekeys_cyrillic_i" /> <!-- U+043E: "о" CYRILLIC SMALL LETTER O --> <Key - latin:keyLabel="о" + latin:keySpec="о" latin:keyHintLabel="9" latin:additionalMoreKeys="9" /> <!-- U+043F: "п" CYRILLIC SMALL LETTER PE --> <Key - latin:keyLabel="п" + latin:keySpec="п" latin:keyHintLabel="0" latin:additionalMoreKeys="0" /> <!-- U+0448: "ш" CYRILLIC SMALL LETTER SHA --> <Key - latin:keyLabel="ш" /> + latin:keySpec="ш" /> </merge> diff --git a/java/res/xml/rowkeys_south_slavic2.xml b/java/res/xml/rowkeys_south_slavic2.xml index 88e894053..3b98001b2 100644 --- a/java/res/xml/rowkeys_south_slavic2.xml +++ b/java/res/xml/rowkeys_south_slavic2.xml @@ -23,34 +23,34 @@ > <!-- U+0430: "а" CYRILLIC SMALL LETTER A --> <Key - latin:keyLabel="а" /> + latin:keySpec="а" /> <!-- U+0441: "с" CYRILLIC SMALL LETTER ES --> <Key - latin:keyLabel="с" /> + latin:keySpec="с" /> <!-- U+0434: "д" CYRILLIC SMALL LETTER DE --> <Key - latin:keyLabel="д" /> + latin:keySpec="д" /> <!-- U+0444: "ф" CYRILLIC SMALL LETTER EF --> <Key - latin:keyLabel="ф" /> + latin:keySpec="ф" /> <!-- U+0433: "г" CYRILLIC SMALL LETTER GHE --> <Key - latin:keyLabel="г" /> + latin:keySpec="г" /> <!-- U+0445: "х" CYRILLIC SMALL LETTER HA --> <Key - latin:keyLabel="х" /> + latin:keySpec="х" /> <!-- U+0458: "ј" CYRILLIC SMALL LETTER JE --> <Key - latin:keyLabel="ј" /> + latin:keySpec="ј" /> <!-- U+043A: "к" CYRILLIC SMALL LETTER KA --> <Key - latin:keyLabel="к" /> + latin:keySpec="к" /> <!-- U+043B: "л" CYRILLIC SMALL LETTER EL --> <Key - latin:keyLabel="л" /> + latin:keySpec="л" /> <!-- U+0447: "ч" CYRILLIC SMALL LETTER CHE --> <Key - latin:keyLabel="ч" /> + latin:keySpec="ч" /> <Key - latin:keyLabel="!text/keylabel_for_south_slavic_row2_11" /> + latin:keySpec="!text/keyspec_south_slavic_row2_11" /> </merge> diff --git a/java/res/xml/rowkeys_south_slavic3.xml b/java/res/xml/rowkeys_south_slavic3.xml index b01550911..31df9b96e 100644 --- a/java/res/xml/rowkeys_south_slavic3.xml +++ b/java/res/xml/rowkeys_south_slavic3.xml @@ -22,28 +22,28 @@ xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" > <Key - latin:keyLabel="!text/keylabel_for_south_slavic_row3_1" /> + latin:keySpec="!text/keyspec_south_slavic_row3_1" /> <!-- U+045F: "џ" CYRILLIC SMALL LETTER DZHE --> <Key - latin:keyLabel="џ" /> + latin:keySpec="џ" /> <!-- U+0446: "ц" CYRILLIC SMALL LETTER TSE --> <Key - latin:keyLabel="ц" /> + latin:keySpec="ц" /> <!-- U+0432: "в" CYRILLIC SMALL LETTER VE --> <Key - latin:keyLabel="в" /> + latin:keySpec="в" /> <!-- U+0431: "б" CYRILLIC SMALL LETTER BE --> <Key - latin:keyLabel="б" /> + latin:keySpec="б" /> <!-- U+043D: "н" CYRILLIC SMALL LETTER EN --> <Key - latin:keyLabel="н" /> + latin:keySpec="н" /> <!-- U+043C: "м" CYRILLIC SMALL LETTER EM --> <Key - latin:keyLabel="м" /> + latin:keySpec="м" /> <Key - latin:keyLabel="!text/keylabel_for_south_slavic_row3_8" /> + latin:keySpec="!text/keyspec_south_slavic_row3_8" /> <!-- U+0436: "ж" CYRILLIC SMALL LETTER ZHE --> <Key - latin:keyLabel="ж" /> + latin:keySpec="ж" /> </merge> diff --git a/java/res/xml/rowkeys_spanish2.xml b/java/res/xml/rowkeys_spanish2.xml index 335dff33c..5c7f67cdd 100644 --- a/java/res/xml/rowkeys_spanish2.xml +++ b/java/res/xml/rowkeys_spanish2.xml @@ -25,5 +25,5 @@ latin:keyboardLayout="@xml/rowkeys_qwerty2" /> <!-- U+00F1: "ñ" LATIN SMALL LETTER N WITH TILDE --> <Key - latin:keyLabel="!text/keylabel_for_spanish_row2_10" /> + latin:keySpec="!text/keyspec_spanish_row2_10" /> </merge> diff --git a/java/res/xml/key_azerty3_right.xml b/java/res/xml/rowkeys_swiss1.xml index 65789ea69..2b82c81bd 100644 --- a/java/res/xml/key_azerty3_right.xml +++ b/java/res/xml/rowkeys_swiss1.xml @@ -2,7 +2,7 @@ <!-- /* ** -** Copyright 2012, The Android Open Source Project +** Copyright 2013, 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. @@ -21,17 +21,9 @@ <merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" > - <switch> - <case - latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLockShifted" - > - <Key - latin:keyLabel="\?" /> - </case> - <default> - <Key - latin:keyLabel="\'" - latin:moreKeys="!text/more_keys_for_single_quote" /> - </default> - </switch> + <include + latin:keyboardLayout="@xml/rowkeys_qwertz1" /> + <Key + latin:keySpec="!text/keyspec_swiss_row1_11" + latin:moreKeys="!text/morekeys_swiss_row1_11" /> </merge> diff --git a/java/res/xml/key_space_3kw.xml b/java/res/xml/rowkeys_swiss2.xml index 20ec882df..770911179 100644 --- a/java/res/xml/key_space_3kw.xml +++ b/java/res/xml/rowkeys_swiss2.xml @@ -21,21 +21,12 @@ <merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" > - <switch> - <case - latin:languageSwitchKeyEnabled="true" - > - <Key - latin:keyStyle="languageSwitchKeyStyle" /> - <Key - latin:keyStyle="spaceKeyStyle" - latin:keyWidth="20%p" /> - </case> - <!-- languageSwitchKeyEnabled="false" --> - <default> - <Key - latin:keyStyle="spaceKeyStyle" - latin:keyWidth="30%p" /> - </default> - </switch> + <include + latin:keyboardLayout="@xml/rowkeys_qwerty2" /> + <Key + latin:keySpec="!text/keyspec_swiss_row2_10" + latin:moreKeys="!text/morekeys_swiss_row2_10" /> + <Key + latin:keySpec="!text/keyspec_swiss_row2_11" + latin:moreKeys="!text/morekeys_swiss_row2_11" /> </merge> diff --git a/java/res/xml/rowkeys_symbols1.xml b/java/res/xml/rowkeys_symbols1.xml index 6e2f92dd9..daf9087b2 100644 --- a/java/res/xml/rowkeys_symbols1.xml +++ b/java/res/xml/rowkeys_symbols1.xml @@ -22,43 +22,43 @@ xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" > <Key - latin:keyLabel="!text/keylabel_for_symbols_1" - latin:additionalMoreKeys="!text/additional_more_keys_for_symbols_1" - latin:moreKeys="!text/more_keys_for_symbols_1" /> + latin:keySpec="!text/keyspec_symbols_1" + latin:additionalMoreKeys="!text/additional_morekeys_symbols_1" + latin:moreKeys="!text/morekeys_symbols_1" /> <Key - latin:keyLabel="!text/keylabel_for_symbols_2" - latin:additionalMoreKeys="!text/additional_more_keys_for_symbols_2" - latin:moreKeys="!text/more_keys_for_symbols_2" /> + latin:keySpec="!text/keyspec_symbols_2" + latin:additionalMoreKeys="!text/additional_morekeys_symbols_2" + latin:moreKeys="!text/morekeys_symbols_2" /> <Key - latin:keyLabel="!text/keylabel_for_symbols_3" - latin:additionalMoreKeys="!text/additional_more_keys_for_symbols_3" - latin:moreKeys="!text/more_keys_for_symbols_3" /> + latin:keySpec="!text/keyspec_symbols_3" + latin:additionalMoreKeys="!text/additional_morekeys_symbols_3" + latin:moreKeys="!text/morekeys_symbols_3" /> <Key - latin:keyLabel="!text/keylabel_for_symbols_4" - latin:additionalMoreKeys="!text/additional_more_keys_for_symbols_4" - latin:moreKeys="!text/more_keys_for_symbols_4" /> + latin:keySpec="!text/keyspec_symbols_4" + latin:additionalMoreKeys="!text/additional_morekeys_symbols_4" + latin:moreKeys="!text/morekeys_symbols_4" /> <Key - latin:keyLabel="!text/keylabel_for_symbols_5" - latin:additionalMoreKeys="!text/additional_more_keys_for_symbols_5" - latin:moreKeys="!text/more_keys_for_symbols_5" /> + latin:keySpec="!text/keyspec_symbols_5" + latin:additionalMoreKeys="!text/additional_morekeys_symbols_5" + latin:moreKeys="!text/morekeys_symbols_5" /> <Key - latin:keyLabel="!text/keylabel_for_symbols_6" - latin:additionalMoreKeys="!text/additional_more_keys_for_symbols_6" - latin:moreKeys="!text/more_keys_for_symbols_6" /> + latin:keySpec="!text/keyspec_symbols_6" + latin:additionalMoreKeys="!text/additional_morekeys_symbols_6" + latin:moreKeys="!text/morekeys_symbols_6" /> <Key - latin:keyLabel="!text/keylabel_for_symbols_7" - latin:additionalMoreKeys="!text/additional_more_keys_for_symbols_7" - latin:moreKeys="!text/more_keys_for_symbols_7" /> + latin:keySpec="!text/keyspec_symbols_7" + latin:additionalMoreKeys="!text/additional_morekeys_symbols_7" + latin:moreKeys="!text/morekeys_symbols_7" /> <Key - latin:keyLabel="!text/keylabel_for_symbols_8" - latin:additionalMoreKeys="!text/additional_more_keys_for_symbols_8" - latin:moreKeys="!text/more_keys_for_symbols_8" /> + latin:keySpec="!text/keyspec_symbols_8" + latin:additionalMoreKeys="!text/additional_morekeys_symbols_8" + latin:moreKeys="!text/morekeys_symbols_8" /> <Key - latin:keyLabel="!text/keylabel_for_symbols_9" - latin:additionalMoreKeys="!text/additional_more_keys_for_symbols_9" - latin:moreKeys="!text/more_keys_for_symbols_9" /> + latin:keySpec="!text/keyspec_symbols_9" + latin:additionalMoreKeys="!text/additional_morekeys_symbols_9" + latin:moreKeys="!text/morekeys_symbols_9" /> <Key - latin:keyLabel="!text/keylabel_for_symbols_0" - latin:additionalMoreKeys="!text/additional_more_keys_for_symbols_0" - latin:moreKeys="!text/more_keys_for_symbols_0" /> + latin:keySpec="!text/keyspec_symbols_0" + latin:additionalMoreKeys="!text/additional_morekeys_symbols_0" + latin:moreKeys="!text/morekeys_symbols_0" /> </merge> diff --git a/java/res/xml/rowkeys_symbols2.xml b/java/res/xml/rowkeys_symbols2.xml index 76cbf6259..811915825 100644 --- a/java/res/xml/rowkeys_symbols2.xml +++ b/java/res/xml/rowkeys_symbols2.xml @@ -28,37 +28,37 @@ <!-- U+066C: "٬" ARABIC THOUSANDS SEPARATOR U+066B: "٫" ARABIC DECIMAL SEPARATOR --> <Key - latin:keyLabel="٬" + latin:keySpec="٬" latin:keyHintLabel="\@" latin:moreKeys="\@" /> <Key - latin:keyLabel="٫" + latin:keySpec="٫" latin:keyHintLabel="\#" latin:moreKeys="\#" /> </case> <default> <Key - latin:keyLabel="\@" /> + latin:keySpec="\@" /> <Key - latin:keyLabel="\#" /> + latin:keySpec="\#" /> </default> </switch> <Key latin:keyStyle="currencyKeyStyle" /> <Key - latin:keyLabel="!text/keylabel_for_symbols_percent" - latin:moreKeys="!text/more_keys_for_symbols_percent" /> + latin:keySpec="!text/keyspec_symbols_percent" + latin:moreKeys="!text/morekeys_symbols_percent" /> <Key - latin:keyLabel="&" /> + latin:keySpec="&" /> <!-- U+2013: "–" EN DASH U+2014: "—" EM DASH U+00B7: "·" MIDDLE DOT --> <Key - latin:keyLabel="-" + latin:keySpec="-" latin:moreKeys="_,–,—,·" /> <Key - latin:keyLabel="+" - latin:moreKeys="!text/more_keys_for_plus" /> + latin:keySpec="+" + latin:moreKeys="!text/morekeys_plus" /> <include latin:keyboardLayout="@xml/keys_parentheses" /> </merge> diff --git a/java/res/xml/rowkeys_symbols3.xml b/java/res/xml/rowkeys_symbols3.xml index 074078cb6..8093081f8 100644 --- a/java/res/xml/rowkeys_symbols3.xml +++ b/java/res/xml/rowkeys_symbols3.xml @@ -22,41 +22,37 @@ xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" > <Key - latin:keyLabel="*" - latin:moreKeys="!text/more_keys_for_star" /> + latin:keySpec="*" + latin:moreKeys="!text/morekeys_star" /> <switch> <case latin:languageCode="fa" > - <!-- U+00AB: "«" LEFT-POINTING DOUBLE ANGLE QUOTATION MARK - U+00BB: "»" RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK --> <Key - latin:keyLabel="«" - latin:code="0x00BB" - latin:moreKeys="!text/more_keys_for_double_quote" /> + latin:keySpec="!text/keyspec_left_double_angle_quote" + latin:moreKeys="!text/morekeys_double_quote" /> <Key - latin:keyLabel="»" - latin:code="0x00AB" - latin:moreKeys="!text/more_keys_for_single_quote" /> + latin:keySpec="!text/keyspec_right_double_angle_quote" + latin:moreKeys="!text/morekeys_single_quote" /> </case> <default> <Key - latin:keyLabel=""" - latin:moreKeys="!text/more_keys_for_double_quote" /> + latin:keySpec=""" + latin:moreKeys="!text/morekeys_double_quote" /> <Key - latin:keyLabel="\'" - latin:moreKeys="!text/more_keys_for_single_quote" /> + latin:keySpec="\'" + latin:moreKeys="!text/morekeys_single_quote" /> </default> </switch> <Key - latin:keyLabel=":" /> + latin:keySpec=":" /> <Key - latin:keyLabel="!text/keylabel_for_symbols_semicolon" - latin:moreKeys="!text/more_keys_for_symbols_semicolon" /> + latin:keySpec="!text/keyspec_symbols_semicolon" + latin:moreKeys="!text/morekeys_symbols_semicolon" /> <Key - latin:keyLabel="!" - latin:moreKeys="!text/more_keys_for_symbols_exclamation" /> + latin:keySpec="!" + latin:moreKeys="!text/morekeys_exclamation" /> <Key - latin:keyLabel="!text/keylabel_for_symbols_question" - latin:moreKeys="!text/more_keys_for_symbols_question" /> + latin:keySpec="!text/keyspec_symbols_question" + latin:moreKeys="!text/morekeys_question" /> </merge> diff --git a/java/res/xml/rowkeys_symbols_shift1.xml b/java/res/xml/rowkeys_symbols_shift1.xml index 6013493e5..f232a7de2 100644 --- a/java/res/xml/rowkeys_symbols_shift1.xml +++ b/java/res/xml/rowkeys_symbols_shift1.xml @@ -22,35 +22,35 @@ xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" > <Key - latin:keyLabel="~" /> + latin:keySpec="~" /> <Key - latin:keyLabel="`" /> + latin:keySpec="`" /> <Key - latin:keyLabel="|" /> + latin:keySpec="|" /> <!-- U+2022: "•" BULLET --> <Key - latin:keyLabel="•" - latin:moreKeys="!text/more_keys_for_bullet" /> + latin:keySpec="•" + latin:moreKeys="!text/morekeys_bullet" /> <!-- U+221A: "√" SQUARE ROOT --> <Key - latin:keyLabel="√" /> - <!-- U+03A0: "Π" GREEK CAPITAL LETTER PI - U+03C0: "π" GREEK SMALL LETTER PI --> + latin:keySpec="√" /> + <!-- U+03C0: "π" GREEK SMALL LETTER PI + U+03A0: "Π" GREEK CAPITAL LETTER PI --> <Key - latin:keyLabel="Π" - latin:moreKeys="π" /> + latin:keySpec="π" + latin:moreKeys="Π" /> <!-- U+00F7: "÷" DIVISION SIGN --> <Key - latin:keyLabel="÷" /> + latin:keySpec="÷" /> <!-- U+00D7: "×" MULTIPLICATION SIGN --> <Key - latin:keyLabel="×" /> + latin:keySpec="×" /> <!-- U+00B6: "¶" PILCROW SIGN U+00A7: "§" SECTION SIGN --> <Key - latin:keyLabel="¶" + latin:keySpec="¶" latin:moreKeys="§" /> <!-- U+2206: "∆" INCREMENT --> <Key - latin:keyLabel="∆" /> + latin:keySpec="∆" /> </merge> diff --git a/java/res/xml/rowkeys_symbols_shift2.xml b/java/res/xml/rowkeys_symbols_shift2.xml index 36f92143f..39a58030b 100644 --- a/java/res/xml/rowkeys_symbols_shift2.xml +++ b/java/res/xml/rowkeys_symbols_shift2.xml @@ -34,19 +34,19 @@ U+2190: "←" LEFTWARDS ARROW U+2192: "→" RIGHTWARDS ARROW --> <Key - latin:keyLabel="^" + latin:keySpec="^" latin:moreKeys="↑,↓,←,→" /> <!-- U+00B0: "°" DEGREE SIGN U+2032: "′" PRIME U+2033: "″" DOUBLE PRIME --> <Key - latin:keyLabel="°" + latin:keySpec="°" latin:moreKeys="′,″" /> <!-- U+2260: "≠" NOT EQUAL TO U+2248: "≈" ALMOST EQUAL TO U+221E: "∞" INFINITY --> <Key - latin:keyLabel="=" + latin:keySpec="=" latin:moreKeys="≠,≈,∞" /> <include latin:keyboardLayout="@xml/keys_curly_brackets" /> diff --git a/java/res/xml/rowkeys_symbols_shift3.xml b/java/res/xml/rowkeys_symbols_shift3.xml index 5fe1c7450..92ff97bb0 100644 --- a/java/res/xml/rowkeys_symbols_shift3.xml +++ b/java/res/xml/rowkeys_symbols_shift3.xml @@ -22,19 +22,19 @@ xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" > <Key - latin:keyLabel="\\" /> + latin:keySpec="\\" /> <!-- U+00A9: "©" COPYRIGHT SIGN --> <Key - latin:keyLabel="©" /> + latin:keySpec="©" /> <!-- U+00AE: "®" REGISTERED SIGN --> <Key - latin:keyLabel="®" /> + latin:keySpec="®" /> <!-- U+2122: "™" TRADE MARK SIGN --> <Key - latin:keyLabel="™" /> + latin:keySpec="™" /> <!-- U+2105: "℅" CARE OF --> <Key - latin:keyLabel="℅" /> + latin:keySpec="℅" /> <include latin:keyboardLayout="@xml/keys_square_brackets" /> </merge> diff --git a/java/res/xml/rowkeys_thai1.xml b/java/res/xml/rowkeys_thai1.xml index cd536656f..864bca876 100644 --- a/java/res/xml/rowkeys_thai1.xml +++ b/java/res/xml/rowkeys_thai1.xml @@ -18,153 +18,120 @@ */ --> -<merge - xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" -> +<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"> <switch> - <case - latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted" - > + <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"> <Key - latin:keyLabel="+" /> + latin:keySpec="+" + latin:keyLabelFlags="fontDefault" /> <!-- U+0E51: "๑" THAI DIGIT ONE --> - <Key - latin:keyLabel="๑" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="๑" /> <!-- U+0E52: "๒" THAI DIGIT TWO --> - <Key - latin:keyLabel="๒" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="๒" /> <!-- U+0E53: "๓" THAI DIGIT THREE --> - <Key - latin:keyLabel="๓" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="๓" /> <!-- U+0E54: "๔" THAI DIGIT FOUR --> - <Key - latin:keyLabel="๔" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="๔" /> <!-- U+0020: " " SPACE U+0E39: " ู" THAI CHARACTER SARA UU --> <!-- Note: The space character is needed as a preceding letter to draw some Thai composing characters correctly. --> <Key - latin:keyLabel=" ู" - latin:code="0x0E39" - latin:keyLabelFlags="fontNormal|followKeyLetterRatio" /> + latin:keySpec=" ู|ู" + latin:keyLabelFlags="followKeyLetterRatio" /> <!-- U+0E3F: "฿" THAI CURRENCY SYMBOL BAHT --> - <Key - latin:keyLabel="฿" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="฿" /> <!-- U+0E55: "๕" THAI DIGIT FIVE --> - <Key - latin:keyLabel="๕" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="๕" /> <!-- U+0E56: "๖" THAI DIGIT SIX --> - <Key - latin:keyLabel="๖" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="๖" /> <!-- U+0E57: "๗" THAI DIGIT SEVEN --> - <Key - latin:keyLabel="๗" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="๗" /> <!-- U+0E58: "๘" THAI DIGIT EIGHT --> - <Key - latin:keyLabel="๘" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="๘" /> <!-- U+0E59: "๙" THAI DIGIT NINE --> - <Key - latin:keyLabel="๙" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="๙" /> </case> <default> <!-- U+0E45: "ๅ" THAI CHARACTER LAKKHANGYAO --> - <Key - latin:keyLabel="ๅ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ๅ" /> <!-- U+0E51: "๑" THAI DIGIT ONE --> <Key + latin:keySpec="/" latin:keyHintLabel="1" latin:additionalMoreKeys="1" latin:moreKeys="๑" - latin:keyLabel="/" /> + latin:keyLabelFlags="fontDefault" /> <!-- U+0E52: "๒" THAI DIGIT TWO --> <Key + latin:keySpec="_" latin:keyHintLabel="2" latin:additionalMoreKeys="2" latin:moreKeys="๒" - latin:keyLabel="_" /> + latin:keyLabelFlags="fontDefault" /> <!-- U+0E20: "ภ" THAI CHARACTER PHO SAMPHAO U+0E53: "๓" THAI DIGIT THREE --> <Key - latin:keyLabel="ภ" + latin:keySpec="ภ" latin:keyHintLabel="3" latin:additionalMoreKeys="3" - latin:moreKeys="๓" - latin:keyLabelFlags="fontNormal" /> + latin:moreKeys="๓" /> <!-- U+0E16: "ถ" THAI CHARACTER THO THUNG U+0E54: "๔" THAI DIGIT FOUR --> <Key - latin:keyLabel="ถ" + latin:keySpec="ถ" latin:keyHintLabel="4" latin:additionalMoreKeys="4" - latin:moreKeys="๔" - latin:keyLabelFlags="fontNormal" /> + latin:moreKeys="๔" /> <!-- U+0020: " " SPACE U+0E38: " ุ" THAI CHARACTER SARA U --> <!-- Note: The space character is needed as a preceding letter to draw some Thai composing characters correctly. --> <Key - latin:keyLabel=" ุ" - latin:code="0x0E38" - latin:keyLabelFlags="fontNormal|followKeyLetterRatio" /> + latin:keySpec=" ุ|ุ" + latin:keyLabelFlags="followKeyLetterRatio" /> <!-- U+0020: " " SPACE U+0E36: " ึ" THAI CHARACTER SARA UE --> <!-- Note: The space character is needed as a preceding letter to draw some Thai composing characters correctly. --> <Key - latin:keyLabel=" ึ" - latin:code="0x0E36" - latin:keyLabelFlags="fontNormal|followKeyLetterRatio" /> + latin:keySpec=" ึ|ึ" + latin:keyLabelFlags="followKeyLetterRatio" /> <!-- U+0E04: "ค" THAI CHARACTER KHO KHWAI U+0E55: "๕" THAI DIGIT FIVE --> <Key - latin:keyLabel="ค" + latin:keySpec="ค" latin:keyHintLabel="5" latin:additionalMoreKeys="5" - latin:moreKeys="๕" - latin:keyLabelFlags="fontNormal" /> + latin:moreKeys="๕" /> <!-- U+0E15: "ต" THAI CHARACTER TO TAO U+0E56: "๖" THAI DIGIT SIX --> <Key - latin:keyLabel="ต" + latin:keySpec="ต" latin:keyHintLabel="6" latin:additionalMoreKeys="6" - latin:moreKeys="๖" - latin:keyLabelFlags="fontNormal" /> + latin:moreKeys="๖" /> <!-- U+0E08: "จ" THAI CHARACTER CHO CHAN U+0E57: "๗" THAI DIGIT SEVEN --> <Key - latin:keyLabel="จ" + latin:keySpec="จ" latin:keyHintLabel="7" latin:additionalMoreKeys="7" - latin:moreKeys="๗" - latin:keyLabelFlags="fontNormal" /> + latin:moreKeys="๗" /> <!-- U+0E02: "ข" THAI CHARACTER KHO KHAI U+0E58: "๘" THAI DIGIT EIGHT --> <Key - latin:keyLabel="ข" + latin:keySpec="ข" latin:keyHintLabel="8" latin:additionalMoreKeys="8" - latin:moreKeys="๘" - latin:keyLabelFlags="fontNormal" /> + latin:moreKeys="๘" /> <!-- U+0E0A: "ช" THAI CHARACTER CHO CHANG U+0E59: "๙" THAI DIGIT NINE --> <Key - latin:keyLabel="ช" + latin:keySpec="ช" latin:keyHintLabel="9" latin:additionalMoreKeys="9" - latin:moreKeys="๙" - latin:keyLabelFlags="fontNormal" /> + latin:moreKeys="๙" /> </default> </switch> </merge> diff --git a/java/res/xml/rowkeys_thai2.xml b/java/res/xml/rowkeys_thai2.xml index 4bcbbbf8d..f43d31fff 100644 --- a/java/res/xml/rowkeys_thai2.xml +++ b/java/res/xml/rowkeys_thai2.xml @@ -18,127 +18,86 @@ */ --> -<merge - xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" -> +<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"> <switch> - <case - latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted" - > + <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"> <!-- U+0E50: "๐" THAI DIGIT ZERO --> + <Key latin:keySpec="๐" /> <Key - latin:keyLabel="๐" - latin:keyLabelFlags="fontNormal" /> - <Key - latin:keyLabel=""" /> + latin:keySpec=""" + latin:keyLabelFlags="fontDefault" /> <!-- U+0E0E: "ฎ" THAI CHARACTER DO CHADA --> - <Key - latin:keyLabel="ฎ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ฎ" /> <!-- U+0E11: "ฑ" THAI CHARACTER THO NANGMONTHO --> - <Key - latin:keyLabel="ฑ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ฑ" /> <!-- U+0E18: "ธ" THAI CHARACTER THO THONG --> - <Key - latin:keyLabel="ธ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ธ" /> <!-- U+0020: " " SPACE U+0E4D: " ํ" THAI CHARACTER THANTHAKHAT --> <!-- Note: The space character is needed as a preceding letter to draw some Thai composing characters correctly. --> <Key - latin:keyLabel=" ํ" - latin:code="0x0E4D" - latin:keyLabelFlags="fontNormal|followKeyLetterRatio" /> + latin:keySpec=" ํ|ํ" + latin:keyLabelFlags="followKeyLetterRatio" /> <!-- U+0020: " " SPACE U+0E4A: " ๊" THAI CHARACTER MAI TRI --> <!-- Note: The space character is needed as a preceding letter to draw some Thai composing characters correctly. --> <Key - latin:keyLabel=" ๊" - latin:code="0x0E4A" - latin:keyLabelFlags="fontNormal|followKeyLetterRatio" /> + latin:keySpec=" ๊|๊" + latin:keyLabelFlags="followKeyLetterRatio" /> <!-- U+0E13: "ณ" THAI CHARACTER NO NEN --> - <Key - latin:keyLabel="ณ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ณ" /> <!-- U+0E2F: "ฯ" THAI CHARACTER PAIYANNOI --> - <Key - latin:keyLabel="ฯ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ฯ" /> <!-- U+0E0D: "ญ" THAI CHARACTER YO YING --> - <Key - latin:keyLabel="ญ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ญ" /> <!-- U+0E10: "ฐ" THAI CHARACTER THO THAN --> + <Key latin:keySpec="ฐ" /> <Key - latin:keyLabel="ฐ" - latin:keyLabelFlags="fontNormal" /> - <Key - latin:keyLabel="," /> + latin:keySpec="," + latin:keyLabelFlags="fontDefault" /> </case> <default> <!-- U+0E46: "ๆ" THAI CHARACTER MAIYAMOK U+0E50: "๐" THAI DIGIT ZERO --> <Key - latin:keyLabel="ๆ" + latin:keySpec="ๆ" latin:keyHintLabel="0" latin:additionalMoreKeys="0" - latin:moreKeys="๐" - latin:keyLabelFlags="fontNormal" /> + latin:moreKeys="๐" /> <!-- U+0E44: "ไ" THAI CHARACTER SARA AI MAIMALAI --> - <Key - latin:keyLabel="ไ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ไ" /> <!-- U+0E33: "ำ" THAI CHARACTER SARA AM --> - <Key - latin:keyLabel="ำ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ำ" /> <!-- U+0E1E: "พ" THAI CHARACTER PHO PHAN --> - <Key - latin:keyLabel="พ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="พ" /> <!-- U+0E30: "ะ" THAI CHARACTER SARA A --> - <Key - latin:keyLabel="ะ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ะ" /> <!-- U+0020: " " SPACE U+0E31: " ั" THAI CHARACTER MAI HAN-AKAT --> <!-- Note: The space character is needed as a preceding letter to draw some Thai composing characters correctly. --> <Key - latin:keyLabel=" ั" - latin:code="0x0E31" - latin:keyLabelFlags="fontNormal|followKeyLetterRatio" /> + latin:keySpec=" ั|ั" + latin:keyLabelFlags="followKeyLetterRatio" /> <!-- U+0020: " " SPACE U+0E35: " ี" HAI CHARACTER SARA II --> <!-- Note: The space character is needed as a preceding letter to draw some Thai composing characters correctly. --> <Key - latin:keyLabel=" ี" - latin:code="0x0E35" - latin:keyLabelFlags="fontNormal|followKeyLetterRatio" /> + latin:keySpec=" ี|ี" + latin:keyLabelFlags="followKeyLetterRatio" /> <!-- U+0E23: "ร" THAI CHARACTER RO RUA --> - <Key - latin:keyLabel="ร" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ร" /> <!-- U+0E19: "น" THAI CHARACTER NO NU --> - <Key - latin:keyLabel="น" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="น" /> <!-- U+0E22: "ย" THAI CHARACTER YO YAK --> - <Key - latin:keyLabel="ย" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ย" /> <!-- U+0E1A: "บ" THAI CHARACTER BO BAIMAI --> - <Key - latin:keyLabel="บ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="บ" /> <!-- U+0E25: "ล" THAI CHARACTER LO LING --> - <Key - latin:keyLabel="ล" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ล" /> </default> </switch> </merge> diff --git a/java/res/xml/rowkeys_thai3.xml b/java/res/xml/rowkeys_thai3.xml index 7b6e6372e..03959b9aa 100644 --- a/java/res/xml/rowkeys_thai3.xml +++ b/java/res/xml/rowkeys_thai3.xml @@ -18,117 +18,76 @@ */ --> -<merge - xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" -> +<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"> <switch> - <case - latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted" - > + <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"> <!-- U+0E24: "ฤ" THAI CHARACTER RU --> - <Key - latin:keyLabel="ฤ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ฤ" /> <!-- U+0E06: "ฆ" THAI CHARACTER KHO RAKHANG --> - <Key - latin:keyLabel="ฆ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ฆ" /> <!-- U+0E0F: "ฏ" THAI CHARACTER TO PATAK --> - <Key - latin:keyLabel="ฏ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ฏ" /> <!-- U+0E42: "โ" THAI CHARACTER SARA O --> - <Key - latin:keyLabel="โ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="โ" /> <!-- U+0E0C: "ฌ" THAI CHARACTER CHO CHOE --> - <Key - latin:keyLabel="ฌ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ฌ" /> <!-- U+0020: " " SPACE U+0E47: " ็" THAI CHARACTER MAITAIKHU --> <!-- Note: The space character is needed as a preceding letter to draw some Thai composing characters correctly. --> <Key - latin:keyLabel=" ็" - latin:code="0x0E47" - latin:keyLabelFlags="fontNormal|followKeyLetterRatio" /> + latin:keySpec=" ็|็" + latin:keyLabelFlags="followKeyLetterRatio" /> <!-- U+0020: " " SPACE U+0E4B: " ๋" THAI CHARACTER MAI CHATTAWA --> <!-- Note: The space character is needed as a preceding letter to draw some Thai composing characters correctly. --> <Key - latin:keyLabel=" ๋" - latin:code="0x0E4B" - latin:keyLabelFlags="fontNormal|followKeyLetterRatio" /> + latin:keySpec=" ๋|๋" + latin:keyLabelFlags="followKeyLetterRatio" /> <!-- U+0E29: "ษ" THAI CHARACTER SO RUSI --> - <Key - latin:keyLabel="ษ" - latin:keyLabelFlags="fontNormal" /> - <!-- U+0E28: "ศ" THAI CHARACTER SO SALA --> - <Key - latin:keyLabel="ศ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ษ" /> + <!-- U+0E28: "ศ" THAI CHARACTER SO SALA --> + <Key latin:keySpec="ศ" /> <!-- U+0E0B: "ซ" THAI CHARACTER SO SO --> + <Key latin:keySpec="ซ" /> <Key - latin:keyLabel="ซ" - latin:keyLabelFlags="fontNormal" /> - <Key - latin:keyLabel="." /> + latin:keySpec="." + latin:keyLabelFlags="fontDefault" /> </case> <default> <!-- U+0E1F: "ฟ" THAI CHARACTER FO FAN --> - <Key - latin:keyLabel="ฟ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ฟ" /> <!-- U+0E2B: "ห" THAI CHARACTER HO HIP --> - <Key - latin:keyLabel="ห" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ห" /> <!-- U+0E01: "ก" THAI CHARACTER KO KAI --> - <Key - latin:keyLabel="ก" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ก" /> <!-- U+0E14: "ด" THAI CHARACTER DO DEK --> - <Key - latin:keyLabel="ด" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ด" /> <!-- U+0E40: "เ" THAI CHARACTER SARA E --> - <Key - latin:keyLabel="เ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="เ" /> <!-- U+0020: " " SPACE U+0E49: " ้" THAI CHARACTER MAI THO --> <!-- Note: The space character is needed as a preceding letter to draw some Thai composing characters correctly. --> <Key - latin:keyLabel=" ้" - latin:code="0x0E49" - latin:keyLabelFlags="fontNormal|followKeyLetterRatio" /> + latin:keySpec=" ้|้" + latin:keyLabelFlags="followKeyLetterRatio" /> <!-- U+0020: " " SPACE U+0E48: " ่" THAI CHARACTER MAI EK --> <!-- Note: The space character is needed as a preceding letter to draw some Thai composing characters correctly. --> <Key - latin:keyLabel=" ่" - latin:code="0x0E48" - latin:keyLabelFlags="fontNormal|followKeyLetterRatio" /> + latin:keySpec=" ่|่" + latin:keyLabelFlags="followKeyLetterRatio" /> <!-- U+0E32: "า" THAI CHARACTER SARA AA --> - <Key - latin:keyLabel="า" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="า" /> <!-- U+0E2A: "ส" THAI CHARACTER SO SUA --> - <Key - latin:keyLabel="ส" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ส" /> <!-- U+0E27: "ว" THAI CHARACTER WO WAEN --> - <Key - latin:keyLabel="ว" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ว" /> <!-- U+0E07: "ง" THAI CHARACTER NGO NGU --> - <Key - latin:keyLabel="ง" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ง" /> </default> </switch> </merge> diff --git a/java/res/xml/rowkeys_thai4.xml b/java/res/xml/rowkeys_thai4.xml index 8a784242c..db665bed5 100644 --- a/java/res/xml/rowkeys_thai4.xml +++ b/java/res/xml/rowkeys_thai4.xml @@ -18,105 +18,74 @@ */ --> -<merge - xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" -> +<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"> <switch> - <case - latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted" - > + <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"> <Key - latin:keyLabel="(" /> + latin:keySpec="(" + latin:keyLabelFlags="fontDefault" /> <Key - latin:keyLabel=")" /> + latin:keySpec=")" + latin:keyLabelFlags="fontDefault" /> <!-- U+0E09: "ฉ" THAI CHARACTER CHO CHING --> - <Key - latin:keyLabel="ฉ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ฉ" /> <!-- U+0E2E: "ฮ" THAI CHARACTER HO NOKHUK --> - <Key - latin:keyLabel="ฮ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ฮ" /> <!-- U+0020: " " SPACE U+0E3A: " ฺ" THAI CHARACTER PHINTHU --> <!-- Note: The space character is needed as a preceding letter to draw some Thai composing characters correctly. --> <Key - latin:keyLabel=" ฺ" - latin:code="0x0E3A" - latin:keyLabelFlags="fontNormal|followKeyLetterRatio" /> + latin:keySpec=" ฺ|ฺ" + latin:keyLabelFlags="followKeyLetterRatio" /> <!-- U+0020: " " SPACE U+0E4C: " ์" THAI CHARACTER THANTHAKHAT --> <!-- Note: The space character is needed as a preceding letter to draw some Thai composing characters correctly. --> <Key - latin:keyLabel=" ์" - latin:code="0x0E4C" - latin:keyLabelFlags="fontNormal|followKeyLetterRatio" /> + latin:keySpec=" ์|์" + latin:keyLabelFlags="followKeyLetterRatio" /> <Key - latin:keyLabel="\?" /> + latin:keySpec="\?" + latin:keyLabelFlags="fontDefault" /> <!-- U+0E12: "ฒ" THAI CHARACTER THO PHUTHAO --> - <Key - latin:keyLabel="ฒ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ฒ" /> <!-- U+0E2C: "ฬ" THAI CHARACTER LO CHULA --> - <Key - latin:keyLabel="ฬ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ฬ" /> <!-- U+0E26: "ฦ" THAI CHARACTER LU --> - <Key - latin:keyLabel="ฦ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ฦ" /> </case> <default> <!-- U+0E1C: "ผ" THAI CHARACTER PHO PHUNG --> - <Key - latin:keyLabel="ผ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ผ" /> <!-- U+0E1B: "ป" THAI CHARACTER PO PLA --> - <Key - latin:keyLabel="ป" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ป" /> <!-- U+0E41: "แ" THAI CHARACTER SARA AE --> - <Key - latin:keyLabel="แ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="แ" /> <!-- U+0E2D: "อ" THAI CHARACTER O ANG --> - <Key - latin:keyLabel="อ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="อ" /> <!-- U+0020: " " SPACE U+0E34: " ิ" THAI CHARACTER SARA I --> <!-- Note: The space character is needed as a preceding letter to draw some Thai composing characters correctly. --> <Key - latin:keyLabel=" ิ" - latin:code="0x0E34" - latin:keyLabelFlags="fontNormal|followKeyLetterRatio" /> + latin:keySpec=" ิ|ิ" + latin:keyLabelFlags="followKeyLetterRatio" /> <!-- U+0020: " " SPACE U+0E37: " ื" THAI CHARACTER SARA UEE --> <!-- Note: The space character is needed as a preceding letter to draw some Thai composing characters correctly. --> <Key - latin:keyLabel=" ื" - latin:code="0x0E37" - latin:keyLabelFlags="fontNormal|followKeyLetterRatio" /> + latin:keySpec=" ื|ื" + latin:keyLabelFlags="followKeyLetterRatio" /> <!-- U+0E17: "ท" THAI CHARACTER THO THAHAN --> - <Key - latin:keyLabel="ท" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ท" /> <!-- U+0E21: "ม" THAI CHARACTER MO MA --> - <Key - latin:keyLabel="ม" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ม" /> <!-- U+0E43: "ใ" THAI CHARACTER SARA AI MAIMUAN --> - <Key - latin:keyLabel="ใ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ใ" /> <!-- U+0E1D: "ฝ" THAI CHARACTER FO FA --> - <Key - latin:keyLabel="ฝ" - latin:keyLabelFlags="fontNormal" /> + <Key latin:keySpec="ฝ" /> </default> </switch> </merge> diff --git a/java/res/xml/rows_arabic.xml b/java/res/xml/rows_arabic.xml index 798c23e81..3f765f347 100644 --- a/java/res/xml/rows_arabic.xml +++ b/java/res/xml/rows_arabic.xml @@ -18,32 +18,28 @@ */ --> -<merge - xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" -> - <include - latin:keyboardLayout="@xml/key_styles_common" /> +<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"> + <include latin:keyboardLayout="@xml/key_styles_common" /> <Row latin:keyWidth="9.091%p" + latin:keyLabelFlags="fontNormal" > - <include - latin:keyboardLayout="@xml/rowkeys_arabic1" /> + <include latin:keyboardLayout="@xml/rowkeys_arabic1" /> </Row> <Row latin:keyWidth="9.091%p" + latin:keyLabelFlags="fontNormal" > - <include - latin:keyboardLayout="@xml/rowkeys_arabic2" /> + <include latin:keyboardLayout="@xml/rowkeys_arabic2" /> </Row> <Row latin:keyWidth="9.091%p" + latin:keyLabelFlags="fontNormal" > - <include - latin:keyboardLayout="@xml/rowkeys_arabic3" /> + <include latin:keyboardLayout="@xml/rowkeys_arabic3" /> <Key latin:keyStyle="deleteKeyStyle" latin:keyWidth="fillRight" /> </Row> - <include - latin:keyboardLayout="@xml/row_qwerty4" /> + <include latin:keyboardLayout="@xml/row_qwerty4" /> </merge> diff --git a/java/res/xml/rows_armenian_phonetic.xml b/java/res/xml/rows_armenian_phonetic.xml index ea8870e1a..198436ca1 100644 --- a/java/res/xml/rows_armenian_phonetic.xml +++ b/java/res/xml/rows_armenian_phonetic.xml @@ -18,47 +18,40 @@ */ --> -<merge - xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" -> - <include - latin:keyboardLayout="@xml/key_styles_common" /> - <include - latin:keyboardLayout="@xml/key_styles_currency" /> +<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"> + <include latin:keyboardLayout="@xml/key_styles_common" /> + <include latin:keyboardLayout="@xml/key_styles_currency" /> <Row latin:keyWidth="10.0%p" + latin:keyLabelFlags="fontNormal" > - <include - latin:keyboardLayout="@xml/rowkeys_armenian_phonetic1" /> + <include latin:keyboardLayout="@xml/rowkeys_armenian_phonetic1" /> </Row> <Row latin:keyWidth="10.0%p" + latin:keyLabelFlags="fontNormal" > - <include - latin:keyboardLayout="@xml/rowkeys_armenian_phonetic2" /> + <include latin:keyboardLayout="@xml/rowkeys_armenian_phonetic2" /> </Row> <Row latin:keyWidth="10.0%p" + latin:keyLabelFlags="fontNormal" > - <include - latin:keyboardLayout="@xml/rowkeys_armenian_phonetic3" /> - <include - latin:keyboardLayout="@xml/key_armenian_xeh" /> + <include latin:keyboardLayout="@xml/rowkeys_armenian_phonetic3" /> + <include latin:keyboardLayout="@xml/key_armenian_xeh" /> </Row> <Row latin:keyWidth="9.8000%p" + latin:keyLabelFlags="fontNormal" > <Key latin:keyStyle="shiftKeyStyle" latin:keyWidth="10.8%p" /> - <include - latin:keyboardLayout="@xml/rowkeys_armenian_phonetic4" /> - <include - latin:keyboardLayout="@xml/key_armenian_sha" /> + <include latin:keyboardLayout="@xml/rowkeys_armenian_phonetic4" /> + <include latin:keyboardLayout="@xml/key_armenian_sha" /> <Key latin:keyStyle="deleteKeyStyle" latin:keyWidth="fillRight" /> </Row> - <include - latin:keyboardLayout="@xml/row_qwerty4" /> + <include latin:keyboardLayout="@xml/row_qwerty4" /> </merge> diff --git a/java/res/xml/rows_bengali.xml b/java/res/xml/rows_bengali.xml new file mode 100644 index 000000000..4e4223b03 --- /dev/null +++ b/java/res/xml/rows_bengali.xml @@ -0,0 +1,45 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright 2014, 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. +*/ +--> + +<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"> + <include latin:keyboardLayout="@xml/key_styles_common" /> + <Row + latin:keyWidth="9.091%p" + latin:keyLabelFlags="fontNormal" + > + <include latin:keyboardLayout="@xml/rowkeys_bengali1" /> + </Row> + <Row + latin:keyWidth="9.091%p" + latin:keyLabelFlags="fontNormal" + > + <include latin:keyboardLayout="@xml/rowkeys_bengali2" /> + </Row> + <Row + latin:keyWidth="9.091%p" + latin:keyLabelFlags="fontNormal" + > + <include latin:keyboardLayout="@xml/rowkeys_bengali3" /> + <Key + latin:keyStyle="deleteKeyStyle" + latin:keyWidth="fillRight" /> + </Row> + <include latin:keyboardLayout="@xml/row_qwerty4" /> +</merge> diff --git a/java/res/xml/rows_colemak.xml b/java/res/xml/rows_colemak.xml index d74c2c9ec..ec553c244 100644 --- a/java/res/xml/rows_colemak.xml +++ b/java/res/xml/rows_colemak.xml @@ -28,8 +28,6 @@ > <include latin:keyboardLayout="@xml/rowkeys_colemak1" /> - <include - latin:keyboardLayout="@xml/key_colemak_colon" /> </Row> <Row latin:keyWidth="10%p" diff --git a/java/res/xml/rows_farsi.xml b/java/res/xml/rows_farsi.xml index c74614fcf..b78048c9d 100644 --- a/java/res/xml/rows_farsi.xml +++ b/java/res/xml/rows_farsi.xml @@ -18,32 +18,28 @@ */ --> -<merge - xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" -> - <include - latin:keyboardLayout="@xml/key_styles_common" /> +<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"> + <include latin:keyboardLayout="@xml/key_styles_common" /> <Row latin:keyWidth="9.091%p" + latin:keyLabelFlags="fontNormal" > - <include - latin:keyboardLayout="@xml/rowkeys_farsi1" /> + <include latin:keyboardLayout="@xml/rowkeys_farsi1" /> </Row> <Row latin:keyWidth="9.091%p" + latin:keyLabelFlags="fontNormal" > - <include - latin:keyboardLayout="@xml/rowkeys_farsi2" /> + <include latin:keyboardLayout="@xml/rowkeys_farsi2" /> </Row> <Row latin:keyWidth="9.091%p" + latin:keyLabelFlags="fontNormal" > - <include - latin:keyboardLayout="@xml/rowkeys_farsi3" /> + <include latin:keyboardLayout="@xml/rowkeys_farsi3" /> <Key latin:keyStyle="deleteKeyStyle" latin:keyWidth="fillRight" /> </Row> - <include - latin:keyboardLayout="@xml/row_qwerty4" /> + <include latin:keyboardLayout="@xml/row_qwerty4" /> </merge> diff --git a/java/res/xml/rows_greek.xml b/java/res/xml/rows_greek.xml index ca6d24005..e00b927a0 100644 --- a/java/res/xml/rows_greek.xml +++ b/java/res/xml/rows_greek.xml @@ -27,8 +27,6 @@ latin:keyWidth="10%p" > <include - latin:keyboardLayout="@xml/key_greek_semicolon" /> - <include latin:keyboardLayout="@xml/rowkeys_greek1" /> </Row> <Row diff --git a/java/res/xml/rows_hindi.xml b/java/res/xml/rows_hindi.xml index 5c631ebff..da869b144 100644 --- a/java/res/xml/rows_hindi.xml +++ b/java/res/xml/rows_hindi.xml @@ -18,35 +18,31 @@ */ --> -<merge - xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" -> - <include - latin:keyboardLayout="@xml/key_styles_common" /> +<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"> + <include latin:keyboardLayout="@xml/key_styles_common" /> <Row latin:keyWidth="9.091%p" + latin:keyLabelFlags="fontNormal" > - <include - latin:keyboardLayout="@xml/rowkeys_hindi1" /> + <include latin:keyboardLayout="@xml/rowkeys_hindi1" /> </Row> <Row - latin:keyWidth="9.091%p" + latin:keyWidth="9.091%p" + latin:keyLabelFlags="fontNormal" > - <include - latin:keyboardLayout="@xml/rowkeys_hindi2" /> + <include latin:keyboardLayout="@xml/rowkeys_hindi2" /> </Row> <Row latin:keyWidth="8.711%p" + latin:keyLabelFlags="fontNormal" > <Key latin:keyStyle="shiftKeyStyle" latin:keyWidth="10.8%p" /> - <include - latin:keyboardLayout="@xml/rowkeys_hindi3" /> + <include latin:keyboardLayout="@xml/rowkeys_hindi3" /> <Key latin:keyStyle="deleteKeyStyle" latin:keyWidth="fillRight" /> </Row> - <include - latin:keyboardLayout="@xml/row_qwerty4" /> + <include latin:keyboardLayout="@xml/row_qwerty4" /> </merge> diff --git a/java/res/xml/rows_hindi_compact.xml b/java/res/xml/rows_hindi_compact.xml new file mode 100644 index 000000000..d21fada1c --- /dev/null +++ b/java/res/xml/rows_hindi_compact.xml @@ -0,0 +1,45 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright 2014, 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. +*/ +--> + +<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"> + <include latin:keyboardLayout="@xml/key_styles_common" /> + <Row + latin:keyWidth="9.091%p" + latin:keyLabelFlags="fontNormal" + > + <include latin:keyboardLayout="@xml/rowkeys_hindi_compact1" /> + </Row> + <Row + latin:keyWidth="9.091%p" + latin:keyLabelFlags="fontNormal" + > + <include latin:keyboardLayout="@xml/rowkeys_hindi_compact2" /> + </Row> + <Row + latin:keyWidth="9.091%p" + latin:keyLabelFlags="fontNormal" + > + <include latin:keyboardLayout="@xml/rowkeys_hindi_compact3" /> + <Key + latin:keyStyle="deleteKeyStyle" + latin:keyWidth="fillRight" /> + </Row> + <include latin:keyboardLayout="@xml/row_qwerty4" /> +</merge> diff --git a/java/res/xml/rows_khmer.xml b/java/res/xml/rows_khmer.xml index e3993871b..69334f33e 100644 --- a/java/res/xml/rows_khmer.xml +++ b/java/res/xml/rows_khmer.xml @@ -18,39 +18,33 @@ */ --> -<merge - xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" -> - <include - latin:keyboardLayout="@xml/key_styles_common" /> +<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"> + <include latin:keyboardLayout="@xml/key_styles_common" /> <Row latin:keyWidth="8.3333%p" + latin:keyLabelFlags="fontNormal|autoXScale" > - <include - latin:keyboardLayout="@xml/rowkeys_khmer1" /> + <include latin:keyboardLayout="@xml/rowkeys_khmer1" /> </Row> <Row latin:keyWidth="8.3333%p" + latin:keyLabelFlags="fontNormal|autoXScale" > - <include - latin:keyboardLayout="@xml/rowkeys_khmer2" /> + <include latin:keyboardLayout="@xml/rowkeys_khmer2" /> </Row> <Row latin:keyWidth="8.3333%p" + latin:keyLabelFlags="fontNormal|autoXScale" > - <include - latin:keyboardLayout="@xml/rowkeys_khmer3" /> + <include latin:keyboardLayout="@xml/rowkeys_khmer3" /> </Row> <Row latin:keyWidth="8.3333%p" + latin:keyLabelFlags="fontNormal|autoXScale" > - <Key - latin:keyStyle="shiftKeyStyle" /> - <include - latin:keyboardLayout="@xml/rowkeys_khmer4" /> - <Key - latin:keyStyle="deleteKeyStyle" /> + <Key latin:keyStyle="shiftKeyStyle" /> + <include latin:keyboardLayout="@xml/rowkeys_khmer4" /> + <Key latin:keyStyle="deleteKeyStyle" /> </Row> - <include - latin:keyboardLayout="@xml/row_qwerty4" /> + <include latin:keyboardLayout="@xml/row_qwerty4" /> </merge> diff --git a/java/res/xml/rows_lao.xml b/java/res/xml/rows_lao.xml index 321f4112a..b3fbf56c5 100644 --- a/java/res/xml/rows_lao.xml +++ b/java/res/xml/rows_lao.xml @@ -18,39 +18,33 @@ */ --> -<merge - xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" -> - <include - latin:keyboardLayout="@xml/key_styles_common" /> +<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"> + <include latin:keyboardLayout="@xml/key_styles_common" /> <Row latin:keyWidth="8.3333%p" + latin:keyLabelFlags="fontNormal" > - <include - latin:keyboardLayout="@xml/rowkeys_lao1" /> + <include latin:keyboardLayout="@xml/rowkeys_lao1" /> </Row> <Row latin:keyWidth="8.3333%p" + latin:keyLabelFlags="fontNormal" > - <include - latin:keyboardLayout="@xml/rowkeys_lao2" /> + <include latin:keyboardLayout="@xml/rowkeys_lao2" /> </Row> <Row latin:keyWidth="8.3333%p" + latin:keyLabelFlags="fontNormal" > - <include - latin:keyboardLayout="@xml/rowkeys_lao3" /> + <include latin:keyboardLayout="@xml/rowkeys_lao3" /> </Row> <Row latin:keyWidth="8.3333%p" + latin:keyLabelFlags="fontNormal" > - <Key - latin:keyStyle="shiftKeyStyle" /> - <include - latin:keyboardLayout="@xml/rowkeys_lao4" /> - <Key - latin:keyStyle="deleteKeyStyle" /> + <Key latin:keyStyle="shiftKeyStyle" /> + <include latin:keyboardLayout="@xml/rowkeys_lao4" /> + <Key latin:keyStyle="deleteKeyStyle" /> </Row> - <include - latin:keyboardLayout="@xml/row_qwerty4" /> + <include latin:keyboardLayout="@xml/row_qwerty4" /> </merge> diff --git a/java/res/xml/rows_marathi.xml b/java/res/xml/rows_marathi.xml new file mode 100644 index 000000000..ff11adb75 --- /dev/null +++ b/java/res/xml/rows_marathi.xml @@ -0,0 +1,45 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright 2014, 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. +*/ +--> + +<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"> + <include latin:keyboardLayout="@xml/key_styles_common" /> + <Row + latin:keyWidth="9.091%p" + latin:keyLabelFlags="fontNormal" + > + <include latin:keyboardLayout="@xml/rowkeys_marathi1" /> + </Row> + <Row + latin:keyWidth="9.091%p" + latin:keyLabelFlags="fontNormal" + > + <include latin:keyboardLayout="@xml/rowkeys_marathi2" /> + </Row> + <Row + latin:keyWidth="9.091%p" + latin:keyLabelFlags="fontNormal" + > + <include latin:keyboardLayout="@xml/rowkeys_marathi3" /> + <Key + latin:keyStyle="deleteKeyStyle" + latin:keyWidth="fillRight" /> + </Row> + <include latin:keyboardLayout="@xml/row_qwerty4" /> +</merge>
\ No newline at end of file diff --git a/java/res/xml/rows_myanmar.xml b/java/res/xml/rows_myanmar.xml new file mode 100644 index 000000000..54538a9b9 --- /dev/null +++ b/java/res/xml/rows_myanmar.xml @@ -0,0 +1,50 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright 2014, 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. +*/ +--> + +<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"> + <include latin:keyboardLayout="@xml/key_styles_common" /> + <Row + latin:keyWidth="10.0%p" + latin:keyLabelFlags="fontNormal|autoXScale" + > + <include latin:keyboardLayout="@xml/rowkeys_myanmar1" /> + </Row> + <Row + latin:keyWidth="10.0%p" + latin:keyLabelFlags="fontNormal|autoXScale" + > + <include latin:keyboardLayout="@xml/rowkeys_myanmar2" /> + </Row> + <Row + latin:keyWidth="10.0%p" + latin:keyLabelFlags="fontNormal|autoXScale" + > + <include latin:keyboardLayout="@xml/rowkeys_myanmar3" /> + </Row> + <Row + latin:keyWidth="10.0%p" + latin:keyLabelFlags="fontNormal|autoXScale" + > + <Key latin:keyStyle="shiftKeyStyle" /> + <include latin:keyboardLayout="@xml/rowkeys_myanmar4" /> + <Key latin:keyStyle="deleteKeyStyle" /> + </Row> + <include latin:keyboardLayout="@xml/row_qwerty4" /> +</merge>
\ No newline at end of file diff --git a/java/res/xml/rows_nepali_romanized.xml b/java/res/xml/rows_nepali_romanized.xml index 6df09c830..daca3ee86 100644 --- a/java/res/xml/rows_nepali_romanized.xml +++ b/java/res/xml/rows_nepali_romanized.xml @@ -18,35 +18,31 @@ */ --> -<merge - xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" -> - <include - latin:keyboardLayout="@xml/key_styles_common" /> +<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"> + <include latin:keyboardLayout="@xml/key_styles_common" /> <Row latin:keyWidth="9.091%p" + latin:keyLabelFlags="fontNormal" > - <include - latin:keyboardLayout="@xml/rowkeys_nepali_romanized1" /> + <include latin:keyboardLayout="@xml/rowkeys_nepali_romanized1" /> </Row> <Row - latin:keyWidth="9.091%p" + latin:keyWidth="9.091%p" + latin:keyLabelFlags="fontNormal" > - <include - latin:keyboardLayout="@xml/rowkeys_nepali_romanized2" /> + <include latin:keyboardLayout="@xml/rowkeys_nepali_romanized2" /> </Row> <Row latin:keyWidth="8.711%p" + latin:keyLabelFlags="fontNormal" > <Key latin:keyStyle="shiftKeyStyle" latin:keyWidth="10.8%p" /> - <include - latin:keyboardLayout="@xml/rowkeys_nepali_romanized3" /> + <include latin:keyboardLayout="@xml/rowkeys_nepali_romanized3" /> <Key latin:keyStyle="deleteKeyStyle" latin:keyWidth="fillRight" /> </Row> - <include - latin:keyboardLayout="@xml/row_qwerty4" /> + <include latin:keyboardLayout="@xml/row_qwerty4" /> </merge> diff --git a/java/res/xml/rows_nepali_traditional.xml b/java/res/xml/rows_nepali_traditional.xml index 7789135ae..edcc73a20 100644 --- a/java/res/xml/rows_nepali_traditional.xml +++ b/java/res/xml/rows_nepali_traditional.xml @@ -18,39 +18,33 @@ */ --> -<merge - xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" -> - <include - latin:keyboardLayout="@xml/key_styles_common" /> - <include - latin:keyboardLayout="@xml/key_styles_currency" /> +<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"> + <include latin:keyboardLayout="@xml/key_styles_common" /> + <include latin:keyboardLayout="@xml/key_styles_currency" /> <Row latin:keyWidth="9.091%p" + latin:keyLabelFlags="fontNormal" > - <include - latin:keyboardLayout="@xml/rowkeys_nepali_traditional1" /> + <include latin:keyboardLayout="@xml/rowkeys_nepali_traditional1" /> </Row> <Row - latin:keyWidth="9.091%p" + latin:keyWidth="9.091%p" + latin:keyLabelFlags="fontNormal" > - <include - latin:keyboardLayout="@xml/rowkeys_nepali_traditional2" /> + <include latin:keyboardLayout="@xml/rowkeys_nepali_traditional2" /> </Row> <Row latin:keyWidth="8.711%p" + latin:keyLabelFlags="fontNormal" > <Key latin:keyStyle="shiftKeyStyle" latin:keyWidth="10.8%p" /> - <include - latin:keyboardLayout="@xml/rowkeys_nepali_traditional3_left6" /> - <include - latin:keyboardLayout="@xml/rowkeys_nepali_traditional3_right3" /> + <include latin:keyboardLayout="@xml/rowkeys_nepali_traditional3_left6" /> + <include latin:keyboardLayout="@xml/rowkeys_nepali_traditional3_right3" /> <Key latin:keyStyle="deleteKeyStyle" latin:keyWidth="fillRight" /> </Row> - <include - latin:keyboardLayout="@xml/row_qwerty4" /> + <include latin:keyboardLayout="@xml/row_qwerty4" /> </merge> diff --git a/java/res/xml/rows_number_normal.xml b/java/res/xml/rows_number_normal.xml index 291018a14..d8d15080e 100644 --- a/java/res/xml/rows_number_normal.xml +++ b/java/res/xml/rows_number_normal.xml @@ -23,16 +23,16 @@ > <Row> <Key - latin:keyLabel="1" + latin:keySpec="1" latin:keyStyle="numKeyStyle" /> <Key - latin:keyLabel="2" + latin:keySpec="2" latin:keyStyle="numKeyStyle" /> <Key - latin:keyLabel="3" + latin:keySpec="3" latin:keyStyle="numKeyStyle" /> <Key - latin:keyLabel="-" + latin:keySpec="-" latin:moreKeys="+" latin:keyLabelFlags="hasPopupHint" latin:keyStyle="numFunctionalKeyStyle" @@ -40,20 +40,20 @@ </Row> <Row> <Key - latin:keyLabel="4" + latin:keySpec="4" latin:keyStyle="numKeyStyle" /> <Key - latin:keyLabel="5" + latin:keySpec="5" latin:keyStyle="numKeyStyle" /> <Key - latin:keyLabel="6" + latin:keySpec="6" latin:keyStyle="numKeyStyle" /> <switch> <case latin:mode="date" > <Key - latin:keyLabel="." + latin:keySpec="." latin:keyStyle="numFunctionalKeyStyle" latin:keyWidth="fillRight" /> </case> @@ -61,15 +61,15 @@ latin:mode="time|datetime" > <Key - latin:keyLabel="." + latin:keySpec="." latin:keyLabelFlags="hasPopupHint" - latin:moreKeys="!text/more_keys_for_am_pm" + latin:moreKeys="!text/morekeys_am_pm" latin:keyStyle="numFunctionalKeyStyle" latin:keyWidth="fillRight" /> </case> <default> <Key - latin:keyLabel="," + latin:keySpec="," latin:keyStyle="numFunctionalKeyStyle" latin:keyWidth="fillRight" /> </default> @@ -77,56 +77,54 @@ </Row> <Row> <Key - latin:keyLabel="7" + latin:keySpec="7" latin:keyStyle="numKeyStyle" /> <Key - latin:keyLabel="8" + latin:keySpec="8" latin:keyStyle="numKeyStyle"/> <Key - latin:keyLabel="9" + latin:keySpec="9" latin:keyStyle="numKeyStyle" /> <Key latin:keyStyle="deleteKeyStyle" latin:keyWidth="fillRight" /> </Row> <Row> - <Key - latin:keyStyle="numSpaceKeyStyle" /> - <Key - latin:keyLabel="0" - latin:keyStyle="numKeyStyle" /> <switch> <case latin:mode="date" > <Key - latin:keyLabel="/" + latin:keySpec="/" latin:keyStyle="numKeyStyle" /> </case> <case latin:mode="time" > <Key - latin:keyLabel=":" + latin:keySpec=":" latin:keyStyle="numKeyStyle" /> </case> <case latin:mode="datetime" > - <!-- U+002F: "/" SOLIDUS --> <Key - latin:code="0x002F" - latin:keyLabel="/ :" + latin:keySpec="/ :|/" latin:moreKeys="!noPanelAutoMoreKey!,:" latin:keyStyle="numKeyStyle" /> </case> <default> <Key - latin:keyLabel="." + latin:keySpec="." latin:keyStyle="numKeyStyle" /> </default> </switch> <Key + latin:keySpec="0" + latin:keyStyle="numKeyStyle" /> + <Key + latin:keyStyle="numSpaceKeyStyle" /> + <Key latin:keyStyle="enterKeyStyle" latin:keyWidth="fillRight" /> </Row> diff --git a/java/res/xml/rows_pcqwerty.xml b/java/res/xml/rows_pcqwerty.xml index 884698963..a5ed74518 100644 --- a/java/res/xml/rows_pcqwerty.xml +++ b/java/res/xml/rows_pcqwerty.xml @@ -26,19 +26,8 @@ <Row latin:keyWidth="7.692%p" > - <switch> - <case - latin:keyboardLayoutSetElement="alphabet|alphabetAutomaticShifted" - > - <include - latin:keyboardLayout="@xml/rowkeys_pcqwerty1" /> - </case> - <!-- keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted" --> - <default> - <include - latin:keyboardLayout="@xml/rowkeys_pcqwerty1_shift" /> - </default> - </switch> + <include + latin:keyboardLayout="@xml/rowkeys_pcqwerty1" /> </Row> <Row latin:keyWidth="7.692%p" diff --git a/java/res/xml/rows_phone.xml b/java/res/xml/rows_phone.xml index d8dcfbd62..03e45419a 100644 --- a/java/res/xml/rows_phone.xml +++ b/java/res/xml/rows_phone.xml @@ -33,7 +33,7 @@ <Key latin:keyStyle="num3KeyStyle" /> <Key - latin:keyLabel="-" + latin:keySpec="-" latin:moreKeys="+" latin:keyLabelFlags="hasPopupHint" latin:keyStyle="numFunctionalKeyStyle" @@ -47,7 +47,7 @@ <Key latin:keyStyle="num6KeyStyle" /> <Key - latin:keyLabel="." + latin:keySpec="." latin:keyStyle="numFunctionalKeyStyle" latin:keyWidth="fillRight" /> </Row> @@ -68,8 +68,7 @@ <!-- U+0030: "0" DIGIT ZERO --> <Key latin:keyStyle="num0KeyStyle" - latin:code="0x0030" - latin:keyLabel="0 +" + latin:keySpec="0 +|0" latin:moreKeys="!noPanelAutoMoreKey!,+" /> <Key latin:keyStyle="numSpaceKeyStyle" /> diff --git a/java/res/xml/rows_phone_symbols.xml b/java/res/xml/rows_phone_symbols.xml index 8c10a2d71..983bfb5c8 100644 --- a/java/res/xml/rows_phone_symbols.xml +++ b/java/res/xml/rows_phone_symbols.xml @@ -27,16 +27,16 @@ latin:keyboardLayout="@xml/key_styles_number" /> <Row> <Key - latin:keyLabel="(" + latin:keySpec="(" latin:keyStyle="numKeyStyle" /> <Key - latin:keyLabel="/" + latin:keySpec="/" latin:keyStyle="numKeyStyle" /> <Key - latin:keyLabel=")" + latin:keySpec=")" latin:keyStyle="numKeyStyle" /> <Key - latin:keyLabel="-" + latin:keySpec="-" latin:moreKeys="+" latin:keyLabelFlags="hasPopupHint" latin:keyStyle="numFunctionalKeyStyle" @@ -44,17 +44,17 @@ </Row> <Row> <Key - latin:keyLabel="N" + latin:keySpec="N" latin:keyStyle="numKeyBaseStyle" /> <!-- Pause is a comma. Check PhoneNumberUtils.java to see if this has changed. --> <Key latin:keyStyle="numPauseKeyStyle" /> <Key - latin:keyLabel="," + latin:keySpec="," latin:keyStyle="numKeyStyle" /> <Key - latin:keyLabel="." + latin:keySpec="." latin:keyStyle="numFunctionalKeyStyle" latin:keyWidth="fillRight" /> </Row> @@ -65,7 +65,7 @@ <Key latin:keyStyle="numWaitKeyStyle" /> <Key - latin:keyLabel="\#" + latin:keySpec="\#" latin:keyStyle="numKeyStyle" /> <Key latin:keyStyle="deleteKeyStyle" @@ -75,7 +75,7 @@ <Key latin:keyStyle="numPhoneToNumericKeyStyle" /> <Key - latin:keyLabel="+" + latin:keySpec="+" latin:keyStyle="numKeyStyle" /> <Key latin:keyStyle="numSpaceKeyStyle" /> diff --git a/java/res/xml/rows_sinhala.xml b/java/res/xml/rows_sinhala.xml new file mode 100644 index 000000000..a2ba0bb8b --- /dev/null +++ b/java/res/xml/rows_sinhala.xml @@ -0,0 +1,48 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright 2014, 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. +*/ +--> + +<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"> + <include latin:keyboardLayout="@xml/key_styles_common" /> + <Row + latin:keyWidth="9.091%p" + latin:keyLabelFlags="fontNormal|autoXScale" + > + <include latin:keyboardLayout="@xml/rowkeys_sinhala1" /> + </Row> + <Row + latin:keyWidth="9.091%p" + latin:keyLabelFlags="fontNormal|autoXScale" + > + <include latin:keyboardLayout="@xml/rowkeys_sinhala2" /> + </Row> + <Row + latin:keyWidth="8.711%p" + latin:keyLabelFlags="fontNormal|autoXScale" + > + <Key + latin:keyStyle="shiftKeyStyle" + latin:keyWidth="10.8%p" /> + <include latin:keyboardLayout="@xml/rowkeys_sinhala3" /> + <Key + latin:keyStyle="deleteKeyStyle" + latin:keyWidth="fillRight" /> + </Row> + <include latin:keyboardLayout="@xml/row_qwerty4" /> +</merge> diff --git a/java/res/xml/rows_swiss.xml b/java/res/xml/rows_swiss.xml new file mode 100644 index 000000000..03e412940 --- /dev/null +++ b/java/res/xml/rows_swiss.xml @@ -0,0 +1,57 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright 2013, 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. +*/ +--> + +<merge + xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" +> + <include + latin:keyboardLayout="@xml/key_styles_common" /> + <Row + latin:keyWidth="9.091%p" + > + <include + latin:keyboardLayout="@xml/rowkeys_swiss1" /> + </Row> + <Row + latin:keyWidth="9.091%p" + > + <include + latin:keyboardLayout="@xml/rowkeys_swiss2" /> + </Row> + <Row + latin:keyWidth="9.2%p" + > + <Key + latin:keyStyle="shiftKeyStyle" + latin:keyWidth="15%p" + latin:visualInsetsRight="1%p" /> + <Spacer + latin:keyWidth="2.8%p" /> + <include + latin:keyboardLayout="@xml/rowkeys_qwertz3" /> + <Key + latin:keyStyle="deleteKeyStyle" + latin:keyXPos="-15%p" + latin:keyWidth="fillRight" + latin:visualInsetsLeft="1%p" /> + </Row> + <include + latin:keyboardLayout="@xml/row_qwerty4" /> +</merge> diff --git a/java/res/xml/rows_symbols.xml b/java/res/xml/rows_symbols.xml index d0606c63b..6fd876f4e 100644 --- a/java/res/xml/rows_symbols.xml +++ b/java/res/xml/rows_symbols.xml @@ -54,6 +54,7 @@ </Row> <Row latin:keyWidth="10%p" + latin:backgroundType="functional" > <Key latin:keyStyle="toAlphaKeyStyle" diff --git a/java/res/xml/rows_symbols_shift.xml b/java/res/xml/rows_symbols_shift.xml index c4bdb9f38..64f6e6114 100644 --- a/java/res/xml/rows_symbols_shift.xml +++ b/java/res/xml/rows_symbols_shift.xml @@ -54,6 +54,7 @@ </Row> <Row latin:keyWidth="10%p" + latin:backgroundType="functional" > <Key latin:keyStyle="toAlphaKeyStyle" diff --git a/java/res/xml/rows_thai.xml b/java/res/xml/rows_thai.xml index 108b7e1fc..fffdb4415 100644 --- a/java/res/xml/rows_thai.xml +++ b/java/res/xml/rows_thai.xml @@ -18,41 +18,34 @@ */ --> -<merge - xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" -> - <include - latin:keyboardLayout="@xml/key_styles_common" /> +<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"> + <include latin:keyboardLayout="@xml/key_styles_common" /> <Row latin:keyWidth="8.3333%p" + latin:keyLabelFlags="fontNormal" > - <include - latin:keyboardLayout="@xml/rowkeys_thai1" /> + <include latin:keyboardLayout="@xml/rowkeys_thai1" /> </Row> <Row latin:keyWidth="8.3333%p" + latin:keyLabelFlags="fontNormal" > - <include - latin:keyboardLayout="@xml/rowkeys_thai2" /> + <include latin:keyboardLayout="@xml/rowkeys_thai2" /> </Row> <Row latin:keyWidth="8.3333%p" + latin:keyLabelFlags="fontNormal" > - <include - latin:keyboardLayout="@xml/rowkeys_thai3" /> - <include - latin:keyboardLayout="@xml/key_thai_kho_khuat" /> + <include latin:keyboardLayout="@xml/rowkeys_thai3" /> + <include latin:keyboardLayout="@xml/key_thai_kho_khuat" /> </Row> <Row latin:keyWidth="8.3333%p" + latin:keyLabelFlags="fontNormal" > - <Key - latin:keyStyle="shiftKeyStyle" /> - <include - latin:keyboardLayout="@xml/rowkeys_thai4" /> - <Key - latin:keyStyle="deleteKeyStyle" /> + <Key latin:keyStyle="shiftKeyStyle" /> + <include latin:keyboardLayout="@xml/rowkeys_thai4" /> + <Key latin:keyStyle="deleteKeyStyle" /> </Row> - <include - latin:keyboardLayout="@xml/row_qwerty4" /> + <include latin:keyboardLayout="@xml/row_qwerty4" /> </merge> diff --git a/java/res/xml/spell_checker_settings.xml b/java/res/xml/spell_checker_settings.xml index de67e7f81..3d9501857 100644 --- a/java/res/xml/spell_checker_settings.xml +++ b/java/res/xml/spell_checker_settings.xml @@ -15,11 +15,12 @@ --> <PreferenceScreen - xmlns:android="http://schemas.android.com/apk/res/android"> - <CheckBoxPreference - android:key="pref_spellcheck_use_contacts" - android:title="@string/use_contacts_for_spellchecking_option_title" - android:summary="@string/use_contacts_for_spellchecking_option_summary" - android:persistent="true" - android:defaultValue="true" /> + xmlns:android="http://schemas.android.com/apk/res/android" +> + <CheckBoxPreference + android:key="pref_spellcheck_use_contacts" + android:title="@string/use_contacts_for_spellchecking_option_title" + android:summary="@string/use_contacts_for_spellchecking_option_summary" + android:defaultValue="true" + android:persistent="true" /> </PreferenceScreen> |