am 564ad492: Merge "Enable long-press digit input for tablets"

* commit '564ad4927c784e541e7f00bb17bea416cb06115e':
  Enable long-press digit input for tablets
main
Tadashi G. Takaoka 2013-06-23 18:18:42 -07:00 committed by Android Git Automerger
commit 82e21ee260
40 changed files with 199 additions and 121 deletions

View File

@ -21,20 +21,40 @@
<merge <merge
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
> >
<switch>
<case
latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"
>
<Key
latin:keyLabel="&quot;"
latin:keyHintLabel="1"
latin:additionalMoreKeys="1" />
<Key
latin:keyLabel="&lt;"
latin:keyHintLabel="2"
latin:additionalMoreKeys="2" />
<Key
latin:keyLabel="&gt;"
latin:keyHintLabel="3"
latin:additionalMoreKeys="3" />
</case>
<default>
<Key <Key
latin:keyLabel="\'" latin:keyLabel="\'"
latin:keyHintLabel="&quot;" latin:keyHintLabel="1"
latin:moreKeys="!" latin:additionalMoreKeys="1"
latin:keyStyle="hasShiftedLetterHintStyle" /> latin:moreKeys="!,&quot;" />
<Key <Key
latin:keyLabel="," latin:keyLabel=","
latin:keyHintLabel="&lt;" latin:keyHintLabel="2"
latin:moreKeys="\?" latin:additionalMoreKeys="2"
latin:keyStyle="hasShiftedLetterHintStyle" /> latin:moreKeys="\?,&lt;" />
<Key <Key
latin:keyLabel="." latin:keyLabel="."
latin:keyHintLabel="&gt;" latin:keyHintLabel="3"
latin:additionalMoreKeys="3"
latin:keyLabelFlags="hasPopupHint|preserveCase" latin:keyLabelFlags="hasPopupHint|preserveCase"
latin:moreKeys="!text/more_keys_for_punctuation" latin:moreKeys="!text/more_keys_for_punctuation,%,&gt;" />
latin:keyStyle="hasShiftedLetterHintStyle" /> </default>
</switch>
</merge> </merge>

View File

