Add a new intent type that allows opening the Contacts app in its last state.
Also fix some broken comments.

Bug: 2615649
Change-Id: I65e1033b64cab38fbfb0c74e104dce382b4a2a20
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 04d0cf4..1fae984 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -63,7 +63,7 @@
             </intent-filter>
         </activity>
 
-        <!-- Tab container for TwelveKeyDialer and RecentCallsList -->
+        <!-- Tab container for all tabs -->
         <activity android:name="DialtactsActivity"
             android:label="@string/launcherDialer"
             android:theme="@style/DialtactsTheme"
@@ -115,7 +115,7 @@
             </intent-filter>
         </activity>
 
-        <!-- Tab container for Activity Stream and Contacts -->
+        <!-- Tab container for all tabs -->
         <activity-alias android:name="DialtactsContactsEntryActivity"
             android:targetActivity="DialtactsActivity"
             android:label="@string/contactsList"
@@ -137,6 +137,22 @@
 
         </activity-alias>
 
+        <!-- Main launch Intent to open the Contacts app. This will open the app in its last manual
+        state. This is the state that has been explicitly set by the user (e.g. by clicking a tab).
+        States configured via other Intents (e.g. CallLog after Call) are not considered manual
+        state. At the moment, the Intent always goes to the DialtactsActivity, but this might later
+        be changed to also include sub-activities like Edit or View if they were left open -->
+
+        <activity-alias android:name="ContactsLaunchActivity"
+            android:targetActivity="DialtactsActivity"
+        >
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+            </intent-filter>
+        </activity-alias>
+
         <!-- An empty activity that presents the DialtactActivity's Favorites tab -->
         <activity-alias android:name="DialtactsFavoritesEntryActivity"
             android:targetActivity="DialtactsActivity"