From 0282863573341da78b55be5d2d0d4d2f9a904114 Mon Sep 17 00:00:00 2001
From: Johannes Krude <johannes.krude@comsys.rwth-aachen.de>
Date: Fri, 6 Sep 2024 15:45:49 +0200
Subject: [PATCH] Casio GW-B5600: bugfix for several watch settings

---
 .../devicesettings/DeviceSpecificSettingsFragment.java       | 1 -
 app/src/main/res/xml/devicesettings_hourly_chime_enable.xml  | 3 ++-
 .../main/res/xml/devicesettings_light_duration_longer.xml    | 3 ++-
 app/src/main/res/xml/devicesettings_power_saving.xml         | 5 +++--
 app/src/main/res/xml/devicesettings_time_sync.xml            | 3 ++-
 5 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSpecificSettingsFragment.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSpecificSettingsFragment.java
index 3632d57bc..9563039e5 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSpecificSettingsFragment.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSpecificSettingsFragment.java
@@ -520,7 +520,6 @@ public class DeviceSpecificSettingsFragment extends AbstractPreferenceFragment i
         addPreferenceHandlerFor(PREF_BUTTON_3_FUNCTION_DOUBLE);
         addPreferenceHandlerFor(PREF_VIBRATION_STRENGH_PERCENTAGE);
         addPreferenceHandlerFor(PREF_POWER_MODE);
-        addPreferenceHandlerFor(PREF_POWER_SAVING);
         addPreferenceHandlerFor(PREF_CONNECTION_DURATION);
         addPreferenceHandlerFor(PREF_LIFTWRIST_NOSHED);
         addPreferenceHandlerFor(PREF_DISCONNECTNOTIF_NOSHED);
diff --git a/app/src/main/res/xml/devicesettings_hourly_chime_enable.xml b/app/src/main/res/xml/devicesettings_hourly_chime_enable.xml
index 2cdf6ef4d..3a9cbc08a 100644
--- a/app/src/main/res/xml/devicesettings_hourly_chime_enable.xml
+++ b/app/src/main/res/xml/devicesettings_hourly_chime_enable.xml
@@ -1,8 +1,9 @@
 <?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_beep"
         android:key="hourly_chime_enable"
+        android:layout="@layout/preference_checkbox"
         android:title="@string/prefs_hourly_chime" />
 </androidx.preference.PreferenceScreen>
diff --git a/app/src/main/res/xml/devicesettings_light_duration_longer.xml b/app/src/main/res/xml/devicesettings_light_duration_longer.xml
index ff15a0cfe..7183de4c8 100644
--- a/app/src/main/res/xml/devicesettings_light_duration_longer.xml
+++ b/app/src/main/res/xml/devicesettings_light_duration_longer.xml
@@ -1,8 +1,9 @@
 <?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="light_duration_longer"
+        android:layout="@layout/preference_checkbox"
         android:title="@string/prefs_light_duration_longer" />
 </androidx.preference.PreferenceScreen>
diff --git a/app/src/main/res/xml/devicesettings_power_saving.xml b/app/src/main/res/xml/devicesettings_power_saving.xml
index 8f8678974..3ca804e10 100644
--- a/app/src/main/res/xml/devicesettings_power_saving.xml
+++ b/app/src/main/res/xml/devicesettings_power_saving.xml
@@ -1,8 +1,9 @@
 <?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_power_settings_new"
-        android:key="power_saving"
+        android:key="pref_key_power_saving"
+        android:layout="@layout/preference_checkbox"
         android:title="@string/power_saving" />
 </androidx.preference.PreferenceScreen>
diff --git a/app/src/main/res/xml/devicesettings_time_sync.xml b/app/src/main/res/xml/devicesettings_time_sync.xml
index 8a3a64aac..4c10090c9 100644
--- a/app/src/main/res/xml/devicesettings_time_sync.xml
+++ b/app/src/main/res/xml/devicesettings_time_sync.xml
@@ -1,8 +1,9 @@
 <?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_sync"
         android:key="time_sync"
+        android:layout="@layout/preference_checkbox"
         android:title="@string/pref_time_sync" />
 </androidx.preference.PreferenceScreen>