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

Commit c82bb141 authored by Romain Hunault's avatar Romain Hunault 💻
Browse files

Merge branch 'move-openkeychain-oreo' into 'v1-oreo' 

Moving openkeychain under security in oreo

See merge request !61
parents 4c911321 042f510d

AndroidManifest.xml

+0 −31
Original line number Diff line number Diff line
@@ -3326,37 +3326,6 @@ 
        </activity>



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

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

            android:label="@string/micro_g"

            android:icon="@drawable/ic_homepage_microg">

            <intent-filter android:priority="1">

                <action android:name="android.settings.MICROG_SETTINGS" />

                <category android:name="android.intent.category.DEFAULT" />

            </intent-filter>

            <intent-filter>

                <action android:name="com.android.settings.action.SETTINGS" />

            </intent-filter>

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

                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 android:name="Settings$OpenKeychainActivity"

            android:label="@string/open_keychain"

            android:icon="@drawable/ic_homepage_openkeychain">

            <intent-filter android:priority="1">

                <action android:name="android.settings.OPENKEYCHAIN_SETTINGS" />

                <category android:name="android.intent.category.DEFAULT" />

            </intent-filter>

            <intent-filter>

                <action android:name="com.android.settings.action.SETTINGS" />

            </intent-filter>

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

                android:value="com.android.settings.category.ia.homepage" />

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

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

        </activity>



        <!-- This is the longest AndroidManifest.xml ever. -->

    </application>

res/drawable/ic_homepage_openkeychain.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/xml/security_settings_status.xml

+13 −0
Original line number Diff line number Diff line
@@ -18,7 +18,20 @@ 
                  android:title="@string/security_privacy_settings_title">



    <PreferenceCategory

        android:order="-10"

        android:key="security_status"

        android:title="@string/security_status_title"/>



    <Preference

        android:key="open_keychain_settings"

        android:title="@string/open_keychain"

        android:icon="@drawable/ic_homepage_openkeychain"

        android:order="75">

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

            android:targetPackage="org.sufficientlysecure.keychain"

            android:targetClass="org.sufficientlysecure.keychain.ui.MainActivity" />

    </Preference>







</PreferenceScreen>

src/com/android/settings/core/gateway/SettingsGateway.java

+0 −1
Original line number Diff line number Diff line
@@ -257,7 +257,6 @@ public class SettingsGateway { 
            BluetoothDeviceDetailsFragment.class.getName(),

            DataUsageList.class.getName(),

            MicroGSettings.class.getName(),

            OpenKeychainSettings.class.getName(),

            SystemUpdaterSettings.class.getName()



    };