Prevent text cutoff on all checkbox preferences

app/src/main/res/xml/charts_preferences.xml

@@ -27,6 +27,7 @@
         <SwitchPreferenceCompat
             android:defaultValue="false"
             android:key="chart_heartrate_color"
+            android:layout="@layout/preference_checkbox"
             android:summaryOff="@string/pref_chart_heartrate_color_orange"
             android:summaryOn="@string/pref_chart_heartrate_color_red"
             android:title="@string/pref_title_chart_heartrate_color"
@@ -35,12 +36,14 @@
         <SwitchPreferenceCompat
             android:defaultValue="true"
             android:key="charts_allow_swipe"
+            android:layout="@layout/preference_checkbox"
             android:title="@string/pref_title_charts_swipe"
             app:iconSpaceReserved="false" />
 
         <SwitchPreferenceCompat
             android:defaultValue="false"
             android:key="chart_sleep_range_24h"
+            android:layout="@layout/preference_checkbox"
             android:summaryOff="@string/pref_chart_sleep_rolling_24_off"
             android:summaryOn="@string/pref_chart_sleep_rolling_24_on"
             android:title="@string/pref_title_chart_sleep_rolling_24_hour"
@@ -49,12 +52,14 @@
         <SwitchPreferenceCompat
             android:defaultValue="true"
             android:key="charts_show_average"
+            android:layout="@layout/preference_checkbox"
             android:title="@string/pref_title_charts_average"
             app:iconSpaceReserved="false" />
 
         <SwitchPreferenceCompat
             android:defaultValue="false"
             android:key="charts_range"
+            android:layout="@layout/preference_checkbox"
             android:summaryOff="@string/pref_charts_range_off"
             android:summaryOn="@string/pref_charts_range_on"
             android:title="@string/pref_title_charts_range"
@@ -63,6 +68,7 @@
         <SwitchPreferenceCompat
             android:defaultValue="true"
             android:key="charts_show_ongoing_activity"
+            android:layout="@layout/preference_checkbox"
             android:title="@string/show_ongoing_activity"
             app:iconSpaceReserved="false" />
 

app/src/main/res/xml/devicesettings_allow_accept_reject_calls.xml

@@ -4,12 +4,14 @@
         android:defaultValue="true"
         android:icon="@drawable/ic_notifications"
         android:key="enable_call_accept"
+        android:layout="@layout/preference_checkbox"
         android:title="@string/pref_enable_call_accept"
         android:summary="@string/pref_enable_call_accept_summary" />
     <SwitchPreferenceCompat
         android:defaultValue="true"
         android:icon="@drawable/ic_notifications"
         android:key="enable_call_reject"
+        android:layout="@layout/preference_checkbox"
         android:title="@string/pref_enable_call_reject"
         android:summary="@string/pref_enable_call_reject_summary" />
 </PreferenceScreen>

app/src/main/res/xml/devicesettings_always_on_display.xml

@@ -31,6 +31,7 @@
         <SwitchPreferenceCompat
             android:defaultValue="true"
             android:key="always_on_display_follow_watchface"
+            android:layout="@layout/preference_checkbox"
             android:title="@string/prefs_always_on_display_follow_watchface" />
 
         <ListPreference

app/src/main/res/xml/devicesettings_antilost.xml

@@ -4,6 +4,7 @@
         android:defaultValue="true"
         android:icon="@drawable/ic_vibration"
         android:key="pref_antilost_enabled"
+        android:layout="@layout/preference_checkbox"
         android:summary="@string/lefun_prefs_antilost_summary"
         android:title="@string/lefun_prefs_antilost_title" />
 </androidx.preference.PreferenceScreen>

app/src/main/res/xml/devicesettings_autoheartrate.xml

@@ -13,12 +13,14 @@
         <SwitchPreferenceCompat
             android:defaultValue="false"
             android:key="pref_autoheartrate_switch"
+            android:layout="@layout/preference_checkbox"
             android:title="@string/prefs_autoheartrate_measurement" />
 
         <SwitchPreferenceCompat
             android:defaultValue="false"
             android:dependency="pref_autoheartrate_switch"
             android:key="pref_autoheartrate_sleep"
+            android:layout="@layout/preference_checkbox"
             android:title="@string/prefs_autoheartrate_sleep" />
 
         <ListPreference

app/src/main/res/xml/devicesettings_autolight.xml

@@ -4,5 +4,6 @@
         android:defaultValue="false"
         android:icon="@drawable/ic_wb_sunny"
         android:key="autolight"
+        android:layout="@layout/preference_checkbox"
         android:title="@string/prefs_autolight" />
 </androidx.preference.PreferenceScreen>

app/src/main/res/xml/devicesettings_autoremove_message.xml

@@ -4,5 +4,6 @@
         android:defaultValue="false"
         android:icon="@drawable/ic_block"
         android:key="autoremove_message"
+        android:layout="@layout/preference_checkbox"
         android:title="@string/prefs_autoremove_message" />
 </androidx.preference.PreferenceScreen>

app/src/main/res/xml/devicesettings_autoremove_notifications.xml

@@ -4,6 +4,7 @@
         android:icon="@drawable/ic_done_all"
         android:defaultValue="true"
         android:key="autoremove_notifications"
+        android:layout="@layout/preference_checkbox"
         android:summary="@string/pref_summary_autoremove_notifications"
         android:title="@string/pref_title_autoremove_notifications" />
 </androidx.preference.PreferenceScreen>

app/src/main/res/xml/devicesettings_banglejs_location.xml

@@ -7,6 +7,7 @@
             android:defaultValue="false"
             android:icon="@drawable/ic_gps_location"
             android:key="banglejs_gps_update"
+            android:layout="@layout/preference_checkbox"
             android:summary="@string/pref_summary_banglejs_phone_gps_enbale"
             android:title="@string/pref_title_banglejs_phone_gps_enbale" />
         <EditTextPreference
@@ -22,6 +23,7 @@
             android:dependency="banglejs_gps_update"
             android:icon="@drawable/ic_gps_location"
             android:key="banglejs_gps_use_network_only"
+            android:layout="@layout/preference_checkbox"
             android:summary="@string/pref_summary_banglejs_phone_gps_network_only"
             android:title="@string/pref_title_banglejs_phone_gps_network_only" />
     </PreferenceCategory>

app/src/main/res/xml/devicesettings_bt_connected_advertisement.xml

@@ -4,6 +4,7 @@
         android:defaultValue="false"
         android:icon="@drawable/ic_settings_remote"
         android:key="bt_connected_advertisement"
+        android:layout="@layout/preference_checkbox"
         android:summary="@string/pref_summary_connected_advertisement"
         android:title="@string/pref_title_connected_advertisement"/>
 </androidx.preference.PreferenceScreen>

app/src/main/res/xml/devicesettings_buttonactions.xml

@@ -16,6 +16,7 @@
             android:defaultValue="false"
             android:icon="@drawable/ic_smart_button"
             android:key="button_action_enable"
+            android:layout="@layout/preference_checkbox"
             android:summary="@string/mi2_prefs_button_action_summary"
             android:title="@string/mi2_prefs_button_action" />
 
@@ -24,6 +25,7 @@
             android:icon="@drawable/ic_vibration"
             android:dependency="button_action_enable"
             android:key="button_action_vibrate"
+            android:layout="@layout/preference_checkbox"
             android:summary="@string/mi2_prefs_button_action_vibrate_summary"
             android:title="@string/mi2_prefs_button_action_vibrate" />
 

app/src/main/res/xml/devicesettings_buttonactions_with_longpress.xml

@@ -16,6 +16,7 @@
             android:defaultValue="false"
             android:icon="@drawable/ic_smart_button"
             android:key="button_action_enable"
+            android:layout="@layout/preference_checkbox"
             android:summary="@string/mi2_prefs_button_action_summary"
             android:title="@string/mi2_prefs_button_action" />
 
@@ -24,6 +25,7 @@
             android:icon="@drawable/ic_vibration"
             android:dependency="button_action_enable"
             android:key="button_action_vibrate"
+            android:layout="@layout/preference_checkbox"
             android:summary="@string/mi2_prefs_button_action_vibrate_summary"
             android:title="@string/mi2_prefs_button_action_vibrate" />
 

app/src/main/res/xml/devicesettings_camera_remote.xml

@@ -4,6 +4,7 @@
         android:defaultValue="false"
         android:icon="@drawable/ic_camera_remote"
         android:key="camera_remote"
+        android:layout="@layout/preference_checkbox"
         android:summary="@string/pref_camera_remote_summary"
         android:title="@string/pref_camera_remote_title" />
 </androidx.preference.PreferenceScreen>

app/src/main/res/xml/devicesettings_casio_alert.xml

@@ -4,30 +4,35 @@
         android:defaultValue="true"
         android:icon="@drawable/ic_email"
         android:key="casio_alert_email"
+        android:layout="@layout/preference_checkbox"
         android:summary="@string/pref_summary_casio_alert_email"
         android:title="@string/pref_title_casio_alert_email" />
     <SwitchPreferenceCompat
         android:defaultValue="true"
         android:icon="@drawable/ic_message_outline"
         android:key="casio_alert_sms"
+        android:layout="@layout/preference_checkbox"
         android:summary="@string/pref_summary_casio_alert_sms"
         android:title="@string/pref_title_casio_alert_sms" />
     <SwitchPreferenceCompat
         android:defaultValue="true"
         android:icon="@android:drawable/ic_menu_call"
         android:key="casio_alert_call"
