diff options
Diffstat (limited to 'java/res')
| -rw-r--r-- | java/res/raw/main_en.dict | bin | 1069220 -> 1069220 bytes | |||
| -rw-r--r-- | java/res/xml-sw600dp/row_pcqwerty5.xml | 41 | ||||
| -rw-r--r-- | java/res/xml/keys_dvorak_123.xml | 34 | ||||
| -rw-r--r-- | java/res/xml/row_dvorak4.xml | 14 |
4 files changed, 37 insertions, 52 deletions
diff --git a/java/res/raw/main_en.dict b/java/res/raw/main_en.dict Binary files differindex 14865a28e..8f8b3cd82 100644 --- a/java/res/raw/main_en.dict +++ b/java/res/raw/main_en.dict diff --git a/java/res/xml-sw600dp/row_pcqwerty5.xml b/java/res/xml-sw600dp/row_pcqwerty5.xml index e9e231a16..3c4a46660 100644 --- a/java/res/xml-sw600dp/row_pcqwerty5.xml +++ b/java/res/xml-sw600dp/row_pcqwerty5.xml @@ -26,44 +26,19 @@ > <switch> <case - latin:keyboardLayoutSetElement="symbols|symbolsShifted" - > - <Spacer - latin:keyXPos="15.0%p" - latin:keyWidth="10.5%p" /> - </case> - <case - latin:mode="url" - > - <Key - latin:keyStyle="comKeyStyle" - latin:keyXPos="15.0%p" - latin:keyWidth="10.5%p" /> - </case> - <default> - <include - latin:keyboardLayout="@xml/keys_f1f2" - latin:keyXPos="18.5%p" /> - </default> - </switch> - <switch> - <case latin:languageSwitchKeyEnabled="true" > <Key - latin:keyStyle="languageSwitchKeyStyle" /> - <Key - latin:keyStyle="spaceKeyStyle" - latin:keyWidth="42.0%p" /> + latin:keyStyle="languageSwitchKeyStyle" + latin:keyWidth="9.0%p" + latin:backgroundType="functional" /> </case> - <!-- languageSwitchKeyEnabled="false" --> - <default> - <Key - latin:keyStyle="spaceKeyStyle" - latin:keyWidth="49.0%p" /> - </default> </switch> - <include + <Key + latin:keyStyle="spaceKeyStyle" + latin:keyXPos="25.5%p" + latin:keyWidth="49.0%p" /> + <include latin:keyXPos="-9.0%p" latin:keyWidth="fillRight" latin:keyboardLayout="@xml/key_shortcut" /> diff --git a/java/res/xml/keys_dvorak_123.xml b/java/res/xml/keys_dvorak_123.xml index 0de2dd628..60e6b6f0d 100644 --- a/java/res/xml/keys_dvorak_123.xml +++ b/java/res/xml/keys_dvorak_123.xml @@ -29,6 +29,35 @@ latin:keyLabel=""" latin:keyHintLabel="1" latin:additionalMoreKeys="1" /> + </case> + <case + latin:mode="url" + > + <Key + latin:keyLabel="/" + latin:keyHintLabel="1" + latin:additionalMoreKeys="1" /> + </case> + <case + latin:mode="email" + > + <Key + latin:keyLabel="\@" + latin:keyHintLabel="1" + latin:additionalMoreKeys="1" /> + </case> + <default> + <Key + latin:keyLabel="\'" + latin:keyHintLabel="1" + latin:additionalMoreKeys="1" + latin:moreKeys="!" /> + </default> + </switch> + <switch> + <case + latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted" + > <Key latin:keyLabel="<" latin:keyHintLabel="2" @@ -40,11 +69,6 @@ </case> <default> <Key - latin:keyLabel="\'" - latin:keyHintLabel="1" - latin:additionalMoreKeys="1" - latin:moreKeys="!" /> - <Key latin:keyLabel="," latin:keyHintLabel="2" latin:additionalMoreKeys="2" diff --git a/java/res/xml/row_dvorak4.xml b/java/res/xml/row_dvorak4.xml index f81fb007b..69bac1358 100644 --- a/java/res/xml/row_dvorak4.xml +++ b/java/res/xml/row_dvorak4.xml @@ -29,20 +29,6 @@ latin:keyWidth="15%p" /> <switch> <case - latin:mode="url" - > - <Key - latin:keyLabel="/" - latin:keyStyle="f1MoreKeysStyle" /> - </case> - <case - latin:mode="email" - > - <Key - latin:keyLabel="\@" - latin:keyStyle="f1MoreKeysStyle" /> - </case> - <case latin:hasShortcutKey="true" latin:keyboardLayoutSetElement="alphabet" > |