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

am 682853c3: Merge "Fix French accented letters order" 

* commit '682853c3afef3d56b594bde46ff68f77eb4b811e':
  Fix French accented letters order
main
Tadashi G. Takaoka 2014-03-19 03:42:26 -07:00 committed by Android Git Automerger
parent 569da9620f 682853c3af
commit c01271ab5a
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsTable.java
View File

@ -1669,7 +1669,7 @@ public final class KeyboardTextsTable {
// U+00E7: "ç" LATIN SMALL LETTER C WITH CEDILLA // U+00E7: "ç" LATIN SMALL LETTER C WITH CEDILLA
// U+0107: "ć" LATIN SMALL LETTER C WITH ACUTE // U+0107: "ć" LATIN SMALL LETTER C WITH ACUTE
// U+010D: "č" LATIN SMALL LETTER C WITH CARON // U+010D: "č" LATIN SMALL LETTER C WITH CARON
/* more_keys_for_c */ "\u00E7,\u0107,\u010D", /* more_keys_for_c */ "\u00E7,%,\u0107,\u010D",
/* label_to_alpha_key ~ */ /* label_to_alpha_key ~ */
null, null, null, null, null, null,
/* ~ more_keys_for_n */ /* ~ more_keys_for_n */

3
tests/src/com/android/inputmethod/keyboard/layout/tests/FrenchCustomizer.java
View File

@ -83,6 +83,7 @@ class FrenchCustomizer extends LayoutCustomizer {
// U+00E7: "ç" LATIN SMALL LETTER C WITH CEDILLA // U+00E7: "ç" LATIN SMALL LETTER C WITH CEDILLA
// U+0107: "ć" LATIN SMALL LETTER C WITH ACUTE // U+0107: "ć" LATIN SMALL LETTER C WITH ACUTE
// U+010D: "č" LATIN SMALL LETTER C WITH CARON // U+010D: "č" LATIN SMALL LETTER C WITH CARON
.setMoreKeysOf("c", "\u00E7", "\u0107", "\u010D"); .setMoreKeysOf("c", "\u00E7", "\u0107", "\u010D")
.setAdditionalMoreKeysPositionOf("c", 2);
} }
} }

2
tools/make-keyboard-text/res/values-fr/donottranslate-more-keys.xml
View File

@ -62,7 +62,7 @@
<!-- U+00E7: "ç" LATIN SMALL LETTER C WITH CEDILLA <!-- U+00E7: "ç" LATIN SMALL LETTER C WITH CEDILLA
U+0107: "ć" LATIN SMALL LETTER C WITH ACUTE U+0107: "ć" LATIN SMALL LETTER C WITH ACUTE
U+010D: "č" LATIN SMALL LETTER C WITH CARON --> U+010D: "č" LATIN SMALL LETTER C WITH CARON -->
<string name="more_keys_for_c">&#x00E7;,&#x0107;,&#x010D;</string> <string name="more_keys_for_c">&#x00E7;,%,&#x0107;,&#x010D;</string>
<!-- U+00FF: "ÿ" LATIN SMALL LETTER Y WITH DIAERESIS --> <!-- U+00FF: "ÿ" LATIN SMALL LETTER Y WITH DIAERESIS -->
<string name="more_keys_for_y">%,&#x00FF;</string> <string name="more_keys_for_y">%,&#x00FF;</string>
<!-- U+00E8: "è" LATIN SMALL LETTER E WITH GRAVE --> <!-- U+00E8: "è" LATIN SMALL LETTER E WITH GRAVE -->