+        android:layout="@layout/preference_checkbox"
         android:summary="@string/pref_summary_casio_alert_call"
         android:title="@string/pref_title_casio_alert_call" />
     <SwitchPreferenceCompat
         android:defaultValue="true"
         android:icon="@android:drawable/ic_menu_my_calendar"
         android:key="casio_alert_calendar"
+        android:layout="@layout/preference_checkbox"
         android:summary="@string/pref_summary_casio_alert_calendar"
         android:title="@string/pref_title_casio_alert_calendar" />
     <SwitchPreferenceCompat
         android:defaultValue="true"
         android:icon="@android:drawable/ic_menu_help"
         android:key="casio_alert_other"
+        android:layout="@layout/preference_checkbox"
         android:summary="@string/pref_summary_casio_alert_other"
         android:title="@string/pref_title_casio_alert_other" />
 </androidx.preference.PreferenceScreen>

app/src/main/res/xml/devicesettings_connect_two_devices.xml

@@ -5,6 +5,7 @@
         android:defaultValue="false"
         android:icon="@drawable/ic_devices_other"
         android:key="pref_sony_connect_two_devices"
+        android:layout="@layout/preference_checkbox"
         android:title="@string/sony_connect_two_devices" />
 
 </androidx.preference.PreferenceScreen>

app/src/main/res/xml/devicesettings_custom_deviceicon.xml

@@ -4,6 +4,7 @@
         android:icon="@drawable/ic_devices_other"
         android:defaultValue="true"
         android:key="use_custom_deviceicon"
+        android:layout="@layout/preference_checkbox"
         android:summary="@string/pref_summary_custom_deviceicon"
         android:title="@string/pref_title_custom_deviceicon" />
 </androidx.preference.PreferenceScreen>

app/src/main/res/xml/devicesettings_custom_emoji_font.xml

@@ -4,6 +4,7 @@
         android:defaultValue="false"
         android:icon="@drawable/ic_font_download"
         android:key="use_custom_font"
+        android:layout="@layout/preference_checkbox"
         android:summary="@string/pref_summary_use_custom_font"
         android:title="@string/pref_title_use_custom_font" />
 </androidx.preference.PreferenceScreen>

app/src/main/res/xml/devicesettings_device_card_activity_card_preferences.xml

@@ -11,6 +11,7 @@
             android:defaultValue="true"
             android:icon="@drawable/ic_activity_unknown_small"
             android:key="prefs_activity_in_device_card"
+            android:layout="@layout/preference_checkbox"
             android:persistent="true"
             android:summary="@string/prefs_activity_in_device_card_title_summary"
             android:title="@string/prefs_activity_in_device_card_title" />
@@ -20,6 +21,7 @@
             android:dependency="prefs_activity_in_device_card"
             android:icon="@drawable/ic_shoe_prints_many"
             android:key="prefs_activity_in_device_card_steps"
+            android:layout="@layout/preference_checkbox"
             android:persistent="true"
             android:summary="@string/prefs_activity_in_device_card_steps_title_summary"
             android:title="@string/Steps" />
@@ -29,6 +31,7 @@
             android:dependency="prefs_activity_in_device_card"
             android:icon="@drawable/ic_distance_total"
             android:key="prefs_activity_in_device_card_distance"
+            android:layout="@layout/preference_checkbox"
             android:persistent="true"
             android:summary="@string/prefs_activity_in_device_card_distance_title_summary"
             android:title="@string/Distance" />
@@ -38,6 +41,7 @@
             android:dependency="prefs_activity_in_device_card"
             android:icon="@drawable/ic_activity_sleep"
             android:key="prefs_activity_in_device_card_sleep"
+            android:layout="@layout/preference_checkbox"
             android:persistent="true"
             android:summary="@string/prefs_activity_in_device_card_sleep_title_summary"
             android:title="@string/prefs_activity_in_device_card_sleep_title" />

app/src/main/res/xml/devicesettings_device_intents.xml

@@ -4,6 +4,7 @@
         android:defaultValue="false"
         android:icon="@drawable/ic_language"
         android:key="device_intents"
+        android:layout="@layout/preference_checkbox"
         android:summary="@string/pref_summary_device_intents"
         android:title="@string/pref_title_device_intents" />
 </androidx.preference.PreferenceScreen>

app/src/main/res/xml/devicesettings_device_internet_access.xml

@@ -4,6 +4,7 @@
         android:defaultValue="false"
         android:icon="@drawable/ic_language"
         android:key="device_internet_access"
+        android:layout="@layout/preference_checkbox"
         android:summary="@string/pref_summary_device_internet_access"
         android:title="@string/pref_title_device_internet_access" />
 </androidx.preference.PreferenceScreen>

app/src/main/res/xml/devicesettings_disable_find_phone_with_dnd.xml

@@ -4,5 +4,6 @@
         android:defaultValue="false"
         android:icon="@drawable/ic_notifications"
         android:key="disable_find_phone_with_dnd"
+        android:layout="@layout/preference_checkbox"
         android:title="@string/pref_disable_find_phone_with_dnd" />
 </PreferenceScreen>

app/src/main/res/xml/devicesettings_disconnectnotification_noshed.xml

@@ -4,5 +4,6 @@
         android:icon="@drawable/ic_signal_cellular_connected_no_internet_4_bar"
         android:defaultValue="false"
         android:key="disconnect_notification_noshed"
+        android:layout="@layout/preference_checkbox"
         android:title="@string/prefs_disconnect_notification" />
 </androidx.preference.PreferenceScreen>

app/src/main/res/xml/devicesettings_display_caller.xml

@@ -4,6 +4,7 @@
         android:defaultValue="true"
         android:icon="@drawable/ic_person"
         android:key="display_caller"
+        android:layout="@layout/preference_checkbox"
         android:summary="@string/pref_display_caller_summary"
         android:title="@string/pref_display_caller_title" />
 </androidx.preference.PreferenceScreen>

app/src/main/res/xml/devicesettings_donotdisturb_allday_liftwirst.xml

@@ -34,6 +34,7 @@
             android:defaultValue="false"
             android:icon="@drawable/ic_arrow_upward"
             android:key="do_not_disturb_lift_wrist"
+            android:layout="@layout/preference_checkbox"
             android:title="@string/mi2_prefs_do_not_disturb_lift_wrist"
             android:summary="@string/do_not_disturb_lift_wrist_summary"/>
 

app/src/main/res/xml/devicesettings_donotdisturb_lift_wrist.xml

@@ -5,6 +5,7 @@
         android:defaultValue="false"
         android:icon="@drawable/ic_arrow_upward"
         android:key="do_not_disturb_lift_wrist"
+        android:layout="@layout/preference_checkbox"
         android:title="@string/mi2_prefs_do_not_disturb_lift_wrist" />
 
 </androidx.preference.PreferenceScreen>

app/src/main/res/xml/devicesettings_expose_hr_thirdparty.xml

@@ -4,6 +4,7 @@
         android:defaultValue="false"
         android:icon="@drawable/ic_settings_remote"
         android:key="expose_hr_thirdparty"
+        android:layout="@layout/preference_checkbox"
         android:summary="@string/pref_summary_expose_hr"
         android:title="@string/pref_title_expose_hr" />
 </androidx.preference.PreferenceScreen>

app/src/main/res/xml/devicesettings_fake_ring_duration.xml

@@ -4,5 +4,6 @@
         android:defaultValue="false"
         android:icon="@drawable/ic_rotate_left"
         android:key="fake_ring_duration"
+        android:layout="@layout/preference_checkbox"
         android:title="@string/prefs_fake_ring_duration" />
 </androidx.preference.PreferenceScreen>

app/src/main/res/xml/devicesettings_force_options.xml

@@ -11,6 +11,7 @@
             android:icon="@drawable/ic_access_time"
             android:defaultValue="false"
             android:key="pref_force_enable_smart_alarm"
+            android:layout="@layout/preference_checkbox"
             android:title="@string/pref_force_smart_alarm"
             android:summary="@string/pref_force_smart_alarm_summary"/>
 
@@ -18,6 +19,7 @@
             android:icon="@drawable/ic_switch_left"
             android:defaultValue="false"
             android:key="pref_force_enable_wear_location"
+            android:layout="@layout/preference_checkbox"
             android:title="@string/pref_force_wear_location"
             android:summary="@string/pref_force_wear_location_summary" />
 
@@ -25,6 +27,7 @@
             android:icon="@drawable/ic_block"
             android:defaultValue="false"
             android:key="pref_force_dnd_support"
+            android:layout="@layout/preference_checkbox"
             android:title="@string/pref_force_dnd_support"
             android:summary="@string/pref_force_dnd_support_summary" />
 
@@ -32,6 +35,7 @@
             android:icon="@drawable/ic_activity_sleep"
             android:defaultValue="false"
             android:key="pref_force_ignore_wakeup_status_start"
+            android:layout="@layout/preference_checkbox"
             android:title="@string/huawei_ignore_wakeup_status_start"
             android:summary="@string/huawei_ignore_wakeup_status_start_description"/>
 
@@ -39,6 +43,7 @@
             android:icon="@drawable/ic_activity_sleep"
             android:defaultValue="false"
             android:key="pref_force_ignore_wakeup_status_end"
+            android:layout="@layout/preference_checkbox"
             android:title="@string/huawei_ignore_wakeup_status_end"
             android:summary="@string/huawei_ignore_wakeup_status_end_description"/>
     </PreferenceScreen>

app/src/main/res/xml/devicesettings_fossilhybridhr_all_fw.xml

@@ -14,12 +14,14 @@
             <SwitchPreferenceCompat
                 android:defaultValue="false"
                 android:key="activity_recognize_running_enabled"
