Add missing letter THEH to Perisan keyboard layout
With this change, the phone keyboard layout use quite similar one of
the oridinal PC. The differences from the ordinal PC keyboard layout
are:
- Add letter JEH between letter TAH and ZAIN at 3rd row.
- Move letter TCHEN from the most left of 1st row to the most left of
3rd row.
The tablet keyboard layout is the same of of the phone except:
- Add letter ALEF with MADDA above between letter WAW and letter TCHEN
at 3rd row.
This change also moves the delete key and the enter key on tablet to
1st and 2nd row respectively.
Bug: 9371393
Change-Id: I964589055eb15549fe20e5ec45e02f7dc6b5686e
diff --git a/java/res/xml/keys_farsi3_right.xml b/java/res/xml/keys_farsi3_right.xml
new file mode 100644
index 0000000..77efb0a
--- /dev/null
+++ b/java/res/xml/keys_farsi3_right.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2013, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<merge
+ xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+>
+ <!-- U+0686: "چ" ARABIC LETTER TCHEH -->
+ <Key
+ latin:keyLabel="چ"
+ latin:keyLabelFlags="fontNormal" />
+</merge>
diff --git a/java/res/xml/rowkeys_farsi1.xml b/java/res/xml/rowkeys_farsi1.xml
index 0ccf1ab..5a22a24 100644
--- a/java/res/xml/rowkeys_farsi1.xml
+++ b/java/res/xml/rowkeys_farsi1.xml
@@ -21,81 +21,83 @@
<merge
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
- <!-- U+0635: "ص" ARABIC LETTER SAD
- U+0636: "ض" ARABIC LETTER DAD
+ <!-- U+0636: "ض" ARABIC LETTER DAD
U+06F1: "۱" EXTENDED ARABIC-INDIC DIGIT ONE -->
<Key
- latin:keyLabel="ص"
- latin:moreKeys="ض,%"
+ latin:keyLabel="ض"
latin:keyHintLabel="۱"
latin:additionalMoreKeys="۱,1"
latin:keyLabelFlags="fontNormal" />
- <!-- U+0642: "ق" ARABIC LETTER QAF
+ <!-- U+0635: "ص" ARABIC LETTER SAD
U+06F2: "۲" EXTENDED ARABIC-INDIC DIGIT TWO -->
<Key
- latin:keyLabel="ق"
+ latin:keyLabel="ص"
latin:keyHintLabel="۲"
latin:additionalMoreKeys="۲,2"
latin:keyLabelFlags="fontNormal" />
- <!-- U+0641: "ف" ARABIC LETTER FEH
+ <!-- U+062B: "ث" ARABIC LETTER THEH
U+06F3: "۳" EXTENDED ARABIC-INDIC DIGIT THREE -->
<Key
- latin:keyLabel="ف"
+ latin:keyLabel="ث"
latin:keyHintLabel="۳"
latin:additionalMoreKeys="۳,3"
latin:keyLabelFlags="fontNormal" />
- <!-- U+063A: "غ" ARABIC LETTER GHAIN
+ <!-- U+0642: "ق" ARABIC LETTER QAF
U+06F4: "۴" EXTENDED ARABIC-INDIC DIGIT FOUR -->
<Key
- latin:keyLabel="غ"
+ latin:keyLabel="ق"
latin:keyHintLabel="۴"
latin:additionalMoreKeys="۴,4"
latin:keyLabelFlags="fontNormal" />
- <!-- U+0639: "ع" ARABIC LETTER AIN
+ <!-- U+0641: "ف" ARABIC LETTER FEH
U+06F5: "۵" EXTENDED ARABIC-INDIC DIGIT FIVE -->
<Key
- latin:keyLabel="ع"
+ latin:keyLabel="ف"
latin:keyHintLabel="۵"
latin:additionalMoreKeys="۵,5"
latin:keyLabelFlags="fontNormal" />
+ <!-- U+063A: "غ" ARABIC LETTER GHAIN
+ U+06F6: "۶" EXTENDED ARABIC-INDIC DIGIT SIX -->
+ <Key
+ latin:keyLabel="غ"
+ latin:keyHintLabel="۶"
+ latin:additionalMoreKeys="۶,6"
+ latin:keyLabelFlags="fontNormal" />
+ <!-- U+0639: "ع" ARABIC LETTER AIN
+ U+06F7: "۷" EXTENDED ARABIC-INDIC DIGIT SEVEN -->
+ <Key
+ latin:keyLabel="ع"
+ latin:keyHintLabel="۷"
+ latin:additionalMoreKeys="۷,7"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+0647: "ه" ARABIC LETTER HEH
U+FEEB: "ﻫ" ARABIC LETTER HEH INITIAL FORM
U+0647/U+200D: ARABIC LETTER HEH + ZERO WIDTH JOINER
U+0647/U+0654: ARABIC LETTER HEH + ARABIC HAMZA ABOVE
U+0629: "ة" ARABIC LETTER TEH MARBUTA
- U+06F6: "۶" EXTENDED ARABIC-INDIC DIGIT SIX -->
+ U+06F8: "۸" EXTENDED ARABIC-INDIC DIGIT EIGHT -->
<Key
latin:keyLabel="ه"
latin:moreKeys="ﻫ|ه‍,هٔ,ة,%"
- latin:keyHintLabel="۶"
- latin:additionalMoreKeys="۶,6"
- latin:keyLabelFlags="fontNormal" />
- <!-- U+062E: "خ" ARABIC LETTER KHAH
- U+06F7: "۷" EXTENDED ARABIC-INDIC DIGIT SEVEN -->
- <Key
- latin:keyLabel="خ"
- latin:keyHintLabel="۷"
- latin:additionalMoreKeys="۷,7"
- latin:keyLabelFlags="fontNormal" />
- <!-- U+062D: "ح" ARABIC LETTER HAH
- U+06F8: "۸" EXTENDED ARABIC-INDIC DIGIT EIGHT -->
- <Key
- latin:keyLabel="ح"
latin:keyHintLabel="۸"
latin:additionalMoreKeys="۸,8"
latin:keyLabelFlags="fontNormal" />
- <!-- U+062C: "ج" ARABIC LETTER JEEM
+ <!-- U+062E: "خ" ARABIC LETTER KHAH
U+06F9: "۹" EXTENDED ARABIC-INDIC DIGIT NINE -->
<Key
- latin:keyLabel="ج"
+ latin:keyLabel="خ"
latin:keyHintLabel="۹"
latin:additionalMoreKeys="۹,9"
latin:keyLabelFlags="fontNormal" />
- <!-- U+0686: "چ" ARABIC LETTER TCHEH
+ <!-- U+062D: "ح" ARABIC LETTER HAH
U+06F0: "۰" EXTENDED ARABIC-INDIC DIGIT ZERO -->
<Key
- latin:keyLabel="چ"
+ latin:keyLabel="ح"
latin:keyHintLabel="۰"
latin:additionalMoreKeys="۰,0"
latin:keyLabelFlags="fontNormal" />
+ <!-- U+062C: "ج" ARABIC LETTER JEEM -->
+ <Key
+ latin:keyLabel="ج"
+ latin:keyLabelFlags="fontNormal" />
</merge>
diff --git a/java/res/xml/rowkeys_farsi2.xml b/java/res/xml/rowkeys_farsi2.xml
index 4b6abe2..fc6789e 100644
--- a/java/res/xml/rowkeys_farsi2.xml
+++ b/java/res/xml/rowkeys_farsi2.xml
@@ -25,11 +25,9 @@
<Key
latin:keyLabel="ش"
latin:keyLabelFlags="fontNormal" />
- <!-- U+0633: "س" ARABIC LETTER SEEN
- U+0636: "ض" ARABIC LETTER DAD -->
+ <!-- U+0633: "س" ARABIC LETTER SEEN -->
<Key
latin:keyLabel="س"
- latin:moreKeys="ض"
latin:keyLabelFlags="fontNormal" />
<!-- U+06CC: "ی" ARABIC LETTER FARSI YEH
U+0626: "ئ" ARABIC LETTER YEH WITH HAMZA ABOVE
@@ -59,11 +57,10 @@
latin:moreKeys="ء,آ,أ,ٱ,إ"
latin:keyLabelFlags="fontNormal" />
<!-- U+062A: "ت" ARABIC LETTER TEH
- U+062B: "ﺙ" ARABIC LETTER THEH
U+0629: "ة": ARABIC LETTER TEH MARBUTA -->
<Key
latin:keyLabel="ت"
- latin:moreKeys="ث,ة"
+ latin:moreKeys="ة"
latin:keyLabelFlags="fontNormal" />
<!-- U+0646: "ن" ARABIC LETTER NOON -->
<Key
@@ -79,4 +76,8 @@
latin:keyLabel="ک"
latin:moreKeys="ك"
latin:keyLabelFlags="fontNormal" />
+ <!-- U+06AF: "گ" ARABIC LETTER GAF -->
+ <Key
+ latin:keyLabel="گ"
+ latin:keyLabelFlags="fontNormal" />
</merge>
diff --git a/java/res/xml/rowkeys_farsi3.xml b/java/res/xml/rowkeys_farsi3.xml
index 7d2e81f..98949f4 100644
--- a/java/res/xml/rowkeys_farsi3.xml
+++ b/java/res/xml/rowkeys_farsi3.xml
@@ -21,17 +21,21 @@
<merge
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
- <!-- U+0637: "ط" ARABIC LETTER TAH
- U+0638: "ظ" ARABIC LETTER ZAH -->
+ <!-- U+0638: "ظ" ARABIC LETTER ZAH -->
+ <Key
+ latin:keyLabel="ظ"
+ latin:keyLabelFlags="fontNormal" />
+ <!-- U+0637: "ط" ARABIC LETTER TAH -->
<Key
latin:keyLabel="ط"
- latin:moreKeys="ظ"
latin:keyLabelFlags="fontNormal" />
- <!-- U+0632: "ز" ARABIC LETTER ZAIN
- U+0698: "ژ" ARABIC LETTER JEH -->
+ <!-- U+0698: "ژ" ARABIC LETTER JEH -->
+ <Key
+ latin:keyLabel="ژ"
+ latin:keyLabelFlags="fontNormal" />
+ <!-- U+0632: "ز" ARABIC LETTER ZAIN -->
<Key
latin:keyLabel="ز"
- latin:moreKeys="ژ"
latin:keyLabelFlags="fontNormal" />
<!-- U+0631: "ر" ARABIC LETTER REH -->
<Key
@@ -55,8 +59,6 @@
latin:keyLabel="و"
latin:moreKeys="ؤ"
latin:keyLabelFlags="fontNormal" />
- <!-- U+06AF: "گ" ARABIC LETTER GAF -->
- <Key
- latin:keyLabel="گ"
- latin:keyLabelFlags="fontNormal" />
+ <include
+ latin:keyboardLayout="@xml/keys_farsi3_right" />
</merge>
diff --git a/java/res/xml/rows_farsi.xml b/java/res/xml/rows_farsi.xml
index cc0c526..c74614f 100644
--- a/java/res/xml/rows_farsi.xml
+++ b/java/res/xml/rows_farsi.xml
@@ -24,27 +24,25 @@
<include
latin:keyboardLayout="@xml/key_styles_common" />
<Row
- latin:keyWidth="10%p"
+ latin:keyWidth="9.091%p"
>
<include
latin:keyboardLayout="@xml/rowkeys_farsi1" />
</Row>
<Row
- latin:keyWidth="10%p"
+ latin:keyWidth="9.091%p"
>
<include
latin:keyboardLayout="@xml/rowkeys_farsi2" />
</Row>
<Row
- latin:keyWidth="10%p"
+ latin:keyWidth="9.091%p"
>
<include
- latin:keyboardLayout="@xml/rowkeys_farsi3"
- latin:keyXPos="5.0%p" />
+ latin:keyboardLayout="@xml/rowkeys_farsi3" />
<Key
latin:keyStyle="deleteKeyStyle"
- latin:keyWidth="fillRight"
- latin:visualInsetsLeft="1%p" />
+ latin:keyWidth="fillRight" />
</Row>
<include
latin:keyboardLayout="@xml/row_qwerty4" />