diff options
Diffstat (limited to 'java/res/xml-sw600dp')
| -rw-r--r-- | java/res/xml-sw600dp/key_period.xml | 11 | ||||
| -rw-r--r-- | java/res/xml-sw600dp/key_space_3kw.xml | 67 | ||||
| -rw-r--r-- | java/res/xml-sw600dp/row_qwerty4.xml | 69 | ||||
| -rw-r--r-- | java/res/xml-sw600dp/rows_bengali_akkhor.xml | 50 | ||||
| -rw-r--r-- | java/res/xml-sw600dp/rows_nepali_romanized.xml | 5 | ||||
| -rw-r--r-- | java/res/xml-sw600dp/rows_nepali_traditional.xml | 6 | ||||
| -rw-r--r-- | java/res/xml-sw600dp/rows_qwerty.xml | 135 | ||||
| -rw-r--r-- | java/res/xml-sw600dp/rows_serbian_qwertz.xml | 43 | ||||
| -rw-r--r-- | java/res/xml-sw600dp/rows_uzbek.xml | 48 |
9 files changed, 370 insertions, 64 deletions
diff --git a/java/res/xml-sw600dp/key_period.xml b/java/res/xml-sw600dp/key_period.xml index df1daf792..3045cbc63 100644 --- a/java/res/xml-sw600dp/key_period.xml +++ b/java/res/xml-sw600dp/key_period.xml @@ -25,17 +25,6 @@ <!-- Kept as a separate file for cleaner overriding by an overlay. --> <switch> <case - latin:languageCode="hi" - latin:keyboardLayoutSet="hindi_compact" - > - <!-- U+0964: "ред" DEVANAGARI DANDA --> - <Key - latin:keySpec="\u0964" - latin:keyLabelFlags="hasPopupHint" - latin:moreKeys="!autoColumnOrder!8,\\,,.,',#,),(,/,;,@,:,-,",+,\\%,&" - latin:backgroundType="functional" /> - </case> - <case latin:keyboardLayoutSet="dvorak" > <Key diff --git a/java/res/xml-sw600dp/key_space_3kw.xml b/java/res/xml-sw600dp/key_space_3kw.xml new file mode 100644 index 000000000..9932d342e --- /dev/null +++ b/java/res/xml-sw600dp/key_space_3kw.xml @@ -0,0 +1,67 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright 2014, The Android Open Source Project +** +** Licensed under the Apache License, Version 2.0 (the "License"); +** you may not use this file except in compliance with the License. +** You may obtain a copy of the License at +** +** http://www.apache.org/licenses/LICENSE-2.0 +** +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and +** limitations under the License. +*/ +--> + +<merge + xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" +> + <switch> + <!-- fa: Perisan + kn: Kannada + ne: Nepali + te: Telugu --> + <case + latin:languageCode="fa|kn|ne|te" + latin:languageSwitchKeyEnabled="true" + > + <Key + latin:keyStyle="languageSwitchKeyStyle" /> + <Key + latin:keyStyle="spaceKeyStyle" + latin:keyWidth="8.0%p" /> + <Key + latin:keyStyle="zwnjKeyStyle" /> + </case> + <case + latin:languageCode="fa|kn|ne|te" + latin:languageSwitchKeyEnabled="false" + > + <Key + latin:keyStyle="spaceKeyStyle" + latin:keyWidth="16.0%p" /> + <Key + latin:keyStyle="zwnjKeyStyle" /> + </case> + <case + latin:languageSwitchKeyEnabled="true" + > + <Key + latin:keyStyle="languageSwitchKeyStyle" /> + <Key + latin:keyStyle="spaceKeyStyle" + latin:keyWidth="16.0%p" /> + </case> + <!-- languageSwitchKeyEnabled="false" --> + <default> + <Key + latin:keyStyle="spaceKeyStyle" + latin:keyWidth="24.0%p" /> + </default> + </switch> +</merge> diff --git a/java/res/xml-sw600dp/row_qwerty4.xml b/java/res/xml-sw600dp/row_qwerty4.xml index ed7150de4..bcfd2cb7f 100644 --- a/java/res/xml-sw600dp/row_qwerty4.xml +++ b/java/res/xml-sw600dp/row_qwerty4.xml @@ -21,23 +21,54 @@ <merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" > - <Row - latin:keyWidth="9.0%p" - latin:backgroundType="functional" - > - <Key - latin:keyStyle="toSymbolKeyStyle" - latin:keyWidth="10.0%p" /> - <include - latin:keyboardLayout="@xml/key_comma" /> - <!-- Space key. --> - <include - latin:keyXPos="19.0%p" - latin:keyboardLayout="@xml/key_space_7kw" - latin:backgroundType="normal" /> - <include - latin:keyboardLayout="@xml/key_period" /> - <include - latin:keyboardLayout="@xml/key_emoji" /> - </Row> + <switch> + <!-- Split the 4th row for split layouts --> + <case + latin:isSplitLayout="true" + > + <Row + latin:keyWidth="8.0%p" + latin:backgroundType="functional" + > + <Key + latin:keyStyle="toSymbolKeyStyle" /> + <include + latin:keyboardLayout="@xml/key_comma" /> + <!-- Space key. --> + <include + latin:keyboardLayout="@xml/key_space_3kw" + latin:backgroundType="normal" /> + <Spacer + latin:keyWidth="20.0%p" /> + <Key + latin:keyStyle="spaceKeyStyle" + latin:keyWidth="24.0%p" /> + <include + latin:keyboardLayout="@xml/key_period" /> + <include + latin:keyboardLayout="@xml/key_emoji" /> + </Row> + </case> + <default> + <Row + latin:keyWidth="9.0%p" + latin:backgroundType="functional" + > + <Key + latin:keyStyle="toSymbolKeyStyle" + latin:keyWidth="10.0%p" /> + <include + latin:keyboardLayout="@xml/key_comma" /> + <!-- Space key. --> + <include + latin:keyXPos="19.0%p" + latin:keyboardLayout="@xml/key_space_7kw" + latin:backgroundType="normal" /> + <include + latin:keyboardLayout="@xml/key_period" /> + <include + latin:keyboardLayout="@xml/key_emoji" /> + </Row> + </default> + </switch> </merge> diff --git a/java/res/xml-sw600dp/rows_bengali_akkhor.xml b/java/res/xml-sw600dp/rows_bengali_akkhor.xml new file mode 100644 index 000000000..3e81a1438 --- /dev/null +++ b/java/res/xml-sw600dp/rows_bengali_akkhor.xml @@ -0,0 +1,50 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright 2014, The Android Open Source Project +** +** Licensed under the Apache License, Version 2.0 (the "License"); +** you may not use this file except in compliance with the License. +** You may obtain a copy of the License at +** +** http://www.apache.org/licenses/LICENSE-2.0 +** +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and +** limitations under the License. +*/ +--> + +<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" > + <include latin:keyboardLayout="@xml/key_styles_common" /> + <Row + latin:keyLabelFlags="fontNormal" + latin:keyWidth="8.182%p" > + <include latin:keyboardLayout="@xml/rowkeys_bengali_akkhor1" /> + <Key + latin:keyStyle="deleteKeyStyle" + latin:keyWidth="fillRight" /> + </Row> + <Row + latin:keyLabelFlags="fontNormal" + latin:keyWidth="8.182%p" > + <include latin:keyboardLayout="@xml/rowkeys_bengali_akkhor2" /> + <Key + latin:keyStyle="enterKeyStyle" + latin:keyWidth="fillRight" /> + </Row> + <Row + latin:keyLabelFlags="fontNormal" + latin:keyWidth="8.182%p" > + <Key + latin:keyStyle="shiftKeyStyle" + latin:keyWidth="10.0%p" /> + + <include latin:keyboardLayout="@xml/rowkeys_bengali_akkhor3" /> + <include latin:keyboardLayout="@xml/keys_exclamation_question" /> + </Row> + <include latin:keyboardLayout="@xml/row_qwerty4" /> +</merge> diff --git a/java/res/xml-sw600dp/rows_nepali_romanized.xml b/java/res/xml-sw600dp/rows_nepali_romanized.xml index fe73fbd9e..41cd2f9b4 100644 --- a/java/res/xml-sw600dp/rows_nepali_romanized.xml +++ b/java/res/xml-sw600dp/rows_nepali_romanized.xml @@ -39,7 +39,7 @@ latin:keyWidth="fillRight" /> </Row> <Row - latin:keyWidth="8.182%p" + latin:keyWidth="8.0%p" latin:keyLabelFlags="fontNormal" > <Key @@ -47,6 +47,9 @@ latin:keyWidth="10.0%p" /> <include latin:keyboardLayout="@xml/rowkeys_nepali_romanized3" /> <include latin:keyboardLayout="@xml/keys_exclamation_question" /> + <Key + latin:keyStyle="shiftKeyStyle" + latin:keyWidth="fillRight" /> </Row> <include latin:keyboardLayout="@xml/row_qwerty4" /> </merge> diff --git a/java/res/xml-sw600dp/rows_nepali_traditional.xml b/java/res/xml-sw600dp/rows_nepali_traditional.xml index e56271f21..d23ca24e4 100644 --- a/java/res/xml-sw600dp/rows_nepali_traditional.xml +++ b/java/res/xml-sw600dp/rows_nepali_traditional.xml @@ -45,8 +45,8 @@ <Key latin:keyStyle="shiftKeyStyle" latin:keyWidth="10.0%p" /> - <include latin:keyboardLayout="@xml/rowkeys_nepali_traditional3_left6" /> - <include latin:keyboardLayout="@xml/rowkeys_nepali_traditional3_right5" /> - </Row> + <include latin:keyboardLayout="@xml/rowkeys_nepali_traditional3" /> + <include latin:keyboardLayout="@xml/keys_exclamation_question" /> + </Row> <include latin:keyboardLayout="@xml/row_qwerty4" /> </merge> diff --git a/java/res/xml-sw600dp/rows_qwerty.xml b/java/res/xml-sw600dp/rows_qwerty.xml index 58ba1d713..51df4b0cc 100644 --- a/java/res/xml-sw600dp/rows_qwerty.xml +++ b/java/res/xml-sw600dp/rows_qwerty.xml @@ -23,39 +23,114 @@ > <include latin:keyboardLayout="@xml/key_styles_common" /> - <Row - latin:keyWidth="9.0%p" - > - <include - latin:keyboardLayout="@xml/rowkeys_qwerty1" /> - <Key - latin:keyStyle="deleteKeyStyle" - latin:keyWidth="fillRight" /> + <!-- TODO: Consolidate the layout specification between protrait and landscape. + Ideally just the keyWidth should be different and the spacer should adjust to fill + the available space. --> + <!-- First row --> + <Row> + <switch> + <!-- Split keyboard layout for the first row --> + <case + latin:isSplitLayout="true" + > + <include + latin:keyboardLayout="@xml/rowkeys_qwerty1_left5" + latin:keyWidth="8.0%p" /> + <Spacer + latin:keyWidth="10.0%p" /> + <include + latin:keyboardLayout="@xml/rowkeys_qwerty1_right5" + latin:keyWidth="8.0%p" /> + <Key + latin:keyStyle="deleteKeyStyle" + latin:keyWidth="10.0%p" /> + </case> + <!-- Regular layout for the first row --> + <default> + <include + latin:keyboardLayout="@xml/rowkeys_qwerty1" + latin:keyWidth="9.0%p" /> + <Key + latin:keyStyle="deleteKeyStyle" + latin:keyWidth="fillRight" /> + </default> + </switch> </Row> - <Row - latin:keyWidth="9.0%p" - > - <include - latin:keyboardLayout="@xml/rowkeys_qwerty2" - latin:keyXPos="4.5%p" /> - <Key - latin:keyStyle="enterKeyStyle" - latin:keyWidth="fillRight" /> + <!-- Second row --> + <Row> + <switch> + <!-- Split keyboard layout for the second row --> + <case + latin:isSplitLayout="true" + > + <include + latin:keyboardLayout="@xml/rowkeys_qwerty2_left5" + latin:keyXPos="4.0%p" + latin:keyWidth="8.0%p" /> + <Spacer + latin:keyWidth="14.0%p" /> + <include + latin:keyboardLayout="@xml/rowkeys_qwerty2_right4" + latin:keyWidth="8.0%p" /> + <Key + latin:keyStyle="enterKeyStyle" + latin:keyWidth="10.0%p" /> + </case> + <!-- Regular layout for the second row --> + <default> + <include + latin:keyboardLayout="@xml/rowkeys_qwerty2" + latin:keyXPos="4.5%p" + latin:keyWidth="9.0%p" /> + <Key + latin:keyStyle="enterKeyStyle" + latin:keyWidth="fillRight" /> + </default> + </switch> </Row> - <Row - latin:keyWidth="9.0%p" - > - <Key - latin:keyStyle="shiftKeyStyle" - latin:keyWidth="10.0%p" /> - <include - latin:keyboardLayout="@xml/rowkeys_qwerty3" /> - <include - latin:keyboardLayout="@xml/keys_exclamation_question" /> - <Key - latin:keyStyle="shiftKeyStyle" - latin:keyWidth="fillRight" /> + <!-- Third row --> + <Row> + <switch> + <!-- Split keyboard layout for the third row --> + <case + latin:isSplitLayout="true" + > + <Key + latin:keyStyle="shiftKeyStyle" + latin:keyWidth="10.0%p" /> + <include + latin:keyboardLayout="@xml/rowkeys_qwerty3_left4" + latin:keyWidth="8.0%p" /> + <Spacer + latin:keyWidth="8.0%p" /> + <include + latin:keyboardLayout="@xml/rowkeys_qwerty3_right3" + latin:keyWidth="8.0%p" /> + <include + latin:keyboardLayout="@xml/keys_exclamation_question" + latin:keyWidth="8.0%p" /> + <Key + latin:keyStyle="shiftKeyStyle" + latin:keyWidth="10.0%p" /> + </case> + <!-- Regular layout for the third row --> + <default> + <Key + latin:keyStyle="shiftKeyStyle" + latin:keyWidth="10.0%p" /> + <include + latin:keyboardLayout="@xml/rowkeys_qwerty3" + latin:keyWidth="9.0%p" /> + <include + latin:keyboardLayout="@xml/keys_exclamation_question" + latin:keyWidth="9.0%p" /> + <Key + latin:keyStyle="shiftKeyStyle" + latin:keyWidth="fillRight" /> + </default> + </switch> </Row> + <!-- Fourth row --> <include latin:keyboardLayout="@xml/row_qwerty4" /> </merge> diff --git a/java/res/xml-sw600dp/rows_serbian_qwertz.xml b/java/res/xml-sw600dp/rows_serbian_qwertz.xml new file mode 100644 index 000000000..a3fb62523 --- /dev/null +++ b/java/res/xml-sw600dp/rows_serbian_qwertz.xml @@ -0,0 +1,43 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright 2014, The Android Open Source Project +** +** Licensed under the Apache License, Version 2.0 (the "License"); +** you may not use this file except in compliance with the License. +** You may obtain a copy of the License at +** +** http://www.apache.org/licenses/LICENSE-2.0 +** +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and +** limitations under the License. +*/ +--> + +<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" > + <include latin:keyboardLayout="@xml/key_styles_common" /> + <Row latin:keyWidth="8.182%p" > + <include latin:keyboardLayout="@xml/rowkeys_serbian_qwertz1" /> + <Key + latin:keyStyle="deleteKeyStyle" + latin:keyWidth="fillRight" /> + </Row> + <Row latin:keyWidth="8.182%p" > + <include latin:keyboardLayout="@xml/rowkeys_serbian_qwertz2" /> + <Key + latin:keyStyle="enterKeyStyle" + latin:keyWidth="fillRight" /> + </Row> + <Row latin:keyWidth="8.182%p" > + <Key + latin:keyStyle="shiftKeyStyle" + latin:keyWidth="10.0%p" /> + <include latin:keyboardLayout="@xml/rowkeys_serbian_qwertz3" /> + <include latin:keyboardLayout="@xml/keys_exclamation_question" /> + </Row> + <include latin:keyboardLayout="@xml/row_qwerty4" /> +</merge> diff --git a/java/res/xml-sw600dp/rows_uzbek.xml b/java/res/xml-sw600dp/rows_uzbek.xml new file mode 100644 index 000000000..3cd9940f6 --- /dev/null +++ b/java/res/xml-sw600dp/rows_uzbek.xml @@ -0,0 +1,48 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright 2014, The Android Open Source Project +** +** Licensed under the Apache License, Version 2.0 (the "License"); +** you may not use this file except in compliance with the License. +** You may obtain a copy of the License at +** +** http://www.apache.org/licenses/LICENSE-2.0 +** +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and +** limitations under the License. +*/ +--> + +<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" > + <include latin:keyboardLayout="@xml/key_styles_common" /> + <Row latin:keyWidth="8.182%p" > + <include latin:keyboardLayout="@xml/rowkeys_uzbek1" /> + <Key + latin:keyStyle="deleteKeyStyle" + latin:keyWidth="fillRight" /> + </Row> + <Row latin:keyWidth="8.182%p" > + <include latin:keyboardLayout="@xml/rowkeys_uzbek2" /> + <Key + latin:keyStyle="enterKeyStyle" + latin:keyWidth="fillRight" /> + </Row> + <Row latin:keyWidth="8.182%p" > + <Key + latin:keyStyle="shiftKeyStyle" + latin:keyWidth="10.0%p" /> + <Spacer latin:keyWidth="3.181%p" /> + <include latin:keyboardLayout="@xml/rowkeys_qwerty3" /> + <include latin:keyboardLayout="@xml/keys_exclamation_question" /> + <Key + latin:keyStyle="shiftKeyStyle" + latin:keyWidth="fillRight" + latin:keyXPos="-10.0%p" /> + </Row> + <include latin:keyboardLayout="@xml/row_qwerty4" /> +</merge>
\ No newline at end of file |