Fixes for returning to the compact editor from the expanded one

* Don't abort the save even if there are no unsaved changed
  when returning the compact from the full editor
* No need to pass the material palette on insert intents.
  It does, however, need to be passed back to the compact
  editor when editing an existing contact w/o a picture.
* Fix returning to the compact editor repeatedly by
  removing the Intent.FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET
  on compact editor intents.
* Updated StructuredNameEditorView#getDisplayName to fall
  back to the display name directly from the ValuesDelta.
  This is required when the name is passed to the
  contact editor, and the user does not change it, in which
  case it will not be written to the underlying data
  structure, and thus not passed subsequent expantions.

Bug 19624360

Change-Id: Ife285f3e411a869a76fbbff4d42939c866db617c

1 files changed, 2 insertions, 8 deletions

diff --git a/src/com/android/contacts/editor/ContactEditorFragment.java b/src/com/android/contacts/editor/ContactEditorFragment.java
index 89b4bf8f4..791e20d36 100644
--- a/src/com/android/contacts/editor/ContactEditorFragment.java
+++ b/src/com/android/contacts/editor/ContactEditorFragment.java
@@ -417,12 +417,6 @@ public class ContactEditorFragment extends ContactEditorBaseFragment implements
         return null;
     }
 
-    @Override
-    public MaterialColorMapUtils.MaterialPalette getMaterialPalette() {
-        // There is no color for default photos on the fully expanded editor
-        return null;
-    }
-
     /**
      * Adjust how dark the hint text should be on all the names' text fields.
      *
@@ -537,10 +531,10 @@ public class ContactEditorFragment extends ContactEditorBaseFragment implements
 
     @Override
     protected boolean doSaveAction(int saveMode) {
-        // Save contact
+        // Save contact and reload the compact editor after saving.
         Intent intent = ContactSaveService.createSaveContactIntent(mContext, mState,
                 SAVE_MODE_EXTRA_KEY, saveMode, isEditingUserProfile(),
-                ((Activity)mContext).getClass(), ContactEditorActivity.ACTION_SAVE_COMPLETED,
+                ((Activity) mContext).getClass(), ContactEditorActivity.ACTION_SAVE_COMPLETED,
                 mUpdatedPhotos);
         mContext.startService(intent);