diff --git a/src/com/android/settings/DateTimeSettings.java b/src/com/android/settings/DateTimeSettings.java index e6e3732c8d2..dd489da1c6e 100644 --- a/src/com/android/settings/DateTimeSettings.java +++ b/src/com/android/settings/DateTimeSettings.java @@ -62,7 +62,7 @@ public class DateTimeSettings extends DashboardFragment implements @Override protected int getPreferenceScreenResId() { - return SEARCH_INDEX_DATA_PROVIDER.getXmlResourceId(); + return R.xml.date_time_prefs; } @Override diff --git a/src/com/android/settings/DisplaySettings.java b/src/com/android/settings/DisplaySettings.java index 9ad4e25bf2f..29ac8b62902 100644 --- a/src/com/android/settings/DisplaySettings.java +++ b/src/com/android/settings/DisplaySettings.java @@ -59,7 +59,7 @@ public class DisplaySettings extends DashboardFragment { @Override protected int getPreferenceScreenResId() { - return SEARCH_INDEX_DATA_PROVIDER.getXmlResourceId(); + return R.xml.display_settings; } @Override diff --git a/src/com/android/settings/LegalSettings.java b/src/com/android/settings/LegalSettings.java index f6e13eaeecf..9cb3bf4ef84 100644 --- a/src/com/android/settings/LegalSettings.java +++ b/src/com/android/settings/LegalSettings.java @@ -39,7 +39,7 @@ public class LegalSettings extends DashboardFragment { @Override protected int getPreferenceScreenResId() { - return SEARCH_INDEX_DATA_PROVIDER.getXmlResourceId(); + return R.xml.about_legal; } public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = diff --git a/src/com/android/settings/SettingsPreferenceFragment.java b/src/com/android/settings/SettingsPreferenceFragment.java index c1d020cf33e..7875aa6fe67 100644 --- a/src/com/android/settings/SettingsPreferenceFragment.java +++ b/src/com/android/settings/SettingsPreferenceFragment.java @@ -44,7 +44,6 @@ import androidx.recyclerview.widget.RecyclerView; import com.android.settings.core.InstrumentedPreferenceFragment; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; -import com.android.settings.search.Indexable; import com.android.settings.search.actionbar.SearchMenuController; import com.android.settings.support.actionbar.HelpMenuController; import com.android.settings.support.actionbar.HelpResourceProvider; @@ -53,6 +52,7 @@ import com.android.settings.widget.LoadingViewController; import com.android.settingslib.CustomDialogPreferenceCompat; import com.android.settingslib.CustomEditTextPreferenceCompat; import com.android.settingslib.core.instrumentation.Instrumentable; +import com.android.settingslib.search.Indexable; import com.android.settingslib.widget.LayoutPreference; import java.util.UUID; diff --git a/src/com/android/settings/TetherSettings.java b/src/com/android/settings/TetherSettings.java index 9ddda1d62fc..c5407c583f3 100644 --- a/src/com/android/settings/TetherSettings.java +++ b/src/com/android/settings/TetherSettings.java @@ -43,7 +43,6 @@ import androidx.preference.SwitchPreference; import com.android.settings.datausage.DataSaverBackend; import com.android.settings.search.BaseSearchIndexProvider; -import com.android.settings.search.Indexable; import com.android.settings.wifi.tether.WifiTetherPreferenceController; import com.android.settingslib.TetherUtil; import com.android.settingslib.search.SearchIndexable; diff --git a/src/com/android/settings/accessibility/AccessibilitySettings.java b/src/com/android/settings/accessibility/AccessibilitySettings.java index b985cd12036..56dc49d22ed 100644 --- a/src/com/android/settings/accessibility/AccessibilitySettings.java +++ b/src/com/android/settings/accessibility/AccessibilitySettings.java @@ -245,7 +245,7 @@ public class AccessibilitySettings extends DashboardFragment { @Override protected int getPreferenceScreenResId() { - return SEARCH_INDEX_DATA_PROVIDER.getXmlResourceId(); + return R.xml.accessibility_settings; } @Override diff --git a/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragment.java b/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragment.java index d6860259726..95a2b76c2f2 100644 --- a/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragment.java +++ b/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragment.java @@ -35,7 +35,7 @@ import androidx.preference.SwitchPreference; import com.android.internal.accessibility.AccessibilityShortcutController; import com.android.settings.R; import com.android.settings.search.BaseSearchIndexProvider; -import com.android.settings.search.Indexable; +import com.android.settingslib.search.Indexable; import com.android.settingslib.accessibility.AccessibilityUtils; import com.android.settingslib.search.SearchIndexable; diff --git a/src/com/android/settings/accessibility/MagnificationPreferenceFragment.java b/src/com/android/settings/accessibility/MagnificationPreferenceFragment.java index c84d3ac3d57..834e0c6dc8d 100644 --- a/src/com/android/settings/accessibility/MagnificationPreferenceFragment.java +++ b/src/com/android/settings/accessibility/MagnificationPreferenceFragment.java @@ -36,7 +36,7 @@ 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.Indexable; import com.android.settings.search.actionbar.SearchMenuController; import com.android.settings.support.actionbar.HelpResourceProvider; import com.android.settingslib.search.SearchIndexable; diff --git a/src/com/android/settings/accessibility/ToggleAutoclickPreferenceFragment.java b/src/com/android/settings/accessibility/ToggleAutoclickPreferenceFragment.java index bb1dbeec427..df72cffdfac 100644 --- a/src/com/android/settings/accessibility/ToggleAutoclickPreferenceFragment.java +++ b/src/com/android/settings/accessibility/ToggleAutoclickPreferenceFragment.java @@ -29,7 +29,7 @@ import androidx.preference.Preference; import com.android.settings.R; import com.android.settings.search.BaseSearchIndexProvider; -import com.android.settings.search.Indexable; +import com.android.settingslib.search.Indexable; import com.android.settings.widget.SeekBarPreference; import com.android.settings.widget.SwitchBar; import com.android.settingslib.search.SearchIndexable; diff --git a/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java b/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java index 3a441c7c374..c5376eb0a8e 100644 --- a/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java +++ b/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java @@ -30,7 +30,7 @@ import androidx.preference.Preference; import com.android.settings.R; import com.android.settings.search.BaseSearchIndexProvider; -import com.android.settings.search.Indexable; +import com.android.settingslib.search.Indexable; import com.android.settings.widget.SwitchBar; import com.android.settingslib.search.SearchIndexable; diff --git a/src/com/android/settings/accounts/AccountDashboardFragment.java b/src/com/android/settings/accounts/AccountDashboardFragment.java index 04a9701ae57..83f071af9ef 100644 --- a/src/com/android/settings/accounts/AccountDashboardFragment.java +++ b/src/com/android/settings/accounts/AccountDashboardFragment.java @@ -51,7 +51,7 @@ public class AccountDashboardFragment extends DashboardFragment { @Override protected int getPreferenceScreenResId() { - return SEARCH_INDEX_DATA_PROVIDER.getXmlResourceId(); + return R.xml.accounts_dashboard_settings; } @Override diff --git a/src/com/android/settings/accounts/AccountPreferenceController.java b/src/com/android/settings/accounts/AccountPreferenceController.java index 1309cc2bb55..5c930e24904 100644 --- a/src/com/android/settings/accounts/AccountPreferenceController.java +++ b/src/com/android/settings/accounts/AccountPreferenceController.java @@ -54,7 +54,7 @@ import com.android.settings.Utils; import com.android.settings.core.PreferenceControllerMixin; import com.android.settings.core.SubSettingLauncher; import com.android.settings.overlay.FeatureFactory; -import com.android.settings.search.SearchIndexableRaw; +import com.android.settingslib.search.SearchIndexableRaw; import com.android.settingslib.RestrictedPreference; import com.android.settingslib.accounts.AuthenticatorHelper; import com.android.settingslib.core.AbstractPreferenceController; diff --git a/src/com/android/settings/accounts/EmergencyInfoPreferenceController.java b/src/com/android/settings/accounts/EmergencyInfoPreferenceController.java index 5be829b8370..5bed05a0115 100644 --- a/src/com/android/settings/accounts/EmergencyInfoPreferenceController.java +++ b/src/com/android/settings/accounts/EmergencyInfoPreferenceController.java @@ -28,7 +28,7 @@ import androidx.preference.Preference; import com.android.settings.R; import com.android.settings.core.BasePreferenceController; -import com.android.settings.search.SearchIndexableRaw; +import com.android.settingslib.search.SearchIndexableRaw; import java.util.List; diff --git a/src/com/android/settings/accounts/ManagedProfileSettings.java b/src/com/android/settings/accounts/ManagedProfileSettings.java index e82b72b4c35..6591be488a3 100644 --- a/src/com/android/settings/accounts/ManagedProfileSettings.java +++ b/src/com/android/settings/accounts/ManagedProfileSettings.java @@ -37,7 +37,7 @@ import com.android.settings.R; import com.android.settings.Utils; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.search.BaseSearchIndexProvider; -import com.android.settings.search.Indexable; +import com.android.settingslib.search.Indexable; import com.android.settingslib.search.SearchIndexable; import java.util.ArrayList; diff --git a/src/com/android/settings/applications/assist/ManageAssist.java b/src/com/android/settings/applications/assist/ManageAssist.java index c3dac26f23f..c96f43fd013 100644 --- a/src/com/android/settings/applications/assist/ManageAssist.java +++ b/src/com/android/settings/applications/assist/ManageAssist.java @@ -46,7 +46,7 @@ public class ManageAssist extends DashboardFragment { @Override protected int getPreferenceScreenResId() { - return SEARCH_INDEX_DATA_PROVIDER.getXmlResourceId(); + return R.xml.manage_assist; } @Override diff --git a/src/com/android/settings/applications/defaultapps/AutofillPicker.java b/src/com/android/settings/applications/defaultapps/AutofillPicker.java index 32790311a7b..62a478f183a 100644 --- a/src/com/android/settings/applications/defaultapps/AutofillPicker.java +++ b/src/com/android/settings/applications/defaultapps/AutofillPicker.java @@ -23,7 +23,7 @@ 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.Indexable; import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.search.SearchIndexable; diff --git a/src/com/android/settings/applications/managedomainurls/ManageDomainUrls.java b/src/com/android/settings/applications/managedomainurls/ManageDomainUrls.java index 1176a1b02f5..82ca6b321a9 100644 --- a/src/com/android/settings/applications/managedomainurls/ManageDomainUrls.java +++ b/src/com/android/settings/applications/managedomainurls/ManageDomainUrls.java @@ -48,7 +48,7 @@ public class ManageDomainUrls extends DashboardFragment { @Override protected int getPreferenceScreenResId() { - return SEARCH_INDEX_DATA_PROVIDER.getXmlResourceId(); + return R.xml.manage_domain_url_settings; } @Override diff --git a/src/com/android/settings/applications/specialaccess/SpecialAccessSettings.java b/src/com/android/settings/applications/specialaccess/SpecialAccessSettings.java index 26f54c93674..f96ff63eef1 100644 --- a/src/com/android/settings/applications/specialaccess/SpecialAccessSettings.java +++ b/src/com/android/settings/applications/specialaccess/SpecialAccessSettings.java @@ -35,7 +35,7 @@ public class SpecialAccessSettings extends DashboardFragment { @Override protected int getPreferenceScreenResId() { - return SEARCH_INDEX_DATA_PROVIDER.getXmlResourceId(); + return R.xml.special_access; } @Override diff --git a/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminSettings.java b/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminSettings.java index 67b10ff9f0f..4a990734bfa 100644 --- a/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminSettings.java +++ b/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminSettings.java @@ -33,7 +33,7 @@ public class DeviceAdminSettings extends DashboardFragment { @Override protected int getPreferenceScreenResId() { - return SEARCH_INDEX_DATA_PROVIDER.getXmlResourceId(); + return R.xml.device_admin_settings; } @Override diff --git a/src/com/android/settings/applications/specialaccess/pictureinpicture/PictureInPictureSettings.java b/src/com/android/settings/applications/specialaccess/pictureinpicture/PictureInPictureSettings.java index f90e4e13e9e..15757a0e4d5 100644 --- a/src/com/android/settings/applications/specialaccess/pictureinpicture/PictureInPictureSettings.java +++ b/src/com/android/settings/applications/specialaccess/pictureinpicture/PictureInPictureSettings.java @@ -185,7 +185,7 @@ public class PictureInPictureSettings extends EmptyTextSettings { @Override protected int getPreferenceScreenResId() { - return SEARCH_INDEX_DATA_PROVIDER.getXmlResourceId(); + return R.xml.picture_in_picture_settings; } @Override diff --git a/src/com/android/settings/applications/specialaccess/premiumsms/PremiumSmsAccess.java b/src/com/android/settings/applications/specialaccess/premiumsms/PremiumSmsAccess.java index 420dcefd807..7e4553d3dd5 100644 --- a/src/com/android/settings/applications/specialaccess/premiumsms/PremiumSmsAccess.java +++ b/src/com/android/settings/applications/specialaccess/premiumsms/PremiumSmsAccess.java @@ -91,7 +91,7 @@ public class PremiumSmsAccess extends EmptyTextSettings @Override protected int getPreferenceScreenResId() { - return SEARCH_INDEX_DATA_PROVIDER.getXmlResourceId(); + return R.xml.premium_sms_settings; } @Override diff --git a/src/com/android/settings/applications/specialaccess/vrlistener/VrListenerSettings.java b/src/com/android/settings/applications/specialaccess/vrlistener/VrListenerSettings.java index ce6abc1480d..a70d03e46ac 100644 --- a/src/com/android/settings/applications/specialaccess/vrlistener/VrListenerSettings.java +++ b/src/com/android/settings/applications/specialaccess/vrlistener/VrListenerSettings.java @@ -61,7 +61,7 @@ public class VrListenerSettings extends ManagedServiceSettings { @Override protected int getPreferenceScreenResId() { - return SEARCH_INDEX_DATA_PROVIDER.getXmlResourceId(); + return R.xml.vr_listeners_settings; } @VisibleForTesting diff --git a/src/com/android/settings/backup/BackupSettingsFragment.java b/src/com/android/settings/backup/BackupSettingsFragment.java index b1f639a02b2..7df19f54660 100644 --- a/src/com/android/settings/backup/BackupSettingsFragment.java +++ b/src/com/android/settings/backup/BackupSettingsFragment.java @@ -23,7 +23,7 @@ import android.os.Bundle; 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.Indexable; import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.search.SearchIndexable; diff --git a/src/com/android/settings/backup/PrivacySettings.java b/src/com/android/settings/backup/PrivacySettings.java index 5509c2fcb90..3ed2f5544bf 100644 --- a/src/com/android/settings/backup/PrivacySettings.java +++ b/src/com/android/settings/backup/PrivacySettings.java @@ -40,7 +40,7 @@ public class PrivacySettings extends DashboardFragment { @Override protected int getPreferenceScreenResId() { - return SEARCH_INDEX_DATA_PROVIDER.getXmlResourceId(); + return R.xml.privacy_settings; } @Override diff --git a/src/com/android/settings/backup/UserBackupSettingsActivity.java b/src/com/android/settings/backup/UserBackupSettingsActivity.java index 31e86e4526c..08461ad787a 100644 --- a/src/com/android/settings/backup/UserBackupSettingsActivity.java +++ b/src/com/android/settings/backup/UserBackupSettingsActivity.java @@ -28,8 +28,8 @@ import androidx.fragment.app.FragmentManager; import com.android.settings.R; import com.android.settings.search.BaseSearchIndexProvider; -import com.android.settings.search.Indexable; -import com.android.settings.search.SearchIndexableRaw; +import com.android.settingslib.search.Indexable; +import com.android.settingslib.search.SearchIndexableRaw; import com.android.settingslib.search.SearchIndexable; import java.util.ArrayList; diff --git a/src/com/android/settings/biometrics/face/FaceSettings.java b/src/com/android/settings/biometrics/face/FaceSettings.java index 20ab6b831fd..e5c2a66a6ac 100644 --- a/src/com/android/settings/biometrics/face/FaceSettings.java +++ b/src/com/android/settings/biometrics/face/FaceSettings.java @@ -93,7 +93,7 @@ public class FaceSettings extends DashboardFragment { @Override protected int getPreferenceScreenResId() { - return SEARCH_INDEX_DATA_PROVIDER.getXmlResourceId(); + return R.xml.security_settings_face; } @Override diff --git a/src/com/android/settings/bluetooth/BluetoothPairingDetail.java b/src/com/android/settings/bluetooth/BluetoothPairingDetail.java index b1a31748ba0..45da8f31256 100644 --- a/src/com/android/settings/bluetooth/BluetoothPairingDetail.java +++ b/src/com/android/settings/bluetooth/BluetoothPairingDetail.java @@ -29,7 +29,7 @@ import android.widget.Toast; import androidx.annotation.VisibleForTesting; import com.android.settings.R; -import com.android.settings.search.Indexable; +import com.android.settingslib.search.Indexable; import com.android.settingslib.bluetooth.BluetoothDeviceFilter; import com.android.settingslib.bluetooth.CachedBluetoothDevice; import com.android.settingslib.widget.FooterPreference; diff --git a/src/com/android/settings/connecteddevice/BluetoothDashboardFragment.java b/src/com/android/settings/connecteddevice/BluetoothDashboardFragment.java index 996e2795922..b16725e3758 100644 --- a/src/com/android/settings/connecteddevice/BluetoothDashboardFragment.java +++ b/src/com/android/settings/connecteddevice/BluetoothDashboardFragment.java @@ -28,11 +28,11 @@ import com.android.settings.bluetooth.BluetoothSwitchPreferenceController; import com.android.settings.core.TogglePreferenceController; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.search.BaseSearchIndexProvider; -import com.android.settings.search.SearchIndexableRaw; import com.android.settings.widget.SwitchBar; import com.android.settings.widget.SwitchBarController; import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settingslib.search.SearchIndexable; +import com.android.settingslib.search.SearchIndexableRaw; import com.android.settingslib.widget.FooterPreference; import java.util.ArrayList; diff --git a/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java b/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java index 1452a2688ba..ce980e0bda2 100644 --- a/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java +++ b/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java @@ -56,7 +56,7 @@ public class ConnectedDeviceDashboardFragment extends DashboardFragment { @Override protected int getPreferenceScreenResId() { - return SEARCH_INDEX_DATA_PROVIDER.getXmlResourceId(); + return R.xml.connected_devices; } @Override diff --git a/src/com/android/settings/connecteddevice/PreviouslyConnectedDeviceDashboardFragment.java b/src/com/android/settings/connecteddevice/PreviouslyConnectedDeviceDashboardFragment.java index b6d2bdd5c07..741763871b1 100644 --- a/src/com/android/settings/connecteddevice/PreviouslyConnectedDeviceDashboardFragment.java +++ b/src/com/android/settings/connecteddevice/PreviouslyConnectedDeviceDashboardFragment.java @@ -22,7 +22,7 @@ import android.content.res.Resources; import com.android.settings.R; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.search.BaseSearchIndexProvider; -import com.android.settings.search.SearchIndexableRaw; +import com.android.settingslib.search.SearchIndexableRaw; import com.android.settingslib.search.SearchIndexable; import java.util.ArrayList; diff --git a/src/com/android/settings/connecteddevice/usb/UsbDetailsFragment.java b/src/com/android/settings/connecteddevice/usb/UsbDetailsFragment.java index 4d5c1bc5aca..6e06f65ed19 100644 --- a/src/com/android/settings/connecteddevice/usb/UsbDetailsFragment.java +++ b/src/com/android/settings/connecteddevice/usb/UsbDetailsFragment.java @@ -62,7 +62,7 @@ public class UsbDetailsFragment extends DashboardFragment { @Override protected int getPreferenceScreenResId() { - return SEARCH_INDEX_DATA_PROVIDER.getXmlResourceId(); + return R.xml.usb_details_fragment; } @Override diff --git a/src/com/android/settings/core/BasePreferenceController.java b/src/com/android/settings/core/BasePreferenceController.java index a019c8d0690..cef372e80e6 100644 --- a/src/com/android/settings/core/BasePreferenceController.java +++ b/src/com/android/settings/core/BasePreferenceController.java @@ -24,11 +24,11 @@ import android.util.Log; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import com.android.settings.search.SearchIndexableRaw; import com.android.settings.slices.SettingsSliceProvider; import com.android.settings.slices.SliceData; import com.android.settings.slices.Sliceable; import com.android.settingslib.core.AbstractPreferenceController; +import com.android.settingslib.search.SearchIndexableRaw; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/src/com/android/settings/core/PreferenceControllerMixin.java b/src/com/android/settings/core/PreferenceControllerMixin.java index da0b7e73d14..fa615523b92 100644 --- a/src/com/android/settings/core/PreferenceControllerMixin.java +++ b/src/com/android/settings/core/PreferenceControllerMixin.java @@ -18,7 +18,7 @@ package com.android.settings.core; import android.text.TextUtils; import android.util.Log; -import com.android.settings.search.SearchIndexableRaw; +import com.android.settingslib.search.SearchIndexableRaw; import com.android.settingslib.core.AbstractPreferenceController; import java.util.List; diff --git a/src/com/android/settings/dashboard/DashboardFragment.java b/src/com/android/settings/dashboard/DashboardFragment.java index f2e3d73c8fe..3215016547a 100644 --- a/src/com/android/settings/dashboard/DashboardFragment.java +++ b/src/com/android/settings/dashboard/DashboardFragment.java @@ -37,7 +37,7 @@ import com.android.settings.core.BasePreferenceController; import com.android.settings.core.PreferenceControllerListHelper; import com.android.settings.core.SettingsBaseActivity; import com.android.settings.overlay.FeatureFactory; -import com.android.settings.search.Indexable; +import com.android.settingslib.search.Indexable; import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settingslib.core.lifecycle.LifecycleObserver; diff --git a/src/com/android/settings/datausage/BillingCycleSettings.java b/src/com/android/settings/datausage/BillingCycleSettings.java index 74f06d7c13b..f680bddd254 100644 --- a/src/com/android/settings/datausage/BillingCycleSettings.java +++ b/src/com/android/settings/datausage/BillingCycleSettings.java @@ -192,7 +192,7 @@ public class BillingCycleSettings extends DataUsageBaseFragment implements @Override protected int getPreferenceScreenResId() { - return SEARCH_INDEX_DATA_PROVIDER.getXmlResourceId(); + return R.xml.billing_cycle; } @Override diff --git a/src/com/android/settings/datausage/DataSaverSummary.java b/src/com/android/settings/datausage/DataSaverSummary.java index 622fd13e6b3..0e32bfda81e 100644 --- a/src/com/android/settings/datausage/DataSaverSummary.java +++ b/src/com/android/settings/datausage/DataSaverSummary.java @@ -18,7 +18,6 @@ import android.app.Application; import android.app.settings.SettingsEnums; import android.content.Context; import android.os.Bundle; -import android.provider.SearchIndexableResource; import android.telephony.SubscriptionManager; import android.widget.Switch; @@ -30,7 +29,6 @@ import com.android.settings.SettingsPreferenceFragment; import com.android.settings.applications.AppStateBaseBridge.Callback; import com.android.settings.datausage.DataSaverBackend.Listener; import com.android.settings.search.BaseSearchIndexProvider; -import com.android.settings.search.Indexable; import com.android.settings.widget.SwitchBar; import com.android.settings.widget.SwitchBar.OnSwitchChangeListener; import com.android.settingslib.applications.ApplicationsState; @@ -40,7 +38,6 @@ import com.android.settingslib.applications.ApplicationsState.Session; import com.android.settingslib.search.SearchIndexable; import java.util.ArrayList; -import java.util.List; @SearchIndexable public class DataSaverSummary extends SettingsPreferenceFragment diff --git a/src/com/android/settings/datausage/UnrestrictedDataAccess.java b/src/com/android/settings/datausage/UnrestrictedDataAccess.java index e8da1027ef5..6d8a4bad249 100644 --- a/src/com/android/settings/datausage/UnrestrictedDataAccess.java +++ b/src/com/android/settings/datausage/UnrestrictedDataAccess.java @@ -109,7 +109,7 @@ public class UnrestrictedDataAccess extends DashboardFragment { @Override protected int getPreferenceScreenResId() { - return SEARCH_INDEX_DATA_PROVIDER.getXmlResourceId(); + return R.xml.unrestricted_data_access_settings; } public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = diff --git a/src/com/android/settings/deletionhelper/AutomaticStorageManagerSettings.java b/src/com/android/settings/deletionhelper/AutomaticStorageManagerSettings.java index e947f5f35bf..0de9f67be36 100644 --- a/src/com/android/settings/deletionhelper/AutomaticStorageManagerSettings.java +++ b/src/com/android/settings/deletionhelper/AutomaticStorageManagerSettings.java @@ -34,7 +34,6 @@ import com.android.settings.SettingsActivity; import com.android.settings.Utils; 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.search.SearchIndexable; diff --git a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java index 4be90d57dcc..52a5cd91faa 100644 --- a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java +++ b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java @@ -29,7 +29,6 @@ import android.content.IntentFilter; import android.os.Bundle; import android.os.SystemProperties; import android.os.UserManager; -import android.provider.SearchIndexableResource; import android.util.Log; import android.view.LayoutInflater; import android.view.View; @@ -46,7 +45,6 @@ import com.android.settings.dashboard.RestrictedDashboardFragment; import com.android.settings.development.autofill.AutofillLoggingLevelPreferenceController; import com.android.settings.development.autofill.AutofillResetOptionsPreferenceController; 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; @@ -56,7 +54,6 @@ import com.android.settingslib.development.SystemPropPoker; import com.android.settingslib.search.SearchIndexable; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; @SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC) diff --git a/src/com/android/settings/development/featureflags/FeatureFlagsDashboard.java b/src/com/android/settings/development/featureflags/FeatureFlagsDashboard.java index d5f11064d50..0483dce7dca 100644 --- a/src/com/android/settings/development/featureflags/FeatureFlagsDashboard.java +++ b/src/com/android/settings/development/featureflags/FeatureFlagsDashboard.java @@ -23,7 +23,7 @@ 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.Indexable; import com.android.settingslib.development.DevelopmentSettingsEnabler; import com.android.settingslib.search.SearchIndexable; diff --git a/src/com/android/settings/development/gamedriver/GameDriverDashboard.java b/src/com/android/settings/development/gamedriver/GameDriverDashboard.java index 91057e8f73f..f67c029cb45 100644 --- a/src/com/android/settings/development/gamedriver/GameDriverDashboard.java +++ b/src/com/android/settings/development/gamedriver/GameDriverDashboard.java @@ -19,21 +19,16 @@ package com.android.settings.development.gamedriver; 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.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.settings.widget.SwitchBarController; import com.android.settingslib.development.DevelopmentSettingsEnabler; import com.android.settingslib.search.SearchIndexable; -import java.util.ArrayList; -import java.util.List; - /** * Dashboard for Game Driver preferences. */ diff --git a/src/com/android/settings/development/qstile/DevelopmentTileConfigFragment.java b/src/com/android/settings/development/qstile/DevelopmentTileConfigFragment.java index e266d9c739a..079195c0a12 100644 --- a/src/com/android/settings/development/qstile/DevelopmentTileConfigFragment.java +++ b/src/com/android/settings/development/qstile/DevelopmentTileConfigFragment.java @@ -23,7 +23,7 @@ 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.Indexable; import com.android.settingslib.development.DevelopmentSettingsEnabler; import com.android.settingslib.search.SearchIndexable; diff --git a/src/com/android/settings/deviceinfo/StorageDashboardFragment.java b/src/com/android/settings/deviceinfo/StorageDashboardFragment.java index e11c786e8df..9409626bbeb 100644 --- a/src/com/android/settings/deviceinfo/StorageDashboardFragment.java +++ b/src/com/android/settings/deviceinfo/StorageDashboardFragment.java @@ -46,7 +46,6 @@ import com.android.settings.deviceinfo.storage.StorageSummaryDonutPreferenceCont import com.android.settings.deviceinfo.storage.UserIconLoader; import com.android.settings.deviceinfo.storage.VolumeSizesLoader; import com.android.settings.search.BaseSearchIndexProvider; -import com.android.settings.search.Indexable; import com.android.settings.widget.EntityHeaderController; import com.android.settingslib.applications.StorageStatsSource; import com.android.settingslib.core.AbstractPreferenceController; diff --git a/src/com/android/settings/deviceinfo/StorageSettings.java b/src/com/android/settings/deviceinfo/StorageSettings.java index 1bafd518415..5925da97093 100644 --- a/src/com/android/settings/deviceinfo/StorageSettings.java +++ b/src/com/android/settings/deviceinfo/StorageSettings.java @@ -50,8 +50,8 @@ import com.android.settings.SettingsPreferenceFragment; import com.android.settings.core.SubSettingLauncher; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; import com.android.settings.search.BaseSearchIndexProvider; -import com.android.settings.search.Indexable; -import com.android.settings.search.SearchIndexableRaw; +import com.android.settingslib.search.Indexable; +import com.android.settingslib.search.SearchIndexableRaw; import com.android.settingslib.RestrictedLockUtils; import com.android.settingslib.RestrictedLockUtilsInternal; import com.android.settingslib.deviceinfo.PrivateStorageInfo; diff --git a/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionSettings.java b/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionSettings.java index 7a722f9d00d..2ade3c29352 100644 --- a/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionSettings.java +++ b/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionSettings.java @@ -23,7 +23,7 @@ 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.Indexable; import com.android.settingslib.search.SearchIndexable; import java.util.ArrayList; diff --git a/src/com/android/settings/deviceinfo/hardwareinfo/HardwareInfoFragment.java b/src/com/android/settings/deviceinfo/hardwareinfo/HardwareInfoFragment.java index fd2dcc50d57..adcbb2a5634 100644 --- a/src/com/android/settings/deviceinfo/hardwareinfo/HardwareInfoFragment.java +++ b/src/com/android/settings/deviceinfo/hardwareinfo/HardwareInfoFragment.java @@ -23,7 +23,7 @@ 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.Indexable; import com.android.settingslib.search.SearchIndexable; import java.util.ArrayList; diff --git a/src/com/android/settings/display/AdaptiveSleepSettings.java b/src/com/android/settings/display/AdaptiveSleepSettings.java index 79374804848..52ded6a2b75 100644 --- a/src/com/android/settings/display/AdaptiveSleepSettings.java +++ b/src/com/android/settings/display/AdaptiveSleepSettings.java @@ -54,7 +54,7 @@ public class AdaptiveSleepSettings extends DashboardFragment { @Override protected int getPreferenceScreenResId() { - return SEARCH_INDEX_DATA_PROVIDER.getXmlResourceId(); + return R.xml.adaptive_sleep_detail; } @Override diff --git a/src/com/android/settings/display/AutoBrightnessSettings.java b/src/com/android/settings/display/AutoBrightnessSettings.java index 38de253f55a..0c594730d5c 100644 --- a/src/com/android/settings/display/AutoBrightnessSettings.java +++ b/src/com/android/settings/display/AutoBrightnessSettings.java @@ -36,7 +36,7 @@ public class AutoBrightnessSettings extends DashboardFragment { @Override protected int getPreferenceScreenResId() { - return SEARCH_INDEX_DATA_PROVIDER.getXmlResourceId(); + return R.xml.auto_brightness_detail; } @Override diff --git a/src/com/android/settings/display/ColorModePreferenceFragment.java b/src/com/android/settings/display/ColorModePreferenceFragment.java index a977bc749f8..c48c1d414f2 100644 --- a/src/com/android/settings/display/ColorModePreferenceFragment.java +++ b/src/com/android/settings/display/ColorModePreferenceFragment.java @@ -90,7 +90,7 @@ public class ColorModePreferenceFragment extends RadioButtonPickerFragment { @Override protected int getPreferenceScreenResId() { - return SEARCH_INDEX_DATA_PROVIDER.getXmlResourceId(); + return R.xml.color_mode_settings; } @VisibleForTesting diff --git a/src/com/android/settings/display/NightDisplaySettings.java b/src/com/android/settings/display/NightDisplaySettings.java index fa69d70dbdc..7f425774982 100644 --- a/src/com/android/settings/display/NightDisplaySettings.java +++ b/src/com/android/settings/display/NightDisplaySettings.java @@ -153,7 +153,7 @@ public class NightDisplaySettings extends DashboardFragment @Override protected int getPreferenceScreenResId() { - return SEARCH_INDEX_DATA_PROVIDER.getXmlResourceId(); + return 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 d0a19ee6a45..a30713661ca 100644 --- a/src/com/android/settings/display/ScreenZoomSettings.java +++ b/src/com/android/settings/display/ScreenZoomSettings.java @@ -26,8 +26,8 @@ import android.view.Display; import com.android.settings.R; import com.android.settings.search.BaseSearchIndexProvider; -import com.android.settings.search.Indexable; -import com.android.settings.search.SearchIndexableRaw; +import com.android.settingslib.search.Indexable; +import com.android.settingslib.search.SearchIndexableRaw; import com.android.settingslib.display.DisplayDensityConfiguration; import com.android.settingslib.display.DisplayDensityUtils; import com.android.settingslib.search.SearchIndexable; diff --git a/src/com/android/settings/display/ToggleFontSizePreferenceFragment.java b/src/com/android/settings/display/ToggleFontSizePreferenceFragment.java index 98d6432f963..d024685686b 100644 --- a/src/com/android/settings/display/ToggleFontSizePreferenceFragment.java +++ b/src/com/android/settings/display/ToggleFontSizePreferenceFragment.java @@ -27,8 +27,8 @@ import android.provider.Settings; import com.android.settings.R; import com.android.settings.search.BaseSearchIndexProvider; -import com.android.settings.search.Indexable; -import com.android.settings.search.SearchIndexableRaw; +import com.android.settingslib.search.Indexable; +import com.android.settingslib.search.SearchIndexableRaw; import com.android.settingslib.search.SearchIndexable; import java.util.ArrayList; diff --git a/src/com/android/settings/dream/DreamSettings.java b/src/com/android/settings/dream/DreamSettings.java index 5bbf910b9eb..a40cf88da99 100644 --- a/src/com/android/settings/dream/DreamSettings.java +++ b/src/com/android/settings/dream/DreamSettings.java @@ -96,7 +96,7 @@ public class DreamSettings extends DashboardFragment { @Override protected int getPreferenceScreenResId() { - return SEARCH_INDEX_DATA_PROVIDER.getXmlResourceId(); + return R.xml.dream_fragment_overview; } @Override diff --git a/src/com/android/settings/flashlight/FlashlightHandleActivity.java b/src/com/android/settings/flashlight/FlashlightHandleActivity.java index 075c39bd9f0..589496540bc 100644 --- a/src/com/android/settings/flashlight/FlashlightHandleActivity.java +++ b/src/com/android/settings/flashlight/FlashlightHandleActivity.java @@ -24,8 +24,8 @@ import android.provider.Settings; import com.android.settings.R; import com.android.settings.search.BaseSearchIndexProvider; -import com.android.settings.search.Indexable; -import com.android.settings.search.SearchIndexableRaw; +import com.android.settingslib.search.Indexable; +import com.android.settingslib.search.SearchIndexableRaw; import com.android.settingslib.search.SearchIndexable; import java.util.ArrayList; diff --git a/src/com/android/settings/fuelgauge/PowerUsageSummary.java b/src/com/android/settings/fuelgauge/PowerUsageSummary.java index 08d70aa6a12..3a5f0ba8d23 100644 --- a/src/com/android/settings/fuelgauge/PowerUsageSummary.java +++ b/src/com/android/settings/fuelgauge/PowerUsageSummary.java @@ -252,7 +252,7 @@ public class PowerUsageSummary extends PowerUsageBase implements OnLongClickList @Override protected int getPreferenceScreenResId() { - return SEARCH_INDEX_DATA_PROVIDER.getXmlResourceId(); + return R.xml.power_usage_summary; } @Override diff --git a/src/com/android/settings/fuelgauge/batterysaver/BatterySaverSettings.java b/src/com/android/settings/fuelgauge/batterysaver/BatterySaverSettings.java index 2b283916ce7..74d0a7a0854 100644 --- a/src/com/android/settings/fuelgauge/batterysaver/BatterySaverSettings.java +++ b/src/com/android/settings/fuelgauge/batterysaver/BatterySaverSettings.java @@ -59,7 +59,7 @@ public class BatterySaverSettings extends DashboardFragment { @Override protected int getPreferenceScreenResId() { - return SEARCH_INDEX_DATA_PROVIDER.getXmlResourceId(); + return R.xml.battery_saver_settings; } @Override diff --git a/src/com/android/settings/gestures/GlobalActionsPanelSettings.java b/src/com/android/settings/gestures/GlobalActionsPanelSettings.java index 34db20ed15c..1ae2a231173 100644 --- a/src/com/android/settings/gestures/GlobalActionsPanelSettings.java +++ b/src/com/android/settings/gestures/GlobalActionsPanelSettings.java @@ -40,7 +40,7 @@ public class GlobalActionsPanelSettings extends DashboardFragment { @Override protected int getPreferenceScreenResId() { - return SEARCH_INDEX_DATA_PROVIDER.getXmlResourceId(); + return R.xml.global_actions_panel_settings; } public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = diff --git a/src/com/android/settings/gestures/PickupGestureSettings.java b/src/com/android/settings/gestures/PickupGestureSettings.java index 6c7c5871262..7d59754d462 100644 --- a/src/com/android/settings/gestures/PickupGestureSettings.java +++ b/src/com/android/settings/gestures/PickupGestureSettings.java @@ -60,7 +60,7 @@ public class PickupGestureSettings extends DashboardFragment { @Override protected int getPreferenceScreenResId() { - return SEARCH_INDEX_DATA_PROVIDER.getXmlResourceId(); + return R.xml.pick_up_gesture_settings; } @Override diff --git a/src/com/android/settings/gestures/SwipeToNotificationSettings.java b/src/com/android/settings/gestures/SwipeToNotificationSettings.java index caa760a0c7c..961718f551a 100644 --- a/src/com/android/settings/gestures/SwipeToNotificationSettings.java +++ b/src/com/android/settings/gestures/SwipeToNotificationSettings.java @@ -56,7 +56,7 @@ public class SwipeToNotificationSettings extends DashboardFragment { @Override protected int getPreferenceScreenResId() { - return SEARCH_INDEX_DATA_PROVIDER.getXmlResourceId(); + return R.xml.swipe_to_notification_settings; } public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = diff --git a/src/com/android/settings/gestures/SystemNavigationGestureSettings.java b/src/com/android/settings/gestures/SystemNavigationGestureSettings.java index 79379ef3750..122a74f422b 100644 --- a/src/com/android/settings/gestures/SystemNavigationGestureSettings.java +++ b/src/com/android/settings/gestures/SystemNavigationGestureSettings.java @@ -33,7 +33,6 @@ import android.content.om.IOverlayManager; import android.content.om.OverlayInfo; import android.os.RemoteException; import android.os.ServiceManager; -import android.provider.SearchIndexableResource; import android.provider.Settings; import android.text.TextUtils; import android.view.accessibility.AccessibilityManager; @@ -46,7 +45,6 @@ import com.android.settings.SettingsTutorialDialogWrapperActivity; import com.android.settings.dashboard.suggestions.SuggestionFeatureProvider; import com.android.settings.overlay.FeatureFactory; import com.android.settings.search.BaseSearchIndexProvider; -import com.android.settings.search.Indexable; import com.android.settings.utils.CandidateInfoExtra; import com.android.settings.widget.RadioButtonPickerFragment; import com.android.settings.widget.RadioButtonPreferenceWithExtraWidget; @@ -56,7 +54,6 @@ import com.android.settingslib.widget.CandidateInfo; import com.android.settingslib.widget.RadioButtonPreference; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; @SearchIndexable diff --git a/src/com/android/settings/gestures/TapScreenGestureSettings.java b/src/com/android/settings/gestures/TapScreenGestureSettings.java index a1a8e426a77..99c349400b5 100644 --- a/src/com/android/settings/gestures/TapScreenGestureSettings.java +++ b/src/com/android/settings/gestures/TapScreenGestureSettings.java @@ -27,7 +27,7 @@ import com.android.settings.dashboard.DashboardFragment; import com.android.settings.dashboard.suggestions.SuggestionFeatureProvider; import com.android.settings.overlay.FeatureFactory; import com.android.settings.search.BaseSearchIndexProvider; -import com.android.settings.search.Indexable; +import com.android.settingslib.search.Indexable; import com.android.settingslib.search.SearchIndexable; import java.util.Arrays; diff --git a/src/com/android/settings/homepage/TopLevelSettings.java b/src/com/android/settings/homepage/TopLevelSettings.java index cbae8639e93..8a7f4bdf43f 100644 --- a/src/com/android/settings/homepage/TopLevelSettings.java +++ b/src/com/android/settings/homepage/TopLevelSettings.java @@ -50,7 +50,7 @@ public class TopLevelSettings extends DashboardFragment implements @Override protected int getPreferenceScreenResId() { - return SEARCH_INDEX_DATA_PROVIDER.getXmlResourceId(); + return R.xml.top_level_settings; } @Override diff --git a/src/com/android/settings/inputmethod/PhysicalKeyboardFragment.java b/src/com/android/settings/inputmethod/PhysicalKeyboardFragment.java index c154f6136f9..ee73c2748b9 100644 --- a/src/com/android/settings/inputmethod/PhysicalKeyboardFragment.java +++ b/src/com/android/settings/inputmethod/PhysicalKeyboardFragment.java @@ -45,7 +45,7 @@ import com.android.settings.R; import com.android.settings.Settings; import com.android.settings.SettingsPreferenceFragment; import com.android.settings.search.BaseSearchIndexProvider; -import com.android.settings.search.Indexable; +import com.android.settingslib.search.Indexable; import com.android.settingslib.search.SearchIndexable; import com.android.settingslib.utils.ThreadUtils; diff --git a/src/com/android/settings/inputmethod/UserDictionaryList.java b/src/com/android/settings/inputmethod/UserDictionaryList.java index 310c1e85664..a003f96b495 100644 --- a/src/com/android/settings/inputmethod/UserDictionaryList.java +++ b/src/com/android/settings/inputmethod/UserDictionaryList.java @@ -25,7 +25,7 @@ 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.Indexable; import com.android.settingslib.search.SearchIndexable; import java.util.ArrayList; diff --git a/src/com/android/settings/inputmethod/VirtualKeyboardFragment.java b/src/com/android/settings/inputmethod/VirtualKeyboardFragment.java index dfdb50a6d3e..903905b2b47 100644 --- a/src/com/android/settings/inputmethod/VirtualKeyboardFragment.java +++ b/src/com/android/settings/inputmethod/VirtualKeyboardFragment.java @@ -23,7 +23,7 @@ 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.Indexable; import com.android.settingslib.search.SearchIndexable; import java.util.Arrays; diff --git a/src/com/android/settings/language/LanguageAndInputSettings.java b/src/com/android/settings/language/LanguageAndInputSettings.java index 45caeb535ef..4f45890162e 100644 --- a/src/com/android/settings/language/LanguageAndInputSettings.java +++ b/src/com/android/settings/language/LanguageAndInputSettings.java @@ -80,7 +80,7 @@ public class LanguageAndInputSettings extends DashboardFragment { @Override protected int getPreferenceScreenResId() { - return SEARCH_INDEX_DATA_PROVIDER.getXmlResourceId(); + return 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 d455a928001..4afb5049295 100644 --- a/src/com/android/settings/location/LocationSettings.java +++ b/src/com/android/settings/location/LocationSettings.java @@ -83,7 +83,7 @@ public class LocationSettings extends DashboardFragment { @Override protected int getPreferenceScreenResId() { - return SEARCH_INDEX_DATA_PROVIDER.getXmlResourceId(); + return R.xml.location_settings; } @Override diff --git a/src/com/android/settings/location/RecentLocationRequestSeeAllFragment.java b/src/com/android/settings/location/RecentLocationRequestSeeAllFragment.java index c31a78310dd..32c9d0d6aff 100644 --- a/src/com/android/settings/location/RecentLocationRequestSeeAllFragment.java +++ b/src/com/android/settings/location/RecentLocationRequestSeeAllFragment.java @@ -53,7 +53,7 @@ public class RecentLocationRequestSeeAllFragment extends DashboardFragment { @Override protected int getPreferenceScreenResId() { - return SEARCH_INDEX_DATA_PROVIDER.getXmlResourceId(); + return 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 b95f9769aaf..90f4e2a9ea0 100644 --- a/src/com/android/settings/location/ScanningSettings.java +++ b/src/com/android/settings/location/ScanningSettings.java @@ -42,7 +42,7 @@ public class ScanningSettings extends DashboardFragment { @Override protected int getPreferenceScreenResId() { - return SEARCH_INDEX_DATA_PROVIDER.getXmlResourceId(); + return R.xml.location_scanning; } @Override diff --git a/src/com/android/settings/network/MobileNetworkListFragment.java b/src/com/android/settings/network/MobileNetworkListFragment.java index cae02f96c21..c27775db96f 100644 --- a/src/com/android/settings/network/MobileNetworkListFragment.java +++ b/src/com/android/settings/network/MobileNetworkListFragment.java @@ -35,7 +35,7 @@ public class MobileNetworkListFragment extends DashboardFragment { @Override protected int getPreferenceScreenResId() { - return SEARCH_INDEX_DATA_PROVIDER.getXmlResourceId(); + return R.xml.mobile_network_list; } @Override diff --git a/src/com/android/settings/network/telephony/MobileNetworkSettings.java b/src/com/android/settings/network/telephony/MobileNetworkSettings.java index d770e0280e9..6b5d720e65a 100644 --- a/src/com/android/settings/network/telephony/MobileNetworkSettings.java +++ b/src/com/android/settings/network/telephony/MobileNetworkSettings.java @@ -47,7 +47,6 @@ import com.android.settings.network.telephony.cdma.CdmaSystemSelectPreferenceCon import com.android.settings.network.telephony.gsm.AutoSelectPreferenceController; import com.android.settings.network.telephony.gsm.OpenNetworkSelectPagePreferenceController; import com.android.settings.search.BaseSearchIndexProvider; -import com.android.settings.search.Indexable; import com.android.settings.widget.PreferenceCategoryController; import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.search.SearchIndexable; diff --git a/src/com/android/settings/nfc/PaymentSettings.java b/src/com/android/settings/nfc/PaymentSettings.java index 600f92b6da7..560ddbf1cd4 100644 --- a/src/com/android/settings/nfc/PaymentSettings.java +++ b/src/com/android/settings/nfc/PaymentSettings.java @@ -54,7 +54,7 @@ public class PaymentSettings extends DashboardFragment { @Override protected int getPreferenceScreenResId() { - return SEARCH_INDEX_DATA_PROVIDER.getXmlResourceId(); + return R.xml.nfc_payment_settings; } @Override diff --git a/src/com/android/settings/notification/ConfigureNotificationSettings.java b/src/com/android/settings/notification/ConfigureNotificationSettings.java index f5765d74dc9..ff8e94ad6e5 100644 --- a/src/com/android/settings/notification/ConfigureNotificationSettings.java +++ b/src/com/android/settings/notification/ConfigureNotificationSettings.java @@ -76,7 +76,7 @@ public class ConfigureNotificationSettings extends DashboardFragment implements @Override protected int getPreferenceScreenResId() { - return SEARCH_INDEX_DATA_PROVIDER.getXmlResourceId(); + return 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 82e3deead5b..4c20f328444 100644 --- a/src/com/android/settings/notification/NotificationAccessSettings.java +++ b/src/com/android/settings/notification/NotificationAccessSettings.java @@ -24,7 +24,6 @@ import android.content.Context; import android.os.AsyncTask; import android.os.Bundle; import android.os.UserManager; -import android.provider.SearchIndexableResource; import android.provider.Settings; import android.service.notification.NotificationListenerService; import android.widget.Toast; @@ -37,13 +36,9 @@ import com.android.settings.R; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; 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.search.SearchIndexable; -import java.util.ArrayList; -import java.util.List; - /** * Settings screen for managing notification listener permissions */ diff --git a/src/com/android/settings/notification/NotificationAssistantPicker.java b/src/com/android/settings/notification/NotificationAssistantPicker.java index 4cfc7da4207..fcee56a702b 100644 --- a/src/com/android/settings/notification/NotificationAssistantPicker.java +++ b/src/com/android/settings/notification/NotificationAssistantPicker.java @@ -74,7 +74,7 @@ public class NotificationAssistantPicker extends DefaultAppPickerFragment implem @Override protected int getPreferenceScreenResId() { - return SEARCH_INDEX_DATA_PROVIDER.getXmlResourceId(); + return R.xml.notification_assistant_settings; } @Override diff --git a/src/com/android/settings/notification/ZenAccessSettings.java b/src/com/android/settings/notification/ZenAccessSettings.java index 1d1a48b7116..34b5354f161 100644 --- a/src/com/android/settings/notification/ZenAccessSettings.java +++ b/src/com/android/settings/notification/ZenAccessSettings.java @@ -78,7 +78,7 @@ public class ZenAccessSettings extends EmptyTextSettings implements @Override protected int getPreferenceScreenResId() { - return SEARCH_INDEX_DATA_PROVIDER.getXmlResourceId(); + return R.xml.zen_access_settings; } @Override diff --git a/src/com/android/settings/notification/ZenModeAutomationSettings.java b/src/com/android/settings/notification/ZenModeAutomationSettings.java index ae5029ffa93..283a9299ecc 100644 --- a/src/com/android/settings/notification/ZenModeAutomationSettings.java +++ b/src/com/android/settings/notification/ZenModeAutomationSettings.java @@ -79,7 +79,7 @@ public class ZenModeAutomationSettings extends ZenModeSettingsBase { @Override protected int getPreferenceScreenResId() { - return SEARCH_INDEX_DATA_PROVIDER.getXmlResourceId(); + return 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 ac6698b1ecb..61d41f9db8e 100644 --- a/src/com/android/settings/notification/ZenModeBlockedEffectsSettings.java +++ b/src/com/android/settings/notification/ZenModeBlockedEffectsSettings.java @@ -30,9 +30,9 @@ import android.os.Bundle; 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.core.lifecycle.Lifecycle; +import com.android.settingslib.search.Indexable; import com.android.settingslib.search.SearchIndexable; import java.util.ArrayList; @@ -81,7 +81,7 @@ public class ZenModeBlockedEffectsSettings extends ZenModeSettingsBase implement @Override protected int getPreferenceScreenResId() { - return SEARCH_INDEX_DATA_PROVIDER.getXmlResourceId(); + return 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 5767c96b176..1518ba88a49 100644 --- a/src/com/android/settings/notification/ZenModeBypassingAppsSettings.java +++ b/src/com/android/settings/notification/ZenModeBypassingAppsSettings.java @@ -25,8 +25,8 @@ 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.settingslib.core.AbstractPreferenceController; +import com.android.settingslib.search.Indexable; import com.android.settingslib.search.SearchIndexable; import java.util.ArrayList; @@ -58,7 +58,7 @@ public class ZenModeBypassingAppsSettings extends ZenModeSettingsBase implements @Override protected int getPreferenceScreenResId() { - return SEARCH_INDEX_DATA_PROVIDER.getXmlResourceId(); + return 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 8656b047c22..9211f1992b5 100644 --- a/src/com/android/settings/notification/ZenModeCallsSettings.java +++ b/src/com/android/settings/notification/ZenModeCallsSettings.java @@ -20,13 +20,12 @@ import static android.app.NotificationManager.Policy.PRIORITY_CATEGORY_CALLS; import android.app.settings.SettingsEnums; import android.content.Context; -import android.provider.SearchIndexableResource; import com.android.settings.R; import com.android.settings.search.BaseSearchIndexProvider; -import com.android.settings.search.Indexable; import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.core.lifecycle.Lifecycle; +import com.android.settingslib.search.Indexable; import com.android.settingslib.search.SearchIndexable; import java.util.ArrayList; diff --git a/src/com/android/settings/notification/ZenModeMessagesSettings.java b/src/com/android/settings/notification/ZenModeMessagesSettings.java index 66088a9378c..f995bb09949 100644 --- a/src/com/android/settings/notification/ZenModeMessagesSettings.java +++ b/src/com/android/settings/notification/ZenModeMessagesSettings.java @@ -23,9 +23,9 @@ import android.content.Context; 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.core.lifecycle.Lifecycle; +import com.android.settingslib.search.Indexable; import com.android.settingslib.search.SearchIndexable; import java.util.ArrayList; @@ -52,7 +52,7 @@ public class ZenModeMessagesSettings extends ZenModeSettingsBase implements Inde @Override protected int getPreferenceScreenResId() { - return SEARCH_INDEX_DATA_PROVIDER.getXmlResourceId(); + return 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 17cc37060e5..2d58ed9c6ae 100644 --- a/src/com/android/settings/notification/ZenModeRestrictNotificationsSettings.java +++ b/src/com/android/settings/notification/ZenModeRestrictNotificationsSettings.java @@ -23,7 +23,7 @@ import android.provider.SearchIndexableResource; import com.android.settings.R; import com.android.settings.search.BaseSearchIndexProvider; -import com.android.settings.search.Indexable; +import com.android.settingslib.search.Indexable; import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settingslib.search.SearchIndexable; diff --git a/src/com/android/settings/notification/ZenModeSettings.java b/src/com/android/settings/notification/ZenModeSettings.java index 3497d109ef6..46e029a0095 100644 --- a/src/com/android/settings/notification/ZenModeSettings.java +++ b/src/com/android/settings/notification/ZenModeSettings.java @@ -39,7 +39,7 @@ import androidx.fragment.app.FragmentManager; import com.android.settings.R; import com.android.settings.search.BaseSearchIndexProvider; -import com.android.settings.search.Indexable; +import com.android.settingslib.search.Indexable; import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settingslib.search.SearchIndexable; diff --git a/src/com/android/settings/notification/ZenModeSoundVibrationSettings.java b/src/com/android/settings/notification/ZenModeSoundVibrationSettings.java index 431f1718c79..4e8dcd8cd8d 100644 --- a/src/com/android/settings/notification/ZenModeSoundVibrationSettings.java +++ b/src/com/android/settings/notification/ZenModeSoundVibrationSettings.java @@ -22,7 +22,7 @@ import android.provider.SearchIndexableResource; import com.android.settings.R; import com.android.settings.search.BaseSearchIndexProvider; -import com.android.settings.search.Indexable; +import com.android.settingslib.search.Indexable; import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settingslib.search.SearchIndexable; diff --git a/src/com/android/settings/print/PrintSettingsFragment.java b/src/com/android/settings/print/PrintSettingsFragment.java index 3fd6f58f189..064109393f8 100644 --- a/src/com/android/settings/print/PrintSettingsFragment.java +++ b/src/com/android/settings/print/PrintSettingsFragment.java @@ -54,7 +54,7 @@ import androidx.preference.PreferenceCategory; import com.android.settings.R; import com.android.settings.search.BaseSearchIndexProvider; -import com.android.settings.search.Indexable; +import com.android.settingslib.search.Indexable; import com.android.settingslib.search.SearchIndexable; import com.android.settingslib.widget.apppreference.AppPreference; diff --git a/src/com/android/settings/search/BaseSearchIndexProvider.java b/src/com/android/settings/search/BaseSearchIndexProvider.java index 58b571eaf95..64de8d20461 100644 --- a/src/com/android/settings/search/BaseSearchIndexProvider.java +++ b/src/com/android/settings/search/BaseSearchIndexProvider.java @@ -36,6 +36,8 @@ import com.android.settings.core.PreferenceControllerListHelper; import com.android.settings.core.PreferenceControllerMixin; import com.android.settings.core.PreferenceXmlParserUtils; import com.android.settingslib.core.AbstractPreferenceController; +import com.android.settingslib.search.Indexable; +import com.android.settingslib.search.SearchIndexableRaw; import org.xmlpull.v1.XmlPullParserException; @@ -134,13 +136,6 @@ 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/DatabaseIndexingUtils.java b/src/com/android/settings/search/DatabaseIndexingUtils.java index e71db9dbb27..21936a0bd6d 100644 --- a/src/com/android/settings/search/DatabaseIndexingUtils.java +++ b/src/com/android/settings/search/DatabaseIndexingUtils.java @@ -19,6 +19,8 @@ package com.android.settings.search; import android.util.Log; +import com.android.settingslib.search.Indexable; + import java.lang.reflect.Field; /** diff --git a/src/com/android/settings/search/Indexable.java b/src/com/android/settings/search/Indexable.java deleted file mode 100644 index e3d917663f1..00000000000 --- a/src/com/android/settings/search/Indexable.java +++ /dev/null @@ -1,74 +0,0 @@ -/* - * Copyright (C) 2014 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.settings.search; - -import android.content.Context; -import android.provider.SearchIndexableResource; - -import androidx.annotation.Keep; - -import com.android.settingslib.core.AbstractPreferenceController; - -import java.util.List; - -/** - * Interface for classes whose instances can provide data for indexing. - * - * Classes implementing the Indexable interface must have a static field called - * SEARCH_INDEX_DATA_PROVIDER, which is an object implementing the - * {@link Indexable.SearchIndexProvider} interface. - * - * See {@link android.provider.SearchIndexableResource} and {@link SearchIndexableRaw}. - */ -public interface Indexable { - - interface SearchIndexProvider { - /** - * Return a list of references for indexing. - * - * See {@link android.provider.SearchIndexableResource} - * - * @param context the context. - * @param enabled hint telling if the data needs to be considered into the search results - * or not. - * @return a list of {@link android.provider.SearchIndexableResource} references. - * Can be null. - */ - @Keep - List getXmlResourcesToIndex(Context context, boolean enabled); - - /** - * Return a list of raw data for indexing. See {@link SearchIndexableRaw} - * - * @param context the context. - * @param enabled hint telling if the data needs to be considered into the search results - * or not. - * @return a list of {@link SearchIndexableRaw} references. Can be null. - */ - @Keep - List getRawDataToIndex(Context context, boolean enabled); - - /** - * Return a list of data keys that cannot be indexed. See {@link SearchIndexableRaw} - * - * @param context the context. - * @return a list of {@link SearchIndexableRaw} references. Can be null. - */ - @Keep - List getNonIndexableKeys(Context context); - } -} diff --git a/src/com/android/settings/search/SearchIndexableRaw.java b/src/com/android/settings/search/SearchIndexableRaw.java deleted file mode 100644 index b8a1699e88c..00000000000 --- a/src/com/android/settings/search/SearchIndexableRaw.java +++ /dev/null @@ -1,64 +0,0 @@ -/* - * Copyright (C) 2014 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.settings.search; - -import android.content.Context; -import android.provider.SearchIndexableData; - -/** - * Indexable raw data for Search. - * - * This is the raw data used by the Indexer and should match its data model. - * - * See {@link Indexable} and {@link android.provider.SearchIndexableResource}. - */ -public class SearchIndexableRaw extends SearchIndexableData { - - /** - * Title's raw data. - */ - public String title; - - /** - * Summary's raw data when the data is "ON". - */ - public String summaryOn; - - /** - * Summary's raw data when the data is "OFF". - */ - public String summaryOff; - - /** - * Entries associated with the raw data (when the data can have several values). - */ - public String entries; - - /** - * Keywords' raw data. - */ - public String keywords; - - /** - * Fragment's or Activity's title associated with the raw data. - */ - public String screenTitle; - - public SearchIndexableRaw(Context context) { - super(context); - } -} diff --git a/src/com/android/settings/search/SettingsSearchIndexablesProvider.java b/src/com/android/settings/search/SettingsSearchIndexablesProvider.java index b5982243e2c..d3692b29727 100644 --- a/src/com/android/settings/search/SettingsSearchIndexablesProvider.java +++ b/src/com/android/settings/search/SettingsSearchIndexablesProvider.java @@ -65,6 +65,8 @@ import com.android.settings.overlay.FeatureFactory; import com.android.settings.slices.SettingsSliceProvider; import com.android.settingslib.drawer.DashboardCategory; import com.android.settingslib.drawer.Tile; +import com.android.settingslib.search.Indexable; +import com.android.settingslib.search.SearchIndexableRaw; import java.util.ArrayList; import java.util.Collection; diff --git a/src/com/android/settings/security/EncryptionAndCredential.java b/src/com/android/settings/security/EncryptionAndCredential.java index 5688b204c5b..3e88fa8e5fa 100644 --- a/src/com/android/settings/security/EncryptionAndCredential.java +++ b/src/com/android/settings/security/EncryptionAndCredential.java @@ -59,7 +59,7 @@ public class EncryptionAndCredential extends DashboardFragment { @Override protected int getPreferenceScreenResId() { - return SEARCH_INDEX_DATA_PROVIDER.getXmlResourceId(); + return R.xml.encryption_and_credential; } private static List buildPreferenceControllers(Context context, diff --git a/src/com/android/settings/security/LockscreenDashboardFragment.java b/src/com/android/settings/security/LockscreenDashboardFragment.java index f63ccb2608d..29b114a3183 100644 --- a/src/com/android/settings/security/LockscreenDashboardFragment.java +++ b/src/com/android/settings/security/LockscreenDashboardFragment.java @@ -77,7 +77,7 @@ public class LockscreenDashboardFragment extends DashboardFragment @Override protected int getPreferenceScreenResId() { - return SEARCH_INDEX_DATA_PROVIDER.getXmlResourceId(); + return R.xml.security_lockscreen_settings; } @Override diff --git a/src/com/android/settings/security/screenlock/ScreenLockSettings.java b/src/com/android/settings/security/screenlock/ScreenLockSettings.java index 1cc6b3f83c9..c1a0f467615 100644 --- a/src/com/android/settings/security/screenlock/ScreenLockSettings.java +++ b/src/com/android/settings/security/screenlock/ScreenLockSettings.java @@ -19,7 +19,6 @@ package com.android.settings.security.screenlock; import android.app.settings.SettingsEnums; import android.content.Context; import android.os.UserHandle; -import android.provider.SearchIndexableResource; import androidx.fragment.app.Fragment; @@ -27,7 +26,6 @@ import com.android.internal.widget.LockPatternUtils; 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.security.OwnerInfoPreferenceController; import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.core.lifecycle.Lifecycle; diff --git a/src/com/android/settings/security/trustagent/TrustAgentSettings.java b/src/com/android/settings/security/trustagent/TrustAgentSettings.java index 0129fcec47c..72898248b0b 100644 --- a/src/com/android/settings/security/trustagent/TrustAgentSettings.java +++ b/src/com/android/settings/security/trustagent/TrustAgentSettings.java @@ -23,7 +23,7 @@ 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.Indexable; import com.android.settingslib.search.SearchIndexable; import java.util.ArrayList; diff --git a/src/com/android/settings/sim/SimSettings.java b/src/com/android/settings/sim/SimSettings.java index 8134ab0161f..bd65508c081 100644 --- a/src/com/android/settings/sim/SimSettings.java +++ b/src/com/android/settings/sim/SimSettings.java @@ -42,7 +42,7 @@ import com.android.settings.R; import com.android.settings.RestrictedSettingsFragment; import com.android.settings.Utils; import com.android.settings.search.BaseSearchIndexProvider; -import com.android.settings.search.Indexable; +import com.android.settingslib.search.Indexable; import com.android.settingslib.search.SearchIndexable; import java.util.ArrayList; diff --git a/src/com/android/settings/slices/SliceDataConverter.java b/src/com/android/settings/slices/SliceDataConverter.java index 85fa8b0be7c..06b5d786739 100644 --- a/src/com/android/settings/slices/SliceDataConverter.java +++ b/src/com/android/settings/slices/SliceDataConverter.java @@ -54,7 +54,7 @@ import com.android.settings.core.PreferenceXmlParserUtils.MetadataFlag; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.overlay.FeatureFactory; import com.android.settings.search.DatabaseIndexingUtils; -import com.android.settings.search.Indexable.SearchIndexProvider; +import com.android.settingslib.search.Indexable.SearchIndexProvider; import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; import org.xmlpull.v1.XmlPullParser; diff --git a/src/com/android/settings/support/SupportDashboardActivity.java b/src/com/android/settings/support/SupportDashboardActivity.java index 0710843171c..8bc538ef38a 100644 --- a/src/com/android/settings/support/SupportDashboardActivity.java +++ b/src/com/android/settings/support/SupportDashboardActivity.java @@ -24,8 +24,8 @@ import com.android.settings.R; import com.android.settings.overlay.FeatureFactory; import com.android.settings.overlay.SupportFeatureProvider; import com.android.settings.search.BaseSearchIndexProvider; -import com.android.settings.search.Indexable; -import com.android.settings.search.SearchIndexableRaw; +import com.android.settingslib.search.Indexable; +import com.android.settingslib.search.SearchIndexableRaw; import com.android.settingslib.search.SearchIndexable; import java.util.ArrayList; diff --git a/src/com/android/settings/system/ResetDashboardFragment.java b/src/com/android/settings/system/ResetDashboardFragment.java index fc53d4e7d80..5e0ead49383 100644 --- a/src/com/android/settings/system/ResetDashboardFragment.java +++ b/src/com/android/settings/system/ResetDashboardFragment.java @@ -25,7 +25,7 @@ import com.android.settings.applications.manageapplications.ResetAppPrefPreferen import com.android.settings.dashboard.DashboardFragment; import com.android.settings.network.NetworkResetPreferenceController; import com.android.settings.search.BaseSearchIndexProvider; -import com.android.settings.search.Indexable; +import com.android.settingslib.search.Indexable; import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settingslib.search.SearchIndexable; diff --git a/src/com/android/settings/system/SystemDashboardFragment.java b/src/com/android/settings/system/SystemDashboardFragment.java index 9736176415d..a766fec2d76 100644 --- a/src/com/android/settings/system/SystemDashboardFragment.java +++ b/src/com/android/settings/system/SystemDashboardFragment.java @@ -29,7 +29,7 @@ import com.android.settings.R; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.overlay.FeatureFactory; import com.android.settings.search.BaseSearchIndexProvider; -import com.android.settings.search.Indexable; +import com.android.settingslib.search.Indexable; import com.android.settingslib.search.SearchIndexable; import java.util.Arrays; diff --git a/src/com/android/settings/tts/TtsEnginePreferenceFragment.java b/src/com/android/settings/tts/TtsEnginePreferenceFragment.java index c2f4e168684..6a1b9bba93c 100644 --- a/src/com/android/settings/tts/TtsEnginePreferenceFragment.java +++ b/src/com/android/settings/tts/TtsEnginePreferenceFragment.java @@ -138,7 +138,7 @@ public class TtsEnginePreferenceFragment extends RadioButtonPickerFragment { @Override protected int getPreferenceScreenResId() { - return SEARCH_INDEX_DATA_PROVIDER.getXmlResourceId(); + return R.xml.tts_engine_picker; } private boolean shouldDisplayDataAlert(EngineCandidateInfo info) { diff --git a/src/com/android/settings/users/UserSettings.java b/src/com/android/settings/users/UserSettings.java index 65057d96b74..2463295a7f9 100644 --- a/src/com/android/settings/users/UserSettings.java +++ b/src/com/android/settings/users/UserSettings.java @@ -41,7 +41,6 @@ import android.os.RemoteException; import android.os.UserHandle; import android.os.UserManager; import android.provider.ContactsContract; -import android.provider.SearchIndexableResource; import android.util.Log; import android.util.SparseArray; import android.view.Menu; @@ -67,7 +66,6 @@ import com.android.settings.core.SubSettingLauncher; import com.android.settings.dashboard.SummaryLoader; import com.android.settings.password.ChooseLockGeneric; import com.android.settings.search.BaseSearchIndexProvider; -import com.android.settings.search.Indexable; import com.android.settings.widget.SwitchBar; import com.android.settings.widget.SwitchBarController; import com.android.settingslib.RestrictedLockUtils; diff --git a/src/com/android/settings/wallpaper/WallpaperSuggestionActivity.java b/src/com/android/settings/wallpaper/WallpaperSuggestionActivity.java index 53f92c87191..e9e12e8ed2e 100644 --- a/src/com/android/settings/wallpaper/WallpaperSuggestionActivity.java +++ b/src/com/android/settings/wallpaper/WallpaperSuggestionActivity.java @@ -25,8 +25,8 @@ import androidx.annotation.VisibleForTesting; import com.android.settings.display.WallpaperPreferenceController; import com.android.settings.search.BaseSearchIndexProvider; -import com.android.settings.search.Indexable; -import com.android.settings.search.SearchIndexableRaw; +import com.android.settingslib.search.Indexable; +import com.android.settingslib.search.SearchIndexableRaw; import com.android.settingslib.search.SearchIndexable; import java.util.ArrayList; diff --git a/src/com/android/settings/wfd/WifiDisplaySettings.java b/src/com/android/settings/wfd/WifiDisplaySettings.java index cf6b8714eb6..0953ef76cf8 100755 --- a/src/com/android/settings/wfd/WifiDisplaySettings.java +++ b/src/com/android/settings/wfd/WifiDisplaySettings.java @@ -66,7 +66,7 @@ import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; import com.android.settings.dashboard.SummaryLoader; import com.android.settings.search.BaseSearchIndexProvider; -import com.android.settings.search.Indexable; +import com.android.settingslib.search.Indexable; import com.android.settingslib.TwoTargetPreference; import com.android.settingslib.search.SearchIndexable; diff --git a/src/com/android/settings/wifi/ConfigureWifiSettings.java b/src/com/android/settings/wifi/ConfigureWifiSettings.java index 340dd55d0b5..41c845b44c2 100644 --- a/src/com/android/settings/wifi/ConfigureWifiSettings.java +++ b/src/com/android/settings/wifi/ConfigureWifiSettings.java @@ -66,7 +66,7 @@ public class ConfigureWifiSettings extends DashboardFragment { @Override protected int getPreferenceScreenResId() { - return SEARCH_INDEX_DATA_PROVIDER.getXmlResourceId(); + return 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 afc8da53289..ec799de26a4 100644 --- a/src/com/android/settings/wifi/WifiSettings.java +++ b/src/com/android/settings/wifi/WifiSettings.java @@ -50,6 +50,10 @@ import android.view.MenuItem; import android.view.View; import android.widget.Toast; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceCategory; + import com.android.settings.LinkifyUtils; import com.android.settings.R; import com.android.settings.RestrictedSettingsFragment; @@ -61,15 +65,15 @@ import com.android.settings.datausage.DataUsagePreference; import com.android.settings.datausage.DataUsageUtils; import com.android.settings.location.ScanningSettings; import com.android.settings.search.BaseSearchIndexProvider; -import com.android.settings.search.Indexable; -import com.android.settings.search.SearchIndexableRaw; import com.android.settings.widget.SummaryUpdater.OnSummaryChangeListener; import com.android.settings.widget.SwitchBarController; import com.android.settings.wifi.details.WifiNetworkDetailsFragment; import com.android.settings.wifi.dpp.WifiDppUtils; import com.android.settingslib.RestrictedLockUtils; import com.android.settingslib.RestrictedLockUtilsInternal; +import com.android.settingslib.search.Indexable; import com.android.settingslib.search.SearchIndexable; +import com.android.settingslib.search.SearchIndexableRaw; import com.android.settingslib.wifi.AccessPoint; import com.android.settingslib.wifi.AccessPoint.AccessPointListener; import com.android.settingslib.wifi.AccessPointPreference; @@ -80,10 +84,6 @@ import com.android.settingslib.wifi.WifiTrackerFactory; import java.util.ArrayList; import java.util.List; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; -import androidx.preference.PreferenceCategory; - /** * Two types of UI are provided here. * diff --git a/src/com/android/settings/wifi/WifiSettings2.java b/src/com/android/settings/wifi/WifiSettings2.java index 3ebdda4c772..ed697edcc28 100644 --- a/src/com/android/settings/wifi/WifiSettings2.java +++ b/src/com/android/settings/wifi/WifiSettings2.java @@ -59,11 +59,11 @@ import com.android.settings.datausage.DataUsagePreference; import com.android.settings.datausage.DataUsageUtils; import com.android.settings.location.ScanningSettings; import com.android.settings.search.BaseSearchIndexProvider; -import com.android.settings.search.Indexable; -import com.android.settings.search.SearchIndexableRaw; import com.android.settings.widget.SummaryUpdater.OnSummaryChangeListener; import com.android.settings.widget.SwitchBarController; +import com.android.settingslib.search.Indexable; import com.android.settingslib.search.SearchIndexable; +import com.android.settingslib.search.SearchIndexableRaw; import com.android.settingslib.wifi.AccessPoint; import com.android.settingslib.wifi.LongPressWifiEntryPreference; import com.android.settingslib.wifi.WifiSavedConfigUtils; diff --git a/tests/robotests/src/com/android/settings/accounts/AccountPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accounts/AccountPreferenceControllerTest.java index ed992d2de0d..65f485efd2a 100644 --- a/tests/robotests/src/com/android/settings/accounts/AccountPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accounts/AccountPreferenceControllerTest.java @@ -46,9 +46,9 @@ import androidx.preference.PreferenceScreen; import com.android.settings.AccessiblePreferenceCategory; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; -import com.android.settings.search.SearchIndexableRaw; import com.android.settings.testutils.shadow.ShadowAccountManager; import com.android.settings.testutils.shadow.ShadowContentResolver; +import com.android.settingslib.search.SearchIndexableRaw; import org.junit.After; import org.junit.Before; diff --git a/tests/robotests/src/com/android/settings/accounts/EmergencyInfoPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accounts/EmergencyInfoPreferenceControllerTest.java index 65da1f7c30b..3217226cf7b 100644 --- a/tests/robotests/src/com/android/settings/accounts/EmergencyInfoPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accounts/EmergencyInfoPreferenceControllerTest.java @@ -36,9 +36,9 @@ import androidx.preference.Preference; import androidx.preference.PreferenceScreen; import com.android.settings.R; -import com.android.settings.search.SearchIndexableRaw; import com.android.settings.testutils.shadow.ShadowAccountManager; import com.android.settings.testutils.shadow.ShadowContentResolver; +import com.android.settingslib.search.SearchIndexableRaw; import org.junit.After; import org.junit.Before; diff --git a/tests/robotests/src/com/android/settings/connecteddevice/BluetoothDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/connecteddevice/BluetoothDashboardFragmentTest.java index e119c18c5bc..ed944cf2cd9 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/BluetoothDashboardFragmentTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/BluetoothDashboardFragmentTest.java @@ -22,7 +22,7 @@ import android.content.Context; import android.text.TextUtils; import com.android.settings.R; -import com.android.settings.search.SearchIndexableRaw; +import com.android.settingslib.search.SearchIndexableRaw; import org.junit.Before; import org.junit.Test; diff --git a/tests/robotests/src/com/android/settings/core/XmlControllerAttributeTest.java b/tests/robotests/src/com/android/settings/core/XmlControllerAttributeTest.java index 9373edabab0..78d1f7415bf 100644 --- a/tests/robotests/src/com/android/settings/core/XmlControllerAttributeTest.java +++ b/tests/robotests/src/com/android/settings/core/XmlControllerAttributeTest.java @@ -11,11 +11,11 @@ import android.util.Xml; import com.android.settings.R; import com.android.settings.search.DatabaseIndexingUtils; -import com.android.settings.search.Indexable; import com.android.settings.search.SearchFeatureProvider; import com.android.settings.search.SearchFeatureProviderImpl; import com.android.settings.security.SecuritySettings; import com.android.settings.testutils.FakeFeatureFactory; +import com.android.settingslib.search.Indexable; import org.junit.Before; import org.junit.Test; diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentSearchIndexProviderInspector.java b/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentSearchIndexProviderInspector.java index 4a488bf9b2b..6103b2b89f4 100644 --- a/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentSearchIndexProviderInspector.java +++ b/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentSearchIndexProviderInspector.java @@ -24,7 +24,7 @@ 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.search.Indexable; import com.android.settingslib.core.AbstractPreferenceController; import org.robolectric.RuntimeEnvironment; diff --git a/tests/robotests/src/com/android/settings/search/FakeSettingsFragment.java b/tests/robotests/src/com/android/settings/search/FakeSettingsFragment.java index ee272614786..19282ddff4d 100644 --- a/tests/robotests/src/com/android/settings/search/FakeSettingsFragment.java +++ b/tests/robotests/src/com/android/settings/search/FakeSettingsFragment.java @@ -22,6 +22,7 @@ import android.provider.SearchIndexableResource; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.dashboard.DashboardFragment; import com.android.settingslib.core.AbstractPreferenceController; +import com.android.settingslib.search.SearchIndexableRaw; import java.util.ArrayList; import java.util.List; diff --git a/tests/robotests/src/com/android/settings/search/SearchIndexProviderCodeInspector.java b/tests/robotests/src/com/android/settings/search/SearchIndexProviderCodeInspector.java index e7cc653ce1b..c75e3b18d2c 100644 --- a/tests/robotests/src/com/android/settings/search/SearchIndexProviderCodeInspector.java +++ b/tests/robotests/src/com/android/settings/search/SearchIndexProviderCodeInspector.java @@ -25,6 +25,7 @@ import android.util.Log; import com.android.settings.SettingsPreferenceFragment; import com.android.settings.core.codeinspection.CodeInspector; import com.android.settings.dashboard.DashboardFragmentSearchIndexProviderInspector; +import com.android.settingslib.search.Indexable; import com.android.settingslib.search.SearchIndexableResources; import org.robolectric.RuntimeEnvironment; diff --git a/tests/robotests/src/com/android/settings/slices/SliceControllerInXmlCodeInspector.java b/tests/robotests/src/com/android/settings/slices/SliceControllerInXmlCodeInspector.java index 213de11bf56..21944fcad47 100644 --- a/tests/robotests/src/com/android/settings/slices/SliceControllerInXmlCodeInspector.java +++ b/tests/robotests/src/com/android/settings/slices/SliceControllerInXmlCodeInspector.java @@ -32,10 +32,10 @@ import com.android.settings.core.TogglePreferenceController; import com.android.settings.core.codeinspection.CodeInspector; import com.android.settings.overlay.FeatureFactory; import com.android.settings.search.DatabaseIndexingUtils; -import com.android.settings.search.Indexable; import com.android.settings.search.SearchFeatureProvider; import com.android.settings.search.SearchFeatureProviderImpl; import com.android.settings.testutils.FakeFeatureFactory; +import com.android.settingslib.search.Indexable; import org.robolectric.RuntimeEnvironment; import org.xmlpull.v1.XmlPullParserException; diff --git a/tests/robotests/src/com/android/settings/support/SupportDashboardActivityTest.java b/tests/robotests/src/com/android/settings/support/SupportDashboardActivityTest.java index dabe9ca6532..8a7d1b510ad 100644 --- a/tests/robotests/src/com/android/settings/support/SupportDashboardActivityTest.java +++ b/tests/robotests/src/com/android/settings/support/SupportDashboardActivityTest.java @@ -24,7 +24,7 @@ import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; import com.android.settings.R; -import com.android.settings.search.SearchIndexableRaw; +import com.android.settingslib.search.SearchIndexableRaw; import org.junit.Before; import org.junit.Test; diff --git a/tests/robotests/src/com/android/settings/testutils/FakeIndexProvider.java b/tests/robotests/src/com/android/settings/testutils/FakeIndexProvider.java index 05ba1630e3c..c96155942b0 100644 --- a/tests/robotests/src/com/android/settings/testutils/FakeIndexProvider.java +++ b/tests/robotests/src/com/android/settings/testutils/FakeIndexProvider.java @@ -21,7 +21,7 @@ import android.content.Context; import com.android.settings.R; import com.android.settings.search.BaseSearchIndexProvider; -import com.android.settings.search.Indexable; +import com.android.settingslib.search.Indexable; import java.util.List; diff --git a/tests/robotests/src/com/android/settings/wifi/WifiSettings2Test.java b/tests/robotests/src/com/android/settings/wifi/WifiSettings2Test.java index 7ce05e137ed..9a3d14ea008 100644 --- a/tests/robotests/src/com/android/settings/wifi/WifiSettings2Test.java +++ b/tests/robotests/src/com/android/settings/wifi/WifiSettings2Test.java @@ -41,19 +41,15 @@ import android.os.PowerManager; import android.os.UserManager; import android.provider.Settings; -import android.view.ContextMenu; -import android.view.View; import androidx.fragment.app.FragmentActivity; import androidx.preference.Preference; import com.android.settings.R; import com.android.settings.datausage.DataUsagePreference; -import com.android.settings.search.SearchIndexableRaw; import com.android.settings.testutils.shadow.ShadowDataUsageUtils; import com.android.settings.testutils.shadow.ShadowFragment; -import com.android.settingslib.wifi.AccessPoint; +import com.android.settingslib.search.SearchIndexableRaw; -import java.util.ArrayList; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -63,6 +59,7 @@ import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; +import java.util.ArrayList; import java.util.List; @RunWith(RobolectricTestRunner.class) diff --git a/tests/robotests/src/com/android/settings/wifi/WifiSettingsTest.java b/tests/robotests/src/com/android/settings/wifi/WifiSettingsTest.java index a16a576c558..18d3f5b2349 100644 --- a/tests/robotests/src/com/android/settings/wifi/WifiSettingsTest.java +++ b/tests/robotests/src/com/android/settings/wifi/WifiSettingsTest.java @@ -40,21 +40,20 @@ import android.os.Bundle; import android.os.PowerManager; import android.os.UserManager; import android.provider.Settings; - import android.view.ContextMenu; import android.view.View; + import androidx.fragment.app.FragmentActivity; import androidx.preference.Preference; import com.android.settings.R; import com.android.settings.datausage.DataUsagePreference; -import com.android.settings.search.SearchIndexableRaw; import com.android.settings.testutils.shadow.ShadowDataUsageUtils; import com.android.settings.testutils.shadow.ShadowFragment; +import com.android.settingslib.search.SearchIndexableRaw; import com.android.settingslib.wifi.AccessPoint; import com.android.settingslib.wifi.WifiTracker; -import java.util.ArrayList; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -64,6 +63,7 @@ import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; +import java.util.ArrayList; import java.util.List; @RunWith(RobolectricTestRunner.class) diff --git a/tests/unit/src/com/android/settings/core/UniquePreferenceTest.java b/tests/unit/src/com/android/settings/core/UniquePreferenceTest.java index 09984946e95..251c51297fd 100644 --- a/tests/unit/src/com/android/settings/core/UniquePreferenceTest.java +++ b/tests/unit/src/com/android/settings/core/UniquePreferenceTest.java @@ -33,8 +33,8 @@ import androidx.test.runner.AndroidJUnit4; import com.android.settings.core.PreferenceXmlParserUtils.MetadataFlag; import com.android.settings.overlay.FeatureFactory; import com.android.settings.search.DatabaseIndexingUtils; -import com.android.settings.search.Indexable; -import com.android.settings.search.SearchIndexableRaw; +import com.android.settingslib.search.Indexable; +import com.android.settingslib.search.SearchIndexableRaw; import com.android.settingslib.search.SearchIndexableResources; import org.junit.Before; diff --git a/tests/unit/src/com/android/settings/core/UserRestrictionTest.java b/tests/unit/src/com/android/settings/core/UserRestrictionTest.java index 20f87655a27..0f5260ae271 100644 --- a/tests/unit/src/com/android/settings/core/UserRestrictionTest.java +++ b/tests/unit/src/com/android/settings/core/UserRestrictionTest.java @@ -34,7 +34,7 @@ import androidx.test.runner.AndroidJUnit4; import com.android.settings.overlay.FeatureFactory; import com.android.settings.search.DatabaseIndexingUtils; -import com.android.settings.search.Indexable; +import com.android.settingslib.search.Indexable; import com.android.settingslib.search.SearchIndexableResources; import com.google.android.collect.Sets; diff --git a/tests/unit/src/com/android/settings/slices/SliceDataContractTest.java b/tests/unit/src/com/android/settings/slices/SliceDataContractTest.java index a914c1c9aa3..7e5a8b03dab 100644 --- a/tests/unit/src/com/android/settings/slices/SliceDataContractTest.java +++ b/tests/unit/src/com/android/settings/slices/SliceDataContractTest.java @@ -32,7 +32,7 @@ import androidx.test.runner.AndroidJUnit4; import com.android.settings.core.PreferenceXmlParserUtils; import com.android.settings.overlay.FeatureFactory; import com.android.settings.search.DatabaseIndexingUtils; -import com.android.settings.search.Indexable; +import com.android.settingslib.search.Indexable; import com.android.settingslib.search.SearchIndexableResources; import org.junit.Before;