From 17c2349667365bc7f5c1a27518cff674de993a63 Mon Sep 17 00:00:00 2001
From: Alex Baker <alex@tasks.org>
Date: Sat, 28 Apr 2018 07:54:02 -0500
Subject: [PATCH] Remove leftover references to ic_launcher

---
 app/src/main/AndroidManifest.xml                             | 4 ++--
 .../main/java/org/tasks/widget/ShortcutConfigActivity.java   | 2 +-
 app/src/main/res/layout/astrid_calendar_reminder_view.xml    | 2 +-
 app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml           | 5 -----
 4 files changed, 4 insertions(+), 9 deletions(-)
 delete mode 100644 app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 03564ca54..fce13bc5b 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -466,7 +466,7 @@
     <activity
       android:enabled="true"
       android:exported="true"
-      android:icon="@mipmap/ic_launcher"
+      android:icon="@mipmap/ic_launcher_round"
       android:label="@string/tasker_create_task"
       android:name=".locale.ui.activity.TaskerCreateTaskActivity"
       android:theme="@style/Tasks"
@@ -493,7 +493,7 @@
     <activity-alias
       android:enabled="true"
       android:exported="true"
-      android:icon="@mipmap/ic_launcher"
+      android:icon="@mipmap/ic_launcher_round"
       android:label="@string/tasker_list_notification"
       android:name="com.twofortyfouram.locale.example.setting.toast.ui.activity.PluginActivity"
       android:targetActivity=".locale.ui.activity.TaskerSettingsActivity"
diff --git a/app/src/main/java/org/tasks/widget/ShortcutConfigActivity.java b/app/src/main/java/org/tasks/widget/ShortcutConfigActivity.java
index 928447e7e..f75d2624e 100644
--- a/app/src/main/java/org/tasks/widget/ShortcutConfigActivity.java
+++ b/app/src/main/java/org/tasks/widget/ShortcutConfigActivity.java
@@ -50,7 +50,7 @@ public class ShortcutConfigActivity extends InjectingAppCompatActivity {
         Intent intent = new Intent();
         intent.putExtra(Intent.EXTRA_SHORTCUT_INTENT, shortcutIntent);
         intent.putExtra(Intent.EXTRA_SHORTCUT_NAME, filter.listingTitle);
-        Drawable launcher = ContextCompat.getDrawable(this, R.mipmap.ic_launcher);
+        Drawable launcher = ContextCompat.getDrawable(this, R.mipmap.ic_launcher_round);
         if (launcher instanceof BitmapDrawable) {
           intent.putExtra(Intent.EXTRA_SHORTCUT_ICON, ((BitmapDrawable) launcher).getBitmap());
         } else if (atLeastOreo() && launcher instanceof AdaptiveIconDrawable) {
diff --git a/app/src/main/res/layout/astrid_calendar_reminder_view.xml b/app/src/main/res/layout/astrid_calendar_reminder_view.xml
index 2f2948aa8..56aa349d5 100644
--- a/app/src/main/res/layout/astrid_calendar_reminder_view.xml
+++ b/app/src/main/res/layout/astrid_calendar_reminder_view.xml
@@ -60,7 +60,7 @@
         android:layout_height="wrap_content"
         android:layout_marginBottom="5dip"
         android:scaleType="fitCenter"
-        android:src="@mipmap/ic_launcher"/>
+        android:src="@mipmap/ic_launcher_round"/>
 
 
       <LinearLayout
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
deleted file mode 100644
index 578e6ac72..000000000
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-  <background android:drawable="@color/ic_launcher_background"/>
-  <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
-</adaptive-icon>
\ No newline at end of file