diff options
| author | Raff Tsai <rafftsai@google.com> | 2019-09-12 10:56:13 +0800 |
|---|---|---|
| committer | Raff Tsai <rafftsai@google.com> | 2019-09-12 11:09:09 +0800 |
| commit | 1f30b1cd6771f6bad12408967b4e93fc72850441 (patch) | |
| tree | 1a4ecd99ad5dcda8e29be089e0e85f7bbbdf8f73 /src | |
| parent | e84a8863d5d29c1c02073ba76121804c5667adc0 (diff) | |
| download | packages_apps_Settings-1f30b1cd6771f6bad12408967b4e93fc72850441.tar.gz packages_apps_Settings-1f30b1cd6771f6bad12408967b4e93fc72850441.tar.bz2 packages_apps_Settings-1f30b1cd6771f6bad12408967b4e93fc72850441.zip | |
Merge similar BaseSearchIndexProvider code together
Bug: 135053028
Test: robolectric, check search_index.db contains the same items
Change-Id: If3c18a170b0e671690df1fdf26e59a421d2c48cd
Diffstat (limited to 'src')
74 files changed, 85 insertions, 732 deletions
diff --git a/src/com/android/settings/DisplaySettings.java b/src/com/android/settings/DisplaySettings.java index eb77d4a349..d79d401f9a 100644 --- a/src/com/android/settings/DisplaySettings.java +++ b/src/com/android/settings/DisplaySettings.java @@ -98,17 +98,7 @@ public class DisplaySettings extends DashboardFragment { } 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( diff --git a/src/com/android/settings/accessibility/AccessibilityControlTimeoutPreferenceFragment.java b/src/com/android/settings/accessibility/AccessibilityControlTimeoutPreferenceFragment.java index df950e8faa..de444f247a 100644 --- a/src/com/android/settings/accessibility/AccessibilityControlTimeoutPreferenceFragment.java +++ b/src/com/android/settings/accessibility/AccessibilityControlTimeoutPreferenceFragment.java @@ -105,20 +105,7 @@ public final class AccessibilityControlTimeoutPreferenceFragment extends Dashboa } public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = - new BaseSearchIndexProvider() { - @Override - public List<SearchIndexableResource> getXmlResourcesToIndex(Context context, - boolean enabled) { - final SearchIndexableResource sir = new SearchIndexableResource(context); - sir.xmlResId = R.xml.accessibility_control_timeout_settings; - return Arrays.asList(sir); - } - - @Override - public List<String> getNonIndexableKeys(Context context) { - final List<String> keys = super.getNonIndexableKeys(context); - return keys; - } + new BaseSearchIndexProvider(R.xml.accessibility_control_timeout_settings) { @Override public List<AbstractPreferenceController> createPreferenceControllers( diff --git a/src/com/android/settings/accessibility/AccessibilitySettings.java b/src/com/android/settings/accessibility/AccessibilitySettings.java index e4df675462..4f9d9656c8 100644 --- a/src/com/android/settings/accessibility/AccessibilitySettings.java +++ b/src/com/android/settings/accessibility/AccessibilitySettings.java @@ -507,16 +507,5 @@ public class AccessibilitySettings extends DashboardFragment { } public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = - new BaseSearchIndexProvider() { - - @Override - public List<SearchIndexableResource> getXmlResourcesToIndex(Context context, - boolean enabled) { - List<SearchIndexableResource> indexables = new ArrayList<>(); - SearchIndexableResource indexable = new SearchIndexableResource(context); - indexable.xmlResId = R.xml.accessibility_settings; - indexables.add(indexable); - return indexables; - } - }; + new BaseSearchIndexProvider(R.xml.accessibility_settings); } diff --git a/src/com/android/settings/accessibility/MagnificationPreferenceFragment.java b/src/com/android/settings/accessibility/MagnificationPreferenceFragment.java index b96d2b7672..87b3de74aa 100644 --- a/src/com/android/settings/accessibility/MagnificationPreferenceFragment.java +++ b/src/com/android/settings/accessibility/MagnificationPreferenceFragment.java @@ -168,14 +168,7 @@ public final class MagnificationPreferenceFragment extends DashboardFragment { } public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = - new BaseSearchIndexProvider() { - @Override - public List<SearchIndexableResource> getXmlResourcesToIndex(Context context, - boolean enabled) { - final SearchIndexableResource sir = new SearchIndexableResource(context); - sir.xmlResId = R.xml.accessibility_magnification_settings; - return Arrays.asList(sir); - } + new BaseSearchIndexProvider(R.xml.accessibility_magnification_settings) { @Override protected boolean isPageSearchEnabled(Context context) { diff --git a/src/com/android/settings/accessibility/ToggleAutoclickPreferenceFragment.java b/src/com/android/settings/accessibility/ToggleAutoclickPreferenceFragment.java index 49f752e299..13a0ed1ee1 100644 --- a/src/com/android/settings/accessibility/ToggleAutoclickPreferenceFragment.java +++ b/src/com/android/settings/accessibility/ToggleAutoclickPreferenceFragment.java @@ -188,16 +188,5 @@ public class ToggleAutoclickPreferenceFragment extends ToggleFeaturePreferenceFr } 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.accessibility_autoclick_settings; - result.add(sir); - return result; - } - }; + new BaseSearchIndexProvider(R.xml.accessibility_autoclick_settings); } diff --git a/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java b/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java index e307e9bfbe..ca52e291f2 100644 --- a/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java +++ b/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java @@ -128,17 +128,6 @@ public class ToggleDaltonizerPreferenceFragment extends ToggleFeaturePreferenceF } 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.accessibility_daltonizer_settings; - result.add(sir); - return result; - } - }; + new BaseSearchIndexProvider(R.xml.accessibility_daltonizer_settings); } diff --git a/src/com/android/settings/accessibility/VibrationSettings.java b/src/com/android/settings/accessibility/VibrationSettings.java index 9d31220120..88d07a2f1d 100644 --- a/src/com/android/settings/accessibility/VibrationSettings.java +++ b/src/com/android/settings/accessibility/VibrationSettings.java @@ -52,15 +52,5 @@ public class VibrationSettings extends DashboardFragment { } public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = - new BaseSearchIndexProvider() { - @Override - public List<SearchIndexableResource> getXmlResourcesToIndex(Context context, - boolean enabled) { - List<SearchIndexableResource> indexables = new ArrayList<>(); - SearchIndexableResource indexable = new SearchIndexableResource(context); - indexable.xmlResId = R.xml.accessibility_vibration_settings; - indexables.add(indexable); - return indexables; - } - }; + new BaseSearchIndexProvider(R.xml.accessibility_vibration_settings); } diff --git a/src/com/android/settings/applications/defaultapps/AutofillPicker.java b/src/com/android/settings/applications/defaultapps/AutofillPicker.java index fb9d6314ac..e443f4f110 100644 --- a/src/com/android/settings/applications/defaultapps/AutofillPicker.java +++ b/src/com/android/settings/applications/defaultapps/AutofillPicker.java @@ -55,15 +55,7 @@ public class AutofillPicker extends DashboardFragment { } public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = - new BaseSearchIndexProvider() { - @Override - public List<SearchIndexableResource> getXmlResourcesToIndex(Context context, - boolean enabled) { - SearchIndexableResource searchIndexableResource = - new SearchIndexableResource(context); - searchIndexableResource.xmlResId = R.xml.default_autofill_picker_settings; - return Arrays.asList(searchIndexableResource); - } + new BaseSearchIndexProvider(R.xml.default_autofill_picker_settings) { @Override public List<AbstractPreferenceController> getPreferenceControllers(Context diff --git a/src/com/android/settings/applications/managedomainurls/ManageDomainUrls.java b/src/com/android/settings/applications/managedomainurls/ManageDomainUrls.java index 010bc94c89..8b133c7b42 100644 --- a/src/com/android/settings/applications/managedomainurls/ManageDomainUrls.java +++ b/src/com/android/settings/applications/managedomainurls/ManageDomainUrls.java @@ -62,16 +62,5 @@ public class ManageDomainUrls extends DashboardFragment { } 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.manage_domain_url_settings; - result.add(sir); - return result; - } - }; + new BaseSearchIndexProvider(R.xml.manage_domain_url_settings); } diff --git a/src/com/android/settings/applications/specialaccess/SpecialAccessSettings.java b/src/com/android/settings/applications/specialaccess/SpecialAccessSettings.java index 4d9a42786a..6e8ed5a37c 100644 --- a/src/com/android/settings/applications/specialaccess/SpecialAccessSettings.java +++ b/src/com/android/settings/applications/specialaccess/SpecialAccessSettings.java @@ -50,16 +50,5 @@ public class SpecialAccessSettings extends DashboardFragment { } 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.special_access; - result.add(sir); - return result; - } - }; + new BaseSearchIndexProvider(R.xml.special_access); } diff --git a/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminSettings.java b/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminSettings.java index 66e3996247..1549ba2748 100644 --- a/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminSettings.java +++ b/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminSettings.java @@ -48,16 +48,5 @@ public class DeviceAdminSettings extends DashboardFragment { } 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.device_admin_settings; - result.add(sir); - return result; - } - }; + new BaseSearchIndexProvider(R.xml.device_admin_settings); } diff --git a/src/com/android/settings/applications/specialaccess/pictureinpicture/PictureInPictureSettings.java b/src/com/android/settings/applications/specialaccess/pictureinpicture/PictureInPictureSettings.java index fdbe1d8cd7..3671f05dcf 100644 --- a/src/com/android/settings/applications/specialaccess/pictureinpicture/PictureInPictureSettings.java +++ b/src/com/android/settings/applications/specialaccess/pictureinpicture/PictureInPictureSettings.java @@ -220,16 +220,5 @@ public class PictureInPictureSettings extends EmptyTextSettings { } 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.picture_in_picture_settings; - result.add(sir); - return result; - } - }; + new BaseSearchIndexProvider(R.xml.picture_in_picture_settings); } diff --git a/src/com/android/settings/applications/specialaccess/premiumsms/PremiumSmsAccess.java b/src/com/android/settings/applications/specialaccess/premiumsms/PremiumSmsAccess.java index a40ddc9485..00c60d5ee7 100644 --- a/src/com/android/settings/applications/specialaccess/premiumsms/PremiumSmsAccess.java +++ b/src/com/android/settings/applications/specialaccess/premiumsms/PremiumSmsAccess.java @@ -253,16 +253,5 @@ public class PremiumSmsAccess extends EmptyTextSettings } 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.premium_sms_settings; - result.add(sir); - return result; - } - }; + new BaseSearchIndexProvider(R.xml.premium_sms_settings); } diff --git a/src/com/android/settings/applications/specialaccess/vrlistener/VrListenerSettings.java b/src/com/android/settings/applications/specialaccess/vrlistener/VrListenerSettings.java index fec57c25ac..38240fcbe8 100644 --- a/src/com/android/settings/applications/specialaccess/vrlistener/VrListenerSettings.java +++ b/src/com/android/settings/applications/specialaccess/vrlistener/VrListenerSettings.java @@ -85,17 +85,6 @@ public class VrListenerSettings extends ManagedServiceSettings { } public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = - new BaseSearchIndexProvider() { - @Override - public List<SearchIndexableResource> getXmlResourcesToIndex(Context context, - boolean enabled) { - final List<SearchIndexableResource> result = new ArrayList<>(); - - final SearchIndexableResource sir = new SearchIndexableResource(context); - sir.xmlResId = R.xml.vr_listeners_settings; - result.add(sir); - return result; - } - }; + new BaseSearchIndexProvider(R.xml.vr_listeners_settings); } diff --git a/src/com/android/settings/backup/BackupSettingsFragment.java b/src/com/android/settings/backup/BackupSettingsFragment.java index f08c8e7516..58bfef094b 100644 --- a/src/com/android/settings/backup/BackupSettingsFragment.java +++ b/src/com/android/settings/backup/BackupSettingsFragment.java @@ -71,8 +71,7 @@ public class BackupSettingsFragment extends DashboardFragment { // The intention is to index {@link UserBackupSettingsActivity} instead of the fragments, // therefore leaving this index provider empty. public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = - new BaseSearchIndexProvider() { - }; + new BaseSearchIndexProvider(); @Override public int getMetricsCategory() { diff --git a/src/com/android/settings/backup/PrivacySettings.java b/src/com/android/settings/backup/PrivacySettings.java index e6d2bd443c..c07fdeeabe 100644 --- a/src/com/android/settings/backup/PrivacySettings.java +++ b/src/com/android/settings/backup/PrivacySettings.java @@ -72,14 +72,7 @@ public class PrivacySettings extends DashboardFragment { } public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = - new BaseSearchIndexProvider() { - @Override - public List<SearchIndexableResource> getXmlResourcesToIndex(Context context, - boolean enabled) { - final SearchIndexableResource sir = new SearchIndexableResource(context); - sir.xmlResId = R.xml.privacy_settings; - return Arrays.asList(sir); - } + new BaseSearchIndexProvider(R.xml.privacy_settings) { @Override protected boolean isPageSearchEnabled(Context context) { diff --git a/src/com/android/settings/biometrics/face/FaceSettings.java b/src/com/android/settings/biometrics/face/FaceSettings.java index 87718025f0..c55a2525db 100644 --- a/src/com/android/settings/biometrics/face/FaceSettings.java +++ b/src/com/android/settings/biometrics/face/FaceSettings.java @@ -271,14 +271,7 @@ public class FaceSettings extends DashboardFragment { } public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = - new BaseSearchIndexProvider() { - @Override - public List<SearchIndexableResource> getXmlResourcesToIndex( - Context context, boolean enabled) { - final SearchIndexableResource sir = new SearchIndexableResource(context); - sir.xmlResId = R.xml.security_settings_face; - return Arrays.asList(sir); - } + new BaseSearchIndexProvider(R.xml.security_settings_face) { @Override public List<AbstractPreferenceController> createPreferenceControllers( diff --git a/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java b/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java index 7df260322e..4cadae95f4 100644 --- a/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java +++ b/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java @@ -80,13 +80,5 @@ public class ConnectedDeviceDashboardFragment extends DashboardFragment { * For Search. */ public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = - new BaseSearchIndexProvider() { - @Override - public List<SearchIndexableResource> getXmlResourcesToIndex( - Context context, boolean enabled) { - final SearchIndexableResource sir = new SearchIndexableResource(context); - sir.xmlResId = R.xml.connected_devices; - return Arrays.asList(sir); - } - }; + new BaseSearchIndexProvider(R.xml.connected_devices); } diff --git a/src/com/android/settings/connecteddevice/usb/UsbDetailsFragment.java b/src/com/android/settings/connecteddevice/usb/UsbDetailsFragment.java index 6d8de6d5a2..bf760f00c7 100644 --- a/src/com/android/settings/connecteddevice/usb/UsbDetailsFragment.java +++ b/src/com/android/settings/connecteddevice/usb/UsbDetailsFragment.java @@ -94,14 +94,7 @@ public class UsbDetailsFragment extends DashboardFragment { * For Search. */ public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = - new BaseSearchIndexProvider() { - @Override - public List<SearchIndexableResource> getXmlResourcesToIndex( - Context context, boolean enabled) { - SearchIndexableResource res = new SearchIndexableResource(context); - res.xmlResId = R.xml.usb_details_fragment; - return Lists.newArrayList(res); - } + new BaseSearchIndexProvider(R.xml.usb_details_fragment) { @Override public List<AbstractPreferenceController> createPreferenceControllers( diff --git a/src/com/android/settings/datausage/BillingCycleSettings.java b/src/com/android/settings/datausage/BillingCycleSettings.java index 9c46d39a81..ab2c8a3f8c 100644 --- a/src/com/android/settings/datausage/BillingCycleSettings.java +++ b/src/com/android/settings/datausage/BillingCycleSettings.java @@ -473,17 +473,7 @@ public class BillingCycleSettings extends DataUsageBaseFragment implements } 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.billing_cycle; - result.add(sir); - return result; - } + new BaseSearchIndexProvider(R.xml.billing_cycle) { @Override protected boolean isPageSearchEnabled(Context context) { diff --git a/src/com/android/settings/datausage/DataSaverSummary.java b/src/com/android/settings/datausage/DataSaverSummary.java index a2106d9e89..b3a63d7eff 100644 --- a/src/com/android/settings/datausage/DataSaverSummary.java +++ b/src/com/android/settings/datausage/DataSaverSummary.java @@ -198,17 +198,7 @@ public class DataSaverSummary extends SettingsPreferenceFragment } 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.data_saver; - result.add(sir); - return result; - } + new BaseSearchIndexProvider(R.xml.data_saver) { @Override protected boolean isPageSearchEnabled(Context context) { diff --git a/src/com/android/settings/datausage/UnrestrictedDataAccess.java b/src/com/android/settings/datausage/UnrestrictedDataAccess.java index d40537f52d..cbc148c495 100644 --- a/src/com/android/settings/datausage/UnrestrictedDataAccess.java +++ b/src/com/android/settings/datausage/UnrestrictedDataAccess.java @@ -118,16 +118,5 @@ public class UnrestrictedDataAccess extends DashboardFragment { } 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.unrestricted_data_access_settings; - result.add(sir); - return result; - } - }; + new BaseSearchIndexProvider(R.xml.unrestricted_data_access_settings); } diff --git a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java index 9bd8516e99..0e7873c931 100644 --- a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java +++ b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java @@ -522,7 +522,7 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra * For Search. */ public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = - new BaseSearchIndexProvider() { + new BaseSearchIndexProvider(R.xml.development_settings) { @Override protected boolean isPageSearchEnabled(Context context) { @@ -530,15 +530,6 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra } @Override - public List<SearchIndexableResource> getXmlResourcesToIndex( - Context context, boolean enabled) { - - final SearchIndexableResource sir = new SearchIndexableResource(context); - sir.xmlResId = R.xml.development_settings; - return Arrays.asList(sir); - } - - @Override public List<AbstractPreferenceController> createPreferenceControllers(Context context) { return buildPreferenceControllers(context, null /* activity */, diff --git a/src/com/android/settings/development/gamedriver/GameDriverDashboard.java b/src/com/android/settings/development/gamedriver/GameDriverDashboard.java index db456bd930..e1f7908e32 100644 --- a/src/com/android/settings/development/gamedriver/GameDriverDashboard.java +++ b/src/com/android/settings/development/gamedriver/GameDriverDashboard.java @@ -76,16 +76,7 @@ public class GameDriverDashboard extends DashboardFragment { } public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = - new BaseSearchIndexProvider() { - @Override - public List<SearchIndexableResource> getXmlResourcesToIndex( - Context context, boolean enabled) { - final List<SearchIndexableResource> result = new ArrayList<>(); - final SearchIndexableResource sir = new SearchIndexableResource(context); - sir.xmlResId = R.xml.game_driver_settings; - result.add(sir); - return result; - } + new BaseSearchIndexProvider(R.xml.game_driver_settings) { @Override protected boolean isPageSearchEnabled(Context context) { diff --git a/src/com/android/settings/development/qstile/DevelopmentTileConfigFragment.java b/src/com/android/settings/development/qstile/DevelopmentTileConfigFragment.java index c6f0ecd3ae..82d01ac905 100644 --- a/src/com/android/settings/development/qstile/DevelopmentTileConfigFragment.java +++ b/src/com/android/settings/development/qstile/DevelopmentTileConfigFragment.java @@ -50,17 +50,7 @@ public class DevelopmentTileConfigFragment extends DashboardFragment { } public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = - new BaseSearchIndexProvider() { - @Override - public List<SearchIndexableResource> getXmlResourcesToIndex(Context context, - boolean enabled) { - final List<SearchIndexableResource> result = new ArrayList<>(); - - final SearchIndexableResource sir = new SearchIndexableResource(context); - sir.xmlResId = R.xml.development_tile_settings; - result.add(sir); - return result; - } + new BaseSearchIndexProvider(R.xml.development_tile_settings) { @Override protected boolean isPageSearchEnabled(Context context) { diff --git a/src/com/android/settings/deviceinfo/aboutphone/MyDeviceInfoFragment.java b/src/com/android/settings/deviceinfo/aboutphone/MyDeviceInfoFragment.java index e6afb7b821..8cbe05f0fa 100644 --- a/src/com/android/settings/deviceinfo/aboutphone/MyDeviceInfoFragment.java +++ b/src/com/android/settings/deviceinfo/aboutphone/MyDeviceInfoFragment.java @@ -174,15 +174,7 @@ public class MyDeviceInfoFragment extends DashboardFragment * For Search. */ public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = - new BaseSearchIndexProvider() { - - @Override - public List<SearchIndexableResource> getXmlResourcesToIndex( - Context context, boolean enabled) { - final SearchIndexableResource sir = new SearchIndexableResource(context); - sir.xmlResId = R.xml.my_device_info; - return Arrays.asList(sir); - } + new BaseSearchIndexProvider(R.xml.my_device_info) { @Override public List<AbstractPreferenceController> createPreferenceControllers( diff --git a/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionSettings.java b/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionSettings.java index 90c3b56876..0971ba8a10 100644 --- a/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionSettings.java +++ b/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionSettings.java @@ -48,17 +48,5 @@ public class FirmwareVersionSettings extends DashboardFragment { } 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.firmware_version; - result.add(sir); - return result; - } - - }; + new BaseSearchIndexProvider(R.xml.firmware_version); } diff --git a/src/com/android/settings/deviceinfo/hardwareinfo/HardwareInfoFragment.java b/src/com/android/settings/deviceinfo/hardwareinfo/HardwareInfoFragment.java index 40e73efe88..aadb0d55e3 100644 --- a/src/com/android/settings/deviceinfo/hardwareinfo/HardwareInfoFragment.java +++ b/src/com/android/settings/deviceinfo/hardwareinfo/HardwareInfoFragment.java @@ -51,17 +51,7 @@ public class HardwareInfoFragment extends DashboardFragment { } 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.hardware_info; - result.add(sir); - return result; - } + new BaseSearchIndexProvider(R.xml.hardware_info) { @Override protected boolean isPageSearchEnabled(Context context) { diff --git a/src/com/android/settings/display/AdaptiveSleepSettings.java b/src/com/android/settings/display/AdaptiveSleepSettings.java index 09e558b9f1..ff955c7826 100644 --- a/src/com/android/settings/display/AdaptiveSleepSettings.java +++ b/src/com/android/settings/display/AdaptiveSleepSettings.java @@ -78,13 +78,5 @@ public class AdaptiveSleepSettings extends DashboardFragment { } public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = - new BaseSearchIndexProvider() { - @Override - public List<SearchIndexableResource> getXmlResourcesToIndex( - Context context, boolean enabled) { - final SearchIndexableResource sir = new SearchIndexableResource(context); - sir.xmlResId = R.xml.adaptive_sleep_detail; - return Arrays.asList(sir); - } - }; + new BaseSearchIndexProvider(R.xml.adaptive_sleep_detail); } diff --git a/src/com/android/settings/display/NightDisplaySettings.java b/src/com/android/settings/display/NightDisplaySettings.java index 9f32de21da..490e4fa2c3 100644 --- a/src/com/android/settings/display/NightDisplaySettings.java +++ b/src/com/android/settings/display/NightDisplaySettings.java @@ -176,16 +176,7 @@ public class NightDisplaySettings extends DashboardFragment } 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.night_display_settings; - result.add(sir); - return result; - } + new BaseSearchIndexProvider(R.xml.night_display_settings) { @Override protected boolean isPageSearchEnabled(Context context) { diff --git a/src/com/android/settings/dream/DreamSettings.java b/src/com/android/settings/dream/DreamSettings.java index c36970e9bc..5b1a8436c9 100644 --- a/src/com/android/settings/dream/DreamSettings.java +++ b/src/com/android/settings/dream/DreamSettings.java @@ -138,14 +138,7 @@ public class DreamSettings extends DashboardFragment { } public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER - = new BaseSearchIndexProvider() { - @Override - public List<SearchIndexableResource> getXmlResourcesToIndex( - Context context, boolean enabled) { - final SearchIndexableResource sir = new SearchIndexableResource(context); - sir.xmlResId = R.xml.dream_fragment_overview; - return Arrays.asList(sir); - } + = new BaseSearchIndexProvider(R.xml.dream_fragment_overview) { @Override public List<AbstractPreferenceController> createPreferenceControllers(Context context) { diff --git a/src/com/android/settings/enterprise/EnterprisePrivacySettings.java b/src/com/android/settings/enterprise/EnterprisePrivacySettings.java index c5beb86191..1490feb9bc 100644 --- a/src/com/android/settings/enterprise/EnterprisePrivacySettings.java +++ b/src/com/android/settings/enterprise/EnterprisePrivacySettings.java @@ -99,19 +99,12 @@ public class EnterprisePrivacySettings extends DashboardFragment { } public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = - new BaseSearchIndexProvider() { + new BaseSearchIndexProvider(R.xml.enterprise_privacy_settings) { @Override protected boolean isPageSearchEnabled(Context context) { return isPageEnabled(context); } - @Override - public List<SearchIndexableResource> getXmlResourcesToIndex( - Context context, boolean enabled) { - final SearchIndexableResource sir = new SearchIndexableResource(context); - sir.xmlResId = R.xml.enterprise_privacy_settings; - return Arrays.asList(sir); - } @Override public List<AbstractPreferenceController> createPreferenceControllers( diff --git a/src/com/android/settings/fuelgauge/PowerUsageSummary.java b/src/com/android/settings/fuelgauge/PowerUsageSummary.java index 4b127ac9b0..42ea52bd11 100644 --- a/src/com/android/settings/fuelgauge/PowerUsageSummary.java +++ b/src/com/android/settings/fuelgauge/PowerUsageSummary.java @@ -396,13 +396,5 @@ public class PowerUsageSummary extends PowerUsageBase implements OnLongClickList public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = - new BaseSearchIndexProvider() { - @Override - public List<SearchIndexableResource> getXmlResourcesToIndex( - Context context, boolean enabled) { - final SearchIndexableResource sir = new SearchIndexableResource(context); - sir.xmlResId = R.xml.power_usage_summary; - return Collections.singletonList(sir); - } - }; + new BaseSearchIndexProvider(R.xml.power_usage_summary); } diff --git a/src/com/android/settings/gestures/DoubleTapPowerSettings.java b/src/com/android/settings/gestures/DoubleTapPowerSettings.java index acabdbc679..628a213147 100644 --- a/src/com/android/settings/gestures/DoubleTapPowerSettings.java +++ b/src/com/android/settings/gestures/DoubleTapPowerSettings.java @@ -64,13 +64,5 @@ public class DoubleTapPowerSettings extends DashboardFragment { } public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = - new BaseSearchIndexProvider() { - @Override - public List<SearchIndexableResource> getXmlResourcesToIndex( - Context context, boolean enabled) { - final SearchIndexableResource sir = new SearchIndexableResource(context); - sir.xmlResId = R.xml.double_tap_power_settings; - return Arrays.asList(sir); - } - }; + new BaseSearchIndexProvider(R.xml.double_tap_power_settings); } diff --git a/src/com/android/settings/gestures/DoubleTapScreenSettings.java b/src/com/android/settings/gestures/DoubleTapScreenSettings.java index 300ce487a3..9a21fed1e0 100644 --- a/src/com/android/settings/gestures/DoubleTapScreenSettings.java +++ b/src/com/android/settings/gestures/DoubleTapScreenSettings.java @@ -49,7 +49,7 @@ public class DoubleTapScreenSettings extends DashboardFragment { prefs.edit().putBoolean(PREF_KEY_SUGGESTION_COMPLETE, true).apply(); use(DoubleTapScreenPreferenceController.class) - .setConfig(new AmbientDisplayConfiguration(context)); + .setConfig(new AmbientDisplayConfiguration(context)); } @Override @@ -73,13 +73,5 @@ public class DoubleTapScreenSettings extends DashboardFragment { } public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = - new BaseSearchIndexProvider() { - @Override - public List<SearchIndexableResource> getXmlResourcesToIndex( - Context context, boolean enabled) { - final SearchIndexableResource sir = new SearchIndexableResource(context); - sir.xmlResId = R.xml.double_tap_screen_settings; - return Arrays.asList(sir); - } - }; + new BaseSearchIndexProvider(R.xml.double_tap_screen_settings); } diff --git a/src/com/android/settings/gestures/GlobalActionsPanelSettings.java b/src/com/android/settings/gestures/GlobalActionsPanelSettings.java index fe9a9e80cb..fee793f4fd 100644 --- a/src/com/android/settings/gestures/GlobalActionsPanelSettings.java +++ b/src/com/android/settings/gestures/GlobalActionsPanelSettings.java @@ -49,13 +49,5 @@ public class GlobalActionsPanelSettings extends DashboardFragment { } public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = - new BaseSearchIndexProvider() { - @Override - public List<SearchIndexableResource> getXmlResourcesToIndex( - Context context, boolean enabled) { - final SearchIndexableResource sir = new SearchIndexableResource(context); - sir.xmlResId = R.xml.global_actions_panel_settings; - return Arrays.asList(sir); - } - }; + new BaseSearchIndexProvider(R.xml.global_actions_panel_settings); } diff --git a/src/com/android/settings/gestures/PickupGestureSettings.java b/src/com/android/settings/gestures/PickupGestureSettings.java index f1cc3f05ed..caf0d7dae9 100644 --- a/src/com/android/settings/gestures/PickupGestureSettings.java +++ b/src/com/android/settings/gestures/PickupGestureSettings.java @@ -73,14 +73,6 @@ public class PickupGestureSettings extends DashboardFragment { } public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = - new BaseSearchIndexProvider() { - @Override - public List<SearchIndexableResource> getXmlResourcesToIndex( - Context context, boolean enabled) { - final SearchIndexableResource sir = new SearchIndexableResource(context); - sir.xmlResId = R.xml.pick_up_gesture_settings; - return Arrays.asList(sir); - } - }; + new BaseSearchIndexProvider(R.xml.pick_up_gesture_settings); } diff --git a/src/com/android/settings/gestures/PreventRingingGestureSettings.java b/src/com/android/settings/gestures/PreventRingingGestureSettings.java index 47cd3ea6ed..9740a3fe67 100644 --- a/src/com/android/settings/gestures/PreventRingingGestureSettings.java +++ b/src/com/android/settings/gestures/PreventRingingGestureSettings.java @@ -75,14 +75,7 @@ public class PreventRingingGestureSettings extends DashboardFragment { } public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = - new BaseSearchIndexProvider() { - @Override - public List<SearchIndexableResource> getXmlResourcesToIndex( - Context context, boolean enabled) { - final SearchIndexableResource sir = new SearchIndexableResource(context); - sir.xmlResId = R.xml.prevent_ringing_gesture_settings; - return Arrays.asList(sir); - } + new BaseSearchIndexProvider(R.xml.prevent_ringing_gesture_settings) { @Override public List<AbstractPreferenceController> createPreferenceControllers( diff --git a/src/com/android/settings/gestures/SwipeToNotificationSettings.java b/src/com/android/settings/gestures/SwipeToNotificationSettings.java index 230cdda27c..90ac4e6ce9 100644 --- a/src/com/android/settings/gestures/SwipeToNotificationSettings.java +++ b/src/com/android/settings/gestures/SwipeToNotificationSettings.java @@ -64,14 +64,7 @@ public class SwipeToNotificationSettings extends DashboardFragment { } public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = - new BaseSearchIndexProvider() { - @Override - public List<SearchIndexableResource> getXmlResourcesToIndex( - Context context, boolean enabled) { - final SearchIndexableResource sir = new SearchIndexableResource(context); - sir.xmlResId = R.xml.swipe_to_notification_settings; - return Arrays.asList(sir); - } + new BaseSearchIndexProvider(R.xml.swipe_to_notification_settings) { @Override protected boolean isPageSearchEnabled(Context context) { diff --git a/src/com/android/settings/gestures/SystemNavigationGestureSettings.java b/src/com/android/settings/gestures/SystemNavigationGestureSettings.java index 5e6d96c6fc..54064adbb6 100644 --- a/src/com/android/settings/gestures/SystemNavigationGestureSettings.java +++ b/src/com/android/settings/gestures/SystemNavigationGestureSettings.java @@ -359,14 +359,7 @@ public class SystemNavigationGestureSettings extends RadioButtonPickerFragment { } public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = - new BaseSearchIndexProvider() { - @Override - public List<SearchIndexableResource> getXmlResourcesToIndex( - Context context, boolean enabled) { - final SearchIndexableResource sir = new SearchIndexableResource(context); - sir.xmlResId = R.xml.system_navigation_gesture_settings; - return Arrays.asList(sir); - } + new BaseSearchIndexProvider(R.xml.system_navigation_gesture_settings) { @Override protected boolean isPageSearchEnabled(Context context) { diff --git a/src/com/android/settings/gestures/TapScreenGestureSettings.java b/src/com/android/settings/gestures/TapScreenGestureSettings.java index a86e6820af..bd09d55230 100644 --- a/src/com/android/settings/gestures/TapScreenGestureSettings.java +++ b/src/com/android/settings/gestures/TapScreenGestureSettings.java @@ -68,13 +68,5 @@ public class TapScreenGestureSettings extends DashboardFragment { } public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = - new BaseSearchIndexProvider() { - @Override - public List<SearchIndexableResource> getXmlResourcesToIndex( - Context context, boolean enabled) { - final SearchIndexableResource sir = new SearchIndexableResource(context); - sir.xmlResId = R.xml.tap_screen_gesture_settings; - return Arrays.asList(sir); - } - }; + new BaseSearchIndexProvider(R.xml.tap_screen_gesture_settings); } diff --git a/src/com/android/settings/homepage/TopLevelSettings.java b/src/com/android/settings/homepage/TopLevelSettings.java index f5dee0c256..ce53e52d17 100644 --- a/src/com/android/settings/homepage/TopLevelSettings.java +++ b/src/com/android/settings/homepage/TopLevelSettings.java @@ -104,14 +104,7 @@ public class TopLevelSettings extends DashboardFragment implements } public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = - new BaseSearchIndexProvider() { - @Override - public List<SearchIndexableResource> getXmlResourcesToIndex( - Context context, boolean enabled) { - final SearchIndexableResource sir = new SearchIndexableResource(context); - sir.xmlResId = R.xml.top_level_settings; - return Arrays.asList(sir); - } + new BaseSearchIndexProvider(R.xml.top_level_settings) { @Override protected boolean isPageSearchEnabled(Context context) { diff --git a/src/com/android/settings/language/LanguageAndInputSettings.java b/src/com/android/settings/language/LanguageAndInputSettings.java index 3a8aeac4b9..771d718ee1 100644 --- a/src/com/android/settings/language/LanguageAndInputSettings.java +++ b/src/com/android/settings/language/LanguageAndInputSettings.java @@ -162,14 +162,7 @@ public class LanguageAndInputSettings extends DashboardFragment { = (activity, summaryLoader) -> new SummaryProvider(activity, summaryLoader); public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = - new BaseSearchIndexProvider() { - @Override - public List<SearchIndexableResource> getXmlResourcesToIndex( - Context context, boolean enabled) { - final SearchIndexableResource sir = new SearchIndexableResource(context); - sir.xmlResId = R.xml.language_and_input; - return Arrays.asList(sir); - } + new BaseSearchIndexProvider(R.xml.language_and_input) { @Override public List<AbstractPreferenceController> createPreferenceControllers( diff --git a/src/com/android/settings/location/LocationSettings.java b/src/com/android/settings/location/LocationSettings.java index 21b031b75b..d36eaaddf4 100644 --- a/src/com/android/settings/location/LocationSettings.java +++ b/src/com/android/settings/location/LocationSettings.java @@ -129,14 +129,7 @@ public class LocationSettings extends DashboardFragment { * For Search. */ public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = - new BaseSearchIndexProvider() { - @Override - public List<SearchIndexableResource> getXmlResourcesToIndex( - Context context, boolean enabled) { - final SearchIndexableResource sir = new SearchIndexableResource(context); - sir.xmlResId = R.xml.location_settings; - return Arrays.asList(sir); - } + new BaseSearchIndexProvider(R.xml.location_settings) { @Override public List<AbstractPreferenceController> createPreferenceControllers(Context diff --git a/src/com/android/settings/location/RecentLocationRequestSeeAllFragment.java b/src/com/android/settings/location/RecentLocationRequestSeeAllFragment.java index 9e4a77fdb2..b704cb4de2 100644 --- a/src/com/android/settings/location/RecentLocationRequestSeeAllFragment.java +++ b/src/com/android/settings/location/RecentLocationRequestSeeAllFragment.java @@ -106,14 +106,7 @@ public class RecentLocationRequestSeeAllFragment extends DashboardFragment { * For Search. */ public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = - new BaseSearchIndexProvider() { - @Override - public List<SearchIndexableResource> getXmlResourcesToIndex( - Context context, boolean enabled) { - final SearchIndexableResource sir = new SearchIndexableResource(context); - sir.xmlResId = R.xml.location_recent_requests_see_all; - return Arrays.asList(sir); - } + new BaseSearchIndexProvider(R.xml.location_recent_requests_see_all) { @Override public List<AbstractPreferenceController> getPreferenceControllers(Context diff --git a/src/com/android/settings/location/ScanningSettings.java b/src/com/android/settings/location/ScanningSettings.java index 31ec9553d3..c031f4d85b 100644 --- a/src/com/android/settings/location/ScanningSettings.java +++ b/src/com/android/settings/location/ScanningSettings.java @@ -69,14 +69,7 @@ public class ScanningSettings extends DashboardFragment { * For Search. */ public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = - new BaseSearchIndexProvider() { - @Override - public List<SearchIndexableResource> getXmlResourcesToIndex( - Context context, boolean enabled) { - final SearchIndexableResource sir = new SearchIndexableResource(context); - sir.xmlResId = R.xml.location_scanning; - return Arrays.asList(sir); - } + new BaseSearchIndexProvider(R.xml.location_scanning) { @Override public List<AbstractPreferenceController> createPreferenceControllers(Context diff --git a/src/com/android/settings/network/MobileNetworkListFragment.java b/src/com/android/settings/network/MobileNetworkListFragment.java index 4690a28815..5afa9947b7 100644 --- a/src/com/android/settings/network/MobileNetworkListFragment.java +++ b/src/com/android/settings/network/MobileNetworkListFragment.java @@ -57,16 +57,7 @@ public class MobileNetworkListFragment extends DashboardFragment { } public static final 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.mobile_network_list; - result.add(sir); - return result; - } + new BaseSearchIndexProvider(R.xml.mobile_network_list) { @Override protected boolean isPageSearchEnabled(Context context) { diff --git a/src/com/android/settings/nfc/PaymentSettings.java b/src/com/android/settings/nfc/PaymentSettings.java index 5742d1a4fa..7a915ae5ed 100644 --- a/src/com/android/settings/nfc/PaymentSettings.java +++ b/src/com/android/settings/nfc/PaymentSettings.java @@ -103,14 +103,7 @@ public class PaymentSettings extends DashboardFragment { } public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = - new BaseSearchIndexProvider() { - @Override - public List<SearchIndexableResource> getXmlResourcesToIndex(Context context, - boolean enabled) { - final SearchIndexableResource sir = new SearchIndexableResource(context); - sir.xmlResId = R.xml.nfc_payment_settings; - return Arrays.asList(sir); - } + new BaseSearchIndexProvider(R.xml.nfc_payment_settings) { @Override protected boolean isPageSearchEnabled(Context context) { diff --git a/src/com/android/settings/notification/ConfigureNotificationSettings.java b/src/com/android/settings/notification/ConfigureNotificationSettings.java index d21be1607b..7174b9d4b6 100644 --- a/src/com/android/settings/notification/ConfigureNotificationSettings.java +++ b/src/com/android/settings/notification/ConfigureNotificationSettings.java @@ -218,14 +218,7 @@ public class ConfigureNotificationSettings extends DashboardFragment implements * For Search. */ public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = - new BaseSearchIndexProvider() { - @Override - public List<SearchIndexableResource> getXmlResourcesToIndex( - Context context, boolean enabled) { - final SearchIndexableResource sir = new SearchIndexableResource(context); - sir.xmlResId = R.xml.configure_notification_settings; - return Arrays.asList(sir); - } + new BaseSearchIndexProvider(R.xml.configure_notification_settings) { @Override public List<AbstractPreferenceController> createPreferenceControllers( diff --git a/src/com/android/settings/notification/NotificationAccessSettings.java b/src/com/android/settings/notification/NotificationAccessSettings.java index 81edc5b65d..a8533fa081 100644 --- a/src/com/android/settings/notification/NotificationAccessSettings.java +++ b/src/com/android/settings/notification/NotificationAccessSettings.java @@ -191,16 +191,5 @@ public class NotificationAccessSettings extends ManagedServiceSettings { } public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = - new BaseSearchIndexProvider() { - @Override - public List<SearchIndexableResource> getXmlResourcesToIndex(Context context, - boolean enabled) { - final List<SearchIndexableResource> result = new ArrayList<>(); - - final SearchIndexableResource sir = new SearchIndexableResource(context); - sir.xmlResId = R.xml.notification_access_settings; - result.add(sir); - return result; - } - }; + new BaseSearchIndexProvider(R.xml.notification_access_settings); } diff --git a/src/com/android/settings/notification/NotificationAssistantPicker.java b/src/com/android/settings/notification/NotificationAssistantPicker.java index 868e0a9812..41fc7c189f 100644 --- a/src/com/android/settings/notification/NotificationAssistantPicker.java +++ b/src/com/android/settings/notification/NotificationAssistantPicker.java @@ -129,18 +129,7 @@ public class NotificationAssistantPicker extends DefaultAppPickerFragment implem } public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = - new BaseSearchIndexProvider() { - @Override - public List<SearchIndexableResource> getXmlResourcesToIndex(Context context, - boolean enabled) { - final List<SearchIndexableResource> result = new ArrayList<>(); - - final SearchIndexableResource sir = new SearchIndexableResource(context); - sir.xmlResId = R.xml.notification_assistant_settings; - result.add(sir); - return result; - } - }; + new BaseSearchIndexProvider(R.xml.notification_assistant_settings); public static class CandidateNone extends CandidateInfo { diff --git a/src/com/android/settings/notification/SoundSettings.java b/src/com/android/settings/notification/SoundSettings.java index eec0fb8018..6e337115dd 100644 --- a/src/com/android/settings/notification/SoundSettings.java +++ b/src/com/android/settings/notification/SoundSettings.java @@ -286,14 +286,7 @@ public class SoundSettings extends DashboardFragment implements OnActivityResult // === Indexing === public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = - new BaseSearchIndexProvider() { - - public List<SearchIndexableResource> getXmlResourcesToIndex( - Context context, boolean enabled) { - final SearchIndexableResource sir = new SearchIndexableResource(context); - sir.xmlResId = R.xml.sound_settings; - return Arrays.asList(sir); - } + new BaseSearchIndexProvider(R.xml.sound_settings) { @Override public List<AbstractPreferenceController> createPreferenceControllers( diff --git a/src/com/android/settings/notification/ZenAccessSettings.java b/src/com/android/settings/notification/ZenAccessSettings.java index fca8255224..947bf1f79c 100644 --- a/src/com/android/settings/notification/ZenAccessSettings.java +++ b/src/com/android/settings/notification/ZenAccessSettings.java @@ -160,16 +160,5 @@ public class ZenAccessSettings extends EmptyTextSettings implements } 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.zen_access_settings; - result.add(sir); - return result; - } - }; + new BaseSearchIndexProvider(R.xml.zen_access_settings); } diff --git a/src/com/android/settings/notification/ZenModeAutomationSettings.java b/src/com/android/settings/notification/ZenModeAutomationSettings.java index 0f879071de..5498c3a2c2 100644 --- a/src/com/android/settings/notification/ZenModeAutomationSettings.java +++ b/src/com/android/settings/notification/ZenModeAutomationSettings.java @@ -149,18 +149,7 @@ public class ZenModeAutomationSettings extends ZenModeSettingsBase { * For Search. */ 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.zen_mode_automation_settings; - result.add(sir); - return result; - } + new BaseSearchIndexProvider(R.xml.zen_mode_automation_settings) { @Override public List<String> getNonIndexableKeys(Context context) { diff --git a/src/com/android/settings/notification/ZenModeBlockedEffectsSettings.java b/src/com/android/settings/notification/ZenModeBlockedEffectsSettings.java index 9cb3f59977..d361de8a4e 100644 --- a/src/com/android/settings/notification/ZenModeBlockedEffectsSettings.java +++ b/src/com/android/settings/notification/ZenModeBlockedEffectsSettings.java @@ -94,17 +94,7 @@ public class ZenModeBlockedEffectsSettings extends ZenModeSettingsBase implement * For Search. */ public static final 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.zen_mode_block_settings; - result.add(sir); - return result; - } + new BaseSearchIndexProvider(R.xml.zen_mode_block_settings) { @Override public List<AbstractPreferenceController> createPreferenceControllers(Context context) { diff --git a/src/com/android/settings/notification/ZenModeBypassingAppsSettings.java b/src/com/android/settings/notification/ZenModeBypassingAppsSettings.java index 455de427ce..2c0c84a0ad 100644 --- a/src/com/android/settings/notification/ZenModeBypassingAppsSettings.java +++ b/src/com/android/settings/notification/ZenModeBypassingAppsSettings.java @@ -76,18 +76,7 @@ public class ZenModeBypassingAppsSettings extends ZenModeSettingsBase implements * For Search. */ public static final 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.zen_mode_bypassing_apps; - result.add(sir); - return result; - } + new BaseSearchIndexProvider(R.xml.zen_mode_bypassing_apps) { @Override public List<AbstractPreferenceController> createPreferenceControllers( diff --git a/src/com/android/settings/notification/ZenModeCallsSettings.java b/src/com/android/settings/notification/ZenModeCallsSettings.java index a1d0ec7e40..0e979e5ebf 100644 --- a/src/com/android/settings/notification/ZenModeCallsSettings.java +++ b/src/com/android/settings/notification/ZenModeCallsSettings.java @@ -68,18 +68,7 @@ public class ZenModeCallsSettings extends ZenModeSettingsBase implements Indexab * For Search. */ public static final 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.zen_mode_calls_settings; - result.add(sir); - return result; - } + new BaseSearchIndexProvider(R.xml.zen_mode_calls_settings) { @Override public List<AbstractPreferenceController> createPreferenceControllers( diff --git a/src/com/android/settings/notification/ZenModeMessagesSettings.java b/src/com/android/settings/notification/ZenModeMessagesSettings.java index a03d088f30..a514420f6c 100644 --- a/src/com/android/settings/notification/ZenModeMessagesSettings.java +++ b/src/com/android/settings/notification/ZenModeMessagesSettings.java @@ -65,18 +65,7 @@ public class ZenModeMessagesSettings extends ZenModeSettingsBase implements Inde * For Search. */ public static final 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.zen_mode_messages_settings; - result.add(sir); - return result; - } + new BaseSearchIndexProvider(R.xml.zen_mode_messages_settings) { @Override public List<AbstractPreferenceController> createPreferenceControllers( diff --git a/src/com/android/settings/notification/ZenModeRestrictNotificationsSettings.java b/src/com/android/settings/notification/ZenModeRestrictNotificationsSettings.java index 90d97f0461..ea7e2134ef 100644 --- a/src/com/android/settings/notification/ZenModeRestrictNotificationsSettings.java +++ b/src/com/android/settings/notification/ZenModeRestrictNotificationsSettings.java @@ -78,17 +78,7 @@ public class ZenModeRestrictNotificationsSettings extends ZenModeSettingsBase im * For Search. */ public static final 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.zen_mode_restrict_notifications_settings; - result.add(sir); - return result; - } + new BaseSearchIndexProvider(R.xml.zen_mode_restrict_notifications_settings) { @Override public List<AbstractPreferenceController> createPreferenceControllers(Context context) { diff --git a/src/com/android/settings/notification/ZenModeSettings.java b/src/com/android/settings/notification/ZenModeSettings.java index f35c649e0b..d4e5e3cb7f 100644 --- a/src/com/android/settings/notification/ZenModeSettings.java +++ b/src/com/android/settings/notification/ZenModeSettings.java @@ -314,15 +314,7 @@ public class ZenModeSettings extends ZenModeSettingsBase { * For Search. */ public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = - new BaseSearchIndexProvider() { - - @Override - public List<SearchIndexableResource> getXmlResourcesToIndex(Context context, - boolean enabled) { - final SearchIndexableResource sir = new SearchIndexableResource(context); - sir.xmlResId = R.xml.zen_mode_settings; - return Arrays.asList(sir); - } + new BaseSearchIndexProvider(R.xml.zen_mode_settings) { @Override public List<String> getNonIndexableKeys(Context context) { diff --git a/src/com/android/settings/notification/ZenModeSoundVibrationSettings.java b/src/com/android/settings/notification/ZenModeSoundVibrationSettings.java index 9f30759cc8..0b96867c50 100644 --- a/src/com/android/settings/notification/ZenModeSoundVibrationSettings.java +++ b/src/com/android/settings/notification/ZenModeSoundVibrationSettings.java @@ -71,18 +71,7 @@ public class ZenModeSoundVibrationSettings extends ZenModeSettingsBase implement * For Search. */ public static final 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.zen_mode_sound_vibration_settings; - result.add(sir); - return result; - } + new BaseSearchIndexProvider(R.xml.zen_mode_sound_vibration_settings) { @Override public List<String> getNonIndexableKeys(Context context) { diff --git a/src/com/android/settings/print/PrintSettingsFragment.java b/src/com/android/settings/print/PrintSettingsFragment.java index 09a0a279e4..b262ebed31 100644 --- a/src/com/android/settings/print/PrintSettingsFragment.java +++ b/src/com/android/settings/print/PrintSettingsFragment.java @@ -492,16 +492,5 @@ public class PrintSettingsFragment extends ProfileSettingsPreferenceFragment } public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = - new BaseSearchIndexProvider() { - - @Override - public List<SearchIndexableResource> getXmlResourcesToIndex(Context context, - boolean enabled) { - List<SearchIndexableResource> indexables = new ArrayList<>(); - SearchIndexableResource indexable = new SearchIndexableResource(context); - indexable.xmlResId = R.xml.print_settings; - indexables.add(indexable); - return indexables; - } - }; + new BaseSearchIndexProvider(R.xml.print_settings); } diff --git a/src/com/android/settings/search/BaseSearchIndexProvider.java b/src/com/android/settings/search/BaseSearchIndexProvider.java index 80775bf82e..64e6a9c0d2 100644 --- a/src/com/android/settings/search/BaseSearchIndexProvider.java +++ b/src/com/android/settings/search/BaseSearchIndexProvider.java @@ -41,6 +41,7 @@ import org.xmlpull.v1.XmlPullParserException; import java.io.IOException; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; /** @@ -49,12 +50,22 @@ import java.util.List; public class BaseSearchIndexProvider implements Indexable.SearchIndexProvider { private static final String TAG = "BaseSearchIndex"; + private int mXmlRes = 0; public BaseSearchIndexProvider() { } + public BaseSearchIndexProvider(int xmlRes) { + mXmlRes = xmlRes; + } + @Override public List<SearchIndexableResource> getXmlResourcesToIndex(Context context, boolean enabled) { + if (mXmlRes != 0) { + final SearchIndexableResource sir = new SearchIndexableResource(context); + sir.xmlResId = mXmlRes; + return Arrays.asList(sir); + } return null; } diff --git a/src/com/android/settings/security/LockscreenDashboardFragment.java b/src/com/android/settings/security/LockscreenDashboardFragment.java index 3472d4802a..f502ee6fb3 100644 --- a/src/com/android/settings/security/LockscreenDashboardFragment.java +++ b/src/com/android/settings/security/LockscreenDashboardFragment.java @@ -131,14 +131,7 @@ public class LockscreenDashboardFragment extends DashboardFragment } public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = - new BaseSearchIndexProvider() { - @Override - public List<SearchIndexableResource> getXmlResourcesToIndex( - Context context, boolean enabled) { - final SearchIndexableResource sir = new SearchIndexableResource(context); - sir.xmlResId = R.xml.security_lockscreen_settings; - return Arrays.asList(sir); - } + new BaseSearchIndexProvider(R.xml.security_lockscreen_settings) { @Override public List<AbstractPreferenceController> createPreferenceControllers( diff --git a/src/com/android/settings/security/SecuritySettings.java b/src/com/android/settings/security/SecuritySettings.java index 7c3391c0b5..021d203e28 100644 --- a/src/com/android/settings/security/SecuritySettings.java +++ b/src/com/android/settings/security/SecuritySettings.java @@ -139,18 +139,7 @@ public class SecuritySettings extends DashboardFragment { * For Search. Please keep it in sync when updating "createPreferenceHierarchy()" */ public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = - new BaseSearchIndexProvider() { - - @Override - public List<SearchIndexableResource> getXmlResourcesToIndex( - Context context, boolean enabled) { - final List<SearchIndexableResource> index = new ArrayList<>(); - // Append the rest of the settings - final SearchIndexableResource sir = new SearchIndexableResource(context); - sir.xmlResId = R.xml.security_dashboard_settings; - index.add(sir); - return index; - } + new BaseSearchIndexProvider(R.xml.security_dashboard_settings) { @Override public List<AbstractPreferenceController> createPreferenceControllers(Context diff --git a/src/com/android/settings/security/screenlock/ScreenLockSettings.java b/src/com/android/settings/security/screenlock/ScreenLockSettings.java index 3fa9dd86c1..dab483658e 100644 --- a/src/com/android/settings/security/screenlock/ScreenLockSettings.java +++ b/src/com/android/settings/security/screenlock/ScreenLockSettings.java @@ -87,17 +87,7 @@ public class ScreenLockSettings extends DashboardFragment 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.screen_lock_settings; - result.add(sir); - return result; - } + new BaseSearchIndexProvider(R.xml.screen_lock_settings) { @Override public List<AbstractPreferenceController> createPreferenceControllers( diff --git a/src/com/android/settings/security/trustagent/TrustAgentSettings.java b/src/com/android/settings/security/trustagent/TrustAgentSettings.java index 36a3867e42..4f652b208d 100644 --- a/src/com/android/settings/security/trustagent/TrustAgentSettings.java +++ b/src/com/android/settings/security/trustagent/TrustAgentSettings.java @@ -54,15 +54,5 @@ public class TrustAgentSettings extends DashboardFragment { } public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = - new BaseSearchIndexProvider() { - @Override - public List<SearchIndexableResource> getXmlResourcesToIndex( - Context context, boolean enabled) { - final List<SearchIndexableResource> result = new ArrayList<>(); - final SearchIndexableResource sir = new SearchIndexableResource(context); - sir.xmlResId = R.xml.trust_agent_settings; - result.add(sir); - return result; - } - }; + new BaseSearchIndexProvider(R.xml.trust_agent_settings); } diff --git a/src/com/android/settings/system/ResetDashboardFragment.java b/src/com/android/settings/system/ResetDashboardFragment.java index 5243d6a393..b0611fc0b4 100644 --- a/src/com/android/settings/system/ResetDashboardFragment.java +++ b/src/com/android/settings/system/ResetDashboardFragment.java @@ -68,17 +68,7 @@ public class ResetDashboardFragment extends DashboardFragment { } 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.reset_dashboard_fragment; - result.add(sir); - return result; - } + new BaseSearchIndexProvider(R.xml.reset_dashboard_fragment) { @Override public List<AbstractPreferenceController> createPreferenceControllers( diff --git a/src/com/android/settings/tts/TextToSpeechSettings.java b/src/com/android/settings/tts/TextToSpeechSettings.java index b4ff0f42e6..bcfad92af0 100644 --- a/src/com/android/settings/tts/TextToSpeechSettings.java +++ b/src/com/android/settings/tts/TextToSpeechSettings.java @@ -796,14 +796,6 @@ public class TextToSpeechSettings extends SettingsPreferenceFragment } public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = - new BaseSearchIndexProvider() { - @Override - public List<SearchIndexableResource> getXmlResourcesToIndex( - Context context, boolean enabled) { - final SearchIndexableResource sir = new SearchIndexableResource(context); - sir.xmlResId = R.xml.tts_settings; - return Arrays.asList(sir); - } - }; + new BaseSearchIndexProvider(R.xml.tts_settings); } diff --git a/src/com/android/settings/tts/TtsEnginePreferenceFragment.java b/src/com/android/settings/tts/TtsEnginePreferenceFragment.java index fb8072b39b..3308f1e0d7 100644 --- a/src/com/android/settings/tts/TtsEnginePreferenceFragment.java +++ b/src/com/android/settings/tts/TtsEnginePreferenceFragment.java @@ -222,13 +222,5 @@ public class TtsEnginePreferenceFragment extends RadioButtonPickerFragment { } public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = - new BaseSearchIndexProvider() { - @Override - public List<SearchIndexableResource> getXmlResourcesToIndex( - Context context, boolean enabled) { - final SearchIndexableResource sir = new SearchIndexableResource(context); - sir.xmlResId = R.xml.tts_engine_picker; - return Arrays.asList(sir); - } - }; + new BaseSearchIndexProvider(R.xml.tts_engine_picker); } diff --git a/src/com/android/settings/users/UserSettings.java b/src/com/android/settings/users/UserSettings.java index bcf0b290a9..c98f174388 100644 --- a/src/com/android/settings/users/UserSettings.java +++ b/src/com/android/settings/users/UserSettings.java @@ -1222,7 +1222,7 @@ public class UserSettings extends SettingsPreferenceFragment (activity, summaryLoader) -> new SummaryProvider(activity, summaryLoader); public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = - new BaseSearchIndexProvider() { + new BaseSearchIndexProvider(R.xml.user_settings) { @Override protected boolean isPageSearchEnabled(Context context) { @@ -1231,17 +1231,6 @@ public class UserSettings extends SettingsPreferenceFragment } @Override - public List<SearchIndexableResource> getXmlResourcesToIndex(Context context, - boolean enabled) { - final List<SearchIndexableResource> index = new ArrayList<>(); - // Append the rest of the settings - final SearchIndexableResource sir = new SearchIndexableResource(context); - sir.xmlResId = R.xml.user_settings; - index.add(sir); - return index; - } - - @Override public List<String> getNonIndexableKeysFromXml(Context context, int xmlResId, boolean suppressAllPage) { final List<String> niks = super.getNonIndexableKeysFromXml(context, xmlResId, diff --git a/src/com/android/settings/wfd/WifiDisplaySettings.java b/src/com/android/settings/wfd/WifiDisplaySettings.java index 9aef21d6de..d7385dcee9 100755 --- a/src/com/android/settings/wfd/WifiDisplaySettings.java +++ b/src/com/android/settings/wfd/WifiDisplaySettings.java @@ -836,16 +836,5 @@ public final class WifiDisplaySettings extends SettingsPreferenceFragment implem = (activity, summaryLoader) -> new SummaryProvider(activity, summaryLoader); 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.wifi_display_settings; - result.add(sir); - return result; - } - }; + new BaseSearchIndexProvider(R.xml.wifi_display_settings); } diff --git a/src/com/android/settings/wifi/ConfigureWifiSettings.java b/src/com/android/settings/wifi/ConfigureWifiSettings.java index 613a2cb095..6dd68c704b 100644 --- a/src/com/android/settings/wifi/ConfigureWifiSettings.java +++ b/src/com/android/settings/wifi/ConfigureWifiSettings.java @@ -109,14 +109,7 @@ public class ConfigureWifiSettings extends DashboardFragment { } public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = - new BaseSearchIndexProvider() { - @Override - public List<SearchIndexableResource> getXmlResourcesToIndex(Context context, - boolean enabled) { - final SearchIndexableResource sir = new SearchIndexableResource(context); - sir.xmlResId = R.xml.wifi_configure_settings; - return Arrays.asList(sir); - } + new BaseSearchIndexProvider(R.xml.wifi_configure_settings) { @Override public List<String> getNonIndexableKeys(Context context) { diff --git a/src/com/android/settings/wifi/tether/WifiTetherSettings.java b/src/com/android/settings/wifi/tether/WifiTetherSettings.java index 3636eb8eb4..6b11cbaa2b 100644 --- a/src/com/android/settings/wifi/tether/WifiTetherSettings.java +++ b/src/com/android/settings/wifi/tether/WifiTetherSettings.java @@ -237,14 +237,7 @@ public class WifiTetherSettings extends RestrictedDashboardFragment } public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = - new BaseSearchIndexProvider() { - @Override - public List<SearchIndexableResource> getXmlResourcesToIndex( - Context context, boolean enabled) { - final SearchIndexableResource sir = new SearchIndexableResource(context); - sir.xmlResId = R.xml.wifi_tether_settings; - return Arrays.asList(sir); - } + new BaseSearchIndexProvider(R.xml.wifi_tether_settings) { @Override public List<String> getNonIndexableKeys(Context context) { |