Merge "Make Contacts app use static library of vCard."
diff --git a/src/com/android/contacts/ContactsListActivity.java b/src/com/android/contacts/ContactsListActivity.java
index bfb6a96..4c7364a 100644
--- a/src/com/android/contacts/ContactsListActivity.java
+++ b/src/com/android/contacts/ContactsListActivity.java
@@ -168,7 +168,7 @@
             listFragmentContainerId = android.R.id.content;
         }
         FragmentTransaction transaction = openFragmentTransaction();
-        transaction.add(mListFragment, listFragmentContainerId);
+        transaction.add(listFragmentContainerId, mListFragment);
         transaction.commit();
     }
 
diff --git a/src/com/android/contacts/JoinContactActivity.java b/src/com/android/contacts/JoinContactActivity.java
index 501739d..0f3eab0 100644
--- a/src/com/android/contacts/JoinContactActivity.java
+++ b/src/com/android/contacts/JoinContactActivity.java
@@ -86,7 +86,7 @@
         });
 
         FragmentTransaction transaction = openFragmentTransaction();
-        transaction.add(fragment, android.R.id.content);
+        transaction.add(android.R.id.content, fragment);
         transaction.commit();
     }
 }
diff --git a/src/com/android/contacts/MultiplePhonePickerActivity.java b/src/com/android/contacts/MultiplePhonePickerActivity.java
index 8a56d20..08811e3 100644
--- a/src/com/android/contacts/MultiplePhonePickerActivity.java
+++ b/src/com/android/contacts/MultiplePhonePickerActivity.java
@@ -61,7 +61,7 @@
         Parcelable[] extras = getIntent().getParcelableArrayExtra(Intents.EXTRA_PHONE_URIS);
         mListFragment.setSelectedUris(extras);
         FragmentTransaction transaction = openFragmentTransaction();
-        transaction.add(mListFragment, android.R.id.content);
+        transaction.add(android.R.id.content, mListFragment);
         transaction.commit();
     }
 
diff --git a/src/com/android/contacts/views/edit/ContactEditFragment.java b/src/com/android/contacts/views/edit/ContactEditFragment.java
index 3f10ea7..488a1a5 100644
--- a/src/com/android/contacts/views/edit/ContactEditFragment.java
+++ b/src/com/android/contacts/views/edit/ContactEditFragment.java
@@ -14,15 +14,6 @@
  * limitations under the License
  */
 
-
-// Here are the open TODOs for the Fragment transition
-// TODO How to save data? Service?
-// TODO Do account-list lookup always in a thread
-// TODO Remove the temporary instance once findFragmentById works
-// TODO Cleanup state handling (orientation changes etc).
-// TODO Cleanup the load function. It can currenlty also do insert, which is awkward
-// TODO Watch for background changes...How?
-
 package com.android.contacts.views.edit;
 
 import com.android.contacts.JoinContactActivity;
@@ -100,6 +91,13 @@
 import java.util.Comparator;
 import java.util.Date;
 
+//Here are the open TODOs for the Fragment transition
+//TODO How to save data? Service?
+//TODO Do account-list lookup always in a thread
+//TODO Cleanup state handling (orientation changes etc).
+//TODO Cleanup the load function. It can currenlty also do insert, which is awkward
+//TODO Watch for background changes...How?
+
 public class ContactEditFragment extends LoaderManagingFragment<ContactEditLoader.Result> {
 
     private static final String TAG = "ContactEditFragment";