aboutsummaryrefslogtreecommitdiffstats
path: root/java/res/xml-sw600dp
diff options
context:
space:
mode:
authorTadashi G. Takaoka <takaoka@google.com>2012-06-15 21:53:12 -0700
committerTadashi G. Takaoka <takaoka@google.com>2012-06-18 10:33:03 -0700
commit38dc9ca31432f19641d80cd6f89354d66c5bebc1 (patch)
treed44e7092a63c827540c498125ab4b166747a7a34 /java/res/xml-sw600dp
parent6de1b7a70986ebb1bf63078617d59ec4e46b657f (diff)
downloadlatinime-38dc9ca31432f19641d80cd6f89354d66c5bebc1.tar.gz
latinime-38dc9ca31432f19641d80cd6f89354d66c5bebc1.tar.xz
latinime-38dc9ca31432f19641d80cd6f89354d66c5bebc1.zip
Fix duplicate period on Persian tablet keyboard
Bug: 6679579 Change-Id: I8bccbfbdf7ea1fa1b78a5af05eb1df100f22ab0c
Diffstat (limited to 'java/res/xml-sw600dp')
-rw-r--r--java/res/xml-sw600dp/key_apostrophe.xml10
-rw-r--r--java/res/xml-sw600dp/key_dash.xml1
-rw-r--r--java/res/xml-sw600dp/rowkeys_farsi3.xml12
-rw-r--r--java/res/xml-sw600dp/rows_farsi.xml2
4 files changed, 19 insertions, 6 deletions
diff --git a/java/res/xml-sw600dp/key_apostrophe.xml b/java/res/xml-sw600dp/key_apostrophe.xml
index 0c838db56..2aec34729 100644
--- a/java/res/xml-sw600dp/key_apostrophe.xml
+++ b/java/res/xml-sw600dp/key_apostrophe.xml
@@ -28,6 +28,16 @@
<Key
latin:keyLabel="-" />
</case>
+ <case
+ latin:languageCode="fa"
+ >
+ <Key
+ latin:keyLabel="!text/keylabel_for_apostrophe"
+ latin:keyHintLabel="!text/keyhintlabel_for_apostrophe"
+ latin:keyLabelFlags="hasPopupHint"
+ latin:moreKeys="!text/more_keys_for_apostrophe"
+ latin:keyStyle="hasShiftedLetterHintStyle" />
+ </case>
<default>
<Key
latin:keyLabel="!text/keylabel_for_apostrophe"
diff --git a/java/res/xml-sw600dp/key_dash.xml b/java/res/xml-sw600dp/key_dash.xml
index 118b67f27..b139c29c8 100644
--- a/java/res/xml-sw600dp/key_dash.xml
+++ b/java/res/xml-sw600dp/key_dash.xml
@@ -34,6 +34,7 @@
<Key
latin:keyLabel="."
latin:keyHintLabel="!text/keyhintlabel_for_arabic_diacritics"
+ latin:keyLabelFlags="hasPopupHint"
latin:moreKeys="!text/more_keys_for_arabic_diacritics"
latin:keyStyle="hasShiftedLetterHintStyle" />
</case>
diff --git a/java/res/xml-sw600dp/rowkeys_farsi3.xml b/java/res/xml-sw600dp/rowkeys_farsi3.xml
index cb8184003..998ba72d6 100644
--- a/java/res/xml-sw600dp/rowkeys_farsi3.xml
+++ b/java/res/xml-sw600dp/rowkeys_farsi3.xml
@@ -27,11 +27,12 @@
<!-- U+0637: "ط" ARABIC LETTER TAH -->
<Key
latin:keyLabel="&#x0637;" />
- <!-- U+0632: "ز" ARABIC LETTER ZAIN
- U+0698: "ژ" ARABIC LETTER JEH -->
+ <!-- U+0698: "ژ" ARABIC LETTER JEH -->
<Key
- latin:keyLabel="&#x0632;"
- latin:moreKeys="&#x0698;" />
+ latin:keyLabel="&#x0698;" />
+ <!-- U+0632: "ز" ARABIC LETTER ZAIN -->
+ <Key
+ latin:keyLabel="&#x0632;" />
<!-- U+0631: "ر" ARABIC LETTER REH -->
<Key
latin:keyLabel="&#x0631;" />
@@ -49,4 +50,7 @@
<Key
latin:keyLabel="&#x0648;"
latin:moreKeys="&#x0624;" />
+ <!-- U+0622: "آ" ARABIC LETTER ALEF WITH MADDA ABOVE -->
+ <Key
+ latin:keyLabel="&#x0622;" />
</merge>
diff --git a/java/res/xml-sw600dp/rows_farsi.xml b/java/res/xml-sw600dp/rows_farsi.xml
index 1ce658648..52c2d9329 100644
--- a/java/res/xml-sw600dp/rows_farsi.xml
+++ b/java/res/xml-sw600dp/rows_farsi.xml
@@ -44,8 +44,6 @@
<include
latin:keyboardLayout="@xml/rowkeys_farsi3"
latin:keyXPos="4.091%p" />
- <include
- latin:keyboardLayout="@xml/keys_comma_period" />
<Key
latin:keyStyle="enterKeyStyle"
latin:keyWidth="fillRight" />