From e194e0dc485bd7e37a81d993cb83e09cf21fc543 Mon Sep 17 00:00:00 2001
From: TebbeUbben <t.ubben@holtrop.de>
Date: Wed, 13 Jun 2018 20:26:46 +0200
Subject: [PATCH] Use icon for all build configurations

---
 app/build.gradle                 | 12 ------------
 app/src/main/AndroidManifest.xml |  3 ++-
 2 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index c8af797bbe..dfccf5e8d7 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -98,9 +98,6 @@ android {
             dimension "standard"
             resValue "string", "app_name", "AndroidAPS"
             versionName version
-            manifestPlaceholders = [
-                    appIcon: "@mipmap/ic_launcher"
-            ]
             buildConfigField "boolean", "APS", "true"
             buildConfigField "boolean", "PUMPDRIVERS", "true"
             buildConfigField "boolean", "NSCLIENTOLNY", "false"
@@ -111,9 +108,6 @@ android {
             dimension "standard"
             resValue "string", "app_name", "AndroidAPS"
             versionName version
-            manifestPlaceholders = [
-                    appIcon: "@mipmap/blueowl"
-            ]
             buildConfigField "boolean", "APS", "false"
             buildConfigField "boolean", "PUMPDRIVERS", "true"
             buildConfigField "boolean", "NSCLIENTOLNY", "false"
@@ -124,9 +118,6 @@ android {
             dimension "standard"
             resValue "string", "app_name", "NSClient"
             versionName version + "-nsclient"
-            manifestPlaceholders = [
-                    appIcon: "@mipmap/yellowowl"
-            ]
             buildConfigField "boolean", "APS", "false"
             buildConfigField "boolean", "PUMPDRIVERS", "false"
             buildConfigField "boolean", "NSCLIENTOLNY", "true"
@@ -137,9 +128,6 @@ android {
             dimension "standard"
             resValue "string", "app_name", "NSClient"
             versionName version + "-nsclient"
-            manifestPlaceholders = [
-                    appIcon: "@mipmap/yellowowl"
-            ]
             buildConfigField "boolean", "APS", "false"
             buildConfigField "boolean", "PUMPDRIVERS", "false"
             buildConfigField "boolean", "NSCLIENTOLNY", "false"
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 78202d9250..df408c661b 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -29,7 +29,8 @@
     <application
         android:name=".MainApp"
         android:allowBackup="true"
-        android:icon="${appIcon}"
+        android:icon="@mipmap/ic_launcher"
+        android:roundIcon="@mipmap/ic_launcher_round"
         android:label="@string/app_name"
         android:supportsRtl="true"
         android:theme="@style/AppTheme.NoActionBar">