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

Merge "Add SubtypeLocale.getKeyboardLayoutSetDisplayName"

Browse source
This commit is contained in:
Tadashi G. Takaoka 2012-04-17 03:08:59 -07:00 committed by Android (Google) Code Review
commit 761b6bc120
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
java/src/com/android/inputmethod/latin/SubtypeLocale.java
View file

@ -68,14 +68,14 @@ public class SubtypeLocale {
} }
if (isNoLanguage(subtype)) { if (isNoLanguage(subtype)) {
return getKeyboardLayoutSetName(subtype).toUpperCase(); return getKeyboardLayoutSetDisplayName(subtype);
} }
final Locale locale = getSubtypeLocale(subtype); final Locale locale = getSubtypeLocale(subtype);
final String language = StringUtils.toTitleCase(locale.getDisplayLanguage(locale), locale); final String language = StringUtils.toTitleCase(locale.getDisplayLanguage(locale), locale);
if (AdditionalSubtype.isAdditionalSubtype(subtype)) { if (AdditionalSubtype.isAdditionalSubtype(subtype)) {
return String.format("%s (%s)", return String.format("%s (%s)",
language, getKeyboardLayoutSetName(subtype).toUpperCase()); language, getKeyboardLayoutSetDisplayName(subtype));
} }
return StringUtils.toTitleCase(locale.getDisplayName(locale), locale); return StringUtils.toTitleCase(locale.getDisplayName(locale), locale);
} }
@ -83,7 +83,7 @@ public class SubtypeLocale {
// Get InputMethodSubtype's middle display name in its locale. // Get InputMethodSubtype's middle display name in its locale.
public static String getMiddleDisplayName(InputMethodSubtype subtype) { public static String getMiddleDisplayName(InputMethodSubtype subtype) {
if (isNoLanguage(subtype)) { if (isNoLanguage(subtype)) {
return getKeyboardLayoutSetName(subtype).toUpperCase(); return getKeyboardLayoutSetDisplayName(subtype);
} }
final Locale locale = getSubtypeLocale(subtype); final Locale locale = getSubtypeLocale(subtype);
return StringUtils.toTitleCase(locale.getDisplayLanguage(locale), locale); return StringUtils.toTitleCase(locale.getDisplayLanguage(locale), locale);
@ -108,6 +108,10 @@ public class SubtypeLocale {
return LocaleUtils.constructLocaleFromString(localeString); return LocaleUtils.constructLocaleFromString(localeString);
} }
public static String getKeyboardLayoutSetDisplayName(InputMethodSubtype subtype) {
return getKeyboardLayoutSetName(subtype).toUpperCase();
}
public static String getKeyboardLayoutSetName(InputMethodSubtype subtype) { public static String getKeyboardLayoutSetName(InputMethodSubtype subtype) {
final String keyboardLayoutSet = subtype.getExtraValueOf( final String keyboardLayoutSet = subtype.getExtraValueOf(
LatinIME.SUBTYPE_EXTRA_VALUE_KEYBOARD_LAYOUT_SET); LatinIME.SUBTYPE_EXTRA_VALUE_KEYBOARD_LAYOUT_SET);