Merge "Fix Farsi keyboard" (82e43549) · Commits · e / os / android_packages_inputmethods_LatinIME

java/res/values-fa/donottranslate-more-keys.xml

+26 −24

Original line number	Diff line number	Diff line
		@@ -38,26 +38,26 @@
		<!-- In order to make Tatweel easily distinguishable from other punctuations, we use consecutive Tatweels only for its displayed label. -->
		<string name="more_keys_for_punctuation">"!fixedColumnOrder!8,\",\',-,:,!,؟,،,؛,ِ,َ,ٍ,ً,ٖ,ٰ,ٕ,ٔ,ُ,ٌ,ّ,ْ,ٓ,ـــ\|ـ,/"</string>
		<string name="keyhintlabel_for_punctuation">ً</string>
		<!-- U+0661: "١" ARABIC-INDIC DIGIT ONE -->
		<string name="keylabel_for_symbols_1">١</string>
		<!-- U+0662: "٢" ARABIC-INDIC DIGIT TWO -->
		<string name="keylabel_for_symbols_2">٢</string>
		<!-- U+0663: "٣" ARABIC-INDIC DIGIT THREE -->
		<string name="keylabel_for_symbols_3">٣</string>
		<!-- U+0664: "٤" ARABIC-INDIC DIGIT FOUR -->
		<string name="keylabel_for_symbols_4">٤</string>
		<!-- U+0665: "٥" ARABIC-INDIC DIGIT FIVE -->
		<string name="keylabel_for_symbols_5">٥</string>
		<!-- U+0666: "٦" ARABIC-INDIC DIGIT SIX -->
		<string name="keylabel_for_symbols_6">٦</string>
		<!-- U+0667: "٧" ARABIC-INDIC DIGIT SEVEN -->
		<string name="keylabel_for_symbols_7">٧</string>
		<!-- U+0668: "٨" ARABIC-INDIC DIGIT EIGHT -->
		<string name="keylabel_for_symbols_8">٨</string>
		<!-- U+0669: "٩" ARABIC-INDIC DIGIT NINE -->
		<string name="keylabel_for_symbols_9">٩</string>
		<!-- U+0660: "٠" ARABIC-INDIC DIGIT ZERO -->
		<string name="keylabel_for_symbols_0">٠</string>
		<!-- U+06F1: "۱" EXTENDED ARABIC-INDIC DIGIT ONE -->
		<string name="keylabel_for_symbols_1">۱</string>
		<!-- U+06F2: "۲" EXTENDED ARABIC-INDIC DIGIT TWO -->
		<string name="keylabel_for_symbols_2">۲</string>
		<!-- U+06F3: "۳" EXTENDED ARABIC-INDIC DIGIT THREE -->
		<string name="keylabel_for_symbols_3">۳</string>
		<!-- U+06F4: "۴" EXTENDED ARABIC-INDIC DIGIT FOUR -->
		<string name="keylabel_for_symbols_4">۴</string>
		<!-- U+06F5: "۵" EXTENDED ARABIC-INDIC DIGIT FIVE -->
		<string name="keylabel_for_symbols_5">۵</string>
		<!-- U+06F6: "۶" EXTENDED ARABIC-INDIC DIGIT SIX -->
		<string name="keylabel_for_symbols_6">۶</string>
		<!-- U+06F7: "۷" EXTENDED ARABIC-INDIC DIGIT SEVEN -->
		<string name="keylabel_for_symbols_7">۷</string>
		<!-- U+06F8: "۸" EXTENDED ARABIC-INDIC DIGIT EIGHT -->
		<string name="keylabel_for_symbols_8">۸</string>
		<!-- U+06F9: "۹" EXTENDED ARABIC-INDIC DIGIT NINE -->
		<string name="keylabel_for_symbols_9">۹</string>
		<!-- U+06F0: "۰" EXTENDED ARABIC-INDIC DIGIT ZERO -->
		<string name="keylabel_for_symbols_0">۰</string>
		<string name="additional_more_keys_for_symbols_1">1</string>
		<string name="additional_more_keys_for_symbols_2">2</string>
		<string name="additional_more_keys_for_symbols_3">3</string>
		@@ -84,9 +84,11 @@
		<!-- U+060C: "،" ARABIC COMMA
		U+061B: "؛" ARABIC SEMICOLON
		U+061F: "؟" ARABIC QUESTION MARK -->
		<string name="keylabel_for_apostrophe">،</string>
		<string name="keylabel_for_dash">"."</string>
		<string name="keyhintlabel_for_apostrophe">؟</string>
		<string name="keylabel_for_tablet_comma">"،"</string>
		<string name="keyhintlabel_for_tablet_comma">"!"</string>
		<string name="more_keys_for_tablet_comma">"!,\\,"</string>
		<string name="keyhintlabel_for_tablet_period">"؟"</string>
		<string name="more_keys_for_tablet_period">"؟,\?"</string>
		<string name="keyhintlabel_for_dash">ً</string>
		<string name="more_keys_for_apostrophe">"؟,؛,!,:,-,/,\',\""</string>
		<!-- U+0651: "ّ" ARABIC SHADDA
		@@ -104,7 +106,7 @@
		U+0654: "ٔ" ARABIC HAMZA ABOVE
		U+0655: "ٕ" 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">"ّ,ْ,ٌ,ٓ,ُ,ِ,َ,ً,ـــ\|ـ,ٍ,ٔ,ٖ,ٕ,ٰ"</string>
		<string name="more_keys_for_dash">"ّ,ْ,ٌ,ٓ,ُ,ِ,َ,ً,ـــ\|ـ,ٍ,ٔ,ٖ,ٕ,_,ٰ"</string>
		<!-- U+266A: "♪" EIGHTH NOTE -->
		<string name="more_keys_for_bullet">♪</string>
		<!-- U+2605: "★" BLACK STAR

