diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2014-03-19 13:13:31 +0900 |
|---|---|---|
| committer | Tadashi G. Takaoka <takaoka@google.com> | 2014-03-19 17:43:53 +0900 |
| commit | 4640e7c989e285fd5b805626e6601363078f21d7 (patch) | |
| tree | 74e8b2fe8c21c5e8b2f81b1a19ea3fb4d5b38f0d | |
| parent | e40a52cc6213bd025655d86dae7d4ee6dcd38682 (diff) | |
| download | latinime-4640e7c989e285fd5b805626e6601363078f21d7.tar.gz latinime-4640e7c989e285fd5b805626e6601363078f21d7.tar.xz latinime-4640e7c989e285fd5b805626e6601363078f21d7.zip | |
Fix French accented letters order
Bug: 13497958
Change-Id: I062a0e2e75b2f6c2606b1309808cbaa83cc91018
3 files changed, 4 insertions, 3 deletions
diff --git a/java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsTable.java b/java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsTable.java index e9ecd1e67..d9cb51fbb 100644 --- a/java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsTable.java +++ b/java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsTable.java @@ -1669,7 +1669,7 @@ public final class KeyboardTextsTable { // U+00E7: "ç" LATIN SMALL LETTER C WITH CEDILLA // U+0107: "ć" LATIN SMALL LETTER C WITH ACUTE // 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 ~ */ null, null, null, /* ~ more_keys_for_n */ diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/FrenchCustomizer.java b/tests/src/com/android/inputmethod/keyboard/layout/tests/FrenchCustomizer.java index b10b368e7..ab90267d0 100644 --- a/tests/src/com/android/inputmethod/keyboard/layout/tests/FrenchCustomizer.java +++ b/tests/src/com/android/inputmethod/keyboard/layout/tests/FrenchCustomizer.java @@ -83,6 +83,7 @@ class FrenchCustomizer extends LayoutCustomizer { // U+00E7: "ç" LATIN SMALL LETTER C WITH CEDILLA // U+0107: "ć" LATIN SMALL LETTER C WITH ACUTE // U+010D: "č" LATIN SMALL LETTER C WITH CARON - .setMoreKeysOf("c", "\u00E7", "\u0107", "\u010D"); + .setMoreKeysOf("c", "\u00E7", "\u0107", "\u010D") + .setAdditionalMoreKeysPositionOf("c", 2); } } diff --git a/tools/make-keyboard-text/res/values-fr/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-fr/donottranslate-more-keys.xml index 665677698..47b1c9ef7 100644 --- a/tools/make-keyboard-text/res/values-fr/donottranslate-more-keys.xml +++ b/tools/make-keyboard-text/res/values-fr/donottranslate-more-keys.xml @@ -62,7 +62,7 @@ <!-- U+00E7: "ç" LATIN SMALL LETTER C WITH CEDILLA U+0107: "ć" LATIN SMALL LETTER C WITH ACUTE U+010D: "č" LATIN SMALL LETTER C WITH CARON --> - <string name="more_keys_for_c">ç,ć,č</string> + <string name="more_keys_for_c">ç,%,ć,č</string> <!-- U+00FF: "ÿ" LATIN SMALL LETTER Y WITH DIAERESIS --> <string name="more_keys_for_y">%,ÿ</string> <!-- U+00E8: "è" LATIN SMALL LETTER E WITH GRAVE --> |