commit cab161cfe8819200171ce0936050834d6694730e
author Yorke Lee <yorkelee@google.com> Thu Jan 17 20:18:43 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jan 17 20:18:43 2013 +0000
tree bebfd4b405aa8fd2d14b777e3a9f72acc1d57325
parent 13d52b10fd720bb94ffe7a7e7ad1b37c1e06bb50
parent 688c228b2d7cf0c812fb673451f24e7cb457d63b

Merge "Fix empty name field when adding contact from maps"

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

diff --git a/src/com/android/contacts/editor/ContactEditorFragment.java b/src/com/android/contacts/editor/ContactEditorFragment.java
index 464ac9d..27c1498 100644
--- a/src/com/android/contacts/editor/ContactEditorFragment.java
+++ b/src/com/android/contacts/editor/ContactEditorFragment.java
@@ -47,6 +47,7 @@
 import android.provider.ContactsContract.Groups;
 import android.provider.ContactsContract.Intents;
 import android.provider.ContactsContract.RawContacts;
+import android.text.TextUtils;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -535,6 +536,7 @@
             }
         }
 
+        String displayName = null;
         // Check for writable raw contacts.  If there are none, then we need to create one so user
         // can edit.  For the user profile case, there is already an editable contact.
         if (!contact.isUserProfile() && !contact.isWritableContact(mContext)) {
@@ -542,10 +544,12 @@
 
             // This is potentially an asynchronous call and will add deltas to list.
             selectAccountAndCreateContact();
+            displayName = contact.getDisplayName();
         }
 
         // This also adds deltas to list
-        bindEditorsForExistingContact(contact.getDisplayName(), contact.isUserProfile(),
+        // If displayName is null at this point it is simply ignored later on by the editor.
+        bindEditorsForExistingContact(displayName, contact.isUserProfile(),
                 mRawContacts);
     }
 
@@ -851,7 +855,9 @@
                     mRequestFocus = false;
                 }
                 nameEditor.setEditorListener(listener);
-                nameEditor.setDisplayName(mDefaultDisplayName);
+                if (!TextUtils.isEmpty(mDefaultDisplayName)) {
+                    nameEditor.setDisplayName(mDefaultDisplayName);
+                }
 
                 final TextFieldsEditorView phoneticNameEditor =
                         rawContactEditor.getPhoneticNameEditor();