@ -21,57 +21,87 @@
<merge <merge
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
> >
<!-- U+0636: "ض" ARABIC LETTER DAD --> <!-- U+0636: "ض" ARABIC LETTER DAD
U+0661: "١" ARABIC-INDIC DIGIT ONE -->
<Key <Key
latin:keyLabel="&#x0636;" latin:keyLabel="&#x0636;"
latin:keyHintLabel="1"
latin:additionalMoreKeys="1,&#x0661;"
latin:keyLabelFlags="fontNormal" /> latin:keyLabelFlags="fontNormal" />
<!-- U+0635: "ص" ARABIC LETTER SAD --> <!-- U+0635: "ص" ARABIC LETTER SAD
U+0662: "٢" ARABIC-INDIC DIGIT TWO -->
<Key <Key
latin:keyLabel="&#x0635;" latin:keyLabel="&#x0635;"
latin:keyHintLabel="2"
latin:additionalMoreKeys="2,&#x0662;"
latin:keyLabelFlags="fontNormal" /> latin:keyLabelFlags="fontNormal" />
<!-- U+062B: "ث" ARABIC LETTER THEH --> <!-- U+062B: "ث" ARABIC LETTER THEH
U+0663: "٣" ARABIC-INDIC DIGIT THREE -->
<Key <Key
latin:keyLabel="&#x062B;" latin:keyLabel="&#x062B;"
latin:keyHintLabel="3"
latin:additionalMoreKeys="3,&#x0663;"
latin:keyLabelFlags="fontNormal" /> latin:keyLabelFlags="fontNormal" />
<!-- U+0642: "ق" ARABIC LETTER QAF <!-- U+0642: "ق" ARABIC LETTER QAF
U+06A8: "ڨ" ARABIC LETTER QAF WITH THREE DOTS ABOVE --> U+06A8: "ڨ" ARABIC LETTER QAF WITH THREE DOTS ABOVE
U+0664: "٤" ARABIC-INDIC DIGIT FOUR -->
<!-- TODO: DroidSansArabic lacks the glyph of 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 <Key
latin:keyLabel="&#x0642;" latin:keyLabel="&#x0642;"
latin:keyHintLabel="4"
latin:additionalMoreKeys="4,&#x0664;"
latin:moreKeys="&#x06A8;" latin:moreKeys="&#x06A8;"
latin:keyLabelFlags="fontNormal" /> latin:keyLabelFlags="fontNormal" />
<!-- U+0641: "ف" ARABIC LETTER FEH <!-- U+0641: "ف" ARABIC LETTER FEH
U+06A4: "ڤ" ARABIC LETTER VEH U+06A4: "ڤ" ARABIC LETTER VEH
U+06A2: "ڢ" ARABIC LETTER FEH WITH DOT MOVED BELOW U+06A2: "ڢ" ARABIC LETTER FEH WITH DOT MOVED BELOW
U+06A5: "ڥ" ARABIC LETTER FEH WITH THREE DOTS BELOW --> U+06A5: "ڥ" ARABIC LETTER FEH WITH THREE DOTS BELOW
U+0665: "٥" ARABIC-INDIC DIGIT FIVE -->
<!-- TODO: DroidSansArabic lacks the glyph of U+06A2 ARABIC LETTER FEH WITH DOT MOVED 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 --> <!-- TODO: DroidSansArabic lacks the glyph of U+06A5 ARABIC LETTER FEH WITH THREE DOTS BELOW -->
<Key <Key
latin:keyLabel="&#x0641;" latin:keyLabel="&#x0641;"
latin:keyHintLabel="5"
latin:additionalMoreKeys="5,&#x0665;"
latin:moreKeys="&#x06A4;,&#x06A2;,&#x06A5;" latin:moreKeys="&#x06A4;,&#x06A2;,&#x06A5;"
latin:keyLabelFlags="fontNormal" /> latin:keyLabelFlags="fontNormal" />
<!-- U+063A: "غ" ARABIC LETTER GHAIN --> <!-- U+063A: "غ" ARABIC LETTER GHAIN
U+0666: "٦" ARABIC-INDIC DIGIT SIX -->
<Key <Key
latin:keyLabel="&#x063A;" latin:keyLabel="&#x063A;"
latin:keyHintLabel="6"
latin:additionalMoreKeys="6,&#x0666;"
latin:keyLabelFlags="fontNormal" /> latin:keyLabelFlags="fontNormal" />
<!-- U+0639: "ع" ARABIC LETTER AIN --> <!-- U+0639: "ع" ARABIC LETTER AIN
U+0667: "٧" ARABIC-INDIC DIGIT SEVEN -->
<Key <Key
latin:keyLabel="&#x0639;" latin:keyLabel="&#x0639;"
latin:keyHintLabel="7"
latin:additionalMoreKeys="7,&#x0667;"
latin:keyLabelFlags="fontNormal" /> latin:keyLabelFlags="fontNormal" />
<!-- U+0647: "ه" ARABIC LETTER HEH <!-- U+0647: "ه" ARABIC LETTER HEH
U+FEEB: "" ARABIC LETTER HEH INITIAL FORM U+FEEB: "" ARABIC LETTER HEH INITIAL FORM
U+0647 U+200D: ARABIC LETTER HEH + ZERO WIDTH JOINER --> U+0647 U+200D: ARABIC LETTER HEH + ZERO WIDTH JOINER
U+0668: "٨" ARABIC-INDIC DIGIT EIGHT -->
<Key <Key
latin:keyLabel="&#x0647;" latin:keyLabel="&#x0647;"
latin:keyHintLabel="8"
latin:additionalMoreKeys="8,&#x0668;"
latin:moreKeys="&#xFEEB;|&#x0647;&#x200D;" latin:moreKeys="&#xFEEB;|&#x0647;&#x200D;"
latin:keyLabelFlags="fontNormal" /> latin:keyLabelFlags="fontNormal" />
<!-- U+062E: "خ" ARABIC LETTER KHAH --> <!-- U+062E: "خ" ARABIC LETTER KHAH
U+0669: "٩" ARABIC-INDIC DIGIT NINE -->
<Key <Key
latin:keyLabel="&#x062E;" latin:keyLabel="&#x062E;"
latin:keyHintLabel="9"
latin:additionalMoreKeys="9,&#x0669;"
latin:keyLabelFlags="fontNormal" /> latin:keyLabelFlags="fontNormal" />
<!-- U+062D: "ح" ARABIC LETTER HAH --> <!-- U+062D: "ح" ARABIC LETTER HAH
U+0660: "٠" ARABIC-INDIC DIGIT ZERO -->
<Key <Key
latin:keyLabel="&#x062D;" latin:keyLabel="&#x062D;"
latin:keyHintLabel="0"
latin:additionalMoreKeys="0,&#x0660;"
latin:keyLabelFlags="fontNormal" /> latin:keyLabelFlags="fontNormal" />
<!-- U+062C: "ج" ARABIC LETTER JEEM <!-- U+062C: "ج" ARABIC LETTER JEEM
U+0686: "چ" ARABIC LETTER TCHEH --> U+0686: "چ" ARABIC LETTER TCHEH -->

View File