+                android:layout="@layout/preference_checkbox"
                 android:title="@string/pref_workout_detection_enabled"
                 android:summary="@string/pref_workout_detection_summary"
                 android:icon="@drawable/ic_activity_running"/>
             <SwitchPreferenceCompat
                 android:defaultValue="false"
                 android:key="activity_recognize_running_ask_first"
+                android:layout="@layout/preference_checkbox"
                 android:title="@string/pref_workout_detection_ask_first"
                 android:summary="@string/pref_workout_detection_ask_first_summary"
                 android:icon="@drawable/ic_warning_gray"
@@ -40,12 +42,14 @@
             <SwitchPreferenceCompat
                 android:defaultValue="false"
                 android:key="activity_recognize_biking_enabled"
+                android:layout="@layout/preference_checkbox"
                 android:title="@string/pref_workout_detection_enabled"
                 android:summary="@string/pref_workout_detection_summary"
                 android:icon="@drawable/ic_activity_biking"/>
             <SwitchPreferenceCompat
                 android:defaultValue="false"
                 android:key="activity_recognize_biking_ask_first"
+                android:layout="@layout/preference_checkbox"
                 android:title="@string/pref_workout_detection_ask_first"
                 android:summary="@string/pref_workout_detection_ask_first_summary"
                 android:icon="@drawable/ic_warning_gray"
@@ -66,12 +70,14 @@
             <SwitchPreferenceCompat
                 android:defaultValue="false"
                 android:key="activity_recognize_walking_enabled"
+                android:layout="@layout/preference_checkbox"
                 android:title="@string/pref_workout_detection_enabled"
                 android:summary="@string/pref_workout_detection_summary"
                 android:icon="@drawable/ic_activity_walking"/>
             <SwitchPreferenceCompat
                 android:defaultValue="false"
                 android:key="activity_recognize_walking_ask_first"
+                android:layout="@layout/preference_checkbox"
                 android:title="@string/pref_workout_detection_ask_first"
                 android:summary="@string/pref_workout_detection_ask_first_summary"
                 android:icon="@drawable/ic_warning_gray"
@@ -92,12 +98,14 @@
             <SwitchPreferenceCompat
                 android:defaultValue="false"
                 android:key="activity_recognize_rowing_enabled"
+                android:layout="@layout/preference_checkbox"
                 android:title="@string/pref_workout_detection_enabled"
                 android:summary="@string/pref_workout_detection_summary"
                 android:icon="@drawable/ic_activity_rowing"/>
             <SwitchPreferenceCompat
                 android:defaultValue="false"
                 android:key="activity_recognize_rowing_ask_first"
+                android:layout="@layout/preference_checkbox"
                 android:title="@string/pref_workout_detection_ask_first"
                 android:summary="@string/pref_workout_detection_ask_first_summary"
                 android:icon="@drawable/ic_warning_gray"
@@ -140,12 +148,14 @@
         <SwitchPreferenceCompat
             android:defaultValue="true"
             android:key="fossil_hr_nav_auto_foreground"
+            android:layout="@layout/preference_checkbox"
             android:title="@string/pref_title_fossil_hr_nav_foreground"
             android:summary="@string/pref_summary_fossil_hr_nav_foreground"
             android:icon="@drawable/ic_info"/>
         <SwitchPreferenceCompat
             android:defaultValue="true"
             android:key="fossil_hr_nav_vibrate"
+            android:layout="@layout/preference_checkbox"
             android:title="@string/pref_title_fossil_hr_nav_vibrate"
             android:summary="@string/pref_summary_fossil_hr_nav_vibrate"
             android:icon="@drawable/ic_action_find_lost_device"/>

app/src/main/res/xml/devicesettings_fossilhybridhr_dev.xml

@@ -11,11 +11,13 @@
         <SwitchPreferenceCompat
             android:defaultValue="false"
             android:key="save_raw_activity_files"
+            android:layout="@layout/preference_checkbox"
             android:title="@string/pref_qhybrid_save_raw_activity_files" />
 
         <SwitchPreferenceCompat
             android:defaultValue="false"
             android:key="dangerous_external_intents"
+            android:layout="@layout/preference_checkbox"
             android:title="@string/qhybrid_pref_title_external_intents"
             android:summary="@string/qhybrid_pref_summary_external_intents" />
 
@@ -30,6 +32,7 @@
         <SwitchPreferenceCompat
             android:defaultValue="true"
             android:key="enable_on_device_confirmation"
+            android:layout="@layout/preference_checkbox"
             android:title="@string/qhybrid_title_on_device_confirmation"
             android:summary="@string/qhybrid_summary_on_device_confirmation" />
 

app/src/main/res/xml/devicesettings_fossilhybridhr_pre_fw220.xml

@@ -15,12 +15,14 @@
         android:defaultValue="false"
         android:icon="@drawable/ic_filter_b_and_w"
         android:key="force_white_color_scheme"
+        android:layout="@layout/preference_checkbox"
         android:summary="@string/pref_summary_force_white_color_scheme"
         android:title="@string/pref_title_force_white_color_scheme" />
     <SwitchPreferenceCompat
         android:defaultValue="false"
         android:icon="@drawable/ic_circle"
         android:key="widget_draw_circles"
+        android:layout="@layout/preference_checkbox"
         android:title="@string/pref_qhybrid_title_widget_draw_circles" />
 
 </androidx.preference.PreferenceScreen>

app/src/main/res/xml/devicesettings_galaxy_buds.xml

@@ -12,6 +12,7 @@
                 android:defaultValue="false"
                 android:icon="@drawable/ic_hearing"
                 android:key="pref_galaxy_buds_ambient_mode"
+                android:layout="@layout/preference_checkbox"
                 android:summary="Hear surrounding sounds"
                 android:title="@string/prefs_ambient_sound" />
             <SwitchPreferenceCompat
@@ -19,6 +20,7 @@
                 android:dependency="pref_galaxy_buds_ambient_mode"
                 android:icon="@drawable/ic_voice"
                 android:key="pref_galaxy_buds_ambient_voice_focus"
+                android:layout="@layout/preference_checkbox"
                 android:summary="@string/prefs_ambient_voice_summary"
                 android:title="@string/prefs_ambient_voice_focus" />
 
@@ -43,6 +45,7 @@
                 android:defaultValue="false"
                 android:icon="@drawable/ic_graphic_eq"
                 android:key="pref_galaxy_buds_equalizer"
+                android:layout="@layout/preference_checkbox"
                 android:summary="@string/prefs_equalizer_summary"
                 android:title="@string/prefs_equalizer" />
             <SwitchPreferenceCompat
@@ -50,6 +53,7 @@
                 android:dependency="pref_galaxy_buds_equalizer"
                 android:icon="@drawable/ic_music_note"
                 android:key="pref_galaxy_buds_equalizer_dolby"
+                android:layout="@layout/preference_checkbox"
                 android:summary="@string/prefs_dolby_summary"
                 android:title="@string/prefs_dolby_mode" />
             <ListPreference
@@ -74,6 +78,7 @@
                 android:disableDependentsState="true"
                 android:icon="@drawable/ic_lock_open"
                 android:key="pref_galaxy_buds_lock_touch"
+                android:layout="@layout/preference_checkbox"
                 android:summary="@string/prefs_touch_lock_summary"
                 android:title="@string/prefs_touch_lock" />
             <ListPreference
@@ -99,6 +104,7 @@
             android:defaultValue="false"
             android:icon="@drawable/ic_videogame"
             android:key="pref_galaxy_buds_game_mode"
+            android:layout="@layout/preference_checkbox"
             android:summary="@string/prefs_game_mode_summary"
             android:title="@string/prefs_game_mode" />
     </PreferenceCategory>

app/src/main/res/xml/devicesettings_galaxy_buds_2.xml

@@ -40,6 +40,7 @@
                 android:defaultValue="false"
                 android:icon="@drawable/ic_phone"
                 android:key="pref_galaxy_buds_ambient_mode_during_call"
+                android:layout="@layout/preference_checkbox"
                 android:summary="@string/prefs_ambient_sound_during_call_summary"
                 android:title="@string/prefs_ambient_sound_during_call_title" />
 
@@ -47,6 +48,7 @@
                 android:defaultValue="false"
                 android:icon="@drawable/ic_hearing"
                 android:key="pref_galaxy_buds_ambient_sound"
+                android:layout="@layout/preference_checkbox"
                 android:title="@string/prefs_customize_ambient_sound_summary" />
 
             <SeekBarPreference
@@ -101,6 +103,7 @@
                 android:defaultValue="true"
                 android:icon="@drawable/ic_touch"
                 android:key="pref_galaxy_buds_lock_touch"
+                android:layout="@layout/preference_checkbox"
                 android:title="@string/prefs_touch_lock_buds2" />
             <ListPreference
                 android:defaultValue="0"
@@ -144,6 +147,7 @@
                 android:dependency="pref_galaxy_buds_lock_touch"
                 android:icon="@drawable/ic_touch"
                 android:key="pref_galaxy_pro_double_tap_edge"
+                android:layout="@layout/preference_checkbox"
                 android:summary="@string/prefs_double_tap_edge_summary"
                 android:title="@string/prefs_double_tap_edge" />
         </PreferenceCategory>
@@ -158,12 +162,14 @@
             android:defaultValue="false"
             android:icon="@drawable/ic_hearing"
             android:key="pref_galaxy_buds_pro_in_ear_detection"
+            android:layout="@layout/preference_checkbox"
             android:summary="@string/prefs_in_ear_detection_summary"
             android:title="@string/nothing_prefs_inear_title" />
         <SwitchPreferenceCompat
             android:defaultValue="false"
             android:icon="@drawable/ic_auto_awesome"
             android:key="prefs_galaxy_buds_seamless_connection"
