commit 0aad572081e72b96e9514c85d8b604c7ff4fe396
author Walter Jang <wjang@google.com> Wed Jul 13 11:54:16 2016 -0700
committer Walter Jang <wjang@google.com> Wed Jul 13 16:59:32 2016 -0700
tree 6df8838a0406e24d255a688893c51452c854fd43
parent 5f996868e8ce945f19b5752a6ab8d72eae7d14d3

Add circular contacts app icons (1/5)

Bug 29902288

Change-Id: I5317aeb5e1589fb404571a13e2c94908154d11da

Android.mk

diff --git a/Android.mk b/Android.mk
index 907680a..ea1bbdb 100644
--- a/Android.mk
+++ b/Android.mk
@@ -13,7 +13,7 @@
 endif
 
 src_dirs := src $(contacts_common_dir)/src $(phone_common_dir)/src
-res_dirs := res $(contacts_common_dir)/res $(phone_common_dir)/res
+res_dirs := res $(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

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 740920f..54e8316 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -55,6 +55,7 @@
         android:name="com.android.contacts.ContactsApplication"
         android:label="@string/applicationLabel"
         android:icon="@mipmap/ic_contacts_launcher"
+        android:roundIcon="@mipmap/ic_contacts_launcher"
         android:taskAffinity="android.task.contacts"
         android:hardwareAccelerated="true"
         android:supportsRtl="true"