Merge "Fix Persian phone keyboard" into jb-dev (0100aef1) · Commits · e / os / android_packages_inputmethods_LatinIME

java/res/xml-sw600dp/rowkeys_farsi1.xml

+2 −3

Original line number	Original line	Diff line number	Diff line
	@@ -45,12 +45,11 @@
	<!-- U+0647: "ه" ARABIC LETTER HEH		<!-- U+0647: "ه" ARABIC LETTER HEH
	U+FEEB: "ﻫ" ARABIC LETTER HEH INITIAL FORM		U+FEEB: "ﻫ" ARABIC LETTER HEH INITIAL FORM
	U+0647/U+200D: ARABIC LETTER HEH + ZERO WIDTH JOINER		U+0647/U+200D: ARABIC LETTER HEH + ZERO WIDTH JOINER
	U+06C0: "ۀ" ARABIC LETTER HEH WITH YEH ABOVE		U+0647/U+0654: ARABIC LETTER HEH + ARABIC HAMZA ABOVE
	U+0629: "ة" ARABIC LETTER TEH MARBUTA -->		U+0629: "ة" ARABIC LETTER TEH MARBUTA -->
	<!-- TODO: DroidSansArabic lacks the glyph of U+06C0 ARABIC LETTER HEH WITH YEH ABOVE -->
	<Key		<Key
	latin:keyLabel="ه"		latin:keyLabel="ه"
	latin:moreKeys="ﻫ\|ه‍,ۀ,ة,%" />		latin:moreKeys="ﻫ\|ه‍,هٔ,ة,%" />
	<!-- U+062E: "خ" ARABIC LETTER KHAH -->		<!-- U+062E: "خ" ARABIC LETTER KHAH -->
	<Key		<Key
	latin:keyLabel="خ" />		latin:keyLabel="خ" />

java/res/xml/method.xml

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -49,7 +49,7 @@
	lt: Lithuanian/qwerty		lt: Lithuanian/qwerty
	lv: Latvian/qwerty		lv: Latvian/qwerty
	mk: Macedonian/south_slavic		mk: Macedonian/south_slavic
	nb: Norwaian Bokmål/nordic		nb: Norwegian Bokmål/nordic
	nl: Dutch/qwerty		nl: Dutch/qwerty
	pl: Polish/qwerty		pl: Polish/qwerty
	pt_BR: Portuguese Brazil/qwerty		pt_BR: Portuguese Brazil/qwerty

java/res/xml/rowkeys_farsi1.xml

+4 −3

Original line number	Original line	Diff line number	Diff line
	@@ -22,9 +22,11 @@
	xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"		xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
	>		>
	<!-- U+0635: "ص" ARABIC LETTER SAD		<!-- U+0635: "ص" ARABIC LETTER SAD
			U+0636: "ض" ARABIC LETTER DAD
	U+06F1: "۱" EXTENDED ARABIC-INDIC DIGIT ONE -->		U+06F1: "۱" EXTENDED ARABIC-INDIC DIGIT ONE -->
	<Key		<Key
	latin:keyLabel="ص"		latin:keyLabel="ص"
			latin:moreKeys="ض,%"
	latin:keyHintLabel="1"		latin:keyHintLabel="1"
	latin:additionalMoreKeys="1,۱" />		latin:additionalMoreKeys="1,۱" />
	<!-- U+0642: "ق" ARABIC LETTER QAF		<!-- U+0642: "ق" ARABIC LETTER QAF
	@@ -54,13 +56,12 @@
	<!-- U+0647: "ه" ARABIC LETTER HEH		<!-- U+0647: "ه" ARABIC LETTER HEH
	U+FEEB: "ﻫ" ARABIC LETTER HEH INITIAL FORM		U+FEEB: "ﻫ" ARABIC LETTER HEH INITIAL FORM
	U+0647/U+200D: ARABIC LETTER HEH + ZERO WIDTH JOINER		U+0647/U+200D: ARABIC LETTER HEH + ZERO WIDTH JOINER
	U+06C0: "ۀ" ARABIC LETTER HEH WITH YEH ABOVE		U+0647/U+0654: ARABIC LETTER HEH + ARABIC HAMZA ABOVE
	U+0629: "ة" ARABIC LETTER TEH MARBUTA		U+0629: "ة" ARABIC LETTER TEH MARBUTA
	U+06F6: "۶" EXTENDED ARABIC-INDIC DIGIT SIX -->		U+06F6: "۶" EXTENDED ARABIC-INDIC DIGIT SIX -->
	<!-- TODO: DroidSansArabic lacks the glyph of U+06C0 ARABIC LETTER HEH WITH YEH ABOVE -->
	<Key		<Key
	latin:keyLabel="ه"		latin:keyLabel="ه"
	latin:moreKeys="ﻫ\|ه‍,ۀ,ة,%"		latin:moreKeys="ﻫ\|ه‍,هٔ,ة,%"
	latin:keyHintLabel="6"		latin:keyHintLabel="6"
	latin:additionalMoreKeys="6,۶" />		latin:additionalMoreKeys="6,۶" />
	<!-- U+062E: "خ" ARABIC LETTER KHAH		<!-- U+062E: "خ" ARABIC LETTER KHAH

java/res/xml/rowkeys_farsi3.xml

+9 −9

Original line number	Original line	Diff line number	Diff line
	@@ -26,20 +26,20 @@
	<Key		<Key
	latin:keyLabel="ط"		latin:keyLabel="ط"
	latin:moreKeys="ظ" />		latin:moreKeys="ظ" />
	<!-- U+0698: "ژ" ARABIC LETTER JEH -->		<!-- U+0632: "ز" ARABIC LETTER ZAIN
			U+0698: "ژ" ARABIC LETTER JEH -->
	<Key		<Key
	latin:keyLabel="ژ" />		latin:keyLabel="ز"
	<!-- U+0632: "ز" ARABIC LETTER ZAIN -->		latin:moreKeys="ژ" />
	<Key
	latin:keyLabel="ز" />
	<!-- U+0631: "ر" ARABIC LETTER REH -->		<!-- U+0631: "ر" ARABIC LETTER REH -->
	<Key		<Key
	latin:keyLabel="ر" />		latin:keyLabel="ر" />
	<!-- U+062F: "د" ARABIC LETTER DAL		<!-- U+0630: "ذ" ARABIC LETTER THAL -->
	U+0630: "ذ" ARABIC LETTER THAL -->		<Key
			latin:keyLabel="ذ" />
			<!-- U+062F: "د" ARABIC LETTER DAL -->
	<Key		<Key
	latin:keyLabel="د"		latin:keyLabel="د" />
	latin:moreKeys="ذ" />
	<!-- U+067E: "پ" ARABIC LETTER PEH -->		<!-- U+067E: "پ" ARABIC LETTER PEH -->
	<Key		<Key
	latin:keyLabel="پ" />		latin:keyLabel="پ" />