Merge pull request #6082 from TacoTheDank/deleteRedundantIcon

Delete redundant round app icons

14 files changed, 4 insertions, 9 deletions

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 021fe4c9e..d888d8d99 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -31,7 +31,7 @@
     <application
         android:name="de.danoeh.antennapod.PodcastApp"
         android:icon="@mipmap/ic_launcher"
-        android:roundIcon="@mipmap/ic_launcher_round"
+        android:roundIcon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:backupAgent=".core.backup.OpmlBackupAgent"
         android:restoreAnyVersion="true"
diff --git a/core/src/debug/res/mipmap-hdpi/ic_launcher_round.png b/core/src/debug/res/mipmap-hdpi/ic_launcher_round.png
deleted file mode 100644
index 6f8022e25..000000000
--- a/core/src/debug/res/mipmap-hdpi/ic_launcher_round.png
+++ /dev/null
diff --git a/core/src/debug/res/mipmap-mdpi/ic_launcher_round.png b/core/src/debug/res/mipmap-mdpi/ic_launcher_round.png
deleted file mode 100644
index d542d555f..000000000
--- a/core/src/debug/res/mipmap-mdpi/ic_launcher_round.png
+++ /dev/null
diff --git a/core/src/debug/res/mipmap-xhdpi/ic_launcher_round.png b/core/src/debug/res/mipmap-xhdpi/ic_launcher_round.png
deleted file mode 100644
index a02ec4ca8..000000000
--- a/core/src/debug/res/mipmap-xhdpi/ic_launcher_round.png
+++ /dev/null
diff --git a/core/src/debug/res/mipmap-xxhdpi/ic_launcher_round.png b/core/src/debug/res/mipmap-xxhdpi/ic_launcher_round.png
deleted file mode 100644
index 066f9e5a5..000000000
--- a/core/src/debug/res/mipmap-xxhdpi/ic_launcher_round.png
+++ /dev/null
diff --git a/core/src/debug/res/mipmap-xxxhdpi/ic_launcher_round.png b/core/src/debug/res/mipmap-xxxhdpi/ic_launcher_round.png
deleted file mode 100644
index 7dbab284c..000000000
--- a/core/src/debug/res/mipmap-xxxhdpi/ic_launcher_round.png
+++ /dev/null
diff --git a/core/src/main/java/de/danoeh/antennapod/core/widget/WidgetUpdater.java b/core/src/main/java/de/danoeh/antennapod/core/widget/WidgetUpdater.java
index 8afba881a..11b0a29ca 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/widget/WidgetUpdater.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/widget/WidgetUpdater.java
@@ -106,7 +106,7 @@ public abstract class WidgetUpdater {
                     views.setImageViewBitmap(R.id.imgvCover, icon);
                 } catch (Throwable tr2) {
                     Log.e(TAG, "Error loading the media icon for the widget", tr2);
-                    views.setImageViewResource(R.id.imgvCover, R.mipmap.ic_launcher_round);
+                    views.setImageViewResource(R.id.imgvCover, R.mipmap.ic_launcher);
                 }
             }
 
@@ -151,7 +151,7 @@ public abstract class WidgetUpdater {
             views.setViewVisibility(R.id.txtvProgress, View.GONE);
             views.setViewVisibility(R.id.txtvTitle, View.GONE);
             views.setViewVisibility(R.id.txtNoPlaying, View.VISIBLE);
-            views.setImageViewResource(R.id.imgvCover, R.mipmap.ic_launcher_round);
+            views.setImageViewResource(R.id.imgvCover, R.mipmap.ic_launcher);
             views.setImageViewResource(R.id.butPlay, R.drawable.ic_widget_play);
             views.setImageViewResource(R.id.butPlayExtended, R.drawable.ic_widget_play);
         }
diff --git a/core/src/main/res/layout/player_widget.xml b/core/src/main/res/layout/player_widget.xml
index 164ca80f8..227cb1cc5 100644
--- a/core/src/main/res/layout/player_widget.xml
+++ b/core/src/main/res/layout/player_widget.xml
@@ -40,7 +40,7 @@
                 android:id="@+id/imgvCover"
                 android:layout_width="@android:dimen/app_icon_size"
                 android:layout_height="match_parent"
-                android:src="@mipmap/ic_launcher_round"
+                android:src="@mipmap/ic_launcher"
                 android:importantForAccessibility="no"
                 android:layout_margin="12dp" />
 
diff --git a/core/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/core/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
deleted file mode 100644
index 4ae7d1237..000000000
--- a/core/src/main/res/mipmap-anydpi-v26/ic_launcher_round.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="@mipmap/ic_launcher_background"/>
-    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
-</adaptive-icon>
\ No newline at end of file
diff --git a/core/src/main/res/mipmap-hdpi/ic_launcher_round.png b/core/src/main/res/mipmap-hdpi/ic_launcher_round.png
deleted file mode 100644
index 9c922ce1c..000000000
--- a/core/src/main/res/mipmap-hdpi/ic_launcher_round.png
+++ /dev/null
diff --git a/core/src/main/res/mipmap-mdpi/ic_launcher_round.png b/core/src/main/res/mipmap-mdpi/ic_launcher_round.png
deleted file mode 100644
index ef741cee7..000000000
--- a/core/src/main/res/mipmap-mdpi/ic_launcher_round.png
+++ /dev/null
diff --git a/core/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/core/src/main/res/mipmap-xhdpi/ic_launcher_round.png
deleted file mode 100644
index b05c50d44..000000000
--- a/core/src/main/res/mipmap-xhdpi/ic_launcher_round.png
+++ /dev/null
diff --git a/core/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/core/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
deleted file mode 100644
index 9d0116d26..000000000
--- a/core/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
+++ /dev/null
diff --git a/core/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/core/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
deleted file mode 100644
index 3c61e7dfc..000000000
--- a/core/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
+++ /dev/null