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

Commit 24328180 authored by Walter Jang's avatar Walter Jang Committed by Android (Google) Code Review
Browse files

Merge "Expanded name not passed to full editor for inserts" into mnc-dev

parents 083fb0ec f5877e3e

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

+4 −1
Original line number Diff line number Diff line
@@ -213,7 +213,10 @@ public class StructuredNameEditorView extends TextFieldsEditorView { 
    public String getDisplayName() {

        final ValuesDelta valuesDelta = getValues();

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

            return valuesDelta.getDisplayName();

            final String displayName = valuesDelta.getDisplayName();

            if (!TextUtils.isEmpty(displayName)) {

                return displayName;

            }

        }

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

        final String displayName = NameConverter.structuredNameToDisplayName(