@ -21,50 +21,80 @@
<merge <merge
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
> >
<!-- U+0636: "ض" ARABIC LETTER DAD --> <!-- U+0636: "ض" ARABIC LETTER DAD
U+06F1: "۱" EXTENDED ARABIC-INDIC DIGIT ONE -->
<Key <Key
latin:keyLabel="&#x0636;" latin:keyLabel="&#x0636;"
latin:keyHintLabel="&#x06F1;"
latin:additionalMoreKeys="&#x06F1;,1"
latin:keyLabelFlags="fontNormal" /> latin:keyLabelFlags="fontNormal" />
<!-- U+0635: "ص" ARABIC LETTER SAD --> <!-- U+0635: "ص" ARABIC LETTER SAD
U+06F2: "۲" EXTENDED ARABIC-INDIC DIGIT TWO -->
<Key <Key
latin:keyLabel="&#x0635;" latin:keyLabel="&#x0635;"
latin:keyHintLabel="&#x06F2;"
latin:additionalMoreKeys="&#x06F2;,2"
latin:keyLabelFlags="fontNormal" /> latin:keyLabelFlags="fontNormal" />
<!-- U+062B: "ث" ARABIC LETTER THEH --> <!-- U+062B: "ث" ARABIC LETTER THEH
U+06F3: "۳" EXTENDED ARABIC-INDIC DIGIT THREE -->
<Key <Key
latin:keyLabel="&#x062B;" latin:keyLabel="&#x062B;"
latin:keyHintLabel="&#x06F3;"
latin:additionalMoreKeys="&#x06F3;,3"
latin:keyLabelFlags="fontNormal" /> latin:keyLabelFlags="fontNormal" />
<!-- U+0642: "ق" ARABIC LETTER QAF --> <!-- U+0642: "ق" ARABIC LETTER QAF
U+06F4: "۴" EXTENDED ARABIC-INDIC DIGIT FOUR -->
<Key <Key
latin:keyLabel="&#x0642;" latin:keyLabel="&#x0642;"
latin:keyHintLabel="&#x06F4;"
latin:additionalMoreKeys="&#x06F4;,4"
latin:keyLabelFlags="fontNormal" /> latin:keyLabelFlags="fontNormal" />
<!-- U+0641: "ف" ARABIC LETTER FEH --> <!-- U+0641: "ف" ARABIC LETTER FEH
U+06F5: "۵" EXTENDED ARABIC-INDIC DIGIT FIVE -->
<Key <Key
latin:keyLabel="&#x0641;" latin:keyLabel="&#x0641;"
latin:keyHintLabel="&#x06F5;"
latin:additionalMoreKeys="&#x06F5;,5"
latin:keyLabelFlags="fontNormal" /> latin:keyLabelFlags="fontNormal" />
<!-- U+063A: "غ" ARABIC LETTER GHAIN --> <!-- U+063A: "غ" ARABIC LETTER GHAIN
U+06F6: "۶" EXTENDED ARABIC-INDIC DIGIT SIX -->
<Key <Key
latin:keyLabel="&#x063A;" latin:keyLabel="&#x063A;"
latin:keyHintLabel="&#x06F6;"
latin:additionalMoreKeys="&#x06F6;,6"
latin:keyLabelFlags="fontNormal" /> latin:keyLabelFlags="fontNormal" />
<!-- U+0639: "ع" ARABIC LETTER AIN --> <!-- U+0639: "ع" ARABIC LETTER AIN
U+06F7: "۷" EXTENDED ARABIC-INDIC DIGIT SEVEN -->
<Key <Key
latin:keyLabel="&#x0639;" latin:keyLabel="&#x0639;"
latin:keyHintLabel="&#x06F7;"
latin:additionalMoreKeys="&#x06F7;,7"
latin:keyLabelFlags="fontNormal" /> latin:keyLabelFlags="fontNormal" />
<!-- U+0647: "ه" ARABIC LETTER HEH <!-- U+0647: "ه" ARABIC LETTER HEH
U+FEEB: "" ARABIC LETTER HEH INITIAL FORM U+FEEB: "" ARABIC LETTER HEH INITIAL FORM
U+0647/U+200D: ARABIC LETTER HEH + ZERO WIDTH JOINER U+0647/U+200D: ARABIC LETTER HEH + ZERO WIDTH JOINER
U+0647/U+0654: ARABIC LETTER HEH + ARABIC HAMZA ABOVE U+0647/U+0654: ARABIC LETTER HEH + ARABIC HAMZA ABOVE
U+0629: "ة" ARABIC LETTER TEH MARBUTA --> U+0629: "ة" ARABIC LETTER TEH MARBUTA
U+06F8: "۸" EXTENDED ARABIC-INDIC DIGIT EIGHT -->
<Key <Key
latin:keyLabel="&#x0647;" latin:keyLabel="&#x0647;"
latin:moreKeys="&#xFEEB;|&#x0647;&#x200D;,&#x0647;&#x0654;,&#x0629;,%" latin:moreKeys="&#xFEEB;|&#x0647;&#x200D;,&#x0647;&#x0654;,&#x0629;,%"
latin:keyHintLabel="&#x06F8;"
latin:additionalMoreKeys="&#x06F8;,8"
latin:keyLabelFlags="fontNormal" /> latin:keyLabelFlags="fontNormal" />
<!-- U+062E: "خ" ARABIC LETTER KHAH --> <!-- U+062E: "خ" ARABIC LETTER KHAH
U+06F9: "۹" EXTENDED ARABIC-INDIC DIGIT NINE -->
<Key <Key
latin:keyLabel="&#x062E;" latin:keyLabel="&#x062E;"
latin:keyHintLabel="&#x06F9;"
latin:additionalMoreKeys="&#x06F9;,9"
latin:keyLabelFlags="fontNormal" /> latin:keyLabelFlags="fontNormal" />
<!-- U+062D: "ح" ARABIC LETTER HAH --> <!-- U+062D: "ح" ARABIC LETTER HAH
U+06F0: "۰" EXTENDED ARABIC-INDIC DIGIT ZERO -->
<Key <Key
latin:keyLabel="&#x062D;" latin:keyLabel="&#x062D;"
latin:keyHintLabel="&#x06F0;"
latin:additionalMoreKeys="&#x06F0;,0"
latin:keyLabelFlags="fontNormal" /> latin:keyLabelFlags="fontNormal" />
<!-- U+062C: "ج" ARABIC LETTER JEEM --> <!-- U+062C: "ج" ARABIC LETTER JEEM -->
<Key <Key

View File

@ -27,8 +27,7 @@
latin:keyWidth="9.0%p" latin:keyWidth="9.0%p"
> >
<include <include
latin:keyboardLayout="@xml/rowkeys_azerty1" latin:keyboardLayout="@xml/rowkeys_azerty1" />
latin:keyLabelFlags="disableAdditionalMoreKeys|disableKeyHintLabel" />
<Key <Key
latin:keyStyle="deleteKeyStyle" latin:keyStyle="deleteKeyStyle"
latin:keyWidth="fillRight" /> latin:keyWidth="fillRight" />

View File

