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

Commit 8d6d434d authored by Tingting Wang's avatar Tingting Wang Committed by android-build-merger
Browse files

Merge "Fix bug for exchange account editor." into ub-contactsdialer-a-dev 

am: 5835795b

* commit '5835795b':
  Fix bug for exchange account editor.
parents 1bb2c902 5835795b

src/com/android/contacts/editor/StructuredNameEditorView.java

+7 −1
Original line number Diff line number Diff line
@@ -221,8 +221,13 @@ public class StructuredNameEditorView extends TextFieldsEditorView { 
     */

    public void setDisplayName(String name) {

        // For now, assume the first text field is the name.

        // TODO: Find a better way to get a hold of the name field.

        // TODO: Find a better way to get a hold of the name field,

        // including given_name and family_name.

        super.setValue(0, name);

        getValues().setDisplayName(name);

        rebuildStructuredName(getValues());

        super.setValue(1, getValues().getAsString(StructuredName.GIVEN_NAME));

        super.setValue(3, getValues().getAsString(StructuredName.FAMILY_NAME));

    }



    /**
@@ -230,6 +235,7 @@ public class StructuredNameEditorView extends TextFieldsEditorView { 
     */

    public String getDisplayName() {

        final ValuesDelta valuesDelta = getValues();

        rebuildFullName(valuesDelta);

        if (hasShortAndLongForms() && areOptionalFieldsVisible()) {

            final Map<String, String> structuredNameMap = valuesToStructuredNameMap(valuesDelta);

            final String displayName = NameConverter.structuredNameToDisplayName(