diff options
Diffstat (limited to 'java/res/xml-sw600dp')
29 files changed, 211 insertions, 169 deletions
diff --git a/java/res/xml-sw600dp/key_dash.xml b/java/res/xml-sw600dp/key_dash.xml index a7c3727da..f7e0b3436 100644 --- a/java/res/xml-sw600dp/key_dash.xml +++ b/java/res/xml-sw600dp/key_dash.xml @@ -28,11 +28,21 @@ <Key latin:keyLabel="_" /> </case> + <case + latin:languageCode="ar|fa" + > + <!-- U+064B: "ً" ARABIC FATHATAN --> + <Key + latin:keyLabel="." + latin:keyHintLabel="ً" + latin:moreKeys="!text/more_keys_for_arabic_diacritics" + latin:keyStyle="hasShiftedLetterHintStyle" /> + </case> <default> <Key - latin:keyLabel="!text/keylabel_for_dash" - latin:keyHintLabel="!text/keyhintlabel_for_dash" - latin:moreKeys="!text/more_keys_for_dash" + latin:keyLabel="-" + latin:keyHintLabel="_" + latin:moreKeys="_" latin:keyStyle="hasShiftedLetterHintStyle" /> </default> </switch> diff --git a/java/res/xml-sw600dp/key_space.xml b/java/res/xml-sw600dp/key_space.xml index 4e1e15b55..234c80391 100644 --- a/java/res/xml-sw600dp/key_space.xml +++ b/java/res/xml-sw600dp/key_space.xml @@ -30,7 +30,7 @@ latin:keyStyle="languageSwitchKeyStyle" /> <Key latin:keyStyle="spaceKeyStyle" - latin:keyWidth="21.950%p" /> + latin:keyWidth="25.50%p" /> <Key latin:keyStyle="zwnjKeyStyle" /> </case> @@ -40,7 +40,7 @@ > <Key latin:keyStyle="spaceKeyStyle" - latin:keyWidth="30.850%p" /> + latin:keyWidth="34.00%p" /> <Key latin:keyStyle="zwnjKeyStyle" /> </case> @@ -51,13 +51,13 @@ latin:keyStyle="languageSwitchKeyStyle" /> <Key latin:keyStyle="spaceKeyStyle" - latin:keyWidth="30.850%p" /> + latin:keyWidth="34.00%p" /> </case> <!-- languageSwitchKeyEnabled="false" --> <default> <Key latin:keyStyle="spaceKeyStyle" - latin:keyWidth="39.750%p" /> + latin:keyWidth="42.50%p" /> </default> </switch> </merge> diff --git a/java/res/xml-sw600dp/row_hebrew4.xml b/java/res/xml-sw600dp/row_hebrew4.xml index 3d50c7554..90441fba8 100644 --- a/java/res/xml-sw600dp/row_hebrew4.xml +++ b/java/res/xml-sw600dp/row_hebrew4.xml @@ -22,19 +22,20 @@ xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" > <Row - latin:keyWidth="8.9%p" + latin:keyWidth="8.5%p" > <Key latin:keyStyle="toSymbolKeyStyle" - latin:keyWidth="13.0%p" /> + latin:keyWidth="11.75%p" /> <include latin:keyboardLayout="@xml/keys_f1f2" /> <include + latin:keyXPos="28.75%p" latin:keyboardLayout="@xml/key_space" /> <include latin:keyboardLayout="@xml/keys_comma_period" /> <include - latin:keyXPos="-10.0%p" + latin:keyXPos="-8.5%p" latin:keyWidth="fillRight" latin:keyboardLayout="@xml/key_shortcut" /> </Row> diff --git a/java/res/xml-sw600dp/row_qwerty4.xml b/java/res/xml-sw600dp/row_qwerty4.xml index a41dc6480..5008696fd 100644 --- a/java/res/xml-sw600dp/row_qwerty4.xml +++ b/java/res/xml-sw600dp/row_qwerty4.xml @@ -22,22 +22,22 @@ xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" > <Row - latin:keyWidth="8.9%p" + latin:keyWidth="8.5%p" > <Key latin:keyStyle="toSymbolKeyStyle" - latin:keyWidth="13.0%p" /> + latin:keyWidth="11.75%p" /> <include latin:keyboardLayout="@xml/keys_f1f2" /> <include - latin:keyXPos="30.750%p" + latin:keyXPos="28.75%p" latin:keyboardLayout="@xml/key_space" /> <include latin:keyboardLayout="@xml/key_apostrophe" /> <include latin:keyboardLayout="@xml/key_dash" /> <include - latin:keyXPos="-10.00%p" + latin:keyXPos="-8.5%p" latin:keyWidth="fillRight" latin:keyboardLayout="@xml/key_shortcut" /> </Row> diff --git a/java/res/xml-sw600dp/row_symbols4.xml b/java/res/xml-sw600dp/row_symbols4.xml index 4c0ad2334..a4fe5faaa 100644 --- a/java/res/xml-sw600dp/row_symbols4.xml +++ b/java/res/xml-sw600dp/row_symbols4.xml @@ -22,17 +22,17 @@ xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" > <Row - latin:keyWidth="8.9%p" + latin:keyWidth="8.5%p" > <Key latin:keyStyle="toAlphaKeyStyle" - latin:keyWidth="13.0%p" /> + latin:keyWidth="11.75%p" /> <Key latin:keyStyle="smileyKeyStyle" /> <Key latin:keyLabel="\@" /> <include - latin:keyXPos="30.750%p" + latin:keyXPos="28.75%p" latin:keyboardLayout="@xml/key_space" /> <Key latin:keyLabel=""" @@ -40,7 +40,7 @@ <Key latin:keyLabel="_" /> <include - latin:keyXPos="-10.0%p" + latin:keyXPos="-8.5%p" latin:keyWidth="fillRight" latin:keyboardLayout="@xml/key_shortcut" /> </Row> diff --git a/java/res/xml-sw600dp/row_symbols_shift4.xml b/java/res/xml-sw600dp/row_symbols_shift4.xml index 23db19304..ffb6e7fe5 100644 --- a/java/res/xml-sw600dp/row_symbols_shift4.xml +++ b/java/res/xml-sw600dp/row_symbols_shift4.xml @@ -22,18 +22,18 @@ xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" > <Row - latin:keyWidth="8.9%p" + latin:keyWidth="8.5%p" > <Key latin:keyStyle="toAlphaKeyStyle" - latin:keyWidth="13.0%p" /> + latin:keyWidth="11.75%p" /> <Key latin:keyStyle="smileyKeyStyle" /> <include - latin:keyXPos="30.750%p" + latin:keyXPos="28.75%p" latin:keyboardLayout="@xml/key_space" /> <include - latin:keyXPos="-10.00%p" + latin:keyXPos="-8.5%p" latin:keyWidth="fillRight" latin:keyboardLayout="@xml/key_shortcut" /> </Row> diff --git a/java/res/xml-sw600dp/rowkeys_symbols3.xml b/java/res/xml-sw600dp/rowkeys_symbols3.xml index 4eb9618cf..4bfa0d730 100644 --- a/java/res/xml-sw600dp/rowkeys_symbols3.xml +++ b/java/res/xml-sw600dp/rowkeys_symbols3.xml @@ -48,10 +48,9 @@ latin:moreKeys="!text/more_keys_for_comma" /> <Key latin:keyLabel="." /> - <!-- U+00A1: "¡" INVERTED EXCLAMATION MARK --> <Key - latin:keyLabel="!" - latin:moreKeys="¡" /> + latin:keyLabel="!text/keylabel_for_symbols_exclamation" + latin:moreKeys="!text/more_keys_for_symbols_exclamation" /> <Key latin:keyLabel="!text/keylabel_for_symbols_question" latin:moreKeys="!text/more_keys_for_symbols_question" /> diff --git a/java/res/xml-sw600dp/rows_10_10_7_symbols.xml b/java/res/xml-sw600dp/rows_10_10_7_symbols.xml index fe9f2fb5f..d016eb8d0 100644 --- a/java/res/xml-sw600dp/rows_10_10_7_symbols.xml +++ b/java/res/xml-sw600dp/rows_10_10_7_symbols.xml @@ -38,8 +38,7 @@ latin:keyWidth="8.5%p" > <include - latin:keyboardLayout="@xml/rowkeys_symbols2" - latin:keyXPos="4.5%p" /> + latin:keyboardLayout="@xml/rowkeys_symbols2" /> <Key latin:keyStyle="enterKeyStyle" latin:keyWidth="fillBoth" /> @@ -49,12 +48,12 @@ > <Key latin:keyStyle="toMoreSymbolKeyStyle" - latin:keyWidth="10.0%p" /> + latin:keyWidth="11.75%p" /> <include latin:keyboardLayout="@xml/rowkeys_symbols3" /> <Key - latin:keyLabel="/" - latin:keyXPos="-8.5%p" + latin:keyStyle="toMoreSymbolKeyStyle" + latin:keyXPos="-11.75%p" latin:keyWidth="fillRight" /> </Row> <include diff --git a/java/res/xml-sw600dp/rows_10_10_7_symbols_shift.xml b/java/res/xml-sw600dp/rows_10_10_7_symbols_shift.xml index 9df112153..d4496b82f 100644 --- a/java/res/xml-sw600dp/rows_10_10_7_symbols_shift.xml +++ b/java/res/xml-sw600dp/rows_10_10_7_symbols_shift.xml @@ -38,8 +38,7 @@ latin:keyWidth="8.5%p" > <include - latin:keyboardLayout="@xml/rowkeys_symbols_shift2" - latin:keyXPos="4.5%p" /> + latin:keyboardLayout="@xml/rowkeys_symbols_shift2" /> <Key latin:keyStyle="enterKeyStyle" latin:keyWidth="fillBoth" /> @@ -49,9 +48,13 @@ > <Key latin:keyStyle="backFromMoreSymbolKeyStyle" - latin:keyWidth="10.0%p" /> + latin:keyWidth="11.75%p" /> <include latin:keyboardLayout="@xml/rowkeys_symbols_shift3" /> + <Key + latin:keyStyle="backFromMoreSymbolKeyStyle" + latin:keyXPos="-11.75%p" + latin:keyWidth="fillRight" /> </Row> <include latin:keyboardLayout="@xml/row_symbols_shift4" /> diff --git a/java/res/xml-sw600dp/rows_arabic.xml b/java/res/xml-sw600dp/rows_arabic.xml index c796a508e..bc21854c0 100644 --- a/java/res/xml-sw600dp/rows_arabic.xml +++ b/java/res/xml-sw600dp/rows_arabic.xml @@ -24,7 +24,7 @@ <include latin:keyboardLayout="@xml/key_styles_common" /> <Row - latin:keyWidth="7.6%p" + latin:keyWidth="7.727%p" > <include latin:keyboardLayout="@xml/rowkeys_arabic1" /> @@ -33,21 +33,20 @@ latin:keyWidth="fillBoth" /> </Row> <Row - latin:keyWidth="7.6%p" + latin:keyWidth="7.727%p" > <include - latin:keyboardLayout="@xml/rowkeys_arabic2" - latin:keyXPos="4.5%p" /> + latin:keyboardLayout="@xml/rowkeys_arabic2" /> <Key latin:keyStyle="enterKeyStyle" latin:keyWidth="fillBoth" /> </Row> <Row - latin:keyWidth="7.6%p" + latin:keyWidth="7.727%p" > <include latin:keyboardLayout="@xml/rowkeys_arabic3" - latin:keyXPos="10.0%p" /> + latin:keyXPos="7.727%p" /> </Row> <include latin:keyboardLayout="@xml/row_qwerty4" /> diff --git a/java/res/xml-sw600dp/rows_azerty.xml b/java/res/xml-sw600dp/rows_azerty.xml index fbfecb341..137c654a8 100644 --- a/java/res/xml-sw600dp/rows_azerty.xml +++ b/java/res/xml-sw600dp/rows_azerty.xml @@ -37,8 +37,7 @@ latin:keyWidth="8.5%p" > <include - latin:keyboardLayout="@xml/rowkeys_azerty2" - latin:keyXPos="4.5%p" /> + latin:keyboardLayout="@xml/rowkeys_azerty2" /> <Key latin:keyStyle="enterKeyStyle" latin:keyWidth="fillBoth" /> @@ -48,14 +47,14 @@ > <Key latin:keyStyle="shiftKeyStyle" - latin:keyWidth="10.0%p" /> + latin:keyWidth="11.75%p" /> <include latin:keyboardLayout="@xml/rowkeys_azerty3" /> <include latin:keyboardLayout="@xml/keys_comma_period" /> <Key latin:keyStyle="shiftKeyStyle" - latin:keyXPos="-10.0%p" + latin:keyXPos="-11.75%p" latin:keyWidth="fillRight" /> </Row> <include diff --git a/java/res/xml-sw600dp/rows_bulgarian.xml b/java/res/xml-sw600dp/rows_bulgarian.xml index 8c41f9634..682c72a0d 100644 --- a/java/res/xml-sw600dp/rows_bulgarian.xml +++ b/java/res/xml-sw600dp/rows_bulgarian.xml @@ -24,7 +24,7 @@ <include latin:keyboardLayout="@xml/key_styles_common" /> <Row - latin:keyWidth="7.6%p" + latin:keyWidth="7.727%p" > <include latin:keyboardLayout="@xml/rowkeys_bulgarian1" @@ -34,28 +34,27 @@ latin:keyWidth="fillBoth" /> </Row> <Row - latin:keyWidth="7.6%p" + latin:keyWidth="7.727%p" > <include - latin:keyboardLayout="@xml/rowkeys_bulgarian2" - latin:keyXPos="4.500%p" /> + latin:keyboardLayout="@xml/rowkeys_bulgarian2" /> <Key latin:keyStyle="enterKeyStyle" latin:keyWidth="fillBoth" /> </Row> <Row - latin:keyWidth="7.6%p" + latin:keyWidth="7.65%p" > <Key latin:keyStyle="shiftKeyStyle" - latin:keyWidth="10.0%p" /> + latin:keyWidth="11.75%p" /> <include latin:keyboardLayout="@xml/rowkeys_bulgarian3" /> <include latin:keyboardLayout="@xml/keys_comma_period" /> <Key latin:keyStyle="shiftKeyStyle" - latin:keyXPos="-10.0%p" + latin:keyXPos="-11.75%p" latin:keyWidth="fillRight" /> </Row> <include diff --git a/java/res/xml-sw600dp/rows_bulgarian_bds.xml b/java/res/xml-sw600dp/rows_bulgarian_bds.xml new file mode 100644 index 000000000..863296432 --- /dev/null +++ b/java/res/xml-sw600dp/rows_bulgarian_bds.xml @@ -0,0 +1,58 @@ +<?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="7.727%p" + > + <include + latin:keyboardLayout="@xml/rowkeys_bulgarian_bds1" + latin:keyLabelFlags="disableAdditionalMoreKeys|disableKeyHintLabel" /> + <Key + latin:keyStyle="deleteKeyStyle" + latin:keyWidth="fillBoth" /> + </Row> + <Row + latin:keyWidth="7.727%p" + > + <include + latin:keyboardLayout="@xml/rowkeys_bulgarian_bds2" /> + <Key + latin:keyStyle="enterKeyStyle" + latin:keyWidth="fillBoth" /> + </Row> + <Row + latin:keyWidth="7.65%p" + > + <Key + latin:keyStyle="shiftKeyStyle" + latin:keyWidth="11.75%p" /> + <include + latin:keyboardLayout="@xml/rowkeys_bulgarian_bds3" /> + <include + latin:keyboardLayout="@xml/keys_comma_period" /> + </Row> + <include + latin:keyboardLayout="@xml/row_qwerty4" /> +</merge> diff --git a/java/res/xml-sw600dp/rows_colemak.xml b/java/res/xml-sw600dp/rows_colemak.xml index b34957c5b..a94381893 100644 --- a/java/res/xml-sw600dp/rows_colemak.xml +++ b/java/res/xml-sw600dp/rows_colemak.xml @@ -39,8 +39,7 @@ latin:keyWidth="8.5%p" > <include - latin:keyboardLayout="@xml/rowkeys_colemak2" - latin:keyXPos="4.5%p" /> + latin:keyboardLayout="@xml/rowkeys_colemak2" /> <Key latin:keyStyle="enterKeyStyle" latin:keyWidth="fillBoth" /> @@ -50,14 +49,14 @@ > <Key latin:keyStyle="shiftKeyStyle" - latin:keyWidth="10.0%p" /> + latin:keyWidth="11.75%p" /> <include latin:keyboardLayout="@xml/rowkeys_colemak3" /> <include latin:keyboardLayout="@xml/keys_comma_period" /> <Key latin:keyStyle="shiftKeyStyle" - latin:keyXPos="-10.0%p" + latin:keyXPos="-11.75%p" latin:keyWidth="fillRight" /> </Row> <include diff --git a/java/res/xml-sw600dp/rows_dvorak.xml b/java/res/xml-sw600dp/rows_dvorak.xml index d361c3e0c..83d1feece 100644 --- a/java/res/xml-sw600dp/rows_dvorak.xml +++ b/java/res/xml-sw600dp/rows_dvorak.xml @@ -39,8 +39,7 @@ latin:keyWidth="8.5%p" > <include - latin:keyboardLayout="@xml/rowkeys_dvorak2" - latin:keyXPos="4.5%p" /> + latin:keyboardLayout="@xml/rowkeys_dvorak2" /> <Key latin:keyStyle="enterKeyStyle" latin:keyWidth="fillBoth" /> @@ -50,12 +49,12 @@ > <Key latin:keyStyle="shiftKeyStyle" - latin:keyWidth="10.0%p" /> + latin:keyWidth="11.75%p" /> <include latin:keyboardLayout="@xml/rowkeys_dvorak3" /> <Key latin:keyStyle="shiftKeyStyle" - latin:keyXPos="-10.0%p" + latin:keyXPos="-11.75%p" latin:keyWidth="fillRight" /> </Row> <include diff --git a/java/res/xml-sw600dp/rows_east_slavic.xml b/java/res/xml-sw600dp/rows_east_slavic.xml index 3f8e50d15..76a6cc364 100644 --- a/java/res/xml-sw600dp/rows_east_slavic.xml +++ b/java/res/xml-sw600dp/rows_east_slavic.xml @@ -24,42 +24,34 @@ <include latin:keyboardLayout="@xml/key_styles_common" /> <Row - latin:keyWidth="7.6%p" + latin:keyWidth="7.727%p" > <include latin:keyboardLayout="@xml/rowkeys_east_slavic1" latin:keyLabelFlags="disableAdditionalMoreKeys|disableKeyHintLabel" /> - <!-- U+044A: "ъ" CYRILLIC SMALL LETTER HARD SIGN --> - <Key - latin:keyLabel="ъ" /> <Key latin:keyStyle="deleteKeyStyle" latin:keyWidth="fillBoth" /> </Row> <Row - latin:keyWidth="7.6%p" + latin:keyWidth="7.727%p" > <include - latin:keyboardLayout="@xml/rowkeys_east_slavic2" - latin:keyXPos="4.5%p" /> + latin:keyboardLayout="@xml/rowkeys_east_slavic2" /> <Key latin:keyStyle="enterKeyStyle" latin:keyWidth="fillBoth" /> </Row> <Row - latin:keyWidth="7.363%p" + latin:keyWidth="7.727%p" > <Key latin:keyStyle="shiftKeyStyle" - latin:keyWidth="10.0%p" /> + latin:keyWidth="11.75%p" /> <include latin:keyboardLayout="@xml/rowkeys_east_slavic3" /> <include latin:keyboardLayout="@xml/keys_comma_period" /> - <Key - latin:keyStyle="shiftKeyStyle" - latin:keyXPos="-9.0%p" - latin:keyWidth="fillRight" /> </Row> <include latin:keyboardLayout="@xml/row_qwerty4" /> diff --git a/java/res/xml-sw600dp/rows_farsi.xml b/java/res/xml-sw600dp/rows_farsi.xml index 3b39b0af8..9daba6d0a 100644 --- a/java/res/xml-sw600dp/rows_farsi.xml +++ b/java/res/xml-sw600dp/rows_farsi.xml @@ -24,38 +24,31 @@ <include latin:keyboardLayout="@xml/key_styles_common" /> <Row - latin:keyWidth="7.6%p" + latin:keyWidth="7.727%p" > <include latin:keyboardLayout="@xml/rowkeys_farsi1" /> - <Key - latin:keyStyle="deleteKeyStyle" - latin:keyWidth="fillBoth" /> </Row> <Row - latin:keyWidth="7.6%p" + latin:keyWidth="7.727%p" > <include - latin:keyboardLayout="@xml/rowkeys_farsi2" - latin:keyXPos="4.5%p" /> + latin:keyboardLayout="@xml/rowkeys_farsi2" /> <Key - latin:keyStyle="enterKeyStyle" + latin:keyStyle="deleteKeyStyle" latin:keyWidth="fillBoth" /> </Row> <Row - latin:keyWidth="7.6%p" + latin:keyWidth="7.727%p" > - <Key - latin:keyStyle="shiftKeyStyle" - latin:keyWidth="10.0%p" /> <include - latin:keyboardLayout="@xml/rowkeys_farsi3" /> + latin:keyboardLayout="@xml/rowkeys_farsi3" + latin:keyXPos="7.727%p" /> <include latin:keyboardLayout="@xml/keys_comma_period" /> <Key - latin:keyStyle="shiftKeyStyle" - latin:keyXPos="-10.0%p" - latin:keyWidth="fillRight" /> + latin:keyStyle="enterKeyStyle" + latin:keyWidth="fillBoth" /> </Row> <include latin:keyboardLayout="@xml/row_qwerty4" /> diff --git a/java/res/xml-sw600dp/rows_georgian.xml b/java/res/xml-sw600dp/rows_georgian.xml index 2e166bd62..89ef09f66 100644 --- a/java/res/xml-sw600dp/rows_georgian.xml +++ b/java/res/xml-sw600dp/rows_georgian.xml @@ -24,7 +24,7 @@ <include latin:keyboardLayout="@xml/key_styles_common" /> <Row - latin:keyWidth="9.0%p" + latin:keyWidth="8.5%p" > <include latin:keyboardLayout="@xml/rowkeys_georgian1" @@ -34,28 +34,28 @@ latin:keyWidth="fillBoth" /> </Row> <Row - latin:keyWidth="9.0%p" + latin:keyWidth="8.5%p" > <include latin:keyboardLayout="@xml/rowkeys_georgian2" - latin:keyXPos="4.5%p" /> + latin:keyXPos="5.875%p" /> <Key latin:keyStyle="enterKeyStyle" latin:keyWidth="fillBoth" /> </Row> <Row - latin:keyWidth="9.0%p" + latin:keyWidth="8.5%p" > <Key latin:keyStyle="shiftKeyStyle" - latin:keyWidth="10.0%p" /> + latin:keyWidth="11.75%p" /> <include latin:keyboardLayout="@xml/rowkeys_georgian3" /> <include latin:keyboardLayout="@xml/keys_comma_period" /> <Key latin:keyStyle="shiftKeyStyle" - latin:keyXPos="-9.0%p" + latin:keyXPos="-11.75%p" latin:keyWidth="fillRight" /> </Row> <include diff --git a/java/res/xml-sw600dp/rows_greek.xml b/java/res/xml-sw600dp/rows_greek.xml index 85d5c8a23..24cbd6289 100644 --- a/java/res/xml-sw600dp/rows_greek.xml +++ b/java/res/xml-sw600dp/rows_greek.xml @@ -24,7 +24,7 @@ <include latin:keyboardLayout="@xml/key_styles_common" /> <Row - latin:keyWidth="9.0%p" + latin:keyWidth="8.5%p" > <include latin:keyboardLayout="@xml/key_greek_semicolon" /> @@ -36,28 +36,28 @@ latin:keyWidth="fillBoth" /> </Row> <Row - latin:keyWidth="9.0%p" + latin:keyWidth="8.5%p" > <include latin:keyboardLayout="@xml/rowkeys_greek2" - latin:keyXPos="4.5%p" /> + latin:keyXPos="5.875%p" /> <Key latin:keyStyle="enterKeyStyle" latin:keyWidth="fillBoth" /> </Row> <Row - latin:keyWidth="9.0%p" + latin:keyWidth="8.5%p" > <Key latin:keyStyle="shiftKeyStyle" - latin:keyWidth="10.0%p" /> + latin:keyWidth="11.75%p" /> <include latin:keyboardLayout="@xml/rowkeys_greek3" /> <include latin:keyboardLayout="@xml/keys_comma_period" /> <Key latin:keyStyle="shiftKeyStyle" - latin:keyXPos="-9.0%p" + latin:keyXPos="-11.75%p" latin:keyWidth="fillRight" /> </Row> <include diff --git a/java/res/xml-sw600dp/rows_hebrew.xml b/java/res/xml-sw600dp/rows_hebrew.xml index 55ce69aa5..0a7bdf165 100644 --- a/java/res/xml-sw600dp/rows_hebrew.xml +++ b/java/res/xml-sw600dp/rows_hebrew.xml @@ -40,8 +40,7 @@ latin:keyWidth="8.5%p" > <include - latin:keyboardLayout="@xml/rowkeys_hebrew2" - latin:keyXPos="4.5%p" /> + latin:keyboardLayout="@xml/rowkeys_hebrew2" /> <Key latin:keyStyle="enterKeyStyle" latin:keyWidth="fillBoth" /> @@ -51,7 +50,7 @@ > <include latin:keyboardLayout="@xml/rowkeys_hebrew3" - latin:keyXPos="10.0%p" /> + latin:keyXPos="11.75%p" /> </Row> <include latin:keyboardLayout="@xml/row_hebrew4" /> diff --git a/java/res/xml-sw600dp/rows_hindi.xml b/java/res/xml-sw600dp/rows_hindi.xml index c26439faa..267e96fc9 100644 --- a/java/res/xml-sw600dp/rows_hindi.xml +++ b/java/res/xml-sw600dp/rows_hindi.xml @@ -24,7 +24,7 @@ <include latin:keyboardLayout="@xml/key_styles_common" /> <Row - latin:keyWidth="7.6%p" + latin:keyWidth="7.727%p" > <include latin:keyboardLayout="@xml/rowkeys_hindi1" @@ -34,29 +34,24 @@ latin:keyWidth="fillBoth" /> </Row> <Row - latin:keyWidth="7.6%p" + latin:keyWidth="7.727%p" > <include - latin:keyboardLayout="@xml/rowkeys_hindi2" - latin:keyXPos="4.5%p" /> + latin:keyboardLayout="@xml/rowkeys_hindi2" /> <Key latin:keyStyle="enterKeyStyle" latin:keyWidth="fillBoth" /> </Row> <Row - latin:keyWidth="7.5%p" + latin:keyWidth="7.727%p" > <Key latin:keyStyle="shiftKeyStyle" - latin:keyWidth="10.0%p" /> + latin:keyWidth="11.75%p" /> <include latin:keyboardLayout="@xml/rowkeys_hindi3" /> <include latin:keyboardLayout="@xml/keys_comma_period" /> - <Key - latin:keyStyle="shiftKeyStyle" - latin:keyXPos="-7.5%p" - latin:keyWidth="fillRight" /> </Row> <include latin:keyboardLayout="@xml/row_qwerty4" /> diff --git a/java/res/xml-sw600dp/rows_nordic.xml b/java/res/xml-sw600dp/rows_nordic.xml index 4cc10d031..93373b637 100644 --- a/java/res/xml-sw600dp/rows_nordic.xml +++ b/java/res/xml-sw600dp/rows_nordic.xml @@ -24,7 +24,7 @@ <include latin:keyboardLayout="@xml/key_styles_common" /> <Row - latin:keyWidth="7.6%p" + latin:keyWidth="7.727%p" > <include latin:keyboardLayout="@xml/rowkeys_nordic1" @@ -34,28 +34,29 @@ latin:keyWidth="fillBoth" /> </Row> <Row - latin:keyWidth="7.6%p" + latin:keyWidth="7.727%p" > <include - latin:keyboardLayout="@xml/rowkeys_nordic2" - latin:keyXPos="4.5%p" /> + latin:keyboardLayout="@xml/rowkeys_nordic2" /> <Key latin:keyStyle="enterKeyStyle" latin:keyWidth="fillBoth" /> </Row> <Row - latin:keyWidth="7.6%p" + latin:keyWidth="7.727%p" > <Key latin:keyStyle="shiftKeyStyle" - latin:keyWidth="10.0%p" /> + latin:keyWidth="11.75%p" /> + <Spacer + latin:keyWidth="3.479%p" /> <include latin:keyboardLayout="@xml/rowkeys_qwerty3" /> <include latin:keyboardLayout="@xml/keys_comma_period" /> <Key latin:keyStyle="shiftKeyStyle" - latin:keyXPos="-10.0%p" + latin:keyXPos="-11.75%p" latin:keyWidth="fillRight" /> </Row> <include diff --git a/java/res/xml-sw600dp/rows_qwerty.xml b/java/res/xml-sw600dp/rows_qwerty.xml index 9fc0e12b8..29aea3fdc 100644 --- a/java/res/xml-sw600dp/rows_qwerty.xml +++ b/java/res/xml-sw600dp/rows_qwerty.xml @@ -24,7 +24,7 @@ <include latin:keyboardLayout="@xml/key_styles_common" /> <Row - latin:keyWidth="9.0%p" + latin:keyWidth="8.5%p" > <include latin:keyboardLayout="@xml/rowkeys_qwerty1" @@ -34,28 +34,28 @@ latin:keyWidth="fillBoth" /> </Row> <Row - latin:keyWidth="9.0%p" + latin:keyWidth="8.5%p" > <include latin:keyboardLayout="@xml/rowkeys_qwerty2" - latin:keyXPos="4.5%p" /> + latin:keyXPos="5.875%p" /> <Key latin:keyStyle="enterKeyStyle" latin:keyWidth="fillBoth" /> </Row> <Row - latin:keyWidth="9.0%p" + latin:keyWidth="8.5%p" > <Key latin:keyStyle="shiftKeyStyle" - latin:keyWidth="10.0%p" /> + latin:keyWidth="11.75%p" /> <include latin:keyboardLayout="@xml/rowkeys_qwerty3" /> <include latin:keyboardLayout="@xml/keys_comma_period" /> <Key latin:keyStyle="shiftKeyStyle" - latin:keyXPos="-9.0%p" + latin:keyXPos="-11.75%p" latin:keyWidth="fillRight" /> </Row> <include diff --git a/java/res/xml-sw600dp/rows_qwertz.xml b/java/res/xml-sw600dp/rows_qwertz.xml index de86444e5..abbc7db89 100644 --- a/java/res/xml-sw600dp/rows_qwertz.xml +++ b/java/res/xml-sw600dp/rows_qwertz.xml @@ -24,7 +24,7 @@ <include latin:keyboardLayout="@xml/key_styles_common" /> <Row - latin:keyWidth="9.0%p" + latin:keyWidth="8.5%p" > <include latin:keyboardLayout="@xml/rowkeys_qwertz1" @@ -34,28 +34,28 @@ latin:keyWidth="fillBoth" /> </Row> <Row - latin:keyWidth="9.0%p" + latin:keyWidth="8.5%p" > <include latin:keyboardLayout="@xml/rowkeys_qwerty2" - latin:keyXPos="4.5%p" /> + latin:keyXPos="5.875%p" /> <Key latin:keyStyle="enterKeyStyle" latin:keyWidth="fillBoth" /> </Row> <Row - latin:keyWidth="9.0%p" + latin:keyWidth="8.5%p" > <Key latin:keyStyle="shiftKeyStyle" - latin:keyWidth="10.0%p" /> + latin:keyWidth="11.75%p" /> <include latin:keyboardLayout="@xml/rowkeys_qwertz3" /> <include latin:keyboardLayout="@xml/keys_comma_period" /> <Key latin:keyStyle="shiftKeyStyle" - latin:keyXPos="-9.0%p" + latin:keyXPos="-11.75%p" latin:keyWidth="fillRight" /> </Row> <include diff --git a/java/res/xml-sw600dp/rows_south_slavic.xml b/java/res/xml-sw600dp/rows_south_slavic.xml index 80eea6d43..68d86a9a2 100644 --- a/java/res/xml-sw600dp/rows_south_slavic.xml +++ b/java/res/xml-sw600dp/rows_south_slavic.xml @@ -24,7 +24,7 @@ <include latin:keyboardLayout="@xml/key_styles_common" /> <Row - latin:keyWidth="7.6%p" + latin:keyWidth="7.727%p" > <include latin:keyboardLayout="@xml/rowkeys_south_slavic1" @@ -34,29 +34,24 @@ latin:keyWidth="fillBoth" /> </Row> <Row - latin:keyWidth="7.6%p" + latin:keyWidth="7.727%p" > <include - latin:keyboardLayout="@xml/rowkeys_south_slavic2" - latin:keyXPos="4.5%p" /> + latin:keyboardLayout="@xml/rowkeys_south_slavic2" /> <Key latin:keyStyle="enterKeyStyle" latin:keyWidth="fillBoth" /> </Row> <Row - latin:keyWidth="7.363%p" + latin:keyWidth="7.727%p" > <Key latin:keyStyle="shiftKeyStyle" - latin:keyWidth="10.0%p" /> + latin:keyWidth="11.75%p" /> <include latin:keyboardLayout="@xml/rowkeys_south_slavic3" /> <include latin:keyboardLayout="@xml/keys_comma_period" /> - <Key - latin:keyStyle="shiftKeyStyle" - latin:keyXPos="-9.0%p" - latin:keyWidth="fillRight" /> </Row> <include latin:keyboardLayout="@xml/row_qwerty4" /> diff --git a/java/res/xml-sw600dp/rows_spanish.xml b/java/res/xml-sw600dp/rows_spanish.xml index 6aef1d781..8c965b2ff 100644 --- a/java/res/xml-sw600dp/rows_spanish.xml +++ b/java/res/xml-sw600dp/rows_spanish.xml @@ -37,8 +37,7 @@ latin:keyWidth="8.5%p" > <include - latin:keyboardLayout="@xml/rowkeys_spanish2" - latin:keyXPos="4.5%p" /> + latin:keyboardLayout="@xml/rowkeys_spanish2" /> <Key latin:keyStyle="enterKeyStyle" latin:keyWidth="fillBoth" /> @@ -48,14 +47,14 @@ > <Key latin:keyStyle="shiftKeyStyle" - latin:keyWidth="10.0%p" /> + latin:keyWidth="11.75%p" /> <include latin:keyboardLayout="@xml/rowkeys_qwerty3" /> <include latin:keyboardLayout="@xml/keys_comma_period" /> <Key latin:keyStyle="shiftKeyStyle" - latin:keyXPos="-10.0%p" + latin:keyXPos="-11.75%p" latin:keyWidth="fillRight" /> </Row> <include diff --git a/java/res/xml-sw600dp/rows_symbols.xml b/java/res/xml-sw600dp/rows_symbols.xml index ada22dff6..57ec70de1 100644 --- a/java/res/xml-sw600dp/rows_symbols.xml +++ b/java/res/xml-sw600dp/rows_symbols.xml @@ -26,7 +26,7 @@ <include latin:keyboardLayout="@xml/key_styles_currency" /> <Row - latin:keyWidth="9.0%p" + latin:keyWidth="8.5%p" > <include latin:keyboardLayout="@xml/rowkeys_symbols1" /> @@ -35,26 +35,26 @@ latin:keyWidth="fillBoth" /> </Row> <Row - latin:keyWidth="9.0%p" + latin:keyWidth="8.5%p" > <include latin:keyboardLayout="@xml/rowkeys_symbols2" - latin:keyXPos="4.5%p" /> + latin:keyXPos="5.875%p" /> <Key latin:keyStyle="enterKeyStyle" latin:keyWidth="fillBoth" /> </Row> <Row - latin:keyWidth="9.0%p" + latin:keyWidth="8.5%p" > <Key latin:keyStyle="toMoreSymbolKeyStyle" - latin:keyWidth="10.0%p" /> + latin:keyWidth="11.75%p" /> <include latin:keyboardLayout="@xml/rowkeys_symbols3" /> <Key - latin:keyLabel="/" - latin:keyXPos="-9.0%p" + latin:keyStyle="toMoreSymbolKeyStyle" + latin:keyXPos="-11.75%p" latin:keyWidth="fillRight" /> </Row> <include diff --git a/java/res/xml-sw600dp/rows_symbols_shift.xml b/java/res/xml-sw600dp/rows_symbols_shift.xml index 0750670d6..c46661ec7 100644 --- a/java/res/xml-sw600dp/rows_symbols_shift.xml +++ b/java/res/xml-sw600dp/rows_symbols_shift.xml @@ -26,7 +26,7 @@ <include latin:keyboardLayout="@xml/key_styles_currency" /> <Row - latin:keyWidth="9.0%p" + latin:keyWidth="8.5%p" > <include latin:keyboardLayout="@xml/rowkeys_symbols_shift1" /> @@ -35,23 +35,27 @@ latin:keyWidth="fillBoth" /> </Row> <Row - latin:keyWidth="9.0%p" + latin:keyWidth="8.5%p" > <include latin:keyboardLayout="@xml/rowkeys_symbols_shift2" - latin:keyXPos="4.5%p" /> + latin:keyXPos="5.875%p" /> <Key latin:keyStyle="enterKeyStyle" latin:keyWidth="fillBoth" /> </Row> <Row - latin:keyWidth="9.0%p" + latin:keyWidth="8.5%p" > <Key latin:keyStyle="backFromMoreSymbolKeyStyle" - latin:keyWidth="10.0%p" /> + latin:keyWidth="11.75%p" /> <include latin:keyboardLayout="@xml/rowkeys_symbols_shift3" /> + <Key + latin:keyStyle="backFromMoreSymbolKeyStyle" + latin:keyXPos="-11.75%p" + latin:keyWidth="fillRight" /> </Row> <include latin:keyboardLayout="@xml/row_symbols_shift4" /> diff --git a/java/res/xml-sw600dp/rows_thai.xml b/java/res/xml-sw600dp/rows_thai.xml index fea1bafd1..c387081a3 100644 --- a/java/res/xml-sw600dp/rows_thai.xml +++ b/java/res/xml-sw600dp/rows_thai.xml @@ -24,43 +24,42 @@ <include latin:keyboardLayout="@xml/key_styles_common" /> <Row - latin:keyWidth="7.800%p" + latin:keyWidth="7.354%p" > <include latin:keyboardLayout="@xml/rowkeys_thai1" - latin:keyXPos="4.0%p" /> + latin:keyXPos="4.396%p" /> <Key latin:keyStyle="deleteKeyStyle" latin:keyWidth="fillRight" /> </Row> <Row - latin:keyWidth="7.692%p" + latin:keyWidth="7.354%p" > <include - latin:keyboardLayout="@xml/rowkeys_thai2" /> + latin:keyboardLayout="@xml/rowkeys_thai2" + latin:keyXPos="0.719%p" /> </Row> <Row - latin:keyWidth="7.692%p" + latin:keyWidth="7.354%p" > <include latin:keyboardLayout="@xml/rowkeys_thai3" - latin:keyXPos="4.5%p" /> + latin:keyXPos="4.396%p" /> <Key latin:keyStyle="enterKeyStyle" latin:keyWidth="fillBoth" /> </Row> <Row - latin:keyWidth="7.692%p" + latin:keyWidth="7.354%p" > <Key latin:keyStyle="shiftKeyStyle" - latin:keyWidth="10.0%p" /> + latin:keyWidth="11.75%p" /> <include latin:keyboardLayout="@xml/rowkeys_thai4" /> - <Key - latin:keyStyle="shiftKeyStyle" - latin:keyXPos="-10.0%p" - latin:keyWidth="fillRight" /> + <include + latin:keyboardLayout="@xml/keys_comma_period" /> </Row> <include latin:keyboardLayout="@xml/row_qwerty4" /> |