@ -27,8 +27,7 @@
latin:keyWidth="8.182%p" latin:keyWidth="8.182%p"
> >
<include <include
latin:keyboardLayout="@xml/rowkeys_bulgarian1" latin:keyboardLayout="@xml/rowkeys_bulgarian1" />
latin:keyLabelFlags="disableAdditionalMoreKeys|disableKeyHintLabel" />
<Key <Key
latin:keyStyle="deleteKeyStyle" latin:keyStyle="deleteKeyStyle"
latin:keyWidth="fillRight" /> latin:keyWidth="fillRight" />

View File

@ -27,8 +27,7 @@
latin:keyWidth="8.182%p" latin:keyWidth="8.182%p"
> >
<include <include
latin:keyboardLayout="@xml/rowkeys_bulgarian_bds1" latin:keyboardLayout="@xml/rowkeys_bulgarian_bds1" />
latin:keyLabelFlags="disableAdditionalMoreKeys|disableKeyHintLabel" />
<Key <Key
latin:keyStyle="deleteKeyStyle" latin:keyStyle="deleteKeyStyle"
latin:keyWidth="fillRight" /> latin:keyWidth="fillRight" />

View File

@ -27,8 +27,7 @@
latin:keyWidth="9.0%p" latin:keyWidth="9.0%p"
> >
<include <include
latin:keyboardLayout="@xml/rowkeys_colemak1" latin:keyboardLayout="@xml/rowkeys_colemak1" />
latin:keyLabelFlags="disableAdditionalMoreKeys|disableKeyHintLabel" />
<include <include
latin:keyboardLayout="@xml/key_colemak_colon" /> latin:keyboardLayout="@xml/key_colemak_colon" />
<Key <Key

View File

@ -27,10 +27,7 @@
latin:keyWidth="9.0%p" latin:keyWidth="9.0%p"
> >
<include <include
latin:keyboardLayout="@xml/keys_dvorak_123" /> latin:keyboardLayout="@xml/rowkeys_dvorak1" />
<include
latin:keyboardLayout="@xml/rowkeys_dvorak1"
latin:keyLabelFlags="disableAdditionalMoreKeys|disableKeyHintLabel" />
<Key <Key
latin:keyStyle="deleteKeyStyle" latin:keyStyle="deleteKeyStyle"
latin:keyWidth="fillRight" /> latin:keyWidth="fillRight" />

View File

@ -27,8 +27,7 @@
latin:keyWidth="8.182%p" latin:keyWidth="8.182%p"
> >
<include <include
latin:keyboardLayout="@xml/rowkeys_east_slavic1" latin:keyboardLayout="@xml/rowkeys_east_slavic1" />
latin:keyLabelFlags="disableAdditionalMoreKeys|disableKeyHintLabel" />
<Key <Key
latin:keyStyle="deleteKeyStyle" latin:keyStyle="deleteKeyStyle"
latin:keyWidth="fillRight" /> latin:keyWidth="fillRight" />

View File

@ -27,8 +27,7 @@
latin:keyWidth="9.0%p" latin:keyWidth="9.0%p"
> >
<include <include
latin:keyboardLayout="@xml/rowkeys_georgian1" latin:keyboardLayout="@xml/rowkeys_georgian1" />
latin:keyLabelFlags="disableAdditionalMoreKeys|disableKeyHintLabel" />
<Key <Key
latin:keyStyle="deleteKeyStyle" latin:keyStyle="deleteKeyStyle"
latin:keyWidth="fillRight" /> latin:keyWidth="fillRight" />

View File

@ -29,8 +29,7 @@
<include <include
latin:keyboardLayout="@xml/key_greek_semicolon" /> latin:keyboardLayout="@xml/key_greek_semicolon" />
<include <include
latin:keyboardLayout="@xml/rowkeys_greek1" latin:keyboardLayout="@xml/rowkeys_greek1" />
latin:keyLabelFlags="disableAdditionalMoreKeys|disableKeyHintLabel" />
<Key <Key
latin:keyStyle="deleteKeyStyle" latin:keyStyle="deleteKeyStyle"
latin:keyWidth="fillRight" /> latin:keyWidth="fillRight" />

View File

@ -26,10 +26,6 @@
<Row <Row
latin:keyWidth="9.0%p" latin:keyWidth="9.0%p"
> >
<include
latin:keyboardLayout="@xml/key_apostrophe" />
<include
latin:keyboardLayout="@xml/key_dash" />
<include <include
latin:keyboardLayout="@xml/rowkeys_hebrew1" /> latin:keyboardLayout="@xml/rowkeys_hebrew1" />
<Key <Key

View File

@ -27,8 +27,7 @@
latin:keyWidth="8.182%p" latin:keyWidth="8.182%p"
> >
<include <include
latin:keyboardLayout="@xml/rowkeys_hindi1" latin:keyboardLayout="@xml/rowkeys_hindi1" />
latin:keyLabelFlags="disableAdditionalMoreKeys|disableKeyHintLabel" />
<Key <Key
latin:keyStyle="deleteKeyStyle" latin:keyStyle="deleteKeyStyle"
latin:keyWidth="fillRight" /> latin:keyWidth="fillRight" />

View File

@ -27,8 +27,7 @@
latin:keyWidth="8.182%p" latin:keyWidth="8.182%p"
> >
<include <include
latin:keyboardLayout="@xml/rowkeys_mongolian1" latin:keyboardLayout="@xml/rowkeys_mongolian1" />
latin:keyLabelFlags="disableAdditionalMoreKeys|disableKeyHintLabel" />
<Key <Key
latin:keyStyle="deleteKeyStyle" latin:keyStyle="deleteKeyStyle"
latin:keyWidth="fillRight" /> latin:keyWidth="fillRight" />

