Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4c911321 authored by Romain Hunault's avatar Romain Hunault 💻
Browse files

Merge branch 'settings-improvement-oreo' into 'v1-oreo' 

Settings improvement oreo

See merge request !56
parents 674cb34f 639891a3

AndroidManifest.xml

+2 −2
Original line number Diff line number Diff line
@@ -3326,7 +3326,7 @@ 
        </activity>



        <!-- /e/ specific changes -->

        <activity android:name="Settings$MicroGActivity"

       <!-- <activity android:name="Settings$MicroGActivity"

            android:label="@string/micro_g"

            android:icon="@drawable/ic_homepage_microg">

            <intent-filter android:priority="1">
@@ -3340,7 +3340,7 @@ 
                android:value="com.android.settings.category.ia.homepage" />

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

                android:value="com.android.settings.MicroGSettings" />

        </activity>

        </activity>-->



        <activity android:name="Settings$OpenKeychainActivity"

            android:label="@string/open_keychain"

res/drawable/ic_homepage_microg.xml

+2 −2
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<vector xmlns:android="http://schemas.android.com/apk/res/android"

    android:width="32dp"

    android:height="32dp"

    android:width="24dp"

    android:height="24dp"

    android:viewportWidth="32"

    android:viewportHeight="32">

res/values/strings.xml

+306 −279

File changed.

Preview size limit exceeded, changes collapsed.

res/xml/system_dashboard_fragment.xml

+8 −0
Original line number Diff line number Diff line
@@ -25,6 +25,14 @@ 
        android:order="-250"

        android:fragment="com.android.settings.gestures.GestureSettings" />



    <Preference

        android:title="@string/micro_g"

        android:icon="@drawable/ic_homepage_microg"

        >

        <intent android:action="android.intent.action.MAIN"

            android:targetPackage="com.google.android.gms"

            android:targetClass="org.microg.gms.ui.SettingsActivity" />

    </Preference>

   

    <Preference

        android:key="reset_dashboard"