From e16a1bfa9cd9a9a0430e2fe890586ae451f0faaf Mon Sep 17 00:00:00 2001 From: Daisuke Miyakawa Date: Thu, 17 Mar 2011 17:46:14 -0700 Subject: Use system locale list. Context's assets may be different from system's. We should prefer system's to reflect PRODUCT_LOCALE. Bug: 4104675 Change-Id: I968c3baf6bfeb945f1b71ec709d5088332482319 --- core/java/com/android/internal/app/LocalePicker.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/java/com/android/internal/app/LocalePicker.java b/core/java/com/android/internal/app/LocalePicker.java index e32c62dfa8e1..52cb679f75af 100644 --- a/core/java/com/android/internal/app/LocalePicker.java +++ b/core/java/com/android/internal/app/LocalePicker.java @@ -88,7 +88,7 @@ public class LocalePicker extends ListFragment { public static ArrayAdapter constructAdapter(Context context, int layoutId, int fieldId) { final Resources resources = context.getResources(); - final String[] locales = context.getAssets().getLocales(); + final String[] locales = Resources.getSystem().getAssets().getLocales(); final String[] specialLocaleCodes = resources.getStringArray(R.array.special_locale_codes); final String[] specialLocaleNames = resources.getStringArray(R.array.special_locale_names); Arrays.sort(locales); -- cgit v1.2.3-59-g8ed1b