Merge pull request #6082 from TacoTheDank/deleteRedundantIcon

Delete redundant round app icons

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"

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);
         }

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" />
 

core/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -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>