Fix Arabic diacritics order (14bc2e89) · Commits · e / os / android_packages_inputmethods_LatinIME

java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsSet.java

+10 −10

Original line number	Original line	Diff line number	Diff line
	@@ -428,23 +428,23 @@ public final class KeyboardTextsSet {
	// U+201F: "‟" DOUBLE HIGH-REVERSED-9 QUOTATION MARK		// U+201F: "‟" DOUBLE HIGH-REVERSED-9 QUOTATION MARK
	/* 54 */ "!fixedColumnOrder!3,\u2039\|\u203A,\u2264\|\u2265,\u00AB\|\u00BB",		/* 54 */ "!fixedColumnOrder!3,\u2039\|\u203A,\u2264\|\u2265,\u00AB\|\u00BB",
	/* 55 */ "!fixedColumnOrder!3,\u203A\|\u2039,\u2265\|\u2264,\u00BB\|\u00AB",		/* 55 */ "!fixedColumnOrder!3,\u203A\|\u2039,\u2265\|\u2264,\u00BB\|\u00AB",
	// U+064F: "ُ" ARABIC DAMMA		// U+0655: "ٕ" ARABIC HAMZA BELOW
	// U+064C: "ٌ" ARABIC DAMMATAN		// U+0654: "ٔ" ARABIC HAMZA ABOVE
	// U+0651: "ّ" ARABIC SHADDA
	// U+0652: "ْ" ARABIC SUKUN		// U+0652: "ْ" ARABIC SUKUN
	// U+0653: "ٓ" ARABIC MADDAH ABOVE
	// U+064D: "ٍ" ARABIC KASRATAN		// U+064D: "ٍ" ARABIC KASRATAN
			// U+064C: "ٌ" ARABIC DAMMATAN
	// U+064B: "ً" ARABIC FATHATAN		// U+064B: "ً" ARABIC FATHATAN
			// U+0651: "ّ" ARABIC SHADDA
			// U+0656: "ٖ" ARABIC SUBSCRIPT ALEF
			// U+0670: "ٰ" ARABIC LETTER SUPERSCRIPT ALEF
			// U+0653: "ٓ" ARABIC MADDAH ABOVE
	// U+0650: "ِ" ARABIC KASRA		// U+0650: "ِ" ARABIC KASRA
			// U+064F: "ُ" ARABIC DAMMA
	// U+064E: "َ" ARABIC FATHA		// U+064E: "َ" ARABIC FATHA
	// U+0640: "ـ" ARABIC TATWEEL		// U+0640: "ـ" ARABIC TATWEEL
	// U+0656: "ٖ" ARABIC SUBSCRIPT ALEF
	// U+0670: "ٰ" ARABIC LETTER SUPERSCRIPT ALEF
	// U+0655: "ٕ" ARABIC HAMZA BELOW
	// U+0654: "ٔ" ARABIC HAMZA ABOVE
	// In order to make Tatweel easily distinguishable from other punctuations, we use consecutive Tatweels only for its displayed label.		// In order to make Tatweel easily distinguishable from other punctuations, we use consecutive Tatweels only for its displayed label.
	/* 56 */ "!fixedColumnOrder!5,\u064F,\u064C,\u0651,\u0652,\u0653,\u064D,\u064B,\u0650,\u064E,\u0640\u0640\u0640\|\u0640,\u0656,\u0670,\u0655,\u0654",		/* 56 */ "!fixedColumnOrder!7,\u0655,\u0654,\u0652,\u064D,\u064C,\u064B,\u0651,\u0656,\u0670,\u0653,\u0650,\u064F,\u064E,\u0640\u0640\u0640\|\u0640",
	/* 57 */ "\u064F",		/* 57 */ "\u0651",
	// U+0661: "١" ARABIC-INDIC DIGIT ONE		// U+0661: "١" ARABIC-INDIC DIGIT ONE
	/* 58 */ "\u0661",		/* 58 */ "\u0661",
	// U+0662: "٢" ARABIC-INDIC DIGIT TWO		// U+0662: "٢" ARABIC-INDIC DIGIT TWO

tools/maketext/res/values-ar/donottranslate-more-keys.xml

+11 −11

Original line number	Original line	Diff line number	Diff line
	@@ -105,21 +105,21 @@
	<!-- TODO: Neither DroidSans nor Roboto have the glyph for U+201F DOUBLE HIGH-REVERSED-9 QUOTATION MARK -->		<!-- TODO: Neither DroidSans nor Roboto have the glyph for U+201F DOUBLE HIGH-REVERSED-9 QUOTATION MARK -->
	<!-- <string name="more_keys_for_tablet_double_quote">!fixedColumnOrder!6,“,”,„,‟,«\|»,&#x00BB\|«;,‘,’,‚,‛</string> -->		<!-- <string name="more_keys_for_tablet_double_quote">!fixedColumnOrder!6,“,”,„,‟,«\|»,&#x00BB\|«;,‘,’,‚,‛</string> -->
	<string name="more_keys_for_tablet_double_quote">!fixedColumnOrder!4,“,”,«\|»,»\|«,‘,’,‚,‛</string>		<string name="more_keys_for_tablet_double_quote">!fixedColumnOrder!4,“,”,«\|»,»\|«,‘,’,‚,‛</string>
	<!-- U+064F: "ُ" ARABIC DAMMA		<!-- U+0655: "ٕ" ARABIC HAMZA BELOW
	U+064C: "ٌ" ARABIC DAMMATAN		U+0654: "ٔ" ARABIC HAMZA ABOVE
	U+0651: "ّ" ARABIC SHADDA
	U+0652: "ْ" ARABIC SUKUN		U+0652: "ْ" ARABIC SUKUN
	U+0653: "ٓ" ARABIC MADDAH ABOVE -->		U+064D: "ٍ" ARABIC KASRATAN
	<!-- U+064D: "ٍ" ARABIC KASRATAN		U+064C: "ٌ" ARABIC DAMMATAN
	U+064B: "ً" ARABIC FATHATAN		U+064B: "ً" ARABIC FATHATAN
			U+0651: "ّ" ARABIC SHADDA -->
			<!-- U+0656: "ٖ" ARABIC SUBSCRIPT ALEF
			U+0670: "ٰ" ARABIC LETTER SUPERSCRIPT ALEF
			U+0653: "ٓ" ARABIC MADDAH ABOVE
	U+0650: "ِ" ARABIC KASRA		U+0650: "ِ" ARABIC KASRA
			U+064F: "ُ" ARABIC DAMMA
	U+064E: "َ" ARABIC FATHA		U+064E: "َ" ARABIC FATHA
	U+0640: "ـ" ARABIC TATWEEL -->		U+0640: "ـ" ARABIC TATWEEL -->
	<!-- U+0656: "ٖ" ARABIC SUBSCRIPT ALEF
	U+0670: "ٰ" ARABIC LETTER SUPERSCRIPT ALEF
	U+0655: "ٕ" ARABIC HAMZA BELOW
	U+0654: "ٔ" ARABIC HAMZA ABOVE -->
	<!-- In order to make Tatweel easily distinguishable from other punctuations, we use consecutive Tatweels only for its displayed label. -->		<!-- In order to make Tatweel easily distinguishable from other punctuations, we use consecutive Tatweels only for its displayed label. -->
	<string name="more_keys_for_arabic_diacritics">"!fixedColumnOrder!5,ُ,ٌ,ّ,ْ,ٓ,ٍ,ً,ِ,َ,ـــ\|ـ,ٖ,ٰ,ٕ,ٔ"</string>		<string name="more_keys_for_arabic_diacritics">"!fixedColumnOrder!7,ٕ,ٔ,ْ,ٍ,ٌ,ً,ّ,ٖ,ٰ,ٓ,ِ,ُ,َ,ـــ\|ـ"</string>
	<string name="keyhintlabel_for_arabic_diacritics">ُ</string>		<string name="keyhintlabel_for_arabic_diacritics">ّ</string>
	</resources>		</resources>