View File

@ -27,8 +27,7 @@
latin:keyWidth="8.182%p" latin:keyWidth="8.182%p"
> >
<include <include
latin:keyboardLayout="@xml/rowkeys_nordic1" latin:keyboardLayout="@xml/rowkeys_nordic1" />
latin:keyLabelFlags="disableAdditionalMoreKeys|disableKeyHintLabel" />
<Key <Key
latin:keyStyle="deleteKeyStyle" latin:keyStyle="deleteKeyStyle"
latin:keyWidth="fillRight" /> latin:keyWidth="fillRight" />

View File

@ -27,8 +27,7 @@
latin:keyWidth="9.0%p" latin:keyWidth="9.0%p"
> >
<include <include
latin:keyboardLayout="@xml/rowkeys_qwerty1" latin:keyboardLayout="@xml/rowkeys_qwerty1" />
latin:keyLabelFlags="disableAdditionalMoreKeys|disableKeyHintLabel" />
<Key <Key
latin:keyStyle="deleteKeyStyle" latin:keyStyle="deleteKeyStyle"
latin:keyWidth="fillRight" /> latin:keyWidth="fillRight" />

View File

@ -27,8 +27,7 @@
latin:keyWidth="9.0%p" latin:keyWidth="9.0%p"
> >
<include <include
latin:keyboardLayout="@xml/rowkeys_qwertz1" latin:keyboardLayout="@xml/rowkeys_qwertz1" />
latin:keyLabelFlags="disableAdditionalMoreKeys|disableKeyHintLabel" />
<Key <Key
latin:keyStyle="deleteKeyStyle" latin:keyStyle="deleteKeyStyle"
latin:keyWidth="fillRight" /> latin:keyWidth="fillRight" />

View File

@ -27,8 +27,7 @@
latin:keyWidth="8.182%p" latin:keyWidth="8.182%p"
> >
<include <include
latin:keyboardLayout="@xml/rowkeys_south_slavic1" latin:keyboardLayout="@xml/rowkeys_south_slavic1" />
latin:keyLabelFlags="disableAdditionalMoreKeys|disableKeyHintLabel" />
<Key <Key
latin:keyStyle="deleteKeyStyle" latin:keyStyle="deleteKeyStyle"
latin:keyWidth="fillRight" /> latin:keyWidth="fillRight" />

View File

@ -27,8 +27,7 @@
latin:keyWidth="9.0%p" latin:keyWidth="9.0%p"
> >
<include <include
latin:keyboardLayout="@xml/rowkeys_qwerty1" latin:keyboardLayout="@xml/rowkeys_qwerty1" />
latin:keyLabelFlags="disableAdditionalMoreKeys|disableKeyHintLabel" />
<Key <Key
latin:keyStyle="deleteKeyStyle" latin:keyStyle="deleteKeyStyle"
latin:keyWidth="fillRight" /> latin:keyWidth="fillRight" />

View File

@ -31,8 +31,7 @@
latin:keyLabelFlags="alignLeft" latin:keyLabelFlags="alignLeft"
latin:keyWidth="7.969%p" /> latin:keyWidth="7.969%p" />
<include <include
latin:keyboardLayout="@xml/rowkeys_azerty1" latin:keyboardLayout="@xml/rowkeys_azerty1" />
latin:keyLabelFlags="disableAdditionalMoreKeys|disableKeyHintLabel" />
<Key <Key
latin:keyStyle="deleteKeyStyle" latin:keyStyle="deleteKeyStyle"
latin:keyWidth="fillRight" /> latin:keyWidth="fillRight" />

View File

@ -31,8 +31,7 @@
latin:keyLabelFlags="alignLeft" latin:keyLabelFlags="alignLeft"
latin:keyWidth="7.969%p" /> latin:keyWidth="7.969%p" />
<include <include
latin:keyboardLayout="@xml/rowkeys_bulgarian1" latin:keyboardLayout="@xml/rowkeys_bulgarian1" />
latin:keyLabelFlags="disableAdditionalMoreKeys|disableKeyHintLabel" />
<Key <Key
latin:keyStyle="deleteKeyStyle" latin:keyStyle="deleteKeyStyle"
latin:keyWidth="fillRight" /> latin:keyWidth="fillRight" />

View File

@ -31,8 +31,7 @@
latin:keyLabelFlags="alignLeft" latin:keyLabelFlags="alignLeft"
latin:keyWidth="7.969%p" /> latin:keyWidth="7.969%p" />
<include <include
latin:keyboardLayout="@xml/rowkeys_bulgarian_bds1" latin:keyboardLayout="@xml/rowkeys_bulgarian_bds1" />
latin:keyLabelFlags="disableAdditionalMoreKeys|disableKeyHintLabel" />
<Key <Key
latin:keyStyle="deleteKeyStyle" latin:keyStyle="deleteKeyStyle"
latin:keyWidth="fillRight" /> latin:keyWidth="fillRight" />

View File

