From 248907c1488ca31ee4c719e309749c3512d5f3ab Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Sun, 31 May 2026 00:16:01 +0000
Subject: [PATCH] #2140 feat: add monochrome app icon for themed icon support
 on Android 13+

Adds ic_launcher_monochrome.xml using evenOdd fill paths derived from the
existing foreground icon so the DPad and keyboard shapes are recognisable
in a single colour. Updates all adaptive-icon XML files (release, debug, ci)
to reference the new monochrome layer.
---
 CHANGELOG.md                                  |  4 ++++
 .../ci/res/mipmap-anydpi-v26/ic_launcher.xml  |  1 +
 .../mipmap-anydpi-v26/ic_launcher_round.xml   |  1 +
 .../res/mipmap-anydpi-v26/ic_launcher.xml     |  1 +
 .../mipmap-anydpi-v26/ic_launcher_round.xml   |  1 +
 .../res/drawable/ic_launcher_monochrome.xml   | 24 +++++++++++++++++++
 .../res/mipmap-anydpi-v26/ic_launcher.xml     |  1 +
 .../mipmap-anydpi-v26/ic_launcher_round.xml   |  1 +
 8 files changed, 34 insertions(+)
 create mode 100644 base/src/main/res/drawable/ic_launcher_monochrome.xml

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c0872a3650..f848f8fed5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 ## Unreleased
 
+## Added
+
+- #2140 Add monochrome app icon layer for themed icon support on Android 13+.
+
 ## Changed
 
 - #1369 Add content descriptions to drag handles and custom "Move up"/"Move down" accessibility actions for trigger and action list items, improving TalkBack support for reordering.
diff --git a/app/src/ci/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/ci/res/mipmap-anydpi-v26/ic_launcher.xml
index 7353dbd1fd..1084c24082 100644
--- a/app/src/ci/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/app/src/ci/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -2,4 +2,5 @@
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@color/ic_launcher_background"/>
     <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+    <monochrome android:drawable="@drawable/ic_launcher_monochrome"/>
 </adaptive-icon>
\ No newline at end of file
diff --git a/app/src/ci/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/ci/res/mipmap-anydpi-v26/ic_launcher_round.xml
index 7353dbd1fd..1084c24082 100644
--- a/app/src/ci/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ b/app/src/ci/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -2,4 +2,5 @@
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@color/ic_launcher_background"/>
     <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+    <monochrome android:drawable="@drawable/ic_launcher_monochrome"/>
 </adaptive-icon>
\ No newline at end of file
diff --git a/app/src/debug/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/debug/res/mipmap-anydpi-v26/ic_launcher.xml
index 7353dbd1fd..1084c24082 100644
--- a/app/src/debug/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/app/src/debug/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -2,4 +2,5 @@
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@color/ic_launcher_background"/>
     <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+    <monochrome android:drawable="@drawable/ic_launcher_monochrome"/>
 </adaptive-icon>
\ No newline at end of file
diff --git a/app/src/debug/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/debug/res/mipmap-anydpi-v26/ic_launcher_round.xml
index 7353dbd1fd..1084c24082 100644
--- a/app/src/debug/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ b/app/src/debug/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -2,4 +2,5 @@
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@color/ic_launcher_background"/>
     <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+    <monochrome android:drawable="@drawable/ic_launcher_monochrome"/>
 </adaptive-icon>
