Skip to content

Commit 9e405cd

Browse files
Nanolx@Vavun
authored andcommitted
microG Settings in AppInfo and SystemSettings (+ adaptive icon) (#719)
Co-Authored-By: @Vavun <31875619+vavun@users.noreply.github.com>
1 parent 62ee8f5 commit 9e405cd

File tree

16 files changed

+40
-1
lines changed

16 files changed

+40
-1
lines changed

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

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -405,18 +405,39 @@
405405

406406
<!-- microG custom UI -->
407407

408+
<!-- microG Settings shown in Launcher -->
408409
<activity
409410
android:name="org.microg.gms.ui.SettingsActivity"
410411
android:icon="@mipmap/ic_microg_settings"
412+
android:roundIcon="@mipmap/ic_microg_settings"
411413
android:label="@string/gms_settings_name"
412414
android:theme="@style/Theme.AppCompat.Settings.Dashboard">
413415
<intent-filter>
414416
<action android:name="android.intent.action.MAIN"/>
415417

416418
<category android:name="android.intent.category.LAUNCHER"/>
417419
</intent-filter>
420+
<intent-filter>
421+
<action android:name="android.intent.action.APPLICATION_PREFERENCES"/>
422+
<category android:name="android.intent.category.DEFAULT"/>
423+
</intent-filter>
418424
</activity>
419425

426+
<!-- microG Settings embedded in System Settings on SDK 23 and newer -->
427+
<activity-alias
428+
android:name="org.microg.gms.ui.SettingsActivityLink"
429+
android:targetActivity="org.microg.gms.ui.SettingsActivity"
430+
android:icon="@drawable/microg_light_color_24"
431+
android:label="@string/gms_settings_name"
432+
android:theme="@style/Theme.AppCompat.Settings.Dashboard">
433+
<intent-filter>
434+
<action android:name="com.android.settings.action.EXTRA_SETTINGS"/>
435+
</intent-filter>
436+
<meta-data android:name="com.android.settings.category" android:value="com.android.settings.category.device"/>
437+
<meta-data android:name="com.android.settings.icon" android:resource="@drawable/microg_light_color_24"/>
438+
<meta-data android:name="com.android.settings.summary" android:resource="@string/gms_settings_summary"/>
439+
</activity-alias>
440+
420441
<activity
421442
android:name="org.microg.gms.ui.AskPushPermission"
422443
android:excludeFromRecents="true"
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt"
2+
android:viewportWidth="256"
3+
android:viewportHeight="256"
4+
android:width="256dp"
5+
android:height="256dp">
6+
<path
7+
android:fillColor="#ffffffff" android:pathData="M207.03481 139.53168c0.42667 -3.41333 0.74667 -6.82666 0.74667 -10.45333 0 -3.62667 -0.32 -7.04 -0.74667 -10.45333l22.50667 -17.6c2.02667 -1.599996 2.56 -4.479996 1.28 -6.826666L209.48815 57.291687c-1.28 -2.346666 -4.16 -3.2 -6.50667 -2.346666l-26.56 10.666666c-5.54667 -4.266666 -11.52 -7.786666 -18.02667 -10.453333l-4.05333 -28.266667c-0.32 -2.56 -2.56 -4.48 -5.22667 -4.48h-42.66666c-2.66667 0 -4.90667 1.92 -5.22667 4.48l-4.053331 28.266667c-6.50667 2.666667 -12.48 6.293333 -18.02667 10.453333l-26.56 -10.666666c-2.45333 -0.96 -5.22667 0 -6.50667 2.346666l-21.33333 36.906667c-1.38667 2.34667 -0.74667 5.22667 1.28 6.826666l22.50667 17.6c-0.42667 3.41333 -0.74667 6.93333 -0.74667 10.45333 0 3.52 0.32 7.04 0.74667 10.45333l-22.50667 17.6c-2.02667 1.6 -2.56 4.48 -1.28 6.82667l21.33333 36.90667c1.28 2.34666 4.16 3.2 6.50667 2.34666l26.56 -10.66666c5.54667 4.26666 11.52 7.78666 18.02667 10.45333l4.053331 28.26667c0.32 2.56 2.56 4.48 5.22667 4.48h42.66666c2.66667 0 4.90667 -1.92 5.22667 -4.48l4.05333 -28.26667c6.50667 -2.66667 12.48 -6.29333 18.02667 -10.45333l26.56 10.66666c2.45333 0.96 5.22667 0 6.50667 -2.34666l21.33333 -36.90667c1.28 -2.34667 0.74667 -5.22667 -1.28 -6.82667z">
8+
</path>
9+
</vector>
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<adaptive-icon
3+
xmlns:android="http://schemas.android.com/apk/res/android">
4+
<background android:drawable="@mipmap/ic_microg_background" />
5+
<foreground android:drawable="@mipmap/ic_microg_foreground" />
6+
</adaptive-icon>
476 Bytes
Loading
7.16 KB
Loading
344 Bytes
Loading
4.48 KB
Loading
618 Bytes
Loading
9.97 KB
Loading
1004 Bytes
Loading

0 commit comments

Comments
 (0)