commit 59fb48e7e6a37f26901ad5a4996947dcd25a73d9
author Dmitri Plotnikov <dplotnikov@google.com> Mon Apr 26 17:09:19 2010 -0700
committer Dmitri Plotnikov <dplotnikov@google.com> Mon Apr 26 17:09:19 2010 -0700
tree 49d76b05fc88f46082248509d3725b806939280c
parent aebce3655e931c47d9036d46f1e2e7faee1534fb

Controller becomes Fragment and Configuration disappears.

Change-Id: I432b16f8b617765e770a8b2be34632c10d5d913d

src/com/android/contacts/JoinContactActivity.java

diff --git a/src/com/android/contacts/JoinContactActivity.java b/src/com/android/contacts/JoinContactActivity.java
index e555523..bacd0af 100644
--- a/src/com/android/contacts/JoinContactActivity.java
+++ b/src/com/android/contacts/JoinContactActivity.java
@@ -17,9 +17,8 @@
 package com.android.contacts;
 
 
-import com.android.contacts.list.ContactEntryListConfiguration;
 import com.android.contacts.list.JoinContactListAdapter;
-import com.android.contacts.list.JoinContactListConfiguration;
+import com.android.contacts.list.JoinContactListFragment;
 
 import android.content.ContentUris;
 import android.content.Intent;
@@ -72,7 +71,7 @@
     private JoinContactListAdapter mAdapter;
 
     @Override
-    protected ContactEntryListConfiguration resolveIntent(Intent intent) {
+    protected boolean resolveIntent(Intent intent) {
         mMode = MODE_PICK_CONTACT;
         mTargetContactId = intent.getLongExtra(EXTRA_TARGET_CONTACT_ID, -1);
         if (mTargetContactId == -1) {
@@ -80,15 +79,19 @@
                     + EXTRA_TARGET_CONTACT_ID);
             setResult(RESULT_CANCELED);
             finish();
-            return null;
+            return false;
         }
-        return new JoinContactListConfiguration(this, this);
+
+        mListFragment = new JoinContactListFragment();
+
+        return true;
     }
 
     @Override
-    public void initContentView() {
-        setContentView(mConfig.createView());
+    protected void onResume() {
+        super.onResume();
 
+        // TODO move this to onAttach of the corresponding fragment
         TextView blurbView = (TextView)findViewById(R.id.join_contact_blurb);
 
         String blurb = getString(R.string.blurbJoinContactDataWith,