diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2014-03-19 03:42:26 -0700 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2014-03-19 03:42:26 -0700 |
| commit | c01271ab5a187f5544c3ec644abf5d1081f1e0cf (patch) | |
| tree | 36bdb6d7aa3b3cf3766f9765e439918b9be9e03b | |
| parent | 569da9620ff41e5f1df58515e931d0a65e1c42d1 (diff) | |
| parent | 682853c3afef3d56b594bde46ff68f77eb4b811e (diff) | |
| download | latinime-c01271ab5a187f5544c3ec644abf5d1081f1e0cf.tar.gz latinime-c01271ab5a187f5544c3ec644abf5d1081f1e0cf.tar.xz latinime-c01271ab5a187f5544c3ec644abf5d1081f1e0cf.zip | |
am 682853c3: Merge "Fix French accented letters order"
* commit '682853c3afef3d56b594bde46ff68f77eb4b811e':
Fix French accented letters order
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 --> |