commit f15b3db3eb69683d23f379697cf86f8487845847
author Daisuke Miyakawa <dmiyakawa@google.com> Fri Mar 18 11:29:04 2011 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Mar 18 11:29:04 2011 -0700
tree 255be03044e322610cef281f7d7b5e946b4b3c7d
parent 0c8e22b1d3dbcd4580db2a288af65fcca10cde1b
parent 10221a22ddb8f9ffaed52dfb4e0e30bc9d2f75b0

am 10221a22: am b02d3956: am e16a1bfa: Use system locale list.

* commit '10221a22ddb8f9ffaed52dfb4e0e30bc9d2f75b0':
  Use system locale list.

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);