aboutsummaryrefslogtreecommitdiffstats
path: root/java/src/com/android/inputmethod/deprecated/languageswitcher/LanguageSwitcher.java
diff options
context:
space:
mode:
authorsatok <satok@google.com>2011-05-18 02:34:37 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-05-18 02:34:37 -0700
commit0b47f3af83648293afb836250756cc14dffcde4b (patch)
treed5e8eaac628c435d36f23da5a8df14ce327bc479 /java/src/com/android/inputmethod/deprecated/languageswitcher/LanguageSwitcher.java
parenta205d23ffdec7e89933c5052ddf325af344f4af0 (diff)
parenteaa10f44a4a0108a90803b1b28238842d3fb5add (diff)
downloadlatinime-0b47f3af83648293afb836250756cc14dffcde4b.tar.gz
latinime-0b47f3af83648293afb836250756cc14dffcde4b.tar.xz
latinime-0b47f3af83648293afb836250756cc14dffcde4b.zip
Merge "Show full display names in the popup of the spacebar language swicher"
Diffstat (limited to 'java/src/com/android/inputmethod/deprecated/languageswitcher/LanguageSwitcher.java')
-rw-r--r--java/src/com/android/inputmethod/deprecated/languageswitcher/LanguageSwitcher.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/java/src/com/android/inputmethod/deprecated/languageswitcher/LanguageSwitcher.java b/java/src/com/android/inputmethod/deprecated/languageswitcher/LanguageSwitcher.java
index 5ef236e31..8dc833d57 100644
--- a/java/src/com/android/inputmethod/deprecated/languageswitcher/LanguageSwitcher.java
+++ b/java/src/com/android/inputmethod/deprecated/languageswitcher/LanguageSwitcher.java
@@ -20,6 +20,7 @@ import com.android.inputmethod.latin.LatinIME;
import com.android.inputmethod.latin.LatinImeLogger;
import com.android.inputmethod.latin.Settings;
import com.android.inputmethod.latin.SharedPreferencesCompat;
+import com.android.inputmethod.latin.Utils;
import android.content.SharedPreferences;
import android.content.SharedPreferences.Editor;
@@ -125,8 +126,7 @@ public class LanguageSwitcher {
private void constructLocales() {
mLocales.clear();
for (final String lang : mSelectedLanguageArray) {
- final Locale locale = new Locale(lang.substring(0, 2),
- lang.length() > 4 ? lang.substring(3, 5) : "");
+ final Locale locale = Utils.constructLocaleFromString(lang);
mLocales.add(locale);
}
}