aboutsummaryrefslogtreecommitdiffstats
path: root/java/res/xml-sw600dp
diff options
context:
space:
mode:
Diffstat (limited to 'java/res/xml-sw600dp')
-rw-r--r--java/res/xml-sw600dp/kbd_more_keys_keyboard_template.xml (renamed from java/res/xml-sw600dp/kbd_mini_keyboard_template.xml)2
-rw-r--r--java/res/xml-sw600dp/kbd_number.xml186
-rw-r--r--java/res/xml-sw600dp/kbd_phone.xml100
-rw-r--r--java/res/xml-sw600dp/kbd_phone_symbols.xml (renamed from java/res/xml-sw600dp/kbd_row3_comma_period.xml)30
-rw-r--r--java/res/xml-sw600dp/kbd_rows_arabic.xml217
-rw-r--r--java/res/xml-sw600dp/kbd_rows_hebrew.xml147
-rw-r--r--java/res/xml-sw600dp/kbd_rows_russian.xml140
-rw-r--r--java/res/xml-sw600dp/kbd_rows_serbian.xml118
-rw-r--r--java/res/xml-sw600dp/key_f2.xml (renamed from java/res/xml-sw600dp/kbd_qwerty_f2.xml)0
-rw-r--r--java/res/xml-sw600dp/key_smiley.xml (renamed from java/res/xml-sw600dp/kbd_row3_smiley.xml)16
-rw-r--r--java/res/xml-sw600dp/key_styles_common.xml (renamed from java/res/xml-sw600dp/kbd_key_styles.xml)85
-rw-r--r--java/res/xml-sw600dp/keys_apostrophe_dash.xml (renamed from java/res/xml-sw600dp/kbd_row4_apostrophe_dash.xml)12
-rw-r--r--java/res/xml-sw600dp/row_qwerty1.xml (renamed from java/res/xml-sw600dp/kbd_qwerty_row1.xml)9
-rw-r--r--java/res/xml-sw600dp/row_qwerty2.xml (renamed from java/res/xml-sw600dp/kbd_qwerty_row2.xml)2
-rw-r--r--java/res/xml-sw600dp/row_qwerty3.xml (renamed from java/res/xml-sw600dp/kbd_qwerty_row3.xml)6
-rw-r--r--java/res/xml-sw600dp/row_qwerty4.xml (renamed from java/res/xml-sw600dp/kbd_qwerty_row4.xml)10
-rw-r--r--java/res/xml-sw600dp/rows_arabic.xml192
-rw-r--r--java/res/xml-sw600dp/rows_azerty.xml (renamed from java/res/xml-sw600dp/kbd_rows_azerty.xml)46
-rw-r--r--java/res/xml-sw600dp/rows_bulgarian.xml148
-rw-r--r--java/res/xml-sw600dp/rows_hebrew.xml149
-rw-r--r--java/res/xml-sw600dp/rows_number_normal.xml138
-rw-r--r--java/res/xml-sw600dp/rows_number_password.xml81
-rw-r--r--java/res/xml-sw600dp/rows_phone.xml (renamed from java/res/xml-sw600dp/kbd_phone_shift.xml)51
-rw-r--r--java/res/xml-sw600dp/rows_qwerty.xml (renamed from java/res/xml-sw600dp/kbd_rows_qwerty.xml)10
-rw-r--r--java/res/xml-sw600dp/rows_qwertz.xml (renamed from java/res/xml-sw600dp/kbd_rows_qwertz.xml)43
-rw-r--r--java/res/xml-sw600dp/rows_scandinavian.xml (renamed from java/res/xml-sw600dp/kbd_rows_scandinavian.xml)25
-rw-r--r--java/res/xml-sw600dp/rows_serbian.xml151
-rw-r--r--java/res/xml-sw600dp/rows_slavic.xml155
-rw-r--r--java/res/xml-sw600dp/rows_spanish.xml (renamed from java/res/xml-sw600dp/kbd_rows_spanish.xml)13
-rw-r--r--java/res/xml-sw600dp/rows_symbols.xml (renamed from java/res/xml-sw600dp/kbd_rows_symbols.xml)45
-rw-r--r--java/res/xml-sw600dp/rows_symbols_shift.xml (renamed from java/res/xml-sw600dp/kbd_rows_symbols_shift.xml)91
31 files changed, 1266 insertions, 1152 deletions
diff --git a/java/res/xml-sw600dp/kbd_mini_keyboard_template.xml b/java/res/xml-sw600dp/kbd_more_keys_keyboard_template.xml
index 0d5795f6a..d90a5884e 100644
--- a/java/res/xml-sw600dp/kbd_mini_keyboard_template.xml
+++ b/java/res/xml-sw600dp/kbd_more_keys_keyboard_template.xml
@@ -21,6 +21,6 @@
<Keyboard xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
latin:keyWidth="8%p"
latin:rowHeight="@dimen/popup_key_height"
- style="?attr/miniKeyboardStyle"
+ style="?attr/moreKeysKeyboardStyle"
>
</Keyboard>
diff --git a/java/res/xml-sw600dp/kbd_number.xml b/java/res/xml-sw600dp/kbd_number.xml
index 46114dedf..70cf6a2ca 100644
--- a/java/res/xml-sw600dp/kbd_number.xml
+++ b/java/res/xml-sw600dp/kbd_number.xml
@@ -20,190 +20,8 @@
<Keyboard
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
- latin:keyWidth="16.75%p"
+ latin:keyWidth="15.00%p"
>
<include
- latin:keyboardLayout="@xml/kbd_key_styles" />
- <include
- latin:keyboardLayout="@xml/kbd_numkey_styles" />
- <switch>
- <case
- latin:passwordInput="true"
- >
- <Row>
- <!-- Note: This Spacer prevents the below key from being marked as a left edge key. -->
- <Spacer
- latin:keyWidth="24.875%p" />
- <Key
- latin:keyStyle="num1KeyStyle" />
- <Key
- latin:keyStyle="num2KeyStyle" />
- <Key
- latin:keyStyle="num3KeyStyle" />
- <Key
- latin:keyStyle="deleteKeyStyle"
- latin:keyXPos="-11.00%p"
- latin:keyWidth="fillRight" />
- </Row>
- <Row>
- <!-- Note: This Spacer prevents the below key from being marked as a left edge key. -->
- <Spacer
- latin:keyWidth="24.875%p" />
- <Key
- latin:keyStyle="num4KeyStyle" />
- <Key
- latin:keyStyle="num5KeyStyle" />
- <Key
- latin:keyStyle="num6KeyStyle" />
- <Key
- latin:keyStyle="returnKeyStyle"
- latin:keyXPos="-11.00%p"
- latin:keyWidth="fillRight" />
- </Row>
- <Row>
- <!-- Note: This Spacer prevents the below key from being marked as a left edge key. -->
- <Spacer
- latin:keyWidth="24.875%p" />
- <Key
- latin:keyStyle="num7KeyStyle" />
- <Key
- latin:keyStyle="num8KeyStyle" />
- <Key
- latin:keyStyle="num9KeyStyle" />
- <!-- Note: This Spacer prevents the above key from being marked as a right edge key. -->
- <Spacer
- latin:keyWidth="0%p" />
- </Row>
- <Row>
- <Key
- latin:keyStyle="tabKeyStyle"
- latin:keyWidth="11.00%p" />
- <Spacer
- latin:keyXPos="24.875%p" />
- <Key
- latin:keyStyle="num0KeyStyle" />
- <Spacer
- latin:keyXPos="-11.00%p"
- latin:keyWidth="0%p" />
- <include
- latin:keyboardLayout="@xml/kbd_qwerty_f2" />
- </Row>
- </case>
- <!-- latin:passwordInput="false" -->
- <default>
- <Row>
- <!-- Note: This Spacer prevents the below key from being marked as a left edge key. -->
- <Spacer
- latin:keyWidth="11.00%p" />
- <Key
- latin:keyLabel="-"
- latin:keyStyle="numKeyStyle"
- latin:keyWidth="9.25%p" />
- <Key
- latin:keyLabel="+"
- latin:keyStyle="numKeyStyle"
- latin:keyWidth="9.25%p" />
- <Key
- latin:keyLabel="."
- latin:keyStyle="numKeyStyle"
- latin:keyWidth="9.25%p" />
- <Key
- latin:keyLabel="1"
- latin:keyStyle="numKeyStyle"
- latin:keyXPos="38.75%p" />
- <Key
- latin:keyLabel="2"
- latin:keyStyle="numKeyStyle" />
- <Key
- latin:keyLabel="3"
- latin:keyStyle="numKeyStyle" />
- <Key
- latin:keyStyle="deleteKeyStyle"
- latin:keyXPos="-11.00%p"
- latin:keyWidth="fillBoth" />
- </Row>
- <Row>
- <!-- Note: This Spacer prevents the below key from being marked as a left edge key. -->
- <Spacer
- latin:keyWidth="11.00%p" />
- <Key
- latin:keyStyle="numStarKeyStyle"
- latin:keyWidth="9.25%p" />
- <Key
- latin:keyLabel="/"
- latin:keyStyle="numKeyStyle"
- latin:keyWidth="9.25%p" />
- <Key
- latin:keyLabel=","
- latin:keyStyle="numKeyStyle"
- latin:keyWidth="9.25%p" />
- <Key
- latin:keyLabel="4"
- latin:keyStyle="numKeyStyle"
- latin:keyXPos="38.75%p" />
- <Key
- latin:keyLabel="5"
- latin:keyStyle="numKeyStyle" />
- <Key
- latin:keyLabel="6"
- latin:keyStyle="numKeyStyle" />
- <Key
- latin:keyStyle="returnKeyStyle"
- latin:keyXPos="-11.00%p"
- latin:keyWidth="fillBoth" />
- </Row>
- <Row>
- <!-- Note: This Spacer prevents the below key from being marked as a left edge key. -->
- <Spacer
- latin:keyWidth="11.00%p" />
- <Key
- latin:keyLabel="("
- latin:keyStyle="numKeyStyle"
- latin:keyWidth="9.25%p" />
- <Key
- latin:keyLabel=")"
- latin:keyStyle="numKeyStyle"
- latin:keyWidth="9.25%p" />
- <Key
- latin:keyLabel="="
- latin:keyStyle="numKeyStyle"
- latin:keyWidth="9.25%p" />
- <Key
- latin:keyLabel="7"
- latin:keyStyle="numKeyStyle"
- latin:keyXPos="38.75%p" />
- <Key
- latin:keyLabel="8"
- latin:keyStyle="numKeyStyle" />
- <Key
- latin:keyLabel="9"
- latin:keyStyle="numKeyStyle" />
- <!-- Note: This Spacer prevents the above key from being marked as a right edge key. -->
- <Spacer
- latin:keyWidth="0%p" />
- </Row>
- <Row>
- <Key
- latin:keyStyle="tabKeyStyle"
- latin:keyWidth="11.00%p" />
- <Key
- latin:keyStyle="nonSpecialBackgroundSpaceKeyStyle"
- latin:keyWidth="27.75%p" />
- <Key
- latin:keyStyle="numStarKeyStyle"
- latin:keyXPos="38.75%p" />
- <Key
- latin:keyLabel="0"
- latin:keyStyle="numKeyStyle" />
- <Key
- latin:keyLabel="#"
- latin:keyStyle="numKeyStyle" />
- <Spacer
- latin:keyXPos="-11.00%p"
- latin:keyWidth="0%p" />
- <include
- latin:keyboardLayout="@xml/kbd_qwerty_f2" />
- </Row>
- </default>
- </switch>
+ latin:keyboardLayout="@xml/rows_number" />
</Keyboard>
diff --git a/java/res/xml-sw600dp/kbd_phone.xml b/java/res/xml-sw600dp/kbd_phone.xml
index 303f8145b..72acef21c 100644
--- a/java/res/xml-sw600dp/kbd_phone.xml
+++ b/java/res/xml-sw600dp/kbd_phone.xml
@@ -20,104 +20,8 @@
<Keyboard
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
- latin:keyWidth="16.75%p"
+ latin:keyWidth="15.00%p"
>
<include
- latin:keyboardLayout="@xml/kbd_key_styles" />
- <include
- latin:keyboardLayout="@xml/kbd_numkey_styles" />
- <Row>
- <!-- Note: This Spacer prevents the below key from being marked as a left edge key. -->
- <Spacer
- latin:keyWidth="15.625%p" />
- <Key
- latin:keyLabel="-"
- latin:keyStyle="numKeyStyle"
- latin:keyWidth="9.25%p" />
- <Key
- latin:keyLabel="+"
- latin:keyStyle="numKeyStyle"
- latin:keyWidth="9.25%p" />
- <Key
- latin:keyStyle="num1KeyStyle"
- latin:keyXPos="38.867%p" />
- <Key
- latin:keyStyle="num2KeyStyle" />
- <Key
- latin:keyStyle="num3KeyStyle" />
- <Key
- latin:keyStyle="deleteKeyStyle"
- latin:keyXPos="-11.00%p"
- latin:keyWidth="fillBoth" />
- </Row>
- <Row>
- <!-- Note: This Spacer prevents the below key from being marked as a left edge key. -->
- <Spacer
- latin:keyWidth="15.625%p" />
- <Key
- latin:keyLabel=","
- latin:keyStyle="numKeyStyle"
- latin:keyWidth="9.25%p" />
- <Key
- latin:keyLabel="."
- latin:keyStyle="numKeyStyle"
- latin:keyWidth="9.25%p" />
- <Key
- latin:keyStyle="num4KeyStyle"
- latin:keyXPos="38.867%p" />
- <Key
- latin:keyStyle="num5KeyStyle" />
- <Key
- latin:keyStyle="num6KeyStyle" />
- <Key
- latin:keyStyle="returnKeyStyle"
- latin:keyXPos="-11.00%p"
- latin:keyWidth="fillBoth" />
- </Row>
- <Row>
- <Key
- latin:keyStyle="toMoreSymbolKeyStyle"
- latin:keyWidth="11.0%p" />
- <Key
- latin:keyLabel="("
- latin:keyStyle="numKeyStyle"
- latin:keyXPos="15.625%p"
- latin:keyWidth="9.25%p" />
- <Key
- latin:keyLabel=")"
- latin:keyStyle="numKeyStyle"
- latin:keyWidth="9.25%p" />
- <Key
- latin:keyStyle="num7KeyStyle"
- latin:keyXPos="38.867%p" />
- <Key
- latin:keyStyle="num8KeyStyle" />
- <Key
- latin:keyStyle="num9KeyStyle" />
- <!-- Note: This Spacer prevents the above key from being marked as a right edge key. -->
- <Spacer
- latin:keyWidth="0%p" />
- </Row>
- <Row>
- <Key
- latin:keyStyle="tabKeyStyle"
- latin:keyWidth="11.00%p" />
- <Key
- latin:keyStyle="nonSpecialBackgroundSpaceKeyStyle"
- latin:keyXPos="15.625%p"
- latin:keyWidth="18.50%p" />
- <Key
- latin:keyStyle="numStarKeyStyle"
- latin:keyXPos="38.867%p" />
- <Key
- latin:keyStyle="num0KeyStyle" />
- <Key
- latin:keyLabel="#"
- latin:keyStyle="numKeyStyle" />
- <Spacer
- latin:keyXPos="-11.00%p"
- latin:keyWidth="0%p" />
- <include
- latin:keyboardLayout="@xml/kbd_qwerty_f2" />
- </Row>
+ latin:keyboardLayout="@xml/rows_phone" />
</Keyboard>
diff --git a/java/res/xml-sw600dp/kbd_row3_comma_period.xml b/java/res/xml-sw600dp/kbd_phone_symbols.xml
index b84443078..9faeaf4e0 100644
--- a/java/res/xml-sw600dp/kbd_row3_comma_period.xml
+++ b/java/res/xml-sw600dp/kbd_phone_symbols.xml
@@ -18,29 +18,11 @@
*/
-->
-<merge
+<Keyboard
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+ latin:keyWidth="15.00%p"
>
- <switch>
- <case
- latin:mode="email"
- >
- <Key
- latin:keyLabel="," />
- <Key
- latin:keyLabel="." />
- </case>
- <default>
- <Key
- latin:keyLabel=","
- latin:keyLabelOption="hasUppercaseLetter"
- latin:keyHintLabel="!"
- latin:moreKeys="!" />
- <Key
- latin:keyLabel="."
- latin:keyLabelOption="hasUppercaseLetter"
- latin:keyHintLabel="\?"
- latin:moreKeys="\?" />
- </default>
- </switch>
-</merge>
+ <!-- Tablet doesn't have phone symbols keyboard -->
+ <include
+ latin:keyboardLayout="@xml/rows_phone" />
+</Keyboard>
diff --git a/java/res/xml-sw600dp/kbd_rows_arabic.xml b/java/res/xml-sw600dp/kbd_rows_arabic.xml
deleted file mode 100644
index c2d3cd4cc..000000000
--- a/java/res/xml-sw600dp/kbd_rows_arabic.xml
+++ /dev/null
@@ -1,217 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2011, 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/kbd_key_styles" />
- <Row
- latin:keyWidth="8.0%p"
- >
- <!-- \u0636: ARABIC LETTER DAD -->
- <Key
- latin:keyLabel="ض" />
- <!-- \u0635: ARABIC LETTER SAD -->
- <Key
- latin:keyLabel="ص" />
- <!-- \u062b: ARABIC LETTER THEH -->
- <Key
- latin:keyLabel="ث" />
- <!-- \u0642: ARABIC LETTER QAF
- \u06a8: ARABIC LETTER QAF WITH THREE DOTS ABOVE -->
- <Key
- latin:keyLabel="ق"
- latin:moreKeys="ڨ" />
- <!-- \u0641: ARABIC LETTER FEH
- \u06a4: ARABIC LETTER VEH
- \u06a2: ARABIC LETTER FEH WITH DOT MOVED BELOW
- \u06a5: ARABIC LETTER FEH WITH THREE DOTS BELOW -->
- <Key
- latin:keyLabel="ف"
- latin:moreKeys="\u06a4,\u06a2,\u06a5" />
- <!-- \u063a: ARABIC LETTER GHAIN -->
- <Key
- latin:keyLabel="غ" />
- <!-- \u0639: ARABIC LETTER AIN -->
- <Key
- latin:keyLabel="ع" />
- <!-- \u0647: ARABIC LETTER HEH
- \ufeeb: ARABIC LETTER HEH INITIAL FORM
- \u0647\u0640: ARABIC LETTER HEH + Zero width joiner -->
- <Key
- latin:keyLabel="ه"
- latin:moreKeys="\ufeeb|\u0647\u200D" />
- <!-- \u062e: ARABIC LETTER KHAH -->
- <Key
- latin:keyLabel="خ" />
- <!-- \u062d: ARABIC LETTER HAH -->
- <Key
- latin:keyLabel="ح" />
- <!-- \u062c: ARABIC LETTER JEEM
- \u0686: ARABIC LETTER TCHEH -->
- <Key
- latin:keyLabel="ج"
- latin:moreKeys="چ" />
- <Key
- latin:keyStyle="deleteKeyStyle"
- latin:keyXPos="-10.0%p"
- latin:keyWidth="fillBoth" />
- </Row>
- <Row
- latin:keyWidth="8.0%p"
- >
- <!-- \u0634: ARABIC LETTER SHEEN
- \u069c: ARABIC LETTER SEEN WITH THREE DOTS BELOW AND THREE DOTS ABOVE -->
- <Key
- latin:keyLabel="ش"
- latin:moreKeys="ڜ"
- latin:keyXPos="3.0%p" />
- <!-- \u0633: ARABIC LETTER SEEN -->
- <Key
- latin:keyLabel="س" />
- <!-- \u064a: ARABIC LETTER YEH
- \u0626: ARABIC LETTER YEH WITH HAMZA ABOVE
- \u0649: ARABIC LETTER ALEF MAKSURA -->
- <Key
- latin:keyLabel="ي"
- latin:moreKeys="\u0626,\u0649" />
- <!-- \u0628: ARABIC LETTER BEH
- \u067e: ARABIC LETTER PEH -->
- <Key
- latin:keyLabel="ب"
- latin:moreKeys="پ" />
- <!-- \u0644: ARABIC LETTER LAM
- \ufefb: ARABIC LIGATURE LAM WITH ALEF ISOLATED FORM
- \u0627: ARABIC LETTER ALEF
- \ufef7: ARABIC LIGATURE LAM WITH ALEF WITH HAMZA ABOVE ISOLATED FORM
- \u0623: ARABIC LETTER ALEF WITH HAMZA ABOVE
- \ufef9: ARABIC LIGATURE LAM WITH ALEF WITH HAMZA BELOW ISOLATED FORM
- \u0625: ARABIC LETTER ALEF WITH HAMZA BELOW
- \ufef5: ARABIC LIGATURE LAM WITH ALEF WITH MADDA ABOVE ISOLATED FORM
- \u0622: ARABIC LETTER ALEF WITH MADDA ABOVE -->
- <Key
- latin:keyLabel="ل"
- latin:moreKeys="\ufefb|\u0644\u0627,\ufef7|\u0644\u0623,\ufef9|\u0644\u0625,\ufef5|\u0644\u0622" />
- <!-- \u0627: ARABIC LETTER ALEF
- \u0621: ARABIC LETTER HAMZA
- \u0671: ARABIC LETTER ALEF WASLA
- \u0623: ARABIC LETTER ALEF WITH HAMZA ABOVE
- \u0625: ARABIC LETTER ALEF WITH HAMZA BELOW
- \u0622: ARABIC LETTER ALEF WITH MADDA ABOVE -->
- <Key
- latin:keyLabel="ا"
- latin:moreKeys="\u0621,\u0671,\u0623,\u0625,\u0622" />
- <!-- \u062a: ARABIC LETTER TEH -->
- <Key
- latin:keyLabel="ت" />
- <!-- \u0646: ARABIC LETTER NOON -->
- <Key
- latin:keyLabel="ن" />
- <!-- \u0645: ARABIC LETTER MEEM -->
- <Key
- latin:keyLabel="م" />
- <!-- \u0643: ARABIC LETTER KAF
- \u06af: ARABIC LETTER GAF
- \u06a9: ARABIC LETTER KEHEH -->
- <Key
- latin:keyLabel="ك"
- latin:moreKeys="\u06af,\u06a9" />
- <!-- \u0637: ARABIC LETTER TAH -->
- <Key
- latin:keyLabel="ط" />
- <Key
- latin:keyStyle="returnKeyStyle"
- latin:keyXPos="-14.6%p"
- latin:keyWidth="fillBoth" />
- </Row>
- <Row
- latin:keyWidth="8.0%p"
- >
- <!-- kbd_row3_smiley -->
- <switch>
- <case
- latin:mode="email"
- >
- <Key
- latin:keyLabel="\@" />
- </case>
- <case
- latin:mode="url"
- >
- <Key
- latin:keyLabel="-"
- latin:keyLabelOption="hasUppercaseLetter"
- latin:keyHintLabel="_"
- latin:moreKeys="_" />
- </case>
- <case
- latin:imeAction="actionSearch"
- >
- <Key
- latin:keyLabel=":"
- latin:keyLabelOption="hasUppercaseLetter"
- latin:keyHintLabel="+"
- latin:moreKeys="+" />
- </case>
- <default>
- <Key
- latin:keyStyle="smileyKeyStyle" />
- </default>
- </switch>
- <!-- \u0626: ARABIC LETTER YEH WITH HAMZA ABOVE -->
- <Key
- latin:keyLabel="ئ" />
- <!-- \u0621: ARABIC LETTER HAMZA -->
- <Key
- latin:keyLabel="ء" />
- <!-- \u0624: ARABIC LETTER WAW WITH HAMZA ABOVE -->
- <Key
- latin:keyLabel="ؤ" />
- <!-- \u0631: ARABIC LETTER REH -->
- <Key
- latin:keyLabel="ر" />
- <!-- \u0630: ARABIC LETTER THAL -->
- <Key
- latin:keyLabel="ذ" />
- <!-- \u0649: ARABIC LETTER ALEF MAKSURA -->
- <Key
- latin:keyLabel="ى" />
- <!-- \u0629: ARABIC LETTER TEH MARBUTA -->
- <Key
- latin:keyLabel="ة" />
- <!-- \u0648: ARABIC LETTER WAW -->
- <Key
- latin:keyLabel="و" />
- <!-- \u0632: ARABIC LETTER ZAIN
- \u0698: ARABIC LETTER JEH -->
- <Key
- latin:keyLabel="ز"
- latin:moreKeys="ژ" />
- <!-- \u0638: ARABIC LETTER ZAH -->
- <Key
- latin:keyLabel="ظ" />
- <!-- \u062f: ARABIC LETTER DAL -->
- <Key
- latin:keyLabel="د" />
- </Row>
- <include
- latin:keyboardLayout="@xml/kbd_qwerty_row4" />
-</merge>
diff --git a/java/res/xml-sw600dp/kbd_rows_hebrew.xml b/java/res/xml-sw600dp/kbd_rows_hebrew.xml
deleted file mode 100644
index a8adbd34c..000000000
--- a/java/res/xml-sw600dp/kbd_rows_hebrew.xml
+++ /dev/null
@@ -1,147 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2011, 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/kbd_key_styles" />
- <Row
- latin:keyWidth="9.0%p"
- >
- <include
- latin:keyboardLayout="@xml/kbd_row4_apostrophe_dash" />
- <Key
- latin:keyLabel="ק" />
- <Key
- latin:keyLabel="ר" />
- <Key
- latin:keyLabel="א" />
- <Key
- latin:keyLabel="ט" />
- <Key
- latin:keyLabel="ו" />
- <Key
- latin:keyLabel="ן" />
- <Key
- latin:keyLabel="ם" />
- <Key
- latin:keyLabel="פ" />
- <Key
- latin:keyStyle="deleteKeyStyle"
- latin:keyXPos="-12.000%p"
- latin:keyWidth="fillBoth" />
- </Row>
- <Row
- latin:keyWidth="9.0%p"
- >
- <Key
- latin:keyLabel="ש"
- latin:keyXPos="4.500%p" />
- <Key
- latin:keyLabel="ד" />
- <Key
- latin:keyLabel="ג"
- latin:moreKeys="ג׳" />
- <Key
- latin:keyLabel="כ" />
- <Key
- latin:keyLabel="ע" />
- <Key
- latin:keyLabel="י"
- latin:moreKeys="ײַ" />
- <Key
- latin:keyLabel="ח"
- latin:moreKeys="ח׳" />
- <Key
- latin:keyLabel="ל" />
- <Key
- latin:keyLabel="ך" />
- <Key
- latin:keyLabel="ף" />
- </Row>
- <Row
- latin:keyWidth="8.9%p"
- >
- <!-- kbd_row3_smiley -->
- <switch>
- <case
- latin:mode="email"
- >
- <Key
- latin:keyLabel="\@"
- latin:keyWidth="10.0%p" />
- </case>
- <case
- latin:mode="url"
- >
- <Key
- latin:keyLabel="-"
- latin:keyLabelOption="hasUppercaseLetter"
- latin:keyHintLabel="_"
- latin:moreKeys="_"
- latin:keyWidth="10.0%p" />
- </case>
- <case
- latin:imeAction="actionSearch"
- >
- <Key
- latin:keyLabel=":"
- latin:keyLabelOption="hasUppercaseLetter"
- latin:keyHintLabel="+"
- latin:moreKeys="+"
- latin:keyWidth="10.0%p" />
- </case>
- <default>
- <Key
- latin:keyStyle="smileyKeyStyle"
- latin:keyWidth="10.0%p" />
- </default>
- </switch>
- <Key
- latin:keyLabel="ז"
- latin:moreKeys="ז׳" />
- <Key
- latin:keyLabel="ס" />
- <Key
- latin:keyLabel="ב" />
- <Key
- latin:keyLabel="ה" />
- <Key
- latin:keyLabel="נ" />
- <Key
- latin:keyLabel="מ" />
- <Key
- latin:keyLabel="צ"
- latin:moreKeys="צ׳" />
- <Key
- latin:keyLabel="ת"
- latin:moreKeys="ת׳" />
- <Key
- latin:keyLabel="ץ"
- latin:moreKeys="ץ׳" />
- <Key
- latin:keyStyle="returnKeyStyle"
- latin:keyXPos="-10.400%p"
- latin:keyWidth="fillBoth" />
- </Row>
- <include
- latin:keyboardLayout="@xml/kbd_qwerty_row4" />
-</merge>
diff --git a/java/res/xml-sw600dp/kbd_rows_russian.xml b/java/res/xml-sw600dp/kbd_rows_russian.xml
deleted file mode 100644
index cc9ad3aa7..000000000
--- a/java/res/xml-sw600dp/kbd_rows_russian.xml
+++ /dev/null
@@ -1,140 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2011, 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/kbd_key_styles" />
- <Row
- latin:keyWidth="7.60%p"
- >
- <Key
- latin:keyLabel="й" />
- <Key
- latin:keyLabel="ц" />
- <Key
- latin:keyLabel="у" />
- <Key
- latin:keyLabel="к" />
- <Key
- latin:keyLabel="е"
- latin:moreKeys="@string/more_keys_for_cyrillic_e" />
- <Key
- latin:keyLabel="н" />
- <Key
- latin:keyLabel="г" />
- <Key
- latin:keyLabel="ш" />
- <Key
- latin:keyLabel="щ" />
- <Key
- latin:keyLabel="з" />
- <Key
- latin:keyLabel="х" />
- <Key
- latin:keyLabel="ъ" />
- <Key
- latin:keyStyle="deleteKeyStyle"
- latin:keyXPos="-10.0%p"
- latin:keyWidth="fillBoth" />
- </Row>
- <Row
- latin:keyWidth="7.60%p"
- >
- <Key
- latin:keyLabel="ф"
- latin:keyXPos="2.25%p" />
- <Key
- latin:keyLabel="ы" />
- <Key
- latin:keyLabel="в" />
- <Key
- latin:keyLabel="а" />
- <Key
- latin:keyLabel="п" />
- <Key
- latin:keyLabel="р" />
- <Key
- latin:keyLabel="о" />
- <Key
- latin:keyLabel="л" />
- <Key
- latin:keyLabel="д" />
- <Key
- latin:keyLabel="ж" />
- <Key
- latin:keyLabel="э" />
- <Key
- latin:keyStyle="returnKeyStyle"
- latin:keyXPos="-14.6%p"
- latin:keyWidth="fillBoth" />
- </Row>
- <Row
- latin:keyWidth="7.60%p"
- >
- <Key
- latin:keyStyle="shiftKeyStyle" />
- <Key
- latin:keyLabel="я" />
- <Key
- latin:keyLabel="ч" />
- <Key
- latin:keyLabel="с" />
- <Key
- latin:keyLabel="м" />
- <Key
- latin:keyLabel="и" />
- <Key
- latin:keyLabel="т" />
- <Key
- latin:keyLabel="ь" />
- <Key
- latin:keyLabel="б" />
- <Key
- latin:keyLabel="ю" />
- <switch>
- <case
- latin:mode="email"
- >
- <Key
- latin:keyLabel="," />
- <Key
- latin:keyLabel="." />
- </case>
- <default>
- <Key
- latin:keyLabel=","
- latin:keyLabelOption="hasUppercaseLetter"
- latin:keyHintLabel="!"
- latin:moreKeys="!" />
- <Key
- latin:keyLabel="."
- latin:keyLabelOption="hasUppercaseLetter"
- latin:keyHintLabel="\?"
- latin:moreKeys="\?" />
- </default>
- </switch>
- <include
- latin:keyboardLayout="@xml/kbd_row3_smiley" />
- </Row>
- <include
- latin:keyboardLayout="@xml/kbd_qwerty_row4" />
-</merge>
diff --git a/java/res/xml-sw600dp/kbd_rows_serbian.xml b/java/res/xml-sw600dp/kbd_rows_serbian.xml
deleted file mode 100644
index db7560cdc..000000000
--- a/java/res/xml-sw600dp/kbd_rows_serbian.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2011, 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/kbd_key_styles" />
- <Row
- latin:keyWidth="8.0%p"
- >
- <Key
- latin:keyLabel="љ"
- latin:keyXPos="2.15%p" />
- <Key
- latin:keyLabel="њ" />
- <Key
- latin:keyLabel="е" />
- <Key
- latin:keyLabel="р" />
- <Key
- latin:keyLabel="т" />
- <Key
- latin:keyLabel="з" />
- <Key
- latin:keyLabel="у" />
- <Key
- latin:keyLabel="и" />
- <Key
- latin:keyLabel="о" />
- <Key
- latin:keyLabel="п" />
- <Key
- latin:keyLabel="ш" />
- <Key
- latin:keyStyle="deleteKeyStyle"
- latin:keyXPos="-10.0%p"
- latin:keyWidth="fillBoth" />
- </Row>
- <Row
- latin:keyWidth="7.9%p"
- >
- <Key
- latin:keyLabel="а" />
- <Key
- latin:keyLabel="с" />
- <Key
- latin:keyLabel="д" />
- <Key
- latin:keyLabel="ф" />
- <Key
- latin:keyLabel="г" />
- <Key
- latin:keyLabel="х" />
- <Key
- latin:keyLabel="ј" />
- <Key
- latin:keyLabel="к" />
- <Key
- latin:keyLabel="л" />
- <Key
- latin:keyLabel="ч" />
- <Key
- latin:keyLabel="ћ" />
- <Key
- latin:keyStyle="returnKeyStyle"
- latin:keyXPos="-14.6%p"
- latin:keyWidth="fillBoth" />
- </Row>
- <Row
- latin:keyWidth="7.5%p"
- >
- <Key
- latin:keyStyle="shiftKeyStyle"
- latin:keyWidth="8.0%p" />
- <Key
- latin:keyLabel="ѕ" />
- <Key
- latin:keyLabel="џ" />
- <Key
- latin:keyLabel="ц" />
- <Key
- latin:keyLabel="в" />
- <Key
- latin:keyLabel="б" />
- <Key
- latin:keyLabel="н" />
- <Key
- latin:keyLabel="м" />
- <Key
- latin:keyLabel="ђ" />
- <Key
- latin:keyLabel="ж" />
- <include
- latin:keyboardLayout="@xml/kbd_row3_comma_period" />
- <include
- latin:keyboardLayout="@xml/kbd_row3_smiley" />
- </Row>
- <include
- latin:keyboardLayout="@xml/kbd_qwerty_row4" />
-</merge>
diff --git a/java/res/xml-sw600dp/kbd_qwerty_f2.xml b/java/res/xml-sw600dp/key_f2.xml
index b25afc12f..b25afc12f 100644
--- a/java/res/xml-sw600dp/kbd_qwerty_f2.xml
+++ b/java/res/xml-sw600dp/key_f2.xml
diff --git a/java/res/xml-sw600dp/kbd_row3_smiley.xml b/java/res/xml-sw600dp/key_smiley.xml
index f9b647cdf..3430d7898 100644
--- a/java/res/xml-sw600dp/kbd_row3_smiley.xml
+++ b/java/res/xml-sw600dp/key_smiley.xml
@@ -26,37 +26,29 @@
latin:mode="email"
>
<Key
- latin:keyLabel="\@"
- latin:keyXPos="-8.9%p"
- latin:keyWidth="fillBoth" />
+ latin:keyLabel="\@" />
</case>
<case
latin:mode="url"
>
<Key
latin:keyLabel="-"
- latin:keyLabelOption="hasUppercaseLetter"
latin:keyHintLabel="_"
latin:moreKeys="_"
- latin:keyXPos="-8.9%p"
- latin:keyWidth="fillBoth" />
+ latin:keyStyle="hasShiftedLetterHintStyle" />
</case>
<case
latin:imeAction="actionSearch"
>
<Key
latin:keyLabel=":"
- latin:keyLabelOption="hasUppercaseLetter"
latin:keyHintLabel="+"
latin:moreKeys="+"
- latin:keyXPos="-8.9%p"
- latin:keyWidth="fillBoth" />
+ latin:keyStyle="hasShiftedLetterHintStyle" />
</case>
<default>
<Key
- latin:keyStyle="smileyKeyStyle"
- latin:keyXPos="-8.9%p"
- latin:keyWidth="fillBoth" />
+ latin:keyStyle="smileyKeyStyle" />
</default>
</switch>
</merge>
diff --git a/java/res/xml-sw600dp/kbd_key_styles.xml b/java/res/xml-sw600dp/key_styles_common.xml
index 25fa8b265..e524aa381 100644
--- a/java/res/xml-sw600dp/kbd_key_styles.xml
+++ b/java/res/xml-sw600dp/key_styles_common.xml
@@ -33,51 +33,92 @@
<default>
<key-style
latin:styleName="f2PopupStyle"
- latin:keyLabelOption="hasPopupHint"
- latin:moreKeys="\@icon/3|\@integer/key_settings"
+ latin:keyLabelFlags="hasPopupHint"
+ latin:moreKeys="\@icon/settingsKey|\@integer/key_settings"
latin:backgroundType="functional" />
</default>
</switch>
+ <switch>
+ <case
+ latin:keyboardSetElement="alphabetManualShifted|alphabetShiftLockShifted"
+ >
+ <key-style
+ latin:styleName="hasShiftedLetterHintStyle"
+ latin:keyLabelFlags="hasShiftedLetterHint|shiftedLetterActivated" />
+ </case>
+ <default>
+ <key-style
+ latin:styleName="hasShiftedLetterHintStyle"
+ latin:keyLabelFlags="hasShiftedLetterHint" />
+ </default>
+ </switch>
<!-- Functional key styles -->
- <key-style
- latin:styleName="shiftKeyStyle"
- latin:code="@integer/key_shift"
- latin:keyIcon="iconShiftKey"
- latin:keyIconShifted="iconShiftedShiftKey"
- latin:backgroundType="sticky" />
+ <switch>
+ <case
+ latin:keyboardSetElement="alphabetManualShifted|alphabetAutomaticShifted"
+ >
+ <key-style
+ latin:styleName="shiftKeyStyle"
+ latin:code="@integer/key_shift"
+ latin:keyIcon="iconShiftKeyShifted"
+ latin:keyActionFlags="noKeyPreview"
+ latin:backgroundType="stickyOff" />
+ </case>
+ <case
+ latin:keyboardSetElement="alphabetShiftLocked|alphabetShiftLockShifted"
+ >
+ <key-style
+ latin:styleName="shiftKeyStyle"
+ latin:code="@integer/key_shift"
+ latin:keyIcon="iconShiftKeyShifted"
+ latin:keyActionFlags="noKeyPreview"
+ latin:backgroundType="stickyOn" />
+ </case>
+ <default>
+ <key-style
+ latin:styleName="shiftKeyStyle"
+ latin:code="@integer/key_shift"
+ latin:keyIcon="iconShiftKey"
+ latin:keyActionFlags="noKeyPreview"
+ latin:backgroundType="stickyOff" />
+ </default>
+ </switch>
<key-style
latin:styleName="deleteKeyStyle"
latin:code="@integer/key_delete"
latin:keyIcon="iconDeleteKey"
- latin:backgroundType="functional"
- latin:isRepeatable="true" />
- <key-style
- latin:styleName="returnKeyStyle"
- latin:code="@integer/key_return"
- latin:keyIcon="iconReturnKey"
+ latin:keyActionFlags="isRepeatable|noKeyPreview"
latin:backgroundType="functional" />
+ <include
+ latin:keyboardLayout="@xml/key_styles_enter_tablet" />
<key-style
latin:styleName="spaceKeyStyle"
- latin:code="@integer/key_space" />
+ latin:code="@integer/key_space"
+ latin:keyActionFlags="noKeyPreview" />
<key-style
latin:styleName="nonSpecialBackgroundSpaceKeyStyle"
- latin:code="@integer/key_space" />
+ latin:code="@integer/key_space"
+ latin:keyActionFlags="noKeyPreview" />
<key-style
latin:styleName="smileyKeyStyle"
latin:keyLabel=":-)"
latin:keyOutputText=":-) "
- latin:keyLabelOption="hasPopupHint"
+ latin:keyLabelFlags="hasPopupHint|preserveCase"
latin:moreKeys="@string/more_keys_for_smiley"
latin:maxMoreKeysColumn="5" />
<key-style
latin:styleName="shortcutKeyStyle"
latin:code="@integer/key_shortcut"
latin:keyIcon="iconShortcutKey"
+ latin:keyIconDisabled="iconDisabledShortcutKey"
+ latin:keyLabelFlags="preserveCase"
+ latin:keyActionFlags="noKeyPreview|altCodeWhileTyping"
latin:parentStyle="f2PopupStyle" />
<key-style
latin:styleName="settingsKeyStyle"
latin:code="@integer/key_settings"
latin:keyIcon="iconSettingsKey"
+ latin:keyActionFlags="noKeyPreview|altCodeWhileTyping"
latin:backgroundType="functional" />
<key-style
latin:styleName="tabKeyStyle"
@@ -89,26 +130,34 @@
latin:styleName="toSymbolKeyStyle"
latin:code="@integer/key_switch_alpha_symbol"
latin:keyLabel="@string/label_to_symbol_key"
+ latin:keyLabelFlags="preserveCase"
+ latin:keyActionFlags="noKeyPreview"
latin:backgroundType="functional" />
<key-style
latin:styleName="toAlphaKeyStyle"
latin:code="@integer/key_switch_alpha_symbol"
latin:keyLabel="@string/label_to_alpha_key"
+ latin:keyLabelFlags="preserveCase"
+ latin:keyActionFlags="noKeyPreview"
latin:backgroundType="functional" />
<key-style
latin:styleName="toMoreSymbolKeyStyle"
latin:code="@integer/key_shift"
latin:keyLabel="@string/label_to_more_symbol_for_tablet_key"
+ latin:keyLabelFlags="preserveCase"
+ latin:keyActionFlags="noKeyPreview"
latin:backgroundType="functional" />
<key-style
latin:styleName="backFromMoreSymbolKeyStyle"
latin:code="@integer/key_shift"
latin:keyLabel="@string/label_to_symbol_key"
+ latin:keyLabelFlags="preserveCase"
+ latin:keyActionFlags="noKeyPreview"
latin:backgroundType="functional" />
<key-style
latin:styleName="comKeyStyle"
latin:keyLabel="@string/keylabel_for_popular_domain"
- latin:keyLabelOption="fontNormal|hasPopupHint"
+ latin:keyLabelFlags="fontNormal|hasPopupHint|preserveCase"
latin:keyOutputText="@string/keylabel_for_popular_domain"
latin:moreKeys="@string/more_keys_for_popular_domain" />
</merge>
diff --git a/java/res/xml-sw600dp/kbd_row4_apostrophe_dash.xml b/java/res/xml-sw600dp/keys_apostrophe_dash.xml
index 9536e81da..a53c1e4ab 100644
--- a/java/res/xml-sw600dp/kbd_row4_apostrophe_dash.xml
+++ b/java/res/xml-sw600dp/keys_apostrophe_dash.xml
@@ -33,16 +33,16 @@
>
<Key
latin:keyLabel="/"
- latin:keyLabelOption="hasUppercaseLetter"
latin:keyHintLabel=":"
- latin:moreKeys=":" />
+ latin:moreKeys=":"
+ latin:keyStyle="hasShiftedLetterHintStyle" />
</case>
<default>
<Key
latin:keyLabel="@string/keylabel_for_apostrophe"
- latin:keyLabelOption="hasUppercaseLetter"
latin:keyHintLabel="@string/keyhintlabel_for_apostrophe"
- latin:moreKeys="@string/more_keys_for_apostrophe" />
+ latin:moreKeys="@string/more_keys_for_apostrophe"
+ latin:keyStyle="hasShiftedLetterHintStyle" />
</default>
</switch>
<switch>
@@ -55,9 +55,9 @@
<default>
<Key
latin:keyLabel="@string/keylabel_for_dash"
- latin:keyLabelOption="hasUppercaseLetter"
latin:keyHintLabel="@string/keyhintlabel_for_dash"
- latin:moreKeys="@string/more_keys_for_dash" />
+ latin:moreKeys="@string/more_keys_for_dash"
+ latin:keyStyle="hasShiftedLetterHintStyle" />
</default>
</switch>
</merge>
diff --git a/java/res/xml-sw600dp/kbd_qwerty_row1.xml b/java/res/xml-sw600dp/row_qwerty1.xml
index 07d8e2296..3d3a1a8ff 100644
--- a/java/res/xml-sw600dp/kbd_qwerty_row1.xml
+++ b/java/res/xml-sw600dp/row_qwerty1.xml
@@ -25,11 +25,9 @@
latin:keyWidth="9.0%p"
>
<Key
- latin:keyLabel="q"
- latin:moreKeys="@string/more_keys_for_q" />
+ latin:keyLabel="q" />
<Key
- latin:keyLabel="w"
- latin:moreKeys="@string/more_keys_for_w" />
+ latin:keyLabel="w" />
<Key
latin:keyLabel="e"
latin:moreKeys="@string/more_keys_for_e" />
@@ -52,8 +50,7 @@
latin:keyLabel="o"
latin:moreKeys="@string/more_keys_for_o" />
<Key
- latin:keyLabel="p"
- latin:moreKeys="@string/more_keys_for_p" />
+ latin:keyLabel="p" />
<Key
latin:keyStyle="deleteKeyStyle"
latin:keyXPos="-10.0%p"
diff --git a/java/res/xml-sw600dp/kbd_qwerty_row2.xml b/java/res/xml-sw600dp/row_qwerty2.xml
index 52a948f20..cabb9cb4a 100644
--- a/java/res/xml-sw600dp/kbd_qwerty_row2.xml
+++ b/java/res/xml-sw600dp/row_qwerty2.xml
@@ -50,7 +50,7 @@
latin:keyLabel="l"
latin:moreKeys="@string/more_keys_for_l" />
<Key
- latin:keyStyle="returnKeyStyle"
+ latin:keyStyle="enterKeyStyle"
latin:keyXPos="-14.6%p"
latin:keyWidth="fillBoth" />
</Row>
diff --git a/java/res/xml-sw600dp/kbd_qwerty_row3.xml b/java/res/xml-sw600dp/row_qwerty3.xml
index 4dabf633c..3d19904a1 100644
--- a/java/res/xml-sw600dp/kbd_qwerty_row3.xml
+++ b/java/res/xml-sw600dp/row_qwerty3.xml
@@ -46,8 +46,10 @@
<Key
latin:keyLabel="m" />
<include
- latin:keyboardLayout="@xml/kbd_row3_comma_period" />
+ latin:keyboardLayout="@xml/keys_comma_period" />
<include
- latin:keyboardLayout="@xml/kbd_row3_smiley" />
+ latin:keyboardLayout="@xml/key_smiley"
+ latin:keyXPos="-8.9%p"
+ latin:keyWidth="fillBoth" />
</Row>
</merge>
diff --git a/java/res/xml-sw600dp/kbd_qwerty_row4.xml b/java/res/xml-sw600dp/row_qwerty4.xml
index ef0292279..b06508e37 100644
--- a/java/res/xml-sw600dp/kbd_qwerty_row4.xml
+++ b/java/res/xml-sw600dp/row_qwerty4.xml
@@ -45,9 +45,9 @@
<default>
<Key
latin:keyLabel="/"
- latin:keyLabelOption="hasUppercaseLetter"
latin:keyHintLabel="\@"
- latin:moreKeys="\@" />
+ latin:moreKeys="\@"
+ latin:keyStyle="hasShiftedLetterHintStyle" />
</default>
</switch>
<Key
@@ -59,18 +59,18 @@
latin:languageCode="iw"
>
<include
- latin:keyboardLayout="@xml/kbd_row3_comma_period" />
+ latin:keyboardLayout="@xml/keys_comma_period" />
</case>
<!-- not languageCode="iw" -->
<default>
<include
- latin:keyboardLayout="@xml/kbd_row4_apostrophe_dash" />
+ latin:keyboardLayout="@xml/keys_apostrophe_dash" />
</default>
</switch>
<Spacer
latin:keyXPos="-10.00%p"
latin:keyWidth="0%p" />
<include
- latin:keyboardLayout="@xml/kbd_qwerty_f2" />
+ latin:keyboardLayout="@xml/key_f2" />
</Row>
</merge>
diff --git a/java/res/xml-sw600dp/rows_arabic.xml b/java/res/xml-sw600dp/rows_arabic.xml
new file mode 100644
index 000000000..60ad45e7f
--- /dev/null
+++ b/java/res/xml-sw600dp/rows_arabic.xml
@@ -0,0 +1,192 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2011, 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.0%p"
+ >
+ <!-- U+0636: "ض" ARABIC LETTER DAD -->
+ <Key
+ latin:keyLabel="&#x0636;" />
+ <!-- U+0635: "ص" ARABIC LETTER SAD -->
+ <Key
+ latin:keyLabel="&#x0635;" />
+ <!-- U+062B: "ث" ARABIC LETTER THEH -->
+ <Key
+ latin:keyLabel="&#x062B;" />
+ <!-- U+0642: "ق" ARABIC LETTER QAF
+ U+06A8: "ڨ" ARABIC LETTER QAF WITH THREE DOTS ABOVE -->
+ <!-- TODO: DroidSansArabic lacks the glyph of U+06A8 ARABIC LETTER QAF WITH THREE DOTS ABOVE -->
+ <Key
+ latin:keyLabel="&#x0642;"
+ latin:moreKeys="&#x06A8;" />
+ <!-- U+0641: "ف" ARABIC LETTER FEH
+ U+06A4: "ڤ" ARABIC LETTER VEH
+ U+06A2: "ڢ" ARABIC LETTER FEH WITH DOT MOVED BELOW
+ U+06A5: "ڥ" ARABIC LETTER FEH WITH THREE DOTS BELOW -->
+ <!-- TODO: DroidSansArabic lacks the glyph of U+06A2 ARABIC LETTER FEH WITH DOT MOVED BELOW -->
+ <!-- TODO: DroidSansArabic lacks the glyph of U+06A5 ARABIC LETTER FEH WITH THREE DOTS BELOW -->
+ <Key
+ latin:keyLabel="&#x0641;"
+ latin:moreKeys="&#x06A4;,&#x06A2;,&#x06A5;" />
+ <!-- U+063A: "غ" ARABIC LETTER GHAIN -->
+ <Key
+ latin:keyLabel="&#x063A;" />
+ <!-- U+0639: "ع" ARABIC LETTER AIN -->
+ <Key
+ latin:keyLabel="&#x0639;" />
+ <!-- U+0647: "ه" ARABIC LETTER HEH
+ U+FEEB: "ﻫ" ARABIC LETTER HEH INITIAL FORM
+ U+0647 U+200D: ARABIC LETTER HEH + ZERO WIDTH JOINER -->
+ <Key
+ latin:keyLabel="&#x0647;"
+ latin:moreKeys="&#xFEEB;|&#x0647;&#x200D;" />
+ <!-- U+062E: "خ" ARABIC LETTER KHAH -->
+ <Key
+ latin:keyLabel="&#x062E;" />
+ <!-- U+062D: "ح" ARABIC LETTER HAH -->
+ <Key
+ latin:keyLabel="&#x062D;" />
+ <!-- U+062C: "ج" ARABIC LETTER JEEM
+ U+0686: "چ" ARABIC LETTER TCHEH -->
+ <Key
+ latin:keyLabel="&#x062C;"
+ latin:moreKeys="&#x0686;" />
+ <Key
+ latin:keyStyle="deleteKeyStyle"
+ latin:keyXPos="-10.0%p"
+ latin:keyWidth="fillBoth" />
+ </Row>
+ <Row
+ latin:keyWidth="8.0%p"
+ >
+ <!-- U+0634: "ش" ARABIC LETTER SHEEN
+ U+069C: "ڜ" ARABIC LETTER SEEN WITH THREE DOTS BELOW AND THREE DOTS ABOVE -->
+ <!-- TODO: DroidSansArabic lacks the glyph of U+069C ARABIC LETTER SEEN WITH THREE DOTS BELOW AND THREE DOTS ABOVE -->
+ <Key
+ latin:keyLabel="&#x0634;"
+ latin:moreKeys="&#x069C;"
+ latin:keyXPos="3.0%p" />
+ <!-- U+0633: "س" ARABIC LETTER SEEN -->
+ <Key
+ latin:keyLabel="&#x0633;" />
+ <!-- U+064A: "ي" ARABIC LETTER YEH
+ U+0626: "ئ" ARABIC LETTER YEH WITH HAMZA ABOVE
+ U+0649: "ى" ARABIC LETTER ALEF MAKSURA -->
+ <Key
+ latin:keyLabel="&#x064A;"
+ latin:moreKeys="&#x0626;,&#x0649;" />
+ <!-- U+0628: "ب" ARABIC LETTER BEH
+ U+067E: "پ" ARABIC LETTER PEH -->
+ <Key
+ latin:keyLabel="&#x0628;"
+ latin:moreKeys="&#x067E;" />
+ <!-- U+0644: "ل" ARABIC LETTER LAM
+ U+FEFB: "ﻻ" ARABIC LIGATURE LAM WITH ALEF ISOLATED FORM
+ U+0627: "ا" ARABIC LETTER ALEF
+ U+FEF7: "ﻷ" ARABIC LIGATURE LAM WITH ALEF WITH HAMZA ABOVE ISOLATED FORM
+ U+0623: "أ" ARABIC LETTER ALEF WITH HAMZA ABOVE
+ U+FEF9: "ﻹ" ARABIC LIGATURE LAM WITH ALEF WITH HAMZA BELOW ISOLATED FORM
+ U+0625: "إ" ARABIC LETTER ALEF WITH HAMZA BELOW
+ U+FEF5: "ﻵ" ARABIC LIGATURE LAM WITH ALEF WITH MADDA ABOVE ISOLATED FORM
+ U+0622: "آ" ARABIC LETTER ALEF WITH MADDA ABOVE -->
+ <Key
+ latin:keyLabel="&#x0644;"
+ latin:moreKeys="&#xFEFB;|&#x0644;&#x0627;,&#xFEF7;|&#x0644;&#x0623;,&#xFEF9;|&#x0644;&#x0625;,&#xFEF5;|&#x0644;&#x0622;" />
+ <!-- U+0627: "ا" ARABIC LETTER ALEF
+ U+0621: "ء" ARABIC LETTER HAMZA
+ U+0671: "ٱ" ARABIC LETTER ALEF WASLA
+ U+0623: "أ" ARABIC LETTER ALEF WITH HAMZA ABOVE
+ U+0625: "إ" ARABIC LETTER ALEF WITH HAMZA BELOW
+ U+0622: "آ" ARABIC LETTER ALEF WITH MADDA ABOVE -->
+ <Key
+ latin:keyLabel="&#x0627;"
+ latin:moreKeys="&#x0621;,&#x0671;,&#x0623;,&#x0625;,&#x0622;" />
+ <!-- U+062A: "ت" ARABIC LETTER TEH -->
+ <Key
+ latin:keyLabel="&#x062A;" />
+ <!-- U+0646: "ن" ARABIC LETTER NOON -->
+ <Key
+ latin:keyLabel="&#x0646;" />
+ <!-- U+0645: "م" ARABIC LETTER MEEM -->
+ <Key
+ latin:keyLabel="&#x0645;" />
+ <!-- U+0643: "ك" ARABIC LETTER KAF
+ U+06AF: "گ" ARABIC LETTER GAF
+ U+06A9: "ک" ARABIC LETTER KEHEH -->
+ <Key
+ latin:keyLabel="&#x0643;"
+ latin:moreKeys="&#x06AF;,&#x06A9;" />
+ <!-- U+0637: "ط" ARABIC LETTER TAH -->
+ <Key
+ latin:keyLabel="&#x0637;" />
+ <Key
+ latin:keyStyle="enterKeyStyle"
+ latin:keyXPos="-14.6%p"
+ latin:keyWidth="fillBoth" />
+ </Row>
+ <Row
+ latin:keyWidth="8.0%p"
+ >
+ <include
+ latin:keyboardLayout="@xml/key_smiley" />
+ <!-- U+0626: "ئ" ARABIC LETTER YEH WITH HAMZA ABOVE -->
+ <Key
+ latin:keyLabel="&#x0626;" />
+ <!-- U+0621: "ء" ARABIC LETTER HAMZA -->
+ <Key
+ latin:keyLabel="&#x0621;" />
+ <!-- U+0624: "ؤ" ARABIC LETTER WAW WITH HAMZA ABOVE -->
+ <Key
+ latin:keyLabel="&#x0624;" />
+ <!-- U+0631: "ر" ARABIC LETTER REH -->
+ <Key
+ latin:keyLabel="&#x0631;" />
+ <!-- U+0630: "ذ" ARABIC LETTER THAL -->
+ <Key
+ latin:keyLabel="&#x0630;" />
+ <!-- U+0649: "ى" ARABIC LETTER ALEF MAKSURA -->
+ <Key
+ latin:keyLabel="&#x0649;" />
+ <!-- U+0629: "ة" ARABIC LETTER TEH MARBUTA -->
+ <Key
+ latin:keyLabel="&#x0629;" />
+ <!-- U+0648: "و" ARABIC LETTER WAW -->
+ <Key
+ latin:keyLabel="&#x0648;" />
+ <!-- U+0632: "ز" ARABIC LETTER ZAIN
+ U+0698: "ژ" ARABIC LETTER JEH -->
+ <Key
+ latin:keyLabel="&#x0632;"
+ latin:moreKeys="&#x0698;" />
+ <!-- U+0638: "ظ" ARABIC LETTER ZAH -->
+ <Key
+ latin:keyLabel="&#x0638;" />
+ <!-- U+062F: "د" ARABIC LETTER DAL -->
+ <Key
+ latin:keyLabel="&#x062F;" />
+ </Row>
+ <include
+ latin:keyboardLayout="@xml/row_qwerty4" />
+</merge>
diff --git a/java/res/xml-sw600dp/kbd_rows_azerty.xml b/java/res/xml-sw600dp/rows_azerty.xml
index 8ae74557c..5c799623d 100644
--- a/java/res/xml-sw600dp/kbd_rows_azerty.xml
+++ b/java/res/xml-sw600dp/rows_azerty.xml
@@ -22,7 +22,7 @@
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<include
- latin:keyboardLayout="@xml/kbd_key_styles" />
+ latin:keyboardLayout="@xml/key_styles_common" />
<Row
latin:keyWidth="8.5%p"
>
@@ -54,8 +54,7 @@
latin:keyLabel="o"
latin:moreKeys="@string/more_keys_for_o" />
<Key
- latin:keyLabel="p"
- latin:moreKeys="@string/more_keys_for_p" />
+ latin:keyLabel="p" />
<Key
latin:keyStyle="deleteKeyStyle"
latin:keyXPos="-10.0%p"
@@ -66,7 +65,6 @@
>
<Key
latin:keyLabel="q"
- latin:moreKeys="@string/more_keys_for_q"
latin:keyXPos="5.0%p" />
<Key
latin:keyLabel="s"
@@ -92,7 +90,7 @@
<Key
latin:keyLabel="m" />
<Key
- latin:keyStyle="returnKeyStyle"
+ latin:keyStyle="enterKeyStyle"
latin:keyXPos="-14.6%p"
latin:keyWidth="fillBoth" />
</Row>
@@ -103,8 +101,7 @@
latin:keyStyle="shiftKeyStyle"
latin:keyWidth="10.0%p" />
<Key
- latin:keyLabel="w"
- latin:moreKeys="@string/more_keys_for_w" />
+ latin:keyLabel="w" />
<Key
latin:keyLabel="x" />
<Key
@@ -119,32 +116,17 @@
latin:keyLabel="n"
latin:moreKeys="@string/more_keys_for_n" />
<Key
- latin:keyLabel="\'" />
- <switch>
- <case
- latin:mode="email"
- >
- <Key
- latin:keyLabel="," />
- <Key
- latin:keyLabel="." />
- </case>
- <default>
- <Key
- latin:keyLabel=","
- latin:keyLabelOption="hasUppercaseLetter"
- latin:keyHintLabel="!"
- latin:moreKeys="!" />
- <Key
- latin:keyLabel="."
- latin:keyLabelOption="hasUppercaseLetter"
- latin:keyHintLabel="\?"
- latin:moreKeys="\?" />
- </default>
- </switch>
+ latin:keyLabel="\'"
+ latin:keyHintLabel=":"
+ latin:moreKeys=":"
+ latin:keyStyle="hasShiftedLetterHintStyle" />
<include
- latin:keyboardLayout="@xml/kbd_row3_smiley" />
+ latin:keyboardLayout="@xml/keys_comma_period" />
+ <include
+ latin:keyboardLayout="@xml/key_smiley"
+ latin:keyXPos="-8.9%p"
+ latin:keyWidth="fillRight" />
</Row>
<include
- latin:keyboardLayout="@xml/kbd_qwerty_row4" />
+ latin:keyboardLayout="@xml/row_qwerty4" />
</merge>
diff --git a/java/res/xml-sw600dp/rows_bulgarian.xml b/java/res/xml-sw600dp/rows_bulgarian.xml
new file mode 100644
index 000000000..87a273cef
--- /dev/null
+++ b/java/res/xml-sw600dp/rows_bulgarian.xml
@@ -0,0 +1,148 @@
+<?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.692%p"
+ >
+ <!-- U+0447: "ч" CYRILLIC SMALL LETTER CHE -->
+ <Key
+ latin:keyLabel="&#x0447;" />
+ <!-- U+0448: "ш" CYRILLIC SMALL LETTER SHA -->
+ <Key
+ latin:keyLabel="&#x0448;" />
+ <!-- U+0435: "е" CYRILLIC SMALL LETTER IE -->
+ <Key
+ latin:keyLabel="&#x0435;" />
+ <!-- U+0440: "р" CYRILLIC SMALL LETTER ER -->
+ <Key
+ latin:keyLabel="&#x0440;" />
+ <!-- U+0442: "т" CYRILLIC SMALL LETTER TE -->
+ <Key
+ latin:keyLabel="&#x0442;" />
+ <!-- U+044A: "ъ" CYRILLIC SMALL LETTER HARD SIGN -->
+ <Key
+ latin:keyLabel="&#x044A;" />
+ <!-- U+0443: "у" CYRILLIC SMALL LETTER U -->
+ <Key
+ latin:keyLabel="&#x0443;" />
+ <!-- U+0438: "и" CYRILLIC SMALL LETTER I
+ U+045D: "ѝ" CYRILLIC SMALL LETTER I WITH GRAVE -->
+ <Key
+ latin:keyLabel="&#x0438;"
+ latin:moreKeys="&#x045D;" />
+ <!-- U+043E: "о" CYRILLIC SMALL LETTER O -->
+ <Key
+ latin:keyLabel="&#x043E;" />
+ <!-- U+043F: "п" CYRILLIC SMALL LETTER PE -->
+ <Key
+ latin:keyLabel="&#x043F;" />
+ <!-- U+044F: "я" CYRILLIC SMALL LETTER YA -->
+ <Key
+ latin:keyLabel="&#x044F;" />
+ <Key
+ latin:keyStyle="deleteKeyStyle"
+ latin:keyWidth="fillBoth" />
+ </Row>
+ <Row
+ latin:keyWidth="7.692%p"
+ >
+ <!-- U+0430: "а" CYRILLIC SMALL LETTER A -->
+ <Key
+ latin:keyLabel="&#x0430;"
+ latin:keyXPos="4.000%p" />
+ <!-- U+0441: "с" CYRILLIC SMALL LETTER ES -->
+ <Key
+ latin:keyLabel="&#x0441;" />
+ <!-- U+0434: "д" CYRILLIC SMALL LETTER DE -->
+ <Key
+ latin:keyLabel="&#x0434;" />
+ <!-- U+0444: "ф" CYRILLIC SMALL LETTER EF -->
+ <Key
+ latin:keyLabel="&#x0444;" />
+ <!-- U+0433: "г" CYRILLIC SMALL LETTER GHE -->
+ <Key
+ latin:keyLabel="&#x0433;" />
+ <!-- U+0445: "х" CYRILLIC SMALL LETTER HA -->
+ <Key
+ latin:keyLabel="&#x0445;" />
+ <!-- U+0439: "й" CYRILLIC SMALL LETTER SHORT I -->
+ <Key
+ latin:keyLabel="&#x0439;" />
+ <!-- U+043A: "к" CYRILLIC SMALL LETTER KA -->
+ <Key
+ latin:keyLabel="&#x043A;" />
+ <!-- U+043B: "л" CYRILLIC SMALL LETTER EL -->
+ <Key
+ latin:keyLabel="&#x043B;" />
+ <!-- U+0449: "щ" CYRILLIC SMALL LETTER SHCHA -->
+ <Key
+ latin:keyLabel="&#x0449;" />
+ <!-- U+044C: "ь" CYRILLIC SMALL LETTER SOFT SIGN -->
+ <Key
+ latin:keyLabel="&#x044C;" />
+ <Key
+ latin:keyStyle="enterKeyStyle"
+ latin:keyWidth="fillBoth" />
+ </Row>
+ <Row
+ latin:keyWidth="7.692%p"
+ >
+ <Key
+ latin:keyStyle="shiftKeyStyle"
+ latin:keyWidth="10.000%p" />
+ <!-- U+0437: "з" CYRILLIC SMALL LETTER ZE -->
+ <Key
+ latin:keyLabel="&#x0437;" />
+ <!-- U+0436: "ж" CYRILLIC SMALL LETTER ZHE -->
+ <Key
+ latin:keyLabel="&#x0436;" />
+ <!-- U+0446: "ц" CYRILLIC SMALL LETTER TSE -->
+ <Key
+ latin:keyLabel="&#x0446;" />
+ <!-- U+0432: "в" CYRILLIC SMALL LETTER VE -->
+ <Key
+ latin:keyLabel="&#x0432;" />
+ <!-- U+0431: "б" CYRILLIC SMALL LETTER BE -->
+ <Key
+ latin:keyLabel="&#x0431;" />
+ <!-- U+043D: "н" CYRILLIC SMALL LETTER EN -->
+ <Key
+ latin:keyLabel="&#x043D;" />
+ <!-- U+043C: "м" CYRILLIC SMALL LETTER EM -->
+ <Key
+ latin:keyLabel="&#x043C;" />
+ <!-- U+044E: "ю" CYRILLIC SMALL LETTER YU -->
+ <Key
+ latin:keyLabel="&#x044E;" />
+ <include
+ latin:keyboardLayout="@xml/keys_comma_period" />
+ <include
+ latin:keyboardLayout="@xml/key_smiley"
+ latin:keyXPos="-8.9%p"
+ latin:keyWidth="fillRight" />
+ </Row>
+ <include
+ latin:keyboardLayout="@xml/row_qwerty4" />
+</merge>
diff --git a/java/res/xml-sw600dp/rows_hebrew.xml b/java/res/xml-sw600dp/rows_hebrew.xml
new file mode 100644
index 000000000..82175f7ef
--- /dev/null
+++ b/java/res/xml-sw600dp/rows_hebrew.xml
@@ -0,0 +1,149 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2011, 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.0%p"
+ >
+ <include
+ latin:keyboardLayout="@xml/keys_apostrophe_dash" />
+ <!-- U+05E7: "ק" HEBREW LETTER QOF -->
+ <Key
+ latin:keyLabel="&#x05E7;" />
+ <!-- U+05E8: "ר" HEBREW LETTER RESH -->
+ <Key
+ latin:keyLabel="&#x05E8;" />
+ <!-- U+05D0: "א" HEBREW LETTER ALEF -->
+ <Key
+ latin:keyLabel="&#x05D0;" />
+ <!-- U+05D8: "ט" HEBREW LETTER TET -->
+ <Key
+ latin:keyLabel="&#x05D8;" />
+ <!-- U+05D5: "ו" HEBREW LETTER VAV -->
+ <Key
+ latin:keyLabel="&#x05D5;" />
+ <!-- U+05DF: "ן" HEBREW LETTER FINAL NUN -->
+ <Key
+ latin:keyLabel="&#x05DF;" />
+ <!-- U+05DD: "ם" HEBREW LETTER FINAL MEM -->
+ <Key
+ latin:keyLabel="&#x05DD;" />
+ <!-- U+05E4: "פ" HEBREW LETTER PE -->
+ <Key
+ latin:keyLabel="&#x05E4;" />
+ <Key
+ latin:keyStyle="deleteKeyStyle"
+ latin:keyXPos="-12.000%p"
+ latin:keyWidth="fillBoth" />
+ </Row>
+ <Row
+ latin:keyWidth="9.0%p"
+ >
+ <!-- U+05E9: "ש" HEBREW LETTER SHIN -->
+ <Key
+ latin:keyLabel="&#x05E9;"
+ latin:keyXPos="4.500%p" />
+ <!-- U+05D3: "ד" HEBREW LETTER DALET -->
+ <Key
+ latin:keyLabel="&#x05D3;" />
+ <!-- U+05D2: "ג" HEBREW LETTER GIMEL
+ U+05D2 U+05F3: "ג׳" HEBREW LETTER GIMEL + HEBREW PUNCTUATION GERESH -->
+ <Key
+ latin:keyLabel="&#x05D2;"
+ latin:moreKeys="&#x05D2;&#x05F3;" />
+ <!-- U+05DB: "כ" HEBREW LETTER KAF -->
+ <Key
+ latin:keyLabel="&#x05DB;" />
+ <!-- U+05E2: "ע" HEBREW LETTER AYIN -->
+ <Key
+ latin:keyLabel="&#x05E2;" />
+ <!-- U+05D9: "י" HEBREW LETTER YOD
+ U+05F2 U+05B7: "ײַ" HEBREW LIGATURE YIDDISH DOUBLE YOD + HEBREW POINT PATAH -->
+ <Key
+ latin:keyLabel="&#x05D9;"
+ latin:moreKeys="&#x05F2;&#x05B7;" />
+ <!-- U+05D7: "ח" HEBREW LETTER HET
+ U+05D7 U+05F3: "ח׳" HEBREW LETTER HET + HEBREW PUNCTUATION GERESH -->
+ <Key
+ latin:keyLabel="&#x05D7;"
+ latin:moreKeys="&#x05D7;&#x05F3;" />
+ <!-- U+05DC: "ל" HEBREW LETTER LAMED -->
+ <Key
+ latin:keyLabel="&#x05DC;" />
+ <!-- U+05DA: "ך" HEBREW LETTER FINAL KAF -->
+ <Key
+ latin:keyLabel="&#x05DA;" />
+ <!-- U+05E3: "ף" HEBREW LETTER FINAL PE -->
+ <Key
+ latin:keyLabel="&#x05E3;" />
+ </Row>
+ <Row
+ latin:keyWidth="8.9%p"
+ >
+ <include
+ latin:keyboardLayout="@xml/key_smiley"
+ latin:keyWidth="10.0%p" />
+ <!-- U+05D6: "ז" HEBREW LETTER ZAYIN
+ U+05D6 U+05F3: "ז׳" HEBREW LETTER ZAYIN + HEBREW PUNCTUATION GERESH -->
+ <Key
+ latin:keyLabel="&#x05D6;"
+ latin:moreKeys="&#x05D6;&#x05F3;" />
+ <!-- U+05E1: "ס" HEBREW LETTER SAMEKH -->
+ <Key
+ latin:keyLabel="&#x05E1;" />
+ <!-- U+05D1: "ב" HEBREW LETTER BET -->
+ <Key
+ latin:keyLabel="&#x05D1;" />
+ <!-- U+05D4: "ה" HEBREW LETTER HE -->
+ <Key
+ latin:keyLabel="&#x05D4;" />
+ <!-- U+05E0: "נ" HEBREW LETTER NUN -->
+ <Key
+ latin:keyLabel="&#x05E0;" />
+ <!-- U+05DE: "מ" HEBREW LETTER MEM -->
+ <Key
+ latin:keyLabel="&#x05DE;" />
+ <!-- U+05E6: "צ" HEBREW LETTER TSADI
+ U+05E6 U+05F3: "צ׳" HEBREW LETTER TSADI + HEBREW PUNCTUATION GERESH -->
+ <Key
+ latin:keyLabel="&#x05E6;"
+ latin:moreKeys="&#x05E6;&#x05F3;" />
+ <!-- U+05EA: "ת" HEBREW LETTER TAV
+ U+05EA U+05F3: "ת׳" HEBREW LETTER TAV + HEBREW PUNCTUATION GERESH -->
+ <Key
+ latin:keyLabel="&#x05EA;"
+ latin:moreKeys="&#x05EA;&#x05F3;" />
+ <!-- U+05E5: "ץ" HEBREW LETTER FINAL TSADI
+ U+05E5 U+05F3: "ץ׳" HEBREW LETTER FINAL TSADI + HEBREW PUNCTUATION GERESH -->
+ <Key
+ latin:keyLabel="&#x05E5;"
+ latin:moreKeys="&#x05E5;&#x05F3;" />
+ <Key
+ latin:keyStyle="enterKeyStyle"
+ latin:keyXPos="-10.400%p"
+ latin:keyWidth="fillBoth" />
+ </Row>
+ <include
+ latin:keyboardLayout="@xml/row_qwerty4" />
+</merge>
diff --git a/java/res/xml-sw600dp/rows_number_normal.xml b/java/res/xml-sw600dp/rows_number_normal.xml
new file mode 100644
index 000000000..3141bbdc7
--- /dev/null
+++ b/java/res/xml-sw600dp/rows_number_normal.xml
@@ -0,0 +1,138 @@
+<?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"
+>
+ <Row>
+ <!-- Note: This Spacer prevents the below key from being marked as a left edge key. -->
+ <Spacer
+ latin:keyWidth="12.75%p" />
+ <Key
+ latin:keyLabel="-"
+ latin:keyStyle="numKeyStyle"
+ latin:keyWidth="9.25%p" />
+ <Key
+ latin:keyLabel="+"
+ latin:keyStyle="numKeyStyle"
+ latin:keyWidth="9.25%p" />
+ <Key
+ latin:keyLabel="."
+ latin:keyStyle="numKeyStyle"
+ latin:keyWidth="9.25%p" />
+ <Key
+ latin:keyLabel="1"
+ latin:keyStyle="numKeyStyle"
+ latin:keyXPos="42.25%p" />
+ <Key
+ latin:keyLabel="2"
+ latin:keyStyle="numKeyStyle" />
+ <Key
+ latin:keyLabel="3"
+ latin:keyStyle="numKeyStyle" />
+ <Key
+ latin:keyStyle="deleteKeyStyle"
+ latin:keyXPos="-11.00%p"
+ latin:keyWidth="fillRight" />
+ </Row>
+ <Row>
+ <!-- Note: This Spacer prevents the below key from being marked as a left edge key. -->
+ <Spacer
+ latin:keyWidth="12.75%p" />
+ <Key
+ latin:keyStyle="numStarKeyStyle"
+ latin:keyWidth="9.25%p" />
+ <Key
+ latin:keyLabel="/"
+ latin:keyStyle="numKeyStyle"
+ latin:keyWidth="9.25%p" />
+ <Key
+ latin:keyLabel=","
+ latin:keyStyle="numKeyStyle"
+ latin:keyWidth="9.25%p" />
+ <Key
+ latin:keyLabel="4"
+ latin:keyStyle="numKeyStyle"
+ latin:keyXPos="42.25%p" />
+ <Key
+ latin:keyLabel="5"
+ latin:keyStyle="numKeyStyle" />
+ <Key
+ latin:keyLabel="6"
+ latin:keyStyle="numKeyStyle" />
+ <Key
+ latin:keyStyle="enterKeyStyle"
+ latin:keyXPos="-11.00%p"
+ latin:keyWidth="fillRight" />
+ </Row>
+ <Row>
+ <!-- Note: This Spacer prevents the below key from being marked as a left edge key. -->
+ <Spacer
+ latin:keyWidth="12.75%p" />
+ <Key
+ latin:keyLabel="("
+ latin:keyStyle="numKeyStyle"
+ latin:keyWidth="9.25%p" />
+ <Key
+ latin:keyLabel=")"
+ latin:keyStyle="numKeyStyle"
+ latin:keyWidth="9.25%p" />
+ <Key
+ latin:keyLabel="="
+ latin:keyStyle="numKeyStyle"
+ latin:keyWidth="9.25%p" />
+ <Key
+ latin:keyLabel="7"
+ latin:keyStyle="numKeyStyle"
+ latin:keyXPos="42.25%p" />
+ <Key
+ latin:keyLabel="8"
+ latin:keyStyle="numKeyStyle" />
+ <Key
+ latin:keyLabel="9"
+ latin:keyStyle="numKeyStyle" />
+ <!-- Note: This Spacer prevents the above key from being marked as a right edge key. -->
+ <Spacer
+ latin:keyWidth="0%p" />
+ </Row>
+ <Row>
+ <Key
+ latin:keyStyle="numTabKeyStyle"
+ latin:keyWidth="11.00%p" />
+ <Key
+ latin:keyStyle="nonSpecialBackgroundSpaceKeyStyle"
+ latin:keyWidth="27.75%p"
+ latin:keyXPos="12.75%p" />
+ <Key
+ latin:keyStyle="numStarKeyStyle"
+ latin:keyXPos="42.25%p" />
+ <Key
+ latin:keyLabel="0"
+ latin:keyStyle="numKeyStyle" />
+ <Key
+ latin:keyLabel="#"
+ latin:keyStyle="numKeyStyle" />
+ <Spacer
+ latin:keyXPos="-11.00%p"
+ latin:keyWidth="0%p" />
+ <include
+ latin:keyboardLayout="@xml/key_f2" />
+ </Row>
+</merge>
diff --git a/java/res/xml-sw600dp/rows_number_password.xml b/java/res/xml-sw600dp/rows_number_password.xml
new file mode 100644
index 000000000..0a71f74d7
--- /dev/null
+++ b/java/res/xml-sw600dp/rows_number_password.xml
@@ -0,0 +1,81 @@
+<?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"
+>
+ <Row>
+ <!-- Note: This Spacer prevents the below key from being marked as a left edge key. -->
+ <Spacer
+ latin:keyWidth="27.50%p" />
+ <Key
+ latin:keyStyle="num1KeyStyle" />
+ <Key
+ latin:keyStyle="num2KeyStyle" />
+ <Key
+ latin:keyStyle="num3KeyStyle" />
+ <Key
+ latin:keyStyle="deleteKeyStyle"
+ latin:keyXPos="-11.00%p"
+ latin:keyWidth="fillRight" />
+ </Row>
+ <Row>
+ <!-- Note: This Spacer prevents the below key from being marked as a left edge key. -->
+ <Spacer
+ latin:keyWidth="27.50%p" />
+ <Key
+ latin:keyStyle="num4KeyStyle" />
+ <Key
+ latin:keyStyle="num5KeyStyle" />
+ <Key
+ latin:keyStyle="num6KeyStyle" />
+ <Key
+ latin:keyStyle="enterKeyStyle"
+ latin:keyXPos="-11.00%p"
+ latin:keyWidth="fillRight" />
+ </Row>
+ <Row>
+ <!-- Note: This Spacer prevents the below key from being marked as a left edge key. -->
+ <Spacer
+ latin:keyWidth="27.50%p" />
+ <Key
+ latin:keyStyle="num7KeyStyle" />
+ <Key
+ latin:keyStyle="num8KeyStyle" />
+ <Key
+ latin:keyStyle="num9KeyStyle" />
+ <!-- Note: This Spacer prevents the above key from being marked as a right edge key. -->
+ <Spacer
+ latin:keyWidth="0%p" />
+ </Row>
+ <Row>
+ <Key
+ latin:keyStyle="tabKeyStyle"
+ latin:keyWidth="11.00%p" />
+ <Key
+ latin:keyStyle="num0KeyStyle"
+ latin:keyXPos="42.50%p"/>
+ <Spacer
+ latin:keyXPos="-11.00%p"
+ latin:keyWidth="0%p" />
+ <include
+ latin:keyboardLayout="@xml/key_f2" />
+ </Row>
+</merge>
diff --git a/java/res/xml-sw600dp/kbd_phone_shift.xml b/java/res/xml-sw600dp/rows_phone.xml
index 4c4f8ad12..d61b4b2ad 100644
--- a/java/res/xml-sw600dp/kbd_phone_shift.xml
+++ b/java/res/xml-sw600dp/rows_phone.xml
@@ -18,18 +18,17 @@
*/
-->
-<Keyboard
+<merge
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
- latin:keyWidth="16.75%p"
>
<include
- latin:keyboardLayout="@xml/kbd_key_styles" />
+ latin:keyboardLayout="@xml/key_styles_common" />
<include
- latin:keyboardLayout="@xml/kbd_numkey_styles" />
+ latin:keyboardLayout="@xml/key_styles_number" />
<Row>
<!-- Note: This Spacer prevents the below key from being marked as a left edge key. -->
<Spacer
- latin:keyWidth="11.00%p" />
+ latin:keyWidth="12.75%p" />
<Key
latin:keyLabel="-"
latin:keyStyle="numKeyStyle"
@@ -39,13 +38,11 @@
latin:keyStyle="numKeyStyle"
latin:keyWidth="9.25%p" />
<Key
- latin:code="44"
- latin:keyLabel="@string/label_pause_key"
- latin:keyLabelOption="followKeyHintLabelRatio|autoXScale"
+ latin:keyStyle="numPauseKeyStyle"
latin:keyWidth="9.25%p" />
<Key
latin:keyStyle="num1KeyStyle"
- latin:keyXPos="38.867%p" />
+ latin:keyXPos="42.25%p" />
<Key
latin:keyStyle="num2KeyStyle" />
<Key
@@ -53,12 +50,12 @@
<Key
latin:keyStyle="deleteKeyStyle"
latin:keyXPos="-11.00%p"
- latin:keyWidth="fillBoth" />
+ latin:keyWidth="fillRight" />
</Row>
<Row>
<!-- Note: This Spacer prevents the below key from being marked as a left edge key. -->
<Spacer
- latin:keyWidth="11.00%p" />
+ latin:keyWidth="12.75%p" />
<Key
latin:keyLabel=","
latin:keyStyle="numKeyStyle"
@@ -68,30 +65,29 @@
latin:keyStyle="numKeyStyle"
latin:keyWidth="9.25%p" />
<Key
- latin:code="59"
- latin:keyLabel="@string/label_wait_key"
- latin:keyLabelOption="followKeyHintLabelRatio|autoXScale"
+ latin:keyStyle="numWaitKeyStyle"
latin:keyWidth="9.25%p" />
<Key
latin:keyStyle="num4KeyStyle"
- latin:keyXPos="38.867%p" />
+ latin:keyXPos="42.25%p" />
<Key
latin:keyStyle="num5KeyStyle" />
<Key
latin:keyStyle="num6KeyStyle" />
<Key
- latin:keyStyle="returnKeyStyle"
+ latin:keyStyle="enterKeyStyle"
latin:keyXPos="-11.00%p"
- latin:keyWidth="fillBoth" />
+ latin:keyWidth="fillRight" />
</Row>
<Row>
- <Key
- latin:keyStyle="backFromMoreSymbolKeyStyle"
- latin:keyWidth="11.00%p" />
+ <!-- Note: This Spacer prevents the below key from being marked as a left edge key. -->
+ <Spacer
+ latin:keyWidth="12.75%p" />
<Key
latin:keyLabel="("
latin:keyStyle="numKeyStyle"
- latin:keyWidth="9.25%p" />
+ latin:keyWidth="9.25%p"
+ latin:keyXPos="12.75%p" />
<Key
latin:keyLabel=")"
latin:keyStyle="numKeyStyle"
@@ -102,7 +98,7 @@
latin:keyWidth="9.25%p" />
<Key
latin:keyStyle="num7KeyStyle"
- latin:keyXPos="38.867%p" />
+ latin:keyXPos="42.25%p" />
<Key
latin:keyStyle="num8KeyStyle" />
<Key
@@ -113,14 +109,15 @@
</Row>
<Row>
<Key
- latin:keyStyle="tabKeyStyle"
+ latin:keyStyle="numTabKeyStyle"
latin:keyWidth="11.00%p" />
<Key
latin:keyStyle="nonSpecialBackgroundSpaceKeyStyle"
- latin:keyWidth="27.75%p" />
+ latin:keyWidth="27.75%p"
+ latin:keyXPos="12.75%p" />
<Key
latin:keyStyle="numStarKeyStyle"
- latin:keyXPos="38.867%p" />
+ latin:keyXPos="42.25%p" />
<Key
latin:keyStyle="num0KeyStyle" />
<Key
@@ -130,6 +127,6 @@
latin:keyXPos="-11.00%p"
latin:keyWidth="0%p" />
<include
- latin:keyboardLayout="@xml/kbd_qwerty_f2" />
+ latin:keyboardLayout="@xml/key_f2" />
</Row>
-</Keyboard>
+</merge>
diff --git a/java/res/xml-sw600dp/kbd_rows_qwerty.xml b/java/res/xml-sw600dp/rows_qwerty.xml
index a2d26b3de..eb41c5087 100644
--- a/java/res/xml-sw600dp/kbd_rows_qwerty.xml
+++ b/java/res/xml-sw600dp/rows_qwerty.xml
@@ -22,13 +22,13 @@
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<include
- latin:keyboardLayout="@xml/kbd_key_styles" />
+ latin:keyboardLayout="@xml/key_styles_common" />
<include
- latin:keyboardLayout="@xml/kbd_qwerty_row1" />
+ latin:keyboardLayout="@xml/row_qwerty1" />
<include
- latin:keyboardLayout="@xml/kbd_qwerty_row2" />
+ latin:keyboardLayout="@xml/row_qwerty2" />
<include
- latin:keyboardLayout="@xml/kbd_qwerty_row3" />
+ latin:keyboardLayout="@xml/row_qwerty3" />
<include
- latin:keyboardLayout="@xml/kbd_qwerty_row4" />
+ latin:keyboardLayout="@xml/row_qwerty4" />
</merge>
diff --git a/java/res/xml-sw600dp/kbd_rows_qwertz.xml b/java/res/xml-sw600dp/rows_qwertz.xml
index 98667e09c..6912f1c6d 100644
--- a/java/res/xml-sw600dp/kbd_rows_qwertz.xml
+++ b/java/res/xml-sw600dp/rows_qwertz.xml
@@ -22,16 +22,14 @@
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<include
- latin:keyboardLayout="@xml/kbd_key_styles" />
+ latin:keyboardLayout="@xml/key_styles_common" />
<Row
latin:keyWidth="9.0%p"
>
<Key
- latin:keyLabel="q"
- latin:moreKeys="@string/more_keys_for_q" />
+ latin:keyLabel="q" />
<Key
- latin:keyLabel="w"
- latin:moreKeys="@string/more_keys_for_w" />
+ latin:keyLabel="w" />
<Key
latin:keyLabel="e"
latin:moreKeys="@string/more_keys_for_e" />
@@ -54,15 +52,14 @@
latin:keyLabel="o"
latin:moreKeys="@string/more_keys_for_o" />
<Key
- latin:keyLabel="p"
- latin:moreKeys="@string/more_keys_for_p" />
+ latin:keyLabel="p" />
<Key
latin:keyStyle="deleteKeyStyle"
latin:keyXPos="-10.0%p"
latin:keyWidth="fillBoth" />
</Row>
<include
- latin:keyboardLayout="@xml/kbd_qwerty_row2" />
+ latin:keyboardLayout="@xml/row_qwerty2" />
<Row
latin:keyWidth="8.9%p"
>
@@ -87,31 +84,13 @@
latin:moreKeys="@string/more_keys_for_n" />
<Key
latin:keyLabel="m" />
- <switch>
- <case
- latin:mode="email"
- >
- <Key
- latin:keyLabel="," />
- <Key
- latin:keyLabel="." />
- </case>
- <default>
- <Key
- latin:keyLabel=","
- latin:keyLabelOption="hasUppercaseLetter"
- latin:keyHintLabel="!"
- latin:moreKeys="!" />
- <Key
- latin:keyLabel="."
- latin:keyLabelOption="hasUppercaseLetter"
- latin:keyHintLabel="\?"
- latin:moreKeys="\?" />
- </default>
- </switch>
<include
- latin:keyboardLayout="@xml/kbd_row3_smiley" />
+ latin:keyboardLayout="@xml/keys_comma_period" />
+ <include
+ latin:keyboardLayout="@xml/key_smiley"
+ latin:keyXPos="-8.9%p"
+ latin:keyWidth="fillBoth" />
</Row>
<include
- latin:keyboardLayout="@xml/kbd_qwerty_row4" />
+ latin:keyboardLayout="@xml/row_qwerty4" />
</merge>
diff --git a/java/res/xml-sw600dp/kbd_rows_scandinavian.xml b/java/res/xml-sw600dp/rows_scandinavian.xml
index 19fb5212b..912c40658 100644
--- a/java/res/xml-sw600dp/kbd_rows_scandinavian.xml
+++ b/java/res/xml-sw600dp/rows_scandinavian.xml
@@ -22,16 +22,14 @@
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<include
- latin:keyboardLayout="@xml/kbd_key_styles" />
+ latin:keyboardLayout="@xml/key_styles_common" />
<Row
latin:keyWidth="7.9%p"
>
<Key
- latin:keyLabel="q"
- latin:moreKeys="@string/more_keys_for_q" />
+ latin:keyLabel="q" />
<Key
- latin:keyLabel="w"
- latin:moreKeys="@string/more_keys_for_w" />
+ latin:keyLabel="w" />
<Key
latin:keyLabel="e"
latin:moreKeys="@string/more_keys_for_e" />
@@ -54,10 +52,9 @@
latin:keyLabel="o"
latin:moreKeys="@string/more_keys_for_o" />
<Key
- latin:keyLabel="p"
- latin:moreKeys="@string/more_keys_for_p" />
+ latin:keyLabel="p" />
<Key
- latin:keyLabel="å" />
+ latin:keyLabel="@string/keylabel_for_scandinavia_row1_11" />
<Key
latin:keyStyle="deleteKeyStyle"
latin:keyXPos="-10.0%p"
@@ -98,7 +95,7 @@
latin:keyLabel="@string/keylabel_for_scandinavia_row2_11"
latin:moreKeys="@string/more_keys_for_scandinavia_row2_11" />
<Key
- latin:keyStyle="returnKeyStyle"
+ latin:keyStyle="enterKeyStyle"
latin:keyXPos="-14.6%p"
latin:keyWidth="fillBoth" />
</Row>
@@ -129,12 +126,12 @@
<Key
latin:keyLabel="m" />
<include
- latin:keyboardLayout="@xml/kbd_row3_comma_period" />
- <Spacer
- latin:keyWidth="4.35%p" />
+ latin:keyboardLayout="@xml/keys_comma_period" />
<include
- latin:keyboardLayout="@xml/kbd_row3_smiley" />
+ latin:keyboardLayout="@xml/key_smiley"
+ latin:keyXPos="-8.9%p"
+ latin:keyWidth="fillRight" />
</Row>
<include
- latin:keyboardLayout="@xml/kbd_qwerty_row4" />
+ latin:keyboardLayout="@xml/row_qwerty4" />
</merge>
diff --git a/java/res/xml-sw600dp/rows_serbian.xml b/java/res/xml-sw600dp/rows_serbian.xml
new file mode 100644
index 000000000..5730aa050
--- /dev/null
+++ b/java/res/xml-sw600dp/rows_serbian.xml
@@ -0,0 +1,151 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2011, 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.0%p"
+ >
+ <!-- U+0459: "љ" CYRILLIC SMALL LETTER LJE -->
+ <Key
+ latin:keyLabel="&#x0459;"
+ latin:keyXPos="2.15%p" />
+ <!-- U+045A: "њ" CYRILLIC SMALL LETTER NJE -->
+ <Key
+ latin:keyLabel="&#x045A;" />
+ <!-- U+0435: "е" CYRILLIC SMALL LETTER IE -->
+ <Key
+ latin:keyLabel="&#x0435;" />
+ <!-- U+0440: "р" CYRILLIC SMALL LETTER ER -->
+ <Key
+ latin:keyLabel="&#x0440;" />
+ <!-- U+0442: "т" CYRILLIC SMALL LETTER TE -->
+ <Key
+ latin:keyLabel="&#x0442;" />
+ <!-- U+0437: "з" CYRILLIC SMALL LETTER ZE -->
+ <Key
+ latin:keyLabel="&#x0437;" />
+ <!-- U+0443: "у" CYRILLIC SMALL LETTER U -->
+ <Key
+ latin:keyLabel="&#x0443;" />
+ <!-- U+0438: "и" CYRILLIC SMALL LETTER I -->
+ <Key
+ latin:keyLabel="&#x0438;" />
+ <!-- U+043E: "о" CYRILLIC SMALL LETTER O -->
+ <Key
+ latin:keyLabel="&#x043E;" />
+ <!-- U+043F: "п" CYRILLIC SMALL LETTER PE -->
+ <Key
+ latin:keyLabel="&#x043F;" />
+ <!-- U+0448: "ш" CYRILLIC SMALL LETTER SHA -->
+ <Key
+ latin:keyLabel="&#x0448;" />
+ <Key
+ latin:keyStyle="deleteKeyStyle"
+ latin:keyXPos="-10.0%p"
+ latin:keyWidth="fillBoth" />
+ </Row>
+ <Row
+ latin:keyWidth="7.9%p"
+ >
+ <!-- U+0430: "а" CYRILLIC SMALL LETTER A -->
+ <Key
+ latin:keyLabel="&#x0430;" />
+ <!-- U+0441: "с" CYRILLIC SMALL LETTER ES -->
+ <Key
+ latin:keyLabel="&#x0441;" />
+ <!-- U+0434: "д" CYRILLIC SMALL LETTER DE -->
+ <Key
+ latin:keyLabel="&#x0434;" />
+ <!-- U+0444: "ф" CYRILLIC SMALL LETTER EF -->
+ <Key
+ latin:keyLabel="&#x0444;" />
+ <!-- U+0433: "г" CYRILLIC SMALL LETTER GHE -->
+ <Key
+ latin:keyLabel="&#x0433;" />
+ <!-- U+0445: "х" CYRILLIC SMALL LETTER HA -->
+ <Key
+ latin:keyLabel="&#x0445;" />
+ <!-- U+0458: "ј" CYRILLIC SMALL LETTER JE -->
+ <Key
+ latin:keyLabel="&#x0458;" />
+ <!-- U+043A: "к" CYRILLIC SMALL LETTER KA -->
+ <Key
+ latin:keyLabel="&#x043A;" />
+ <!-- U+043B: "л" CYRILLIC SMALL LETTER EL -->
+ <Key
+ latin:keyLabel="&#x043B;" />
+ <!-- U+0447: "ч" CYRILLIC SMALL LETTER CHE -->
+ <Key
+ latin:keyLabel="&#x0447;" />
+ <!-- U+045B: "ћ" CYRILLIC SMALL LETTER TSHE -->
+ <Key
+ latin:keyLabel="&#x045B;" />
+ <Key
+ latin:keyStyle="enterKeyStyle"
+ latin:keyXPos="-14.6%p"
+ latin:keyWidth="fillBoth" />
+ </Row>
+ <Row
+ latin:keyWidth="7.5%p"
+ >
+ <Key
+ latin:keyStyle="shiftKeyStyle"
+ latin:keyWidth="8.0%p" />
+ <!-- U+0455: "ѕ" CYRILLIC SMALL LETTER DZE -->
+ <Key
+ latin:keyLabel="&#x0455;" />
+ <!-- U+045F: "џ" CYRILLIC SMALL LETTER DZHE -->
+ <Key
+ latin:keyLabel="&#x045F;" />
+ <!-- U+0446: "ц" CYRILLIC SMALL LETTER TSE -->
+ <Key
+ latin:keyLabel="&#x0446;" />
+ <!-- U+0432: "в" CYRILLIC SMALL LETTER VE -->
+ <Key
+ latin:keyLabel="&#x0432;" />
+ <!-- U+0431: "б" CYRILLIC SMALL LETTER BE -->
+ <Key
+ latin:keyLabel="&#x0431;" />
+ <!-- U+043D: "н" CYRILLIC SMALL LETTER EN -->
+ <Key
+ latin:keyLabel="&#x043D;" />
+ <!-- U+043C: "м" CYRILLIC SMALL LETTER EM -->
+ <Key
+ latin:keyLabel="&#x043C;" />
+ <!-- U+0452: "ђ" CYRILLIC SMALL LETTER DJE -->
+ <Key
+ latin:keyLabel="&#x0452;" />
+ <!-- U+0436: "ж" CYRILLIC SMALL LETTER ZHE -->
+ <Key
+ latin:keyLabel="&#x0436;" />
+ <include
+ latin:keyboardLayout="@xml/keys_comma_period" />
+ <include
+ latin:keyboardLayout="@xml/key_smiley"
+ latin:keyXPos="-8.9%p"
+ latin:keyWidth="fillBoth" />
+ </Row>
+ <include
+ latin:keyboardLayout="@xml/row_qwerty4" />
+</merge>
diff --git a/java/res/xml-sw600dp/rows_slavic.xml b/java/res/xml-sw600dp/rows_slavic.xml
new file mode 100644
index 000000000..58f0b3900
--- /dev/null
+++ b/java/res/xml-sw600dp/rows_slavic.xml
@@ -0,0 +1,155 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2011, 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.60%p"
+ >
+ <!-- U+0439: "й" CYRILLIC SMALL LETTER SHORT I -->
+ <Key
+ latin:keyLabel="&#x0439;" />
+ <!-- U+0446: "ц" CYRILLIC SMALL LETTER TSE -->
+ <Key
+ latin:keyLabel="&#x0446;" />
+ <!-- U+0443: "у" CYRILLIC SMALL LETTER U -->
+ <Key
+ latin:keyLabel="&#x0443;"
+ latin:moreKeys="@string/more_keys_for_slavic_u" />
+ <!-- U+043A: "к" CYRILLIC SMALL LETTER KA -->
+ <Key
+ latin:keyLabel="&#x043A;" />
+ <!-- U+0435: "е" CYRILLIC SMALL LETTER IE -->
+ <Key
+ latin:keyLabel="&#x0435;"
+ latin:moreKeys="@string/more_keys_for_slavic_ye" />
+ <!-- U+043D: "н" CYRILLIC SMALL LETTER EN -->
+ <Key
+ latin:keyLabel="&#x043D;"
+ latin:moreKeys="@string/more_keys_for_slavic_en" />
+ <!-- U+0433: "г" CYRILLIC SMALL LETTER GHE -->
+ <Key
+ latin:keyLabel="&#x0433;" />
+ <!-- U+0448: "ш" CYRILLIC SMALL LETTER SHA -->
+ <Key
+ latin:keyLabel="&#x0448;" />
+ <Key
+ latin:keyLabel="@string/keylabel_for_slavic_shcha" />
+ <!-- U+0437: "з" CYRILLIC SMALL LETTER ZE -->
+ <Key
+ latin:keyLabel="&#x0437;" />
+ <!-- U+0445: "х" CYRILLIC SMALL LETTER HA -->
+ <Key
+ latin:keyLabel="&#x0445;" />
+ <!-- U+044A: "ъ" CYRILLIC SMALL LETTER HARD SIGN -->
+ <Key
+ latin:keyLabel="&#x044A;" />
+ <Key
+ latin:keyStyle="deleteKeyStyle"
+ latin:keyXPos="-10.0%p"
+ latin:keyWidth="fillBoth" />
+ </Row>
+ <Row
+ latin:keyWidth="7.60%p"
+ >
+ <!-- U+0444: "ф" CYRILLIC SMALL LETTER EF -->
+ <Key
+ latin:keyLabel="&#x0444;"
+ latin:keyXPos="2.25%p" />
+ <Key
+ latin:keyLabel="@string/keylabel_for_slavic_yery"
+ latin:moreKeys="@string/more_keys_for_slavic_yery" />
+ <!-- U+0432: "в" CYRILLIC SMALL LETTER VE -->
+ <Key
+ latin:keyLabel="&#x0432;" />
+ <!-- U+0430: "а" CYRILLIC SMALL LETTER A -->
+ <Key
+ latin:keyLabel="&#x0430;" />
+ <!-- U+043F: "п" CYRILLIC SMALL LETTER PE -->
+ <Key
+ latin:keyLabel="&#x043F;" />
+ <!-- U+0440: "р" CYRILLIC SMALL LETTER ER -->
+ <Key
+ latin:keyLabel="&#x0440;" />
+ <!-- U+043E: "о" CYRILLIC SMALL LETTER O -->
+ <Key
+ latin:keyLabel="&#x043E;"
+ latin:moreKeys="@string/more_keys_for_slavic_o" />
+ <!-- U+043B: "л" CYRILLIC SMALL LETTER EL -->
+ <Key
+ latin:keyLabel="&#x043B;" />
+ <!-- U+0434: "д" CYRILLIC SMALL LETTER DE -->
+ <Key
+ latin:keyLabel="&#x0434;" />
+ <!-- U+0436: "ж" CYRILLIC SMALL LETTER ZHE -->
+ <Key
+ latin:keyLabel="&#x0436;" />
+ <!-- U+044D: "э" CYRILLIC SMALL LETTER E -->
+ <Key
+ latin:keyLabel="&#x044D;" />
+ <Key
+ latin:keyStyle="enterKeyStyle"
+ latin:keyXPos="-14.6%p"
+ latin:keyWidth="fillBoth" />
+ </Row>
+ <Row
+ latin:keyWidth="7.60%p"
+ >
+ <Key
+ latin:keyStyle="shiftKeyStyle" />
+ <!-- U+044F: "я" CYRILLIC SMALL LETTER YA -->
+ <Key
+ latin:keyLabel="&#x044F;" />
+ <!-- U+0447: "ч" CYRILLIC SMALL LETTER CHE -->
+ <Key
+ latin:keyLabel="&#x0447;" />
+ <!-- U+0441: "с" CYRILLIC SMALL LETTER ES -->
+ <Key
+ latin:keyLabel="&#x0441;" />
+ <!-- U+043C: "м" CYRILLIC SMALL LETTER EM -->
+ <Key
+ latin:keyLabel="&#x043C;" />
+ <Key
+ latin:keyLabel="@string/keylabel_for_slavic_i" />
+ <!-- U+0442: "т" CYRILLIC SMALL LETTER TE -->
+ <Key
+ latin:keyLabel="&#x0442;" />
+ <!-- U+044C: "ь" CYRILLIC SMALL LETTER SOFT SIGN -->
+ <Key
+ latin:keyLabel="&#x044C;" />
+ <!-- U+0431: "б" CYRILLIC SMALL LETTER BE -->
+ <Key
+ latin:keyLabel="&#x0431;" />
+ <!-- U+044E: "ю" CYRILLIC SMALL LETTER YU -->
+ <Key
+ latin:keyLabel="&#x044E;" />
+ <include
+ latin:keyboardLayout="@xml/keys_comma_period" />
+ <include
+ latin:keyboardLayout="@xml/key_smiley"
+ latin:keyXPos="-8.9%p"
+ latin:keyWidth="fillBoth" />
+ </Row>
+ <include
+ latin:keyboardLayout="@xml/row_qwerty4" />
+</merge>
diff --git a/java/res/xml-sw600dp/kbd_rows_spanish.xml b/java/res/xml-sw600dp/rows_spanish.xml
index 8506af697..b6df257cb 100644
--- a/java/res/xml-sw600dp/kbd_rows_spanish.xml
+++ b/java/res/xml-sw600dp/rows_spanish.xml
@@ -22,9 +22,9 @@
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<include
- latin:keyboardLayout="@xml/kbd_key_styles" />
+ latin:keyboardLayout="@xml/key_styles_common" />
<include
- latin:keyboardLayout="@xml/kbd_qwerty_row1" />
+ latin:keyboardLayout="@xml/row_qwerty1" />
<Row
latin:keyWidth="8.5%p"
>
@@ -53,15 +53,16 @@
<Key
latin:keyLabel="l"
latin:moreKeys="@string/more_keys_for_l" />
+ <!-- U+00F1: "ñ" LATIN SMALL LETTER N WITH TILDE -->
<Key
- latin:keyLabel="ñ" />
+ latin:keyLabel="&#x00F1;" />
<Key
- latin:keyStyle="returnKeyStyle"
+ latin:keyStyle="enterKeyStyle"
latin:keyXPos="-14.6%p"
latin:keyWidth="fillBoth" />
</Row>
<include
- latin:keyboardLayout="@xml/kbd_qwerty_row3" />
+ latin:keyboardLayout="@xml/row_qwerty3" />
<include
- latin:keyboardLayout="@xml/kbd_qwerty_row4" />
+ latin:keyboardLayout="@xml/row_qwerty4" />
</merge>
diff --git a/java/res/xml-sw600dp/kbd_rows_symbols.xml b/java/res/xml-sw600dp/rows_symbols.xml
index bb48fe734..448e3bb85 100644
--- a/java/res/xml-sw600dp/kbd_rows_symbols.xml
+++ b/java/res/xml-sw600dp/rows_symbols.xml
@@ -22,41 +22,51 @@
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<include
- latin:keyboardLayout="@xml/kbd_key_styles" />
+ latin:keyboardLayout="@xml/key_styles_common" />
<include
- latin:keyboardLayout="@xml/kbd_currency_key_styles" />
+ latin:keyboardLayout="@xml/key_styles_currency" />
<Row
latin:keyWidth="9.0%p"
>
<Key
latin:keyLabel="@string/keylabel_for_symbols_1"
+ latin:additionalMoreKeys="@string/additional_more_keys_for_symbols_1"
latin:moreKeys="@string/more_keys_for_symbols_1" />
<Key
latin:keyLabel="@string/keylabel_for_symbols_2"
+ latin:additionalMoreKeys="@string/additional_more_keys_for_symbols_2"
latin:moreKeys="@string/more_keys_for_symbols_2" />
<Key
latin:keyLabel="@string/keylabel_for_symbols_3"
+ latin:additionalMoreKeys="@string/additional_more_keys_for_symbols_3"
latin:moreKeys="@string/more_keys_for_symbols_3" />
<Key
latin:keyLabel="@string/keylabel_for_symbols_4"
+ latin:additionalMoreKeys="@string/additional_more_keys_for_symbols_4"
latin:moreKeys="@string/more_keys_for_symbols_4" />
<Key
latin:keyLabel="@string/keylabel_for_symbols_5"
+ latin:additionalMoreKeys="@string/additional_more_keys_for_symbols_5"
latin:moreKeys="@string/more_keys_for_symbols_5" />
<Key
latin:keyLabel="@string/keylabel_for_symbols_6"
+ latin:additionalMoreKeys="@string/additional_more_keys_for_symbols_6"
latin:moreKeys="@string/more_keys_for_symbols_6" />
<Key
latin:keyLabel="@string/keylabel_for_symbols_7"
+ latin:additionalMoreKeys="@string/additional_more_keys_for_symbols_7"
latin:moreKeys="@string/more_keys_for_symbols_7" />
<Key
latin:keyLabel="@string/keylabel_for_symbols_8"
+ latin:additionalMoreKeys="@string/additional_more_keys_for_symbols_8"
latin:moreKeys="@string/more_keys_for_symbols_8" />
<Key
latin:keyLabel="@string/keylabel_for_symbols_9"
+ latin:additionalMoreKeys="@string/additional_more_keys_for_symbols_9"
latin:moreKeys="@string/more_keys_for_symbols_9" />
<Key
latin:keyLabel="@string/keylabel_for_symbols_0"
+ latin:additionalMoreKeys="@string/additional_more_keys_for_symbols_0"
latin:moreKeys="@string/more_keys_for_symbols_0" />
<Key
latin:keyStyle="deleteKeyStyle"
@@ -85,14 +95,10 @@
<Key
latin:keyLabel="+"
latin:moreKeys="@string/more_keys_for_plus" />
+ <include
+ latin:keyboardLayout="@xml/keys_parentheses" />
<Key
- latin:keyLabel="("
- latin:moreKeys="[,{,&lt;" />
- <Key
- latin:keyLabel=")"
- latin:moreKeys="],},&gt;" />
- <Key
- latin:keyStyle="returnKeyStyle"
+ latin:keyStyle="enterKeyStyle"
latin:keyXPos="-14.6%p"
latin:keyWidth="fillBoth" />
</Row>
@@ -102,12 +108,8 @@
<Key
latin:keyStyle="toMoreSymbolKeyStyle"
latin:keyWidth="10.0%p" />
- <Key
- latin:keyLabel="&lt;"
- latin:moreKeys="≤,«,‹" />
- <Key
- latin:keyLabel="&gt;"
- latin:moreKeys="≥,»,›" />
+ <include
+ latin:keyboardLayout="@xml/keys_less_greater" />
<Key
latin:keyLabel="="
latin:moreKeys="≠,≈" />
@@ -116,8 +118,7 @@
latin:mode="url"
>
<Key
- latin:keyLabel="\'"
- latin:moreKeys="‘,’,‚,‛" />
+ latin:keyLabel="\'" />
</case>
<default>
<Key
@@ -132,9 +133,10 @@
latin:moreKeys="@string/more_keys_for_comma" />
<Key
latin:keyLabel="." />
+ <!-- U+00A1: "¡" INVERTED EXCLAMATION MARK -->
<Key
latin:keyLabel="!"
- latin:moreKeys="¡" />
+ latin:moreKeys="&#x00A1;" />
<Key
latin:keyLabel="@string/keylabel_for_symbols_question"
latin:moreKeys="@string/more_keys_for_symbols_question" />
@@ -156,17 +158,16 @@
latin:keyStyle="spaceKeyStyle"
latin:keyXPos="30.750%p"
latin:keyWidth="39.750%p" />
- <!-- Note: DroidSans doesn't have double-high-reversed-quotation '\u201f' glyph. -->
- <!-- latin:moreKeys="“,”,„,‟,«,»,‘,’,‚,‛" -->
<Key
latin:keyLabel="&quot;"
- latin:moreKeys="“,”,«,»,‘,’,‚,‛" />
+ latin:moreKeys="@string/more_keys_for_tablet_double_quote"
+ latin:maxMoreKeysColumn="4" />
<Key
latin:keyLabel="_" />
<Spacer
latin:keyXPos="-10.00%p"
latin:keyWidth="0%p" />
<include
- latin:keyboardLayout="@xml/kbd_qwerty_f2" />
+ latin:keyboardLayout="@xml/key_f2" />
</Row>
</merge>
diff --git a/java/res/xml-sw600dp/kbd_rows_symbols_shift.xml b/java/res/xml-sw600dp/rows_symbols_shift.xml
index 8e4751502..05824b936 100644
--- a/java/res/xml-sw600dp/kbd_rows_symbols_shift.xml
+++ b/java/res/xml-sw600dp/rows_symbols_shift.xml
@@ -22,9 +22,9 @@
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<include
- latin:keyboardLayout="@xml/kbd_key_styles" />
+ latin:keyboardLayout="@xml/key_styles_common" />
<include
- latin:keyboardLayout="@xml/kbd_currency_key_styles" />
+ latin:keyboardLayout="@xml/key_styles_currency" />
<Row
latin:keyWidth="9.0%p"
>
@@ -34,23 +34,32 @@
latin:keyLabel="`" />
<Key
latin:keyLabel="|" />
+ <!-- U+2022: "•" BULLET -->
<Key
- latin:keyLabel="•"
+ latin:keyLabel="&#x2022;"
latin:moreKeys="@string/more_keys_for_bullet" />
+ <!-- U+221A: "√" SQUARE ROOT -->
<Key
- latin:keyLabel="√" />
+ latin:keyLabel="&#x221A;" />
+ <!-- U+03C0: "π" GREEK SMALL LETTER PI
+ U+03A0: "Π" GREEK CAPITAL LETTER PI -->
<Key
- latin:keyLabel="π"
- latin:moreKeys="Π" />
+ latin:keyLabel="&#x03C0;"
+ latin:moreKeys="&#x03A0;" />
+ <!-- U+00F7: "÷" DIVISION SIGN -->
<Key
- latin:keyLabel="÷" />
+ latin:keyLabel="&#x00F7;" />
+ <!-- U+00D7: "×" MULTIPLICATION SIGN -->
<Key
- latin:keyLabel="×" />
+ latin:keyLabel="&#x00D7;" />
+ <!-- U+00A7: "§" SECTION SIGN
+ U+00B6: "¶" PILCROW SIGN -->
<Key
- latin:keyLabel="§"
- latin:moreKeys="¶" />
+ latin:keyLabel="&#x00A7;"
+ latin:moreKeys="&#x00B6;" />
+ <!-- U+0394: "Δ" GREEK CAPITAL LETTER DELTA -->
<Key
- latin:keyLabel="Δ" />
+ latin:keyLabel="&#x0394;" />
<Key
latin:keyStyle="deleteKeyStyle"
latin:keyXPos="-10.0%p"
@@ -59,8 +68,9 @@
<Row
latin:keyWidth="9.0%p"
>
+ <!-- U+00A3: "£" POUND SIGN -->
<Key
- latin:keyLabel="£"
+ latin:keyLabel="&#x00A3;"
latin:keyXPos="4.5%p" />
<Key
latin:keyStyle="moreCurrency1KeyStyle" />
@@ -68,21 +78,28 @@
latin:keyStyle="moreCurrency2KeyStyle" />
<Key
latin:keyStyle="moreCurrency3KeyStyle" />
+ <!-- U+2191: "↑" UPWARDS ARROW
+ U+2193: "↓" DOWNWARDS ARROW
+ U+2190: "←" LEFTWARDS ARROW
+ U+2192: "→" RIGHTWARDS ARROW -->
<Key
latin:keyLabel="^"
- latin:moreKeys="↑,↓,←,→" />
- <Key
- latin:keyLabel="°"
- latin:moreKeys="′,″" />
- <Key
- latin:keyLabel="±"
- latin:moreKeys="∞" />
- <Key
- latin:keyLabel="{" />
- <Key
- latin:keyLabel="}" />
+ latin:moreKeys="&#x2191;,&#x2193;,&#x2190;,&#x2192;" />
+ <!-- U+00B0: "°" DEGREE SIGN
+ U+2032: "′" PRIME
+ U+2033: "″" DOUBLE PRIME -->
+ <Key
+ latin:keyLabel="&#x00B0;"
+ latin:moreKeys="&#x2032;,&#x2033;" />
+ <!-- U+00B1: "±" PLUS-MINUS SIGN
+ U+221E: "∞" INFINITY -->
+ <Key
+ latin:keyLabel="&#x00B1;"
+ latin:moreKeys="&#x221E;" />
+ <include
+ latin:keyboardLayout="@xml/keys_curly_brackets" />
<Key
- latin:keyStyle="returnKeyStyle"
+ latin:keyStyle="enterKeyStyle"
latin:keyXPos="-14.6%p"
latin:keyWidth="fillBoth" />
</Row>
@@ -94,22 +111,26 @@
latin:keyWidth="10.0%p" />
<Key
latin:keyLabel="\\" />
+ <!-- U+00A9: "©" COPYRIGHT SIGN -->
<Key
- latin:keyLabel="©" />
- <Key
- latin:keyLabel="®" />
+ latin:keyLabel="&#x00A9;" />
+ <!-- U+00AE: "®" REGISTERED SIGN -->
<Key
- latin:keyLabel="™" />
+ latin:keyLabel="&#x00AE;" />
+ <!-- U+2122: "™" TRADE MARK SIGN -->
<Key
- latin:keyLabel="℅" />
+ latin:keyLabel="&#x2122;" />
+ <!-- U+2105: "℅" CARE OF -->
<Key
- latin:keyLabel="[" />
- <Key
- latin:keyLabel="]" />
+ latin:keyLabel="&#x2105;" />
+ <include
+ latin:keyboardLayout="@xml/keys_square_brackets" />
+ <!-- U+00A1: "¡" INVERTED EXCLAMATION MARK -->
<Key
- latin:keyLabel="¡" />
+ latin:keyLabel="&#x00A1;" />
+ <!-- U+00BF: "¿" INVERTED QUESTION MARK -->
<Key
- latin:keyLabel="¿" />
+ latin:keyLabel="&#x00BF;" />
</Row>
<Row
latin:keyWidth="8.9%p"
@@ -127,6 +148,6 @@
latin:keyXPos="-10.00%p"
latin:keyWidth="0%p" />
<include
- latin:keyboardLayout="@xml/kbd_qwerty_f2" />
+ latin:keyboardLayout="@xml/key_f2" />
</Row>
</merge>
generated by cgit v1.2.3-83-g751a (git 2.47.1) at 2025-08-17 23:43:58 +0000