\ No newline at end of file
diff --git a/base/src/main/res/drawable/ic_launcher_monochrome.xml b/base/src/main/res/drawable/ic_launcher_monochrome.xml
new file mode 100644
index 0000000000..228496484e
--- /dev/null
+++ b/base/src/main/res/drawable/ic_launcher_monochrome.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="144"
+    android:viewportHeight="144">
+    <!--
+        DPad square with directional arrow shapes as transparent cutouts.
+        Uses evenOdd fill so the arrow paths punch holes through the square.
+    -->
+    <path
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"
+        android:pathData="M46,65L75,65A4,4 0,0 1,79 69L79,98A4,4 0,0 1,75 102L46,102A4,4 0,0 1,42 98L42,69A4,4 0,0 1,46 65Z M63.9,77.877L63.9,72.3C63.9,71.585 63.315,71 62.6,71h-5.2c-0.715,0 -1.3,0.585 -1.3,1.3v5.577c0,0.169 0.065,0.338 0.195,0.455l3.25,3.25c0.26,0.26 0.663,0.26 0.923,0l3.25,-3.25c0.117,-0.117 0.182,-0.273 0.182,-0.455Z M53.877,80.1L48.3,80.1C47.585,80.1 47,80.685 47,81.4v5.2c0,0.715 0.585,1.3 1.3,1.3L53.877,87.9c0.169,0 0.338,-0.065 0.455,-0.195l3.25,-3.25c0.26,-0.26 0.26,-0.663 0,-0.923l-3.25,-3.25c-0.117,-0.117 -0.273,-0.182 -0.455,-0.182Z M56.1,90.123v5.577C56.1,96.415 56.685,97 57.4,97h5.2c0.715,0 1.3,-0.585 1.3,-1.3L63.9,90.123c0,-0.169 -0.065,-0.338 -0.195,-0.455l-3.25,-3.25c-0.26,-0.26 -0.663,-0.26 -0.923,0l-3.25,3.25c-0.117,0.117 -0.182,0.273 -0.182,0.455Z M65.655,80.295L62.405,83.545c-0.26,0.26 -0.26,0.663 0,0.923l3.25,3.25c0.117,0.117 0.286,0.195 0.455,0.195h5.59C72.415,87.913 73,87.328 73,86.613L73,81.413C73,80.698 72.415,80.113 71.7,80.113L66.123,80.113c-0.182,-0.013 -0.338,0.052 -0.468,0.182Z"/>
+    <!--
+        Keyboard square with the keyboard grid as transparent cutouts.
+        The keyboard frame becomes a hole, and individual keys appear as
+        filled squares within that hole due to the evenOdd triple-overlap.
+    -->
+    <path
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"
+        android:pathData="M97,43.225L68,43.225A4,4 0,0 0,64 47.225L64,76.225A4,4 0,0 0,68 80.225L97,80.225A4,4 0,0 0,101 76.225L101,47.225A4,4 0,0 0,97 43.225Z M93.4,51.8L72.6,51.8c-1.43,0 -2.587,1.17 -2.587,2.6L70,67.4c0,1.43 1.17,2.6 2.6,2.6L93.4,70C94.83,70 96,68.83 96,67.4L96,54.4c0,-1.43 -1.17,-2.6 -2.6,-2.6Z M81.7,55.7h2.6v2.6L81.7,58.3Z M81.7,59.6h2.6L84.3,62.2L81.7,62.2Z M77.8,55.7h2.6v2.6L77.8,58.3Z M77.8,59.6h2.6L80.4,62.2L77.8,62.2Z M76.5,62.2h-2.6v-2.6h2.6Z M76.5,58.3h-2.6v-2.6h2.6Z M86.9,67.4h-7.8C78.385,67.4 77.8,66.815 77.8,66.1 77.8,65.385 78.385,64.8 79.1,64.8h7.8c0.715,0 1.3,0.585 1.3,1.3 0,0.715 -0.585,1.3 -1.3,1.3Z M88.2,62.2h-2.6v-2.6h2.6Z M88.2,58.3h-2.6v-2.6h2.6Z M92.1,62.2h-2.6v-2.6h2.6Z M92.1,58.3h-2.6v-2.6h2.6Z"/>
+</vector>
diff --git a/base/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/base/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
index 7353dbd1fd..1084c24082 100644
--- a/base/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/base/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -2,4 +2,5 @@
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@color/ic_launcher_background"/>
     <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+    <monochrome android:drawable="@drawable/ic_launcher_monochrome"/>
 </adaptive-icon>
\ No newline at end of file
diff --git a/base/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/base/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
index 7353dbd1fd..1084c24082 100644
--- a/base/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ b/base/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -2,4 +2,5 @@
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@color/ic_launcher_background"/>
     <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+    <monochrome android:drawable="@drawable/ic_launcher_monochrome"/>
 </adaptive-icon>
\ No newline at end of file