From 9856fcee477d04f51bdbcbfdf632876c6b8a1173 Mon Sep 17 00:00:00 2001
From: Katherine Kuan <katherinekuan@google.com>
Date: Wed, 1 Jun 2011 10:24:09 -0700
Subject: New People activity

- This is part 1 of bringing up the new People app
- Rename ContactBrowserActivity and related XMLs to PeopleActivity
- Change Contacts to People app launcher icon
- Create new task affinity for phone app activities
- Get rid of ContactsFrontDoor activity because it doesn't need
to distinguish between Dialtacts and ContactBrowserActivity anymore

Change-Id: I8c5e1ed540b294c1bda85409ca1499f88d4459ee
---
 AndroidManifest.xml | 28 ++++++++++------------------
 1 file changed, 10 insertions(+), 18 deletions(-)

(limited to 'AndroidManifest.xml')

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 596909747..47340a018 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -127,6 +127,7 @@
             android:icon="@mipmap/ic_launcher_phone"
             android:screenOrientation="nosensor"
             android:enabled="@*android:bool/config_voice_capable"
+            android:taskAffinity="android.task.contacts.phone"
         >
             <intent-filter>
                 <action android:name="android.intent.action.DIAL" />
@@ -171,11 +172,10 @@
             </intent-filter>
         </activity>
 
-        <!-- Front door proxy that picks the right UI based on the screen config -->
-        <activity android:name=".activities.ContactsFrontDoor"
-            android:label="@string/contactsList"
-            android:icon="@mipmap/ic_launcher_contacts"
-            android:theme="@style/ContactBrowserTheme"
+        <!-- The main Contacts activity with the contact list, favorites, and groups. -->
+        <activity android:name=".activities.PeopleActivity"
+            android:label="@string/people"
+            android:theme="@style/PeopleTheme"
             android:clearTaskOnLaunch="true"
             android:launchMode="singleTop"
         >
@@ -185,15 +185,6 @@
                 <category android:name="android.intent.category.LAUNCHER" />
                 <category android:name="android.intent.category.BROWSABLE" />
             </intent-filter>
-        </activity>
-
-        <!-- The actual list of contacts -->
-        <activity android:name=".activities.ContactBrowserActivity"
-            android:label="@string/contactsList"
-            android:theme="@style/ContactBrowserTheme"
-            android:launchMode="singleTop"
-            android:clearTaskOnLaunch="true"
-        >
             <intent-filter>
                 <action android:name="com.android.contacts.action.LIST_DEFAULT" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -298,7 +289,7 @@
 
         <!-- Backwards compatibility: somebody may have hard coded this activity name -->
         <activity-alias android:name="ContactsListActivity"
-            android:targetActivity=".activities.ContactBrowserActivity"
+            android:targetActivity=".activities.PeopleActivity"
         />
 
         <!-- An activity for joining contacts -->
@@ -340,7 +331,7 @@
         <!-- List of groups -->
         <activity android:name=".activities.GroupBrowserActivity"
             android:label="@string/contactsGroupsLabel"
-            android:theme="@style/ContactBrowserTheme"
+            android:theme="@style/PeopleTheme"
             android:launchMode="singleTop"
             android:clearTaskOnLaunch="true">
             <!-- TODO: Remove this temporary intent action name when the fragmentization
@@ -437,6 +428,7 @@
         <activity android:name="CallDetailActivity"
             android:label="@string/callDetailTitle"
             android:theme="@style/CallDetailActivityTheme"
+            android:taskAffinity="android.task.contacts.phone"
         >
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
@@ -527,10 +519,10 @@
             android:theme="@android:style/Theme.Translucent">
         </activity>
 
-        <!-- Makes .ContactBrowserActivity the search target for any activity in Contacts -->
+        <!-- Makes .PeopleActivity the search target for any activity in Contacts -->
         <meta-data
             android:name="android.app.default_searchable"
-            android:value=".activities.ContactBrowserActivity" />
+            android:value=".activities.PeopleActivity" />
 
 
         <!-- LIVE FOLDERS -->
-- 
cgit v1.2.3