From 0fcd6cbaa87fecf1abd6d727c935be202bb7f691 Mon Sep 17 00:00:00 2001 From: Tony Mantler Date: Mon, 26 Mar 2018 15:17:25 -0700 Subject: [PATCH] Autogenerate SearchIndexableResources subclass Bug: 77148954 Test: RunSettingsLibRoboTests RunSettingsRoboTests RunSettingsGoogleRoboTests RunArcSettingsRoboTests Change-Id: I842c42c55014c3310070ef22bd4f0d9a70dfd804 --- Android.mk | 1 + .../android/settings/DateTimeSettings.java | 2 + src/com/android/settings/DisplaySettings.java | 2 + src/com/android/settings/LegalSettings.java | 2 + .../accessibility/AccessibilitySettings.java | 2 + ...cessibilityShortcutPreferenceFragment.java | 2 + .../MagnificationPreferenceFragment.java | 8 +- .../accessibility/VibrationSettings.java | 2 + .../accounts/AccountDashboardFragment.java | 2 + .../AppAndNotificationDashboardFragment.java | 2 + .../applications/DefaultAppSettings.java | 2 + .../applications/SpecialAccessSettings.java | 3 + .../applications/assist/ManageAssist.java | 2 + .../backup/BackupSettingsActivity.java | 2 + .../backup/BackupSettingsFragment.java | 2 + ...ancedConnectedDeviceDashboardFragment.java | 2 + .../ConnectedDeviceDashboardFragment.java | 2 + .../usb/UsbDetailsFragment.java | 2 + .../settings/datausage/DataUsageSummary.java | 2 + .../datausage/DataUsageSummaryLegacy.java | 2 + .../AutomaticStorageManagerSettings.java | 2 + .../DevelopmentSettingsDashboardFragment.java | 2 + .../deviceinfo/DeviceInfoSettings.java | 2 + .../deviceinfo/StorageDashboardFragment.java | 2 + .../settings/deviceinfo/StorageSettings.java | 2 + .../aboutphone/MyDeviceInfoFragment.java | 2 + .../display/AmbientDisplaySettings.java | 2 + .../display/NightDisplaySettings.java | 2 + .../settings/display/ScreenZoomSettings.java | 2 + .../android/settings/dream/DreamSettings.java | 2 + .../enterprise/EnterprisePrivacySettings.java | 2 + .../fuelgauge/PowerUsageAdvanced.java | 2 + .../settings/fuelgauge/PowerUsageSummary.java | 2 + .../fuelgauge/SmartBatterySettings.java | 2 + .../batterysaver/BatterySaverSettings.java | 2 + .../gestures/AssistGestureSettings.java | 2 + .../gestures/DoubleTapPowerSettings.java | 2 + .../gestures/DoubleTapScreenSettings.java | 2 + .../gestures/DoubleTwistGestureSettings.java | 2 + .../settings/gestures/GestureSettings.java | 2 + .../gestures/PickupGestureSettings.java | 2 + .../PreventRingingGestureSettings.java | 2 + .../gestures/SwipeToNotificationSettings.java | 2 + .../AvailableVirtualKeyboardFragment.java | 2 + .../inputmethod/PhysicalKeyboardFragment.java | 2 + .../inputmethod/VirtualKeyboardFragment.java | 2 + .../language/LanguageAndInputSettings.java | 2 + .../settings/location/LocationSettings.java | 3 + .../RecentLocationRequestSeeAllFragment.java | 3 + .../settings/location/ScanningSettings.java | 2 + .../network/NetworkDashboardFragment.java | 2 + .../android/settings/nfc/PaymentSettings.java | 2 + .../ConfigureNotificationSettings.java | 2 + .../settings/notification/SoundSettings.java | 2 + .../ZenModeAutomationSettings.java | 2 + .../notification/ZenModeBehaviorSettings.java | 2 + .../ZenModeBlockedEffectsSettings.java | 2 + .../notification/ZenModeSettings.java | 2 + .../settings/print/PrintSettingsFragment.java | 2 + .../search/SearchFeatureProvider.java | 1 + .../search/SearchFeatureProviderImpl.java | 4 +- .../search/SearchIndexableResources.java | 29 --- .../search/SearchIndexableResourcesImpl.java | 190 ------------------ .../security/EncryptionAndCredential.java | 2 + .../security/LockscreenDashboardFragment.java | 2 + .../security/ScreenPinningSettings.java | 2 + .../settings/security/SecuritySettings.java | 2 + .../screenlock/ScreenLockSettings.java | 2 + src/com/android/settings/sim/SimSettings.java | 2 + .../support/SupportDashboardActivity.java | 2 + .../system/ResetDashboardFragment.java | 2 + .../system/SystemDashboardFragment.java | 2 + .../settings/tts/TextToSpeechSettings.java | 2 + .../tts/TtsEnginePreferenceFragment.java | 3 + .../android/settings/users/UserSettings.java | 2 + .../wallpaper/WallpaperTypeSettings.java | 2 + .../settings/wfd/WifiDisplaySettings.java | 2 + .../settings/wifi/ConfigureWifiSettings.java | 2 + .../android/settings/wifi/WifiSettings.java | 2 + tests/robotests/Android.mk | 3 +- .../SearchIndexProviderCodeInspector.java | 1 + .../search/SearchIndexableResourcesTest.java | 9 +- .../PreferenceControllerContractTest.java | 2 +- .../settings/core/UniquePreferenceTest.java | 2 +- .../settings/core/UserRestrictionTest.java | 2 +- 85 files changed, 169 insertions(+), 233 deletions(-) delete mode 100644 src/com/android/settings/search/SearchIndexableResources.java delete mode 100644 src/com/android/settings/search/SearchIndexableResourcesImpl.java diff --git a/Android.mk b/Android.mk index 61851cf1b6d..8d02dd5b9ad 100644 --- a/Android.mk +++ b/Android.mk @@ -54,6 +54,7 @@ endif include frameworks/opt/setupwizard/library/common-gingerbread.mk include frameworks/base/packages/SettingsLib/common.mk +include frameworks/base/packages/SettingsLib/search/common.mk include $(BUILD_PACKAGE) diff --git a/src/com/android/settings/DateTimeSettings.java b/src/com/android/settings/DateTimeSettings.java index 2a4934c3f60..16c6ff5bcf4 100644 --- a/src/com/android/settings/DateTimeSettings.java +++ b/src/com/android/settings/DateTimeSettings.java @@ -38,11 +38,13 @@ import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.search.Indexable; import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.datetime.ZoneGetter; +import com.android.settingslib.search.SearchIndexable; import java.util.ArrayList; import java.util.Calendar; import java.util.List; +@SearchIndexable public class DateTimeSettings extends DashboardFragment implements TimePreferenceController.TimePreferenceHost, DatePreferenceController.DatePreferenceHost { diff --git a/src/com/android/settings/DisplaySettings.java b/src/com/android/settings/DisplaySettings.java index d8bd447d440..dc6b0403fff 100644 --- a/src/com/android/settings/DisplaySettings.java +++ b/src/com/android/settings/DisplaySettings.java @@ -41,10 +41,12 @@ import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.search.Indexable; import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.core.lifecycle.Lifecycle; +import com.android.settingslib.search.SearchIndexable; import java.util.ArrayList; import java.util.List; +@SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC) public class DisplaySettings extends DashboardFragment { private static final String TAG = "DisplaySettings"; diff --git a/src/com/android/settings/LegalSettings.java b/src/com/android/settings/LegalSettings.java index e9b2694b82a..64e4cfc70b4 100644 --- a/src/com/android/settings/LegalSettings.java +++ b/src/com/android/settings/LegalSettings.java @@ -31,10 +31,12 @@ import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.search.Indexable; +import com.android.settingslib.search.SearchIndexable; import java.util.Arrays; import java.util.List; +@SearchIndexable public class LegalSettings extends SettingsPreferenceFragment implements Indexable { private static final String KEY_TERMS = "terms"; diff --git a/src/com/android/settings/accessibility/AccessibilitySettings.java b/src/com/android/settings/accessibility/AccessibilitySettings.java index e0e8e4e0df9..af95101916e 100644 --- a/src/com/android/settings/accessibility/AccessibilitySettings.java +++ b/src/com/android/settings/accessibility/AccessibilitySettings.java @@ -59,6 +59,7 @@ import com.android.settingslib.RestrictedLockUtils; import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; import com.android.settingslib.RestrictedPreference; import com.android.settingslib.accessibility.AccessibilityUtils; +import com.android.settingslib.search.SearchIndexable; import java.util.ArrayList; import java.util.Collection; @@ -70,6 +71,7 @@ import java.util.Set; /** * Activity with the accessibility settings. */ +@SearchIndexable public class AccessibilitySettings extends SettingsPreferenceFragment implements Preference.OnPreferenceChangeListener, Indexable { diff --git a/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragment.java b/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragment.java index bc164ab5152..1510ae46cf4 100644 --- a/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragment.java +++ b/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragment.java @@ -36,10 +36,12 @@ import com.android.settings.R; import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.search.Indexable; import com.android.settingslib.accessibility.AccessibilityUtils; +import com.android.settingslib.search.SearchIndexable; /** * Settings page for accessibility shortcut */ +@SearchIndexable public class AccessibilityShortcutPreferenceFragment extends ToggleFeaturePreferenceFragment implements Indexable { diff --git a/src/com/android/settings/accessibility/MagnificationPreferenceFragment.java b/src/com/android/settings/accessibility/MagnificationPreferenceFragment.java index 05cb46b4d8f..fd4812988cf 100644 --- a/src/com/android/settings/accessibility/MagnificationPreferenceFragment.java +++ b/src/com/android/settings/accessibility/MagnificationPreferenceFragment.java @@ -25,22 +25,20 @@ import android.provider.SearchIndexableResource; import android.provider.Settings; import android.support.v7.preference.Preference; import android.text.TextUtils; -import android.view.View; import android.view.accessibility.AccessibilityManager; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; -import com.android.settings.dashboard.DashboardFragment; import com.android.settings.R; -import com.android.settings.SettingsPreferenceFragment; +import com.android.settings.dashboard.DashboardFragment; import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.search.Indexable; -import com.android.settingslib.core.AbstractPreferenceController; +import com.android.settingslib.search.SearchIndexable; -import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; import java.util.List; +@SearchIndexable public final class MagnificationPreferenceFragment extends DashboardFragment { private static final String TAG = "MagnificationPreferenceFragment"; diff --git a/src/com/android/settings/accessibility/VibrationSettings.java b/src/com/android/settings/accessibility/VibrationSettings.java index 83a5af6ac83..37207e743eb 100644 --- a/src/com/android/settings/accessibility/VibrationSettings.java +++ b/src/com/android/settings/accessibility/VibrationSettings.java @@ -23,6 +23,7 @@ import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.search.BaseSearchIndexProvider; +import com.android.settingslib.search.SearchIndexable; import java.util.ArrayList; import java.util.List; @@ -30,6 +31,7 @@ import java.util.List; /** * Accessibility settings for the vibration. */ +@SearchIndexable public class VibrationSettings extends DashboardFragment { private static final String TAG = "VibrationSettings"; diff --git a/src/com/android/settings/accounts/AccountDashboardFragment.java b/src/com/android/settings/accounts/AccountDashboardFragment.java index b97694031e6..094390c2e0d 100644 --- a/src/com/android/settings/accounts/AccountDashboardFragment.java +++ b/src/com/android/settings/accounts/AccountDashboardFragment.java @@ -34,11 +34,13 @@ import com.android.settings.users.AutoSyncPersonalDataPreferenceController; import com.android.settings.users.AutoSyncWorkDataPreferenceController; import com.android.settingslib.accounts.AuthenticatorHelper; import com.android.settingslib.core.AbstractPreferenceController; +import com.android.settingslib.search.SearchIndexable; import java.util.ArrayList; import java.util.Arrays; import java.util.List; +@SearchIndexable public class AccountDashboardFragment extends DashboardFragment { private static final String TAG = "AccountDashboardFrag"; diff --git a/src/com/android/settings/applications/AppAndNotificationDashboardFragment.java b/src/com/android/settings/applications/AppAndNotificationDashboardFragment.java index eb74fb13861..aaf1d5825eb 100644 --- a/src/com/android/settings/applications/AppAndNotificationDashboardFragment.java +++ b/src/com/android/settings/applications/AppAndNotificationDashboardFragment.java @@ -28,11 +28,13 @@ import com.android.settings.dashboard.DashboardFragment; import com.android.settings.notification.EmergencyBroadcastPreferenceController; import com.android.settings.search.BaseSearchIndexProvider; import com.android.settingslib.core.AbstractPreferenceController; +import com.android.settingslib.search.SearchIndexable; import java.util.ArrayList; import java.util.Arrays; import java.util.List; +@SearchIndexable public class AppAndNotificationDashboardFragment extends DashboardFragment { private static final String TAG = "AppAndNotifDashboard"; diff --git a/src/com/android/settings/applications/DefaultAppSettings.java b/src/com/android/settings/applications/DefaultAppSettings.java index 7fc405f3d39..8def0157386 100644 --- a/src/com/android/settings/applications/DefaultAppSettings.java +++ b/src/com/android/settings/applications/DefaultAppSettings.java @@ -37,11 +37,13 @@ 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; import java.util.ArrayList; import java.util.Arrays; import java.util.List; +@SearchIndexable public class DefaultAppSettings extends DashboardFragment { static final String TAG = "DefaultAppSettings"; diff --git a/src/com/android/settings/applications/SpecialAccessSettings.java b/src/com/android/settings/applications/SpecialAccessSettings.java index 6387ec7053d..da41a18a975 100644 --- a/src/com/android/settings/applications/SpecialAccessSettings.java +++ b/src/com/android/settings/applications/SpecialAccessSettings.java @@ -26,9 +26,12 @@ import com.android.settings.dashboard.DashboardFragment; import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.search.Indexable; import com.android.settingslib.core.AbstractPreferenceController; +import com.android.settingslib.search.SearchIndexable; + import java.util.ArrayList; import java.util.List; +@SearchIndexable public class SpecialAccessSettings extends DashboardFragment { private static final String TAG = "SpecialAccessSettings"; diff --git a/src/com/android/settings/applications/assist/ManageAssist.java b/src/com/android/settings/applications/assist/ManageAssist.java index f5a38383180..5a46941e39f 100644 --- a/src/com/android/settings/applications/assist/ManageAssist.java +++ b/src/com/android/settings/applications/assist/ManageAssist.java @@ -27,6 +27,7 @@ import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.search.Indexable; import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.core.lifecycle.Lifecycle; +import com.android.settingslib.search.SearchIndexable; import java.util.ArrayList; import java.util.Arrays; @@ -35,6 +36,7 @@ import java.util.List; /** * Settings screen to manage everything about assist. */ +@SearchIndexable public class ManageAssist extends DashboardFragment { private static final String TAG = "ManageAssist"; diff --git a/src/com/android/settings/backup/BackupSettingsActivity.java b/src/com/android/settings/backup/BackupSettingsActivity.java index d78af32d36b..c69414eac0f 100644 --- a/src/com/android/settings/backup/BackupSettingsActivity.java +++ b/src/com/android/settings/backup/BackupSettingsActivity.java @@ -31,6 +31,7 @@ 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.SearchIndexable; import java.util.ArrayList; import java.util.List; @@ -40,6 +41,7 @@ import java.util.List; * The activity used to launch the configured Backup activity or the preference screen * if the manufacturer provided their backup settings. */ +@SearchIndexable public class BackupSettingsActivity extends Activity implements Indexable { private static final String TAG = "BackupSettingsActivity"; private FragmentManager mFragmentManager; diff --git a/src/com/android/settings/backup/BackupSettingsFragment.java b/src/com/android/settings/backup/BackupSettingsFragment.java index e9bcc6fe9ec..d21e2e46365 100644 --- a/src/com/android/settings/backup/BackupSettingsFragment.java +++ b/src/com/android/settings/backup/BackupSettingsFragment.java @@ -26,6 +26,7 @@ import com.android.settings.dashboard.DashboardFragment; import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.search.Indexable; import com.android.settingslib.core.AbstractPreferenceController; +import com.android.settingslib.search.SearchIndexable; import java.util.ArrayList; import java.util.List; @@ -33,6 +34,7 @@ import java.util.List; /** * Fragment showing the items to launch different backup settings screens. */ +@SearchIndexable public class BackupSettingsFragment extends DashboardFragment { private static final String TAG = "BackupSettings"; diff --git a/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceDashboardFragment.java b/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceDashboardFragment.java index 45794c5a20f..e347c3fc04c 100644 --- a/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceDashboardFragment.java +++ b/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceDashboardFragment.java @@ -28,6 +28,7 @@ import com.android.settings.print.PrintSettingPreferenceController; import com.android.settings.search.BaseSearchIndexProvider; import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.core.lifecycle.Lifecycle; +import com.android.settingslib.search.SearchIndexable; import java.util.ArrayList; import java.util.Arrays; @@ -36,6 +37,7 @@ import java.util.List; /** * This fragment contains all the advanced connection preferences(i.e, Bluetooth, NFC, USB..) */ +@SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC) public class AdvancedConnectedDeviceDashboardFragment extends DashboardFragment { private static final String TAG = "AdvancedConnectedDeviceFrag"; diff --git a/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java b/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java index b3dd8acf763..b0ef34d9d97 100644 --- a/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java +++ b/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java @@ -29,11 +29,13 @@ import com.android.settings.nfc.NfcPreferenceController; import com.android.settings.search.BaseSearchIndexProvider; import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.core.lifecycle.Lifecycle; +import com.android.settingslib.search.SearchIndexable; import java.util.ArrayList; import java.util.Arrays; import java.util.List; +@SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC) public class ConnectedDeviceDashboardFragment extends DashboardFragment { private static final String TAG = "ConnectedDeviceFrag"; diff --git a/src/com/android/settings/connecteddevice/usb/UsbDetailsFragment.java b/src/com/android/settings/connecteddevice/usb/UsbDetailsFragment.java index 662abbfcfd2..044d4a8d108 100644 --- a/src/com/android/settings/connecteddevice/usb/UsbDetailsFragment.java +++ b/src/com/android/settings/connecteddevice/usb/UsbDetailsFragment.java @@ -27,6 +27,7 @@ import com.android.settings.dashboard.DashboardFragment; import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.search.Indexable; import com.android.settingslib.core.AbstractPreferenceController; +import com.android.settingslib.search.SearchIndexable; import com.google.android.collect.Lists; @@ -36,6 +37,7 @@ import java.util.List; /** * Controls the USB device details and provides updates to individual controllers. */ +@SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC) public class UsbDetailsFragment extends DashboardFragment { private static final String TAG = UsbDetailsFragment.class.getSimpleName(); diff --git a/src/com/android/settings/datausage/DataUsageSummary.java b/src/com/android/settings/datausage/DataUsageSummary.java index f0c254939e3..b0877872b2e 100644 --- a/src/com/android/settings/datausage/DataUsageSummary.java +++ b/src/com/android/settings/datausage/DataUsageSummary.java @@ -45,6 +45,7 @@ import com.android.settings.search.Indexable; import com.android.settingslib.NetworkPolicyEditor; import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.net.DataUsageController; +import com.android.settingslib.search.SearchIndexable; import java.util.ArrayList; import java.util.List; @@ -52,6 +53,7 @@ import java.util.List; /** * Settings preference fragment that displays data usage summary. */ +@SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC) public class DataUsageSummary extends DataUsageBaseFragment implements Indexable, DataUsageEditController { diff --git a/src/com/android/settings/datausage/DataUsageSummaryLegacy.java b/src/com/android/settings/datausage/DataUsageSummaryLegacy.java index 090e8e45379..7e8ee885a07 100644 --- a/src/com/android/settings/datausage/DataUsageSummaryLegacy.java +++ b/src/com/android/settings/datausage/DataUsageSummaryLegacy.java @@ -48,6 +48,7 @@ import com.android.settings.search.Indexable; import com.android.settingslib.NetworkPolicyEditor; import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.net.DataUsageController; +import com.android.settingslib.search.SearchIndexable; import java.util.ArrayList; import java.util.List; @@ -55,6 +56,7 @@ import java.util.List; /** * Legacy {@link DataUsageSummary} fragment. */ +@SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC) public class DataUsageSummaryLegacy extends DataUsageBaseFragment implements Indexable, DataUsageEditController { diff --git a/src/com/android/settings/deletionhelper/AutomaticStorageManagerSettings.java b/src/com/android/settings/deletionhelper/AutomaticStorageManagerSettings.java index 590254538a7..d37dbe0a351 100644 --- a/src/com/android/settings/deletionhelper/AutomaticStorageManagerSettings.java +++ b/src/com/android/settings/deletionhelper/AutomaticStorageManagerSettings.java @@ -36,6 +36,7 @@ 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; import java.util.ArrayList; import java.util.List; @@ -44,6 +45,7 @@ import java.util.List; * AutomaticStorageManagerSettings is the Settings screen for configuration and management of the * automatic storage manager. */ +@SearchIndexable public class AutomaticStorageManagerSettings extends DashboardFragment implements OnPreferenceChangeListener { private static final String KEY_DAYS = "days"; diff --git a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java index 601f113df38..d69109c06ca 100644 --- a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java +++ b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java @@ -49,11 +49,13 @@ import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settingslib.development.DeveloperOptionsPreferenceController; import com.android.settingslib.development.DevelopmentSettingsEnabler; 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) public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFragment implements SwitchBar.OnSwitchChangeListener, OemUnlockDialogHost, AdbDialogHost, AdbClearKeysDialogHost, LogPersistDialogHost { diff --git a/src/com/android/settings/deviceinfo/DeviceInfoSettings.java b/src/com/android/settings/deviceinfo/DeviceInfoSettings.java index 3f70d8b3ef2..5e78362b0da 100644 --- a/src/com/android/settings/deviceinfo/DeviceInfoSettings.java +++ b/src/com/android/settings/deviceinfo/DeviceInfoSettings.java @@ -35,11 +35,13 @@ import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.search.Indexable; import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.core.lifecycle.Lifecycle; +import com.android.settingslib.search.SearchIndexable; import java.util.ArrayList; import java.util.Arrays; import java.util.List; +@SearchIndexable public class DeviceInfoSettings extends DashboardFragment implements Indexable { private static final String LOG_TAG = "DeviceInfoSettings"; diff --git a/src/com/android/settings/deviceinfo/StorageDashboardFragment.java b/src/com/android/settings/deviceinfo/StorageDashboardFragment.java index 8e56b12ec8f..06515249a13 100644 --- a/src/com/android/settings/deviceinfo/StorageDashboardFragment.java +++ b/src/com/android/settings/deviceinfo/StorageDashboardFragment.java @@ -51,12 +51,14 @@ import com.android.settingslib.applications.StorageStatsSource; import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.deviceinfo.PrivateStorageInfo; import com.android.settingslib.deviceinfo.StorageManagerVolumeProvider; +import com.android.settingslib.search.SearchIndexable; import com.android.settingslib.wrapper.PackageManagerWrapper; import java.util.ArrayList; import java.util.Arrays; import java.util.List; +@SearchIndexable public class StorageDashboardFragment extends DashboardFragment implements LoaderManager.LoaderCallbacks> { diff --git a/src/com/android/settings/deviceinfo/StorageSettings.java b/src/com/android/settings/deviceinfo/StorageSettings.java index cf9d34b3bca..720cebd83a0 100644 --- a/src/com/android/settings/deviceinfo/StorageSettings.java +++ b/src/com/android/settings/deviceinfo/StorageSettings.java @@ -57,6 +57,7 @@ import com.android.settings.search.SearchIndexableRaw; import com.android.settingslib.RestrictedLockUtils; import com.android.settingslib.deviceinfo.PrivateStorageInfo; import com.android.settingslib.deviceinfo.StorageManagerVolumeProvider; +import com.android.settingslib.search.SearchIndexable; import java.text.NumberFormat; import java.util.ArrayList; @@ -67,6 +68,7 @@ import java.util.List; * Panel showing both internal storage (both built-in storage and private * volumes) and removable storage (public volumes). */ +@SearchIndexable public class StorageSettings extends SettingsPreferenceFragment implements Indexable { static final String TAG = "StorageSettings"; diff --git a/src/com/android/settings/deviceinfo/aboutphone/MyDeviceInfoFragment.java b/src/com/android/settings/deviceinfo/aboutphone/MyDeviceInfoFragment.java index e6303dc26c5..18e1d04f627 100644 --- a/src/com/android/settings/deviceinfo/aboutphone/MyDeviceInfoFragment.java +++ b/src/com/android/settings/deviceinfo/aboutphone/MyDeviceInfoFragment.java @@ -55,11 +55,13 @@ import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.widget.EntityHeaderController; import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.core.lifecycle.Lifecycle; +import com.android.settingslib.search.SearchIndexable; import java.util.ArrayList; import java.util.Arrays; import java.util.List; +@SearchIndexable public class MyDeviceInfoFragment extends DashboardFragment { private static final String LOG_TAG = "MyDeviceInfoFragment"; diff --git a/src/com/android/settings/display/AmbientDisplaySettings.java b/src/com/android/settings/display/AmbientDisplaySettings.java index cab28fa290f..92a009b001b 100644 --- a/src/com/android/settings/display/AmbientDisplaySettings.java +++ b/src/com/android/settings/display/AmbientDisplaySettings.java @@ -32,6 +32,7 @@ import com.android.settings.search.Indexable; import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; import com.android.settingslib.core.lifecycle.Lifecycle; +import com.android.settingslib.search.SearchIndexable; import java.util.ArrayList; import java.util.List; @@ -39,6 +40,7 @@ import java.util.List; /** * Settings screen for Ambient display. */ +@SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC) public class AmbientDisplaySettings extends DashboardFragment { public static final String KEY_AMBIENT_DISPLAY_ALWAYS_ON = "ambient_display_always_on"; diff --git a/src/com/android/settings/display/NightDisplaySettings.java b/src/com/android/settings/display/NightDisplaySettings.java index 4e0ebcd0f6d..add4443f98b 100644 --- a/src/com/android/settings/display/NightDisplaySettings.java +++ b/src/com/android/settings/display/NightDisplaySettings.java @@ -33,6 +33,7 @@ import com.android.settings.search.Indexable; import com.android.settings.widget.SeekBarPreference; import com.android.settings.SettingsPreferenceFragment; import com.android.settingslib.core.AbstractPreferenceController; +import com.android.settingslib.search.SearchIndexable; import java.text.DateFormat; import java.time.LocalTime; @@ -45,6 +46,7 @@ import java.util.TimeZone; * Settings screen for Night display. * TODO (b/69912911) Upgrade to Dashboard fragment */ +@SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC) public class NightDisplaySettings extends SettingsPreferenceFragment implements ColorDisplayController.Callback, Preference.OnPreferenceChangeListener, Indexable { diff --git a/src/com/android/settings/display/ScreenZoomSettings.java b/src/com/android/settings/display/ScreenZoomSettings.java index 6b5216e7ab8..fed8aa67f55 100644 --- a/src/com/android/settings/display/ScreenZoomSettings.java +++ b/src/com/android/settings/display/ScreenZoomSettings.java @@ -30,6 +30,7 @@ import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.search.Indexable; import com.android.settings.search.SearchIndexableRaw; import com.android.settingslib.display.DisplayDensityUtils; +import com.android.settingslib.search.SearchIndexable; import java.util.ArrayList; import java.util.List; @@ -37,6 +38,7 @@ import java.util.List; /** * Preference fragment used to control screen zoom. */ +@SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC) public class ScreenZoomSettings extends PreviewSeekBarPreferenceFragment implements Indexable { private int mDefaultDensity; diff --git a/src/com/android/settings/dream/DreamSettings.java b/src/com/android/settings/dream/DreamSettings.java index c0d4c400cc0..97f2c89cb57 100644 --- a/src/com/android/settings/dream/DreamSettings.java +++ b/src/com/android/settings/dream/DreamSettings.java @@ -32,11 +32,13 @@ import com.android.settings.search.BaseSearchIndexProvider; import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.dream.DreamBackend; import com.android.settingslib.dream.DreamBackend.WhenToDream; +import com.android.settingslib.search.SearchIndexable; import java.util.ArrayList; import java.util.Arrays; import java.util.List; +@SearchIndexable public class DreamSettings extends DashboardFragment { private static final String TAG = "DreamSettings"; diff --git a/src/com/android/settings/enterprise/EnterprisePrivacySettings.java b/src/com/android/settings/enterprise/EnterprisePrivacySettings.java index 92ae38df94e..f04c421429b 100644 --- a/src/com/android/settings/enterprise/EnterprisePrivacySettings.java +++ b/src/com/android/settings/enterprise/EnterprisePrivacySettings.java @@ -26,11 +26,13 @@ import com.android.settings.overlay.FeatureFactory; import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.widget.PreferenceCategoryController; import com.android.settingslib.core.AbstractPreferenceController; +import com.android.settingslib.search.SearchIndexable; import java.util.ArrayList; import java.util.Arrays; import java.util.List; +@SearchIndexable public class EnterprisePrivacySettings extends DashboardFragment { static final String TAG = "EnterprisePrivacySettings"; diff --git a/src/com/android/settings/fuelgauge/PowerUsageAdvanced.java b/src/com/android/settings/fuelgauge/PowerUsageAdvanced.java index 327a6c58bfa..cf80196eca2 100644 --- a/src/com/android/settings/fuelgauge/PowerUsageAdvanced.java +++ b/src/com/android/settings/fuelgauge/PowerUsageAdvanced.java @@ -30,12 +30,14 @@ import com.android.settings.SettingsActivity; import com.android.settings.overlay.FeatureFactory; import com.android.settings.search.BaseSearchIndexProvider; import com.android.settingslib.core.AbstractPreferenceController; +import com.android.settingslib.search.SearchIndexable; import com.android.settingslib.utils.StringUtil; import java.util.ArrayList; import java.util.Arrays; import java.util.List; +@SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC) public class PowerUsageAdvanced extends PowerUsageBase { private static final String TAG = "AdvancedBatteryUsage"; private static final String KEY_BATTERY_GRAPH = "battery_graph"; diff --git a/src/com/android/settings/fuelgauge/PowerUsageSummary.java b/src/com/android/settings/fuelgauge/PowerUsageSummary.java index 2c8f9611bcd..09147ca5edd 100644 --- a/src/com/android/settings/fuelgauge/PowerUsageSummary.java +++ b/src/com/android/settings/fuelgauge/PowerUsageSummary.java @@ -51,6 +51,7 @@ import com.android.settings.overlay.FeatureFactory; import com.android.settings.search.BaseSearchIndexProvider; import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.core.lifecycle.Lifecycle; +import com.android.settingslib.search.SearchIndexable; import com.android.settingslib.utils.PowerUtil; import com.android.settingslib.utils.StringUtil; @@ -62,6 +63,7 @@ import java.util.List; * Displays a list of apps and subsystems that consume power, ordered by how much power was * consumed since the last time it was unplugged. */ +@SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC) public class PowerUsageSummary extends PowerUsageBase implements OnLongClickListener, BatteryTipPreferenceController.BatteryTipListener { diff --git a/src/com/android/settings/fuelgauge/SmartBatterySettings.java b/src/com/android/settings/fuelgauge/SmartBatterySettings.java index 43ac960679c..f2d1b2efb6b 100644 --- a/src/com/android/settings/fuelgauge/SmartBatterySettings.java +++ b/src/com/android/settings/fuelgauge/SmartBatterySettings.java @@ -27,6 +27,7 @@ import com.android.settings.core.InstrumentedPreferenceFragment; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.search.BaseSearchIndexProvider; import com.android.settingslib.core.AbstractPreferenceController; +import com.android.settingslib.search.SearchIndexable; import com.android.settingslib.widget.FooterPreferenceMixin; import java.util.ArrayList; @@ -36,6 +37,7 @@ import java.util.List; /** * Fragment to show smart battery and restricted app controls */ +@SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC) public class SmartBatterySettings extends DashboardFragment { public static final String TAG = "SmartBatterySettings"; diff --git a/src/com/android/settings/fuelgauge/batterysaver/BatterySaverSettings.java b/src/com/android/settings/fuelgauge/batterysaver/BatterySaverSettings.java index 8009e954e38..aa16fc9fe16 100644 --- a/src/com/android/settings/fuelgauge/batterysaver/BatterySaverSettings.java +++ b/src/com/android/settings/fuelgauge/batterysaver/BatterySaverSettings.java @@ -27,6 +27,7 @@ import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.search.Indexable; import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.core.lifecycle.Lifecycle; +import com.android.settingslib.search.SearchIndexable; import java.util.ArrayList; import java.util.Arrays; @@ -35,6 +36,7 @@ import java.util.List; /** * Battery saver settings page */ +@SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC) public class BatterySaverSettings extends DashboardFragment { private static final String TAG = "BatterySaverSettings"; diff --git a/src/com/android/settings/gestures/AssistGestureSettings.java b/src/com/android/settings/gestures/AssistGestureSettings.java index 84f4ab2ecfe..19c00bc6d9a 100644 --- a/src/com/android/settings/gestures/AssistGestureSettings.java +++ b/src/com/android/settings/gestures/AssistGestureSettings.java @@ -26,11 +26,13 @@ import com.android.settings.overlay.FeatureFactory; import com.android.settings.search.BaseSearchIndexProvider; import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.core.lifecycle.Lifecycle; +import com.android.settingslib.search.SearchIndexable; import java.util.ArrayList; import java.util.Arrays; import java.util.List; +@SearchIndexable public class AssistGestureSettings extends DashboardFragment { private static final String TAG = "AssistGesture"; diff --git a/src/com/android/settings/gestures/DoubleTapPowerSettings.java b/src/com/android/settings/gestures/DoubleTapPowerSettings.java index 6b159239101..4d8098651a8 100644 --- a/src/com/android/settings/gestures/DoubleTapPowerSettings.java +++ b/src/com/android/settings/gestures/DoubleTapPowerSettings.java @@ -28,11 +28,13 @@ import com.android.settings.overlay.FeatureFactory; import com.android.settings.search.BaseSearchIndexProvider; import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.core.lifecycle.Lifecycle; +import com.android.settingslib.search.SearchIndexable; import java.util.ArrayList; import java.util.Arrays; import java.util.List; +@SearchIndexable public class DoubleTapPowerSettings extends DashboardFragment { private static final String TAG = "DoubleTapPower"; diff --git a/src/com/android/settings/gestures/DoubleTapScreenSettings.java b/src/com/android/settings/gestures/DoubleTapScreenSettings.java index 1f0ff03b7df..8ea3ed56a6b 100644 --- a/src/com/android/settings/gestures/DoubleTapScreenSettings.java +++ b/src/com/android/settings/gestures/DoubleTapScreenSettings.java @@ -30,11 +30,13 @@ import com.android.settings.overlay.FeatureFactory; import com.android.settings.search.BaseSearchIndexProvider; import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.core.lifecycle.Lifecycle; +import com.android.settingslib.search.SearchIndexable; import java.util.ArrayList; import java.util.Arrays; import java.util.List; +@SearchIndexable public class DoubleTapScreenSettings extends DashboardFragment { private static final String TAG = "DoubleTapScreen"; diff --git a/src/com/android/settings/gestures/DoubleTwistGestureSettings.java b/src/com/android/settings/gestures/DoubleTwistGestureSettings.java index 69517fe46c2..ac51959ea33 100644 --- a/src/com/android/settings/gestures/DoubleTwistGestureSettings.java +++ b/src/com/android/settings/gestures/DoubleTwistGestureSettings.java @@ -28,11 +28,13 @@ import com.android.settings.overlay.FeatureFactory; import com.android.settings.search.BaseSearchIndexProvider; import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.core.lifecycle.Lifecycle; +import com.android.settingslib.search.SearchIndexable; import java.util.ArrayList; import java.util.Arrays; import java.util.List; +@SearchIndexable public class DoubleTwistGestureSettings extends DashboardFragment { private static final String TAG = "DoubleTwistGesture"; diff --git a/src/com/android/settings/gestures/GestureSettings.java b/src/com/android/settings/gestures/GestureSettings.java index b3f8b798bb0..fbed0f6e84a 100644 --- a/src/com/android/settings/gestures/GestureSettings.java +++ b/src/com/android/settings/gestures/GestureSettings.java @@ -29,11 +29,13 @@ import com.android.settings.dashboard.DashboardFragment; import com.android.settings.search.BaseSearchIndexProvider; import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.core.lifecycle.Lifecycle; +import com.android.settingslib.search.SearchIndexable; import java.util.ArrayList; import java.util.Arrays; import java.util.List; +@SearchIndexable public class GestureSettings extends DashboardFragment { private static final String TAG = "GestureSettings"; diff --git a/src/com/android/settings/gestures/PickupGestureSettings.java b/src/com/android/settings/gestures/PickupGestureSettings.java index 78ae9c4f0be..4576b79043d 100644 --- a/src/com/android/settings/gestures/PickupGestureSettings.java +++ b/src/com/android/settings/gestures/PickupGestureSettings.java @@ -30,11 +30,13 @@ import com.android.settings.overlay.FeatureFactory; import com.android.settings.search.BaseSearchIndexProvider; import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.core.lifecycle.Lifecycle; +import com.android.settingslib.search.SearchIndexable; import java.util.ArrayList; import java.util.Arrays; import java.util.List; +@SearchIndexable public class PickupGestureSettings extends DashboardFragment { private static final String TAG = "PickupGestureSettings"; diff --git a/src/com/android/settings/gestures/PreventRingingGestureSettings.java b/src/com/android/settings/gestures/PreventRingingGestureSettings.java index 9897b48d126..bde677b36b5 100644 --- a/src/com/android/settings/gestures/PreventRingingGestureSettings.java +++ b/src/com/android/settings/gestures/PreventRingingGestureSettings.java @@ -26,11 +26,13 @@ import com.android.settings.dashboard.DashboardFragment; import com.android.settings.search.BaseSearchIndexProvider; import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.core.lifecycle.Lifecycle; +import com.android.settingslib.search.SearchIndexable; import java.util.ArrayList; import java.util.Arrays; import java.util.List; +@SearchIndexable public class PreventRingingGestureSettings extends DashboardFragment { private static final String TAG = "RingingGestureSettings"; diff --git a/src/com/android/settings/gestures/SwipeToNotificationSettings.java b/src/com/android/settings/gestures/SwipeToNotificationSettings.java index 9ddf0d4ff90..3ab33898210 100644 --- a/src/com/android/settings/gestures/SwipeToNotificationSettings.java +++ b/src/com/android/settings/gestures/SwipeToNotificationSettings.java @@ -28,11 +28,13 @@ import com.android.settings.overlay.FeatureFactory; import com.android.settings.search.BaseSearchIndexProvider; import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.core.lifecycle.Lifecycle; +import com.android.settingslib.search.SearchIndexable; import java.util.ArrayList; import java.util.Arrays; import java.util.List; +@SearchIndexable public class SwipeToNotificationSettings extends DashboardFragment { private static final String TAG = "SwipeToNotifSettings"; diff --git a/src/com/android/settings/inputmethod/AvailableVirtualKeyboardFragment.java b/src/com/android/settings/inputmethod/AvailableVirtualKeyboardFragment.java index 48b0b4ada4f..96185e2ad10 100644 --- a/src/com/android/settings/inputmethod/AvailableVirtualKeyboardFragment.java +++ b/src/com/android/settings/inputmethod/AvailableVirtualKeyboardFragment.java @@ -42,11 +42,13 @@ import com.android.settings.search.Indexable; import com.android.settingslib.inputmethod.InputMethodAndSubtypeUtil; import com.android.settingslib.inputmethod.InputMethodPreference; import com.android.settingslib.inputmethod.InputMethodSettingValuesWrapper; +import com.android.settingslib.search.SearchIndexable; import java.text.Collator; import java.util.ArrayList; import java.util.List; +@SearchIndexable public final class AvailableVirtualKeyboardFragment extends SettingsPreferenceFragment implements InputMethodPreference.OnSavePreferenceListener, Indexable { diff --git a/src/com/android/settings/inputmethod/PhysicalKeyboardFragment.java b/src/com/android/settings/inputmethod/PhysicalKeyboardFragment.java index 36f4e92f238..30eb2df8940 100644 --- a/src/com/android/settings/inputmethod/PhysicalKeyboardFragment.java +++ b/src/com/android/settings/inputmethod/PhysicalKeyboardFragment.java @@ -46,6 +46,7 @@ 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.SearchIndexable; import com.android.settingslib.utils.ThreadUtils; import java.text.Collator; @@ -55,6 +56,7 @@ import java.util.HashMap; import java.util.List; import java.util.Objects; +@SearchIndexable public final class PhysicalKeyboardFragment extends SettingsPreferenceFragment implements InputManager.InputDeviceListener, KeyboardLayoutDialogFragment.OnSetupKeyboardLayoutsListener, Indexable { diff --git a/src/com/android/settings/inputmethod/VirtualKeyboardFragment.java b/src/com/android/settings/inputmethod/VirtualKeyboardFragment.java index fbe9690bb6d..b7c6c46a5fa 100644 --- a/src/com/android/settings/inputmethod/VirtualKeyboardFragment.java +++ b/src/com/android/settings/inputmethod/VirtualKeyboardFragment.java @@ -36,12 +36,14 @@ import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.search.Indexable; import com.android.settingslib.inputmethod.InputMethodAndSubtypeUtil; import com.android.settingslib.inputmethod.InputMethodPreference; +import com.android.settingslib.search.SearchIndexable; import java.text.Collator; import java.util.ArrayList; import java.util.Arrays; import java.util.List; +@SearchIndexable public final class VirtualKeyboardFragment extends SettingsPreferenceFragment implements Indexable { private static final String ADD_VIRTUAL_KEYBOARD_SCREEN = "add_virtual_keyboard_screen"; diff --git a/src/com/android/settings/language/LanguageAndInputSettings.java b/src/com/android/settings/language/LanguageAndInputSettings.java index 126f3c848df..c92349e11ee 100644 --- a/src/com/android/settings/language/LanguageAndInputSettings.java +++ b/src/com/android/settings/language/LanguageAndInputSettings.java @@ -43,11 +43,13 @@ import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.widget.PreferenceCategoryController; import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.core.lifecycle.Lifecycle; +import com.android.settingslib.search.SearchIndexable; import java.util.ArrayList; import java.util.Arrays; import java.util.List; +@SearchIndexable public class LanguageAndInputSettings extends DashboardFragment { private static final String TAG = "LangAndInputSettings"; diff --git a/src/com/android/settings/location/LocationSettings.java b/src/com/android/settings/location/LocationSettings.java index 13ba8f5eb09..90547e91aec 100644 --- a/src/com/android/settings/location/LocationSettings.java +++ b/src/com/android/settings/location/LocationSettings.java @@ -34,6 +34,8 @@ import com.android.settings.widget.SwitchBar; import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settingslib.location.RecentLocationApps; +import com.android.settingslib.search.SearchIndexable; + import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; @@ -58,6 +60,7 @@ import java.util.List; * other things, this simplifies integration with future changes to the default (AOSP) * implementation. */ +@SearchIndexable public class LocationSettings extends DashboardFragment { private static final String TAG = "LocationSettings"; diff --git a/src/com/android/settings/location/RecentLocationRequestSeeAllFragment.java b/src/com/android/settings/location/RecentLocationRequestSeeAllFragment.java index 0b7614c22be..7bc77788287 100644 --- a/src/com/android/settings/location/RecentLocationRequestSeeAllFragment.java +++ b/src/com/android/settings/location/RecentLocationRequestSeeAllFragment.java @@ -26,11 +26,14 @@ import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.search.Indexable; import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.core.lifecycle.Lifecycle; +import com.android.settingslib.search.SearchIndexable; + import java.util.ArrayList; import java.util.Arrays; import java.util.List; /** Dashboard Fragment to display all recent location requests, sorted by recency. */ +@SearchIndexable public class RecentLocationRequestSeeAllFragment extends DashboardFragment { private static final String TAG = "RecentLocationReqAll"; diff --git a/src/com/android/settings/location/ScanningSettings.java b/src/com/android/settings/location/ScanningSettings.java index 91359520ea3..b2ce5fbf7da 100644 --- a/src/com/android/settings/location/ScanningSettings.java +++ b/src/com/android/settings/location/ScanningSettings.java @@ -25,6 +25,7 @@ import com.android.settings.dashboard.DashboardFragment; import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.search.Indexable; import com.android.settingslib.core.AbstractPreferenceController; +import com.android.settingslib.search.SearchIndexable; import java.util.ArrayList; import java.util.Arrays; @@ -33,6 +34,7 @@ import java.util.List; /** * A page that configures the background scanning settings for Wi-Fi and Bluetooth. */ +@SearchIndexable public class ScanningSettings extends DashboardFragment { private static final String TAG = "ScanningSettings"; diff --git a/src/com/android/settings/network/NetworkDashboardFragment.java b/src/com/android/settings/network/NetworkDashboardFragment.java index 955c50390ee..7c185707106 100644 --- a/src/com/android/settings/network/NetworkDashboardFragment.java +++ b/src/com/android/settings/network/NetworkDashboardFragment.java @@ -39,11 +39,13 @@ import com.android.settings.wifi.WifiMasterSwitchPreferenceController; import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; import com.android.settingslib.core.lifecycle.Lifecycle; +import com.android.settingslib.search.SearchIndexable; import java.util.ArrayList; import java.util.Arrays; import java.util.List; +@SearchIndexable public class NetworkDashboardFragment extends DashboardFragment implements MobilePlanPreferenceHost { diff --git a/src/com/android/settings/nfc/PaymentSettings.java b/src/com/android/settings/nfc/PaymentSettings.java index c832dfc8ecc..9532dac840b 100644 --- a/src/com/android/settings/nfc/PaymentSettings.java +++ b/src/com/android/settings/nfc/PaymentSettings.java @@ -35,10 +35,12 @@ import com.android.settings.SettingsPreferenceFragment; import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.search.Indexable; import com.android.settings.search.SearchIndexableRaw; +import com.android.settingslib.search.SearchIndexable; import java.util.ArrayList; import java.util.List; +@SearchIndexable public class PaymentSettings extends SettingsPreferenceFragment implements Indexable { public static final String TAG = "PaymentSettings"; diff --git a/src/com/android/settings/notification/ConfigureNotificationSettings.java b/src/com/android/settings/notification/ConfigureNotificationSettings.java index 26c1bc8be66..34678581b8f 100644 --- a/src/com/android/settings/notification/ConfigureNotificationSettings.java +++ b/src/com/android/settings/notification/ConfigureNotificationSettings.java @@ -36,11 +36,13 @@ import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.search.Indexable; import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.core.lifecycle.Lifecycle; +import com.android.settingslib.search.SearchIndexable; import java.util.ArrayList; import java.util.Arrays; import java.util.List; +@SearchIndexable public class ConfigureNotificationSettings extends DashboardFragment { private static final String TAG = "ConfigNotiSettings"; diff --git a/src/com/android/settings/notification/SoundSettings.java b/src/com/android/settings/notification/SoundSettings.java index 9550758656b..10bf159ce62 100644 --- a/src/com/android/settings/notification/SoundSettings.java +++ b/src/com/android/settings/notification/SoundSettings.java @@ -36,11 +36,13 @@ import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.widget.PreferenceCategoryController; import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.core.lifecycle.Lifecycle; +import com.android.settingslib.search.SearchIndexable; import java.util.ArrayList; import java.util.Arrays; import java.util.List; +@SearchIndexable public class SoundSettings extends DashboardFragment { private static final String TAG = "SoundSettings"; diff --git a/src/com/android/settings/notification/ZenModeAutomationSettings.java b/src/com/android/settings/notification/ZenModeAutomationSettings.java index 1bb6fc678cc..74bc93de079 100644 --- a/src/com/android/settings/notification/ZenModeAutomationSettings.java +++ b/src/com/android/settings/notification/ZenModeAutomationSettings.java @@ -29,10 +29,12 @@ import com.android.settings.utils.ManagedServiceSettings; import com.android.settings.utils.ZenServiceListing; import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.core.lifecycle.Lifecycle; +import com.android.settingslib.search.SearchIndexable; import java.util.ArrayList; import java.util.List; +@SearchIndexable public class ZenModeAutomationSettings extends ZenModeSettingsBase { protected final ManagedServiceSettings.Config CONFIG = getConditionProviderConfig(); diff --git a/src/com/android/settings/notification/ZenModeBehaviorSettings.java b/src/com/android/settings/notification/ZenModeBehaviorSettings.java index 31542c35ed4..5a084e88e2d 100644 --- a/src/com/android/settings/notification/ZenModeBehaviorSettings.java +++ b/src/com/android/settings/notification/ZenModeBehaviorSettings.java @@ -25,10 +25,12 @@ import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.search.Indexable; import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.core.lifecycle.Lifecycle; +import com.android.settingslib.search.SearchIndexable; import java.util.ArrayList; import java.util.List; +@SearchIndexable public class ZenModeBehaviorSettings extends ZenModeSettingsBase implements Indexable { @Override diff --git a/src/com/android/settings/notification/ZenModeBlockedEffectsSettings.java b/src/com/android/settings/notification/ZenModeBlockedEffectsSettings.java index 0cac9cb103d..a15d055be22 100644 --- a/src/com/android/settings/notification/ZenModeBlockedEffectsSettings.java +++ b/src/com/android/settings/notification/ZenModeBlockedEffectsSettings.java @@ -34,10 +34,12 @@ import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.search.Indexable; import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.core.lifecycle.Lifecycle; +import com.android.settingslib.search.SearchIndexable; import java.util.ArrayList; import java.util.List; +@SearchIndexable public class ZenModeBlockedEffectsSettings extends ZenModeSettingsBase implements Indexable { @Override diff --git a/src/com/android/settings/notification/ZenModeSettings.java b/src/com/android/settings/notification/ZenModeSettings.java index 5b85440369e..97aafdb3667 100644 --- a/src/com/android/settings/notification/ZenModeSettings.java +++ b/src/com/android/settings/notification/ZenModeSettings.java @@ -32,6 +32,7 @@ import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.search.Indexable; import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.core.lifecycle.Lifecycle; +import com.android.settingslib.search.SearchIndexable; import java.util.ArrayList; import java.util.Arrays; @@ -39,6 +40,7 @@ import java.util.List; import java.util.Map; import java.util.Map.Entry; +@SearchIndexable public class ZenModeSettings extends ZenModeSettingsBase { @Override protected int getPreferenceScreenResId() { diff --git a/src/com/android/settings/print/PrintSettingsFragment.java b/src/com/android/settings/print/PrintSettingsFragment.java index 21ee360e98b..c2cf87f58a3 100644 --- a/src/com/android/settings/print/PrintSettingsFragment.java +++ b/src/com/android/settings/print/PrintSettingsFragment.java @@ -56,6 +56,7 @@ import com.android.settings.R; import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.search.Indexable; import com.android.settings.utils.ProfileSettingsPreferenceFragment; +import com.android.settingslib.search.SearchIndexable; import java.text.DateFormat; import java.util.ArrayList; @@ -64,6 +65,7 @@ import java.util.List; /** * Fragment with the top level print settings. */ +@SearchIndexable public class PrintSettingsFragment extends ProfileSettingsPreferenceFragment implements Indexable, OnClickListener { public static final String TAG = "PrintSettingsFragment"; diff --git a/src/com/android/settings/search/SearchFeatureProvider.java b/src/com/android/settings/search/SearchFeatureProvider.java index cbe49f8c799..a7ad92b8d0d 100644 --- a/src/com/android/settings/search/SearchFeatureProvider.java +++ b/src/com/android/settings/search/SearchFeatureProvider.java @@ -24,6 +24,7 @@ import android.content.Intent; import android.widget.Toolbar; import com.android.settings.overlay.FeatureFactory; +import com.android.settingslib.search.SearchIndexableResources; /** * FeatureProvider for Settings Search diff --git a/src/com/android/settings/search/SearchFeatureProviderImpl.java b/src/com/android/settings/search/SearchFeatureProviderImpl.java index 78c47edf046..2e68f909001 100644 --- a/src/com/android/settings/search/SearchFeatureProviderImpl.java +++ b/src/com/android/settings/search/SearchFeatureProviderImpl.java @@ -24,6 +24,8 @@ import android.text.TextUtils; import com.android.internal.annotations.VisibleForTesting; import com.android.settings.overlay.FeatureFactory; import com.android.settings.search.indexing.IndexData; +import com.android.settingslib.search.SearchIndexableResources; +import com.android.settingslib.search.SearchIndexableResourcesMobile; import java.util.Locale; @@ -76,7 +78,7 @@ public class SearchFeatureProviderImpl implements SearchFeatureProvider { @Override public SearchIndexableResources getSearchIndexableResources() { if (mSearchIndexableResources == null) { - mSearchIndexableResources = new SearchIndexableResourcesImpl(); + mSearchIndexableResources = new SearchIndexableResourcesMobile(); } return mSearchIndexableResources; } diff --git a/src/com/android/settings/search/SearchIndexableResources.java b/src/com/android/settings/search/SearchIndexableResources.java deleted file mode 100644 index 5a0a131af6b..00000000000 --- a/src/com/android/settings/search/SearchIndexableResources.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright (C) 2018 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 java.util.Collection; - -public interface SearchIndexableResources { - - /** - * Returns a collection of classes that should be indexed for search. - * - * Each class should have the SEARCH_INDEX_DATA_PROVIDER public static member. - */ - Collection getProviderValues(); -} diff --git a/src/com/android/settings/search/SearchIndexableResourcesImpl.java b/src/com/android/settings/search/SearchIndexableResourcesImpl.java deleted file mode 100644 index 0dbfe637c87..00000000000 --- a/src/com/android/settings/search/SearchIndexableResourcesImpl.java +++ /dev/null @@ -1,190 +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.support.annotation.VisibleForTesting; - -import com.android.settings.DateTimeSettings; -import com.android.settings.DisplaySettings; -import com.android.settings.LegalSettings; -import com.android.settings.connecteddevice.AdvancedConnectedDeviceDashboardFragment; -import com.android.settings.datausage.DataUsageSummaryLegacy; -import com.android.settings.deviceinfo.aboutphone.MyDeviceInfoFragment; -import com.android.settings.accessibility.AccessibilitySettings; -import com.android.settings.accessibility.AccessibilityShortcutPreferenceFragment; -import com.android.settings.accessibility.MagnificationPreferenceFragment; -import com.android.settings.accessibility.VibrationSettings; -import com.android.settings.accounts.AccountDashboardFragment; -import com.android.settings.applications.AppAndNotificationDashboardFragment; -import com.android.settings.applications.DefaultAppSettings; -import com.android.settings.applications.SpecialAccessSettings; -import com.android.settings.applications.assist.ManageAssist; -import com.android.settings.backup.BackupSettingsActivity; -import com.android.settings.backup.BackupSettingsFragment; -import com.android.settings.connecteddevice.ConnectedDeviceDashboardFragment; -import com.android.settings.connecteddevice.usb.UsbDetailsFragment; -import com.android.settings.datausage.DataUsageSummary; -import com.android.settings.deletionhelper.AutomaticStorageManagerSettings; -import com.android.settings.development.DevelopmentSettingsDashboardFragment; -import com.android.settings.deviceinfo.DeviceInfoSettings; -import com.android.settings.deviceinfo.StorageDashboardFragment; -import com.android.settings.deviceinfo.StorageSettings; -import com.android.settings.display.AmbientDisplaySettings; -import com.android.settings.display.NightDisplaySettings; -import com.android.settings.display.ScreenZoomSettings; -import com.android.settings.dream.DreamSettings; -import com.android.settings.enterprise.EnterprisePrivacySettings; -import com.android.settings.fuelgauge.PowerUsageAdvanced; -import com.android.settings.fuelgauge.batterysaver.BatterySaverSettings; -import com.android.settings.fuelgauge.PowerUsageSummary; -import com.android.settings.fuelgauge.SmartBatterySettings; -import com.android.settings.gestures.AssistGestureSettings; -import com.android.settings.gestures.DoubleTapPowerSettings; -import com.android.settings.gestures.DoubleTapScreenSettings; -import com.android.settings.gestures.DoubleTwistGestureSettings; -import com.android.settings.gestures.GestureSettings; -import com.android.settings.gestures.PickupGestureSettings; -import com.android.settings.gestures.PreventRingingGestureSettings; -import com.android.settings.gestures.SwipeToNotificationSettings; -import com.android.settings.inputmethod.AvailableVirtualKeyboardFragment; -import com.android.settings.inputmethod.PhysicalKeyboardFragment; -import com.android.settings.inputmethod.VirtualKeyboardFragment; -import com.android.settings.language.LanguageAndInputSettings; -import com.android.settings.location.LocationSettings; -import com.android.settings.location.RecentLocationRequestSeeAllFragment; -import com.android.settings.location.ScanningSettings; -import com.android.settings.network.NetworkDashboardFragment; -import com.android.settings.nfc.PaymentSettings; -import com.android.settings.notification.ConfigureNotificationSettings; -import com.android.settings.notification.SoundSettings; -import com.android.settings.notification.ZenModeAutomationSettings; -import com.android.settings.notification.ZenModeBehaviorSettings; -import com.android.settings.notification.ZenModeBlockedEffectsSettings; -import com.android.settings.notification.ZenModeSettings; -import com.android.settings.print.PrintSettingsFragment; -import com.android.settings.security.EncryptionAndCredential; -import com.android.settings.security.LockscreenDashboardFragment; -import com.android.settings.security.ScreenPinningSettings; -import com.android.settings.security.SecuritySettings; -import com.android.settings.security.screenlock.ScreenLockSettings; -import com.android.settings.sim.SimSettings; -import com.android.settings.support.SupportDashboardActivity; -import com.android.settings.system.ResetDashboardFragment; -import com.android.settings.system.SystemDashboardFragment; -import com.android.settings.tts.TextToSpeechSettings; -import com.android.settings.tts.TtsEnginePreferenceFragment; -import com.android.settings.users.UserSettings; -import com.android.settings.wallpaper.WallpaperTypeSettings; -import com.android.settings.wfd.WifiDisplaySettings; -import com.android.settings.wifi.ConfigureWifiSettings; -import com.android.settings.wifi.WifiSettings; - -import java.util.Collection; -import java.util.HashSet; -import java.util.Set; - -public class SearchIndexableResourcesImpl implements SearchIndexableResources { - - private final Set sProviders = new HashSet<>(); - - @VisibleForTesting - void addIndex(Class indexClass) { - sProviders.add(indexClass); - } - - public SearchIndexableResourcesImpl() { - addIndex(WifiSettings.class); - addIndex(NetworkDashboardFragment.class); - addIndex(ConfigureWifiSettings.class); - addIndex(SimSettings.class); - addIndex(DataUsageSummary.class); - addIndex(DataUsageSummaryLegacy.class); - addIndex(ScreenZoomSettings.class); - addIndex(DisplaySettings.class); - addIndex(AmbientDisplaySettings.class); - addIndex(WallpaperTypeSettings.class); - addIndex(AppAndNotificationDashboardFragment.class); - addIndex(SoundSettings.class); - addIndex(ZenModeSettings.class); - addIndex(StorageSettings.class); - addIndex(PowerUsageAdvanced.class); - addIndex(DefaultAppSettings.class); - addIndex(ManageAssist.class); - addIndex(SpecialAccessSettings.class); - addIndex(UserSettings.class); - addIndex(AssistGestureSettings.class); - addIndex(PickupGestureSettings.class); - addIndex(DoubleTapScreenSettings.class); - addIndex(DoubleTapPowerSettings.class); - addIndex(DoubleTwistGestureSettings.class); - addIndex(SwipeToNotificationSettings.class); - addIndex(GestureSettings.class); - addIndex(LanguageAndInputSettings.class); - addIndex(LocationSettings.class); - addIndex(ScanningSettings.class); - addIndex(SecuritySettings.class); - addIndex(ScreenLockSettings.class); - addIndex(EncryptionAndCredential.class); - addIndex(ScreenPinningSettings.class); - addIndex(AccountDashboardFragment.class); - addIndex(VirtualKeyboardFragment.class); - addIndex(AvailableVirtualKeyboardFragment.class); - addIndex(PhysicalKeyboardFragment.class); - addIndex(BackupSettingsActivity.class); - addIndex(BackupSettingsFragment.class); - addIndex(DateTimeSettings.class); - addIndex(AccessibilitySettings.class); - addIndex(PrintSettingsFragment.class); - addIndex(DevelopmentSettingsDashboardFragment.class); - addIndex(DeviceInfoSettings.class); - addIndex(LegalSettings.class); - addIndex(SystemDashboardFragment.class); - addIndex(ResetDashboardFragment.class); - addIndex(StorageDashboardFragment.class); - addIndex(ConnectedDeviceDashboardFragment.class); - addIndex(AdvancedConnectedDeviceDashboardFragment.class); - addIndex(EnterprisePrivacySettings.class); - addIndex(PaymentSettings.class); - addIndex(TextToSpeechSettings.class); - addIndex(TtsEnginePreferenceFragment.class); - addIndex(MagnificationPreferenceFragment.class); - addIndex(AccessibilityShortcutPreferenceFragment.class); - addIndex(DreamSettings.class); - addIndex(SupportDashboardActivity.class); - addIndex(AutomaticStorageManagerSettings.class); - addIndex(ConfigureNotificationSettings.class); - addIndex(PowerUsageSummary.class); - addIndex(BatterySaverSettings.class); - addIndex(LockscreenDashboardFragment.class); - addIndex(UsbDetailsFragment.class); - addIndex(WifiDisplaySettings.class); - addIndex(ZenModeBehaviorSettings.class); - addIndex(ZenModeBlockedEffectsSettings.class); - addIndex(ZenModeAutomationSettings.class); - addIndex(NightDisplaySettings.class); - addIndex(SmartBatterySettings.class); - addIndex(MyDeviceInfoFragment.class); - addIndex(VibrationSettings.class); - addIndex(RecentLocationRequestSeeAllFragment.class); - addIndex(PreventRingingGestureSettings.class); - } - - @Override - public Collection getProviderValues() { - return sProviders; - } -} diff --git a/src/com/android/settings/security/EncryptionAndCredential.java b/src/com/android/settings/security/EncryptionAndCredential.java index 66ae20b08ca..90964864660 100644 --- a/src/com/android/settings/security/EncryptionAndCredential.java +++ b/src/com/android/settings/security/EncryptionAndCredential.java @@ -30,6 +30,7 @@ import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.widget.PreferenceCategoryController; import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.core.lifecycle.Lifecycle; +import com.android.settingslib.search.SearchIndexable; import java.util.ArrayList; import java.util.Arrays; @@ -38,6 +39,7 @@ import java.util.List; /** * Encryption and Credential settings. */ +@SearchIndexable public class EncryptionAndCredential extends DashboardFragment { private static final String TAG = "EncryptionAndCredential"; diff --git a/src/com/android/settings/security/LockscreenDashboardFragment.java b/src/com/android/settings/security/LockscreenDashboardFragment.java index 21b4c921fc6..3cf5ba6c409 100644 --- a/src/com/android/settings/security/LockscreenDashboardFragment.java +++ b/src/com/android/settings/security/LockscreenDashboardFragment.java @@ -28,6 +28,7 @@ import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.users.AddUserWhenLockedPreferenceController; import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.core.lifecycle.Lifecycle; +import com.android.settingslib.search.SearchIndexable; import java.util.ArrayList; import java.util.Arrays; @@ -36,6 +37,7 @@ import java.util.List; /** * Settings screen for lock screen preference */ +@SearchIndexable public class LockscreenDashboardFragment extends DashboardFragment implements OwnerInfoPreferenceController.OwnerInfoCallback { diff --git a/src/com/android/settings/security/ScreenPinningSettings.java b/src/com/android/settings/security/ScreenPinningSettings.java index 6e4856ee423..f7efa017771 100644 --- a/src/com/android/settings/security/ScreenPinningSettings.java +++ b/src/com/android/settings/security/ScreenPinningSettings.java @@ -40,6 +40,7 @@ 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.settingslib.search.SearchIndexable; import java.util.Arrays; import java.util.List; @@ -47,6 +48,7 @@ import java.util.List; /** * Screen pinning settings. */ +@SearchIndexable public class ScreenPinningSettings extends SettingsPreferenceFragment implements SwitchBar.OnSwitchChangeListener, Indexable { diff --git a/src/com/android/settings/security/SecuritySettings.java b/src/com/android/settings/security/SecuritySettings.java index 0839450a93c..652b66da290 100644 --- a/src/com/android/settings/security/SecuritySettings.java +++ b/src/com/android/settings/security/SecuritySettings.java @@ -41,10 +41,12 @@ import com.android.settings.security.trustagent.TrustAgentListPreferenceControll import com.android.settings.widget.PreferenceCategoryController; import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.core.lifecycle.Lifecycle; +import com.android.settingslib.search.SearchIndexable; import java.util.ArrayList; import java.util.List; +@SearchIndexable public class SecuritySettings extends DashboardFragment { private static final String TAG = "SecuritySettings"; diff --git a/src/com/android/settings/security/screenlock/ScreenLockSettings.java b/src/com/android/settings/security/screenlock/ScreenLockSettings.java index 2fa4124f95e..6c6e862f63c 100644 --- a/src/com/android/settings/security/screenlock/ScreenLockSettings.java +++ b/src/com/android/settings/security/screenlock/ScreenLockSettings.java @@ -30,10 +30,12 @@ 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; +import com.android.settingslib.search.SearchIndexable; import java.util.ArrayList; import java.util.List; +@SearchIndexable public class ScreenLockSettings extends DashboardFragment implements OwnerInfoPreferenceController.OwnerInfoCallback { diff --git a/src/com/android/settings/sim/SimSettings.java b/src/com/android/settings/sim/SimSettings.java index 3d6bfb162a9..2211d47947e 100644 --- a/src/com/android/settings/sim/SimSettings.java +++ b/src/com/android/settings/sim/SimSettings.java @@ -42,10 +42,12 @@ 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.SearchIndexable; import java.util.ArrayList; import java.util.List; +@SearchIndexable public class SimSettings extends RestrictedSettingsFragment implements Indexable { private static final String TAG = "SimSettings"; private static final boolean DBG = false; diff --git a/src/com/android/settings/support/SupportDashboardActivity.java b/src/com/android/settings/support/SupportDashboardActivity.java index e829577cc38..ed7e76ce9b8 100644 --- a/src/com/android/settings/support/SupportDashboardActivity.java +++ b/src/com/android/settings/support/SupportDashboardActivity.java @@ -26,6 +26,7 @@ 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.SearchIndexable; import java.util.ArrayList; import java.util.List; @@ -33,6 +34,7 @@ import java.util.List; /** * Trampoline activity that decides which version of support should be shown to the user. */ +@SearchIndexable public class SupportDashboardActivity extends Activity implements Indexable { @Override diff --git a/src/com/android/settings/system/ResetDashboardFragment.java b/src/com/android/settings/system/ResetDashboardFragment.java index 03543cc4989..153177a4ac7 100644 --- a/src/com/android/settings/system/ResetDashboardFragment.java +++ b/src/com/android/settings/system/ResetDashboardFragment.java @@ -28,10 +28,12 @@ import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.search.Indexable; import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.core.lifecycle.Lifecycle; +import com.android.settingslib.search.SearchIndexable; import java.util.ArrayList; import java.util.List; +@SearchIndexable public class ResetDashboardFragment extends DashboardFragment { private static final String TAG = "ResetDashboardFragment"; diff --git a/src/com/android/settings/system/SystemDashboardFragment.java b/src/com/android/settings/system/SystemDashboardFragment.java index 1556659fa8e..8258f20e7ac 100644 --- a/src/com/android/settings/system/SystemDashboardFragment.java +++ b/src/com/android/settings/system/SystemDashboardFragment.java @@ -28,10 +28,12 @@ import com.android.settings.backup.BackupSettingsActivityPreferenceController; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.search.Indexable; +import com.android.settingslib.search.SearchIndexable; import java.util.Arrays; import java.util.List; +@SearchIndexable public class SystemDashboardFragment extends DashboardFragment { private static final String TAG = "SystemDashboardFrag"; diff --git a/src/com/android/settings/tts/TextToSpeechSettings.java b/src/com/android/settings/tts/TextToSpeechSettings.java index 9bb7958e233..c6b20b0ee84 100644 --- a/src/com/android/settings/tts/TextToSpeechSettings.java +++ b/src/com/android/settings/tts/TextToSpeechSettings.java @@ -46,6 +46,7 @@ import com.android.settings.search.Indexable; import com.android.settings.widget.ActionButtonPreference; import com.android.settings.widget.GearPreference; import com.android.settings.widget.SeekBarPreference; +import com.android.settingslib.search.SearchIndexable; import java.util.ArrayList; import java.util.Arrays; @@ -58,6 +59,7 @@ import java.util.MissingResourceException; import java.util.Objects; import java.util.Set; +@SearchIndexable public class TextToSpeechSettings extends SettingsPreferenceFragment implements Preference.OnPreferenceChangeListener, GearPreference.OnGearClickListener, Indexable { diff --git a/src/com/android/settings/tts/TtsEnginePreferenceFragment.java b/src/com/android/settings/tts/TtsEnginePreferenceFragment.java index 8e6cfecb8f7..81afe8d8338 100644 --- a/src/com/android/settings/tts/TtsEnginePreferenceFragment.java +++ b/src/com/android/settings/tts/TtsEnginePreferenceFragment.java @@ -15,12 +15,15 @@ import android.util.Log; import static android.provider.Settings.Secure.TTS_DEFAULT_SYNTH; import com.android.settings.search.Indexable; import com.android.settings.search.BaseSearchIndexProvider; +import com.android.settingslib.search.SearchIndexable; + import android.content.Context; import android.provider.SearchIndexableResource; import java.util.List; import java.util.Arrays; +@SearchIndexable public class TtsEnginePreferenceFragment extends SettingsPreferenceFragment //implements implements RadioButtonGroupState, Indexable { private static final String TAG = "TtsEnginePrefFragment"; diff --git a/src/com/android/settings/users/UserSettings.java b/src/com/android/settings/users/UserSettings.java index bc02b3003ff..3b1a4de1c29 100644 --- a/src/com/android/settings/users/UserSettings.java +++ b/src/com/android/settings/users/UserSettings.java @@ -73,6 +73,7 @@ import com.android.settingslib.RestrictedLockUtils; import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; import com.android.settingslib.RestrictedPreference; import com.android.settingslib.drawable.CircleFramedDrawable; +import com.android.settingslib.search.SearchIndexable; import java.io.IOException; import java.io.InputStream; @@ -89,6 +90,7 @@ import java.util.List; * The first one is always the current user. * Owner is the primary user. */ +@SearchIndexable public class UserSettings extends SettingsPreferenceFragment implements OnPreferenceClickListener, OnClickListener, DialogInterface.OnDismissListener, EditUserInfoController.OnContentChangedCallback, Indexable { diff --git a/src/com/android/settings/wallpaper/WallpaperTypeSettings.java b/src/com/android/settings/wallpaper/WallpaperTypeSettings.java index 1a1e1214fa1..9d565e4aa7b 100644 --- a/src/com/android/settings/wallpaper/WallpaperTypeSettings.java +++ b/src/com/android/settings/wallpaper/WallpaperTypeSettings.java @@ -31,10 +31,12 @@ import com.android.settings.SettingsPreferenceFragment; import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.search.Indexable; import com.android.settings.search.SearchIndexableRaw; +import com.android.settingslib.search.SearchIndexable; import java.util.ArrayList; import java.util.List; +@SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC) public class WallpaperTypeSettings extends SettingsPreferenceFragment implements Indexable { @Override diff --git a/src/com/android/settings/wfd/WifiDisplaySettings.java b/src/com/android/settings/wfd/WifiDisplaySettings.java index 8f42389a8cc..9a8ac70c4a8 100755 --- a/src/com/android/settings/wfd/WifiDisplaySettings.java +++ b/src/com/android/settings/wfd/WifiDisplaySettings.java @@ -66,6 +66,7 @@ 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.SearchIndexable; import java.util.ArrayList; import java.util.List; @@ -78,6 +79,7 @@ import java.util.List; * on the system. In that case, the enable option will not be shown but other * remote display routes will continue to be made available. */ +@SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC) public final class WifiDisplaySettings extends SettingsPreferenceFragment implements Indexable { private static final String TAG = "WifiDisplaySettings"; private static final boolean DEBUG = false; diff --git a/src/com/android/settings/wifi/ConfigureWifiSettings.java b/src/com/android/settings/wifi/ConfigureWifiSettings.java index 96b2d03c3dc..822e3595c33 100644 --- a/src/com/android/settings/wifi/ConfigureWifiSettings.java +++ b/src/com/android/settings/wifi/ConfigureWifiSettings.java @@ -31,11 +31,13 @@ import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.search.Indexable; import com.android.settings.wifi.p2p.WifiP2pPreferenceController; import com.android.settingslib.core.AbstractPreferenceController; +import com.android.settingslib.search.SearchIndexable; import java.util.ArrayList; import java.util.Arrays; import java.util.List; +@SearchIndexable public class ConfigureWifiSettings extends DashboardFragment { private static final String TAG = "ConfigureWifiSettings"; diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java index 5f299221642..b09f21e26a5 100644 --- a/src/com/android/settings/wifi/WifiSettings.java +++ b/src/com/android/settings/wifi/WifiSettings.java @@ -66,6 +66,7 @@ import com.android.settings.widget.SwitchBarController; import com.android.settings.wifi.details.WifiNetworkDetailsFragment; import com.android.settings.wrapper.ConnectivityManagerWrapper; import com.android.settingslib.RestrictedLockUtils; +import com.android.settingslib.search.SearchIndexable; import com.android.settingslib.wifi.AccessPoint; import com.android.settingslib.wifi.AccessPoint.AccessPointListener; import com.android.settingslib.wifi.AccessPointPreference; @@ -83,6 +84,7 @@ import java.util.List; * The second is for Setup Wizard, with a simplified interface that hides the action bar * and menus. */ +@SearchIndexable public class WifiSettings extends RestrictedSettingsFragment implements Indexable, WifiTracker.WifiListener, AccessPointListener, WifiDialog.WifiDialogListener { diff --git a/tests/robotests/Android.mk b/tests/robotests/Android.mk index 102e8da00b4..ba3d086bffa 100644 --- a/tests/robotests/Android.mk +++ b/tests/robotests/Android.mk @@ -38,7 +38,8 @@ LOCAL_JAVA_LIBRARIES := \ LOCAL_TEST_PACKAGE := Settings -LOCAL_INSTRUMENT_SOURCE_DIRS := $(dir $(LOCAL_PATH))../src +LOCAL_INSTRUMENT_SOURCE_DIRS := $(dir $(LOCAL_PATH))../src \ + frameworks/base/packages/SettingsLib/search/src \ LOCAL_ROBOTEST_TIMEOUT := 36000 diff --git a/tests/robotests/src/com/android/settings/search/SearchIndexProviderCodeInspector.java b/tests/robotests/src/com/android/settings/search/SearchIndexProviderCodeInspector.java index d6103637be4..c68ddbba809 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.SearchIndexableResources; import org.robolectric.RuntimeEnvironment; diff --git a/tests/robotests/src/com/android/settings/search/SearchIndexableResourcesTest.java b/tests/robotests/src/com/android/settings/search/SearchIndexableResourcesTest.java index dcf68aa8491..ab90a0fe3dc 100644 --- a/tests/robotests/src/com/android/settings/search/SearchIndexableResourcesTest.java +++ b/tests/robotests/src/com/android/settings/search/SearchIndexableResourcesTest.java @@ -17,8 +17,11 @@ package com.android.settings.search; import static android.provider.SearchIndexablesContract.COLUMN_INDEX_NON_INDEXABLE_KEYS_KEY_VALUE; + import static com.google.common.truth.Truth.assertThat; + import static junit.framework.Assert.fail; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; @@ -62,8 +65,7 @@ public class SearchIndexableResourcesTest { final int beforeCount = mSearchProvider.getSearchIndexableResources().getProviderValues().size(); - ((SearchIndexableResourcesImpl) mSearchProvider.getSearchIndexableResources()) - .addIndex(String.class); + mSearchProvider.getSearchIndexableResources().addIndex(String.class); assertThat(mSearchProvider.getSearchIndexableResources().getProviderValues()) .contains(String.class); @@ -81,8 +83,7 @@ public class SearchIndexableResourcesTest { @Test public void testNonIndexableKeys_GetsKeyFromProvider() { mSearchProvider.getSearchIndexableResources().getProviderValues().clear(); - ((SearchIndexableResourcesImpl) mSearchProvider.getSearchIndexableResources()) - .addIndex(FakeIndexProvider.class); + mSearchProvider.getSearchIndexableResources().addIndex(FakeIndexProvider.class); SettingsSearchIndexablesProvider provider = spy(new SettingsSearchIndexablesProvider()); diff --git a/tests/unit/src/com/android/settings/core/PreferenceControllerContractTest.java b/tests/unit/src/com/android/settings/core/PreferenceControllerContractTest.java index 802a3a71caf..176d3c44ab5 100644 --- a/tests/unit/src/com/android/settings/core/PreferenceControllerContractTest.java +++ b/tests/unit/src/com/android/settings/core/PreferenceControllerContractTest.java @@ -28,8 +28,8 @@ import android.util.ArraySet; import com.android.settings.overlay.FeatureFactory; import com.android.settings.search.DatabaseIndexingUtils; import com.android.settings.search.Indexable; -import com.android.settings.search.SearchIndexableResources; import com.android.settingslib.core.AbstractPreferenceController; +import com.android.settingslib.search.SearchIndexableResources; import org.junit.Before; import org.junit.Test; diff --git a/tests/unit/src/com/android/settings/core/UniquePreferenceTest.java b/tests/unit/src/com/android/settings/core/UniquePreferenceTest.java index df56480c1c9..58533318657 100644 --- a/tests/unit/src/com/android/settings/core/UniquePreferenceTest.java +++ b/tests/unit/src/com/android/settings/core/UniquePreferenceTest.java @@ -34,7 +34,7 @@ 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.settings.search.SearchIndexableResources; +import com.android.settingslib.search.SearchIndexableResources; import org.junit.Before; import org.junit.Test; diff --git a/tests/unit/src/com/android/settings/core/UserRestrictionTest.java b/tests/unit/src/com/android/settings/core/UserRestrictionTest.java index 6d6f06cc1f1..dc4a120d77b 100644 --- a/tests/unit/src/com/android/settings/core/UserRestrictionTest.java +++ b/tests/unit/src/com/android/settings/core/UserRestrictionTest.java @@ -35,7 +35,7 @@ import android.util.Xml; import com.android.settings.overlay.FeatureFactory; import com.android.settings.search.DatabaseIndexingUtils; import com.android.settings.search.Indexable; -import com.android.settings.search.SearchIndexableResources; +import com.android.settingslib.search.SearchIndexableResources; import com.google.android.collect.Sets;