From 69fcec059ddef7156302cc44af3905cc93d51173 Mon Sep 17 00:00:00 2001
From: Arjan Schrijver <a_gadgetbridge@anymore.nl>
Date: Fri, 6 Oct 2023 22:06:35 +0200
Subject: [PATCH] Replace old-style preference switch with Material 3 switch

---
 .../AbstractPreferenceFragment.java           |  6 +--
 .../capabilities/HeartRateCapability.java     |  8 ++--
 .../HybridHRWatchfaceSettingsActivity.java    | 10 ++--
 .../HybridHRWatchfaceWidgetActivity.java      |  6 +--
 .../res/layout/preference_material_switch.xml | 10 ++++
 app/src/main/res/values/styles.xml            | 12 +++++
 app/src/main/res/xml/charts_preferences.xml   | 12 ++---
 .../xml/devicesettings_always_on_display.xml  |  2 +-
 .../main/res/xml/devicesettings_antilost.xml  |  2 +-
 .../res/xml/devicesettings_autoheartrate.xml  |  4 +-
 .../main/res/xml/devicesettings_autolight.xml |  2 +-
 .../xml/devicesettings_autoremove_message.xml |  2 +-
 ...evicesettings_autoremove_notifications.xml |  2 +-
 .../xml/devicesettings_banglejs_location.xml  |  4 +-
 ...icesettings_bt_connected_advertisement.xml |  2 +-
 .../res/xml/devicesettings_buttonactions.xml  |  4 +-
 ...esettings_buttonactions_with_longpress.xml |  4 +-
 .../res/xml/devicesettings_camera_remote.xml  |  2 +-
 .../devicesettings_connect_two_devices.xml    |  2 +-
 .../xml/devicesettings_custom_deviceicon.xml  |  2 +-
 .../xml/devicesettings_custom_emoji_font.xml  |  2 +-
 ..._device_card_activity_card_preferences.xml |  8 ++--
 .../res/xml/devicesettings_device_intents.xml |  2 +-
 .../devicesettings_device_internet_access.xml |  2 +-
 ...settings_disconnectnotification_noshed.xml |  2 +-
 .../res/xml/devicesettings_display_caller.xml |  2 +-
 ...devicesettings_donotdisturb_lift_wrist.xml |  2 +-
 .../devicesettings_expose_hr_thirdparty.xml   |  2 +-
 .../xml/devicesettings_fake_ring_duration.xml |  2 +-
 .../res/xml/devicesettings_fossilhybridhr.xml | 22 ++++-----
 ...devicesettings_fossilhybridhr_pre_fw20.xml |  4 +-
 .../res/xml/devicesettings_galaxy_buds.xml    | 12 ++---
 .../res/xml/devicesettings_galaxy_buds_2.xml  | 18 ++++----
 .../xml/devicesettings_galaxy_buds_2_pro.xml  | 20 ++++----
 .../xml/devicesettings_galaxy_buds_live.xml   |  8 ++--
 .../xml/devicesettings_galaxy_buds_pro.xml    | 20 ++++----
 .../xml/devicesettings_goal_notification.xml  |  2 +-
 .../main/res/xml/devicesettings_gps_agps.xml  |  2 +-
 .../xml/devicesettings_heartrate_sleep.xml    |  2 +-
 ...evicesettings_heartrate_sleep_activity.xml |  4 +-
 ..._heartrate_sleep_alert_activity_stress.xml |  8 ++--
 ...trate_sleep_alert_activity_stress_spo2.xml | 12 ++---
 .../main/res/xml/devicesettings_high_mtu.xml  |  2 +-
 .../res/xml/devicesettings_hourly_chime.xml   |  2 +-
 .../xml/devicesettings_huami2021_alexa.xml    |  2 +-
 ...gs_huami2021_fetch_operation_time_unit.xml |  2 +-
 .../xml/devicesettings_hydration_reminder.xml |  2 +-
 .../res/xml/devicesettings_inactivity.xml     |  2 +-
 .../res/xml/devicesettings_inactivity_dnd.xml |  4 +-
 ...cesettings_inactivity_dnd_no_threshold.xml |  4 +-
 .../devicesettings_inactivity_extended.xml    |  2 +-
 .../xml/devicesettings_inactivity_noshed.xml  |  2 +-
 ...esettings_keep_activity_data_on_device.xml |  2 +-
 .../res/xml/devicesettings_key_vibration.xml  |  2 +-
 ...evicesettings_liftwrist_display_noshed.xml |  2 +-
 .../res/xml/devicesettings_lock_unlock.xml    |  2 +-
 .../devicesettings_lowlatency_fwupdate.xml    |  2 +-
 .../main/res/xml/devicesettings_miband2.xml   |  2 +-
 .../devicesettings_miband6_new_protocol.xml   |  2 +-
 .../xml/devicesettings_morning_updates.xml    |  2 +-
 .../res/xml/devicesettings_nothing_ear1.xml   |  2 +-
 .../devicesettings_notifications_enable.xml   |  2 +-
 .../res/xml/devicesettings_offline_voice.xml  |  6 +--
 .../xml/devicesettings_operating_sounds.xml   |  2 +-
 ...tings_overwrite_settings_on_connection.xml |  2 +-
 .../main/res/xml/devicesettings_password.xml  |  2 +-
 .../devicesettings_phone_calls_watch_pair.xml |  4 +-
 .../devicesettings_reconnect_bl_classic.xml   |  2 +-
 .../res/xml/devicesettings_reconnect_ble.xml  |  2 +-
 .../devicesettings_relax_firmware_checks.xml  |  2 +-
 .../devicesettings_rotatewrist_cycleinfo.xml  |  2 +-
 ...icesettings_screen_brightness_withauto.xml |  2 +-
 ...icesettings_screen_on_on_notifications.xml |  2 +-
 ...vicesettings_settings_third_party_apps.xml |  2 +-
 .../res/xml/devicesettings_sleep_mode.xml     |  4 +-
 ..._sony_headphones_ambient_sound_control.xml |  2 +-
 ...ent_sound_control_wind_noise_reduction.xml |  2 +-
 ...tings_sony_headphones_audio_upsampling.xml |  2 +-
 ...y_headphones_notifications_voice_guide.xml |  2 +-
 ...s_sony_headphones_pause_when_taken_off.xml |  2 +-
 ...s_sony_headphones_speak_to_chat_simple.xml |  2 +-
 ...headphones_speak_to_chat_with_settings.xml |  4 +-
 ...gs_sony_headphones_touch_sensor_single.xml |  2 +-
 .../main/res/xml/devicesettings_sonyswr12.xml |  4 +-
 .../devicesettings_sound_and_vibration.xml    | 10 ++--
 .../res/xml/devicesettings_swipeunlock.xml    |  2 +-
 .../res/xml/devicesettings_sync_calendar.xml  |  2 +-
 .../res/xml/devicesettings_text_bitmaps.xml   |  2 +-
 .../xml/devicesettings_vibrations_enable.xml  |  2 +-
 .../res/xml/devicesettings_watchxplus.xml     | 12 ++---
 app/src/main/res/xml/devicesettings_wena3.xml | 14 +++---
 .../xml/devicesettings_workout_detection.xml  |  2 +-
 .../devicesettings_workout_keep_screen_on.xml |  2 +-
 ...evicesettings_workout_send_gps_to_band.xml |  2 +-
 .../devicesettings_workout_start_on_phone.xml |  2 +-
 .../res/xml/discovery_pairing_preferences.xml |  6 +--
 .../res/xml/fossil_hr_watchface_settings.xml  |  8 ++--
 .../res/xml/fossil_hr_widget_settings.xml     |  4 +-
 app/src/main/res/xml/hplus_preferences.xml    |  2 +-
 app/src/main/res/xml/loyalty_cards.xml        |  6 +--
 app/src/main/res/xml/miband_preferences.xml   |  4 +-
 .../res/xml/notifications_preferences.xml     | 16 +++----
 app/src/main/res/xml/pebble_preferences.xml   | 28 +++++------
 app/src/main/res/xml/preferences.xml          | 46 +++++++++----------
 app/src/main/res/xml/zetime_preferences.xml   | 24 +++++-----
 105 files changed, 287 insertions(+), 265 deletions(-)
 create mode 100644 app/src/main/res/layout/preference_material_switch.xml

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AbstractPreferenceFragment.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AbstractPreferenceFragment.java
index bf1e5ae2b..07b4de95e 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AbstractPreferenceFragment.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AbstractPreferenceFragment.java
@@ -29,7 +29,7 @@ import androidx.preference.PreferenceFragmentCompat;
 import androidx.preference.PreferenceGroup;
 import androidx.preference.PreferenceScreen;
 import androidx.preference.SeekBarPreference;
-import androidx.preference.SwitchPreference;
+import androidx.preference.SwitchPreferenceCompat;
 
 import com.mobeta.android.dslv.DragSortListPreference;
 import com.mobeta.android.dslv.DragSortListPreferenceFragment;
