aboutsummaryrefslogtreecommitdiffstats
path: root/java
diff options
context:
space:
mode:
authorTadashi G. Takaoka <takaoka@google.com>2013-07-15 23:03:54 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-07-15 23:03:54 -0700
commit0a951d55a0acaf5edb3df43e28bd90586cce6475 (patch)
tree49e8593fbeaefd400ab79d0a13b9030af4c73313 /java
parent8850a158f8b650a4ff43506e9c582587ad1a6cb9 (diff)
parent0d47f2844809afb173a54a38ff582c909af4c069 (diff)
downloadlatinime-0a951d55a0acaf5edb3df43e28bd90586cce6475.tar.gz
latinime-0a951d55a0acaf5edb3df43e28bd90586cce6475.tar.xz
latinime-0a951d55a0acaf5edb3df43e28bd90586cce6475.zip
am 0d47f284: Merge "Move punctuations to more key of z in dvorak"
* commit '0d47f2844809afb173a54a38ff582c909af4c069': Move punctuations to more key of z in dvorak
Diffstat (limited to 'java')
-rw-r--r--java/res/xml-sw600dp/keys_dvorak_123.xml3
-rw-r--r--java/res/xml/keys_dvorak_123.xml3
-rw-r--r--java/res/xml/row_dvorak4.xml3
3 files changed, 4 insertions, 5 deletions
diff --git a/java/res/xml-sw600dp/keys_dvorak_123.xml b/java/res/xml-sw600dp/keys_dvorak_123.xml
index 851c14b5e..58416abb4 100644
--- a/java/res/xml-sw600dp/keys_dvorak_123.xml
+++ b/java/res/xml-sw600dp/keys_dvorak_123.xml
@@ -53,8 +53,7 @@
latin:keyLabel="."
latin:keyHintLabel="3"
latin:additionalMoreKeys="3"
- latin:keyLabelFlags="hasPopupHint|preserveCase"
- latin:moreKeys="!text/more_keys_for_punctuation,%,&gt;" />
+ latin:moreKeys="&gt;" />
</default>
</switch>
</merge>
diff --git a/java/res/xml/keys_dvorak_123.xml b/java/res/xml/keys_dvorak_123.xml
index 7124c89e7..fa94f1f28 100644
--- a/java/res/xml/keys_dvorak_123.xml
+++ b/java/res/xml/keys_dvorak_123.xml
@@ -77,8 +77,7 @@
latin:keyLabel="."
latin:keyHintLabel="3"
latin:additionalMoreKeys="3"
- latin:keyLabelFlags="hasPopupHint|preserveCase"
- latin:moreKeys="!text/more_keys_for_punctuation,%,&gt;" />
+ latin:moreKeys="&gt;" />
</default>
</switch>
</merge>
diff --git a/java/res/xml/row_dvorak4.xml b/java/res/xml/row_dvorak4.xml
index 69bac1358..e6d487e1d 100644
--- a/java/res/xml/row_dvorak4.xml
+++ b/java/res/xml/row_dvorak4.xml
@@ -68,7 +68,8 @@
latin:keyboardLayout="@xml/key_space" />
<Key
latin:keyLabel="z"
- latin:moreKeys="!text/more_keys_for_z" />
+ latin:keyLabelFlags="hasPopupHint"
+ latin:moreKeys="!text/more_keys_for_punctuation,!text/more_keys_for_z" />
<Key
latin:keyStyle="enterKeyStyle"
latin:keyWidth="fillRight" />