From 44b9173476c4f293649507703e9179d24667754d Mon Sep 17 00:00:00 2001
From: Marvin W <git@larma.de>
Date: Tue, 24 Oct 2023 14:03:46 +1300
Subject: [PATCH] Add missing icon for system settings

Fixes #2057
---
 .../src/main/AndroidManifest.xml              |  4 +-
 .../ic_app_foreground.xml                     |  0
 .../ic_app_foreground_mono.xml                |  0
 .../ic_app_settings_foreground.xml            |  0
 .../ic_app_settings_foreground_mono.xml       |  0
 .../drawable-v21/ic_app_settings_system.xml   | 45 +++++++++++++++++++
 6 files changed, 47 insertions(+), 2 deletions(-)
 rename play-services-core/src/main/res/{drawable-v26 => drawable-v21}/ic_app_foreground.xml (100%)
 rename play-services-core/src/main/res/{drawable-v26 => drawable-v21}/ic_app_foreground_mono.xml (100%)
 rename play-services-core/src/main/res/{drawable-v26 => drawable-v21}/ic_app_settings_foreground.xml (100%)
 rename play-services-core/src/main/res/{drawable-v26 => drawable-v21}/ic_app_settings_foreground_mono.xml (100%)
 create mode 100644 play-services-core/src/main/res/drawable-v21/ic_app_settings_system.xml

diff --git a/play-services-core/src/main/AndroidManifest.xml b/play-services-core/src/main/AndroidManifest.xml
index 7275a511c4..c07bf4020d 100644
--- a/play-services-core/src/main/AndroidManifest.xml
+++ b/play-services-core/src/main/AndroidManifest.xml
@@ -574,7 +574,7 @@
         <!-- microG Settings embedded in System Settings on SDK 23 and newer -->
         <activity-alias
             android:name="org.microg.gms.ui.SettingsActivityLink"
-            android:icon="@drawable/ic_app_settings_foreground_mono"
+            android:icon="@mipmap/ic_app_settings"
             android:label="@string/gms_settings_name"
             android:process=":ui"
             android:targetActivity="org.microg.gms.ui.MainSettingsActivity"
@@ -588,7 +588,7 @@
                 android:value="com.android.settings.category.device" />
             <meta-data
                 android:name="com.android.settings.icon"
-                android:resource="@drawable/ic_app_settings_foreground_mono" />
+                android:resource="@drawable/ic_app_settings_system" />
             <meta-data
                 android:name="com.android.settings.summary"
                 android:resource="@string/gms_settings_summary" />
diff --git a/play-services-core/src/main/res/drawable-v26/ic_app_foreground.xml b/play-services-core/src/main/res/drawable-v21/ic_app_foreground.xml
similarity index 100%
rename from play-services-core/src/main/res/drawable-v26/ic_app_foreground.xml
rename to play-services-core/src/main/res/drawable-v21/ic_app_foreground.xml
diff --git a/play-services-core/src/main/res/drawable-v26/ic_app_foreground_mono.xml b/play-services-core/src/main/res/drawable-v21/ic_app_foreground_mono.xml
similarity index 100%
rename from play-services-core/src/main/res/drawable-v26/ic_app_foreground_mono.xml
rename to play-services-core/src/main/res/drawable-v21/ic_app_foreground_mono.xml
diff --git a/play-services-core/src/main/res/drawable-v26/ic_app_settings_foreground.xml b/play-services-core/src/main/res/drawable-v21/ic_app_settings_foreground.xml
similarity index 100%
rename from play-services-core/src/main/res/drawable-v26/ic_app_settings_foreground.xml
rename to play-services-core/src/main/res/drawable-v21/ic_app_settings_foreground.xml
diff --git a/play-services-core/src/main/res/drawable-v26/ic_app_settings_foreground_mono.xml b/play-services-core/src/main/res/drawable-v21/ic_app_settings_foreground_mono.xml
similarity index 100%
rename from play-services-core/src/main/res/drawable-v26/ic_app_settings_foreground_mono.xml
rename to play-services-core/src/main/res/drawable-v21/ic_app_settings_foreground_mono.xml
diff --git a/play-services-core/src/main/res/drawable-v21/ic_app_settings_system.xml b/play-services-core/src/main/res/drawable-v21/ic_app_settings_system.xml
new file mode 100644
index 0000000000..3e10efc387
--- /dev/null
+++ b/play-services-core/src/main/res/drawable-v21/ic_app_settings_system.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ SPDX-FileCopyrightText: 2023 microG Project Team
+  ~ SPDX-License-Identifier: CC-BY-SA-4.0
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="225.27"
+    android:viewportHeight="225.27">
+    <group>
+        <path
+            android:pathData="m151.55,151.53a55,55 0,0 1,-66.39 8.74"
+            android:strokeAlpha="0.8"
+            android:strokeWidth="36"
+            android:fillColor="#00ffffff"
+            android:strokeColor="#ffffff"
+            android:fillAlpha="0.9"
+            android:strokeLineCap="butt" />
+        <path
+            android:pathData="M85.16,160.27A55,55 0,0 1,59.53 98.4"
+            android:strokeAlpha="0.6"
+            android:strokeWidth="36"
+            android:fillColor="#00ffffff"
+            android:strokeColor="#ffffff"
+            android:fillAlpha="0.7"
+            android:strokeLineCap="butt" />
+        <path
+            android:pathData="m59.53,98.4a55,55 0,0 1,25.63 -33.4"
+            android:strokeAlpha="0.5"
+            android:strokeWidth="36"
+            android:fillColor="#00ffffff"
+            android:strokeColor="#ffffff"
+            android:fillAlpha="0.6"
+            android:strokeLineCap="butt" />
+        <path
+            android:pathData="m85.16,65.01a55,55 0,0 1,66.39 8.74"
+            android:strokeAlpha="0.7"
+            android:strokeWidth="36"
+            android:fillColor="#00ffffff"
+            android:strokeColor="#ffffff"
+            android:fillAlpha="0.8"
+            android:strokeLineCap="butt" />
+    </group>
+</vector>