From 2b133574bbfd076ff7f8bfac27a0f1226e47abeb Mon Sep 17 00:00:00 2001
From: Daisuke Miyakawa <dmiyakawa@google.com>
Date: Sun, 19 Dec 2010 18:58:47 -0800
Subject: [PATCH] Let callers replace layout for LocalePicker adapter.

Bug: 3298275
Change-Id: I9be5f4677ba553bfd2f35348d14d99e68fdd60f1
---
 core/java/com/android/internal/app/LocalePicker.java | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/core/java/com/android/internal/app/LocalePicker.java b/core/java/com/android/internal/app/LocalePicker.java
index 6f6b40b7282c0..e32c62dfa8e16 100644
--- a/core/java/com/android/internal/app/LocalePicker.java
+++ b/core/java/com/android/internal/app/LocalePicker.java
@@ -82,6 +82,11 @@ public class LocalePicker extends ListFragment {
      * {@link LocaleInfo#label}.
      */
     public static ArrayAdapter<LocaleInfo> constructAdapter(Context context) {
+        return constructAdapter(context, R.layout.locale_picker_item, R.id.locale);
+    }
+
+    public static ArrayAdapter<LocaleInfo> constructAdapter(Context context,
+            int layoutId, int fieldId) {
         final Resources resources = context.getResources();
         final String[] locales = context.getAssets().getLocales();
         final String[] specialLocaleCodes = resources.getStringArray(R.array.special_locale_codes);
@@ -149,8 +154,6 @@ public class LocalePicker extends ListFragment {
             localeInfos[i] = preprocess[i];
         }
         Arrays.sort(localeInfos);
-        final int layoutId = R.layout.locale_picker_item;
-        final int fieldId = R.id.locale;
         return new ArrayAdapter<LocaleInfo>(context, layoutId, fieldId, localeInfos);
     }