commit 57d27da940983fba40d8e3a6d8b99a57b48419ea
author Dmitri Plotnikov <dplotnikov@google.com> Mon Sep 28 18:06:11 2009 -0700
committer Dmitri Plotnikov <dplotnikov@google.com> Mon Sep 28 21:54:07 2009 -0700
tree 3c9c7a59c99fa313abcd88a16d95b3dec9b5639c
parent 9108dad3165459347a52684d91594bf7aca42339

[Issue 2097049] Adding a header to Contact Join UI

Also fixing this bug:
java.lang.RuntimeException: Unable to stop activity {com.android.contacts/com.android.contacts.ContactsListActivity$JoinContactActivity}: java.lang.IllegalStateException: get field slot from row 0 col -1 failed

Change-Id: I74025ee687944282ea9fea945ce281e9a00f6fdc

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 546238a..b6a2045 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -195,11 +195,6 @@
             </intent-filter>
 
             <intent-filter>
-                <action android:name="com.android.contacts.action.JOIN_AGGREGATE" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-
-            <intent-filter>
                 <action android:name="android.intent.action.INSERT_OR_EDIT" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <data android:mimeType="vnd.android.cursor.item/person" />
@@ -239,6 +234,18 @@
             />
         </activity>
 
+        <!-- An activity for joining contacts -->
+        <activity android:name="ContactsListActivity$JoinContactActivity"
+            android:theme="@style/TallTitleBarTheme"
+            android:clearTaskOnLaunch="true"
+        >
+            <intent-filter>
+                <action android:name="com.android.contacts.action.JOIN_AGGREGATE" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+
+
         <!-- Used to select display and sync groups -->
         <activity android:name=".ui.DisplayGroupsActivity" android:label="@string/displayGroups" />