commit 3dd365f695ab3540bc636e0d726e3f57a80c6ce5
author Dmitri Plotnikov <dplotnikov@google.com> Mon Mar 08 14:30:46 2010 -0800
committer Dmitri Plotnikov <dplotnikov@google.com> Mon Mar 08 14:30:46 2010 -0800
tree d63ea6bc336864e9279c8a8ebf88115840479b31
parent 89e67f8e671d881c5a34d59896a5d210b0d47a45

Proper ordering of names in the contact editor for China and Korea.

Change-Id: Ie21d48fe40dd631dbcd3055c0c66da499252a899

src/com/android/contacts/model/FallbackSource.java

diff --git a/src/com/android/contacts/model/FallbackSource.java b/src/com/android/contacts/model/FallbackSource.java
index 723a053..9f1417b 100644
--- a/src/com/android/contacts/model/FallbackSource.java
+++ b/src/com/android/contacts/model/FallbackSource.java
@@ -110,12 +110,15 @@
         }
 
         if (inflateLevel >= ContactsSource.LEVEL_CONSTRAINTS) {
-            final boolean useJapaneseOrder =
-                Locale.JAPANESE.getLanguage().equals(Locale.getDefault().getLanguage());
+            boolean displayOrderPrimary =
+                    context.getResources().getBoolean(R.bool.config_default_display_order_primary);
+            boolean displayOrderUserChangeable =
+                context.getResources().getBoolean(R.bool.config_display_order_user_changeable);
+
             kind.fieldList = Lists.newArrayList();
             kind.fieldList.add(new EditField(StructuredName.PREFIX, R.string.name_prefix,
                     FLAGS_PERSON_NAME).setOptional(true));
-            if (useJapaneseOrder) {
+            if (!displayOrderPrimary && !displayOrderUserChangeable) {
                 kind.fieldList.add(new EditField(StructuredName.FAMILY_NAME, R.string.name_family,
                         FLAGS_PERSON_NAME));
                 kind.fieldList.add(new EditField(StructuredName.MIDDLE_NAME, R.string.name_middle,