Contacts static shortcuts fixes (1/2)

* Set the component package name differently for
  the AOSP and GoogleContacts projects
* Prevent shortcuts from going into the default
  application task by setting taskAffinity=""

Bug 30204775
Bug 30201875

Change-Id: Ie7cb3a88bcc90c706628d151b80d964dd222451e

Android.mk

@@ -13,7 +13,7 @@ support_library_root_dir := prebuilts/sdk/current/support
 endif
 
 src_dirs := src $(contacts_common_dir)/src $(phone_common_dir)/src
-res_dirs := res $(contacts_common_dir)/res $(contacts_common_dir)/icons/res $(phone_common_dir)/res
+res_dirs := res res-aosp $(contacts_common_dir)/res $(contacts_common_dir)/icons/res $(phone_common_dir)/res
 asset_dirs := $(contacts_common_dir)/assets
 
 LOCAL_SRC_FILES := $(call all-java-files-under, $(src_dirs))

AndroidManifest.xml

@@ -361,6 +361,8 @@
             android:name=".activities.CompactContactEditorActivity"
             android:label="@string/editContactActivityLabel"
             android:theme="@style/EditorActivityTheme"
+            android:excludeFromRecents="true"
+            android:taskAffinity=""
             android:windowSoftInputMode="stateHidden|adjustResize">
 
             <intent-filter android:label="@string/editContactDescription">

res/xml/shortcuts.xml → res-aosp/xml/shortcuts.xml

@@ -23,7 +23,7 @@
         <intent
             android:action="android.intent.action.INSERT"
             android:data="content://com.android.contacts/contacts"
-            android:targetClass="com.google.android.contacts.PeopleActivity" />
-        <categories android:name="android.shortcut.conversation"/>
+            android:targetPackage="com.android.contacts"
+            android:targetClass="com.android.contacts.activities.CompactContactEditorActivity"/>
     </shortcut>
 </shortcuts>