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

Commit 110163d0 authored by Yao Lu's avatar Yao Lu Committed by Android (Google) Code Review
Browse files

Merge "Show data entered in prefix, middle name and suffix in compact editor"... 

Merge "Show data entered in prefix, middle name and suffix in compact editor" into ub-contactsdialer-h-dev
parents 5f3c81ed 6976549b

src/com/android/contacts/common/model/account/BaseAccountType.java

+4 −4
Original line number Original line Diff line number Diff line
@@ -187,24 +187,24 @@ public abstract class BaseAccountType extends AccountType { 
                context.getResources().getBoolean(R.bool.config_editor_field_order_primary);

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





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

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

                FLAGS_PERSON_NAME).setLongForm(true));

                FLAGS_PERSON_NAME).setOptional(true));

        if (!displayOrderPrimary) {

        if (!displayOrderPrimary) {

            kind.fieldList.add(new EditField(StructuredName.FAMILY_NAME, R.string.name_family,

            kind.fieldList.add(new EditField(StructuredName.FAMILY_NAME, R.string.name_family,

                    FLAGS_PERSON_NAME));

                    FLAGS_PERSON_NAME));

            kind.fieldList.add(new EditField(StructuredName.MIDDLE_NAME, R.string.name_middle,

            kind.fieldList.add(new EditField(StructuredName.MIDDLE_NAME, R.string.name_middle,

                    FLAGS_PERSON_NAME).setLongForm(true));

                    FLAGS_PERSON_NAME).setOptional(true));

            kind.fieldList.add(new EditField(StructuredName.GIVEN_NAME, R.string.name_given,

            kind.fieldList.add(new EditField(StructuredName.GIVEN_NAME, R.string.name_given,

                    FLAGS_PERSON_NAME));

                    FLAGS_PERSON_NAME));

        } else {

        } else {

            kind.fieldList.add(new EditField(StructuredName.GIVEN_NAME, R.string.name_given,

            kind.fieldList.add(new EditField(StructuredName.GIVEN_NAME, R.string.name_given,

                    FLAGS_PERSON_NAME));

                    FLAGS_PERSON_NAME));

            kind.fieldList.add(new EditField(StructuredName.MIDDLE_NAME, R.string.name_middle,

            kind.fieldList.add(new EditField(StructuredName.MIDDLE_NAME, R.string.name_middle,

                    FLAGS_PERSON_NAME).setLongForm(true));

                    FLAGS_PERSON_NAME).setOptional(true));

            kind.fieldList.add(new EditField(StructuredName.FAMILY_NAME, R.string.name_family,

            kind.fieldList.add(new EditField(StructuredName.FAMILY_NAME, R.string.name_family,

                    FLAGS_PERSON_NAME));

                    FLAGS_PERSON_NAME));

        }

        }

        kind.fieldList.add(new EditField(StructuredName.SUFFIX, R.string.name_suffix,

        kind.fieldList.add(new EditField(StructuredName.SUFFIX, R.string.name_suffix,

                FLAGS_PERSON_NAME).setLongForm(true));

                FLAGS_PERSON_NAME).setOptional(true));





        return kind;

        return kind;

    }

    }