From a0b4f789771f1003c252021286a3fc1c4053188b Mon Sep 17 00:00:00 2001
From: Dennis Guse <dennis.guse@alumni.tu-berlin.de>
Date: Mon, 23 Jun 2025 08:54:20 +0200
Subject: [PATCH] Cleanup: remove support for launcher icons before SDK26.

Part of #2108.
---
 .../ic_launcher_background.xml                    |  0
 src/main/res/drawable-v26/ic_launcher.xml         |  6 ------
 src/main/res/drawable/ic_launcher.xml             |  7 +++++--
 .../ic_launcher_background.xml                    |  0
 .../ic_launcher_background.xml                    |  0
 src/reproducible/res/drawable-v26/ic_launcher.xml | 14 --------------
 src/reproducible/res/drawable/ic_launcher.xml     | 15 +++++++++++++--
 .../ic_launcher_background.xml                    |  0
 8 files changed, 18 insertions(+), 24 deletions(-)
 rename src/debug/res/{values-v26 => values}/ic_launcher_background.xml (100%)
 delete mode 100644 src/main/res/drawable-v26/ic_launcher.xml
 rename src/main/res/{values-v26 => values}/ic_launcher_background.xml (100%)
 rename src/nightly/res/{values-v26 => values}/ic_launcher_background.xml (100%)
 delete mode 100644 src/reproducible/res/drawable-v26/ic_launcher.xml
 rename src/reproducible/res/{values-v26 => values}/ic_launcher_background.xml (100%)

diff --git a/src/debug/res/values-v26/ic_launcher_background.xml b/src/debug/res/values/ic_launcher_background.xml
similarity index 100%
rename from src/debug/res/values-v26/ic_launcher_background.xml
rename to src/debug/res/values/ic_launcher_background.xml
diff --git a/src/main/res/drawable-v26/ic_launcher.xml b/src/main/res/drawable-v26/ic_launcher.xml
deleted file mode 100644
index a9070e741..000000000
--- a/src/main/res/drawable-v26/ic_launcher.xml
+++ /dev/null
@@ -1,6 +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="@drawable/ic_logo_color_108dp" />
-    <monochrome android:drawable="@drawable/ic_logo_color_108dp" />
-</adaptive-icon>
\ No newline at end of file
diff --git a/src/main/res/drawable/ic_launcher.xml b/src/main/res/drawable/ic_launcher.xml
index 1066c5489..a9070e741 100644
--- a/src/main/res/drawable/ic_launcher.xml
+++ b/src/main/res/drawable/ic_launcher.xml
@@ -1,3 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<inset xmlns:android="http://schemas.android.com/apk/res/android"
-    android:drawable="@drawable/ic_logo_color_24dp" />
\ No newline at end of file
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_launcher_background" />
+    <foreground android:drawable="@drawable/ic_logo_color_108dp" />
+    <monochrome android:drawable="@drawable/ic_logo_color_108dp" />
+</adaptive-icon>
\ No newline at end of file
diff --git a/src/main/res/values-v26/ic_launcher_background.xml b/src/main/res/values/ic_launcher_background.xml
similarity index 100%
rename from src/main/res/values-v26/ic_launcher_background.xml
rename to src/main/res/values/ic_launcher_background.xml
diff --git a/src/nightly/res/values-v26/ic_launcher_background.xml b/src/nightly/res/values/ic_launcher_background.xml
similarity index 100%
rename from src/nightly/res/values-v26/ic_launcher_background.xml
rename to src/nightly/res/values/ic_launcher_background.xml
diff --git a/src/reproducible/res/drawable-v26/ic_launcher.xml b/src/reproducible/res/drawable-v26/ic_launcher.xml
deleted file mode 100644
index 7254fb990..000000000
--- a/src/reproducible/res/drawable-v26/ic_launcher.xml
+++ /dev/null
@@ -1,14 +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>
-        <inset
-            android:inset="20dp"
-            android:drawable="@drawable/ic_logo_24dp" />
-    </foreground>
-    <monochrome>
-        <inset
-            android:inset="20dp"
-            android:drawable="@drawable/ic_logo_24dp" />
-    </monochrome>
-</adaptive-icon>
\ No newline at end of file
diff --git a/src/reproducible/res/drawable/ic_launcher.xml b/src/reproducible/res/drawable/ic_launcher.xml
index 5e60a0007..7254fb990 100644
--- a/src/reproducible/res/drawable/ic_launcher.xml
+++ b/src/reproducible/res/drawable/ic_launcher.xml
@@ -1,3 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<inset xmlns:android="http://schemas.android.com/apk/res/android"
-    android:drawable="@drawable/ic_logo_108dp" />
\ No newline at end of file
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_launcher_background" />
+    <foreground>
+        <inset
+            android:inset="20dp"
+            android:drawable="@drawable/ic_logo_24dp" />
+    </foreground>
+    <monochrome>
+        <inset
+            android:inset="20dp"
+            android:drawable="@drawable/ic_logo_24dp" />
+    </monochrome>
+</adaptive-icon>
\ No newline at end of file
diff --git a/src/reproducible/res/values-v26/ic_launcher_background.xml b/src/reproducible/res/values/ic_launcher_background.xml
similarity index 100%
rename from src/reproducible/res/values-v26/ic_launcher_background.xml
rename to src/reproducible/res/values/ic_launcher_background.xml