From e52d1e7c01f27a19b84eb906c03c2908d29da644 Mon Sep 17 00:00:00 2001
From: Mohit Mali <futuretechnoworld.mohit@gmail.com>
Date: Fri, 11 Dec 2020 11:14:48 +0000
Subject: [PATCH 1/2] Moved Openkeychain under security settings

---
 AndroidManifest.xml                                |  4 ++--
 res/drawable/ic_homepage_openkeychain.xml          |  6 +++---
 res/xml/security_dashboard_settings.xml            | 14 +++++++++++++-
 .../settings/core/gateway/SettingsGateway.java     |  1 -
 4 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 7f46dff95b2..a8478e3fbf1 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -3307,7 +3307,7 @@
                 android:value="com.android.settings.gestures.GlobalActionsPanelSettings" />
 	</activity>
 	<!-- /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">
@@ -3321,7 +3321,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-->
 
         <activity android:name=".backup.transport.TransportActivity"
                   android:label="@string/backup_transport_title"
diff --git a/res/drawable/ic_homepage_openkeychain.xml b/res/drawable/ic_homepage_openkeychain.xml
index bd74db90fae..9a3c37e6314 100644
--- a/res/drawable/ic_homepage_openkeychain.xml
+++ b/res/drawable/ic_homepage_openkeychain.xml
@@ -1,7 +1,7 @@
 <?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">
 
@@ -23,4 +23,4 @@
         android:fillColor="#ffffff"
         android:fillType="evenOdd"
         android:pathData="M16.9823 4.87792C15.4315 4.87792 14.182 6.12744 14.182 7.67821C14.182 8.45204 14.4979 9.15714 15.0119 9.67118C15.3206 9.97985 15.3206 10.4803 15.0119 10.789C14.7032 11.0976 14.2028 11.0976 13.8941 10.789C13.0983 9.99321 12.6012 8.89167 12.6012 7.67821C12.6012 5.25438 14.5585 3.29712 16.9823 3.29712C19.3996 3.29712 21.386 5.24794 21.386 7.67821C21.386 8.11473 21.0321 8.46861 20.5955 8.46861C20.159 8.46861 19.8051 8.11473 19.8051 7.67821C19.8051 6.13387 18.5395 4.87792 16.9823 4.87792Z" />
-</vector>
\ No newline at end of file
+</vector>
diff --git a/res/xml/security_dashboard_settings.xml b/res/xml/security_dashboard_settings.xml
index 6a896ced42c..92d9b5fe3e7 100644
--- a/res/xml/security_dashboard_settings.xml
+++ b/res/xml/security_dashboard_settings.xml
@@ -28,6 +28,18 @@
         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" />
@@ -147,4 +159,4 @@
         android:summary="@string/summary_placeholder"
         android:fragment="com.android.settings.security.ScreenPinningSettings" />
 
-</PreferenceScreen>
\ No newline at end of file
+</PreferenceScreen>
diff --git a/src/com/android/settings/core/gateway/SettingsGateway.java b/src/com/android/settings/core/gateway/SettingsGateway.java
index f27a51a5569..6c8aa48077b 100644
--- a/src/com/android/settings/core/gateway/SettingsGateway.java
+++ b/src/com/android/settings/core/gateway/SettingsGateway.java
@@ -287,7 +287,6 @@ public class SettingsGateway {
             MobileNetworkListFragment.class.getName(),
             GlobalActionsPanelSettings.class.getName(),
             DarkModeSettingsFragment.class.getName(),
-            OpenKeychainSettings.class.getName(),
             SystemUpdaterSettings.class.getName(),
     };
 
-- 
GitLab


From 57527aba3556d68beb8d098f48639e895564a4f2 Mon Sep 17 00:00:00 2001
From: Romain Hunault <romain.hunault@e.email>
Date: Mon, 14 Dec 2020 14:17:20 +0000
Subject: [PATCH 2/2] Removed commented code

---
 AndroidManifest.xml | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index a8478e3fbf1..7bef65657ec 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -3307,21 +3307,6 @@
                 android:value="com.android.settings.gestures.GlobalActionsPanelSettings" />
 	</activity>
 	<!-- /e/ specific changes -->
-    <!---    <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-->
 
         <activity android:name=".backup.transport.TransportActivity"
                   android:label="@string/backup_transport_title"
-- 
GitLab