diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2012-03-30 03:03:55 -0700 |
|---|---|---|
| committer |   Android (Google) Code Review <android-gerrit@google.com> | 2012-03-30 03:03:55 -0700 |
| commit | 3224878351d8bbcde0fd54c7bb21fff25b2a0508 (patch) | |
| tree | 69b8ebe8b6406554c8cca92039a95705eab26d69 /java/src/com/android/inputmethod/latin | |
| parent | 7fbc51965a63700e70338585a27ed1d3413d4e03 (diff) | |
| parent | fb5b4c4fc39499d03951671c1a9b67b3573dd11d (diff) | |
| download | latinime-3224878351d8bbcde0fd54c7bb21fff25b2a0508.tar.gz latinime-3224878351d8bbcde0fd54c7bb21fff25b2a0508.tar.xz latinime-3224878351d8bbcde0fd54c7bb21fff25b2a0508.zip | |
Merge "Add language agnostic QWERTY subtype"
Diffstat (limited to 'java/src/com/android/inputmethod/latin')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/SubtypeLocale.java | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/java/src/com/android/inputmethod/latin/SubtypeLocale.java b/java/src/com/android/inputmethod/latin/SubtypeLocale.java index 917521c40..66c13bd2e 100644 --- a/java/src/com/android/inputmethod/latin/SubtypeLocale.java +++ b/java/src/com/android/inputmethod/latin/SubtypeLocale.java @@ -36,10 +36,16 @@ public class SubtypeLocale { } public static String getFullDisplayName(Locale locale) { - String localeCode = locale.toString(); + final String localeCode = locale.toString(); for (int index = 0; index < sExceptionKeys.length; index++) { - if (sExceptionKeys[index].equals(localeCode)) - return sExceptionValues[index]; + if (sExceptionKeys[index].equals(localeCode)) { + final String value = sExceptionValues[index]; + if (value.indexOf("%s") >= 0) { + final String languageName = locale.getDisplayLanguage(locale); + return String.format(value, languageName); + } + return value; + } } return locale.getDisplayName(locale); } |