+            android:layout="@layout/preference_checkbox"
             android:summary="@string/prefs_seamless_connection_switch_summary"
             android:title="@string/prefs_seamless_connection_switch_title" />
 
@@ -171,6 +177,7 @@
             android:defaultValue="false"
             android:icon="@drawable/ic_hearing"
             android:key="pref_galaxy_buds_noise_controls_with_one_earbud"
+            android:layout="@layout/preference_checkbox"
             android:summary="@string/prefs_noise_control_with_one_earbud_summary"
             android:title="@string/prefs_noise_control_with_one_earbud" />
 
@@ -189,6 +196,7 @@
                 android:defaultValue="false"
                 android:icon="@drawable/ic_videogame"
                 android:key="pref_galaxy_buds_game_mode"
+                android:layout="@layout/preference_checkbox"
                 android:summary="@string/prefs_game_mode_summary"
                 android:title="@string/prefs_game_mode" />
         </PreferenceCategory>

app/src/main/res/xml/devicesettings_galaxy_buds_2_pro.xml

@@ -20,6 +20,7 @@
                 android:defaultValue="false"
                 android:icon="@drawable/ic_voice"
                 android:key="pref_galaxy_buds_pro_voice_detect"
+                android:layout="@layout/preference_checkbox"
                 android:summary="@string/prefs_voice_detect_summary"
                 android:title="@string/prefs_voice_detect" />
             <ListPreference
@@ -40,6 +41,7 @@
                 android:defaultValue="false"
                 android:icon="@drawable/ic_phone"
                 android:key="pref_galaxy_buds_ambient_mode_during_call"
+                android:layout="@layout/preference_checkbox"
                 android:summary="@string/prefs_ambient_sound_during_call_summary"
                 android:title="@string/prefs_ambient_sound_during_call_title" />
 
@@ -47,6 +49,7 @@
                 android:defaultValue="false"
                 android:icon="@drawable/ic_hearing"
                 android:key="pref_galaxy_buds_ambient_sound"
+                android:layout="@layout/preference_checkbox"
                 android:title="@string/prefs_customize_ambient_sound_summary" />
 
             <SeekBarPreference
@@ -100,6 +103,7 @@
                 android:defaultValue="true"
                 android:icon="@drawable/ic_touch"
                 android:key="pref_galaxy_buds_lock_touch"
+                android:layout="@layout/preference_checkbox"
                 android:title="@string/prefs_touch_lock_buds2" />
             <ListPreference
                 android:defaultValue="0"
@@ -143,6 +147,7 @@
                 android:dependency="pref_galaxy_buds_lock_touch"
                 android:icon="@drawable/ic_touch"
                 android:key="pref_galaxy_pro_double_tap_edge"
+                android:layout="@layout/preference_checkbox"
                 android:summary="@string/prefs_double_tap_edge_summary"
                 android:title="@string/prefs_double_tap_edge" />
         </PreferenceCategory>
@@ -157,12 +162,14 @@
             android:defaultValue="false"
             android:icon="@drawable/ic_hearing"
             android:key="pref_galaxy_buds_pro_in_ear_detection"
+            android:layout="@layout/preference_checkbox"
             android:summary="@string/prefs_in_ear_detection_summary"
             android:title="@string/nothing_prefs_inear_title" />
         <SwitchPreferenceCompat
             android:defaultValue="false"
             android:icon="@drawable/ic_auto_awesome"
             android:key="prefs_galaxy_buds_seamless_connection"
+            android:layout="@layout/preference_checkbox"
             android:summary="@string/prefs_seamless_connection_switch_summary"
             android:title="@string/prefs_seamless_connection_switch_title" />
 
@@ -170,6 +177,7 @@
             android:defaultValue="false"
             android:icon="@drawable/ic_hearing"
             android:key="pref_galaxy_buds_noise_controls_with_one_earbud"
+            android:layout="@layout/preference_checkbox"
             android:summary="@string/prefs_noise_control_with_one_earbud_summary"
             android:title="@string/prefs_noise_control_with_one_earbud" />
 
@@ -188,6 +196,7 @@
                 android:defaultValue="false"
                 android:icon="@drawable/ic_videogame"
                 android:key="pref_galaxy_buds_game_mode"
+                android:layout="@layout/preference_checkbox"
                 android:summary="@string/prefs_game_mode_summary"
                 android:title="@string/prefs_game_mode" />
         </PreferenceCategory>
@@ -196,6 +205,7 @@
             android:defaultValue="false"
             android:icon="@drawable/ic_graphic_eq"
             android:key="pref_galaxy_buds_pro_read_notifications_outloud"
+            android:layout="@layout/preference_checkbox"
             android:title="@string/prefs_read_notification_outloud" />
             -->
 

app/src/main/res/xml/devicesettings_galaxy_buds_live.xml

@@ -5,6 +5,7 @@
         android:defaultValue="false"
         android:icon="@drawable/ic_hearing"
         android:key="pref_galaxy_buds_live_anc"
+        android:layout="@layout/preference_checkbox"
         android:summary="@string/prefs_active_noise_cancelling_summary"
         android:title="@string/prefs_active_noise_cancelling" />
 
@@ -28,6 +29,7 @@
                 android:disableDependentsState="true"
                 android:icon="@drawable/ic_lock_open"
                 android:key="pref_galaxy_buds_lock_touch"
+                android:layout="@layout/preference_checkbox"
                 android:summary="@string/prefs_touch_lock_summary"
                 android:title="@string/prefs_touch_lock" />
             <ListPreference
@@ -53,6 +55,7 @@
             android:defaultValue="false"
             android:icon="@drawable/ic_videogame"
             android:key="pref_galaxy_buds_game_mode"
+            android:layout="@layout/preference_checkbox"
             android:summary="@string/prefs_game_mode_summary"
             android:title="@string/prefs_game_mode" />
 
@@ -60,6 +63,7 @@
             android:defaultValue="false"
             android:icon="@drawable/ic_engineering"
             android:key="pref_galaxy_buds_live_pressure_relief"
+            android:layout="@layout/preference_checkbox"
             android:summary="@string/pressure_relief_summary"
             android:title="@string/prefs_pressure_relief" />
     </PreferenceCategory>

app/src/main/res/xml/devicesettings_galaxy_buds_pro.xml

@@ -50,6 +50,7 @@
                 android:defaultValue="false"
                 android:icon="@drawable/ic_voice"
                 android:key="pref_galaxy_buds_pro_voice_detect"
+                android:layout="@layout/preference_checkbox"
                 android:summary="@string/prefs_voice_detect_summary"
                 android:title="@string/prefs_voice_detect" />
             <ListPreference
@@ -70,6 +71,7 @@
                 android:defaultValue="false"
                 android:icon="@drawable/ic_phone"
                 android:key="pref_galaxy_buds_ambient_mode_during_call"
+                android:layout="@layout/preference_checkbox"
                 android:summary="@string/prefs_ambient_sound_during_call_summary"
                 android:title="@string/prefs_ambient_sound_during_call_title" />
 
@@ -77,6 +79,7 @@
                 android:defaultValue="false"
                 android:icon="@drawable/ic_hearing"
                 android:key="pref_galaxy_buds_ambient_sound"
+                android:layout="@layout/preference_checkbox"
                 android:title="@string/prefs_customize_ambient_sound_summary" />
 
             <SeekBarPreference
@@ -132,6 +135,7 @@
                 android:disableDependentsState="true"
                 android:icon="@drawable/ic_lock_open"
                 android:key="pref_galaxy_buds_lock_touch"
+                android:layout="@layout/preference_checkbox"
                 android:summary="@string/prefs_touch_lock_summary"
                 android:title="@string/prefs_touch_lock" />
             <ListPreference
@@ -178,6 +182,7 @@
                 android:dependency="pref_galaxy_buds_lock_touch"
                 android:icon="@drawable/ic_touch"
                 android:key="pref_galaxy_pro_double_tap_edge"
+                android:layout="@layout/preference_checkbox"
                 android:summary="@string/prefs_double_tap_edge_summary"
                 android:title="@string/prefs_double_tap_edge" />
         </PreferenceCategory>
@@ -192,12 +197,14 @@
             android:defaultValue="false"
             android:icon="@drawable/ic_hearing"
             android:key="pref_galaxy_buds_pro_in_ear_detection"
+            android:layout="@layout/preference_checkbox"
             android:summary="@string/prefs_in_ear_detection_summary"
             android:title="@string/nothing_prefs_inear_title" />
         <SwitchPreferenceCompat
             android:defaultValue="false"
             android:icon="@drawable/ic_auto_awesome"
             android:key="pref_galaxy_buds_pro_seamless_connection"
+            android:layout="@layout/preference_checkbox"
             android:summary="@string/prefs_seamless_connection_switch_summary"
             android:title="@string/prefs_seamless_connection_switch_title" />
 
@@ -205,6 +212,7 @@
             android:defaultValue="false"
             android:icon="@drawable/ic_hearing"
             android:key="pref_galaxy_buds_noise_controls_with_one_earbud"
+            android:layout="@layout/preference_checkbox"
             android:summary="@string/prefs_noise_control_with_one_earbud_summary"
             android:title="@string/prefs_noise_control_with_one_earbud" />
 
@@ -223,6 +231,7 @@
                 android:defaultValue="false"
                 android:icon="@drawable/ic_videogame"
                 android:key="pref_galaxy_buds_game_mode"
