Merge pull request #10533 from t895/adaptive-icon

Android: Create adaptive icon and refactor old icon usage
dolphin-emu · Mar 26, 2022 · 56b5c67 · 56b5c67
2 parents 379de5d + b8013ff
commit 56b5c67
Show file tree

Hide file tree

Showing 18 changed files with 12 additions and 3 deletions.
diff --git a/Source/Android/app/src/main/AndroidManifest.xml b/Source/Android/app/src/main/AndroidManifest.xml
@@ -32,7 +32,7 @@
     <application
         android:name=".DolphinApplication"
         android:label="@string/app_name"
-        android:icon="@drawable/ic_launcher"
+        android:icon="@mipmap/ic_launcher"
         android:requestLegacyExternalStorage="true"
         android:preserveLegacyExternalStorage="true"
         android:allowBackup="true"

diff --git a/...e/Android/app/src/main/java/org/dolphinemu/dolphinemu/services/SyncChannelJobService.java b/...e/Android/app/src/main/java/org/dolphinemu/dolphinemu/services/SyncChannelJobService.java
@@ -129,7 +129,7 @@ private long createChannel(HomeScreenChannel subscription)
                               builder.build().toContentValues());
 
       channelId = ContentUris.parseId(channelUrl);
-      Bitmap bitmap = TvUtil.convertToBitmap(context, R.drawable.ic_launcher);
+      Bitmap bitmap = TvUtil.convertToBitmap(context, R.drawable.ic_dolphin);
       ChannelLogoUtils.storeChannelLogo(context, channelId, bitmap);
 
       return channelId;

diff --git a/...rc/main/res/drawable-hdpi/ic_launcher.png → ...src/main/res/drawable-hdpi/ic_dolphin.png b/...rc/main/res/drawable-hdpi/ic_launcher.png → ...src/main/res/drawable-hdpi/ic_dolphin.png
diff --git a/...c/main/res/drawable-xhdpi/ic_launcher.png → ...rc/main/res/drawable-xhdpi/ic_dolphin.png b/...c/main/res/drawable-xhdpi/ic_launcher.png → ...rc/main/res/drawable-xhdpi/ic_dolphin.png
diff --git a/.../main/res/drawable-xxhdpi/ic_launcher.png → ...c/main/res/drawable-xxhdpi/ic_dolphin.png b/.../main/res/drawable-xxhdpi/ic_launcher.png → ...c/main/res/drawable-xxhdpi/ic_dolphin.png
diff --git a/Source/Android/app/src/main/res/layout/tv_title.xml b/Source/Android/app/src/main/res/layout/tv_title.xml
@@ -25,7 +25,7 @@
             android:id="@+id/badge"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:src="@drawable/ic_launcher"/>
+            android:src="@drawable/ic_dolphin"/>
 
     </RelativeLayout>
 </androidx.leanback.widget.TitleView>
diff --git a/Source/Android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/Source/Android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -0,0 +1,5 @@
+<?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>
diff --git a/Source/Android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/Source/Android/app/src/main/res/mipmap-hdpi/ic_launcher.png
diff --git a/Source/Android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/Source/Android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
diff --git a/Source/Android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/Source/Android/app/src/main/res/mipmap-mdpi/ic_launcher.png
diff --git a/Source/Android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/Source/Android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
diff --git a/Source/Android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/Source/Android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
diff --git a/Source/Android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/Source/Android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
diff --git a/Source/Android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/Source/Android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/Source/Android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/Source/Android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
diff --git a/Source/Android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/Source/Android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/Source/Android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/Source/Android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
diff --git a/Source/Android/app/src/main/res/values/ic_launcher_background.xml b/Source/Android/app/src/main/res/values/ic_launcher_background.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="ic_launcher_background">#FFFFFF</color>
+</resources>