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

am 38dc9ca3: Fix duplicate period on Persian tablet keyboard 

* commit '38dc9ca31432f19641d80cd6f89354d66c5bebc1':
  Fix duplicate period on Persian tablet keyboard
main
Tadashi G. Takaoka 2012-06-18 10:49:49 -07:00 committed by Android Git Automerger
parent 58f9b35e1c 38dc9ca314
commit e4bbff783b
7 changed files with 30 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
java/res/xml-sw600dp/key_apostrophe.xml
View File

@ -28,6 +28,16 @@
<Key
latin:keyLabel="-" />
</case>
<case
latin:languageCode="fa"
>
<Key
latin:keyLabel="!text/keylabel_for_apostrophe"
latin:keyHintLabel="!text/keyhintlabel_for_apostrophe"
latin:keyLabelFlags="hasPopupHint"
latin:moreKeys="!text/more_keys_for_apostrophe"
latin:keyStyle="hasShiftedLetterHintStyle" />
</case>
<default>
<Key
latin:keyLabel="!text/keylabel_for_apostrophe"

1
java/res/xml-sw600dp/key_dash.xml
View File

@ -34,6 +34,7 @@
<Key
latin:keyLabel="."
latin:keyHintLabel="!text/keyhintlabel_for_arabic_diacritics"
latin:keyLabelFlags="hasPopupHint"
latin:moreKeys="!text/more_keys_for_arabic_diacritics"
latin:keyStyle="hasShiftedLetterHintStyle" />
</case>

12
java/res/xml-sw600dp/rowkeys_farsi3.xml
View File

@ -27,11 +27,12 @@
<!-- U+0637: "ط" ARABIC LETTER TAH -->
<Key
latin:keyLabel="&#x0637;" />
<!-- U+0632: "ز" ARABIC LETTER ZAIN
U+0698: "ژ" ARABIC LETTER JEH -->
<!-- U+0698: "ژ" ARABIC LETTER JEH -->
<Key
latin:keyLabel="&#x0632;"
latin:moreKeys="&#x0698;" />
latin:keyLabel="&#x0698;" />
<!-- U+0632: "ز" ARABIC LETTER ZAIN -->
<Key
latin:keyLabel="&#x0632;" />
<!-- U+0631: "ر" ARABIC LETTER REH -->
<Key
latin:keyLabel="&#x0631;" />
@ -49,4 +50,7 @@
<Key
latin:keyLabel="&#x0648;"
latin:moreKeys="&#x0624;" />
<!-- U+0622: "آ" ARABIC LETTER ALEF WITH MADDA ABOVE -->
<Key
latin:keyLabel="&#x0622;" />
</merge>

2
java/res/xml-sw600dp/rows_farsi.xml
View File

@ -44,8 +44,6 @@
<include
latin:keyboardLayout="@xml/rowkeys_farsi3"
latin:keyXPos="4.091%p" />
<include
latin:keyboardLayout="@xml/keys_comma_period" />
<Key
latin:keyStyle="enterKeyStyle"
latin:keyWidth="fillRight" />

2
java/res/xml-sw768dp/rows_farsi.xml
View File

@ -52,8 +52,6 @@
<include
latin:keyboardLayout="@xml/rowkeys_farsi3"
latin:keyXPos="13.829%p" />
<include
latin:keyboardLayout="@xml/keys_comma_period" />
<Key
latin:keyStyle="enterKeyStyle"
latin:keyWidth="fillRight" />

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

@ -1101,14 +1101,16 @@ public final class KeyboardTextsSet {
// U+060C: "،" ARABIC COMMA
// U+061B: "؛" ARABIC SEMICOLON
// U+061F: "؟" ARABIC QUESTION MARK
// U+00AB: "«" LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
// U+00BB: "»" RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
/* 98 */ "\u060C",
/* 99 */ "!",
/* 100 */ "!,\\,",
/* 101 */ "\u061F",
/* 102 */ "\u061F,?",
/* 103 */ null,
/* 104 */ null,
/* 105 */ "\u061F,\u061B,!,:,-,/,\',\"",
/* 103 */ "\u060C",
/* 104 */ "\u061F",
/* 105 */ "!fixedColumnOrder!4,:,!,\u061F,\u061B,-,/,\u00AB|\u00BB,\u00BB|\u00AB",
};
/* Language fi: Finnish */

8
tools/maketext/res/values-fa/donottranslate-more-keys.xml
View File

@ -63,13 +63,17 @@
<string name="more_keys_for_symbols_percent">\\%,&#x2030;</string>
<!-- U+060C: "،" ARABIC COMMA
U+061B: "؛" ARABIC SEMICOLON
U+061F: "؟" ARABIC QUESTION MARK -->
U+061F: "؟" ARABIC QUESTION MARK
U+00AB: "«" LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
U+00BB: "»" RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK -->
<string name="keylabel_for_tablet_comma">"&#x060C;"</string>
<string name="keyhintlabel_for_tablet_comma">"!"</string>
<string name="more_keys_for_tablet_comma">"!,\\,"</string>
<string name="keyhintlabel_for_tablet_period">"&#x061F;"</string>
<string name="more_keys_for_tablet_period">"&#x061F;,\?"</string>
<string name="more_keys_for_apostrophe">"&#x061F;,&#x061B;,!,:,-,/,\',\""</string>
<string name="keylabel_for_apostrophe">&#x060C;</string>
<string name="keyhintlabel_for_apostrophe">&#x061F;</string>
<string name="more_keys_for_apostrophe">"!fixedColumnOrder!4,:,!,&#x061F;,&#x061B;,-,/,&#x00AB;|&#x00BB;,&#x00BB;|&#x00AB;"</string>
<!-- U+061F: "؟" ARABIC QUESTION MARK
U+060C: "،" ARABIC COMMA
U+061B: "؛" ARABIC SEMICOLON -->