Fix Persian keyboard

Change-Id: Id897b5e1205250bf208daeaa43bffe66043295cd

3 files changed, 115 insertions, 4 deletions

diff --git a/java/res/values-fa/donottranslate-more-keys.xml b/java/res/values-fa/donottranslate-more-keys.xml
new file mode 100644
index 000000000..cde686084
--- /dev/null
+++ b/java/res/values-fa/donottranslate-more-keys.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2011, 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.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- \u060c: ARABIC COMMA
+         \u061b: ARABIC SEMICOLON
+         \u061f: ARABIC QUESTION MARK -->
+    <!-- \u0650: ARABIC KASRA
+         \u064e: ARABIC FATHA
+         \u064b: ARABIC FATHATAN
+         \u0640: ARABIC TATWEEL
+         \u064d: ARABIC KASRATAN
+         \u0670: ARABIC LETTER SUPERSCRIPT ALEF
+         \u0656: ARABIC SUBSCRIPT ALEF
+         \u0654: ARABIC HAMZA ABOVE
+         \u0655: ARABIC HAMZA BELOW -->
+    <!-- \u0651: ARABIC SHADDA
+         \u0652: ARABIC SUKUN
+         \u064c: ARABIC DAMMATAN
+         \u0653: ARABIC MADDAH ABOVE
+         \u064f: ARABIC DAMMA -->
+    <!-- In order to make Tatweel easily distinguishable from other punctuations, we use consecutive Tatweels only for its displayed label. -->
+    <!-- TODO: Will introduce "grouping marks" to the more characters specification. -->
+    <string name="more_keys_for_punctuation">"\u060c,\u061b,\u061f,!,:,-,/,\',\",\u0640\u0640\u0640|\u0640,\u064e,\u0650,\u064b,\u064d,\u0670,\u0656,\u0655,\u0654,\u0653,\u0652,\u0651,\u064c,\u064f"</string>
+    <integer name="mini_keyboard_column_for_punctuation">9</integer>
+    <string name="keyhintlabel_for_punctuation">\u064b</string>
+    <string name="keylabel_for_symbols_1">"١"</string>
+    <string name="keylabel_for_symbols_2">"٢"</string>
+    <string name="keylabel_for_symbols_3">"٣"</string>
+    <string name="keylabel_for_symbols_4">"٤"</string>
+    <string name="keylabel_for_symbols_5">"٥"</string>
+    <string name="keylabel_for_symbols_6">"٦"</string>
+    <string name="keylabel_for_symbols_7">"٧"</string>
+    <string name="keylabel_for_symbols_8">"٨"</string>
+    <string name="keylabel_for_symbols_9">"٩"</string>
+    <string name="keylabel_for_symbols_0">"٠"</string>
+    <string name="more_keys_for_symbols_1">1</string>
+    <string name="more_keys_for_symbols_2">2</string>
+    <string name="more_keys_for_symbols_3">3</string>
+    <string name="more_keys_for_symbols_4">4</string>
+    <string name="more_keys_for_symbols_5">5</string>
+    <string name="more_keys_for_symbols_6">6</string>
+    <string name="more_keys_for_symbols_7">7</string>
+    <string name="more_keys_for_symbols_8">8</string>
+    <string name="more_keys_for_symbols_9">9</string>
+    <!-- \u066b: ARABIC DECIMAL SEPARATOR
+         \u066c: ARABIC THOUSANDS SEPARATOR -->
+    <string name="more_keys_for_symbols_0">0,\u066b,\u066c</string>
+    <string name="keylabel_for_comma">\u060c</string>
+    <string name="keylabel_for_f1">\u060c</string>
+    <string name="keylabel_for_symbols_question">\u061f</string>
+    <string name="keylabel_for_symbols_semicolon">\u061b</string>
+    <!-- \u066a: ARABIC PERCENT SIGN -->
+    <string name="keylabel_for_symbols_percent">\u066a</string>
+    <string name="more_keys_for_comma">,</string>
+    <string name="more_keys_for_f1">,</string>
+    <!-- @icon/3 is iconSettingsKey -->
+    <string name="more_keys_for_f1_settings">\\,,\@icon/3|\@integer/key_settings</string>
+    <!-- @icon/7 is iconTabKey -->
+    <string name="more_keys_for_f1_navigate">\\,,\@icon/7|\@integer/key_tab</string>
+    <string name="more_keys_for_symbols_question">\?</string>
+    <string name="more_keys_for_symbols_semicolon">;</string>
+    <string name="more_keys_for_symbols_percent">%,‰</string>
+    <!-- \u060c: ARABIC COMMA
+         \u061b: ARABIC SEMICOLON
+         \u061f: ARABIC QUESTION MARK -->
+    <string name="keylabel_for_apostrophe">"\u060c"</string>
+    <string name="keylabel_for_dash">"."</string>
+    <string name="keyhintlabel_for_apostrophe">"\u061f"</string>
+    <string name="keyhintlabel_for_dash">"\u064b"</string>
+    <string name="more_keys_for_apostrophe">"\u061f,\u061b,!,:,-,/,\',\""</string>
+    <!-- \u0651: ARABIC SHADDA
+         \u0652: ARABIC SUKUN
+         \u064c: ARABIC DAMMATAN
+         \u0653: ARABIC MADDAH ABOVE
+         \u064f: ARABIC DAMMA -->
+    <!-- \u0650: ARABIC KASRA
+         \u064e: ARABIC FATHA
+         \u064b: ARABIC FATHATAN
+         \u0640: ARABIC TATWEEL
+         \u064d: ARABIC KASRATAN -->
+    <!-- \u0670: ARABIC LETTER SUPERSCRIPT ALEF
+         \u0656: ARABIC SUBSCRIPT ALEF
+         \u0654: ARABIC HAMZA ABOVE
+         \u0655: ARABIC HAMZA BELOW -->
+    <!-- In order to make Tatweel easily distinguishable from other punctuations, we use consecutive Tatweels only for its displayed label. -->
+    <string name="more_keys_for_dash">"\u0651,\u0652,\u064c,\u0653,\u064f,\u0650,\u064e,\u064b,\u0640\u0640\u0640|\u0640,\u064d,\u0654,\u0656,\u0655,\u0670"</string>
+    <string name="more_keys_for_bullet">♪</string>
+    <!-- \u066d: ARABIC FIVE POINTED STAR -->
+    <string name="more_keys_for_star">★,\u066d</string>
+    <!-- \ufd3e: ORNATE LEFT PARENTHESIS -->
+    <string name="more_keys_for_left_parenthesis">[,{,&lt;,\ufd3e</string>
+    <!-- \ufd3f: ORNATE RIGHT PARENTHESIS -->
+    <string name="more_keys_for_right_parenthesis">],},&gt;,\ufd3f</string>
+</resources>
diff --git a/java/res/values-fa/strings.xml b/java/res/values-fa/strings.xml
index 7d8c1e941..fb2022aa4 100644
--- a/java/res/values-fa/strings.xml
+++ b/java/res/values-fa/strings.xml
@@ -66,9 +66,9 @@
     <string name="label_next_key" msgid="362972844525672568">"بعدی"</string>
     <string name="label_done_key" msgid="2441578748772529288">"انجام شد"</string>
     <string name="label_send_key" msgid="2815056534433717444">"ارسال"</string>
