commit 1f30b1cd6771f6bad12408967b4e93fc72850441
author Raff Tsai <rafftsai@google.com> Thu Sep 12 10:56:13 2019 +0800
committer Raff Tsai <rafftsai@google.com> Thu Sep 12 11:09:09 2019 +0800
tree 1a4ecd99ad5dcda8e29be089e0e85f7bbbdf8f73
parent e84a8863d5d29c1c02073ba76121804c5667adc0

Merge similar BaseSearchIndexProvider code together

Bug: 135053028
Test: robolectric, check search_index.db contains the same items
Change-Id: If3c18a170b0e671690df1fdf26e59a421d2c48cd

src/com/android/settings/DisplaySettings.java

diff --git a/src/com/android/settings/DisplaySettings.java b/src/com/android/settings/DisplaySettings.java
index eb77d4a..d79d401 100644
--- a/src/com/android/settings/DisplaySettings.java
+++ b/src/com/android/settings/DisplaySettings.java
@@ -98,17 +98,7 @@
     }
 
     public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
-            new BaseSearchIndexProvider() {
-                @Override
-                public List<SearchIndexableResource> getXmlResourcesToIndex(Context context,
-                        boolean enabled) {
-                    final ArrayList<SearchIndexableResource> result = new ArrayList<>();
-
-                    final SearchIndexableResource sir = new SearchIndexableResource(context);
-                    sir.xmlResId = R.xml.display_settings;
-                    result.add(sir);
-                    return result;
-                }
+            new BaseSearchIndexProvider(R.xml.display_settings) {
 
                 @Override
                 public List<AbstractPreferenceController> createPreferenceControllers(