Fix contact name passing from compact to full editor on inserts

Bug 19624360

Change-Id: I50c415b59c4bad1d08f18f8c2bc7d57ddb73c418

1 files changed, 25 insertions, 12 deletions

diff --git a/src/com/android/contacts/editor/ContactEditorFragment.java b/src/com/android/contacts/editor/ContactEditorFragment.java
index 494972921..4cda73d93 100644
--- a/src/com/android/contacts/editor/ContactEditorFragment.java
+++ b/src/com/android/contacts/editor/ContactEditorFragment.java
@@ -382,12 +382,9 @@ public class ContactEditorFragment extends ContactEditorBaseFragment implements
                 final StructuredNameEditorView nameEditorView =
                         rawContactEditorView.getNameEditor();
                 if (nameEditorView != null) {
-                    final ValuesDelta valuesDelta = nameEditorView.getValues();
-                    if (valuesDelta != null && valuesDelta.isSuperPrimary()) {
-                        final String displayName = valuesDelta.getDisplayName();
-                        if (!TextUtils.isEmpty(displayName)) {
-                            return displayName;
-                        }
+                    final String displayName = nameEditorView.getDisplayName();
+                    if (!TextUtils.isEmpty(displayName)) {
+                        return displayName;
                     }
                 }
             }
@@ -400,12 +397,28 @@ public class ContactEditorFragment extends ContactEditorBaseFragment implements
                 final StructuredNameEditorView nameEditorView =
                         rawContactEditorView.getNameEditor();
                 if (nameEditorView != null) {
-                    final ValuesDelta valuesDelta = nameEditorView.getValues();
-                    if (valuesDelta != null) {
-                        final String displayName = valuesDelta.getDisplayName();
-                        if (!TextUtils.isEmpty(displayName)) {
-                            return displayName;
-                        }
+                    final String displayName = nameEditorView.getDisplayName();
+                    if (!TextUtils.isEmpty(displayName)) {
+                        return displayName;
+                    }
+                }
+            }
+        }
+        return null;
+    }
+
+    @Override
+    public String getPhoneticName() {
+        for (int i = 0; i < mContent.getChildCount(); i++) {
+            final View view = mContent.getChildAt(i);
+            if (view instanceof RawContactEditorView) {
+                final RawContactEditorView rawContactEditorView = (RawContactEditorView) view;
+                final PhoneticNameEditorView phoneticNameEditorView =
+                        (PhoneticNameEditorView) rawContactEditorView.getPhoneticNameEditor();
+                if (phoneticNameEditorView != null) {
+                    final String phoneticName = phoneticNameEditorView.getPhoneticName();
+                    if (!TextUtils.isEmpty(phoneticName)) {
+                        return phoneticName;
                     }
                 }
             }