nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

am aee2ed1f: am 14bc2e89: Fix Arabic diacritics order 

* commit 'aee2ed1f4b0be7a538cc5722fed274632f2a40ba':
  Fix Arabic diacritics order
main
Tadashi G. Takaoka 2012-06-14 21:08:18 -07:00 committed by Android Git Automerger
parent e904bba54b aee2ed1f4b
commit 9328e0f2d9
2 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsSet.java
View File

@ -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+064C: "ٌ" ARABIC DAMMATAN
// U+0651: "ّ" ARABIC SHADDA
// U+0652: "ْ" ARABIC SUKUN
// U+0653: "ٓ" ARABIC MADDAH ABOVE
// U+064D: "ٍ" ARABIC KASRATAN
// U+064B: "ً" ARABIC FATHATAN
// U+0650: "ِ" ARABIC KASRA
// U+064E: "َ" ARABIC FATHA
// U+0640: "ـ" ARABIC TATWEEL
// U+0656: "ٖ" ARABIC SUBSCRIPT ALEF
// U+0670: "ٰ" ARABIC LETTER SUPERSCRIPT ALEF
// U+0655: "ٕ" ARABIC HAMZA BELOW // U+0655: "ٕ" ARABIC HAMZA BELOW
// U+0654: "ٔ" ARABIC HAMZA ABOVE // U+0654: "ٔ" ARABIC HAMZA ABOVE
// U+0652: "ْ" ARABIC SUKUN
// U+064D: "ٍ" ARABIC KASRATAN
// U+064C: "ٌ" ARABIC DAMMATAN
// 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+064F: "ُ" ARABIC DAMMA
// U+064E: "َ" ARABIC FATHA
// U+0640: "ـ" ARABIC TATWEEL
// 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

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

@ -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,&#x201C;,&#x201D;,&#x201E;,&#x201F;,&#x00AB;|&#x00BB;,&#x00BB|&#x00AB;;,&#x2018;,&#x2019;,&#x201A;,&#x201B;</string> --> <!-- <string name="more_keys_for_tablet_double_quote">!fixedColumnOrder!6,&#x201C;,&#x201D;,&#x201E;,&#x201F;,&#x00AB;|&#x00BB;,&#x00BB|&#x00AB;;,&#x2018;,&#x2019;,&#x201A;,&#x201B;</string> -->
<string name="more_keys_for_tablet_double_quote">!fixedColumnOrder!4,&#x201C;,&#x201D;,&#x00AB;|&#x00BB;,&#x00BB;|&#x00AB;,&#x2018;,&#x2019;,&#x201A;,&#x201B;</string> <string name="more_keys_for_tablet_double_quote">!fixedColumnOrder!4,&#x201C;,&#x201D;,&#x00AB;|&#x00BB;,&#x00BB;|&#x00AB;,&#x2018;,&#x2019;,&#x201A;,&#x201B;</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+0650: "ِ" ARABIC KASRA U+0651: "ّ" ARABIC SHADDA -->
U+064E: "َ" ARABIC FATHA
U+0640: "ـ" ARABIC TATWEEL -->
<!-- U+0656: "ٖ" ARABIC SUBSCRIPT ALEF <!-- U+0656: "ٖ" ARABIC SUBSCRIPT ALEF
U+0670: "ٰ" ARABIC LETTER SUPERSCRIPT ALEF U+0670: "ٰ" ARABIC LETTER SUPERSCRIPT ALEF
U+0655: "ٕ" ARABIC HAMZA BELOW U+0653: "ٓ" ARABIC MADDAH ABOVE
U+0654: "ٔ" ARABIC HAMZA ABOVE --> U+0650: "ِ" ARABIC KASRA
U+064F: "ُ" ARABIC DAMMA
U+064E: "َ" ARABIC FATHA
U+0640: "ـ" ARABIC TATWEEL -->
<!-- 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,&#x064F;,&#x064C;,&#x0651;,&#x0652;,&#x0653;,&#x064D;,&#x064B;,&#x0650;,&#x064E;,&#x0640;&#x0640;&#x0640;|&#x0640;,&#x0656;,&#x0670;,&#x0655;,&#x0654;"</string> <string name="more_keys_for_arabic_diacritics">"!fixedColumnOrder!7,&#x0655;,&#x0654;,&#x0652;,&#x064D;,&#x064C;,&#x064B;,&#x0651;,&#x0656;,&#x0670;,&#x0653;,&#x0650;,&#x064F;,&#x064E;,&#x0640;&#x0640;&#x0640;|&#x0640;"</string>
<string name="keyhintlabel_for_arabic_diacritics">&#x064F;</string> <string name="keyhintlabel_for_arabic_diacritics">&#x0651;</string>
</resources> </resources>