diff --git a/res/xml/about_legal.xml b/res/xml/about_legal.xml index 6c59cacb059..d30ceaa280b 100644 --- a/res/xml/about_legal.xml +++ b/res/xml/about_legal.xml @@ -16,8 +16,7 @@ + android:title="@string/legal_information"> diff --git a/res/xml/assist_gesture_settings.xml b/res/xml/assist_gesture_settings.xml index 7cbd483d124..5f7918f3f59 100644 --- a/res/xml/assist_gesture_settings.xml +++ b/res/xml/assist_gesture_settings.xml @@ -18,7 +18,6 @@ - \ No newline at end of file + diff --git a/res/xml/available_virtual_keyboard.xml b/res/xml/available_virtual_keyboard.xml index 9a0b3c62ab1..6be06a2678c 100644 --- a/res/xml/available_virtual_keyboard.xml +++ b/res/xml/available_virtual_keyboard.xml @@ -17,7 +17,6 @@ - \ No newline at end of file + diff --git a/res/xml/battery_saver_settings.xml b/res/xml/battery_saver_settings.xml index 0436105dceb..6009f6ae3cf 100644 --- a/res/xml/battery_saver_settings.xml +++ b/res/xml/battery_saver_settings.xml @@ -17,8 +17,7 @@ + android:title="@string/battery_saver"> - \ No newline at end of file + diff --git a/res/xml/captioning_appearance.xml b/res/xml/captioning_appearance.xml index 66b298d5b69..3e0e804e535 100644 --- a/res/xml/captioning_appearance.xml +++ b/res/xml/captioning_appearance.xml @@ -18,8 +18,6 @@ diff --git a/res/xml/configure_notification_settings.xml b/res/xml/configure_notification_settings.xml index 6e8f701704b..021705703c5 100644 --- a/res/xml/configure_notification_settings.xml +++ b/res/xml/configure_notification_settings.xml @@ -16,8 +16,7 @@ + android:title="@string/configure_notification_settings"> diff --git a/res/xml/connected_devices_advanced.xml b/res/xml/connected_devices_advanced.xml index f5cef7ef5fc..ba623807f45 100644 --- a/res/xml/connected_devices_advanced.xml +++ b/res/xml/connected_devices_advanced.xml @@ -17,7 +17,6 @@ + android:order="-9"/> + android:order="-3"/> - \ No newline at end of file + diff --git a/res/xml/data_saver.xml b/res/xml/data_saver.xml index e884d6d68c2..4a917f621a1 100644 --- a/res/xml/data_saver.xml +++ b/res/xml/data_saver.xml @@ -17,7 +17,6 @@ diff --git a/res/xml/development_settings.xml b/res/xml/development_settings.xml index ff6640cc1c2..a49d85b9f09 100644 --- a/res/xml/development_settings.xml +++ b/res/xml/development_settings.xml @@ -125,8 +125,7 @@ + android:fragment="com.android.settings.development.qstile.DevelopmentTileConfigFragment" /> + android:fragment="com.android.settings.development.featureflags.FeatureFlagsDashboard" /> + android:fragment="com.android.settings.development.gamedriver.GameDriverDashboard" /> diff --git a/res/xml/device_admin_settings.xml b/res/xml/device_admin_settings.xml index 1837251455d..9a48761ab13 100644 --- a/res/xml/device_admin_settings.xml +++ b/res/xml/device_admin_settings.xml @@ -19,7 +19,6 @@ xmlns:android="http://schemas.android.com/apk/res/android" xmlns:settings="http://schemas.android.com/apk/res-auto" android:title="@string/manage_device_admin" - android:key="device_admin_settings" settings:controller="com.android.settings.applications.specialaccess.deviceadmin.DeviceAdminListPreferenceController"> - \ No newline at end of file + diff --git a/res/xml/display_settings.xml b/res/xml/display_settings.xml index 9bc67108459..4bf0c823ede 100644 --- a/res/xml/display_settings.xml +++ b/res/xml/display_settings.xml @@ -17,9 +17,7 @@ + settings:controller="com.android.settings.display.DarkUIPreferenceController"/> + android:fragment="com.android.settings.display.ScreenZoomSettings"/> + android:fragment="com.android.settings.dream.DreamSettings" /> - \ No newline at end of file + diff --git a/res/xml/double_tap_screen_settings.xml b/res/xml/double_tap_screen_settings.xml index 2734143c06b..e9eeb3adafa 100644 --- a/res/xml/double_tap_screen_settings.xml +++ b/res/xml/double_tap_screen_settings.xml @@ -18,7 +18,6 @@ - \ No newline at end of file + diff --git a/res/xml/double_twist_gesture_settings.xml b/res/xml/double_twist_gesture_settings.xml index f91bd350b05..ad82df3f07f 100644 --- a/res/xml/double_twist_gesture_settings.xml +++ b/res/xml/double_twist_gesture_settings.xml @@ -18,7 +18,6 @@ - \ No newline at end of file + diff --git a/res/xml/dream_fragment_overview.xml b/res/xml/dream_fragment_overview.xml index e4c2eb5365f..3cb49f9cced 100644 --- a/res/xml/dream_fragment_overview.xml +++ b/res/xml/dream_fragment_overview.xml @@ -17,7 +17,6 @@ - \ No newline at end of file + diff --git a/res/xml/encryption_and_credential.xml b/res/xml/encryption_and_credential.xml index f7e7184036c..b0906c16462 100644 --- a/res/xml/encryption_and_credential.xml +++ b/res/xml/encryption_and_credential.xml @@ -17,8 +17,7 @@ + android:title="@string/encryption_and_credential_settings_title"> + xmlns:settings="http://schemas.android.com/apk/res-auto"> diff --git a/res/xml/feature_flags_settings.xml b/res/xml/feature_flags_settings.xml index 0e509a8c0f3..a6cc0a90253 100644 --- a/res/xml/feature_flags_settings.xml +++ b/res/xml/feature_flags_settings.xml @@ -18,7 +18,6 @@ diff --git a/res/xml/gestures.xml b/res/xml/gestures.xml index ff3a6b52c8f..5ac27e0b018 100644 --- a/res/xml/gestures.xml +++ b/res/xml/gestures.xml @@ -18,7 +18,6 @@ diff --git a/res/xml/install_certificate_from_storage.xml b/res/xml/install_certificate_from_storage.xml index 640cb562c1e..8227ead4c50 100644 --- a/res/xml/install_certificate_from_storage.xml +++ b/res/xml/install_certificate_from_storage.xml @@ -17,8 +17,7 @@ + android:title="@string/credentials_install"> @@ -76,4 +75,4 @@ - \ No newline at end of file + diff --git a/res/xml/language_and_input.xml b/res/xml/language_and_input.xml index 03c83d47285..c3848e32750 100644 --- a/res/xml/language_and_input.xml +++ b/res/xml/language_and_input.xml @@ -18,7 +18,6 @@ @@ -39,8 +38,7 @@ android:key="physical_keyboard_pref" android:title="@string/physical_keyboard_title" android:summary="@string/summary_placeholder" - android:fragment="com.android.settings.inputmethod.PhysicalKeyboardFragment" - settings:searchable="false"/> + android:fragment="com.android.settings.inputmethod.PhysicalKeyboardFragment"/> + android:title="@string/location_scanning_screen_title"> + android:title="@string/location_settings_title"> + settings:allowDividerAbove="true"/> diff --git a/res/xml/nfc_payment_settings.xml b/res/xml/nfc_payment_settings.xml index 2508c39fab1..8e55a39a3ca 100644 --- a/res/xml/nfc_payment_settings.xml +++ b/res/xml/nfc_payment_settings.xml @@ -17,7 +17,6 @@ - \ No newline at end of file + diff --git a/res/xml/notification_access_settings.xml b/res/xml/notification_access_settings.xml index 4dbaf887f89..ca84f1b505c 100644 --- a/res/xml/notification_access_settings.xml +++ b/res/xml/notification_access_settings.xml @@ -18,6 +18,5 @@ diff --git a/res/xml/physical_keyboard_settings.xml b/res/xml/physical_keyboard_settings.xml index a2d9a6b7218..96946a9030e 100644 --- a/res/xml/physical_keyboard_settings.xml +++ b/res/xml/physical_keyboard_settings.xml @@ -15,7 +15,6 @@ --> diff --git a/res/xml/pick_up_gesture_settings.xml b/res/xml/pick_up_gesture_settings.xml index 47f707a2c26..178ddf5fa5b 100644 --- a/res/xml/pick_up_gesture_settings.xml +++ b/res/xml/pick_up_gesture_settings.xml @@ -18,7 +18,6 @@ - \ No newline at end of file + diff --git a/res/xml/picture_in_picture_settings.xml b/res/xml/picture_in_picture_settings.xml index 35839cdc148..1f0824643cf 100644 --- a/res/xml/picture_in_picture_settings.xml +++ b/res/xml/picture_in_picture_settings.xml @@ -18,6 +18,5 @@ diff --git a/res/xml/platform_compat_settings.xml b/res/xml/platform_compat_settings.xml index bee2324fb0e..86e62fe2246 100644 --- a/res/xml/platform_compat_settings.xml +++ b/res/xml/platform_compat_settings.xml @@ -18,6 +18,5 @@ diff --git a/res/xml/power_usage_summary.xml b/res/xml/power_usage_summary.xml index 005ce17f36d..869bb94f759 100644 --- a/res/xml/power_usage_summary.xml +++ b/res/xml/power_usage_summary.xml @@ -17,9 +17,7 @@ + android:title="@string/power_usage_summary_title"> diff --git a/res/xml/prevent_ringing_gesture_settings.xml b/res/xml/prevent_ringing_gesture_settings.xml index 4b0edc36179..cc2f234016e 100644 --- a/res/xml/prevent_ringing_gesture_settings.xml +++ b/res/xml/prevent_ringing_gesture_settings.xml @@ -18,7 +18,6 @@ - \ No newline at end of file + diff --git a/res/xml/previously_connected_devices.xml b/res/xml/previously_connected_devices.xml index 8c5509bc57e..435ced7565d 100644 --- a/res/xml/previously_connected_devices.xml +++ b/res/xml/previously_connected_devices.xml @@ -17,11 +17,10 @@ - \ No newline at end of file + diff --git a/res/xml/print_settings.xml b/res/xml/print_settings.xml index 8d840d1fc67..1919e53a88c 100644 --- a/res/xml/print_settings.xml +++ b/res/xml/print_settings.xml @@ -17,7 +17,6 @@ diff --git a/res/xml/privacy_dashboard_settings.xml b/res/xml/privacy_dashboard_settings.xml index 623460c5d37..abedc532bec 100644 --- a/res/xml/privacy_dashboard_settings.xml +++ b/res/xml/privacy_dashboard_settings.xml @@ -18,7 +18,6 @@ diff --git a/res/xml/reset_dashboard_fragment.xml b/res/xml/reset_dashboard_fragment.xml index 1b8dc6800f2..ac4ccb5668e 100644 --- a/res/xml/reset_dashboard_fragment.xml +++ b/res/xml/reset_dashboard_fragment.xml @@ -18,8 +18,7 @@ + android:title="@string/reset_dashboard_title"> @@ -147,4 +146,4 @@ android:summary="@string/summary_placeholder" android:fragment="com.android.settings.security.ScreenPinningSettings" /> - \ No newline at end of file + diff --git a/res/xml/security_lockscreen_settings.xml b/res/xml/security_lockscreen_settings.xml index 8cd4d76fbe0..dfc5ce79b68 100644 --- a/res/xml/security_lockscreen_settings.xml +++ b/res/xml/security_lockscreen_settings.xml @@ -17,9 +17,7 @@ + android:title="@string/lockscreen_settings_title"> diff --git a/res/xml/special_access.xml b/res/xml/special_access.xml index 200f896c4ba..ae3c9f8b33e 100644 --- a/res/xml/special_access.xml +++ b/res/xml/special_access.xml @@ -17,7 +17,6 @@ @@ -76,4 +75,4 @@ android:targetClass="@string/additional_system_update_menu"/> - \ No newline at end of file + diff --git a/res/xml/system_navigation_gesture_settings.xml b/res/xml/system_navigation_gesture_settings.xml index b1045fcbd6e..a75875bc745 100644 --- a/res/xml/system_navigation_gesture_settings.xml +++ b/res/xml/system_navigation_gesture_settings.xml @@ -18,6 +18,5 @@ diff --git a/res/xml/tap_screen_gesture_settings.xml b/res/xml/tap_screen_gesture_settings.xml index 9c0610af36f..fe3122543b6 100644 --- a/res/xml/tap_screen_gesture_settings.xml +++ b/res/xml/tap_screen_gesture_settings.xml @@ -18,7 +18,6 @@ - \ No newline at end of file + diff --git a/res/xml/tether_prefs.xml b/res/xml/tether_prefs.xml index 54c49e8f1c3..70d55aa5124 100644 --- a/res/xml/tether_prefs.xml +++ b/res/xml/tether_prefs.xml @@ -17,7 +17,6 @@ diff --git a/res/xml/tts_engine_picker.xml b/res/xml/tts_engine_picker.xml index 2550fe0ff5e..fd431ce22b5 100644 --- a/res/xml/tts_engine_picker.xml +++ b/res/xml/tts_engine_picker.xml @@ -15,7 +15,6 @@ --> diff --git a/res/xml/tts_settings.xml b/res/xml/tts_settings.xml index 92bf5d7c4d2..bcc9c85f39d 100644 --- a/res/xml/tts_settings.xml +++ b/res/xml/tts_settings.xml @@ -17,14 +17,12 @@ + android:fragment="com.android.settings.tts.TtsEnginePreferenceFragment"/> diff --git a/res/xml/usb_default_fragment.xml b/res/xml/usb_default_fragment.xml index b8d5e53b375..b062b8f8946 100644 --- a/res/xml/usb_default_fragment.xml +++ b/res/xml/usb_default_fragment.xml @@ -16,6 +16,5 @@ --> + android:title="@string/usb_pref"> diff --git a/res/xml/user_dictionary_list_fragment.xml b/res/xml/user_dictionary_list_fragment.xml index 46418c196a0..2f921a0b28b 100644 --- a/res/xml/user_dictionary_list_fragment.xml +++ b/res/xml/user_dictionary_list_fragment.xml @@ -17,7 +17,6 @@ diff --git a/res/xml/virtual_keyboard_settings.xml b/res/xml/virtual_keyboard_settings.xml index f248236d3a8..5a300824572 100644 --- a/res/xml/virtual_keyboard_settings.xml +++ b/res/xml/virtual_keyboard_settings.xml @@ -16,7 +16,6 @@ diff --git a/res/xml/wifi_configure_settings.xml b/res/xml/wifi_configure_settings.xml index 41d101bd7ef..cc281fa8768 100644 --- a/res/xml/wifi_configure_settings.xml +++ b/res/xml/wifi_configure_settings.xml @@ -17,7 +17,6 @@ diff --git a/res/xml/wifi_tether_settings.xml b/res/xml/wifi_tether_settings.xml index 3a3bdc4ba4b..1f43bb54542 100644 --- a/res/xml/wifi_tether_settings.xml +++ b/res/xml/wifi_tether_settings.xml @@ -18,9 +18,7 @@ + android:title="@string/wifi_hotspot_checkbox_text"> diff --git a/res/xml/zen_mode_automation_settings.xml b/res/xml/zen_mode_automation_settings.xml index 467331dc6d9..f00865dcaac 100644 --- a/res/xml/zen_mode_automation_settings.xml +++ b/res/xml/zen_mode_automation_settings.xml @@ -16,7 +16,6 @@ --> diff --git a/res/xml/zen_mode_people_settings.xml b/res/xml/zen_mode_people_settings.xml index 140d1cde8d7..7755bb75647 100644 --- a/res/xml/zen_mode_people_settings.xml +++ b/res/xml/zen_mode_people_settings.xml @@ -18,7 +18,6 @@ diff --git a/res/xml/zen_mode_sound_vibration_settings.xml b/res/xml/zen_mode_sound_vibration_settings.xml index 4aacda3b892..26f003fcc7c 100644 --- a/res/xml/zen_mode_sound_vibration_settings.xml +++ b/res/xml/zen_mode_sound_vibration_settings.xml @@ -17,7 +17,6 @@ getRawDataToIndex(Context context, - boolean enabled) { - final List result = new ArrayList<>(); - - // Add the activity title - final SearchIndexableRaw data = new SearchIndexableRaw(context); - data.title = context.getString(R.string.bluetooth_settings_title); - data.screenTitle = context.getString(R.string.bluetooth_settings_title); - data.keywords = context.getString(R.string.keywords_bluetooth_settings); - data.key = KEY_BLUETOOTH_SCREEN; - result.add(data); - - return result; - } - - @Override - public List getNonIndexableKeys(Context context) { - final List keys = super.getNonIndexableKeys(context); - BluetoothManager manager = - (BluetoothManager) context.getSystemService(Context.BLUETOOTH_SERVICE); - if (manager != null) { - BluetoothAdapter adapter = manager.getAdapter(); - final int status = adapter != null - ? TogglePreferenceController.AVAILABLE - : TogglePreferenceController.UNSUPPORTED_ON_DEVICE; - if (status != TogglePreferenceController.AVAILABLE) { - keys.add(KEY_BLUETOOTH_SCREEN); - } - } - - return keys; - } - }; + new BaseSearchIndexProvider(R.xml.bluetooth_screen); } diff --git a/src/com/android/settings/connecteddevice/PreviouslyConnectedDeviceDashboardFragment.java b/src/com/android/settings/connecteddevice/PreviouslyConnectedDeviceDashboardFragment.java index 741763871b1..d3f5c28afbe 100644 --- a/src/com/android/settings/connecteddevice/PreviouslyConnectedDeviceDashboardFragment.java +++ b/src/com/android/settings/connecteddevice/PreviouslyConnectedDeviceDashboardFragment.java @@ -17,17 +17,12 @@ package com.android.settings.connecteddevice; import android.app.settings.SettingsEnums; import android.content.Context; -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.settingslib.search.SearchIndexableRaw; import com.android.settingslib.search.SearchIndexable; -import java.util.ArrayList; -import java.util.List; - /** * This fragment contains previously connected device */ @@ -67,22 +62,5 @@ public class PreviouslyConnectedDeviceDashboardFragment extends DashboardFragmen * For Search. */ public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = - new BaseSearchIndexProvider() { - @Override - public List getRawDataToIndex( - Context context, boolean enabled) { - final List result = new ArrayList(); - final Resources res = context.getResources(); - - // Add fragment title - SearchIndexableRaw data = new SearchIndexableRaw(context); - data.key = KEY_PREVIOUSLY_CONNECTED_DEVICES; - data.title = res.getString( - R.string.connected_device_previously_connected_title); - data.screenTitle = res.getString( - R.string.connected_device_previously_connected_title); - result.add(data); - return result; - } - }; + new BaseSearchIndexProvider(R.xml.previously_connected_devices); } \ No newline at end of file diff --git a/src/com/android/settings/connecteddevice/TopLevelConnectedDevicesPreferenceController.java b/src/com/android/settings/connecteddevice/TopLevelConnectedDevicesPreferenceController.java index 21022838d2b..fd36bca6338 100644 --- a/src/com/android/settings/connecteddevice/TopLevelConnectedDevicesPreferenceController.java +++ b/src/com/android/settings/connecteddevice/TopLevelConnectedDevicesPreferenceController.java @@ -31,8 +31,7 @@ public class TopLevelConnectedDevicesPreferenceController extends BasePreference @Override public int getAvailabilityStatus() { return mContext.getResources().getBoolean(R.bool.config_show_top_level_connected_devices) - ? AVAILABLE_UNSEARCHABLE - : UNSUPPORTED_ON_DEVICE; + ? AVAILABLE : UNSUPPORTED_ON_DEVICE; } @Override diff --git a/src/com/android/settings/deviceinfo/HardwareInfoPreferenceController.java b/src/com/android/settings/deviceinfo/HardwareInfoPreferenceController.java index 29f13912071..7ee6f891fc7 100644 --- a/src/com/android/settings/deviceinfo/HardwareInfoPreferenceController.java +++ b/src/com/android/settings/deviceinfo/HardwareInfoPreferenceController.java @@ -44,7 +44,7 @@ public class HardwareInfoPreferenceController extends BasePreferenceController { @Override public int getAvailabilityStatus() { return mContext.getResources().getBoolean(R.bool.config_show_device_model) - ? AVAILABLE_UNSEARCHABLE : UNSUPPORTED_ON_DEVICE; + ? AVAILABLE : UNSUPPORTED_ON_DEVICE; } @Override diff --git a/src/com/android/settings/deviceinfo/StorageSettings.java b/src/com/android/settings/deviceinfo/StorageSettings.java index 5925da97093..aedaa4cca57 100644 --- a/src/com/android/settings/deviceinfo/StorageSettings.java +++ b/src/com/android/settings/deviceinfo/StorageSettings.java @@ -50,13 +50,13 @@ 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.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; import com.android.settingslib.deviceinfo.StorageManagerVolumeProvider; +import com.android.settingslib.search.Indexable; import com.android.settingslib.search.SearchIndexable; +import com.android.settingslib.search.SearchIndexableRaw; import java.util.ArrayList; import java.util.Collections; @@ -550,13 +550,6 @@ public class StorageSettings extends SettingsPreferenceFragment implements Index final List result = new ArrayList<>(); SearchIndexableRaw data = new SearchIndexableRaw(context); - data.title = context.getString(R.string.storage_settings); - data.key = "storage_settings"; - data.screenTitle = context.getString(R.string.storage_settings); - data.keywords = context.getString(R.string.keywords_storage_settings); - result.add(data); - - data = new SearchIndexableRaw(context); data.title = context.getString(R.string.internal_storage); data.key = "storage_settings_internal_storage"; data.screenTitle = context.getString(R.string.storage_settings); diff --git a/src/com/android/settings/deviceinfo/TopLevelStoragePreferenceController.java b/src/com/android/settings/deviceinfo/TopLevelStoragePreferenceController.java index fdc5feb573e..8a2d3babb89 100644 --- a/src/com/android/settings/deviceinfo/TopLevelStoragePreferenceController.java +++ b/src/com/android/settings/deviceinfo/TopLevelStoragePreferenceController.java @@ -43,7 +43,7 @@ public class TopLevelStoragePreferenceController extends BasePreferenceControlle @Override public int getAvailabilityStatus() { - return AVAILABLE_UNSEARCHABLE; + return AVAILABLE; } @Override diff --git a/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionPreferenceController.java b/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionPreferenceController.java index 41d9566760c..a63c20600ca 100644 --- a/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionPreferenceController.java +++ b/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionPreferenceController.java @@ -29,7 +29,7 @@ public class FirmwareVersionPreferenceController extends BasePreferenceControlle @Override public int getAvailabilityStatus() { - return AVAILABLE_UNSEARCHABLE; + return AVAILABLE; } @Override diff --git a/src/com/android/settings/display/ColorModePreferenceController.java b/src/com/android/settings/display/ColorModePreferenceController.java index 234cc98859b..7a43e5c3d70 100644 --- a/src/com/android/settings/display/ColorModePreferenceController.java +++ b/src/com/android/settings/display/ColorModePreferenceController.java @@ -34,7 +34,7 @@ public class ColorModePreferenceController extends BasePreferenceController { return mContext.getSystemService(ColorDisplayManager.class) .isDeviceColorManaged() && !ColorDisplayManager.areAccessibilityTransformsEnabled(mContext) ? - AVAILABLE_UNSEARCHABLE : DISABLED_FOR_USER; + AVAILABLE : DISABLED_FOR_USER; } @Override diff --git a/src/com/android/settings/display/FontSizePreferenceController.java b/src/com/android/settings/display/FontSizePreferenceController.java index 680e378cc4d..28c7922ea36 100644 --- a/src/com/android/settings/display/FontSizePreferenceController.java +++ b/src/com/android/settings/display/FontSizePreferenceController.java @@ -28,7 +28,7 @@ public class FontSizePreferenceController extends BasePreferenceController { @Override public int getAvailabilityStatus() { - return AVAILABLE_UNSEARCHABLE; + return AVAILABLE; } @Override diff --git a/src/com/android/settings/display/ScreenZoomSettings.java b/src/com/android/settings/display/ScreenZoomSettings.java index a30713661ca..4c46f018937 100644 --- a/src/com/android/settings/display/ScreenZoomSettings.java +++ b/src/com/android/settings/display/ScreenZoomSettings.java @@ -20,21 +20,15 @@ import android.annotation.Nullable; import android.app.settings.SettingsEnums; import android.content.Context; import android.content.res.Configuration; -import android.content.res.Resources; import android.os.Bundle; import android.view.Display; import com.android.settings.R; import com.android.settings.search.BaseSearchIndexProvider; -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; -import java.util.ArrayList; -import java.util.List; - /** * Preference fragment used to control screen zoom. */ @@ -121,18 +115,8 @@ public class ScreenZoomSettings extends PreviewSeekBarPreferenceFragment { public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = new BaseSearchIndexProvider() { @Override - public List getRawDataToIndex(Context context, - boolean enabled) { - final Resources res = context.getResources(); - final SearchIndexableRaw data = new SearchIndexableRaw(context); - data.title = res.getString(R.string.screen_zoom_title); - data.key = "screen_zoom_settings"; - data.screenTitle = res.getString(R.string.screen_zoom_title); - data.keywords = res.getString(R.string.screen_zoom_keywords); - - final List result = new ArrayList<>(1); - result.add(data); - return result; + protected boolean isPageSearchEnabled(Context context) { + return false; } }; } diff --git a/src/com/android/settings/display/ToggleFontSizePreferenceFragment.java b/src/com/android/settings/display/ToggleFontSizePreferenceFragment.java index d024685686b..db4d899cbb4 100644 --- a/src/com/android/settings/display/ToggleFontSizePreferenceFragment.java +++ b/src/com/android/settings/display/ToggleFontSizePreferenceFragment.java @@ -27,13 +27,8 @@ import android.provider.Settings; import com.android.settings.R; import com.android.settings.search.BaseSearchIndexProvider; -import com.android.settingslib.search.Indexable; -import com.android.settingslib.search.SearchIndexableRaw; import com.android.settingslib.search.SearchIndexable; -import java.util.ArrayList; -import java.util.List; - /** * Preference fragment used to control font size. */ @@ -118,16 +113,8 @@ public class ToggleFontSizePreferenceFragment extends PreviewSeekBarPreferenceFr public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = new BaseSearchIndexProvider() { @Override - public List getRawDataToIndex(Context context, - boolean enabled) { - final ArrayList result = new ArrayList<>(); - final SearchIndexableRaw data = new SearchIndexableRaw(context); - data.title = context.getString(R.string.title_font_size); - data.screenTitle = context.getString(R.string.title_font_size); - data.key = "font_size_setting_screen"; - data.keywords = context.getString(R.string.keywords_display_font_size); - result.add(data); - return result; + protected boolean isPageSearchEnabled(Context context) { + return false; } }; diff --git a/src/com/android/settings/enterprise/ManageDeviceAdminPreferenceController.java b/src/com/android/settings/enterprise/ManageDeviceAdminPreferenceController.java index 1b88e385830..00d17f17832 100644 --- a/src/com/android/settings/enterprise/ManageDeviceAdminPreferenceController.java +++ b/src/com/android/settings/enterprise/ManageDeviceAdminPreferenceController.java @@ -43,8 +43,7 @@ public class ManageDeviceAdminPreferenceController extends BasePreferenceControl @Override public int getAvailabilityStatus() { return mContext.getResources().getBoolean(R.bool.config_show_manage_device_admin) - ? AVAILABLE_UNSEARCHABLE - : UNSUPPORTED_ON_DEVICE; + ? AVAILABLE : UNSUPPORTED_ON_DEVICE; } } diff --git a/src/com/android/settings/fuelgauge/TopLevelBatteryPreferenceController.java b/src/com/android/settings/fuelgauge/TopLevelBatteryPreferenceController.java index f6182f661e9..88fd1ceeb67 100644 --- a/src/com/android/settings/fuelgauge/TopLevelBatteryPreferenceController.java +++ b/src/com/android/settings/fuelgauge/TopLevelBatteryPreferenceController.java @@ -48,8 +48,7 @@ public class TopLevelBatteryPreferenceController extends BasePreferenceControlle @Override public int getAvailabilityStatus() { return mContext.getResources().getBoolean(R.bool.config_show_top_level_battery) - ? AVAILABLE_UNSEARCHABLE - : UNSUPPORTED_ON_DEVICE; + ? AVAILABLE : UNSUPPORTED_ON_DEVICE; } @Override diff --git a/src/com/android/settings/gestures/GestureSettings.java b/src/com/android/settings/gestures/GestureSettings.java index 763efaf9f17..76964e5e000 100644 --- a/src/com/android/settings/gestures/GestureSettings.java +++ b/src/com/android/settings/gestures/GestureSettings.java @@ -19,16 +19,12 @@ package com.android.settings.gestures; import android.app.settings.SettingsEnums; import android.content.Context; import android.hardware.display.AmbientDisplayConfiguration; -import android.provider.SearchIndexableResource; import com.android.settings.R; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.search.BaseSearchIndexProvider; import com.android.settingslib.search.SearchIndexable; -import java.util.Arrays; -import java.util.List; - @SearchIndexable public class GestureSettings extends DashboardFragment { @@ -67,20 +63,5 @@ public class GestureSettings extends DashboardFragment { } public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = - new BaseSearchIndexProvider() { - @Override - public List getXmlResourcesToIndex( - Context context, boolean enabled) { - final SearchIndexableResource sir = new SearchIndexableResource(context); - sir.xmlResId = R.xml.gestures; - return Arrays.asList(sir); - } - - @Override - protected boolean isPageSearchEnabled(Context context) { - // All rows in this screen can lead to a different page, so suppress everything - // from this page to remove duplicates. - return false; - } - }; + new BaseSearchIndexProvider(R.xml.gestures); } diff --git a/src/com/android/settings/gestures/PreventRingingParentPreferenceController.java b/src/com/android/settings/gestures/PreventRingingParentPreferenceController.java index afb34315260..7c7be096841 100644 --- a/src/com/android/settings/gestures/PreventRingingParentPreferenceController.java +++ b/src/com/android/settings/gestures/PreventRingingParentPreferenceController.java @@ -38,7 +38,7 @@ public class PreventRingingParentPreferenceController extends BasePreferenceCont public int getAvailabilityStatus() { return mContext.getResources().getBoolean( com.android.internal.R.bool.config_volumeHushGestureEnabled) - ? AVAILABLE_UNSEARCHABLE : UNSUPPORTED_ON_DEVICE; + ? AVAILABLE : UNSUPPORTED_ON_DEVICE; } @Override diff --git a/src/com/android/settings/homepage/TopLevelSettings.java b/src/com/android/settings/homepage/TopLevelSettings.java index 8a7f4bdf43f..e27e288716b 100644 --- a/src/com/android/settings/homepage/TopLevelSettings.java +++ b/src/com/android/settings/homepage/TopLevelSettings.java @@ -100,12 +100,5 @@ public class TopLevelSettings extends DashboardFragment implements } public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = - new BaseSearchIndexProvider(R.xml.top_level_settings) { - - @Override - protected boolean isPageSearchEnabled(Context context) { - // Never searchable, all entries in this page are already indexed elsewhere. - return false; - } - }; + new BaseSearchIndexProvider(R.xml.top_level_settings); } diff --git a/src/com/android/settings/inputmethod/InputMethodPreferenceController.java b/src/com/android/settings/inputmethod/InputMethodPreferenceController.java index 5c5d0fb0e0b..1b1103870b5 100644 --- a/src/com/android/settings/inputmethod/InputMethodPreferenceController.java +++ b/src/com/android/settings/inputmethod/InputMethodPreferenceController.java @@ -30,10 +30,11 @@ import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnStart; import com.android.settingslib.inputmethod.InputMethodPreference; +import com.google.common.annotations.VisibleForTesting; + import java.text.Collator; import java.util.ArrayList; import java.util.List; -import com.google.common.annotations.VisibleForTesting; public class InputMethodPreferenceController extends BasePreferenceController implements LifecycleObserver, OnStart { @@ -52,7 +53,7 @@ public class InputMethodPreferenceController extends BasePreferenceController im @Override public int getAvailabilityStatus() { - return AVAILABLE_UNSEARCHABLE; + return AVAILABLE; } @Override diff --git a/src/com/android/settings/language/TtsPreferenceController.java b/src/com/android/settings/language/TtsPreferenceController.java index 7e34175ce99..6507785cda3 100644 --- a/src/com/android/settings/language/TtsPreferenceController.java +++ b/src/com/android/settings/language/TtsPreferenceController.java @@ -38,7 +38,6 @@ public class TtsPreferenceController extends BasePreferenceController { public int getAvailabilityStatus() { return !mTtsEngines.getEngines().isEmpty() && mContext.getResources().getBoolean(R.bool.config_show_tts_settings_summary) - ? AVAILABLE_UNSEARCHABLE - : CONDITIONALLY_UNAVAILABLE; + ? AVAILABLE : CONDITIONALLY_UNAVAILABLE; } } diff --git a/src/com/android/settings/language/UserDictionaryPreferenceController.java b/src/com/android/settings/language/UserDictionaryPreferenceController.java index d7829c612b2..27c47ed9b99 100644 --- a/src/com/android/settings/language/UserDictionaryPreferenceController.java +++ b/src/com/android/settings/language/UserDictionaryPreferenceController.java @@ -37,7 +37,7 @@ public class UserDictionaryPreferenceController extends BasePreferenceController @Override public int getAvailabilityStatus() { - return AVAILABLE_UNSEARCHABLE; + return AVAILABLE; } @Override diff --git a/src/com/android/settings/network/TopLevelNetworkEntryPreferenceController.java b/src/com/android/settings/network/TopLevelNetworkEntryPreferenceController.java index 11367367f72..f2e1312f0df 100644 --- a/src/com/android/settings/network/TopLevelNetworkEntryPreferenceController.java +++ b/src/com/android/settings/network/TopLevelNetworkEntryPreferenceController.java @@ -46,7 +46,7 @@ public class TopLevelNetworkEntryPreferenceController extends BasePreferenceCont @Override public int getAvailabilityStatus() { - return Utils.isDemoUser(mContext) ? UNSUPPORTED_ON_DEVICE : AVAILABLE_UNSEARCHABLE; + return Utils.isDemoUser(mContext) ? UNSUPPORTED_ON_DEVICE : AVAILABLE; } @Override diff --git a/src/com/android/settings/security/TopLevelSecurityEntryPreferenceController.java b/src/com/android/settings/security/TopLevelSecurityEntryPreferenceController.java index 4b004240685..4a4d34511da 100644 --- a/src/com/android/settings/security/TopLevelSecurityEntryPreferenceController.java +++ b/src/com/android/settings/security/TopLevelSecurityEntryPreferenceController.java @@ -32,7 +32,7 @@ public class TopLevelSecurityEntryPreferenceController extends BasePreferenceCon @Override public int getAvailabilityStatus() { - return AVAILABLE_UNSEARCHABLE; + return AVAILABLE; } @Override diff --git a/src/com/android/settings/security/screenlock/LockScreenPreferenceController.java b/src/com/android/settings/security/screenlock/LockScreenPreferenceController.java index 8cf0825d03c..85854930dd1 100644 --- a/src/com/android/settings/security/screenlock/LockScreenPreferenceController.java +++ b/src/com/android/settings/security/screenlock/LockScreenPreferenceController.java @@ -50,7 +50,7 @@ public class LockScreenPreferenceController extends BasePreferenceController imp @Override public int getAvailabilityStatus() { - return AVAILABLE_UNSEARCHABLE; + return AVAILABLE; } @Override diff --git a/src/com/android/settings/system/ResetPreferenceController.java b/src/com/android/settings/system/ResetPreferenceController.java index bbb5323ae62..09db32febb5 100644 --- a/src/com/android/settings/system/ResetPreferenceController.java +++ b/src/com/android/settings/system/ResetPreferenceController.java @@ -38,8 +38,7 @@ public class ResetPreferenceController extends BasePreferenceController { @Override public int getAvailabilityStatus() { return mContext.getResources().getBoolean(R.bool.config_show_reset_dashboard) - ? AVAILABLE_UNSEARCHABLE - : UNSUPPORTED_ON_DEVICE; + ? AVAILABLE : UNSUPPORTED_ON_DEVICE; } @Override diff --git a/src/com/android/settings/wfd/WifiDisplayPreferenceController.java b/src/com/android/settings/wfd/WifiDisplayPreferenceController.java index 32273878b79..a83a56b5945 100644 --- a/src/com/android/settings/wfd/WifiDisplayPreferenceController.java +++ b/src/com/android/settings/wfd/WifiDisplayPreferenceController.java @@ -69,8 +69,7 @@ public class WifiDisplayPreferenceController extends BasePreferenceController im @Override public int getAvailabilityStatus() { - return WifiDisplaySettings.isAvailable(mContext) ? AVAILABLE_UNSEARCHABLE - : UNSUPPORTED_ON_DEVICE; + return WifiDisplaySettings.isAvailable(mContext) ? AVAILABLE : UNSUPPORTED_ON_DEVICE; } @Override @@ -104,4 +103,4 @@ public class WifiDisplayPreferenceController extends BasePreferenceController im public void onStop() { mRouter.removeCallback(mRouterCallback); } -} \ No newline at end of file +} diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java index 488aadbafb7..5b8bbe34e03 100644 --- a/src/com/android/settings/wifi/WifiSettings.java +++ b/src/com/android/settings/wifi/WifiSettings.java @@ -27,7 +27,6 @@ import android.content.ContentResolver; import android.content.Context; import android.content.DialogInterface; import android.content.Intent; -import android.content.res.Resources; import android.net.ConnectivityManager; import android.net.Network; import android.net.NetworkInfo; @@ -73,7 +72,6 @@ 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; @@ -81,7 +79,6 @@ import com.android.settingslib.wifi.WifiSavedConfigUtils; import com.android.settingslib.wifi.WifiTracker; import com.android.settingslib.wifi.WifiTrackerFactory; -import java.util.ArrayList; import java.util.List; /** @@ -193,9 +190,6 @@ public class WifiSettings extends RestrictedSettingsFragment DataUsagePreference mDataUsagePreference; private LinkablePreference mStatusMessagePreference; - // For Search - public static final String DATA_KEY_REFERENCE = "main_toggle_wifi"; - /** * Tracks whether the user initiated a connection via clicking in order to autoscroll to the * network once connected. @@ -1243,24 +1237,6 @@ public class WifiSettings extends RestrictedSettingsFragment public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = new BaseSearchIndexProvider(R.xml.wifi_settings) { - @Override - public List getRawDataToIndex(Context context, - boolean enabled) { - final List result = new ArrayList<>(); - final Resources res = context.getResources(); - - // Add fragment title if we are showing this fragment - if (res.getBoolean(R.bool.config_show_wifi_settings)) { - SearchIndexableRaw data = new SearchIndexableRaw(context); - data.title = res.getString(R.string.wifi_settings); - data.screenTitle = res.getString(R.string.wifi_settings); - data.keywords = res.getString(R.string.keywords_wifi); - data.key = DATA_KEY_REFERENCE; - result.add(data); - } - return result; - } - @Override public List getNonIndexableKeys(Context context) { final List keys = super.getNonIndexableKeys(context); diff --git a/src/com/android/settings/wifi/WifiSettings2.java b/src/com/android/settings/wifi/WifiSettings2.java index 932f5d9177c..d21cec0fe4b 100644 --- a/src/com/android/settings/wifi/WifiSettings2.java +++ b/src/com/android/settings/wifi/WifiSettings2.java @@ -25,7 +25,6 @@ import android.content.ContentResolver; import android.content.Context; import android.content.DialogInterface; import android.content.Intent; -import android.content.res.Resources; import android.net.ConnectivityManager; import android.net.NetworkScoreManager; import android.net.NetworkTemplate; @@ -73,7 +72,6 @@ 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.LongPressWifiEntryPreference; import com.android.wifitrackerlib.WifiEntry; import com.android.wifitrackerlib.WifiEntry.ConnectCallback; @@ -81,7 +79,6 @@ import com.android.wifitrackerlib.WifiPickerTracker; import java.time.Clock; import java.time.ZoneOffset; -import java.util.ArrayList; import java.util.List; import java.util.Optional; @@ -198,9 +195,6 @@ public class WifiSettings2 extends RestrictedSettingsFragment DataUsagePreference mDataUsagePreference; private LinkablePreference mStatusMessagePreference; - // For Search - public static final String DATA_KEY_REFERENCE = "main_toggle_wifi"; - /** * Tracks whether the user initiated a connection via clicking in order to autoscroll to the * network once connected. @@ -1019,26 +1013,7 @@ public class WifiSettings2 extends RestrictedSettingsFragment }; public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = - new BaseSearchIndexProvider() { - @Override - public List getRawDataToIndex(Context context, - boolean enabled) { - final List result = new ArrayList<>(); - final Resources res = context.getResources(); - - // Add fragment title if we are showing this fragment - if (res.getBoolean(R.bool.config_show_wifi_settings)) { - SearchIndexableRaw data = new SearchIndexableRaw(context); - data.title = res.getString(R.string.wifi_settings); - data.screenTitle = res.getString(R.string.wifi_settings); - data.keywords = res.getString(R.string.keywords_wifi); - data.key = DATA_KEY_REFERENCE; - result.add(data); - } - - return result; - } - }; + new BaseSearchIndexProvider(R.xml.wifi_settings2); private class WifiEntryConnectCallback implements ConnectCallback { final WifiEntry mConnectWifiEntry; diff --git a/tests/robotests/src/com/android/settings/accessibility/AutoclickPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/AutoclickPreferenceControllerTest.java index b8be23efff0..d670ee8e785 100644 --- a/tests/robotests/src/com/android/settings/accessibility/AutoclickPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/AutoclickPreferenceControllerTest.java @@ -46,7 +46,7 @@ public class AutoclickPreferenceControllerTest { @Test public void getAvailabilityStatus_shouldReturnAvailableUnsearchable() { assertThat(mController.getAvailabilityStatus()) - .isEqualTo(BasePreferenceController.AVAILABLE_UNSEARCHABLE); + .isEqualTo(BasePreferenceController.AVAILABLE); } @Test diff --git a/tests/robotests/src/com/android/settings/accessibility/TopLevelAccessibilityPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/TopLevelAccessibilityPreferenceControllerTest.java index 809d8b454a2..3acc02c4c18 100644 --- a/tests/robotests/src/com/android/settings/accessibility/TopLevelAccessibilityPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/TopLevelAccessibilityPreferenceControllerTest.java @@ -16,23 +16,19 @@ package com.android.settings.accessibility; -import static com.android.settings.core.BasePreferenceController.AVAILABLE_UNSEARCHABLE; +import static com.android.settings.core.BasePreferenceController.AVAILABLE; import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE; import static com.google.common.truth.Truth.assertThat; import android.content.Context; -import com.android.settings.R; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -import org.robolectric.annotation.Implementation; -import org.robolectric.annotation.Implements; @RunWith(RobolectricTestRunner.class) public class TopLevelAccessibilityPreferenceControllerTest { @@ -48,7 +44,7 @@ public class TopLevelAccessibilityPreferenceControllerTest { @Test public void getAvailibilityStatus_availableByDefault() { - assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE_UNSEARCHABLE); + assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE); } @Test diff --git a/tests/robotests/src/com/android/settings/applications/SpecialAppAccessPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/SpecialAppAccessPreferenceControllerTest.java index 75302d837c3..00d3cb119fe 100644 --- a/tests/robotests/src/com/android/settings/applications/SpecialAppAccessPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/SpecialAppAccessPreferenceControllerTest.java @@ -16,7 +16,7 @@ package com.android.settings.applications; -import static com.android.settings.core.BasePreferenceController.AVAILABLE_UNSEARCHABLE; +import static com.android.settings.core.BasePreferenceController.AVAILABLE; import static com.google.common.truth.Truth.assertThat; @@ -83,7 +83,7 @@ public class SpecialAppAccessPreferenceControllerTest { @Test public void getAvailabilityState_unsearchable() { - assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE_UNSEARCHABLE); + assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE); } @Test diff --git a/tests/robotests/src/com/android/settings/applications/specialaccess/premiumsms/PremiumSmsControllerTest.java b/tests/robotests/src/com/android/settings/applications/specialaccess/premiumsms/PremiumSmsControllerTest.java index 0607e58985c..4c4acc719ad 100644 --- a/tests/robotests/src/com/android/settings/applications/specialaccess/premiumsms/PremiumSmsControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/specialaccess/premiumsms/PremiumSmsControllerTest.java @@ -16,7 +16,7 @@ package com.android.settings.applications.specialaccess.premiumsms; -import static com.android.settings.core.BasePreferenceController.AVAILABLE_UNSEARCHABLE; +import static com.android.settings.core.BasePreferenceController.AVAILABLE; import static com.google.common.truth.Truth.assertThat; @@ -47,7 +47,7 @@ public class PremiumSmsControllerTest { @Test public void getAvailability_byDefault_shouldBeShown() { - assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE_UNSEARCHABLE); + assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE); } @Test diff --git a/tests/robotests/src/com/android/settings/applications/specialaccess/vrlistener/EnabledVrListenersControllerTest.java b/tests/robotests/src/com/android/settings/applications/specialaccess/vrlistener/EnabledVrListenersControllerTest.java index 32b18efafe2..5f102a01cbf 100644 --- a/tests/robotests/src/com/android/settings/applications/specialaccess/vrlistener/EnabledVrListenersControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/specialaccess/vrlistener/EnabledVrListenersControllerTest.java @@ -16,7 +16,7 @@ package com.android.settings.applications.specialaccess.vrlistener; -import static com.android.settings.core.BasePreferenceController.AVAILABLE_UNSEARCHABLE; +import static com.android.settings.core.BasePreferenceController.AVAILABLE; import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE; import static com.google.common.truth.Truth.assertThat; @@ -48,7 +48,7 @@ public class EnabledVrListenersControllerTest { @Test public void getAvailability_byDefault_unsearchable() { - assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE_UNSEARCHABLE); + assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE); } @Test diff --git a/tests/robotests/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceDashboardFragmentTest.java index 3fa0e4d9aa7..d6bcb127667 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceDashboardFragmentTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceDashboardFragmentTest.java @@ -16,6 +16,7 @@ package com.android.settings.connecteddevice; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; @@ -23,6 +24,7 @@ import android.content.Context; import android.nfc.NfcAdapter; import android.provider.SearchIndexableResource; +import com.android.settings.nfc.AndroidBeamPreferenceController; import com.android.settings.testutils.shadow.ShadowConnectivityManager; import com.android.settings.testutils.shadow.ShadowUserManager; import com.android.settingslib.drawer.CategoryKey; @@ -85,6 +87,6 @@ public class AdvancedConnectedDeviceDashboardFragmentTest { AdvancedConnectedDeviceDashboardFragment.SEARCH_INDEX_DATA_PROVIDER .getNonIndexableKeys(context); - assertThat(niks).contains(AdvancedConnectedDeviceDashboardFragment.KEY_BLUETOOTH); + assertThat(niks).contains(AndroidBeamPreferenceController.KEY_ANDROID_BEAM_SETTINGS); } } \ No newline at end of file diff --git a/tests/robotests/src/com/android/settings/connecteddevice/BluetoothDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/connecteddevice/BluetoothDashboardFragmentTest.java deleted file mode 100644 index ed944cf2cd9..00000000000 --- a/tests/robotests/src/com/android/settings/connecteddevice/BluetoothDashboardFragmentTest.java +++ /dev/null @@ -1,57 +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.connecteddevice; - -import static com.google.common.truth.Truth.assertThat; - -import android.content.Context; -import android.text.TextUtils; - -import com.android.settings.R; -import com.android.settingslib.search.SearchIndexableRaw; - -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.robolectric.RobolectricTestRunner; -import org.robolectric.RuntimeEnvironment; - -import java.util.List; - -@RunWith(RobolectricTestRunner.class) -public class BluetoothDashboardFragmentTest { - - private Context mContext; - - @Before - public void setUp() { - mContext = RuntimeEnvironment.application; - } - - @Test - public void rawData_includesFragmentResult() { - final List rawList = - BluetoothDashboardFragment.SEARCH_INDEX_DATA_PROVIDER.getRawDataToIndex(mContext, - true /* enabled */); - - final SearchIndexableRaw fragmentResult = rawList.stream().filter( - raw -> TextUtils.equals(raw.title, - mContext.getString(R.string.bluetooth_settings))).findFirst().get(); - - assertThat(fragmentResult).isNotNull(); - } -} diff --git a/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragmentTest.java index 778bb79c5b2..c4f15874503 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragmentTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragmentTest.java @@ -52,6 +52,7 @@ import java.util.List; public class ConnectedDeviceDashboardFragmentTest { private static final String KEY_NEARBY_DEVICES = "bt_nearby_slice"; private static final String KEY_DISCOVERABLE_FOOTER = "discoverable_footer"; + private static final String KEY_SEE_ALL = "previously_connected_devices_see_all"; @Mock private PackageManager mPackageManager; @@ -82,7 +83,7 @@ public class ConnectedDeviceDashboardFragmentTest { .getNonIndexableKeys(mContext); assertThat(niks).containsExactly(KEY_CONNECTED_DEVICES, KEY_AVAILABLE_DEVICES, - KEY_NEARBY_DEVICES, KEY_DISCOVERABLE_FOOTER); + KEY_NEARBY_DEVICES, KEY_DISCOVERABLE_FOOTER, KEY_SEE_ALL); } @Test diff --git a/tests/robotests/src/com/android/settings/connecteddevice/TopLevelConnectedDevicesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/TopLevelConnectedDevicesPreferenceControllerTest.java index ab733701cdf..14fe4bd19e6 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/TopLevelConnectedDevicesPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/TopLevelConnectedDevicesPreferenceControllerTest.java @@ -16,7 +16,7 @@ package com.android.settings.connecteddevice; -import static com.android.settings.core.BasePreferenceController.AVAILABLE_UNSEARCHABLE; +import static com.android.settings.core.BasePreferenceController.AVAILABLE; import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE; import static com.google.common.truth.Truth.assertThat; @@ -48,7 +48,7 @@ public class TopLevelConnectedDevicesPreferenceControllerTest { @Test public void getAvailibilityStatus_availableByDefault() { - assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE_UNSEARCHABLE); + assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE); } @Test diff --git a/tests/robotests/src/com/android/settings/core/PreferenceXmlParserUtilsTest.java b/tests/robotests/src/com/android/settings/core/PreferenceXmlParserUtilsTest.java index 9ad6a7b9af0..41e1ab181e9 100644 --- a/tests/robotests/src/com/android/settings/core/PreferenceXmlParserUtilsTest.java +++ b/tests/robotests/src/com/android/settings/core/PreferenceXmlParserUtilsTest.java @@ -76,10 +76,11 @@ public class PreferenceXmlParserUtilsTest { @Test public void testDataKeywordsValid_ReturnsPreferenceKeywords() { - XmlResourceParser parser = getParentPrimedParser(R.xml.display_settings); + XmlResourceParser parser = getChildByType(R.xml.display_settings, + "com.android.settings.display.TimeoutListPreference"); final AttributeSet attrs = Xml.asAttributeSet(parser); String keywords = PreferenceXmlParserUtils.getDataKeywords(mContext, attrs); - String expKeywords = mContext.getString(R.string.keywords_display); + String expKeywords = mContext.getString(R.string.keywords_screen_timeout); assertThat(keywords).isEqualTo(expKeywords); } diff --git a/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionPreferenceControllerTest.java index 77ae4e2589b..d000c912b9f 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionPreferenceControllerTest.java @@ -58,7 +58,7 @@ public class FirmwareVersionPreferenceControllerTest { @Test public void firmwareVersion_shouldAlwaysBeShown() { assertThat(mController.getAvailabilityStatus()) - .isEqualTo(BasePreferenceController.AVAILABLE_UNSEARCHABLE); + .isEqualTo(BasePreferenceController.AVAILABLE); } @Test diff --git a/tests/robotests/src/com/android/settings/deviceinfo/hardwareinfo/HardwareInfoPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/hardwareinfo/HardwareInfoPreferenceControllerTest.java index 413c4921bbd..291f6e28fe8 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/hardwareinfo/HardwareInfoPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/hardwareinfo/HardwareInfoPreferenceControllerTest.java @@ -61,7 +61,7 @@ public class HardwareInfoPreferenceControllerTest { @Test public void isAvailable_returnTrueIfVisible() { assertThat(mController.getAvailabilityStatus()).isEqualTo( - BasePreferenceController.AVAILABLE_UNSEARCHABLE); + BasePreferenceController.AVAILABLE); } @Test diff --git a/tests/robotests/src/com/android/settings/display/FontSizePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/FontSizePreferenceControllerTest.java index 888b711efc5..58e7ccd564b 100644 --- a/tests/robotests/src/com/android/settings/display/FontSizePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/FontSizePreferenceControllerTest.java @@ -49,7 +49,7 @@ public class FontSizePreferenceControllerTest { @Test public void isAlwaysAvailable() { assertThat(mController.getAvailabilityStatus()) - .isEqualTo(BasePreferenceController.AVAILABLE_UNSEARCHABLE); + .isEqualTo(BasePreferenceController.AVAILABLE); } @Test diff --git a/tests/robotests/src/com/android/settings/fuelgauge/TopLevelBatteryPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/TopLevelBatteryPreferenceControllerTest.java index 58ed6b46d73..37758029bc9 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/TopLevelBatteryPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/TopLevelBatteryPreferenceControllerTest.java @@ -16,7 +16,7 @@ package com.android.settings.fuelgauge; -import static com.android.settings.core.BasePreferenceController.AVAILABLE_UNSEARCHABLE; +import static com.android.settings.core.BasePreferenceController.AVAILABLE; import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE; import static com.android.settings.fuelgauge.TopLevelBatteryPreferenceController.getDashboardLabel; @@ -27,9 +27,9 @@ import android.content.Context; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.annotation.Config; import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; +import org.robolectric.annotation.Config; @RunWith(RobolectricTestRunner.class) public class TopLevelBatteryPreferenceControllerTest { @@ -44,7 +44,7 @@ public class TopLevelBatteryPreferenceControllerTest { @Test public void getAvailibilityStatus_availableByDefault() { - assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE_UNSEARCHABLE); + assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE); } @Test diff --git a/tests/robotests/src/com/android/settings/gestures/AssistGestureSettingsTest.java b/tests/robotests/src/com/android/settings/gestures/AssistGestureSettingsTest.java index d6c6a1f8f5f..17db208f787 100644 --- a/tests/robotests/src/com/android/settings/gestures/AssistGestureSettingsTest.java +++ b/tests/robotests/src/com/android/settings/gestures/AssistGestureSettingsTest.java @@ -72,6 +72,6 @@ public class AssistGestureSettingsTest { assertThat(AssistGestureSettings.SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys( RuntimeEnvironment.application)) - .contains("gesture_assist_settings_page"); + .isNotEmpty(); } } diff --git a/tests/robotests/src/com/android/settings/gestures/PreventRingingParentPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/PreventRingingParentPreferenceControllerTest.java index 07716859a19..c752eb98232 100644 --- a/tests/robotests/src/com/android/settings/gestures/PreventRingingParentPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/gestures/PreventRingingParentPreferenceControllerTest.java @@ -21,7 +21,7 @@ import static android.provider.Settings.Secure.VOLUME_HUSH_MUTE; import static android.provider.Settings.Secure.VOLUME_HUSH_OFF; import static android.provider.Settings.Secure.VOLUME_HUSH_VIBRATE; -import static com.android.settings.core.BasePreferenceController.AVAILABLE_UNSEARCHABLE; +import static com.android.settings.core.BasePreferenceController.AVAILABLE; import static com.google.common.truth.Truth.assertThat; @@ -64,7 +64,7 @@ public class PreventRingingParentPreferenceControllerTest { when(mResources.getBoolean( com.android.internal.R.bool.config_volumeHushGestureEnabled)).thenReturn(true); - assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE_UNSEARCHABLE); + assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE); } @Test diff --git a/tests/robotests/src/com/android/settings/nfc/PaymentSettingsTest.java b/tests/robotests/src/com/android/settings/nfc/PaymentSettingsTest.java index 513da65e3cb..525f3efd3b8 100644 --- a/tests/robotests/src/com/android/settings/nfc/PaymentSettingsTest.java +++ b/tests/robotests/src/com/android/settings/nfc/PaymentSettingsTest.java @@ -53,7 +53,6 @@ public class PaymentSettingsTest { static final String PAYMENT_KEY = "nfc_payment"; static final String FOREGROUND_KEY = "nfc_foreground"; - static final String PAYMENT_SCREEN_KEY = "nfc_payment_settings_screen"; private Context mContext; @@ -107,14 +106,14 @@ public class PaymentSettingsTest { } @Test - public void getNonIndexabkeKey_guestUser_returnsFalse() { + public void getNonIndexableKey_guestUser_returnsFalse() { when(mPackageManager.hasSystemFeature(PackageManager.FEATURE_NFC)).thenReturn(true); when(mUserInfo.isGuest()).thenReturn(true); final List niks = PaymentSettings.SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(mContext); - assertThat(niks).containsAllOf(FOREGROUND_KEY, PAYMENT_KEY, PAYMENT_SCREEN_KEY); + assertThat(niks).containsAllOf(FOREGROUND_KEY, PAYMENT_KEY); } @Test diff --git a/tests/robotests/src/com/android/settings/security/InstallCertificateFromStorageTest.java b/tests/robotests/src/com/android/settings/security/InstallCertificateFromStorageTest.java index 03bdb088809..8484ebf3656 100644 --- a/tests/robotests/src/com/android/settings/security/InstallCertificateFromStorageTest.java +++ b/tests/robotests/src/com/android/settings/security/InstallCertificateFromStorageTest.java @@ -62,7 +62,6 @@ public class InstallCertificateFromStorageTest { private void setUpTestKeys() { mTestKeys = new ArrayList<>(); - mTestKeys.add("install_certificate_from_storage"); mTestKeys.add("certificate_types"); mTestKeys.add("install_ca_certificate"); mTestKeys.add("install_user_certificate"); diff --git a/tests/robotests/src/com/android/settings/security/screenlock/LockScreenPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/screenlock/LockScreenPreferenceControllerTest.java index 36eadbac60a..17bef3c4e95 100644 --- a/tests/robotests/src/com/android/settings/security/screenlock/LockScreenPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/security/screenlock/LockScreenPreferenceControllerTest.java @@ -21,7 +21,7 @@ import static android.app.admin.DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED import static androidx.lifecycle.Lifecycle.Event.ON_RESUME; -import static com.android.settings.core.BasePreferenceController.AVAILABLE_UNSEARCHABLE; +import static com.android.settings.core.BasePreferenceController.AVAILABLE; import static com.google.common.truth.Truth.assertThat; @@ -90,7 +90,7 @@ public class LockScreenPreferenceControllerTest { when(mLockPatternUtils.isSecure(anyInt())).thenReturn(false); when(mLockPatternUtils.isLockScreenDisabled(anyInt())).thenReturn(true); - assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE_UNSEARCHABLE); + assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE); } @Test @@ -98,7 +98,7 @@ public class LockScreenPreferenceControllerTest { when(mLockPatternUtils.isSecure(anyInt())).thenReturn(false); when(mLockPatternUtils.isLockScreenDisabled(anyInt())).thenReturn(false); - assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE_UNSEARCHABLE); + assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE); } @Test @@ -107,7 +107,7 @@ public class LockScreenPreferenceControllerTest { when(mLockPatternUtils.getKeyguardStoredPasswordQuality(anyInt())) .thenReturn(PASSWORD_QUALITY_ALPHABETIC); - assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE_UNSEARCHABLE); + assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE); } @Test @@ -116,7 +116,7 @@ public class LockScreenPreferenceControllerTest { when(mLockPatternUtils.getKeyguardStoredPasswordQuality(anyInt())) .thenReturn(PASSWORD_QUALITY_UNSPECIFIED); - assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE_UNSEARCHABLE); + assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE); } @Test diff --git a/tests/robotests/src/com/android/settings/wifi/WifiSettings2Test.java b/tests/robotests/src/com/android/settings/wifi/WifiSettings2Test.java index eb4f3269ddf..320d767dcd1 100644 --- a/tests/robotests/src/com/android/settings/wifi/WifiSettings2Test.java +++ b/tests/robotests/src/com/android/settings/wifi/WifiSettings2Test.java @@ -49,7 +49,6 @@ import com.android.settings.R; import com.android.settings.datausage.DataUsagePreference; 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.LongPressWifiEntryPreference; import com.android.wifitrackerlib.WifiEntry; import com.android.wifitrackerlib.WifiPickerTracker; @@ -64,8 +63,6 @@ import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -import java.util.List; - @RunWith(RobolectricTestRunner.class) public class WifiSettings2Test { @@ -94,26 +91,6 @@ public class WifiSettings2Test { mWifiSettings2.mWifiPickerTracker = mMockWifiPickerTracker; } - @Test - public void testSearchIndexProvider_shouldIndexFragmentTitle() { - final List indexRes = - WifiSettings.SEARCH_INDEX_DATA_PROVIDER.getRawDataToIndex(mContext, - true /* enabled */); - - assertThat(indexRes).isNotNull(); - assertThat(indexRes.get(0).key).isEqualTo(WifiSettings.DATA_KEY_REFERENCE); - } - - @Test - @Config(qualifiers = "mcc999") - public void testSearchIndexProvider_ifWifiSettingsNotVisible_shouldNotIndexFragmentTitle() { - final List indexRes = - WifiSettings.SEARCH_INDEX_DATA_PROVIDER.getRawDataToIndex(mContext, - true /* enabled */); - - assertThat(indexRes).isEmpty(); - } - @Test public void addNetworkFragmentSendResult_onActivityResult_shouldHandleEvent() { final WifiSettings wifiSettings = spy(new WifiSettings()); diff --git a/tests/robotests/src/com/android/settings/wifi/WifiSettingsTest.java b/tests/robotests/src/com/android/settings/wifi/WifiSettingsTest.java index 2fe7c5ca1b4..5145cc15fc9 100644 --- a/tests/robotests/src/com/android/settings/wifi/WifiSettingsTest.java +++ b/tests/robotests/src/com/android/settings/wifi/WifiSettingsTest.java @@ -52,7 +52,6 @@ import com.android.settings.R; import com.android.settings.datausage.DataUsagePreference; 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; @@ -99,26 +98,6 @@ public class WifiSettingsTest { mWifiSettings.mWifiManager = mWifiManager; } - @Test - public void testSearchIndexProvider_shouldIndexFragmentTitle() { - final List indexRes = - WifiSettings.SEARCH_INDEX_DATA_PROVIDER.getRawDataToIndex(mContext, - true /* enabled */); - - assertThat(indexRes).isNotNull(); - assertThat(indexRes.get(0).key).isEqualTo(WifiSettings.DATA_KEY_REFERENCE); - } - - @Test - @Config(qualifiers = "mcc999") - public void testSearchIndexProvider_ifWifiSettingsNotVisible_shouldNotIndexFragmentTitle() { - final List indexRes = - WifiSettings.SEARCH_INDEX_DATA_PROVIDER.getRawDataToIndex(mContext, - true /* enabled */); - - assertThat(indexRes).isEmpty(); - } - @Test public void addNetworkFragmentSendResult_onActivityResult_shouldHandleEvent() { final WifiSettings wifiSettings = spy(new WifiSettings());