microG Settings in AppInfo and SystemSettings (+ adaptive icon)

play-services-core/src/main/AndroidManifest.xml

@@ -405,18 +405,39 @@
 
         <!-- microG custom UI -->
 
+        <!-- microG Settings shown in Launcher -->
         <activity
             android:name="org.microg.gms.ui.SettingsActivity"
             android:icon="@mipmap/ic_microg_settings"
+            android:roundIcon="@mipmap/ic_microg_settings"
             android:label="@string/gms_settings_name"
             android:theme="@style/Theme.AppCompat.Settings.Dashboard">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
 
                 <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.APPLICATION_PREFERENCES"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
         </activity>
 
+        <!-- microG Settings embedded in System Settings on SDK 23 and newer -->
+        <activity-alias
+            android:name="org.microg.gms.ui.SettingsActivityLink"
+            android:targetActivity="org.microg.gms.ui.SettingsActivity"
+            android:icon="@drawable/microg_light_color_24"
+            android:label="@string/gms_settings_name"
+            android:theme="@style/Theme.AppCompat.Settings.Dashboard">
+            <intent-filter>
+                <action android:name="com.android.settings.action.EXTRA_SETTINGS"/>
+            </intent-filter>
+            <meta-data android:name="com.android.settings.category" android:value="com.android.settings.category.device"/>
+            <meta-data android:name="com.android.settings.icon" android:resource="@drawable/microg_light_color_24"/>
+            <meta-data android:name="com.android.settings.summary" android:resource="@string/gms_settings_summary"/>
+        </activity-alias>
+
         <activity
             android:name="org.microg.gms.ui.AskPushPermission"
             android:excludeFromRecents="true"

play-services-core/src/main/res/drawable-anydpi-v21/microg_light_color_24.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector android:height="24.0dip" android:width="24.0dip" android:viewportWidth="24.0" android:viewportHeight="24.0"
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#ffffffff" android:pathData="M12 10v4.51h6.47c-0.53 2.75,-2.95 4.74,-6.47 4.74,-3.93 0,-7.11,-3.32,-7.11,-7.25S8.07 4.75 12 4.75c1.77 0 3.35 0.61 4.6 1.8l3.42,-3.42C17.95 1.19 15.24 0 12 0 5.37 0 0 5.37 0 12s5.37 12 12 12c6.93 0 11.49,-4.87 11.49,-11.73 0,-0.79,-0.07,-1.54,-0.19,-2.27H12z" />
+</vector>

play-services-core/src/main/res/mipmap-anydpi-v26/ic_microg_settings.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@mipmap/ic_microg_background" />
+    <foreground android:drawable="@mipmap/ic_microg_foreground" />
+</adaptive-icon>

play-services-core/src/main/res/values-de/strings.xml

@@ -17,6 +17,7 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="gms_app_name">microG Services Core</string>
     <string name="gms_settings_name">microG Einstellungen</string>
+    <string name="gms_settings_summary">microG services Core einrichten.</string>
 
     <string name="just_a_sec">Einen kurzen Moment…</string>
     <string name="google_account_label">Google</string>

play-services-core/src/main/res/values-ru/strings.xml

@@ -16,7 +16,8 @@
 
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="gms_app_name">microG Services Core</string>
-    <string name="gms_settings_name">MicroG</string>
+    <string name="gms_settings_name">Настройки MicroG</string>
+    <string name="gms_settings_summary">Конфигурирование сервисов microG.</string>
 
     <string name="just_a_sec">Пожалуйста, подождите...</string>
     <string name="google_account_label">Google</string>

play-services-core/src/main/res/values/strings.xml

@@ -17,6 +17,7 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="gms_app_name">microG Services Core</string>
     <string name="gms_settings_name">microG Settings</string>
+    <string name="gms_settings_summary">Setup microG services Core.</string>
 
     <string name="just_a_sec">Just a sec…</string>
     <string name="google_account_label">Google</string>