From 437afcc9ed49ed0afb25eb9f121c16abca0e353c Mon Sep 17 00:00:00 2001
From: Chiao Cheng <chiaocheng@google.com>
Date: Fri, 9 Nov 2012 15:18:21 -0800
Subject: Moving phone icon into Dialer app.

Also removed un-necessary taskAffinity definitions.

Bug: 6993891
Change-Id: Id89bfecfe5cbc462964a43063f789e3ea1a62984
---
 AndroidManifest.xml | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to 'AndroidManifest.xml')

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 7c39ee5db..502184c63 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -51,10 +51,8 @@
 
     <application
         android:label="@string/applicationLabel"
-        android:icon="@mipmap/ic_launcher_contacts"
-        android:taskAffinity="android.task.contacts"
-        android:hardwareAccelerated="true"
-    >
+        android:icon="@mipmap/ic_launcher_phone"
+        android:hardwareAccelerated="true">
 
         <!-- The entrance point for Phone UI.
              stateAlwaysHidden is set to suppress keyboard show up on
@@ -68,7 +66,6 @@
             android:icon="@mipmap/ic_launcher_phone"
             android:screenOrientation="nosensor"
             android:enabled="@*android:bool/config_voice_capable"
-            android:taskAffinity="android.task.contacts.phone"
             android:windowSoftInputMode="stateAlwaysHidden|adjustNothing">
             <intent-filter>
                 <action android:name="android.intent.action.DIAL" />
@@ -130,7 +127,6 @@
                   android:theme="@style/CallDetailActivityTheme"
                   android:screenOrientation="portrait"
                   android:icon="@mipmap/ic_launcher_phone"
-                  android:taskAffinity="android.task.contacts.phone"
             >
             <intent-filter>
                 <action android:name="android.intent.action.VIEW"/>
-- 
cgit v1.2.3