+                android:layout="@layout/preference_checkbox"
                 android:summary="@string/prefs_game_mode_summary"
                 android:title="@string/prefs_game_mode" />
         </PreferenceCategory>

app/src/main/res/xml/devicesettings_goal_notification.xml

@@ -4,6 +4,7 @@
         android:defaultValue="false"
         android:icon="@drawable/ic_star_gray"
         android:key="fitness_goal_notification"
+        android:layout="@layout/preference_checkbox"
         android:summary="@string/mi2_prefs_goal_notification_summary"
         android:title="@string/mi2_prefs_goal_notification" />
 </androidx.preference.PreferenceScreen>

app/src/main/res/xml/devicesettings_gps_agps.xml

@@ -50,6 +50,7 @@
             <SwitchPreferenceCompat
                 android:defaultValue="false"
                 android:key="pref_agps_expiry_reminder_enabled"
+                android:layout="@layout/preference_checkbox"
                 android:title="@string/pref_agps_expiry_reminder_enabled" />
 
             <nodomain.freeyourgadget.gadgetbridge.util.XTimePreference

app/src/main/res/xml/devicesettings_heartrate_automatic_enable.xml

@@ -5,5 +5,6 @@
         android:defaultValue="false"
         android:icon="@drawable/ic_heartrate"
         android:key="heartrate_automatic_enable"
+        android:layout="@layout/preference_checkbox"
         android:title="@string/pref_heartrate_automatic_enable" />
 </androidx.preference.PreferenceScreen>

app/src/main/res/xml/devicesettings_heartrate_sleep.xml

@@ -11,6 +11,7 @@
             android:defaultValue="false"
             android:icon="@drawable/ic_activity_sleep"
             android:key="heartrate_sleep_detection"
+            android:layout="@layout/preference_checkbox"
             android:title="@string/miband_prefs_hr_sleep_detection" />
 
         <ListPreference

app/src/main/res/xml/devicesettings_heartrate_sleep_activity.xml

@@ -11,6 +11,7 @@
             android:defaultValue="false"
             android:icon="@drawable/ic_activity_sleep"
             android:key="heartrate_sleep_detection"
+            android:layout="@layout/preference_checkbox"
             android:title="@string/miband_prefs_hr_sleep_detection" />
 
         <ListPreference
@@ -28,6 +29,7 @@
             android:defaultValue="false"
             android:icon="@drawable/ic_activity_unknown_small"
             android:key="heartrate_activity_monitoring"
+            android:layout="@layout/preference_checkbox"
             android:summary="@string/prefs_activity_monitoring_description"
             android:title="@string/prefs_activity_monitoring_title" />
 

app/src/main/res/xml/devicesettings_heartrate_sleep_alert_activity_stress.xml

@@ -11,6 +11,7 @@
             android:defaultValue="false"
             android:icon="@drawable/ic_activity_sleep"
             android:key="heartrate_sleep_detection"
+            android:layout="@layout/preference_checkbox"
             android:title="@string/miband_prefs_hr_sleep_detection" />
 
         <ListPreference
@@ -28,6 +29,7 @@
             android:defaultValue="false"
             android:icon="@drawable/ic_activity_unknown_small"
             android:key="heartrate_activity_monitoring"
+            android:layout="@layout/preference_checkbox"
             android:summary="@string/prefs_activity_monitoring_description"
             android:title="@string/prefs_activity_monitoring_title" />
 
@@ -37,6 +39,7 @@
             android:defaultValue="false"
             android:icon="@drawable/ic_warning_gray"
             android:key="heartrate_alert_enabled"
+            android:layout="@layout/preference_checkbox"
             android:summary="@string/prefs_heartrate_alert_experimental_description"
             android:title="@string/prefs_heartrate_alert_experimental_title" />
 
@@ -56,6 +59,7 @@
             android:defaultValue="false"
             android:icon="@drawable/ic_mood_bad"
             android:key="heartrate_stress_monitoring"
+            android:layout="@layout/preference_checkbox"
             android:summary="@string/prefs_stress_monitoring_description"
             android:title="@string/prefs_stress_monitoring_title" />
     </PreferenceScreen>

app/src/main/res/xml/devicesettings_heartrate_sleep_alert_activity_stress_spo2.xml

@@ -15,12 +15,14 @@
                 android:defaultValue="false"
                 android:icon="@drawable/ic_activity_sleep"
                 android:key="heartrate_sleep_detection"
+                android:layout="@layout/preference_checkbox"
                 android:title="@string/miband_prefs_hr_sleep_detection" />
 
             <SwitchPreferenceCompat
                 android:defaultValue="false"
                 android:icon="@drawable/ic_activity_sleep"
                 android:key="heartrate_sleep_breathing_quality_monitoring"
+                android:layout="@layout/preference_checkbox"
                 android:title="@string/pref_sleep_breathing_quality_monitoring" />
         </PreferenceCategory>
 
@@ -44,6 +46,7 @@
             android:defaultValue="false"
             android:icon="@drawable/ic_activity_unknown_small"
             android:key="heartrate_activity_monitoring"
+            android:layout="@layout/preference_checkbox"
             android:summary="@string/prefs_activity_monitoring_description"
             android:title="@string/prefs_activity_monitoring_title" />
 
@@ -91,6 +94,7 @@
                 android:defaultValue="false"
                 android:icon="@drawable/ic_mood_bad"
                 android:key="heartrate_stress_monitoring"
+                android:layout="@layout/preference_checkbox"
                 android:summary="@string/prefs_stress_monitoring_description"
                 android:title="@string/prefs_stress_monitoring_title" />
 
@@ -98,6 +102,7 @@
                 android:defaultValue="false"
                 android:dependency="heartrate_stress_monitoring"
                 android:key="heartrate_stress_relaxation_reminder"
+                android:layout="@layout/preference_checkbox"
                 android:summary="@string/prefs_relaxation_reminder_description"
                 android:title="@string/prefs_relaxation_reminder_title" />
         </PreferenceCategory>
@@ -110,6 +115,7 @@
             <SwitchPreferenceCompat
                 android:defaultValue="false"
                 android:key="spo2_all_day_monitoring_enabled"
+                android:layout="@layout/preference_checkbox"
                 android:summary="@string/prefs_spo2_monitoring_description"
                 android:title="@string/prefs_spo2_monitoring_title" />
 

app/src/main/res/xml/devicesettings_high_mtu.xml

@@ -4,6 +4,7 @@
         android:icon="@drawable/ic_mtu"
         android:defaultValue="true"
         android:key="allow_high_mtu"
+        android:layout="@layout/preference_checkbox"
         android:summary="@string/pref_summary_allow_high_mtu"
         android:title="@string/pref_title_allow_high_mtu" />
 </androidx.preference.PreferenceScreen>

app/src/main/res/xml/devicesettings_hourly_chime.xml

@@ -10,6 +10,7 @@
         <SwitchPreferenceCompat
             android:defaultValue="false"
             android:key="hourly_chime_enable"
+            android:layout="@layout/preference_checkbox"
             android:title="@string/prefs_hourly_chime"
             android:summary="@string/prefs_hourly_chime_summary" />
 

app/src/main/res/xml/devicesettings_huami2021_alexa.xml

@@ -59,6 +59,7 @@
             <SwitchPreferenceCompat
                 android:defaultValue="false"
                 android:key="zepp_os_alexa_ask_more_input"
+                android:layout="@layout/preference_checkbox"
                 android:summary="Continue listening after sending the reply"
                 android:title="Ask for more input" />
 

app/src/main/res/xml/devicesettings_huami2021_fetch_operation_time_unit.xml

@@ -4,6 +4,7 @@
         android:defaultValue="true"
         android:icon="@drawable/ic_timer"
         android:key="huami_truncate_fetch_operation_timestamps"
+        android:layout="@layout/preference_checkbox"
         android:summary="@string/pref_huami_truncate_fetch_operation_timestamps_summary"
         android:title="@string/pref_huami_truncate_fetch_operation_timestamps_title" />
 </androidx.preference.PreferenceScreen>

app/src/main/res/xml/devicesettings_huawei.xml

@@ -10,6 +10,7 @@
             android:defaultValue="false"
             android:icon="@drawable/ic_notifications"
             android:key="notification_enable"
+            android:layout="@layout/preference_checkbox"
             android:title="@string/prefs_notifications_enable"
             android:summary="@string/enable_notifications_summary"/>
 
@@ -17,6 +18,7 @@
             android:icon="@drawable/ic_signal_cellular_connected_no_internet_4_bar"
             android:defaultValue="false"
             android:key="disconnect_notification_noshed"
+            android:layout="@layout/preference_checkbox"
             android:title="@string/prefs_disconnect_notification"
             android:summary="@string/prefs_disconnect_notification_summary"/>
 
@@ -33,6 +35,7 @@
             <SwitchPreferenceCompat
                 android:defaultValue="false"
                 android:key="inactivity_warnings_enable"
+                android:layout="@layout/preference_checkbox"
                 android:title="@string/mi2_prefs_inactivity_warnings"
                 android:summary="@string/mi2_prefs_inactivity_warnings_summary" />
 
@@ -125,6 +128,7 @@
             android:defaultValue="false"
             android:icon="@drawable/ic_arrow_upward"
             android:key="do_not_disturb_lift_wrist"
+            android:layout="@layout/preference_checkbox"
             android:title="@string/mi2_prefs_do_not_disturb_lift_wrist"
             android:summary="@string/do_not_disturb_lift_wrist_summary"/>
 
@@ -132,6 +136,7 @@
             android:defaultValue="false"
             android:icon="@drawable/ic_notification_disconnected"
             android:key="do_not_disturb_not_wear"
