aboutsummaryrefslogtreecommitdiffstats
path: root/java/src/com/android/inputmethod/latin
diff options
context:
space:
mode:
authorTadashi G. Takaoka <takaoka@google.com>2012-03-29 21:01:19 +0900
committerTadashi G. Takaoka <takaoka@google.com>2012-03-30 18:20:52 +0900
commitfb5b4c4fc39499d03951671c1a9b67b3573dd11d (patch)
tree597996a6086820383f5b0d5eada32a06d63b1878 /java/src/com/android/inputmethod/latin
parent338ba2a236aea0d7ad6890a9e7bc26c2fe5bc364 (diff)
downloadlatinime-fb5b4c4fc39499d03951671c1a9b67b3573dd11d.tar.gz
latinime-fb5b4c4fc39499d03951671c1a9b67b3573dd11d.tar.xz
latinime-fb5b4c4fc39499d03951671c1a9b67b3573dd11d.zip
Add language agnostic QWERTY subtype
Bug: 6010147 Change-Id: I705e38ac889172ae8b7c2a68e5c688f2ffc28320
Diffstat (limited to 'java/src/com/android/inputmethod/latin')
-rw-r--r--java/src/com/android/inputmethod/latin/SubtypeLocale.java12
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);
}