diff options
Diffstat (limited to 'java/res')
47 files changed, 639 insertions, 199 deletions
diff --git a/java/res/values/donottranslate.xml b/java/res/values/donottranslate.xml index 73aa54f7e..d6a68d0dc 100644 --- a/java/res/values/donottranslate.xml +++ b/java/res/values/donottranslate.xml @@ -178,6 +178,9 @@ <string name="subtype_generic_colemak">%s (Colemak)</string> <string name="subtype_generic_pcqwerty">%s (PC)</string> + <!-- Description for Bulgarian (BDS) subtype. --> + <string name="subtype_bulgarian_bds">%s (BDS)</string> + <!-- dictionary pack package name /settings activity (for shared prefs and settings) --> <string name="dictionary_pack_package_name">com.google.android.inputmethod.latin.dictionarypack</string> <string name="dictionary_pack_settings_activity">com.google.android.inputmethod.latin.dictionarypack.DictionarySettingsActivity</string> 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" /> diff --git a/java/res/xml-sw768dp/rows_bulgarian_bds.xml b/java/res/xml-sw768dp/rows_bulgarian_bds.xml new file mode 100644 index 000000000..31343d227 --- /dev/null +++ b/java/res/xml-sw768dp/rows_bulgarian_bds.xml @@ -0,0 +1,69 @@ +<?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.000%p" + > + <Key + latin:keyStyle="tabKeyStyle" + latin:keyLabelFlags="alignLeft" + latin:keyWidth="7.969%p" /> + <include + latin:keyboardLayout="@xml/rowkeys_bulgarian_bds1" + latin:keyLabelFlags="disableAdditionalMoreKeys|disableKeyHintLabel" /> + <Key + latin:keyStyle="deleteKeyStyle" + latin:keyWidth="fillBoth" /> + </Row> + <Row + latin:keyWidth="7.000%p" + > + <Key + latin:keyStyle="toSymbolKeyStyle" + latin:keyLabelFlags="alignLeft" + latin:keyWidth="11.172%p" /> + <include + latin:keyboardLayout="@xml/rowkeys_bulgarian_bds2" /> + <Key + latin:keyStyle="enterKeyStyle" + latin:keyWidth="fillBoth" /> + </Row> + <Row + latin:keyWidth="7.000%p" + > + <Key + latin:keyStyle="shiftKeyStyle" + latin:keyWidth="13.829%p" /> + <include + latin:keyboardLayout="@xml/rowkeys_bulgarian_bds3" /> + <include + latin:keyboardLayout="@xml/keys_comma_period" /> + <Key + latin:keyStyle="shiftKeyStyle" + latin:keyWidth="fillBoth" /> + </Row> + <include + latin:keyboardLayout="@xml/row_qwerty4" /> +</merge> diff --git a/java/res/xml-sw768dp/rows_farsi.xml b/java/res/xml-sw768dp/rows_farsi.xml index 28ea6fff5..8a70df99d 100644 --- a/java/res/xml-sw768dp/rows_farsi.xml +++ b/java/res/xml-sw768dp/rows_farsi.xml @@ -24,7 +24,7 @@ <include latin:keyboardLayout="@xml/key_styles_common" /> <Row - latin:keyWidth="7.000%p" + latin:keyWidth="7.125%p" > <Key latin:keyStyle="tabKeyStyle" @@ -32,9 +32,6 @@ latin:keyWidth="7.969%p" /> <include latin:keyboardLayout="@xml/rowkeys_farsi1" /> - <Key - latin:keyStyle="deleteKeyStyle" - latin:keyWidth="fillBoth" /> </Row> <Row latin:keyWidth="7.125%p" @@ -46,22 +43,19 @@ <include latin:keyboardLayout="@xml/rowkeys_farsi2" /> <Key - latin:keyStyle="enterKeyStyle" + latin:keyStyle="deleteKeyStyle" latin:keyWidth="fillBoth" /> </Row> <Row latin:keyWidth="7.375%p" > - <Key - latin:keyStyle="shiftKeyStyle" - latin:keyWidth="13.829%p"/> <include - latin:keyboardLayout="@xml/rowkeys_farsi3" /> + latin:keyboardLayout="@xml/rowkeys_farsi3" + latin:keyXPos="13.829%p" /> <include latin:keyboardLayout="@xml/keys_comma_period" /> <Key - latin:keyStyle="shiftKeyStyle" - latin:keyXPos="-13.750%p" + latin:keyStyle="enterKeyStyle" latin:keyWidth="fillBoth" /> </Row> <include diff --git a/java/res/xml-sw768dp/rows_greek.xml b/java/res/xml-sw768dp/rows_greek.xml index c0b38dc15..cf2fa4013 100644 --- a/java/res/xml-sw768dp/rows_greek.xml +++ b/java/res/xml-sw768dp/rows_greek.xml @@ -35,6 +35,9 @@ <include latin:keyboardLayout="@xml/rowkeys_greek1" latin:keyLabelFlags="disableAdditionalMoreKeys|disableKeyHintLabel" /> + <Key + latin:keyStyle="deleteKeyStyle" + latin:keyWidth="fillBoth"/> </Row> <Row latin:keyWidth="8.125%p" diff --git a/java/res/xml-sw768dp/rows_nordic.xml b/java/res/xml-sw768dp/rows_nordic.xml index fbee1c3f0..9a452511e 100644 --- a/java/res/xml-sw768dp/rows_nordic.xml +++ b/java/res/xml-sw768dp/rows_nordic.xml @@ -56,6 +56,8 @@ <Key latin:keyStyle="shiftKeyStyle" latin:keyWidth="13.829%p" /> + <Spacer + latin:keyWidth="3.689%p" /> <include latin:keyboardLayout="@xml/rowkeys_qwerty3" /> <include diff --git a/java/res/xml/kbd_bulgarian_bds.xml b/java/res/xml/kbd_bulgarian_bds.xml new file mode 100644 index 000000000..a8d770c04 --- /dev/null +++ b/java/res/xml/kbd_bulgarian_bds.xml @@ -0,0 +1,26 @@ +<?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" +> + <include + latin:keyboardLayout="@xml/rows_bulgarian_bds" /> +</Keyboard> diff --git a/java/res/xml/key_styles_common.xml b/java/res/xml/key_styles_common.xml index 6b64985a6..819cdc6a9 100644 --- a/java/res/xml/key_styles_common.xml +++ b/java/res/xml/key_styles_common.xml @@ -201,7 +201,6 @@ <key-style latin:styleName="punctuationKeyStyle" latin:keyLabel="." - latin:keyHintLabel="!text/keyhintlabel_for_punctuation" latin:keyLabelFlags="hasPopupHint" latin:moreKeys="!text/more_keys_for_punctuation" latin:backgroundType="functional" /> diff --git a/java/res/xml/keyboard_layout_set_bulgarian_bds.xml b/java/res/xml/keyboard_layout_set_bulgarian_bds.xml new file mode 100644 index 000000000..a36b3bd52 --- /dev/null +++ b/java/res/xml/keyboard_layout_set_bulgarian_bds.xml @@ -0,0 +1,42 @@ +<?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. +*/ +--> + +<KeyboardLayoutSet + xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"> + <Element + latin:elementName="alphabet" + latin:elementKeyboard="@xml/kbd_bulgarian_bds" + 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/method.xml b/java/res/xml/method.xml index 981f24657..19b32f2e7 100644 --- a/java/res/xml/method.xml +++ b/java/res/xml/method.xml @@ -25,6 +25,7 @@ ar: Arabic/arabic be: Belarusian/east_slavic bg: Bulgarian/bulgarian + bg: Bulgarian/bulgarian_bds cs: Czech/qwertz da: Danish/nordic de: German/qwertz @@ -101,6 +102,12 @@ android:imeSubtypeExtraValue="KeyboardLayoutSet=bulgarian" /> <subtype android:icon="@drawable/ic_subtype_keyboard" + android:label="@string/subtype_bulgarian_bds" + android:imeSubtypeLocale="bg" + android:imeSubtypeMode="keyboard" + android:imeSubtypeExtraValue="KeyboardLayoutSet=bulgarian_bds" + /> + <subtype android:icon="@drawable/ic_subtype_keyboard" android:label="@string/subtype_generic" android:imeSubtypeLocale="cs" android:imeSubtypeMode="keyboard" diff --git a/java/res/xml/row_qwerty4.xml b/java/res/xml/row_qwerty4.xml index 678034960..ecb95e7a5 100644 --- a/java/res/xml/row_qwerty4.xml +++ b/java/res/xml/row_qwerty4.xml @@ -32,8 +32,23 @@ <include latin:keyXPos="25%p" latin:keyboardLayout="@xml/key_space" /> - <Key - latin:keyStyle="punctuationKeyStyle" /> + <switch> + <case + latin:languageCode="ar|fa" + > + <!-- U+064B: "ً" ARABIC FATHATAN --> + <Key + latin:keyLabel="." + latin:keyHintLabel="ً" + latin:keyLabelFlags="hasPopupHint|hasShiftedLetterHint" + latin:moreKeys="!text/more_keys_for_arabic_diacritics" + latin:backgroundType="functional" /> + </case> + <default> + <Key + latin:keyStyle="punctuationKeyStyle" /> + </default> + </switch> <Key latin:keyStyle="enterKeyStyle" latin:keyWidth="fillRight" /> diff --git a/java/res/xml/rowkeys_bulgarian1.xml b/java/res/xml/rowkeys_bulgarian1.xml index adeecaf20..441b079f1 100644 --- a/java/res/xml/rowkeys_bulgarian1.xml +++ b/java/res/xml/rowkeys_bulgarian1.xml @@ -21,14 +21,14 @@ <merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" > - <!-- U+0447: "ч" CYRILLIC SMALL LETTER CHE --> + <!-- U+044F: "я" CYRILLIC SMALL LETTER YA --> <Key - latin:keyLabel="ч" + latin:keyLabel="я" latin:keyHintLabel="1" latin:additionalMoreKeys="1" /> - <!-- U+0448: "ш" CYRILLIC SMALL LETTER SHA --> + <!-- U+0432: "в" CYRILLIC SMALL LETTER VE --> <Key - latin:keyLabel="ш" + latin:keyLabel="в" latin:keyHintLabel="2" latin:additionalMoreKeys="2" /> <!-- U+0435: "е" CYRILLIC SMALL LETTER IE --> @@ -73,7 +73,7 @@ latin:keyLabel="п" latin:keyHintLabel="0" latin:additionalMoreKeys="0" /> - <!-- U+044F: "я" CYRILLIC SMALL LETTER YA --> + <!-- U+0447: "ч" CYRILLIC SMALL LETTER CHE --> <Key - latin:keyLabel="я" /> + latin:keyLabel="ч" /> </merge> diff --git a/java/res/xml/rowkeys_bulgarian2.xml b/java/res/xml/rowkeys_bulgarian2.xml index 599edd3ed..a4e93d862 100644 --- a/java/res/xml/rowkeys_bulgarian2.xml +++ b/java/res/xml/rowkeys_bulgarian2.xml @@ -48,10 +48,10 @@ <!-- U+043B: "л" CYRILLIC SMALL LETTER EL --> <Key latin:keyLabel="л" /> + <!-- U+0448: "ш" CYRILLIC SMALL LETTER SHA --> + <Key + latin:keyLabel="ш" /> <!-- U+0449: "щ" CYRILLIC SMALL LETTER SHCHA --> <Key latin:keyLabel="щ" /> - <!-- U+044C: "ь" CYRILLIC SMALL LETTER SOFT SIGN --> - <Key - latin:keyLabel="ь" /> </merge> diff --git a/java/res/xml/rowkeys_bulgarian3.xml b/java/res/xml/rowkeys_bulgarian3.xml index 19872cdfe..258219c27 100644 --- a/java/res/xml/rowkeys_bulgarian3.xml +++ b/java/res/xml/rowkeys_bulgarian3.xml @@ -24,15 +24,15 @@ <!-- U+0437: "з" CYRILLIC SMALL LETTER ZE --> <Key latin:keyLabel="з" /> - <!-- U+0436: "ж" CYRILLIC SMALL LETTER ZHE --> + <!-- U+044C: "ь" CYRILLIC SMALL LETTER SOFT SIGN --> <Key - latin:keyLabel="ж" /> + latin:keyLabel="ь" /> <!-- U+0446: "ц" CYRILLIC SMALL LETTER TSE --> <Key latin:keyLabel="ц" /> - <!-- U+0432: "в" CYRILLIC SMALL LETTER VE --> + <!-- U+0436: "ж" CYRILLIC SMALL LETTER ZHE --> <Key - latin:keyLabel="в" /> + latin:keyLabel="ж" /> <!-- U+0431: "б" CYRILLIC SMALL LETTER BE --> <Key latin:keyLabel="б" /> diff --git a/java/res/xml/rowkeys_bulgarian_bds1.xml b/java/res/xml/rowkeys_bulgarian_bds1.xml new file mode 100644 index 000000000..eed1fcb8f --- /dev/null +++ b/java/res/xml/rowkeys_bulgarian_bds1.xml @@ -0,0 +1,79 @@ +<?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" +> + <!-- U+0443: "у" CYRILLIC SMALL LETTER U --> + <Key + latin:keyLabel="у" + latin:keyHintLabel="1" + latin:additionalMoreKeys="1" /> + <!-- U+0435: "е" CYRILLIC SMALL LETTER IE --> + <Key + latin:keyLabel="е" + latin:keyHintLabel="2" + latin:additionalMoreKeys="2" /> + <!-- U+0438: "и" CYRILLIC SMALL LETTER I + U+045D: "ѝ" CYRILLIC SMALL LETTER I WITH GRAVE --> + <Key + latin:keyLabel="и" + latin:keyHintLabel="3" + latin:additionalMoreKeys="3" + latin:moreKeys="ѝ" /> + <!-- U+0448: "ш" CYRILLIC SMALL LETTER SHA --> + <Key + latin:keyLabel="ш" + latin:keyHintLabel="4" + latin:additionalMoreKeys="4" /> + <!-- U+0449: "щ" CYRILLIC SMALL LETTER SHCHA --> + <Key + latin:keyLabel="щ" + latin:keyHintLabel="5" + latin:additionalMoreKeys="5" /> + <!-- U+043A: "к" CYRILLIC SMALL LETTER KA --> + <Key + latin:keyLabel="к" + latin:keyHintLabel="6" + latin:additionalMoreKeys="6" /> + <!-- U+0441: "с" CYRILLIC SMALL LETTER ES --> + <Key + latin:keyLabel="с" + latin:keyHintLabel="7" + latin:additionalMoreKeys="7" /> + <!-- U+0434: "д" CYRILLIC SMALL LETTER DE --> + <Key + latin:keyLabel="д" + latin:keyHintLabel="8" + latin:additionalMoreKeys="8" /> + <!-- U+0437: "з" CYRILLIC SMALL LETTER ZE --> + <Key + latin:keyLabel="з" + latin:keyHintLabel="9" + latin:additionalMoreKeys="9" /> + <!-- U+0446: "ц" CYRILLIC SMALL LETTER TSE --> + <Key + latin:keyLabel="ц" + latin:keyHintLabel="0" + latin:additionalMoreKeys="0" /> + <!-- U+0431: "б" CYRILLIC SMALL LETTER BE --> + <Key + latin:keyLabel="б" /> +</merge> diff --git a/java/res/xml/rowkeys_bulgarian_bds2.xml b/java/res/xml/rowkeys_bulgarian_bds2.xml new file mode 100644 index 000000000..ff1bff895 --- /dev/null +++ b/java/res/xml/rowkeys_bulgarian_bds2.xml @@ -0,0 +1,57 @@ +<?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" +> + <!-- U+044C: "ь" CYRILLIC SMALL LETTER SOFT SIGN --> + <Key + latin:keyLabel="ь" /> + <!-- U+044F: "я" CYRILLIC SMALL LETTER YA --> + <Key + latin:keyLabel="я" /> + <!-- U+0430: "а" CYRILLIC SMALL LETTER A --> + <Key + latin:keyLabel="а" /> + <!-- U+043E: "о" CYRILLIC SMALL LETTER O --> + <Key + latin:keyLabel="о" /> + <!-- U+0436: "ж" CYRILLIC SMALL LETTER ZHE --> + <Key + latin:keyLabel="ж" /> + <!-- U+0433: "г" CYRILLIC SMALL LETTER GHE --> + <Key + latin:keyLabel="г" /> + <!-- U+0442: "т" CYRILLIC SMALL LETTER TE --> + <Key + latin:keyLabel="т" /> + <!-- U+043D: "н" CYRILLIC SMALL LETTER EN --> + <Key + latin:keyLabel="н" /> + <!-- U+0432: "в" CYRILLIC SMALL LETTER VE --> + <Key + latin:keyLabel="в" /> + <!-- U+043C: "м" CYRILLIC SMALL LETTER EM --> + <Key + latin:keyLabel="м" /> + <!-- U+0447: "ч" CYRILLIC SMALL LETTER CHE --> + <Key + latin:keyLabel="ч" /> +</merge> diff --git a/java/res/xml/rowkeys_bulgarian_bds3.xml b/java/res/xml/rowkeys_bulgarian_bds3.xml new file mode 100644 index 000000000..7bb780ac7 --- /dev/null +++ b/java/res/xml/rowkeys_bulgarian_bds3.xml @@ -0,0 +1,51 @@ +<?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" +> + <!-- U+044E: "ю" CYRILLIC SMALL LETTER YU --> + <Key + latin:keyLabel="ю" /> + <!-- U+0439: "й" CYRILLIC SMALL LETTER SHORT I --> + <Key + latin:keyLabel="й" /> + <!-- U+044A: "ъ" CYRILLIC SMALL LETTER HARD SIGN --> + <Key + latin:keyLabel="ъ" /> + <!-- U+044D: "э" CYRILLIC SMALL LETTER E --> + <Key + latin:keyLabel="э" /> + <!-- U+0444: "ф" CYRILLIC SMALL LETTER EF --> + <Key + latin:keyLabel="ф" /> + <!-- U+0445: "х" CYRILLIC SMALL LETTER HA --> + <Key + latin:keyLabel="х" /> + <!-- U+043F: "п" CYRILLIC SMALL LETTER PE --> + <Key + latin:keyLabel="п" /> + <!-- U+0440: "р" CYRILLIC SMALL LETTER ER --> + <Key + latin:keyLabel="р" /> + <!-- U+043B: "л" CYRILLIC SMALL LETTER EL --> + <Key + latin:keyLabel="л" /> +</merge> diff --git a/java/res/xml/rowkeys_symbols3.xml b/java/res/xml/rowkeys_symbols3.xml index 0518c1954..2b2d9a4ea 100644 --- a/java/res/xml/rowkeys_symbols3.xml +++ b/java/res/xml/rowkeys_symbols3.xml @@ -21,10 +21,9 @@ <merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" > - <!-- 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=""" latin:moreKeys="!text/more_keys_for_double_quote" /> diff --git a/java/res/xml/rows_bulgarian_bds.xml b/java/res/xml/rows_bulgarian_bds.xml new file mode 100644 index 000000000..9a2f0bc44 --- /dev/null +++ b/java/res/xml/rows_bulgarian_bds.xml @@ -0,0 +1,52 @@ +<?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="9.091%p" + > + <include + latin:keyboardLayout="@xml/rowkeys_bulgarian_bds1" /> + </Row> + <Row + latin:keyWidth="9.091%p" + > + <include + latin:keyboardLayout="@xml/rowkeys_bulgarian_bds2" /> + </Row> + <Row + latin:keyWidth="9.091%p" + > + <Key + latin:keyStyle="shiftKeyStyle" + latin:keyWidth="10.8%p" /> + <include + latin:keyboardLayout="@xml/rowkeys_bulgarian_bds3" /> + <Key + latin:keyStyle="deleteKeyStyle" + latin:keyWidth="fillRight" /> + </Row> + <include + latin:keyboardLayout="@xml/row_qwerty4" /> +</merge> |