PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge similar BaseSearchIndexProvider code together

Browse Source 
Bug: 135053028
Test: robolectric, check search_index.db contains the same items
Change-Id: If3c18a170b0e671690df1fdf26e59a421d2c48cd
This commit is contained in:
Raff Tsai
2019-09-12 10:56:13 +08:00
parent e84a8863d5
commit 1f30b1cd67
75 changed files with 86 additions and 744 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/com/android/settings/DisplaySettings.java
View File

@@ -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(

15
src/com/android/settings/accessibility/AccessibilityControlTimeoutPreferenceFragment.java
View File

@@ -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(

13
src/com/android/settings/accessibility/AccessibilitySettings.java
View File

@@ -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);
}

9
src/com/android/settings/accessibility/MagnificationPreferenceFragment.java
View File

@@ -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) {

13
src/com/android/settings/accessibility/ToggleAutoclickPreferenceFragment.java
View File

@@ -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);
}

13
src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java
View File

@@ -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);
}

12
src/com/android/settings/accessibility/VibrationSettings.java
View File

@@ -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);
}

10
src/com/android/settings/applications/defaultapps/AutofillPicker.java
View File

@@ -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

13
src/com/android/settings/applications/managedomainurls/ManageDomainUrls.java
View File

@@ -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);
}

13
src/com/android/settings/applications/specialaccess/SpecialAccessSettings.java
View File

@@ -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);
}

13
src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminSettings.java
View File

@@ -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);
}

13
src/com/android/settings/applications/specialaccess/pictureinpicture/PictureInPictureSettings.java
View File

@@ -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);
}

13
src/com/android/settings/applications/specialaccess/premiumsms/PremiumSmsAccess.java
View File

@@ -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);
}

13
src/com/android/settings/applications/specialaccess/vrlistener/VrListenerSettings.java
View File

@@ -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);
}

3
src/com/android/settings/backup/BackupSettingsFragment.java
View File

@@ -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() {

9
src/com/android/settings/backup/PrivacySettings.java
View File

@@ -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) {

9
src/com/android/settings/biometrics/face/FaceSettings.java
View File

@@ -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(

10
src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java
View File

@@ -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);
}

9
src/com/android/settings/connecteddevice/usb/UsbDetailsFragment.java
View File

@@ -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(

12
src/com/android/settings/datausage/BillingCycleSettings.java
View File

@@ -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) {

12
src/com/android/settings/datausage/DataSaverSummary.java
View File

@@ -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) {

13
src/com/android/settings/datausage/UnrestrictedDataAccess.java
View File

@@ -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);
}

11
src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
View File

@@ -522,22 +522,13 @@ 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) {
return DevelopmentSettingsEnabler.isDevelopmentSettingsEnabled(context);
}
@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) {

11
src/com/android/settings/development/gamedriver/GameDriverDashboard.java
View File

@@ -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) {

12
src/com/android/settings/development/qstile/DevelopmentTileConfigFragment.java
View File

@@ -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) {

10
src/com/android/settings/deviceinfo/aboutphone/MyDeviceInfoFragment.java
View File

@@ -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(

14
src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionSettings.java
View File

@@ -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);
}

12
src/com/android/settings/deviceinfo/hardwareinfo/HardwareInfoFragment.java
View File

@@ -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) {

10
src/com/android/settings/display/AdaptiveSleepSettings.java
View File

@@ -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);
}

11
src/com/android/settings/display/NightDisplaySettings.java
View File

@@ -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) {

9
src/com/android/settings/dream/DreamSettings.java
View File

@@ -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) {

9
src/com/android/settings/enterprise/EnterprisePrivacySettings.java
View File

@@ -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(

10
src/com/android/settings/fuelgauge/PowerUsageSummary.java
View File

@@ -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);
}

10
src/com/android/settings/gestures/DoubleTapPowerSettings.java
View File

@@ -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);
}

12
src/com/android/settings/gestures/DoubleTapScreenSettings.java
View File

@@ -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);
}

10
src/com/android/settings/gestures/GlobalActionsPanelSettings.java
View File

@@ -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);
}

10
src/com/android/settings/gestures/PickupGestureSettings.java
View File

@@ -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);
}

9
src/com/android/settings/gestures/PreventRingingGestureSettings.java
View File

