commit 31f016838dcbf07e76d2724dd3c3189d68f2c6b8
author John Shao <johnshao@google.com> Tue Oct 25 20:40:27 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue Oct 25 20:40:27 2016 +0000
tree 1b5ec1313ab504a923a8253313539c62a380e9f4
parent 760a945fa91eb46f1fd95c9b96b272d314a67334
parent 62a12a322a941a01df01e4ac4af7307da1d14ed3

Editor Insert or Edit intent helper am: f8f6f95154
am: 62a12a322a

Change-Id: Ic2f5362722e60e0bff1edb3e59db5df44eea05f6

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

diff --git a/src/com/android/contacts/editor/EditorIntents.java b/src/com/android/contacts/editor/EditorIntents.java
index c903b84..2d05eb2 100644
--- a/src/com/android/contacts/editor/EditorIntents.java
+++ b/src/com/android/contacts/editor/EditorIntents.java
@@ -25,6 +25,7 @@
 
 import com.android.contacts.activities.ContactEditorActivity;
 import com.android.contacts.activities.ContactEditorSpringBoardActivity;
+import com.android.contacts.activities.ContactSelectionActivity;
 import com.android.contacts.common.model.RawContactDeltaList;
 import com.android.contacts.common.util.MaterialColorMapUtils.MaterialPalette;
 
@@ -75,9 +76,7 @@
                 context, ContactEditorActivity.class);
         intent.putExtra(
                 ContactEditorFragment.INTENT_EXTRA_NEW_LOCAL_PROFILE, isNewLocalProfile);
-        if (rawContactDeltaList != null || displayName != null || phoneticName != null) {
-            putRawContactDeltaValues(intent, rawContactDeltaList, displayName, phoneticName);
-        }
+        putRawContactDeltaValues(intent, rawContactDeltaList, displayName, phoneticName);
         return intent;
     }
 
@@ -100,6 +99,18 @@
         return intent;
     }
 
+    /**
+     * Returns an Intent to start the {@link ContactSelectionActivity} for a
+     * new or existing contact.
+     */
+    public static Intent createInsertOrEditContactIntent(Context context,
+            RawContactDeltaList rawContactDeltaList, String displayName, String phoneticName) {
+        final Intent intent = new Intent(Intent.ACTION_INSERT_OR_EDIT, Contacts.CONTENT_URI,
+                context, ContactSelectionActivity.class);
+        putRawContactDeltaValues(intent, rawContactDeltaList, displayName, phoneticName);
+        return intent;
+    }
+
     private static void putMaterialPalette(Intent intent, MaterialPalette materialPalette) {
         if (materialPalette != null) {
             intent.putExtra(