From b34824d74debd93e8411d1e148481638463ca92f Mon Sep 17 00:00:00 2001
From: Mohit Mali <futuretechnoworld.mohit@gmail.com>
Date: Wed, 28 Oct 2020 10:19:43 +0000
Subject: [PATCH 1/5] Update res/xml/system_updater_prefs.xml

---
 res/xml/system_updater_prefs.xml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/res/xml/system_updater_prefs.xml b/res/xml/system_updater_prefs.xml
index f84fb21f8fe..75db659060d 100644
--- a/res/xml/system_updater_prefs.xml
+++ b/res/xml/system_updater_prefs.xml
@@ -7,9 +7,7 @@
         android:key="system_update_settings"
         android:order="-30"
         android:summary="@string/summary_placeholder"
-        android:title="@string/system_update_settings_list_item_title"
-        settings:controller="com.android.settings.system.SystemUpdatePreferenceController"
-        settings:keywords="@string/keywords_system_update_settings">
+        android:title="@string/system_update_settings_list_item_title">
         <intent android:action="android.settings.SYSTEM_UPDATE_SETTINGS" />
     </Preference>
 
-- 
GitLab


From c48c5cb3272ec38adec49ad32232244b1b82bf86 Mon Sep 17 00:00:00 2001
From: Mohit Mali <futuretechnoworld.mohit@gmail.com>
Date: Wed, 28 Oct 2020 11:57:51 +0000
Subject: [PATCH 2/5] Fixed crash when click on updater settings option

---
 res/xml/system_dashboard_fragment.xml | 10 +---------
 res/xml/system_updater_prefs.xml      | 12 ++++++------
 2 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/res/xml/system_dashboard_fragment.xml b/res/xml/system_dashboard_fragment.xml
index b3625548145..8d50c709a05 100644
--- a/res/xml/system_dashboard_fragment.xml
+++ b/res/xml/system_dashboard_fragment.xml
@@ -25,15 +25,7 @@
         android:order="-250"
         android:fragment="com.android.settings.gestures.GestureSettings" />
 
-    <Preference
-        android:key="additional_system_update_settings"
-        android:title="@string/additional_system_update_settings_list_item_title"
-        android:order="-31">
-        <intent android:action="android.intent.action.MAIN"
-                android:targetPackage="@string/additional_system_update"
-                android:targetClass="@string/additional_system_update_menu" />
-    </Preference>
-
+   
     <Preference
         android:key="reset_dashboard"
         android:title="@string/reset_dashboard_title"
diff --git a/res/xml/system_updater_prefs.xml b/res/xml/system_updater_prefs.xml
index 75db659060d..6f8c1920997 100644
--- a/res/xml/system_updater_prefs.xml
+++ b/res/xml/system_updater_prefs.xml
@@ -3,12 +3,12 @@
     xmlns:settings="http://schemas.android.com/apk/res-auto">
 
     <Preference
-        android:icon="@drawable/ic_system_update"
-        android:key="system_update_settings"
-        android:order="-30"
-        android:summary="@string/summary_placeholder"
-        android:title="@string/system_update_settings_list_item_title">
-        <intent android:action="android.settings.SYSTEM_UPDATE_SETTINGS" />
+        android:key="additional_system_update_settings"
+        android:title="@string/additional_system_update_settings_list_item_title"
+        android:order="-31">
+        <intent android:action="android.intent.action.MAIN"
+                android:targetPackage="@string/additional_system_update"
+                android:targetClass="@string/additional_system_update_menu" />
     </Preference>
 
 </PreferenceScreen>
-- 
GitLab


From b76b429592cb516dcaccd77fe18b471ae898aef7 Mon Sep 17 00:00:00 2001
From: Mohit Mali <futuretechnoworld.mohit@gmail.com>
Date: Wed, 28 Oct 2020 15:09:33 +0000
Subject: [PATCH 3/5] Fixed crash on clicking system updater settings

