summaryrefslogtreecommitdiffstats
path: root/apps/CustomLocale
diff options
context:
space:
mode:
authorRaphael <raphael@google.com>2009-10-02 11:18:10 -0700
committerRaphael <raphael@google.com>2009-10-02 11:18:10 -0700
commitef1337876b2dfbf76dc7e45e035f4a25ebc0f560 (patch)
tree7c51208a50a1cbfec7bf26bec2e53676273773f5 /apps/CustomLocale
parent480332f6c5ee0da552426716abff5ddd87074a5f (diff)
downloadandroid_development-ef1337876b2dfbf76dc7e45e035f4a25ebc0f560.tar.gz
android_development-ef1337876b2dfbf76dc7e45e035f4a25ebc0f560.tar.bz2
android_development-ef1337876b2dfbf76dc7e45e035f4a25ebc0f560.zip
SDK: Fix CustomLocale to properly setup Language+Country
SDK BUG 2154263 Change-Id: I74db5bc237921ff6a6fd55664a2a3c62f544081b
Diffstat (limited to 'apps/CustomLocale')
-rw-r--r--apps/CustomLocale/src/com/android/customlocale/CustomLocaleActivity.java10
1 files changed, 9 insertions, 1 deletions
diff --git a/apps/CustomLocale/src/com/android/customlocale/CustomLocaleActivity.java b/apps/CustomLocale/src/com/android/customlocale/CustomLocaleActivity.java
index 768f9105f..69b9c5bf2 100644
--- a/apps/CustomLocale/src/com/android/customlocale/CustomLocaleActivity.java
+++ b/apps/CustomLocale/src/com/android/customlocale/CustomLocaleActivity.java
@@ -289,7 +289,15 @@ public class CustomLocaleActivity extends ListActivity {
IActivityManager am = ActivityManagerNative.getDefault();
Configuration config = am.getConfiguration();
- Locale loc = new Locale(locale);
+ Locale loc = null;
+
+ String[] langCountry = locale.split("_");
+ if (langCountry.length == 2) {
+ loc = new Locale(langCountry[0], langCountry[1]);
+ } else {
+ loc = new Locale(locale);
+ }
+
config.locale = loc;
// indicate this isn't some passing default - the user wants this