diff options
Diffstat (limited to 'java/src/com/android/inputmethod')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/AdditionalSubtype.java | 5 | ||||
| -rw-r--r-- | java/src/com/android/inputmethod/latin/SubtypeLocale.java | 7 |
2 files changed, 10 insertions, 2 deletions
diff --git a/java/src/com/android/inputmethod/latin/AdditionalSubtype.java b/java/src/com/android/inputmethod/latin/AdditionalSubtype.java index 28cec56e6..1e405f9a2 100644 --- a/java/src/com/android/inputmethod/latin/AdditionalSubtype.java +++ b/java/src/com/android/inputmethod/latin/AdditionalSubtype.java @@ -28,10 +28,12 @@ public class AdditionalSubtype { public static final String QWERTY = "qwerty"; public static final String QWERTZ = "qwertz"; public static final String AZERTY = "azerty"; + public static final String DVORAK = "dvorak"; public static final String[] PREDEFINED_KEYBOARD_LAYOUT_SET = { QWERTY, QWERTZ, - AZERTY + AZERTY, + DVORAK }; // Keyboard layout to subtype name resource id map. @@ -42,6 +44,7 @@ public class AdditionalSubtype { sKeyboardLayoutToNameIdsMap.put(QWERTY, R.string.subtype_generic_qwerty); sKeyboardLayoutToNameIdsMap.put(QWERTZ, R.string.subtype_generic_qwertz); sKeyboardLayoutToNameIdsMap.put(AZERTY, R.string.subtype_generic_azerty); + sKeyboardLayoutToNameIdsMap.put(DVORAK, R.string.subtype_generic_dvorak); } private AdditionalSubtype() { diff --git a/java/src/com/android/inputmethod/latin/SubtypeLocale.java b/java/src/com/android/inputmethod/latin/SubtypeLocale.java index fc6193287..d291d1a2e 100644 --- a/java/src/com/android/inputmethod/latin/SubtypeLocale.java +++ b/java/src/com/android/inputmethod/latin/SubtypeLocale.java @@ -115,7 +115,12 @@ public class SubtypeLocale { } public static String getKeyboardLayoutSetDisplayName(InputMethodSubtype subtype) { - return getKeyboardLayoutSetName(subtype).toUpperCase(); + final String layoutName = getKeyboardLayoutSetName(subtype); + // TODO: This hack should be removed. + if (layoutName.equals(AdditionalSubtype.DVORAK)) { + return StringUtils.toTitleCase(layoutName, Locale.US); + } + return layoutName.toUpperCase(); } public static String getKeyboardLayoutSetName(InputMethodSubtype subtype) { |