diff --git a/src/com/android/settings/DateTimeSettings.java b/src/com/android/settings/DateTimeSettings.java index 40b20052ab5..e6e3732c8d2 100644 --- a/src/com/android/settings/DateTimeSettings.java +++ b/src/com/android/settings/DateTimeSettings.java @@ -21,7 +21,6 @@ import android.app.Dialog; import android.app.settings.SettingsEnums; import android.content.Context; import android.content.Intent; -import android.provider.SearchIndexableResource; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.dashboard.SummaryLoader; @@ -34,7 +33,6 @@ import com.android.settings.datetime.TimeFormatPreferenceController; import com.android.settings.datetime.TimePreferenceController; import com.android.settings.datetime.TimeZonePreferenceController; import com.android.settings.search.BaseSearchIndexProvider; -import com.android.settings.search.Indexable; import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.datetime.ZoneGetter; import com.android.settingslib.search.SearchIndexable; @@ -64,7 +62,7 @@ public class DateTimeSettings extends DashboardFragment implements @Override protected int getPreferenceScreenResId() { - return R.xml.date_time_prefs; + return SEARCH_INDEX_DATA_PROVIDER.getXmlResourceId(); } @Override @@ -176,21 +174,6 @@ public class DateTimeSettings extends DashboardFragment implements }; - public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = - new DateTimeSearchIndexProvider(); - - private static class DateTimeSearchIndexProvider extends BaseSearchIndexProvider { - - @Override - public List getXmlResourcesToIndex( - Context context, boolean enabled) { - List result = new ArrayList<>(); - - SearchIndexableResource sir = new SearchIndexableResource(context); - sir.xmlResId = R.xml.date_time_prefs; - result.add(sir); - - return result; - } - } + public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = + new BaseSearchIndexProvider(R.xml.date_time_prefs); } diff --git a/src/com/android/settings/DisplaySettings.java b/src/com/android/settings/DisplaySettings.java index d79d401f9a3..9ad4e25bf2f 100644 --- a/src/com/android/settings/DisplaySettings.java +++ b/src/com/android/settings/DisplaySettings.java @@ -19,7 +19,6 @@ package com.android.settings; import android.app.settings.SettingsEnums; import android.content.Context; import android.os.Bundle; -import android.provider.SearchIndexableResource; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.display.BrightnessLevelPreferenceController; @@ -35,7 +34,6 @@ import com.android.settings.display.ThemePreferenceController; import com.android.settings.display.TimeoutPreferenceController; import com.android.settings.display.VrDisplayPreferenceController; import com.android.settings.search.BaseSearchIndexProvider; -import com.android.settings.search.Indexable; import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settingslib.search.SearchIndexable; @@ -61,7 +59,7 @@ public class DisplaySettings extends DashboardFragment { @Override protected int getPreferenceScreenResId() { - return R.xml.display_settings; + return SEARCH_INDEX_DATA_PROVIDER.getXmlResourceId(); } @Override @@ -97,7 +95,7 @@ public class DisplaySettings extends DashboardFragment { return controllers; } - public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = + public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = new BaseSearchIndexProvider(R.xml.display_settings) { @Override diff --git a/src/com/android/settings/LegalSettings.java b/src/com/android/settings/LegalSettings.java index e6f0c2c0735..f6e13eaeecf 100644 --- a/src/com/android/settings/LegalSettings.java +++ b/src/com/android/settings/LegalSettings.java @@ -17,17 +17,11 @@ package com.android.settings; import android.app.settings.SettingsEnums; -import android.content.Context; -import android.provider.SearchIndexableResource; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.search.BaseSearchIndexProvider; -import com.android.settings.search.Indexable; import com.android.settingslib.search.SearchIndexable; -import java.util.Arrays; -import java.util.List; - @SearchIndexable public class LegalSettings extends DashboardFragment { @@ -45,18 +39,9 @@ public class LegalSettings extends DashboardFragment { @Override protected int getPreferenceScreenResId() { - return R.xml.about_legal; + return SEARCH_INDEX_DATA_PROVIDER.getXmlResourceId(); } - public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = - new BaseSearchIndexProvider() { - - @Override - public List getXmlResourcesToIndex( - Context context, boolean enabled) { - final SearchIndexableResource sir = new SearchIndexableResource(context); - sir.xmlResId = R.xml.about_legal; - return Arrays.asList(sir); - } - }; + public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = + new BaseSearchIndexProvider(R.xml.about_legal); } diff --git a/src/com/android/settings/TetherSettings.java b/src/com/android/settings/TetherSettings.java index a6cbcb00f18..9ddda1d62fc 100644 --- a/src/com/android/settings/TetherSettings.java +++ b/src/com/android/settings/TetherSettings.java @@ -441,7 +441,7 @@ public class TetherSettings extends RestrictedSettingsFragment } }; - public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = + public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = new BaseSearchIndexProvider() { @Override public List getXmlResourcesToIndex( diff --git a/src/com/android/settings/accessibility/AccessibilityControlTimeoutPreferenceFragment.java b/src/com/android/settings/accessibility/AccessibilityControlTimeoutPreferenceFragment.java index de444f247ae..b37fdfb8519 100644 --- a/src/com/android/settings/accessibility/AccessibilityControlTimeoutPreferenceFragment.java +++ b/src/com/android/settings/accessibility/AccessibilityControlTimeoutPreferenceFragment.java @@ -104,7 +104,7 @@ public final class AccessibilityControlTimeoutPreferenceFragment extends Dashboa return sControllers; } - public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = + public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = new BaseSearchIndexProvider(R.xml.accessibility_control_timeout_settings) { @Override diff --git a/src/com/android/settings/accessibility/AccessibilitySettings.java b/src/com/android/settings/accessibility/AccessibilitySettings.java index 4f9d9656c88..b985cd12036 100644 --- a/src/com/android/settings/accessibility/AccessibilitySettings.java +++ b/src/com/android/settings/accessibility/AccessibilitySettings.java @@ -32,7 +32,6 @@ import android.os.Bundle; import android.os.Handler; import android.os.UserHandle; import android.provider.DeviceConfig; -import android.provider.SearchIndexableResource; import android.provider.Settings; import android.text.TextUtils; import android.util.ArrayMap; @@ -246,7 +245,7 @@ public class AccessibilitySettings extends DashboardFragment { @Override protected int getPreferenceScreenResId() { - return R.xml.accessibility_settings; + return SEARCH_INDEX_DATA_PROVIDER.getXmlResourceId(); } @Override @@ -506,6 +505,6 @@ public class AccessibilitySettings extends DashboardFragment { } } - public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = + public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = new BaseSearchIndexProvider(R.xml.accessibility_settings); } diff --git a/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragment.java b/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragment.java index cd13875b57f..d6860259726 100644 --- a/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragment.java +++ b/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragment.java @@ -192,7 +192,7 @@ public class AccessibilityShortcutPreferenceFragment extends ToggleFeaturePrefer return ComponentName.unflattenFromString(componentNameString); } - public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = + public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = new BaseSearchIndexProvider() { // This fragment is for details of the shortcut. Only the shortcut itself needs // to be indexed. diff --git a/src/com/android/settings/accessibility/MagnificationPreferenceFragment.java b/src/com/android/settings/accessibility/MagnificationPreferenceFragment.java index 87b3de74aaf..c84d3ac3d57 100644 --- a/src/com/android/settings/accessibility/MagnificationPreferenceFragment.java +++ b/src/com/android/settings/accessibility/MagnificationPreferenceFragment.java @@ -167,7 +167,7 @@ public final class MagnificationPreferenceFragment extends DashboardFragment { == NAV_BAR_MODE_GESTURAL; } - public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = + public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = new BaseSearchIndexProvider(R.xml.accessibility_magnification_settings) { @Override diff --git a/src/com/android/settings/accessibility/ToggleAutoclickPreferenceFragment.java b/src/com/android/settings/accessibility/ToggleAutoclickPreferenceFragment.java index 13a0ed1ee10..bb1dbeec427 100644 --- a/src/com/android/settings/accessibility/ToggleAutoclickPreferenceFragment.java +++ b/src/com/android/settings/accessibility/ToggleAutoclickPreferenceFragment.java @@ -187,6 +187,6 @@ public class ToggleAutoclickPreferenceFragment extends ToggleFeaturePreferenceFr return (delay - MIN_AUTOCLICK_DELAY) / AUTOCLICK_DELAY_STEP; } - public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = + public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = 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 ca52e291f26..3a441c7c374 100644 --- a/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java +++ b/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java @@ -127,7 +127,7 @@ public class ToggleDaltonizerPreferenceFragment extends ToggleFeaturePreferenceF onPreferenceToggled(mPreferenceKey, isChecked); } - public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = + public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = 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 88d07a2f1d6..32256f4d75d 100644 --- a/src/com/android/settings/accessibility/VibrationSettings.java +++ b/src/com/android/settings/accessibility/VibrationSettings.java @@ -51,6 +51,6 @@ public class VibrationSettings extends DashboardFragment { return TAG; } - public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = + public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = new BaseSearchIndexProvider(R.xml.accessibility_vibration_settings); } diff --git a/src/com/android/settings/accounts/AccountDashboardFragment.java b/src/com/android/settings/accounts/AccountDashboardFragment.java index 515008af596..04a9701ae57 100644 --- a/src/com/android/settings/accounts/AccountDashboardFragment.java +++ b/src/com/android/settings/accounts/AccountDashboardFragment.java @@ -19,7 +19,6 @@ import static android.provider.Settings.EXTRA_AUTHORITIES; import android.app.settings.SettingsEnums; import android.content.Context; -import android.provider.SearchIndexableResource; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; @@ -32,7 +31,6 @@ import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.search.SearchIndexable; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; @SearchIndexable @@ -53,7 +51,7 @@ public class AccountDashboardFragment extends DashboardFragment { @Override protected int getPreferenceScreenResId() { - return R.xml.accounts_dashboard_settings; + return SEARCH_INDEX_DATA_PROVIDER.getXmlResourceId(); } @Override @@ -83,15 +81,8 @@ public class AccountDashboardFragment extends DashboardFragment { return controllers; } - public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = - new BaseSearchIndexProvider() { - @Override - public List getXmlResourcesToIndex( - Context context, boolean enabled) { - final SearchIndexableResource sir = new SearchIndexableResource(context); - sir.xmlResId = R.xml.accounts_dashboard_settings; - return Arrays.asList(sir); - } + public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = + new BaseSearchIndexProvider(R.xml.accounts_dashboard_settings) { @Override public List createPreferenceControllers( diff --git a/src/com/android/settings/accounts/ManagedProfileSettings.java b/src/com/android/settings/accounts/ManagedProfileSettings.java index 1f18d07ec7e..e82b72b4c35 100644 --- a/src/com/android/settings/accounts/ManagedProfileSettings.java +++ b/src/com/android/settings/accounts/ManagedProfileSettings.java @@ -116,7 +116,7 @@ public class ManagedProfileSettings extends DashboardFragment { return SettingsEnums.ACCOUNTS_WORK_PROFILE_SETTINGS; } - public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = + public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = new BaseSearchIndexProvider() { @Override public List getXmlResourcesToIndex(Context context, diff --git a/src/com/android/settings/applications/AppAndNotificationDashboardFragment.java b/src/com/android/settings/applications/AppAndNotificationDashboardFragment.java index 876c99938f7..8b0f85119de 100644 --- a/src/com/android/settings/applications/AppAndNotificationDashboardFragment.java +++ b/src/com/android/settings/applications/AppAndNotificationDashboardFragment.java @@ -121,7 +121,7 @@ public class AppAndNotificationDashboardFragment extends DashboardFragment return controllers; } - public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = + public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = new BaseSearchIndexProvider() { @Override public List getXmlResourcesToIndex( diff --git a/src/com/android/settings/applications/assist/ManageAssist.java b/src/com/android/settings/applications/assist/ManageAssist.java index ae2728d0dd9..c3dac26f23f 100644 --- a/src/com/android/settings/applications/assist/ManageAssist.java +++ b/src/com/android/settings/applications/assist/ManageAssist.java @@ -18,19 +18,16 @@ package com.android.settings.applications.assist; import android.app.settings.SettingsEnums; import android.content.Context; -import android.provider.SearchIndexableResource; import com.android.settings.R; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.gestures.AssistGestureSettingsPreferenceController; import com.android.settings.search.BaseSearchIndexProvider; -import com.android.settings.search.Indexable; import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settingslib.search.SearchIndexable; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; /** @@ -49,7 +46,7 @@ public class ManageAssist extends DashboardFragment { @Override protected int getPreferenceScreenResId() { - return R.xml.manage_assist; + return SEARCH_INDEX_DATA_PROVIDER.getXmlResourceId(); } @Override @@ -80,15 +77,8 @@ public class ManageAssist extends DashboardFragment { return controllers; } - public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = - new BaseSearchIndexProvider() { - @Override - public List getXmlResourcesToIndex(Context context, - boolean enabled) { - final SearchIndexableResource sir = new SearchIndexableResource(context); - sir.xmlResId = R.xml.manage_assist; - return Arrays.asList(sir); - } + public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = + new BaseSearchIndexProvider(R.xml.manage_assist) { @Override public List createPreferenceControllers( diff --git a/src/com/android/settings/applications/defaultapps/AutofillPicker.java b/src/com/android/settings/applications/defaultapps/AutofillPicker.java index e443f4f1107..32790311a7b 100644 --- a/src/com/android/settings/applications/defaultapps/AutofillPicker.java +++ b/src/com/android/settings/applications/defaultapps/AutofillPicker.java @@ -54,7 +54,7 @@ public class AutofillPicker extends DashboardFragment { return buildPreferenceControllers(context); } - public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = + public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = new BaseSearchIndexProvider(R.xml.default_autofill_picker_settings) { @Override diff --git a/src/com/android/settings/applications/managedomainurls/ManageDomainUrls.java b/src/com/android/settings/applications/managedomainurls/ManageDomainUrls.java index 8b133c7b426..1176a1b02f5 100644 --- a/src/com/android/settings/applications/managedomainurls/ManageDomainUrls.java +++ b/src/com/android/settings/applications/managedomainurls/ManageDomainUrls.java @@ -20,17 +20,12 @@ import static com.android.settingslib.search.SearchIndexable.MOBILE; import android.app.settings.SettingsEnums; import android.content.Context; -import android.provider.SearchIndexableResource; import com.android.settings.R; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.search.BaseSearchIndexProvider; -import com.android.settings.search.Indexable; import com.android.settingslib.search.SearchIndexable; -import java.util.ArrayList; -import java.util.List; - /** * Activity to manage how Android handles URL resolution. Includes both per-app * handling as well as system handling for Web Actions. @@ -53,7 +48,7 @@ public class ManageDomainUrls extends DashboardFragment { @Override protected int getPreferenceScreenResId() { - return R.xml.manage_domain_url_settings; + return SEARCH_INDEX_DATA_PROVIDER.getXmlResourceId(); } @Override @@ -61,6 +56,6 @@ public class ManageDomainUrls extends DashboardFragment { return SettingsEnums.MANAGE_DOMAIN_URLS; } - public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = + public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = 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 6e8ed5a37c7..26f54c93674 100644 --- a/src/com/android/settings/applications/specialaccess/SpecialAccessSettings.java +++ b/src/com/android/settings/applications/specialaccess/SpecialAccessSettings.java @@ -17,18 +17,12 @@ package com.android.settings.applications.specialaccess; import android.app.settings.SettingsEnums; -import android.content.Context; -import android.provider.SearchIndexableResource; import com.android.settings.R; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.search.BaseSearchIndexProvider; -import com.android.settings.search.Indexable; import com.android.settingslib.search.SearchIndexable; -import java.util.ArrayList; -import java.util.List; - @SearchIndexable public class SpecialAccessSettings extends DashboardFragment { @@ -41,7 +35,7 @@ public class SpecialAccessSettings extends DashboardFragment { @Override protected int getPreferenceScreenResId() { - return R.xml.special_access; + return SEARCH_INDEX_DATA_PROVIDER.getXmlResourceId(); } @Override @@ -49,6 +43,6 @@ public class SpecialAccessSettings extends DashboardFragment { return SettingsEnums.SPECIAL_ACCESS; } - public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = + public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = 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 1549ba27489..67b10ff9f0f 100644 --- a/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminSettings.java +++ b/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminSettings.java @@ -17,18 +17,12 @@ package com.android.settings.applications.specialaccess.deviceadmin; import android.app.settings.SettingsEnums; -import android.content.Context; -import android.provider.SearchIndexableResource; import com.android.settings.R; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.search.BaseSearchIndexProvider; -import com.android.settings.search.Indexable; import com.android.settingslib.search.SearchIndexable; -import java.util.ArrayList; -import java.util.List; - @SearchIndexable public class DeviceAdminSettings extends DashboardFragment { static final String TAG = "DeviceAdminSettings"; @@ -39,7 +33,7 @@ public class DeviceAdminSettings extends DashboardFragment { @Override protected int getPreferenceScreenResId() { - return R.xml.device_admin_settings; + return SEARCH_INDEX_DATA_PROVIDER.getXmlResourceId(); } @Override @@ -47,6 +41,6 @@ public class DeviceAdminSettings extends DashboardFragment { return TAG; } - public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = + public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = 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 3671f05dcf7..f90e4e13e9e 100644 --- a/src/com/android/settings/applications/specialaccess/pictureinpicture/PictureInPictureSettings.java +++ b/src/com/android/settings/applications/specialaccess/pictureinpicture/PictureInPictureSettings.java @@ -28,7 +28,6 @@ import android.content.pm.UserInfo; import android.os.Bundle; import android.os.UserHandle; import android.os.UserManager; -import android.provider.SearchIndexableResource; import android.util.IconDrawableFactory; import android.util.Pair; import android.view.View; @@ -41,7 +40,6 @@ import androidx.preference.PreferenceScreen; import com.android.settings.R; import com.android.settings.applications.AppInfoBase; import com.android.settings.search.BaseSearchIndexProvider; -import com.android.settings.search.Indexable; import com.android.settings.widget.EmptyTextSettings; import com.android.settingslib.search.SearchIndexable; import com.android.settingslib.widget.apppreference.AppPreference; @@ -187,7 +185,7 @@ public class PictureInPictureSettings extends EmptyTextSettings { @Override protected int getPreferenceScreenResId() { - return R.xml.picture_in_picture_settings; + return SEARCH_INDEX_DATA_PROVIDER.getXmlResourceId(); } @Override @@ -219,6 +217,6 @@ public class PictureInPictureSettings extends EmptyTextSettings { return pipApps; } - public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = + public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = 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 00c60d5ee77..420dcefd807 100644 --- a/src/com/android/settings/applications/specialaccess/premiumsms/PremiumSmsAccess.java +++ b/src/com/android/settings/applications/specialaccess/premiumsms/PremiumSmsAccess.java @@ -21,7 +21,6 @@ import android.app.Application; import android.app.settings.SettingsEnums; import android.content.Context; import android.os.Bundle; -import android.provider.SearchIndexableResource; import android.view.View; import androidx.annotation.VisibleForTesting; @@ -38,7 +37,6 @@ import com.android.settings.applications.AppStateSmsPremBridge; import com.android.settings.applications.AppStateSmsPremBridge.SmsState; import com.android.settings.overlay.FeatureFactory; import com.android.settings.search.BaseSearchIndexProvider; -import com.android.settings.search.Indexable; import com.android.settings.widget.EmptyTextSettings; import com.android.settingslib.applications.ApplicationsState; import com.android.settingslib.applications.ApplicationsState.AppEntry; @@ -49,7 +47,6 @@ import com.android.settingslib.search.SearchIndexable; import com.android.settingslib.widget.FooterPreference; import java.util.ArrayList; -import java.util.List; @SearchIndexable public class PremiumSmsAccess extends EmptyTextSettings @@ -94,7 +91,7 @@ public class PremiumSmsAccess extends EmptyTextSettings @Override protected int getPreferenceScreenResId() { - return R.xml.premium_sms_settings; + return SEARCH_INDEX_DATA_PROVIDER.getXmlResourceId(); } @Override @@ -252,6 +249,6 @@ public class PremiumSmsAccess extends EmptyTextSettings } } - public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = + public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = 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 38240fcbe85..ce6abc1480d 100644 --- a/src/com/android/settings/applications/specialaccess/vrlistener/VrListenerSettings.java +++ b/src/com/android/settings/applications/specialaccess/vrlistener/VrListenerSettings.java @@ -17,8 +17,6 @@ package com.android.settings.applications.specialaccess.vrlistener; import android.app.settings.SettingsEnums; import android.content.ComponentName; -import android.content.Context; -import android.provider.SearchIndexableResource; import android.provider.Settings; import android.service.vr.VrListenerService; @@ -27,14 +25,10 @@ import androidx.annotation.VisibleForTesting; import com.android.settings.R; import com.android.settings.overlay.FeatureFactory; import com.android.settings.search.BaseSearchIndexProvider; -import com.android.settings.search.Indexable; import com.android.settings.utils.ManagedServiceSettings; import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; import com.android.settingslib.search.SearchIndexable; -import java.util.ArrayList; -import java.util.List; - @SearchIndexable public class VrListenerSettings extends ManagedServiceSettings { private static final String TAG = VrListenerSettings.class.getSimpleName(); @@ -67,7 +61,7 @@ public class VrListenerSettings extends ManagedServiceSettings { @Override protected int getPreferenceScreenResId() { - return R.xml.vr_listeners_settings; + return SEARCH_INDEX_DATA_PROVIDER.getXmlResourceId(); } @VisibleForTesting @@ -84,7 +78,7 @@ public class VrListenerSettings extends ManagedServiceSettings { 0); } - public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = + public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = 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 58bfef094b4..b1f639a02b2 100644 --- a/src/com/android/settings/backup/BackupSettingsFragment.java +++ b/src/com/android/settings/backup/BackupSettingsFragment.java @@ -70,7 +70,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 = + public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = new BaseSearchIndexProvider(); @Override diff --git a/src/com/android/settings/backup/PrivacySettings.java b/src/com/android/settings/backup/PrivacySettings.java index c07fdeeabe2..5509c2fcb90 100644 --- a/src/com/android/settings/backup/PrivacySettings.java +++ b/src/com/android/settings/backup/PrivacySettings.java @@ -18,16 +18,12 @@ package com.android.settings.backup; import android.app.settings.SettingsEnums; import android.content.Context; -import android.provider.SearchIndexableResource; import com.android.settings.R; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.search.BaseSearchIndexProvider; import com.android.settingslib.search.SearchIndexable; -import java.util.Arrays; -import java.util.List; - @SearchIndexable public class PrivacySettings extends DashboardFragment { private static final String TAG = "PrivacySettings"; @@ -44,7 +40,7 @@ public class PrivacySettings extends DashboardFragment { @Override protected int getPreferenceScreenResId() { - return R.xml.privacy_settings; + return SEARCH_INDEX_DATA_PROVIDER.getXmlResourceId(); } @Override @@ -71,7 +67,7 @@ public class PrivacySettings extends DashboardFragment { } } - public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = + public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = new BaseSearchIndexProvider(R.xml.privacy_settings) { @Override diff --git a/src/com/android/settings/backup/UserBackupSettingsActivity.java b/src/com/android/settings/backup/UserBackupSettingsActivity.java index c2bcd07c8f9..31e86e4526c 100644 --- a/src/com/android/settings/backup/UserBackupSettingsActivity.java +++ b/src/com/android/settings/backup/UserBackupSettingsActivity.java @@ -96,7 +96,7 @@ public class UserBackupSettingsActivity extends FragmentActivity implements Inde /** * For Search. */ - public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = + public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = new BaseSearchIndexProvider() { private static final String BACKUP_SEARCH_INDEX_KEY = "Backup"; diff --git a/src/com/android/settings/biometrics/face/FaceSettings.java b/src/com/android/settings/biometrics/face/FaceSettings.java index c55a2525dbf..20ab6b831fd 100644 --- a/src/com/android/settings/biometrics/face/FaceSettings.java +++ b/src/com/android/settings/biometrics/face/FaceSettings.java @@ -28,7 +28,6 @@ import android.hardware.face.FaceManager; import android.os.Bundle; import android.os.UserHandle; import android.os.UserManager; -import android.provider.SearchIndexableResource; import android.util.Log; import androidx.preference.Preference; @@ -94,7 +93,7 @@ public class FaceSettings extends DashboardFragment { @Override protected int getPreferenceScreenResId() { - return R.xml.security_settings_face; + return SEARCH_INDEX_DATA_PROVIDER.getXmlResourceId(); } @Override @@ -270,7 +269,7 @@ public class FaceSettings extends DashboardFragment { return controllers; } - public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = + public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = new BaseSearchIndexProvider(R.xml.security_settings_face) { @Override diff --git a/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceDashboardFragment.java b/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceDashboardFragment.java index 0d130d92122..8509ca06444 100644 --- a/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceDashboardFragment.java +++ b/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceDashboardFragment.java @@ -89,7 +89,7 @@ public class AdvancedConnectedDeviceDashboardFragment extends DashboardFragment /** * For Search. */ - public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = + public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = new BaseSearchIndexProvider() { @Override public List getXmlResourcesToIndex( diff --git a/src/com/android/settings/connecteddevice/BluetoothDashboardFragment.java b/src/com/android/settings/connecteddevice/BluetoothDashboardFragment.java index 36b2ae8c007..996e2795922 100644 --- a/src/com/android/settings/connecteddevice/BluetoothDashboardFragment.java +++ b/src/com/android/settings/connecteddevice/BluetoothDashboardFragment.java @@ -101,7 +101,7 @@ public class BluetoothDashboardFragment extends DashboardFragment { /** * For Search. */ - public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = + public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = new BaseSearchIndexProvider() { @Override public List getRawDataToIndex(Context context, diff --git a/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java b/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java index 4cadae95f40..1452a2688ba 100644 --- a/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java +++ b/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java @@ -19,7 +19,6 @@ import android.app.settings.SettingsEnums; import android.content.Context; import android.net.Uri; import android.provider.DeviceConfig; -import android.provider.SearchIndexableResource; import androidx.annotation.VisibleForTesting; @@ -30,9 +29,6 @@ import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.slices.SlicePreferenceController; import com.android.settingslib.search.SearchIndexable; -import java.util.Arrays; -import java.util.List; - @SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC) public class ConnectedDeviceDashboardFragment extends DashboardFragment { @@ -60,7 +56,7 @@ public class ConnectedDeviceDashboardFragment extends DashboardFragment { @Override protected int getPreferenceScreenResId() { - return R.xml.connected_devices; + return SEARCH_INDEX_DATA_PROVIDER.getXmlResourceId(); } @Override @@ -79,6 +75,6 @@ public class ConnectedDeviceDashboardFragment extends DashboardFragment { /** * For Search. */ - public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = + public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = new BaseSearchIndexProvider(R.xml.connected_devices); } diff --git a/src/com/android/settings/connecteddevice/PreviouslyConnectedDeviceDashboardFragment.java b/src/com/android/settings/connecteddevice/PreviouslyConnectedDeviceDashboardFragment.java index 709e1dc1c42..b6d2bdd5c07 100644 --- a/src/com/android/settings/connecteddevice/PreviouslyConnectedDeviceDashboardFragment.java +++ b/src/com/android/settings/connecteddevice/PreviouslyConnectedDeviceDashboardFragment.java @@ -66,7 +66,7 @@ public class PreviouslyConnectedDeviceDashboardFragment extends DashboardFragmen /** * For Search. */ - public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = + public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = new BaseSearchIndexProvider() { @Override public List getRawDataToIndex( diff --git a/src/com/android/settings/connecteddevice/usb/UsbDetailsFragment.java b/src/com/android/settings/connecteddevice/usb/UsbDetailsFragment.java index bf760f00c78..4d5c1bc5aca 100644 --- a/src/com/android/settings/connecteddevice/usb/UsbDetailsFragment.java +++ b/src/com/android/settings/connecteddevice/usb/UsbDetailsFragment.java @@ -18,19 +18,15 @@ package com.android.settings.connecteddevice.usb; import android.app.settings.SettingsEnums; import android.content.Context; -import android.provider.SearchIndexableResource; import androidx.annotation.VisibleForTesting; import com.android.settings.R; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.search.BaseSearchIndexProvider; -import com.android.settings.search.Indexable; import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.search.SearchIndexable; -import com.google.android.collect.Lists; - import java.util.ArrayList; import java.util.List; @@ -66,7 +62,7 @@ public class UsbDetailsFragment extends DashboardFragment { @Override protected int getPreferenceScreenResId() { - return R.xml.usb_details_fragment; + return SEARCH_INDEX_DATA_PROVIDER.getXmlResourceId(); } @Override @@ -93,7 +89,7 @@ public class UsbDetailsFragment extends DashboardFragment { /** * For Search. */ - public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = + public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = new BaseSearchIndexProvider(R.xml.usb_details_fragment) { @Override diff --git a/src/com/android/settings/datausage/BillingCycleSettings.java b/src/com/android/settings/datausage/BillingCycleSettings.java index e203456f436..74f06d7c13b 100644 --- a/src/com/android/settings/datausage/BillingCycleSettings.java +++ b/src/com/android/settings/datausage/BillingCycleSettings.java @@ -25,7 +25,6 @@ import android.content.res.Resources; import android.net.NetworkPolicy; import android.net.NetworkTemplate; import android.os.Bundle; -import android.provider.SearchIndexableResource; import android.util.Log; import android.view.LayoutInflater; import android.view.View; @@ -42,13 +41,10 @@ import androidx.preference.SwitchPreference; import com.android.settings.R; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; import com.android.settings.search.BaseSearchIndexProvider; -import com.android.settings.search.Indexable; import com.android.settingslib.NetworkPolicyEditor; import com.android.settingslib.net.DataUsageController; import com.android.settingslib.search.SearchIndexable; -import java.util.ArrayList; -import java.util.List; import java.util.TimeZone; @SearchIndexable @@ -196,7 +192,7 @@ public class BillingCycleSettings extends DataUsageBaseFragment implements @Override protected int getPreferenceScreenResId() { - return R.xml.billing_cycle; + return SEARCH_INDEX_DATA_PROVIDER.getXmlResourceId(); } @Override @@ -472,7 +468,7 @@ public class BillingCycleSettings extends DataUsageBaseFragment implements } } - public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = + public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = new BaseSearchIndexProvider(R.xml.billing_cycle) { @Override diff --git a/src/com/android/settings/datausage/DataSaverSummary.java b/src/com/android/settings/datausage/DataSaverSummary.java index b3a63d7effe..622fd13e6b3 100644 --- a/src/com/android/settings/datausage/DataSaverSummary.java +++ b/src/com/android/settings/datausage/DataSaverSummary.java @@ -197,7 +197,7 @@ public class DataSaverSummary extends SettingsPreferenceFragment } - public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = + public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = new BaseSearchIndexProvider(R.xml.data_saver) { @Override diff --git a/src/com/android/settings/datausage/UnrestrictedDataAccess.java b/src/com/android/settings/datausage/UnrestrictedDataAccess.java index cbc148c4955..e8da1027ef5 100644 --- a/src/com/android/settings/datausage/UnrestrictedDataAccess.java +++ b/src/com/android/settings/datausage/UnrestrictedDataAccess.java @@ -17,7 +17,6 @@ package com.android.settings.datausage; import android.app.settings.SettingsEnums; import android.content.Context; import android.os.Bundle; -import android.provider.SearchIndexableResource; import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; @@ -26,14 +25,10 @@ import android.view.View; import com.android.settings.R; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.search.BaseSearchIndexProvider; -import com.android.settings.search.Indexable; import com.android.settingslib.applications.ApplicationsState; import com.android.settingslib.applications.ApplicationsState.AppFilter; import com.android.settingslib.search.SearchIndexable; -import java.util.ArrayList; -import java.util.List; - @SearchIndexable public class UnrestrictedDataAccess extends DashboardFragment { @@ -114,9 +109,9 @@ public class UnrestrictedDataAccess extends DashboardFragment { @Override protected int getPreferenceScreenResId() { - return R.xml.unrestricted_data_access_settings; + return SEARCH_INDEX_DATA_PROVIDER.getXmlResourceId(); } - public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = + public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = new BaseSearchIndexProvider(R.xml.unrestricted_data_access_settings); } diff --git a/src/com/android/settings/deletionhelper/AutomaticStorageManagerSettings.java b/src/com/android/settings/deletionhelper/AutomaticStorageManagerSettings.java index 0bc9dc9f04a..e947f5f35bf 100644 --- a/src/com/android/settings/deletionhelper/AutomaticStorageManagerSettings.java +++ b/src/com/android/settings/deletionhelper/AutomaticStorageManagerSettings.java @@ -163,7 +163,7 @@ public class AutomaticStorageManagerSettings extends DashboardFragment } /** For Search. */ - public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = + public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = new BaseSearchIndexProvider() { @Override protected boolean isPageSearchEnabled(Context context) { diff --git a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java index 0e7873c931b..4be90d57dcc 100644 --- a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java +++ b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java @@ -521,7 +521,7 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra /** * For Search. */ - public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = + public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = new BaseSearchIndexProvider(R.xml.development_settings) { @Override diff --git a/src/com/android/settings/development/featureflags/FeatureFlagsDashboard.java b/src/com/android/settings/development/featureflags/FeatureFlagsDashboard.java index f0d7f1cb3c5..d5f11064d50 100644 --- a/src/com/android/settings/development/featureflags/FeatureFlagsDashboard.java +++ b/src/com/android/settings/development/featureflags/FeatureFlagsDashboard.java @@ -60,7 +60,7 @@ public class FeatureFlagsDashboard extends DashboardFragment { return 0; } - public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = + public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = new BaseSearchIndexProvider() { @Override public List getXmlResourcesToIndex(Context context, diff --git a/src/com/android/settings/development/gamedriver/GameDriverDashboard.java b/src/com/android/settings/development/gamedriver/GameDriverDashboard.java index e1f7908e32f..91057e8f73f 100644 --- a/src/com/android/settings/development/gamedriver/GameDriverDashboard.java +++ b/src/com/android/settings/development/gamedriver/GameDriverDashboard.java @@ -75,7 +75,7 @@ public class GameDriverDashboard extends DashboardFragment { switchBar.show(); } - public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = + public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = new BaseSearchIndexProvider(R.xml.game_driver_settings) { @Override diff --git a/src/com/android/settings/development/qstile/DevelopmentTileConfigFragment.java b/src/com/android/settings/development/qstile/DevelopmentTileConfigFragment.java index 82d01ac9051..e266d9c739a 100644 --- a/src/com/android/settings/development/qstile/DevelopmentTileConfigFragment.java +++ b/src/com/android/settings/development/qstile/DevelopmentTileConfigFragment.java @@ -49,7 +49,7 @@ public class DevelopmentTileConfigFragment extends DashboardFragment { return SettingsEnums.DEVELOPMENT_QS_TILE_CONFIG; } - public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = + public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = new BaseSearchIndexProvider(R.xml.development_tile_settings) { @Override diff --git a/src/com/android/settings/deviceinfo/StorageDashboardFragment.java b/src/com/android/settings/deviceinfo/StorageDashboardFragment.java index 9dab2bd4387..e11c786e8df 100644 --- a/src/com/android/settings/deviceinfo/StorageDashboardFragment.java +++ b/src/com/android/settings/deviceinfo/StorageDashboardFragment.java @@ -226,7 +226,7 @@ public class StorageDashboardFragment extends DashboardFragment /** * For Search. */ - public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = + public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = new BaseSearchIndexProvider() { @Override public List getXmlResourcesToIndex( diff --git a/src/com/android/settings/deviceinfo/StorageSettings.java b/src/com/android/settings/deviceinfo/StorageSettings.java index e791168de06..1bafd518415 100644 --- a/src/com/android/settings/deviceinfo/StorageSettings.java +++ b/src/com/android/settings/deviceinfo/StorageSettings.java @@ -542,7 +542,7 @@ public class StorageSettings extends SettingsPreferenceFragment implements Index } /** Enable indexing of searchable data */ - public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = + public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = new BaseSearchIndexProvider() { @Override public List getRawDataToIndex( diff --git a/src/com/android/settings/deviceinfo/aboutphone/MyDeviceInfoFragment.java b/src/com/android/settings/deviceinfo/aboutphone/MyDeviceInfoFragment.java index 8cbe05f0fab..b2e298068d8 100644 --- a/src/com/android/settings/deviceinfo/aboutphone/MyDeviceInfoFragment.java +++ b/src/com/android/settings/deviceinfo/aboutphone/MyDeviceInfoFragment.java @@ -173,7 +173,7 @@ public class MyDeviceInfoFragment extends DashboardFragment /** * For Search. */ - public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = + public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = new BaseSearchIndexProvider(R.xml.my_device_info) { @Override diff --git a/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionSettings.java b/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionSettings.java index 0971ba8a106..7a722f9d00d 100644 --- a/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionSettings.java +++ b/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionSettings.java @@ -47,6 +47,6 @@ public class FirmwareVersionSettings extends DashboardFragment { return SettingsEnums.DIALOG_FIRMWARE_VERSION; } - public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = + public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = 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 aadb0d55e33..fd2dcc50d57 100644 --- a/src/com/android/settings/deviceinfo/hardwareinfo/HardwareInfoFragment.java +++ b/src/com/android/settings/deviceinfo/hardwareinfo/HardwareInfoFragment.java @@ -50,7 +50,7 @@ public class HardwareInfoFragment extends DashboardFragment { return TAG; } - public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = + public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = new BaseSearchIndexProvider(R.xml.hardware_info) { @Override diff --git a/src/com/android/settings/display/AdaptiveSleepSettings.java b/src/com/android/settings/display/AdaptiveSleepSettings.java index ff955c7826e..79374804848 100644 --- a/src/com/android/settings/display/AdaptiveSleepSettings.java +++ b/src/com/android/settings/display/AdaptiveSleepSettings.java @@ -22,7 +22,6 @@ import static com.android.settings.homepage.contextualcards.slices.ContextualAda import android.app.settings.SettingsEnums; import android.content.Context; import android.os.Bundle; -import android.provider.SearchIndexableResource; import androidx.preference.Preference; @@ -30,10 +29,6 @@ import com.android.settings.R; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.search.BaseSearchIndexProvider; import com.android.settingslib.search.SearchIndexable; -import com.android.settingslib.widget.FooterPreference; - -import java.util.Arrays; -import java.util.List; @SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC) public class AdaptiveSleepSettings extends DashboardFragment { @@ -59,7 +54,7 @@ public class AdaptiveSleepSettings extends DashboardFragment { @Override protected int getPreferenceScreenResId() { - return R.xml.adaptive_sleep_detail; + return SEARCH_INDEX_DATA_PROVIDER.getXmlResourceId(); } @Override @@ -77,6 +72,6 @@ public class AdaptiveSleepSettings extends DashboardFragment { return R.string.help_url_adaptive_sleep; } - public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = + public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = new BaseSearchIndexProvider(R.xml.adaptive_sleep_detail); } diff --git a/src/com/android/settings/display/AutoBrightnessSettings.java b/src/com/android/settings/display/AutoBrightnessSettings.java index 1dd1d621f8c..38de253f55a 100644 --- a/src/com/android/settings/display/AutoBrightnessSettings.java +++ b/src/com/android/settings/display/AutoBrightnessSettings.java @@ -17,18 +17,13 @@ package com.android.settings.display; import android.app.settings.SettingsEnums; -import android.content.Context; import android.os.Bundle; -import android.provider.SearchIndexableResource; import com.android.settings.R; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.search.BaseSearchIndexProvider; import com.android.settingslib.search.SearchIndexable; -import java.util.Arrays; -import java.util.List; - @SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC) public class AutoBrightnessSettings extends DashboardFragment { @@ -41,7 +36,7 @@ public class AutoBrightnessSettings extends DashboardFragment { @Override protected int getPreferenceScreenResId() { - return R.xml.auto_brightness_detail; + return SEARCH_INDEX_DATA_PROVIDER.getXmlResourceId(); } @Override @@ -59,14 +54,6 @@ public class AutoBrightnessSettings extends DashboardFragment { return R.string.help_url_auto_brightness; } - public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = - new BaseSearchIndexProvider() { - @Override - public List getXmlResourcesToIndex( - Context context, boolean enabled) { - final SearchIndexableResource sir = new SearchIndexableResource(context); - sir.xmlResId = R.xml.auto_brightness_detail; - return Arrays.asList(sir); - } - }; + public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = + new BaseSearchIndexProvider(R.xml.auto_brightness_detail); } diff --git a/src/com/android/settings/display/ColorModePreferenceFragment.java b/src/com/android/settings/display/ColorModePreferenceFragment.java index 598d9c16bd0..a977bc749f8 100644 --- a/src/com/android/settings/display/ColorModePreferenceFragment.java +++ b/src/com/android/settings/display/ColorModePreferenceFragment.java @@ -22,22 +22,19 @@ import android.hardware.display.ColorDisplayManager; import android.net.Uri; import android.os.Handler; import android.os.Looper; -import android.provider.SearchIndexableResource; - import android.provider.Settings.Secure; + import androidx.annotation.VisibleForTesting; import androidx.preference.PreferenceScreen; import com.android.settings.R; import com.android.settings.search.BaseSearchIndexProvider; -import com.android.settings.search.Indexable; import com.android.settings.widget.RadioButtonPickerFragment; import com.android.settingslib.search.SearchIndexable; import com.android.settingslib.widget.CandidateInfo; import com.android.settingslib.widget.LayoutPreference; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; @SuppressWarnings("WeakerAccess") @@ -93,7 +90,7 @@ public class ColorModePreferenceFragment extends RadioButtonPickerFragment { @Override protected int getPreferenceScreenResId() { - return R.xml.color_mode_settings; + return SEARCH_INDEX_DATA_PROVIDER.getXmlResourceId(); } @VisibleForTesting @@ -204,15 +201,8 @@ public class ColorModePreferenceFragment extends RadioButtonPickerFragment { } } - public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = - new BaseSearchIndexProvider() { - @Override - public List getXmlResourcesToIndex( - Context context, boolean enabled) { - final SearchIndexableResource sir = new SearchIndexableResource(context); - sir.xmlResId = R.xml.color_mode_settings; - return Arrays.asList(sir); - } + public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = + new BaseSearchIndexProvider(R.xml.color_mode_settings) { @Override protected boolean isPageSearchEnabled(Context context) { diff --git a/src/com/android/settings/display/NightDisplaySettings.java b/src/com/android/settings/display/NightDisplaySettings.java index 490e4fa2c34..fa69d70dbdc 100644 --- a/src/com/android/settings/display/NightDisplaySettings.java +++ b/src/com/android/settings/display/NightDisplaySettings.java @@ -23,19 +23,15 @@ import android.content.Context; import android.hardware.display.ColorDisplayManager; import android.hardware.display.NightDisplayListener; import android.os.Bundle; -import android.provider.SearchIndexableResource; import androidx.preference.Preference; import com.android.settings.R; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.search.BaseSearchIndexProvider; -import com.android.settings.search.Indexable; import com.android.settingslib.search.SearchIndexable; import java.time.LocalTime; -import java.util.ArrayList; -import java.util.List; /** * Settings screen for Night display. @@ -157,7 +153,7 @@ public class NightDisplaySettings extends DashboardFragment @Override protected int getPreferenceScreenResId() { - return R.xml.night_display_settings; + return SEARCH_INDEX_DATA_PROVIDER.getXmlResourceId(); } @Override @@ -175,7 +171,7 @@ public class NightDisplaySettings extends DashboardFragment return TAG; } - public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = + public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = new BaseSearchIndexProvider(R.xml.night_display_settings) { @Override diff --git a/src/com/android/settings/display/ScreenZoomSettings.java b/src/com/android/settings/display/ScreenZoomSettings.java index 13c76ce2d7b..d0a19ee6a45 100644 --- a/src/com/android/settings/display/ScreenZoomSettings.java +++ b/src/com/android/settings/display/ScreenZoomSettings.java @@ -118,7 +118,7 @@ public class ScreenZoomSettings extends PreviewSeekBarPreferenceFragment { } /** Index provider used to expose this fragment in search. */ - public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = + public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = new BaseSearchIndexProvider() { @Override public List getRawDataToIndex(Context context, diff --git a/src/com/android/settings/display/ToggleFontSizePreferenceFragment.java b/src/com/android/settings/display/ToggleFontSizePreferenceFragment.java index 49177a0b8ba..98d6432f963 100644 --- a/src/com/android/settings/display/ToggleFontSizePreferenceFragment.java +++ b/src/com/android/settings/display/ToggleFontSizePreferenceFragment.java @@ -115,7 +115,7 @@ public class ToggleFontSizePreferenceFragment extends PreviewSeekBarPreferenceFr return indices.length - 1; } - public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = + public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = new BaseSearchIndexProvider() { @Override public List getRawDataToIndex(Context context, diff --git a/src/com/android/settings/dream/DreamSettings.java b/src/com/android/settings/dream/DreamSettings.java index 5b1a8436c9f..5bbf910b9eb 100644 --- a/src/com/android/settings/dream/DreamSettings.java +++ b/src/com/android/settings/dream/DreamSettings.java @@ -23,7 +23,6 @@ import static com.android.settingslib.dream.DreamBackend.WHILE_DOCKED; import android.app.settings.SettingsEnums; import android.content.Context; -import android.provider.SearchIndexableResource; import androidx.annotation.VisibleForTesting; @@ -36,7 +35,6 @@ import com.android.settingslib.dream.DreamBackend.WhenToDream; import com.android.settingslib.search.SearchIndexable; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; @SearchIndexable @@ -98,7 +96,7 @@ public class DreamSettings extends DashboardFragment { @Override protected int getPreferenceScreenResId() { - return R.xml.dream_fragment_overview; + return SEARCH_INDEX_DATA_PROVIDER.getXmlResourceId(); } @Override @@ -137,7 +135,7 @@ public class DreamSettings extends DashboardFragment { return controllers; } - public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER + public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = new BaseSearchIndexProvider(R.xml.dream_fragment_overview) { @Override diff --git a/src/com/android/settings/enterprise/EnterprisePrivacySettings.java b/src/com/android/settings/enterprise/EnterprisePrivacySettings.java index 1490feb9bc2..dd0a9ce8793 100644 --- a/src/com/android/settings/enterprise/EnterprisePrivacySettings.java +++ b/src/com/android/settings/enterprise/EnterprisePrivacySettings.java @@ -98,7 +98,7 @@ public class EnterprisePrivacySettings extends DashboardFragment { .hasDeviceOwner(); } - public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = + public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = new BaseSearchIndexProvider(R.xml.enterprise_privacy_settings) { @Override protected boolean isPageSearchEnabled(Context context) { diff --git a/src/com/android/settings/flashlight/FlashlightHandleActivity.java b/src/com/android/settings/flashlight/FlashlightHandleActivity.java index 0c50f91c896..075c39bd9f0 100644 --- a/src/com/android/settings/flashlight/FlashlightHandleActivity.java +++ b/src/com/android/settings/flashlight/FlashlightHandleActivity.java @@ -53,7 +53,7 @@ public class FlashlightHandleActivity extends Activity implements Indexable { finish(); } - public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = + public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = new BaseSearchIndexProvider() { @Override diff --git a/src/com/android/settings/fuelgauge/PowerUsageAdvanced.java b/src/com/android/settings/fuelgauge/PowerUsageAdvanced.java index 669d7ed0b7f..befede46b9b 100644 --- a/src/com/android/settings/fuelgauge/PowerUsageAdvanced.java +++ b/src/com/android/settings/fuelgauge/PowerUsageAdvanced.java @@ -166,7 +166,7 @@ public class PowerUsageAdvanced extends PowerUsageBase { } } - public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = + public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = new BaseSearchIndexProvider() { @Override public List getXmlResourcesToIndex( diff --git a/src/com/android/settings/fuelgauge/PowerUsageSummary.java b/src/com/android/settings/fuelgauge/PowerUsageSummary.java index 42ea52bd11f..08d70aa6a12 100644 --- a/src/com/android/settings/fuelgauge/PowerUsageSummary.java +++ b/src/com/android/settings/fuelgauge/PowerUsageSummary.java @@ -24,7 +24,6 @@ import android.database.ContentObserver; import android.net.Uri; import android.os.Bundle; import android.os.Handler; -import android.provider.SearchIndexableResource; import android.provider.Settings.Global; import android.text.format.Formatter; import android.view.Menu; @@ -54,7 +53,6 @@ import com.android.settingslib.utils.PowerUtil; import com.android.settingslib.utils.StringUtil; import com.android.settingslib.widget.LayoutPreference; -import java.util.Collections; import java.util.List; /** @@ -254,7 +252,7 @@ public class PowerUsageSummary extends PowerUsageBase implements OnLongClickList @Override protected int getPreferenceScreenResId() { - return R.xml.power_usage_summary; + return SEARCH_INDEX_DATA_PROVIDER.getXmlResourceId(); } @Override @@ -395,6 +393,6 @@ public class PowerUsageSummary extends PowerUsageBase implements OnLongClickList } - public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = + public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = new BaseSearchIndexProvider(R.xml.power_usage_summary); } diff --git a/src/com/android/settings/fuelgauge/SmartBatterySettings.java b/src/com/android/settings/fuelgauge/SmartBatterySettings.java index 130c1f2ad6f..e9d637ce58d 100644 --- a/src/com/android/settings/fuelgauge/SmartBatterySettings.java +++ b/src/com/android/settings/fuelgauge/SmartBatterySettings.java @@ -78,7 +78,7 @@ public class SmartBatterySettings extends DashboardFragment { return controllers; } - public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = + public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = new BaseSearchIndexProvider() { @Override public List getXmlResourcesToIndex( diff --git a/src/com/android/settings/fuelgauge/batterysaver/BatterySaverSettings.java b/src/com/android/settings/fuelgauge/batterysaver/BatterySaverSettings.java index 6216917180f..2b283916ce7 100644 --- a/src/com/android/settings/fuelgauge/batterysaver/BatterySaverSettings.java +++ b/src/com/android/settings/fuelgauge/batterysaver/BatterySaverSettings.java @@ -17,8 +17,6 @@ package com.android.settings.fuelgauge.batterysaver; import android.app.settings.SettingsEnums; -import android.content.Context; -import android.provider.SearchIndexableResource; import android.text.Annotation; import android.text.Spannable; import android.text.SpannableStringBuilder; @@ -34,14 +32,10 @@ import androidx.fragment.app.Fragment; import com.android.settings.R; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.search.BaseSearchIndexProvider; -import com.android.settings.search.Indexable; import com.android.settingslib.HelpUtils; import com.android.settingslib.search.SearchIndexable; import com.android.settingslib.widget.FooterPreference; -import java.util.Arrays; -import java.util.List; - /** * Battery saver settings page */ @@ -65,7 +59,7 @@ public class BatterySaverSettings extends DashboardFragment { @Override protected int getPreferenceScreenResId() { - return R.xml.battery_saver_settings; + return SEARCH_INDEX_DATA_PROVIDER.getXmlResourceId(); } @Override @@ -81,16 +75,8 @@ public class BatterySaverSettings extends DashboardFragment { /** * For Search. */ - public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = - new BaseSearchIndexProvider() { - @Override - public List getXmlResourcesToIndex( - Context context, boolean enabled) { - final SearchIndexableResource sir = new SearchIndexableResource(context); - sir.xmlResId = R.xml.battery_saver_settings; - return Arrays.asList(sir); - } - }; + public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = + new BaseSearchIndexProvider(R.xml.battery_saver_settings); // Updates the footer for this page. @VisibleForTesting diff --git a/src/com/android/settings/gestures/AssistGestureSettings.java b/src/com/android/settings/gestures/AssistGestureSettings.java index b67fd659287..f56416c3d6f 100644 --- a/src/com/android/settings/gestures/AssistGestureSettings.java +++ b/src/com/android/settings/gestures/AssistGestureSettings.java @@ -66,7 +66,7 @@ public class AssistGestureSettings extends DashboardFragment { return controllers; } - public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = + public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = new BaseSearchIndexProvider() { @Override public List getXmlResourcesToIndex( diff --git a/src/com/android/settings/gestures/DoubleTapPowerSettings.java b/src/com/android/settings/gestures/DoubleTapPowerSettings.java index 628a2131471..466fe912271 100644 --- a/src/com/android/settings/gestures/DoubleTapPowerSettings.java +++ b/src/com/android/settings/gestures/DoubleTapPowerSettings.java @@ -63,6 +63,6 @@ public class DoubleTapPowerSettings extends DashboardFragment { return R.xml.double_tap_power_settings; } - public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = + public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = 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 9a21fed1e0c..7c7a02f25c8 100644 --- a/src/com/android/settings/gestures/DoubleTapScreenSettings.java +++ b/src/com/android/settings/gestures/DoubleTapScreenSettings.java @@ -72,6 +72,6 @@ public class DoubleTapScreenSettings extends DashboardFragment { return R.string.help_url_double_tap_screen; } - public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = + public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = new BaseSearchIndexProvider(R.xml.double_tap_screen_settings); } diff --git a/src/com/android/settings/gestures/DoubleTwistGestureSettings.java b/src/com/android/settings/gestures/DoubleTwistGestureSettings.java index 34819299b00..9ea718075ce 100644 --- a/src/com/android/settings/gestures/DoubleTwistGestureSettings.java +++ b/src/com/android/settings/gestures/DoubleTwistGestureSettings.java @@ -63,7 +63,7 @@ public class DoubleTwistGestureSettings extends DashboardFragment { return R.xml.double_twist_gesture_settings; } - public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = + public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = new BaseSearchIndexProvider() { @Override public List getXmlResourcesToIndex( diff --git a/src/com/android/settings/gestures/GestureSettings.java b/src/com/android/settings/gestures/GestureSettings.java index db402cc04d9..763efaf9f17 100644 --- a/src/com/android/settings/gestures/GestureSettings.java +++ b/src/com/android/settings/gestures/GestureSettings.java @@ -66,7 +66,7 @@ public class GestureSettings extends DashboardFragment { return mAmbientDisplayConfig; } - public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = + public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = new BaseSearchIndexProvider() { @Override public List getXmlResourcesToIndex( diff --git a/src/com/android/settings/gestures/GlobalActionsPanelSettings.java b/src/com/android/settings/gestures/GlobalActionsPanelSettings.java index fee793f4fdf..34db20ed15c 100644 --- a/src/com/android/settings/gestures/GlobalActionsPanelSettings.java +++ b/src/com/android/settings/gestures/GlobalActionsPanelSettings.java @@ -17,17 +17,12 @@ package com.android.settings.gestures; import android.app.settings.SettingsEnums; -import android.content.Context; -import android.provider.SearchIndexableResource; import com.android.settings.R; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.search.BaseSearchIndexProvider; import com.android.settingslib.search.SearchIndexable; -import java.util.Arrays; -import java.util.List; - @SearchIndexable public class GlobalActionsPanelSettings extends DashboardFragment { @@ -45,9 +40,9 @@ public class GlobalActionsPanelSettings extends DashboardFragment { @Override protected int getPreferenceScreenResId() { - return R.xml.global_actions_panel_settings; + return SEARCH_INDEX_DATA_PROVIDER.getXmlResourceId(); } - public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = + public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = 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 caf0d7dae9e..6c7c5871262 100644 --- a/src/com/android/settings/gestures/PickupGestureSettings.java +++ b/src/com/android/settings/gestures/PickupGestureSettings.java @@ -20,7 +20,6 @@ import android.app.settings.SettingsEnums; import android.content.Context; import android.content.SharedPreferences; import android.hardware.display.AmbientDisplayConfiguration; -import android.provider.SearchIndexableResource; import com.android.settings.R; import com.android.settings.dashboard.DashboardFragment; @@ -29,9 +28,6 @@ import com.android.settings.overlay.FeatureFactory; import com.android.settings.search.BaseSearchIndexProvider; import com.android.settingslib.search.SearchIndexable; -import java.util.Arrays; -import java.util.List; - @SearchIndexable public class PickupGestureSettings extends DashboardFragment { @@ -64,7 +60,7 @@ public class PickupGestureSettings extends DashboardFragment { @Override protected int getPreferenceScreenResId() { - return R.xml.pick_up_gesture_settings; + return SEARCH_INDEX_DATA_PROVIDER.getXmlResourceId(); } @Override @@ -72,7 +68,7 @@ public class PickupGestureSettings extends DashboardFragment { return R.string.help_url_pickup_gesture; } - public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = + public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = 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 9740a3fe67c..d327b71267a 100644 --- a/src/com/android/settings/gestures/PreventRingingGestureSettings.java +++ b/src/com/android/settings/gestures/PreventRingingGestureSettings.java @@ -74,7 +74,7 @@ public class PreventRingingGestureSettings extends DashboardFragment { return R.string.help_uri_prevent_ringing_gesture; } - public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = + public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = new BaseSearchIndexProvider(R.xml.prevent_ringing_gesture_settings) { @Override diff --git a/src/com/android/settings/gestures/SwipeToNotificationSettings.java b/src/com/android/settings/gestures/SwipeToNotificationSettings.java index 90ac4e6ce99..caa760a0c7c 100644 --- a/src/com/android/settings/gestures/SwipeToNotificationSettings.java +++ b/src/com/android/settings/gestures/SwipeToNotificationSettings.java @@ -19,7 +19,6 @@ package com.android.settings.gestures; import android.app.settings.SettingsEnums; import android.content.Context; import android.content.SharedPreferences; -import android.provider.SearchIndexableResource; import com.android.settings.R; import com.android.settings.dashboard.DashboardFragment; @@ -28,9 +27,6 @@ import com.android.settings.overlay.FeatureFactory; import com.android.settings.search.BaseSearchIndexProvider; import com.android.settingslib.search.SearchIndexable; -import java.util.Arrays; -import java.util.List; - @SearchIndexable public class SwipeToNotificationSettings extends DashboardFragment { @@ -60,10 +56,10 @@ public class SwipeToNotificationSettings extends DashboardFragment { @Override protected int getPreferenceScreenResId() { - return R.xml.swipe_to_notification_settings; + return SEARCH_INDEX_DATA_PROVIDER.getXmlResourceId(); } - public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = + public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = new BaseSearchIndexProvider(R.xml.swipe_to_notification_settings) { @Override diff --git a/src/com/android/settings/gestures/SystemNavigationGestureSettings.java b/src/com/android/settings/gestures/SystemNavigationGestureSettings.java index b9c390d464a..79379ef3750 100644 --- a/src/com/android/settings/gestures/SystemNavigationGestureSettings.java +++ b/src/com/android/settings/gestures/SystemNavigationGestureSettings.java @@ -325,7 +325,7 @@ public class SystemNavigationGestureSettings extends RadioButtonPickerFragment { Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_NAVBAR_ENABLED, 0) == 1; } - public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = + public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = new BaseSearchIndexProvider(R.xml.system_navigation_gesture_settings) { @Override diff --git a/src/com/android/settings/gestures/TapScreenGestureSettings.java b/src/com/android/settings/gestures/TapScreenGestureSettings.java index bd09d552309..a1a8e426a77 100644 --- a/src/com/android/settings/gestures/TapScreenGestureSettings.java +++ b/src/com/android/settings/gestures/TapScreenGestureSettings.java @@ -67,6 +67,6 @@ public class TapScreenGestureSettings extends DashboardFragment { return R.xml.tap_screen_gesture_settings; } - public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = + public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = 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 ce53e52d178..cbae8639e93 100644 --- a/src/com/android/settings/homepage/TopLevelSettings.java +++ b/src/com/android/settings/homepage/TopLevelSettings.java @@ -22,7 +22,6 @@ import static com.android.settingslib.search.SearchIndexable.MOBILE; import android.app.settings.SettingsEnums; import android.content.Context; import android.os.Bundle; -import android.provider.SearchIndexableResource; import androidx.fragment.app.Fragment; import androidx.preference.Preference; @@ -36,9 +35,6 @@ import com.android.settings.support.SupportPreferenceController; import com.android.settingslib.core.instrumentation.Instrumentable; import com.android.settingslib.search.SearchIndexable; -import java.util.Arrays; -import java.util.List; - @SearchIndexable(forTarget = MOBILE) public class TopLevelSettings extends DashboardFragment implements PreferenceFragmentCompat.OnPreferenceStartFragmentCallback { @@ -54,7 +50,7 @@ public class TopLevelSettings extends DashboardFragment implements @Override protected int getPreferenceScreenResId() { - return R.xml.top_level_settings; + return SEARCH_INDEX_DATA_PROVIDER.getXmlResourceId(); } @Override @@ -103,7 +99,7 @@ public class TopLevelSettings extends DashboardFragment implements .getBoolean(R.bool.config_force_rounded_icon_TopLevelSettings); } - public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = + public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = new BaseSearchIndexProvider(R.xml.top_level_settings) { @Override diff --git a/src/com/android/settings/inputmethod/AvailableVirtualKeyboardFragment.java b/src/com/android/settings/inputmethod/AvailableVirtualKeyboardFragment.java index c37d2b5ae5e..686558c73a1 100644 --- a/src/com/android/settings/inputmethod/AvailableVirtualKeyboardFragment.java +++ b/src/com/android/settings/inputmethod/AvailableVirtualKeyboardFragment.java @@ -113,7 +113,7 @@ public final class AvailableVirtualKeyboardFragment extends SettingsPreferenceFr } } - public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = + public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = new BaseSearchIndexProvider() { @Override public List getXmlResourcesToIndex(Context context, diff --git a/src/com/android/settings/inputmethod/PhysicalKeyboardFragment.java b/src/com/android/settings/inputmethod/PhysicalKeyboardFragment.java index 119571dc1c0..c154f6136f9 100644 --- a/src/com/android/settings/inputmethod/PhysicalKeyboardFragment.java +++ b/src/com/android/settings/inputmethod/PhysicalKeyboardFragment.java @@ -332,7 +332,7 @@ public final class PhysicalKeyboardFragment extends SettingsPreferenceFragment } } - public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = + public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = new BaseSearchIndexProvider() { @Override public List getXmlResourcesToIndex( diff --git a/src/com/android/settings/inputmethod/UserDictionaryList.java b/src/com/android/settings/inputmethod/UserDictionaryList.java index 497b380ca63..310c1e85664 100644 --- a/src/com/android/settings/inputmethod/UserDictionaryList.java +++ b/src/com/android/settings/inputmethod/UserDictionaryList.java @@ -75,7 +75,7 @@ public class UserDictionaryList extends DashboardFragment { return TAG; } - public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = + public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = new BaseSearchIndexProvider() { @Override public List getXmlResourcesToIndex(Context context, diff --git a/src/com/android/settings/inputmethod/VirtualKeyboardFragment.java b/src/com/android/settings/inputmethod/VirtualKeyboardFragment.java index 61dbd31c259..dfdb50a6d3e 100644 --- a/src/com/android/settings/inputmethod/VirtualKeyboardFragment.java +++ b/src/com/android/settings/inputmethod/VirtualKeyboardFragment.java @@ -49,7 +49,7 @@ public final class VirtualKeyboardFragment extends DashboardFragment { return SettingsEnums.VIRTUAL_KEYBOARDS; } - public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = + public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = new BaseSearchIndexProvider() { @Override public List getXmlResourcesToIndex( diff --git a/src/com/android/settings/language/LanguageAndInputSettings.java b/src/com/android/settings/language/LanguageAndInputSettings.java index 771d718ee16..45caeb535ef 100644 --- a/src/com/android/settings/language/LanguageAndInputSettings.java +++ b/src/com/android/settings/language/LanguageAndInputSettings.java @@ -22,7 +22,6 @@ import android.content.ComponentName; import android.content.ContentResolver; import android.content.Context; import android.content.pm.PackageManager; -import android.provider.SearchIndexableResource; import android.provider.Settings; import android.text.TextUtils; import android.view.inputmethod.InputMethodInfo; @@ -81,7 +80,7 @@ public class LanguageAndInputSettings extends DashboardFragment { @Override protected int getPreferenceScreenResId() { - return R.xml.language_and_input; + return SEARCH_INDEX_DATA_PROVIDER.getXmlResourceId(); } @Override @@ -161,7 +160,7 @@ public class LanguageAndInputSettings extends DashboardFragment { public static final SummaryLoader.SummaryProviderFactory SUMMARY_PROVIDER_FACTORY = (activity, summaryLoader) -> new SummaryProvider(activity, summaryLoader); - public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = + public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = new BaseSearchIndexProvider(R.xml.language_and_input) { @Override diff --git a/src/com/android/settings/location/LocationSettings.java b/src/com/android/settings/location/LocationSettings.java index d36eaaddf4e..d455a928001 100644 --- a/src/com/android/settings/location/LocationSettings.java +++ b/src/com/android/settings/location/LocationSettings.java @@ -20,7 +20,6 @@ import android.app.settings.SettingsEnums; import android.content.Context; import android.location.SettingInjectorService; import android.os.Bundle; -import android.provider.SearchIndexableResource; import androidx.preference.Preference; import androidx.preference.PreferenceGroup; @@ -29,7 +28,6 @@ import com.android.settings.R; import com.android.settings.SettingsActivity; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.search.BaseSearchIndexProvider; -import com.android.settings.search.Indexable; import com.android.settings.widget.SwitchBar; import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.core.lifecycle.Lifecycle; @@ -37,7 +35,6 @@ import com.android.settingslib.location.RecentLocationApps; import com.android.settingslib.search.SearchIndexable; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collections; import java.util.Comparator; import java.util.List; @@ -86,7 +83,7 @@ public class LocationSettings extends DashboardFragment { @Override protected int getPreferenceScreenResId() { - return R.xml.location_settings; + return SEARCH_INDEX_DATA_PROVIDER.getXmlResourceId(); } @Override @@ -128,7 +125,7 @@ public class LocationSettings extends DashboardFragment { /** * For Search. */ - public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = + public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = new BaseSearchIndexProvider(R.xml.location_settings) { @Override diff --git a/src/com/android/settings/location/RecentLocationRequestSeeAllFragment.java b/src/com/android/settings/location/RecentLocationRequestSeeAllFragment.java index b704cb4de25..c31a78310dd 100644 --- a/src/com/android/settings/location/RecentLocationRequestSeeAllFragment.java +++ b/src/com/android/settings/location/RecentLocationRequestSeeAllFragment.java @@ -16,7 +16,6 @@ package com.android.settings.location; import android.content.Context; -import android.provider.SearchIndexableResource; import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; @@ -25,13 +24,11 @@ import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.search.BaseSearchIndexProvider; -import com.android.settings.search.Indexable; import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settingslib.search.SearchIndexable; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; /** Dashboard Fragment to display all recent location requests, sorted by recency. */ @@ -56,7 +53,7 @@ public class RecentLocationRequestSeeAllFragment extends DashboardFragment { @Override protected int getPreferenceScreenResId() { - return R.xml.location_recent_requests_see_all; + return SEARCH_INDEX_DATA_PROVIDER.getXmlResourceId(); } @Override @@ -105,7 +102,7 @@ public class RecentLocationRequestSeeAllFragment extends DashboardFragment { /** * For Search. */ - public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = + public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = new BaseSearchIndexProvider(R.xml.location_recent_requests_see_all) { @Override diff --git a/src/com/android/settings/location/ScanningSettings.java b/src/com/android/settings/location/ScanningSettings.java index c031f4d85bb..b95f9769aaf 100644 --- a/src/com/android/settings/location/ScanningSettings.java +++ b/src/com/android/settings/location/ScanningSettings.java @@ -18,17 +18,14 @@ package com.android.settings.location; import android.app.settings.SettingsEnums; import android.content.Context; -import android.provider.SearchIndexableResource; import com.android.settings.R; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.search.BaseSearchIndexProvider; -import com.android.settings.search.Indexable; import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.search.SearchIndexable; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; /** @@ -45,7 +42,7 @@ public class ScanningSettings extends DashboardFragment { @Override protected int getPreferenceScreenResId() { - return R.xml.location_scanning; + return SEARCH_INDEX_DATA_PROVIDER.getXmlResourceId(); } @Override @@ -68,7 +65,7 @@ public class ScanningSettings extends DashboardFragment { /** * For Search. */ - public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = + public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = new BaseSearchIndexProvider(R.xml.location_scanning) { @Override diff --git a/src/com/android/settings/network/MobileNetworkListFragment.java b/src/com/android/settings/network/MobileNetworkListFragment.java index 5afa9947b7d..cae02f96c21 100644 --- a/src/com/android/settings/network/MobileNetworkListFragment.java +++ b/src/com/android/settings/network/MobileNetworkListFragment.java @@ -19,7 +19,6 @@ package com.android.settings.network; import android.app.settings.SettingsEnums; import android.content.Context; import android.os.UserManager; -import android.provider.SearchIndexableResource; import com.android.settings.R; import com.android.settings.dashboard.DashboardFragment; @@ -36,7 +35,7 @@ public class MobileNetworkListFragment extends DashboardFragment { @Override protected int getPreferenceScreenResId() { - return R.xml.mobile_network_list; + return SEARCH_INDEX_DATA_PROVIDER.getXmlResourceId(); } @Override @@ -56,7 +55,7 @@ public class MobileNetworkListFragment extends DashboardFragment { return controllers; } - public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = + public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = new BaseSearchIndexProvider(R.xml.mobile_network_list) { @Override diff --git a/src/com/android/settings/network/NetworkDashboardFragment.java b/src/com/android/settings/network/NetworkDashboardFragment.java index 8c686a54aae..92c55cb5692 100644 --- a/src/com/android/settings/network/NetworkDashboardFragment.java +++ b/src/com/android/settings/network/NetworkDashboardFragment.java @@ -162,7 +162,7 @@ public class NetworkDashboardFragment extends DashboardFragment implements return 0; } - public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = + public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = new BaseSearchIndexProvider() { @Override public List getXmlResourcesToIndex( diff --git a/src/com/android/settings/network/telephony/MobileNetworkSettings.java b/src/com/android/settings/network/telephony/MobileNetworkSettings.java index 2dc9f91039a..d770e0280e9 100644 --- a/src/com/android/settings/network/telephony/MobileNetworkSettings.java +++ b/src/com/android/settings/network/telephony/MobileNetworkSettings.java @@ -271,7 +271,7 @@ public class MobileNetworkSettings extends RestrictedDashboardFragment { return super.onOptionsItemSelected(menuItem); } - public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = + public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = new BaseSearchIndexProvider() { @Override public List getXmlResourcesToIndex(Context context, diff --git a/src/com/android/settings/nfc/PaymentSettings.java b/src/com/android/settings/nfc/PaymentSettings.java index 62a3d54fe65..600f92b6da7 100644 --- a/src/com/android/settings/nfc/PaymentSettings.java +++ b/src/com/android/settings/nfc/PaymentSettings.java @@ -24,7 +24,6 @@ import android.content.pm.UserInfo; import android.os.Bundle; import android.os.UserHandle; import android.os.UserManager; -import android.provider.SearchIndexableResource; import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; @@ -36,9 +35,6 @@ import com.android.settings.dashboard.DashboardFragment; import com.android.settings.search.BaseSearchIndexProvider; import com.android.settingslib.search.SearchIndexable; -import java.util.Arrays; -import java.util.List; - @SearchIndexable public class PaymentSettings extends DashboardFragment { @@ -58,7 +54,7 @@ public class PaymentSettings extends DashboardFragment { @Override protected int getPreferenceScreenResId() { - return R.xml.nfc_payment_settings; + return SEARCH_INDEX_DATA_PROVIDER.getXmlResourceId(); } @Override @@ -101,7 +97,7 @@ public class PaymentSettings extends DashboardFragment { menuItem.setShowAsActionFlags(MenuItem.SHOW_AS_ACTION_NEVER); } - public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = + public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = new BaseSearchIndexProvider(R.xml.nfc_payment_settings) { @Override diff --git a/src/com/android/settings/notification/AppBubbleNotificationSettings.java b/src/com/android/settings/notification/AppBubbleNotificationSettings.java index 2517573f0ad..82bab2447bb 100644 --- a/src/com/android/settings/notification/AppBubbleNotificationSettings.java +++ b/src/com/android/settings/notification/AppBubbleNotificationSettings.java @@ -23,7 +23,6 @@ import android.util.Log; import com.android.settings.R; import com.android.settings.search.BaseSearchIndexProvider; -import com.android.settings.search.Indexable; import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.search.SearchIndexable; @@ -99,7 +98,7 @@ public class AppBubbleNotificationSettings extends NotificationSettingsBase impl super.onPause(); } - public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = + public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = new BaseSearchIndexProvider() { @Override diff --git a/src/com/android/settings/notification/ConfigureNotificationSettings.java b/src/com/android/settings/notification/ConfigureNotificationSettings.java index 7174b9d4b65..f5765d74dc9 100644 --- a/src/com/android/settings/notification/ConfigureNotificationSettings.java +++ b/src/com/android/settings/notification/ConfigureNotificationSettings.java @@ -28,7 +28,6 @@ import android.os.Bundle; import android.os.ServiceManager; import android.os.UserHandle; import android.os.UserManager; -import android.provider.SearchIndexableResource; import android.text.TextUtils; import androidx.annotation.VisibleForTesting; @@ -43,13 +42,10 @@ import com.android.settings.core.OnActivityResultListener; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.dashboard.SummaryLoader; import com.android.settings.search.BaseSearchIndexProvider; -import com.android.settings.search.Indexable; import com.android.settingslib.core.AbstractPreferenceController; -import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settingslib.search.SearchIndexable; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; @SearchIndexable @@ -80,7 +76,7 @@ public class ConfigureNotificationSettings extends DashboardFragment implements @Override protected int getPreferenceScreenResId() { - return R.xml.configure_notification_settings; + return SEARCH_INDEX_DATA_PROVIDER.getXmlResourceId(); } @Override @@ -217,7 +213,7 @@ public class ConfigureNotificationSettings extends DashboardFragment implements /** * For Search. */ - public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = + public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = new BaseSearchIndexProvider(R.xml.configure_notification_settings) { @Override diff --git a/src/com/android/settings/notification/NotificationAccessSettings.java b/src/com/android/settings/notification/NotificationAccessSettings.java index a8533fa0811..82e3deead5b 100644 --- a/src/com/android/settings/notification/NotificationAccessSettings.java +++ b/src/com/android/settings/notification/NotificationAccessSettings.java @@ -190,6 +190,6 @@ public class NotificationAccessSettings extends ManagedServiceSettings { } } - public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = + public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = 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 41fc7c189f2..4cfc7da4207 100644 --- a/src/com/android/settings/notification/NotificationAssistantPicker.java +++ b/src/com/android/settings/notification/NotificationAssistantPicker.java @@ -23,18 +23,14 @@ import android.content.pm.PackageItemInfo; import android.content.pm.PackageManager; import android.content.pm.ServiceInfo; import android.graphics.drawable.Drawable; -import android.os.RemoteException; -import android.provider.SearchIndexableResource; import android.provider.Settings; import android.service.notification.NotificationAssistantService; import android.text.TextUtils; -import android.util.Log; import com.android.internal.annotations.VisibleForTesting; import com.android.settings.R; import com.android.settings.applications.defaultapps.DefaultAppPickerFragment; import com.android.settings.search.BaseSearchIndexProvider; -import com.android.settings.search.Indexable; import com.android.settingslib.applications.DefaultAppInfo; import com.android.settingslib.applications.ServiceListing; import com.android.settingslib.widget.CandidateInfo; @@ -78,7 +74,7 @@ public class NotificationAssistantPicker extends DefaultAppPickerFragment implem @Override protected int getPreferenceScreenResId() { - return R.xml.notification_assistant_settings; + return SEARCH_INDEX_DATA_PROVIDER.getXmlResourceId(); } @Override @@ -128,7 +124,7 @@ public class NotificationAssistantPicker extends DefaultAppPickerFragment implem mCandidateInfos = list; } - public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = + public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = new BaseSearchIndexProvider(R.xml.notification_assistant_settings); public static class CandidateNone extends CandidateInfo { diff --git a/src/com/android/settings/notification/ZenAccessSettings.java b/src/com/android/settings/notification/ZenAccessSettings.java index 947bf1f79cf..1d1a48b7116 100644 --- a/src/com/android/settings/notification/ZenAccessSettings.java +++ b/src/com/android/settings/notification/ZenAccessSettings.java @@ -25,7 +25,6 @@ import android.content.pm.ApplicationInfo; import android.content.pm.PackageItemInfo; import android.content.pm.PackageManager; import android.os.Bundle; -import android.provider.SearchIndexableResource; import android.util.ArraySet; import android.view.View; @@ -37,7 +36,6 @@ import com.android.settings.applications.specialaccess.zenaccess.ZenAccessContro import com.android.settings.applications.specialaccess.zenaccess.ZenAccessDetails; import com.android.settings.applications.specialaccess.zenaccess.ZenAccessSettingObserverMixin; import com.android.settings.search.BaseSearchIndexProvider; -import com.android.settings.search.Indexable; import com.android.settings.widget.EmptyTextSettings; import com.android.settingslib.search.SearchIndexable; import com.android.settingslib.widget.apppreference.AppPreference; @@ -80,7 +78,7 @@ public class ZenAccessSettings extends EmptyTextSettings implements @Override protected int getPreferenceScreenResId() { - return R.xml.zen_access_settings; + return SEARCH_INDEX_DATA_PROVIDER.getXmlResourceId(); } @Override @@ -159,6 +157,6 @@ public class ZenAccessSettings extends EmptyTextSettings implements : R.string.app_permission_summary_not_allowed; } - public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = + public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = 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 5498c3a2c22..ae5029ffa93 100644 --- a/src/com/android/settings/notification/ZenModeAutomationSettings.java +++ b/src/com/android/settings/notification/ZenModeAutomationSettings.java @@ -23,7 +23,6 @@ import android.app.settings.SettingsEnums; import android.content.Context; import android.content.DialogInterface; import android.os.Bundle; -import android.provider.SearchIndexableResource; import android.service.notification.ConditionProviderService; import android.view.Menu; import android.view.MenuInflater; @@ -33,7 +32,6 @@ import androidx.fragment.app.Fragment; import com.android.settings.R; import com.android.settings.search.BaseSearchIndexProvider; -import com.android.settings.search.Indexable; import com.android.settings.utils.ManagedServiceSettings; import com.android.settings.utils.ZenServiceListing; import com.android.settingslib.core.AbstractPreferenceController; @@ -81,7 +79,7 @@ public class ZenModeAutomationSettings extends ZenModeSettingsBase { @Override protected int getPreferenceScreenResId() { - return R.xml.zen_mode_automation_settings; + return SEARCH_INDEX_DATA_PROVIDER.getXmlResourceId(); } @Override @@ -148,7 +146,7 @@ public class ZenModeAutomationSettings extends ZenModeSettingsBase { /** * For Search. */ - public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = + public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = new BaseSearchIndexProvider(R.xml.zen_mode_automation_settings) { @Override diff --git a/src/com/android/settings/notification/ZenModeBlockedEffectsSettings.java b/src/com/android/settings/notification/ZenModeBlockedEffectsSettings.java index d361de8a4ea..ac6698b1ecb 100644 --- a/src/com/android/settings/notification/ZenModeBlockedEffectsSettings.java +++ b/src/com/android/settings/notification/ZenModeBlockedEffectsSettings.java @@ -27,7 +27,6 @@ import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_STATUS_BA import android.app.settings.SettingsEnums; import android.content.Context; import android.os.Bundle; -import android.provider.SearchIndexableResource; import com.android.settings.R; import com.android.settings.search.BaseSearchIndexProvider; @@ -82,7 +81,7 @@ public class ZenModeBlockedEffectsSettings extends ZenModeSettingsBase implement @Override protected int getPreferenceScreenResId() { - return R.xml.zen_mode_block_settings; + return SEARCH_INDEX_DATA_PROVIDER.getXmlResourceId(); } @Override @@ -93,7 +92,7 @@ public class ZenModeBlockedEffectsSettings extends ZenModeSettingsBase implement /** * For Search. */ - public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = + public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = new BaseSearchIndexProvider(R.xml.zen_mode_block_settings) { @Override diff --git a/src/com/android/settings/notification/ZenModeBypassingAppsSettings.java b/src/com/android/settings/notification/ZenModeBypassingAppsSettings.java index 2c0c84a0ad0..5767c96b176 100644 --- a/src/com/android/settings/notification/ZenModeBypassingAppsSettings.java +++ b/src/com/android/settings/notification/ZenModeBypassingAppsSettings.java @@ -20,7 +20,6 @@ import android.app.Activity; import android.app.Application; import android.app.settings.SettingsEnums; import android.content.Context; -import android.provider.SearchIndexableResource; import androidx.fragment.app.Fragment; @@ -59,7 +58,7 @@ public class ZenModeBypassingAppsSettings extends ZenModeSettingsBase implements @Override protected int getPreferenceScreenResId() { - return R.xml.zen_mode_bypassing_apps; + return SEARCH_INDEX_DATA_PROVIDER.getXmlResourceId(); } @Override @@ -75,7 +74,7 @@ public class ZenModeBypassingAppsSettings extends ZenModeSettingsBase implements /** * For Search. */ - public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = + public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = new BaseSearchIndexProvider(R.xml.zen_mode_bypassing_apps) { @Override diff --git a/src/com/android/settings/notification/ZenModeCallsSettings.java b/src/com/android/settings/notification/ZenModeCallsSettings.java index 0e979e5ebfe..8656b047c22 100644 --- a/src/com/android/settings/notification/ZenModeCallsSettings.java +++ b/src/com/android/settings/notification/ZenModeCallsSettings.java @@ -67,7 +67,7 @@ public class ZenModeCallsSettings extends ZenModeSettingsBase implements Indexab /** * For Search. */ - public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = + public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = new BaseSearchIndexProvider(R.xml.zen_mode_calls_settings) { @Override diff --git a/src/com/android/settings/notification/ZenModeMessagesSettings.java b/src/com/android/settings/notification/ZenModeMessagesSettings.java index a514420f6cd..66088a9378c 100644 --- a/src/com/android/settings/notification/ZenModeMessagesSettings.java +++ b/src/com/android/settings/notification/ZenModeMessagesSettings.java @@ -20,7 +20,6 @@ import static android.app.NotificationManager.Policy.PRIORITY_CATEGORY_MESSAGES; import android.app.settings.SettingsEnums; import android.content.Context; -import android.provider.SearchIndexableResource; import com.android.settings.R; import com.android.settings.search.BaseSearchIndexProvider; @@ -53,7 +52,7 @@ public class ZenModeMessagesSettings extends ZenModeSettingsBase implements Inde @Override protected int getPreferenceScreenResId() { - return R.xml.zen_mode_messages_settings; + return SEARCH_INDEX_DATA_PROVIDER.getXmlResourceId(); } @Override @@ -64,7 +63,7 @@ public class ZenModeMessagesSettings extends ZenModeSettingsBase implements Inde /** * For Search. */ - public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = + public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = new BaseSearchIndexProvider(R.xml.zen_mode_messages_settings) { @Override diff --git a/src/com/android/settings/notification/ZenModeRestrictNotificationsSettings.java b/src/com/android/settings/notification/ZenModeRestrictNotificationsSettings.java index ea7e2134efc..17cc37060e5 100644 --- a/src/com/android/settings/notification/ZenModeRestrictNotificationsSettings.java +++ b/src/com/android/settings/notification/ZenModeRestrictNotificationsSettings.java @@ -77,7 +77,7 @@ public class ZenModeRestrictNotificationsSettings extends ZenModeSettingsBase im /** * For Search. */ - public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = + public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = new BaseSearchIndexProvider(R.xml.zen_mode_restrict_notifications_settings) { @Override diff --git a/src/com/android/settings/notification/ZenModeSettings.java b/src/com/android/settings/notification/ZenModeSettings.java index d4e5e3cb7fa..3497d109ef6 100644 --- a/src/com/android/settings/notification/ZenModeSettings.java +++ b/src/com/android/settings/notification/ZenModeSettings.java @@ -313,7 +313,7 @@ public class ZenModeSettings extends ZenModeSettingsBase { /** * For Search. */ - public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = + public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = new BaseSearchIndexProvider(R.xml.zen_mode_settings) { @Override diff --git a/src/com/android/settings/notification/ZenModeSoundVibrationSettings.java b/src/com/android/settings/notification/ZenModeSoundVibrationSettings.java index 0b96867c507..431f1718c79 100644 --- a/src/com/android/settings/notification/ZenModeSoundVibrationSettings.java +++ b/src/com/android/settings/notification/ZenModeSoundVibrationSettings.java @@ -70,7 +70,7 @@ public class ZenModeSoundVibrationSettings extends ZenModeSettingsBase implement /** * For Search. */ - public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = + public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = new BaseSearchIndexProvider(R.xml.zen_mode_sound_vibration_settings) { @Override diff --git a/src/com/android/settings/print/PrintSettingsFragment.java b/src/com/android/settings/print/PrintSettingsFragment.java index b262ebed311..3fd6f58f189 100644 --- a/src/com/android/settings/print/PrintSettingsFragment.java +++ b/src/com/android/settings/print/PrintSettingsFragment.java @@ -491,6 +491,6 @@ public class PrintSettingsFragment extends ProfileSettingsPreferenceFragment } } - public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = + public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = new BaseSearchIndexProvider(R.xml.print_settings); } diff --git a/src/com/android/settings/privacy/PrivacyDashboardFragment.java b/src/com/android/settings/privacy/PrivacyDashboardFragment.java index af83ec19cce..c7c564d3369 100644 --- a/src/com/android/settings/privacy/PrivacyDashboardFragment.java +++ b/src/com/android/settings/privacy/PrivacyDashboardFragment.java @@ -19,13 +19,11 @@ package com.android.settings.privacy; import android.app.settings.SettingsEnums; import android.content.Context; import android.os.Bundle; -import android.provider.SearchIndexableResource; import android.view.View; import androidx.annotation.VisibleForTesting; import com.android.settings.R; -import com.android.settings.Utils; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.notification.LockScreenNotificationPreferenceController; import com.android.settings.search.BaseSearchIndexProvider; @@ -105,18 +103,8 @@ public class PrivacyDashboardFragment extends DashboardFragment { } - public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = - new BaseSearchIndexProvider() { - @Override - public List getXmlResourcesToIndex(Context context, - boolean enabled) { - final ArrayList result = new ArrayList<>(); - - final SearchIndexableResource sir = new SearchIndexableResource(context); - sir.xmlResId = R.xml.privacy_dashboard_settings; - result.add(sir); - return result; - } + public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = + new BaseSearchIndexProvider(R.xml.privacy_dashboard_settings) { @Override public List createPreferenceControllers( diff --git a/src/com/android/settings/search/BaseSearchIndexProvider.java b/src/com/android/settings/search/BaseSearchIndexProvider.java index 64e6a9c0d25..58b571eaf95 100644 --- a/src/com/android/settings/search/BaseSearchIndexProvider.java +++ b/src/com/android/settings/search/BaseSearchIndexProvider.java @@ -103,7 +103,6 @@ public class BaseSearchIndexProvider implements Indexable.SearchIndexProvider { return nonIndexableKeys; } - @Override public List getPreferenceControllers(Context context) { final List controllersFromCode = createPreferenceControllers(context); @@ -135,6 +134,13 @@ public class BaseSearchIndexProvider implements Indexable.SearchIndexProvider { return null; } + /** + * Returns the xml resource Id. + */ + public int getXmlResourceId() { + return mXmlRes; + } + /** * Returns true if the page should be considered in search query. If return false, entire page * will be suppressed during search query. diff --git a/src/com/android/settings/search/Indexable.java b/src/com/android/settings/search/Indexable.java index eef7184762f..e3d917663f1 100644 --- a/src/com/android/settings/search/Indexable.java +++ b/src/com/android/settings/search/Indexable.java @@ -70,12 +70,5 @@ public interface Indexable { */ @Keep List getNonIndexableKeys(Context context); - - /** - * @return a list of {@link AbstractPreferenceController} for ResultPayload data during - * Indexing. - */ - @Keep - List getPreferenceControllers(Context context); } } diff --git a/src/com/android/settings/security/EncryptionAndCredential.java b/src/com/android/settings/security/EncryptionAndCredential.java index a6d2a0ab838..5688b204c5b 100644 --- a/src/com/android/settings/security/EncryptionAndCredential.java +++ b/src/com/android/settings/security/EncryptionAndCredential.java @@ -21,7 +21,6 @@ import static com.android.settings.security.EncryptionStatusPreferenceController import android.app.settings.SettingsEnums; import android.content.Context; import android.os.UserManager; -import android.provider.SearchIndexableResource; import com.android.settings.R; import com.android.settings.dashboard.DashboardFragment; @@ -60,7 +59,7 @@ public class EncryptionAndCredential extends DashboardFragment { @Override protected int getPreferenceScreenResId() { - return R.xml.encryption_and_credential; + return SEARCH_INDEX_DATA_PROVIDER.getXmlResourceId(); } private static List buildPreferenceControllers(Context context, @@ -88,28 +87,19 @@ public class EncryptionAndCredential extends DashboardFragment { /** * For Search. Please keep it in sync when updating "createPreferenceHierarchy()" */ - public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = - new SecuritySearchIndexProvider(); + public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = + new BaseSearchIndexProvider(R.xml.encryption_and_credential) { + @Override + public List createPreferenceControllers( + Context context) { + return buildPreferenceControllers(context, null /* lifecycle */); + } - private static class SecuritySearchIndexProvider extends BaseSearchIndexProvider { - - @Override - public List getXmlResourcesToIndex( - Context context, boolean enabled) { - final SearchIndexableResource sir = new SearchIndexableResource(context); - sir.xmlResId = R.xml.encryption_and_credential; - return Arrays.asList(sir); - } - - @Override - public List createPreferenceControllers(Context context) { - return buildPreferenceControllers(context, null /* lifecycle */); - } - - @Override - protected boolean isPageSearchEnabled(Context context) { - final UserManager um = (UserManager) context.getSystemService(Context.USER_SERVICE); - return um.isAdminUser(); - } - } + @Override + protected boolean isPageSearchEnabled(Context context) { + final UserManager um = (UserManager) context.getSystemService( + Context.USER_SERVICE); + return um.isAdminUser(); + } + }; } diff --git a/src/com/android/settings/security/LockscreenDashboardFragment.java b/src/com/android/settings/security/LockscreenDashboardFragment.java index f502ee6fb3b..f63ccb2608d 100644 --- a/src/com/android/settings/security/LockscreenDashboardFragment.java +++ b/src/com/android/settings/security/LockscreenDashboardFragment.java @@ -19,7 +19,6 @@ package com.android.settings.security; import android.app.settings.SettingsEnums; import android.content.Context; import android.hardware.display.AmbientDisplayConfiguration; -import android.provider.SearchIndexableResource; import androidx.annotation.VisibleForTesting; @@ -37,7 +36,6 @@ import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settingslib.search.SearchIndexable; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; /** @@ -79,7 +77,7 @@ public class LockscreenDashboardFragment extends DashboardFragment @Override protected int getPreferenceScreenResId() { - return R.xml.security_lockscreen_settings; + return SEARCH_INDEX_DATA_PROVIDER.getXmlResourceId(); } @Override @@ -130,7 +128,7 @@ public class LockscreenDashboardFragment extends DashboardFragment return mConfig; } - public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = + public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = new BaseSearchIndexProvider(R.xml.security_lockscreen_settings) { @Override diff --git a/src/com/android/settings/security/ScreenPinningSettings.java b/src/com/android/settings/security/ScreenPinningSettings.java index c60fd472a92..849db406975 100644 --- a/src/com/android/settings/security/ScreenPinningSettings.java +++ b/src/com/android/settings/security/ScreenPinningSettings.java @@ -216,7 +216,7 @@ public class ScreenPinningSettings extends SettingsPreferenceFragment /** * For search */ - public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = + public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = new BaseSearchIndexProvider() { @Override diff --git a/src/com/android/settings/security/SecuritySettings.java b/src/com/android/settings/security/SecuritySettings.java index 021d203e283..da8f003180b 100644 --- a/src/com/android/settings/security/SecuritySettings.java +++ b/src/com/android/settings/security/SecuritySettings.java @@ -138,7 +138,7 @@ public class SecuritySettings extends DashboardFragment { /** * For Search. Please keep it in sync when updating "createPreferenceHierarchy()" */ - public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = + public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = new BaseSearchIndexProvider(R.xml.security_dashboard_settings) { @Override diff --git a/src/com/android/settings/security/screenlock/ScreenLockSettings.java b/src/com/android/settings/security/screenlock/ScreenLockSettings.java index dab483658ea..1cc6b3f83c9 100644 --- a/src/com/android/settings/security/screenlock/ScreenLockSettings.java +++ b/src/com/android/settings/security/screenlock/ScreenLockSettings.java @@ -86,7 +86,7 @@ public class ScreenLockSettings extends DashboardFragment } - public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = + public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = new BaseSearchIndexProvider(R.xml.screen_lock_settings) { @Override diff --git a/src/com/android/settings/security/trustagent/TrustAgentSettings.java b/src/com/android/settings/security/trustagent/TrustAgentSettings.java index 4f652b208d3..0129fcec47c 100644 --- a/src/com/android/settings/security/trustagent/TrustAgentSettings.java +++ b/src/com/android/settings/security/trustagent/TrustAgentSettings.java @@ -53,6 +53,6 @@ public class TrustAgentSettings extends DashboardFragment { return R.xml.trust_agent_settings; } - public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = + public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = new BaseSearchIndexProvider(R.xml.trust_agent_settings); } diff --git a/src/com/android/settings/sim/SimSettings.java b/src/com/android/settings/sim/SimSettings.java index 1222913d8c9..8134ab0161f 100644 --- a/src/com/android/settings/sim/SimSettings.java +++ b/src/com/android/settings/sim/SimSettings.java @@ -336,7 +336,7 @@ public class SimSettings extends RestrictedSettingsFragment implements Indexable /** * For search */ - public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = + public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = new BaseSearchIndexProvider() { @Override public List getXmlResourcesToIndex(Context context, diff --git a/src/com/android/settings/support/SupportDashboardActivity.java b/src/com/android/settings/support/SupportDashboardActivity.java index 8703ec79667..0710843171c 100644 --- a/src/com/android/settings/support/SupportDashboardActivity.java +++ b/src/com/android/settings/support/SupportDashboardActivity.java @@ -53,7 +53,7 @@ public class SupportDashboardActivity extends Activity implements Indexable { /** * For Search. */ - public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = + public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = new BaseSearchIndexProvider() { private static final String SUPPORT_SEARCH_INDEX_KEY = "support_dashboard_activity"; diff --git a/src/com/android/settings/system/ResetDashboardFragment.java b/src/com/android/settings/system/ResetDashboardFragment.java index b0611fc0b4e..fc53d4e7d80 100644 --- a/src/com/android/settings/system/ResetDashboardFragment.java +++ b/src/com/android/settings/system/ResetDashboardFragment.java @@ -67,7 +67,7 @@ public class ResetDashboardFragment extends DashboardFragment { return controllers; } - public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = + public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = new BaseSearchIndexProvider(R.xml.reset_dashboard_fragment) { @Override diff --git a/src/com/android/settings/system/SystemDashboardFragment.java b/src/com/android/settings/system/SystemDashboardFragment.java index 3ab31e3a17e..9736176415d 100644 --- a/src/com/android/settings/system/SystemDashboardFragment.java +++ b/src/com/android/settings/system/SystemDashboardFragment.java @@ -102,7 +102,7 @@ public class SystemDashboardFragment extends DashboardFragment { /** * For Search. */ - public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = + public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = new BaseSearchIndexProvider() { @Override public List getXmlResourcesToIndex( diff --git a/src/com/android/settings/tts/TextToSpeechSettings.java b/src/com/android/settings/tts/TextToSpeechSettings.java index bcfad92af0b..2bfc6ea4998 100644 --- a/src/com/android/settings/tts/TextToSpeechSettings.java +++ b/src/com/android/settings/tts/TextToSpeechSettings.java @@ -28,7 +28,6 @@ import android.content.Intent; import android.os.Bundle; import android.os.UserHandle; import android.os.UserManager; -import android.provider.SearchIndexableResource; import android.provider.Settings.Secure; import android.speech.tts.TextToSpeech; import android.speech.tts.TextToSpeech.EngineInfo; @@ -45,9 +44,8 @@ import androidx.preference.Preference; import com.android.settings.R; import com.android.settings.SettingsActivity; import com.android.settings.SettingsPreferenceFragment; -import com.android.settings.search.BaseSearchIndexProvider; -import com.android.settings.search.Indexable; import com.android.settings.Utils; +import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.widget.GearPreference; import com.android.settings.widget.SeekBarPreference; import com.android.settingslib.search.SearchIndexable; @@ -55,7 +53,6 @@ import com.android.settingslib.widget.ActionButtonsPreference; import java.text.Collator; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collections; import java.util.HashMap; import java.util.List; @@ -795,7 +792,7 @@ public class TextToSpeechSettings extends SettingsPreferenceFragment } } - public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = + public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = 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 3308f1e0d7c..c2f4e168684 100644 --- a/src/com/android/settings/tts/TtsEnginePreferenceFragment.java +++ b/src/com/android/settings/tts/TtsEnginePreferenceFragment.java @@ -7,7 +7,6 @@ import android.content.Context; import android.content.DialogInterface; import android.graphics.drawable.Drawable; import android.os.Bundle; -import android.provider.SearchIndexableResource; import android.speech.tts.TextToSpeech; import android.speech.tts.TextToSpeech.EngineInfo; import android.speech.tts.TtsEngines; @@ -17,13 +16,11 @@ import androidx.appcompat.app.AlertDialog; import com.android.settings.R; import com.android.settings.search.BaseSearchIndexProvider; -import com.android.settings.search.Indexable; import com.android.settings.widget.RadioButtonPickerFragment; import com.android.settingslib.search.SearchIndexable; import com.android.settingslib.widget.CandidateInfo; import java.util.ArrayList; -import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -141,7 +138,7 @@ public class TtsEnginePreferenceFragment extends RadioButtonPickerFragment { @Override protected int getPreferenceScreenResId() { - return R.xml.tts_engine_picker; + return SEARCH_INDEX_DATA_PROVIDER.getXmlResourceId(); } private boolean shouldDisplayDataAlert(EngineCandidateInfo info) { @@ -221,6 +218,6 @@ public class TtsEnginePreferenceFragment extends RadioButtonPickerFragment { } } - public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = + public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = 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 c98f1743881..65057d96b74 100644 --- a/src/com/android/settings/users/UserSettings.java +++ b/src/com/android/settings/users/UserSettings.java @@ -1221,7 +1221,7 @@ public class UserSettings extends SettingsPreferenceFragment public static final SummaryLoader.SummaryProviderFactory SUMMARY_PROVIDER_FACTORY = (activity, summaryLoader) -> new SummaryProvider(activity, summaryLoader); - public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = + public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = new BaseSearchIndexProvider(R.xml.user_settings) { @Override diff --git a/src/com/android/settings/wallpaper/WallpaperSuggestionActivity.java b/src/com/android/settings/wallpaper/WallpaperSuggestionActivity.java index 57222f1a41d..53f92c87191 100644 --- a/src/com/android/settings/wallpaper/WallpaperSuggestionActivity.java +++ b/src/com/android/settings/wallpaper/WallpaperSuggestionActivity.java @@ -53,7 +53,7 @@ public class WallpaperSuggestionActivity extends StyleSuggestionActivityBase imp return manager.getWallpaperId(WallpaperManager.FLAG_SYSTEM) > 0; } - public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = + public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = new BaseSearchIndexProvider() { private static final String SUPPORT_SEARCH_INDEX_KEY = "wallpaper_type"; diff --git a/src/com/android/settings/wfd/WifiDisplaySettings.java b/src/com/android/settings/wfd/WifiDisplaySettings.java index d7385dcee9d..cf6b8714eb6 100755 --- a/src/com/android/settings/wfd/WifiDisplaySettings.java +++ b/src/com/android/settings/wfd/WifiDisplaySettings.java @@ -835,6 +835,6 @@ public final class WifiDisplaySettings extends SettingsPreferenceFragment implem public static final SummaryLoader.SummaryProviderFactory SUMMARY_PROVIDER_FACTORY = (activity, summaryLoader) -> new SummaryProvider(activity, summaryLoader); - public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = + public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = 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 6dd68c704b7..340dd55d0b5 100644 --- a/src/com/android/settings/wifi/ConfigureWifiSettings.java +++ b/src/com/android/settings/wifi/ConfigureWifiSettings.java @@ -23,18 +23,15 @@ import android.content.Intent; import android.net.ConnectivityManager; import android.net.NetworkInfo; import android.net.wifi.WifiManager; -import android.provider.SearchIndexableResource; import com.android.settings.R; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.search.BaseSearchIndexProvider; -import com.android.settings.search.Indexable; import com.android.settings.wifi.p2p.WifiP2pPreferenceController; import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.search.SearchIndexable; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; @SearchIndexable @@ -69,7 +66,7 @@ public class ConfigureWifiSettings extends DashboardFragment { @Override protected int getPreferenceScreenResId() { - return R.xml.wifi_configure_settings; + return SEARCH_INDEX_DATA_PROVIDER.getXmlResourceId(); } @Override @@ -108,7 +105,7 @@ public class ConfigureWifiSettings extends DashboardFragment { super.onActivityResult(requestCode, resultCode, data); } - public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = + public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = new BaseSearchIndexProvider(R.xml.wifi_configure_settings) { @Override diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java index 8ac868f1f37..afc8da53289 100644 --- a/src/com/android/settings/wifi/WifiSettings.java +++ b/src/com/android/settings/wifi/WifiSettings.java @@ -1206,7 +1206,7 @@ public class WifiSettings extends RestrictedSettingsFragment ((AccessPointPreference) accessPoint.getTag()).onLevelChanged(); } - public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = + public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = new BaseSearchIndexProvider() { @Override public List getRawDataToIndex(Context context, diff --git a/src/com/android/settings/wifi/WifiSettings2.java b/src/com/android/settings/wifi/WifiSettings2.java index d715ac083d2..3ebdda4c772 100644 --- a/src/com/android/settings/wifi/WifiSettings2.java +++ b/src/com/android/settings/wifi/WifiSettings2.java @@ -655,7 +655,7 @@ public class WifiSettings2 extends RestrictedSettingsFragment return R.string.help_url_wifi; } - public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = + public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = new BaseSearchIndexProvider() { @Override public List getRawDataToIndex(Context context, diff --git a/src/com/android/settings/wifi/savedaccesspoints/SavedAccessPointsWifiSettings.java b/src/com/android/settings/wifi/savedaccesspoints/SavedAccessPointsWifiSettings.java index 4daf7da5502..cf2fc99cb7e 100644 --- a/src/com/android/settings/wifi/savedaccesspoints/SavedAccessPointsWifiSettings.java +++ b/src/com/android/settings/wifi/savedaccesspoints/SavedAccessPointsWifiSettings.java @@ -17,22 +17,16 @@ package com.android.settings.wifi.savedaccesspoints; import android.annotation.Nullable; -import android.app.Dialog; import android.app.settings.SettingsEnums; import android.content.Context; -import android.content.DialogInterface; -import android.net.wifi.WifiManager; import android.os.Bundle; import android.util.FeatureFlagUtils; -import android.util.Log; import com.android.settings.R; import com.android.settings.core.FeatureFlags; import com.android.settings.core.SubSettingLauncher; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.development.featureflags.FeatureFlagPersistent; -import com.android.settings.wifi.WifiConfigUiBase; -import com.android.settings.wifi.WifiDialog; import com.android.settings.wifi.WifiSettings; import com.android.settings.wifi.details.WifiNetworkDetailsFragment; import com.android.settingslib.wifi.AccessPoint; diff --git a/src/com/android/settings/wifi/tether/WifiTetherSettings.java b/src/com/android/settings/wifi/tether/WifiTetherSettings.java index 6b11cbaa2b7..84e044fa9e8 100644 --- a/src/com/android/settings/wifi/tether/WifiTetherSettings.java +++ b/src/com/android/settings/wifi/tether/WifiTetherSettings.java @@ -236,7 +236,7 @@ public class WifiTetherSettings extends RestrictedDashboardFragment .updateDisplay(); } - public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = + public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = new BaseSearchIndexProvider(R.xml.wifi_tether_settings) { @Override diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentSearchIndexProviderInspector.java b/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentSearchIndexProviderInspector.java index 7106cf6fecc..4a488bf9b2b 100644 --- a/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentSearchIndexProviderInspector.java +++ b/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentSearchIndexProviderInspector.java @@ -22,6 +22,7 @@ import androidx.fragment.app.Fragment; import com.android.settings.core.BasePreferenceController; import com.android.settings.core.PreferenceControllerListHelper; +import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.search.DatabaseIndexingUtils; import com.android.settings.search.Indexable; import com.android.settingslib.core.AbstractPreferenceController; @@ -45,8 +46,8 @@ public class DashboardFragmentSearchIndexProviderInspector { return true; } - final Indexable.SearchIndexProvider provider = - DatabaseIndexingUtils.getSearchIndexProvider(clazz); + final BaseSearchIndexProvider provider = + (BaseSearchIndexProvider) DatabaseIndexingUtils.getSearchIndexProvider(clazz); if (provider == null) { return true; } diff --git a/tests/robotests/src/com/android/settings/search/FakeSettingsFragment.java b/tests/robotests/src/com/android/settings/search/FakeSettingsFragment.java index 7011ddad2a1..ee272614786 100644 --- a/tests/robotests/src/com/android/settings/search/FakeSettingsFragment.java +++ b/tests/robotests/src/com/android/settings/search/FakeSettingsFragment.java @@ -70,7 +70,7 @@ public class FakeSettingsFragment extends DashboardFragment { } /** Index provider used to expose this fragment in search. */ - public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = + public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = new BaseSearchIndexProvider() { @Override public List getRawDataToIndex(Context context, diff --git a/tests/robotests/src/com/android/settings/testutils/FakeIndexProvider.java b/tests/robotests/src/com/android/settings/testutils/FakeIndexProvider.java index a8a65e58db2..05ba1630e3c 100644 --- a/tests/robotests/src/com/android/settings/testutils/FakeIndexProvider.java +++ b/tests/robotests/src/com/android/settings/testutils/FakeIndexProvider.java @@ -29,7 +29,7 @@ public class FakeIndexProvider implements Indexable { public static final String KEY = "TestKey"; - public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = + public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = new BaseSearchIndexProvider(R.xml.location_settings) { @Override diff --git a/tests/unit/src/com/android/settings/core/PreferenceControllerContractTest.java b/tests/unit/src/com/android/settings/core/PreferenceControllerContractTest.java index ad6be043c21..3fcccf66370 100644 --- a/tests/unit/src/com/android/settings/core/PreferenceControllerContractTest.java +++ b/tests/unit/src/com/android/settings/core/PreferenceControllerContractTest.java @@ -28,8 +28,8 @@ import androidx.test.filters.MediumTest; import androidx.test.runner.AndroidJUnit4; import com.android.settings.overlay.FeatureFactory; +import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.search.DatabaseIndexingUtils; -import com.android.settings.search.Indexable; import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.search.SearchIndexableResources; @@ -62,8 +62,8 @@ public class PreferenceControllerContractTest { .getSearchIndexableResources(); for (Class clazz : resources.getProviderValues()) { - final Indexable.SearchIndexProvider provider = - DatabaseIndexingUtils.getSearchIndexProvider(clazz); + final BaseSearchIndexProvider provider = + (BaseSearchIndexProvider) DatabaseIndexingUtils.getSearchIndexProvider(clazz); if (provider == null) { continue; }