diff options
| author |   Ken Wakasa <kwakasa@google.com> | 2013-10-15 07:15:58 -0700 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2013-10-15 07:15:58 -0700 |
| commit | 8ea85a48c7338ba85d9cf35bc3006293a77107c8 (patch) | |
| tree | b97fc0242f6aa8bbf935bceb75d8a8a2cb8814ef /java/src/com/android/inputmethod/latin | |
| parent | e9066e4dad71c9f068d42aa5e6b12a54d06b6f44 (diff) | |
| parent | b067be0e5f08eafd89eb0fd706ba564b898f317a (diff) | |
| download | latinime-8ea85a48c7338ba85d9cf35bc3006293a77107c8.tar.gz latinime-8ea85a48c7338ba85d9cf35bc3006293a77107c8.tar.xz latinime-8ea85a48c7338ba85d9cf35bc3006293a77107c8.zip | |
am b067be0e: Merge "Revert "Revert "Add Swiss French and German keyboard layouts."""
* commit 'b067be0e5f08eafd89eb0fd706ba564b898f317a':
Revert "Revert "Add Swiss French and German keyboard layouts.""
Diffstat (limited to 'java/src/com/android/inputmethod/latin')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/utils/SubtypeLocaleUtils.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/java/src/com/android/inputmethod/latin/utils/SubtypeLocaleUtils.java b/java/src/com/android/inputmethod/latin/utils/SubtypeLocaleUtils.java index 102a41b4e..fdbe81ab6 100644 --- a/java/src/com/android/inputmethod/latin/utils/SubtypeLocaleUtils.java +++ b/java/src/com/android/inputmethod/latin/utils/SubtypeLocaleUtils.java @@ -197,7 +197,9 @@ public final class SubtypeLocaleUtils { // es_US spanish F Español (EE.UU.) exception // fr azerty F Français // fr_CA qwerty F Français (Canada) + // fr_CH swiss F Français (Suisse) // de qwertz F Deutsch + // de_CH swiss T Deutsch (Schweiz) // zz qwerty F No language (QWERTY) in system locale // fr qwertz T Français (QWERTZ) // de qwerty T Deutsch (QWERTY) @@ -298,7 +300,9 @@ public final class SubtypeLocaleUtils { // es_US spanish F Es Español Español (EE.UU.) exception // fr azerty F Fr Français Français // fr_CA qwerty F Fr Français Français (Canada) + // fr_CH swiss F Fr Français Français (Suisse) // de qwertz F De Deutsch Deutsch + // de_CH swiss T De Deutsch Deutsch (Schweiz) // zz qwerty F QWERTY QWERTY // fr qwertz T Fr Français Français // de qwerty T De Deutsch Deutsch |