diff options
Diffstat (limited to 'java/res/xml-sw768dp')
-rw-r--r-- | java/res/xml-sw768dp/kbd_thai.xml | 29 | ||||
-rw-r--r-- | java/res/xml-sw768dp/kbd_thai_symbols.xml | 4 | ||||
-rw-r--r-- | java/res/xml-sw768dp/kbd_thai_symbols_shift.xml | 4 | ||||
-rw-r--r-- | java/res/xml-sw768dp/key_space.xml | 25 | ||||
-rw-r--r-- | java/res/xml-sw768dp/key_styles_common.xml | 19 | ||||
-rw-r--r-- | java/res/xml-sw768dp/row_dvorak4.xml | 7 | ||||
-rw-r--r-- | java/res/xml-sw768dp/row_hebrew4.xml | 7 | ||||
-rw-r--r-- | java/res/xml-sw768dp/row_qwerty4.xml | 7 | ||||
-rw-r--r-- | java/res/xml-sw768dp/row_symbols4.xml | 8 | ||||
-rw-r--r-- | java/res/xml-sw768dp/row_symbols_shift4.xml | 9 | ||||
-rw-r--r-- | java/res/xml-sw768dp/rowkeys_thai_digits.xml | 30 | ||||
-rw-r--r-- | java/res/xml-sw768dp/rows_east_slavic.xml | 3 | ||||
-rw-r--r-- | java/res/xml-sw768dp/rows_esperanto.xml | 69 | ||||
-rw-r--r-- | java/res/xml-sw768dp/rows_number_normal.xml | 3 | ||||
-rw-r--r-- | java/res/xml-sw768dp/rows_thai.xml | 6 |
15 files changed, 105 insertions, 125 deletions
diff --git a/java/res/xml-sw768dp/kbd_thai.xml b/java/res/xml-sw768dp/kbd_thai.xml deleted file mode 100644 index 593ccbd48..000000000 --- a/java/res/xml-sw768dp/kbd_thai.xml +++ /dev/null @@ -1,29 +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. -*/ ---> - -<Keyboard - xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" - latin:rowHeight="20%p" - latin:verticalGap="2.95%p" - latin:touchPositionCorrectionData="@null" -> - <include - latin:keyboardLayout="@xml/rows_thai" /> -</Keyboard> diff --git a/java/res/xml-sw768dp/kbd_thai_symbols.xml b/java/res/xml-sw768dp/kbd_thai_symbols.xml index e2e5f5d56..0cd9a61ea 100644 --- a/java/res/xml-sw768dp/kbd_thai_symbols.xml +++ b/java/res/xml-sw768dp/kbd_thai_symbols.xml @@ -21,7 +21,9 @@ <Keyboard xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" latin:rowHeight="20%p" - latin:verticalGap="2.95%p" + latin:verticalGap="@fraction/key_bottom_gap_5row" + latin:keyLetterSize="@fraction/key_letter_ratio_5row" + latin:keyShiftedLetterHintRatio="@fraction/key_uppercase_letter_ratio_5row" latin:touchPositionCorrectionData="@null" > <include diff --git a/java/res/xml-sw768dp/kbd_thai_symbols_shift.xml b/java/res/xml-sw768dp/kbd_thai_symbols_shift.xml index a1358d4a2..a68fec458 100644 --- a/java/res/xml-sw768dp/kbd_thai_symbols_shift.xml +++ b/java/res/xml-sw768dp/kbd_thai_symbols_shift.xml @@ -21,7 +21,9 @@ <Keyboard xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" latin:rowHeight="20%p" - latin:verticalGap="2.95%p" + latin:verticalGap="@fraction/key_bottom_gap_5row" + latin:keyLetterSize="@fraction/key_letter_ratio_5row" + latin:keyShiftedLetterHintRatio="@fraction/key_uppercase_letter_ratio_5row" latin:touchPositionCorrectionData="@null" > <include diff --git a/java/res/xml-sw768dp/key_space.xml b/java/res/xml-sw768dp/key_space.xml index 8968f080a..58e71d807 100644 --- a/java/res/xml-sw768dp/key_space.xml +++ b/java/res/xml-sw768dp/key_space.xml @@ -24,15 +24,36 @@ <switch> <case latin:languageCode="fa" + latin:languageSwitchKeyEnabled="true" + > + <Key + latin:keyStyle="languageSwitchKeyStyle" /> + <Key + latin:keyStyle="spaceKeyStyle" + latin:keyWidth="24.141%p" /> + <Key + latin:keyStyle="zwnjKeyStyle" /> + </case> + <case + latin:languageCode="fa" + latin:languageSwitchKeyEnabled="false" > <Key latin:keyStyle="spaceKeyStyle" latin:keyWidth="32.188%p" /> - <!-- U+200C: "" ZERO WIDTH NON-JOINER - U+200D: "" ZERO WIDTH JOINER --> <Key latin:keyStyle="zwnjKeyStyle" /> </case> + <case + latin:languageSwitchKeyEnabled="true" + > + <Key + latin:keyStyle="languageSwitchKeyStyle" /> + <Key + latin:keyStyle="spaceKeyStyle" + latin:keyWidth="32.188%p" /> + </case> + <!-- languageSwitchKeyEnabled="false" --> <default> <Key latin:keyStyle="spaceKeyStyle" diff --git a/java/res/xml-sw768dp/key_styles_common.xml b/java/res/xml-sw768dp/key_styles_common.xml index 40082ac35..537e76800 100644 --- a/java/res/xml-sw768dp/key_styles_common.xml +++ b/java/res/xml-sw768dp/key_styles_common.xml @@ -76,7 +76,7 @@ <key-style latin:styleName="spaceKeyStyle" latin:code="!code/key_space" - latin:keyActionFlags="noKeyPreview" /> + latin:keyActionFlags="noKeyPreview|enableLongPress" /> <!-- U+200C: ZERO WIDTH NON-JOINER U+200D: ZERO WIDTH JOINER --> <key-style @@ -100,6 +100,12 @@ latin:keyActionFlags="noKeyPreview" latin:backgroundType="functional" /> <key-style + latin:styleName="languageSwitchKeyStyle" + latin:code="!code/key_language_switch" + latin:keyIcon="!icon/language_switch_key" + latin:keyActionFlags="noKeyPreview|altCodeWhileTyping|enableLongPress" + latin:altCode="!code/key_space" /> + <key-style latin:styleName="settingsKeyStyle" latin:code="!code/key_settings" latin:keyIcon="!icon/settings_key" @@ -117,6 +123,17 @@ latin:keyLabelFlags="fontNormal|preserveCase" latin:backgroundType="functional" /> </case> + <case + latin:keyboardLayoutSetElement="alphabet|alphabetAutomaticShifted|alphabetShiftLocked" + latin:navigateNext="true" + > + <key-style + latin:styleName="tabKeyStyle" + latin:code="!code/key_action_next" + latin:keyLabel="!text/label_tab_key" + latin:keyLabelFlags="fontNormal|preserveCase" + latin:backgroundType="functional" /> + </case> <default> <key-style latin:styleName="tabKeyStyle" diff --git a/java/res/xml-sw768dp/row_dvorak4.xml b/java/res/xml-sw768dp/row_dvorak4.xml index 0827815c9..8f9230d4a 100644 --- a/java/res/xml-sw768dp/row_dvorak4.xml +++ b/java/res/xml-sw768dp/row_dvorak4.xml @@ -25,8 +25,10 @@ latin:keyWidth="8.047%p" latin:backgroundType="functional" > + <!-- Note: This Spacer prevents the below key from being marked as a left edge key. --> + <Spacer + latin:keyWidth="5.782%p" /> <include - latin:keyXPos="5.782%p" latin:keyboardLayout="@xml/key_settings" /> <include latin:keyboardLayout="@xml/key_shortcut" /> @@ -42,5 +44,8 @@ latin:keyboardLayout="@xml/key_dash" /> <include latin:keyboardLayout="@xml/key_f2" /> + <!-- Note: This Spacer prevents the above key from being marked as a right edge key. --> + <Spacer + latin:keyWidth="fillRight" /> </Row> </merge> diff --git a/java/res/xml-sw768dp/row_hebrew4.xml b/java/res/xml-sw768dp/row_hebrew4.xml index 180c5641d..ae14f0296 100644 --- a/java/res/xml-sw768dp/row_hebrew4.xml +++ b/java/res/xml-sw768dp/row_hebrew4.xml @@ -25,8 +25,10 @@ latin:keyWidth="8.047%p" latin:backgroundType="functional" > + <!-- Note: This Spacer prevents the below key from being marked as a left edge key. --> + <Spacer + latin:keyWidth="5.782%p" /> <include - latin:keyXPos="5.782%p" latin:keyboardLayout="@xml/key_settings" /> <include latin:keyboardLayout="@xml/key_shortcut" /> @@ -40,5 +42,8 @@ latin:keyboardLayout="@xml/keys_comma_period" /> <include latin:keyboardLayout="@xml/key_f2" /> + <!-- Note: This Spacer prevents the above key from being marked as a right edge key. --> + <Spacer + latin:keyWidth="fillRight" /> </Row> </merge> diff --git a/java/res/xml-sw768dp/row_qwerty4.xml b/java/res/xml-sw768dp/row_qwerty4.xml index 92411f54e..f1f4214ca 100644 --- a/java/res/xml-sw768dp/row_qwerty4.xml +++ b/java/res/xml-sw768dp/row_qwerty4.xml @@ -25,8 +25,10 @@ latin:keyWidth="8.047%p" latin:backgroundType="functional" > + <!-- Note: This Spacer prevents the below key from being marked as a left edge key. --> + <Spacer + latin:keyWidth="5.782%p" /> <include - latin:keyXPos="5.782%p" latin:keyboardLayout="@xml/key_settings" /> <include latin:keyboardLayout="@xml/key_shortcut" /> @@ -42,5 +44,8 @@ latin:keyboardLayout="@xml/key_dash" /> <include latin:keyboardLayout="@xml/key_f2" /> + <!-- Note: This Spacer prevents the above key from being marked as a right edge key. --> + <Spacer + latin:keyWidth="fillRight" /> </Row> </merge> diff --git a/java/res/xml-sw768dp/row_symbols4.xml b/java/res/xml-sw768dp/row_symbols4.xml index 4e1c11994..b801a12a7 100644 --- a/java/res/xml-sw768dp/row_symbols4.xml +++ b/java/res/xml-sw768dp/row_symbols4.xml @@ -25,8 +25,10 @@ latin:keyWidth="8.047%p" latin:backgroundType="functional" > + <!-- Note: This Spacer prevents the below key from being marked as a left edge key. --> + <Spacer + latin:keyWidth="13.829%p" /> <Key - latin:keyXPos="13.829%p" latin:keyLabel="/" /> <include latin:keyboardLayout="@xml/key_f1" /> @@ -39,6 +41,8 @@ latin:moreKeys="!text/more_keys_for_tablet_double_quote" /> <Key latin:keyLabel="_" /> - <!-- Here is empty space. --> + <!-- Note: This Spacer prevents the above key from being marked as a right edge key. --> + <Spacer + latin:keyWidth="fillRight" /> </Row> </merge> diff --git a/java/res/xml-sw768dp/row_symbols_shift4.xml b/java/res/xml-sw768dp/row_symbols_shift4.xml index 561351cab..f71864bc3 100644 --- a/java/res/xml-sw768dp/row_symbols_shift4.xml +++ b/java/res/xml-sw768dp/row_symbols_shift4.xml @@ -25,11 +25,14 @@ latin:keyWidth="8.047%p" latin:backgroundType="functional" > - <!-- Here is empty space. --> + <!-- Note: This Spacer prevents the below key from being marked as a left edge key. --> + <Spacer + latin:keyWidth="29.923%p" /> <include - latin:keyXPos="29.923%p" latin:keyboardLayout="@xml/key_space" latin:backgroundType="normal" /> - <!-- Here is empty space. --> + <!-- Note: This Spacer prevents the above key from being marked as a right edge key. --> + <Spacer + latin:keyWidth="fillRight" /> </Row> </merge> diff --git a/java/res/xml-sw768dp/rowkeys_thai_digits.xml b/java/res/xml-sw768dp/rowkeys_thai_digits.xml index 512283096..55196ebc3 100644 --- a/java/res/xml-sw768dp/rowkeys_thai_digits.xml +++ b/java/res/xml-sw768dp/rowkeys_thai_digits.xml @@ -23,32 +23,42 @@ > <!-- U+0E51: "๑" THAI DIGIT ONE --> <Key - latin:keyLabel="๑" /> + latin:keyLabel="๑" + latin:keyLabelFlags="fontNormal" /> <!-- U+0E52: "๒" THAI DIGIT TWO --> <Key - latin:keyLabel="๒" /> + latin:keyLabel="๒" + latin:keyLabelFlags="fontNormal" /> <!-- U+0E53: "๓" THAI DIGIT THREE --> <Key - latin:keyLabel="๓" /> + latin:keyLabel="๓" + latin:keyLabelFlags="fontNormal" /> <!-- U+0E54: "๔" THAI DIGIT FOUR --> <Key - latin:keyLabel="๔" /> + latin:keyLabel="๔" + latin:keyLabelFlags="fontNormal" /> <!-- U+0E55: "๕" THAI DIGIT FIVE --> <Key - latin:keyLabel="๕" /> + latin:keyLabel="๕" + latin:keyLabelFlags="fontNormal" /> <!-- U+0E56: "๖" THAI DIGIT SIX --> <Key - latin:keyLabel="๖" /> + latin:keyLabel="๖" + latin:keyLabelFlags="fontNormal" /> <!-- U+0E57: "๗" THAI DIGIT SEVEN --> <Key - latin:keyLabel="๗" /> + latin:keyLabel="๗" + latin:keyLabelFlags="fontNormal" /> <!-- U+0E58: "๘" THAI DIGIT EIGHT --> <Key - latin:keyLabel="๘" /> + latin:keyLabel="๘" + latin:keyLabelFlags="fontNormal" /> <!-- U+0E59: "๙" THAI DIGIT NINE --> <Key - latin:keyLabel="๙" /> + latin:keyLabel="๙" + latin:keyLabelFlags="fontNormal" /> <!-- U+0E50: "๐" THAI DIGIT ZERO --> <Key - latin:keyLabel="๐" /> + latin:keyLabel="๐" + latin:keyLabelFlags="fontNormal" /> </merge> diff --git a/java/res/xml-sw768dp/rows_east_slavic.xml b/java/res/xml-sw768dp/rows_east_slavic.xml index 0316c76f6..a4287f162 100644 --- a/java/res/xml-sw768dp/rows_east_slavic.xml +++ b/java/res/xml-sw768dp/rows_east_slavic.xml @@ -33,9 +33,8 @@ <include latin:keyboardLayout="@xml/rowkeys_east_slavic1" latin:keyLabelFlags="disableAdditionalMoreKeys|disableKeyHintLabel" /> - <!-- U+044A: "ъ" CYRILLIC SMALL LETTER HARD SIGN --> <Key - latin:keyLabel="ъ" /> + latin:keyLabel="!text/keylabel_for_east_slavic_row1_12" /> <Key latin:keyStyle="deleteKeyStyle" latin:keyWidth="fillRight" /> diff --git a/java/res/xml-sw768dp/rows_esperanto.xml b/java/res/xml-sw768dp/rows_esperanto.xml deleted file mode 100644 index 0b3bb1fe0..000000000 --- a/java/res/xml-sw768dp/rows_esperanto.xml +++ /dev/null @@ -1,69 +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" -> - <include - latin:keyboardLayout="@xml/key_styles_common" /> - <Row - latin:keyWidth="8.282%p" - > - <Key - latin:keyStyle="tabKeyStyle" - latin:keyLabelFlags="alignLeft" - latin:keyWidth="7.969%p" /> - <include - latin:keyboardLayout="@xml/rowkeys_esperanto1" - latin:keyLabelFlags="disableAdditionalMoreKeys|disableKeyHintLabel" /> - <Key - latin:keyStyle="deleteKeyStyle" - latin:keyWidth="fillRight"/> - </Row> - <Row - latin:keyWidth="8.125%p" - > - <Key - latin:keyStyle="toSymbolKeyStyle" - latin:keyLabelFlags="alignLeft" - latin:keyWidth="10.167%"/> - <include - latin:keyboardLayout="@xml/rowkeys_esperanto2" /> - <Key - latin:keyStyle="enterKeyStyle" - latin:keyWidth="fillRight" /> - </Row> - <Row - latin:keyWidth="8.047%p" - > - <Key - latin:keyStyle="shiftKeyStyle" - latin:keyWidth="13.829%p"/> - <include - latin:keyboardLayout="@xml/rowkeys_esperanto3" /> - <include - latin:keyboardLayout="@xml/keys_comma_period" /> - <Key - latin:keyStyle="shiftKeyStyle" - latin:keyWidth="fillRight" /> - </Row> - <include - latin:keyboardLayout="@xml/row_qwerty4" /> -</merge> diff --git a/java/res/xml-sw768dp/rows_number_normal.xml b/java/res/xml-sw768dp/rows_number_normal.xml index 84910a88f..d4d7c722a 100644 --- a/java/res/xml-sw768dp/rows_number_normal.xml +++ b/java/res/xml-sw768dp/rows_number_normal.xml @@ -168,5 +168,8 @@ <Key latin:keyLabel="#" latin:keyStyle="numKeyStyle" /> + <!-- Note: This Spacer prevents the above key from being marked as a right edge key. --> + <Spacer + latin:keyWidth="fillRight" /> </Row> </merge> diff --git a/java/res/xml-sw768dp/rows_thai.xml b/java/res/xml-sw768dp/rows_thai.xml index 7721bc5a9..5f9b383f8 100644 --- a/java/res/xml-sw768dp/rows_thai.xml +++ b/java/res/xml-sw768dp/rows_thai.xml @@ -28,7 +28,7 @@ > <include latin:keyboardLayout="@xml/rowkeys_thai1" - latin:keyXPos="11.508%p" /> + latin:keyXPos="3.799%p" /> <Key latin:keyStyle="deleteKeyStyle" latin:keyWidth="fillRight"/> @@ -42,9 +42,11 @@ latin:keyWidth="7.969%p" /> <include latin:keyboardLayout="@xml/rowkeys_thai2" /> + <include + latin:keyboardLayout="@xml/key_thai_kho_khuat" /> </Row> <Row - latin:keyWidth="7.125%p" + latin:keyWidth="7.079%p" > <Key latin:keyStyle="toSymbolKeyStyle" |