commit 1f093dd94cffbf1afbe967e87434e9c60161e67b
author Hyunyoung Song <hyunyoungs@google.com> Tue Feb 14 10:40:58 2017 -0800
committer Hyunyoung Song <hyunyoungs@google.com> Thu Feb 16 12:31:49 2017 -0800
tree 0c4b8029ad2734182fdb7f90e43d1b6fc45adeb2
parent b4d6b4f7f83e7d55f0af6489e1a04a94b0f3ae41

Change launcher and shortcut icons to MaskableIconDrawable
Test: manual test on Launcher3
Bug: 33034275
Bug: 35431198

Change-Id: Ief9f49ec38ec95daa738799398fc4b458d634acc

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 0501077..d436ba7 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -83,7 +83,7 @@
     <uses-permission android:name="android.permission.DELETE_PACKAGES"/>
 
     <application android:label="@string/settings_label"
-            android:icon="@mipmap/ic_launcher_settings"
+            android:icon="@drawable/ic_launcher_settings"
             android:taskAffinity=""
             android:theme="@style/Theme.Settings"
             android:hardwareAccelerated="true"