Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bbd03c02 authored by Martin Hibdon's avatar Martin Hibdon
Browse files

Cherry-pick 78bc8a3d into 

the Froyo branch.
parent 5ecd315c

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

+3 −3
Original line number Diff line number Diff line
@@ -66,14 +66,14 @@ public class ExchangeSource extends FallbackSource { 
        final DataKind kind = super.inflateStructuredName(context, ContactsSource.LEVEL_MIMETYPES);



        if (inflateLevel >= ContactsSource.LEVEL_CONSTRAINTS) {

            final boolean useJapaneseOrder =

                Locale.JAPANESE.getLanguage().equals(Locale.getDefault().getLanguage());

            boolean displayOrderPrimary =

                    context.getResources().getBoolean(R.bool.config_editor_field_order_primary);

            kind.typeOverallMax = 1;



            kind.fieldList = Lists.newArrayList();

            kind.fieldList.add(new EditField(StructuredName.PREFIX, R.string.name_prefix,

                    FLAGS_PERSON_NAME).setOptional(true));

            if (useJapaneseOrder) {

            if (!displayOrderPrimary) {

                kind.fieldList.add(new EditField(StructuredName.FAMILY_NAME,

                        R.string.name_family, FLAGS_PERSON_NAME));

                kind.fieldList.add(new EditField(StructuredName.MIDDLE_NAME,