From ef1337876b2dfbf76dc7e45e035f4a25ebc0f560 Mon Sep 17 00:00:00 2001
From: Raphael <raphael@google.com>
Date: Fri, 2 Oct 2009 11:18:10 -0700
Subject: [PATCH] SDK: Fix CustomLocale to properly setup Language+Country

SDK BUG 2154263

Change-Id: I74db5bc237921ff6a6fd55664a2a3c62f544081b
---
 .../com/android/customlocale/CustomLocaleActivity.java | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

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