java/res/values/donottranslate-more-keys.xml

+5 −0

Original line number	Diff line number	Diff line
		@@ -139,6 +139,11 @@
		<string name="more_keys_for_symbols_semicolon"></string>
		<!-- U+2030: "‰" PER MILLE SIGN -->
		<string name="more_keys_for_symbols_percent">‰</string>
		<string name="keylabel_for_tablet_comma">,</string>
		<string name="keyhintlabel_for_tablet_comma">!</string>
		<string name="more_keys_for_tablet_comma">!</string>
		<string name="keyhintlabel_for_tablet_period">\?</string>
		<string name="more_keys_for_tablet_period">\?</string>
		<string name="keylabel_for_apostrophe">\'</string>
		<string name="keylabel_for_dash">-</string>
		<string name="keyhintlabel_for_apostrophe">\"</string>

java/res/xml-fa/keyboard_set.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -23,7 +23,7 @@
		latin:keyboardLocale="fa" >
		<Element
		latin:elementName="alphabet"
		latin:elementKeyboard="@xml/kbd_arabic" />
		latin:elementKeyboard="@xml/kbd_farsi" />
		<Element
		latin:elementName="symbols"
		latin:elementKeyboard="@xml/kbd_symbols" />

java/res/xml/keys_comma_period.xml→java/res/xml-sw600dp/keys_comma_period.xml

+5 −5

Original line number	Diff line number	Diff line
		@@ -32,14 +32,14 @@
		</case>
		<default>
		<Key
		latin:keyLabel=","
		latin:keyHintLabel="!"
		latin:moreKeys="!"
		latin:keyLabel="@string/keylabel_for_tablet_comma"
		latin:keyHintLabel="@string/keyhintlabel_for_tablet_comma"
		latin:moreKeys="@string/more_keys_for_tablet_comma"
		latin:keyStyle="hasShiftedLetterHintStyle" />
		<Key
		latin:keyLabel="."
		latin:keyHintLabel="\?"
		latin:moreKeys="\?"
		latin:keyHintLabel="@string/keyhintlabel_for_tablet_period"
		latin:moreKeys="@string/more_keys_for_tablet_period"
		latin:keyStyle="hasShiftedLetterHintStyle" />
		</default>
		</switch>

java/res/xml-sw600dp/rowkeys_farsi1.xml

0 → 100644

+66 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		/*
		**
		** Copyright 2012, 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+0636: "ض" ARABIC LETTER DAD -->
		<Key
		latin:keyLabel="ض" />
		<!-- U+0635: "ص" ARABIC LETTER SAD -->
		<Key
		latin:keyLabel="ص" />
		<!-- U+062B: "ث" ARABIC LETTER THEH -->
		<Key
		latin:keyLabel="ث" />
		<!-- U+0642: "ق" ARABIC LETTER QAF -->
		<Key
		latin:keyLabel="ق" />
		<!-- U+0641: "ف" ARABIC LETTER FEH -->
		<Key
		latin:keyLabel="ف" />
		<!-- U+063A: "غ" ARABIC LETTER GHAIN -->
		<Key
		latin:keyLabel="غ" />
		<!-- U+0639: "ع" ARABIC LETTER AIN -->
		<Key
		latin:keyLabel="ع" />
		<!-- U+0647: "ه" ARABIC LETTER HEH
		U+FEEB: "ﻫ" ARABIC LETTER HEH INITIAL FORM
		U+0647/U+200D: ARABIC LETTER HEH + ZERO WIDTH JOINER
		U+06C0: "ۀ" ARABIC LETTER HEH WITH YEH ABOVE
		U+0629: "ة" ARABIC LETTER TEH MARBUTA -->
		<!-- TODO: DroidSansArabic lacks the glyph of U+06C0 ARABIC LETTER HEH WITH YEH ABOVE -->
		<Key
		latin:keyLabel="ه"
		latin:moreKeys="ﻫ\|ه‍,ۀ,ة,%" />
		<!-- U+062E: "خ" ARABIC LETTER KHAH -->
		<Key
		latin:keyLabel="خ" />
		<!-- U+062D: "ح" ARABIC LETTER HAH -->
		<Key
		latin:keyLabel="ح" />
		<!-- U+062C: "ج" ARABIC LETTER JEEM -->
		<Key
		latin:keyLabel="ج" />
		<!-- U+0686: "چ" ARABIC LETTER TCHEH -->
		<Key
		latin:keyLabel="چ" />
		</merge>