@ -31,8 +31,7 @@
latin:keyLabelFlags="alignLeft" latin:keyLabelFlags="alignLeft"
latin:keyWidth="7.969%p" /> latin:keyWidth="7.969%p" />
<include <include
latin:keyboardLayout="@xml/rowkeys_colemak1" latin:keyboardLayout="@xml/rowkeys_colemak1" />
latin:keyLabelFlags="disableAdditionalMoreKeys|disableKeyHintLabel" />
<include <include
latin:keyboardLayout="@xml/key_colemak_colon" /> latin:keyboardLayout="@xml/key_colemak_colon" />
<Key <Key

View File

@ -31,10 +31,7 @@
latin:keyLabelFlags="alignLeft" latin:keyLabelFlags="alignLeft"
latin:keyWidth="7.969%p" /> latin:keyWidth="7.969%p" />
<include <include
latin:keyboardLayout="@xml/keys_dvorak_123" /> latin:keyboardLayout="@xml/rowkeys_dvorak1" />
<include
latin:keyboardLayout="@xml/rowkeys_dvorak1"
latin:keyLabelFlags="disableAdditionalMoreKeys|disableKeyHintLabel" />
<Key <Key
latin:keyStyle="deleteKeyStyle" latin:keyStyle="deleteKeyStyle"
latin:keyWidth="fillRight" /> latin:keyWidth="fillRight" />

View File

@ -31,8 +31,7 @@
latin:keyLabelFlags="alignLeft" latin:keyLabelFlags="alignLeft"
latin:keyWidth="7.969%p" /> latin:keyWidth="7.969%p" />
<include <include
latin:keyboardLayout="@xml/rowkeys_east_slavic1" latin:keyboardLayout="@xml/rowkeys_east_slavic1" />
latin:keyLabelFlags="disableAdditionalMoreKeys|disableKeyHintLabel" />
<Key <Key
latin:keyLabel="!text/keylabel_for_east_slavic_row1_12" /> latin:keyLabel="!text/keylabel_for_east_slavic_row1_12" />
<Key <Key

View File

@ -31,8 +31,7 @@
latin:keyLabelFlags="alignLeft" latin:keyLabelFlags="alignLeft"
latin:keyWidth="7.969%p" /> latin:keyWidth="7.969%p" />
<include <include
latin:keyboardLayout="@xml/rowkeys_georgian1" latin:keyboardLayout="@xml/rowkeys_georgian1" />
latin:keyLabelFlags="disableAdditionalMoreKeys|disableKeyHintLabel" />
<Key <Key
latin:keyStyle="deleteKeyStyle" latin:keyStyle="deleteKeyStyle"
latin:keyWidth="fillRight"/> latin:keyWidth="fillRight"/>

View File

@ -33,8 +33,7 @@
<include <include
latin:keyboardLayout="@xml/key_greek_semicolon" /> latin:keyboardLayout="@xml/key_greek_semicolon" />
<include <include
latin:keyboardLayout="@xml/rowkeys_greek1" latin:keyboardLayout="@xml/rowkeys_greek1" />
latin:keyLabelFlags="disableAdditionalMoreKeys|disableKeyHintLabel" />
<Key <Key
latin:keyStyle="deleteKeyStyle" latin:keyStyle="deleteKeyStyle"
latin:keyWidth="fillRight"/> latin:keyWidth="fillRight"/>

View File

@ -30,10 +30,6 @@
latin:keyStyle="tabKeyStyle" latin:keyStyle="tabKeyStyle"
latin:keyLabelFlags="alignLeft" latin:keyLabelFlags="alignLeft"
latin:keyWidth="7.969%p" /> latin:keyWidth="7.969%p" />
<include
latin:keyboardLayout="@xml/key_apostrophe" />
<include
latin:keyboardLayout="@xml/key_dash" />
<include <include
latin:keyboardLayout="@xml/rowkeys_hebrew1" /> latin:keyboardLayout="@xml/rowkeys_hebrew1" />
<Key <Key

View File

@ -31,8 +31,7 @@
latin:keyLabelFlags="alignLeft" latin:keyLabelFlags="alignLeft"
latin:keyWidth="7.969%p" /> latin:keyWidth="7.969%p" />
<include <include
latin:keyboardLayout="@xml/rowkeys_hindi1" latin:keyboardLayout="@xml/rowkeys_hindi1" />
latin:keyLabelFlags="disableAdditionalMoreKeys|disableKeyHintLabel" />
<Key <Key
latin:keyStyle="deleteKeyStyle" latin:keyStyle="deleteKeyStyle"
latin:keyWidth="fillRight" /> latin:keyWidth="fillRight" />

View File

@ -31,8 +31,7 @@
latin:keyLabelFlags="alignLeft" latin:keyLabelFlags="alignLeft"
latin:keyWidth="7.969%p" /> latin:keyWidth="7.969%p" />
<include <include
latin:keyboardLayout="@xml/rowkeys_mongolian1" latin:keyboardLayout="@xml/rowkeys_mongolian1" />
latin:keyLabelFlags="disableAdditionalMoreKeys|disableKeyHintLabel" />
<Key <Key
latin:keyStyle="deleteKeyStyle" latin:keyStyle="deleteKeyStyle"
latin:keyWidth="fillRight" /> latin:keyWidth="fillRight" />

View File

@ -31,8 +31,7 @@
latin:keyLabelFlags="alignLeft" latin:keyLabelFlags="alignLeft"
latin:keyWidth="7.969%p" /> latin:keyWidth="7.969%p" />
<include <include
latin:keyboardLayout="@xml/rowkeys_nordic1" latin:keyboardLayout="@xml/rowkeys_nordic1" />
latin:keyLabelFlags="disableAdditionalMoreKeys|disableKeyHintLabel" />
<Key <Key
latin:keyStyle="deleteKeyStyle" latin:keyStyle="deleteKeyStyle"
latin:keyWidth="fillRight" /> latin:keyWidth="fillRight" />

