Merge "Migrate to CompoundButton" into main
diff --git a/res/xml/accessibility_audio_adjustment.xml b/res/xml/accessibility_audio_adjustment.xml
index c38b4ad..92e6d8d 100644
--- a/res/xml/accessibility_audio_adjustment.xml
+++ b/res/xml/accessibility_audio_adjustment.xml
@@ -21,7 +21,7 @@
android:persistent="false"
android:title="@string/accessibility_audio_adjustment_title">
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="toggle_primary_mono"
android:persistent="false"
android:summary="@string/accessibility_toggle_primary_mono_summary"
diff --git a/res/xml/accessibility_button_settings.xml b/res/xml/accessibility_button_settings.xml
index ab9fc41..2b1392d 100644
--- a/res/xml/accessibility_button_settings.xml
+++ b/res/xml/accessibility_button_settings.xml
@@ -56,7 +56,7 @@
android:title="@string/accessibility_button_size_title"
settings:controller="com.android.settings.accessibility.FloatingMenuSizePreferenceController" />
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="accessibility_button_fade"
android:persistent="false"
android:summary="@string/accessibility_button_fade_summary"
diff --git a/res/xml/accessibility_color_and_motion.xml b/res/xml/accessibility_color_and_motion.xml
index a313526..3b2e78d 100644
--- a/res/xml/accessibility_color_and_motion.xml
+++ b/res/xml/accessibility_color_and_motion.xml
@@ -49,7 +49,7 @@
settings:controller="com.android.settings.display.DarkUIPreferenceController"
settings:searchable="false"/>
- <SwitchPreference
+ <SwitchPreferenceCompat
android:icon="@drawable/ic_accessibility_animation"
android:key="toggle_disable_animations"
android:persistent="false"
@@ -57,7 +57,7 @@
android:title="@string/accessibility_disable_animations"
settings:controller="com.android.settings.accessibility.DisableAnimationsPreferenceController"/>
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="toggle_large_pointer_icon"
android:persistent="false"
android:summary="@string/accessibility_toggle_large_pointer_icon_summary"
diff --git a/res/xml/accessibility_hearing_aids.xml b/res/xml/accessibility_hearing_aids.xml
index b13eb74..20c8e29 100644
--- a/res/xml/accessibility_hearing_aids.xml
+++ b/res/xml/accessibility_hearing_aids.xml
@@ -53,7 +53,7 @@
android:fragment="com.android.settings.accessibility.AccessibilityAudioRoutingFragment"
settings:controller="com.android.settings.accessibility.HearingAidAudioRoutingPreferenceController"/>
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="hearing_aid_compatibility"
android:order="30"
android:title="@string/accessibility_hac_mode_title"
diff --git a/res/xml/accessibility_settings.xml b/res/xml/accessibility_settings.xml
index f90d8b6..0f4065b 100644
--- a/res/xml/accessibility_settings.xml
+++ b/res/xml/accessibility_settings.xml
@@ -141,7 +141,7 @@
android:persistent="false"
android:title="@string/audio_category_title">
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="toggle_audio_description"
android:persistent="false"
android:icon="@drawable/ic_audio_description"
diff --git a/res/xml/accessibility_shortcuts_settings.xml b/res/xml/accessibility_shortcuts_settings.xml
index 2863335..c807056 100644
--- a/res/xml/accessibility_shortcuts_settings.xml
+++ b/res/xml/accessibility_shortcuts_settings.xml
@@ -28,7 +28,7 @@
android:summary="@string/accessibility_button_summary"
settings:controller="com.android.settings.accessibility.AccessibilityButtonPreferenceController"/>
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="accessibility_shortcut_preference"
android:persistent="false"
android:title="@string/accessibility_shortcut_service_on_lock_screen_title"
diff --git a/res/xml/accessibility_system_controls.xml b/res/xml/accessibility_system_controls.xml
index 37c4d67..460214f 100644
--- a/res/xml/accessibility_system_controls.xml
+++ b/res/xml/accessibility_system_controls.xml
@@ -36,7 +36,7 @@
settings:searchable="false"
settings:controller="com.android.settings.gestures.OneHandedEnablePreferenceController"/>
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="toggle_power_button_ends_call_preference"
android:persistent="false"
android:title="@string/accessibility_power_button_ends_call_prerefence_title"
@@ -44,7 +44,7 @@
<!-- Standard auto-rotation preference that will be shown when device state based auto-rotation
settings are NOT available. -->
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="toggle_lock_screen_rotation_preference"
android:persistent="false"
android:title="@string/accelerometer_title"
diff --git a/res/xml/accessibility_text_reading_options.xml b/res/xml/accessibility_text_reading_options.xml
index 09954b3..0711a3f 100644
--- a/res/xml/accessibility_text_reading_options.xml
+++ b/res/xml/accessibility_text_reading_options.xml
@@ -45,7 +45,7 @@
settings:iconStartContentDescription="@string/screen_zoom_make_smaller_desc"
settings:keywords="@string/keywords_display_size" />
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="toggle_force_bold_text"
android:persistent="false"
android:title="@string/force_bold_text"
@@ -53,7 +53,7 @@
"com.android.settings.accessibility.FontWeightAdjustmentPreferenceController"
settings:keywords="@string/keywords_bold_text" />
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="toggle_high_text_contrast_preference"
android:persistent="false"
android:summary="@string/accessibility_toggle_high_text_contrast_preference_summary"
diff --git a/res/xml/accessibility_vibration_intensity_settings.xml b/res/xml/accessibility_vibration_intensity_settings.xml
index 13dc03b..f9a5578 100644
--- a/res/xml/accessibility_vibration_intensity_settings.xml
+++ b/res/xml/accessibility_vibration_intensity_settings.xml
@@ -35,7 +35,7 @@
app:keywords="@string/keywords_ring_vibration"
app:controller="com.android.settings.accessibility.RingVibrationIntensityPreferenceController" />
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="vibration_intensity_preference_ramping_ringer"
android:title="@string/vibrate_when_ringing_option_ramping_ringer"
app:keywords="@string/keywords_ramping_ringer_vibration"
@@ -77,7 +77,7 @@
app:keywords="@string/keywords_media_vibration"
app:controller="com.android.settings.accessibility.MediaVibrationIntensityPreferenceController" />
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="vibration_intensity_preference_keyboard"
android:title="@string/accessibility_keyboard_vibration_title"
app:keywords="@string/keywords_keyboard_vibration"
diff --git a/res/xml/accessibility_vibration_settings.xml b/res/xml/accessibility_vibration_settings.xml
index 0435cb4..3ce92a6 100644
--- a/res/xml/accessibility_vibration_settings.xml
+++ b/res/xml/accessibility_vibration_settings.xml
@@ -29,13 +29,13 @@
android:key="vibration_category_call"
android:title="@string/accessibility_call_vibration_category_title">
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="vibration_preference_ring"
android:title="@string/accessibility_ring_vibration_title"
app:keywords="@string/keywords_ring_vibration"
app:controller="com.android.settings.accessibility.RingVibrationTogglePreferenceController" />
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="vibration_preference_ramping_ringer"
android:title="@string/vibrate_when_ringing_option_ramping_ringer"
app:keywords="@string/keywords_ramping_ringer_vibration"
@@ -47,13 +47,13 @@
android:key="vibration_category_notification_alarm"
android:title="@string/accessibility_notification_alarm_vibration_category_title">
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="vibration_preference_notification"
android:title="@string/accessibility_notification_vibration_title"
app:keywords="@string/keywords_notification_vibration"
app:controller="com.android.settings.accessibility.NotificationVibrationTogglePreferenceController" />
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="vibration_preference_alarm"
android:title="@string/accessibility_alarm_vibration_title"
app:keywords="@string/keywords_alarm_vibration"
@@ -65,19 +65,19 @@
android:key="vibration_category_haptics"
android:title="@string/accessibility_interactive_haptics_category_title">
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="vibration_preference_touch"
android:title="@string/accessibility_touch_vibration_title"
app:keywords="@string/keywords_touch_vibration"
app:controller="com.android.settings.accessibility.HapticFeedbackTogglePreferenceController" />
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="vibration_preference_media"
android:title="@string/accessibility_media_vibration_title"
app:keywords="@string/keywords_media_vibration"
app:controller="com.android.settings.accessibility.MediaVibrationTogglePreferenceController" />
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="vibration_preference_keyboard"
android:title="@string/accessibility_keyboard_vibration_title"
app:keywords="@string/keywords_keyboard_vibration"
diff --git a/res/xml/accounts_dashboard_settings.xml b/res/xml/accounts_dashboard_settings.xml
index c8627e7..f332d52 100644
--- a/res/xml/accounts_dashboard_settings.xml
+++ b/res/xml/accounts_dashboard_settings.xml
@@ -49,21 +49,21 @@
android:key="dashboard_tile_placeholder"
android:order="130"/>
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="auto_sync_account_data"
android:title="@string/auto_sync_account_title"
android:summary="@string/auto_sync_account_summary"
android:order="202"
settings:allowDividerAbove="true"/>
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="auto_sync_work_account_data"
android:title="@string/account_settings_menu_auto_sync_work"
android:summary="@string/auto_sync_account_summary"
settings:forWork="true"
android:order="203"/>
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="auto_sync_personal_account_data"
android:title="@string/account_settings_menu_auto_sync_personal"
android:summary="@string/auto_sync_account_summary"
diff --git a/res/xml/accounts_dashboard_settings_credman.xml b/res/xml/accounts_dashboard_settings_credman.xml
index 83c16a2..7bcf62d 100644
--- a/res/xml/accounts_dashboard_settings_credman.xml
+++ b/res/xml/accounts_dashboard_settings_credman.xml
@@ -49,21 +49,21 @@
android:key="dashboard_tile_placeholder"
android:order="130"/>
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="auto_sync_account_data"
android:title="@string/auto_sync_account_title"
android:summary="@string/auto_sync_account_summary"
android:order="202"
settings:allowDividerAbove="true"/>
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="auto_sync_work_account_data"
android:title="@string/account_settings_menu_auto_sync_work"
android:summary="@string/auto_sync_account_summary"
settings:forWork="true"
android:order="203"/>
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="auto_sync_personal_account_data"
android:title="@string/account_settings_menu_auto_sync_personal"
android:summary="@string/auto_sync_account_summary"
diff --git a/res/xml/accounts_personal_dashboard_settings.xml b/res/xml/accounts_personal_dashboard_settings.xml
index e0ba71b..2d4d682 100644
--- a/res/xml/accounts_personal_dashboard_settings.xml
+++ b/res/xml/accounts_personal_dashboard_settings.xml
@@ -50,14 +50,14 @@
android:key="dashboard_tile_placeholder"
android:order="130"/>
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="auto_sync_account_data"
android:title="@string/auto_sync_account_title"
android:summary="@string/auto_sync_account_summary"
android:order="200"
settings:allowDividerAbove="true"/>
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="auto_sync_personal_account_data"
android:title="@string/account_settings_menu_auto_sync_personal"
android:summary="@string/auto_sync_account_summary"
diff --git a/res/xml/accounts_personal_dashboard_settings_credman.xml b/res/xml/accounts_personal_dashboard_settings_credman.xml
index b87e866..835fcb7 100644
--- a/res/xml/accounts_personal_dashboard_settings_credman.xml
+++ b/res/xml/accounts_personal_dashboard_settings_credman.xml
@@ -50,14 +50,14 @@
android:key="dashboard_tile_placeholder"
android:order="130"/>
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="auto_sync_account_data"
android:title="@string/auto_sync_account_title"
android:summary="@string/auto_sync_account_summary"
android:order="200"
settings:allowDividerAbove="true"/>
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="auto_sync_personal_account_data"
android:title="@string/account_settings_menu_auto_sync_personal"
android:summary="@string/auto_sync_account_summary"
diff --git a/res/xml/accounts_private_dashboard_settings.xml b/res/xml/accounts_private_dashboard_settings.xml
index 79bcce9..cc1a4fd 100644
--- a/res/xml/accounts_private_dashboard_settings.xml
+++ b/res/xml/accounts_private_dashboard_settings.xml
@@ -50,14 +50,14 @@
android:key="dashboard_tile_placeholder"
android:order="130"/>
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="auto_sync_account_data"
android:title="@string/auto_sync_account_title"
android:summary="@string/auto_sync_account_summary"
android:order="200"
settings:allowDividerAbove="true"/>
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="auto_sync_private_account_data"
android:title="@string/account_settings_menu_auto_sync_private"
android:summary="@string/auto_sync_account_summary"
diff --git a/res/xml/accounts_private_dashboard_settings_credman.xml b/res/xml/accounts_private_dashboard_settings_credman.xml
index 88b2736..e9abcf8 100644
--- a/res/xml/accounts_private_dashboard_settings_credman.xml
+++ b/res/xml/accounts_private_dashboard_settings_credman.xml
@@ -51,14 +51,14 @@
android:key="dashboard_tile_placeholder"
android:order="130"/>
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="auto_sync_account_data"
android:title="@string/auto_sync_account_title"
android:summary="@string/auto_sync_account_summary"
android:order="200"
settings:allowDividerAbove="true"/>
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="auto_sync_private_account_data"
android:title="@string/account_settings_menu_auto_sync_private"
android:summary="@string/auto_sync_account_summary"
diff --git a/res/xml/accounts_work_dashboard_settings.xml b/res/xml/accounts_work_dashboard_settings.xml
index 3269933..ad5e359 100644
--- a/res/xml/accounts_work_dashboard_settings.xml
+++ b/res/xml/accounts_work_dashboard_settings.xml
@@ -51,14 +51,14 @@
android:key="dashboard_tile_placeholder"
android:order="130"/>
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="auto_sync_account_data"
android:title="@string/auto_sync_account_title"
android:summary="@string/auto_sync_account_summary"
android:order="200"
settings:allowDividerAbove="true"/>
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="auto_sync_work_account_data"
android:title="@string/account_settings_menu_auto_sync_work"
android:summary="@string/auto_sync_account_summary"
diff --git a/res/xml/accounts_work_dashboard_settings_credman.xml b/res/xml/accounts_work_dashboard_settings_credman.xml
index bb9976e..8afbba8 100644
--- a/res/xml/accounts_work_dashboard_settings_credman.xml
+++ b/res/xml/accounts_work_dashboard_settings_credman.xml
@@ -50,14 +50,14 @@
android:key="dashboard_tile_placeholder"
android:order="130"/>
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="auto_sync_account_data"
android:title="@string/auto_sync_account_title"
android:summary="@string/auto_sync_account_summary"
android:order="200"
settings:allowDividerAbove="true"/>
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="auto_sync_work_account_data"
android:title="@string/account_settings_menu_auto_sync_work"
android:summary="@string/auto_sync_account_summary"
diff --git a/res/xml/all_tether_prefs.xml b/res/xml/all_tether_prefs.xml
index 0aee621..8673d31 100644
--- a/res/xml/all_tether_prefs.xml
+++ b/res/xml/all_tether_prefs.xml
@@ -36,7 +36,7 @@
android:persistent="false"
android:title="@string/wifi_hotspot_password_title"/>
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="wifi_tether_auto_turn_off_2"
android:title="@string/wifi_hotspot_auto_off_title"
android:summary="@string/wifi_hotspot_auto_off_summary"/>
@@ -57,28 +57,28 @@
android:key="tethering_options_group"
android:title="@string/tethering_interface_options"
settings:searchable="false">
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="enable_usb_tethering"
android:title="@string/usb_tethering_button_text"
android:summary="@string/usb_tethering_subtext"
settings:controller="com.android.settings.network.UsbTetherPreferenceController"
settings:keywords="@string/keywords_hotspot_tethering" />
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="enable_bluetooth_tethering_2"
android:title="@string/bluetooth_tether_checkbox_text"
android:summary="@string/bluetooth_tethering_subtext"
settings:controller="com.android.settings.network.BluetoothTetherPreferenceController"
settings:keywords="@string/keywords_hotspot_tethering" />
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="enable_ethernet_tethering_2"
android:title="@string/ethernet_tether_checkbox_text"
android:summary="@string/ethernet_tethering_subtext"
settings:controller="com.android.settings.network.EthernetTetherPreferenceController"
settings:keywords="@string/keywords_hotspot_tethering"/>
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="disable_wifi_tethering"
android:title="@string/disable_wifi_hotspot_title"
android:summary="@string/summary_placeholder"
diff --git a/res/xml/apn_editor.xml b/res/xml/apn_editor.xml
index 0c39948..e5c04e0 100644
--- a/res/xml/apn_editor.xml
+++ b/res/xml/apn_editor.xml
@@ -143,7 +143,7 @@
android:entryValues="@array/apn_protocol_values"
android:persistent="false"
/>
- <SwitchPreference
+ <SwitchPreferenceCompat
android:title="@string/carrier_enabled"
android:key="carrier_enabled"
android:enabled="false"
diff --git a/res/xml/app_info_settings.xml b/res/xml/app_info_settings.xml
index 73241b7..0782f67 100644
--- a/res/xml/app_info_settings.xml
+++ b/res/xml/app_info_settings.xml
@@ -139,7 +139,7 @@
settings:controller=
"com.android.settings.applications.appinfo.AppHibernationPreferenceCategoryController">
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="hibernation_switch"
android:title="@string/unused_apps_switch"
android:summary="@string/unused_apps_switch_summary"
diff --git a/res/xml/auto_rotate_settings.xml b/res/xml/auto_rotate_settings.xml
index 38aa5f0..e8303b1 100644
--- a/res/xml/auto_rotate_settings.xml
+++ b/res/xml/auto_rotate_settings.xml
@@ -28,7 +28,7 @@
android:title="@string/auto_rotate_settings_primary_switch_title"
settings:controller="com.android.settings.display.AutoRotateSwitchBarController"/>
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="auto_rotate_switch"
android:title="@string/auto_rotate_settings_primary_switch_title"
settings:controller="com.android.settings.display.AutoRotatePreferenceController"/>
@@ -50,7 +50,7 @@
android:title="@string/ambient_camera_summary_battery_saver_on"
settings:controller="com.android.settings.display.SmartAutoRotateBatterySaverController" />
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="face_based_rotate"
android:title="@string/auto_rotate_switch_face_based"
settings:controller="com.android.settings.display.SmartAutoRotateController" />
diff --git a/res/xml/battery_saver_settings.xml b/res/xml/battery_saver_settings.xml
index 52b8b1a..74ef856 100644
--- a/res/xml/battery_saver_settings.xml
+++ b/res/xml/battery_saver_settings.xml
@@ -34,7 +34,7 @@
settings:keywords="@string/keywords_battery_saver_schedule"
settings:controller="com.android.settings.fuelgauge.batterysaver.BatterySaverSchedulePreferenceController"/>
- <SwitchPreference
+ <SwitchPreferenceCompat
android:order="80"
android:key="battery_saver_sticky"
android:title="@string/battery_saver_sticky_title_new"
diff --git a/res/xml/billing_cycle.xml b/res/xml/billing_cycle.xml
index 77f8bc3..000abac 100644
--- a/res/xml/billing_cycle.xml
+++ b/res/xml/billing_cycle.xml
@@ -23,7 +23,7 @@
android:key="billing_cycle"
android:title="@string/app_usage_cycle" />
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="set_data_warning"
android:title="@string/set_data_warning"/>
@@ -31,7 +31,7 @@
android:key="data_warning"
android:title="@string/data_warning" />
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="set_data_limit"
android:title="@string/set_data_limit" />
diff --git a/res/xml/button_navigation_settings.xml b/res/xml/button_navigation_settings.xml
index 2459b60..1de011c 100644
--- a/res/xml/button_navigation_settings.xml
+++ b/res/xml/button_navigation_settings.xml
@@ -30,7 +30,7 @@
settings:lottie_imageAssetsFolder="button_nav_menu"
settings:lottie_rawRes="@raw/lottie_button_nav_menu"/>
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="assistant_long_press_home_gesture"
android:title="@string/assistant_long_press_home_gesture_title"
android:summary="@string/assistant_long_press_home_gesture_summary"
diff --git a/res/xml/configure_notification_settings.xml b/res/xml/configure_notification_settings.xml
index ee88215..bfca03d 100644
--- a/res/xml/configure_notification_settings.xml
+++ b/res/xml/configure_notification_settings.xml
@@ -98,7 +98,7 @@
android:summary="@string/lock_screen_notifs_redact_work_summary"
settings:controller="com.android.settings.notification.RedactNotificationPreferenceController" />
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="notification_lockscreen_bypass"
android:order="16"
android:title="@string/lockscreen_bypass_title"
@@ -120,7 +120,7 @@
settings:controller="com.android.settings.notification.zen.ZenModePreferenceController"
/>
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="lock_screen_show_only_unseen_notifs"
android:order="18"
android:title="@string/unseen_notifs_lock_screen"
@@ -148,27 +148,27 @@
android:targetClass="com.android.cellbroadcastreceiver.CellBroadcastSettings"/>
</com.android.settingslib.RestrictedPreference>
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="silent_icons"
android:order="21"
android:title="@string/silent_notifications_status_bar"
settings:controller="com.android.settings.notification.SilentStatusBarPreferenceController"/>
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="show_snooze_options"
android:order="22"
android:title="@string/snooze_options_title"
settings:controller="com.android.settings.notification.SnoozeNotificationPreferenceController" />
<!-- Notification badging -->
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="notification_badging"
android:order="23"
android:title="@string/notification_badging_title"
settings:controller="com.android.settings.notification.BadgingNotificationPreferenceController"/>
<!-- Pulse notification light, on devices that support it -->
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="notification_pulse"
android:order="24"
android:title="@string/notification_pulse_title"
diff --git a/res/xml/connected_devices_advanced.xml b/res/xml/connected_devices_advanced.xml
index a1eae91..3c66998 100644
--- a/res/xml/connected_devices_advanced.xml
+++ b/res/xml/connected_devices_advanced.xml
@@ -69,7 +69,7 @@
android:fragment="com.android.settings.print.PrintSettingsFragment"
android:order="-3"/>
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="uwb_settings"
android:title="@string/uwb_settings_title"
android:order="100"
diff --git a/res/xml/date_time_prefs.xml b/res/xml/date_time_prefs.xml
index 593c428..e7170ca 100644
--- a/res/xml/date_time_prefs.xml
+++ b/res/xml/date_time_prefs.xml
@@ -53,7 +53,7 @@
settings:controller="com.android.settings.datetime.LocationProviderStatusPreferenceController"/>
<!-- This preference gets removed if location-based time zone detection is not supported -->
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="location_time_zone_detection"
android:title="@string/location_time_zone_detection_toggle_title"
settings:controller="com.android.settings.datetime.LocationTimeZoneDetectionPreferenceController"/>
@@ -72,11 +72,11 @@
android:key="time_format_preference_category"
android:title="@string/time_format_category_title"
settings:keywords="@string/keywords_time_format">
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="auto_24hour"
android:title="@string/date_time_24hour_auto"/>
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="24 hour"
android:title="@string/date_time_24hour" />
</PreferenceCategory>
diff --git a/res/xml/development_settings.xml b/res/xml/development_settings.xml
index 234733b..b053424 100644
--- a/res/xml/development_settings.xml
+++ b/res/xml/development_settings.xml
@@ -123,12 +123,12 @@
android:dialogTitle="@string/select_webview_provider_dialog_title"
android:fragment="com.android.settings.webview.WebViewAppPicker" />
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="color_temperature"
android:title="@string/color_temperature"
android:summary="@string/color_temperature_desc" />
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="ota_disable_automatic_update"
android:title="@string/ota_disable_automatic_update"
android:summary="@string/ota_disable_automatic_update_summary" />
@@ -175,39 +175,39 @@
android:summary="@string/enable_adb_wireless_summary"
settings:keywords="@string/keywords_adb_wireless" />
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="adb_authorization_timeout"
android:title="@string/adb_authorization_timeout_title"
android:summary="@string/adb_authorization_timeout_summary" />
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="enable_terminal"
android:title="@string/enable_terminal_title"
android:summary="@string/enable_terminal_summary" />
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="bugreport_in_power"
android:title="@string/bugreport_in_power"
android:summary="@string/bugreport_in_power_summary" />
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="enable_verbose_vendor_logging"
android:title="@string/enable_verbose_vendor_logging"
android:summary="@string/enable_verbose_vendor_logging_summary" />
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="automatic_system_server_heap_dumps"
android:title="@string/automatic_system_heap_dump_title"
android:summary="@string/automatic_system_heap_dump_summary" />
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="debug_view_attributes"
android:title="@string/debug_view_attributes" />
<Preference android:key="debug_app"
android:title="@string/debug_app" />
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="wait_for_debugger"
android:title="@string/wait_for_debugger"
android:summary="@string/wait_for_debugger_summary" />
@@ -217,7 +217,7 @@
android:title="@string/verify_apps_over_usb_title"
android:summary="@string/verify_apps_over_usb_summary" />
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="art_verifier_for_debuggable"
android:title="@string/art_verifier_for_debuggable_title"
android:summary="@string/art_verifier_for_debuggable_summary" />
@@ -236,7 +236,7 @@
android:entries="@array/select_logpersist_titles"
android:entryValues="@array/select_logpersist_values" />
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="camera_laser_sensor_switch"
android:title="@string/camera_laser_sensor_switch" />
@@ -245,12 +245,12 @@
android:title="@string/feature_flags_dashboard_title"
android:fragment="com.android.settings.development.featureflags.FeatureFlagsDashboard" />
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="enable_gpu_debug_layers"
android:title="@string/enable_gpu_debug_layers"
android:summary="@string/enable_gpu_debug_layers_summary" />
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="enable_angle_as_system_driver"
android:title="@string/enable_angle_as_system_driver"
android:summary="@string/enable_angle_as_system_driver_summary" />
@@ -268,22 +268,22 @@
settings:controller="com.android.settings.spa.development.compat.PlatformCompatPreferenceController"
/>
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="show_refresh_rate"
android:title="@string/show_refresh_rate"
android:summary="@string/show_refresh_rate_summary" />
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="overlay_settings"
android:title="@string/overlay_settings_title"
android:summary="@string/overlay_settings_summary" />
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="pref_key_peak_refresh_rate"
android:title="@string/force_high_refresh_rate_toggle"
android:summary="@string/force_high_refresh_rate_desc" />
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="allow_mock_modem"
android:title="@string/allow_mock_modem"
android:summary="@string/allow_mock_modem_summary" />
@@ -299,32 +299,32 @@
android:title="@string/debug_networking_category"
android:order="400">
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="wifi_display_certification"
android:title="@string/wifi_display_certification"
android:summary="@string/wifi_display_certification_summary" />
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="wifi_verbose_logging"
android:title="@string/wifi_verbose_logging"
android:summary="@string/wifi_verbose_logging_summary" />
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="wifi_scan_throttling"
android:title="@string/wifi_scan_throttling"
android:summary="@string/wifi_scan_throttling_summary" />
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="wifi_non_persistent_mac_randomization"
android:title="@string/wifi_non_persistent_mac_randomization"
android:summary="@string/wifi_non_persistent_mac_randomization_summary" />
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="mobile_data_always_on"
android:title="@string/mobile_data_always_on"
android:summary="@string/mobile_data_always_on_summary" />
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="tethering_hardware_offload"
android:title="@string/tethering_hardware_offload"
android:summary="@string/tethering_hardware_offload_summary" />
@@ -342,35 +342,35 @@
android:fragment="com.android.settings.connecteddevice.usb.UsbDefaultFragment"
android:title="@string/usb_default_label"/>
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="bluetooth_show_devices_without_names"
android:title="@string/bluetooth_show_devices_without_names"
android:summary="@string/bluetooth_show_devices_without_names_summary" />
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="bluetooth_disable_absolute_volume"
android:title="@string/bluetooth_disable_absolute_volume"
android:summary="@string/bluetooth_disable_absolute_volume_summary" />
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="bluetooth_disable_leaudio"
android:title="@string/bluetooth_disable_leaudio"
android:summary="@string/bluetooth_disable_leaudio_summary" />
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="bluetooth_show_leaudio_device_details"
android:title="@string/bluetooth_show_leaudio_device_details"/>
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="bluetooth_bypass_leaudio_allowlist"
android:title="@string/bluetooth_bypass_leaudio_allowlist"
android:summary="@string/bluetooth_bypass_leaudio_allowlist_summary" />
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="bluetooth_disable_le_audio_hw_offload"
android:title="@string/bluetooth_disable_le_audio_hw_offload" />
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="bluetooth_disable_a2dp_hw_offload"
android:title="@string/bluetooth_disable_a2dp_hw_offload" />
@@ -388,7 +388,7 @@
android:entries="@array/bluetooth_map_versions"
android:entryValues="@array/bluetooth_map_version_values" />
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="bluetooth_hd_audio_settings"
android:title="@string/bluetooth_profile_a2dp_high_quality_unknown_codec"/>
@@ -439,17 +439,17 @@
android:entries="@array/bluetooth_max_connected_audio_devices"
android:entryValues="@array/bluetooth_max_connected_audio_devices_values" />
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="nfc_stack_debuglog_enabled"
android:title="@string/nfc_stack_debuglog_title"
android:summary="@string/nfc_stack_debuglog_summary" />
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="nfc_verbose_vendor_log"
android:title="@string/nfc_verbose_vendor_log_title"
android:summary="@string/nfc_verbose_vendor_log_summary" />
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="nfc_snoop_log"
android:title="@string/nfc_snoop_log_title"
android:summary="@string/nfc_snoop_log_summary"/>
@@ -461,17 +461,17 @@
android:title="@string/debug_input_category"
android:order="500">
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="show_touches"
android:title="@string/show_touches"
android:summary="@string/show_touches_summary" />
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="pointer_location"
android:title="@string/pointer_location"
android:summary="@string/pointer_location_summary" />
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="show_key_presses"
android:title="@string/show_key_presses"
android:summary="@string/show_key_presses_summary" />
@@ -483,17 +483,17 @@
android:title="@string/debug_drawing_category"
android:order="600">
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="show_screen_updates"
android:title="@string/show_screen_updates"
android:summary="@string/show_screen_updates_summary" />
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="debug_layout"
android:title="@string/debug_layout"
android:summary="@string/debug_layout_summary" />
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="force_rtl_layout_all_locales"
android:title="@string/force_rtl_layout_all_locales"
android:summary="@string/force_rtl_layout_all_locales_summary" />
@@ -531,7 +531,7 @@
android:title="@string/display_cutout_emulation"
settings:keywords="@string/display_cutout_emulation_keywords" />
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="transparent_navigation_bar"
android:title="@string/transparent_navigation_bar"
android:summary="@string/transparent_navigation_bar_summary" />
@@ -549,12 +549,12 @@
android:title="@string/debug_hw_drawing_category"
android:order="700">
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="show_hw_screen_updates"
android:title="@string/show_hw_screen_updates"
android:summary="@string/show_hw_screen_updates_summary" />
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="show_hw_layers_updates"
android:title="@string/show_hw_layers_updates"
android:summary="@string/show_hw_layers_updates_summary" />
@@ -571,21 +571,21 @@
android:entries="@array/show_non_rect_clip_entries"
android:entryValues="@array/show_non_rect_clip_values" />
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="hwui_force_dark"
android:title="@string/hwui_force_dark_title"
android:summary="@string/hwui_force_dark_summary" />
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="enable_blurs_on_windows"
android:title="@string/window_blurs"/>
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="force_msaa"
android:title="@string/force_msaa"
android:summary="@string/force_msaa_summary" />
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="disable_overlays"
android:title="@string/disable_overlays"
android:summary="@string/disable_overlays_summary" />
@@ -621,7 +621,7 @@
android:title="@string/debug_monitoring_category"
android:order="900">
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="strict_mode"
android:title="@string/strict_mode"
android:summary="@string/strict_mode_summary" />
@@ -640,7 +640,7 @@
android:title="@string/debug_applications_category"
android:order="1000">
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="immediately_destroy_activities"
android:title="@string/immediately_destroy_activities"
android:summary="@string/immediately_destroy_activities_summary" />
@@ -656,12 +656,12 @@
android:fragment="com.android.settings.applications.appops.BackgroundCheckSummary"
android:title="@string/background_check_pref" />
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="show_first_crash_dialog"
android:title="@string/show_first_crash_dialog"
android:summary="@string/show_first_crash_dialog_summary" />
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="show_all_anrs"
android:title="@string/show_all_anrs"
android:summary="@string/show_all_anrs_summary" />
@@ -672,7 +672,7 @@
android:entries="@array/cached_apps_freezer_entries"
android:entryValues="@array/cached_apps_freezer_values" />
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="show_notification_channel_warnings"
android:title="@string/show_notification_channel_warnings"
android:summary="@string/show_notification_channel_warnings_summary" />
@@ -692,32 +692,32 @@
android:title="@string/tare_title" >
</Preference>
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="force_allow_on_external"
android:title="@string/force_allow_on_external"
android:summary="@string/force_allow_on_external_summary" />
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="force_resizable_activities"
android:title="@string/force_resizable_activities"
android:summary="@string/force_resizable_activities_summary" />
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="enable_freeform_support"
android:title="@string/enable_freeform_support"
android:summary="@string/enable_freeform_support_summary" />
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="force_desktop_mode_on_external_displays"
android:title="@string/force_desktop_mode"
android:summary="@string/force_desktop_mode_summary" />
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="enable_non_resizable_multi_window"
android:title="@string/enable_non_resizable_multi_window"
android:summary="@string/enable_non_resizable_multi_window_summary" />
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="back_navigation_animation"
android:title="@string/back_navigation_animation"
android:summary="@string/back_navigation_animation_summary" />
@@ -726,12 +726,12 @@
android:key="reset_shortcut_manager_throttling"
android:title="@string/reset_shortcut_manager_throttling" />
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="disable_phantom_process_monitor"
android:title="@string/disable_phantom_process_monitor_title"
android:summary="@string/disable_phantom_process_monitor_summary" />
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="force_enable_notes_role"
android:title="@string/enable_notes_role_title"
android:summary="@string/enable_notes_role_summary" />
@@ -793,12 +793,12 @@
<Preference android:key="mock_location_app"
android:title="@string/mock_location_app" />
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="enable_gnss_raw_meas_full_tracking"
android:title="@string/enable_gnss_raw_meas_full_tracking"
android:summary="@string/enable_gnss_raw_meas_full_tracking_summary" />
- <SwitchPreference
+ <SwitchPreferenceCompat
android:title="@string/location_indicator_settings_title"
android:summary="@string/location_indicator_settings_description"
android:defaultValue="true"
@@ -811,7 +811,7 @@
android:title="@string/input_method_category"
android:order="1400">
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="stylus_handwriting"
android:title="@string/stylus_handwriting"
android:defaultValue="true"
diff --git a/res/xml/display_settings.xml b/res/xml/display_settings.xml
index c5e559c..2df360d 100644
--- a/res/xml/display_settings.xml
+++ b/res/xml/display_settings.xml
@@ -108,7 +108,7 @@
Standard auto-rotation preference that will be shown when device state based
auto-rotation settings are NOT available.
-->
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="auto_rotate"
android:title="@string/accelerometer_title"
settings:keywords="@string/keywords_auto_rotate"
@@ -132,19 +132,19 @@
settings:keywords="@string/keywords_screen_resolution"
settings:controller="com.android.settings.display.ScreenResolutionController"/>
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="display_white_balance"
android:title="@string/display_white_balance_title"
android:summary="@string/display_white_balance_summary"
settings:controller="com.android.settings.display.DisplayWhiteBalancePreferenceController"/>
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="peak_refresh_rate"
android:title="@string/peak_refresh_rate_title"
android:summary="@string/peak_refresh_rate_summary"
settings:controller="com.android.settings.display.PeakRefreshRatePreferenceController"/>
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="show_operator_name"
android:title="@string/show_operator_name_title"
android:summary="@string/show_operator_name_summary"/>
@@ -156,16 +156,16 @@
settings:keywords="@string/keywords_screensaver"
settings:controller="com.android.settings.display.ScreenSaverPreferenceController"/>
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="camera_gesture"
android:title="@string/camera_gesture_title"
android:summary="@string/camera_gesture_desc"/>
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="lift_to_wake"
android:title="@string/lift_to_wake_title"/>
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="tap_to_wake"
android:title="@string/tap_to_wake"
android:summary="@string/tap_to_wake_summary"/>
diff --git a/res/xml/double_tap_power_settings.xml b/res/xml/double_tap_power_settings.xml
index f4d7607..fb5dd52 100644
--- a/res/xml/double_tap_power_settings.xml
+++ b/res/xml/double_tap_power_settings.xml
@@ -26,7 +26,7 @@
settings:searchable="false"
app:lottie_rawRes="@drawable/quickly_open_camera"/>
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="gesture_double_tap_power"
android:title="@string/double_tap_power_for_camera_title"
android:summary="@string/double_tap_power_for_camera_summary"
diff --git a/res/xml/double_tap_screen_settings.xml b/res/xml/double_tap_screen_settings.xml
index f982331..80e9bc4 100644
--- a/res/xml/double_tap_screen_settings.xml
+++ b/res/xml/double_tap_screen_settings.xml
@@ -24,7 +24,7 @@
android:key="gesture_double_tap_screen_video"
app:lottie_rawRes="@raw/lottie_tap_to_check_phone" />
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="gesture_double_tap_screen"
android:title="@string/ambient_display_title"
android:summary="@string/ambient_display_summary"
diff --git a/res/xml/double_twist_gesture_settings.xml b/res/xml/double_twist_gesture_settings.xml
index 674ba51..699755b 100644
--- a/res/xml/double_twist_gesture_settings.xml
+++ b/res/xml/double_twist_gesture_settings.xml
@@ -27,7 +27,7 @@
settings:lottie_rawRes="@raw/flip_camera_for_selfie_lottie"
settings:dynamicColor="true"/>
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="gesture_double_twist"
android:title="@string/double_twist_for_camera_mode_title"
android:summary="@string/double_twist_for_camera_mode_summary"
diff --git a/res/xml/dream_fragment_overview.xml b/res/xml/dream_fragment_overview.xml
index 8377a06..6996908 100644
--- a/res/xml/dream_fragment_overview.xml
+++ b/res/xml/dream_fragment_overview.xml
@@ -40,13 +40,13 @@
android:layout="@layout/dream_picker_layout"/>
</PreferenceCategory>
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="dream_complications_toggle"
android:title="@string/dream_complications_toggle_title"
android:summary="@string/dream_complications_toggle_summary"
settings:controller="com.android.settings.dream.DreamComplicationPreferenceController"/>
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="dream_home_controls_toggle"
android:title="@string/dream_home_controls_toggle_title"
android:summary="@string/dream_home_controls_toggle_summary"
diff --git a/res/xml/emergency_gesture_settings.xml b/res/xml/emergency_gesture_settings.xml
index 9fd644f..8367988 100644
--- a/res/xml/emergency_gesture_settings.xml
+++ b/res/xml/emergency_gesture_settings.xml
@@ -28,7 +28,7 @@
android:title="@string/emergency_gesture_screen_summary"
app:allowDividerAbove="false"/>
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="emergency_gesture_sound"
android:icon="@drawable/ic_hearing"
android:title="@string/emergency_gesture_sound_setting_title"
diff --git a/res/xml/flash_notifications_settings.xml b/res/xml/flash_notifications_settings.xml
index 85cc2cb..bc76f6d 100644
--- a/res/xml/flash_notifications_settings.xml
+++ b/res/xml/flash_notifications_settings.xml
@@ -30,7 +30,7 @@
settings:lottie_rawRes="@drawable/flash_notifications_illustration"
settings:controller="com.android.settings.accessibility.FlashNotificationIllustrationPreferenceController"/>
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="camera_flash_notification_preference"
android:persistent="false"
android:title="@string/camera_flash_notification_title"
diff --git a/res/xml/gesture_navigation_settings.xml b/res/xml/gesture_navigation_settings.xml
index 022583c..a4b5af9 100644
--- a/res/xml/gesture_navigation_settings.xml
+++ b/res/xml/gesture_navigation_settings.xml
@@ -28,7 +28,7 @@
android:persistent="false"
android:title="@string/assistant_gesture_category_title">
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="assistant_gesture_corner_swipe"
android:title="@string/assistant_corner_gesture_title"
android:summary="@string/assistant_corner_gesture_summary"
diff --git a/res/xml/keyboard_settings.xml b/res/xml/keyboard_settings.xml
index b18338b..21b2bb0 100644
--- a/res/xml/keyboard_settings.xml
+++ b/res/xml/keyboard_settings.xml
@@ -63,7 +63,7 @@
android:dialogTitle="@string/pointer_speed" />
</PreferenceCategory>
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="vibrate_input_devices"
android:title="@string/vibrate_input_devices"
android:summary="@string/vibrate_input_devices_summary"
diff --git a/res/xml/language_and_input.xml b/res/xml/language_and_input.xml
index a5f6f63..1848f86 100644
--- a/res/xml/language_and_input.xml
+++ b/res/xml/language_and_input.xml
@@ -110,7 +110,7 @@
android:dialogTitle="@string/pointer_speed" />
</PreferenceCategory>
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="vibrate_input_devices"
android:title="@string/vibrate_input_devices"
android:summary="@string/vibrate_input_devices_summary"
diff --git a/res/xml/manage_assist.xml b/res/xml/manage_assist.xml
index 141444a..527dfd0 100644
--- a/res/xml/manage_assist.xml
+++ b/res/xml/manage_assist.xml
@@ -28,17 +28,17 @@
android:summary="@string/summary_placeholder"
settings:searchable="false"/>
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="context"
android:title="@string/assist_access_context_title"
android:summary="@string/assist_access_context_summary" />
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="screenshot"
android:title="@string/assist_access_screenshot_title"
android:summary="@string/assist_access_screenshot_summary" />
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="flash"
android:title="@string/assist_flash_title"
android:summary="@string/assist_flash_summary" />
diff --git a/res/xml/manage_domain_url_settings.xml b/res/xml/manage_domain_url_settings.xml
index e820e78..07194e4 100644
--- a/res/xml/manage_domain_url_settings.xml
+++ b/res/xml/manage_domain_url_settings.xml
@@ -25,7 +25,7 @@
android:key="web_action_category"
android:title="@string/web_action_section_title"
settings:controller="com.android.settings.applications.managedomainurls.WebActionCategoryController">
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="instant_app_web_action_toggle"
android:title="@string/web_action_enable_title"
android:summary="@string/web_action_enable_summary"
diff --git a/res/xml/managed_profile_settings.xml b/res/xml/managed_profile_settings.xml
index ddfb869..4dcfc4d 100644
--- a/res/xml/managed_profile_settings.xml
+++ b/res/xml/managed_profile_settings.xml
@@ -31,7 +31,7 @@
settings:useAdditionalSummary="true"
settings:controller="com.android.settings.accounts.ContactSearchPreferenceController"/>
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="cross_profile_calendar"
android:summary="@string/cross_profile_calendar_summary"
android:title="@string/cross_profile_calendar_title"
diff --git a/res/xml/media_controls_settings.xml b/res/xml/media_controls_settings.xml
index 822639a..96a2ee4 100644
--- a/res/xml/media_controls_settings.xml
+++ b/res/xml/media_controls_settings.xml
@@ -20,20 +20,20 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:title="@string/media_controls_title">
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="media_controls_resume_switch"
android:title="@string/media_controls_resume_title"
android:summary="@string/media_controls_resume_description"
app:keywords="@string/keywords_media_controls"
app:controller="com.android.settings.sound.MediaControlsPreferenceController" />
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="media_controls_lockscreen"
android:title="@string/media_controls_lockscreen_title"
android:summary="@string/media_controls_lockscreen_description"
app:controller="com.android.settings.sound.MediaControlsLockScreenPreferenceController" />
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="media_controls_recommendations"
android:title="@string/media_controls_recommendations_title"
android:summary="@string/media_controls_recommendations_description"
diff --git a/res/xml/more_security_privacy_settings.xml b/res/xml/more_security_privacy_settings.xml
index 42ca418..8358c73 100644
--- a/res/xml/more_security_privacy_settings.xml
+++ b/res/xml/more_security_privacy_settings.xml
@@ -42,7 +42,7 @@
android:summary="@string/unlock_set_unlock_mode_pattern"
settings:keywords="@string/keywords_lockscreen" />
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="visiblepattern_profile"
android:title="@string/lockpattern_settings_enable_visible_pattern_title_profile"
settings:controller="com.android.settings.security.VisiblePatternProfilePreferenceController" />
@@ -86,7 +86,7 @@
settings:searchable="false"/>
<!-- Show media on lock screen -->
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="privacy_media_controls_lockscreen"
android:title="@string/media_controls_lockscreen_title"
android:summary="@string/media_controls_lockscreen_description"
@@ -98,7 +98,7 @@
ContentCaptureService implementations defines a custom settings activitiy on its manifest.
Hence, we show both here, but the controller itself will decide if it's available or not.
-->
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="content_capture"
android:title="@string/content_capture"
android:summary="@string/content_capture_summary"
@@ -195,7 +195,7 @@
settings:keywords="@string/keywords_app_pinning"
settings:controller="com.android.settings.security.ScreenPinningPreferenceController" />
- <SwitchPreference
+ <SwitchPreferenceCompat
android:order="290"
android:key="confirm_sim_deletion"
android:title="@string/confirm_sim_deletion_title"
diff --git a/res/xml/nfc_and_payment_settings.xml b/res/xml/nfc_and_payment_settings.xml
index b7900f8..5fb7c69 100644
--- a/res/xml/nfc_and_payment_settings.xml
+++ b/res/xml/nfc_and_payment_settings.xml
@@ -30,7 +30,7 @@
settings:lottie_rawRes="@drawable/nfc_detection_point"
settings:controller="com.android.settings.nfc.NfcDetectionPointController"/>
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="nfc_secure_settings"
android:title="@string/nfc_secure_settings_title"
settings:controller="com.android.settings.nfc.SecureNfcPreferenceController"
diff --git a/res/xml/physical_keyboard_settings.xml b/res/xml/physical_keyboard_settings.xml
index 40851a9..d8e66bb 100644
--- a/res/xml/physical_keyboard_settings.xml
+++ b/res/xml/physical_keyboard_settings.xml
@@ -21,7 +21,7 @@
<PreferenceCategory
android:key="keyboard_options_category"
android:title="@string/keyboard_options_category">
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="show_virtual_keyboard_switch"
android:title="@string/show_ime"
android:summary="@string/show_ime_summary"
diff --git a/res/xml/pick_up_gesture_settings.xml b/res/xml/pick_up_gesture_settings.xml
index 38dad0a..e863080 100644
--- a/res/xml/pick_up_gesture_settings.xml
+++ b/res/xml/pick_up_gesture_settings.xml
@@ -27,7 +27,7 @@
app:lottie_rawRes="@raw/lottie_lift_to_check_phone"/>
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="gesture_pick_up"
android:title="@string/ambient_display_pickup_title"
android:summary="@string/ambient_display_pickup_summary"
diff --git a/res/xml/polite_notifications_settings.xml b/res/xml/polite_notifications_settings.xml
index 5e09c3b..36f64f2 100644
--- a/res/xml/polite_notifications_settings.xml
+++ b/res/xml/polite_notifications_settings.xml
@@ -27,14 +27,14 @@
android:entryValues="@array/notification_polite_options_values"
settings:controller="com.android.settings.notification.PoliteNotificationFilterController"/>
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="notification_polite_vibrate_unlocked"
android:persistent="false"
android:title="@string/notification_polite_vibrate_unlocked"
android:summary="@string/notification_polite_vibrate_unlocked_summary"
settings:controller="com.android.settings.notification.PoliteNotifVibrateUnlockedToggleController" />
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="notification_polite_work_profile"
android:persistent="false"
android:title="@string/notification_polite_work"
diff --git a/res/xml/power_usage_summary.xml b/res/xml/power_usage_summary.xml
index 121e1fe..e62f5c0 100644
--- a/res/xml/power_usage_summary.xml
+++ b/res/xml/power_usage_summary.xml
@@ -51,7 +51,7 @@
settings:keywords="@string/keywords_battery_saver"
settings:controller="com.android.settings.fuelgauge.BatterySaverController" />
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="battery_percentage"
android:title="@string/battery_percentage"
android:summary="@string/battery_percentage_description"
diff --git a/res/xml/privacy_controls_settings.xml b/res/xml/privacy_controls_settings.xml
index cc88e0c..c7c3035 100644
--- a/res/xml/privacy_controls_settings.xml
+++ b/res/xml/privacy_controls_settings.xml
@@ -35,7 +35,7 @@
settings:controller="com.android.settings.privacy.MicToggleController"/>
<!-- Clipboard access notifications -->
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="show_clip_access_notification"
android:title="@string/show_clip_access_notification"
android:summary="@string/show_clip_access_notification_summary"
diff --git a/res/xml/privacy_dashboard_settings.xml b/res/xml/privacy_dashboard_settings.xml
index d84dca5..551501b 100644
--- a/res/xml/privacy_dashboard_settings.xml
+++ b/res/xml/privacy_dashboard_settings.xml
@@ -86,7 +86,7 @@
settings:controller="com.android.settings.privacy.MicToggleController"/>
<!-- Show passwords -->
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="show_password"
android:title="@string/show_password"
android:summary="@string/show_password_summary"
@@ -99,7 +99,7 @@
android:summary="@string/summary_placeholder"/>
<!-- Show media on lock screen -->
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="privacy_media_controls_lockscreen"
android:title="@string/media_controls_lockscreen_title"
android:summary="@string/media_controls_lockscreen_description"
@@ -136,7 +136,7 @@
Hence, we show both here, but the controller itself will decide if it's available or not.
-->
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="content_capture"
android:title="@string/content_capture"
android:summary="@string/content_capture_summary"
@@ -149,7 +149,7 @@
settings:controller="com.android.settings.privacy.EnableContentCaptureWithServiceSettingsPreferenceController"/>
<!-- Clipboard access notifications -->
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="show_clip_access_notification"
android:title="@string/show_clip_access_notification"
android:summary="@string/show_clip_access_notification_summary"
diff --git a/res/xml/private_space_settings.xml b/res/xml/private_space_settings.xml
index 0277254..1c473db 100644
--- a/res/xml/private_space_settings.xml
+++ b/res/xml/private_space_settings.xml
@@ -25,13 +25,13 @@
<PreferenceCategory
android:title="@string/security_header">
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="private_space_use_one_lock"
android:title="@string/private_space_one_lock_title"
settings:controller="com.android.settings.privatespace.UseOneLockController"
settings:searchable="false" />
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="private_space_hidden"
android:title="@string/private_space_hide_title"
settings:controller="com.android.settings.privatespace.HidePrivateSpaceController"
diff --git a/res/xml/reduce_bright_colors_settings.xml b/res/xml/reduce_bright_colors_settings.xml
index 00ab585..d092e13 100644
--- a/res/xml/reduce_bright_colors_settings.xml
+++ b/res/xml/reduce_bright_colors_settings.xml
@@ -30,7 +30,7 @@
settings:tickMark="@android:color/transparent"
/>
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="rbc_persist"
android:persistent="false"
android:title="@string/reduce_bright_colors_persist_preference_title" />
diff --git a/res/xml/screen_lock_settings.xml b/res/xml/screen_lock_settings.xml
index 00dd7ae..3f732b9 100644
--- a/res/xml/screen_lock_settings.xml
+++ b/res/xml/screen_lock_settings.xml
@@ -23,17 +23,17 @@
settings:searchable="false">
<!-- available in pattern -->
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="visiblepattern"
android:title="@string/lockpattern_settings_enable_visible_pattern_title" />
<!-- available in pin -->
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="auto_pin_confirm"
android:title="@string/lock_screen_auto_pin_confirm_title"
android:summary="@string/lock_screen_auto_pin_confirm_summary" />
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="enhancedPinPrivacy"
android:title="@string/lockpattern_settings_enhanced_pin_privacy_title"
android:summary="@string/lockpattern_settings_enhanced_pin_privacy_summary" />
@@ -48,7 +48,7 @@
android:entryValues="@array/lock_after_timeout_values" />
<!-- available in pin/pattern/password -->
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="power_button_instantly_locks"
android:title="@string/lockpattern_settings_enable_power_button_instantly_locks" />
diff --git a/res/xml/screen_pinning_settings.xml b/res/xml/screen_pinning_settings.xml
index 7689043..2c4402d 100644
--- a/res/xml/screen_pinning_settings.xml
+++ b/res/xml/screen_pinning_settings.xml
@@ -23,7 +23,7 @@
android:title="@string/app_pinning_intro"
settings:searchable="false"/>
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="use_screen_lock"
android:title="@string/screen_pinning_unlock_none"
settings:allowDividerAbove="true"/>
diff --git a/res/xml/security_advanced_settings.xml b/res/xml/security_advanced_settings.xml
index 4570dac..89834b4 100644
--- a/res/xml/security_advanced_settings.xml
+++ b/res/xml/security_advanced_settings.xml
@@ -106,7 +106,7 @@
settings:keywords="@string/keywords_app_pinning"
settings:controller="com.android.settings.security.ScreenPinningPreferenceController" />
- <SwitchPreference
+ <SwitchPreferenceCompat
android:order="290"
android:key="confirm_sim_deletion"
android:title="@string/confirm_sim_deletion_title"
@@ -142,7 +142,7 @@
android:summary="@string/unlock_set_unlock_mode_pattern"
settings:keywords="@string/keywords_lockscreen" />
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="visiblepattern_profile"
android:title="@string/lockpattern_settings_enable_visible_pattern_title_profile"
settings:controller="com.android.settings.security.VisiblePatternProfilePreferenceController" />
diff --git a/res/xml/security_lockscreen_settings.xml b/res/xml/security_lockscreen_settings.xml
index 80e8fe6..cb1ce44 100644
--- a/res/xml/security_lockscreen_settings.xml
+++ b/res/xml/security_lockscreen_settings.xml
@@ -28,7 +28,7 @@
android:summary="@string/summary_placeholder"
settings:keywords="@string/keywords_lock_screen_notif"/>
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="security_display_lockscreen_bypass"
android:title="@string/lockscreen_bypass_title"
android:summary="@string/lockscreen_bypass_summary"
@@ -45,25 +45,25 @@
android:title="@string/owner_info_settings_title"
android:summary="@string/owner_info_settings_summary" />
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="lockscreen_privacy_wallet_switch"
android:title="@string/lockscreen_privacy_wallet_setting_toggle"
android:summary="@string/lockscreen_privacy_wallet_summary"
settings:controller="com.android.settings.display.WalletPrivacyPreferenceController" />
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="lock_screen_show_qr_scanner"
android:title="@string/lockscreen_privacy_qr_code_scanner_setting_toggle"
android:summary="@string/lockscreen_privacy_qr_code_scanner_summary"
settings:controller="com.android.settings.display.QRCodeScannerPreferenceController" />
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="lockscreen_privacy_controls_switch"
android:title="@string/lockscreen_privacy_controls_setting_toggle"
android:summary="@string/lockscreen_privacy_controls_summary"
settings:controller="com.android.settings.display.ControlsPrivacyPreferenceController" />
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="lockscreen_trivial_controls_switch"
android:title="@string/lockscreen_trivial_controls_setting_toggle"
android:summary="@string/lockscreen_trivial_controls_summary"
@@ -74,7 +74,7 @@
android:title="@string/lockscreen_quick_affordances_title"
settings:controller="com.android.settings.display.CustomizableLockScreenQuickAffordancesPreferenceController" />
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="lockscreen_double_line_clock_switch"
android:title="@string/lockscreen_double_line_clock_setting_toggle"
android:summary="@string/lockscreen_double_line_clock_summary"
@@ -116,7 +116,7 @@
settings:searchable="false"
settings:controller="com.android.settings.gestures.PickupGesturePreferenceController" />
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="ambient_display_notification"
android:title="@string/doze_title"
android:summary="@string/doze_summary"
diff --git a/res/xml/security_settings_combined_biometric.xml b/res/xml/security_settings_combined_biometric.xml
index 7d01472..c545b47 100644
--- a/res/xml/security_settings_combined_biometric.xml
+++ b/res/xml/security_settings_combined_biometric.xml
@@ -66,7 +66,7 @@
settings:keywords="@string/keywords_biometric_unlock"
settings:controller="com.android.settings.biometrics.combination.BiometricSettingsKeyguardPreferenceController"/>
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="biometric_settings_biometric_app"
android:title="@string/biometric_settings_use_biometric_for_apps"
settings:keywords="@string/keywords_biometric_unlock"
diff --git a/res/xml/security_settings_combined_biometric_profile.xml b/res/xml/security_settings_combined_biometric_profile.xml
index 22d19ac..1ab4106 100644
--- a/res/xml/security_settings_combined_biometric_profile.xml
+++ b/res/xml/security_settings_combined_biometric_profile.xml
@@ -45,7 +45,7 @@
<PreferenceCategory
android:key="biometric_ways_to_use">
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="biometric_settings_biometric_app_profile"
android:title="@string/biometric_settings_use_biometric_for_apps"
settings:keywords="@string/keywords_biometric_unlock"
diff --git a/res/xml/security_settings_face.xml b/res/xml/security_settings_face.xml
index 9fc8a1f..fd3498e 100644
--- a/res/xml/security_settings_face.xml
+++ b/res/xml/security_settings_face.xml
@@ -28,7 +28,7 @@
android:title="@string/biometric_settings_use_biometric_unlock_phone"
settings:keywords="@string/keywords_face_unlock"
settings:controller="com.android.settings.biometrics.face.FaceSettingsKeyguardPreferenceController"/>
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="security_settings_face_app"
android:title="@string/biometric_settings_use_biometric_for_apps"
settings:keywords="@string/keywords_face_unlock"
@@ -44,14 +44,14 @@
<PreferenceCategory
android:key="security_settings_face_manage_category"
android:title="@string/security_settings_face_settings_preferences_category">
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="security_settings_face_require_attention"
android:title="@string/security_settings_face_settings_require_attention"
android:summary="@string/security_settings_face_settings_require_attention_details"
settings:keywords="@string/keywords_face_unlock"
settings:controller="com.android.settings.biometrics.face.FaceSettingsAttentionPreferenceController"/>
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="security_settings_face_require_confirmation"
android:title="@string/security_settings_face_settings_require_confirmation"
android:summary="@string/security_settings_face_settings_require_confirmation_details"
diff --git a/res/xml/sim_lock_settings.xml b/res/xml/sim_lock_settings.xml
index 174e5c2..02db847 100644
--- a/res/xml/sim_lock_settings.xml
+++ b/res/xml/sim_lock_settings.xml
@@ -15,10 +15,9 @@
-->
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:settings="http://schemas.android.com/apk/res-auto"
- android:title="@string/sim_lock_settings">
+ android:title="@string/sim_lock_settings">
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="sim_toggle"
android:title="@string/sim_pin_toggle"
android:summaryOn="@string/sim_lock_on"
diff --git a/res/xml/smart_battery_detail.xml b/res/xml/smart_battery_detail.xml
index 9795125..4047674 100644
--- a/res/xml/smart_battery_detail.xml
+++ b/res/xml/smart_battery_detail.xml
@@ -26,14 +26,14 @@
android:key="auto_awesome_battery"
settings:lottie_rawRes="@raw/auto_awesome_battery_lottie" />
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="smart_battery"
android:title="@string/smart_battery_title"
android:summary="@string/smart_battery_summary"
settings:controller="com.android.settings.fuelgauge.SmartBatteryPreferenceController"
settings:allowDividerAbove="true"/>
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="auto_restriction"
android:title="@string/battery_auto_restriction_title"
android:summary="@string/battery_auto_restriction_summary"
diff --git a/res/xml/smart_forwarding_switch.xml b/res/xml/smart_forwarding_switch.xml
index dda9d5a..a278cdf 100644
--- a/res/xml/smart_forwarding_switch.xml
+++ b/res/xml/smart_forwarding_switch.xml
@@ -1,10 +1,9 @@
<PreferenceScreen
- xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:settings="http://schemas.android.com/apk/res-auto"
- android:key="smart_forwarding_preference"
- android:title="@string/smart_forwarding_title">
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:key="smart_forwarding_preference"
+ android:title="@string/smart_forwarding_title">
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="smart_forwarding_switch"
android:title="Smart forwarding"
android:summaryOff="@string/smart_forwarding_summary_disabled"
diff --git a/res/xml/sound_settings.xml b/res/xml/sound_settings.xml
index 57e3249..15312c8 100644
--- a/res/xml/sound_settings.xml
+++ b/res/xml/sound_settings.xml
@@ -169,37 +169,37 @@
android:order="-60"/>
<!-- Dial pad tones -->
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="dial_pad_tones"
android:title="@string/dial_pad_tones_title"
android:order="-50"/>
<!-- Screen locking sounds -->
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="screen_locking_sounds"
android:title="@string/screen_locking_sounds_title"
android:order="-45"/>
<!-- Charging sounds -->
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="charging_sounds"
android:title="@string/charging_sounds_title"
android:order="-40"/>
<!-- Docking sounds -->
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="docking_sounds"
android:title="@string/docking_sounds_title"
android:order="-35"/>
<!-- Touch sounds -->
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="touch_sounds"
android:title="@string/touch_sounds_title"
android:order="-30"/>
<!-- Show vibrate icon in status bar -->
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="vibrate_icon"
android:title="@string/vibrate_icon_title"
android:order="-27"/>
@@ -212,7 +212,7 @@
android:order="-20"/>
<!-- Boot sounds -->
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="boot_sounds"
android:title="@string/boot_sounds_title"
android:order="-15"/>
diff --git a/res/xml/sound_work_settings.xml b/res/xml/sound_work_settings.xml
index 8e48fac..a7ab57a 100644
--- a/res/xml/sound_work_settings.xml
+++ b/res/xml/sound_work_settings.xml
@@ -19,7 +19,7 @@
android:title="@string/sound_work_settings">
<!-- Use the same sounds of the work profile -->
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="work_use_personal_sounds"
android:title="@string/work_use_personal_sounds_title"
android:summary="@string/work_use_personal_sounds_summary"
diff --git a/res/xml/spatial_audio_settings.xml b/res/xml/spatial_audio_settings.xml
index 13d3b25..7355f98 100644
--- a/res/xml/spatial_audio_settings.xml
+++ b/res/xml/spatial_audio_settings.xml
@@ -24,12 +24,12 @@
android:title="@string/spatial_audio_text"
settings:searchable="false"/>
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="spatial_audio"
android:title="@string/spatial_audio_speaker"
settings:controller="com.android.settings.notification.SpatialAudioPreferenceController"/>
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="spatial_audio_wired_headphones"
android:title="@string/spatial_audio_wired_headphones"
settings:controller="com.android.settings.notification.SpatialAudioWiredHeadphonesController"/>
diff --git a/res/xml/swipe_to_notification_settings.xml b/res/xml/swipe_to_notification_settings.xml
index 9d681a1..766a894 100644
--- a/res/xml/swipe_to_notification_settings.xml
+++ b/res/xml/swipe_to_notification_settings.xml
@@ -26,7 +26,7 @@
settings:searchable="false"
app:lottie_rawRes="@raw/lottie_swipe_fingerprint"/>
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="gesture_swipe_down_fingerprint"
android:title="@string/fingerprint_swipe_for_notifications_title"
android:summary="@string/fingerprint_swipe_for_notifications_summary"
diff --git a/res/xml/tap_screen_gesture_settings.xml b/res/xml/tap_screen_gesture_settings.xml
index 468b416..6b2674b 100644
--- a/res/xml/tap_screen_gesture_settings.xml
+++ b/res/xml/tap_screen_gesture_settings.xml
@@ -26,7 +26,7 @@
settings:searchable="false"
app:lottie_rawRes="@raw/lottie_tap_to_check_phone"/>
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="gesture_tap"
android:title="@string/ambient_display_tap_screen_title"
android:summary="@string/ambient_display_tap_screen_summary"
diff --git a/res/xml/tether_prefs.xml b/res/xml/tether_prefs.xml
index a6e0a39..89bd631 100644
--- a/res/xml/tether_prefs.xml
+++ b/res/xml/tether_prefs.xml
@@ -37,13 +37,13 @@
android:summary="@string/usb_tethering_subtext"
settings:keywords="@string/keywords_hotspot_tethering" />
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="enable_bluetooth_tethering"
android:title="@string/bluetooth_tether_checkbox_text"
android:summary="@string/bluetooth_tethering_subtext"
settings:keywords="@string/keywords_hotspot_tethering" />
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="enable_ethernet_tethering"
android:title="@string/ethernet_tether_checkbox_text"
android:summary="@string/ethernet_tethering_subtext"
diff --git a/res/xml/trackpad_gesture_settings.xml b/res/xml/trackpad_gesture_settings.xml
index 6cac7f6..c2cdbdf 100644
--- a/res/xml/trackpad_gesture_settings.xml
+++ b/res/xml/trackpad_gesture_settings.xml
@@ -19,7 +19,7 @@
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:settings="http://schemas.android.com/apk/res-auto"
android:title="@string/trackpad_touchpad_gesture_title">
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="gesture_go_back"
android:title="@string/trackpad_go_back_title"
android:summary="@string/trackpad_go_back_summary"
@@ -27,7 +27,7 @@
android:order="10"
settings:controller="com.android.settings.inputmethod.TrackpadGoBackPreferenceController"/>
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="gesture_go_home"
android:title="@string/trackpad_go_home_title"
android:summary="@string/trackpad_go_home_summary"
@@ -35,7 +35,7 @@
android:order="20"
settings:controller="com.android.settings.inputmethod.TrackpadGoHomePreferenceController"/>
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="gesture_recent_apps"
android:title="@string/trackpad_recent_apps_title"
android:summary="@string/trackpad_recent_apps_summary"
@@ -43,7 +43,7 @@
android:order="30"
settings:controller="com.android.settings.inputmethod.TrackpadRecentAppsPreferenceController"/>
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="gesture_notifications"
android:title="@string/trackpad_notifications_title"
android:summary="@string/trackpad_notifications_summary"
@@ -51,7 +51,7 @@
android:order="40"
settings:controller="com.android.settings.inputmethod.TrackpadNotificationsPreferenceController"/>
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="gesture_switch_apps"
android:title="@string/trackpad_switch_apps_title"
android:summary="@string/trackpad_switch_apps_summary"
diff --git a/res/xml/trackpad_settings.xml b/res/xml/trackpad_settings.xml
index 19ce259..84ea528 100644
--- a/res/xml/trackpad_settings.xml
+++ b/res/xml/trackpad_settings.xml
@@ -28,14 +28,14 @@
android:fragment="com.android.settings.inputmethod.TrackpadTouchGestureSettings"
settings:controller="com.android.settings.inputmethod.TrackpadTouchGestureSettingsController"/>
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="trackpad_tap_to_click"
android:title="@string/trackpad_tap_to_click"
android:icon="@drawable/ic_trackpad_tap_to_click"
settings:controller="com.android.settings.inputmethod.TrackpadTapToClickPreferenceController"
android:order="10"/>
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="trackpad_reverse_scrolling"
android:title="@string/trackpad_reverse_scrolling_title"
android:summary="@string/trackpad_reverse_scrolling_summary"
@@ -43,7 +43,7 @@
settings:controller="com.android.settings.inputmethod.TrackpadReverseScrollingPreferenceController"
android:order="20"/>
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="trackpad_bottom_right_tap"
android:title="@string/trackpad_bottom_right_tap_title"
android:summary="@string/trackpad_bottom_right_tap_summary"
diff --git a/res/xml/transcode_settings.xml b/res/xml/transcode_settings.xml
index 5c3bb7c..dd57515 100644
--- a/res/xml/transcode_settings.xml
+++ b/res/xml/transcode_settings.xml
@@ -21,27 +21,27 @@
android:title="@string/transcode_settings_title"
settings:searchable="false">
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="transcode_user_control"
android:title="@string/transcode_user_control"
settings:controller="com.android.settings.development.transcode.TranscodeUserControlPreferenceController" />
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="transcode_enable_all"
android:title="@string/transcode_enable_all"
settings:controller="com.android.settings.development.transcode.TranscodeGlobalTogglePreferenceController" />
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="transcode_default"
android:title="@string/transcode_default"
settings:controller="com.android.settings.development.transcode.TranscodeDefaultOptionPreferenceController" />
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="transcode_notification"
android:title="@string/transcode_notification"
settings:controller="com.android.settings.development.transcode.TranscodeNotificationPreferenceController" />
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="transcode_disable_cache"
android:title="@string/transcode_disable_cache"
settings:controller="com.android.settings.development.transcode.TranscodeDisableCachePreferenceController" />
diff --git a/res/xml/user_details_settings.xml b/res/xml/user_details_settings.xml
index 068039c..8e15d14 100644
--- a/res/xml/user_details_settings.xml
+++ b/res/xml/user_details_settings.xml
@@ -21,11 +21,11 @@
<com.android.settingslib.RestrictedPreference
android:key="switch_user"
android:icon="@drawable/ic_swap" />
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="user_grant_admin"
android:icon="@drawable/ic_admin_panel_settings"
android:title="@string/user_grant_admin" />
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="enable_calling"
android:icon="@drawable/ic_phone"
android:title="@string/user_enable_calling_sms" />
diff --git a/res/xml/wifi_configure_settings.xml b/res/xml/wifi_configure_settings.xml
index 2ab7b6a..bf795d0 100644
--- a/res/xml/wifi_configure_settings.xml
+++ b/res/xml/wifi_configure_settings.xml
@@ -19,14 +19,14 @@
xmlns:settings="http://schemas.android.com/apk/res-auto"
android:title="@string/wifi_configure_settings_preference_title">
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="enable_wifi_wakeup"
android:title="@string/wifi_wakeup"
android:icon="@drawable/ic_auto_wifi"
android:summary="@string/wifi_wakeup_summary"
settings:controller="com.android.settings.wifi.WifiWakeupPreferenceController"/>
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="notify_open_networks"
android:title="@string/wifi_notify_open_networks"
android:icon="@drawable/ic_open_wifi_notifications"
@@ -34,7 +34,7 @@
settings:keywords="@string/keywords_wifi_notify_open_networks"
settings:controller="com.android.settings.wifi.NotifyOpenNetworksPreferenceController"/>
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="wifi_cellular_data_fallback"
android:title="@string/wifi_cellular_data_fallback_title"
android:summary="@string/wifi_cellular_data_fallback_summary"
diff --git a/res/xml/wifi_network_details_fragment2.xml b/res/xml/wifi_network_details_fragment2.xml
index 0062474..56e7b04 100644
--- a/res/xml/wifi_network_details_fragment2.xml
+++ b/res/xml/wifi_network_details_fragment2.xml
@@ -102,7 +102,7 @@
android:title="@string/wifi_subscription"
android:summary="@string/wifi_subscription_summary"/>
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="auto_connect"
android:title="@string/wifi_auto_connect_title"
android:summary="@string/wifi_auto_connect_summary"/>
diff --git a/res/xml/wifi_tether_settings.xml b/res/xml/wifi_tether_settings.xml
index b8b810f..4924bf9 100644
--- a/res/xml/wifi_tether_settings.xml
+++ b/res/xml/wifi_tether_settings.xml
@@ -44,12 +44,12 @@
android:persistent="false"
android:title="@string/wifi_hotspot_password_title"/>
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="wifi_tether_auto_turn_off"
android:title="@string/wifi_hotspot_auto_off_title"
android:summary="@string/wifi_hotspot_auto_off_summary"/>
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="wifi_tether_maximize_compatibility"
android:title="@string/wifi_hotspot_maximize_compatibility"/>
diff --git a/res/xml/zen_mode_calls_settings.xml b/res/xml/zen_mode_calls_settings.xml
index a0b39a9c..447353e 100644
--- a/res/xml/zen_mode_calls_settings.xml
+++ b/res/xml/zen_mode_calls_settings.xml
@@ -29,7 +29,7 @@
</PreferenceCategory>
<!-- Repeat callers -->
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="zen_mode_repeat_callers"
android:title="@string/zen_mode_repeat_callers_title"
settings:allowDividerAbove="true"/>
diff --git a/res/xml/zen_mode_custom_rule_calls_settings.xml b/res/xml/zen_mode_custom_rule_calls_settings.xml
index 4dca2ad..4bc3cb6 100644
--- a/res/xml/zen_mode_custom_rule_calls_settings.xml
+++ b/res/xml/zen_mode_custom_rule_calls_settings.xml
@@ -35,7 +35,7 @@
android:title="@string/zen_mode_starred_contacts_title"/>
<!-- Repeat callers -->
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="zen_mode_repeat_callers"
android:title="@string/zen_mode_repeat_callers_title" />
</PreferenceCategory>
diff --git a/res/xml/zen_mode_custom_rule_configuration.xml b/res/xml/zen_mode_custom_rule_configuration.xml
index 664c09a..906d642 100644
--- a/res/xml/zen_mode_custom_rule_configuration.xml
+++ b/res/xml/zen_mode_custom_rule_configuration.xml
@@ -34,31 +34,31 @@
android:title="@string/zen_mode_messages" />
<!-- Alarms -->
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="zen_rule_alarms"
android:title="@string/zen_mode_alarms"
android:summary="@string/zen_mode_alarms_summary"/>
<!-- Media -->
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="zen_rule_media"
android:title="@string/zen_mode_media"
android:summary="@string/zen_mode_media_summary"/>
<!-- System -->
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="zen_rule_system"
android:title="@string/zen_mode_system"
android:summary="@string/zen_mode_system_summary"/>
<!-- Reminders -->
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="zen_rule_reminders"
android:title="@string/zen_mode_reminders"
android:summary="@string/zen_mode_reminders_summary"/>
<!-- Events -->
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="zen_rule_events"
android:title="@string/zen_mode_events"
android:summary="@string/zen_mode_events_summary"/>
diff --git a/res/xml/zen_mode_schedule_rule_settings.xml b/res/xml/zen_mode_schedule_rule_settings.xml
index 874f5c9..82483f3 100644
--- a/res/xml/zen_mode_schedule_rule_settings.xml
+++ b/res/xml/zen_mode_schedule_rule_settings.xml
@@ -42,7 +42,7 @@
<!-- Start time/End time added and removed here! :-) -->
<!-- Exit DND mode with alarm -->
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="exit_at_alarm"
android:title="@string/zen_mode_schedule_alarm_title"
android:summary="@string/zen_mode_schedule_alarm_summary"
diff --git a/res/xml/zen_mode_sound_vibration_settings.xml b/res/xml/zen_mode_sound_vibration_settings.xml
index 2db42ac..ab22159 100644
--- a/res/xml/zen_mode_sound_vibration_settings.xml
+++ b/res/xml/zen_mode_sound_vibration_settings.xml
@@ -20,29 +20,29 @@
android:title="@string/zen_category_exceptions" >
<!-- Alarms -->
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="zen_mode_alarms"
android:title="@string/zen_mode_alarms"/>
<!-- Media -->
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="zen_mode_media"
android:title="@string/zen_mode_media"
android:summary="@string/zen_mode_media_summary"/>
<!-- System -->
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="zen_mode_system"
android:title="@string/zen_mode_system"
android:summary="@string/zen_mode_system_summary"/>
<!-- Reminders -->
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="zen_mode_reminders"
android:title="@string/zen_mode_reminders"/>
<!-- Events -->
- <SwitchPreference
+ <SwitchPreferenceCompat
android:key="zen_mode_events"
android:title="@string/zen_mode_events"/>