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

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

Merge "Attach aggregation listener to super primary name field" into mnc-dev

parents 24498d61 a26490b1

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

+3 −1
Original line number Original line Diff line number Diff line
@@ -369,8 +369,10 @@ public class CompactRawContactsEditorView extends LinearLayout implements View.O 
                    rawContactDelta, StructuredName.CONTENT_ITEM_TYPE, dataKind);

                    rawContactDelta, StructuredName.CONTENT_ITEM_TYPE, dataKind);

            if (superPrimaryValuesDelta != null) {

            if (superPrimaryValuesDelta != null) {

                // Our first preference is for a non-empty super primary name

                // Our first preference is for a non-empty super primary name

                final NameEditorListener nameEditorListener = new NameEditorListener(

                        superPrimaryValuesDelta, rawContactDelta.getRawContactId(), mListener);

                mNames.addView(inflateStructuredNameEditorView(mNames, accountType,

                mNames.addView(inflateStructuredNameEditorView(mNames, accountType,

                        superPrimaryValuesDelta, rawContactDelta, /* nameEditorListener =*/ null));

                        superPrimaryValuesDelta, rawContactDelta, nameEditorListener));

                return;

                return;

            }

            }

        }

        }