+            android:layout="@layout/preference_checkbox"
             android:title="@string/pref_do_not_disturb_not_wear" />
 
         <!-- workaround for missing toolbar -->
@@ -184,6 +189,7 @@
         <SwitchPreferenceCompat
             android:defaultValue="false"
             android:key="huawei_reparse_workout_data"
+            android:layout="@layout/preference_checkbox"
             android:title="Reparse workout data"
             android:summary="This will only do something after certain updates" />
 
@@ -197,6 +203,7 @@
                 android:icon="@drawable/ic_access_time"
                 android:defaultValue="false"
                 android:key="pref_force_enable_smart_alarm"
+                android:layout="@layout/preference_checkbox"
                 android:title="@string/pref_force_smart_alarm"
                 android:summary="@string/pref_force_smart_alarm_summary"/>
 
@@ -204,6 +211,7 @@
                 android:icon="@drawable/ic_switch_left"
                 android:defaultValue="false"
                 android:key="pref_force_enable_wear_location"
+                android:layout="@layout/preference_checkbox"
                 android:title="@string/pref_force_wear_location"
                 android:summary="@string/pref_force_wear_location_summary" />
 
@@ -211,6 +219,7 @@
                 android:icon="@drawable/ic_block"
                 android:defaultValue="false"
                 android:key="pref_force_dnd_support"
+                android:layout="@layout/preference_checkbox"
                 android:title="@string/pref_force_dnd_support"
                 android:summary="@string/pref_force_dnd_support_summary" />
 
@@ -218,6 +227,7 @@
                 android:icon="@drawable/ic_activity_sleep"
                 android:defaultValue="false"
                 android:key="pref_force_ignore_wakeup_status_start"
+                android:layout="@layout/preference_checkbox"
                 android:title="@string/huawei_ignore_wakeup_status_start"
                 android:summary="@string/huawei_ignore_wakeup_status_start_description"/>
 
@@ -225,6 +235,7 @@
                 android:icon="@drawable/ic_activity_sleep"
                 android:defaultValue="false"
                 android:key="pref_force_ignore_wakeup_status_end"
+                android:layout="@layout/preference_checkbox"
                 android:title="@string/huawei_ignore_wakeup_status_end"
                 android:summary="@string/huawei_ignore_wakeup_status_end_description"/>
         </PreferenceCategory>

app/src/main/res/xml/devicesettings_hydration_reminder.xml

@@ -10,6 +10,7 @@
         <SwitchPreferenceCompat
             android:defaultValue="false"
             android:key="pref_hydration_switch"
+            android:layout="@layout/preference_checkbox"
             android:title="@string/lefun_prefs_hydration_reminder_title" />
         <EditTextPreference
             android:defaultValue="60"

app/src/main/res/xml/devicesettings_hydration_reminder_dnd.xml

@@ -10,6 +10,7 @@
         <SwitchPreferenceCompat
             android:defaultValue="false"
             android:key="pref_hydration_switch"
+            android:layout="@layout/preference_checkbox"
             android:title="@string/lefun_prefs_hydration_reminder_title" />
         <EditTextPreference
             android:defaultValue="60"
@@ -21,6 +22,7 @@
             android:defaultValue="false"
             android:dependency="screen_hydration_reminder"
             android:key="pref_hydration_dnd"
+            android:layout="@layout/preference_checkbox"
             android:summary="@string/hydration_dnd_summary"
             android:title="@string/mi2_prefs_do_not_disturb" />
 

app/src/main/res/xml/devicesettings_inactivity.xml

@@ -10,6 +10,7 @@
         <SwitchPreferenceCompat
             android:defaultValue="false"
             android:key="inactivity_warnings_enable"
+            android:layout="@layout/preference_checkbox"
             android:title="@string/mi2_prefs_inactivity_warnings"
             android:summary="@string/mi2_prefs_inactivity_warnings_summary" />
         <EditTextPreference

app/src/main/res/xml/devicesettings_inactivity_dnd.xml

@@ -10,6 +10,7 @@
         <SwitchPreferenceCompat
             android:defaultValue="false"
             android:key="inactivity_warnings_enable"
+            android:layout="@layout/preference_checkbox"
             android:title="@string/mi2_prefs_inactivity_warnings"
             android:summary="@string/mi2_prefs_inactivity_warnings_summary" />
 
@@ -37,6 +38,7 @@
             android:defaultValue="false"
             android:dependency="inactivity_warnings_enable"
             android:key="inactivity_warnings_dnd"
+            android:layout="@layout/preference_checkbox"
             android:summary="@string/mi2_prefs_inactivity_warnings_dnd_summary"
             android:title="@string/mi2_prefs_do_not_disturb" />
 

app/src/main/res/xml/devicesettings_inactivity_dnd_no_threshold.xml

@@ -10,6 +10,7 @@
         <SwitchPreferenceCompat
             android:defaultValue="false"
             android:key="inactivity_warnings_enable"
+            android:layout="@layout/preference_checkbox"
             android:summary="@string/mi2_prefs_inactivity_warnings_summary"
             android:title="@string/mi2_prefs_inactivity_warnings" />
 
@@ -29,6 +30,7 @@
             android:defaultValue="false"
             android:dependency="inactivity_warnings_enable"
             android:key="inactivity_warnings_dnd"
+            android:layout="@layout/preference_checkbox"
             android:summary="@string/mi2_prefs_inactivity_warnings_dnd_summary"
             android:title="@string/mi2_prefs_do_not_disturb" />
 

app/src/main/res/xml/devicesettings_inactivity_extended.xml

@@ -13,6 +13,7 @@
         <SwitchPreferenceCompat
             android:defaultValue="false"
             android:key="inactivity_warnings_enable"
+            android:layout="@layout/preference_checkbox"
             android:summary="@string/mi2_prefs_inactivity_warnings_summary"
             android:title="@string/mi2_prefs_inactivity_warnings" />
 

app/src/main/res/xml/devicesettings_inactivity_noshed.xml

@@ -4,6 +4,7 @@
         android:icon="@drawable/ic_chair"
         android:defaultValue="false"
         android:key="inactivity_warnings_enable_noshed"
+        android:layout="@layout/preference_checkbox"
         android:title="@string/mi2_prefs_inactivity_warnings"
         android:summary="@string/mi2_prefs_inactivity_warnings_summary"/>
 </androidx.preference.PreferenceScreen>

app/src/main/res/xml/devicesettings_inactivity_sheduled.xml

@@ -13,6 +13,7 @@
         <SwitchPreferenceCompat
             android:defaultValue="false"
             android:key="inactivity_warnings_enable"
+            android:layout="@layout/preference_checkbox"
             android:title="@string/mi2_prefs_inactivity_warnings"
             android:summary="@string/mi2_prefs_inactivity_warnings_summary" />
 

app/src/main/res/xml/devicesettings_keep_activity_data_on_device.xml

@@ -4,6 +4,7 @@
         android:icon="@drawable/ic_activity_unknown_small"
         android:defaultValue="false"
         android:key="keep_activity_data_on_device"
+        android:layout="@layout/preference_checkbox"
         android:summary="@string/pref_summary_keep_data_on_device"
         android:title="@string/pref_title_keep_data_on_device" />
 </androidx.preference.PreferenceScreen>

app/src/main/res/xml/devicesettings_key_vibration.xml

@@ -4,5 +4,6 @@
         android:defaultValue="false"
         android:icon="@drawable/ic_vibration"
         android:key="key_vibration"
+        android:layout="@layout/preference_checkbox"
         android:title="@string/prefs_key_vibration" />
 </androidx.preference.PreferenceScreen>

app/src/main/res/xml/devicesettings_liftwrist_display_noshed.xml

@@ -4,5 +4,6 @@
         android:icon="@drawable/ic_arrow_upward"
         android:defaultValue="false"
         android:key="activate_display_on_lift_wrist_noshed"
+        android:layout="@layout/preference_checkbox"
         android:title="@string/mi2_prefs_activate_display_on_lift" />
 </androidx.preference.PreferenceScreen>

app/src/main/res/xml/devicesettings_lock_unlock.xml

@@ -4,5 +4,6 @@
         android:icon="@drawable/ic_lock_open"
         android:defaultValue="false"
         android:key="lock"
+        android:layout="@layout/preference_checkbox"
         android:title="@string/pref_title_lock_unlock" />
 </androidx.preference.PreferenceScreen>

app/src/main/res/xml/devicesettings_lowlatency_fwupdate.xml

@@ -4,6 +4,7 @@
         android:icon="@drawable/ic_mtu"
         android:defaultValue="true"
         android:key="low_latency_fw_update"
+        android:layout="@layout/preference_checkbox"
         android:summary="@string/pref_summary_low_latency_fw_update"
         android:title="@string/pref_title_low_latency_fw_update" />
 </androidx.preference.PreferenceScreen>

app/src/main/res/xml/devicesettings_miband2.xml

@@ -14,6 +14,7 @@
         android:defaultValue="true"
         android:icon="@drawable/ic_font_download"
         android:key="mi2_enable_text_notifications"
+        android:layout="@layout/preference_checkbox"
         android:summary="@string/mi2_enable_text_notifications_summary"
         android:title="@string/mi2_enable_text_notifications" />
 

app/src/main/res/xml/devicesettings_miband6_new_protocol.xml

@@ -4,6 +4,7 @@
         android:defaultValue="false"
         android:icon="@drawable/ic_mtu"
         android:key="force_new_protocol"
+        android:layout="@layout/preference_checkbox"
         android:summary="@string/pref_summary_huami_force_new_protocol"
         android:title="@string/pref_title_huami_force_new_protocol" />
 </androidx.preference.PreferenceScreen>

