diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2012-05-28 21:19:30 -0700 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2012-05-28 21:19:30 -0700 |
| commit | b6c03228db202b04de54ddb6b79cbcbed107bcb5 (patch) | |
| tree | d4871e9cfe0ae4aee7f90a554d3277e996fda6ef /java | |
| parent | e03f6b3917f71a7c9f9459765264b547cc80b751 (diff) | |
| parent | 6034acd168646136ca2ae99c0c503597dbe7be9b (diff) | |
| download | latinime-b6c03228db202b04de54ddb6b79cbcbed107bcb5.tar.gz latinime-b6c03228db202b04de54ddb6b79cbcbed107bcb5.tar.xz latinime-b6c03228db202b04de54ddb6b79cbcbed107bcb5.zip | |
am 6034acd1: Fix Dvorak layout in uri/email mode on phone device
* commit '6034acd168646136ca2ae99c0c503597dbe7be9b':
Fix Dvorak layout in uri/email mode on phone device
Diffstat (limited to 'java')
| -rw-r--r-- | java/res/xml/keys_dvorak_123.xml | 34 | ||||
| -rw-r--r-- | java/res/xml/row_dvorak4.xml | 14 |
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="<" 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" > |