From a6c15cc98804a28d015a1a34ff5653222bb03313 Mon Sep 17 00:00:00 2001 From: Amit Kumar Date: Fri, 12 Feb 2021 01:11:19 +0530 Subject: [PATCH 1/3] Add system updater to top level settings Change-Id: I79fc27743bfadabf068303a9981de5d3e55a9c96 --- AndroidManifest.xml | 9 +++++---- res/xml/top_level_settings.xml | 12 ++++++++++++ 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 7bef65657ec..4eb186d32c2 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -181,13 +181,14 @@ - - + + + - + diff --git a/res/xml/top_level_settings.xml b/res/xml/top_level_settings.xml index 367f426f5fb..68ba4d01931 100644 --- a/res/xml/top_level_settings.xml +++ b/res/xml/top_level_settings.xml @@ -20,6 +20,18 @@ xmlns:settings="http://schemas.android.com/apk/res-auto" android:key="top_level_settings"> + + + + Date: Fri, 12 Feb 2021 01:29:26 +0530 Subject: [PATCH 2/3] Add @SearchIndexable annotion to SystemUpdaterSettings to make it searchable Change-Id: Icc4990113bb1b6ab2f136f970199ea266d866759 --- src/com/android/settings/SystemUpdaterSettings.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/com/android/settings/SystemUpdaterSettings.java b/src/com/android/settings/SystemUpdaterSettings.java index f2b025d257e..d1036deba92 100644 --- a/src/com/android/settings/SystemUpdaterSettings.java +++ b/src/com/android/settings/SystemUpdaterSettings.java @@ -11,10 +11,12 @@ import android.provider.SearchIndexableResource; import com.android.settings.R; import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.search.Indexable; +import com.android.settingslib.search.SearchIndexable; + import java.util.ArrayList; import java.util.List; - +@SearchIndexable public class SystemUpdaterSettings extends Fragment { @Override -- GitLab From d4912169c1d0d361cdd708bf63d6840485f765de Mon Sep 17 00:00:00 2001 From: Amit Kumar Date: Fri, 12 Feb 2021 01:30:50 +0530 Subject: [PATCH 3/3] Reformat code Change-Id: I61f475c09a41be8b0b48a249851ec330e40cc1af --- src/com/android/settings/SystemUpdaterSettings.java | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/com/android/settings/SystemUpdaterSettings.java b/src/com/android/settings/SystemUpdaterSettings.java index d1036deba92..6fe8416bc78 100644 --- a/src/com/android/settings/SystemUpdaterSettings.java +++ b/src/com/android/settings/SystemUpdaterSettings.java @@ -31,10 +31,8 @@ public class SystemUpdaterSettings extends Fragment { if (activity != null) { activity.finish(); } - } - public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = new BaseSearchIndexProvider() { @Override @@ -48,7 +46,4 @@ public class SystemUpdaterSettings extends Fragment { return result; } }; - - } - -- GitLab