---
 res/xml/device_info_settings.xml                    | 7 -------
 src/com/android/settings/SystemUpdaterSettings.java | 3 ++-
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/res/xml/device_info_settings.xml b/res/xml/device_info_settings.xml
index 422226218fc..049303a49cc 100644
--- a/res/xml/device_info_settings.xml
+++ b/res/xml/device_info_settings.xml
@@ -22,13 +22,6 @@
         <org.lineageos.internal.preference.deviceinfo.LineageVersionPreference
                 android:key="lineage_version" />
 
-        <!-- System update settings - launches activity -->
-        <Preference android:key="additional_system_update_settings"
-                    android:title="@string/additional_system_update_settings_list_item_title">
-            <intent android:action="android.intent.action.MAIN"
-                    android:targetPackage="@string/additional_system_update"
-                    android:targetClass="@string/additional_system_update_menu" />
-        </Preference>
 
         <!-- LineageOS updates -->
         <org.lineageos.internal.preference.deviceinfo.LineageUpdatesPreference
diff --git a/src/com/android/settings/SystemUpdaterSettings.java b/src/com/android/settings/SystemUpdaterSettings.java
index 9b524a9b5d0..8c11671867b 100644
--- a/src/com/android/settings/SystemUpdaterSettings.java
+++ b/src/com/android/settings/SystemUpdaterSettings.java
@@ -21,7 +21,8 @@ public class SystemUpdaterSettings extends Fragment {
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        Intent intent = new Intent("android.settings.SYSTEM_UPDATE_SETTINGS");
+        Intent intent = new Intent("android.intent.action.MAIN");
+        intent.setComponent(new ComponentName("org.lineageos.updater", "org.lineageos.updater.UpdatesActivity"));
         startActivity(intent);
 
         Activity activity = getActivity();
-- 
GitLab


From c291993868244f4077de33178566a51fd257fdf2 Mon Sep 17 00:00:00 2001
From: Mohit Mali <futuretechnoworld.mohit@gmail.com>
Date: Wed, 28 Oct 2020 16:25:06 +0000
Subject: [PATCH 4/5] Update res/xml/device_info_settings.xml

---
 res/xml/device_info_settings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/res/xml/device_info_settings.xml b/res/xml/device_info_settings.xml
index 049303a49cc..733672d4c1d 100644
--- a/res/xml/device_info_settings.xml
+++ b/res/xml/device_info_settings.xml
@@ -24,10 +24,10 @@
 
 
         <!-- LineageOS updates -->
-        <org.lineageos.internal.preference.deviceinfo.LineageUpdatesPreference
+      <!--  <org.lineageos.internal.preference.deviceinfo.LineageUpdatesPreference
                 android:key="lineage_updates"
                 lineage:requiresOwner="true"
-                lineage:requiresPackage="org.lineageos.updater" />
+                lineage:requiresPackage="org.lineageos.updater" /-->
 
         <!-- Device status - launches activity -->
         <Preference android:key="status_info"
-- 
GitLab


From 80a9a6c220e12e7fbc8dd39c6f66fb8cebabd6ac Mon Sep 17 00:00:00 2001
From: Romain Hunault <romain.hunault@e.email>
Date: Thu, 29 Oct 2020 21:05:08 +0000
Subject: [PATCH 5/5] Clean device_info_settings.xml

---
 res/xml/device_info_settings.xml | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/res/xml/device_info_settings.xml b/res/xml/device_info_settings.xml
index 733672d4c1d..b85f4c8044f 100644
--- a/res/xml/device_info_settings.xml
+++ b/res/xml/device_info_settings.xml
@@ -22,13 +22,6 @@
         <org.lineageos.internal.preference.deviceinfo.LineageVersionPreference
                 android:key="lineage_version" />
 
-
-        <!-- LineageOS updates -->
-      <!--  <org.lineageos.internal.preference.deviceinfo.LineageUpdatesPreference
-                android:key="lineage_updates"
-                lineage:requiresOwner="true"
-                lineage:requiresPackage="org.lineageos.updater" /-->
-
         <!-- Device status - launches activity -->
         <Preference android:key="status_info"
                 android:title="@string/device_status"
-- 
GitLab