From aa008b02469b31c58d16c7e176be24b08c43db36 Mon Sep 17 00:00:00 2001 From: Mohit Mali Date: Wed, 30 Sep 2020 13:05:27 +0530 Subject: [PATCH 1/2] Move updater to top of settings main page --- AndroidManifest.xml | 15 ++++++ res/values/strings.xml | 2 +- res/xml/device_info_settings.xml | 4 +- res/xml/system_updater_prefs.xml | 7 +++ .../android/settings/SettingsActivity.java | 3 +- .../settings/SystemUpdaterSettings.java | 51 +++++++++++++++++++ src/com/android/settings/search/Ranking.java | 5 ++ .../search/SearchIndexableResources.java | 9 ++++ 8 files changed, 92 insertions(+), 4 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 064243fbbb1..5bb12fab3a2 100755 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -199,6 +199,21 @@ + + + + + + + + + + + SIM PIN operation failed! - Tablet status + Tablet status Phone status diff --git a/res/xml/device_info_settings.xml b/res/xml/device_info_settings.xml index 921dfc10d6d..fae210bb449 100644 --- a/res/xml/device_info_settings.xml +++ b/res/xml/device_info_settings.xml @@ -26,12 +26,12 @@ android:title="@string/mod_version" android:summary="@string/mod_version_default" /> - + + + + \ No newline at end of file diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java index 97b6f9f4797..fbb7e967171 100755 --- a/src/com/android/settings/SettingsActivity.java +++ b/src/com/android/settings/SettingsActivity.java @@ -374,7 +374,8 @@ public class SettingsActivity extends SettingsDrawerActivity ManageDomainUrls.class.getName(), AutomaticStorageManagerSettings.class.getName(), MicroGSettings.class.getName(), - OpenKeychainSettings.class.getName() + OpenKeychainSettings.class.getName(), + SystemUpdaterSettings.class.getName() }; diff --git a/src/com/android/settings/SystemUpdaterSettings.java b/src/com/android/settings/SystemUpdaterSettings.java new file mode 100644 index 00000000000..4f93861b142 --- /dev/null +++ b/src/com/android/settings/SystemUpdaterSettings.java @@ -0,0 +1,51 @@ +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/search/Ranking.java b/src/com/android/settings/search/Ranking.java index 99b36437567..82f2229d160 100644 --- a/src/com/android/settings/search/Ranking.java +++ b/src/com/android/settings/search/Ranking.java @@ -25,6 +25,7 @@ import com.android.settings.LegalSettings; import com.android.settings.PrivacySettings; import com.android.settings.ScreenPinningSettings; import com.android.settings.SecuritySettings; +import com.android.settings.SystemUpdaterSettings; import com.android.settings.WallpaperTypeSettings; import com.android.settings.WirelessSettings; import com.android.settings.accessibility.AccessibilitySettings; @@ -91,6 +92,7 @@ public final class Ranking { public static final int RANK_GESTURE = 24; public static final int RANK_MICROG = 25; public static final int RANK_OPENKEYCHAIN = 26; + public static final int RANK_UPDATER = 27; public static final int RANK_UNDEFINED = -1; public static final int RANK_OTHERS = 1024; @@ -195,6 +197,9 @@ public final class Ranking { // OpenKeychain sRankMap.put(OpenKeychainSettings.class.getName(), RANK_OPENKEYCHAIN); + // System Update + sRankMap.put(SystemUpdaterSettings.class.getName(), RANK_UPDATER); + sBaseRankMap.put("com.android.settings", 0); } diff --git a/src/com/android/settings/search/SearchIndexableResources.java b/src/com/android/settings/search/SearchIndexableResources.java index a2878a89439..7360e1efe54 100644 --- a/src/com/android/settings/search/SearchIndexableResources.java +++ b/src/com/android/settings/search/SearchIndexableResources.java @@ -26,6 +26,7 @@ import com.android.settings.PrivacySettings; import com.android.settings.R; import com.android.settings.ScreenPinningSettings; import com.android.settings.SecuritySettings; +import com.android.settings.SystemUpdaterSettings; import com.android.settings.WallpaperTypeSettings; import com.android.settings.WirelessSettings; import com.android.settings.accessibility.AccessibilitySettings; @@ -69,6 +70,14 @@ public final class SearchIndexableResources { new HashMap(); static { + + sResMap.put(SystemUpdaterSettings.class.getName(), + new SearchIndexableResource( + Ranking.getRankForClassName(SystemUpdaterSettings.class.getName()), + R.xml.system_updater_prefs, + SystemUpdaterSettings.class.getName(), + R.drawable.ic_system_update)); + sResMap.put(WifiSettings.class.getName(), new SearchIndexableResource( Ranking.getRankForClassName(WifiSettings.class.getName()), -- GitLab From 786117625df0eceb54ddf96abcd7a73853026d1f Mon Sep 17 00:00:00 2001 From: Romain Hunault Date: Tue, 27 Oct 2020 16:28:01 +0000 Subject: [PATCH 2/2] Do some cleaning --- res/values/strings.xml | 2 +- res/xml/device_info_settings.xml | 8 -------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/res/values/strings.xml b/res/values/strings.xml index d70e49ad87d..b6822516adb 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -2364,7 +2364,7 @@ SIM PIN operation failed! - Tablet status + Tablet status Phone status diff --git a/res/xml/device_info_settings.xml b/res/xml/device_info_settings.xml index fae210bb449..04597ddf829 100644 --- a/res/xml/device_info_settings.xml +++ b/res/xml/device_info_settings.xml @@ -26,14 +26,6 @@ android:title="@string/mod_version" android:summary="@string/mod_version_default" /> - - -