@@ -183,8 +183,8 @@ public abstract class AbstractPreferenceFragment extends PreferenceFragmentCompa
             if (preference instanceof SeekBarPreference) {
                 final SeekBarPreference seekBarPreference = (SeekBarPreference) preference;
                 seekBarPreference.setValue(prefs.getInt(key, seekBarPreference.getValue()));
-            } else if (preference instanceof SwitchPreference) {
-                final SwitchPreference switchPreference = (SwitchPreference) preference;
+            } else if (preference instanceof SwitchPreferenceCompat) {
+                final SwitchPreferenceCompat switchPreference = (SwitchPreferenceCompat) preference;
                 switchPreference.setChecked(prefs.getBoolean(key, switchPreference.isChecked()));
             } else if (preference instanceof ListPreference) {
                 final ListPreference listPreference = (ListPreference) preference;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/capabilities/HeartRateCapability.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/capabilities/HeartRateCapability.java
index c855c6203..6fd390d25 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/capabilities/HeartRateCapability.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/capabilities/HeartRateCapability.java
@@ -28,7 +28,7 @@ import android.content.Context;
 
 import androidx.preference.ListPreference;
 import androidx.preference.Preference;
-import androidx.preference.SwitchPreference;
+import androidx.preference.SwitchPreferenceCompat;
 
 import java.util.List;
 
@@ -109,9 +109,9 @@ public class HeartRateCapability {
             heartrateMeasurementInterval.setEntries(entries);
             heartrateMeasurementInterval.setEntryValues(values);
 
-            final SwitchPreference activityMonitoring = handler.findPreference(PREF_HEARTRATE_ACTIVITY_MONITORING);
-            final SwitchPreference heartrateAlertEnabled = handler.findPreference(PREF_HEARTRATE_ALERT_ENABLED);
-            final SwitchPreference stressMonitoring = handler.findPreference(PREF_HEARTRATE_STRESS_MONITORING);
+            final SwitchPreferenceCompat activityMonitoring = handler.findPreference(PREF_HEARTRATE_ACTIVITY_MONITORING);
+            final SwitchPreferenceCompat heartrateAlertEnabled = handler.findPreference(PREF_HEARTRATE_ALERT_ENABLED);
+            final SwitchPreferenceCompat stressMonitoring = handler.findPreference(PREF_HEARTRATE_STRESS_MONITORING);
 
             heartrateMeasurementInterval.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
                 public boolean onPreferenceChange(final Preference preference, final Object newVal) {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/HybridHRWatchfaceSettingsActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/HybridHRWatchfaceSettingsActivity.java
index fd72ab140..8e43162ee 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/HybridHRWatchfaceSettingsActivity.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/HybridHRWatchfaceSettingsActivity.java
@@ -25,7 +25,7 @@ import androidx.preference.EditTextPreference;
 import androidx.preference.ListPreference;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceFragmentCompat;
-import androidx.preference.SwitchPreference;
+import androidx.preference.SwitchPreferenceCompat;
 
 import nodomain.freeyourgadget.gadgetbridge.R;
 import nodomain.freeyourgadget.gadgetbridge.activities.AbstractPreferenceFragment;
@@ -99,7 +99,7 @@ public class HybridHRWatchfaceSettingsActivity extends AbstractSettingsActivityV
             refresh_partial.setSummary(Integer.toString(settings.getDisplayTimeoutPartial()));
             setInputTypeFor("pref_hybridhr_watchface_refresh_partial", InputType.TYPE_CLASS_NUMBER);
 
-            SwitchPreference wrist_flick_relative = findPreference("pref_hybridhr_watchface_wrist_flick_relative");
+            SwitchPreferenceCompat wrist_flick_relative = findPreference("pref_hybridhr_watchface_wrist_flick_relative");
             wrist_flick_relative.setOnPreferenceChangeListener(this);
             wrist_flick_relative.setChecked(settings.isWristFlickHandsMoveRelative());
 
@@ -136,15 +136,15 @@ public class HybridHRWatchfaceSettingsActivity extends AbstractSettingsActivityV
             move_hands.setValue(settings.getMoveHandsEvent());
             move_hands.setSummary(move_hands.getEntry());
 
-            SwitchPreference power_saving_display = findPreference("pref_hybridhr_watchface_power_saving_display");
+            SwitchPreferenceCompat power_saving_display = findPreference("pref_hybridhr_watchface_power_saving_display");
             power_saving_display.setOnPreferenceChangeListener(this);
             power_saving_display.setChecked(settings.getPowersaveDisplay());
 
-            SwitchPreference power_saving_hands = findPreference("pref_hybridhr_watchface_power_saving_hands");
+            SwitchPreferenceCompat power_saving_hands = findPreference("pref_hybridhr_watchface_power_saving_hands");
             power_saving_hands.setOnPreferenceChangeListener(this);
             power_saving_hands.setChecked(settings.getPowersaveHands());
 
-            SwitchPreference light_up_on_notification = findPreference("pref_hybridhr_watchface_light_up_on_notification");
+            SwitchPreferenceCompat light_up_on_notification = findPreference("pref_hybridhr_watchface_light_up_on_notification");
             light_up_on_notification.setOnPreferenceChangeListener(this);
             light_up_on_notification.setChecked(settings.getLightUpOnNotification());
         }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/HybridHRWatchfaceWidgetActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/HybridHRWatchfaceWidgetActivity.java
index e7bdfbc35..a8fca2b59 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/HybridHRWatchfaceWidgetActivity.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/HybridHRWatchfaceWidgetActivity.java
@@ -26,7 +26,7 @@ import androidx.preference.ListPreference;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceCategory;
 import androidx.preference.PreferenceFragmentCompat;
-import androidx.preference.SwitchPreference;
+import androidx.preference.SwitchPreferenceCompat;
 
 import java.util.LinkedHashMap;
 import java.util.TimeZone;
@@ -173,11 +173,11 @@ public class HybridHRWatchfaceWidgetActivity extends AbstractSettingsActivityV2
             customWidgetTimeout.setSummary(Integer.toString(widget.getExtraConfigInt("update_timeout", WIDGET_CUSTOM_DEFAULT_TIMEOUT)));
             setInputTypeFor("pref_hybridhr_widget_custom_timeout", InputType.TYPE_CLASS_NUMBER);
 
-            SwitchPreference customWidgetHideText = findPreference("pref_hybridhr_widget_custom_hide_text");
+            SwitchPreferenceCompat customWidgetHideText = findPreference("pref_hybridhr_widget_custom_hide_text");
             customWidgetHideText.setOnPreferenceChangeListener(this);
             customWidgetHideText.setChecked(widget.getExtraConfigBoolean("timeout_hide_text", WIDGET_CUSTOM_DEFAULT_HIDE_TEXT));
 
-            SwitchPreference customWidgetShowCircle = findPreference("pref_hybridhr_widget_custom_show_circle");
+            SwitchPreferenceCompat customWidgetShowCircle = findPreference("pref_hybridhr_widget_custom_show_circle");
             customWidgetShowCircle.setOnPreferenceChangeListener(this);
             customWidgetShowCircle.setChecked(widget.getExtraConfigBoolean("timeout_show_circle", WIDGET_CUSTOM_DEFAULT_SHOW_CIRCLE));
         }
diff --git a/app/src/main/res/layout/preference_material_switch.xml b/app/src/main/res/layout/preference_material_switch.xml
new file mode 100644
index 000000000..af3272ec5
--- /dev/null
+++ b/app/src/main/res/layout/preference_material_switch.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Found on https://stackoverflow.com/a/73782598 -->
+<!-- Derived from https://github.com/androidx/androidx/blob/8cb282cc/preference/preference/res/layout/preference_widget_switch_compat.xml -->
+<com.google.android.material.materialswitch.MaterialSwitch xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/switchWidget"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:background="@null"
+    android:clickable="false"
+    android:focusable="false" />
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 303953358..efbac57ed 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -18,6 +18,7 @@
         <item name="drawerArrowStyle">@style/GadgetbridgeTheme.DrawerButtonStyle</item>
         <item name="toolbarNavigationButtonStyle">@style/GadgetbridgeTheme.NavigationButtonStyle</item>
         <item name="actionOverflowButtonStyle">@style/GadgetbridgeTheme.OverflowMenuButton</item>
+        <item name="preferenceTheme">@style/AppPreferenceThemeOverlay</item>
 
         <item name="drawer_header_color">?attr/colorPrimaryDark</item>
         <item name="drawer_title_color">@android:color/white</item>
@@ -51,6 +52,7 @@
         <item name="drawerArrowStyle">@style/GadgetbridgeTheme.DrawerButtonStyle</item>
         <item name="toolbarNavigationButtonStyle">@style/GadgetbridgeTheme.NavigationButtonStyle</item>
         <item name="actionOverflowButtonStyle">@style/GadgetbridgeTheme.OverflowMenuButton</item>
+        <item name="preferenceTheme">@style/AppPreferenceThemeOverlay</item>
 
         <item name="drawer_header_color">?attr/colorPrimaryDark</item>
         <item name="drawer_title_color">@android:color/white</item>
@@ -84,6 +86,7 @@
         <item name="actionmenu_icon_color">?attr/colorOnSurface</item>
         <item name="alternate_row_background">?attr/colorSecondaryContainer</item>
         <item name="sports_activity_summary_background">?attr/colorSurface</item>
+        <item name="preferenceTheme">@style/AppPreferenceThemeOverlay</item>
     </style>
     <style name="GadgetbridgeThemeDynamicDark" parent="Theme.Material3.DynamicColors.Dark">
         <item name="actionBarStyle">@style/GadgetbridgeThemeDynamic.ActionBar</item>
@@ -97,6 +100,7 @@
         <item name="actionmenu_icon_color">?attr/colorOnSurface</item>
         <item name="alternate_row_background">?attr/colorSecondaryContainer</item>
         <item name="sports_activity_summary_background">?attr/colorSurface</item>
+        <item name="preferenceTheme">@style/AppPreferenceThemeOverlay</item>
     </style>
     <style name="GadgetbridgeThemeDynamicDarkAmoled" parent="GadgetbridgeThemeDynamicDark">
         <item name="android:windowBackground">@android:color/black</item>
@@ -160,4 +164,12 @@
         <item name="android:navigationBarColor">@color/primarydark_dark</item>
         <item name="android:windowBackground">@drawable/splash</item>
     </style>
+
+    <!-- preferences screens -->
+    <style name="AppPreferenceThemeOverlay" parent="@style/PreferenceThemeOverlay">
+        <item name="switchPreferenceCompatStyle">@style/AppSwitchPreference</item>
+    </style>
+    <style name="AppSwitchPreference" parent="@style/Preference.SwitchPreferenceCompat.Material">
+        <item name="widgetLayout">@layout/preference_material_switch</item>
+    </style>
 </resources>
diff --git a/app/src/main/res/xml/charts_preferences.xml b/app/src/main/res/xml/charts_preferences.xml
index 17eb110df..8d12ffa0a 100644
--- a/app/src/main/res/xml/charts_preferences.xml
+++ b/app/src/main/res/xml/charts_preferences.xml
@@ -24,7 +24,7 @@
             app:iconSpaceReserved="false"
             app:useSimpleSummaryProvider="true" />
 
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:defaultValue="false"
             android:key="chart_heartrate_color"
             android:summaryOff="@string/pref_chart_heartrate_color_orange"
@@ -32,13 +32,13 @@
             android:title="@string/pref_title_chart_heartrate_color"
             app:iconSpaceReserved="false" />
 
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:defaultValue="true"
             android:key="charts_allow_swipe"
             android:title="@string/pref_title_charts_swipe"
             app:iconSpaceReserved="false" />
 
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:defaultValue="false"
             android:key="chart_sleep_range_24h"
             android:summaryOff="@string/pref_chart_sleep_rolling_24_off"
@@ -46,13 +46,13 @@
             android:title="@string/pref_title_chart_sleep_rolling_24_hour"
             app:iconSpaceReserved="false" />
 
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:defaultValue="true"
             android:key="charts_show_average"
             android:title="@string/pref_title_charts_average"
             app:iconSpaceReserved="false" />
 
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:defaultValue="false"
             android:key="charts_range"
             android:summaryOff="@string/pref_charts_range_off"
@@ -60,7 +60,7 @@
             android:title="@string/pref_title_charts_range"
             app:iconSpaceReserved="false" />
 
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:defaultValue="true"
             android:key="charts_show_ongoing_activity"
             android:title="@string/show_ongoing_activity"
diff --git a/app/src/main/res/xml/devicesettings_always_on_display.xml b/app/src/main/res/xml/devicesettings_always_on_display.xml
index e0fff4312..d94a45d9a 100644
--- a/app/src/main/res/xml/devicesettings_always_on_display.xml
+++ b/app/src/main/res/xml/devicesettings_always_on_display.xml
@@ -28,7 +28,7 @@
             android:key="always_on_display_end"
             android:title="@string/mi2_prefs_do_not_disturb_end" />
 
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:defaultValue="true"
             android:key="always_on_display_follow_watchface"
             android:title="@string/prefs_always_on_display_follow_watchface" />
diff --git a/app/src/main/res/xml/devicesettings_antilost.xml b/app/src/main/res/xml/devicesettings_antilost.xml
index a4c9dc705..491daf709 100644
--- a/app/src/main/res/xml/devicesettings_antilost.xml
+++ b/app/src/main/res/xml/devicesettings_antilost.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-    <SwitchPreference
+    <SwitchPreferenceCompat
         android:defaultValue="true"
         android:icon="@drawable/ic_vibration"
         android:key="pref_antilost_enabled"
diff --git a/app/src/main/res/xml/devicesettings_autoheartrate.xml b/app/src/main/res/xml/devicesettings_autoheartrate.xml
index 68bb46ee1..746b44a8b 100644
--- a/app/src/main/res/xml/devicesettings_autoheartrate.xml
+++ b/app/src/main/res/xml/devicesettings_autoheartrate.xml
@@ -10,12 +10,12 @@
         <!-- workaround for missing toolbar -->
         <PreferenceCategory android:title="@string/prefs_autoheartrate_summary" />
 
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:defaultValue="false"
             android:key="pref_autoheartrate_switch"
             android:title="@string/prefs_autoheartrate_measurement" />
 
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:defaultValue="false"
             android:dependency="pref_autoheartrate_switch"
             android:key="pref_autoheartrate_sleep"
diff --git a/app/src/main/res/xml/devicesettings_autolight.xml b/app/src/main/res/xml/devicesettings_autolight.xml
index 3fe564e68..4061e5502 100644
--- a/app/src/main/res/xml/devicesettings_autolight.xml
+++ b/app/src/main/res/xml/devicesettings_autolight.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-    <SwitchPreference
+    <SwitchPreferenceCompat
         android:defaultValue="false"
         android:icon="@drawable/ic_wb_sunny"
         android:key="autolight"
diff --git a/app/src/main/res/xml/devicesettings_autoremove_message.xml b/app/src/main/res/xml/devicesettings_autoremove_message.xml
index 4be7a9800..adc4598a7 100644
--- a/app/src/main/res/xml/devicesettings_autoremove_message.xml
+++ b/app/src/main/res/xml/devicesettings_autoremove_message.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-    <SwitchPreference
+    <SwitchPreferenceCompat
         android:defaultValue="false"
         android:icon="@drawable/ic_block"
         android:key="autoremove_message"
diff --git a/app/src/main/res/xml/devicesettings_autoremove_notifications.xml b/app/src/main/res/xml/devicesettings_autoremove_notifications.xml
index 80c09d97c..0ecb6d6aa 100644
--- a/app/src/main/res/xml/devicesettings_autoremove_notifications.xml
+++ b/app/src/main/res/xml/devicesettings_autoremove_notifications.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-    <SwitchPreference
+    <SwitchPreferenceCompat
         android:icon="@drawable/ic_done_all"
         android:defaultValue="true"
         android:key="autoremove_notifications"
diff --git a/app/src/main/res/xml/devicesettings_banglejs_location.xml b/app/src/main/res/xml/devicesettings_banglejs_location.xml
index 00eb5fd70..d65017c12 100644
--- a/app/src/main/res/xml/devicesettings_banglejs_location.xml
+++ b/app/src/main/res/xml/devicesettings_banglejs_location.xml
@@ -3,7 +3,7 @@
     <PreferenceCategory
         android:key="pref_header_location"
         android:title="@string/pref_header_location">
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:defaultValue="false"
             android:icon="@drawable/ic_gps_location"
             android:key="banglejs_gps_update"
@@ -17,7 +17,7 @@
             android:key="banglejs_gps_update_interval"
             android:summary="@string/pref_summary_banglejs_phone_gps_update_interval"
             android:title="@string/pref_title_banglejs_phone_gps_update_interval" />
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:defaultValue="false"
             android:dependency="banglejs_gps_update"
             android:icon="@drawable/ic_gps_location"
diff --git a/app/src/main/res/xml/devicesettings_bt_connected_advertisement.xml b/app/src/main/res/xml/devicesettings_bt_connected_advertisement.xml
index 0f7b88fe1..f58478a3d 100644
--- a/app/src/main/res/xml/devicesettings_bt_connected_advertisement.xml
+++ b/app/src/main/res/xml/devicesettings_bt_connected_advertisement.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-    <SwitchPreference
+    <SwitchPreferenceCompat
         android:defaultValue="false"
         android:icon="@drawable/ic_settings_remote"
         android:key="bt_connected_advertisement"
diff --git a/app/src/main/res/xml/devicesettings_buttonactions.xml b/app/src/main/res/xml/devicesettings_buttonactions.xml
index 8002be183..97134fb55 100644
--- a/app/src/main/res/xml/devicesettings_buttonactions.xml
+++ b/app/src/main/res/xml/devicesettings_buttonactions.xml
@@ -12,14 +12,14 @@
 
         public static final String PREF_BUTTON_ACTION_PRESS_DELAY = "button_action_press_count_delay";
 
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:defaultValue="false"
             android:icon="@drawable/ic_smart_button"
             android:key="button_action_enable"
             android:summary="@string/mi2_prefs_button_action_summary"
             android:title="@string/mi2_prefs_button_action" />
 
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:defaultValue="false"
             android:icon="@drawable/ic_vibration"
             android:dependency="button_action_enable"
diff --git a/app/src/main/res/xml/devicesettings_buttonactions_with_longpress.xml b/app/src/main/res/xml/devicesettings_buttonactions_with_longpress.xml
index 719ef466f..2fa303f93 100644
--- a/app/src/main/res/xml/devicesettings_buttonactions_with_longpress.xml
+++ b/app/src/main/res/xml/devicesettings_buttonactions_with_longpress.xml
@@ -12,14 +12,14 @@
 
         public static final String PREF_BUTTON_ACTION_PRESS_DELAY = "button_action_press_count_delay";
 
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:defaultValue="false"
             android:icon="@drawable/ic_smart_button"
             android:key="button_action_enable"
             android:summary="@string/mi2_prefs_button_action_summary"
             android:title="@string/mi2_prefs_button_action" />
 
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:defaultValue="false"
             android:icon="@drawable/ic_vibration"
             android:dependency="button_action_enable"
diff --git a/app/src/main/res/xml/devicesettings_camera_remote.xml b/app/src/main/res/xml/devicesettings_camera_remote.xml
index 2739c8b43..cb6fd0f68 100644
--- a/app/src/main/res/xml/devicesettings_camera_remote.xml
+++ b/app/src/main/res/xml/devicesettings_camera_remote.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-    <SwitchPreference
+    <SwitchPreferenceCompat
         android:defaultValue="false"
         android:icon="@drawable/ic_camera_remote"
         android:key="camera_remote"
diff --git a/app/src/main/res/xml/devicesettings_connect_two_devices.xml b/app/src/main/res/xml/devicesettings_connect_two_devices.xml
index 183c45edb..f1482f9f5 100644
--- a/app/src/main/res/xml/devicesettings_connect_two_devices.xml
+++ b/app/src/main/res/xml/devicesettings_connect_two_devices.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <SwitchPreference
+    <SwitchPreferenceCompat
         android:defaultValue="false"
         android:icon="@drawable/ic_devices_other"
         android:key="pref_sony_connect_two_devices"
diff --git a/app/src/main/res/xml/devicesettings_custom_deviceicon.xml b/app/src/main/res/xml/devicesettings_custom_deviceicon.xml
index 2c37f6ad1..93329c4bf 100644
--- a/app/src/main/res/xml/devicesettings_custom_deviceicon.xml
+++ b/app/src/main/res/xml/devicesettings_custom_deviceicon.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-    <SwitchPreference
+    <SwitchPreferenceCompat
         android:icon="@drawable/ic_devices_other"
         android:defaultValue="true"
         android:key="use_custom_deviceicon"
diff --git a/app/src/main/res/xml/devicesettings_custom_emoji_font.xml b/app/src/main/res/xml/devicesettings_custom_emoji_font.xml
index f9d64604a..088513265 100644
--- a/app/src/main/res/xml/devicesettings_custom_emoji_font.xml
+++ b/app/src/main/res/xml/devicesettings_custom_emoji_font.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-    <SwitchPreference
+    <SwitchPreferenceCompat
         android:defaultValue="false"
         android:icon="@drawable/ic_font_download"
         android:key="use_custom_font"
diff --git a/app/src/main/res/xml/devicesettings_device_card_activity_card_preferences.xml b/app/src/main/res/xml/devicesettings_device_card_activity_card_preferences.xml
index 8c6968392..24ac7dc41 100644
--- a/app/src/main/res/xml/devicesettings_device_card_activity_card_preferences.xml
+++ b/app/src/main/res/xml/devicesettings_device_card_activity_card_preferences.xml
@@ -7,7 +7,7 @@
         android:summary="@string/device_card_activity_card_title_summary"
         android:title="@string/device_card_activity_card_title">
 
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:defaultValue="true"
             android:icon="@drawable/ic_activity_unknown_small"
             android:key="prefs_activity_in_device_card"
@@ -15,7 +15,7 @@
             android:summary="@string/prefs_activity_in_device_card_title_summary"
             android:title="@string/prefs_activity_in_device_card_title" />
 
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:defaultValue="true"
             android:dependency="prefs_activity_in_device_card"
             android:icon="@drawable/ic_shoe_prints_many"
@@ -24,7 +24,7 @@
             android:summary="@string/prefs_activity_in_device_card_steps_title_summary"
             android:title="@string/Steps" />
 
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:defaultValue="true"
             android:dependency="prefs_activity_in_device_card"
             android:icon="@drawable/ic_distance_total"
@@ -33,7 +33,7 @@
             android:summary="@string/prefs_activity_in_device_card_distance_title_summary"
             android:title="@string/Distance" />
 
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:defaultValue="true"
             android:dependency="prefs_activity_in_device_card"
             android:icon="@drawable/ic_activity_sleep"
diff --git a/app/src/main/res/xml/devicesettings_device_intents.xml b/app/src/main/res/xml/devicesettings_device_intents.xml
index d30169584..96662ef51 100644
--- a/app/src/main/res/xml/devicesettings_device_intents.xml
+++ b/app/src/main/res/xml/devicesettings_device_intents.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-    <SwitchPreference
+    <SwitchPreferenceCompat
         android:defaultValue="false"
         android:icon="@drawable/ic_language"
         android:key="device_intents"
diff --git a/app/src/main/res/xml/devicesettings_device_internet_access.xml b/app/src/main/res/xml/devicesettings_device_internet_access.xml
index a84b985b8..8119dc93f 100644
--- a/app/src/main/res/xml/devicesettings_device_internet_access.xml
+++ b/app/src/main/res/xml/devicesettings_device_internet_access.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-    <SwitchPreference
+    <SwitchPreferenceCompat
         android:defaultValue="false"
         android:icon="@drawable/ic_language"
         android:key="device_internet_access"
diff --git a/app/src/main/res/xml/devicesettings_disconnectnotification_noshed.xml b/app/src/main/res/xml/devicesettings_disconnectnotification_noshed.xml
index 317b37252..1a4fe217d 100644
--- a/app/src/main/res/xml/devicesettings_disconnectnotification_noshed.xml
+++ b/app/src/main/res/xml/devicesettings_disconnectnotification_noshed.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-    <SwitchPreference
+    <SwitchPreferenceCompat
         android:icon="@drawable/ic_signal_cellular_connected_no_internet_4_bar"
         android:defaultValue="false"
         android:key="disconnect_notification_noshed"
diff --git a/app/src/main/res/xml/devicesettings_display_caller.xml b/app/src/main/res/xml/devicesettings_display_caller.xml
index e4ca6f70e..38fcb6815 100644
--- a/app/src/main/res/xml/devicesettings_display_caller.xml
+++ b/app/src/main/res/xml/devicesettings_display_caller.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-    <SwitchPreference
+    <SwitchPreferenceCompat
         android:defaultValue="true"
         android:icon="@drawable/ic_person"
         android:key="display_caller"
diff --git a/app/src/main/res/xml/devicesettings_donotdisturb_lift_wrist.xml b/app/src/main/res/xml/devicesettings_donotdisturb_lift_wrist.xml
index c785c6558..e1bfe67cc 100644
--- a/app/src/main/res/xml/devicesettings_donotdisturb_lift_wrist.xml
+++ b/app/src/main/res/xml/devicesettings_donotdisturb_lift_wrist.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <SwitchPreference
+    <SwitchPreferenceCompat
         android:defaultValue="false"
         android:icon="@drawable/ic_arrow_upward"
         android:key="do_not_disturb_lift_wrist"
diff --git a/app/src/main/res/xml/devicesettings_expose_hr_thirdparty.xml b/app/src/main/res/xml/devicesettings_expose_hr_thirdparty.xml
index c38bd231b..296864ea4 100644
--- a/app/src/main/res/xml/devicesettings_expose_hr_thirdparty.xml
+++ b/app/src/main/res/xml/devicesettings_expose_hr_thirdparty.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-    <SwitchPreference
+    <SwitchPreferenceCompat
         android:defaultValue="false"
         android:icon="@drawable/ic_settings_remote"
         android:key="expose_hr_thirdparty"
diff --git a/app/src/main/res/xml/devicesettings_fake_ring_duration.xml b/app/src/main/res/xml/devicesettings_fake_ring_duration.xml
index e2cc4fa76..460a90968 100644
--- a/app/src/main/res/xml/devicesettings_fake_ring_duration.xml
+++ b/app/src/main/res/xml/devicesettings_fake_ring_duration.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-    <SwitchPreference
+    <SwitchPreferenceCompat
         android:defaultValue="false"
         android:icon="@drawable/ic_rotate_left"
         android:key="fake_ring_duration"
diff --git a/app/src/main/res/xml/devicesettings_fossilhybridhr.xml b/app/src/main/res/xml/devicesettings_fossilhybridhr.xml
index c6c840d28..8af465e73 100644
--- a/app/src/main/res/xml/devicesettings_fossilhybridhr.xml
+++ b/app/src/main/res/xml/devicesettings_fossilhybridhr.xml
@@ -11,13 +11,13 @@
         <PreferenceCategory
             android:key="pref_workout_detection_running"
             android:title="@string/activity_type_running">
-            <SwitchPreference
+            <SwitchPreferenceCompat
                 android:defaultValue="false"
                 android:key="activity_recognize_running_enabled"
                 android:title="@string/pref_workout_detection_enabled"
                 android:summary="@string/pref_workout_detection_summary"
                 android:icon="@drawable/ic_activity_running"/>
-            <SwitchPreference
+            <SwitchPreferenceCompat
                 android:defaultValue="false"
                 android:key="activity_recognize_running_ask_first"
                 android:title="@string/pref_workout_detection_ask_first"
@@ -37,13 +37,13 @@
         <PreferenceCategory
             android:key="pref_workout_detection_biking"
             android:title="@string/activity_type_biking">
-            <SwitchPreference
+            <SwitchPreferenceCompat
                 android:defaultValue="false"
                 android:key="activity_recognize_biking_enabled"
                 android:title="@string/pref_workout_detection_enabled"
                 android:summary="@string/pref_workout_detection_summary"
                 android:icon="@drawable/ic_activity_biking"/>
-            <SwitchPreference
+            <SwitchPreferenceCompat
                 android:defaultValue="false"
                 android:key="activity_recognize_biking_ask_first"
                 android:title="@string/pref_workout_detection_ask_first"
@@ -63,13 +63,13 @@
         <PreferenceCategory
             android:key="pref_workout_detection_walking"
             android:title="@string/activity_type_walking">
-            <SwitchPreference
+            <SwitchPreferenceCompat
                 android:defaultValue="false"
                 android:key="activity_recognize_walking_enabled"
                 android:title="@string/pref_workout_detection_enabled"
                 android:summary="@string/pref_workout_detection_summary"
                 android:icon="@drawable/ic_activity_walking"/>
-            <SwitchPreference
+            <SwitchPreferenceCompat
                 android:defaultValue="false"
                 android:key="activity_recognize_walking_ask_first"
                 android:title="@string/pref_workout_detection_ask_first"
@@ -89,13 +89,13 @@
         <PreferenceCategory
             android:key="pref_workout_detection_rowing"
             android:title="@string/activity_type_rowing">
-            <SwitchPreference
+            <SwitchPreferenceCompat
                 android:defaultValue="false"
                 android:key="activity_recognize_rowing_enabled"
                 android:title="@string/pref_workout_detection_enabled"
                 android:summary="@string/pref_workout_detection_summary"
                 android:icon="@drawable/ic_activity_rowing"/>
-            <SwitchPreference
+            <SwitchPreferenceCompat
                 android:defaultValue="false"
                 android:key="activity_recognize_rowing_ask_first"
                 android:title="@string/pref_workout_detection_ask_first"
@@ -146,12 +146,12 @@
         android:title="@string/pref_title_developer_settings"
         android:summary="@string/pref_summary_developer_settings">
 
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:defaultValue="false"
             android:key="save_raw_activity_files"
             android:title="@string/pref_qhybrid_save_raw_activity_files" />
 
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:defaultValue="false"
             android:key="dangerous_external_intents"
             android:title="@string/qhybrid_pref_title_external_intents"
@@ -165,7 +165,7 @@
                 android:targetClass="nodomain.freeyourgadget.gadgetbridge.devices.qhybrid.FileManagementActivity" />
         </Preference>
 
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:defaultValue="true"
             android:key="enable_on_device_confirmation"
             android:title="@string/qhybrid_title_on_device_confirmation"
diff --git a/app/src/main/res/xml/devicesettings_fossilhybridhr_pre_fw20.xml b/app/src/main/res/xml/devicesettings_fossilhybridhr_pre_fw20.xml
index e646899cd..e8d784c06 100644
--- a/app/src/main/res/xml/devicesettings_fossilhybridhr_pre_fw20.xml
+++ b/app/src/main/res/xml/devicesettings_fossilhybridhr_pre_fw20.xml
@@ -11,13 +11,13 @@
             android:targetClass="nodomain.freeyourgadget.gadgetbridge.devices.qhybrid.HRConfigActivity" />
     </Preference>
 
-    <SwitchPreference
+    <SwitchPreferenceCompat
         android:defaultValue="false"
         android:icon="@drawable/ic_filter_b_and_w"
         android:key="force_white_color_scheme"
         android:summary="@string/pref_summary_force_white_color_scheme"
         android:title="@string/pref_title_force_white_color_scheme" />
-    <SwitchPreference
+    <SwitchPreferenceCompat
         android:defaultValue="false"
         android:icon="@drawable/ic_circle"
         android:key="widget_draw_circles"
diff --git a/app/src/main/res/xml/devicesettings_galaxy_buds.xml b/app/src/main/res/xml/devicesettings_galaxy_buds.xml
index a44eb570f..f3f751566 100644
--- a/app/src/main/res/xml/devicesettings_galaxy_buds.xml
+++ b/app/src/main/res/xml/devicesettings_galaxy_buds.xml
@@ -8,13 +8,13 @@
         android:title="@string/prefs_ambient_mode">
 
         <PreferenceCategory android:title="@string/prefs_ambient_mode">
-            <SwitchPreference
+            <SwitchPreferenceCompat
                 android:defaultValue="false"
                 android:icon="@drawable/ic_hearing"
                 android:key="pref_galaxy_buds_ambient_mode"
                 android:summary="Hear surrounding sounds"
                 android:title="@string/prefs_ambient_sound" />
-            <SwitchPreference
+            <SwitchPreferenceCompat
                 android:defaultValue="false"
                 android:dependency="pref_galaxy_buds_ambient_mode"
                 android:icon="@drawable/ic_voice"
@@ -39,13 +39,13 @@
         android:persistent="false"
         android:title="@string/prefs_equalizer">
         <PreferenceCategory android:title="@string/prefs_equalizer">
-            <SwitchPreference
+            <SwitchPreferenceCompat
                 android:defaultValue="false"
                 android:icon="@drawable/ic_graphic_eq"
                 android:key="pref_galaxy_buds_equalizer"
                 android:summary="@string/prefs_equalizer_summary"
                 android:title="@string/prefs_equalizer" />
-            <SwitchPreference
+            <SwitchPreferenceCompat
                 android:defaultValue="false"
                 android:dependency="pref_galaxy_buds_equalizer"
                 android:icon="@drawable/ic_music_note"
@@ -69,7 +69,7 @@
         android:persistent="false"
         android:title="@string/prefs_galaxy_touch_options">
         <PreferenceCategory android:title="@string/prefs_galaxy_touch_options">
-            <SwitchPreference
+            <SwitchPreferenceCompat
                 android:defaultValue="false"
                 android:disableDependentsState="true"
                 android:icon="@drawable/ic_lock_open"
@@ -95,7 +95,7 @@
         </PreferenceCategory>
     </PreferenceScreen>
     <PreferenceCategory android:title="@string/prefs_galaxy_buds_experimental">
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:defaultValue="false"
             android:icon="@drawable/ic_videogame"
             android:key="pref_galaxy_buds_game_mode"
diff --git a/app/src/main/res/xml/devicesettings_galaxy_buds_2.xml b/app/src/main/res/xml/devicesettings_galaxy_buds_2.xml
index 387741b4b..7aa6cde0d 100644
--- a/app/src/main/res/xml/devicesettings_galaxy_buds_2.xml
+++ b/app/src/main/res/xml/devicesettings_galaxy_buds_2.xml
@@ -36,14 +36,14 @@
         android:title="@string/prefs_ambient_settings_title">
 
         <PreferenceCategory android:title="@string/prefs_ambient_sound">
-            <SwitchPreference
+            <SwitchPreferenceCompat
                 android:defaultValue="false"
                 android:icon="@drawable/ic_phone"
                 android:key="pref_galaxy_buds_ambient_mode_during_call"
                 android:summary="@string/prefs_ambient_sound_during_call_summary"
                 android:title="@string/prefs_ambient_sound_during_call_title" />
 
-            <SwitchPreference
+            <SwitchPreferenceCompat
                 android:defaultValue="false"
                 android:icon="@drawable/ic_hearing"
                 android:key="pref_galaxy_buds_ambient_sound"
@@ -97,7 +97,7 @@
         android:persistent="false"
         android:title="@string/prefs_galaxy_touch_options">
         <PreferenceCategory android:title="@string/prefs_galaxy_touch_options">
-            <SwitchPreference
+            <SwitchPreferenceCompat
                 android:defaultValue="true"
                 android:icon="@drawable/ic_touch"
                 android:key="pref_galaxy_buds_lock_touch"
@@ -139,7 +139,7 @@
                 android:summary="%s"
                 android:title="@string/prefs_switch_control_right" />
 
-            <SwitchPreference
+            <SwitchPreferenceCompat
                 android:defaultValue="false"
                 android:dependency="pref_galaxy_buds_lock_touch"
                 android:icon="@drawable/ic_touch"
@@ -154,20 +154,20 @@
         android:key="prefs_settings"
         android:persistent="false"
         android:title="@string/title_activity_settings">
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:defaultValue="false"
             android:icon="@drawable/ic_hearing"
             android:key="pref_galaxy_buds_pro_in_ear_detection"
             android:summary="@string/prefs_in_ear_detection_summary"
             android:title="@string/nothing_prefs_inear_title" />
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:defaultValue="false"
             android:icon="@drawable/ic_auto_awesome"
             android:key="prefs_galaxy_buds_seamless_connection"
             android:summary="@string/prefs_seamless_connection_switch_summary"
             android:title="@string/prefs_seamless_connection_switch_title" />
 
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:defaultValue="false"
             android:icon="@drawable/ic_hearing"
             android:key="pref_galaxy_buds_noise_controls_with_one_earbud"
@@ -185,7 +185,7 @@
             app:showSeekBarValue="true" />
 
         <PreferenceCategory android:title="@string/prefs_galaxy_buds_experimental">
-            <SwitchPreference
+            <SwitchPreferenceCompat
                 android:defaultValue="false"
                 android:icon="@drawable/ic_videogame"
                 android:key="pref_galaxy_buds_game_mode"
@@ -193,7 +193,7 @@
                 android:title="@string/prefs_game_mode" />
         </PreferenceCategory>
 
-        <!-- <SwitchPreference
+        <!-- <SwitchPreferenceCompat
             android:defaultValue="false"
             android:icon="@drawable/ic_graphic_eq"
             android:key="pref_galaxy_buds_pro_read_notifications_outloud"
diff --git a/app/src/main/res/xml/devicesettings_galaxy_buds_2_pro.xml b/app/src/main/res/xml/devicesettings_galaxy_buds_2_pro.xml
index 1a74a474c..ae84ca11d 100644
--- a/app/src/main/res/xml/devicesettings_galaxy_buds_2_pro.xml
+++ b/app/src/main/res/xml/devicesettings_galaxy_buds_2_pro.xml
@@ -16,7 +16,7 @@
         android:title="@string/prefs_ambient_settings_title">
 
         <PreferenceCategory android:title="@string/prefs_voice_detect">
-            <SwitchPreference
+            <SwitchPreferenceCompat
                 android:defaultValue="false"
                 android:icon="@drawable/ic_voice"
                 android:key="pref_galaxy_buds_pro_voice_detect"
@@ -36,14 +36,14 @@
         <PreferenceCategory android:title="@string/prefs_ambient_sound">
 
 
-            <SwitchPreference
+            <SwitchPreferenceCompat
                 android:defaultValue="false"
                 android:icon="@drawable/ic_phone"
                 android:key="pref_galaxy_buds_ambient_mode_during_call"
                 android:summary="@string/prefs_ambient_sound_during_call_summary"
                 android:title="@string/prefs_ambient_sound_during_call_title" />
 
-            <SwitchPreference
+            <SwitchPreferenceCompat
                 android:defaultValue="false"
                 android:icon="@drawable/ic_hearing"
                 android:key="pref_galaxy_buds_ambient_sound"
@@ -96,7 +96,7 @@
         android:persistent="false"
         android:title="@string/prefs_galaxy_touch_options">
         <PreferenceCategory android:title="@string/prefs_galaxy_touch_options">
-            <SwitchPreference
+            <SwitchPreferenceCompat
                 android:defaultValue="true"
                 android:icon="@drawable/ic_touch"
                 android:key="pref_galaxy_buds_lock_touch"
@@ -138,7 +138,7 @@
                 android:summary="%s"
                 android:title="@string/prefs_switch_control_right" />
 
-            <SwitchPreference
+            <SwitchPreferenceCompat
                 android:defaultValue="false"
                 android:dependency="pref_galaxy_buds_lock_touch"
                 android:icon="@drawable/ic_touch"
@@ -153,20 +153,20 @@
         android:key="prefs_settings"
         android:persistent="false"
         android:title="@string/title_activity_settings">
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:defaultValue="false"
             android:icon="@drawable/ic_hearing"
             android:key="pref_galaxy_buds_pro_in_ear_detection"
             android:summary="@string/prefs_in_ear_detection_summary"
             android:title="@string/nothing_prefs_inear_title" />
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:defaultValue="false"
             android:icon="@drawable/ic_auto_awesome"
             android:key="prefs_galaxy_buds_seamless_connection"
             android:summary="@string/prefs_seamless_connection_switch_summary"
             android:title="@string/prefs_seamless_connection_switch_title" />
 
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:defaultValue="false"
             android:icon="@drawable/ic_hearing"
             android:key="pref_galaxy_buds_noise_controls_with_one_earbud"
@@ -184,7 +184,7 @@
             app:showSeekBarValue="true" />
 
         <PreferenceCategory android:title="@string/prefs_galaxy_buds_experimental">
-            <SwitchPreference
+            <SwitchPreferenceCompat
                 android:defaultValue="false"
                 android:icon="@drawable/ic_videogame"
                 android:key="pref_galaxy_buds_game_mode"
@@ -192,7 +192,7 @@
                 android:title="@string/prefs_game_mode" />
         </PreferenceCategory>
 
-        <!-- <SwitchPreference
+        <!-- <SwitchPreferenceCompat
             android:defaultValue="false"
             android:icon="@drawable/ic_graphic_eq"
             android:key="pref_galaxy_buds_pro_read_notifications_outloud"
diff --git a/app/src/main/res/xml/devicesettings_galaxy_buds_live.xml b/app/src/main/res/xml/devicesettings_galaxy_buds_live.xml
index 6f1bc0d33..f48e26c63 100644
--- a/app/src/main/res/xml/devicesettings_galaxy_buds_live.xml
+++ b/app/src/main/res/xml/devicesettings_galaxy_buds_live.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <SwitchPreference
+    <SwitchPreferenceCompat
         android:defaultValue="false"
         android:icon="@drawable/ic_hearing"
         android:key="pref_galaxy_buds_live_anc"
@@ -23,7 +23,7 @@
         android:persistent="false"
         android:title="@string/prefs_galaxy_touch_options">
         <PreferenceCategory android:title="@string/prefs_galaxy_touch_options">
-            <SwitchPreference
+            <SwitchPreferenceCompat
                 android:defaultValue="false"
                 android:disableDependentsState="true"
                 android:icon="@drawable/ic_lock_open"
@@ -49,14 +49,14 @@
         </PreferenceCategory>
     </PreferenceScreen>
     <PreferenceCategory android:title="@string/prefs_galaxy_buds_experimental">
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:defaultValue="false"
             android:icon="@drawable/ic_videogame"
             android:key="pref_galaxy_buds_game_mode"
             android:summary="@string/prefs_game_mode_summary"
             android:title="@string/prefs_game_mode" />
 
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:defaultValue="false"
             android:icon="@drawable/ic_engineering"
             android:key="pref_galaxy_buds_live_pressure_relief"
diff --git a/app/src/main/res/xml/devicesettings_galaxy_buds_pro.xml b/app/src/main/res/xml/devicesettings_galaxy_buds_pro.xml
index 42ee5b0c3..dcb91514a 100644
--- a/app/src/main/res/xml/devicesettings_galaxy_buds_pro.xml
+++ b/app/src/main/res/xml/devicesettings_galaxy_buds_pro.xml
@@ -46,7 +46,7 @@
         android:title="@string/prefs_ambient_settings_title">
 
         <PreferenceCategory android:title="@string/prefs_voice_detect">
-            <SwitchPreference
+            <SwitchPreferenceCompat
                 android:defaultValue="false"
                 android:icon="@drawable/ic_voice"
                 android:key="pref_galaxy_buds_pro_voice_detect"
@@ -66,14 +66,14 @@
         <PreferenceCategory android:title="@string/prefs_ambient_sound">
 
 
-            <SwitchPreference
+            <SwitchPreferenceCompat
                 android:defaultValue="false"
                 android:icon="@drawable/ic_phone"
                 android:key="pref_galaxy_buds_ambient_mode_during_call"
                 android:summary="@string/prefs_ambient_sound_during_call_summary"
                 android:title="@string/prefs_ambient_sound_during_call_title" />
 
-            <SwitchPreference
+            <SwitchPreferenceCompat
                 android:defaultValue="false"
                 android:icon="@drawable/ic_hearing"
                 android:key="pref_galaxy_buds_ambient_sound"
@@ -127,7 +127,7 @@
         android:persistent="false"
         android:title="@string/prefs_galaxy_touch_options">
         <PreferenceCategory android:title="@string/prefs_galaxy_touch_options">
-            <SwitchPreference
+            <SwitchPreferenceCompat
                 android:defaultValue="false"
                 android:disableDependentsState="true"
                 android:icon="@drawable/ic_lock_open"
@@ -173,7 +173,7 @@
                 android:summary="%s"
                 android:title="@string/prefs_switch_control_right" />
 
-            <SwitchPreference
+            <SwitchPreferenceCompat
                 android:defaultValue="false"
                 android:dependency="pref_galaxy_buds_lock_touch"
                 android:icon="@drawable/ic_touch"
@@ -188,20 +188,20 @@
         android:key="prefs_settings"
         android:persistent="false"
         android:title="@string/title_activity_settings">
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:defaultValue="false"
             android:icon="@drawable/ic_hearing"
             android:key="pref_galaxy_buds_pro_in_ear_detection"
             android:summary="@string/prefs_in_ear_detection_summary"
             android:title="@string/nothing_prefs_inear_title" />
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:defaultValue="false"
             android:icon="@drawable/ic_auto_awesome"
             android:key="pref_galaxy_buds_pro_seamless_connection"
             android:summary="@string/prefs_seamless_connection_switch_summary"
             android:title="@string/prefs_seamless_connection_switch_title" />
 
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:defaultValue="false"
             android:icon="@drawable/ic_hearing"
             android:key="pref_galaxy_buds_noise_controls_with_one_earbud"
@@ -219,7 +219,7 @@
             app:showSeekBarValue="true" />
 
         <PreferenceCategory android:title="@string/prefs_galaxy_buds_experimental">
-            <SwitchPreference
+            <SwitchPreferenceCompat
                 android:defaultValue="false"
                 android:icon="@drawable/ic_videogame"
                 android:key="pref_galaxy_buds_game_mode"
@@ -227,7 +227,7 @@
                 android:title="@string/prefs_game_mode" />
         </PreferenceCategory>
 
-        <!-- <SwitchPreference
+        <!-- <SwitchPreferenceCompat
             android:defaultValue="false"
             android:icon="@drawable/ic_graphic_eq"
             android:key="pref_galaxy_buds_pro_read_notifications_outloud"
diff --git a/app/src/main/res/xml/devicesettings_goal_notification.xml b/app/src/main/res/xml/devicesettings_goal_notification.xml
index 143a14040..92f9add73 100644
--- a/app/src/main/res/xml/devicesettings_goal_notification.xml
+++ b/app/src/main/res/xml/devicesettings_goal_notification.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-    <SwitchPreference
+    <SwitchPreferenceCompat
         android:defaultValue="false"
         android:icon="@drawable/ic_star_gray"
         android:key="fitness_goal_notification"
diff --git a/app/src/main/res/xml/devicesettings_gps_agps.xml b/app/src/main/res/xml/devicesettings_gps_agps.xml
index ffcb15eac..150f3a1c5 100644
--- a/app/src/main/res/xml/devicesettings_gps_agps.xml
+++ b/app/src/main/res/xml/devicesettings_gps_agps.xml
@@ -47,7 +47,7 @@
             android:key="pref_header_agps"
             android:title="@string/pref_agps_header">
 
-            <SwitchPreference
+            <SwitchPreferenceCompat
                 android:defaultValue="false"
                 android:key="pref_agps_expiry_reminder_enabled"
                 android:title="@string/pref_agps_expiry_reminder_enabled" />
diff --git a/app/src/main/res/xml/devicesettings_heartrate_sleep.xml b/app/src/main/res/xml/devicesettings_heartrate_sleep.xml
index 9cc3d09b6..0371fd651 100644
--- a/app/src/main/res/xml/devicesettings_heartrate_sleep.xml
+++ b/app/src/main/res/xml/devicesettings_heartrate_sleep.xml
@@ -7,7 +7,7 @@
         android:summary="@string/mi2_prefs_heart_rate_monitoring_summary"
         android:title="@string/mi2_prefs_heart_rate_monitoring">
 
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:defaultValue="false"
             android:icon="@drawable/ic_activity_sleep"
             android:key="heartrate_sleep_detection"
diff --git a/app/src/main/res/xml/devicesettings_heartrate_sleep_activity.xml b/app/src/main/res/xml/devicesettings_heartrate_sleep_activity.xml
index f959aec43..808c97ec6 100644
--- a/app/src/main/res/xml/devicesettings_heartrate_sleep_activity.xml
+++ b/app/src/main/res/xml/devicesettings_heartrate_sleep_activity.xml
@@ -7,7 +7,7 @@
         android:summary="@string/mi2_prefs_heart_rate_monitoring_summary"
         android:title="@string/mi2_prefs_heart_rate_monitoring">
 
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:defaultValue="false"
             android:icon="@drawable/ic_activity_sleep"
             android:key="heartrate_sleep_detection"
@@ -24,7 +24,7 @@
 
         <!-- Activity Monitoring -->
 
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:defaultValue="false"
             android:icon="@drawable/ic_activity_unknown_small"
             android:key="heartrate_activity_monitoring"
diff --git a/app/src/main/res/xml/devicesettings_heartrate_sleep_alert_activity_stress.xml b/app/src/main/res/xml/devicesettings_heartrate_sleep_alert_activity_stress.xml
index 7abecfa16..6f5b19cc0 100644
--- a/app/src/main/res/xml/devicesettings_heartrate_sleep_alert_activity_stress.xml
+++ b/app/src/main/res/xml/devicesettings_heartrate_sleep_alert_activity_stress.xml
@@ -7,7 +7,7 @@
         android:summary="@string/mi2_prefs_heart_rate_monitoring_alerts_summary"
         android:title="@string/mi2_prefs_heart_rate_monitoring">
 
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:defaultValue="false"
             android:icon="@drawable/ic_activity_sleep"
             android:key="heartrate_sleep_detection"
@@ -24,7 +24,7 @@
 
         <!-- Activity Monitoring -->
 
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:defaultValue="false"
             android:icon="@drawable/ic_activity_unknown_small"
             android:key="heartrate_activity_monitoring"
@@ -33,7 +33,7 @@
 
         <!-- Heart Rate Alerts -->
 
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:defaultValue="false"
             android:icon="@drawable/ic_warning_gray"
             android:key="heartrate_alert_enabled"
@@ -52,7 +52,7 @@
 
         <!-- Stress Monitoring -->
 
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:defaultValue="false"
             android:icon="@drawable/ic_mood_bad"
             android:key="heartrate_stress_monitoring"
diff --git a/app/src/main/res/xml/devicesettings_heartrate_sleep_alert_activity_stress_spo2.xml b/app/src/main/res/xml/devicesettings_heartrate_sleep_alert_activity_stress_spo2.xml
index 332de9bb6..b2a84fc37 100644
--- a/app/src/main/res/xml/devicesettings_heartrate_sleep_alert_activity_stress_spo2.xml
+++ b/app/src/main/res/xml/devicesettings_heartrate_sleep_alert_activity_stress_spo2.xml
@@ -11,13 +11,13 @@
             android:key="pref_key_header_heartrate_sleep"
             android:title="@string/pref_header_heartrate_sleep">
 
-            <SwitchPreference
+            <SwitchPreferenceCompat
                 android:defaultValue="false"
                 android:icon="@drawable/ic_activity_sleep"
                 android:key="heartrate_sleep_detection"
                 android:title="@string/miband_prefs_hr_sleep_detection" />
 
-            <SwitchPreference
+            <SwitchPreferenceCompat
                 android:defaultValue="false"
                 android:icon="@drawable/ic_activity_sleep"
                 android:key="heartrate_sleep_breathing_quality_monitoring"
@@ -40,7 +40,7 @@
 
         <!-- Activity Monitoring -->
 
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:defaultValue="false"
             android:icon="@drawable/ic_activity_unknown_small"
             android:key="heartrate_activity_monitoring"
@@ -78,14 +78,14 @@
             android:key="pref_key_header_stress"
             android:title="@string/pref_header_stress">
 
-            <SwitchPreference
+            <SwitchPreferenceCompat
                 android:defaultValue="false"
                 android:icon="@drawable/ic_mood_bad"
                 android:key="heartrate_stress_monitoring"
                 android:summary="@string/prefs_stress_monitoring_description"
                 android:title="@string/prefs_stress_monitoring_title" />
 
-            <SwitchPreference
+            <SwitchPreferenceCompat
                 android:defaultValue="false"
                 android:dependency="heartrate_stress_monitoring"
                 android:key="heartrate_stress_relaxation_reminder"
@@ -98,7 +98,7 @@
             android:key="pref_key_header_spo2"
             android:title="@string/pref_header_spo2">
 
-            <SwitchPreference
+            <SwitchPreferenceCompat
                 android:defaultValue="false"
                 android:key="spo2_all_day_monitoring_enabled"
                 android:summary="@string/prefs_spo2_monitoring_description"
diff --git a/app/src/main/res/xml/devicesettings_high_mtu.xml b/app/src/main/res/xml/devicesettings_high_mtu.xml
index b721b59c8..8cc61775f 100644
--- a/app/src/main/res/xml/devicesettings_high_mtu.xml
+++ b/app/src/main/res/xml/devicesettings_high_mtu.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-    <SwitchPreference
+    <SwitchPreferenceCompat
         android:icon="@drawable/ic_mtu"
         android:defaultValue="true"
         android:key="allow_high_mtu"
diff --git a/app/src/main/res/xml/devicesettings_hourly_chime.xml b/app/src/main/res/xml/devicesettings_hourly_chime.xml
index dcd06b25a..4258371db 100644
--- a/app/src/main/res/xml/devicesettings_hourly_chime.xml
+++ b/app/src/main/res/xml/devicesettings_hourly_chime.xml
@@ -7,7 +7,7 @@
         android:summary="@string/prefs_hourly_chime_summary"
         android:title="@string/prefs_hourly_chime">
 
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:defaultValue="false"
             android:key="hourly_chime_enable"
             android:title="@string/prefs_hourly_chime"
diff --git a/app/src/main/res/xml/devicesettings_huami2021_alexa.xml b/app/src/main/res/xml/devicesettings_huami2021_alexa.xml
index f36aa5ea1..26374061f 100644
--- a/app/src/main/res/xml/devicesettings_huami2021_alexa.xml
+++ b/app/src/main/res/xml/devicesettings_huami2021_alexa.xml
@@ -56,7 +56,7 @@
                 android:title="Reply Text"
                 app:useSimpleSummaryProvider="true" />
 
-            <SwitchPreference
+            <SwitchPreferenceCompat
                 android:defaultValue="false"
                 android:key="zepp_os_alexa_ask_more_input"
                 android:summary="Continue listening after sending the reply"
diff --git a/app/src/main/res/xml/devicesettings_huami2021_fetch_operation_time_unit.xml b/app/src/main/res/xml/devicesettings_huami2021_fetch_operation_time_unit.xml
index 8615338c0..9645ae32f 100644
--- a/app/src/main/res/xml/devicesettings_huami2021_fetch_operation_time_unit.xml
+++ b/app/src/main/res/xml/devicesettings_huami2021_fetch_operation_time_unit.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-    <SwitchPreference
+    <SwitchPreferenceCompat
         android:defaultValue="true"
         android:icon="@drawable/ic_timer"
         android:key="huami_truncate_fetch_operation_timestamps"
diff --git a/app/src/main/res/xml/devicesettings_hydration_reminder.xml b/app/src/main/res/xml/devicesettings_hydration_reminder.xml
index b290974c1..0ce10c209 100644
--- a/app/src/main/res/xml/devicesettings_hydration_reminder.xml
+++ b/app/src/main/res/xml/devicesettings_hydration_reminder.xml
@@ -7,7 +7,7 @@
         android:summary="@string/lefun_prefs_hydration_reminder_summary"
         android:title="@string/lefun_prefs_hydration_reminder_title">
 
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:defaultValue="false"
             android:key="pref_hydration_switch"
             android:title="@string/lefun_prefs_hydration_reminder_title" />
diff --git a/app/src/main/res/xml/devicesettings_inactivity.xml b/app/src/main/res/xml/devicesettings_inactivity.xml
index a5cddd42c..55f33896b 100644
--- a/app/src/main/res/xml/devicesettings_inactivity.xml
+++ b/app/src/main/res/xml/devicesettings_inactivity.xml
@@ -7,7 +7,7 @@
         android:summary="@string/mi2_prefs_inactivity_warnings_summary"
         android:title="@string/mi2_prefs_inactivity_warnings">
 
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:defaultValue="false"
             android:key="inactivity_warnings_enable"
             android:title="@string/mi2_prefs_inactivity_warnings"
diff --git a/app/src/main/res/xml/devicesettings_inactivity_dnd.xml b/app/src/main/res/xml/devicesettings_inactivity_dnd.xml
index 3cb86d648..88d07f5ec 100644
--- a/app/src/main/res/xml/devicesettings_inactivity_dnd.xml
+++ b/app/src/main/res/xml/devicesettings_inactivity_dnd.xml
@@ -7,7 +7,7 @@
         android:summary="@string/mi2_prefs_inactivity_warnings_summary"
         android:title="@string/mi2_prefs_inactivity_warnings">
 
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:defaultValue="false"
             android:key="inactivity_warnings_enable"
             android:title="@string/mi2_prefs_inactivity_warnings"
@@ -33,7 +33,7 @@
             android:key="inactivity_warnings_end"
             android:title="@string/mi2_prefs_do_not_disturb_end" />
 
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:defaultValue="false"
             android:dependency="inactivity_warnings_enable"
             android:key="inactivity_warnings_dnd"
diff --git a/app/src/main/res/xml/devicesettings_inactivity_dnd_no_threshold.xml b/app/src/main/res/xml/devicesettings_inactivity_dnd_no_threshold.xml
index 6455e5d8f..39e992e46 100644
--- a/app/src/main/res/xml/devicesettings_inactivity_dnd_no_threshold.xml
+++ b/app/src/main/res/xml/devicesettings_inactivity_dnd_no_threshold.xml
@@ -7,7 +7,7 @@
         android:summary="@string/mi2_prefs_inactivity_warnings_summary"
         android:title="@string/mi2_prefs_inactivity_warnings">
 
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:defaultValue="false"
             android:key="inactivity_warnings_enable"
             android:summary="@string/mi2_prefs_inactivity_warnings_summary"
@@ -25,7 +25,7 @@
             android:key="inactivity_warnings_end"
             android:title="@string/mi2_prefs_do_not_disturb_end" />
 
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:defaultValue="false"
             android:dependency="inactivity_warnings_enable"
             android:key="inactivity_warnings_dnd"
diff --git a/app/src/main/res/xml/devicesettings_inactivity_extended.xml b/app/src/main/res/xml/devicesettings_inactivity_extended.xml
index 87bcd86c8..f01ce99d4 100644
--- a/app/src/main/res/xml/devicesettings_inactivity_extended.xml
+++ b/app/src/main/res/xml/devicesettings_inactivity_extended.xml
@@ -10,7 +10,7 @@
         <!-- workaround for missing toolbar -->
         <PreferenceCategory android:title="@string/mi2_prefs_inactivity_warnings_summary" />
 
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:defaultValue="false"
             android:key="inactivity_warnings_enable"
             android:summary="@string/mi2_prefs_inactivity_warnings_summary"
diff --git a/app/src/main/res/xml/devicesettings_inactivity_noshed.xml b/app/src/main/res/xml/devicesettings_inactivity_noshed.xml
index d10fb0d53..034d39fd5 100644
--- a/app/src/main/res/xml/devicesettings_inactivity_noshed.xml
+++ b/app/src/main/res/xml/devicesettings_inactivity_noshed.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-    <SwitchPreference
+    <SwitchPreferenceCompat
         android:icon="@drawable/ic_chair"
         android:defaultValue="false"
         android:key="inactivity_warnings_enable_noshed"
diff --git a/app/src/main/res/xml/devicesettings_keep_activity_data_on_device.xml b/app/src/main/res/xml/devicesettings_keep_activity_data_on_device.xml
index c2809866e..c7cfa1b0f 100644
--- a/app/src/main/res/xml/devicesettings_keep_activity_data_on_device.xml
+++ b/app/src/main/res/xml/devicesettings_keep_activity_data_on_device.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-    <SwitchPreference
+    <SwitchPreferenceCompat
         android:icon="@drawable/ic_activity_unknown_small"
         android:defaultValue="false"
         android:key="keep_activity_data_on_device"
diff --git a/app/src/main/res/xml/devicesettings_key_vibration.xml b/app/src/main/res/xml/devicesettings_key_vibration.xml
index 4e5b28fbf..39caad13c 100644
--- a/app/src/main/res/xml/devicesettings_key_vibration.xml
+++ b/app/src/main/res/xml/devicesettings_key_vibration.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-    <SwitchPreference
+    <SwitchPreferenceCompat
         android:defaultValue="false"
         android:icon="@drawable/ic_vibration"
         android:key="key_vibration"
diff --git a/app/src/main/res/xml/devicesettings_liftwrist_display_noshed.xml b/app/src/main/res/xml/devicesettings_liftwrist_display_noshed.xml
index 9cd0ccba0..6907c3029 100644
--- a/app/src/main/res/xml/devicesettings_liftwrist_display_noshed.xml
+++ b/app/src/main/res/xml/devicesettings_liftwrist_display_noshed.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-    <SwitchPreference
+    <SwitchPreferenceCompat
         android:icon="@drawable/ic_arrow_upward"
         android:defaultValue="false"
         android:key="activate_display_on_lift_wrist_noshed"
diff --git a/app/src/main/res/xml/devicesettings_lock_unlock.xml b/app/src/main/res/xml/devicesettings_lock_unlock.xml
index 008871bbd..c58d90935 100644
--- a/app/src/main/res/xml/devicesettings_lock_unlock.xml
+++ b/app/src/main/res/xml/devicesettings_lock_unlock.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-    <SwitchPreference
+    <SwitchPreferenceCompat
         android:icon="@drawable/ic_lock_open"
         android:defaultValue="false"
         android:key="lock"
diff --git a/app/src/main/res/xml/devicesettings_lowlatency_fwupdate.xml b/app/src/main/res/xml/devicesettings_lowlatency_fwupdate.xml
index 7e12b0e6f..45cf7479e 100644
--- a/app/src/main/res/xml/devicesettings_lowlatency_fwupdate.xml
+++ b/app/src/main/res/xml/devicesettings_lowlatency_fwupdate.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-    <SwitchPreference
+    <SwitchPreferenceCompat
         android:icon="@drawable/ic_mtu"
         android:defaultValue="true"
         android:key="low_latency_fw_update"
diff --git a/app/src/main/res/xml/devicesettings_miband2.xml b/app/src/main/res/xml/devicesettings_miband2.xml
index da079d54b..696780ba7 100644
--- a/app/src/main/res/xml/devicesettings_miband2.xml
+++ b/app/src/main/res/xml/devicesettings_miband2.xml
@@ -10,7 +10,7 @@
         android:summary="@string/mi2_prefs_display_items_summary"
         android:title="@string/mi2_prefs_display_items" />
 
-    <SwitchPreference
+    <SwitchPreferenceCompat
         android:defaultValue="true"
         android:icon="@drawable/ic_font_download"
         android:key="mi2_enable_text_notifications"
diff --git a/app/src/main/res/xml/devicesettings_miband6_new_protocol.xml b/app/src/main/res/xml/devicesettings_miband6_new_protocol.xml
index dce6381e7..38849474e 100644
--- a/app/src/main/res/xml/devicesettings_miband6_new_protocol.xml
+++ b/app/src/main/res/xml/devicesettings_miband6_new_protocol.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-    <SwitchPreference
+    <SwitchPreferenceCompat
         android:defaultValue="false"
         android:key="force_new_protocol"
         android:summary="@string/pref_summary_huami_force_new_protocol"
diff --git a/app/src/main/res/xml/devicesettings_morning_updates.xml b/app/src/main/res/xml/devicesettings_morning_updates.xml
index 77bf4d84b..d3692692d 100644
--- a/app/src/main/res/xml/devicesettings_morning_updates.xml
+++ b/app/src/main/res/xml/devicesettings_morning_updates.xml
@@ -7,7 +7,7 @@
         android:summary="@string/pref_morning_updates_summary"
         android:title="@string/pref_morning_updates_title">
 
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:defaultValue="false"
             android:icon="@drawable/ic_wb_sunny"
             android:key="morning_updates_enabled"
diff --git a/app/src/main/res/xml/devicesettings_nothing_ear1.xml b/app/src/main/res/xml/devicesettings_nothing_ear1.xml
index 2d530472d..746624935 100644
--- a/app/src/main/res/xml/devicesettings_nothing_ear1.xml
+++ b/app/src/main/res/xml/devicesettings_nothing_ear1.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-    <SwitchPreference
+    <SwitchPreferenceCompat
         android:defaultValue="true"
         android:icon="@drawable/ic_extension"
         android:key="pref_nothing_inear_detection"
diff --git a/app/src/main/res/xml/devicesettings_notifications_enable.xml b/app/src/main/res/xml/devicesettings_notifications_enable.xml
index 517f00653..b93f2184f 100644
--- a/app/src/main/res/xml/devicesettings_notifications_enable.xml
+++ b/app/src/main/res/xml/devicesettings_notifications_enable.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <SwitchPreference
+    <SwitchPreferenceCompat
         android:defaultValue="false"
         android:icon="@drawable/ic_notifications"
         android:key="notification_enable"
diff --git a/app/src/main/res/xml/devicesettings_offline_voice.xml b/app/src/main/res/xml/devicesettings_offline_voice.xml
index 3070e12c5..2f7c02477 100644
--- a/app/src/main/res/xml/devicesettings_offline_voice.xml
+++ b/app/src/main/res/xml/devicesettings_offline_voice.xml
@@ -15,19 +15,19 @@
             android:summary="%s"
             android:title="@string/pref_title_language" />
 
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:defaultValue="false"
             android:icon="@drawable/ic_rotate_left"
             android:key="offline_voice_respond_turn_wrist"
             android:title="@string/offline_voice_respond_turn_wrist" />
 
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:defaultValue="false"
             android:icon="@drawable/ic_always_on_display"
             android:key="offline_voice_respond_screen_on"
             android:title="@string/offline_voice_respond_screen_on" />
 
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:defaultValue="false"
             android:icon="@drawable/ic_always_on_display"
             android:key="offline_voice_response_during_screen_lighting"
diff --git a/app/src/main/res/xml/devicesettings_operating_sounds.xml b/app/src/main/res/xml/devicesettings_operating_sounds.xml
index 9749e9a8b..0ea824069 100644
--- a/app/src/main/res/xml/devicesettings_operating_sounds.xml
+++ b/app/src/main/res/xml/devicesettings_operating_sounds.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-    <SwitchPreference
+    <SwitchPreferenceCompat
         android:defaultValue="false"
         android:icon="@drawable/ic_radio"
         android:key="operating_sounds"
diff --git a/app/src/main/res/xml/devicesettings_overwrite_settings_on_connection.xml b/app/src/main/res/xml/devicesettings_overwrite_settings_on_connection.xml
index 114410b30..1db64aa24 100644
--- a/app/src/main/res/xml/devicesettings_overwrite_settings_on_connection.xml
+++ b/app/src/main/res/xml/devicesettings_overwrite_settings_on_connection.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-    <SwitchPreference
+    <SwitchPreferenceCompat
         android:defaultValue="true"
         android:icon="@drawable/ic_settings_applications"
         android:key="overwrite_settings_on_connection"
diff --git a/app/src/main/res/xml/devicesettings_password.xml b/app/src/main/res/xml/devicesettings_password.xml
index 1a75186cd..e9e90185e 100644
--- a/app/src/main/res/xml/devicesettings_password.xml
+++ b/app/src/main/res/xml/devicesettings_password.xml
@@ -7,7 +7,7 @@
         android:summary="@string/prefs_password_summary"
         android:title="@string/prefs_password">
 
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:defaultValue="false"
             android:icon="@drawable/ic_password"
             android:key="pref_password_enabled"
diff --git a/app/src/main/res/xml/devicesettings_phone_calls_watch_pair.xml b/app/src/main/res/xml/devicesettings_phone_calls_watch_pair.xml
index 1554d2e83..ed52d9ba0 100644
--- a/app/src/main/res/xml/devicesettings_phone_calls_watch_pair.xml
+++ b/app/src/main/res/xml/devicesettings_phone_calls_watch_pair.xml
@@ -45,14 +45,14 @@
             android:key="pref_bluetooth_calls_settings_header"
             android:title="@string/bluetooth_calls_settings">
 
-            <SwitchPreference
+            <SwitchPreferenceCompat
                 android:defaultValue="false"
                 android:icon="@drawable/ic_voice"
                 android:key="bluetooth_calls_enabled"
                 android:summary="@string/pref_summary_receive_calls_watch"
                 android:title="@string/bluetooth_calls" />
 
-            <SwitchPreference
+            <SwitchPreferenceCompat
                 android:defaultValue="true"
                 android:icon="@drawable/ic_person"
                 android:key="display_caller"
diff --git a/app/src/main/res/xml/devicesettings_reconnect_bl_classic.xml b/app/src/main/res/xml/devicesettings_reconnect_bl_classic.xml
index afd3793c0..26b625adb 100644
--- a/app/src/main/res/xml/devicesettings_reconnect_bl_classic.xml
+++ b/app/src/main/res/xml/devicesettings_reconnect_bl_classic.xml
@@ -3,7 +3,7 @@
     <PreferenceCategory
         android:title="@string/connection_over_bt_classic" />
 
-    <SwitchPreference
+    <SwitchPreferenceCompat
         android:icon="@drawable/ic_bluetooth"
         android:key="prefs_key_device_reconnect_on_acl"
         android:title="@string/autoconnect_from_device_title"
diff --git a/app/src/main/res/xml/devicesettings_reconnect_ble.xml b/app/src/main/res/xml/devicesettings_reconnect_ble.xml
index 3bfa82059..8bd7591e0 100644
--- a/app/src/main/res/xml/devicesettings_reconnect_ble.xml
+++ b/app/src/main/res/xml/devicesettings_reconnect_ble.xml
@@ -3,7 +3,7 @@
     <PreferenceCategory
         android:title="@string/connection_over_ble" />
 
-    <SwitchPreference
+    <SwitchPreferenceCompat
         android:icon="@drawable/ic_bluetooth"
         android:key="prefs_key_device_auto_reconnect"
         android:title="@string/auto_reconnect_ble_title"
diff --git a/app/src/main/res/xml/devicesettings_relax_firmware_checks.xml b/app/src/main/res/xml/devicesettings_relax_firmware_checks.xml
index 3940d854f..430e0dcf3 100644
--- a/app/src/main/res/xml/devicesettings_relax_firmware_checks.xml
+++ b/app/src/main/res/xml/devicesettings_relax_firmware_checks.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-    <SwitchPreference
+    <SwitchPreferenceCompat
         android:icon="@drawable/ic_verified"
         android:defaultValue="false"
         android:key="relax_firmware_checks"
diff --git a/app/src/main/res/xml/devicesettings_rotatewrist_cycleinfo.xml b/app/src/main/res/xml/devicesettings_rotatewrist_cycleinfo.xml
index 71b46fa7b..faf743b6b 100644
--- a/app/src/main/res/xml/devicesettings_rotatewrist_cycleinfo.xml
+++ b/app/src/main/res/xml/devicesettings_rotatewrist_cycleinfo.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-    <SwitchPreference
+    <SwitchPreferenceCompat
         android:defaultValue="false"
         android:icon="@drawable/ic_rotate_left"
         android:key="rotate_wrist_to_cycle_info"
diff --git a/app/src/main/res/xml/devicesettings_screen_brightness_withauto.xml b/app/src/main/res/xml/devicesettings_screen_brightness_withauto.xml
index 8f70a766c..5aede5f38 100644
--- a/app/src/main/res/xml/devicesettings_screen_brightness_withauto.xml
+++ b/app/src/main/res/xml/devicesettings_screen_brightness_withauto.xml
@@ -6,7 +6,7 @@
         android:persistent="false"
         android:title="@string/pref_screen_brightness">
 
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:defaultValue="true"
             android:icon="@drawable/ic_wb_sunny"
             android:key="screen_auto_brightness"
diff --git a/app/src/main/res/xml/devicesettings_screen_on_on_notifications.xml b/app/src/main/res/xml/devicesettings_screen_on_on_notifications.xml
index c64154984..705e73836 100644
--- a/app/src/main/res/xml/devicesettings_screen_on_on_notifications.xml
+++ b/app/src/main/res/xml/devicesettings_screen_on_on_notifications.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-    <SwitchPreference
+    <SwitchPreferenceCompat
         android:defaultValue="true"
         android:icon="@drawable/ic_notifications"
         android:key="screen_on_on_notifications"
diff --git a/app/src/main/res/xml/devicesettings_settings_third_party_apps.xml b/app/src/main/res/xml/devicesettings_settings_third_party_apps.xml
index 899e6045a..f9cdb1ca3 100644
--- a/app/src/main/res/xml/devicesettings_settings_third_party_apps.xml
+++ b/app/src/main/res/xml/devicesettings_settings_third_party_apps.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-    <SwitchPreference
+    <SwitchPreferenceCompat
         android:icon="@drawable/ic_developer_mode"
         android:defaultValue="false"
         android:key="third_party_apps_set_settings"
diff --git a/app/src/main/res/xml/devicesettings_sleep_mode.xml b/app/src/main/res/xml/devicesettings_sleep_mode.xml
index 2887bc301..9ed657ab6 100644
--- a/app/src/main/res/xml/devicesettings_sleep_mode.xml
+++ b/app/src/main/res/xml/devicesettings_sleep_mode.xml
@@ -6,14 +6,14 @@
         android:persistent="false"
         android:title="@string/pref_sleep_mode_title">
 
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:defaultValue="false"
             android:icon="@drawable/ic_activity_sleep"
             android:key="pref_sleep_mode_sleep_screen"
             android:summary="@string/pref_sleep_mode_sleep_screen_summary"
             android:title="@string/pref_sleep_mode_sleep_screen_title" />
 
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:defaultValue="false"
             android:icon="@drawable/ic_auto_awesome"
             android:key="pref_sleep_mode_smart_enable"
diff --git a/app/src/main/res/xml/devicesettings_sony_headphones_ambient_sound_control.xml b/app/src/main/res/xml/devicesettings_sony_headphones_ambient_sound_control.xml
index 0945b5df7..8ea8b8078 100644
--- a/app/src/main/res/xml/devicesettings_sony_headphones_ambient_sound_control.xml
+++ b/app/src/main/res/xml/devicesettings_sony_headphones_ambient_sound_control.xml
@@ -21,7 +21,7 @@
             android:max="19"
             android:title="@string/sony_ambient_sound_level" />
 
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:defaultValue="true"
             android:icon="@drawable/ic_voice"
             android:key="pref_sony_focus_voice"
diff --git a/app/src/main/res/xml/devicesettings_sony_headphones_ambient_sound_control_wind_noise_reduction.xml b/app/src/main/res/xml/devicesettings_sony_headphones_ambient_sound_control_wind_noise_reduction.xml
index 20439fca4..9dd62efc2 100644
--- a/app/src/main/res/xml/devicesettings_sony_headphones_ambient_sound_control_wind_noise_reduction.xml
+++ b/app/src/main/res/xml/devicesettings_sony_headphones_ambient_sound_control_wind_noise_reduction.xml
@@ -21,7 +21,7 @@
             android:max="19"
             android:title="@string/sony_ambient_sound_level" />
 
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:defaultValue="true"
             android:icon="@drawable/ic_voice"
             android:key="pref_sony_focus_voice"
diff --git a/app/src/main/res/xml/devicesettings_sony_headphones_audio_upsampling.xml b/app/src/main/res/xml/devicesettings_sony_headphones_audio_upsampling.xml
index 684dc2d4e..656adb26a 100644
--- a/app/src/main/res/xml/devicesettings_sony_headphones_audio_upsampling.xml
+++ b/app/src/main/res/xml/devicesettings_sony_headphones_audio_upsampling.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-    <SwitchPreference
+    <SwitchPreferenceCompat
         android:defaultValue="false"
         android:icon="@drawable/ic_extension"
         android:key="pref_sony_audio_upsampling"
diff --git a/app/src/main/res/xml/devicesettings_sony_headphones_notifications_voice_guide.xml b/app/src/main/res/xml/devicesettings_sony_headphones_notifications_voice_guide.xml
index 1eb8d7ab9..12917bdb8 100644
--- a/app/src/main/res/xml/devicesettings_sony_headphones_notifications_voice_guide.xml
+++ b/app/src/main/res/xml/devicesettings_sony_headphones_notifications_voice_guide.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-    <SwitchPreference
+    <SwitchPreferenceCompat
         android:defaultValue="true"
         android:icon="@drawable/ic_notifications"
         android:key="pref_sony_notification_voice_guide"
diff --git a/app/src/main/res/xml/devicesettings_sony_headphones_pause_when_taken_off.xml b/app/src/main/res/xml/devicesettings_sony_headphones_pause_when_taken_off.xml
index d09af46d2..b6b5bcb30 100644
--- a/app/src/main/res/xml/devicesettings_sony_headphones_pause_when_taken_off.xml
+++ b/app/src/main/res/xml/devicesettings_sony_headphones_pause_when_taken_off.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-    <SwitchPreference
+    <SwitchPreferenceCompat
         android:defaultValue="false"
         android:icon="@drawable/ic_pause"
         android:key="pref_sony_pause_when_taken_off"
diff --git a/app/src/main/res/xml/devicesettings_sony_headphones_speak_to_chat_simple.xml b/app/src/main/res/xml/devicesettings_sony_headphones_speak_to_chat_simple.xml
index 32fc45364..ba3749ee3 100644
--- a/app/src/main/res/xml/devicesettings_sony_headphones_speak_to_chat_simple.xml
+++ b/app/src/main/res/xml/devicesettings_sony_headphones_speak_to_chat_simple.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <SwitchPreference
+    <SwitchPreferenceCompat
         android:defaultValue="false"
         android:icon="@drawable/ic_voice"
         android:key="pref_sony_speak_to_chat"
diff --git a/app/src/main/res/xml/devicesettings_sony_headphones_speak_to_chat_with_settings.xml b/app/src/main/res/xml/devicesettings_sony_headphones_speak_to_chat_with_settings.xml
index 68b0935d6..786ae5db0 100644
--- a/app/src/main/res/xml/devicesettings_sony_headphones_speak_to_chat_with_settings.xml
+++ b/app/src/main/res/xml/devicesettings_sony_headphones_speak_to_chat_with_settings.xml
@@ -8,7 +8,7 @@
         android:summary="@string/sony_speak_to_chat_summary"
         android:title="@string/sony_speak_to_chat">
 
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:defaultValue="false"
             android:icon="@drawable/ic_voice"
             android:key="pref_sony_speak_to_chat"
@@ -28,7 +28,7 @@
                 android:summary="%s"
                 android:title="@string/sony_speak_to_chat_sensitivity" />
 
-            <SwitchPreference
+            <SwitchPreferenceCompat
                 android:defaultValue="false"
                 android:dependency="pref_sony_speak_to_chat"
                 android:icon="@drawable/ic_voice"
diff --git a/app/src/main/res/xml/devicesettings_sony_headphones_touch_sensor_single.xml b/app/src/main/res/xml/devicesettings_sony_headphones_touch_sensor_single.xml
index 5f141262e..5cad5dee9 100644
--- a/app/src/main/res/xml/devicesettings_sony_headphones_touch_sensor_single.xml
+++ b/app/src/main/res/xml/devicesettings_sony_headphones_touch_sensor_single.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-    <SwitchPreference
+    <SwitchPreferenceCompat
         android:defaultValue="true"
         android:icon="@drawable/ic_touch"
         android:key="pref_sony_touch_sensor"
diff --git a/app/src/main/res/xml/devicesettings_sonyswr12.xml b/app/src/main/res/xml/devicesettings_sonyswr12.xml
index 32d6859e4..bd175b1d9 100644
--- a/app/src/main/res/xml/devicesettings_sonyswr12.xml
+++ b/app/src/main/res/xml/devicesettings_sonyswr12.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-    <SwitchPreference
+    <SwitchPreferenceCompat
         android:icon="@drawable/ic_bolt"
         android:key="stamina_preference"
         android:title="@string/sonyswr12_settings_stamina"
         android:defaultValue="false"
         android:summary="@string/sonyswr12_settings_stamina_summary" />
-    <SwitchPreference
+    <SwitchPreferenceCompat
         android:icon="@drawable/ic_vibration"
         android:key="vibration_preference"
         android:title="@string/sonyswr12_settings_low_vibration"
diff --git a/app/src/main/res/xml/devicesettings_sound_and_vibration.xml b/app/src/main/res/xml/devicesettings_sound_and_vibration.xml
index 0b389e06c..819f96b2d 100644
--- a/app/src/main/res/xml/devicesettings_sound_and_vibration.xml
+++ b/app/src/main/res/xml/devicesettings_sound_and_vibration.xml
@@ -13,31 +13,31 @@
             android:max="100"
             android:title="@string/menuitem_volume" />
 
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:defaultValue="false"
             android:icon="@drawable/ic_rotate_left"
             android:key="crown_vibration"
             android:title="@string/pref_crown_vibration" />
 
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:defaultValue="false"
             android:icon="@drawable/ic_warning_gray"
             android:key="alert_tone"
             android:title="@string/pref_alert_tone" />
 
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:defaultValue="false"
             android:icon="@drawable/ic_volume_off"
             android:key="cover_to_mute"
             android:title="@string/pref_cover_to_mute" />
 
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:defaultValue="false"
             android:icon="@drawable/ic_vibration"
             android:key="vibrate_for_alert"
             android:title="@string/pref_vibrate_for_alert" />
 
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:defaultValue="false"
             android:icon="@drawable/ic_voice"
             android:key="text_to_speech"
diff --git a/app/src/main/res/xml/devicesettings_swipeunlock.xml b/app/src/main/res/xml/devicesettings_swipeunlock.xml
index a9cba8c91..0f75776f2 100644
--- a/app/src/main/res/xml/devicesettings_swipeunlock.xml
+++ b/app/src/main/res/xml/devicesettings_swipeunlock.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-    <SwitchPreference
+    <SwitchPreferenceCompat
         android:defaultValue="false"
         android:icon="@drawable/ic_lock_open"
         android:key="swipe_unlock"
diff --git a/app/src/main/res/xml/devicesettings_sync_calendar.xml b/app/src/main/res/xml/devicesettings_sync_calendar.xml
index f217315a6..41ee39e09 100644
--- a/app/src/main/res/xml/devicesettings_sync_calendar.xml
+++ b/app/src/main/res/xml/devicesettings_sync_calendar.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-    <SwitchPreference
+    <SwitchPreferenceCompat
         android:defaultValue="false"
         android:icon="@drawable/ic_calendar_sync"
         android:key="sync_calendar"
diff --git a/app/src/main/res/xml/devicesettings_text_bitmaps.xml b/app/src/main/res/xml/devicesettings_text_bitmaps.xml
index 2bfbe538e..9ad1027ee 100644
--- a/app/src/main/res/xml/devicesettings_text_bitmaps.xml
+++ b/app/src/main/res/xml/devicesettings_text_bitmaps.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-    <SwitchPreference
+    <SwitchPreferenceCompat
         android:defaultValue="false"
         android:icon="@drawable/ic_translate"
         android:key="banglejs_text_bitmap"
diff --git a/app/src/main/res/xml/devicesettings_vibrations_enable.xml b/app/src/main/res/xml/devicesettings_vibrations_enable.xml
index fcfacb414..bba7a6c68 100644
--- a/app/src/main/res/xml/devicesettings_vibrations_enable.xml
+++ b/app/src/main/res/xml/devicesettings_vibrations_enable.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <SwitchPreference
+    <SwitchPreferenceCompat
         android:defaultValue="false"
         android:icon="@drawable/ic_vibration"
         android:key="vibration_enable"
diff --git a/app/src/main/res/xml/devicesettings_watchxplus.xml b/app/src/main/res/xml/devicesettings_watchxplus.xml
index 0ef7be393..5cee36ed8 100644
--- a/app/src/main/res/xml/devicesettings_watchxplus.xml
+++ b/app/src/main/res/xml/devicesettings_watchxplus.xml
@@ -14,13 +14,13 @@
                     android:max="10"
                     android:title="@string/pref_title_notifications_and_calls_repeat_on_call"
                     app:showSeekBarValue="true" />
-                <SwitchPreference
+                <SwitchPreferenceCompat
                     android:defaultValue="false"
                     android:key="notification_enable_continious_ring"
                     android:title="@string/prefs_notifications_and_calls_continious_ring" />
             <PreferenceCategory
                 android:title="@string/pref_screen_notification_profile_missed_call"/>
-                <SwitchPreference
+                <SwitchPreferenceCompat
                     android:defaultValue="false"
                     android:key="notification_enable_missed_call"
                     android:title="@string/pref_notifications_and_calls_enable_misscall"
@@ -35,12 +35,12 @@
                     app:showSeekBarValue="true" />
             <PreferenceCategory
                 android:title="@string/pref_header_notifications_and_calls_callhandling"/>
-                <SwitchPreference
+                <SwitchPreferenceCompat
                     android:defaultValue="false"
                     android:key="notification_button_reject"
                     android:summary="@string/pref_summary_notifications_and_calls_title_reject"
                     android:title="@string/prefs_notifications_and_calls_reject" />
-                <SwitchPreference
+                <SwitchPreferenceCompat
                     android:defaultValue="false"
                     android:key="notification_shake_reject"
                     android:summary="@string/pref_summary_notifications_and_calls_title_shake_reject"
@@ -59,13 +59,13 @@
             android:entryValues="@array/language_only_EN_CH_values"
             android:key="language"
             android:summary="%s" />
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:icon="@drawable/ic_access_time"
             android:defaultValue="false"
             android:key="pref_device_spec_settings_force_time"
             android:summary="@string/pref_summary_device_spec_settings_title_force_time"
             android:title="@string/pref_title_device_spec_settings_force_time" />
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:defaultValue="false"
             android:key="show_raw_graph"
             android:title="@string/pref_title_device_spec_settings_show_raw_graph" />
diff --git a/app/src/main/res/xml/devicesettings_wena3.xml b/app/src/main/res/xml/devicesettings_wena3.xml
index 549a3b20c..914770bef 100644
--- a/app/src/main/res/xml/devicesettings_wena3.xml
+++ b/app/src/main/res/xml/devicesettings_wena3.xml
@@ -3,7 +3,7 @@
     <!-- Not including PREF_LANGUAGE here since GadgetBridge seems to add it for us -->
     <PreferenceCategory
         android:title="@string/prefs_wena3_title_activity">
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:defaultValue="true"
             android:key="pref_wena3_background_sync"
             android:icon="@drawable/ic_access_time"
@@ -53,7 +53,7 @@
     </PreferenceCategory>
     <PreferenceCategory
         android:title="@string/prefs_wena3_receive_calls_title">
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:title="@string/prefs_wena3_receive_calls_item"
             android:key="pref_wena3_receive_calls"
             android:icon="@drawable/ic_phone"
@@ -96,26 +96,26 @@
             android:icon="@drawable/ic_hourglass_empty"
             android:summary="%s"
             android:title="@string/prefs_screen_timeout" />
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:title="@string/mi2_prefs_activate_display_on_lift"
             android:key="pref_screen_lift_wrist"
             android:icon="@drawable/ic_watch"
             android:summary="@string/prefs_wena3_hint_lift_wrist"
             android:defaultValue="false"
             />
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:title="@string/prefs_wena3_item_weather_statusbar"
             android:icon="@drawable/ic_wb_sunny"
             android:key="pref_wena3_weather_in_statusbar"
             android:summary="@string/prefs_wena3_hint_weather_statusbar"
             android:defaultValue="true" />
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:title="@string/prefs_wena3_item_rich_design"
             android:icon="@drawable/ic_auto_awesome"
             android:key="pref_wena3_rich_design_mode"
             android:summary="@string/prefs_wena3_hint_rich_design"
             android:defaultValue="false" />
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:title="@string/prefs_wena3_item_large_font"
             android:icon="@drawable/ic_font_size"
             android:key="pref_wena3_large_font_size"
@@ -190,7 +190,7 @@
             android:entries="@array/prefs_wena3_vibration_strength_names_list"
             android:entryValues="@array/prefs_wena3_vibration_strength_values_list"
             android:summary="%s" />
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:title="@string/prefs_wena3_vibration_smart_item"
             android:key="pref_wena3_vibration_smart"
             android:defaultValue="true" />
diff --git a/app/src/main/res/xml/devicesettings_workout_detection.xml b/app/src/main/res/xml/devicesettings_workout_detection.xml
index 3b58eb98c..00930b394 100644
--- a/app/src/main/res/xml/devicesettings_workout_detection.xml
+++ b/app/src/main/res/xml/devicesettings_workout_detection.xml
@@ -17,7 +17,7 @@
             android:summary="@string/pref_workout_detection_categories_summary"
             android:title="@string/pref_workout_detection_categories_title" />
 
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:defaultValue="false"
             android:icon="@drawable/ic_notifications"
             android:key="workout_detection_alert"
diff --git a/app/src/main/res/xml/devicesettings_workout_keep_screen_on.xml b/app/src/main/res/xml/devicesettings_workout_keep_screen_on.xml
index faaef91e8..fde3bc48a 100644
--- a/app/src/main/res/xml/devicesettings_workout_keep_screen_on.xml
+++ b/app/src/main/res/xml/devicesettings_workout_keep_screen_on.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-    <SwitchPreference
+    <SwitchPreferenceCompat
         android:defaultValue="false"
         android:icon="@drawable/ic_always_on_display"
         android:key="workout_keep_screen_on"
diff --git a/app/src/main/res/xml/devicesettings_workout_send_gps_to_band.xml b/app/src/main/res/xml/devicesettings_workout_send_gps_to_band.xml
index ed82a58f0..06815537d 100644
--- a/app/src/main/res/xml/devicesettings_workout_send_gps_to_band.xml
+++ b/app/src/main/res/xml/devicesettings_workout_send_gps_to_band.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-    <SwitchPreference
+    <SwitchPreferenceCompat
         android:defaultValue="false"
         android:icon="@drawable/ic_gps_location"
         android:key="workout_send_gps_to_band"
diff --git a/app/src/main/res/xml/devicesettings_workout_start_on_phone.xml b/app/src/main/res/xml/devicesettings_workout_start_on_phone.xml
index fb9054d8f..93ec68ea2 100644
--- a/app/src/main/res/xml/devicesettings_workout_start_on_phone.xml
+++ b/app/src/main/res/xml/devicesettings_workout_start_on_phone.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-    <SwitchPreference
+    <SwitchPreferenceCompat
         android:defaultValue="false"
         android:icon="@drawable/ic_activity_unknown_small"
         android:key="workout_start_on_phone"
diff --git a/app/src/main/res/xml/discovery_pairing_preferences.xml b/app/src/main/res/xml/discovery_pairing_preferences.xml
index bcc2294f1..c21b4f7a5 100644
--- a/app/src/main/res/xml/discovery_pairing_preferences.xml
+++ b/app/src/main/res/xml/discovery_pairing_preferences.xml
@@ -2,21 +2,21 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
-    <SwitchPreference
+    <SwitchPreferenceCompat
         android:defaultValue="true"
         android:key="ignore_bonded_devices"
         android:layout="@layout/preference_checkbox"
         android:summary="@string/ignore_bonded_devices_description"
         android:title="@string/ignore_bonded_devices"
         app:iconSpaceReserved="false" />
-    <SwitchPreference
+    <SwitchPreferenceCompat
         android:defaultValue="false"
         android:key="enable_companiondevice_pairing"
         android:layout="@layout/preference_checkbox"
         android:summary="@string/companiondevice_pairing_details"
         android:title="@string/companiondevice_pairing"
         app:iconSpaceReserved="false" />
-    <SwitchPreference
+    <SwitchPreferenceCompat
         android:defaultValue="false"
         android:key="discover_unsupported_devices"
         android:layout="@layout/preference_checkbox"
diff --git a/app/src/main/res/xml/fossil_hr_watchface_settings.xml b/app/src/main/res/xml/fossil_hr_watchface_settings.xml
index 549a5ae37..131b89e5b 100644
--- a/app/src/main/res/xml/fossil_hr_watchface_settings.xml
+++ b/app/src/main/res/xml/fossil_hr_watchface_settings.xml
@@ -29,7 +29,7 @@
             android:singleLineTitle="false"
             android:title="@string/watchface_setting_desc_wrist_flick"
             app:iconSpaceReserved="false" />
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:key="pref_hybridhr_watchface_wrist_flick_relative"
             android:persistent="false"
             android:singleLineTitle="false"
@@ -91,19 +91,19 @@
         android:title="@string/watchface_setting_title_power_saving"
         app:iconSpaceReserved="false">
 
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:key="pref_hybridhr_watchface_power_saving_display"
             android:persistent="false"
             android:singleLineTitle="false"
             android:title="@string/watchface_setting_power_saving_display"
             app:iconSpaceReserved="false" />
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:key="pref_hybridhr_watchface_power_saving_hands"
             android:persistent="false"
             android:singleLineTitle="false"
             android:title="@string/watchface_setting_power_saving_hands"
             app:iconSpaceReserved="false" />
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:key="pref_hybridhr_watchface_light_up_on_notification"
             android:persistent="false"
             android:singleLineTitle="false"
diff --git a/app/src/main/res/xml/fossil_hr_widget_settings.xml b/app/src/main/res/xml/fossil_hr_widget_settings.xml
index 1d90e90ca..e67c40093 100644
--- a/app/src/main/res/xml/fossil_hr_widget_settings.xml
+++ b/app/src/main/res/xml/fossil_hr_widget_settings.xml
@@ -92,13 +92,13 @@
             android:persistent="false"
             android:title="@string/watchface_dialog_widget_update_timeout"
             app:iconSpaceReserved="false" />
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:key="pref_hybridhr_widget_custom_hide_text"
             android:persistent="false"
             android:singleLineTitle="false"
             android:title="@string/watchface_dialog_widget_timeout_hide_text"
             app:iconSpaceReserved="false" />
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:key="pref_hybridhr_widget_custom_show_circle"
             android:persistent="false"
             android:singleLineTitle="false"
diff --git a/app/src/main/res/xml/hplus_preferences.xml b/app/src/main/res/xml/hplus_preferences.xml
index d2b409556..d37b71370 100644
--- a/app/src/main/res/xml/hplus_preferences.xml
+++ b/app/src/main/res/xml/hplus_preferences.xml
@@ -13,7 +13,7 @@
             app:iconSpaceReserved="false"
             app:useSimpleSummaryProvider="true"/>
 
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:defaultValue="true"
             android:key="hplus_alldayhr"
             android:layout="@layout/preference_checkbox"
diff --git a/app/src/main/res/xml/loyalty_cards.xml b/app/src/main/res/xml/loyalty_cards.xml
index 631e9b042..cf61172bc 100644
--- a/app/src/main/res/xml/loyalty_cards.xml
+++ b/app/src/main/res/xml/loyalty_cards.xml
@@ -54,7 +54,7 @@
         android:key="pref_key_header_loyalty_cards_sync_options"
         android:title="@string/loyalty_cards_sync_options">
 
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:defaultValue="false"
             android:icon="@drawable/ic_list_numbered"
             android:key="loyalty_cards_sync_groups_only"
@@ -71,13 +71,13 @@
             android:summary=""
             android:title="@string/loyalty_cards_sync_groups" />
 
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:defaultValue="false"
             android:icon="@drawable/ic_archive"
             android:key="loyalty_cards_sync_archived"
             android:title="@string/loyalty_cards_sync_archived" />
 
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:defaultValue="false"
             android:icon="@drawable/ic_star_gray"
             android:key="loyalty_cards_sync_starred"
diff --git a/app/src/main/res/xml/miband_preferences.xml b/app/src/main/res/xml/miband_preferences.xml
index 14ad0c508..6f77105e3 100644
--- a/app/src/main/res/xml/miband_preferences.xml
+++ b/app/src/main/res/xml/miband_preferences.xml
@@ -293,7 +293,7 @@
         android:key="pref_key_development"
         android:title="@string/pref_header_development"
         app:iconSpaceReserved="false">
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:defaultValue="true"
             android:key="mi_setup_bt_pairing"
             android:summary="@string/pref_summary_setup_bt_pairing"
@@ -306,7 +306,7 @@
             android:title="@string/pref_title_development_miaddr"
             app:iconSpaceReserved="false"
             app:useSimpleSummaryProvider="true" />
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:defaultValue="false"
             android:key="mi_dont_ack_transfer"
             android:summary="@string/pref_summary_keep_data_on_device"
diff --git a/app/src/main/res/xml/notifications_preferences.xml b/app/src/main/res/xml/notifications_preferences.xml
index 81a621750..396f2e40d 100644
--- a/app/src/main/res/xml/notifications_preferences.xml
+++ b/app/src/main/res/xml/notifications_preferences.xml
@@ -15,14 +15,14 @@
             android:title="@string/pref_title_notifications_generic"
             app:iconSpaceReserved="false" />
 
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:defaultValue="false"
             android:key="notifications_generic_whenscreenon"
             android:layout="@layout/preference_checkbox"
             android:title="@string/pref_title_whenscreenon"
             app:iconSpaceReserved="false" />
 
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:defaultValue="true"
             android:key="notifications_ignore_low_priority"
             android:layout="@layout/preference_checkbox"
@@ -30,7 +30,7 @@
             android:title="@string/pref_title_notifications_ignore_low_priority"
             app:iconSpaceReserved="false" />
 
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:defaultValue="true"
             android:key="notification_prefer_long_text"
             android:layout="@layout/preference_checkbox"
@@ -38,7 +38,7 @@
             android:title="@string/pref_title_notification_prefer_long_text"
             app:iconSpaceReserved="false" />
 
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:defaultValue="false"
             android:key="notification_cache_while_disconnected"
             android:layout="@layout/preference_checkbox"
@@ -46,7 +46,7 @@
             android:title="@string/pref_title_notification_cache_while_disconnected"
             app:iconSpaceReserved="false" />
 
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:defaultValue="false"
             android:key="minimize_priority"
             android:layout="@layout/preference_checkbox"
@@ -71,7 +71,7 @@
             android:title="@string/pref_title_notifications_call"
             app:iconSpaceReserved="false" />
 
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:defaultValue="false"
             android:key="notification_support_voip_calls"
             android:layout="@layout/preference_checkbox"
@@ -115,7 +115,7 @@
             android:title="@string/pref_title_notifications_timeout"
             app:iconSpaceReserved="false" />
 
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:defaultValue="false"
             android:key="notification_filter"
             android:layout="@layout/preference_checkbox"
@@ -137,7 +137,7 @@
             android:title="@string/pref_title_notification_use_as"
             app:iconSpaceReserved="false" />
 
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:defaultValue="false"
             android:key="notification_media_ignores_application_list"
             android:layout="@layout/preference_checkbox"
diff --git a/app/src/main/res/xml/pebble_preferences.xml b/app/src/main/res/xml/pebble_preferences.xml
index a4eb6ce5c..87062a7db 100644
--- a/app/src/main/res/xml/pebble_preferences.xml
+++ b/app/src/main/res/xml/pebble_preferences.xml
@@ -4,14 +4,14 @@
     <PreferenceCategory
         android:title="@string/pref_header_general"
         app:iconSpaceReserved="false">
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:defaultValue="true"
             android:key="pebble_enable_outgoing_call"
             android:layout="@layout/preference_checkbox"
             android:summary="@string/pref_summary_enable_outgoing_call"
             android:title="@string/pref_title_enable_outgoing_call"
             app:iconSpaceReserved="false" />
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:defaultValue="false"
             android:key="pebble_enable_pebblekit"
             android:layout="@layout/preference_checkbox"
@@ -38,7 +38,7 @@
     <PreferenceCategory
         android:title="@string/pref_header_pebble_timeline"
         app:iconSpaceReserved="false">
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:key="send_sunrise_sunset"
             android:layout="@layout/preference_checkbox"
             android:summary="@string/pref_summary_sunrise_sunset"
@@ -56,13 +56,13 @@
             android:summary="%s"
             android:title="@string/pref_title_pebble_activitytracker"
             app:iconSpaceReserved="false" />
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:defaultValue="true"
             android:key="pebble_sync_health"
             android:layout="@layout/preference_checkbox"
             android:title="@string/pref_title_pebble_sync_health"
             app:iconSpaceReserved="false" />
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:defaultValue="true"
             android:dependency="pebble_sync_health"
             android:key="pebble_health_store_raw"
@@ -70,13 +70,13 @@
             android:summary="@string/pref_summary_pebble_health_store_raw"
             android:title="@string/pref_title_pebble_health_store_raw"
             app:iconSpaceReserved="false" />
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:defaultValue="true"
             android:key="pebble_sync_misfit"
             android:layout="@layout/preference_checkbox"
             android:title="@string/pref_title_pebble_sync_misfit"
             app:iconSpaceReserved="false" />>
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:defaultValue="true"
             android:key="pebble_sync_morpheuz"
             android:layout="@layout/preference_checkbox"
@@ -86,21 +86,21 @@
     <PreferenceCategory
         android:title="@string/pref_header_development"
         app:iconSpaceReserved="false">
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:defaultValue="false"
             android:key="pebble_force_protocol"
             android:layout="@layout/preference_checkbox"
             android:summary="@string/pref_summary_pebble_forceprotocol"
             android:title="@string/pref_title_pebble_forceprotocol"
             app:iconSpaceReserved="false" />
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:defaultValue="false"
             android:key="pebble_force_untested"
             android:layout="@layout/preference_checkbox"
             android:summary="@string/pref_summary_pebble_forceuntested"
             android:title="@string/pref_title_pebble_forceuntested"
             app:iconSpaceReserved="false" />
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:defaultValue="false"
             android:key="pebble_force_le"
             android:layout="@layout/preference_checkbox"
@@ -115,28 +115,28 @@
             android:summary="@string/pref_summary_pebble_mtu_limit"
             android:title="@string/pref_title_pebble_mtu_limit"
             app:iconSpaceReserved="false" />
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:defaultValue="false"
             android:key="pebble_gatt_clientonly"
             android:layout="@layout/preference_checkbox"
             android:summary="@string/pref_summary_pebble_gatt_clientonly"
             android:title="@string/pref_title_pebble_gatt_clientonly"
             app:iconSpaceReserved="false" />
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:defaultValue="false"
             android:key="pebble_enable_applogs"
             android:layout="@layout/preference_checkbox"
             android:summary="@string/pref_summary_pebble_enable_applogs"
             android:title="@string/pref_title_pebble_enable_applogs"
             app:iconSpaceReserved="false" />
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:defaultValue="false"
             android:key="pebble_always_ack_pebblekit"
             android:layout="@layout/preference_checkbox"
             android:summary="@string/pref_summary_pebble_always_ack_pebblekit"
             android:title="@string/pref_title_pebble_always_ack_pebblekit"
             app:iconSpaceReserved="false" />
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:defaultValue="false"
             android:dependency="pebble_force_untested"
             android:key="pebble_enable_background_javascript"
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index c403ba2a7..c6f9a2b05 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -6,19 +6,19 @@
         android:key="pref_key_general"
         android:title="@string/pref_header_general"
         app:iconSpaceReserved="false">
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:defaultValue="true"
             android:key="general_autostartonboot"
             android:layout="@layout/preference_checkbox"
             android:title="@string/pref_title_general_autostartonboot"
             app:iconSpaceReserved="false" />
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:defaultValue="false"
             android:key="general_autoconnectonbluetooth"
             android:layout="@layout/preference_checkbox"
             android:title="@string/pref_title_general_autoconnectonbluetooth"
             app:iconSpaceReserved="false" />
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:defaultValue="false"
             android:enabled="false"
             android:key="general_autocreconnect"
@@ -26,7 +26,7 @@
             android:summary="setting has been moved to device specific settings"
             android:title="@string/pref_title_general_autoreconnect"
             app:iconSpaceReserved="false" />
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:defaultValue="true"
             android:key="display_add_device_fab"
             android:layout="@layout/preference_checkbox"
@@ -35,7 +35,7 @@
             android:title="@string/pref_display_add_device_fab"
             app:iconSpaceReserved="false" />
 
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:defaultValue="false"
             android:key="mb_intents"
             android:layout="@layout/preference_checkbox"
@@ -63,7 +63,7 @@
                 android:summary="%s"
                 android:title="@string/pref_title_theme"
                 app:iconSpaceReserved="false" />
-            <SwitchPreference
+            <SwitchPreferenceCompat
                 android:defaultValue="false"
                 android:key="pref_key_theme_amoled_black"
                 android:layout="@layout/preference_checkbox"
@@ -101,14 +101,14 @@
                 android:key="pref_screen_rtl"
                 android:title="@string/preferences_rtl_settings"
                 app:iconSpaceReserved="false">
-                <SwitchPreference
+                <SwitchPreferenceCompat
                     android:defaultValue="false"
                     android:key="rtl"
                     android:layout="@layout/preference_checkbox"
                     android:summary="@string/pref_summary_rtl"
                     android:title="@string/pref_title_rtl"
                     app:iconSpaceReserved="false" />
-                <SwitchPreference
+                <SwitchPreferenceCompat
                     android:defaultValue="false"
                     android:key="contextualArabic"
                     android:layout="@layout/preference_checkbox"
@@ -156,7 +156,7 @@
         android:key="pref_key_datetime"
         android:title="@string/pref_header_datetime"
         app:iconSpaceReserved="false">
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:defaultValue="true"
             android:key="datetime_synconconnect"
             android:layout="@layout/preference_checkbox"
@@ -187,7 +187,7 @@
             android:title="@string/pref_title_location_longitude"
             app:iconSpaceReserved="false"
             app:useSimpleSummaryProvider="true" />
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:defaultValue="true"
             android:dependency="location_aquire"
             android:key="use_updated_location_if_available"
@@ -204,14 +204,14 @@
     <PreferenceCategory
         android:title="@string/pref_header_navigation"
         app:iconSpaceReserved="false">
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:defaultValue="true"
             android:key="navigation_forward"
             android:layout="@layout/preference_checkbox"
             android:summary="@string/pref_summary_navigation_forward"
             android:title="@string/pref_title_navigation_forward"
             app:iconSpaceReserved="false" />
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:defaultValue="true"
             android:dependency="navigation_forward"
             android:key="nagivation_screen_on"
@@ -257,7 +257,7 @@
             android:summary="%s"
             android:title="@string/pref_title_auto_export_location"
             app:iconSpaceReserved="false" />
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:defaultValue="false"
             android:key="auto_export_enabled"
             android:layout="@layout/preference_checkbox"
@@ -277,7 +277,7 @@
     <PreferenceCategory
         android:title="@string/pref_header_auto_fetch"
         app:iconSpaceReserved="false">
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:defaultValue="false"
             android:key="auto_fetch_enabled"
             android:layout="@layout/preference_checkbox"
@@ -299,27 +299,27 @@
         android:key="pref_key_development"
         android:title="@string/pref_header_development"
         app:iconSpaceReserved="false">
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:defaultValue="false"
             android:key="log_to_file"
             android:layout="@layout/preference_checkbox"
             android:title="@string/pref_write_logfiles"
             app:iconSpaceReserved="false" />
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:defaultValue="true"
             android:key="permission_pestering"
             android:layout="@layout/preference_checkbox"
             android:summary="@string/pref_check_permission_status_summary"
             android:title="@string/pref_check_permission_status"
             app:iconSpaceReserved="false" />
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:defaultValue="true"
             android:key="show_changelog"
             android:layout="@layout/preference_checkbox"
             android:summary="@string/pref_show_changelog_summary"
             android:title="@string/pref_show_changelog"
             app:iconSpaceReserved="false" />
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:defaultValue="true"
             android:key="cache_weather"
             android:layout="@layout/preference_checkbox"
@@ -342,31 +342,31 @@
             android:title="@string/pref_header_intent_api"
             app:iconSpaceReserved="false">
 
-            <SwitchPreference
+            <SwitchPreferenceCompat
                 android:key="prefs_key_allow_bluetooth_intent_api"
                 android:summary="@string/activity_prefs_summary_allow_bluetooth_intent_api"
                 android:title="@string/activity_prefs_allow_bluetooth_intent_api"
                 app:iconSpaceReserved="false" />
 
-            <SwitchPreference
+            <SwitchPreferenceCompat
                 android:key="intent_api_allow_activity_sync"
                 android:summary="@string/intent_api_allow_activity_sync_summary"
                 android:title="@string/intent_api_allow_activity_sync_title"
                 app:iconSpaceReserved="false" />
 
-            <SwitchPreference
+            <SwitchPreferenceCompat
                 android:key="intent_api_allow_trigger_export"
                 android:summary="@string/intent_api_allow_trigger_export_summary"
                 android:title="@string/intent_api_allow_trigger_export_title"
                 app:iconSpaceReserved="false" />
 
-            <SwitchPreference
+            <SwitchPreferenceCompat
                 android:key="intent_api_broadcast_export"
                 android:summary="@string/intent_api_broadcast_export_summary"
                 android:title="@string/intent_api_broadcast_export_title"
                 app:iconSpaceReserved="false" />
 
-            <SwitchPreference
+            <SwitchPreferenceCompat
                 android:key="intent_api_allow_debug_commands"
                 android:summary="@string/intent_api_allow_debug_commands_summary"
                 android:title="@string/intent_api_allow_debug_commands_title"
diff --git a/app/src/main/res/xml/zetime_preferences.xml b/app/src/main/res/xml/zetime_preferences.xml
index 3ef3db8fe..9eafd1333 100644
--- a/app/src/main/res/xml/zetime_preferences.xml
+++ b/app/src/main/res/xml/zetime_preferences.xml
@@ -15,7 +15,7 @@
             app:iconSpaceReserved="false"
             app:useSimpleSummaryProvider="true" />
 
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:defaultValue="false"
             android:key="zetime_activity_tracking"
             android:summary="@string/zetime_activity_tracking_summary"
@@ -77,7 +77,7 @@
                 android:title="@string/mi2_prefs_inactivity_warnings"
                 app:iconSpaceReserved="false" />
 
-            <SwitchPreference
+            <SwitchPreferenceCompat
                 android:defaultValue="false"
                 android:key="inactivity_warnings_enable"
                 android:summary="@string/mi2_prefs_inactivity_warnings_summary"
@@ -113,37 +113,37 @@
                 android:dependency="inactivity_warnings_enable"
                 android:title="@string/zetime_prefs_inactivity_repetitions"
                 app:iconSpaceReserved="false">
-                <SwitchPreference
+                <SwitchPreferenceCompat
                     android:defaultValue="false"
                     android:key="inactivity_warnings_mo"
                     android:title="@string/zetime_prefs_inactivity_mo"
                     app:iconSpaceReserved="false" />
-                <SwitchPreference
+                <SwitchPreferenceCompat
                     android:defaultValue="false"
                     android:key="inactivity_warnings_tu"
                     android:title="@string/zetime_prefs_inactivity_tu"
                     app:iconSpaceReserved="false" />
-                <SwitchPreference
+                <SwitchPreferenceCompat
                     android:defaultValue="false"
                     android:key="inactivity_warnings_we"
                     android:title="@string/zetime_prefs_inactivity_we"
                     app:iconSpaceReserved="false" />
-                <SwitchPreference
+                <SwitchPreferenceCompat
                     android:defaultValue="false"
                     android:key="inactivity_warnings_th"
                     android:title="@string/zetime_prefs_inactivity_th"
                     app:iconSpaceReserved="false" />
-                <SwitchPreference
+                <SwitchPreferenceCompat
                     android:defaultValue="false"
                     android:key="inactivity_warnings_fr"
                     android:title="@string/zetime_prefs_inactivity_fr"
                     app:iconSpaceReserved="false" />
-                <SwitchPreference
+                <SwitchPreferenceCompat
                     android:defaultValue="false"
                     android:key="inactivity_warnings_sa"
                     android:title="@string/zetime_prefs_inactivity_sa"
                     app:iconSpaceReserved="false" />
-                <SwitchPreference
+                <SwitchPreferenceCompat
                     android:defaultValue="false"
                     android:key="inactivity_warnings_su"
                     android:title="@string/zetime_prefs_inactivity_su"
@@ -160,7 +160,7 @@
             app:iconSpaceReserved="false"
             app:useSimpleSummaryProvider="true" />
 
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:defaultValue="false"
             android:key="zetime_handmove_display"
             android:summary="@string/zetime_handmove_display_summary"
@@ -185,7 +185,7 @@
             app:iconSpaceReserved="false"
             app:useSimpleSummaryProvider="true" />
 
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:defaultValue="true"
             android:key="zetime_dont_del_actdata"
             android:summary="@string/pref_summary_keep_data_on_device"
@@ -252,7 +252,7 @@
 
                 app:iconSpaceReserved="false" />
 
-            <SwitchPreference
+            <SwitchPreferenceCompat
                 android:defaultValue="false"
                 android:key="zetime_heartrate_alarm_enable"
                 android:summary="@string/zetime_title_heart_rate_alarm_summary"