app/src/main/res/xml/devicesettings_morning_updates.xml

@@ -11,6 +11,7 @@
             android:defaultValue="false"
             android:icon="@drawable/ic_wb_sunny"
             android:key="morning_updates_enabled"
+            android:layout="@layout/preference_checkbox"
             android:summary="@string/pref_morning_updates_summary"
             android:title="@string/pref_morning_updates_title" />
 

app/src/main/res/xml/devicesettings_nothing_ear1.xml

@@ -4,6 +4,7 @@
         android:defaultValue="true"
         android:icon="@drawable/ic_extension"
         android:key="pref_nothing_inear_detection"
+        android:layout="@layout/preference_checkbox"
         android:summary="@string/nothing_prefs_inear_summary"
         android:title="@string/nothing_prefs_inear_title" />
     <ListPreference

app/src/main/res/xml/devicesettings_notifications_enable.xml

@@ -5,6 +5,7 @@
         android:defaultValue="false"
         android:icon="@drawable/ic_notifications"
         android:key="notification_enable"
+        android:layout="@layout/preference_checkbox"
         android:summary="@string/enable_notifications_summary"
         android:title="@string/prefs_notifications_enable" />
 </androidx.preference.PreferenceScreen>

app/src/main/res/xml/devicesettings_offline_voice.xml

@@ -19,18 +19,21 @@
             android:defaultValue="false"
             android:icon="@drawable/ic_rotate_left"
             android:key="offline_voice_respond_turn_wrist"
+            android:layout="@layout/preference_checkbox"
             android:title="@string/offline_voice_respond_turn_wrist" />
 
         <SwitchPreferenceCompat
             android:defaultValue="false"
             android:icon="@drawable/ic_always_on_display"
             android:key="offline_voice_respond_screen_on"
+            android:layout="@layout/preference_checkbox"
             android:title="@string/offline_voice_respond_screen_on" />
 
         <SwitchPreferenceCompat
             android:defaultValue="false"
             android:icon="@drawable/ic_always_on_display"
             android:key="offline_voice_response_during_screen_lighting"
+            android:layout="@layout/preference_checkbox"
             android:title="@string/offline_voice_response_during_screen_lighting" />
     </PreferenceScreen>
 </androidx.preference.PreferenceScreen>

app/src/main/res/xml/devicesettings_operating_sounds.xml

@@ -4,5 +4,6 @@
         android:defaultValue="false"
         android:icon="@drawable/ic_radio"
         android:key="operating_sounds"
+        android:layout="@layout/preference_checkbox"
         android:title="@string/prefs_operating_sounds" />
 </androidx.preference.PreferenceScreen>

app/src/main/res/xml/devicesettings_overwrite_settings_on_connection.xml

@@ -4,6 +4,7 @@
         android:defaultValue="true"
         android:icon="@drawable/ic_settings_applications"
         android:key="overwrite_settings_on_connection"
+        android:layout="@layout/preference_checkbox"
         android:summary="@string/pref_summary_overwrite_settings_on_connection"
         android:title="@string/pref_title_overwrite_settings_on_connection" />
 </androidx.preference.PreferenceScreen>

app/src/main/res/xml/devicesettings_password.xml

@@ -11,6 +11,7 @@
             android:defaultValue="false"
             android:icon="@drawable/ic_password"
             android:key="pref_password_enabled"
+            android:layout="@layout/preference_checkbox"
             android:summary="@string/prefs_password_summary"
             android:title="@string/prefs_password_enabled" />
 

app/src/main/res/xml/devicesettings_phone_calls_watch_pair.xml

@@ -49,6 +49,7 @@
                 android:defaultValue="false"
                 android:icon="@drawable/ic_voice"
                 android:key="bluetooth_calls_enabled"
+                android:layout="@layout/preference_checkbox"
                 android:summary="@string/pref_summary_receive_calls_watch"
                 android:title="@string/bluetooth_calls" />
 
@@ -56,6 +57,7 @@
                 android:defaultValue="true"
                 android:icon="@drawable/ic_person"
                 android:key="display_caller"
+                android:layout="@layout/preference_checkbox"
                 android:summary="@string/pref_display_caller_summary"
                 android:title="@string/pref_display_caller_title" />
 

app/src/main/res/xml/devicesettings_pixoo.xml

@@ -3,12 +3,14 @@
     <SwitchPreferenceCompat
         android:icon="@drawable/ic_power_settings_new"
         android:key="pref_key_clap_hands_to_wakeup_device"
+        android:layout="@layout/preference_checkbox"
         android:title="@string/clap_hands_to_wakeup_device"
         android:summary="@string/clap_hands_to_wakeup_device_summary"
         android:defaultValue="false" />
     <SwitchPreferenceCompat
         android:icon="@drawable/ic_music_note"
         android:key="pref_key_power_saving"
+        android:layout="@layout/preference_checkbox"
         android:title="@string/power_saving"
         android:summary="@string/pixoo_power_saving_summary"
         android:defaultValue="false" />

app/src/main/res/xml/devicesettings_prefix_notification_with_app.xml

@@ -4,6 +4,7 @@
         android:defaultValue="true"
         android:icon="@drawable/ic_notifications"
         android:key="pref_prefix_notification_with_app"
+        android:layout="@layout/preference_checkbox"
         android:title="@string/pref_title_prefix_notification_with_app"
         android:summary="@string/pref_summary_prefix_notification_with_app" />
 </androidx.preference.PreferenceScreen>

app/src/main/res/xml/devicesettings_preview_message_in_title.xml

@@ -4,6 +4,7 @@
         android:defaultValue="true"
         android:icon="@android:drawable/ic_menu_view"
         android:key="preview_message_in_title"
+        android:layout="@layout/preference_checkbox"
         android:summary="@string/pref_summary_preview_message_in_title"
         android:title="@string/pref_title_preview_message_in_title" />
 </androidx.preference.PreferenceScreen>

app/src/main/res/xml/devicesettings_reconnect_bl_classic.xml

@@ -6,6 +6,7 @@
     <SwitchPreferenceCompat
         android:icon="@drawable/ic_bluetooth"
         android:key="prefs_key_device_reconnect_on_acl"
+        android:layout="@layout/preference_checkbox"
         android:title="@string/autoconnect_from_device_title"
         android:summary="@string/autoconnect_from_device_summary" />
 </PreferenceScreen>

app/src/main/res/xml/devicesettings_reconnect_ble.xml

@@ -6,6 +6,7 @@
     <SwitchPreferenceCompat
         android:icon="@drawable/ic_bluetooth"
         android:key="prefs_key_device_auto_reconnect"
+        android:layout="@layout/preference_checkbox"
         android:title="@string/auto_reconnect_ble_title"
         android:summary="@string/auto_reconnect_ble_summary"
         android:defaultValue="true" />

app/src/main/res/xml/devicesettings_relax_firmware_checks.xml

@@ -4,6 +4,7 @@
         android:icon="@drawable/ic_verified"
         android:defaultValue="false"
         android:key="relax_firmware_checks"
+        android:layout="@layout/preference_checkbox"
         android:summary="@string/pref_summary_relax_firmware_checks"
         android:title="@string/pref_title_relax_firmware_checks" />
 </androidx.preference.PreferenceScreen>

app/src/main/res/xml/devicesettings_rotatewrist_cycleinfo.xml

@@ -4,5 +4,6 @@
         android:defaultValue="false"
         android:icon="@drawable/ic_rotate_left"
         android:key="rotate_wrist_to_cycle_info"
+        android:layout="@layout/preference_checkbox"
         android:title="@string/mi2_prefs_rotate_wrist_to_switch_info" />
 </androidx.preference.PreferenceScreen>

app/src/main/res/xml/devicesettings_screen_brightness_withauto.xml

@@ -10,6 +10,7 @@
             android:defaultValue="true"
             android:icon="@drawable/ic_wb_sunny"
             android:key="screen_auto_brightness"
+            android:layout="@layout/preference_checkbox"
             android:summary="@string/pref_screen_auto_brightness_summary"
             android:title="@string/pref_screen_auto_brightness_title" />
 

app/src/main/res/xml/devicesettings_screen_on_on_notifications.xml

@@ -4,6 +4,7 @@
         android:defaultValue="true"
         android:icon="@drawable/ic_notifications"
         android:key="screen_on_on_notifications"
+        android:layout="@layout/preference_checkbox"
         android:summary="@string/pref_summary_screen_on_on_notifications"
         android:title="@string/pref_title_screen_on_on_notifications" />
 </androidx.preference.PreferenceScreen>

app/src/main/res/xml/devicesettings_send_app_notifications.xml

@@ -4,6 +4,7 @@
         android:defaultValue="true"
         android:icon="@drawable/ic_notifications"
         android:key="send_app_notifications"
+        android:layout="@layout/preference_checkbox"
         android:summary="@string/pref_summary_send_app_notifications"
         android:title="@string/pref_title_send_app_notifications" />
 </androidx.preference.PreferenceScreen>

app/src/main/res/xml/devicesettings_settings_third_party_apps.xml

@@ -4,6 +4,7 @@
         android:icon="@drawable/ic_developer_mode"
         android:defaultValue="false"
         android:key="third_party_apps_set_settings"
+        android:layout="@layout/preference_checkbox"
         android:summary="@string/pref_summary_third_party_app_device_settings"
         android:title="@string/pref_title_third_party_app_device_settings" />
 </androidx.preference.PreferenceScreen>

app/src/main/res/xml/devicesettings_sleep_mode.xml

