commit e16a1bfa9cd9a9a0430e2fe890586ae451f0faaf
author Daisuke Miyakawa <dmiyakawa@google.com> Thu Mar 17 17:46:14 2011 -0700
committer Daisuke Miyakawa <dmiyakawa@google.com> Thu Mar 17 19:56:13 2011 -0700
tree 8ee8fbfc71624a72de50c6eb816ac07c960918d4
parent e8f95e7f353d6205dbb09cc440f47256604229ee

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

diff --git a/core/java/com/android/internal/app/LocalePicker.java b/core/java/com/android/internal/app/LocalePicker.java
index e32c62d..52cb679 100644
--- a/core/java/com/android/internal/app/LocalePicker.java
+++ b/core/java/com/android/internal/app/LocalePicker.java
@@ -88,7 +88,7 @@
     public static ArrayAdapter<LocaleInfo> 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);