-    <string name="label_to_alpha_key" msgid="4793983863798817523">"ABC"</string>
-    <string name="label_to_symbol_key" msgid="8516904117128967293">"?123"</string>
-    <string name="label_to_symbol_with_microphone_key" msgid="9035925553010061906">"123"</string>
+    <string name="label_to_alpha_key" msgid="4793983863798817523">"ا ب پ"</string>
+    <string name="label_to_symbol_key" msgid="8516904117128967293">"٣٢١؟"</string>
+    <string name="label_to_symbol_with_microphone_key" msgid="9035925553010061906">"٣٢١"</string>
     <string name="label_pause_key" msgid="181098308428035340">"توقف موقت"</string>
     <string name="label_wait_key" msgid="6402152600878093134">"منتظر بمانید"</string>
     <string name="spoken_use_headphones" msgid="896961781287283493">"برای شنیدن کلیدهای گذرواژه که با صدای بلند خوانده می‌شوند، از هدست استفاده کنید."</string>
diff --git a/java/res/xml/kbd_rows_farsi.xml b/java/res/xml/kbd_rows_farsi.xml
index d0a28537f..bca43b623 100644
--- a/java/res/xml/kbd_rows_farsi.xml
+++ b/java/res/xml/kbd_rows_farsi.xml
@@ -67,7 +67,7 @@
         <Key
             latin:keyLabel="ه"
             latin:keyHintLabel="7"
-            latin:moreKeys="7,٧,/u0629" />
+            latin:moreKeys="7,٧,\u0629" />
         <!-- \u062e: ARABIC LETTER KHAH -->
         <Key
             latin:keyLabel="خ"