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

Commit 9bf99f58 authored by Romain Hunault's avatar Romain Hunault 🚴🏻
Browse files

Merge branch 'issue-1075-pie' into 'v1-pie' 

Moved Openkeychain under security settings

See merge request !53
parents 9f9e07ef 60763633

AndroidManifest.xml

+2 −2
Original line number Diff line number Diff line
@@ -3409,7 +3409,7 @@ 
                 android:permission="android.permission.BIND_JOB_SERVICE" />



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

        <activity android:name="Settings$OpenKeychainActivity"

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

            android:label="@string/open_keychain"

            android:icon="@drawable/ic_homepage_openkeychain">

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

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

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

        </activity>

        </activity-->



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

    </application>

res/drawable/ic_homepage_openkeychain.xml

+3 −3
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="@dimen/dashboard_tile_image_size"

    android:height="@dimen/dashboard_tile_image_size"

    android:width="24dp"

    android:height="24dp"

    android:viewportWidth="32"

    android:viewportHeight="32">

res/xml/security_dashboard_settings.xml

+12 −1
Original line number Diff line number Diff line
@@ -28,6 +28,17 @@ 
        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>



    <PreferenceCategory

        android:order="1"

        android:key="dashboard_tile_placeholder" />

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

+1 −1
Original line number Diff line number Diff line
@@ -266,7 +266,7 @@ public class SettingsGateway { 
            DirectoryAccessDetails.class.getName(),

            ToggleBackupSettingFragment.class.getName(),

            PreviouslyConnectedDeviceDashboardFragment.class.getName(),

            OpenKeychainSettings.class.getName(),

        //     OpenKeychainSettings.class.getName(),

            SystemUpdaterSettings.class.getName(),

    };