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

Commit bb04997a authored by Walter Jang's avatar Walter Jang Committed by Android Git Automerger
Browse files

am d9d7bac1: am af470e52: am 24328180: Merge "Expanded name not passed to full... 

am d9d7bac1: am af470e52: am 24328180: Merge "Expanded name not passed to full editor for inserts" into mnc-dev

* commit 'd9d7bac1':
  Expanded name not passed to full editor for inserts
parents 0ee9ef9e d9d7bac1

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(