aboutsummaryrefslogtreecommitdiffstats
path: root/java
diff options
context:
space:
mode:
Diffstat (limited to 'java')
-rw-r--r--java/res/xml/keys_dvorak_123.xml34
-rw-r--r--java/res/xml/row_dvorak4.xml14
2 files changed, 29 insertions, 19 deletions
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="&lt;"
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"
>