aboutsummaryrefslogtreecommitdiffstats
path: root/java
diff options
context:
space:
mode:
authorTadashi G. Takaoka <takaoka@google.com>2014-01-29 23:12:49 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2014-01-29 23:12:49 -0800
commit306080ee3f1874aec415ae2fce8a86867187e33e (patch)
tree2762215cbc1865145c7ef7a6637574b71d4ff3e7 /java
parent60e0aef93730033a2d61b99297e53d1dc98941cf (diff)
parentd432892f0cd480efa03e0ff101596ac44d89f4f2 (diff)
downloadlatinime-306080ee3f1874aec415ae2fce8a86867187e33e.tar.gz
latinime-306080ee3f1874aec415ae2fce8a86867187e33e.tar.xz
latinime-306080ee3f1874aec415ae2fce8a86867187e33e.zip
am d432892f: Fix Farsi keyboard comma and period
* commit 'd432892f0cd480efa03e0ff101596ac44d89f4f2': Fix Farsi keyboard comma and period
Diffstat (limited to 'java')
-rw-r--r--java/res/xml/keys_comma_period_symbols.xml3
-rw-r--r--java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsSet.java3
2 files changed, 4 insertions, 2 deletions
diff --git a/java/res/xml/keys_comma_period_symbols.xml b/java/res/xml/keys_comma_period_symbols.xml
index cbdbe2ea2..880fe40d9 100644
--- a/java/res/xml/keys_comma_period_symbols.xml
+++ b/java/res/xml/keys_comma_period_symbols.xml
@@ -22,7 +22,8 @@
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<Key
- latin:keyLabel="," />
+ latin:keyLabel="!text/keylabel_for_comma"
+ latin:moreKeys="!text/more_keys_for_comma" />
<!-- U+2026: "…" HORIZONTAL ELLIPSIS -->
<Key
latin:keyLabel="."
diff --git a/java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsSet.java b/java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsSet.java
index 9f33fcc0a..4e8eb3ea7 100644
--- a/java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsSet.java
+++ b/java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsSet.java
@@ -1512,7 +1512,8 @@ public final class KeyboardTextsSet {
/* 104 */ "\u061F",
/* 105 */ "!fixedColumnOrder!4,:,!,\u061F,\u061B,-,/,\u00AB|\u00BB,\u00BB|\u00AB",
/* 106 */ null,
- /* 107 */ "\u061F",
+ // U+064B: "ً" ARABIC FATHATAN
+ /* 107 */ "\u064B",
/* 108 */ "!text/more_keys_for_arabic_diacritics",
/* 109 */ null,
/* 110 */ "\u064B",