commit 501b7eac6f85c4100fbd1b00d7c7841fe6472e7c
author Dmitri Plotnikov <dplotnikov@google.com> Wed Apr 07 17:20:49 2010 -0700
committer Dmitri Plotnikov <dplotnikov@google.com> Wed Apr 07 17:22:40 2010 -0700
tree c8fcf519848678432b39a9da8a47b7f49cf15c39
parent dbf0c8d1e7d2e49d0012b9853bc032202a07c070

Splitting off the Join Contact mode.

This is not a strategic refactoring, just a step
toward splitting Contacts List into multiple
classes.

Change-Id: I6ec5472ef31e87f62d7d62e31b4f413627a9b1f8

src/com/android/contacts/ViewContactActivity.java

diff --git a/src/com/android/contacts/ViewContactActivity.java b/src/com/android/contacts/ViewContactActivity.java
index ead6a4a..c15a40d 100644
--- a/src/com/android/contacts/ViewContactActivity.java
+++ b/src/com/android/contacts/ViewContactActivity.java
@@ -685,11 +685,8 @@
             if (mCursor.moveToFirst()) {
                 displayName = mCursor.getString(0);
             }
-            Intent intent = new Intent(ContactsListActivity.JOIN_AGGREGATE);
-            intent.putExtra(ContactsListActivity.EXTRA_AGGREGATE_ID, freshId);
-            if (displayName != null) {
-                intent.putExtra(ContactsListActivity.EXTRA_AGGREGATE_NAME, displayName);
-            }
+            Intent intent = new Intent(JoinContactActivity.JOIN_CONTACT);
+            intent.putExtra(JoinContactActivity.EXTRA_TARGET_CONTACT_ID, freshId);
             startActivityForResult(intent, REQUEST_JOIN_CONTACT);
         }
     }