Breaking out the Multi-Picker into a separate activity.

Continuing the "nuke" part of the nuke-and-rebuild
process for ContactsListActivity. At this stage the code
will look worse than before, but hopefully will remain
fully functional.

Bear with us - we are in the middle of a major refactoring.

Change-Id: Idad9fa2e589dce0bcd3f62b9c7d5bf22fea6c5e1
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 7d88e8f..23fe067 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -223,12 +223,6 @@
                 <data android:mimeType="vnd.android.cursor.item/postal-address_v2" android:host="com.android.contacts" />
                 <data android:mimeType="vnd.android.cursor.item/postal-address" android:host="contacts" />
             </intent-filter>
-
-            <intent-filter>
-                <action android:name="com.android.contacts.action.GET_MULTIPLE_PHONES" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <data android:mimeType="vnd.android.cursor.dir/phone_v2" android:host="com.android.contacts" />
-            </intent-filter>
         </activity>
 
         <!-- An activity for joining contacts -->
@@ -242,6 +236,15 @@
             </intent-filter>
         </activity>
 
+        <!-- An activity for selecting multiple phone numbers -->
+        <activity android:name="MultiplePhonePickerActivity">
+            <intent-filter>
+                <action android:name="com.android.contacts.action.GET_MULTIPLE_PHONES" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <data android:mimeType="vnd.android.cursor.dir/phone_v2" android:host="com.android.contacts" />
+            </intent-filter>
+        </activity>
+
         <!-- The contacts search/filter UI -->
         <activity android:name="ContactsSearchActivity"
             android:theme="@style/ContactsSearchTheme"