commit 5fb3a58ebc48ecbede7346a411e59ad4a99c77c9
author Paul Soulos <psoulos@google.com> Mon May 19 16:51:51 2014 -0700
committer Brian Attwell <brianattwell@google.com> Wed Jun 11 14:10:47 2014 -0700
tree 5704038061a70068f12beefac7da1662303972d0
parent fe1ad2a24d174f3728b351292a72dffe887b62de

Updated PersonActivity row click and QuickContact intent filters.

The entire row in PersonActivity now launches the QuickContactsActivity.
Removed ContactDetailActivity and move its intent-filter to QuickContactActivity.

Change-Id: Ibfb7d92059f97cbbc5fd426453b6b5a1918bf590

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index bae0341..b9d8a40 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -272,6 +272,14 @@
                 <data android:mimeType="vnd.android.cursor.item/contact" />
                 <data android:mimeType="vnd.android.cursor.item/person" />
             </intent-filter>
+
+            <intent-filter android:label="@string/viewContactDesription">
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <data android:mimeType="vnd.android.cursor.item/person" />
+                <data android:mimeType="vnd.android.cursor.item/contact" />
+                <data android:mimeType="vnd.android.cursor.item/raw_contact" />
+            </intent-filter>
         </activity>
 
         <receiver
@@ -317,21 +325,6 @@
 
         </activity-alias>
 
-        <!-- Views the details of a single contact -->
-        <activity android:name=".activities.ContactDetailActivity"
-            android:label="@string/viewContactTitle"
-            android:theme="@style/DetailActivityTheme"
-            android:parentActivityName=".activities.PeopleActivity">
-
-            <intent-filter android:label="@string/viewContactDesription">
-                <action android:name="android.intent.action.VIEW" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <data android:mimeType="vnd.android.cursor.item/person" />
-                <data android:mimeType="vnd.android.cursor.item/contact" />
-                <data android:mimeType="vnd.android.cursor.item/raw_contact" />
-            </intent-filter>
-        </activity>
-
         <!-- Confirm that a single detail will be added to an existing contact -->
         <activity
             android:name=".activities.ConfirmAddDetailActivity"

src/com/android/contacts/activities/PeopleActivity.java

diff --git a/src/com/android/contacts/activities/PeopleActivity.java b/src/com/android/contacts/activities/PeopleActivity.java
index 88f4a19..0a49f4c 100644
--- a/src/com/android/contacts/activities/PeopleActivity.java
+++ b/src/com/android/contacts/activities/PeopleActivity.java
@@ -1038,7 +1038,9 @@
             if (PhoneCapabilityTester.isUsingTwoPanes(PeopleActivity.this)) {
                 setupContactDetailFragment(contactLookupUri);
             } else {
-                Intent intent = new Intent(Intent.ACTION_VIEW, contactLookupUri);
+                Intent intent = QuickContact.composeQuickContactsIntent(PeopleActivity.this,
+                        getCurrentFocus().getRootView(), contactLookupUri, QuickContact.MODE_LARGE,
+                        null);
                 startActivity(intent);
             }
         }
@@ -1215,7 +1217,9 @@
             if (PhoneCapabilityTester.isUsingTwoPanes(PeopleActivity.this)) {
                 QuickContact.showQuickContact(PeopleActivity.this, targetRect, contactUri, 0, null);
             } else {
-                startActivity(new Intent(Intent.ACTION_VIEW, contactUri));
+                Intent intent = QuickContact.composeQuickContactsIntent(PeopleActivity.this,
+                        targetRect, contactUri, QuickContact.MODE_LARGE, null);
+                startActivity(intent);
             }
         }