@@ -10,6 +10,7 @@
             android:defaultValue="false"
             android:icon="@drawable/ic_activity_sleep"
             android:key="pref_sleep_mode_sleep_screen"
+            android:layout="@layout/preference_checkbox"
             android:summary="@string/pref_sleep_mode_sleep_screen_summary"
             android:title="@string/pref_sleep_mode_sleep_screen_title" />
 
@@ -17,6 +18,7 @@
             android:defaultValue="false"
             android:icon="@drawable/ic_auto_awesome"
             android:key="pref_sleep_mode_smart_enable"
+            android:layout="@layout/preference_checkbox"
             android:summary="@string/pref_sleep_mode_smart_enable_summary"
             android:title="@string/pref_sleep_mode_smart_enable_title" />
     </PreferenceScreen>

app/src/main/res/xml/devicesettings_sleep_mode_schedule.xml

@@ -10,6 +10,7 @@
             android:defaultValue="false"
             android:icon="@drawable/ic_activity_sleep"
             android:key="sleep_mode_schedule_enabled"
+            android:layout="@layout/preference_checkbox"
             android:summary="@string/pref_sleep_mode_schedule_summary"
             android:title="@string/pref_sleep_mode_schedule_title" />
 

app/src/main/res/xml/devicesettings_sony_headphones_adaptive_volume_control.xml

@@ -8,6 +8,7 @@
             android:defaultValue="false"
             android:icon="@drawable/ic_hearing"
             android:key="pref_adaptive_volume_control"
+            android:layout="@layout/preference_checkbox"
             android:summary="@string/pref_adaptive_volume_control_summary"
             android:title="@string/pref_adaptive_volume_control_title" />
     </PreferenceCategory>

app/src/main/res/xml/devicesettings_sony_headphones_ambient_sound_control.xml

@@ -25,6 +25,7 @@
             android:defaultValue="true"
             android:icon="@drawable/ic_voice"
             android:key="pref_sony_focus_voice"
+            android:layout="@layout/preference_checkbox"
             android:title="@string/sony_ambient_sound_focus_voice" />
 
     </PreferenceCategory>

app/src/main/res/xml/devicesettings_sony_headphones_ambient_sound_control_wind_noise_reduction.xml

@@ -25,6 +25,7 @@
             android:defaultValue="true"
             android:icon="@drawable/ic_voice"
             android:key="pref_sony_focus_voice"
+            android:layout="@layout/preference_checkbox"
             android:title="@string/sony_ambient_sound_focus_voice" />
 
     </PreferenceCategory>

app/src/main/res/xml/devicesettings_sony_headphones_audio_upsampling.xml

@@ -4,5 +4,6 @@
         android:defaultValue="false"
         android:icon="@drawable/ic_extension"
         android:key="pref_sony_audio_upsampling"
+        android:layout="@layout/preference_checkbox"
         android:title="@string/sony_audio_upsampling" />
 </androidx.preference.PreferenceScreen>

app/src/main/res/xml/devicesettings_sony_headphones_notifications_voice_guide.xml

@@ -4,5 +4,6 @@
         android:defaultValue="true"
         android:icon="@drawable/ic_notifications"
         android:key="pref_sony_notification_voice_guide"
+        android:layout="@layout/preference_checkbox"
         android:title="@string/sony_notification_voice_guide" />
 </androidx.preference.PreferenceScreen>

app/src/main/res/xml/devicesettings_sony_headphones_pause_when_taken_off.xml

@@ -4,5 +4,6 @@
         android:defaultValue="false"
         android:icon="@drawable/ic_pause"
         android:key="pref_sony_pause_when_taken_off"
+        android:layout="@layout/preference_checkbox"
         android:title="@string/sony_pause_when_taken_off" />
 </androidx.preference.PreferenceScreen>

app/src/main/res/xml/devicesettings_sony_headphones_speak_to_chat_simple.xml

@@ -5,6 +5,7 @@
         android:defaultValue="false"
         android:icon="@drawable/ic_voice"
         android:key="pref_sony_speak_to_chat"
+        android:layout="@layout/preference_checkbox"
         android:summary="@string/sony_speak_to_chat_summary"
         android:title="@string/sony_speak_to_chat" />
 

app/src/main/res/xml/devicesettings_sony_headphones_speak_to_chat_with_settings.xml

@@ -12,6 +12,7 @@
             android:defaultValue="false"
             android:icon="@drawable/ic_voice"
             android:key="pref_sony_speak_to_chat"
+            android:layout="@layout/preference_checkbox"
             android:summary="@string/sony_speak_to_chat_summary"
             android:title="@string/sony_speak_to_chat" />
 
@@ -32,6 +33,7 @@
                 android:defaultValue="false"
                 android:dependency="pref_sony_speak_to_chat"
                 android:icon="@drawable/ic_voice"
+                android:layout="@layout/preference_checkbox"
                 android:key="pref_sony_speak_to_chat_focus_on_voice"
                 android:title="@string/sony_speak_to_chat_focus_on_voice" />
 

app/src/main/res/xml/devicesettings_sony_headphones_touch_sensor_single.xml

@@ -4,5 +4,6 @@
         android:defaultValue="true"
         android:icon="@drawable/ic_touch"
         android:key="pref_sony_touch_sensor"
+        android:layout="@layout/preference_checkbox"
         android:title="@string/sony_touch_sensor" />
 </androidx.preference.PreferenceScreen>

app/src/main/res/xml/devicesettings_sony_headphones_wide_area_tap.xml

@@ -4,6 +4,7 @@
         android:defaultValue="false"
         android:icon="@drawable/ic_touch"
         android:key="pref_wide_area_tap"
+        android:layout="@layout/preference_checkbox"
         android:summary="@string/pref_wide_area_tap_summary"
         android:title="@string/pref_wide_area_tap_title" />
 </androidx.preference.PreferenceScreen>

app/src/main/res/xml/devicesettings_sonyswr12.xml

@@ -3,12 +3,14 @@
     <SwitchPreferenceCompat
         android:icon="@drawable/ic_bolt"
         android:key="stamina_preference"
+        android:layout="@layout/preference_checkbox"
         android:title="@string/sonyswr12_settings_stamina"
         android:defaultValue="false"
         android:summary="@string/sonyswr12_settings_stamina_summary" />
     <SwitchPreferenceCompat
         android:icon="@drawable/ic_vibration"
         android:key="vibration_preference"
+        android:layout="@layout/preference_checkbox"
         android:title="@string/sonyswr12_settings_low_vibration"
         android:defaultValue="false"
         android:summary="@string/sonyswr12_settings_low_vibration_summary" />

app/src/main/res/xml/devicesettings_sound_and_vibration.xml

@@ -17,30 +17,35 @@
             android:defaultValue="false"
             android:icon="@drawable/ic_rotate_left"
             android:key="crown_vibration"
+            android:layout="@layout/preference_checkbox"
             android:title="@string/pref_crown_vibration" />
 
         <SwitchPreferenceCompat
             android:defaultValue="false"
             android:icon="@drawable/ic_warning_gray"
             android:key="alert_tone"
+            android:layout="@layout/preference_checkbox"
             android:title="@string/pref_alert_tone" />
 
         <SwitchPreferenceCompat
             android:defaultValue="false"
             android:icon="@drawable/ic_volume_off"
             android:key="cover_to_mute"
+            android:layout="@layout/preference_checkbox"
             android:title="@string/pref_cover_to_mute" />
 
         <SwitchPreferenceCompat
             android:defaultValue="false"
             android:icon="@drawable/ic_vibration"
             android:key="vibrate_for_alert"
+            android:layout="@layout/preference_checkbox"
             android:title="@string/pref_vibrate_for_alert" />
 
         <SwitchPreferenceCompat
             android:defaultValue="false"
             android:icon="@drawable/ic_voice"
             android:key="text_to_speech"
+            android:layout="@layout/preference_checkbox"
             android:title="@string/pref_text_to_speech" />
     </PreferenceScreen>
 </androidx.preference.PreferenceScreen>

app/src/main/res/xml/devicesettings_spo_automatic_enable.xml

@@ -5,5 +5,6 @@
         android:defaultValue="false"
         android:icon="@drawable/ic_heart"
         android:key="spo_automatic_enable"
+        android:layout="@layout/preference_checkbox"
         android:title="@string/pref_spo_automatic_enable" />
 </androidx.preference.PreferenceScreen>

app/src/main/res/xml/devicesettings_swipeunlock.xml

@@ -4,6 +4,7 @@
         android:defaultValue="false"
         android:icon="@drawable/ic_lock_open"
         android:key="swipe_unlock"
+        android:layout="@layout/preference_checkbox"
         android:summary="@string/mi3_prefs_band_screen_unlock_summary"
         android:title="@string/mi3_prefs_band_screen_unlock" />
 </androidx.preference.PreferenceScreen>

app/src/main/res/xml/devicesettings_sync_calendar.xml

@@ -4,6 +4,7 @@
         android:defaultValue="false"
         android:icon="@drawable/ic_calendar_sync"
         android:key="sync_calendar"
+        android:layout="@layout/preference_checkbox"
         android:summary="@string/pref_summary_sync_calendar"
         android:title="@string/pref_title_sync_caldendar" />
     <Preference

app/src/main/res/xml/devicesettings_text_bitmaps.xml

@@ -4,6 +4,7 @@
         android:defaultValue="false"
         android:icon="@drawable/ic_translate"
         android:key="banglejs_text_bitmap"
+        android:layout="@layout/preference_checkbox"
         android:summary="@string/pref_summary_banglejs_text_bitmap"
         android:title="@string/pref_title_banglejs_text_bitmap" />
     <EditTextPreference