View File

@ -31,8 +31,7 @@
latin:keyLabelFlags="alignLeft" latin:keyLabelFlags="alignLeft"
latin:keyWidth="7.969%p" /> latin:keyWidth="7.969%p" />
<include <include
latin:keyboardLayout="@xml/rowkeys_qwerty1" latin:keyboardLayout="@xml/rowkeys_qwerty1" />
latin:keyLabelFlags="disableAdditionalMoreKeys|disableKeyHintLabel" />
<Key <Key
latin:keyStyle="deleteKeyStyle" latin:keyStyle="deleteKeyStyle"
latin:keyWidth="fillRight"/> latin:keyWidth="fillRight"/>

View File

@ -31,8 +31,7 @@
latin:keyLabelFlags="alignLeft" latin:keyLabelFlags="alignLeft"
latin:keyWidth="7.969%p" /> latin:keyWidth="7.969%p" />
<include <include
latin:keyboardLayout="@xml/rowkeys_qwertz1" latin:keyboardLayout="@xml/rowkeys_qwertz1" />
latin:keyLabelFlags="disableAdditionalMoreKeys|disableKeyHintLabel" />
<Key <Key
latin:keyStyle="deleteKeyStyle" latin:keyStyle="deleteKeyStyle"
latin:keyWidth="fillRight"/> latin:keyWidth="fillRight"/>

View File

@ -31,8 +31,7 @@
latin:keyLabelFlags="alignLeft" latin:keyLabelFlags="alignLeft"
latin:keyWidth="7.969%p" /> latin:keyWidth="7.969%p" />
<include <include
latin:keyboardLayout="@xml/rowkeys_south_slavic1" latin:keyboardLayout="@xml/rowkeys_south_slavic1" />
latin:keyLabelFlags="disableAdditionalMoreKeys|disableKeyHintLabel" />
<Key <Key
latin:keyStyle="deleteKeyStyle" latin:keyStyle="deleteKeyStyle"
latin:keyWidth="fillRight" /> latin:keyWidth="fillRight" />

View File

@ -31,8 +31,7 @@
latin:keyLabelFlags="alignLeft" latin:keyLabelFlags="alignLeft"
latin:keyWidth="7.969%p" /> latin:keyWidth="7.969%p" />
<include <include
latin:keyboardLayout="@xml/rowkeys_qwerty1" latin:keyboardLayout="@xml/rowkeys_qwerty1" />
latin:keyLabelFlags="disableAdditionalMoreKeys|disableKeyHintLabel" />
<Key <Key
latin:keyStyle="deleteKeyStyle" latin:keyStyle="deleteKeyStyle"
latin:keyWidth="fillRight"/> latin:keyWidth="fillRight"/>

View File

@ -51,7 +51,7 @@
latin:keyLabel="\'" latin:keyLabel="\'"
latin:keyHintLabel="1" latin:keyHintLabel="1"
latin:additionalMoreKeys="1" latin:additionalMoreKeys="1"
latin:moreKeys="!" /> latin:moreKeys="!,&quot;" />
</default> </default>
</switch> </switch>
<switch> <switch>
@ -72,13 +72,13 @@
latin:keyLabel="," latin:keyLabel=","
latin:keyHintLabel="2" latin:keyHintLabel="2"
latin:additionalMoreKeys="2" latin:additionalMoreKeys="2"
latin:moreKeys="\?" /> latin:moreKeys="\?,&lt;" />
<Key <Key
latin:keyLabel="." latin:keyLabel="."
latin:keyHintLabel="3" latin:keyHintLabel="3"
latin:additionalMoreKeys="3" latin:additionalMoreKeys="3"
latin:keyLabelFlags="hasPopupHint|preserveCase" latin:keyLabelFlags="hasPopupHint|preserveCase"
latin:moreKeys="!text/more_keys_for_punctuation,%" /> latin:moreKeys="!text/more_keys_for_punctuation,%,&gt;" />
</default> </default>
</switch> </switch>
</merge> </merge>

View File

@ -21,6 +21,8 @@
<merge <merge
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
> >
<include
latin:keyboardLayout="@xml/keys_dvorak_123" />
<Key <Key
latin:keyLabel="p" latin:keyLabel="p"
latin:keyHintLabel="4" latin:keyHintLabel="4"

View File

