commit 15583077f6f373fb515b16773d47ce377bfaeff3
author Walter Jang <wjang@google.com> Mon Jul 18 17:03:11 2016 +0000
committer android-build-merger <android-build-merger@google.com> Mon Jul 18 17:03:11 2016 +0000
tree 3a1b0d5f237c3cc8007e27c1a074c949f0b7f0f0
parent ecc750af589b69d9b7964fe9d07e4970909838cb
parent 574f071d8d13c32b98d3253b8d52a00e6f751cc2

Add circular contacts app icons (1/5) am: 0aad572081
am: 574f071d8d

Change-Id: I7611ff3f901c0682ccd3a8276a92d8e2ec4c2adb

Android.mk

diff --git a/Android.mk b/Android.mk
index 0546bc9..2d28edc 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 9235931..c6aac5b 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -56,6 +56,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"