@@ -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(

9
src/com/android/settings/gestures/SwipeToNotificationSettings.java
View File

@@ -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) {

9
src/com/android/settings/gestures/SystemNavigationGestureSettings.java
View File

@@ -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) {

10
src/com/android/settings/gestures/TapScreenGestureSettings.java
View File

@@ -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);
}

9
src/com/android/settings/homepage/TopLevelSettings.java
View File

@@ -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) {

9
src/com/android/settings/language/LanguageAndInputSettings.java
View File

@@ -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(

9
src/com/android/settings/location/LocationSettings.java
View File

@@ -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

9
src/com/android/settings/location/RecentLocationRequestSeeAllFragment.java
View File

@@ -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

9
src/com/android/settings/location/ScanningSettings.java
View File

@@ -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

11
src/com/android/settings/network/MobileNetworkListFragment.java
View File

@@ -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) {

9
src/com/android/settings/nfc/PaymentSettings.java
View File

@@ -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) {

9
src/com/android/settings/notification/ConfigureNotificationSettings.java
View File

@@ -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(

13
src/com/android/settings/notification/NotificationAccessSettings.java
View File

@@ -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);
}

13
src/com/android/settings/notification/NotificationAssistantPicker.java
View File

@@ -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 {

9
src/com/android/settings/notification/SoundSettings.java
View File

@@ -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(

13
src/com/android/settings/notification/ZenAccessSettings.java
View File

@@ -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);
}

13
src/com/android/settings/notification/ZenModeAutomationSettings.java
View File

@@ -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) {

12
src/com/android/settings/notification/ZenModeBlockedEffectsSettings.java
View File

@@ -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) {

13
src/com/android/settings/notification/ZenModeBypassingAppsSettings.java
View File

@@ -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(

13
src/com/android/settings/notification/ZenModeCallsSettings.java
View File

@@ -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(

13
src/com/android/settings/notification/ZenModeMessagesSettings.java
View File

@@ -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(

12
src/com/android/settings/notification/ZenModeRestrictNotificationsSettings.java
View File

@@ -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) {

10
src/com/android/settings/notification/ZenModeSettings.java
View File

@@ -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) {

13
src/com/android/settings/notification/ZenModeSoundVibrationSettings.java
View File

@@ -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) {

13
src/com/android/settings/print/PrintSettingsFragment.java
View File

@@ -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);
}

11
src/com/android/settings/search/BaseSearchIndexProvider.java
View File

@@ -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;
}

9
src/com/android/settings/security/LockscreenDashboardFragment.java
View File

@@ -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(

13
src/com/android/settings/security/SecuritySettings.java
View File

@@ -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

12
src/com/android/settings/security/screenlock/ScreenLockSettings.java
View File

@@ -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(

12
src/com/android/settings/security/trustagent/TrustAgentSettings.java
View File

@@ -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);
}

12
src/com/android/settings/system/ResetDashboardFragment.java
View File

@@ -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(

10
src/com/android/settings/tts/TextToSpeechSettings.java
View File

@@ -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);
}

10
src/com/android/settings/tts/TtsEnginePreferenceFragment.java
View File

@@ -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);
}

13
src/com/android/settings/users/UserSettings.java
View File

@@ -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) {
@@ -1230,17 +1230,6 @@ public class UserSettings extends SettingsPreferenceFragment
return userCaps.mEnabled;
}
@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) {

13
src/com/android/settings/wfd/WifiDisplaySettings.java
View File

@@ -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);
}

9
src/com/android/settings/wifi/ConfigureWifiSettings.java
View File

@@ -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) {

9
src/com/android/settings/wifi/tether/WifiTetherSettings.java
View File

@@ -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) {

13
tests/robotests/src/com/android/settings/testutils/FakeIndexProvider.java
View File

@@ -18,13 +18,11 @@
package com.android.settings.testutils;
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 FakeIndexProvider implements Indexable {
@@ -32,16 +30,7 @@ public class FakeIndexProvider implements Indexable {
public static final String KEY = "TestKey";
public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
new BaseSearchIndexProvider() {
@Override
public List<SearchIndexableResource> getXmlResourcesToIndex(Context context,
boolean enabled) {
List<SearchIndexableResource> resources = new ArrayList<>();
SearchIndexableResource res = new SearchIndexableResource(context);
res.xmlResId = R.xml.location_settings;
resources.add(res);
return resources;
}
new BaseSearchIndexProvider(R.xml.location_settings) {
@Override
public List<String> getNonIndexableKeys(Context context) {