From 249d8a94acb1574a34c602ae61bc71b6c9e4dde4 Mon Sep 17 00:00:00 2001 From: Mohit Mali Date: Wed, 30 Sep 2020 12:16:56 +0530 Subject: [PATCH 1/2] Move updater to top of settings main page --- AndroidManifest.xml | 16 ++++++ res/xml/system_dashboard_fragment.xml | 4 +- res/xml/system_updater_prefs.xml | 16 ++++++ src/com/android/settings/Settings.java | 1 + .../settings/SystemUpdaterSettings.java | 52 +++++++++++++++++++ .../core/gateway/SettingsGateway.java | 4 +- 6 files changed, 90 insertions(+), 3 deletions(-) create mode 100644 res/xml/system_updater_prefs.xml create mode 100644 src/com/android/settings/SystemUpdaterSettings.java diff --git a/AndroidManifest.xml b/AndroidManifest.xml index bc930799350..e3d9918cda5 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -147,6 +147,22 @@ + + + + + + + + + + + + --> - + + + + + + + + diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java index 8f32d3dc6b9..ba7f2f288ae 100644 --- a/src/com/android/settings/Settings.java +++ b/src/com/android/settings/Settings.java @@ -192,5 +192,6 @@ public class Settings extends SettingsActivity { public static class StorageDashboardActivity extends SettingsActivity {} public static class UserAndAccountDashboardActivity extends SettingsActivity {} public static class SystemDashboardActivity extends SettingsActivity {} + public static class SystemUpdaterActivity extends SettingsActivity { /* empty */ } } diff --git a/src/com/android/settings/SystemUpdaterSettings.java b/src/com/android/settings/SystemUpdaterSettings.java new file mode 100644 index 00000000000..9b524a9b5d0 --- /dev/null +++ b/src/com/android/settings/SystemUpdaterSettings.java @@ -0,0 +1,52 @@ +package com.android.settings; + +import android.os.Bundle; +import android.content.Intent; +import android.content.ComponentName; +import android.app.Fragment; + +import android.app.Activity; +import android.content.Context; +import android.provider.SearchIndexableResource; +import com.android.settings.R; +import com.android.settings.search.BaseSearchIndexProvider; +import com.android.settings.search.Indexable; +import java.util.ArrayList; +import java.util.List; + + +public class SystemUpdaterSettings extends Fragment { + + @Override + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + + Intent intent = new Intent("android.settings.SYSTEM_UPDATE_SETTINGS"); + startActivity(intent); + + Activity activity = getActivity(); + + if (activity != null) { + activity.finish(); + } + + } + + + public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = + new BaseSearchIndexProvider() { + @Override + public List getXmlResourcesToIndex(Context context, + boolean enabled) { + final ArrayList result = new ArrayList<>(); + + final SearchIndexableResource sir = new SearchIndexableResource(context); + sir.xmlResId = R.xml.system_updater_prefs; + result.add(sir); + return result; + } + }; + + +} + diff --git a/src/com/android/settings/core/gateway/SettingsGateway.java b/src/com/android/settings/core/gateway/SettingsGateway.java index 31ac7252f3c..15849223dcc 100644 --- a/src/com/android/settings/core/gateway/SettingsGateway.java +++ b/src/com/android/settings/core/gateway/SettingsGateway.java @@ -30,6 +30,7 @@ import com.android.settings.SecuritySettings; import com.android.settings.MicroGSettings; import com.android.settings.OpenKeychainSettings; import com.android.settings.Settings; +import com.android.settings.SystemUpdaterSettings; import com.android.settings.TestingSettings; import com.android.settings.TetherSettings; import com.android.settings.TrustedCredentialsSettings; @@ -256,7 +257,8 @@ public class SettingsGateway { BluetoothDeviceDetailsFragment.class.getName(), DataUsageList.class.getName(), MicroGSettings.class.getName(), - OpenKeychainSettings.class.getName() + OpenKeychainSettings.class.getName(), + SystemUpdaterSettings.class.getName() }; -- GitLab From f6225d0885f617e220c745b87a06eac31f2d1fc4 Mon Sep 17 00:00:00 2001 From: Romain Hunault Date: Tue, 27 Oct 2020 16:30:20 +0000 Subject: [PATCH 2/2] Do some cleaning --- res/xml/system_dashboard_fragment.xml | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/res/xml/system_dashboard_fragment.xml b/res/xml/system_dashboard_fragment.xml index 6e9b2b05fc8..b3625548145 100644 --- a/res/xml/system_dashboard_fragment.xml +++ b/res/xml/system_dashboard_fragment.xml @@ -25,28 +25,6 @@ android:order="-250" android:fragment="com.android.settings.gestures.GestureSettings" /> - - - - -