aboutsummaryrefslogtreecommitdiffstats
path: root/java
diff options
context:
space:
mode:
authorTadashi G. Takaoka <takaoka@google.com>2012-03-13 20:35:25 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-03-13 20:35:25 -0700
commit0bae6abffd3a7c0a954448b109986b6acfc99128 (patch)
tree51b30de685c629c1eaa08649b2dc9afd2d2a971a /java
parent7b2d6a8f98b197b6ff9e7aefd5efef35fe1695af (diff)
parentf71c2cfb65e5e66a34b1184b2659f59905a8985d (diff)
downloadlatinime-0bae6abffd3a7c0a954448b109986b6acfc99128.tar.gz
latinime-0bae6abffd3a7c0a954448b109986b6acfc99128.tar.xz
latinime-0bae6abffd3a7c0a954448b109986b6acfc99128.zip
Merge "ZWNJ key on Persian shouldn't be altCodeWhileTyping key"
Diffstat (limited to 'java')
-rw-r--r--java/res/xml-sw600dp/key_styles_common.xml4
-rw-r--r--java/res/xml-sw768dp/key_styles_common.xml4
-rw-r--r--java/res/xml/key_styles_common.xml2
3 files changed, 2 insertions, 8 deletions
diff --git a/java/res/xml-sw600dp/key_styles_common.xml b/java/res/xml-sw600dp/key_styles_common.xml
index b206f0e54..a263acd9b 100644
--- a/java/res/xml-sw600dp/key_styles_common.xml
+++ b/java/res/xml-sw600dp/key_styles_common.xml
@@ -82,9 +82,7 @@
latin:styleName="zwnjKeyStyle"
latin:keyLabel="&#x200C;"
latin:moreKeys="&#x200D;"
- latin:keyLabelFlags="hasPopupHint"
- latin:altCode="@integer/key_space"
- latin:keyActionFlags="altCodeWhileTyping" />
+ latin:keyLabelFlags="hasPopupHint" />
<key-style
latin:styleName="smileyKeyStyle"
latin:keyLabel=":-)"
diff --git a/java/res/xml-sw768dp/key_styles_common.xml b/java/res/xml-sw768dp/key_styles_common.xml
index 069fc63b9..fade151ed 100644
--- a/java/res/xml-sw768dp/key_styles_common.xml
+++ b/java/res/xml-sw768dp/key_styles_common.xml
@@ -81,9 +81,7 @@
latin:styleName="zwnjKeyStyle"
latin:keyLabel="&#x200C;"
latin:moreKeys="&#x200D;"
- latin:keyLabelFlags="hasPopupHint"
- latin:altCode="@integer/key_space"
- latin:keyActionFlags="altCodeWhileTyping" />
+ latin:keyLabelFlags="hasPopupHint" />
<key-style
latin:styleName="smileyKeyStyle"
latin:keyLabel=":-)"
diff --git a/java/res/xml/key_styles_common.xml b/java/res/xml/key_styles_common.xml
index 7b526c07f..087b8952f 100644
--- a/java/res/xml/key_styles_common.xml
+++ b/java/res/xml/key_styles_common.xml
@@ -112,8 +112,6 @@
latin:keyLabel="&#x200C;"
latin:moreKeys="&#x200D;"
latin:keyLabelFlags="hasPopupHint"
- latin:altCode="@integer/key_space"
- latin:keyActionFlags="altCodeWhileTyping"
latin:backgroundType="functional" />
<key-style
latin:styleName="shortcutKeyStyle"