@ -81,17 +81,33 @@
<Key <Key
latin:keyLabel="&#x0E45;" latin:keyLabel="&#x0E45;"
latin:keyLabelFlags="fontNormal" /> latin:keyLabelFlags="fontNormal" />
<!-- U+0E51: "๑" THAI DIGIT ONE -->
<Key <Key
latin:keyHintLabel="1"
latin:additionalMoreKeys="1"
latin:moreKeys="&#x0E51;"
latin:keyLabel="/" /> latin:keyLabel="/" />
<!-- U+0E52: "๒" THAI DIGIT TWO -->
<Key <Key
latin:keyHintLabel="2"
latin:additionalMoreKeys="2"
latin:moreKeys="&#x0E52;"
latin:keyLabel="_" /> latin:keyLabel="_" />
<!-- U+0E20: "ภ" THAI CHARACTER PHO SAMPHAO --> <!-- U+0E20: "ภ" THAI CHARACTER PHO SAMPHAO
U+0E53: "๓" THAI DIGIT THREE -->
<Key <Key
latin:keyLabel="&#x0E20;" latin:keyLabel="&#x0E20;"
latin:keyHintLabel="3"
latin:additionalMoreKeys="3"
latin:moreKeys="&#x0E53;"
latin:keyLabelFlags="fontNormal" /> latin:keyLabelFlags="fontNormal" />
<!-- U+0E16: "ถ" THAI CHARACTER THO THUNG --> <!-- U+0E16: "ถ" THAI CHARACTER THO THUNG
U+0E54: "๔" THAI DIGIT FOUR -->
<Key <Key
latin:keyLabel="&#x0E16;" latin:keyLabel="&#x0E16;"
latin:keyHintLabel="4"
latin:additionalMoreKeys="4"
latin:moreKeys="&#x0E54;"
latin:keyLabelFlags="fontNormal" /> latin:keyLabelFlags="fontNormal" />
<!-- U+0020: " " SPACE <!-- U+0020: " " SPACE
U+0E38: " ุ" THAI CHARACTER SARA U --> U+0E38: " ุ" THAI CHARACTER SARA U -->
@ -109,25 +125,45 @@
latin:keyLabel="&#x20;&#x0E36;" latin:keyLabel="&#x20;&#x0E36;"
latin:code="0x0E36" latin:code="0x0E36"
latin:keyLabelFlags="fontNormal|followKeyLetterRatio" /> latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
<!-- U+0E04: "ค" THAI CHARACTER KHO KHWAI --> <!-- U+0E04: "ค" THAI CHARACTER KHO KHWAI
U+0E55: "๕" THAI DIGIT FIVE -->
<Key <Key
latin:keyLabel="&#x0E04;" latin:keyLabel="&#x0E04;"
latin:keyHintLabel="5"
latin:additionalMoreKeys="5"
latin:moreKeys="&#x0E55;"
latin:keyLabelFlags="fontNormal" /> latin:keyLabelFlags="fontNormal" />
<!-- U+0E15: "ต" THAI CHARACTER TO TAO --> <!-- U+0E15: "ต" THAI CHARACTER TO TAO
U+0E56: "๖" THAI DIGIT SIX -->
<Key <Key
latin:keyLabel="&#x0E15;" latin:keyLabel="&#x0E15;"
latin:keyHintLabel="6"
latin:additionalMoreKeys="6"
latin:moreKeys="&#x0E56;"
latin:keyLabelFlags="fontNormal" /> latin:keyLabelFlags="fontNormal" />
<!-- U+0E08: "จ" THAI CHARACTER CHO CHAN --> <!-- U+0E08: "จ" THAI CHARACTER CHO CHAN
U+0E57: "๗" THAI DIGIT SEVEN -->
<Key <Key
latin:keyLabel="&#x0E08;" latin:keyLabel="&#x0E08;"
latin:keyHintLabel="7"
latin:additionalMoreKeys="7"
latin:moreKeys="&#x0E57;"
latin:keyLabelFlags="fontNormal" /> latin:keyLabelFlags="fontNormal" />
<!-- U+0E02: "ข" THAI CHARACTER KHO KHAI --> <!-- U+0E02: "ข" THAI CHARACTER KHO KHAI
U+0E58: "๘" THAI DIGIT EIGHT -->
<Key <Key
latin:keyLabel="&#x0E02;" latin:keyLabel="&#x0E02;"
latin:keyHintLabel="8"
latin:additionalMoreKeys="8"
latin:moreKeys="&#x0E58;"
latin:keyLabelFlags="fontNormal" /> latin:keyLabelFlags="fontNormal" />
<!-- U+0E0A: "ช" THAI CHARACTER CHO CHANG --> <!-- U+0E0A: "ช" THAI CHARACTER CHO CHANG
U+0E59: "๙" THAI DIGIT NINE -->
<Key <Key
latin:keyLabel="&#x0E0A;" latin:keyLabel="&#x0E0A;"
latin:keyHintLabel="9"
latin:additionalMoreKeys="9"
latin:moreKeys="&#x0E59;"
latin:keyLabelFlags="fontNormal" /> latin:keyLabelFlags="fontNormal" />
</default> </default>
</switch> </switch>

View File

@ -79,9 +79,13 @@
latin:keyLabel="," /> latin:keyLabel="," />
</case> </case>
<default> <default>
<!-- U+0E46: "ๆ" THAI CHARACTER MAIYAMOK --> <!-- U+0E46: "ๆ" THAI CHARACTER MAIYAMOK
U+0E50: "" THAI DIGIT ZERO -->
<Key <Key
latin:keyLabel="&#x0E46;" latin:keyLabel="&#x0E46;"
latin:keyHintLabel="0"
latin:additionalMoreKeys="0"
latin:moreKeys="&#x0E50;"
latin:keyLabelFlags="fontNormal" /> latin:keyLabelFlags="fontNormal" />
<!-- U+0E44: "ไ" THAI CHARACTER SARA AI MAIMALAI --> <!-- U+0E44: "ไ" THAI CHARACTER SARA AI MAIMALAI -->
<Key <Key

View File

@ -26,8 +26,6 @@
<Row <Row
latin:keyWidth="10%p" latin:keyWidth="10%p"
> >
<include
latin:keyboardLayout="@xml/keys_dvorak_123" />
<include <include
latin:keyboardLayout="@xml/rowkeys_dvorak1" /> latin:keyboardLayout="@xml/rowkeys_dvorak1" />
</Row> </Row>