From c0adbf59c366f0b1bdb97772a6879fa593ebccc4 Mon Sep 17 00:00:00 2001
From: Marc Nause <marc.nause@audioattack.de>
Date: Tue, 29 Mar 2022 23:11:35 +0200
Subject: [PATCH 001/110] Added rule to keep static members of
 GattCharacteristic class

---
 app/proguard-rules.pro | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index 6af6c8ff1..65ded85a0 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -18,10 +18,14 @@
 -keepclassmembers class nodomain.freeyourgadget.gadgetbridge.service.devices.pebble.webview.JSInterface {
     public *;
 }
-# Required for refection in BangleJSDeviceSupport
+# Required for reflection in BangleJSDeviceSupport
 -keepclassmembers class nodomain.freeyourgadget.gadgetbridge.model.CallSpec {
     public static *;
 }
+# Required for reflection in method GattCharacteristic.initDebugMap()
+-keepclassmembers class nodomain.freeyourgadget.gadgetbridge.service.btle.GattCharacteristic {
+    public static *;
+}
 -keepattributes JavascriptInterface
 
 # https://github.com/tony19/logback-android/issues/29

From ad36569376f367303ecd4b2fd4cae83560fe077d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=93scar=20Fern=C3=A1ndez=20D=C3=ADaz?=
 <oscfdezdz@tuta.io>
Date: Thu, 17 Mar 2022 20:34:03 +0000
Subject: [PATCH 002/110] Translated using Weblate (Spanish)

Currently translated at 100.0% (1468 of 1468 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/es/
---
 app/src/main/res/values-es/strings.xml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 3cba4fce6..49304fe14 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -1591,4 +1591,11 @@
     <string name="pref_device_action_fitness_app_control_stop">Parada de seguimiento de la aplicación de ejercicio físico</string>
     <string name="pref_title_opentracks_packagename">Nombre del paquete OpenTracks</string>
     <string name="pref_summary_opentracks_packagename">Se usa para iniciar/detener la grabación del seguimiento GPS en la aplicación externa de ejercicio físico.</string>
+    <string name="activity_db_management_autoexport_enabled_yes">La autoexportación está activada.</string>
+    <string name="activity_db_management_autoexport_enabled_no">La autoexportación no está activada.</string>
+    <string name="activity_db_management_autoexport_scheduled_yes">La autoexportación ha sido programada (originalmente) para %1$s</string>
+    <string name="activity_db_management_autoexport_scheduled_no">La autoexportación no ha sido programada.</string>
+    <string name="watchface_dialog_pre_setting_position">preconfigurando la posición a %s</string>
+    <string name="autoExport_lastTime_label">Última autoexportación: %1$s</string>
+    <string name="activity_db_management_autoexport_location">No se ha podido entender la ubicación. Probablemente un problema del nuevo sistema de permisos de Android. Lo más probable es que la autoexportación no funcione ahora.</string>
 </resources>
\ No newline at end of file

From f9fbde3d13a22e771879653cadf3d07a751bd437 Mon Sep 17 00:00:00 2001
From: arjan-s <a_gitlab@anymore.nl>
Date: Sun, 20 Mar 2022 08:24:10 +0000
Subject: [PATCH 003/110] Translated using Weblate (Dutch)

Currently translated at 100.0% (1468 of 1468 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/nl/
---
 app/src/main/res/values-nl/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 7acb91769..c16d969c4 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -1592,4 +1592,5 @@
     <string name="activity_db_management_autoexport_enabled_yes">AutoExport is ingeschakeld.</string>
     <string name="activity_db_management_autoexport_scheduled_yes">AutoExport is (oorspronkelijk) gepland voor %1$s</string>
     <string name="autoExport_lastTime_label">Laatste AutoExport: %1$s</string>
+    <string name="watchface_dialog_pre_setting_position">Positie ingesteld op %s</string>
 </resources>
\ No newline at end of file

From 4f5cef9e144a20af7b259554b8b9e3038a1533dd Mon Sep 17 00:00:00 2001
From: HenRy <helge1o1o1@gmail.com>
Date: Wed, 23 Mar 2022 09:14:16 +0000
Subject: [PATCH 004/110] Translated using Weblate (German)

Currently translated at 100.0% (1469 of 1469 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/de/
---
 app/src/main/res/values-de/strings.xml | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index c7a592dad..02875ad3a 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -1593,4 +1593,13 @@
     <string name="pref_summary_opentracks_packagename">Dient zum Starten/Stoppen der GPS-Track-Aufzeichnung in der externen Fitness-App.</string>
     <string name="pref_title_notifications_generic_settings">Android-Benachrichtigungseinstellungen</string>
     <string name="watchface_dialog_pre_setting_position">setze position auf %s</string>
-</resources>
+    <string name="pref_device_action_fitness_app_control_stop">Fitness-App Tracking Stopp</string>
+    <string name="pref_device_action_fitness_app_control_start">Fitness-App Tracking Start</string>
+    <string name="activity_db_management_autoexport_enabled_yes">Autom. Export ist aktiviert.</string>
+    <string name="activity_db_management_autoexport_enabled_no">Autom. Export ist deaktiviert.</string>
+    <string name="activity_db_management_autoexport_scheduled_yes">Autom. Export wurde (ursprünglich) geplant für %1$s</string>
+    <string name="activity_db_management_autoexport_scheduled_no">Autom. Export wurde nicht geplant.</string>
+    <string name="watchface_setting_light_up_on_notification">Aufleuchten bei neuer Benachrichtigung</string>
+    <string name="autoExport_lastTime_label">Letzter autom. Export: %1$s</string>
+    <string name="activity_db_management_autoexport_location">Standort ermittelt nicht möglich. Wahrscheinlich ein Problem des neueren Android-Berechtigungssystems. Höchstwahrscheinlich funktioniert der autom. Export jetzt nicht.</string>
+</resources>
\ No newline at end of file

From 1495772f9ff4c822d31d33d52a8c1754e8fb7518 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vinc=C3=A8n=20PUJOL?= <vincen@vincen.org>
Date: Tue, 22 Mar 2022 20:12:41 +0000
Subject: [PATCH 005/110] Translated using Weblate (French)

Currently translated at 100.0% (1469 of 1469 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/fr/
---
 app/src/main/res/values-fr/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 6e3c5c682..28436286a 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -1596,4 +1596,5 @@ Temps de sommeil préféré en heures</string>
     <string name="activity_db_management_autoexport_enabled_no">L\'export automatique est désactivé.</string>
     <string name="activity_db_management_autoexport_location">L\'emplacement n\'a pas pu être détecté. Probablement un problème avec les nouvelles permissions du système Android. Très probablement, l\'export automatique ne fonctionne pas actuellement.</string>
     <string name="watchface_dialog_pre_setting_position">pré-configuration de la position à %s</string>
+    <string name="watchface_setting_light_up_on_notification">S\'allumer pour une nouvelle notification</string>
 </resources>
\ No newline at end of file

From 8095b8948d0f47fbcb5e98c09512167913386273 Mon Sep 17 00:00:00 2001
From: Yaron Shahrabani <sh.yaron@gmail.com>
Date: Wed, 23 Mar 2022 04:52:40 +0000
Subject: [PATCH 006/110] Translated using Weblate (Hebrew)

Currently translated at 100.0% (1469 of 1469 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/he/
---
 app/src/main/res/values-he/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml
index 9fe7ad229..de312adc6 100644
--- a/app/src/main/res/values-he/strings.xml
+++ b/app/src/main/res/values-he/strings.xml
@@ -1592,4 +1592,5 @@
     <string name="activity_db_management_autoexport_scheduled_yes">הייצוא האוטומטי תוזמן (במקור) ל־%1$s</string>
     <string name="activity_db_management_autoexport_location">לא ניתן לפענח את המיקום. כנראה תקלה במערכת ההרשאות החדשה של Android. סביר להניח שהייצוא האוטומטי לא עובד כרגע.</string>
     <string name="watchface_dialog_pre_setting_position">המיקום מוגדר מראש לכדי %s</string>
+    <string name="watchface_setting_light_up_on_notification">הארה עם התראות חדשות</string>
 </resources>
\ No newline at end of file

From d132037d8dee1c7b3a4c34322fd15803e9d08417 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?O=C4=9Fuz=20Ersen?= <oguz@ersen.moe>
Date: Wed, 23 Mar 2022 08:06:51 +0000
Subject: [PATCH 007/110] Translated using Weblate (Turkish)

Currently translated at 100.0% (1469 of 1469 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/tr/
---
 app/src/main/res/values-tr/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 3a2ab4b7b..2a24bc272 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -1609,4 +1609,5 @@
     <string name="activity_db_management_autoexport_enabled_yes">Otomatik dışa aktarma etkin.</string>
     <string name="activity_db_management_autoexport_location">Konum anlaşılamadı. Bu, muhtemelen daha yeni bir Android izin sistemi sorunudur. Büyük olasılıkla, otomatik dışa aktarma şu anda çalışmıyor.</string>
     <string name="watchface_dialog_pre_setting_position">konumu %s olarak ön ayarlama</string>
+    <string name="watchface_setting_light_up_on_notification">Yeni bildirimde ışığı aç</string>
 </resources>
\ No newline at end of file

From 0f837393efc149376b0dbe054f54cdb6b801ad8b Mon Sep 17 00:00:00 2001
From: Ihor Hordiichuk <igor_ck@outlook.com>
Date: Tue, 22 Mar 2022 22:29:57 +0000
Subject: [PATCH 008/110] Translated using Weblate (Ukrainian)

Currently translated at 100.0% (1469 of 1469 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/uk/
---
 app/src/main/res/values-uk/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 1b8d399aa..51a330b34 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -1600,4 +1600,5 @@
     <string name="autoExport_lastTime_label">Останній автоекспорт: %1$s</string>
     <string name="activity_db_management_autoexport_location">Не вдалося встановити місцеперебування. Ймовірно, проблема з новішою системою дозволів Android. Швидше за все, автоекспорт зараз не працює.</string>
     <string name="watchface_dialog_pre_setting_position">попереднє встановлення розташування на %s</string>
+    <string name="watchface_setting_light_up_on_notification">Засвітлювати за нового сповіщення</string>
 </resources>
\ No newline at end of file

From f007e362d28c444cc1e0fe05256a1652ec3d5be7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=B0=91=E4=B8=BE?= <oshirisu.red@gmail.com>
Date: Wed, 23 Mar 2022 01:42:23 +0000
Subject: [PATCH 009/110] Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (1469 of 1469 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/zh_Hans/
---
 app/src/main/res/values-zh-rCN/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index ea6d5dcdf..d866c5f8e 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -1598,4 +1598,5 @@
     <string name="activity_db_management_autoexport_enabled_no">自动导出未开启。</string>
     <string name="activity_db_management_autoexport_enabled_yes">自动导出已开启。</string>
     <string name="watchface_dialog_pre_setting_position">预设位置为 %s</string>
+    <string name="watchface_setting_light_up_on_notification">有新通知时亮起</string>
 </resources>
\ No newline at end of file

From 1b7d71837920f26d466dd6dfb6e9d6751790844e Mon Sep 17 00:00:00 2001
From: arjan-s <a_gitlab@anymore.nl>
Date: Fri, 25 Mar 2022 07:48:14 +0000
Subject: [PATCH 010/110] Translated using Weblate (Dutch)

Currently translated at 100.0% (1469 of 1469 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/nl/
---
 app/src/main/res/values-nl/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index c16d969c4..152ea63fd 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -1593,4 +1593,5 @@
     <string name="activity_db_management_autoexport_scheduled_yes">AutoExport is (oorspronkelijk) gepland voor %1$s</string>
     <string name="autoExport_lastTime_label">Laatste AutoExport: %1$s</string>
     <string name="watchface_dialog_pre_setting_position">Positie ingesteld op %s</string>
+    <string name="watchface_setting_light_up_on_notification">Scherm oplichten bij nieuwe melding</string>
 </resources>
\ No newline at end of file

From e1b0b9f4a94de2e164ddb6a93dbd9c9d786446f1 Mon Sep 17 00:00:00 2001
From: Aprilhoomie <Aprilhoomie@gmail.com>
Date: Fri, 25 Mar 2022 00:20:29 +0000
Subject: [PATCH 011/110] Translated using Weblate (Persian)

Currently translated at 10.5% (155 of 1469 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/fa/
---
 app/src/main/res/values-fa/strings.xml | 86 ++++++++++++++++++++++++++
 1 file changed, 86 insertions(+)

diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml
index 6c9da732f..7b72ea164 100644
--- a/app/src/main/res/values-fa/strings.xml
+++ b/app/src/main/res/values-fa/strings.xml
@@ -145,4 +145,90 @@
     <string name="battery_detail_activity_title">اطلاعات باتری</string>
     <string name="controlcenter_set_alias">تعیین نام مستعار</string>
     <string name="find_lost_device_message">جستجو برای %1$s؟</string>
+    <string name="controlcenter_power_off">خاموش کردن</string>
+    <string name="controlcenter_power_off_confirm_title">تایید خاموش کردن</string>
+    <string name="controlcenter_power_off_confirm_description">آیا مطمئن هستید که میخواهید دستگاه خاموش شود؟</string>
+    <string name="device_card_activity_card_title">اطلاعات فعالیت روی کارت دستگاه</string>
+    <string name="prefs_activity_in_device_card_sleep_title">خواب</string>
+    <string name="device_card_activity_card_title_summary">انتخاب جزئیات فعالیت‌های نمایش داده شده روی کارت‌های دستگاه</string>
+    <string name="prefs_activity_in_device_card_steps_title_summary">نمایش تعداد کل قدم‌ها</string>
+    <string name="fw_upgrade_notice_miband5">شما در حال نصب فرمویر (Firmware) %s بر روی دستگاه می بند پنج (mi band 5) خود می‌باشید.
+\n
+\nلطفا از نصب فایل با پسوند .fw و پس از آن فایل با پسوند .res و اطمینان حاصل فرمایید. ساعت شما پس از نصب فایل با پسوند .fw راه‌اندازی مجدد (ری‌استارت) خواهد شد.
+\n
+\nیادداشت: درصورتی که فایل با فرمت .res شما دقیقا مشابه فایلِ از پیش نصب شده می‌باشد نیازی به نصب مجدد آن نیست.
+\n
+\nبا مسئولیت خودتان ادامه دهید!</string>
+    <string name="fw_upgrade_notice_amazfitcor2">شما در حال نصب فرمویر (Firmware) %s بر روی دستگاه امیزفیت کور ۲ (Amazfit core 2) خود می‌باشید.
+\n
+\nلطفا از نصب فایل با پسوند .fw و پس از آن فایل با پسوند .res اطمینان حاصل فرمایید. ساعت شما پس از نصب فایل با پسوند .fw راه‌اندازی مجدد (ری‌استارت) خواهد شد.
+\n
+\nیادداشت: درصورتی که فایل با فرمت .res شما دقیقا مشابه فایلِ از پیش نصب شده می‌باشد نیازی به نصب مجدد آن نیست.
+\n
+\nبا مسئولیت خودتان ادامه دهید!
+\n
+\nکاملا تست نشده، در صورتی که نام دستگاه شما \"Amazfit Band 2\" می‌باشد، ممکن است نیاز داشته باشید که یک فرمویر BEATS_W روی دستگاه خود بریزید.</string>
+    <string name="fw_upgrade_notice_amazfit_trex">شما در حال نصب فرمویر (Firmware) %s بر روی دستگاه امیزفیت تی رکس (Amazfit T-REX) خود می‌باشید.
+\n
+\nلطفا از نصب فایل با پسوند .fw و پس از آن فایل با پسوند .res و در نهایت فایل با پسوند .gps اطمینان حاصل فرمایید. ساعت شما پس از نصب فایل با پسوند .fw راه‌اندازی مجدد (ری‌استارت) خواهد شد.
+\n
+\nیادداشت: درصورتی که فایل‌های با فرمت .res و .gps شما دقیقا مشابه فایلِ از پیش نصب شده می‌باشد نیازی به نصب مجدد آن نیست.
+\n
+\nبا مسئولیت خودتان ادامه دهید!</string>
+    <string name="check_all_applications">انتخاب تمام اپلیکیشن‌ها</string>
+    <string name="title_activity_notification_management">تنظیمات اعلان‌ها</string>
+    <string name="uncheck_all_applications">حذف انتخاب تمام اپلیکیشن‌ها</string>
+    <string name="fw_upgrade_notice_amazfitbip_lite">شما در حال نصب سیستم‌عامل (Firmware) %s بر روی دستگاه امیزفیت بیپ لایت (Amazfit bip lite) خود می‌باشید.
+\n
+\nلطفا از نصب فایل با پسوند .fw و پس از آن فایل با پسوند .res اطمینان حاصل فرمایید. ساعت شما پس از نصب فایل با پسوند .fw راه‌اندازی مجدد (ری‌استارت) خواهد شد.
+\n
+\nیادداشت: درصورتی که فایل با فرمت .res شما دقیقا مشابه فایلِ از پیش نصب شده می‌باشد نیازی به نصب مجدد آن نیست.
+\n
+\nبا مسئولیت خودتان ادامه دهید!</string>
+    <string name="prefs_activity_in_device_card_distance_title_summary">مسافت با استفاده از تعداد قدم‌ها و طول هر قدم (که از بخش درباره شما در تنظیمات قابل تغییر است) محاسبه می‌شود</string>
+    <string name="prefs_activity_in_device_card_title">نمایش اطلاعات فعالیت روی کارت‌های دستگاه</string>
+    <string name="prefs_activity_in_device_card_sleep_title_summary">نمایش مدت خواب</string>
+    <string name="prefs_activity_in_device_card_title_summary">نمایش تعداد قدم‌های فعلی، مسافت طی شده یا میزان خواب روی کارت دستگاه</string>
+    <string name="fw_upgrade_notice_miband6">شما در حال نصب فرمویر (Firmware) %s بر روی دستگاه می بند شش (mi band 6) خود می‌باشید.
+\n
+\nلطفا از نصب فایل با پسوند .fw و پس از آن فایل با پسوند .res و اطمینان حاصل فرمایید. ساعت شما پس از نصب فایل با پسوند .fw راه‌اندازی مجدد (ری‌استارت) خواهد شد.
+\n
+\nیادداشت: درصورتی که فایل با فرمت .res شما دقیقا مشابه فایلِ از پیش نصب شده می‌باشد نیازی به نصب مجدد آن نیست.
+\n
+\nبا مسئولیت خودتان ادامه دهید!</string>
+    <string name="fw_upgrade_notice_amazfitgtr">شما در حال نصب فرمویر (Firmware) %s بر روی دستگاه امیزفیت جی تی آر (Amazfit GTR) خود می‌باشید.
+\n
+\nلطفا از نصب فایل با پسوند .fw و پس از آن فایل با پسوند .res و در نهایت فایل با پسوند .gps اطمینان حاصل فرمایید. ساعت شما پس از نصب فایل با پسوند .fw راه‌اندازی مجدد (ری‌استارت) خواهد شد.
+\n
+\nیادداشت: درصورتی که فایل‌های با فرمت .res و .gps شما دقیقا مشابه فایلِ از پیش نصب شده می‌باشد نیازی به نصب مجدد آن نیست.
+\n
+\nبا مسئولیت خودتان ادامه دهید!</string>
+    <string name="fw_upgrade_notice_amazfitgts">شما در حال نصب فرمویر (Firmware) %s بر روی دستگاه امیزفیت جی تی اس (Amazfit GTS) خود می‌باشید.
+\n
+\nلطفا از نصب فایل با پسوند .fw و پس از آن فایل با پسوند .res و در نهایت فایل با پسوند .gps اطمینان حاصل فرمایید. ساعت شما پس از نصب فایل با پسوند .fw راه‌اندازی مجدد (ری‌استارت) خواهد شد.
+\n
+\nیادداشت: درصورتی که فایل‌های با فرمت .res و .gps شما دقیقا مشابه فایلِ از پیش نصب شده می‌باشد نیازی به نصب مجدد آن نیست.
+\n
+\nبا مسئولیت خودتان ادامه دهید!</string>
+    <string name="fw_upgrade_notice_amazfitvergel">شما در حال نصب فرمویر (Firmware) %s بر روی دستگاه امیزفیت ورج لایت (Amazfit verge lite) خود می‌باشید.
+\n
+\nلطفا از نصب فایل با پسوند .fw و پس از آن فایل با پسوند .res و در نهایت فایل با پسوند .gps اطمینان حاصل فرمایید. ساعت شما پس از نصب فایل با پسوند .fw راه‌اندازی مجدد (ری‌استارت) خواهد شد.
+\n
+\nیادداشت: درصورتی که فایل‌های با فرمت .res و .gps شما دقیقا مشابه فایلِ از پیش نصب شده می‌باشد نیازی به نصب مجدد آن نیست.
+\n
+\nبا مسئولیت خودتان ادامه دهید!</string>
+    <string name="fw_upgrade_notice_miband4">شما در حال نصب فرمویر (Firmware) %s بر روی دستگاه می بند چهار (mi band 4) خود می‌باشید.
+\n
+\nلطفا از نصب فایل با پسوند .fw و پس از آن فایل با پسوند .res و اطمینان حاصل فرمایید. ساعت شما پس از نصب فایل با پسوند .fw راه‌اندازی مجدد (ری‌استارت) خواهد شد.
+\n
+\nیادداشت: درصورتی که فایل با فرمت .res شما دقیقا مشابه فایلِ از پیش نصب شده می‌باشد نیازی به نصب مجدد آن نیست.
+\n
+\nبا مسئولیت خودتان ادامه دهید!</string>
+    <string name="fw_upgrade_notice_amazfitx">شما در حال نصب فرمویر (Firmware) %s بر روی دستگاه امیزفیت ایکس (Amazfit X) خود می‌باشید.
+\n
+\nلطفا از نصب فایل با پسوند .fw و پس از آن فایل با پسوند .res و اطمینان حاصل فرمایید. ساعت شما پس از نصب فایل با پسوند .fw راه‌اندازی مجدد (ری‌استارت) خواهد شد.
+\n
+\nیادداشت: درصورتی که فایل با فرمت .res شما دقیقا مشابه فایلِ از پیش نصب شده می‌باشد نیازی به نصب مجدد آن نیست.
+\n
+\nبا مسئولیت خودتان ادامه دهید!</string>
 </resources>
\ No newline at end of file

From 267bb3f011f347f73998ea18cbf9f36f6eb896bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=93scar=20Fern=C3=A1ndez=20D=C3=ADaz?=
 <oscfdezdz@tuta.io>
Date: Wed, 30 Mar 2022 11:41:41 +0000
Subject: [PATCH 012/110] Translated using Weblate (Spanish)

Currently translated at 100.0% (1469 of 1469 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/es/
---
 app/src/main/res/values-es/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 49304fe14..4ecbeec37 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -1598,4 +1598,5 @@
     <string name="watchface_dialog_pre_setting_position">preconfigurando la posición a %s</string>
     <string name="autoExport_lastTime_label">Última autoexportación: %1$s</string>
     <string name="activity_db_management_autoexport_location">No se ha podido entender la ubicación. Probablemente un problema del nuevo sistema de permisos de Android. Lo más probable es que la autoexportación no funcione ahora.</string>
+    <string name="watchface_setting_light_up_on_notification">Encender al recibir una notificación nueva</string>
 </resources>
\ No newline at end of file

From 9c6ba34c99c0c47ed1799cd68ee15a6af702a60d Mon Sep 17 00:00:00 2001
From: Milo Ivir <mail@milotype.de>
Date: Wed, 30 Mar 2022 17:57:39 +0000
Subject: [PATCH 013/110] Translated using Weblate (Croatian)

Currently translated at 99.1% (1457 of 1469 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/hr/
---
 app/src/main/res/values-hr/strings.xml | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
index 711a0edb3..813ad6637 100644
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -1557,4 +1557,17 @@
     <string name="devicetype_amazfit_pop_pro">Amazfit Pop Pro</string>
     <string name="menuitem_nothing">Ništa</string>
     <string name="unknown">Nepoznato</string>
+    <string name="pref_anc_optimizer_state_pressure">Atmosferski tlak</string>
+    <string name="sony_anc_optimizer_status_analyzing">Analiziranje …</string>
+    <string name="pref_title_notifications_generic_settings">Postavke obavijesti za Android</string>
+    <string name="autoExport_lastTime_label">Zadnji automatski izvoz: %1$s</string>
+    <string name="activity_db_management_autoexport_enabled_yes">Automatski izvoz je deaktiviran.</string>
+    <string name="activity_db_management_autoexport_enabled_no">Automatski izvoz nije aktiviran.</string>
+    <string name="activity_db_management_autoexport_scheduled_yes">Automatski izvoz je (izvorno) planiran za %1$s</string>
+    <string name="activity_db_management_autoexport_scheduled_no">Automatski izvoz nije planiran.</string>
+    <string name="sony_anc_optimize_title">Optimiraj</string>
+    <string name="sony_anc_optimizer_status_starting">Pokretanje …</string>
+    <string name="sony_anc_optimizer_status_not_running">Nije pokrenuto</string>
+    <string name="sony_anc_optimizer_status_atmospheric_pressure">Mjerenje atmostferskog tlaka …</string>
+    <string name="sony_anc_optimizer_status_finished">Dovršavanje …</string>
 </resources>
\ No newline at end of file

From 28a2573f8d8d549c7967822e98d18e7b5a1d4f99 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Allan=20Nordh=C3=B8y?= <epost@anotheragency.no>
Date: Thu, 31 Mar 2022 16:58:25 +0000
Subject: [PATCH 014/110] =?UTF-8?q?Translated=20using=20Weblate=20(Norwegi?=
 =?UTF-8?q?an=20Bokm=C3=A5l)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Currently translated at 91.5% (1345 of 1469 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/nb_NO/
---
 app/src/main/res/values-nb-rNO/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml
index 89b097f23..18f6e3e8b 100644
--- a/app/src/main/res/values-nb-rNO/strings.xml
+++ b/app/src/main/res/values-nb-rNO/strings.xml
@@ -1595,4 +1595,5 @@
     <string name="activity_db_management_autoexport_scheduled_no">Auto-eksport er ikke planlagt.</string>
     <string name="activity_db_management_autoexport_location">Forsto ikke plassering. Antagelig er dette et tilgangsproblem i Android. Mest sannsynlig fungerer ikke auto-eksport nå.</string>
     <string name="watchface_dialog_pre_setting_position">forhåndsinnstiller posisjon til %s</string>
+    <string name="watchface_setting_light_up_on_notification">Slå på lys ved nye merknader</string>
 </resources>
\ No newline at end of file

From d8c8a068d8bee987154ddb1ea1b990f9842ea040 Mon Sep 17 00:00:00 2001
From: Milo Ivir <mail@milotype.de>
Date: Thu, 31 Mar 2022 11:21:10 +0000
Subject: [PATCH 015/110] Translated using Weblate (Croatian)

Currently translated at 100.0% (1469 of 1469 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/hr/
---
 app/src/main/res/values-hr/strings.xml | 30 ++++++++++++++++++--------
 1 file changed, 21 insertions(+), 9 deletions(-)

diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
index 813ad6637..11e483392 100644
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -405,9 +405,9 @@
     <string name="sony_ambient_sound_focus_voice">Fokusiranje na glas</string>
     <string name="sony_ambient_sound_level">Razina ambijentalnog zvuka</string>
     <string name="sony_sound_position">Položaj zvuka</string>
-    <string name="sony_sound_position_front">Prednji</string>
-    <string name="sony_sound_position_front_left">Prednji lijevi</string>
-    <string name="sony_sound_position_rear_right">Stražnji desni</string>
+    <string name="sony_sound_position_front">Sprijeda</string>
+    <string name="sony_sound_position_front_left">Sprijeda lijevo</string>
+    <string name="sony_sound_position_rear_right">Straga desno</string>
     <string name="sony_surround_mode">Surround način rada</string>
     <string name="sony_surround_mode_off">Isključeno</string>
     <string name="sony_surround_mode_arena">Arena</string>
@@ -424,7 +424,7 @@
     <string name="pref_header_sony_equalizer_preset_custom_1">Prilagođeno unaprijed postavljeno 1</string>
     <string name="pref_header_sony_equalizer_preset_custom_2">Prilagođeno unaprijed postavljeno 2</string>
     <string name="sony_equalizer_band_400">400</string>
-    <string name="sony_equalizer_band_1000">1000</string>
+    <string name="sony_equalizer_band_1000">1.000</string>
     <string name="sony_equalizer_band_16000">16.000</string>
     <string name="sony_equalizer_clear_bass">Čisti bas</string>
     <string name="sony_touch_sensor">Upravljanje senzorom na dodir</string>
@@ -502,8 +502,8 @@
     <string name="warning">Upozorenje!</string>
     <string name="pref_title_lower_button_function_double">Donji gumb dvostruko</string>
     <string name="minutes_mi">min/mi</string>
-    <string name="sony_sound_position_front_right">Prednji desni</string>
-    <string name="sony_sound_position_rear_left">Stražnji lijevi</string>
+    <string name="sony_sound_position_front_right">Sprijeda desno</string>
+    <string name="sony_sound_position_rear_left">Straga lijevo</string>
     <string name="discovery_bonding_failed_immediately">Povezivanje s %1$s odmah nije uspjelo.</string>
     <string name="discovery_trying_to_connect_to">Pokušavam se povezati s: %1$s</string>
     <string name="discovery_enable_bluetooth">Omogućite Bluetooth za otkrivanje uređaja.</string>
@@ -1007,7 +1007,7 @@
     <string name="pref_header_sony_ambient_sound_control">Upravljanje ambijentalnim zvukom</string>
     <string name="sony_ambient_sound_off">Isključeno</string>
     <string name="sony_ambient_sound_noise_cancelling">Poništavanje buke</string>
-    <string name="sony_ambient_sound_wind_noise_reduction">Smanjenje šuma vjetra</string>
+    <string name="sony_ambient_sound_wind_noise_reduction">Smanjenje buke vjetra</string>
     <string name="sony_equalizer_preset_excited">Uzbuđeno</string>
     <string name="pref_header_other">Ostalo</string>
     <string name="pref_header_system">Sustav</string>
@@ -1049,8 +1049,8 @@
     <string name="pref_summary_canned_messages_dismisscall">Odbacite pozive sa sata SMS porukom</string>
     <string name="qhybrid_calibration_100_steps">100 koraka</string>
     <string name="pref_title_equalizer_soft">Meko</string>
-    <string name="sony_equalizer_band_2500">2500</string>
-    <string name="sony_equalizer_band_6300">6300</string>
+    <string name="sony_equalizer_band_2500">2.500</string>
+    <string name="sony_equalizer_band_6300">6.300</string>
     <string name="watchface_dialog_widget_update_timeout">Vrijeme čekanja ažuriranja u minutama:</string>
     <string name="watchface_dialog_widget_timeout_hide_text">Sakrij tekst nakon isteka:</string>
     <string name="menuitem_mutephone">Bešumno</string>
@@ -1570,4 +1570,16 @@
     <string name="sony_anc_optimizer_status_not_running">Nije pokrenuto</string>
     <string name="sony_anc_optimizer_status_atmospheric_pressure">Mjerenje atmostferskog tlaka …</string>
     <string name="sony_anc_optimizer_status_finished">Dovršavanje …</string>
+    <string name="sony_anc_optimizer_status_wearing_condition">Mjerenje stanja nošenja …</string>
+    <string name="activity_db_management_autoexport_location">Nije bilo moguće razumjeti lokaciju. Vjerojatno se radi o problemu novijeg Android sustava dozvola. Najvjerojatnije automatski izvoz sada ne radi.</string>
+    <string name="pref_header_sony_anc_optimizer">Optimizator poništavanje buke</string>
+    <string name="sony_anc_optimize_confirmation_title">Optimizator poništavanje buke</string>
+    <string name="sony_anc_optimize_confirmation_description">Koristi slušalice kao obično. Ako se stanje nošenja ili atmosferski tlak promijene, ponovo pokreni optimizator.</string>
+    <string name="sony_anc_optimize_description">Pritisni za pokretanje optimizatora poništavanja buke.</string>
+    <string name="pref_device_action_fitness_app_control_start">Pokretanje praćenja aplikacije za fitness</string>
+    <string name="pref_device_action_fitness_app_control_stop">Prekid praćenja aplikacije za fitness</string>
+    <string name="pref_title_opentracks_packagename">Ime OpenTracks paketa</string>
+    <string name="watchface_dialog_pre_setting_position">predpodešavanje položaja na %s</string>
+    <string name="watchface_setting_light_up_on_notification">Zasvijetli pri novoj obavijesti</string>
+    <string name="pref_summary_opentracks_packagename">Koristi se za pokretanje/prekidanje snimanja GPS zapisa u vanjskoj aplikaciji za fitness.</string>
 </resources>
\ No newline at end of file

From 9c851699e832cedcdf424dc83ed03485da825cb8 Mon Sep 17 00:00:00 2001
From: ifurther <i.further.5.4@gmail.com>
Date: Mon, 4 Apr 2022 15:44:27 +0000
Subject: [PATCH 016/110] Translated using Weblate (Chinese (Traditional))

Currently translated at 45.4% (668 of 1469 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/zh_Hant/
---
 app/src/main/res/values-zh-rTW/strings.xml | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 1c761d590..c0361c7a3 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -688,4 +688,17 @@
     <string name="pref_theme_system">根據系統</string>
     <string name="discovery_bluetooth_scan">藍芽掃描：</string>
     <string name="discovery_bluetooth_le_scan">低功耗藍芽掃描：</string>
+    <string name="fw_upgrade_notice_miband6">您即將在您的小米手環6上安裝韌體 %s 
+\n 
+\n請確定先安裝 .fw 檔，然後再安裝 .res 檔。您的手環將在安裝完 .fw 檔後重新啟動。 
+\n 
+\n注意：如果您安裝的是與先前同樣的版本，您就不必再安裝 .res 檔。 
+\n 
+\n過程中的風險請自負！</string>
+    <string name="watchface_setting_light_up_on_notification">新通知时亮起</string>
+    <string name="fw_upgrade_notice_amazfitneo">您將要在Amazfit Neo上安裝%s固件。
+\n
+\n安裝 .fw 檔後，您的頻帶將重新啟動。
+\n
+\n過程中的風險請自負！</string>
 </resources>
\ No newline at end of file

From 469e082e58a3e7e08e86c1f15ada512d534c48f0 Mon Sep 17 00:00:00 2001
From: ifurther <i.further.5.4@gmail.com>
Date: Tue, 5 Apr 2022 14:38:34 +0000
Subject: [PATCH 017/110] Translated using Weblate (Chinese (Traditional))

Currently translated at 45.5% (669 of 1469 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/zh_Hant/
---
 app/src/main/res/values-zh-rTW/strings.xml | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index c0361c7a3..d31c63536 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -698,7 +698,14 @@
     <string name="watchface_setting_light_up_on_notification">新通知时亮起</string>
     <string name="fw_upgrade_notice_amazfitneo">您將要在Amazfit Neo上安裝%s固件。
 \n
-\n安裝 .fw 檔後，您的頻帶將重新啟動。
+\n安裝 .fw 檔後，您的手環將重新啟動。
+\n
+\n過程中的風險請自負！</string>
+    <string name="fw_upgrade_notice_amazfitx">您將要在Amazfit X上安裝%s固件。
+\n
+\n請確定先安裝 .fw 檔，然後再安裝 .res 檔。您的手環將在安裝完 .fw 檔後重新啟動。
+\n
+\n注意：如果您安裝的是與先前同樣的版本，您就不必再安裝 .res 檔。
 \n
 \n過程中的風險請自負！</string>
 </resources>
\ No newline at end of file

From 1c6967e1ec2635fb04f0b6297585d24f223206d2 Mon Sep 17 00:00:00 2001
From: Milo Ivir <mail@milotype.de>
Date: Fri, 8 Apr 2022 11:24:30 +0000
Subject: [PATCH 018/110] Translated using Weblate (German)

Currently translated at 100.0% (1470 of 1470 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/de/
---
 app/src/main/res/values-de/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 02875ad3a..f67e7a61d 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -1602,4 +1602,5 @@
     <string name="watchface_setting_light_up_on_notification">Aufleuchten bei neuer Benachrichtigung</string>
     <string name="autoExport_lastTime_label">Letzter autom. Export: %1$s</string>
     <string name="activity_db_management_autoexport_location">Standort ermittelt nicht möglich. Wahrscheinlich ein Problem des neueren Android-Berechtigungssystems. Höchstwahrscheinlich funktioniert der autom. Export jetzt nicht.</string>
+    <string name="menuitem_email">E-mail</string>
 </resources>
\ No newline at end of file

From 02241702c0d71f1e9704fec2baf820b153cb91b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vinc=C3=A8n=20PUJOL?= <vincen@vincen.org>
Date: Fri, 8 Apr 2022 06:09:44 +0000
Subject: [PATCH 019/110] Translated using Weblate (French)

Currently translated at 100.0% (1470 of 1470 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/fr/
---
 app/src/main/res/values-fr/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 28436286a..72fc51142 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -1597,4 +1597,5 @@ Temps de sommeil préféré en heures</string>
     <string name="activity_db_management_autoexport_location">L\'emplacement n\'a pas pu être détecté. Probablement un problème avec les nouvelles permissions du système Android. Très probablement, l\'export automatique ne fonctionne pas actuellement.</string>
     <string name="watchface_dialog_pre_setting_position">pré-configuration de la position à %s</string>
     <string name="watchface_setting_light_up_on_notification">S\'allumer pour une nouvelle notification</string>
+    <string name="menuitem_email">Email</string>
 </resources>
\ No newline at end of file

From f8f43a47ca84ddf2ee5d127793da34dee16bb4c6 Mon Sep 17 00:00:00 2001
From: Yaron Shahrabani <sh.yaron@gmail.com>
Date: Fri, 8 Apr 2022 08:22:15 +0000
Subject: [PATCH 020/110] Translated using Weblate (Hebrew)

Currently translated at 100.0% (1470 of 1470 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/he/
---
 app/src/main/res/values-he/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml
index de312adc6..e3a3dc0e1 100644
--- a/app/src/main/res/values-he/strings.xml
+++ b/app/src/main/res/values-he/strings.xml
@@ -1593,4 +1593,5 @@
     <string name="activity_db_management_autoexport_location">לא ניתן לפענח את המיקום. כנראה תקלה במערכת ההרשאות החדשה של Android. סביר להניח שהייצוא האוטומטי לא עובד כרגע.</string>
     <string name="watchface_dialog_pre_setting_position">המיקום מוגדר מראש לכדי %s</string>
     <string name="watchface_setting_light_up_on_notification">הארה עם התראות חדשות</string>
+    <string name="menuitem_email">דוא״ל</string>
 </resources>
\ No newline at end of file

From 13cae08afc67f32783cec47d875e4483d9c704df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?O=C4=9Fuz=20Ersen?= <oguz@ersen.moe>
Date: Fri, 8 Apr 2022 04:37:21 +0000
Subject: [PATCH 021/110] Translated using Weblate (Turkish)

Currently translated at 100.0% (1470 of 1470 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/tr/
---
 app/src/main/res/values-tr/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 2a24bc272..b316aaaf5 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -1610,4 +1610,5 @@
     <string name="activity_db_management_autoexport_location">Konum anlaşılamadı. Bu, muhtemelen daha yeni bir Android izin sistemi sorunudur. Büyük olasılıkla, otomatik dışa aktarma şu anda çalışmıyor.</string>
     <string name="watchface_dialog_pre_setting_position">konumu %s olarak ön ayarlama</string>
     <string name="watchface_setting_light_up_on_notification">Yeni bildirimde ışığı aç</string>
+    <string name="menuitem_email">E-posta</string>
 </resources>
\ No newline at end of file

From c5a2a71e54a2dd0228b52c99b2645f1aee6eec6e Mon Sep 17 00:00:00 2001
From: Ihor Hordiichuk <igor_ck@outlook.com>
Date: Thu, 7 Apr 2022 21:18:00 +0000
Subject: [PATCH 022/110] Translated using Weblate (Ukrainian)

Currently translated at 100.0% (1470 of 1470 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/uk/
---
 app/src/main/res/values-uk/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 51a330b34..8ea3305e8 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -1601,4 +1601,5 @@
     <string name="activity_db_management_autoexport_location">Не вдалося встановити місцеперебування. Ймовірно, проблема з новішою системою дозволів Android. Швидше за все, автоекспорт зараз не працює.</string>
     <string name="watchface_dialog_pre_setting_position">попереднє встановлення розташування на %s</string>
     <string name="watchface_setting_light_up_on_notification">Засвітлювати за нового сповіщення</string>
+    <string name="menuitem_email">Е-пошта</string>
 </resources>
\ No newline at end of file

From e8211d1cbed0897ae8c2df7e75b0afd66f739786 Mon Sep 17 00:00:00 2001
From: arjan-s <a_gitlab@anymore.nl>
Date: Sat, 9 Apr 2022 07:03:54 +0000
Subject: [PATCH 023/110] Translated using Weblate (Dutch)

Currently translated at 100.0% (1470 of 1470 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/nl/
---
 app/src/main/res/values-nl/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 152ea63fd..afc1c40e5 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -1594,4 +1594,5 @@
     <string name="autoExport_lastTime_label">Laatste AutoExport: %1$s</string>
     <string name="watchface_dialog_pre_setting_position">Positie ingesteld op %s</string>
     <string name="watchface_setting_light_up_on_notification">Scherm oplichten bij nieuwe melding</string>
+    <string name="menuitem_email">E-mail</string>
 </resources>
\ No newline at end of file

From 041bc25d97dd2aee9caa05591604d5c6e3772867 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=B0=91=E4=B8=BE?= <oshirisu.red@gmail.com>
Date: Fri, 8 Apr 2022 02:26:35 +0000
Subject: [PATCH 024/110] Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (1470 of 1470 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/zh_Hans/
---
 app/src/main/res/values-zh-rCN/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index d866c5f8e..313f273be 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -1599,4 +1599,5 @@
     <string name="activity_db_management_autoexport_enabled_yes">自动导出已开启。</string>
     <string name="watchface_dialog_pre_setting_position">预设位置为 %s</string>
     <string name="watchface_setting_light_up_on_notification">有新通知时亮起</string>
+    <string name="menuitem_email">电子邮件</string>
 </resources>
\ No newline at end of file

From aa34c432954c530aa0cc6d40ba9b52b56a2d06be Mon Sep 17 00:00:00 2001
From: Milo Ivir <mail@milotype.de>
Date: Fri, 8 Apr 2022 11:11:44 +0000
Subject: [PATCH 025/110] Translated using Weblate (Croatian)

Currently translated at 100.0% (1470 of 1470 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/hr/
---
 app/src/main/res/values-hr/strings.xml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
index 11e483392..56443598a 100644
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -1543,11 +1543,11 @@
     <string name="sony_speak_to_chat_sensitivity_high">Visoka</string>
     <string name="sony_speak_to_chat_sensitivity_low">Niska</string>
     <string name="sony_speak_to_chat_focus_on_voice">Fokusiranje na glas</string>
-    <string name="sony_speak_to_chat_timeout">Pauza</string>
+    <string name="sony_speak_to_chat_timeout">Vremensko ograničenje</string>
     <string name="sony_speak_to_chat_timeout_off">Isključeno</string>
-    <string name="sony_speak_to_chat_timeout_short">Kratka (15 s)</string>
-    <string name="sony_speak_to_chat_timeout_standard">Standardna (30 s)</string>
-    <string name="sony_speak_to_chat_timeout_long">Duga (1 min)</string>
+    <string name="sony_speak_to_chat_timeout_short">Kratko (15 s)</string>
+    <string name="sony_speak_to_chat_timeout_standard">Standardno (30 s)</string>
+    <string name="sony_speak_to_chat_timeout_long">Dugo (1 min)</string>
     <string name="sony_connect_two_devices">Poveži se na dva uređaja istovremeno</string>
     <string name="sony_speak_to_chat">Speak-to-chat</string>
     <string name="pref_header_sony_device_info">Informacije urađaja</string>
@@ -1582,4 +1582,5 @@
     <string name="watchface_dialog_pre_setting_position">predpodešavanje položaja na %s</string>
     <string name="watchface_setting_light_up_on_notification">Zasvijetli pri novoj obavijesti</string>
     <string name="pref_summary_opentracks_packagename">Koristi se za pokretanje/prekidanje snimanja GPS zapisa u vanjskoj aplikaciji za fitness.</string>
+    <string name="menuitem_email">E-mail</string>
 </resources>
\ No newline at end of file

From 6bfd4991d4fe6467d73bdf662d95685c341a1b9f Mon Sep 17 00:00:00 2001
From: nautilusx <translate@disroot.org>
Date: Mon, 11 Apr 2022 07:15:11 +0000
Subject: [PATCH 026/110] Translated using Weblate (German)

Currently translated at 100.0% (1470 of 1470 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/de/
---
 app/src/main/res/values-de/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index f67e7a61d..c8acf6e93 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -1602,5 +1602,5 @@
     <string name="watchface_setting_light_up_on_notification">Aufleuchten bei neuer Benachrichtigung</string>
     <string name="autoExport_lastTime_label">Letzter autom. Export: %1$s</string>
     <string name="activity_db_management_autoexport_location">Standort ermittelt nicht möglich. Wahrscheinlich ein Problem des neueren Android-Berechtigungssystems. Höchstwahrscheinlich funktioniert der autom. Export jetzt nicht.</string>
-    <string name="menuitem_email">E-mail</string>
+    <string name="menuitem_email">E-Mail</string>
 </resources>
\ No newline at end of file

From a07e942cf530f23d11a2fe6f655fb71a990fab7c Mon Sep 17 00:00:00 2001
From: Kintu <kintukp@gmail.com>
Date: Thu, 14 Apr 2022 10:08:24 +0000
Subject: [PATCH 027/110] Translated using Weblate (Catalan)

Currently translated at 89.5% (1317 of 1470 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/ca/
---
 app/src/main/res/values-ca/strings.xml | 92 ++++++++++++++++++++++++--
 1 file changed, 88 insertions(+), 4 deletions(-)

diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
index dfd01fa43..0b26dcf32 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -443,9 +443,14 @@
     <string name="pref_summary_pebble_health_store_raw">Desa les dades \"tal qual\", tot augmentant l\'ús de la base de dades per tal de permetre possibles interpretacions més tard.</string>
     <string name="action_db_management">Gestió de dades</string>
     <string name="title_activity_db_management">Gestió de dades</string>
-    <string name="activity_db_management_import_export_explanation">Les operacions de base de dades fan servir el següent camí al vostre aparell.
-\nAquest camí és accessible des d\'altres aparells Android i des del vostre ordinador.
-\nQuan exporteu una base de dades, la trobareu aquí, i quan vulgueu importar una base de dades, heu de deixar els fitxers també aquí:</string>
+    <string name="activity_db_management_import_export_explanation">Les operacions d\'exportació/importació fan servir el següent camí (vegeu a sota) cap a un directori al vostre aparell. Aquest directori és accessible des d\'altres aparells Android i des del vostre ordinador. Tingueu en compte que aquest directori i tots els seus fitxers seran esborrats si desinstal·leu Gadgetbridge. Les dades inclouen:
+\n Export_preference - configuració global
+\n Export_preference_MAC - configuració específica de l\'aparell
+\n Gadgetbridge - base de dades d\'activitat i aparell
+\n Gadgetbridge_date - base de dades exportada en una data
+\n *.gpx - gravacions GPS
+\n *.log - fitxers de registre
+\nTrobeu els vostres fitxers exportats (o deseu els fitxers que volgueu importar) aquí:</string>
     <string name="activity_db_management_merge_old_title">Esborra la base de dades antiga</string>
     <string name="dbmanagementactivvity_cannot_access_export_path">No es pot accedir al camí d\'exportació. Si us plau, contacteu els desenvolupadors.</string>
     <string name="dbmanagementactivity_exported_to">S\'ha exportat a: %1$s</string>
@@ -1277,7 +1282,7 @@
     <string name="prefs_reserve_reminder_calendar_summary">Nombre d\'esdeveniments del calendari que seran sincronitzats</string>
     <string name="prefs_sounds_summary">Configureu quan l\'aparell pitarà</string>
     <string name="prefs_fm_presets_presets">Preconfiguracions</string>
-    <string name="device_card_activity_card_title">Informació d\'activitat a la tarja de l\'aparell</string>
+    <string name="device_card_activity_card_title">Informació d\'activitat a la targeta de l\'aparell</string>
     <string name="pref_header_notification_application_settings">Configuració per aplicació</string>
     <string name="pref_title_notification_use_as">Useu la llista d\'aplicacions per a ...</string>
     <string name="pref_title_notification_use_as_deny">Rebutgeu les notificacions de les aplicacions triades</string>
@@ -1352,4 +1357,83 @@
     <string name="prefs_autoheartrate_sleep">Prendre mesures durant el son</string>
     <string name="watchface_setting_desc_wrist_flick">(per desactivar-lo completament, habiliteu el moviment relatiu i establiu tots els valors a 0)</string>
     <string name="button_watchface_preview">Previsualització del rellotge</string>
+    <string name="unknown">Desconegut</string>
+    <string name="start">Inicia</string>
+    <string name="activity_summary_detail_editing_gpx_track">Edició de la pista GPX enllaçada</string>
+    <string name="nothing_prefs_inear_title">Detecció intraorella</string>
+    <string name="prefs_ambient_sound">So ambiental</string>
+    <string name="pref_anc_optimizer_state_pressure">Pressió atmosfèrica</string>
+    <string name="distance_format_feet">### ft</string>
+    <string name="distance_format_miles">###.# mi</string>
+    <string name="distance_format_kilometers">###.# km</string>
+    <string name="discover_unsupported_devices">Detecta aparells no suportats</string>
+    <string name="watchface_toast_settings_incomplete">Configuració incompleta, giny no afegit</string>
+    <string name="prefs_vibration_enable">Activa la vibració</string>
+    <string name="prefs_autoheartrate_interval">Freqüència de mesures</string>
+    <string name="left_earbud">Auricular esquerre</string>
+    <string name="right_earbud">Auricular dret</string>
+    <string name="sony_sound_position_front_left">Frontal esquerra</string>
+    <string name="distance_format_meters">### m</string>
+    <string name="watchface_dialog_widget_width">Ample:</string>
+    <string name="menuitem_menu">Menú</string>
+    <string name="pref_activity_recognition_mode_auto">automàtic</string>
+    <string name="pref_activity_recognition_mode_ask">pregunta</string>
+    <string name="add_test_device">Afegeix aparell de prova</string>
+    <string name="controlcenter_power_off_confirm_description">Estàs segur que vols apagar l\'aparell\?</string>
+    <string name="pref_title_message_privacy_mode">Mode de privacitat de missatges</string>
+    <string name="devicetype_amazfit_pop">Amazfit Pop</string>
+    <string name="devicetype_amazfit_pop_pro">Amazfit Pop Pro</string>
+    <string name="device_unsupported">NO SUPORTAT</string>
+    <string name="watchface_widget_type_2nd_tz">2n fus horari</string>
+    <string name="pref_header_sony_device_info">Informació de l\'aparell</string>
+    <string name="sony_ambient_sound_wind_noise_reduction">Reducció de soroll de vent</string>
+    <string name="sony_anc_optimize_title">Optimitza</string>
+    <string name="watchface_widget_type_active_mins">Minuts actiu</string>
+    <string name="activity_type_hiking">Senderisme</string>
+    <string name="pref_title_ping_tone">To de ping</string>
+    <string name="device_card_activity_card_title_summary">Escull quins detalls d\'activitat es mostren a la targeta de l\'aparell</string>
+    <string name="prefs_activity_in_device_card_title">Mostra informació d\'activitat a la targeta de l\'aparell</string>
+    <string name="prefs_activity_in_device_card_title_summary">Mostra les passes, la distància o el son actuals a la targeta de l\'aparell</string>
+    <string name="devicetype_sonyswr12">Sony SWR12</string>
+    <string name="swolf_index">índex swolf</string>
+    <string name="discovery_bluetooth_scan">Escaneig Bluetooth:</string>
+    <string name="discovery_bluetooth_le_scan">Escaneig Bluetooth LE:</string>
+    <string name="activity_prefs_discovery_pairing">Opcions de detecció i emparellament</string>
+    <string name="prefs_galaxy_touch_options">Opcions tàctils</string>
+    <string name="pref_activity_recognition_mode_none">cap</string>
+    <string name="prefs_ambient_volume">Volum ambiental</string>
+    <string name="activity_db_management_autoexport_enabled_yes">L\'exportació automàtica està activada.</string>
+    <string name="autoExport_lastTime_label">Última exportació automàtica: %1$s</string>
+    <string name="activity_db_management_autoexport_enabled_no">L\'exportació automàtica no està activada.</string>
+    <string name="activity_db_management_autoexport_scheduled_yes">L\'exportació automàtica està programada (originalment) per a %1$s</string>
+    <string name="activity_db_management_autoexport_scheduled_no">L\'exportació automàtica no ha sigut programada.</string>
+    <string name="menuitem_nothing">Res</string>
+    <string name="qhybrid_summary_calibration">Calibra les manetes del rellotge</string>
+    <string name="watchface_setting_display_refresh_partial">Actualització parcial (en minuts):</string>
+    <string name="devicetype_galaxybuds">Galaxy Buds</string>
+    <string name="devicetype_galaxybuds_live">Galaxy Buds Live</string>
+    <string name="devicetype_nothingear1">Nothing Ear (1)</string>
+    <string name="devicetype_bose_qc35">Bose QC35</string>
+    <string name="devicetype_vesc">VESC</string>
+    <string name="controlcenter_power_off_confirm_title">Apaga</string>
+    <string name="pref_title_notifications_generic_settings">Configuració de notificacions Android</string>
+    <string name="controlcenter_power_off">Apaga</string>
+    <string name="activity_summary_detail_clear_gpx_track">Neteja la pista GPX</string>
+    <string name="devicetype_sony_wf_sp800n">Sony WF-SP800N</string>
+    <string name="menuitem_email">Correu electrònic</string>
+    <string name="watchface_install_info">Sou a punt d\'instal·lar la següent caràtula:
+\n
+\n%1$s
+\nVersió %2$s per %3$s
+\n</string>
+    <string name="devicetype_domyos_t540">Domyos T540</string>
+    <string name="activity_type_climbing">Escalada</string>
+    <string name="activity_summary_detail_select_gpx_track">Selecciona la pista GPX</string>
+    <string name="devicetype_sony_wh_1000xm4">Sony WH-1000XM4</string>
+    <string name="about_hash">Confirma %s</string>
+    <string name="watchface_setting_display_refresh_full">Actualització completa (en minuts):</string>
+    <string name="sony_ambient_sound_noise_cancelling">Cancel·lació de soroll</string>
+    <string name="sony_sound_position_front_right">Frontal dreta</string>
+    <string name="gpx_receiver_activity_title">Receptor GPX Gadgetbridge</string>
+    <string name="prefs_active_noise_cancelling">Cancel·lació de soroll activa</string>
 </resources>
\ No newline at end of file

From 7f2d55a1f07bb0ba7c1c8f808ddbabbdbf6ff3f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=93scar=20Fern=C3=A1ndez=20D=C3=ADaz?=
 <oscfdezdz@tuta.io>
Date: Sat, 16 Apr 2022 15:12:48 +0000
Subject: [PATCH 028/110] Translated using Weblate (Spanish)

Currently translated at 100.0% (1470 of 1470 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/es/
---
 app/src/main/res/values-es/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 4ecbeec37..1cb42b9ca 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -1599,4 +1599,5 @@
     <string name="autoExport_lastTime_label">Última autoexportación: %1$s</string>
     <string name="activity_db_management_autoexport_location">No se ha podido entender la ubicación. Probablemente un problema del nuevo sistema de permisos de Android. Lo más probable es que la autoexportación no funcione ahora.</string>
     <string name="watchface_setting_light_up_on_notification">Encender al recibir una notificación nueva</string>
+    <string name="menuitem_email">Correo electrónico</string>
 </resources>
\ No newline at end of file

From d0623ccd4e3824a1b1a4d1bfc9d3814305d63124 Mon Sep 17 00:00:00 2001
From: Michal L <michalrmsmi@wp.pl>
Date: Sat, 16 Apr 2022 17:29:16 +0000
Subject: [PATCH 029/110] Translated using Weblate (Polish)

Currently translated at 99.7% (1467 of 1470 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/pl/
---
 app/src/main/res/values-pl/strings.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index bed0b2fe6..6eafd0291 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -1604,4 +1604,6 @@
     <string name="pref_device_action_fitness_app_control_stop">Zatrzymanie śledzenia aplikacji fitness</string>
     <string name="watchface_dialog_pre_setting_position">Wstępne ustawienie położenia na %s</string>
     <string name="activity_db_management_autoexport_location">Lokalizacja nie jest dostępna. Najprawdopodobniej jest to spowodowane nowym systemem uprawnień Androida. Prawdopodobnie automatyczny eksport teraz nie działa.</string>
+    <string name="watchface_setting_light_up_on_notification">Podświetlanie nowych powiadomień</string>
+    <string name="menuitem_email">E-mail</string>
 </resources>
\ No newline at end of file

From 9fdb947ec9ac93dac3b5bab23271299b1670e093 Mon Sep 17 00:00:00 2001
From: Shimoon Horanek <simonfarm0@gmail.com>
Date: Tue, 19 Apr 2022 10:42:59 +0000
Subject: [PATCH 030/110] Translated using Weblate (Czech)

Currently translated at 99.9% (1469 of 1470 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/cs/
---
 app/src/main/res/values-cs/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 507730638..71b747c15 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -1595,4 +1595,5 @@
     <string name="watchface_dialog_pre_setting_position">přednastavuji pozici na %s</string>
     <string name="activity_db_management_autoexport_enabled_no">AutoExport není aktivní.</string>
     <string name="activity_db_management_autoexport_scheduled_no">AutoExport zatím nebyl naplánován.</string>
+    <string name="menuitem_email">E-mail</string>
 </resources>
\ No newline at end of file

From 63f2cfa336a525df29ef1dc07efbdb8972ada2a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Gir=C3=B3n?= <contacto@duhowpi.net>
Date: Tue, 19 Apr 2022 15:28:09 +0000
Subject: [PATCH 031/110] Translated using Weblate (Catalan)

Currently translated at 91.2% (1341 of 1470 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/ca/
---
 app/src/main/res/values-ca/strings.xml | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
index 0b26dcf32..6a1b8e896 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -1436,4 +1436,28 @@
     <string name="sony_sound_position_front_right">Frontal dreta</string>
     <string name="gpx_receiver_activity_title">Receptor GPX Gadgetbridge</string>
     <string name="prefs_active_noise_cancelling">Cancel·lació de soroll activa</string>
+    <string name="pref_title_upper_button_function_double">Botó superior doble</string>
+    <string name="pref_title_middle_button_function_double">Botó central doble</string>
+    <string name="prefs_events_forwarding_summary">Fes servir events del dispositiu per executar accions i emissions d\'Android</string>
+    <string name="prefs_operating_sounds">Sons de funcionament</string>
+    <string name="pref_title_middle_button_function_long">Botó central llarg</string>
+    <string name="mi2_prefs_do_not_disturb_lift_wrist">Encendre la pantalla al agafar el dispositiu amb \"No molestar\"</string>
+    <string name="pref_title_upper_button_function_long">Botó superior llarg</string>
+    <string name="pref_title_lower_button_function_double">Botó inferior doble</string>
+    <string name="maxStride">Gambada màxima</string>
+    <string name="totalStride">Total recorregut</string>
+    <string name="prefs_fake_ring_duration">Timbre continu fals</string>
+    <string name="pref_qhybrid_title_widget_draw_circles">Dibuixar cercles de widget</string>
+    <string name="minStride">Gambada mínima</string>
+    <string name="pref_title_middle_button_function_short">Botó central curt</string>
+    <string name="pref_title_lower_button_function_short">Botó inferior curt</string>
+    <string name="pref_title_upper_button_function_short">Botó superior curt</string>
+    <string name="qhybrid_title_watchface">Configuració de Watchface</string>
+    <string name="kind_agps_bundle">Paquet AGPS</string>
+    <string name="pref_title_lower_button_function_long">Botó inferior llarg</string>
+    <string name="activity_db_management_autoexport_location">No s\'ha entés la ubicació. És possible que sigui un problema de permissos del nou sistema Android. El més probable és que l\'autoexportació de dades no funcioni ara.</string>
+    <string name="activity_db_management_clean_export_directory_text">Els fitxers exportats a la carpeta d\'Exportar/Importar poden ser llegits per qualsevol aplicació al teu dispositiu. És possible que vulguis suprimir aquests fixters després de sincronitzar o fer una copia de seguretat. Assegura\'t de fer una copia abans d\'esborrar-los. Els fitxers GPX, les subcarpetes i la base de dades auto-exportada (si existeix) no s\'esborrarà. La carpeta d\'Exportar/Importar es troba a:</string>
+    <string name="companiondevice_pairing">Emparellament de dispositius de companyia</string>
+    <string name="qhybrid_pref_summary_external_intents">Permetre que altres aplicacions d\'Android puguin sobre/escriure fitxers</string>
+    <string name="averageStride">Mitjana d\'avançada</string>
 </resources>
\ No newline at end of file

From b564a6c8953094576ce86e67072ac108639da850 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vinc=C3=A8n=20PUJOL?= <vincen@vincen.org>
Date: Thu, 21 Apr 2022 18:55:43 +0000
Subject: [PATCH 032/110] Translated using Weblate (French)

Currently translated at 100.0% (1470 of 1470 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/fr/
---
 app/src/main/res/values-fr/strings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 72fc51142..cd2b07501 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -1062,7 +1062,7 @@ Temps de sommeil préféré en heures</string>
     <string name="activity_prefs_chart_max_idle_phase_length">Longueur de la pause pour séparer les activités (minutes)</string>
     <string name="activity_prefs_chart_min_steps_per_minute">Nombre de pas minimum par minute pour détecter une activité</string>
     <string name="activity_prefs_chart_min_steps_per_minute_for_run">Nombre de pas minimum par minute pour détecter une course</string>
-    <string name="charts_activity_list">Liste d\'activités</string>
+    <string name="charts_activity_list">Activités du jour</string>
     <string name="chart_get_active_and_synchronize">Avoir une activité et synchroniser l\'appareil.</string>
     <string name="chart_no_active_data">Aucune activité détectée.</string>
     <string name="devicetype_lefun">Lefun</string>
@@ -1130,7 +1130,7 @@ Temps de sommeil préféré en heures</string>
 \nIntensité</string>
     <string name="activity_list_summary_active_time">Durée d\'activité</string>
     <string name="activity_list_summary_distance">Distance</string>
-    <string name="activity_list_summary_active_steps">Pas réalisés</string>
+    <string name="activity_list_summary_active_steps">Pas réels</string>
     <string name="devicetype_amazfit_gts2">Amazfit GTS 2</string>
     <string name="devicetype_casiogbx100">Casio GBX-100</string>
     <string name="prefs_charts_tabs_summary">Onglets visibles des tableaux</string>

From d386b01169af6c9feb45ac9de98f3fd73eaef960 Mon Sep 17 00:00:00 2001
From: vanous <petr@linuks.cz>
Date: Sat, 2 Apr 2022 16:49:09 +0200
Subject: [PATCH 033/110] Allow string resources for build variants to be
 customized via gradle

---
 app/build.gradle                           | 22 +++++++++++++-
 app/src/banglejs/res/values/strings.xml    |  8 -----
 app/src/main/AndroidManifest.xml           |  3 +-
 app/src/main/res/layout/activity_about.xml |  2 +-
 app/src/main/res/values/strings.xml        | 35 ++++++++++++++++++----
 app/src/nightly/res/values/strings.xml     |  4 ---
 app/src/nopebble/res/values/strings.xml    |  4 ---
 7 files changed, 54 insertions(+), 24 deletions(-)
 delete mode 100644 app/src/banglejs/res/values/strings.xml
 delete mode 100644 app/src/nightly/res/values/strings.xml
 delete mode 100644 app/src/nopebble/res/values/strings.xml

diff --git a/app/build.gradle b/app/build.gradle
index b7264498e..eb6da978e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -62,6 +62,11 @@ android {
         buildConfigField "String", "GIT_HASH_SHORT", "\"${getGitHashShort()}\""
         buildConfigField "boolean", "INTERNET_ACCESS", "false"
         resValue "string", "pebble_content_provider", "com.getpebble.android.provider"
+        resValue "string", "app_name", "@string/application_name_generic"
+        resValue "string", "title_activity_controlcenter", "@string/title_activity_controlcenter_generic"
+        resValue "string", "about_activity_title", "@string/about_activity_title_generic"
+        resValue "string", "about_description", "@string/about_description_generic"
+        resValue "string", "gadgetbridge_running", "@string/gadgetbridge_running_generic"
     }
     signingConfigs {
         nightly {
@@ -91,6 +96,11 @@ android {
             }
             proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
             resValue "string", "pebble_content_provider", "com.getpebble.android.provider"
+            resValue "string", "app_name", "@string/application_name_main_nightly"
+            resValue "string", "title_activity_controlcenter", "@string/title_activity_controlcenter_main_nightly"
+            resValue "string", "about_activity_title", "@string/about_activity_title_main_nightly"
+            resValue "string", "about_description", "@string/about_description_main_nightly"
+            resValue "string", "gadgetbridge_running", "@string/gadgetbridge_running_main_nightly"
             debuggable true
         }
         nopebble {
@@ -104,6 +114,11 @@ android {
             }
             proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
             resValue "string", "pebble_content_provider", "com.getpebble.android.nopebble.provider"
+            resValue "string", "app_name", "@string/application_name_main_nopebble"
+            resValue "string", "title_activity_controlcenter", "@string/title_activity_controlcenter_main_nopebble"
+            resValue "string", "about_activity_title", "@string/about_activity_title_main_nopebble"
+            resValue "string", "about_description", "@string/about_description_main_nopebble"
+            resValue "string", "gadgetbridge_running", "@string/gadgetbridge_running_main_nopebble"
             debuggable true
         }
 
@@ -139,7 +154,12 @@ android {
             versionNameSuffix "-banglejs"
             buildConfigField "boolean", "INTERNET_ACCESS", "true"
             // Disable pebble provider to allow Bangle.js Gadgetbridge to coexist with Gadgetbridge
-            resValue "string", "pebble_content_provider", "com.getpebble.android.nopebble.provider"
+            resValue "string", "pebble_content_provider", "com.getpebble.android.nopebble.bangle.provider"
+            resValue "string", "app_name", "@string/application_name_banglejs_main"
+            resValue "string", "title_activity_controlcenter", "@string/title_activity_controlcenter_banglejs_main"
+            resValue "string", "about_activity_title", "@string/about_activity_title_banglejs_main"
+            resValue "string", "about_description", "@string/about_description_banglejs_main"
+            resValue "string", "gadgetbridge_running", "@string/gadgetbridge_running_banglejs_main"
         }
     }
 
diff --git a/app/src/banglejs/res/values/strings.xml b/app/src/banglejs/res/values/strings.xml
deleted file mode 100644
index e965e9764..000000000
--- a/app/src/banglejs/res/values/strings.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
-    <string name="app_name">Bangle.js Gadgetbridge</string>
-    <string name="title_activity_controlcenter">Bangle.js Gadgetbridge</string>
-    <string name="about_activity_title">About Bangle.js Gadgetbridge</string>
-    <string name="about_description">Android companion app for Bangle.js built on top of the Gadgetbridge project, with added Internet Access.</string>
-    <string name="gadgetbridge_running">Bangle.js running</string>
-</resources>
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index edf7b965e..a2078b549 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -69,7 +69,8 @@
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:requestLegacyExternalStorage="true"
-        android:theme="@style/GadgetbridgeTheme">
+        android:theme="@style/GadgetbridgeTheme"
+        tools:replace="android:label">
         <activity
             android:name=".activities.ControlCenterv2"
             android:label="@string/title_activity_controlcenter"
diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml
index a0817758e..769ce31ee 100644
--- a/app/src/main/res/layout/activity_about.xml
+++ b/app/src/main/res/layout/activity_about.xml
@@ -44,7 +44,7 @@
                 android:paddingRight="@dimen/about_margin">
 
                 <TextView
-                    android:id="@+id/about_desc"
+                    android:id="@+id/about_description"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:text="@string/about_description" />
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 8d65c4df6..b4c78e916 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,7 +1,35 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
-    <string name="app_name">Gadgetbridge</string>
-    <string name="title_activity_controlcenter">Gadgetbridge</string>
+    <string name="application_name_generic">Gadgetbridge</string>
+    <string name="title_activity_controlcenter_generic">Gadgetbridge</string>
+    <string name="about_activity_title_generic">About Gadgetbridge</string>
+    <string name="about_description_generic">Cloudless copylefted libre replacement for closed source Android gadget apps from vendors.</string>
+    <string name="gadgetbridge_running_generic">Gadgetbridge running</string>
+
+    <string name="application_name_banglejs_main">Bangle.js Gadgetbridge</string>
+    <string name="title_activity_controlcenter_banglejs_main">Bangle.js Gadgetbridge</string>
+    <string name="about_activity_title_banglejs_main">About Bangle.js Gadgetbridge</string>
+    <string name="about_description_banglejs_main">Android companion app for Bangle.js built on top of the Gadgetbridge project, with added Internet Access.</string>
+    <string name="gadgetbridge_running_banglejs_main">Bangle.js running</string>
+
+    <string name="application_name_banglejs_nopebble">Bangle.js Gadgetbridge</string>
+    <string name="title_activity_controlcenter_banglejs_nopebble">Bangle.js Gadgetbridge</string>
+    <string name="about_activity_title_banglejs_nopebble">About Bangle.js Gadgetbridge</string>
+    <string name="about_description_banglejs_nopebble">Android companion app for Bangle.js built on top of the Gadgetbridge project, with added Internet Access.</string>
+    <string name="gadgetbridge_running_banglejs_nopebble">Bangle.js running</string>
+
+    <string name="application_name_main_nightly">Gadgetbridge (Nightly)</string>
+    <string name="title_activity_controlcenter_main_nightly">Gadgetbridge Nightly</string>
+    <string name="about_activity_title_main_nightly">About Gadgetbridge Nightly</string>
+    <string name="about_description_main_nightly">Cloudless copylefted libre replacement for closed source Android gadget apps from vendors. Nightly releases of Gadgetbridge. It cannot be installed if you already have either the Gadgetbridge or the Pebble app installed, due to a conflict in the Pebble provider.</string>
+    <string name="gadgetbridge_running_main_nightly">Nightly GB running</string>
+
+    <string name="application_name_main_nopebble">Gadgetbridge (Nightly, No Pebble provider)</string>
+    <string name="title_activity_controlcenter_main_nopebble">Gadgetbridge Nightly No Pebble </string>
+    <string name="about_activity_title_main_nopebble">About Gadgetbridge Nightly No Pebble</string>
+    <string name="about_description_main_nopebble">Cloudless copylefted libre replacement for closed source Android gadget apps from vendors. Nightly releases of Gadgetbridge. This version has the Pebble provider renamed to prevent conflicts, so some Pebble related integrations will not work, but it can be installed alongside existing Gadgetbridge installation.</string>
+    <string name="gadgetbridge_running_main_nopebble">Nightly NoPebble GB running</string>
+
     <string name="action_settings">Settings</string>
     <string name="action_debug">Debug</string>
     <string name="action_quit">Quit</string>
@@ -368,7 +396,6 @@
     <string name="tap_connected_device_for_vibration">Tap connected device for vibration</string>
     <string name="tap_a_device_to_connect">Tap a device to connect</string>
     <string name="cannot_connect_bt_address_invalid_">Cannot connect. Bluetooth address invalid?</string>
-    <string name="gadgetbridge_running">Gadgetbridge running</string>
     <string name="installing_binary_d_d">Installing binary %1$d/%2$d</string>
     <string name="installation_failed_">Installation failed</string>
     <string name="installation_successful">Installed</string>
@@ -1096,11 +1123,9 @@
     <string name="about_title">About</string>
     <string name="about_version">Version %s</string>
     <string name="about_hash">Commit %s</string>
-    <string name="about_activity_title">About Gadgetbridge</string>
     <string name="gpx_receiver_activity_title">GPX Receiver Gadgetbridge</string>
     <string name="gpx_receiver_files_received">GPX file(s) received:</string>
     <string name="gpx_receiver_overwrite_some_files">Some file(s) already exist. Overwrite?</string>
-    <string name="about_description">Cloudless copylefted libre replacement for closed source Android gadget apps from vendors.</string>
     <string name="about_core_team_title">Core Team (in order of first code contribution)</string>
     <string name="about_contributors">Contributors</string>
     <string name="about_core_team_members" translatable="false">Andreas Shimokawa\nCarsten Pfeiffer\nDaniele Gobbetti</string>
diff --git a/app/src/nightly/res/values/strings.xml b/app/src/nightly/res/values/strings.xml
deleted file mode 100644
index c4e5885c9..000000000
--- a/app/src/nightly/res/values/strings.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
-    <string name="app_name">Gadgetbridge (Nightly)</string>
-</resources>
diff --git a/app/src/nopebble/res/values/strings.xml b/app/src/nopebble/res/values/strings.xml
deleted file mode 100644
index 090f10a24..000000000
--- a/app/src/nopebble/res/values/strings.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
-    <string name="app_name">Gadgetbridge (Nightly, No Pebble provider)</string>
-</resources>

From fea2d98bd172bef5d47c38ded89cd23234caed00 Mon Sep 17 00:00:00 2001
From: Gordon Williams <gw@pur3.co.uk>
Date: Tue, 26 Apr 2022 15:29:05 +0100
Subject: [PATCH 034/110] Update strings for app_name/etc to '_generic' values
 to allow differently named apps -
 https://codeberg.org/Freeyourgadget/Gadgetbridge/issues/2627

---
 app/src/main/res/values-bg/strings.xml     |  6 +++---
 app/src/main/res/values-ca/strings.xml     | 10 +++++-----
 app/src/main/res/values-cs/strings.xml     | 10 +++++-----
 app/src/main/res/values-de/strings.xml     | 10 +++++-----
 app/src/main/res/values-el/strings.xml     | 10 +++++-----
 app/src/main/res/values-en-rGB/strings.xml | 10 +++++-----
 app/src/main/res/values-es/strings.xml     | 10 +++++-----
 app/src/main/res/values-et/strings.xml     | 10 +++++-----
 app/src/main/res/values-fa/strings.xml     |  4 ++--
 app/src/main/res/values-fi/strings.xml     |  6 +++---
 app/src/main/res/values-fr-rCA/strings.xml |  6 +++---
 app/src/main/res/values-fr/strings.xml     | 10 +++++-----
 app/src/main/res/values-gl/strings.xml     |  6 +++---
 app/src/main/res/values-he/strings.xml     | 10 +++++-----
 app/src/main/res/values-hr/strings.xml     | 10 +++++-----
 app/src/main/res/values-hu/strings.xml     |  6 +++---
 app/src/main/res/values-id/strings.xml     |  6 +++---
 app/src/main/res/values-it/strings.xml     | 10 +++++-----
 app/src/main/res/values-ja/strings.xml     |  8 ++++----
 app/src/main/res/values-ka/strings.xml     |  4 ++--
 app/src/main/res/values-ko/strings.xml     |  6 +++---
 app/src/main/res/values-lt/strings.xml     |  6 +++---
 app/src/main/res/values-ml/strings.xml     |  4 ++--
 app/src/main/res/values-my/strings.xml     |  4 ++--
 app/src/main/res/values-nb-rNO/strings.xml | 10 +++++-----
 app/src/main/res/values-nl/strings.xml     | 10 +++++-----
 app/src/main/res/values-pl/strings.xml     | 10 +++++-----
 app/src/main/res/values-pt-rBR/strings.xml | 10 +++++-----
 app/src/main/res/values-pt/strings.xml     | 10 +++++-----
 app/src/main/res/values-ro/strings.xml     |  4 ++--
 app/src/main/res/values-ru/strings.xml     | 10 +++++-----
 app/src/main/res/values-sk/strings.xml     |  6 +++---
 app/src/main/res/values-sv/strings.xml     |  4 ++--
 app/src/main/res/values-tr/strings.xml     | 10 +++++-----
 app/src/main/res/values-uk/strings.xml     | 10 +++++-----
 app/src/main/res/values-vi/strings.xml     |  6 +++---
 app/src/main/res/values-zh-rCN/strings.xml | 10 +++++-----
 app/src/main/res/values-zh-rTW/strings.xml | 10 +++++-----
 38 files changed, 151 insertions(+), 151 deletions(-)

diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml
index e74f26fca..2976c5371 100644
--- a/app/src/main/res/values-bg/strings.xml
+++ b/app/src/main/res/values-bg/strings.xml
@@ -17,8 +17,8 @@
     <string name="pref_title_charts_range">Обхват на Графиката</string>
     <string name="pref_charts_range_on">Обхвата е Месец</string>
     <string name="pref_charts_range_off">Обхвата е Седмица</string>
-    <string name="app_name">Gadgetbridge</string>
-    <string name="title_activity_controlcenter">Gadgetbridge</string>
+    <string name="application_name_generic">Gadgetbridge</string>
+    <string name="title_activity_controlcenter_generic">Gadgetbridge</string>
     <string name="action_settings">Настройки</string>
     <string name="action_debug">Дебъгване</string>
     <string name="action_quit">Изход</string>
@@ -228,7 +228,7 @@
     <string name="tap_connected_device_for_vibration">Докоснете свързаното устройство за вибрации</string>
     <string name="tap_a_device_to_connect">Докоснете устройство за свързване</string>
     <string name="cannot_connect_bt_address_invalid_">Не може да се установи връзка. Грешен Bluetooth адрес\?</string>
-    <string name="gadgetbridge_running">Gadgetbridge работи</string>
+    <string name="gadgetbridge_running_generic">Gadgetbridge работи</string>
     <string name="installing_binary_d_d">Инсталиране на двоичен файл %1$d/%2$d</string>
     <string name="installation_failed_">Инсталацията пропадна</string>
     <string name="installation_successful">Инсталирано</string>
diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
index 6a1b8e896..2b4807b2c 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">Gadgetbridge</string>
-    <string name="title_activity_controlcenter">Gadgetbridge</string>
+    <string name="application_name_generic">Gadgetbridge</string>
+    <string name="title_activity_controlcenter_generic">Gadgetbridge</string>
     <string name="action_settings">Configuració</string>
     <string name="action_debug">Depuració</string>
     <string name="action_quit">Surt</string>
@@ -174,7 +174,7 @@
     <string name="tap_connected_device_for_vibration">Toca l\'aparell per fer-lo vibrar</string>
     <string name="tap_a_device_to_connect">Toca un aparell per connectar-hi</string>
     <string name="cannot_connect_bt_address_invalid_">No es pot connectar. Potser la direcció Bluetooth és incorrecta\?</string>
-    <string name="gadgetbridge_running">El Gadgetbridge està funcionant</string>
+    <string name="gadgetbridge_running_generic">El Gadgetbridge està funcionant</string>
     <string name="installing_binary_d_d">S\'està instal·lant el binari %1$d/%2$d</string>
     <string name="installation_failed_">La instal·lació ha fallat</string>
     <string name="installation_successful">Instal·lat</string>
@@ -913,7 +913,7 @@
     <string name="about_additional_device_support">Support d\'aparell addicional</string>
     <string name="about_contributors">Col·laboradors</string>
     <string name="about_core_team_title">Equip principal (en ordre de primera contribució de codi)</string>
-    <string name="about_description">Substitut lliure, copyleft i sense núvol per a les aplicacions Android de codi tancat dels fabricants dels aparells.</string>
+    <string name="about_description_generic">Substitut lliure, copyleft i sense núvol per a les aplicacions Android de codi tancat dels fabricants dels aparells.</string>
     <string name="menuitem_dnd">No molestis</string>
     <string name="menuitem_spo2">SpO2</string>
     <string name="menuitem_pai">PAI</string>
@@ -1000,7 +1000,7 @@
     <string name="device_requires_key">ES REQUEREIX CLAU</string>
     <string name="require_location_provider">La ubicació ha d\'estar activada</string>
     <string name="about_links">Enllaços</string>
-    <string name="about_activity_title">Quant a Gadgetbridge</string>
+    <string name="about_activity_title_generic">Quant a Gadgetbridge</string>
     <string name="about_version">Versió %s</string>
     <string name="about_title">Quant a</string>
     <string name="hr_widget_last_notification">Última notificació</string>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 71b747c15..ef0c4a36a 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">Gadgetbridge</string>
-    <string name="title_activity_controlcenter">Gadgetbridge</string>
+    <string name="application_name_generic">Gadgetbridge</string>
+    <string name="title_activity_controlcenter_generic">Gadgetbridge</string>
     <string name="action_settings">Nastavení</string>
     <string name="action_debug">Ladění</string>
     <string name="action_quit">Ukončit</string>
@@ -154,7 +154,7 @@
     <string name="tap_connected_device_for_vibration">Dotkněte se zařízení pro vibrace</string>
     <string name="tap_a_device_to_connect">Dotkněte se zařízení pro připojení</string>
     <string name="cannot_connect_bt_address_invalid_">Nelze připojit. Je BT adresa v pořádku?</string>
-    <string name="gadgetbridge_running">Gadgetbridge běží</string>
+    <string name="gadgetbridge_running_generic">Gadgetbridge běží</string>
     <string name="installing_binary_d_d">Instaluji soubor %1$d/%2$d</string>
     <string name="installation_failed_">Instalace selhala</string>
     <string name="installation_successful">Instalace úspěšná</string>
@@ -915,8 +915,8 @@
     <string name="about_additional_device_support">Podpora dalších zařízení</string>
     <string name="about_contributors">Přispěvatelé</string>
     <string name="about_core_team_title">Centrální tým (v pořadí příspěvku prvního kódu)</string>
-    <string name="about_description">Svobodná a lokální náhrada za uzavřenou aplikaci vašich hodinek/náramku.</string>
-    <string name="about_activity_title">O aplikaci Gadgetbridge</string>
+    <string name="about_description_generic">Svobodná a lokální náhrada za uzavřenou aplikaci vašich hodinek/náramku.</string>
+    <string name="about_activity_title_generic">O aplikaci Gadgetbridge</string>
     <string name="about_title">O aplikaci</string>
     <string name="menuitem_worldclock">Světový Čas</string>
     <string name="pref_title_weather_summary">Použito s poskytovatelem počasí LineageOS. Ostatní verze Androidu vyžadují \"Weather Notification\" app. Více informací naleznete na Gadgetbridge wiki.</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index c8acf6e93..e0dc57876 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">Gadgetbridge</string>
-    <string name="title_activity_controlcenter">Gadgetbridge</string>
+    <string name="application_name_generic">Gadgetbridge</string>
+    <string name="title_activity_controlcenter_generic">Gadgetbridge</string>
     <string name="action_settings">Einstellungen</string>
     <string name="action_debug">Debug</string>
     <string name="action_quit">Beenden</string>
@@ -161,7 +161,7 @@
     <string name="tap_connected_device_for_vibration">Tippe auf das verbundene Gerät, um es vibrieren zu lassen</string>
     <string name="tap_a_device_to_connect">Tippe auf ein Gerät, um eine Verbindung herzustellen</string>
     <string name="cannot_connect_bt_address_invalid_">Keine Verbindung möglich. Bluetooth-Adresse ungültig\?</string>
-    <string name="gadgetbridge_running">Gadgetbridge läuft</string>
+    <string name="gadgetbridge_running_generic">Gadgetbridge läuft</string>
     <string name="installing_binary_d_d">Binärdatei %1$d/%2$d wird installiert</string>
     <string name="installation_failed_">Installation fehlgeschlagen</string>
     <string name="installation_successful">Installiert</string>
@@ -923,8 +923,8 @@
     <string name="about_additional_device_support">Unterstützung zusätzlicher Geräte</string>
     <string name="about_contributors">Beitragende</string>
     <string name="about_core_team_title">Kernteam (Reihenfolge der ersten Mitwirkung am Code)</string>
-    <string name="about_description">Cloudloser freier Ersatz für proprietäre Android-Gadget-Apps der Hersteller.</string>
-    <string name="about_activity_title">Über Gadgetbridge</string>
+    <string name="about_description_generic">Cloudloser freier Ersatz für proprietäre Android-Gadget-Apps der Hersteller.</string>
+    <string name="about_activity_title_generic">Über Gadgetbridge</string>
     <string name="about_title">Über</string>
     <string name="pref_title_weather_summary">Wird für den LineageOS Wetterdienst genutzt, andere Android-Versionen müssen eine Anwendung wie Weather notification nutzen. Mehr Informationen gibt es im Gadgetbride-Wiki.</string>
     <string name="menuitem_worldclock">Weltzeituhr</string>
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index cd82ac718..e4c50f513 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">Gadgetbridge</string>
-    <string name="title_activity_controlcenter">Gadgetbridge</string>
+    <string name="application_name_generic">Gadgetbridge</string>
+    <string name="title_activity_controlcenter_generic">Gadgetbridge</string>
     <string name="action_settings">Ρυθμίσεις</string>
     <string name="action_debug">Αποσφαλμάτωση</string>
     <string name="action_quit">Έξοδος</string>
@@ -174,7 +174,7 @@
     <string name="tap_connected_device_for_vibration">Πατήστε τη συνδεδεμένη συσκευή για δόνηση</string>
     <string name="tap_a_device_to_connect">Πατήστε μία συσκευή για να συνδεθεί</string>
     <string name="cannot_connect_bt_address_invalid_">Δεν μπορεί να γίνει σύνδεση. Μήπως δεν είναι έγκυρη η διεύθυνση Bluetooth;</string>
-    <string name="gadgetbridge_running">Το Gadgetbridge εκτελείται</string>
+    <string name="gadgetbridge_running_generic">Το Gadgetbridge εκτελείται</string>
     <string name="installing_binary_d_d">Γίνεται εγκατάσταση των βιβλιοθηκών %1$d/%2$d</string>
     <string name="installation_failed_">Η εγκατάσταση απέτυχε</string>
     <string name="installation_successful">Εγκατεστημένο</string>
@@ -901,8 +901,8 @@
     <string name="about_additional_device_support">Πρόσθετη υποστήριξη συσκευών</string>
     <string name="about_contributors">Συντελεστές</string>
     <string name="about_core_team_title">Βασική ομάδα (κατά σειρά μεγαλύτερης συνεισφοράς κώδικα)</string>
-    <string name="about_description">Μια δωρεάν, ελεύθερου κώδικα και χωρίς πρόσβαση στο διαδίκτυο εφαρμογή Android για να αντικαταστήσει τις υπάρχουσες εφαρμογές κλειστού κώδικα των κατασκευαστών του smartwatch σας.</string>
-    <string name="about_activity_title">Σχετικά με το Gadgetbridge</string>
+    <string name="about_description_generic">Μια δωρεάν, ελεύθερου κώδικα και χωρίς πρόσβαση στο διαδίκτυο εφαρμογή Android για να αντικαταστήσει τις υπάρχουσες εφαρμογές κλειστού κώδικα των κατασκευαστών του smartwatch σας.</string>
+    <string name="about_activity_title_generic">Σχετικά με το Gadgetbridge</string>
     <string name="about_title">Σχετικά</string>
     <string name="menuitem_worldclock">Παγκόσμιο Ρολόι</string>
     <string name="devicetype_amazfit_trex">Amazfit T-Rex</string>
diff --git a/app/src/main/res/values-en-rGB/strings.xml b/app/src/main/res/values-en-rGB/strings.xml
index 401143723..953d8f9e2 100644
--- a/app/src/main/res/values-en-rGB/strings.xml
+++ b/app/src/main/res/values-en-rGB/strings.xml
@@ -684,7 +684,7 @@
     <string name="installation_successful">Installed</string>
     <string name="installation_failed_">Installation failed</string>
     <string name="installing_binary_d_d">Installing binary %1$d/%2$d</string>
-    <string name="gadgetbridge_running">Gadgetbridge running</string>
+    <string name="gadgetbridge_running_generic">Gadgetbridge running</string>
     <string name="cannot_connect_bt_address_invalid_">Cannot connect. Bluetooth address invalid\?</string>
     <string name="tap_a_device_to_connect">Tap a device to connect</string>
     <string name="tap_connected_device_for_vibration">Tap connected device for vibration</string>
@@ -853,8 +853,8 @@
     <string name="action_quit">Quit</string>
     <string name="action_debug">Debug</string>
     <string name="action_settings">Settings</string>
-    <string name="title_activity_controlcenter">Gadgetbridge</string>
-    <string name="app_name">Gadgetbridge</string>
+    <string name="title_activity_controlcenter_generic">Gadgetbridge</string>
+    <string name="application_name_generic">Gadgetbridge</string>
     <string name="pref_qhybrid_save_raw_activity_files">Save raw activity files</string>
     <string name="menuitem_workout">Workout</string>
     <string name="menuitem_eventreminder">Event Reminder</string>
@@ -1124,7 +1124,7 @@
     <string name="activity_summaries_statistics">Statistics</string>
     <string name="pref_title_upper_button_function_short">Upper Button short</string>
     <string name="pref_title_upper_button_function_double">Upper Button double</string>
-    <string name="about_activity_title">About Gadgetbridge</string>
+    <string name="about_activity_title_generic">About Gadgetbridge</string>
     <string name="gpx_receiver_files_received">GPX file(s) received:</string>
     <string name="gpx_receiver_overwrite_some_files">Some file(s) already exist. Overwrite\?</string>
     <string name="about_additional_contributions">Many thanks to all unlisted contributors for contributing code, translations, support, ideas, motivation, bug reports, money… ✊</string>
@@ -1276,7 +1276,7 @@
     <string name="menuitem_temperature">Temperature</string>
     <string name="about_version">Version %s</string>
     <string name="about_title">About</string>
-    <string name="about_description">Cloudless copylefted libre replacement for closed source Android gadget apps from vendors.</string>
+    <string name="about_description_generic">Cloudless copylefted libre replacement for closed source Android gadget apps from vendors.</string>
     <string name="sports_activity_quick_filter_30days">30 days</string>
     <string name="sports_activity_quick_filter_select">Time period</string>
     <string name="device_is_currently_bonded">Already bonded</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 1cb42b9ca..bf85b9cd1 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">Gadgetbridge</string>
-    <string name="title_activity_controlcenter">Gadgetbridge</string>
+    <string name="application_name_generic">Gadgetbridge</string>
+    <string name="title_activity_controlcenter_generic">Gadgetbridge</string>
     <string name="action_settings">Configuración</string>
     <string name="action_debug">Depuración</string>
     <string name="action_quit">Salir</string>
@@ -161,7 +161,7 @@
     <string name="tap_connected_device_for_vibration">Toque el dispositivo conectado para la vibración</string>
     <string name="tap_a_device_to_connect">Toca un dispositivo para conectarlo</string>
     <string name="cannot_connect_bt_address_invalid_">No se puede conectar. ¿Dirección BT incorrecta?</string>
-    <string name="gadgetbridge_running">Gadgetbridge funcionando</string>
+    <string name="gadgetbridge_running_generic">Gadgetbridge funcionando</string>
     <string name="installing_binary_d_d">Instalando binario %1$d/%2$d</string>
     <string name="installation_failed_">Instalación fallida</string>
     <string name="installation_successful">Instalado</string>
@@ -1093,8 +1093,8 @@
     <string name="about_additional_device_support">Soporte de dispositivos adicionales</string>
     <string name="about_contributors">Colaboradores</string>
     <string name="about_core_team_title">Equipo principal (por orden de primera contribución de código)</string>
-    <string name="about_description">Sustitución sin nube y con copyleft de las aplicaciones de código cerrado para Android de los proveedores.</string>
-    <string name="about_activity_title">Acerca de Gadgetbridge</string>
+    <string name="about_description_generic">Sustitución sin nube y con copyleft de las aplicaciones de código cerrado para Android de los proveedores.</string>
+    <string name="about_activity_title_generic">Acerca de Gadgetbridge</string>
     <string name="about_version">Versión %s</string>
     <string name="about_title">Acerca de</string>
     <string name="hr_widget_last_notification">Última notificación</string>
diff --git a/app/src/main/res/values-et/strings.xml b/app/src/main/res/values-et/strings.xml
index c1dcfc880..d271cdd78 100644
--- a/app/src/main/res/values-et/strings.xml
+++ b/app/src/main/res/values-et/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">Gadgetbridge</string>
-    <string name="title_activity_controlcenter">Gadgetbridge</string>
+    <string name="application_name_generic">Gadgetbridge</string>
+    <string name="title_activity_controlcenter_generic">Gadgetbridge</string>
     <string name="action_settings">Seaded</string>
     <string name="action_debug">Silumine</string>
     <string name="action_quit">Välju</string>
@@ -243,7 +243,7 @@
     <string name="tap_connected_device_for_vibration">Puuduta ühendatud seadet värina tekitamiseks</string>
     <string name="tap_a_device_to_connect">Puuduta seadet, et ühendada</string>
     <string name="cannot_connect_bt_address_invalid_">Ei saa ühendust. Vigane bluetooth aadress\?</string>
-    <string name="gadgetbridge_running">Gadgetbridge töötab</string>
+    <string name="gadgetbridge_running_generic">Gadgetbridge töötab</string>
     <string name="installing_binary_d_d">Binaarfaili %1$d/%2$d paigaldamine</string>
     <string name="installation_failed_">Paigaldamine nurjus</string>
     <string name="installation_successful">Paigaldatud</string>
@@ -746,8 +746,8 @@
     <string name="about_additional_device_support">Täiendavate seadmete tugi</string>
     <string name="about_contributors">Kaasaaitajad</string>
     <string name="about_core_team_title">Tuumiktiim (järjestatud esimese koodirea kuupäeva järgi)</string>
-    <string name="about_description">Tasuta ja pilvevaba asendus teie kantavate nutiseadmete tootjate rakendustele.</string>
-    <string name="about_activity_title">Gadgetbridge\'ist</string>
+    <string name="about_description_generic">Tasuta ja pilvevaba asendus teie kantavate nutiseadmete tootjate rakendustele.</string>
+    <string name="about_activity_title_generic">Gadgetbridge\'ist</string>
     <string name="about_title">Rakendusest</string>
     <string name="pref_title_lower_button_function">Alumine nupp</string>
     <string name="pref_title_middle_button_function">Keskmine nupp</string>
diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml
index 7b72ea164..da08dba02 100644
--- a/app/src/main/res/values-fa/strings.xml
+++ b/app/src/main/res/values-fa/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">گجت‌بریج</string>
-    <string name="title_activity_controlcenter">گجت‌بریج</string>
+    <string name="application_name_generic">گجت‌بریج</string>
+    <string name="title_activity_controlcenter_generic">گجت‌بریج</string>
     <string name="action_settings">تنظیمات</string>
     <string name="action_debug">اشکال‌زدایی</string>
     <string name="action_quit">خروج</string>
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index f2c7af838..820f5adff 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -3,8 +3,8 @@
     <string name="action_settings">Asetukset</string>
     <string name="controlcenter_fetch_activity_data">Synkronoi</string>
     <string name="controlcenter_find_device">Löydä kadonnut laite</string>
-    <string name="app_name">Gadgetbridge</string>
-    <string name="title_activity_controlcenter">Gadgetbridge</string>
+    <string name="application_name_generic">Gadgetbridge</string>
+    <string name="title_activity_controlcenter_generic">Gadgetbridge</string>
     <string name="action_quit">Lopeta</string>
     <string name="action_donate">Lahjoita</string>
     <string name="controlcenter_take_screenshot">Ota ruutukaappaus</string>
@@ -447,7 +447,7 @@
     <string name="live_activity_steps_history">Askeleiden historia</string>
     <string name="live_activity_total_steps">Kokonaisaskeleet</string>
     <string name="about_title">Tietoja</string>
-    <string name="about_activity_title">Tietoja Gadgetbridgestä</string>
+    <string name="about_activity_title_generic">Tietoja Gadgetbridgestä</string>
     <string name="activity_filter_date_from">Alkaen</string>
     <string name="activity_filter_date_to">Päättyen</string>
     <string name="pref_screen_notification_profile_missed_call">Vastaamatta jääneen puhelun ilmoitus</string>
diff --git a/app/src/main/res/values-fr-rCA/strings.xml b/app/src/main/res/values-fr-rCA/strings.xml
index b93cfdd6c..d588a524f 100644
--- a/app/src/main/res/values-fr-rCA/strings.xml
+++ b/app/src/main/res/values-fr-rCA/strings.xml
@@ -129,8 +129,8 @@
     <string name="calories">Calories</string>
     <string name="miband_prefs_vibration">Vibration</string>
     <string name="vibration_profile_long">Long</string>
-    <string name="title_activity_controlcenter">Gadgetbridge</string>
-    <string name="app_name">Gadgetbridge</string>
+    <string name="title_activity_controlcenter_generic">Gadgetbridge</string>
+    <string name="application_name_generic">Gadgetbridge</string>
     <plurals name="widget_alarm_target_hours">
         <item quantity="one">%d heure</item>
         <item quantity="other">%d heures</item>
@@ -697,7 +697,7 @@
     <string name="installation_successful">Installé</string>
     <string name="installation_failed_">Échec de l\'installation</string>
     <string name="installing_binary_d_d">Installation du binaire %1$d/%2$d</string>
-    <string name="gadgetbridge_running">Gadgetbridge est en fonctionnement</string>
+    <string name="gadgetbridge_running_generic">Gadgetbridge est en fonctionnement</string>
     <string name="tap_a_device_to_connect">Tapez sur le périphérique pour le connecter</string>
     <string name="tap_connected_device_for_vibration">Cliquez sur connecter pour envoyer une vibration</string>
     <string name="tap_connected_device_for_activity">Cliquez sur l\'appareil pour ouvrir le gestionnaire d’activité</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index cd2b07501..05adb2646 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">Gadgetbridge</string>
-    <string name="title_activity_controlcenter">Gadgetbridge</string>
+    <string name="application_name_generic">Gadgetbridge</string>
+    <string name="title_activity_controlcenter_generic">Gadgetbridge</string>
     <string name="action_settings">Paramètres</string>
     <string name="action_debug">Déboguer</string>
     <string name="action_quit">Quitter</string>
@@ -161,7 +161,7 @@
     <string name="tap_connected_device_for_vibration">Cliquez sur connecter pour envoyer une vibration</string>
     <string name="tap_a_device_to_connect">Tapez sur le périphérique pour le connecter</string>
     <string name="cannot_connect_bt_address_invalid_">Connexion impossible. L’adresse Bluetooth est-elle valide ?</string>
-    <string name="gadgetbridge_running">Gadgetbridge est en fonctionnement</string>
+    <string name="gadgetbridge_running_generic">Gadgetbridge est en fonctionnement</string>
     <string name="installing_binary_d_d">Installation du binaire %1$d/%2$d</string>
     <string name="installation_failed_">Échec de l\'installation</string>
     <string name="installation_successful">Installé</string>
@@ -1017,8 +1017,8 @@ Temps de sommeil préféré en heures</string>
     <string name="about_additional_device_support">Support d\'appareil supplémentaire</string>
     <string name="about_contributors">Contributeurs</string>
     <string name="about_core_team_title">Équipe principal (dans l\'ordre de la première contribution au code)</string>
-    <string name="about_description">Un remplaçant libre et sans cloud aux applications Android propriétaires des fabricants de vos bracelets.</string>
-    <string name="about_activity_title">A propos de Gadgetbridge</string>
+    <string name="about_description_generic">Un remplaçant libre et sans cloud aux applications Android propriétaires des fabricants de vos bracelets.</string>
+    <string name="about_activity_title_generic">A propos de Gadgetbridge</string>
     <string name="about_title">A propos</string>
     <string name="menuitem_worldclock">Horloge mondiale</string>
     <string name="menuitem_stress">Stress</string>
diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml
index 2947c1049..ae765d3aa 100644
--- a/app/src/main/res/values-gl/strings.xml
+++ b/app/src/main/res/values-gl/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">Gadgetbridge</string>
-    <string name="title_activity_controlcenter">Gadgetbridge</string>
+    <string name="application_name_generic">Gadgetbridge</string>
+    <string name="title_activity_controlcenter_generic">Gadgetbridge</string>
     <string name="action_settings">Axustes</string>
     <string name="action_debug">Depuración</string>
     <string name="action_quit">Saír</string>
@@ -143,7 +143,7 @@
     <string name="tap_connected_device_for_vibration">Toque nun dispositivo conectado para facelo Vibrar</string>
     <string name="tap_a_device_to_connect">Toque nun dispositivo para conectar</string>
     <string name="cannot_connect_bt_address_invalid_">Non foi posíbel conectar. Enderezo Bluetooth inválido?</string>
-    <string name="gadgetbridge_running">Gadgetbridge en execución</string>
+    <string name="gadgetbridge_running_generic">Gadgetbridge en execución</string>
     <string name="installing_binary_d_d">Instalando binario %1$d/%2$d</string>
     <string name="installation_failed_">Fallou a instalación</string>
     <string name="installation_successful">Instalado</string>
diff --git a/app/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml
index e3a3dc0e1..aef1dbfbb 100644
--- a/app/src/main/res/values-he/strings.xml
+++ b/app/src/main/res/values-he/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">Gadgetbridge</string>
-    <string name="title_activity_controlcenter">Gadgetbridge</string>
+    <string name="application_name_generic">Gadgetbridge</string>
+    <string name="title_activity_controlcenter_generic">Gadgetbridge</string>
     <string name="action_settings">הגדרות</string>
     <string name="action_debug">ניפוי שגיאות</string>
     <string name="action_quit">יציאה</string>
@@ -147,7 +147,7 @@
     <string name="tap_connected_device_for_vibration">נקישה על ההתקן המחובר לרטט</string>
     <string name="tap_a_device_to_connect">יש לגעת בהתקן כדי להתחבר</string>
     <string name="cannot_connect_bt_address_invalid_">לא ניתן להתחבר. כתובת ה־Bluetooth שגויה?</string>
-    <string name="gadgetbridge_running">Gadgetbridge פעיל</string>
+    <string name="gadgetbridge_running_generic">Gadgetbridge פעיל</string>
     <string name="installing_binary_d_d">התקנת הבינרי %1$d/%2$d</string>
     <string name="installation_failed_">ההתקנה נכשלה</string>
     <string name="installation_successful">ההתקנה הצליחה</string>
@@ -913,8 +913,8 @@
     <string name="about_additional_device_support">תמיכה במכשירים נוספים</string>
     <string name="about_contributors">תורמים</string>
     <string name="about_core_team_title">צוות הליבה (מסודרים לפי מועד תרומת הקוד הראשונה)</string>
-    <string name="about_description">חלופה חופשית ונטולת ענן ליישומוני ה־Android לחפיצים עם הקוד הסגור של היצרנים.</string>
-    <string name="about_activity_title">על אודות Gadgetbridge</string>
+    <string name="about_description_generic">חלופה חופשית ונטולת ענן ליישומוני ה־Android לחפיצים עם הקוד הסגור של היצרנים.</string>
+    <string name="about_activity_title_generic">על אודות Gadgetbridge</string>
     <string name="about_title">על אודות</string>
     <string name="pref_title_weather_summary">משמש לספק מזג האוויר של LineageOS, גרסאות אחרות של Android צריכות להשתמש ביישומונים כמו „התראות מזג אוויר”. אפשר למצוא מידע נוסף בוויקי של Gadgetbridge.</string>
     <string name="menuitem_worldclock">שעון עולמי</string>
diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
index 56443598a..4da3fec84 100644
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">Gadgetbridge</string>
+    <string name="application_name_generic">Gadgetbridge</string>
     <string name="male">Muško</string>
     <string name="female">Žensko</string>
     <string name="other">Ostalo</string>
@@ -28,7 +28,7 @@
     <string name="controlcenter_set_alias">Postavi pseudonim</string>
     <string name="action_quit">Izlaz</string>
     <string name="action_debug">Debug</string>
-    <string name="title_activity_controlcenter">Gadgetbridge</string>
+    <string name="title_activity_controlcenter_generic">Gadgetbridge</string>
     <string name="dbmanagementactivity_delete_old_activitydb_confirmation">Stvarno izbrisati staru bazu podataka aktivnosti\? Podaci aktivnosti koji nisu uvezeni će se izgubiti.</string>
     <string name="dbmanagementactivity_delete_old_activity_db">Izbrisati staru bazu podataka aktivnosti\?</string>
     <string name="dbmanagementactivity_database_successfully_deleted">Podaci izbrisani.</string>
@@ -1268,8 +1268,8 @@
     <string name="add_widget">Dodaj widget</string>
     <string name="appwidget_setting_alarm">Postavljanje alarma za %1$02d:%2$02d</string>
     <string name="about_version">Verzija %s</string>
-    <string name="about_activity_title">O Gadgetbridge</string>
-    <string name="about_description">Zamjena za libre bez oblaka bez kopiranja za zatvorene aplikacije za Android gadgete od dobavljača.</string>
+    <string name="about_activity_title_generic">O Gadgetbridge</string>
+    <string name="about_description_generic">Zamjena za libre bez oblaka bez kopiranja za zatvorene aplikacije za Android gadgete od dobavljača.</string>
     <string name="about_core_team_title">Osnovni tim (po redoslijedu doprinosa prvog koda)</string>
     <string name="qhybrid_title_watchface">Konfiguracija izgleda sata</string>
     <string name="button_watchface_select_image">Promjena pozadinske slike</string>
@@ -1358,7 +1358,7 @@
 \n
 \n
 \n Ovaj firmware je za HW reviziju: %s</string>
-    <string name="gadgetbridge_running">Gadgetbridge je pokrenut</string>
+    <string name="gadgetbridge_running_generic">Gadgetbridge je pokrenut</string>
     <string name="tap_a_device_to_connect">Dodirnite uređaj za povezivanje</string>
     <string name="test">Test</string>
     <string name="not_connected">Nije povezano</string>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index d9cf5a1f6..36b660a49 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">Gadgetbridge</string>
-    <string name="title_activity_controlcenter">Gadgetbridge </string>
+    <string name="application_name_generic">Gadgetbridge</string>
+    <string name="title_activity_controlcenter_generic">Gadgetbridge </string>
     <string name="action_settings">Beállítások</string>
     <string name="action_debug">Hibakeresés</string>
     <string name="action_quit">Kilépés</string>
@@ -157,7 +157,7 @@
     <string name="tap_connected_device_for_vibration">Koppints az eszközre a rezgetéshez.</string>
     <string name="tap_a_device_to_connect">Koppints az eszközre a csatlakozáshoz</string>
     <string name="cannot_connect_bt_address_invalid_">Nem lehet csatlakozni. Rossz Bluetooth cím?</string>
-    <string name="gadgetbridge_running">A Gadgetbridge fut</string>
+    <string name="gadgetbridge_running_generic">A Gadgetbridge fut</string>
     <string name="installing_binary_d_d">%1$d/%2$d bináris telepítése</string>
     <string name="installation_failed_">Sikertelen telepítés</string>
     <string name="installation_successful">Telepítve</string>
diff --git a/app/src/main/res/values-id/strings.xml b/app/src/main/res/values-id/strings.xml
index dd7f06e40..2f9a12290 100644
--- a/app/src/main/res/values-id/strings.xml
+++ b/app/src/main/res/values-id/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">Gadgetbridge</string>
-    <string name="title_activity_controlcenter">Gadgetbridge</string>
+    <string name="application_name_generic">Gadgetbridge</string>
+    <string name="title_activity_controlcenter_generic">Gadgetbridge</string>
     <string name="action_settings">Pengaturan</string>
     <string name="action_quit">Keluar</string>
     <string name="action_donate">Donasi</string>
@@ -175,7 +175,7 @@
     <string name="hr_widget_calories">Kalori</string>
     <string name="gpx_receiver_activity_title">Penerima GPX Gadgetbridge</string>
     <string name="require_location_provider">Lokasi harus diaktifkan</string>
-    <string name="about_activity_title">Tentang Gadgetbridge</string>
+    <string name="about_activity_title_generic">Tentang Gadgetbridge</string>
     <string name="about_version">Versi %s</string>
     <string name="about_title">Tentang</string>
     <string name="about_links">Tautan</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index f6ab2f1c9..d7877fe9e 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">Gadgetbridge</string>
-    <string name="title_activity_controlcenter">Gadgetbridge</string>
+    <string name="application_name_generic">Gadgetbridge</string>
+    <string name="title_activity_controlcenter_generic">Gadgetbridge</string>
     <string name="action_settings">Impostazioni</string>
     <string name="action_debug">Debug</string>
     <string name="action_quit">Esci</string>
@@ -158,7 +158,7 @@
     <string name="tap_connected_device_for_vibration">Tocca il dispositivo connesso per la vibrazione</string>
     <string name="tap_a_device_to_connect">tocca il dispositivo a cui connettersi</string>
     <string name="cannot_connect_bt_address_invalid_">Impossibile connettersi. Indirizzo Bluetooth non valido?</string>
-    <string name="gadgetbridge_running">Gadgetbridge in esecuzione</string>
+    <string name="gadgetbridge_running_generic">Gadgetbridge in esecuzione</string>
     <string name="installing_binary_d_d">Installazione del binario %1$d/%2$d</string>
     <string name="installation_failed_">Installazione fallita</string>
     <string name="installation_successful">Installazione conclusa con successo</string>
@@ -884,8 +884,8 @@
     <string name="about_additional_device_support">Supporto a dispositivi aggiuntivi</string>
     <string name="about_contributors">Contributori</string>
     <string name="about_core_team_title">Team principale (ordinati in base al primo contributo di codice)</string>
-    <string name="about_description">Un\'alternativa gratuita, libera e senza cloud alle applicazioni Android a sorgente chiusa del tuo dispositivo.</string>
-    <string name="about_activity_title">Su Gadgetbridge</string>
+    <string name="about_description_generic">Un\'alternativa gratuita, libera e senza cloud alle applicazioni Android a sorgente chiusa del tuo dispositivo.</string>
+    <string name="about_activity_title_generic">Su Gadgetbridge</string>
     <string name="about_title">Informazioni</string>
     <string name="hr_widget_last_notification">Ultima notifica</string>
     <string name="pref_qhybrid_save_raw_activity_files">Salva i dati raw (grezzi) delle attività</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 90f5245de..2e8deca6e 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">ガジェットブリッジ</string>
-    <string name="title_activity_controlcenter">ガジェットブリッジ</string>
+    <string name="application_name_generic">ガジェットブリッジ</string>
+    <string name="title_activity_controlcenter_generic">ガジェットブリッジ</string>
     <string name="action_settings">設定</string>
     <string name="action_debug">デバッグ</string>
     <string name="action_quit">終了</string>
@@ -161,7 +161,7 @@
     <string name="tap_connected_device_for_vibration">バイブレーションの接続されたデバイスをタップ</string>
     <string name="tap_a_device_to_connect">接続するデバイスをタップ</string>
     <string name="cannot_connect_bt_address_invalid_">接続できません。 Bluetoothアドレスが無効ですか\?</string>
-    <string name="gadgetbridge_running">ガジェットブリッジは実行中</string>
+    <string name="gadgetbridge_running_generic">ガジェットブリッジは実行中</string>
     <string name="installing_binary_d_d">バイナリーのインストール中 %1$d/%2$d</string>
     <string name="installation_failed_">インストールに失敗しました</string>
     <string name="installation_successful">インストールに成功しました</string>
@@ -708,7 +708,7 @@
     <string name="distanceMeters">距離</string>
     <string name="device_requires_key">キーが必要です</string>
     <string name="about_contributors">貢献者</string>
-    <string name="about_activity_title">Gadgetbridgeについて</string>
+    <string name="about_activity_title_generic">Gadgetbridgeについて</string>
     <string name="about_title">について</string>
     <string name="hr_widget_last_notification">最終通知</string>
     <string name="hr_appname_commute">通勤</string>
diff --git a/app/src/main/res/values-ka/strings.xml b/app/src/main/res/values-ka/strings.xml
index b55601dd1..43984c98e 100644
--- a/app/src/main/res/values-ka/strings.xml
+++ b/app/src/main/res/values-ka/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">Gadgetbridge</string>
-    <string name="title_activity_controlcenter">Gadgetbridge</string>
+    <string name="application_name_generic">Gadgetbridge</string>
+    <string name="title_activity_controlcenter_generic">Gadgetbridge</string>
     <string name="action_settings">პარამეტრები</string>
     <string name="action_quit">შეწყვეტა</string>
     <string name="action_donate">დონაცია</string>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index 35e2abd47..7afd8b2d9 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">가젯브릿지</string>
-    <string name="title_activity_controlcenter">가젯브릿지</string>
+    <string name="application_name_generic">가젯브릿지</string>
+    <string name="title_activity_controlcenter_generic">가젯브릿지</string>
     <string name="action_settings">설정</string>
     <string name="action_debug">디버그</string>
     <string name="action_quit">종료</string>
@@ -77,7 +77,7 @@
     <string name="tap_connected_device_for_app_mananger">연결된 기기를 선택해 앱 관리자 실행</string>
     <string name="tap_a_device_to_connect">기기를 선택해 연결</string>
     <string name="cannot_connect_bt_address_invalid_">연결할 수 없습니다. 블루투스 주소가 올바르지 않은 것 같습니다\?</string>
-    <string name="gadgetbridge_running">가젯브릿지 실행중</string>
+    <string name="gadgetbridge_running_generic">가젯브릿지 실행중</string>
     <string name="installing_binary_d_d">바이너리 설치중: %1$d/%2$d</string>
     <string name="installation_failed_">설치 실패</string>
     <string name="installation_successful">설치됨</string>
diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml
index f466c9a57..3180dafc8 100644
--- a/app/src/main/res/values-lt/strings.xml
+++ b/app/src/main/res/values-lt/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">Gadgetbridge</string>
-    <string name="title_activity_controlcenter">Gadgetbridge</string>
+    <string name="application_name_generic">Gadgetbridge</string>
+    <string name="title_activity_controlcenter_generic">Gadgetbridge</string>
     <string name="action_settings">Nustatymai</string>
     <string name="action_debug">Šalinti riktus</string>
     <string name="action_quit">Išeiti</string>
@@ -167,7 +167,7 @@
     <string name="bluetooth_is_not_supported_">Bluetooth nepalaikomas.</string>
     <string name="bluetooth_is_disabled_">Bluetooth išjungtas.</string>
     <string name="tap_a_device_to_connect">Bagstelėkite įrenginį, kad prisijungtumėte</string>
-    <string name="gadgetbridge_running">Gadgetbridge paleistas</string>
+    <string name="gadgetbridge_running_generic">Gadgetbridge paleistas</string>
     <string name="installation_successful">Instaluota</string>
     <string name="title_activity_discovery">Įrenginio paieška</string>
     <string name="discovery_stop_scanning">Stabdyti skenavimą</string>
diff --git a/app/src/main/res/values-ml/strings.xml b/app/src/main/res/values-ml/strings.xml
index 692c26523..7e0dca922 100644
--- a/app/src/main/res/values-ml/strings.xml
+++ b/app/src/main/res/values-ml/strings.xml
@@ -78,8 +78,8 @@
     <string name="action_quit">പുറത്തു കടക്കുക</string>
     <string name="action_debug">തെറ്റുകൾ തിരുത്തുക</string>
     <string name="action_settings">ക്രമീകരണങ്ങൾ</string>
-    <string name="title_activity_controlcenter">ഗാഡ്ജക്‌റ്റ് ബ്രിഡ്ജ്</string>
-    <string name="app_name">ഗാഡ്ജക്‌റ്റ് ബ്രിഡ്ജ്</string>
+    <string name="title_activity_controlcenter_generic">ഗാഡ്ജക്‌റ്റ് ബ്രിഡ്ജ്</string>
+    <string name="application_name_generic">ഗാഡ്ജക്‌റ്റ് ബ്രിഡ്ജ്</string>
     <string name="sonyswr12_settings_low_vibration_summary">ബാൻഡിൽ വൈബ്രേഷന്റെ കുറഞ്ഞ തീവ്രത പ്രവർത്തനക്ഷമമാക്കുക</string>
     <string name="sonyswr12_settings_stamina_summary">പവർ സേവിംഗ് മോഡ് ഹൃദയമിടിപ്പിന്റെ ആനുകാലിക യാന്ത്രിക അളവ് ഓഫുചെയ്യുന്നത് പ്രവർത്തന സമയം വർദ്ധിപ്പിക്കുന്നു</string>
     <string name="sonyswr12_settings_alarm_interval_summary">ഇൻസ്റ്റാൾ ചെയ്ത അലാറത്തിന് മുമ്പുള്ള ഇടവേളയാണ് സ്മാർട്ട് അലാറം ഇടവേള. ഈ ഇടവേള ഉപകരണം ഉപയോക്താവിനെ ഉണർത്താൻ ഉറക്കത്തിന്റെ ഭാരം കുറഞ്ഞ ഘട്ടം കണ്ടെത്താൻ ശ്രമിക്കുന്നു</string>
diff --git a/app/src/main/res/values-my/strings.xml b/app/src/main/res/values-my/strings.xml
index 4caf4bc91..6b15aa624 100644
--- a/app/src/main/res/values-my/strings.xml
+++ b/app/src/main/res/values-my/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">Gadgetbridge</string>
-    <string name="title_activity_controlcenter">Gadgetbridge</string>
+    <string name="application_name_generic">Gadgetbridge</string>
+    <string name="title_activity_controlcenter_generic">Gadgetbridge</string>
     <string name="action_settings">ခ်ိန္ညွိရန္</string>
     <string name="action_debug">ျပစ္ခ်က္</string>
     <string name="action_quit">ထြက္မည္</string>
diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml
index 18f6e3e8b..a4ec29f47 100644
--- a/app/src/main/res/values-nb-rNO/strings.xml
+++ b/app/src/main/res/values-nb-rNO/strings.xml
@@ -39,8 +39,8 @@
     <string name="title_activity_calblacklist">Svartelistede kalendere</string>
     <string name="title_activity_fw_app_insaller">Fastvare-/program-installerer</string>
     <string name="fw_upgrade_notice">Du er i ferd med å installere %s.</string>
-    <string name="app_name">Gadgetbru</string>
-    <string name="title_activity_controlcenter">Gadgetbru</string>
+    <string name="application_name_generic">Gadgetbru</string>
+    <string name="title_activity_controlcenter_generic">Gadgetbru</string>
     <string name="controlcenter_delete_device_dialogmessage">Dette vil slette enheten og all tilknyttet data!</string>
     <string name="fw_upgrade_notice_amazfitbip">Du er i ferd med å installere %s-fastvaren på din Amazfit Bip.
 \n
@@ -165,7 +165,7 @@
     <string name="tap_connected_device_for_vibration">Trykk på tilkoblet enhet for vibrasjon</string>
     <string name="tap_a_device_to_connect">Trykk på en enhet for å koble til</string>
     <string name="cannot_connect_bt_address_invalid_">Kan ikke koble til. Ugyldig Blåtannsadresse?</string>
-    <string name="gadgetbridge_running">Gadgetbro kjører</string>
+    <string name="gadgetbridge_running_generic">Gadgetbro kjører</string>
     <string name="installing_binary_d_d">Installerer binærfil %1$d/%2$d</string>
     <string name="installation_failed_">Installasjon mislyktes</string>
     <string name="installation_successful">Installert</string>
@@ -902,7 +902,7 @@
     <string name="error_background_service">Klarte ikke å starte bakgrunnstjeneste</string>
     <string name="about_additional_device_support">Ytterligere enhetsstøtte</string>
     <string name="about_contributors">Bidragsytere</string>
-    <string name="about_activity_title">Om Gadgetbridge</string>
+    <string name="about_activity_title_generic">Om Gadgetbridge</string>
     <string name="about_title">Om</string>
     <string name="menuitem_worldclock">Verdensklokke</string>
     <string name="menuitem_stress">Stress</string>
@@ -1034,7 +1034,7 @@
     <string name="sonyswr12_settings_low_vibration_summary">Aktiver lav vibrasjonsintensitet på båndet</string>
     <string name="sonyswr12_settings_stamina_summary">Strømsparingsmodus slår av periodisk automatisk måling av hjertefrekvensen og øker dermed arbeidstiden</string>
     <string name="sonyswr12_settings_alarm_interval_summary">Smart alarmintervall er intervall før installert alarm. I dette intervallet prøver enheten å oppdage den letteste søvnfasen for å våkne brukeren</string>
-    <string name="about_description">Skyfri, gemenhetslig fri erstatning for den lukkede motsatsen for dine Android-slaveenheter.</string>
+    <string name="about_description_generic">Skyfri, gemenhetslig fri erstatning for den lukkede motsatsen for dine Android-slaveenheter.</string>
     <string name="pref_check_permission_status_summary">Sjekk og forespør tilganger selv om de ikke trengs umiddelbart. Skru av dette kun hvis enhetene dine ikke støtter noen av disse funksjonene. Å ikke innvilge tilganger kan forårsake problemer!</string>
     <string name="companiondevice_pairing_details">Skrur på slaveenhets-API (funker kun på Android 8 og høyere, og tilknytningen må settes opp på ny med Gadgetbro), noe som øker påliteligheten hvis tjenester må startes på ny i bakgrunnen</string>
     <string name="error_version_check_extreme_caution">Advarsel: Kunne ikke sjekke versjonsinfo! Du bør ikke fortsette og versjonsnavnet «%s» ble sett.</string>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index afc1c40e5..9f26eba66 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">Gadgetbridge</string>
-    <string name="title_activity_controlcenter">Gadgetbridge</string>
+    <string name="application_name_generic">Gadgetbridge</string>
+    <string name="title_activity_controlcenter_generic">Gadgetbridge</string>
     <string name="action_settings">Instellingen</string>
     <string name="action_debug">Debug</string>
     <string name="action_quit">Sluit af</string>
@@ -185,7 +185,7 @@
     <string name="tap_connected_device_for_vibration">Tap op het verbonden apparaat voor vibratie</string>
     <string name="tap_a_device_to_connect">Tap op een apparaat om te verbinden</string>
     <string name="cannot_connect_bt_address_invalid_">Kan niet verbinden. Is het Bluetooth adres ongeldig?</string>
-    <string name="gadgetbridge_running">Gadgetbridge loopt</string>
+    <string name="gadgetbridge_running_generic">Gadgetbridge loopt</string>
     <string name="installing_binary_d_d">Binary installeren %1$d/%2$d</string>
     <string name="installation_failed_">Installatie gefaald</string>
     <string name="installation_successful">Geïnstalleerd</string>
@@ -914,8 +914,8 @@
     <string name="about_additional_device_support">Extra apparaatondersteuning</string>
     <string name="about_contributors">Bijdragers</string>
     <string name="about_core_team_title">Kernteam (in volgorde van eerste codebijdrage)</string>
-    <string name="about_description">Cloudloze vrije vervanging voor de gesloten Android-applicaties van gadgetfabrikanten.</string>
-    <string name="about_activity_title">Over Gadgetbridge</string>
+    <string name="about_description_generic">Cloudloze vrije vervanging voor de gesloten Android-applicaties van gadgetfabrikanten.</string>
+    <string name="about_activity_title_generic">Over Gadgetbridge</string>
     <string name="about_title">Over</string>
     <string name="pref_title_weather_summary">Gebruikt voor de LineageOS-weeraanbieder, andere Android versies moeten een app zoals \"Weather notification\" gebruiken. Meer informatie is te vinden in de Gadgetbridge wiki.</string>
     <string name="menuitem_worldclock">Wereld Klok</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 6eafd0291..28eea76cc 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">Gadgetbridge</string>
-    <string name="title_activity_controlcenter">Gadgetbridge</string>
+    <string name="application_name_generic">Gadgetbridge</string>
+    <string name="title_activity_controlcenter_generic">Gadgetbridge</string>
     <string name="action_settings">Ustawienia</string>
     <string name="action_debug">Debuguj</string>
     <string name="action_quit">Wyjdź</string>
@@ -108,7 +108,7 @@
     <string name="tap_connected_device_for_app_mananger">Kliknij połączone urządzenie, aby uruchomić menadżer aplikacji</string>
     <string name="tap_a_device_to_connect">Dotknij urządzenie aby połączyć</string>
     <string name="cannot_connect_bt_address_invalid_">Nie można połączyć. Nieprawidłowy adres Bluetooth\?</string>
-    <string name="gadgetbridge_running">Gadgetbridge działa</string>
+    <string name="gadgetbridge_running_generic">Gadgetbridge działa</string>
     <string name="installing_binary_d_d">Instalowanie binarki %1$d/%2$d</string>
     <string name="installation_failed_">Instalacja nie powiodła się</string>
     <string name="installation_successful">Zainstalowano</string>
@@ -913,7 +913,7 @@
     <string name="hr_widget_last_notification">Ostatnie powiadomienie</string>
     <string name="controlcenter_set_alias">Ustaw własną nazwę</string>
     <string name="about_contributors">Współtwórcy</string>
-    <string name="about_activity_title">O Gadgetbridge</string>
+    <string name="about_activity_title_generic">O Gadgetbridge</string>
     <string name="devicetype_amazfit_trex">Amazfit T-Rex</string>
     <string name="backstroke">Styl grzbietowy</string>
     <string name="freestyle">Styl dowolny</string>
@@ -1031,7 +1031,7 @@
     <string name="about_links">Linki</string>
     <string name="about_additional_contributions">Dziękujemy wszystkim nie notowanym na liście współtwórcom za udostępnienie kodu, tłumaczenia, wsparcie, pomysły, motywację, zgłoszenia błędów, pieniądze… ✊</string>
     <string name="about_core_team_title">Zespół główny (w kolejności od pierwszego wkładu w kod aplikacji)</string>
-    <string name="about_description">Wolny od chmury zamiennik dla aplikacji o zamkniętym kodzie źródłowym dostarczanych przez producentów gadżetów dla systemu Android.</string>
+    <string name="about_description_generic">Wolny od chmury zamiennik dla aplikacji o zamkniętym kodzie źródłowym dostarczanych przez producentów gadżetów dla systemu Android.</string>
     <string name="activity_summary_edit_name_title">Edytuj etykietę</string>
     <string name="activity_type_pingpong">Ping-pong</string>
     <string name="activity_type_cricket">Krykiet</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index a411025d3..d42561908 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">Gadgetbridge</string>
-    <string name="title_activity_controlcenter">Gadgetbridge</string>
+    <string name="application_name_generic">Gadgetbridge</string>
+    <string name="title_activity_controlcenter_generic">Gadgetbridge</string>
     <string name="action_settings">Configurações</string>
     <string name="action_debug">Depurar</string>
     <string name="action_quit">Sair</string>
@@ -148,7 +148,7 @@
     <string name="tap_connected_device_for_vibration">Toque no dispositivo conectado para vibração</string>
     <string name="tap_a_device_to_connect">Toque num dispositivo para ligar</string>
     <string name="cannot_connect_bt_address_invalid_">Não foi possível conectar. Endereço de Bluetooth inválido\?</string>
-    <string name="gadgetbridge_running">Gadgetbridge em execução</string>
+    <string name="gadgetbridge_running_generic">Gadgetbridge em execução</string>
     <string name="installing_binary_d_d">Instalando binário %1$d/%2$d</string>
     <string name="installation_failed_">Instalação falhou</string>
     <string name="installation_successful">Instalado</string>
@@ -920,8 +920,8 @@
     <string name="about_additional_device_support">Suporte a dispositivos adicionais</string>
     <string name="about_contributors">Contribuidores</string>
     <string name="about_core_team_title">Equipe Core (na ordem da primeira contribuição de código)</string>
-    <string name="about_description">Um substituto livre, protegido por copyleft, sem acesso a nuvem para os aplicativos Android de código fechado dos fornecedores de gadgets.</string>
-    <string name="about_activity_title">Sobre o Gadgetbridge</string>
+    <string name="about_description_generic">Um substituto livre, protegido por copyleft, sem acesso a nuvem para os aplicativos Android de código fechado dos fornecedores de gadgets.</string>
+    <string name="about_activity_title_generic">Sobre o Gadgetbridge</string>
     <string name="about_title">Sobre</string>
     <string name="pref_title_weather_summary">Usado para o provedor do clima do LineageOS, outras versões do Android precisam usar um aplicativo como o \"Notificação de clima\". Encontrará mais informações no wiki do Gadgetbridge.</string>
     <string name="menuitem_worldclock">Relógio mundial</string>
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index 74efd9cd1..d26dbd7aa 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">Gadgetbridge</string>
-    <string name="title_activity_controlcenter">Gadgetbridge</string>
+    <string name="application_name_generic">Gadgetbridge</string>
+    <string name="title_activity_controlcenter_generic">Gadgetbridge</string>
     <string name="action_settings">Definições</string>
     <string name="action_debug">Depurar</string>
     <string name="action_quit">Sair</string>
@@ -156,7 +156,7 @@
     <string name="tap_connected_device_for_vibration">Toque no aparelho ligado para o fazer vibrar</string>
     <string name="tap_a_device_to_connect">Toque num aparelho para ligar</string>
     <string name="cannot_connect_bt_address_invalid_">Não foi possível conectar. Endereço de Bluetooth inválido\?</string>
-    <string name="gadgetbridge_running">Gadgetbridge a executar</string>
+    <string name="gadgetbridge_running_generic">Gadgetbridge a executar</string>
     <string name="installing_binary_d_d">Instalando binário %1$d/%2$d</string>
     <string name="installation_failed_">A instalação falhou</string>
     <string name="installation_successful">Instalado</string>
@@ -573,8 +573,8 @@
     <string name="about_additional_device_support">Suporte a aparelhos adicionais</string>
     <string name="about_contributors">Contribuidores</string>
     <string name="about_core_team_title">Equipa Core (na ordem da primeira contribuição de código)</string>
-    <string name="about_description">Um substituto livre, protegido por copyleft, sem acesso a nuvem para as apps Android de código fechado dos fornecedores de gadgets.</string>
-    <string name="about_activity_title">Sobre o Gadgetbridge</string>
+    <string name="about_description_generic">Um substituto livre, protegido por copyleft, sem acesso a nuvem para as apps Android de código fechado dos fornecedores de gadgets.</string>
+    <string name="about_activity_title_generic">Sobre o Gadgetbridge</string>
     <string name="about_title">Sobre</string>
     <string name="fw_upgrade_notice_amazfit_trex">Está prestes a instalar o firmware %s no seu Amazit T-Rex. 
 \n 
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index a05411b86..a12113c8a 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">Gadgetbridge</string>
-    <string name="title_activity_controlcenter">Gadgetbridge</string>
+    <string name="application_name_generic">Gadgetbridge</string>
+    <string name="title_activity_controlcenter_generic">Gadgetbridge</string>
     <string name="action_settings">Setari</string>
     <string name="action_debug">Depaneaza</string>
     <string name="action_quit">Iesire</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index a6c394052..1d606ba1d 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">Gadgetbridge</string>
-    <string name="title_activity_controlcenter">Gadgetbridge</string>
+    <string name="application_name_generic">Gadgetbridge</string>
+    <string name="title_activity_controlcenter_generic">Gadgetbridge</string>
     <string name="action_settings">Настройки</string>
     <string name="action_debug">Отладка</string>
     <string name="action_quit">Выйти</string>
@@ -157,7 +157,7 @@
     <string name="tap_connected_device_for_vibration">Коснитесь подключённого устройства для Вибрации</string>
     <string name="tap_a_device_to_connect">Коснитесь устройства для соединения</string>
     <string name="cannot_connect_bt_address_invalid_">Не удалось соединиться. Неверный адрес Bluetooth\?</string>
-    <string name="gadgetbridge_running">Gadgetbridge запущен</string>
+    <string name="gadgetbridge_running_generic">Gadgetbridge запущен</string>
     <string name="installing_binary_d_d">установка бинарного файла %1$d/%2$d</string>
     <string name="installation_failed_">Установка не удалась</string>
     <string name="installation_successful">Установлено</string>
@@ -848,8 +848,8 @@
     <string name="about_additional_device_support">Дополнительная поддержка устройств</string>
     <string name="about_contributors">Соавторы</string>
     <string name="about_core_team_title">Основная команда (в порядке поступления первого кода)</string>
-    <string name="about_description">\"Безоблачная\" свободная альтернатива закрытым приложениям от производителей гаджетов.</string>
-    <string name="about_activity_title">О Gadgetbridge</string>
+    <string name="about_description_generic">\"Безоблачная\" свободная альтернатива закрытым приложениям от производителей гаджетов.</string>
+    <string name="about_activity_title_generic">О Gadgetbridge</string>
     <string name="about_title">О программе</string>
     <string name="hr_widget_last_notification">Последнее уведомление</string>
     <string name="pref_qhybrid_save_raw_activity_files">Сохранять необработанные файлы активности</string>
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index 8cff0a970..ec6aba113 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">Gadgetbridge</string>
-    <string name="title_activity_controlcenter">Gadgetbridge</string>
+    <string name="application_name_generic">Gadgetbridge</string>
+    <string name="title_activity_controlcenter_generic">Gadgetbridge</string>
     <string name="action_settings">Nastavenia</string>
     <string name="action_debug">Ladenie</string>
     <string name="action_quit">Ukončiť</string>
@@ -180,7 +180,7 @@
     <string name="tap_connected_device_for_vibration">Dotknite sa pripojeného zariadenia pre vibrácie</string>
     <string name="tap_a_device_to_connect">Dotknite sa pripojeného zariadenia pre pripojenie</string>
     <string name="cannot_connect_bt_address_invalid_">Nie je možné pripojiť. Je BT adresa v poriadku?</string>
-    <string name="gadgetbridge_running">Gadgetbridge je spustený</string>
+    <string name="gadgetbridge_running_generic">Gadgetbridge je spustený</string>
     <string name="installing_binary_d_d">Instalujem binárny súbor %1$d/%2$d</string>
     <string name="installation_failed_">Inštalácia zlyhala</string>
     <string name="installation_successful">Inštalácia bola úspešná</string>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index 6a8f73ae5..47dea915a 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">Gadgetbridge</string>
-    <string name="title_activity_controlcenter">Gadgetbridge</string>
+    <string name="application_name_generic">Gadgetbridge</string>
+    <string name="title_activity_controlcenter_generic">Gadgetbridge</string>
     <string name="action_settings">Inställningar</string>
     <string name="action_quit">Avsluta</string>
     <string name="action_donate">Donera</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index b316aaaf5..3ed1c3fc2 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -88,7 +88,7 @@
 \nSürüm %2$s, %3$s tarafından
 \n</string>
     <string name="app_move_to_top">Yukarı taşı</string>
-    <string name="app_name">Gadgetbridge</string>
+    <string name="application_name_generic">Gadgetbridge</string>
     <string name="appinstaller_install">Kur</string>
     <string name="appmanager_app_openinstore">Pebble uygulama mağazasında ara</string>
     <string name="appmanager_cached_watchapps_watchfaces">Önbellekteki uygulamalar</string>
@@ -314,7 +314,7 @@
     <string name="fwapp_install_device_not_ready">Dosya kurulamıyor, aygıt hazır değil.</string>
     <string name="fwappinstaller_connection_state">Aygıta bağlantı: %1$s</string>
     <string name="fwinstaller_firmware_not_compatible_to_device">Bu ürün yazılımı bu aygıtla uyumlu değil</string>
-    <string name="gadgetbridge_running">Gadgetbridge çalışıyor</string>
+    <string name="gadgetbridge_running_generic">Gadgetbridge çalışıyor</string>
     <string name="german">Almanca</string>
     <string name="heart_rate">Kalp ritmi</string>
     <string name="horizontal">Yatay</string>
@@ -754,7 +754,7 @@
     <string name="title_activity_appmanager">Uygulama Yöneticisi</string>
     <string name="title_activity_calblacklist">Kara Listeye Alınan Takvimler</string>
     <string name="title_activity_charts">Etkinlik ve Uyku</string>
-    <string name="title_activity_controlcenter">Gadgetbridge</string>
+    <string name="title_activity_controlcenter_generic">Gadgetbridge</string>
     <string name="title_activity_db_management">Veri yönetimi</string>
     <string name="title_activity_debug">Hata Ayıklama</string>
     <string name="title_activity_device_specific_settings">Aygıta özel ayarlar</string>
@@ -937,8 +937,8 @@
     <string name="about_additional_device_support">Ek aygıt desteği</string>
     <string name="about_contributors">Katkıda bulunanlar</string>
     <string name="about_core_team_title">Çekirdek Ekip (ilk kod katkıda bulunma sırasına göre)</string>
-    <string name="about_description">Satıcıların kapalı kaynaklı Android aygıt uygulamalarının yerine bulut gerektirmeyen copyleft özgür alternatif.</string>
-    <string name="about_activity_title">Gadgetbridge hakkında</string>
+    <string name="about_description_generic">Satıcıların kapalı kaynaklı Android aygıt uygulamalarının yerine bulut gerektirmeyen copyleft özgür alternatif.</string>
+    <string name="about_activity_title_generic">Gadgetbridge hakkında</string>
     <string name="about_title">Hakkında</string>
     <string name="pref_title_weather_summary">LineageOS hava durumu sağlayıcısı için kullanılır, diğer Android sürümleri \"Weather notification\" gibi bir uygulama kullanmalıdır. Gadgetbridge wiki sayfasında daha fazla bilgi bulabilirsiniz.</string>
     <string name="menuitem_worldclock">Dünya Saati</string>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 8ea3305e8..4422a3df7 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">Gadgetbridge</string>
-    <string name="title_activity_controlcenter">Gadgetbridge</string>
+    <string name="application_name_generic">Gadgetbridge</string>
+    <string name="title_activity_controlcenter_generic">Gadgetbridge</string>
     <string name="action_settings">Налаштування</string>
     <string name="action_debug">Зневадження</string>
     <string name="action_quit">Вийти</string>
@@ -98,7 +98,7 @@
     <string name="bluetooth_is_not_supported_">Bluetooth не підтримується.</string>
     <string name="bluetooth_is_disabled_">Bluetooth вимкнуто.</string>
     <string name="cannot_connect_bt_address_invalid_">Не вдалося з\'єднатися. Неправильна Bluetooth адреса\?</string>
-    <string name="gadgetbridge_running">Gadgetbridge запущено</string>
+    <string name="gadgetbridge_running_generic">Gadgetbridge запущено</string>
     <string name="installing_binary_d_d">Встановлення двійкового файлу %1$d/%2$d</string>
     <string name="installation_failed_">Невдале встановлення</string>
     <string name="installation_successful">Встановлено</string>
@@ -1022,8 +1022,8 @@
     <string name="about_additional_device_support">Підтримка додаткових пристроїв</string>
     <string name="about_contributors">Співавтори</string>
     <string name="about_core_team_title">Основна команда (впорядковано за датою допомоги)</string>
-    <string name="about_description">Незалежний від хмари, вільний замінник закритих застосунків від інших виробників.</string>
-    <string name="about_activity_title">Про Gadgetbridge</string>
+    <string name="about_description_generic">Незалежний від хмари, вільний замінник закритих застосунків від інших виробників.</string>
+    <string name="about_activity_title_generic">Про Gadgetbridge</string>
     <string name="about_title">Про застосунок</string>
     <string name="hr_widget_last_notification">Останнє сповіщення</string>
     <string name="menuitem_worldclock">Світовий час</string>
diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
index 3e852602c..fbd33c430 100644
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">Gadgetbridge</string>
-    <string name="title_activity_controlcenter">Gadgetbridge</string>
+    <string name="application_name_generic">Gadgetbridge</string>
+    <string name="title_activity_controlcenter_generic">Gadgetbridge</string>
     <string name="action_settings">Cài đặt</string>
     <string name="action_debug">Dò lỗi</string>
     <string name="action_quit">Thoát</string>
@@ -49,7 +49,7 @@
     <string name="bluetooth_is_not_supported_">Không hỗ trợ Bluetooth.</string>
     <string name="bluetooth_is_disabled_">Đã tắt Bluetooth.</string>
     <string name="cannot_connect_bt_address_invalid_">Không thể kết nối. Địa chỉ Bluetooth không hợp lệ\?</string>
-    <string name="gadgetbridge_running">Gadgetbridge đang chạy</string>
+    <string name="gadgetbridge_running_generic">Gadgetbridge đang chạy</string>
     <string name="installing_binary_d_d">Đang cài tệp nhị phân %1$d/%2$d</string>
     <string name="installation_failed_">Cài đặt thất bại</string>
     <string name="installation_successful">Đã cài đặt</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 313f273be..ab20c7d41 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">Gadgetbridge</string>
-    <string name="title_activity_controlcenter">Gadgetbridge</string>
+    <string name="application_name_generic">Gadgetbridge</string>
+    <string name="title_activity_controlcenter_generic">Gadgetbridge</string>
     <string name="action_settings">设置</string>
     <string name="action_debug">调试</string>
     <string name="action_quit">退出</string>
@@ -166,7 +166,7 @@
     <string name="tap_connected_device_for_vibration">点按以震动已连接的设备</string>
     <string name="tap_a_device_to_connect">点按一个设备以连接</string>
     <string name="cannot_connect_bt_address_invalid_">无法连接。 蓝牙地址无效？</string>
-    <string name="gadgetbridge_running">Gadgetbridge 正在运行</string>
+    <string name="gadgetbridge_running_generic">Gadgetbridge 正在运行</string>
     <string name="installing_binary_d_d">正在安装二进制文件 %1$d/%2$d</string>
     <string name="installation_failed_">安装失败</string>
     <string name="installation_successful">安装成功</string>
@@ -917,8 +917,8 @@
     <string name="about_additional_device_support">额外设备支持</string>
     <string name="about_contributors">贡献者</string>
     <string name="about_core_team_title">核心成员 （以第一次提交代码排序）</string>
-    <string name="about_description">用于替代原厂手环应用的脱机无版权自由应用。</string>
-    <string name="about_activity_title">关于 Gadgetbridge</string>
+    <string name="about_description_generic">用于替代原厂手环应用的脱机无版权自由应用。</string>
+    <string name="about_activity_title_generic">关于 Gadgetbridge</string>
     <string name="about_title">关于</string>
     <string name="pref_title_weather_summary">由LineageOS天气服务提供，其他版本的Android系统需要使用诸如“Weather notification”。更多信息请访问 Gadgetbridge 的Wiki。</string>
     <string name="menuitem_worldclock">世界时钟</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index d31c63536..cf8f656c0 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -26,8 +26,8 @@
     <string name="appmananger_app_delete_cache">刪除並清除緩存</string>
     <string name="appmananger_app_reinstall">重新安裝</string>
     <string name="mi2_prefs_button_press_broadcast_default_value" translatable="false">nodomain.freeyourgadget.gadgetbridge.ButtonPressed</string>
-    <string name="app_name">Gadgetbridge</string>
-    <string name="title_activity_controlcenter">Gadgetbridge</string>
+    <string name="application_name_generic">Gadgetbridge</string>
+    <string name="title_activity_controlcenter_generic">Gadgetbridge</string>
     <string name="controlcenter_snackbar_connecting">連接中…</string>
     <string name="controlcenter_snackbar_requested_screenshot">截取設備的屏幕截圖</string>
     <string name="controlcenter_calibrate_device">校正設備</string>
@@ -524,7 +524,7 @@
     <string name="title_activity_mi_band_pairing">配對您的小米手環</string>
     <string name="title_activity_android_pairing">配對裝置</string>
     <string name="initialized">初始化完成</string>
-    <string name="gadgetbridge_running">Gadgetbridge 正在執行</string>
+    <string name="gadgetbridge_running_generic">Gadgetbridge 正在執行</string>
     <string name="tap_a_device_to_connect">點擊一個裝置以進行連線</string>
     <string name="bluetooth_is_not_supported_">藍芽不支援。</string>
     <string name="zetime_calories_type_all">涵蓋活動與未活動時消耗的卡路里</string>
@@ -583,8 +583,8 @@
     <string name="about_additional_device_support">額外裝置支援</string>
     <string name="about_contributors">貢獻者</string>
     <string name="about_core_team_title">核心團隊（按第一次程式碼貢獻順序排列）</string>
-    <string name="about_description">用來取代廠商提供的閉源 Android 小裝置應用程式的離線且版權自由的替代品。</string>
-    <string name="about_activity_title">關於 Gadgetbridge</string>
+    <string name="about_description_generic">用來取代廠商提供的閉源 Android 小裝置應用程式的離線且版權自由的替代品。</string>
+    <string name="about_activity_title_generic">關於 Gadgetbridge</string>
     <string name="about_title">關於</string>
     <string name="activity_summaries">運動活動</string>
     <string name="activity_type_swimming">游泳</string>

From 1092e1b10ac2600b8bd63cad6e590ffb8e6e23aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Sat, 30 Apr 2022 20:24:34 +0100
Subject: [PATCH 035/110] Unset notification color for Android 12+

---
 .../freeyourgadget/gadgetbridge/GBApplication.java    |  3 +++
 .../nodomain/freeyourgadget/gadgetbridge/util/GB.java | 11 +++++++++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GBApplication.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GBApplication.java
index 6282ebcac..35f4b1f6a 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GBApplication.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GBApplication.java
@@ -380,6 +380,9 @@ public class GBApplication extends Application {
         return VERSION.SDK_INT >= Build.VERSION_CODES.Q;
     }
 
+    public static boolean isRunningTwelveOrLater() {
+        return VERSION.SDK_INT >= 31;  // Build.VERSION_CODES.S, but our target SDK is lower
+    }
 
     public static boolean isRunningPieOrLater() {
         return VERSION.SDK_INT >= Build.VERSION_CODES.P;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/GB.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/GB.java
index 5bc9b1fc3..d2cbd09bb 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/GB.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/GB.java
@@ -151,10 +151,13 @@ public class GB {
                 .setContentText(text)
                 .setSmallIcon(connected ? device.getNotificationIconConnected() : device.getNotificationIconDisconnected())
                 .setContentIntent(getContentIntent(context))
-                .setColor(context.getResources().getColor(R.color.accent))
                 .setShowWhen(false)
                 .setOngoing(true);
 
+        if (!GBApplication.isRunningTwelveOrLater()) {
+            builder.setColor(context.getResources().getColor(R.color.accent));
+        }
+
         Intent deviceCommunicationServiceIntent = new Intent(context, DeviceCommunicationService.class);
         if (connected) {
             deviceCommunicationServiceIntent.setAction(DeviceService.ACTION_DISCONNECT);
@@ -187,9 +190,13 @@ public class GB {
                 .setContentText(text)
                 .setSmallIcon(R.drawable.ic_notification_disconnected)
                 .setContentIntent(getContentIntent(context))
-                .setColor(context.getResources().getColor(R.color.accent))
                 .setShowWhen(false)
                 .setOngoing(true);
+
+        if (!GBApplication.isRunningTwelveOrLater()) {
+            builder.setColor(context.getResources().getColor(R.color.accent));
+        }
+
         if (GBApplication.getPrefs().getString("last_device_address", null) != null) {
             Intent deviceCommunicationServiceIntent = new Intent(context, DeviceCommunicationService.class);
             deviceCommunicationServiceIntent.setAction(DeviceService.ACTION_CONNECT);

From 2aecb85015dc83a5f6794a150d6a3c2d2462f77f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Sat, 7 May 2022 20:45:33 +0100
Subject: [PATCH 036/110] Fix fitness goal and inactivity warning threshold
 preference migration

---
 .../freeyourgadget/gadgetbridge/GBApplication.java         | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GBApplication.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GBApplication.java
index 35f4b1f6a..3085c607e 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GBApplication.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GBApplication.java
@@ -115,7 +115,7 @@ public class GBApplication extends Application {
     private static SharedPreferences sharedPrefs;
     private static final String PREFS_VERSION = "shared_preferences_version";
     //if preferences have to be migrated, increment the following and add the migration logic in migratePrefs below; see http://stackoverflow.com/questions/16397848/how-can-i-migrate-android-preferences-with-a-new-version
-    private static final int CURRENT_PREFS_VERSION = 11;
+    private static final int CURRENT_PREFS_VERSION = 12;
 
     private static LimitedQueue mIDSenderLookup = new LimitedQueue(16);
     private static Prefs prefs;
@@ -1075,6 +1075,11 @@ public class GBApplication extends Application {
                 Log.w(TAG, "error acquiring DB lock");
             }
         }
+        if (oldVersion < 12) {
+            // Convert preferences that were wrongly migrated to int, since Android saves them as Strings internally
+            editor.putString("inactivity_warnings_threshold", String.valueOf(prefs.getInt("inactivity_warnings_threshold", 60)));
+            editor.putString("fitness_goal", String.valueOf(prefs.getInt("fitness_goal", 8000)));
+        }
         editor.putString(PREFS_VERSION, Integer.toString(CURRENT_PREFS_VERSION));
         editor.apply();
     }

From 873ac850017d859932d3b72bb0b77b5478f2517e Mon Sep 17 00:00:00 2001
From: vanous <petr@linuks.cz>
Date: Mon, 9 May 2022 17:18:06 +0200
Subject: [PATCH 037/110] Enable Fitness App Tracking Stop in Huami actions.
 Add Toggle function to the Tracking

---
 .../devices/huami/HuamiConst.java             |  1 +
 .../externalevents/OpenTracksController.java  |  9 +++++++++
 .../service/devices/huami/HuamiSupport.java   |  7 +++++++
 app/src/main/res/values/arrays.xml            | 20 ++++---------------
 app/src/main/res/values/strings.xml           |  1 +
 app/src/main/res/values/values.xml            |  1 +
 6 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiConst.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiConst.java
index f03b5c21e..8fef25994 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiConst.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiConst.java
@@ -74,6 +74,7 @@ public class HuamiConst {
     public static final String PREF_BUTTON_ACTION_SELECTION_BROADCAST = "BROADCAST";
     public static final String PREF_BUTTON_ACTION_SELECTION_FITNESS_APP_START = "FITNESS_CONTROL_START";
     public static final String PREF_BUTTON_ACTION_SELECTION_FITNESS_APP_STOP = "FITNESS_CONTROL_STOP";
+    public static final String PREF_BUTTON_ACTION_SELECTION_FITNESS_APP_TOGGLE = "FITNESS_CONTROL_TOGGLE";
 
     public static final String PREF_DEVICE_ACTION_SELECTION_OFF = "UNKNOWN";
     public static final String PREF_DEVICE_ACTION_SELECTION_BROADCAST = "BROADCAST";
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/OpenTracksController.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/OpenTracksController.java
index 3d94d8951..93a6d9892 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/OpenTracksController.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/OpenTracksController.java
@@ -113,4 +113,13 @@ public class OpenTracksController extends Activity {
         }
         GBApplication.app().setOpenTracksObserver(null);
     }
+
+    public static void toggleRecording(Context context) {
+        OpenTracksContentObserver openTracksObserver = GBApplication.app().getOpenTracksObserver();
+        if (openTracksObserver == null) {
+            startRecording(context);
+        } else {
+            stopRecording(context);
+        }
+    }
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiSupport.java
index 6851f2bea..2b738ad28 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiSupport.java
@@ -177,6 +177,7 @@ import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.Dev
 import static nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst.PREF_BUTTON_ACTION_SELECTION_BROADCAST;
 import static nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst.PREF_BUTTON_ACTION_SELECTION_FITNESS_APP_START;
 import static nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst.PREF_BUTTON_ACTION_SELECTION_FITNESS_APP_STOP;
+import static nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst.PREF_BUTTON_ACTION_SELECTION_FITNESS_APP_TOGGLE;
 import static nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst.PREF_BUTTON_ACTION_SELECTION_OFF;
 import static nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst.PREF_DEVICE_ACTION_FELL_SLEEP_BROADCAST;
 import static nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst.PREF_DEVICE_ACTION_FELL_SLEEP_SELECTION;
@@ -1438,6 +1439,9 @@ public class HuamiSupport extends AbstractBTLEDeviceSupport {
             case PREF_BUTTON_ACTION_SELECTION_FITNESS_APP_STOP:
                 OpenTracksController.stopRecording(this.getContext());
                 break;
+            case PREF_BUTTON_ACTION_SELECTION_FITNESS_APP_TOGGLE:
+                OpenTracksController.toggleRecording(this.getContext());
+                break;
             default:
                 handleMediaButton(buttonPreference);
         }
@@ -1457,6 +1461,9 @@ public class HuamiSupport extends AbstractBTLEDeviceSupport {
             case PREF_BUTTON_ACTION_SELECTION_FITNESS_APP_STOP:
                 OpenTracksController.stopRecording(this.getContext());
                 break;
+            case PREF_BUTTON_ACTION_SELECTION_FITNESS_APP_TOGGLE:
+                OpenTracksController.toggleRecording(this.getContext());
+                break;
             default:
                 handleMediaButton(deviceAction);
         }
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index e71a0eaaf..ef6fc510c 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -1655,11 +1655,8 @@
         <item>@string/pref_media_rewind</item>
         <item>@string/pref_device_action_broadcast</item>
         <item>@string/pref_device_action_fitness_app_control_start</item>
-        <!--
-        Enable when OpenTracks allows to be stopped via intent
-        https://github.com/OpenTracksApp/OpenTracks/issues/1103
         <item>@string/pref_device_action_fitness_app_control_stop</item>
-        -->
+        <item>@string/pref_device_action_fitness_app_control_toggle</item>
     </string-array>
 
     <string-array name="button_action_values">
@@ -1675,11 +1672,8 @@
         <item>@string/pref_media_rewind_value</item>
         <item>@string/pref_device_action_broadcast_value</item>
         <item>@string/pref_device_action_fitness_app_control_start_value</item>
-        <!--
-        Enable when OpenTracks allows to be stopped via intent
-        https://github.com/OpenTracksApp/OpenTracks/issues/1103
         <item>@string/pref_device_action_fitness_app_control_stop_value</item>
-        -->
+        <item>@string/pref_device_action_fitness_app_control_toggle_value</item>
     </string-array>
 
     <string-array name="device_action_options">
@@ -1689,11 +1683,8 @@
         <item>@string/pref_media_playpause</item>
         <item>@string/pref_device_action_broadcast</item>
         <item>@string/pref_device_action_fitness_app_control_start</item>
-        <!--
-        Enable when OpenTracks allows to be stopped via intent
-        https://github.com/OpenTracksApp/OpenTracks/issues/1103
         <item>@string/pref_device_action_fitness_app_control_stop</item>
-        -->
+        <item>@string/pref_device_action_fitness_app_control_toggle</item>
     </string-array>
 
     <string-array name="device_action_values">
@@ -1703,11 +1694,8 @@
         <item>@string/pref_media_playpause_value</item>
         <item>@string/pref_device_action_broadcast_value</item>
         <item>@string/pref_device_action_fitness_app_control_start_value</item>
-        <!--
-        Enable when OpenTracks allows to be stopped via intent
-        https://github.com/OpenTracksApp/OpenTracks/issues/1103
         <item>@string/pref_device_action_fitness_app_control_stop_value</item>
-        -->
+        <item>@string/pref_device_action_fitness_app_control_toggle_value</item>
     </string-array>
 
     <string-array name="pref_hybridhr_buttonfunctions">
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b4c78e916..7b5386c0a 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1530,6 +1530,7 @@
     <string name="pref_device_action_broadcast">Send Broadcast</string>
     <string name="pref_device_action_fitness_app_control_start">Fitness App Tracking Start</string>
     <string name="pref_device_action_fitness_app_control_stop">Fitness App Tracking Stop</string>
+    <string name="pref_device_action_fitness_app_control_toggle">Toggle Fitness App Tracking</string>
     <!-- Translators: the ### indicate number of digits, keep intact -->
     <string name="distance_format_meters">###m</string>
     <!-- Translators: the ### indicate number of digits, keep intact -->
diff --git a/app/src/main/res/values/values.xml b/app/src/main/res/values/values.xml
index 7380f9f1c..355fbad6a 100644
--- a/app/src/main/res/values/values.xml
+++ b/app/src/main/res/values/values.xml
@@ -109,6 +109,7 @@
     <item name="pref_device_action_broadcast_value" translatable="false" type="string">BROADCAST</item>
     <item name="pref_device_action_fitness_app_control_start_value" translatable="false" type="string">FITNESS_CONTROL_START</item>
     <item name="pref_device_action_fitness_app_control_stop_value" translatable="false" type="string">FITNESS_CONTROL_STOP</item>
+    <item name="pref_device_action_fitness_app_control_toggle_value" translatable="false" type="string">FITNESS_CONTROL_TOGGLE</item>
     <item name="pref_title_touch_voice_assistant" type="string">Voice Assistant</item>
     <item name="pref_title_touch_anc" type="string">Active Noise Cancelling</item>
     <item name="pref_title_touch_quick_ambient" type="string">Quick Ambient Sound</item>

From 43bcac072d6d5f35b7e58a783a3556a2355b4ab6 Mon Sep 17 00:00:00 2001
From: mvn23 <schopdiedwaas@gmail.com>
Date: Mon, 9 May 2022 11:51:28 +0200
Subject: [PATCH 038/110] Add com.asus.asusincallui to handleCallNotification
 blacklist

---
 .../gadgetbridge/externalevents/NotificationListener.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/NotificationListener.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/NotificationListener.java
index 1402a92d1..16e9c34b1 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/NotificationListener.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/NotificationListener.java
@@ -494,7 +494,7 @@ public class NotificationListener extends NotificationListenerService {
     private void handleCallNotification(StatusBarNotification sbn) {
         String app = sbn.getPackageName();
         LOG.debug("got call from: " + app);
-        if (app.equals("com.android.dialer") || app.equals("com.android.incallui") || app.equals("com.google.android.dialer")) {
+        if (app.equals("com.android.dialer") || app.equals("com.android.incallui") || app.equals("com.google.android.dialer") || app.equals("com.asus.asusincallui")) {
             LOG.debug("Ignoring non-voip call");
             return;
         }

From c74bbffb4d8ae6bcee64775e958c024359541a90 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Mon, 9 May 2022 13:57:44 +0100
Subject: [PATCH 039/110] Mi Band 5: Add activate display on lift sensitivity

---
 .../DeviceSettingsPreferenceConst.java        |  1 +
 .../DeviceSpecificSettingsFragment.java       | 19 ++++++++-
 .../ActivateDisplayOnLiftSensitivity.java     | 22 +++++++++++
 .../devices/huami/HuamiCoordinator.java       |  9 +++++
 .../devices/huami/HuamiService.java           |  2 +
 .../huami/miband5/MiBand5Coordinator.java     |  2 +-
 .../service/devices/huami/HuamiSupport.java   | 24 ++++++++++++
 .../devices/huami/miband5/MiBand5Support.java |  8 +++-
 app/src/main/res/values/arrays.xml            |  9 +++++
 app/src/main/res/values/strings.xml           |  3 ++
 app/src/main/res/values/values.xml            |  3 ++
 ...settings_liftwrist_display_sensitivity.xml | 39 +++++++++++++++++++
 12 files changed, 138 insertions(+), 3 deletions(-)
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/ActivateDisplayOnLiftSensitivity.java
 create mode 100644 app/src/main/res/xml/devicesettings_liftwrist_display_sensitivity.xml

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsPreferenceConst.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsPreferenceConst.java
index 7e461dfd1..1f82f62e6 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsPreferenceConst.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsPreferenceConst.java
@@ -58,6 +58,7 @@ public class DeviceSettingsPreferenceConst {
     public static final String PREF_ACTIVATE_DISPLAY_ON_LIFT = "activate_display_on_lift_wrist";
     public static final String PREF_DISPLAY_ON_LIFT_START = "display_on_lift_start";
     public static final String PREF_DISPLAY_ON_LIFT_END = "display_on_lift_end";
+    public static final String PREF_DISPLAY_ON_LIFT_SENSITIVITY = "display_on_lift_sensitivity";
 
     public static final String PREF_SLEEP_TIME = "prefs_enable_sleep_time";
     public static final String PREF_SLEEP_TIME_START = "prefs_sleep_time_start";
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 260a64ea8..5f817cc9d 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
@@ -516,6 +516,7 @@ public class DeviceSpecificSettingsFragment extends PreferenceFragmentCompat imp
         }
         String displayOnLiftState = prefs.getString(PREF_ACTIVATE_DISPLAY_ON_LIFT, PREF_DO_NOT_DISTURB_OFF);
         boolean displayOnLiftScheduled = displayOnLiftState.equals(PREF_DO_NOT_DISTURB_SCHEDULED);
+        boolean displayOnLiftOff = displayOnLiftState.equals(PREF_DO_NOT_DISTURB_OFF);
 
         final Preference rotateWristCycleInfo = findPreference(PREF_MI2_ROTATE_WRIST_TO_SWITCH_INFO);
         if (rotateWristCycleInfo != null) {
@@ -553,16 +554,32 @@ public class DeviceSpecificSettingsFragment extends PreferenceFragmentCompat imp
             });
         }
 
+        final Preference displayOnLiftSensitivity = findPreference(PREF_DISPLAY_ON_LIFT_SENSITIVITY);
+        if (displayOnLiftSensitivity != null) {
+            displayOnLiftSensitivity.setEnabled(!displayOnLiftOff);
+            displayOnLiftSensitivity.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
+                @Override
+                public boolean onPreferenceChange(Preference preference, Object newVal) {
+                    notifyPreferenceChanged(PREF_DISPLAY_ON_LIFT_SENSITIVITY);
+                    return true;
+                }
+            });
+        }
+
         final Preference displayOnLift = findPreference(PREF_ACTIVATE_DISPLAY_ON_LIFT);
         if (displayOnLift != null) {
             displayOnLift.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
                 @Override
                 public boolean onPreferenceChange(Preference preference, Object newVal) {
                     final boolean scheduled = PREF_DO_NOT_DISTURB_SCHEDULED.equals(newVal.toString());
+                    final boolean off = PREF_DO_NOT_DISTURB_OFF.equals(newVal.toString());
                     Objects.requireNonNull(displayOnLiftStart).setEnabled(scheduled);
                     Objects.requireNonNull(displayOnLiftEnd).setEnabled(scheduled);
                     if (rotateWristCycleInfo != null) {
-                        rotateWristCycleInfo.setEnabled(!PREF_DO_NOT_DISTURB_OFF.equals(newVal.toString()));
+                        rotateWristCycleInfo.setEnabled(!off);
+                    }
+                    if (displayOnLiftSensitivity != null) {
+                        displayOnLiftSensitivity.setEnabled(!off);
                     }
                     notifyPreferenceChanged(PREF_ACTIVATE_DISPLAY_ON_LIFT);
                     return true;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/ActivateDisplayOnLiftSensitivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/ActivateDisplayOnLiftSensitivity.java
new file mode 100644
index 000000000..f50750b78
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/ActivateDisplayOnLiftSensitivity.java
@@ -0,0 +1,22 @@
+/*  Copyright (C) 2022 José Rebelo
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.devices.huami;
+
+public enum ActivateDisplayOnLiftSensitivity {
+    NORMAL,
+    SENSITIVE
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiCoordinator.java
index c7e63a266..af54a0a2f 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiCoordinator.java
@@ -35,6 +35,7 @@ import java.text.SimpleDateFormat;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Date;
+import java.util.Locale;
 
 import de.greenrobot.dao.query.QueryBuilder;
 import nodomain.freeyourgadget.gadgetbridge.GBApplication;
@@ -166,6 +167,14 @@ public abstract class HuamiCoordinator extends AbstractDeviceCoordinator {
         return getTimePreference(DeviceSettingsPreferenceConst.PREF_DISPLAY_ON_LIFT_END, "00:00", deviceAddress);
     }
 
+    public static ActivateDisplayOnLiftSensitivity getDisplayOnLiftSensitivity(String deviceAddress) {
+        final SharedPreferences prefs = GBApplication.getDeviceSpecificSharedPrefs(deviceAddress);
+
+        final String pref = prefs.getString(DeviceSettingsPreferenceConst.PREF_DISPLAY_ON_LIFT_SENSITIVITY, "sensitive");
+
+        return ActivateDisplayOnLiftSensitivity.valueOf(pref.toUpperCase(Locale.ROOT));
+    }
+
     public static DisconnectNotificationSetting getDisconnectNotificationSetting(Context context, String deviceAddress) {
         Prefs prefs = new Prefs(GBApplication.getDeviceSpecificSharedPrefs(deviceAddress));
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiService.java
index 35fc46c9e..9cc8245f8 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiService.java
@@ -149,6 +149,8 @@ public class HuamiService {
     public static final byte[] COMMAND_ENABLE_DISPLAY_ON_LIFT_WRIST = new byte[]{ENDPOINT_DISPLAY, 0x05, 0x00, 0x01};
     public static final byte[] COMMAND_DISABLE_DISPLAY_ON_LIFT_WRIST = new byte[]{ENDPOINT_DISPLAY, 0x05, 0x00, 0x00};
     public static final byte[] COMMAND_SCHEDULE_DISPLAY_ON_LIFT_WRIST = new byte[]{ENDPOINT_DISPLAY, 0x05, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00};
+    public static final byte[] COMMAND_DISPLAY_ON_LIFT_WRIST_SPEED_NORMAL = new byte[]{ENDPOINT_DISPLAY, 0x23, 0x00, 0x00};
+    public static final byte[] COMMAND_DISPLAY_ON_LIFT_WRIST_SPEED_SENSITIVE = new byte[]{ENDPOINT_DISPLAY, 0x23, 0x00, 0x01};
     public static final byte[] COMMAND_ENABLE_GOAL_NOTIFICATION = new byte[]{ENDPOINT_DISPLAY, 0x06, 0x00, 0x01};
     public static final byte[] COMMAND_DISABLE_GOAL_NOTIFICATION = new byte[]{ENDPOINT_DISPLAY, 0x06, 0x00, 0x00};
     public static final byte[] COMMAND_ENABLE_ROTATE_WRIST_TO_SWITCH_INFO = new byte[]{ENDPOINT_DISPLAY, 0x0d, 0x00, 0x01};
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband5/MiBand5Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband5/MiBand5Coordinator.java
index 477f3036f..75b2061ee 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband5/MiBand5Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband5/MiBand5Coordinator.java
@@ -94,7 +94,7 @@ public class MiBand5Coordinator extends HuamiCoordinator {
                 R.xml.devicesettings_timeformat,
                 R.xml.devicesettings_dateformat,
                 R.xml.devicesettings_nightmode,
-                R.xml.devicesettings_liftwrist_display,
+                R.xml.devicesettings_liftwrist_display_sensitivity,
                 R.xml.devicesettings_swipeunlock,
                 R.xml.devicesettings_sync_calendar,
                 R.xml.devicesettings_reserve_reminders_calendar,
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiSupport.java
index 2b738ad28..665c34f5a 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiSupport.java
@@ -72,6 +72,7 @@ import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventVersionInf
 import nodomain.freeyourgadget.gadgetbridge.devices.DeviceCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.SampleProvider;
 import nodomain.freeyourgadget.gadgetbridge.devices.huami.ActivateDisplayOnLift;
+import nodomain.freeyourgadget.gadgetbridge.devices.huami.ActivateDisplayOnLiftSensitivity;
 import nodomain.freeyourgadget.gadgetbridge.devices.huami.DisconnectNotificationSetting;
 import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst;
 import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiCoordinator;
@@ -129,6 +130,7 @@ import nodomain.freeyourgadget.gadgetbridge.service.devices.common.SimpleNotific
 import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.actions.StopNotificationAction;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.miband2.Mi2NotificationStrategy;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.miband2.Mi2TextNotificationStrategy;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.miband5.MiBand5Support;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.operations.FetchActivityOperation;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.operations.InitOperation;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.operations.InitOperation2021;
@@ -151,6 +153,7 @@ import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.Dev
 import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst.PREF_ALLOW_HIGH_MTU;
 import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst.PREF_BT_CONNECTED_ADVERTISEMENT;
 import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst.PREF_DATEFORMAT;
+import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst.PREF_DISPLAY_ON_LIFT_SENSITIVITY;
 import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst.PREF_DISPLAY_ON_LIFT_START;
 import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst.PREF_DISPLAY_ON_LIFT_END;
 import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst.PREF_DISCONNECT_NOTIFICATION;
@@ -188,6 +191,7 @@ import static nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst.PREF
 import static nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst.PREF_DEVICE_ACTION_WOKE_UP_BROADCAST;
 import static nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst.PREF_DEVICE_ACTION_WOKE_UP_SELECTION;
 import static nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiService.DISPLAY_ITEM_BIT_CLOCK;
+import static nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiService.ENDPOINT_DISPLAY;
 import static nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiService.ENDPOINT_DISPLAY_ITEMS;
 import static nodomain.freeyourgadget.gadgetbridge.devices.miband.MiBandConst.DEFAULT_VALUE_VIBRATION_COUNT;
 import static nodomain.freeyourgadget.gadgetbridge.devices.miband.MiBandConst.DEFAULT_VALUE_VIBRATION_PROFILE;
@@ -2237,6 +2241,9 @@ public class HuamiSupport extends AbstractBTLEDeviceSupport {
                 case PREF_DISPLAY_ON_LIFT_END:
                     setActivateDisplayOnLiftWrist(builder);
                     break;
+                case PREF_DISPLAY_ON_LIFT_SENSITIVITY:
+                    setActivateDisplayOnLiftWristSensitivity(builder);
+                    break;
                 case PREF_DISCONNECT_NOTIFICATION:
                 case PREF_DISCONNECT_NOTIFICATION_START:
                 case PREF_DISCONNECT_NOTIFICATION_END:
@@ -2666,6 +2673,23 @@ public class HuamiSupport extends AbstractBTLEDeviceSupport {
         return this;
     }
 
+    protected HuamiSupport setActivateDisplayOnLiftWristSensitivity(TransactionBuilder builder) {
+        final ActivateDisplayOnLiftSensitivity sensitivity = HuamiCoordinator.getDisplayOnLiftSensitivity(gbDevice.getAddress());
+        LOG.info("Setting activate display on lift wrist sensitivity to " + sensitivity);
+
+        switch (sensitivity) {
+            case SENSITIVE:
+                writeToConfiguration(builder, HuamiService.COMMAND_DISPLAY_ON_LIFT_WRIST_SPEED_SENSITIVE);
+                break;
+            case NORMAL:
+            default:
+                writeToConfiguration(builder, HuamiService.COMMAND_DISPLAY_ON_LIFT_WRIST_SPEED_NORMAL);
+                break;
+        }
+
+        return this;
+    }
+
     protected HuamiSupport setDisplayItems(TransactionBuilder builder) {
         SharedPreferences prefs = GBApplication.getDeviceSpecificSharedPrefs(gbDevice.getAddress());
         Set<String> pages = prefs.getStringSet(HuamiConst.PREF_DISPLAY_ITEMS, new HashSet<>(Arrays.asList(getContext().getResources().getStringArray(R.array.pref_mi2_display_items_default))));
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/miband5/MiBand5Support.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/miband5/MiBand5Support.java
index 79dbeb075..d96edc865 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/miband5/MiBand5Support.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/miband5/MiBand5Support.java
@@ -50,7 +50,6 @@ public class MiBand5Support extends MiBand4Support {
         return new MiBand5FWHelper(uri, context);
     }
 
-
     @Override
     public boolean supportsSunriseSunsetWindHumidity() {
         return true;
@@ -60,4 +59,11 @@ public class MiBand5Support extends MiBand4Support {
     public int getActivitySampleSize() {
         return 8;
     }
+
+    @Override
+    public void phase3Initialize(TransactionBuilder builder) {
+        super.phase3Initialize(builder);
+        LOG.info("phase3Initialize...");
+        setActivateDisplayOnLiftWristSensitivity(builder); // TODO? Move this to HuamiSupport?
+    }
 }
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index ef6fc510c..e9b7245bd 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -272,6 +272,15 @@
         <item>@string/p_scheduled</item>
     </string-array>
 
+    <string-array name="activate_display_on_lift_sensitivity">
+        <item>@string/normal</item>
+        <item>@string/sensitive</item>
+    </string-array>
+    <string-array name="activate_display_on_lift_sensitivity_values">
+        <item>@string/p_normal</item>
+        <item>@string/p_sensitive</item>
+    </string-array>
+
     <string-array name="mi3_night_mode">
         <item>@string/off</item>
         <!--
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 7b5386c0a..8ec87947b 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -678,6 +678,7 @@
     <string name="mi3_prefs_night_mode_summary">Lower band screen brightness automatically at night</string>
     <string name="bip_prefs_shortcuts">Shortcuts</string>
     <string name="bip_prefs_shotcuts_summary">Choose the shortcuts on the band screen</string>
+    <string name="prefs_activate_display_on_lift_sensitivity">Sensitivity</string>
     <string name="pref_title_force_white_color_scheme">Force black on white color scheme</string>
     <string name="pref_summary_force_white_color_scheme">Useful if you your watch has dark hands</string>
     <string name="lefun_prefs_hydration_reminder_title">Hydration reminder</string>
@@ -838,6 +839,8 @@
     <string name="mi2_enable_text_notifications_summary"><![CDATA[Needs firmware >= 1.0.1.28 and Mili_pro.ft* installed.]]></string>
     <string name="on">On</string>
     <string name="off">Off</string>
+    <string name="normal">Normal</string>
+    <string name="sensitive">Sensitive</string>
     <string name="mi2_dnd_off">Off</string>
     <string name="mi3_night_mode_sunset">At sunset</string>
     <string name="mi2_dnd_automatic">Automatic (sleep detection)</string>
diff --git a/app/src/main/res/values/values.xml b/app/src/main/res/values/values.xml
index 355fbad6a..e71663e87 100644
--- a/app/src/main/res/values/values.xml
+++ b/app/src/main/res/values/values.xml
@@ -69,6 +69,9 @@
     <item name="p_automatic" type="string">automatic</item>
     <item name="p_scheduled" type="string">scheduled</item>
 
+    <item name="p_normal" type="string">normal</item>
+    <item name="p_sensitive" type="string">sensitive</item>
+
     <item name="p_unit_metric" type="string">metric</item>
     <item name="p_unit_imperial" type="string">imperial</item>
 
diff --git a/app/src/main/res/xml/devicesettings_liftwrist_display_sensitivity.xml b/app/src/main/res/xml/devicesettings_liftwrist_display_sensitivity.xml
new file mode 100644
index 000000000..aa912138c
--- /dev/null
+++ b/app/src/main/res/xml/devicesettings_liftwrist_display_sensitivity.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+    <PreferenceScreen
+        android:icon="@drawable/ic_arrow_upward"
+        android:key="screen_liftwrist_display"
+        android:persistent="false"
+        android:title="@string/mi2_prefs_activate_display_on_lift">
+
+        <!-- workaround for missing toolbar -->
+        <PreferenceCategory android:title="@string/mi2_prefs_activate_display_on_lift" />
+
+        <ListPreference
+            android:defaultValue="@string/p_off"
+            android:entries="@array/activate_display_on_lift"
+            android:entryValues="@array/activate_display_on_lift_values"
+            android:key="activate_display_on_lift_wrist"
+            android:summary="%s"
+            android:title="@string/mi2_prefs_activate_display_on_lift" />
+
+        <ListPreference
+            android:defaultValue="@string/p_normal"
+            android:entries="@array/activate_display_on_lift_sensitivity"
+            android:entryValues="@array/activate_display_on_lift_sensitivity_values"
+            android:key="display_on_lift_sensitivity"
+            android:summary="%s"
+            android:title="@string/prefs_activate_display_on_lift_sensitivity" />
+
+        <nodomain.freeyourgadget.gadgetbridge.util.XTimePreference
+            android:defaultValue="00:00"
+            android:key="display_on_lift_start"
+            android:title="@string/mi2_prefs_do_not_disturb_start" />
+
+        <nodomain.freeyourgadget.gadgetbridge.util.XTimePreference
+            android:defaultValue="00:00"
+            android:key="display_on_lift_end"
+            android:title="@string/mi2_prefs_do_not_disturb_end" />
+
+    </PreferenceScreen>
+</androidx.preference.PreferenceScreen>
\ No newline at end of file

From d973f50560c72a4fb766ca6ebd535a39678a6ebf Mon Sep 17 00:00:00 2001
From: Andreas Shimokawa <shimokawa@fsfe.org>
Date: Mon, 9 May 2022 23:01:57 +0200
Subject: [PATCH 040/110] Mi Band 6: enable setting sensitivty for display on
 lift setting

Tested and seens to work
---
 .../gadgetbridge/devices/huami/miband6/MiBand6Coordinator.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband6/MiBand6Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband6/MiBand6Coordinator.java
index c55f4fa08..a5aba4b37 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband6/MiBand6Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband6/MiBand6Coordinator.java
@@ -79,7 +79,7 @@ public class MiBand6Coordinator extends HuamiCoordinator {
                 R.xml.devicesettings_timeformat,
                 R.xml.devicesettings_dateformat,
                 R.xml.devicesettings_nightmode,
-                R.xml.devicesettings_liftwrist_display,
+                R.xml.devicesettings_liftwrist_display_sensitivity,
                 R.xml.devicesettings_swipeunlock,
                 R.xml.devicesettings_sync_calendar,
                 R.xml.devicesettings_reserve_reminders_calendar,

From 5c6edea2335a80c7963ddfb320e00446616d1f09 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Mon, 9 May 2022 19:47:08 +0100
Subject: [PATCH 041/110] Mi Band 5: Add support for World Clocks

---
 .../gadgetbridge/daogen/GBDaoGenerator.java   |  21 +-
 app/build.gradle                              |   4 +
 app/src/main/AndroidManifest.xml              |  10 +
 .../gadgetbridge/GBApplication.java           |   5 +
 .../activities/ConfigureWorldClocks.java      | 218 ++++++++++++++++++
 .../activities/WorldClockDetails.java         | 174 ++++++++++++++
 .../DeviceSettingsActivity.java               |  31 +--
 .../DeviceSettingsPreferenceConst.java        |   2 +
 .../DeviceSpecificSettingsFragment.java       |  52 ++++-
 .../adapter/GBWorldClockListAdapter.java      | 132 +++++++++++
 .../gadgetbridge/database/DBHelper.java       |  42 ++++
 .../devices/AbstractDeviceCoordinator.java    |  10 +
 .../devices/DeviceCoordinator.java            |  10 +
 .../gadgetbridge/devices/EventHandler.java    |   3 +
 .../huami/miband5/MiBand5Coordinator.java     |  11 +
 .../gadgetbridge/impl/GBDeviceService.java    |   8 +
 .../gadgetbridge/model/DeviceService.java     |   2 +
 .../gadgetbridge/model/WorldClock.java        |  30 +++
 .../service/DeviceCommunicationService.java   |   7 +
 .../service/ServiceDeviceSupport.java         |   9 +
 .../btle/AbstractBTLEDeviceSupport.java       |   6 +
 .../service/devices/huami/HuamiSupport.java   | 123 ++++++++++
 .../serial/AbstractSerialDeviceSupport.java   |   7 +
 .../service/serial/GBDeviceProtocol.java      |   5 +
 .../activity_configure_world_clocks.xml       |  27 +++
 .../layout/activity_world_clock_details.xml   |  97 ++++++++
 app/src/main/res/layout/device_itemv2.xml     |  14 +-
 app/src/main/res/layout/item_world_clock.xml  |  64 +++++
 app/src/main/res/values/strings.xml           |   9 +
 .../res/xml/devicesettings_world_clocks.xml   |   8 +
 30 files changed, 1100 insertions(+), 41 deletions(-)
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ConfigureWorldClocks.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/WorldClockDetails.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/GBWorldClockListAdapter.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/WorldClock.java
 create mode 100644 app/src/main/res/layout/activity_configure_world_clocks.xml
 create mode 100644 app/src/main/res/layout/activity_world_clock_details.xml
 create mode 100644 app/src/main/res/layout/item_world_clock.xml
 create mode 100644 app/src/main/res/xml/devicesettings_world_clocks.xml

diff --git a/GBDaoGenerator/src/nodomain/freeyourgadget/gadgetbridge/daogen/GBDaoGenerator.java b/GBDaoGenerator/src/nodomain/freeyourgadget/gadgetbridge/daogen/GBDaoGenerator.java
index b6f5fdef6..11cda37c9 100644
--- a/GBDaoGenerator/src/nodomain/freeyourgadget/gadgetbridge/daogen/GBDaoGenerator.java
+++ b/GBDaoGenerator/src/nodomain/freeyourgadget/gadgetbridge/daogen/GBDaoGenerator.java
@@ -43,7 +43,7 @@ public class GBDaoGenerator {
 
 
     public static void main(String[] args) throws Exception {
-        final Schema schema = new Schema(37, MAIN_PACKAGE + ".entities");
+        final Schema schema = new Schema(38, MAIN_PACKAGE + ".entities");
 
         Entity userAttributes = addUserAttributes(schema);
         Entity user = addUserInfo(schema, userAttributes);
@@ -87,6 +87,7 @@ public class GBDaoGenerator {
         addCalendarSyncState(schema, device);
         addAlarms(schema, user, device);
         addReminders(schema, user, device);
+        addWorldClocks(schema, user, device);
 
         Entity notificationFilter = addNotificationFilters(schema);
 
@@ -561,6 +562,24 @@ public class GBDaoGenerator {
         reminder.addToOne(device, deviceId);
     }
 
+    private static void addWorldClocks(Schema schema, Entity user, Entity device) {
+        Entity worldClock = addEntity(schema, "WorldClock");
+        worldClock.implementsInterface("nodomain.freeyourgadget.gadgetbridge.model.WorldClock");
+        Property deviceId = worldClock.addLongProperty("deviceId").notNull().getProperty();
+        Property userId = worldClock.addLongProperty("userId").notNull().getProperty();
+        Property worldClockId = worldClock.addStringProperty("worldClockId").notNull().primaryKey().getProperty();
+        Index indexUnique = new Index();
+        indexUnique.addProperty(deviceId);
+        indexUnique.addProperty(userId);
+        indexUnique.addProperty(worldClockId);
+        indexUnique.makeUnique();
+        worldClock.addIndex(indexUnique);
+        worldClock.addStringProperty("label").notNull();
+        worldClock.addStringProperty("timeZoneId").notNull();
+        worldClock.addToOne(user, userId);
+        worldClock.addToOne(device, deviceId);
+    }
+
     private static void addNotificationFilterEntry(Schema schema, Entity notificationFilterEntity) {
         Entity notificatonFilterEntry = addEntity(schema, "NotificationFilterEntry");
         notificatonFilterEntry.addIdProperty().autoincrement();
diff --git a/app/build.gradle b/app/build.gradle
index eb6da978e..aff0035ab 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -238,6 +238,10 @@ dependencies {
     implementation 'com.google.protobuf:protobuf-lite:3.0.1'
     implementation "androidx.multidex:multidex:2.0.1"
     implementation 'com.android.volley:volley:1.2.1'
+
+    // JSR-310 timezones backport for Android, since we're still on java 7
+    implementation 'com.jakewharton.threetenabp:threetenabp:1.4.0'
+    testImplementation 'org.threeten:threetenbp:1.6.0'
 }
 
 preBuild.dependsOn(":GBDaoGenerator:genSources")
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index a2078b549..6a424dfb7 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -498,6 +498,10 @@
             android:name=".activities.ConfigureReminders"
             android:label="@string/title_activity_set_reminders"
             android:parentActivityName=".activities.ControlCenterv2" />
+        <activity
+            android:name=".activities.ConfigureWorldClocks"
+            android:label="@string/pref_world_clocks_title"
+            android:parentActivityName=".activities.ControlCenterv2" />
         <activity
             android:name=".activities.devicesettings.DeviceSettingsActivity"
             android:label="@string/title_activity_device_specific_settings"
@@ -513,6 +517,12 @@
             android:parentActivityName=".activities.ConfigureReminders"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="adjustResize" />
+        <activity
+            android:name=".activities.WorldClockDetails"
+            android:label="@string/title_activity_world_clock_details"
+            android:parentActivityName=".activities.ConfigureWorldClocks"
+            android:screenOrientation="portrait"
+            android:windowSoftInputMode="adjustResize" />
         <activity
             android:name=".activities.VibrationActivity"
             android:label="@string/title_activity_vibration"
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GBApplication.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GBApplication.java
index 3085c607e..6523fabe9 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GBApplication.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GBApplication.java
@@ -100,6 +100,8 @@ import static nodomain.freeyourgadget.gadgetbridge.util.GB.NOTIFICATION_ID_ERROR
 
 import androidx.multidex.MultiDex;
 
+import com.jakewharton.threetenabp.AndroidThreeTen;
+
 /**
  * Main Application class that initializes and provides access to certain things like
  * logging and DB access.
@@ -191,6 +193,9 @@ public class GBApplication extends Application {
             return;
         }
 
+        // Initialize the timezones library
+        AndroidThreeTen.init(this);
+
         sharedPrefs = PreferenceManager.getDefaultSharedPreferences(context);
         prefs = new Prefs(sharedPrefs);
         gbPrefs = new GBPrefs(prefs);
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ConfigureWorldClocks.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ConfigureWorldClocks.java
new file mode 100644
index 000000000..1da0d937e
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ConfigureWorldClocks.java
@@ -0,0 +1,218 @@
+/*  Copyright (C) 2022 José Rebelo
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.activities;
+
+import android.app.AlertDialog;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.os.Bundle;
+import android.view.MenuItem;
+import android.view.View;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.text.SimpleDateFormat;
+import java.util.List;
+import java.util.Locale;
+import java.util.TimeZone;
+import java.util.UUID;
+
+import nodomain.freeyourgadget.gadgetbridge.GBApplication;
+import nodomain.freeyourgadget.gadgetbridge.R;
+import nodomain.freeyourgadget.gadgetbridge.adapter.GBWorldClockListAdapter;
+import nodomain.freeyourgadget.gadgetbridge.database.DBHandler;
+import nodomain.freeyourgadget.gadgetbridge.database.DBHelper;
+import nodomain.freeyourgadget.gadgetbridge.devices.DeviceCoordinator;
+import nodomain.freeyourgadget.gadgetbridge.entities.DaoSession;
+import nodomain.freeyourgadget.gadgetbridge.entities.Device;
+import nodomain.freeyourgadget.gadgetbridge.entities.User;
+import nodomain.freeyourgadget.gadgetbridge.entities.WorldClock;
+import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
+import nodomain.freeyourgadget.gadgetbridge.util.DeviceHelper;
+
+
+public class ConfigureWorldClocks extends AbstractGBActivity {
+    private static final Logger LOG = LoggerFactory.getLogger(ConfigureWorldClocks.class);
+
+    private static final int REQ_CONFIGURE_WORLD_CLOCK = 1;
+
+    private GBWorldClockListAdapter mGBWorldClockListAdapter;
+    private GBDevice gbDevice;
+
+    private BroadcastReceiver timeTickBroadcastReceiver;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        setContentView(R.layout.activity_configure_world_clocks);
+
+        gbDevice = getIntent().getParcelableExtra(GBDevice.EXTRA_DEVICE);
+
+        mGBWorldClockListAdapter = new GBWorldClockListAdapter(this);
+
+        final RecyclerView worldClocksRecyclerView = findViewById(R.id.world_clock_list);
+        worldClocksRecyclerView.setHasFixedSize(true);
+        worldClocksRecyclerView.setLayoutManager(new LinearLayoutManager(this));
+        worldClocksRecyclerView.setAdapter(mGBWorldClockListAdapter);
+        updateWorldClocksFromDB();
+
+        final FloatingActionButton fab = findViewById(R.id.fab);
+        fab.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                final DeviceCoordinator coordinator = DeviceHelper.getInstance().getCoordinator(gbDevice);
+
+                int deviceSlots = coordinator.getWorldClocksSlotCount();
+
+                if (mGBWorldClockListAdapter.getItemCount() >= deviceSlots) {
+                    // No more free slots
+                    new AlertDialog.Builder(v.getContext())
+                            .setTitle(R.string.world_clock_no_free_slots_title)
+                            .setMessage(getBaseContext().getString(R.string.world_clock_no_free_slots_description, String.format(Locale.getDefault(), "%d", deviceSlots)))
+                            .setIcon(R.drawable.ic_warning)
+                            .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
+                                public void onClick(final DialogInterface dialog, final int whichButton) {
+                                }
+                            })
+                            .show();
+                    return;
+                }
+
+                final WorldClock worldClock;
+                try (DBHandler db = GBApplication.acquireDB()) {
+                    final DaoSession daoSession = db.getDaoSession();
+                    final Device device = DBHelper.getDevice(gbDevice, daoSession);
+                    final User user = DBHelper.getUser(daoSession);
+                    worldClock = createDefaultWorldClock(device, user);
+                } catch (final Exception e) {
+                    LOG.error("Error accessing database", e);
+                    return;
+                }
+
+                configureWorldClock(worldClock);
+            }
+        });
+    }
+
+    @Override
+    protected void onStart() {
+        super.onStart();
+
+        timeTickBroadcastReceiver = new BroadcastReceiver() {
+            @Override
+            public void onReceive(final Context context, Intent intent) {
+                if (Intent.ACTION_TIME_TICK.equals(intent.getAction())) {
+                    // Refresh the UI, to update the current time in each timezone
+                    mGBWorldClockListAdapter.notifyDataSetChanged();
+                }
+            }
+        };
+
+        registerReceiver(timeTickBroadcastReceiver, new IntentFilter(Intent.ACTION_TIME_TICK));
+    }
+
+    @Override
+    protected void onStop() {
+        super.onStop();
+
+        if (timeTickBroadcastReceiver != null) {
+            unregisterReceiver(timeTickBroadcastReceiver);
+        }
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        // Refresh to update the current time on each clock
+        mGBWorldClockListAdapter.notifyDataSetChanged();
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+
+        if (requestCode == REQ_CONFIGURE_WORLD_CLOCK && resultCode == 1) {
+            updateWorldClocksFromDB();
+            sendWorldClocksToDevice();
+        }
+    }
+
+    private WorldClock createDefaultWorldClock(@NonNull Device device, @NonNull User user) {
+        final WorldClock worldClock = new WorldClock();
+        final String timezone = TimeZone.getDefault().getID();
+        worldClock.setTimeZoneId(timezone);
+        final String[] timezoneParts = timezone.split("/");
+        worldClock.setLabel(timezoneParts[timezoneParts.length - 1]);
+
+        worldClock.setDeviceId(device.getId());
+        worldClock.setUserId(user.getId());
+        worldClock.setWorldClockId(UUID.randomUUID().toString());
+
+        return worldClock;
+    }
+
+    /**
+     * Reads the available worldClocks from the database and updates the view afterwards.
+     */
+    private void updateWorldClocksFromDB() {
+        final List<WorldClock> worldClocks = DBHelper.getWorldClocks(gbDevice);
+
+        mGBWorldClockListAdapter.setWorldClockList(worldClocks);
+        mGBWorldClockListAdapter.notifyDataSetChanged();
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case android.R.id.home:
+                // back button
+                finish();
+                return true;
+        }
+        return super.onOptionsItemSelected(item);
+    }
+
+    public void configureWorldClock(final WorldClock worldClock) {
+        final Intent startIntent = new Intent(getApplicationContext(), WorldClockDetails.class);
+        startIntent.putExtra(GBDevice.EXTRA_DEVICE, gbDevice);
+        startIntent.putExtra(WorldClock.EXTRA_WORLD_CLOCK, worldClock);
+        startActivityForResult(startIntent, REQ_CONFIGURE_WORLD_CLOCK);
+    }
+
+    public void deleteWorldClock(final WorldClock worldClock) {
+        DBHelper.delete(worldClock);
+        updateWorldClocksFromDB();
+        sendWorldClocksToDevice();
+    }
+
+    private void sendWorldClocksToDevice() {
+        if (gbDevice.isInitialized()) {
+            GBApplication.deviceService().onSetWorldClocks(mGBWorldClockListAdapter.getWorldClockList());
+        }
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/WorldClockDetails.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/WorldClockDetails.java
new file mode 100644
index 000000000..a1f3c5646
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/WorldClockDetails.java
@@ -0,0 +1,174 @@
+/*  Copyright (C) 2022 José Rebelo
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.activities;
+
+import android.app.AlertDialog;
+import android.content.DialogInterface;
+import android.os.Bundle;
+import android.text.Editable;
+import android.text.InputFilter;
+import android.text.TextWatcher;
+import android.view.MenuItem;
+import android.view.View;
+import android.widget.ArrayAdapter;
+import android.widget.EditText;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.TimeZone;
+
+import nodomain.freeyourgadget.gadgetbridge.R;
+import nodomain.freeyourgadget.gadgetbridge.database.DBHelper;
+import nodomain.freeyourgadget.gadgetbridge.devices.DeviceCoordinator;
+import nodomain.freeyourgadget.gadgetbridge.entities.WorldClock;
+import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
+import nodomain.freeyourgadget.gadgetbridge.util.DeviceHelper;
+import nodomain.freeyourgadget.gadgetbridge.util.GB;
+
+public class WorldClockDetails extends AbstractGBActivity {
+    private static final Logger LOG = LoggerFactory.getLogger(WorldClockDetails.class);
+
+    private WorldClock worldClock;
+    private GBDevice device;
+
+    ArrayAdapter<String> timezoneAdapter;
+
+    TextView worldClockTimezone;
+    EditText worldClockLabel;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_world_clock_details);
+
+        worldClock = (WorldClock) getIntent().getSerializableExtra(WorldClock.EXTRA_WORLD_CLOCK);
+
+        if (worldClock == null) {
+            GB.toast("No worldClock provided to WorldClockDetails Activity", Toast.LENGTH_LONG, GB.ERROR);
+            finish();
+            return;
+        }
+
+        worldClockTimezone = findViewById(R.id.world_clock_timezone);
+        worldClockLabel = findViewById(R.id.world_clock_label);
+
+        device = getIntent().getParcelableExtra(GBDevice.EXTRA_DEVICE);
+        final DeviceCoordinator coordinator = DeviceHelper.getInstance().getCoordinator(device);
+
+        final String[] timezoneIDs = TimeZone.getAvailableIDs();
+        timezoneAdapter = new ArrayAdapter<>(this, android.R.layout.simple_list_item_1, timezoneIDs);
+
+        final View cardTimezone = findViewById(R.id.card_timezone);
+        cardTimezone.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                new AlertDialog.Builder(WorldClockDetails.this).setAdapter(timezoneAdapter, new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialogInterface, int i) {
+                        worldClock.setTimeZoneId(timezoneIDs[i]);
+                        updateUiFromWorldClock();
+                    }
+                }).create().show();
+            }
+        });
+
+        worldClockLabel.setFilters(new InputFilter[]{new InputFilter.LengthFilter(coordinator.getWorldClocksLabelLength())});
+        worldClockLabel.addTextChangedListener(new TextWatcher() {
+            @Override
+            public void beforeTextChanged(final CharSequence s, int start, int count, int after) {
+            }
+
+            @Override
+            public void onTextChanged(final CharSequence s, int start, int before, int count) {
+            }
+
+            @Override
+            public void afterTextChanged(final Editable s) {
+                worldClock.setLabel(s.toString());
+            }
+        });
+
+        final FloatingActionButton fab = findViewById(R.id.fab_save);
+        fab.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                updateWorldClock();
+                WorldClockDetails.this.setResult(1);
+                finish();
+            }
+        });
+
+        updateUiFromWorldClock();
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case android.R.id.home:
+                // back button
+                // TODO confirm when exiting without saving
+                finish();
+                return true;
+        }
+        return super.onOptionsItemSelected(item);
+    }
+
+    private void updateWorldClock() {
+        DBHelper.store(worldClock);
+    }
+
+    @Override
+    protected void onSaveInstanceState(Bundle state) {
+        super.onSaveInstanceState(state);
+        state.putSerializable("worldClock", worldClock);
+    }
+
+    @Override
+    protected void onRestoreInstanceState(Bundle savedInstanceState) {
+        super.onRestoreInstanceState(savedInstanceState);
+        worldClock = (WorldClock) savedInstanceState.getSerializable("worldClock");
+        updateUiFromWorldClock();
+    }
+
+    public void updateUiFromWorldClock() {
+        final String oldTimezone = worldClockTimezone.getText().toString();
+
+        worldClockTimezone.setText(worldClock.getTimeZoneId());
+
+        // Check if the label was still the default (the timezone city name)
+        // If so, and if the user changed the timezone, update the label to match the new city name
+        if (!oldTimezone.equals(worldClock.getTimeZoneId())) {
+            final String[] oldTimezoneParts = oldTimezone.split("/");
+            final String[] newTimezoneParts = worldClock.getTimeZoneId().split("/");
+            final String newLabel = newTimezoneParts[newTimezoneParts.length - 1];
+            final String oldLabel = oldTimezoneParts[oldTimezoneParts.length - 1];
+            final String userLabel = worldClockLabel.getText().toString();
+
+            if (userLabel.equals(oldLabel)) {
+                // The label was still the original, so let's override it with the new city
+                worldClock.setLabel(newLabel);
+            }
+        }
+
+        worldClockLabel.setText(worldClock.getLabel());
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsActivity.java
index a34fde8bb..9ed08de5d 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsActivity.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsActivity.java
@@ -48,20 +48,7 @@ public class DeviceSettingsActivity extends AbstractGBActivity implements
         if (savedInstanceState == null) {
             Fragment fragment = getSupportFragmentManager().findFragmentByTag(DeviceSpecificSettingsFragment.FRAGMENT_TAG);
             if (fragment == null) {
-                DeviceCoordinator coordinator = DeviceHelper.getInstance().getCoordinator(device);
-                int[] supportedSettings = coordinator.getSupportedDeviceSpecificSettings(device);
-                String[] supportedLanguages = coordinator.getSupportedLanguageSettings(device);
-
-                if (supportedLanguages != null) {
-                    supportedSettings = ArrayUtils.insert(0, supportedSettings, R.xml.devicesettings_language_generic);
-                }
-                if (coordinator.supportsActivityTracking()) {
-                    supportedSettings = ArrayUtils.addAll(supportedSettings, R.xml.devicesettings_chartstabs);
-                    supportedSettings = ArrayUtils.addAll(supportedSettings, R.xml.devicesettings_device_card_activity_card_preferences);
-                }
-
-                final DeviceSpecificSettingsCustomizer deviceSpecificSettingsCustomizer = coordinator.getDeviceSpecificSettingsCustomizer(device);
-                fragment = DeviceSpecificSettingsFragment.newInstance(device.getAddress(), supportedSettings, supportedLanguages, deviceSpecificSettingsCustomizer);
+                fragment = DeviceSpecificSettingsFragment.newInstance(device);
             }
             getSupportFragmentManager()
                     .beginTransaction()
@@ -73,21 +60,7 @@ public class DeviceSettingsActivity extends AbstractGBActivity implements
 
     @Override
     public boolean onPreferenceStartScreen(PreferenceFragmentCompat caller, PreferenceScreen preferenceScreen) {
-        DeviceCoordinator coordinator = DeviceHelper.getInstance().getCoordinator(device);
-        int[] supportedSettings = coordinator.getSupportedDeviceSpecificSettings(device);
-        String[] supportedLanguages = coordinator.getSupportedLanguageSettings(device);
-
-        if (supportedLanguages != null) {
-            supportedSettings = ArrayUtils.insert(0, supportedSettings, R.xml.devicesettings_language_generic);
-        }
-
-        if (coordinator.supportsActivityTracking()) {
-            supportedSettings = ArrayUtils.addAll(supportedSettings, R.xml.devicesettings_chartstabs);
-            supportedSettings = ArrayUtils.addAll(supportedSettings, R.xml.devicesettings_device_card_activity_card_preferences);
-        }
-
-        final DeviceSpecificSettingsCustomizer deviceSpecificSettingsCustomizer = coordinator.getDeviceSpecificSettingsCustomizer(device);
-        PreferenceFragmentCompat fragment = DeviceSpecificSettingsFragment.newInstance(device.getAddress(), supportedSettings, supportedLanguages, deviceSpecificSettingsCustomizer);
+        final PreferenceFragmentCompat fragment = DeviceSpecificSettingsFragment.newInstance(device);
         Bundle args = fragment.getArguments();
         args.putString(PreferenceFragmentCompat.ARG_PREFERENCE_ROOT, preferenceScreen.getKey());
         fragment.setArguments(args);
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsPreferenceConst.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsPreferenceConst.java
index 1f82f62e6..39964bdcd 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsPreferenceConst.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsPreferenceConst.java
@@ -112,6 +112,8 @@ public class DeviceSettingsPreferenceConst {
     public static final String PREF_KEY_VIBRATION = "key_vibration";
     public static final String PREF_FAKE_RING_DURATION = "fake_ring_duration";
 
+    public static final String PREF_WORLD_CLOCKS = "pref_world_clocks";
+
     public static final String PREF_ANTILOST_ENABLED = "pref_antilost_enabled";
     public static final String PREF_HYDRATION_SWITCH = "pref_hydration_switch";
     public static final String PREF_HYDRATION_PERIOD = "pref_hydration_period";
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 5f817cc9d..4bbd36b6a 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
@@ -20,6 +20,7 @@ import android.content.Intent;
 import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.text.InputType;
+import android.view.View;
 import android.widget.EditText;
 
 import androidx.annotation.NonNull;
@@ -47,11 +48,17 @@ import java.util.Objects;
 
 import nodomain.freeyourgadget.gadgetbridge.GBApplication;
 import nodomain.freeyourgadget.gadgetbridge.R;
+import nodomain.freeyourgadget.gadgetbridge.activities.ConfigureWorldClocks;
+import nodomain.freeyourgadget.gadgetbridge.activities.SettingsActivity;
+import nodomain.freeyourgadget.gadgetbridge.devices.DeviceCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.DeviceManager;
 import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst;
 import nodomain.freeyourgadget.gadgetbridge.devices.makibeshr3.MakibesHR3Constants;
 import nodomain.freeyourgadget.gadgetbridge.devices.miband.MiBandConst;
+import nodomain.freeyourgadget.gadgetbridge.devices.miband.MiBandPreferencesActivity;
+import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
 import nodomain.freeyourgadget.gadgetbridge.model.CannedMessagesSpec;
+import nodomain.freeyourgadget.gadgetbridge.util.DeviceHelper;
 import nodomain.freeyourgadget.gadgetbridge.util.Prefs;
 import nodomain.freeyourgadget.gadgetbridge.util.XTimePreference;
 import nodomain.freeyourgadget.gadgetbridge.util.XTimePreferenceFragment;
@@ -89,6 +96,8 @@ public class DeviceSpecificSettingsFragment extends PreferenceFragmentCompat imp
 
     private DeviceSpecificSettingsCustomizer deviceSpecificSettingsCustomizer;
 
+    private GBDevice device;
+
     private void setSettingsFileSuffix(String settingsFileSuffix, @NonNull int[] supportedSettings, String[] supportedLanguages) {
         Bundle args = new Bundle();
         args.putString("settingsFileSuffix", settingsFileSuffix);
@@ -103,6 +112,12 @@ public class DeviceSpecificSettingsFragment extends PreferenceFragmentCompat imp
         setArguments(args);
     }
 
+    private void setDevice(final GBDevice device) {
+        final Bundle args = getArguments() != null ? getArguments() : new Bundle();
+        args.putParcelable("device", device);
+        setArguments(args);
+    }
+
     @Override
     public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
         Bundle arguments = getArguments();
@@ -113,6 +128,7 @@ public class DeviceSpecificSettingsFragment extends PreferenceFragmentCompat imp
         int[] supportedSettings = arguments.getIntArray("supportedSettings");
         String[] supportedLanguages = arguments.getStringArray("supportedLanguages");
         this.deviceSpecificSettingsCustomizer = arguments.getParcelable("deviceSpecificSettingsCustomizer");
+        this.device = arguments.getParcelable("device");
 
         if (settingsFileSuffix == null || supportedSettings == null) {
             return;
@@ -587,6 +603,19 @@ public class DeviceSpecificSettingsFragment extends PreferenceFragmentCompat imp
             });
         }
 
+        final Preference worldClocks = findPreference(PREF_WORLD_CLOCKS);
+        if (worldClocks != null) {
+            worldClocks.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
+                @Override
+                public boolean onPreferenceClick(Preference preference) {
+                    final Intent intent = new Intent(getContext(), ConfigureWorldClocks.class);
+                    intent.putExtra(GBDevice.EXTRA_DEVICE, device);
+                    startActivity(intent);
+                    return true;
+                }
+            });
+        }
+
         final Preference cannedMessagesDismissCall = findPreference("canned_messages_dismisscall_send");
         if (cannedMessagesDismissCall != null) {
             cannedMessagesDismissCall.setOnPreferenceClickListener(new androidx.preference.Preference.OnPreferenceClickListener() {
@@ -704,13 +733,28 @@ public class DeviceSpecificSettingsFragment extends PreferenceFragmentCompat imp
         }
     }
 
-    static DeviceSpecificSettingsFragment newInstance(String settingsFileSuffix,
-                                                      @NonNull int[] supportedSettings,
-                                                      String[] supportedLanguages,
-                                                      DeviceSpecificSettingsCustomizer deviceSpecificSettingsCustomizer) {
+    static DeviceSpecificSettingsFragment newInstance(GBDevice device) {
+        final DeviceCoordinator coordinator = DeviceHelper.getInstance().getCoordinator(device);
+        int[] supportedSettings = coordinator.getSupportedDeviceSpecificSettings(device);
+        String[] supportedLanguages = coordinator.getSupportedLanguageSettings(device);
+
+        if (supportedLanguages != null) {
+            supportedSettings = ArrayUtils.insert(0, supportedSettings, R.xml.devicesettings_language_generic);
+        }
+
+        if (coordinator.supportsActivityTracking()) {
+            supportedSettings = ArrayUtils.addAll(supportedSettings, R.xml.devicesettings_chartstabs);
+            supportedSettings = ArrayUtils.addAll(supportedSettings, R.xml.devicesettings_device_card_activity_card_preferences);
+        }
+
+        final DeviceSpecificSettingsCustomizer deviceSpecificSettingsCustomizer = coordinator.getDeviceSpecificSettingsCustomizer(device);
+
+        final String settingsFileSuffix = device.getAddress();
+
         final DeviceSpecificSettingsFragment fragment = new DeviceSpecificSettingsFragment();
         fragment.setSettingsFileSuffix(settingsFileSuffix, supportedSettings, supportedLanguages);
         fragment.setDeviceSpecificSettingsCustomizer(deviceSpecificSettingsCustomizer);
+        fragment.setDevice(device);
 
         return fragment;
     }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/GBWorldClockListAdapter.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/GBWorldClockListAdapter.java
new file mode 100644
index 000000000..82f07cde9
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/GBWorldClockListAdapter.java
@@ -0,0 +1,132 @@
+/*  Copyright (C) 2022 José Rebelo
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.adapter;
+
+
+import android.app.AlertDialog;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.cardview.widget.CardView;
+import androidx.recyclerview.widget.RecyclerView;
+
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Locale;
+import java.util.TimeZone;
+
+import nodomain.freeyourgadget.gadgetbridge.GBApplication;
+import nodomain.freeyourgadget.gadgetbridge.R;
+import nodomain.freeyourgadget.gadgetbridge.activities.ConfigureWorldClocks;
+import nodomain.freeyourgadget.gadgetbridge.entities.WorldClock;
+
+/**
+ * Adapter for displaying WorldClock instances.
+ */
+public class GBWorldClockListAdapter extends RecyclerView.Adapter<GBWorldClockListAdapter.ViewHolder> {
+
+    private final Context mContext;
+    private ArrayList<WorldClock> worldClockList;
+
+    public GBWorldClockListAdapter(final Context context) {
+        this.mContext = context;
+    }
+
+    public void setWorldClockList(final List<WorldClock> worldClocks) {
+        this.worldClockList = new ArrayList<>(worldClocks);
+    }
+
+    public ArrayList<WorldClock> getWorldClockList() {
+        return worldClockList;
+    }
+
+    @NonNull
+    @Override
+    public GBWorldClockListAdapter.ViewHolder onCreateViewHolder(@NonNull final ViewGroup parent, final int viewType) {
+        final View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.item_world_clock, parent, false);
+        return new ViewHolder(view);
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull ViewHolder holder, final int position) {
+        final WorldClock worldClock = worldClockList.get(position);
+
+        holder.container.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                ((ConfigureWorldClocks) mContext).configureWorldClock(worldClock);
+            }
+        });
+
+        holder.container.setOnLongClickListener(new View.OnLongClickListener() {
+            @Override
+            public boolean onLongClick(View v) {
+                new AlertDialog.Builder(v.getContext())
+                        .setTitle(v.getContext().getString(R.string.world_clock_delete_confirm_title, worldClock.getLabel()))
+                        .setMessage(R.string.world_clock_delete_confirm_description)
+                        .setIcon(R.drawable.ic_warning)
+                        .setPositiveButton(android.R.string.yes, new DialogInterface.OnClickListener() {
+                            public void onClick(final DialogInterface dialog, final int whichButton) {
+                                ((ConfigureWorldClocks) mContext).deleteWorldClock(worldClock);
+                            }
+                        })
+                        .setNegativeButton(android.R.string.no, null)
+                        .show();
+
+                return true;
+            }
+        });
+
+        holder.worldClockLabel.setText(worldClock.getLabel());
+        holder.worldClockTimezone.setText(worldClock.getTimeZoneId());
+
+        final DateFormat df = new SimpleDateFormat("HH:mm", GBApplication.getLanguage());
+        df.setTimeZone(TimeZone.getTimeZone(worldClock.getTimeZoneId()));
+        holder.worldClockCurrentTime.setText(df.format(new Date()));
+    }
+
+    @Override
+    public int getItemCount() {
+        return worldClockList.size();
+    }
+
+    static class ViewHolder extends RecyclerView.ViewHolder {
+        final CardView container;
+
+        final TextView worldClockTimezone;
+        final TextView worldClockLabel;
+        final TextView worldClockCurrentTime;
+
+        ViewHolder(View view) {
+            super(view);
+
+            container = view.findViewById(R.id.card_view);
+
+            worldClockTimezone = view.findViewById(R.id.world_clock_item_timezone);
+            worldClockLabel = view.findViewById(R.id.world_clock_item_label);
+            worldClockCurrentTime = view.findViewById(R.id.world_clock_current_time);
+        }
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/DBHelper.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/DBHelper.java
index 7e97e9862..ef5981eae 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/DBHelper.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/DBHelper.java
@@ -62,6 +62,8 @@ import nodomain.freeyourgadget.gadgetbridge.entities.TagDao;
 import nodomain.freeyourgadget.gadgetbridge.entities.User;
 import nodomain.freeyourgadget.gadgetbridge.entities.UserAttributes;
 import nodomain.freeyourgadget.gadgetbridge.entities.UserDao;
+import nodomain.freeyourgadget.gadgetbridge.entities.WorldClock;
+import nodomain.freeyourgadget.gadgetbridge.entities.WorldClockDao;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
 import nodomain.freeyourgadget.gadgetbridge.model.ActivityUser;
 import nodomain.freeyourgadget.gadgetbridge.model.ValidByDate;
@@ -658,6 +660,28 @@ public class DBHelper {
         return Collections.emptyList();
     }
 
+    @NonNull
+    public static List<WorldClock> getWorldClocks(@NonNull GBDevice gbDevice) {
+        try (DBHandler db = GBApplication.acquireDB()) {
+            final DaoSession daoSession = db.getDaoSession();
+            final User user = getUser(daoSession);
+            final Device dbDevice = DBHelper.findDevice(gbDevice, daoSession);
+            if (dbDevice != null) {
+                final WorldClockDao worldClockDao = daoSession.getWorldClockDao();
+                final Long deviceId = dbDevice.getId();
+                final QueryBuilder<WorldClock> qb = worldClockDao.queryBuilder();
+                qb.where(
+                        WorldClockDao.Properties.UserId.eq(user.getId()),
+                        WorldClockDao.Properties.DeviceId.eq(deviceId)).orderAsc(WorldClockDao.Properties.WorldClockId);
+                return qb.build().list();
+            }
+        } catch (final Exception e) {
+            LOG.error("Error reading world clocks from db", e);
+        }
+
+        return Collections.emptyList();
+    }
+
     public static void store(final Reminder reminder) {
         try (DBHandler db = GBApplication.acquireDB()) {
             final DaoSession daoSession = db.getDaoSession();
@@ -667,6 +691,15 @@ public class DBHelper {
         }
     }
 
+    public static void store(final WorldClock worldClock) {
+        try (DBHandler db = GBApplication.acquireDB()) {
+            final DaoSession daoSession = db.getDaoSession();
+            daoSession.insertOrReplace(worldClock);
+        } catch (final Exception e) {
+            LOG.error("Error acquiring database", e);
+        }
+    }
+
     public static void delete(final Reminder reminder) {
         try (DBHandler db = GBApplication.acquireDB()) {
             final DaoSession daoSession = db.getDaoSession();
@@ -676,6 +709,15 @@ public class DBHelper {
         }
     }
 
+    public static void delete(final WorldClock worldClock) {
+        try (DBHandler db = GBApplication.acquireDB()) {
+            final DaoSession daoSession = db.getDaoSession();
+            daoSession.delete(worldClock);
+        } catch (final Exception e) {
+            LOG.error("Error acquiring database", e);
+        }
+    }
+
     public static void clearSession() {
         try (DBHandler dbHandler = GBApplication.acquireDB()) {
             DaoSession session = dbHandler.getDaoSession();
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/AbstractDeviceCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/AbstractDeviceCoordinator.java
index 232c69628..f97a9608a 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/AbstractDeviceCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/AbstractDeviceCoordinator.java
@@ -232,6 +232,16 @@ public abstract class AbstractDeviceCoordinator implements DeviceCoordinator {
         return 0;
     }
 
+    @Override
+    public int getWorldClocksSlotCount() {
+        return 0;
+    }
+
+    @Override
+    public int getWorldClocksLabelLength() {
+        return 10;
+    }
+
     @Override
     public boolean supportsRgbLedColor() {
         return false;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/DeviceCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/DeviceCoordinator.java
index b329c7970..f5dc931bc 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/DeviceCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/DeviceCoordinator.java
@@ -331,6 +331,16 @@ public interface DeviceCoordinator {
      */
     int getReminderSlotCount();
 
+    /**
+     * Indicates the maximum number of slots available for world clocks in the device.
+     */
+    int getWorldClocksSlotCount();
+
+    /**
+     * Indicates the maximum label length for a world clock in the device.
+     */
+    int getWorldClocksLabelLength();
+
     /**
      * Indicates whether the device has an led which supports custom colors
      */
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/EventHandler.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/EventHandler.java
index d20ab54e3..d4ccc7c67 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/EventHandler.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/EventHandler.java
@@ -32,6 +32,7 @@ import nodomain.freeyourgadget.gadgetbridge.model.MusicStateSpec;
 import nodomain.freeyourgadget.gadgetbridge.model.NotificationSpec;
 import nodomain.freeyourgadget.gadgetbridge.model.Reminder;
 import nodomain.freeyourgadget.gadgetbridge.model.WeatherSpec;
+import nodomain.freeyourgadget.gadgetbridge.model.WorldClock;
 
 /**
  * Specifies all events that Gadgetbridge intends to send to the gadget device.
@@ -49,6 +50,8 @@ public interface EventHandler {
 
     void onSetReminders(ArrayList<? extends Reminder> reminders);
 
+    void onSetWorldClocks(ArrayList<? extends WorldClock> clocks);
+
     void onSetCallState(CallSpec callSpec);
 
     void onSetCannedMessages(CannedMessagesSpec cannedMessagesSpec);
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband5/MiBand5Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband5/MiBand5Coordinator.java
index 75b2061ee..8bf08ac85 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband5/MiBand5Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband5/MiBand5Coordinator.java
@@ -85,6 +85,16 @@ public class MiBand5Coordinator extends HuamiCoordinator {
         return true;
     }
 
+    @Override
+    public int getWorldClocksSlotCount() {
+        return 20; // as enforced by Mi Fit
+    }
+
+    @Override
+    public int getWorldClocksLabelLength() {
+        return 30; // at least
+    }
+
     @Override
     public int[] getSupportedDeviceSpecificSettings(GBDevice device) {
         return new int[]{
@@ -93,6 +103,7 @@ public class MiBand5Coordinator extends HuamiCoordinator {
                 R.xml.devicesettings_custom_emoji_font,
                 R.xml.devicesettings_timeformat,
                 R.xml.devicesettings_dateformat,
+                R.xml.devicesettings_world_clocks,
                 R.xml.devicesettings_nightmode,
                 R.xml.devicesettings_liftwrist_display_sensitivity,
                 R.xml.devicesettings_swipeunlock,
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/impl/GBDeviceService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/impl/GBDeviceService.java
index 69ede37da..54f57b170 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/impl/GBDeviceService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/impl/GBDeviceService.java
@@ -43,6 +43,7 @@ import nodomain.freeyourgadget.gadgetbridge.model.MusicStateSpec;
 import nodomain.freeyourgadget.gadgetbridge.model.NotificationSpec;
 import nodomain.freeyourgadget.gadgetbridge.model.Reminder;
 import nodomain.freeyourgadget.gadgetbridge.model.WeatherSpec;
+import nodomain.freeyourgadget.gadgetbridge.model.WorldClock;
 import nodomain.freeyourgadget.gadgetbridge.service.DeviceCommunicationService;
 import nodomain.freeyourgadget.gadgetbridge.util.RtlUtils;
 
@@ -230,6 +231,13 @@ public class GBDeviceService implements DeviceService {
         invokeService(intent);
     }
 
+    @Override
+    public void onSetWorldClocks(ArrayList<? extends WorldClock> clocks) {
+        Intent intent = createIntent().setAction(ACTION_SET_WORLD_CLOCKS)
+                .putExtra(EXTRA_WORLD_CLOCKS, clocks);
+        invokeService(intent);
+    }
+
     @Override
     public void onSetMusicInfo(MusicSpec musicSpec) {
         Intent intent = createIntent().setAction(ACTION_SETMUSICINFO)
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceService.java
index 8304b8410..ddf52dc7f 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceService.java
@@ -56,6 +56,7 @@ public interface DeviceService extends EventHandler {
     String ACTION_SET_ALARMS = PREFIX + ".action.set_alarms";
     String ACTION_SAVE_ALARMS = PREFIX + ".action.save_alarms";
     String ACTION_SET_REMINDERS = PREFIX + ".action.set_reminders";
+    String ACTION_SET_WORLD_CLOCKS = PREFIX + ".action.set_world_clocks";
     String ACTION_ENABLE_REALTIME_STEPS = PREFIX + ".action.enable_realtime_steps";
     String ACTION_REALTIME_SAMPLES = PREFIX + ".action.realtime_samples";
     String ACTION_ENABLE_REALTIME_HEARTRATE_MEASUREMENT = PREFIX + ".action.realtime_hr_measurement";
@@ -110,6 +111,7 @@ public interface DeviceService extends EventHandler {
     String EXTRA_CONFIG = "config";
     String EXTRA_ALARMS = "alarms";
     String EXTRA_REMINDERS = "reminders";
+    String EXTRA_WORLD_CLOCKS = "world_clocks";
     String EXTRA_CONNECT_FIRST_TIME = "connect_first_time";
     String EXTRA_BOOLEAN_ENABLE = "enable_realtime_steps";
     String EXTRA_INTERVAL_SECONDS = "interval_seconds";
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/WorldClock.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/WorldClock.java
new file mode 100644
index 000000000..1c6b0bd1d
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/WorldClock.java
@@ -0,0 +1,30 @@
+/*  Copyright (C) 2022 José Rebelo
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.model;
+
+import java.io.Serializable;
+
+public interface WorldClock extends Serializable {
+    /**
+     * The {@link android.os.Bundle} name for transferring parceled world clocks.
+     */
+    String EXTRA_WORLD_CLOCK = "world_clock";
+
+    String getWorldClockId();
+    String getLabel();
+    String getTimeZoneId();
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceCommunicationService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceCommunicationService.java
index a9f7ddfa6..52df51f46 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceCommunicationService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceCommunicationService.java
@@ -75,6 +75,7 @@ import nodomain.freeyourgadget.gadgetbridge.model.NotificationSpec;
 import nodomain.freeyourgadget.gadgetbridge.model.NotificationType;
 import nodomain.freeyourgadget.gadgetbridge.model.Reminder;
 import nodomain.freeyourgadget.gadgetbridge.model.WeatherSpec;
+import nodomain.freeyourgadget.gadgetbridge.model.WorldClock;
 import nodomain.freeyourgadget.gadgetbridge.service.receivers.AutoConnectIntervalReceiver;
 import nodomain.freeyourgadget.gadgetbridge.service.receivers.GBAutoFetchReceiver;
 import nodomain.freeyourgadget.gadgetbridge.util.DeviceHelper;
@@ -120,6 +121,7 @@ import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.ACTION_SE
 import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.ACTION_SET_HEARTRATE_MEASUREMENT_INTERVAL;
 import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.ACTION_SET_LED_COLOR;
 import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.ACTION_SET_REMINDERS;
+import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.ACTION_SET_WORLD_CLOCKS;
 import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.ACTION_START;
 import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.ACTION_STARTAPP;
 import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.ACTION_TEST_NEW_FUNCTION;
@@ -178,6 +180,7 @@ import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.EXTRA_RES
 import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.EXTRA_URI;
 import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.EXTRA_VIBRATION_INTENSITY;
 import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.EXTRA_WEATHER;
+import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.EXTRA_WORLD_CLOCKS;
 
 public class DeviceCommunicationService extends Service implements SharedPreferences.OnSharedPreferenceChangeListener {
     private static final Logger LOG = LoggerFactory.getLogger(DeviceCommunicationService.class);
@@ -586,6 +589,10 @@ public class DeviceCommunicationService extends Service implements SharedPrefere
                 ArrayList<? extends Reminder> reminders = (ArrayList<? extends Reminder>) intent.getSerializableExtra(EXTRA_REMINDERS);
                 mDeviceSupport.onSetReminders(reminders);
                 break;
+            case ACTION_SET_WORLD_CLOCKS:
+                ArrayList<? extends WorldClock> clocks = (ArrayList<? extends WorldClock>) intent.getSerializableExtra(EXTRA_WORLD_CLOCKS);
+                mDeviceSupport.onSetWorldClocks(clocks);
+                break;
             case ACTION_ENABLE_REALTIME_STEPS: {
                 boolean enable = intent.getBooleanExtra(EXTRA_BOOLEAN_ENABLE, false);
                 mDeviceSupport.onEnableRealtimeSteps(enable);
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/ServiceDeviceSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/ServiceDeviceSupport.java
index 0cc8a6d06..bc946df64 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/ServiceDeviceSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/ServiceDeviceSupport.java
@@ -39,6 +39,7 @@ import nodomain.freeyourgadget.gadgetbridge.model.MusicStateSpec;
 import nodomain.freeyourgadget.gadgetbridge.model.NotificationSpec;
 import nodomain.freeyourgadget.gadgetbridge.model.Reminder;
 import nodomain.freeyourgadget.gadgetbridge.model.WeatherSpec;
+import nodomain.freeyourgadget.gadgetbridge.model.WorldClock;
 
 /**
  * Wraps another device support instance and supports busy-checking and throttling of events.
@@ -318,6 +319,14 @@ public class ServiceDeviceSupport implements DeviceSupport {
         delegate.onSetReminders(reminders);
     }
 
+    @Override
+    public void onSetWorldClocks(ArrayList<? extends WorldClock> clocks) {
+        if (checkBusy("set world clocks")) {
+            return;
+        }
+        delegate.onSetWorldClocks(clocks);
+    }
+
     @Override
     public void onEnableRealtimeSteps(boolean enable) {
         if (checkBusy("enable realtime steps: " + enable)) {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/AbstractBTLEDeviceSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/AbstractBTLEDeviceSupport.java
index 73a9e1b95..9959cc958 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/AbstractBTLEDeviceSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/AbstractBTLEDeviceSupport.java
@@ -38,6 +38,7 @@ import java.util.UUID;
 import nodomain.freeyourgadget.gadgetbridge.Logging;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
 import nodomain.freeyourgadget.gadgetbridge.model.Reminder;
+import nodomain.freeyourgadget.gadgetbridge.model.WorldClock;
 import nodomain.freeyourgadget.gadgetbridge.service.AbstractDeviceSupport;
 import nodomain.freeyourgadget.gadgetbridge.service.btle.actions.CheckInitializedAction;
 import nodomain.freeyourgadget.gadgetbridge.service.btle.profiles.AbstractBleProfile;
@@ -378,6 +379,11 @@ public abstract class AbstractBTLEDeviceSupport extends AbstractDeviceSupport im
 
     }
 
+    @Override
+    public void onSetWorldClocks(ArrayList<? extends WorldClock> clocks) {
+
+    }
+
     @Override
     public void onConnectionStateChange(BluetoothDevice device, int status, int newState) {
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiSupport.java
index 665c34f5a..dbf67a768 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiSupport.java
@@ -37,10 +37,16 @@ import net.e175.klaus.solarpositioning.SPA;
 import org.apache.commons.lang3.ArrayUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.threeten.bp.Instant;
+import org.threeten.bp.ZoneId;
+import org.threeten.bp.zone.ZoneOffsetTransition;
+import org.threeten.bp.zone.ZoneRules;
 
+import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Calendar;
@@ -52,6 +58,7 @@ import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
 import java.util.SimpleTimeZone;
+import java.util.TimeZone;
 import java.util.Timer;
 import java.util.TimerTask;
 import java.util.UUID;
@@ -112,6 +119,7 @@ import nodomain.freeyourgadget.gadgetbridge.model.NotificationType;
 import nodomain.freeyourgadget.gadgetbridge.model.Reminder;
 import nodomain.freeyourgadget.gadgetbridge.model.Weather;
 import nodomain.freeyourgadget.gadgetbridge.model.WeatherSpec;
+import nodomain.freeyourgadget.gadgetbridge.model.WorldClock;
 import nodomain.freeyourgadget.gadgetbridge.service.btle.AbstractBTLEDeviceSupport;
 import nodomain.freeyourgadget.gadgetbridge.service.btle.BLETypeConversions;
 import nodomain.freeyourgadget.gadgetbridge.service.btle.BtLEAction;
@@ -925,6 +933,120 @@ public class HuamiSupport extends AbstractBTLEDeviceSupport {
         writeToChunked(builder, 2, buf.array());
     }
 
+    @Override
+    public void onSetWorldClocks(ArrayList<? extends WorldClock> clocks) {
+        final TransactionBuilder builder;
+        try {
+            builder = performInitialized("onSetWorldClocks");
+        } catch (final IOException e) {
+            LOG.error("Unable to send world clocks to device", e);
+            return;
+        }
+
+        sendWorldClocks(builder, clocks);
+
+        builder.queue(getQueue());
+    }
+
+    private void setWorldClocks(final TransactionBuilder builder) {
+        final List<? extends WorldClock> clocks = DBHelper.getWorldClocks(gbDevice);
+        sendWorldClocks(builder, clocks);
+    }
+
+    private void sendWorldClocks(final TransactionBuilder builder, final List<? extends WorldClock> clocks) {
+        final DeviceCoordinator coordinator = DeviceHelper.getInstance().getCoordinator(gbDevice);
+        if (coordinator.getWorldClocksSlotCount() == 0) {
+            return;
+        }
+
+        final ByteArrayOutputStream baos = new ByteArrayOutputStream();
+
+        try {
+            baos.write(0x03);
+            
+            if (clocks.size() != 0) {
+                int i = clocks.size();
+                for (final WorldClock clock : clocks) {
+                    baos.write(i--);
+                    baos.write(encodeWorldClock(clock));
+                }
+            } else {
+                baos.write(0);
+            }
+        } catch (final IOException e) {
+            LOG.error("Unable to send world clocks to device", e);
+            return;
+        }
+
+        writeToChunked2021(builder, (short) 0x0008, getNextHandle(), baos.toByteArray(), false, false);
+    }
+
+    public byte[] encodeWorldClock(final WorldClock clock) {
+        final DeviceCoordinator coordinator = DeviceHelper.getInstance().getCoordinator(gbDevice);
+
+        try {
+            final ByteArrayOutputStream baos = new ByteArrayOutputStream();
+
+            final TimeZone timezone = TimeZone.getTimeZone(clock.getTimeZoneId());
+            final ZoneId zoneId = ZoneId.of(clock.getTimeZoneId());
+
+            // Usually the 3-letter city code (eg. LIS for Lisbon), but doesn't seem to be used in the UI
+            baos.write("   ".getBytes(StandardCharsets.UTF_8));
+            baos.write(0x00);
+
+            // Some other string? Seems to be empty
+            baos.write(0x00);
+
+            // The city name / label that shows up on the band
+            baos.write(StringUtils.truncate(clock.getLabel(), coordinator.getWorldClocksLabelLength()).getBytes(StandardCharsets.UTF_8));
+            baos.write(0x00);
+
+            // The raw offset from UTC, in number of 15-minute blocks
+            baos.write((int) (timezone.getRawOffset() / (1000L * 60L * 15L)));
+
+            // Daylight savings
+            final boolean useDaylightTime = timezone.useDaylightTime();
+            final boolean inDaylightTime = timezone.inDaylightTime(new Date());
+            byte daylightByte = 0;
+            // The daylight savings offset, either currently (the previous transition) or future (the next transition), in minutes
+            byte daylightOffsetMinutes = 0;
+
+            final ZoneRules zoneRules = zoneId.getRules();
+            if (useDaylightTime) {
+                final ZoneOffsetTransition transition;
+                if (inDaylightTime) {
+                    daylightByte = 0x01;
+                    transition = zoneRules.previousTransition(Instant.now());
+                } else {
+                    daylightByte = 0x02;
+                    transition = zoneRules.nextTransition(Instant.now());
+                }
+                daylightOffsetMinutes = (byte) transition.getDuration().toMinutes();
+            }
+
+            baos.write(daylightByte);
+            baos.write(daylightOffsetMinutes);
+
+            // The timestamp of the next daylight savings transition, if any
+            final ZoneOffsetTransition nextTransition = zoneRules.nextTransition(Instant.now());
+            long nextTransitionTs = 0;
+            if (nextTransition != null) {
+                nextTransitionTs = nextTransition
+                        .getDateTimeBefore()
+                        .atZone(zoneId)
+                        .toEpochSecond();
+            }
+
+            for (int i = 0; i < 4; i++) {
+                baos.write((byte) ((nextTransitionTs >> (i * 8)) & 0xff));
+            }
+
+            return baos.toByteArray();
+        } catch (final IOException e) {
+            throw new RuntimeException("This should never happen", e);
+        }
+    }
+
     @Override
     public void onNotification(NotificationSpec notificationSpec) {
         if (notificationSpec.type == NotificationType.GENERIC_ALARM_CLOCK) {
@@ -3351,6 +3473,7 @@ public class HuamiSupport extends AbstractBTLEDeviceSupport {
         setExposeHRThridParty(builder);
         setHeartrateMeasurementInterval(builder, getHeartRateMeasurementInterval());
         sendReminders(builder);
+        setWorldClocks(builder);
         requestAlarms(builder);
     }
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/serial/AbstractSerialDeviceSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/serial/AbstractSerialDeviceSupport.java
index 39da5fb9e..d847031d0 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/serial/AbstractSerialDeviceSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/serial/AbstractSerialDeviceSupport.java
@@ -31,6 +31,7 @@ import nodomain.freeyourgadget.gadgetbridge.model.MusicStateSpec;
 import nodomain.freeyourgadget.gadgetbridge.model.NotificationSpec;
 import nodomain.freeyourgadget.gadgetbridge.model.Reminder;
 import nodomain.freeyourgadget.gadgetbridge.model.WeatherSpec;
+import nodomain.freeyourgadget.gadgetbridge.model.WorldClock;
 import nodomain.freeyourgadget.gadgetbridge.service.AbstractDeviceSupport;
 
 /**
@@ -276,4 +277,10 @@ public abstract class AbstractSerialDeviceSupport extends AbstractDeviceSupport
         byte[] bytes = gbDeviceProtocol.encodeReminders(reminders);
         sendToDevice(bytes);
     }
+
+    @Override
+    public void onSetWorldClocks(ArrayList<? extends WorldClock> clocks) {
+        byte[] bytes = gbDeviceProtocol.encodeWorldClocks(clocks);
+        sendToDevice(bytes);
+    }
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/serial/GBDeviceProtocol.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/serial/GBDeviceProtocol.java
index a4408d053..888d64756 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/serial/GBDeviceProtocol.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/serial/GBDeviceProtocol.java
@@ -27,6 +27,7 @@ import nodomain.freeyourgadget.gadgetbridge.model.CannedMessagesSpec;
 import nodomain.freeyourgadget.gadgetbridge.model.NotificationSpec;
 import nodomain.freeyourgadget.gadgetbridge.model.Reminder;
 import nodomain.freeyourgadget.gadgetbridge.model.WeatherSpec;
+import nodomain.freeyourgadget.gadgetbridge.model.WorldClock;
 
 public abstract class GBDeviceProtocol {
 
@@ -151,6 +152,10 @@ public abstract class GBDeviceProtocol {
         return null;
     }
 
+    public byte[] encodeWorldClocks(ArrayList<? extends WorldClock> clocks) {
+        return null;
+    }
+
     public byte[] encodeFmFrequency(float frequency) {
         return null;
     }
diff --git a/app/src/main/res/layout/activity_configure_world_clocks.xml b/app/src/main/res/layout/activity_configure_world_clocks.xml
new file mode 100644
index 000000000..727f8c4df
--- /dev/null
+++ b/app/src/main/res/layout/activity_configure_world_clocks.xml
@@ -0,0 +1,27 @@
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    app:layout_behavior="@string/appbar_scrolling_view_behavior"
+    android:fitsSystemWindows="true"
+    tools:context="nodomain.freeyourgadget.gadgetbridge.activities.ConfigureWorldClocks">
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_alignParentTop="true"
+        android:layout_centerHorizontal="true"
+        android:divider="@null"
+        android:id="@+id/world_clock_list" />
+
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
+        android:id="@+id/fab"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:layout_alignParentEnd="true"
+        android:layout_gravity="bottom|end"
+        app:srcCompat="@drawable/ic_add"
+        android:layout_margin="16dp" />
+</RelativeLayout>
diff --git a/app/src/main/res/layout/activity_world_clock_details.xml b/app/src/main/res/layout/activity_world_clock_details.xml
new file mode 100644
index 000000000..93bc99fd6
--- /dev/null
+++ b/app/src/main/res/layout/activity_world_clock_details.xml
@@ -0,0 +1,97 @@
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:card_view="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/constraintLayout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    tools:context="nodomain.freeyourgadget.gadgetbridge.activities.ReminderDetails">
+
+    <androidx.cardview.widget.CardView
+        android:id="@+id/card_timezone"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="8dp"
+        android:foreground="?android:attr/selectableItemBackground"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        card_view:cardCornerRadius="4dp"
+        card_view:cardElevation="4dp"
+        card_view:contentPadding="4dp">
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="8dp">
+
+            <TextView
+                android:id="@+id/label_timezone"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/world_clock_timezone"
+                android:textAppearance="?android:attr/textAppearance"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
+            <TextView
+                android:id="@+id/world_clock_timezone"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="2dp"
+                android:text="?"
+                android:textAppearance="?android:attr/textAppearanceLarge"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/label_timezone" />
+        </androidx.constraintlayout.widget.ConstraintLayout>
+    </androidx.cardview.widget.CardView>
+
+    <androidx.cardview.widget.CardView
+        android:id="@+id/card_label"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="8dp"
+        android:foreground="?android:attr/selectableItemBackground"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/card_timezone"
+        card_view:cardCornerRadius="4dp"
+        card_view:cardElevation="4dp"
+        card_view:contentPadding="4dp">
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="8dp">
+
+            <TextView
+                android:id="@+id/label_message"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/world_clock_label"
+                android:textAppearance="?android:attr/textAppearance"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
+            <EditText
+                android:id="@+id/world_clock_label"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="2dp"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/label_message" />
+        </androidx.constraintlayout.widget.ConstraintLayout>
+    </androidx.cardview.widget.CardView>
+
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
+        android:id="@+id/fab_save"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom|end"
+        android:layout_margin="16dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:srcCompat="@drawable/ic_save" />
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/device_itemv2.xml b/app/src/main/res/layout/device_itemv2.xml
index 98ff82cad..ef17481b9 100644
--- a/app/src/main/res/layout/device_itemv2.xml
+++ b/app/src/main/res/layout/device_itemv2.xml
@@ -73,15 +73,15 @@
                 android:id="@+id/device_image"
                 android:layout_width="48dp"
                 android:layout_height="48dp"
-                android:layout_alignParentStart="true"
                 android:layout_below="@id/device_item_infos_box"
-                android:contentDescription="@string/candidate_item_device_image"
-                android:clickable="true"
-                android:longClickable="true"
-                android:background="?android:attr/selectableItemBackground"
-                card_view:srcCompat="@drawable/ic_device_pebble"
+                android:layout_alignParentStart="true"
                 android:layout_marginTop="2dp"
-                android:focusable="true" />
+                android:background="?android:attr/selectableItemBackground"
+                android:clickable="true"
+                android:contentDescription="@string/candidate_item_device_image"
+                android:focusable="true"
+                android:longClickable="true"
+                card_view:srcCompat="@drawable/ic_device_pebble" />
 
             <TextView
                 android:id="@+id/device_name"
diff --git a/app/src/main/res/layout/item_world_clock.xml b/app/src/main/res/layout/item_world_clock.xml
new file mode 100644
index 000000000..60c8e419d
--- /dev/null
+++ b/app/src/main/res/layout/item_world_clock.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:card_view="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <androidx.cardview.widget.CardView
+        android:id="@+id/card_view"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="8dp"
+        android:foreground="?android:attr/selectableItemBackground"
+        card_view:cardCornerRadius="4dp"
+        card_view:cardElevation="4dp"
+        card_view:contentPadding="4dp">
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="8dp">
+
+            <TextView
+                android:id="@+id/world_clock_item_timezone"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentStart="true"
+                android:layout_alignParentTop="true"
+                android:layout_marginStart="3dp"
+                android:layout_marginTop="4dp"
+                android:layout_marginEnd="0dp"
+                android:layout_marginBottom="8dp"
+                android:text="Middle-earth/Gondor"
+                android:textAppearance="?android:attr/textAppearance" />
+
+            <TextView
+                android:id="@+id/world_clock_item_label"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentStart="true"
+                android:layout_alignParentTop="true"
+                android:layout_marginStart="3dp"
+                android:layout_marginTop="25dp"
+                android:layout_marginEnd="0dp"
+                android:layout_marginBottom="8dp"
+                android:text="?"
+                android:textAppearance="?android:attr/textAppearanceLarge" />
+
+            <TextView
+                android:id="@+id/world_clock_current_time"
+                android:layout_width="48dp"
+                android:layout_height="36dp"
+                android:layout_alignParentEnd="true"
+                android:layout_marginStart="8dp"
+                android:layout_marginTop="8dp"
+                android:gravity="center"
+                android:layout_marginEnd="0dp"
+                android:layout_marginBottom="8dp"
+                android:text="00:00"
+                card_view:tint="@color/secondarytext" />
+
+        </RelativeLayout>
+    </androidx.cardview.widget.CardView>
+
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 8ec87947b..a2422f918 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -486,6 +486,8 @@
     <string name="title_activity_charts">Activity and Sleep</string>
     <string name="title_activity_set_alarm">Configure alarms</string>
     <string name="title_activity_set_reminders">Configure reminders</string>
+    <string name="pref_world_clocks_title">World Clocks</string>
+    <string name="pref_world_clocks_summary">Configure clocks for other timezones</string>
     <string name="controlcenter_start_configure_alarms">Configure alarms</string>
     <string name="controlcenter_start_configure_reminders">Configure reminders</string>
     <string name="reminder_repeat">Repeat</string>
@@ -506,8 +508,15 @@
     <string name="reminder_delete_confirm_description">Are you sure you want to delete the reminder?</string>
     <string name="reminder_no_free_slots_title">No free slots</string>
     <string name="reminder_no_free_slots_description">The device has no free slots for reminders (total slots: %1$s)</string>
+    <string name="world_clock_delete_confirm_title">Delete \'%1$s\'</string>
+    <string name="world_clock_delete_confirm_description">Are you sure you want to delete the world clock?</string>
+    <string name="world_clock_no_free_slots_title">No free slots</string>
+    <string name="world_clock_no_free_slots_description">The device has no free slots for world clocks (total slots: %1$s)</string>
+    <string name="world_clock_timezone">Time Zone</string>
+    <string name="world_clock_label">Label</string>
     <string name="title_activity_alarm_details">Alarm details</string>
     <string name="title_activity_reminder_details">Reminder details</string>
+    <string name="title_activity_world_clock_details">World Clock details</string>
     <string name="alarm_sun_short">Sun</string>
     <string name="alarm_mon_short">Mon</string>
     <string name="alarm_tue_short">Tue</string>
diff --git a/app/src/main/res/xml/devicesettings_world_clocks.xml b/app/src/main/res/xml/devicesettings_world_clocks.xml
new file mode 100644
index 000000000..46d224761
--- /dev/null
+++ b/app/src/main/res/xml/devicesettings_world_clocks.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+    <Preference
+        android:icon="@drawable/ic_access_time"
+        android:key="pref_world_clocks"
+        android:summary="@string/pref_world_clocks_summary"
+        android:title="@string/pref_world_clocks_title" />
+</androidx.preference.PreferenceScreen>

From 46cd229a1411ac1347319739d904d5f00b2f1884 Mon Sep 17 00:00:00 2001
From: Andreas Shimokawa <shimokawa@fsfe.org>
Date: Tue, 10 May 2022 14:16:52 +0200
Subject: [PATCH 042/110] Mi Band 6: Enable World clock setting

Also take care of new/old firmware
---
 .../devices/huami/miband6/MiBand6Coordinator.java     | 11 +++++++++++
 .../service/devices/huami/HuamiSupport.java           |  2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband6/MiBand6Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband6/MiBand6Coordinator.java
index a5aba4b37..527fb5361 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband6/MiBand6Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband6/MiBand6Coordinator.java
@@ -70,6 +70,16 @@ public class MiBand6Coordinator extends HuamiCoordinator {
         return true;
     }
 
+    @Override
+    public int getWorldClocksSlotCount() {
+        return 20; // as enforced by Mi Fit
+    }
+
+    @Override
+    public int getWorldClocksLabelLength() {
+        return 30; // at least
+    }
+
     @Override
     public int[] getSupportedDeviceSpecificSettings(GBDevice device) {
         return new int[]{
@@ -78,6 +88,7 @@ public class MiBand6Coordinator extends HuamiCoordinator {
                 R.xml.devicesettings_custom_emoji_font,
                 R.xml.devicesettings_timeformat,
                 R.xml.devicesettings_dateformat,
+                R.xml.devicesettings_world_clocks,
                 R.xml.devicesettings_nightmode,
                 R.xml.devicesettings_liftwrist_display_sensitivity,
                 R.xml.devicesettings_swipeunlock,
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiSupport.java
index dbf67a768..3ae94aaf8 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiSupport.java
@@ -978,7 +978,7 @@ public class HuamiSupport extends AbstractBTLEDeviceSupport {
             return;
         }
 
-        writeToChunked2021(builder, (short) 0x0008, getNextHandle(), baos.toByteArray(), false, false);
+        writeToChunked2021(builder, (short) 0x0008, getNextHandle(), baos.toByteArray(), force2021Protocol, false);
     }
 
     public byte[] encodeWorldClock(final WorldClock clock) {

From 05515d6ba2e8f11d85671c21828dbc69676b6ac8 Mon Sep 17 00:00:00 2001
From: Andreas Shimokawa <shimokawa@fsfe.org>
Date: Tue, 10 May 2022 15:29:47 +0200
Subject: [PATCH 043/110] Amazfit Bip S: Enable world clock configuration

---
 .../huami/amazfitbips/AmazfitBipSCoordinator.java     | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbips/AmazfitBipSCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbips/AmazfitBipSCoordinator.java
index 682e8df66..b40541bbe 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbips/AmazfitBipSCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbips/AmazfitBipSCoordinator.java
@@ -82,11 +82,22 @@ public class AmazfitBipSCoordinator extends HuamiCoordinator {
         return true;
     }
 
+    @Override
+    public int getWorldClocksSlotCount() {
+        return 20; // as enforced by Mi Fit
+    }
+
+    @Override
+    public int getWorldClocksLabelLength() {
+        return 30; // at least
+    }
+
     @Override
     public int[] getSupportedDeviceSpecificSettings(GBDevice device) {
         return new int[]{
                 R.xml.devicesettings_amazfitbips,
                 R.xml.devicesettings_timeformat,
+                R.xml.devicesettings_world_clocks,
                 R.xml.devicesettings_wearlocation,
                 R.xml.devicesettings_custom_emoji_font,
                 R.xml.devicesettings_liftwrist_display,

From 3a1d4d6161d97507cb4c8c43b197838fa841d948 Mon Sep 17 00:00:00 2001
From: Andreas Shimokawa <shimokawa@fsfe.org>
Date: Tue, 10 May 2022 15:41:12 +0200
Subject: [PATCH 044/110] Amazfip Bip U/Pro: Enable lift wrist sensitity and
 world clock configuration

---
 .../huami/amazfitbipu/AmazfitBipUCoordinator.java   | 13 ++++++++++++-
 .../amazfitbipupro/AmazfitBipUProCoordinator.java   | 13 ++++++++++++-
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbipu/AmazfitBipUCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbipu/AmazfitBipUCoordinator.java
index bcd415b47..d866addcc 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbipu/AmazfitBipUCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbipu/AmazfitBipUCoordinator.java
@@ -93,15 +93,26 @@ public class AmazfitBipUCoordinator extends HuamiCoordinator {
         return 0;
     }
 
+    @Override
+    public int getWorldClocksSlotCount() {
+        return 20; // as enforced by Mi Fit
+    }
+
+    @Override
+    public int getWorldClocksLabelLength() {
+        return 30; // at least
+    }
+
     @Override
     public int[] getSupportedDeviceSpecificSettings(GBDevice device) {
         return new int[]{
                 R.xml.devicesettings_amazfitbipu,
                 //R.xml.devicesettings_canned_dismisscall_16,
                 R.xml.devicesettings_timeformat,
+                R.xml.devicesettings_world_clocks,
                 R.xml.devicesettings_wearlocation,
                 R.xml.devicesettings_custom_emoji_font,
-                R.xml.devicesettings_liftwrist_display,
+                R.xml.devicesettings_liftwrist_display_sensitivity,
                 R.xml.devicesettings_sync_calendar,
                 R.xml.devicesettings_reserve_reminders_calendar,
                 R.xml.devicesettings_expose_hr_thirdparty,
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbipupro/AmazfitBipUProCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbipupro/AmazfitBipUProCoordinator.java
index 543525414..ea0af7783 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbipupro/AmazfitBipUProCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbipupro/AmazfitBipUProCoordinator.java
@@ -93,14 +93,25 @@ public class AmazfitBipUProCoordinator extends HuamiCoordinator {
         return 0;
     }
 
+    @Override
+    public int getWorldClocksSlotCount() {
+        return 20; // as enforced by Mi Fit
+    }
+
+    @Override
+    public int getWorldClocksLabelLength() {
+        return 30; // at least
+    }
+
     @Override
     public int[] getSupportedDeviceSpecificSettings(GBDevice device) {
         return new int[]{
                 R.xml.devicesettings_amazfitbipupro,
                 R.xml.devicesettings_timeformat,
+                R.xml.devicesettings_world_clocks,
                 R.xml.devicesettings_wearlocation,
                 R.xml.devicesettings_custom_emoji_font,
-                R.xml.devicesettings_liftwrist_display,
+                R.xml.devicesettings_liftwrist_display_sensitivity,
                 R.xml.devicesettings_sync_calendar,
                 R.xml.devicesettings_reserve_reminders_calendar,
                 R.xml.devicesettings_expose_hr_thirdparty,

From 37ba8c291e3b4f1ac15f118a435c862b76bef8f6 Mon Sep 17 00:00:00 2001
From: Andreas Shimokawa <shimokawa@fsfe.org>
Date: Tue, 10 May 2022 15:49:34 +0200
Subject: [PATCH 045/110] Amazfit Band 5: Enbable lift wrist sensitivity and
 world clock configuration

---
 .../huami/amazfitband5/AmazfitBand5Coordinator.java  | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitband5/AmazfitBand5Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitband5/AmazfitBand5Coordinator.java
index 314c3887d..f4ed7aae0 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitband5/AmazfitBand5Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitband5/AmazfitBand5Coordinator.java
@@ -85,6 +85,16 @@ public class AmazfitBand5Coordinator extends HuamiCoordinator {
         return true;
     }
 
+    @Override
+    public int getWorldClocksSlotCount() {
+        return 20; // as enforced by Mi Fit
+    }
+
+    @Override
+    public int getWorldClocksLabelLength() {
+        return 30; // at least
+    }
+
     @Override
     public int[] getSupportedDeviceSpecificSettings(GBDevice device) {
         return new int[]{
@@ -94,7 +104,7 @@ public class AmazfitBand5Coordinator extends HuamiCoordinator {
                 R.xml.devicesettings_timeformat,
                 R.xml.devicesettings_dateformat,
                 R.xml.devicesettings_nightmode,
-                R.xml.devicesettings_liftwrist_display,
+                R.xml.devicesettings_liftwrist_display_sensitivity,
                 R.xml.devicesettings_swipeunlock,
                 R.xml.devicesettings_sync_calendar,
                 R.xml.devicesettings_reserve_reminders_calendar,

From 682b215985eeddf9521e01f487ea9257f6b6d6da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Thu, 5 May 2022 14:14:15 +0100
Subject: [PATCH 046/110] Huami: Send media volume to device

---
 .../gadgetbridge/devices/EventHandler.java    |  7 ++++
 .../gadgetbridge/impl/GBDeviceService.java    |  7 ++++
 .../gadgetbridge/model/DeviceService.java     |  2 ++
 .../service/DeviceCommunicationService.java   |  6 ++++
 .../service/ServiceDeviceSupport.java         |  8 +++++
 .../btle/AbstractBTLEDeviceSupport.java       |  5 +++
 .../service/devices/huami/HuamiSupport.java   | 33 ++++++++++++++++++-
 .../receivers/GBMusicControlReceiver.java     |  6 ++++
 .../serial/AbstractSerialDeviceSupport.java   |  6 ++++
 .../service/serial/GBDeviceProtocol.java      |  4 +++
 10 files changed, 83 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/EventHandler.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/EventHandler.java
index d4ccc7c67..a0ec99c1c 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/EventHandler.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/EventHandler.java
@@ -60,6 +60,13 @@ public interface EventHandler {
 
     void onSetMusicInfo(MusicSpec musicSpec);
 
+    /**
+     * Sets the current phone media volume.
+     *
+     * @param volume the volume percentage (0 to 100).
+     */
+    void onSetPhoneVolume(final float volume);
+
     void onEnableRealtimeSteps(boolean enable);
 
     void onInstallApp(Uri uri);
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/impl/GBDeviceService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/impl/GBDeviceService.java
index 54f57b170..15f842bb7 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/impl/GBDeviceService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/impl/GBDeviceService.java
@@ -224,6 +224,13 @@ public class GBDeviceService implements DeviceService {
         invokeService(intent);
     }
 
+    @Override
+    public void onSetPhoneVolume(final float volume) {
+        Intent intent = createIntent().setAction(ACTION_SET_PHONE_VOLUME)
+                .putExtra(EXTRA_PHONE_VOLUME, volume);
+        invokeService(intent);
+    }
+
     @Override
     public void onSetReminders(ArrayList<? extends Reminder> reminders) {
         Intent intent = createIntent().setAction(ACTION_SET_REMINDERS)
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceService.java
index ddf52dc7f..edb88e8b6 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceService.java
@@ -39,6 +39,7 @@ public interface DeviceService extends EventHandler {
     String ACTION_SETTIME = PREFIX + ".action.settime";
     String ACTION_SETMUSICINFO = PREFIX + ".action.setmusicinfo";
     String ACTION_SETMUSICSTATE = PREFIX + ".action.setmusicstate";
+    String ACTION_SET_PHONE_VOLUME = PREFIX + ".action.set_phone_volume";
     String ACTION_REQUEST_DEVICEINFO = PREFIX + ".action.request_deviceinfo";
     String ACTION_REQUEST_APPINFO = PREFIX + ".action.request_appinfo";
     String ACTION_REQUEST_SCREENSHOT = PREFIX + ".action.request_screenshot";
@@ -103,6 +104,7 @@ public interface DeviceService extends EventHandler {
     String EXTRA_MUSIC_REPEAT = "music_repeat";
     String EXTRA_MUSIC_POSITION = "music_position";
     String EXTRA_MUSIC_RATE = "music_rate";
+    String EXTRA_PHONE_VOLUME = "phone_volume";
     String EXTRA_APP_UUID = "app_uuid";
     String EXTRA_APP_START = "app_start";
     String EXTRA_APP_CONFIG = "app_config";
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceCommunicationService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceCommunicationService.java
index 52df51f46..0708899dd 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceCommunicationService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceCommunicationService.java
@@ -120,6 +120,7 @@ import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.ACTION_SE
 import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.ACTION_SET_FM_FREQUENCY;
 import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.ACTION_SET_HEARTRATE_MEASUREMENT_INTERVAL;
 import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.ACTION_SET_LED_COLOR;
+import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.ACTION_SET_PHONE_VOLUME;
 import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.ACTION_SET_REMINDERS;
 import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.ACTION_SET_WORLD_CLOCKS;
 import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.ACTION_START;
@@ -174,6 +175,7 @@ import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.EXTRA_NOT
 import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.EXTRA_NOTIFICATION_SUBJECT;
 import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.EXTRA_NOTIFICATION_TITLE;
 import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.EXTRA_NOTIFICATION_TYPE;
+import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.EXTRA_PHONE_VOLUME;
 import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.EXTRA_RECORDED_DATA_TYPES;
 import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.EXTRA_REMINDERS;
 import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.EXTRA_RESET_FLAGS;
@@ -533,6 +535,10 @@ public class DeviceCommunicationService extends Service implements SharedPrefere
                 musicSpec.trackNr = intent.getIntExtra(EXTRA_MUSIC_TRACKNR, 0);
                 mDeviceSupport.onSetMusicInfo(musicSpec);
                 break;
+            case ACTION_SET_PHONE_VOLUME:
+                float phoneVolume = intent.getFloatExtra(EXTRA_PHONE_VOLUME, 0);
+                mDeviceSupport.onSetPhoneVolume(phoneVolume);
+                break;
             case ACTION_SETMUSICSTATE:
                 MusicStateSpec stateSpec = new MusicStateSpec();
                 stateSpec.shuffle = intent.getByteExtra(EXTRA_MUSIC_SHUFFLE, (byte) 0);
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/ServiceDeviceSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/ServiceDeviceSupport.java
index bc946df64..37224e887 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/ServiceDeviceSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/ServiceDeviceSupport.java
@@ -207,6 +207,14 @@ public class ServiceDeviceSupport implements DeviceSupport {
         delegate.onSetMusicInfo(musicSpec);
     }
 
+    @Override
+    public void onSetPhoneVolume(float volume) {
+        if (checkBusy("set phone volume")) {
+            return;
+        }
+        delegate.onSetPhoneVolume(volume);
+    }
+
     @Override
     public void onInstallApp(Uri uri) {
         if (checkBusy("install app")) {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/AbstractBTLEDeviceSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/AbstractBTLEDeviceSupport.java
index 9959cc958..26c1a587c 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/AbstractBTLEDeviceSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/AbstractBTLEDeviceSupport.java
@@ -374,6 +374,11 @@ public abstract class AbstractBTLEDeviceSupport extends AbstractDeviceSupport im
 
     }
 
+    @Override
+    public void onSetPhoneVolume(final float volume) {
+
+    }
+
     @Override
     public void onSetReminders(ArrayList<? extends Reminder> reminders) {
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiSupport.java
index 3ae94aaf8..8c9652404 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiSupport.java
@@ -26,6 +26,7 @@ import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
+import android.media.AudioManager;
 import android.net.Uri;
 import android.widget.Toast;
 
@@ -1230,11 +1231,40 @@ public class HuamiSupport extends AbstractBTLEDeviceSupport {
         }
     }
 
-
     private void sendMusicStateToDevice() {
         sendMusicStateToDevice(bufferMusicSpec, bufferMusicStateSpec);
     }
 
+    @Override
+    public void onSetPhoneVolume(final float volume) {
+        if (characteristicChunked == null) {
+            return;
+        }
+
+        final byte[] volumeCommand = new byte[]{0x40, (byte) Math.round(volume)};
+
+        try {
+            final TransactionBuilder builder = performInitialized("send volume");
+            writeToChunked(builder, 3, volumeCommand);
+
+            builder.queue(getQueue());
+        } catch (final IOException e) {
+            LOG.error("Unable to send volume", e);
+        }
+
+        LOG.info("sendVolumeStateToDevice: {}", volume);
+    }
+
+    private void sendVolumeStateToDevice() {
+        final AudioManager audioManager = (AudioManager) getContext().getSystemService(Context.AUDIO_SERVICE);
+
+        final int volumeLevel = audioManager.getStreamVolume(AudioManager.STREAM_MUSIC);
+        final int volumeMax = audioManager.getStreamMaxVolume(AudioManager.STREAM_MUSIC);
+        final int volumePercentage = (byte) Math.round(100 * (volumeLevel / (float) volumeMax));
+
+        onSetPhoneVolume(volumePercentage);
+    }
+
     protected void sendMusicStateToDevice(MusicSpec musicSpec, MusicStateSpec musicStateSpec) {
         if (characteristicChunked == null) {
             return;
@@ -1712,6 +1742,7 @@ public class HuamiSupport extends AbstractBTLEDeviceSupport {
                         LOG.info("Music app started");
                         isMusicAppStarted = true;
                         sendMusicStateToDevice();
+                        sendVolumeStateToDevice();
                         break;
                     case (byte) 225:
                         LOG.info("Music app terminated");
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/receivers/GBMusicControlReceiver.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/receivers/GBMusicControlReceiver.java
index 9a7d299b0..5f4542864 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/receivers/GBMusicControlReceiver.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/receivers/GBMusicControlReceiver.java
@@ -76,6 +76,12 @@ public class GBMusicControlReceiver extends BroadcastReceiver {
             case VOLUMEDOWN:
                 AudioManager audioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
                 audioManager.adjustStreamVolume(AudioManager.STREAM_MUSIC, volumeAdjust, 0);
+
+                final int volumeLevel = audioManager.getStreamVolume(AudioManager.STREAM_MUSIC);
+                final int volumeMax = audioManager.getStreamMaxVolume(AudioManager.STREAM_MUSIC);
+                final int volumePercentage = (byte) Math.round(100 * (volumeLevel / (float) volumeMax));
+
+                GBApplication.deviceService().onSetPhoneVolume(volumePercentage);
                 break;
             default:
                 return;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/serial/AbstractSerialDeviceSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/serial/AbstractSerialDeviceSupport.java
index d847031d0..245f5c5d7 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/serial/AbstractSerialDeviceSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/serial/AbstractSerialDeviceSupport.java
@@ -158,6 +158,12 @@ public abstract class AbstractSerialDeviceSupport extends AbstractDeviceSupport
         sendToDevice(bytes);
     }
 
+    @Override
+    public void onSetPhoneVolume(final float volume) {
+        byte[] bytes = gbDeviceProtocol.encodeVolume(volume);
+        sendToDevice(bytes);
+    }
+
     @Override
     public void onAppInfoReq() {
         byte[] bytes = gbDeviceProtocol.encodeAppInfoReq();
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/serial/GBDeviceProtocol.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/serial/GBDeviceProtocol.java
index 888d64756..e2f9005da 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/serial/GBDeviceProtocol.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/serial/GBDeviceProtocol.java
@@ -64,6 +64,10 @@ public abstract class GBDeviceProtocol {
         return null;
     }
 
+    public byte[] encodeVolume(float volume) {
+        return null;
+    }
+
     public byte[] encodeSetMusicState(byte state, int position, int playRate, byte shuffle, byte repeat) {
         return null;
     }

From 10d11d4818af7217045eb6afa3a5f3b3a397a63b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Mon, 9 May 2022 14:05:08 +0100
Subject: [PATCH 047/110] Mi Band 5: Add support for configuring activity types

---
 .../DeviceSpecificSettingsFragment.java       |  6 +--
 .../devices/huami/HuamiConst.java             |  1 +
 .../service/devices/huami/HuamiSupport.java   | 48 +++++++++++++++--
 .../huami/HuamiWorkoutActivityType.java       | 52 +++++++++++++++++++
 .../devices/huami/miband5/MiBand5Support.java |  1 +
 app/src/main/res/values/arrays.xml            | 42 +++++++++++++++
 app/src/main/res/values/strings.xml           |  6 +++
 .../main/res/xml/devicesettings_miband5.xml   | 10 ++++
 8 files changed, 159 insertions(+), 7 deletions(-)
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiWorkoutActivityType.java

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 4bbd36b6a..4671a325d 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
@@ -20,7 +20,6 @@ import android.content.Intent;
 import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.text.InputType;
-import android.view.View;
 import android.widget.EditText;
 
 import androidx.annotation.NonNull;
@@ -49,13 +48,10 @@ import java.util.Objects;
 import nodomain.freeyourgadget.gadgetbridge.GBApplication;
 import nodomain.freeyourgadget.gadgetbridge.R;
 import nodomain.freeyourgadget.gadgetbridge.activities.ConfigureWorldClocks;
-import nodomain.freeyourgadget.gadgetbridge.activities.SettingsActivity;
 import nodomain.freeyourgadget.gadgetbridge.devices.DeviceCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.DeviceManager;
 import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst;
-import nodomain.freeyourgadget.gadgetbridge.devices.makibeshr3.MakibesHR3Constants;
 import nodomain.freeyourgadget.gadgetbridge.devices.miband.MiBandConst;
-import nodomain.freeyourgadget.gadgetbridge.devices.miband.MiBandPreferencesActivity;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
 import nodomain.freeyourgadget.gadgetbridge.model.CannedMessagesSpec;
 import nodomain.freeyourgadget.gadgetbridge.util.DeviceHelper;
@@ -77,6 +73,7 @@ import static nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst.PREF
 import static nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst.PREF_EXPOSE_HR_THIRDPARTY;
 import static nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst.PREF_SHORTCUTS;
 import static nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst.PREF_SHORTCUTS_SORTABLE;
+import static nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst.PREF_WORKOUT_ACTIVITY_TYPES_SORTABLE;
 import static nodomain.freeyourgadget.gadgetbridge.devices.miband.MiBandConst.PREF_MI2_DATEFORMAT;
 import static nodomain.freeyourgadget.gadgetbridge.devices.miband.MiBandConst.PREF_MI2_ROTATE_WRIST_TO_SWITCH_INFO;
 import static nodomain.freeyourgadget.gadgetbridge.devices.miband.MiBandConst.PREF_NIGHT_MODE;
@@ -350,6 +347,7 @@ public class DeviceSpecificSettingsFragment extends PreferenceFragmentCompat imp
         addPreferenceHandlerFor(PREF_DATEFORMAT);
         addPreferenceHandlerFor(PREF_DISPLAY_ITEMS);
         addPreferenceHandlerFor(PREF_DISPLAY_ITEMS_SORTABLE);
+        addPreferenceHandlerFor(PREF_WORKOUT_ACTIVITY_TYPES_SORTABLE);
         addPreferenceHandlerFor(PREF_SHORTCUTS);
         addPreferenceHandlerFor(PREF_SHORTCUTS_SORTABLE);
         addPreferenceHandlerFor(PREF_LANGUAGE);
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiConst.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiConst.java
index 8fef25994..2ec6b9f77 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiConst.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiConst.java
@@ -59,6 +59,7 @@ public class HuamiConst {
 
     public static final String PREF_DISPLAY_ITEMS = "display_items";
     public static final String PREF_DISPLAY_ITEMS_SORTABLE = "display_items_sortable";
+    public static final String PREF_WORKOUT_ACTIVITY_TYPES_SORTABLE = "workout_activity_types_sortable";
     public static final String PREF_SHORTCUTS = "shortcuts";
     public static final String PREF_SHORTCUTS_SORTABLE = "shortcuts_sortable";
     public static final String PREF_EXPOSE_HR_THIRDPARTY = "expose_hr_thirdparty";
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiSupport.java
index 8c9652404..e6d692330 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiSupport.java
@@ -139,7 +139,6 @@ import nodomain.freeyourgadget.gadgetbridge.service.devices.common.SimpleNotific
 import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.actions.StopNotificationAction;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.miband2.Mi2NotificationStrategy;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.miband2.Mi2TextNotificationStrategy;
-import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.miband5.MiBand5Support;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.operations.FetchActivityOperation;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.operations.InitOperation;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.operations.InitOperation2021;
@@ -193,14 +192,12 @@ import static nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst.PREF
 import static nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst.PREF_BUTTON_ACTION_SELECTION_OFF;
 import static nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst.PREF_DEVICE_ACTION_FELL_SLEEP_BROADCAST;
 import static nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst.PREF_DEVICE_ACTION_FELL_SLEEP_SELECTION;
-import static nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst.PREF_DEVICE_ACTION_SELECTION_BROADCAST;
 import static nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst.PREF_DEVICE_ACTION_SELECTION_OFF;
 import static nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst.PREF_DEVICE_ACTION_START_NON_WEAR_BROADCAST;
 import static nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst.PREF_DEVICE_ACTION_START_NON_WEAR_SELECTION;
 import static nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst.PREF_DEVICE_ACTION_WOKE_UP_BROADCAST;
 import static nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst.PREF_DEVICE_ACTION_WOKE_UP_SELECTION;
 import static nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiService.DISPLAY_ITEM_BIT_CLOCK;
-import static nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiService.ENDPOINT_DISPLAY;
 import static nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiService.ENDPOINT_DISPLAY_ITEMS;
 import static nodomain.freeyourgadget.gadgetbridge.devices.miband.MiBandConst.DEFAULT_VALUE_VIBRATION_COUNT;
 import static nodomain.freeyourgadget.gadgetbridge.devices.miband.MiBandConst.DEFAULT_VALUE_VIBRATION_PROFILE;
@@ -2410,6 +2407,9 @@ public class HuamiSupport extends AbstractBTLEDeviceSupport {
                 case HuamiConst.PREF_SHORTCUTS_SORTABLE:
                     setShortcuts(builder);
                     break;
+                case HuamiConst.PREF_WORKOUT_ACTIVITY_TYPES_SORTABLE:
+                    setWorkoutActivityTypes(builder);
+                    break;
                 case MiBandConst.PREF_MI2_ROTATE_WRIST_TO_SWITCH_INFO:
                     setRotateWristToSwitchInfo(builder);
                     break;
@@ -2992,6 +2992,48 @@ public class HuamiSupport extends AbstractBTLEDeviceSupport {
         return this;
     }
 
+    protected HuamiSupport setWorkoutActivityTypes(final TransactionBuilder builder) {
+        final SharedPreferences prefs = GBApplication.getDeviceSpecificSharedPrefs(gbDevice.getAddress());
+
+        final List<String> allActivityTypes = Arrays.asList(getContext().getResources().getStringArray(R.array.pref_miband5_workout_activity_types_values));
+        final List<String> defaultActivityTypes = Arrays.asList(getContext().getResources().getStringArray(R.array.pref_miband5_workout_activity_types_default));
+        final String activityTypesPref = prefs.getString(HuamiConst.PREF_WORKOUT_ACTIVITY_TYPES_SORTABLE, null);
+
+        final List<String> enabledActivityTypes;
+        if (activityTypesPref == null || activityTypesPref.equals("")) {
+            enabledActivityTypes = defaultActivityTypes;
+        } else {
+            enabledActivityTypes = Arrays.asList(activityTypesPref.split(","));
+        }
+
+        LOG.info("Setting workout types to {}", enabledActivityTypes);
+
+        final byte[] command = new byte[allActivityTypes.size() * 3 + 2];
+        command[0] = 0x0b;
+        command[1] = 0x00;
+
+        int pos = 2;
+
+        for (final String workoutType : enabledActivityTypes) {
+            command[pos++] = HuamiWorkoutActivityType.fromPrefValue(workoutType).getCode();
+            command[pos++] = 0x00;
+            command[pos++] = 0x01;
+        }
+
+        // Send all the remaining disabled workout types
+        for (final String workoutType : allActivityTypes) {
+            if (!enabledActivityTypes.contains(workoutType)) {
+                command[pos++] = HuamiWorkoutActivityType.fromPrefValue(workoutType).getCode();
+                command[pos++] = 0x00;
+                command[pos++] = 0x00;
+            }
+        }
+
+        writeToChunked(builder, 9, command);
+
+        return this;
+    }
+
     protected HuamiSupport setBeepSounds(TransactionBuilder builder) {
 
         SharedPreferences prefs = GBApplication.getDeviceSpecificSharedPrefs(gbDevice.getAddress());
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiWorkoutActivityType.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiWorkoutActivityType.java
new file mode 100644
index 000000000..70688310c
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiWorkoutActivityType.java
@@ -0,0 +1,52 @@
+/*  Copyright (C) 2022 José Rebelo
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.service.devices.huami;
+
+import java.util.Locale;
+
+public enum HuamiWorkoutActivityType {
+    OutdoorRunning(0x01),
+    Walking(0x06),
+    Treadmill(0x08),
+    OutdoorCycling(0x09),
+    IndoorCycling(0x0a),
+    Elliptical(0x0c),
+    PoolSwimming(0x0e),
+    Freestyle(0x10),
+    JumpRope(0x15),
+    RowingMachine(0x17),
+    Yoga(0x3c);
+
+    private final byte code;
+
+    HuamiWorkoutActivityType(final int code) {
+        this.code = (byte) code;
+    }
+
+    public byte getCode() {
+        return code;
+    }
+
+    public static HuamiWorkoutActivityType fromPrefValue(final String prefValue) {
+        for (HuamiWorkoutActivityType type : values()) {
+            if (type.name().toLowerCase(Locale.ROOT).equals(prefValue.replace("_", "").toLowerCase(Locale.ROOT))) {
+                return type;
+            }
+        }
+        throw new RuntimeException("No matching HuamiWorkoutActivityType for pref value: " + prefValue);
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/miband5/MiBand5Support.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/miband5/MiBand5Support.java
index d96edc865..e38fd3861 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/miband5/MiBand5Support.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/miband5/MiBand5Support.java
@@ -65,5 +65,6 @@ public class MiBand5Support extends MiBand4Support {
         super.phase3Initialize(builder);
         LOG.info("phase3Initialize...");
         setActivateDisplayOnLiftWristSensitivity(builder); // TODO? Move this to HuamiSupport?
+        setWorkoutActivityTypes(builder);  // TODO: Supported by other bands?
     }
 }
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index e9b7245bd..73cea0d25 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -580,6 +580,48 @@
         <item>@string/p_menuitem_music</item>
     </string-array>
 
+    <string-array name="pref_miband5_workout_activity_types">
+        <item>@string/activity_type_outdoor_running</item>
+        <item>@string/activity_type_walking</item>
+        <item>@string/activity_type_treadmill</item>
+        <item>@string/activity_type_outdoor_cycling</item>
+        <item>@string/activity_type_indoor_cycling</item>
+        <item>@string/activity_type_elliptical</item>
+        <item>@string/activity_type_swimming</item>
+        <item>@string/activity_type_freestyle</item>
+        <item>@string/activity_type_jump_roping</item>
+        <item>@string/activity_type_rowing_machine</item>
+        <item>@string/activity_type_yoga</item>
+    </string-array>
+
+    <string-array name="pref_miband5_workout_activity_types_values">
+        <item>outdoor_running</item>
+        <item>walking</item>
+        <item>treadmill</item>
+        <item>outdoor_cycling</item>
+        <item>indoor_cycling</item>
+        <item>elliptical</item>
+        <item>pool_swimming</item>
+        <item>freestyle</item>
+        <item>jump_rope</item>
+        <item>rowing_machine</item>
+        <item>yoga</item>
+    </string-array>
+
+    <string-array name="pref_miband5_workout_activity_types_default">
+        <item>outdoor_running</item>
+        <item>walking</item>
+        <item>treadmill</item>
+        <item>outdoor_cycling</item>
+        <item>indoor_cycling</item>
+        <item>elliptical</item>
+        <item>pool_swimming</item>
+        <item>freestyle</item>
+        <item>jump_rope</item>
+        <item>rowing_machine</item>
+        <item>yoga</item>
+    </string-array>
+
     <string-array name="pref_neo_display_items">
         <item>@string/menuitem_pai</item>
         <item>@string/menuitem_dnd</item>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index a2422f918..7cff8e280 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -688,6 +688,8 @@
     <string name="bip_prefs_shortcuts">Shortcuts</string>
     <string name="bip_prefs_shotcuts_summary">Choose the shortcuts on the band screen</string>
     <string name="prefs_activate_display_on_lift_sensitivity">Sensitivity</string>
+    <string name="mi5_prefs_workout_activity_types">Workout Activity Types</string>
+    <string name="mi5_prefs_workout_activity_types_summary">Choose the activity types to display on the workouts screen</string>
     <string name="pref_title_force_white_color_scheme">Force black on white color scheme</string>
     <string name="pref_summary_force_white_color_scheme">Useful if you your watch has dark hands</string>
     <string name="lefun_prefs_hydration_reminder_title">Hydration reminder</string>
@@ -875,13 +877,17 @@
     <string name="activity_type_deep_sleep">Deep sleep</string>
     <string name="activity_type_not_worn">Device not worn</string>
     <string name="activity_type_running">Running</string>
+    <string name="activity_type_outdoor_running">Outdoor Running</string>
     <string name="activity_type_walking">Walking</string>
+    <string name="activity_type_freestyle">Freestyle</string>
     <string name="activity_type_hiking">Hiking</string>
     <string name="activity_type_climbing">Climbing</string>
     <string name="activity_type_swimming">Swimming</string>
     <string name="activity_type_swimming_openwater">Swimming (Open water)</string>
     <string name="activity_type_indoor_cycling">Indoor Cycling</string>
+    <string name="activity_type_outdoor_cycling">Outdoor Cycling</string>
     <string name="activity_type_elliptical_trainer">Elliptical Trainer</string>
+    <string name="activity_type_elliptical">Elliptical</string>
     <string name="activity_type_jump_roping">Jumping Rope</string>
     <string name="activity_type_yoga">Yoga</string>
     <string name="activity_type_soccer">Soccer</string>
diff --git a/app/src/main/res/xml/devicesettings_miband5.xml b/app/src/main/res/xml/devicesettings_miband5.xml
index e7ea6b1a2..326912155 100644
--- a/app/src/main/res/xml/devicesettings_miband5.xml
+++ b/app/src/main/res/xml/devicesettings_miband5.xml
@@ -20,4 +20,14 @@
         android:persistent="true"
         android:summary="@string/bip_prefs_shotcuts_summary"
         android:title="@string/bip_prefs_shortcuts" />
+    <com.mobeta.android.dslv.DragSortListPreference
+        android:icon="@drawable/ic_activity_unknown_small"
+        android:defaultValue="@array/pref_miband5_workout_activity_types_default"
+        android:dialogTitle="@string/mi5_prefs_workout_activity_types"
+        android:entries="@array/pref_miband5_workout_activity_types"
+        android:entryValues="@array/pref_miband5_workout_activity_types_values"
+        android:key="workout_activity_types_sortable"
+        android:persistent="true"
+        android:summary="@string/mi5_prefs_workout_activity_types_summary"
+        android:title="@string/mi5_prefs_workout_activity_types" />
 </androidx.preference.PreferenceScreen>

From c31213c34d357f60823fafe57093809f2006ce1b Mon Sep 17 00:00:00 2001
From: Daniel Dakhno <dakhnod@gmail.com>
Date: Sat, 14 May 2022 04:47:22 +0200
Subject: [PATCH 048/110] VESC: added battery indicator

---
 .../DeviceSettingsPreferenceConst.java        |   3 +
 .../devices/vesc/VescControlActivity.java     |   8 +-
 .../devices/vesc/VescCoordinator.java         |  12 +-
 .../service/devices/vesc/CommandType.java     |  48 +++-
 .../devices/vesc/VescDeviceSupport.java       | 230 +++++++++++++++---
 app/src/main/res/xml/devicesettings_vesc.xml  |  18 ++
 6 files changed, 274 insertions(+), 45 deletions(-)
 create mode 100644 app/src/main/res/xml/devicesettings_vesc.xml

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsPreferenceConst.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsPreferenceConst.java
index 39964bdcd..ad1aa2c91 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsPreferenceConst.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsPreferenceConst.java
@@ -184,6 +184,9 @@ public class DeviceSettingsPreferenceConst {
     public static final String PREF_UM25_SHOW_THRESHOLD_NOTIFICATION = "um25_current_threshold_notify";
     public static final String PREF_UM25_SHOW_THRESHOLD = "um25_current_threshold";
 
+    public static final String PREF_VESC_MINIMUM_VOLTAGE = "vesc_minimum_battery_voltage";
+    public static final String PREF_VESC_MAXIMUM_VOLTAGE = "vesc_maximum_battery_voltage";
+
     public static final String PREF_SOUNDS = "sounds";
     public static final String PREF_AUTH_KEY = "authkey";
     public static final String PREF_USER_FITNESS_GOAL = "fitness_goal";
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/vesc/VescControlActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/vesc/VescControlActivity.java
index 8c745f975..18f904a9d 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/vesc/VescControlActivity.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/vesc/VescControlActivity.java
@@ -73,7 +73,7 @@ public class VescControlActivity extends AbstractGBActivity {
 
     private void restoreValues(){
         rpmEditText.setText(String.valueOf(preferences.getInt(PREFS_KEY_LAST_RPM, 0)));
-        breakCurrentEditText.setText(String.valueOf(preferences.getInt(PREFS_KEY_LAST_BREAK_CURRENT, 0)));
+        breakCurrentEditText.setText(String.valueOf(preferences.getInt(PREFS_KEY_LAST_BREAK_CURRENT, 0) / 1000));
     }
 
     @Override
@@ -184,7 +184,11 @@ public class VescControlActivity extends AbstractGBActivity {
                     currentBreakCurrentMa = 0;
                     return;
                 }
-                VescControlActivity.this.currentBreakCurrentMa = Integer.parseInt(text) * 1000;
+                try {
+                    VescControlActivity.this.currentBreakCurrentMa = Integer.parseInt(text) * 1000;
+                }catch (NumberFormatException e){
+                    VescControlActivity.this.currentBreakCurrentMa = 0;
+                }
             }
         });
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/vesc/VescCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/vesc/VescCoordinator.java
index f34dc2083..773b7e6a1 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/vesc/VescCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/vesc/VescCoordinator.java
@@ -24,6 +24,7 @@ import android.os.ParcelUuid;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import nodomain.freeyourgadget.gadgetbridge.R;
 import nodomain.freeyourgadget.gadgetbridge.GBException;
 import nodomain.freeyourgadget.gadgetbridge.devices.AbstractDeviceCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.InstallHandler;
@@ -38,9 +39,11 @@ import nodomain.freeyourgadget.gadgetbridge.model.DeviceType;
 public class VescCoordinator extends AbstractDeviceCoordinator {
     public final static String UUID_SERVICE_SERIAL_HM10 = "0000ffe0-0000-1000-8000-00805f9b34fb";
     public final static String UUID_CHARACTERISTIC_SERIAL_TX_HM10 = "0000ffe1-0000-1000-8000-00805f9b34fb";
+    public final static String UUID_CHARACTERISTIC_SERIAL_RX_HM10 = "0000ffe1-0000-1000-8000-00805f9b34fb";
 
     public final static String UUID_SERVICE_SERIAL_NRF = "0000ffe0-0000-1000-8000-00805f9b34fb";
     public final static String UUID_CHARACTERISTIC_SERIAL_TX_NRF = "0000ffe0-0000-1000-8000-00805f9b34fb";
+    public final static String UUID_CHARACTERISTIC_SERIAL_RX_NRF = "0000ffe1-0000-1000-8000-00805f9b34fb";
 
 
     @Override
@@ -48,6 +51,13 @@ public class VescCoordinator extends AbstractDeviceCoordinator {
 
     }
 
+    @Override
+    public int[] getSupportedDeviceSpecificSettings(GBDevice device) {
+        return new int[]{
+            R.xml.devicesettings_vesc
+        };
+    }
+
     @Override
     public DeviceType getSupportedType(GBDeviceCandidate candidate) {
         ParcelUuid[] uuids = candidate.getServiceUuids();
@@ -77,7 +87,7 @@ public class VescCoordinator extends AbstractDeviceCoordinator {
 
     @Override
     public boolean supportsActivityDataFetching() {
-        return false;
+        return true;
     }
 
     @Override
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vesc/CommandType.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vesc/CommandType.java
index b1ce868b4..bd0ca8eae 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vesc/CommandType.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vesc/CommandType.java
@@ -17,17 +17,47 @@
 package nodomain.freeyourgadget.gadgetbridge.service.devices.vesc;
 
 public enum CommandType {
-    SET_CURRENT((byte) 0x06),
-    SET_CURRENT_BRAKE((byte) 0x07),
-    SET_RPM((byte) 0x08),
+    COMM_FW_VERSION,
+    COMM_JUMP_TO_BOOTLOADER,
+    COMM_ERASE_NEW_APP,
+    COMM_WRITE_NEW_APP_DATA,
+    COMM_GET_VALUES,
+    COMM_SET_DUTY,
+    COMM_SET_CURRENT,
+    COMM_SET_CURRENT_BRAKE,
+    COMM_SET_RPM,
+    COMM_SET_POS,
+    COMM_SET_HANDBRAKE,
+    COMM_SET_DETECT,
+    COMM_SET_SERVO_POS,
+    COMM_SET_MCCONF,
+    COMM_GET_MCCONF,
+    COMM_GET_MCCONF_DEFAULT,
+    COMM_SET_APPCONF,
+    COMM_GET_APPCONF,
+    COMM_GET_APPCONF_DEFAULT,
+    COMM_SAMPLE_PRINT,
+    COMM_TERMINAL_CMD,
+    COMM_PRINT,
+    COMM_ROTOR_POSITION,
+    COMM_EXPERIMENT_SAMPLE,
+    COMM_DETECT_MOTOR_PARAM,
+    COMM_DETECT_MOTOR_R_L,
+    COMM_DETECT_MOTOR_FLUX_LINKAGE,
+    COMM_DETECT_ENCODER,
+    COMM_DETECT_HALL_FOC,
+    COMM_REBOOT,
+    COMM_ALIVE,
+    COMM_GET_DECODED_PPM,
+    COMM_GET_DECODED_ADC,
+    COMM_GET_DECODED_CHUK,
+    COMM_FORWARD_CAN,
+    COMM_SET_CHUCK_DATA,
+    COMM_CUSTOM_APP_DATA,
+    COMM_NRF_START_PAIRING
     ;
-    byte commandByte;
-
-    CommandType(byte commandByte){
-        this.commandByte = commandByte;
-    }
 
     public byte getCommandByte(){
-        return this.commandByte;
+        return (byte) this.ordinal();
     }
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vesc/VescDeviceSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vesc/VescDeviceSupport.java
index ca10ef14a..2007b6f1d 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vesc/VescDeviceSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vesc/VescDeviceSupport.java
@@ -16,11 +16,14 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.vesc;
 
+import android.bluetooth.BluetoothGatt;
 import android.bluetooth.BluetoothGattCharacteristic;
+import android.bluetooth.BluetoothGattDescriptor;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
+import android.content.SharedPreferences;
 
 import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 
@@ -28,8 +31,11 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
 import java.util.UUID;
 
+import nodomain.freeyourgadget.gadgetbridge.GBApplication;
+import nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst;
 import nodomain.freeyourgadget.gadgetbridge.devices.vesc.VescCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
 import nodomain.freeyourgadget.gadgetbridge.model.DeviceType;
@@ -37,32 +43,44 @@ import nodomain.freeyourgadget.gadgetbridge.service.btle.TransactionBuilder;
 import nodomain.freeyourgadget.gadgetbridge.service.btle.actions.SetDeviceStateAction;
 import nodomain.freeyourgadget.gadgetbridge.util.CheckSums;
 
-public class VescDeviceSupport extends VescBaseDeviceSupport{
-    BluetoothGattCharacteristic serialWriteCharacteristic;
+public class VescDeviceSupport extends VescBaseDeviceSupport {
+    BluetoothGattCharacteristic serialWriteCharacteristic, serialReadCharacteristic;
 
     public static final String COMMAND_SET_RPM = "nodomain.freeyourgadget.gadgetbridge.vesc.command.SET_RPM";
     public static final String COMMAND_SET_CURRENT = "nodomain.freeyourgadget.gadgetbridge.vesc.command.SET_CURRENT";
     public static final String COMMAND_SET_BREAK_CURRENT = "nodomain.freeyourgadget.gadgetbridge.vesc.command.SET_BREAK_CURRENT";
+    public static final String COMMAND_GET_VALUES = "nodomain.freeyourgadget.gadgetbridge.vesc.command.GET_VALUES";
     public static final String EXTRA_RPM = "EXTRA_RPM";
     public static final String EXTRA_CURRENT = "EXTRA_CURRENT";
+    public static final String EXTRA_VOLTAGE = "EXTRA_VOLTAGE";
+
+    public static final String ACTION_GOT_VALUES = "nodomain.freeyourgadget.gadgetbridge.vesc.action.GOT_VALUES";
 
     private Logger logger = LoggerFactory.getLogger(getClass());
 
     private DeviceType deviceType;
 
-    public VescDeviceSupport(DeviceType type){
+    private ByteBuffer responseBuffer = ByteBuffer.allocate(100);
+
+    public VescDeviceSupport(DeviceType type) {
         super();
-        logger.debug("VescDeviceSupport() {}", type);
+        responseBuffer.order(ByteOrder.BIG_ENDIAN);
 
         deviceType = type;
 
-        if(type == DeviceType.VESC_NRF){
+        if (type == DeviceType.VESC_NRF) {
             addSupportedService(UUID.fromString(VescCoordinator.UUID_SERVICE_SERIAL_NRF));
-        }else if(type == DeviceType.VESC_HM10){
+        } else if (type == DeviceType.VESC_HM10) {
             addSupportedService(UUID.fromString(VescCoordinator.UUID_SERVICE_SERIAL_HM10));
         }
     }
 
+    @Override
+    public void onFetchRecordedData(int dataTypes) {
+        super.onFetchRecordedData(dataTypes);
+        getValues();
+    }
+
     @Override
     protected TransactionBuilder initializeDevice(TransactionBuilder builder) {
         logger.debug("initializing device");
@@ -71,15 +89,148 @@ public class VescDeviceSupport extends VescBaseDeviceSupport{
 
         initBroadcast();
 
-        if(deviceType == DeviceType.VESC_NRF){
+        if (deviceType == DeviceType.VESC_NRF) {
             this.serialWriteCharacteristic = getCharacteristic(UUID.fromString(VescCoordinator.UUID_CHARACTERISTIC_SERIAL_TX_NRF));
-        }else if(deviceType == DeviceType.VESC_HM10){
+            this.serialReadCharacteristic = getCharacteristic(UUID.fromString(VescCoordinator.UUID_CHARACTERISTIC_SERIAL_RX_NRF));
+        } else if (deviceType == DeviceType.VESC_HM10) {
             this.serialWriteCharacteristic = getCharacteristic(UUID.fromString(VescCoordinator.UUID_CHARACTERISTIC_SERIAL_TX_HM10));
+            this.serialReadCharacteristic = getCharacteristic(UUID.fromString(VescCoordinator.UUID_CHARACTERISTIC_SERIAL_RX_HM10));
         }
 
+        builder.notify(this.serialReadCharacteristic, true);
+
         return builder.add(new SetDeviceStateAction(getDevice(), GBDevice.State.INITIALIZED, getContext()));
     }
 
+    @Override
+    public boolean onDescriptorWrite(BluetoothGatt gatt, BluetoothGattDescriptor descriptor, int status) {
+        super.onDescriptorWrite(gatt, descriptor, status);
+        getValues();
+
+        return true;
+    }
+
+    @Override
+    public boolean onCharacteristicChanged(BluetoothGatt gatt, BluetoothGattCharacteristic characteristic) {
+        handleRxCharacteristic(characteristic);
+
+        return true;
+    }
+
+    private void handleRxCharacteristic(BluetoothGattCharacteristic characteristic) {
+        if (characteristic != serialReadCharacteristic) return;
+
+        responseBuffer.put(characteristic.getValue());
+        short length = 0;
+        int oldPosition = responseBuffer.position();
+        responseBuffer.position(0);
+        byte lengthType = responseBuffer.get();
+        if (lengthType == 2) {
+            length = responseBuffer.get();
+        } else if (lengthType == 3) {
+            length = responseBuffer.getShort();
+        } else {
+            return;
+        }
+        if (length == oldPosition - 5) {
+            // whole message transmitted
+            responseBuffer.position(oldPosition);
+            handleResponseBuffer(responseBuffer);
+
+            oldPosition = 0;
+        }
+        responseBuffer.position(oldPosition);
+    }
+
+    private void handleResponseBuffer(ByteBuffer responseBuffer) {
+        int bufferLength = responseBuffer.position();
+        int payloadStartPosition = responseBuffer.get(0);
+
+        byte[] payload = new byte[bufferLength - 3 - payloadStartPosition];
+        System.arraycopy(responseBuffer.array(), payloadStartPosition, payload, 0, payload.length);
+
+        int actualCrc = CheckSums.getCRC16(payload, 0);
+        int expectedCrc = responseBuffer.getShort(bufferLength - 3);
+
+        byte responseType = payload[0];
+        if (responseType == 0x04) {
+            handleResponseValues(responseBuffer);
+        }
+    }
+
+    private void handleResponseValues(ByteBuffer valueBuffer) {
+        valueBuffer.position(3);
+        float temp_mos = buffer_get_float16(valueBuffer, 1e1);
+        float temp_motor = buffer_get_float16(valueBuffer, 1e1);
+        float current_motor = buffer_get_float32(valueBuffer, 1e2);
+        float current_in = buffer_get_float32(valueBuffer, 1e2);
+        float id = buffer_get_float32(valueBuffer, 1e2);
+        float iq = buffer_get_float32(valueBuffer, 1e2);
+        float duty_now = buffer_get_float16(valueBuffer, 1e3);
+        float rpm = buffer_get_float32(valueBuffer, 1e0);
+        float v_in = buffer_get_float16(valueBuffer, 1e1);
+        float amp_hours = buffer_get_float32(valueBuffer, 1e4);
+        float amp_hours_charged = buffer_get_float32(valueBuffer, 1e4);
+        float watt_hours = buffer_get_float32(valueBuffer, 1e4);
+        float watt_hours_charged = buffer_get_float32(valueBuffer, 1e4);
+        float tachometer = buffer_get_int32(valueBuffer);
+        float tachometer_abs = buffer_get_int32(valueBuffer);
+
+        handleBatteryVoltage(v_in);
+
+        Intent intent = new Intent(ACTION_GOT_VALUES);
+        intent.putExtra(EXTRA_VOLTAGE, v_in);
+    }
+
+
+
+    void handleBatteryVoltage(float voltage){
+        SharedPreferences prefs = GBApplication.getDeviceSpecificSharedPrefs(getDevice().getAddress());
+        float minimalVoltage = Float.parseFloat(prefs.getString(DeviceSettingsPreferenceConst.PREF_VESC_MINIMUM_VOLTAGE, "-1"));
+        float maximalVoltage = Float.parseFloat(prefs.getString(DeviceSettingsPreferenceConst.PREF_VESC_MAXIMUM_VOLTAGE, "-1"));
+
+        if(minimalVoltage == -1){
+            return;
+        }
+        if(maximalVoltage == -1){
+            return;
+        }
+
+        float voltageAboveMinimum = voltage - minimalVoltage;
+        float voltageRange = maximalVoltage - minimalVoltage;
+        float fullness = voltageAboveMinimum / voltageRange;
+
+        int fullnessPercent = (int)(fullness * 100);
+        fullnessPercent = Math.max(fullnessPercent, 0);
+        fullnessPercent = Math.min(fullnessPercent, 100);
+
+        getDevice().setBatteryLevel(fullnessPercent);
+        getDevice().setBatteryVoltage(voltage);
+        getDevice().sendDeviceUpdateIntent(getContext());
+    }
+
+    float buffer_get_float16(ByteBuffer buffer, double scale){
+        return (float) (buffer.getShort() / scale);
+    }
+
+    float buffer_get_float32(ByteBuffer buffer, double scale){
+        return (float) (buffer.getInt() / scale);
+    }
+
+    int buffer_get_int32(ByteBuffer buffer){
+        return buffer.getInt();
+    }
+
+    @Override
+    public void onTestNewFunction() {
+        getValues();
+        // getDecodedADC();
+    }
+
+    private void getDecodedADC() {
+        buildAndQueryPacket(CommandType.COMM_GET_DECODED_ADC);
+    }
+
     private void initBroadcast() {
         LocalBroadcastManager broadcastManager = LocalBroadcastManager.getInstance(getContext());
 
@@ -87,86 +238,99 @@ public class VescDeviceSupport extends VescBaseDeviceSupport{
         filter.addAction(COMMAND_SET_RPM);
         filter.addAction(COMMAND_SET_CURRENT);
         filter.addAction(COMMAND_SET_BREAK_CURRENT);
+        filter.addAction(COMMAND_GET_VALUES);
 
         broadcastManager.registerReceiver(commandReceiver, filter);
     }
 
+    @Override
+    public void dispose() {
+        super.dispose();
+        LocalBroadcastManager.getInstance(getContext()).unregisterReceiver(commandReceiver);
+    }
+
     BroadcastReceiver commandReceiver = new BroadcastReceiver() {
         @Override
         public void onReceive(Context context, Intent intent) {
-            if(intent.getAction().equals(COMMAND_SET_RPM)){
+            if (intent.getAction().equals(COMMAND_SET_RPM)) {
                 VescDeviceSupport.this.setRPM(
                         intent.getIntExtra(EXTRA_RPM, 0)
                 );
-            }else if(intent.getAction().equals(COMMAND_SET_BREAK_CURRENT)){
+            } else if (intent.getAction().equals(COMMAND_SET_BREAK_CURRENT)) {
                 VescDeviceSupport.this.setBreakCurrent(
                         intent.getIntExtra(EXTRA_CURRENT, 0)
                 );
-            }else if(intent.getAction().equals(COMMAND_SET_CURRENT)){
+            } else if (intent.getAction().equals(COMMAND_SET_CURRENT)) {
                 VescDeviceSupport.this.setCurrent(
                         intent.getIntExtra(EXTRA_CURRENT, 0)
                 );
+            } else if (intent.getAction().equals(COMMAND_GET_VALUES)) {
+                VescDeviceSupport.this.getValues();
             }
         }
     };
 
-    public void setCurrent(int currentMillisAmperes){
-        buildAndQueryPacket(CommandType.SET_CURRENT, currentMillisAmperes);
+    public void setCurrent(int currentMillisAmperes) {
+        buildAndQueryPacket(CommandType.COMM_SET_CURRENT, currentMillisAmperes);
     }
 
-    public void setBreakCurrent(int breakCurrentMillisAmperes){
-        buildAndQueryPacket(CommandType.SET_CURRENT_BRAKE, breakCurrentMillisAmperes);
+    public void setBreakCurrent(int breakCurrentMillisAmperes) {
+        buildAndQueryPacket(CommandType.COMM_SET_CURRENT_BRAKE, breakCurrentMillisAmperes);
     }
 
-    public void setRPM(int rpm){
-        buildAndQueryPacket(CommandType.SET_RPM, rpm);
+    public void getValues() {
+        buildAndQueryPacket(CommandType.COMM_GET_VALUES);
     }
 
-    public void buildAndQueryPacket(CommandType commandType, Object ... args){
+    public void setRPM(int rpm) {
+        buildAndQueryPacket(CommandType.COMM_SET_RPM, rpm);
+    }
+
+    public void buildAndQueryPacket(CommandType commandType, Object... args) {
         byte[] data = buildPacket(commandType, args);
         queryPacket(data);
     }
 
-    public void queryPacket(byte[] data){
+    public void queryPacket(byte[] data) {
         new TransactionBuilder("write serial packet")
                 .write(this.serialWriteCharacteristic, data)
                 .queue(getQueue());
     }
 
-    public byte[] buildPacket(CommandType commandType, Object ... args){
+    public byte[] buildPacket(CommandType commandType, Object... args) {
         int dataLength = 0;
-        for(Object arg : args){
-            if(arg instanceof Integer) dataLength += 4;
-            else if(arg instanceof Short) dataLength += 2;
+        for (Object arg : args) {
+            if (arg instanceof Integer) dataLength += 4;
+            else if (arg instanceof Short) dataLength += 2;
         }
         ByteBuffer buffer = ByteBuffer.allocate(dataLength);
 
-        for(Object arg : args){
-            if(arg instanceof Integer) buffer.putInt((Integer) arg);
-            if(arg instanceof Short) buffer.putShort((Short) arg);
+        for (Object arg : args) {
+            if (arg instanceof Integer) buffer.putInt((Integer) arg);
+            if (arg instanceof Short) buffer.putShort((Short) arg);
         }
 
         return buildPacket(commandType, buffer.array());
     }
 
-    public byte[] buildPacket(CommandType commandType, byte[] data){
+    public byte[] buildPacket(CommandType commandType, byte[] data) {
         return buildPacket(commandType.getCommandByte(), data);
     }
 
-    private byte[] buildPacket(byte commandByte, byte[] data){
+    private byte[] buildPacket(byte commandByte, byte[] data) {
         byte[] contents = new byte[data.length + 1];
         contents[0] = commandByte;
         System.arraycopy(data, 0, contents, 1, data.length);
         return buildPacket(contents);
     }
 
-    private byte[] buildPacket(byte[] contents){
+    private byte[] buildPacket(byte[] contents) {
         int dataLength = contents.length;
         ByteBuffer buffer = ByteBuffer.allocate(dataLength + (dataLength < 256 ? 5 : 6));
-        if(dataLength < 256){
-            buffer.put((byte)0x02);
-            buffer.put((byte)dataLength);
-        }else{
+        if (dataLength < 256) {
+            buffer.put((byte) 0x02);
+            buffer.put((byte) dataLength);
+        } else {
             buffer.put((byte) 0x03);
             buffer.putShort((short) dataLength);
         }
diff --git a/app/src/main/res/xml/devicesettings_vesc.xml b/app/src/main/res/xml/devicesettings_vesc.xml
new file mode 100644
index 000000000..d4906ee06
--- /dev/null
+++ b/app/src/main/res/xml/devicesettings_vesc.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PreferenceScreen
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <EditTextPreference
+        android:title="Minimum battery voltage"
+        android:key="vesc_minimum_battery_voltage"
+        android:inputType="number"
+        app:useSimpleSummaryProvider="true" />
+
+    <EditTextPreference
+        android:title="Maximum battery voltage"
+        android:key="vesc_maximum_battery_voltage"
+        android:inputType="number"
+        app:useSimpleSummaryProvider="true" />
+
+</PreferenceScreen>
\ No newline at end of file

From 5f73dd79e63555e7fe312c320eebb71c75f241a1 Mon Sep 17 00:00:00 2001
From: vanous <petr@linuks.cz>
Date: Sat, 14 May 2022 14:42:07 +0200
Subject: [PATCH 049/110] Amazfit Band 5: enable: world clocks settings,
 display on lift sensitivity, configuring activity types

---
 .../huami/amazfitband5/AmazfitBand5Coordinator.java  |  1 +
 .../huami/amazfitband5/AmazfitBand5Support.java      | 12 ++++++++++++
 app/src/main/res/xml/devicesettings_amazfitband5.xml | 10 ++++++++++
 3 files changed, 23 insertions(+)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitband5/AmazfitBand5Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitband5/AmazfitBand5Coordinator.java
index f4ed7aae0..4616431c9 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitband5/AmazfitBand5Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitband5/AmazfitBand5Coordinator.java
@@ -103,6 +103,7 @@ public class AmazfitBand5Coordinator extends HuamiCoordinator {
                 R.xml.devicesettings_custom_emoji_font,
                 R.xml.devicesettings_timeformat,
                 R.xml.devicesettings_dateformat,
+                R.xml.devicesettings_world_clocks,
                 R.xml.devicesettings_nightmode,
                 R.xml.devicesettings_liftwrist_display_sensitivity,
                 R.xml.devicesettings_swipeunlock,
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitband5/AmazfitBand5Support.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitband5/AmazfitBand5Support.java
index a828b6a51..6b3a410de 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitband5/AmazfitBand5Support.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitband5/AmazfitBand5Support.java
@@ -49,4 +49,16 @@ public class AmazfitBand5Support extends MiBand5Support {
     public HuamiFWHelper createFWHelper(Uri uri, Context context) throws IOException {
         return new AmazfitBand5FWHelper(uri, context);
     }
+    @Override
+    public boolean supportsSunriseSunsetWindHumidity() {
+        return true;
+    }
+
+    @Override
+    public void phase3Initialize(TransactionBuilder builder) {
+        super.phase3Initialize(builder);
+        LOG.info("phase3Initialize...");
+        setActivateDisplayOnLiftWristSensitivity(builder); // TODO? Move this to HuamiSupport?
+        setWorkoutActivityTypes(builder);  // TODO: Supported by other bands?
+    }
 }
diff --git a/app/src/main/res/xml/devicesettings_amazfitband5.xml b/app/src/main/res/xml/devicesettings_amazfitband5.xml
index 0ef11beca..3ee60e7e1 100644
--- a/app/src/main/res/xml/devicesettings_amazfitband5.xml
+++ b/app/src/main/res/xml/devicesettings_amazfitband5.xml
@@ -20,4 +20,14 @@
         android:persistent="true"
         android:summary="@string/bip_prefs_shotcuts_summary"
         android:title="@string/bip_prefs_shortcuts" />
+    <com.mobeta.android.dslv.DragSortListPreference
+        android:icon="@drawable/ic_activity_unknown_small"
+        android:defaultValue="@array/pref_miband5_workout_activity_types_default"
+        android:dialogTitle="@string/mi5_prefs_workout_activity_types"
+        android:entries="@array/pref_miband5_workout_activity_types"
+        android:entryValues="@array/pref_miband5_workout_activity_types_values"
+        android:key="workout_activity_types_sortable"
+        android:persistent="true"
+        android:summary="@string/mi5_prefs_workout_activity_types_summary"
+        android:title="@string/mi5_prefs_workout_activity_types" />
 </androidx.preference.PreferenceScreen>

From b220fef74ebef352877497df52c33438c0e7cdb9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Sat, 14 May 2022 14:20:28 +0100
Subject: [PATCH 050/110] Mi Band 5: Add notification vibration patterns

---
 .../DeviceSpecificSettingsCustomizer.java     |   7 +
 .../DeviceSpecificSettingsFragment.java       |  25 +-
 .../DeviceSpecificSettingsHandler.java        |   8 +
 .../devices/huami/HuamiConst.java             |  33 +++
 .../devices/huami/HuamiCoordinator.java       |  19 ++
 .../huami/HuamiSettingsCustomizer.java        | 104 +++++++
 .../huami/miband5/MiBand5Coordinator.java     |   1 +
 .../devices/miband/VibrationProfile.java      |   4 +
 .../SonyHeadphonesSettingsCustomizer.java     |   7 +
 .../service/devices/huami/HuamiSupport.java   | 135 +++++++++-
 ...HuamiVibrationPatternNotificationType.java |  42 +++
 .../drawable/ic_action_find_lost_device.xml   |  10 +-
 .../res/drawable/ic_device_set_reminders.xml  |   2 +-
 app/src/main/res/drawable/ic_phone.xml        |   5 +
 app/src/main/res/drawable/ic_seat_normal.xml  |   5 +
 app/src/main/res/drawable/ic_star_gray.xml    |   9 +
 app/src/main/res/values/strings.xml           |   5 +
 .../xml/devicesettings_miband5_vibration.xml  | 253 ++++++++++++++++++
 18 files changed, 658 insertions(+), 16 deletions(-)
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiSettingsCustomizer.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiVibrationPatternNotificationType.java
 create mode 100644 app/src/main/res/drawable/ic_phone.xml
 create mode 100644 app/src/main/res/drawable/ic_seat_normal.xml
 create mode 100644 app/src/main/res/drawable/ic_star_gray.xml
 create mode 100644 app/src/main/res/xml/devicesettings_miband5_vibration.xml

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSpecificSettingsCustomizer.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSpecificSettingsCustomizer.java
index 3a8ac1323..fc948131a 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSpecificSettingsCustomizer.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSpecificSettingsCustomizer.java
@@ -20,6 +20,8 @@ import android.os.Parcelable;
 
 import androidx.preference.Preference;
 
+import java.util.Set;
+
 /**
  * A device-specific preference handler, that allows for concrete implementations to customize the preferences in
  * the {@link DeviceSpecificSettingsFragment}.
@@ -39,4 +41,9 @@ public interface DeviceSpecificSettingsCustomizer extends Parcelable {
      * @param handler the {@link DeviceSpecificSettingsHandler}
      */
     void customizeSettings(final DeviceSpecificSettingsHandler handler);
+
+    /**
+     * Keys of preferences which should print its values as a summary below the preference name.
+     */
+    Set<String> getPreferenceKeysWithSummary();
 }
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 4671a325d..cc7d588b1 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
@@ -43,7 +43,9 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.Objects;
+import java.util.Set;
 
 import nodomain.freeyourgadget.gadgetbridge.GBApplication;
 import nodomain.freeyourgadget.gadgetbridge.R;
@@ -806,7 +808,8 @@ public class DeviceSpecificSettingsFragment extends PreferenceFragmentCompat imp
         }
     }
 
-    private void setInputTypeFor(final String preferenceKey, final int editTypeFlags) {
+    @Override
+    public void setInputTypeFor(final String preferenceKey, final int editTypeFlags) {
         EditTextPreference textPreference = findPreference(preferenceKey);
         if (textPreference != null) {
             textPreference.setOnBindEditTextListener(new EditTextPreference.OnBindEditTextListener() {
@@ -818,6 +821,19 @@ public class DeviceSpecificSettingsFragment extends PreferenceFragmentCompat imp
         }
     }
 
+    /**
+     * Keys of preferences which should print its values as a summary below the preference name.
+     */
+    protected Set<String> getPreferenceKeysWithSummary() {
+        final Set<String> keysWithSummary = new HashSet<>();
+
+        if (deviceSpecificSettingsCustomizer != null) {
+            keysWithSummary.addAll(deviceSpecificSettingsCustomizer.getPreferenceKeysWithSummary());
+        }
+
+        return keysWithSummary;
+    }
+
     /**
      * Reload the preferences in the current screen. This is needed when the user enters or exists a PreferenceScreen,
      * otherwise the settings won't be reloaded by the {@link SharedPreferencesChangeHandler}, as the preferences return
@@ -849,7 +865,7 @@ public class DeviceSpecificSettingsFragment extends PreferenceFragmentCompat imp
         public void onSharedPreferenceChanged(SharedPreferences prefs, String key) {
             LOG.debug("Preference changed: {}", key);
 
-            if(key == null){
+            if (key == null){
                 LOG.warn("Preference null, ignoring");
                 return;
             }
@@ -879,6 +895,11 @@ public class DeviceSpecificSettingsFragment extends PreferenceFragmentCompat imp
                 LOG.warn("Unknown preference class {}, ignoring", preference.getClass());
             }
 
+            if (getPreferenceKeysWithSummary().contains(key)) {
+                final String summary = prefs.getString(key, preference.getSummary() != null ? preference.getSummary().toString() : "");
+                preference.setSummary(summary);
+            }
+
             if (deviceSpecificSettingsCustomizer != null) {
                 deviceSpecificSettingsCustomizer.onPreferenceChange(preference, DeviceSpecificSettingsFragment.this);
             }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSpecificSettingsHandler.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSpecificSettingsHandler.java
index 47d4a4095..97917e837 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSpecificSettingsHandler.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSpecificSettingsHandler.java
@@ -53,4 +53,12 @@ public interface DeviceSpecificSettingsHandler {
      * @param extraListener the extra listener.
      */
     void addPreferenceHandlerFor(final String preferenceKey, Preference.OnPreferenceChangeListener extraListener);
+
+    /**
+     * Sets the input type flags for an EditText preference.
+     *
+     * @param preferenceKey the preference key.
+     * @param editTypeFlags the edit type {@link android.text.InputType} flags.
+     */
+    void setInputTypeFor(final String preferenceKey, final int editTypeFlags);
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiConst.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiConst.java
index 2ec6b9f77..1b388391c 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiConst.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiConst.java
@@ -86,6 +86,39 @@ public class HuamiConst {
     public static final String PREF_DEVICE_ACTION_START_NON_WEAR_SELECTION = "events_forwarding_startnonwear_action_selection";
     public static final String PREF_DEVICE_ACTION_START_NON_WEAR_BROADCAST = "prefs_events_forwarding_startnonwear_broadcast";
 
+    /**
+     * The suffixes match the enum {@link nodomain.freeyourgadget.gadgetbridge.service.devices.huami.HuamiVibrationPatternNotificationType}.
+     */
+    // profile
+    public static final String PREF_HUAMI_VIBRATION_PROFILE_PREFIX = "huami_vibration_profile_";
+    public static final String PREF_HUAMI_VIBRATION_PROFILE_APP_ALERTS = PREF_HUAMI_VIBRATION_PROFILE_PREFIX + "app_alerts";
+    public static final String PREF_HUAMI_VIBRATION_PROFILE_INCOMING_CALL = PREF_HUAMI_VIBRATION_PROFILE_PREFIX + "incoming_call";
+    public static final String PREF_HUAMI_VIBRATION_PROFILE_INCOMING_SMS = PREF_HUAMI_VIBRATION_PROFILE_PREFIX + "incoming_sms";
+    public static final String PREF_HUAMI_VIBRATION_PROFILE_GOAL_NOTIFICATION = PREF_HUAMI_VIBRATION_PROFILE_PREFIX + "goal_notification";
+    public static final String PREF_HUAMI_VIBRATION_PROFILE_ALARM = PREF_HUAMI_VIBRATION_PROFILE_PREFIX + "alarm";
+    public static final String PREF_HUAMI_VIBRATION_PROFILE_IDLE_ALERTS = PREF_HUAMI_VIBRATION_PROFILE_PREFIX + "idle_alerts";
+    public static final String PREF_HUAMI_VIBRATION_PROFILE_EVENT_REMINDER = PREF_HUAMI_VIBRATION_PROFILE_PREFIX + "event_reminder";
+    public static final String PREF_HUAMI_VIBRATION_PROFILE_FIND_BAND = PREF_HUAMI_VIBRATION_PROFILE_PREFIX + "find_band";
+    // count
+    public static final String PREF_HUAMI_VIBRATION_COUNT_PREFIX = "huami_vibration_count_";
+    public static final String PREF_HUAMI_VIBRATION_COUNT_APP_ALERTS = PREF_HUAMI_VIBRATION_COUNT_PREFIX + "app_alerts";
+    public static final String PREF_HUAMI_VIBRATION_COUNT_INCOMING_CALL = PREF_HUAMI_VIBRATION_COUNT_PREFIX + "incoming_call";
+    public static final String PREF_HUAMI_VIBRATION_COUNT_INCOMING_SMS = PREF_HUAMI_VIBRATION_COUNT_PREFIX + "incoming_sms";
+    public static final String PREF_HUAMI_VIBRATION_COUNT_GOAL_NOTIFICATION = PREF_HUAMI_VIBRATION_COUNT_PREFIX + "goal_notification";
+    public static final String PREF_HUAMI_VIBRATION_COUNT_ALARM = PREF_HUAMI_VIBRATION_COUNT_PREFIX + "alarm";
+    public static final String PREF_HUAMI_VIBRATION_COUNT_IDLE_ALERTS = PREF_HUAMI_VIBRATION_COUNT_PREFIX + "idle_alerts";
+    public static final String PREF_HUAMI_VIBRATION_COUNT_EVENT_REMINDER = PREF_HUAMI_VIBRATION_COUNT_PREFIX + "event_reminder";
+    public static final String PREF_HUAMI_VIBRATION_COUNT_FIND_BAND = PREF_HUAMI_VIBRATION_COUNT_PREFIX + "find_band";
+    // try
+    public static final String PREF_HUAMI_VIBRATION_TRY_PREFIX = "huami_vibration_try_";
+    public static final String PREF_HUAMI_VIBRATION_TRY_APP_ALERTS = PREF_HUAMI_VIBRATION_TRY_PREFIX + "app_alerts";
+    public static final String PREF_HUAMI_VIBRATION_TRY_INCOMING_CALL = PREF_HUAMI_VIBRATION_TRY_PREFIX + "incoming_call";
+    public static final String PREF_HUAMI_VIBRATION_TRY_INCOMING_SMS = PREF_HUAMI_VIBRATION_TRY_PREFIX + "incoming_sms";
+    public static final String PREF_HUAMI_VIBRATION_TRY_GOAL_NOTIFICATION = PREF_HUAMI_VIBRATION_TRY_PREFIX + "goal_notification";
+    public static final String PREF_HUAMI_VIBRATION_TRY_ALARM = PREF_HUAMI_VIBRATION_TRY_PREFIX + "alarm";
+    public static final String PREF_HUAMI_VIBRATION_TRY_IDLE_ALERTS = PREF_HUAMI_VIBRATION_TRY_PREFIX + "idle_alerts";
+    public static final String PREF_HUAMI_VIBRATION_TRY_EVENT_REMINDER = PREF_HUAMI_VIBRATION_TRY_PREFIX + "event_reminder";
+    public static final String PREF_HUAMI_VIBRATION_TRY_FIND_BAND = PREF_HUAMI_VIBRATION_TRY_PREFIX + "find_band";
 
     public static int toActivityKind(int rawType) {
         switch (rawType) {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiCoordinator.java
index af54a0a2f..c19c6b18d 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiCoordinator.java
@@ -43,6 +43,7 @@ import nodomain.freeyourgadget.gadgetbridge.GBException;
 import nodomain.freeyourgadget.gadgetbridge.R;
 import nodomain.freeyourgadget.gadgetbridge.activities.SettingsActivity;
 import nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst;
+import nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSpecificSettingsCustomizer;
 import nodomain.freeyourgadget.gadgetbridge.devices.AbstractDeviceCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.SampleProvider;
 import nodomain.freeyourgadget.gadgetbridge.devices.miband.DateTimeDisplay;
@@ -51,11 +52,13 @@ import nodomain.freeyourgadget.gadgetbridge.devices.miband.MiBand2SampleProvider
 import nodomain.freeyourgadget.gadgetbridge.devices.miband.MiBandConst;
 import nodomain.freeyourgadget.gadgetbridge.devices.miband.MiBandPairingActivity;
 import nodomain.freeyourgadget.gadgetbridge.devices.miband.MiBandService;
+import nodomain.freeyourgadget.gadgetbridge.devices.miband.VibrationProfile;
 import nodomain.freeyourgadget.gadgetbridge.entities.AbstractActivitySample;
 import nodomain.freeyourgadget.gadgetbridge.entities.DaoSession;
 import nodomain.freeyourgadget.gadgetbridge.entities.Device;
 import nodomain.freeyourgadget.gadgetbridge.entities.MiBandActivitySampleDao;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.HuamiVibrationPatternNotificationType;
 import nodomain.freeyourgadget.gadgetbridge.util.Prefs;
 
 public abstract class HuamiCoordinator extends AbstractDeviceCoordinator {
@@ -270,6 +273,17 @@ public abstract class HuamiCoordinator extends AbstractDeviceCoordinator {
         return prefs.getBoolean(DeviceSettingsPreferenceConst.PREF_BT_CONNECTED_ADVERTISEMENT, false);
     }
 
+    public static VibrationProfile getVibrationProfile(String deviceAddress, HuamiVibrationPatternNotificationType notificationType) {
+        Prefs prefs = new Prefs(GBApplication.getDeviceSpecificSharedPrefs(deviceAddress));
+        final String vibrationProfileId = prefs.getString(
+                HuamiConst.PREF_HUAMI_VIBRATION_PROFILE_PREFIX + notificationType.name().toLowerCase(Locale.ROOT),
+                VibrationProfile.ID_MEDIUM
+        );
+        final int vibrationProfileCount = prefs.getInt(HuamiConst.PREF_HUAMI_VIBRATION_COUNT_PREFIX + notificationType.name().toLowerCase(Locale.ROOT), 2);
+
+        return VibrationProfile.getProfile(vibrationProfileId, (short) vibrationProfileCount);
+    }
+
     protected static Date getTimePreference(String key, String defaultValue, String deviceAddress) {
         Prefs prefs;
 
@@ -353,4 +367,9 @@ public abstract class HuamiCoordinator extends AbstractDeviceCoordinator {
     public int getReminderSlotCount() {
         return 22; // At least, Mi Fit still allows more
     }
+
+    @Override
+    public DeviceSpecificSettingsCustomizer getDeviceSpecificSettingsCustomizer(final GBDevice device) {
+        return new HuamiSettingsCustomizer(device);
+    }
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiSettingsCustomizer.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiSettingsCustomizer.java
new file mode 100644
index 000000000..fef6626d2
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiSettingsCustomizer.java
@@ -0,0 +1,104 @@
+/*  Copyright (C) 2022 José Rebelo
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.devices.huami;
+
+import android.os.Parcel;
+import android.text.InputType;
+import android.widget.Toast;
+
+import androidx.preference.Preference;
+
+import java.util.HashSet;
+import java.util.Locale;
+import java.util.Set;
+
+import nodomain.freeyourgadget.gadgetbridge.GBApplication;
+import nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSpecificSettingsCustomizer;
+import nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSpecificSettingsHandler;
+import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.HuamiVibrationPatternNotificationType;
+
+public class HuamiSettingsCustomizer implements DeviceSpecificSettingsCustomizer {
+    final GBDevice device;
+
+    public HuamiSettingsCustomizer(final GBDevice device) {
+        this.device = device;
+    }
+
+    @Override
+    public void onPreferenceChange(final Preference preference, final DeviceSpecificSettingsHandler handler) {
+        // Nothing to do here
+    }
+
+    @Override
+    public void customizeSettings(final DeviceSpecificSettingsHandler handler) {
+        for (HuamiVibrationPatternNotificationType notificationType : HuamiVibrationPatternNotificationType.values()) {
+            final String typeKey = notificationType.name().toLowerCase(Locale.ROOT);
+
+            handler.addPreferenceHandlerFor(HuamiConst.PREF_HUAMI_VIBRATION_PROFILE_PREFIX + typeKey);
+            handler.addPreferenceHandlerFor(HuamiConst.PREF_HUAMI_VIBRATION_COUNT_PREFIX + typeKey);
+            handler.setInputTypeFor(HuamiConst.PREF_HUAMI_VIBRATION_COUNT_PREFIX + typeKey, InputType.TYPE_CLASS_NUMBER);
+
+            final String tryPrefKey = HuamiConst.PREF_HUAMI_VIBRATION_TRY_PREFIX + typeKey;
+            final Preference tryPref = handler.findPreference(tryPrefKey);
+            if (tryPref != null) {
+                tryPref.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
+                    @Override
+                    public boolean onPreferenceClick(final Preference preference) {
+                        GBApplication.deviceService().onSendConfiguration(tryPrefKey);
+                        return true;
+                    }
+                });
+            }
+        }
+    }
+
+    @Override
+    public Set<String> getPreferenceKeysWithSummary() {
+        final Set<String> keysWithSummary = new HashSet<>();
+
+        for (HuamiVibrationPatternNotificationType notificationType : HuamiVibrationPatternNotificationType.values()) {
+            final String typeKey = notificationType.name().toLowerCase(Locale.ROOT);
+            keysWithSummary.add(HuamiConst.PREF_HUAMI_VIBRATION_COUNT_PREFIX + typeKey);
+        }
+
+        return keysWithSummary;
+    }
+
+    public static final Creator<HuamiSettingsCustomizer> CREATOR = new Creator<HuamiSettingsCustomizer>() {
+        @Override
+        public HuamiSettingsCustomizer createFromParcel(final Parcel in) {
+            final GBDevice device = in.readParcelable(HuamiSettingsCustomizer.class.getClassLoader());
+            return new HuamiSettingsCustomizer(device);
+        }
+
+        @Override
+        public HuamiSettingsCustomizer[] newArray(final int size) {
+            return new HuamiSettingsCustomizer[size];
+        }
+    };
+
+    @Override
+    public int describeContents() {
+        return 0;
+    }
+
+    @Override
+    public void writeToParcel(final Parcel dest, final int flags) {
+        dest.writeParcelable(device, 0);
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband5/MiBand5Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband5/MiBand5Coordinator.java
index 8bf08ac85..d8bd5ac5f 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband5/MiBand5Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband5/MiBand5Coordinator.java
@@ -99,6 +99,7 @@ public class MiBand5Coordinator extends HuamiCoordinator {
     public int[] getSupportedDeviceSpecificSettings(GBDevice device) {
         return new int[]{
                 R.xml.devicesettings_miband5,
+                R.xml.devicesettings_miband5_vibration,
                 R.xml.devicesettings_wearlocation,
                 R.xml.devicesettings_custom_emoji_font,
                 R.xml.devicesettings_timeformat,
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/VibrationProfile.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/VibrationProfile.java
index d7505bcdc..70cbd9d3c 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/VibrationProfile.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/VibrationProfile.java
@@ -79,6 +79,10 @@ public class VibrationProfile {
      * @param repeat        how often the sequence shall be repeated
      */
     public VibrationProfile(String id, int[] onOffSequence, short repeat) {
+        if (onOffSequence.length % 2 != 0) {
+            throw new IllegalArgumentException("Each on duration must have a subsequent off duration");
+        }
+
         this.id = id;
         this.repeat = repeat;
         this.onOffSequence = onOffSequence;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/SonyHeadphonesSettingsCustomizer.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/SonyHeadphonesSettingsCustomizer.java
index 3bb3148dc..0a8eb477d 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/SonyHeadphonesSettingsCustomizer.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/SonyHeadphonesSettingsCustomizer.java
@@ -47,8 +47,10 @@ import androidx.preference.ListPreference;
 import androidx.preference.Preference;
 
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 import java.util.Locale;
+import java.util.Set;
 
 import nodomain.freeyourgadget.gadgetbridge.R;
 import nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSpecificSettingsCustomizer;
@@ -185,6 +187,11 @@ public class SonyHeadphonesSettingsCustomizer implements DeviceSpecificSettingsC
         }
     }
 
+    @Override
+    public Set<String> getPreferenceKeysWithSummary() {
+        return Collections.emptySet();
+    }
+
     public static final Creator<SonyHeadphonesSettingsCustomizer> CREATOR = new Creator<SonyHeadphonesSettingsCustomizer>() {
         @Override
         public SonyHeadphonesSettingsCustomizer createFromParcel(final Parcel in) {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiSupport.java
index e6d692330..a2b4b40b9 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiSupport.java
@@ -197,6 +197,33 @@ import static nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst.PREF
 import static nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst.PREF_DEVICE_ACTION_START_NON_WEAR_SELECTION;
 import static nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst.PREF_DEVICE_ACTION_WOKE_UP_BROADCAST;
 import static nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst.PREF_DEVICE_ACTION_WOKE_UP_SELECTION;
+import static nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst.PREF_HUAMI_VIBRATION_COUNT_ALARM;
+import static nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst.PREF_HUAMI_VIBRATION_COUNT_APP_ALERTS;
+import static nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst.PREF_HUAMI_VIBRATION_COUNT_EVENT_REMINDER;
+import static nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst.PREF_HUAMI_VIBRATION_COUNT_FIND_BAND;
+import static nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst.PREF_HUAMI_VIBRATION_COUNT_GOAL_NOTIFICATION;
+import static nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst.PREF_HUAMI_VIBRATION_COUNT_IDLE_ALERTS;
+import static nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst.PREF_HUAMI_VIBRATION_COUNT_INCOMING_CALL;
+import static nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst.PREF_HUAMI_VIBRATION_COUNT_INCOMING_SMS;
+import static nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst.PREF_HUAMI_VIBRATION_COUNT_PREFIX;
+import static nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst.PREF_HUAMI_VIBRATION_PROFILE_ALARM;
+import static nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst.PREF_HUAMI_VIBRATION_PROFILE_APP_ALERTS;
+import static nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst.PREF_HUAMI_VIBRATION_PROFILE_EVENT_REMINDER;
+import static nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst.PREF_HUAMI_VIBRATION_PROFILE_FIND_BAND;
+import static nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst.PREF_HUAMI_VIBRATION_PROFILE_GOAL_NOTIFICATION;
+import static nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst.PREF_HUAMI_VIBRATION_PROFILE_IDLE_ALERTS;
+import static nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst.PREF_HUAMI_VIBRATION_PROFILE_INCOMING_CALL;
+import static nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst.PREF_HUAMI_VIBRATION_PROFILE_INCOMING_SMS;
+import static nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst.PREF_HUAMI_VIBRATION_PROFILE_PREFIX;
+import static nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst.PREF_HUAMI_VIBRATION_TRY_ALARM;
+import static nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst.PREF_HUAMI_VIBRATION_TRY_APP_ALERTS;
+import static nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst.PREF_HUAMI_VIBRATION_TRY_EVENT_REMINDER;
+import static nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst.PREF_HUAMI_VIBRATION_TRY_FIND_BAND;
+import static nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst.PREF_HUAMI_VIBRATION_TRY_GOAL_NOTIFICATION;
+import static nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst.PREF_HUAMI_VIBRATION_TRY_IDLE_ALERTS;
+import static nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst.PREF_HUAMI_VIBRATION_TRY_INCOMING_CALL;
+import static nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst.PREF_HUAMI_VIBRATION_TRY_INCOMING_SMS;
+import static nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst.PREF_HUAMI_VIBRATION_TRY_PREFIX;
 import static nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiService.DISPLAY_ITEM_BIT_CLOCK;
 import static nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiService.ENDPOINT_DISPLAY_ITEMS;
 import static nodomain.freeyourgadget.gadgetbridge.devices.miband.MiBandConst.DEFAULT_VALUE_VIBRATION_COUNT;
@@ -2465,6 +2492,32 @@ public class HuamiSupport extends AbstractBTLEDeviceSupport {
                 case PREF_USER_GENDER:
                     setUserInfo(builder);
                     break;
+                case PREF_HUAMI_VIBRATION_PROFILE_APP_ALERTS:
+                case PREF_HUAMI_VIBRATION_PROFILE_INCOMING_CALL:
+                case PREF_HUAMI_VIBRATION_PROFILE_INCOMING_SMS:
+                case PREF_HUAMI_VIBRATION_PROFILE_GOAL_NOTIFICATION:
+                case PREF_HUAMI_VIBRATION_PROFILE_ALARM:
+                case PREF_HUAMI_VIBRATION_PROFILE_IDLE_ALERTS:
+                case PREF_HUAMI_VIBRATION_PROFILE_EVENT_REMINDER:
+                case PREF_HUAMI_VIBRATION_PROFILE_FIND_BAND:
+                case PREF_HUAMI_VIBRATION_COUNT_APP_ALERTS:
+                case PREF_HUAMI_VIBRATION_COUNT_INCOMING_CALL:
+                case PREF_HUAMI_VIBRATION_COUNT_INCOMING_SMS:
+                case PREF_HUAMI_VIBRATION_COUNT_GOAL_NOTIFICATION:
+                case PREF_HUAMI_VIBRATION_COUNT_ALARM:
+                case PREF_HUAMI_VIBRATION_COUNT_IDLE_ALERTS:
+                case PREF_HUAMI_VIBRATION_COUNT_EVENT_REMINDER:
+                case PREF_HUAMI_VIBRATION_COUNT_FIND_BAND:
+                case PREF_HUAMI_VIBRATION_TRY_APP_ALERTS:
+                case PREF_HUAMI_VIBRATION_TRY_INCOMING_CALL:
+                case PREF_HUAMI_VIBRATION_TRY_INCOMING_SMS:
+                case PREF_HUAMI_VIBRATION_TRY_GOAL_NOTIFICATION:
+                case PREF_HUAMI_VIBRATION_TRY_ALARM:
+                case PREF_HUAMI_VIBRATION_TRY_IDLE_ALERTS:
+                case PREF_HUAMI_VIBRATION_TRY_EVENT_REMINDER:
+                case PREF_HUAMI_VIBRATION_TRY_FIND_BAND:
+                    setVibrationPattern(builder, config);
+                    break;
             }
             builder.queue(getQueue());
         } catch (IOException e) {
@@ -2480,16 +2533,82 @@ public class HuamiSupport extends AbstractBTLEDeviceSupport {
     @Override
     public void onTestNewFunction() {
         //requestMTU(23);
-        /*
         try {
-            boolean test = false;
-            TransactionBuilder builder = performInitialized("test pattern");
-            byte[] testpattern = new byte[] {0x20,0x00, (byte) 0x4b,0x64,0x00, (byte) 0x8d,0x01,0x73,0x00,0x38,0x01,0x64,0x00,0x64,0x00,0x64,0x00,0x67,0x00,0x64,0x00,0x37,0x01,0x7c,0x00,0x64,0x00,0x64,0x00,0x67,0x00,0x64,0x00,0x67,0x00,0x64,0x00,0x37,0x01,0x64,0x00,0x64,0x00,0x64,0x00, (byte) 0xe5,0x02};
-            //byte[] testpattern = new byte[] {0x20,0x00, (byte) 0x00, 0,0,0,0};
-            writeToChunked(builder,2, testpattern);
+            final TransactionBuilder builder = performInitialized("test pattern");
+            final VibrationProfile profile = VibrationProfile.getProfile(VibrationProfile.ID_SHORT, (short) 2);
+
+            setVibrationPattern(builder, HuamiVibrationPatternNotificationType.APP_ALERTS, true, profile);
             builder.queue(getQueue());
-        } catch (Exception ignored) {}
-        */
+        } catch (final Exception e) {
+            LOG.error("onTestNewFunction failed", e);
+        }
+    }
+
+    private void setVibrationPattern(final TransactionBuilder builder, final String preferenceKey) {
+        // The preference key has one of the 3 prefixes
+        final String notificationTypeName = preferenceKey.replace(PREF_HUAMI_VIBRATION_COUNT_PREFIX, "")
+                .replace(PREF_HUAMI_VIBRATION_PROFILE_PREFIX, "")
+                .replace(PREF_HUAMI_VIBRATION_TRY_PREFIX, "")
+                .toUpperCase(Locale.ROOT);
+        final HuamiVibrationPatternNotificationType notificationType = HuamiVibrationPatternNotificationType.valueOf(notificationTypeName);
+        final boolean isTry = preferenceKey.startsWith(PREF_HUAMI_VIBRATION_TRY_PREFIX);
+
+        final VibrationProfile vibrationProfile = HuamiCoordinator.getVibrationProfile(getDevice().getAddress(), notificationType);
+
+        setVibrationPattern(builder, notificationType, isTry, vibrationProfile);
+    }
+
+    /**
+     * Test or set a {@link VibrationProfile}.
+     *
+     * @param builder          the {@link TransactionBuilder}
+     * @param notificationType the notification type
+     * @param test             test the pattern (only vibrate the band, do not set it)
+     * @param profile          the {@link VibrationProfile}
+     */
+    private void setVibrationPattern(final TransactionBuilder builder,
+                                     final HuamiVibrationPatternNotificationType notificationType,
+                                     final boolean test,
+                                     final VibrationProfile profile) {
+        final int MAX_TOTAL_LENGTH_MS = 10_000; // 10 seconds, about as long as Mi Fit allows
+        int totalLengthMs = 0;
+
+        // The on-off sequence, until the max total length is reached
+        final List<Short> onOff = new ArrayList<>(profile.getOnOffSequence().length);
+
+        for (int c = 0; c < profile.getRepeat(); c++) {
+            for (int i = 0; i < profile.getOnOffSequence().length; i += 2) {
+                final short on = (short) profile.getOnOffSequence()[i];
+                final short off = (short) profile.getOnOffSequence()[i + 1];
+
+                if (totalLengthMs + on + off > MAX_TOTAL_LENGTH_MS) {
+                    LOG.warn("VibrationProfile {} too long, truncating to {} ms", profile.getId(), MAX_TOTAL_LENGTH_MS);
+                    break;
+                }
+
+                onOff.add(on);
+                onOff.add(off);
+                totalLengthMs += on + off;
+            }
+        }
+
+        final ByteBuffer buf = ByteBuffer.allocate(3 + 2 * onOff.size());
+        buf.order(ByteOrder.LITTLE_ENDIAN);
+
+        buf.put((byte) 0x20);
+        buf.put(notificationType.getCode());
+        byte flag = (byte) (onOff.size() / 2);
+        flag |= 0x40;
+        if (test) {
+            flag |= 0x80;
+        }
+        buf.put(flag);
+
+        for (Short time : onOff) {
+            buf.putShort(time);
+        }
+
+        writeToChunked(builder, 2, buf.array());
     }
 
     @Override
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiVibrationPatternNotificationType.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiVibrationPatternNotificationType.java
new file mode 100644
index 000000000..ba9ea0aae
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiVibrationPatternNotificationType.java
@@ -0,0 +1,42 @@
+/*  Copyright (C) 2022 José Rebelo
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.service.devices.huami;
+
+/**
+ * The notification types for which vibration patterns are customizable. If these change, the
+ * constants in {@link nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst} need to be updated.
+ */
+public enum HuamiVibrationPatternNotificationType {
+    APP_ALERTS(0x00),
+    INCOMING_CALL(0x01),
+    INCOMING_SMS(0x02),
+    GOAL_NOTIFICATION(0x04),
+    ALARM(0x05),
+    IDLE_ALERTS(0x06),
+    EVENT_REMINDER(0x08),
+    FIND_BAND(0x09);
+
+    private final byte code;
+
+    HuamiVibrationPatternNotificationType(final int code) {
+        this.code = (byte) code;
+    }
+
+    public byte getCode() {
+        return code;
+    }
+}
diff --git a/app/src/main/res/drawable/ic_action_find_lost_device.xml b/app/src/main/res/drawable/ic_action_find_lost_device.xml
index 8fdf6c723..d13a11d17 100644
--- a/app/src/main/res/drawable/ic_action_find_lost_device.xml
+++ b/app/src/main/res/drawable/ic_action_find_lost_device.xml
@@ -1,10 +1,10 @@
 <!--drawable/watch-vibrate.xml-->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="45sp"
-    android:height="45sp"
-    android:viewportWidth="25"
-    android:viewportHeight="25">
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
     <path
-        android:fillColor="#000000"
+        android:fillColor="#7E7E7E"
         android:pathData="M3 17V7h2v10H3m16 0V7h2v10h-2m3-8h2v6h-2V9M0 15V9h2v6H0m17.96-3.03c0 1.9-0.89 3.6-2.28 4.7l-0.71 4.28H9l-0.73-4.28C6.88 15.57 6 13.87 6 11.97c0-1.9 0.88-3.6 2.27-4.69L9 3h5.97l0.71 4.28c1.39 1.09 2.28 2.79 2.28 4.69m-10.46 0c0 2.48 2 4.49 4.47 4.49a4.5 4.5 0 0 0 4.49-4.49c0-2.47-2.01-4.47-4.49-4.47a4.47 4.47 0 0 0-4.47 4.47z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_device_set_reminders.xml b/app/src/main/res/drawable/ic_device_set_reminders.xml
index 7009a6763..aa25afa2a 100644
--- a/app/src/main/res/drawable/ic_device_set_reminders.xml
+++ b/app/src/main/res/drawable/ic_device_set_reminders.xml
@@ -4,6 +4,6 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="#7E7E7E"
         android:pathData="M12,22c1.1,0 2,-0.9 2,-2h-4c0,1.1 0.89,2 2,2zM18,16v-5c0,-3.07 -1.64,-5.64 -4.5,-6.32L13.5,4c0,-0.83 -0.67,-1.5 -1.5,-1.5s-1.5,0.67 -1.5,1.5v0.68C7.63,5.36 6,7.92 6,11v5l-2,2v1h16v-1l-2,-2z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_phone.xml b/app/src/main/res/drawable/ic_phone.xml
new file mode 100644
index 000000000..08b0fc27e
--- /dev/null
+++ b/app/src/main/res/drawable/ic_phone.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#7E7E7E"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M6.62,10.79c1.44,2.83 3.76,5.14 6.59,6.59l2.2,-2.2c0.27,-0.27 0.67,-0.36 1.02,-0.24 1.12,0.37 2.33,0.57 3.57,0.57 0.55,0 1,0.45 1,1V20c0,0.55 -0.45,1 -1,1 -9.39,0 -17,-7.61 -17,-17 0,-0.55 0.45,-1 1,-1h3.5c0.55,0 1,0.45 1,1 0,1.25 0.2,2.45 0.57,3.57 0.11,0.35 0.03,0.74 -0.25,1.02l-2.2,2.2z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_seat_normal.xml b/app/src/main/res/drawable/ic_seat_normal.xml
new file mode 100644
index 000000000..ca5626916
--- /dev/null
+++ b/app/src/main/res/drawable/ic_seat_normal.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#7E7E7E"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M7.59,5.41c-0.78,-0.78 -0.78,-2.05 0,-2.83 0.78,-0.78 2.05,-0.78 2.83,0 0.78,0.78 0.78,2.05 0,2.83 -0.79,0.79 -2.05,0.79 -2.83,0zM6,16L6,7L4,7v9c0,2.76 2.24,5 5,5h6v-2L9,19c-1.66,0 -3,-1.34 -3,-3zM20,20.07L14.93,15L11.5,15v-3.68c1.4,1.15 3.6,2.16 5.5,2.16v-2.16c-1.66,0.02 -3.61,-0.87 -4.67,-2.04l-1.4,-1.55c-0.19,-0.21 -0.43,-0.38 -0.69,-0.5 -0.29,-0.14 -0.62,-0.23 -0.96,-0.23h-0.03C8.01,7 7,8.01 7,9.25L7,15c0,1.66 1.34,3 3,3h5.07l3.5,3.5L20,20.07z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_star_gray.xml b/app/src/main/res/drawable/ic_star_gray.xml
new file mode 100644
index 000000000..24d9e7985
--- /dev/null
+++ b/app/src/main/res/drawable/ic_star_gray.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#7E7E7E"
+        android:pathData="M12,17.27L18.18,21l-1.64,-7.03L22,9.24l-7.19,-0.61L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21z" />
+</vector>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 7cff8e280..f00cdc87e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -471,6 +471,11 @@
     <string name="pref_screen_notification_profile_low_power">Low power warning</string>
     <string name="pref_screen_notification_profile_anti_loss">Anti-loss warning</string>
     <string name="prefs_title_heartrate_measurement_interval">Whole day HR measurement</string>
+    <string name="pref_screen_notification_profile_event_reminder">Event reminder</string>
+    <string name="pref_screen_notification_profile_find_device">Find device</string>
+    <string name="pref_screen_notification_idle_alerts">Idle Alerts</string>
+    <string name="pref_screen_vibration_patterns_title">Vibration Patterns</string>
+    <string name="pref_screen_vibration_patterns_summary">Configure the vibration patterns for different notifications</string>
     <string name="interval_one_minute">once a minute</string>
     <string name="interval_five_minutes">every 5 minutes</string>
     <string name="interval_ten_minutes">every 10 minutes</string>
diff --git a/app/src/main/res/xml/devicesettings_miband5_vibration.xml b/app/src/main/res/xml/devicesettings_miband5_vibration.xml
new file mode 100644
index 000000000..a269b775d
--- /dev/null
+++ b/app/src/main/res/xml/devicesettings_miband5_vibration.xml
@@ -0,0 +1,253 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+    <PreferenceScreen
+        android:icon="@drawable/ic_vibration"
+        android:key="vibration_patterns_key"
+        android:persistent="false"
+        android:summary="@string/pref_screen_vibration_patterns_summary"
+        android:title="@string/pref_screen_vibration_patterns_title">
+
+        <PreferenceCategory android:title="@string/pref_screen_vibration_patterns_title" />
+
+        <PreferenceScreen
+            android:key="vibration_profile_key"
+            android:icon="@drawable/ic_settings_applications"
+            android:title="@string/pref_screen_notification_profile_generic"
+            android:persistent="false">
+
+            <!-- workaround for missing toolbar -->
+            <PreferenceCategory android:title="@string/pref_screen_notification_profile_generic" />
+
+            <ListPreference
+                android:defaultValue="@string/p_short"
+                android:entries="@array/vibration_profile"
+                android:entryValues="@array/vibration_profile_values"
+                android:key="huami_vibration_profile_app_alerts"
+                android:title="@string/miband_prefs_vibration"
+                android:summary="%s" />
+
+            <EditTextPreference
+                android:defaultValue="2"
+                android:inputType="number"
+                android:key="huami_vibration_count_app_alerts"
+                android:maxLength="1"
+                android:title="@string/pref_title_notifications_repetitions" />
+
+            <Preference
+                android:persistent="false"
+                android:key="huami_vibration_try_app_alerts"
+                android:title="@string/vibration_try"/>
+        </PreferenceScreen>
+
+        <PreferenceScreen
+            android:key="vibration_profile_key"
+            android:icon="@drawable/ic_phone"
+            android:title="@string/pref_screen_notification_profile_incoming_call"
+            android:persistent="false">
+
+            <!-- workaround for missing toolbar -->
+            <PreferenceCategory android:title="@string/pref_screen_notification_profile_incoming_call" />
+
+            <ListPreference
+                android:defaultValue="@string/p_ring"
+                android:entries="@array/vibration_profile"
+                android:entryValues="@array/vibration_profile_values"
+                android:key="huami_vibration_profile_incoming_call"
+                android:title="@string/miband_prefs_vibration"
+                android:summary="%s" />
+
+            <EditTextPreference
+                android:defaultValue="1"
+                android:inputType="number"
+                android:key="huami_vibration_count_incoming_call"
+                android:maxLength="1"
+                android:title="@string/pref_title_notifications_repetitions" />
+
+            <Preference
+                android:persistent="false"
+                android:key="huami_vibration_try_incoming_call"
+                android:title="@string/vibration_try"/>
+        </PreferenceScreen>
+
+        <PreferenceScreen
+            android:key="vibration_profile_key"
+            android:icon="@drawable/ic_message_outline"
+            android:title="@string/pref_screen_notification_profile_sms"
+            android:persistent="false">
+
+            <!-- workaround for missing toolbar -->
+            <PreferenceCategory android:title="@string/pref_screen_notification_profile_sms" />
+
+            <ListPreference
+                android:defaultValue="@string/p_staccato"
+                android:entries="@array/vibration_profile"
+                android:entryValues="@array/vibration_profile_values"
+                android:key="huami_vibration_profile_incoming_sms"
+                android:title="@string/miband_prefs_vibration"
+                android:summary="%s" />
+
+            <EditTextPreference
+                android:defaultValue="2"
+                android:inputType="number"
+                android:key="huami_vibration_count_incoming_sms"
+                android:maxLength="1"
+                android:title="@string/pref_title_notifications_repetitions" />
+
+            <Preference
+                android:persistent="false"
+                android:key="huami_vibration_try_incoming_sms"
+                android:title="@string/vibration_try"/>
+        </PreferenceScreen>
+
+        <PreferenceScreen
+            android:key="vibration_profile_key"
+            android:icon="@drawable/ic_star_gray"
+            android:title="@string/mi2_prefs_goal_notification"
+            android:persistent="false">
+
+            <!-- workaround for missing toolbar -->
+            <PreferenceCategory android:title="@string/mi2_prefs_goal_notification" />
+
+            <ListPreference
+                android:defaultValue="@string/p_long"
+                android:entries="@array/vibration_profile"
+                android:entryValues="@array/vibration_profile_values"
+                android:key="huami_vibration_profile_goal_notification"
+                android:title="@string/miband_prefs_vibration"
+                android:summary="%s" />
+
+            <EditTextPreference
+                android:defaultValue="1"
+                android:inputType="number"
+                android:key="huami_vibration_count_goal_notification"
+                android:maxLength="1"
+                android:title="@string/pref_title_notifications_repetitions" />
+
+            <Preference
+                android:persistent="false"
+                android:key="huami_vibration_try_goal_notification"
+                android:title="@string/vibration_try"/>
+        </PreferenceScreen>
+
+        <PreferenceScreen
+            android:key="vibration_profile_key"
+            android:icon="@drawable/ic_access_alarms"
+            android:title="@string/vibration_profile_alarm_clock"
+            android:persistent="false">
+
+            <!-- workaround for missing toolbar -->
+            <PreferenceCategory android:title="@string/vibration_profile_alarm_clock" />
+
+            <ListPreference
+                android:defaultValue="@string/p_alarm_clock"
+                android:entries="@array/vibration_profile"
+                android:entryValues="@array/vibration_profile_values"
+                android:key="huami_vibration_profile_alarm"
+                android:title="@string/miband_prefs_vibration"
+                android:summary="%s" />
+
+            <EditTextPreference
+                android:defaultValue="1"
+                android:inputType="number"
+                android:key="huami_vibration_count_alarm"
+                android:maxLength="1"
+                android:title="@string/pref_title_notifications_repetitions" />
+
+            <Preference
+                android:persistent="false"
+                android:key="huami_vibration_try_alarm"
+                android:title="@string/vibration_try"/>
+        </PreferenceScreen>
+
+        <PreferenceScreen
+            android:key="vibration_profile_key"
+            android:icon="@drawable/ic_seat_normal"
+            android:title="@string/pref_screen_notification_idle_alerts"
+            android:persistent="false">
+
+            <!-- workaround for missing toolbar -->
+            <PreferenceCategory android:title="@string/pref_screen_notification_idle_alerts" />
+
+            <ListPreference
+                android:defaultValue="@string/p_normal"
+                android:entries="@array/vibration_profile"
+                android:entryValues="@array/vibration_profile_values"
+                android:key="huami_vibration_profile_idle_alerts"
+                android:title="@string/miband_prefs_vibration"
+                android:summary="%s" />
+
+            <EditTextPreference
+                android:defaultValue="2"
+                android:inputType="number"
+                android:key="huami_vibration_count_idle_alerts"
+                android:maxLength="1"
+                android:title="@string/pref_title_notifications_repetitions" />
+
+            <Preference
+                android:persistent="false"
+                android:key="huami_vibration_try_idle_alerts"
+                android:title="@string/vibration_try"/>
+        </PreferenceScreen>
+
+        <PreferenceScreen
+            android:key="vibration_profile_key"
+            android:icon="@drawable/ic_device_set_reminders"
+            android:title="@string/pref_screen_notification_profile_event_reminder"
+            android:persistent="false">
+
+            <!-- workaround for missing toolbar -->
+            <PreferenceCategory android:title="@string/pref_screen_notification_profile_event_reminder" />
+
+            <ListPreference
+                android:defaultValue="@string/p_long"
+                android:entries="@array/vibration_profile"
+                android:entryValues="@array/vibration_profile_values"
+                android:key="huami_vibration_profile_event_reminder"
+                android:title="@string/miband_prefs_vibration"
+                android:summary="%s" />
+
+            <EditTextPreference
+                android:defaultValue="1"
+                android:inputType="number"
+                android:key="huami_vibration_count_event_reminder"
+                android:maxLength="1"
+                android:title="@string/pref_title_notifications_repetitions" />
+
+            <Preference
+                android:persistent="false"
+                android:key="huami_vibration_try_event_reminder"
+                android:title="@string/vibration_try"/>
+        </PreferenceScreen>
+
+        <PreferenceScreen
+            android:key="vibration_profile_key"
+            android:icon="@drawable/ic_action_find_lost_device"
+            android:title="@string/pref_screen_notification_profile_find_device"
+            android:persistent="false">
+
+            <!-- workaround for missing toolbar -->
+            <PreferenceCategory android:title="@string/pref_screen_notification_profile_find_device" />
+
+            <ListPreference
+                android:defaultValue="@string/p_ring"
+                android:entries="@array/vibration_profile"
+                android:entryValues="@array/vibration_profile_values"
+                android:key="huami_vibration_profile_find_band"
+                android:title="@string/miband_prefs_vibration"
+                android:summary="%s" />
+
+            <EditTextPreference
+                android:defaultValue="3"
+                android:inputType="number"
+                android:key="huami_vibration_count_find_band"
+                android:maxLength="1"
+                android:title="@string/pref_title_notifications_repetitions" />
+
+            <Preference
+                android:persistent="false"
+                android:key="huami_vibration_try_find_band"
+                android:title="@string/vibration_try"/>
+        </PreferenceScreen>
+
+    </PreferenceScreen>
+</androidx.preference.PreferenceScreen>

From f3e5ed2bf8842cf32299b6234b9261fd9c81f9d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Sat, 14 May 2022 15:15:30 +0100
Subject: [PATCH 051/110] Mi Band 5: Fix vibration patterns preference keys

---
 .../res/xml/devicesettings_miband5_vibration.xml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/src/main/res/xml/devicesettings_miband5_vibration.xml b/app/src/main/res/xml/devicesettings_miband5_vibration.xml
index a269b775d..4f0332585 100644
--- a/app/src/main/res/xml/devicesettings_miband5_vibration.xml
+++ b/app/src/main/res/xml/devicesettings_miband5_vibration.xml
@@ -10,7 +10,7 @@
         <PreferenceCategory android:title="@string/pref_screen_vibration_patterns_title" />
 
         <PreferenceScreen
-            android:key="vibration_profile_key"
+            android:key="vibration_profile_key_app_alerts"
             android:icon="@drawable/ic_settings_applications"
             android:title="@string/pref_screen_notification_profile_generic"
             android:persistent="false">
@@ -40,7 +40,7 @@
         </PreferenceScreen>
 
         <PreferenceScreen
-            android:key="vibration_profile_key"
+            android:key="vibration_profile_key_incoming_call"
             android:icon="@drawable/ic_phone"
             android:title="@string/pref_screen_notification_profile_incoming_call"
             android:persistent="false">
@@ -70,7 +70,7 @@
         </PreferenceScreen>
 
         <PreferenceScreen
-            android:key="vibration_profile_key"
+            android:key="vibration_profile_key_incoming_sms"
             android:icon="@drawable/ic_message_outline"
             android:title="@string/pref_screen_notification_profile_sms"
             android:persistent="false">
@@ -100,7 +100,7 @@
         </PreferenceScreen>
 
         <PreferenceScreen
-            android:key="vibration_profile_key"
+            android:key="vibration_profile_key_goal_notification"
             android:icon="@drawable/ic_star_gray"
             android:title="@string/mi2_prefs_goal_notification"
             android:persistent="false">
@@ -130,7 +130,7 @@
         </PreferenceScreen>
 
         <PreferenceScreen
-            android:key="vibration_profile_key"
+            android:key="vibration_profile_key_alarm"
             android:icon="@drawable/ic_access_alarms"
             android:title="@string/vibration_profile_alarm_clock"
             android:persistent="false">
@@ -160,7 +160,7 @@
         </PreferenceScreen>
 
         <PreferenceScreen
-            android:key="vibration_profile_key"
+            android:key="vibration_profile_key_idle_alerts"
             android:icon="@drawable/ic_seat_normal"
             android:title="@string/pref_screen_notification_idle_alerts"
             android:persistent="false">
@@ -190,7 +190,7 @@
         </PreferenceScreen>
 
         <PreferenceScreen
-            android:key="vibration_profile_key"
+            android:key="vibration_profile_key_event_reminder"
             android:icon="@drawable/ic_device_set_reminders"
             android:title="@string/pref_screen_notification_profile_event_reminder"
             android:persistent="false">
@@ -220,7 +220,7 @@
         </PreferenceScreen>
 
         <PreferenceScreen
-            android:key="vibration_profile_key"
+            android:key="vibration_profile_key_find_band"
             android:icon="@drawable/ic_action_find_lost_device"
             android:title="@string/pref_screen_notification_profile_find_device"
             android:persistent="false">

From 50346ce79844e1fa4bd58916e4d9ba81d23e2947 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Sat, 14 May 2022 15:17:07 +0100
Subject: [PATCH 052/110] Amazfit Band 5: Add notification vibration patterns

---
 .../devices/huami/amazfitband5/AmazfitBand5Coordinator.java      | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitband5/AmazfitBand5Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitband5/AmazfitBand5Coordinator.java
index 4616431c9..8d577709b 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitband5/AmazfitBand5Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitband5/AmazfitBand5Coordinator.java
@@ -99,6 +99,7 @@ public class AmazfitBand5Coordinator extends HuamiCoordinator {
     public int[] getSupportedDeviceSpecificSettings(GBDevice device) {
         return new int[]{
                 R.xml.devicesettings_amazfitband5,
+                R.xml.devicesettings_miband5_vibration,
                 R.xml.devicesettings_wearlocation,
                 R.xml.devicesettings_custom_emoji_font,
                 R.xml.devicesettings_timeformat,

From 49a787161493274928bac0ce944124da21412293 Mon Sep 17 00:00:00 2001
From: vanous <petr@linuks.cz>
Date: Sun, 15 May 2022 13:03:16 +0200
Subject: [PATCH 053/110] Sony WF 800n: new icons

---
 app/src/main/assets/ic_device_sony_800n.svg   | 215 ++++++++++++++
 .../assets/ic_device_sony_800n_disabled.svg   | 268 ++++++++++++++++++
 app/src/main/assets/ic_sony_wf_800n_left.svg  |  95 +++++++
 app/src/main/assets/ic_sony_wf_800n_right.svg |  95 +++++++
 app/src/main/assets/sony_800n.svg             |  76 +++++
 app/src/main/assets/sony_800n_case.svg        |  72 +++++
 .../coordinators/SonyWFSP800NCoordinator.java |   6 +-
 .../gadgetbridge/model/DeviceType.java        |   2 +-
 .../res/drawable/ic_device_sony_wf_800n.xml   |  14 +
 .../ic_device_sony_wf_800n_disabled.xml       |  15 +
 .../res/drawable/ic_sony_wf_800n_case.xml     |  17 ++
 .../res/drawable/ic_sony_wf_800n_left.xml     |  39 +++
 .../res/drawable/ic_sony_wf_800n_right.xml    |  39 +++
 13 files changed, 949 insertions(+), 4 deletions(-)
 create mode 100644 app/src/main/assets/ic_device_sony_800n.svg
 create mode 100644 app/src/main/assets/ic_device_sony_800n_disabled.svg
 create mode 100644 app/src/main/assets/ic_sony_wf_800n_left.svg
 create mode 100644 app/src/main/assets/ic_sony_wf_800n_right.svg
 create mode 100644 app/src/main/assets/sony_800n.svg
 create mode 100644 app/src/main/assets/sony_800n_case.svg
 create mode 100644 app/src/main/res/drawable/ic_device_sony_wf_800n.xml
 create mode 100644 app/src/main/res/drawable/ic_device_sony_wf_800n_disabled.xml
 create mode 100644 app/src/main/res/drawable/ic_sony_wf_800n_case.xml
 create mode 100644 app/src/main/res/drawable/ic_sony_wf_800n_left.xml
 create mode 100644 app/src/main/res/drawable/ic_sony_wf_800n_right.xml

diff --git a/app/src/main/assets/ic_device_sony_800n.svg b/app/src/main/assets/ic_device_sony_800n.svg
new file mode 100644
index 000000000..1c8095454
--- /dev/null
+++ b/app/src/main/assets/ic_device_sony_800n.svg
@@ -0,0 +1,215 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   version="1.1"
+   id="svg2"
+   width="28.740126"
+   height="28.740126"
+   viewBox="0 0 28.740126 28.740126"
+   sodipodi:docname="ic_device_sony_800n.svg"
+   inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <metadata
+     id="metadata8">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs6">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 14.370063 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="28.740126 : 14.370063 : 1"
+       inkscape:persp3d-origin="14.370063 : 9.580042 : 1"
+       id="perspective903" />
+  </defs>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1035"
+     id="namedview4"
+     showgrid="false"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:zoom="22.627418"
+     inkscape:cx="8.8167373"
+     inkscape:cy="16.373941"
+     inkscape:window-x="0"
+     inkscape:window-y="45"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="layer1"
+     inkscape:pagecheckerboard="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid972" />
+  </sodipodi:namedview>
+  <g
+     inkscape:groupmode="layer"
+     id="layer1"
+     inkscape:label="Background"
+     style="display:inline">
+    <g
+       inkscape:groupmode="layer"
+       id="layer4"
+       inkscape:label="Bottom"
+       style="display:inline"
+       sodipodi:insensitive="true">
+      <rect
+         style="display:inline;fill:#1f7fdb;fill-opacity:1;stroke:none;stroke-width:3.57115;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect817-5"
+         width="22.819572"
+         height="21.904638"
+         x="2.9239759"
+         y="3.8768768"
+         ry="0.9472276" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer3"
+       inkscape:label="Middle"
+       style="display:inline"
+       sodipodi:insensitive="true">
+      <rect
+         style="display:inline;fill:#4dabf5;fill-opacity:1;stroke:none;stroke-width:3.57115;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect817-7"
+         width="22.819572"
+         height="21.904638"
+         x="2.9317887"
+         y="3.0349438"
+         ry="0.9472276" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer2"
+       inkscape:label="Top"
+       style="display:inline"
+       sodipodi:insensitive="true">
+      <rect
+         style="fill:#2196f3;fill-opacity:1;stroke:none;stroke-width:3.57115;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect817"
+         width="22.819572"
+         height="21.904638"
+         x="2.9238882"
+         y="3.4130721"
+         ry="0.9472276" />
+    </g>
+    <g
+       id="g2458"
+       transform="translate(0.01135305,-0.15009041)">
+      <g
+         id="g2347">
+        <path
+           id="path13615-2"
+           style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:0.4;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="m 7.279849,6.2422412 c -0.03346,0.01692 -0.06557,0.03428 -0.09731,0.05262 -0.03173,0.01835 -0.06309,0.03768 -0.09514,0.05843 -0.03205,0.02076 -0.06477,0.04295 -0.09916,0.0671 -0.03438,0.02415 -0.07046,0.05023 -0.109229,0.07876 -0.02534,0.01848 -0.05048,0.03753 -0.07551,0.05707 -0.02503,0.01954 -0.0499,0.0396 -0.07456,0.06013 -0.04934,0.04106 -0.09793,0.084 -0.145486,0.128648 -0.04756,0.04465 -0.09414,0.091 -0.139497,0.138751 -0.04536,0.04774 -0.08948,0.09688 -0.132231,0.147218 -0.04275,0.05034 -0.08411,0.101873 -0.123825,0.15432 -0.0397,0.05244 -0.07777,0.105815 -0.114003,0.159856 -0.03625,0.05404 -0.07062,0.108751 -0.102975,0.163896 -0.01618,0.02756 -0.0319,0.05524 -0.04703,0.08299 -0.01513,0.02775 -0.02969,0.05557 -0.04371,0.08346 -0.03618,0.07192 -0.06927,0.14029 -0.09954,0.205974 -0.03028,0.0657 -0.05776,0.1287 -0.08266,0.190082 -0.02488,0.06138 -0.04721,0.121101 -0.06723,0.180116 -0.01,0.02952 -0.01941,0.05886 -0.0283,0.08813 -0.009,0.02927 -0.01728,0.05852 -0.0251,0.08781 -0.0078,0.02929 -0.01514,0.05865 -0.02198,0.0882 -0.0069,0.02954 -0.01321,0.05927 -0.01911,0.0893 -0.01181,0.06007 -0.02184,0.12132 -0.03033,0.184805 -0.0086,0.06349 -0.01548,0.129192 -0.02116,0.198028 -0.0057,0.06884 -0.01012,0.140872 -0.01351,0.216987 -0.0025,0.05629 -0.0043,0.110992 -0.0052,0.16448 -8.64e-4,0.05349 -9.69e-4,0.105698 -6.4e-5,0.156926 8.64e-4,0.05122 0.0027,0.101473 0.0056,0.150996 0.0029,0.04952 0.0067,0.09832 0.01168,0.146697 0.0049,0.04837 0.01103,0.09631 0.01829,0.144095 0.0073,0.04777 0.01565,0.09538 0.02537,0.1431138 0.0097,0.04773 0.02073,0.09559 0.03307,0.143831 0.01233,0.04823 0.02603,0.09688 0.04117,0.146177 0.01514,0.04931 0.03172,0.0993 0.04983,0.150215 0.01811,0.05092 0.03775,0.102736 0.05902,0.155817 0.02125,0.05309 0.04414,0.107386 0.0687,0.163179 0.02456,0.0558 0.05079,0.113155 0.07883,0.172233 0.02805,0.05908 0.0579,0.119891 0.0896,0.182787 0.03169,0.0629 0.06523,0.127824 0.100756,0.195098 0.03552,0.06727 0.07298,0.136893 0.112485,0.209101 0.03951,0.07221 0.08105,0.147045 0.124707,0.224738 0.06395,0.110373 0.12747,0.218614 0.190476,0.324728 0.063,0.10611 0.12555,0.210119 0.187612,0.312027 0.06207,0.101911 0.123617,0.201698 0.184741,0.299454 0.06112,0.09775 0.121762,0.19342 0.181938,0.287076 0.06017,0.09366 0.119894,0.185283 0.179133,0.274895 0.05924,0.08961 0.118038,0.177222 0.176331,0.262845 0.05829,0.08562 0.116105,0.1693 0.173462,0.250989 0.05736,0.08169 0.114249,0.161388 0.170659,0.239198 0.05641,0.0778 0.112317,0.153684 0.167791,0.227668 0.05546,0.07399 0.110513,0.14612 0.165051,0.216333 0.05453,0.07022 0.108593,0.138504 0.162182,0.204999 0.0027,0.0033 0.0053,0.0064 0.008,0.0098 C 8.00872,14.732698 7.120877,13.942779 6.658257,13.361473 5.598455,12.029821 5.055189,10.452858 5.217346,9.1790022 5.365603,8.0143522 5.882,7.0633652 6.841532,6.1881132 7.079748,5.9708212 7.106058,5.9999142 7.175394,6.0213522 7.413036,6.1657852 7.440231,6.1534602 7.2799,6.2422692 Z"
+           sodipodi:nodetypes="cssscssssssssssssssssssssssssssssssssssscsssssssssssccsscc" />
+        <path
+           style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:0.3;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="m 11.577603,11.492866 c 0.322335,-0.01399 0.357232,0.03938 0.593611,-0.181212 0.221983,-0.240393 0.274315,-0.351823 0.276651,-0.568905 0.0025,-0.225226 -0.0071,-0.251559 -0.197844,-0.709979 C 11.842608,9.0532972 11.354715,8.0707792 11.126601,7.7704282 10.78476,7.3203352 10.29549,6.9914762 9.74677,6.8222662 9.333842,6.6949312 8.625467,6.7136062 8.182495,6.8635162 6.779112,7.3384312 6.027958,8.8521302 6.491449,10.27125 c 0.271605,0.831606 0.705445,1.281983 1.214295,1.281983 z"
+           id="path3272-6"
+           sodipodi:nodetypes="ccsssssscc" />
+        <path
+           style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0.3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000"
+           id="path16756-1"
+           sodipodi:type="arc"
+           sodipodi:cx="-12.009243"
+           sodipodi:cy="12.377947"
+           sodipodi:rx="0.19409445"
+           sodipodi:ry="0.19840427"
+           sodipodi:start="0.57990659"
+           sodipodi:end="0.54828965"
+           sodipodi:arc-type="arc"
+           sodipodi:open="true"
+           d="m -11.84688,12.486662 a 0.19409445,0.19840427 0 0 1 -0.26743,0.05811 0.19409445,0.19840427 0 0 1 -0.05896,-0.2729 0.19409445,0.19840427 0 0 1 0.266498,-0.06242 0.19409445,0.19840427 0 0 1 0.06317,0.271913"
+           transform="scale(-1,1)" />
+        <path
+           id="rect20090-0"
+           style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:0.3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000"
+           d="m 11.857757,10.952689 -3.825845,0.06844 c -0.144962,0.0026 -0.261704,0.119311 -0.261704,0.267512 0,0.148204 0.11674,0.270106 0.261704,0.267514 l 3.825845,-0.06844 c 0.144962,-0.0026 0.261704,-0.119312 0.261704,-0.267515 0,-0.148201 -0.116741,-0.270105 -0.261704,-0.267511 z"
+           sodipodi:nodetypes="sssssss" />
+        <path
+           style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:0.4;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="m 12.18194,17.216199 c 0.624312,-0.131607 1.333297,-0.60414 1.680554,-1.120063 0.529917,-0.787312 0.660533,-1.614976 0.412007,-2.610703 -0.445153,-1.783509 -1.737094,-5.0026358 -2.421826,-6.0344618 -0.48947,-0.737586 -1.146722,-1.225567 -1.985164,-1.473899 -0.284388,-0.08423 -0.549789,-0.118307 -0.970098,-0.126588 -0.24378,-0.0048 -0.652706,0.03674 -1.040841,0.17381 -0.485591,0.168758 -0.640212,0.230083 -0.950323,0.458278 -0.405441,0.295742 -0.788291,0.729017 -1.012688,1.175025 -0.289449,0.575304 -0.391516,0.937594 -0.418687,1.546511 -0.04019,0.9006898 0.117467,1.4116638 0.816102,2.6547258 1.00275,1.681382 1.225081,2.020621 2.371836,3.434141 0.232245,0.299614 0.629643,0.75695 0.883104,1.016312 0.372595,0.381249 0.523321,0.502467 0.787118,0.633023 0.598301,0.296089 1.270931,0.395727 1.848906,0.273889 z"
+           id="path5762-6"
+           sodipodi:nodetypes="ssssssccssccsss" />
+      </g>
+      <g
+         id="g2347-1"
+         style="display:inline"
+         transform="matrix(-1,0,0,1,28.780726,6.499701)">
+        <path
+           id="path13615-2-5"
+           style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:0.4;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="m 7.279849,6.2422412 c -0.03346,0.01692 -0.06557,0.03428 -0.09731,0.05262 -0.03173,0.01835 -0.06309,0.03768 -0.09514,0.05843 -0.03205,0.02076 -0.06477,0.04295 -0.09916,0.0671 -0.03438,0.02415 -0.07046,0.05023 -0.109229,0.07876 -0.02534,0.01848 -0.05048,0.03753 -0.07551,0.05707 -0.02503,0.01954 -0.0499,0.0396 -0.07456,0.06013 -0.04934,0.04106 -0.09793,0.084 -0.145486,0.128648 -0.04756,0.04465 -0.09414,0.091 -0.139497,0.138751 -0.04536,0.04774 -0.08948,0.09688 -0.132231,0.147218 -0.04275,0.05034 -0.08411,0.101873 -0.123825,0.15432 -0.0397,0.05244 -0.07777,0.105815 -0.114003,0.159856 -0.03625,0.05404 -0.07062,0.108751 -0.102975,0.163896 -0.01618,0.02756 -0.0319,0.05524 -0.04703,0.08299 -0.01513,0.02775 -0.02969,0.05557 -0.04371,0.08346 -0.03618,0.07192 -0.06927,0.14029 -0.09954,0.205974 -0.03028,0.0657 -0.05776,0.1287 -0.08266,0.190082 -0.02488,0.06138 -0.04721,0.121101 -0.06723,0.180116 -0.01,0.02952 -0.01941,0.05886 -0.0283,0.08813 -0.009,0.02927 -0.01728,0.05852 -0.0251,0.08781 -0.0078,0.02929 -0.01514,0.05865 -0.02198,0.0882 -0.0069,0.02954 -0.01321,0.05927 -0.01911,0.0893 -0.01181,0.06007 -0.02184,0.12132 -0.03033,0.184805 -0.0086,0.06349 -0.01548,0.129192 -0.02116,0.198028 -0.0057,0.06884 -0.01012,0.140872 -0.01351,0.216987 -0.0025,0.05629 -0.0043,0.110992 -0.0052,0.16448 -8.64e-4,0.05349 -9.69e-4,0.105698 -6.4e-5,0.156926 8.64e-4,0.05122 0.0027,0.101473 0.0056,0.150996 0.0029,0.04952 0.0067,0.09832 0.01168,0.146697 0.0049,0.04837 0.01103,0.09631 0.01829,0.144095 0.0073,0.04777 0.01565,0.09538 0.02537,0.1431138 0.0097,0.04773 0.02073,0.09559 0.03307,0.143831 0.01233,0.04823 0.02603,0.09688 0.04117,0.146177 0.01514,0.04931 0.03172,0.0993 0.04983,0.150215 0.01811,0.05092 0.03775,0.102736 0.05902,0.155817 0.02125,0.05309 0.04414,0.107386 0.0687,0.163179 0.02456,0.0558 0.05079,0.113155 0.07883,0.172233 0.02805,0.05908 0.0579,0.119891 0.0896,0.182787 0.03169,0.0629 0.06523,0.127824 0.100756,0.195098 0.03552,0.06727 0.07298,0.136893 0.112485,0.209101 0.03951,0.07221 0.08105,0.147045 0.124707,0.224738 0.06395,0.110373 0.12747,0.218614 0.190476,0.324728 0.063,0.10611 0.12555,0.210119 0.187612,0.312027 0.06207,0.101911 0.123617,0.201698 0.184741,0.299454 0.06112,0.09775 0.121762,0.19342 0.181938,0.287076 0.06017,0.09366 0.119894,0.185283 0.179133,0.274895 0.05924,0.08961 0.118038,0.177222 0.176331,0.262845 0.05829,0.08562 0.116105,0.1693 0.173462,0.250989 0.05736,0.08169 0.114249,0.161388 0.170659,0.239198 0.05641,0.0778 0.112317,0.153684 0.167791,0.227668 0.05546,0.07399 0.110513,0.14612 0.165051,0.216333 0.05453,0.07022 0.108593,0.138504 0.162182,0.204999 0.0027,0.0033 0.0053,0.0064 0.008,0.0098 C 8.00872,14.732698 7.120877,13.942779 6.658257,13.361473 5.598455,12.029821 5.055189,10.452858 5.217346,9.1790022 5.365603,8.0143522 5.882,7.0633652 6.841532,6.1881132 7.079748,5.9708212 7.106058,5.9999142 7.175394,6.0213522 7.413036,6.1657852 7.440231,6.1534602 7.2799,6.2422692 Z"
+           sodipodi:nodetypes="cssscssssssssssssssssssssssssssssssssssscsssssssssssccsscc" />
+        <path
+           style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:0.3;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="m 11.577603,11.492866 c 0.322335,-0.01399 0.357232,0.03938 0.593611,-0.181212 0.221983,-0.240393 0.274315,-0.351823 0.276651,-0.568905 0.0025,-0.225226 -0.0071,-0.251559 -0.197844,-0.709979 C 11.842608,9.0532972 11.354715,8.0707792 11.126601,7.7704282 10.78476,7.3203352 10.29549,6.9914762 9.74677,6.8222662 9.333842,6.6949312 8.625467,6.7136062 8.182495,6.8635162 6.779112,7.3384312 6.027958,8.8521302 6.491449,10.27125 c 0.271605,0.831606 0.705445,1.281983 1.214295,1.281983 z"
+           id="path3272-6-9"
+           sodipodi:nodetypes="ccsssssscc" />
+        <path
+           style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0.3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000"
+           id="path16756-1-4"
+           sodipodi:type="arc"
+           sodipodi:cx="-12.009243"
+           sodipodi:cy="12.377947"
+           sodipodi:rx="0.19409445"
+           sodipodi:ry="0.19840427"
+           sodipodi:start="0.57990659"
+           sodipodi:end="0.54828965"
+           sodipodi:arc-type="arc"
+           sodipodi:open="true"
+           transform="scale(-1,1)"
+           d="m -11.84688,12.486662 a 0.19409445,0.19840427 0 0 1 -0.26743,0.05811 0.19409445,0.19840427 0 0 1 -0.05896,-0.2729 0.19409445,0.19840427 0 0 1 0.266498,-0.06242 0.19409445,0.19840427 0 0 1 0.06317,0.271913" />
+        <path
+           id="rect20090-0-9"
+           style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:0.3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000"
+           d="m 11.857757,10.952689 -3.825845,0.06844 c -0.144962,0.0026 -0.261704,0.119311 -0.261704,0.267512 0,0.148204 0.11674,0.270106 0.261704,0.267514 l 3.825845,-0.06844 c 0.144962,-0.0026 0.261704,-0.119312 0.261704,-0.267515 0,-0.148201 -0.116741,-0.270105 -0.261704,-0.267511 z"
+           sodipodi:nodetypes="sssssss" />
+        <path
+           style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:0.4;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="m 12.18194,17.216199 c 0.624312,-0.131607 1.333297,-0.60414 1.680554,-1.120063 0.529917,-0.787312 0.660533,-1.614976 0.412007,-2.610703 -0.445153,-1.783509 -1.737094,-5.0026358 -2.421826,-6.0344618 -0.48947,-0.737586 -1.146722,-1.225567 -1.985164,-1.473899 -0.284388,-0.08423 -0.549789,-0.118307 -0.970098,-0.126588 -0.24378,-0.0048 -0.652706,0.03674 -1.040841,0.17381 -0.485591,0.168758 -0.640212,0.230083 -0.950323,0.458278 -0.405441,0.295742 -0.788291,0.729017 -1.012688,1.175025 -0.289449,0.575304 -0.391516,0.937594 -0.418687,1.546511 -0.04019,0.9006898 0.117467,1.4116638 0.816102,2.6547258 1.00275,1.681382 1.225081,2.020621 2.371836,3.434141 0.232245,0.299614 0.629643,0.75695 0.883104,1.016312 0.372595,0.381249 0.523321,0.502467 0.787118,0.633023 0.598301,0.296089 1.270931,0.395727 1.848906,0.273889 z"
+           id="path5762-6-0"
+           sodipodi:nodetypes="ssssssccssccsss" />
+      </g>
+    </g>
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer5"
+     inkscape:label="Original"
+     style="display:none"
+     sodipodi:insensitive="true">
+    <image
+       y="0.0079936879"
+       x="0.010951031"
+       id="image4124"
+       xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGAAAABgCAMAAADVRocKAAAAA3NCSVQICAjb4U/gAAAACXBIWXMA ADFOAAAxTgGacD5yAAAAGXRFWHRTb2Z0d2FyZQB3d3cuaW5rc2NhcGUub3Jnm+48GgAAABF0RVh0 VGl0bGUAUGViYmxlIEljb26KvwD9AAAADHRFWHRBdXRob3IAeHBobnh/4OzMAAAAY3RFWHRDb3B5 cmlnaHQAQ0MgQXR0cmlidXRpb24tTm9uQ29tbWVyY2lhbC1TaGFyZUFsaWtlIGh0dHA6Ly9jcmVh dGl2ZWNvbW1vbnMub3JnL2xpY2Vuc2VzL2J5LW5jLXNhLzMuMC/eBBrlAAABy1BMVEUAAAAAAAAA AP8AAIAAAFUAAKoAVaoAAIAAQIAAM2YAM5kzM2YzM5krK4AkJG0kJJIgIIAcHHEcHI4aGoAXF3QX F4sXLnQXLosVK4AUJ3YUJ4kSJIAkJIARInciInciIogQIIAgIIAeHngeHoccHIAcK4AbKHkbKIYa GoAaJoAYJHkXI4AXI4sWIXoWIYUVIIAfH3ofH4UdJ4ATHIQcJnsbJIAaI4QaIoAZIXsZIYQYIHgY IIAXH4MXJ3wXHoAXJoBLpfAWJHwdJHwdJIMcI4Acas0VIoMbIoAaIXwaIIAZH3wZH4MZJXwYHoAY HoYYJIAehtsYHoIefdtHoO0jetZGovNEn+4gg+EfgN5Ep/VKqfREpvQgfdkgfttKqvQggd4hjesw nPMwnPRJqfUhgd4hjutJqfUgfttNq/VNq/QhlPEhlPIhlvMkmPMglvIff9sgjeoglPAhk/AhlPEh lPIhlvMkl/MkmPMlmPMmmPMnmfMpmvMzn/Q0n/Q1n/Q2oPRIqfVNq/VasfZbsvZhtPZitfdtuveQ yvmXzvmj0/qk1Pqu2fu83/vR6f3T6v3Z7f3i8f3j8v3l8/7m8/7p9f7q9f7x+P7y+f7////ougeB AAAAb3RSTlMAAQECAwMDBAQFBQUFBgcHCAkJCgsLCwsMDQ0ODg8PDxAQERESEhMTFBQVFhYXFxgZ GRobGxwdHh8fICAhISIiIiMjIyQkJSYnKCkpKSoqKiorKyssLC2xs7O0tba2tu7u7u7u7+/w8fHy +/v7+/ywJhX9AAAC0klEQVRo3u2a+VfTQBCAm00iW0nSTVNKbKQYbIMUC6jU4q2IB2rF+74vPEAR LSjIIXgAAiqef65py6MNJe17y1RF8/26L/N1N9O8ZGZcLof/DiYFoiV1cZHwiGVZjh7zalRAYYbn sFsQ6RFwGccyBeJjwSMrPn8lHX6fQqRy3tbAsFiU1So9FA4bNIRD63XNTwTO5pSYc9fuvwbgwaW9 SxqYs/eGBgcAGBy+fRrlpRPDsJdfJoEYuMgvzibz/vK3kmDcFMuxNZvM/BG74QTdFV6PJZsYlhe9 XXCCrlCVStwcyhG45QCkoCmiV0o4uwXEib4aQMHjbc0RTXYvCMx/mGdNHaSgraWxRhEXzsgUEC0C KWjfszlUYRWsrYcUHGttNlSRzxUEo5CCjrZYrSqVVlD3Nwj6vqcZsovzKrPeTy3o/5lmxE4wnFl/ 4QhKLvjy2YY5IEExHMH0B1umQQSj9o+EUUewIBh/m8c4qOBbfu58dQRLCmYnJmZLKphKJicdwR8X vJsymSmhIM37FSv4OJlhxnlUOAJHAC8Ye5PHmPNe9PsEJX/5dT5AigvmPtkw53wnr3xB34809uWc zDp9OWflV7xgBaBlzY79MWORALhuui+vbhoArfwe3rUp5MtWfl2Il1QDUtAaj+rKakv1XdEhBfGm Wo1kq+/pM1Ih+wdRI6iIq3IFvEAewgke6QHFg1mU26PjhbtwghsKEbG1X8ew3PmnUPGfXRAwv7hr yqAD13t6nwPQ23PnBMeivG4gg85c7XwCQOeVU+avZ5bslcrrNm7dfehIInGSguOJo+0Hd27ZoOam j3ULvOjTI02x+PYddLTEY42GJpfnpo/L0g50k8pqI1IfbWikoSFaXxfSFKnMrqFsZpKbKKoWDFbT EdQCqlfCdhtIG7AoESLTQogk4EJd/VRTn8fLgecKTg3MjyUsA4SKDD7MT1bQ8++NmvwCRmydh2Fg UvEAAAAASUVORK5CYII= "
+       style="opacity:0.49074079;image-rendering:optimizeQuality"
+       preserveAspectRatio="none"
+       height="28.710279"
+       width="28.710279" />
+  </g>
+</svg>
diff --git a/app/src/main/assets/ic_device_sony_800n_disabled.svg b/app/src/main/assets/ic_device_sony_800n_disabled.svg
new file mode 100644
index 000000000..e43bffb5d
--- /dev/null
+++ b/app/src/main/assets/ic_device_sony_800n_disabled.svg
@@ -0,0 +1,268 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   version="1.1"
+   id="svg2"
+   width="28.740126"
+   height="28.740126"
+   viewBox="0 0 28.740126 28.740126"
+   sodipodi:docname="ic_device_sony_800n_disabled.svg"
+   inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:android="http://schemas.android.com/apk/res/android">
+  <metadata
+     id="metadata8">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs6">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 14.370063 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="28.740126 : 14.370063 : 1"
+       inkscape:persp3d-origin="14.370063 : 9.580042 : 1"
+       id="perspective903" />
+  </defs>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1035"
+     id="namedview4"
+     showgrid="false"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:zoom="16"
+     inkscape:cx="7.34375"
+     inkscape:cy="7.65625"
+     inkscape:window-x="0"
+     inkscape:window-y="45"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="layer6"
+     inkscape:pagecheckerboard="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid972" />
+  </sodipodi:namedview>
+  <g
+     inkscape:groupmode="layer"
+     id="layer1"
+     inkscape:label="Background"
+     style="display:inline">
+    <g
+       inkscape:groupmode="layer"
+       id="layer4"
+       inkscape:label="Bottom"
+       style="display:inline"
+       sodipodi:insensitive="true">
+      <rect
+         style="display:inline;fill:#7a7a7a;fill-opacity:1;stroke:none;stroke-width:3.57115173;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect817-5"
+         width="22.819572"
+         height="21.904638"
+         x="2.9239759"
+         y="3.8768768"
+         ry="0.9472276" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer3"
+       inkscape:label="Middle"
+       style="display:inline"
+       sodipodi:insensitive="true">
+      <rect
+         style="display:inline;fill:#9f9f9f;fill-opacity:0.94117647;stroke:none;stroke-width:3.57115173;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect817-7"
+         width="22.819572"
+         height="21.904638"
+         x="2.9317887"
+         y="3.0349438"
+         ry="0.9472276" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer2"
+       inkscape:label="Top"
+       style="display:inline"
+       sodipodi:insensitive="true">
+      <rect
+         style="fill:#8a8a8a;fill-opacity:1;stroke:none;stroke-width:3.57115173;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect817"
+         width="22.819572"
+         height="21.904638"
+         x="2.9238882"
+         y="3.4130721"
+         ry="0.9472276" />
+    </g>
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer6"
+     inkscape:label="Foreground"
+     style="display:inline">
+    <g
+       inkscape:groupmode="layer"
+       id="layer7"
+       inkscape:label="Backplane"
+       style="display:inline" />
+    <g
+       inkscape:groupmode="layer"
+       id="layer8"
+       inkscape:label="Frontplane"
+       style="display:inline">
+      <g
+         inkscape:groupmode="layer"
+         id="layer9"
+         inkscape:label="Base"
+         style="display:inline" />
+      <g
+         inkscape:groupmode="layer"
+         id="layer10"
+         inkscape:label="Top"
+         style="display:inline" />
+      <g
+         inkscape:groupmode="layer"
+         id="layer11"
+         inkscape:label="Toptop"
+         style="display:inline" />
+      <g
+         inkscape:groupmode="layer"
+         id="layer12"
+         inkscape:label="Toptoptop"
+         style="display:inline" />
+    </g>
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:#8a8a8a;fill-opacity:0.94117647"
+       d="m 12.48275,10.865376 h 3.907 v 6.978 h -3.907 z"
+       android:strokeWidth="1"
+       id="path2735" />
+    <g
+       id="g2458"
+       transform="translate(0.01135305,-0.15009041)"
+       style="display:inline">
+      <g
+         id="g2347">
+        <path
+           id="path13615-2"
+           style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:0.4;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="m 7.279849,6.2422412 c -0.03346,0.01692 -0.06557,0.03428 -0.09731,0.05262 -0.03173,0.01835 -0.06309,0.03768 -0.09514,0.05843 -0.03205,0.02076 -0.06477,0.04295 -0.09916,0.0671 -0.03438,0.02415 -0.07046,0.05023 -0.109229,0.07876 -0.02534,0.01848 -0.05048,0.03753 -0.07551,0.05707 -0.02503,0.01954 -0.0499,0.0396 -0.07456,0.06013 -0.04934,0.04106 -0.09793,0.084 -0.145486,0.128648 -0.04756,0.04465 -0.09414,0.091 -0.139497,0.138751 -0.04536,0.04774 -0.08948,0.09688 -0.132231,0.147218 -0.04275,0.05034 -0.08411,0.101873 -0.123825,0.15432 -0.0397,0.05244 -0.07777,0.105815 -0.114003,0.159856 -0.03625,0.05404 -0.07062,0.108751 -0.102975,0.163896 -0.01618,0.02756 -0.0319,0.05524 -0.04703,0.08299 -0.01513,0.02775 -0.02969,0.05557 -0.04371,0.08346 -0.03618,0.07192 -0.06927,0.14029 -0.09954,0.205974 -0.03028,0.0657 -0.05776,0.1287 -0.08266,0.190082 -0.02488,0.06138 -0.04721,0.121101 -0.06723,0.180116 -0.01,0.02952 -0.01941,0.05886 -0.0283,0.08813 -0.009,0.02927 -0.01728,0.05852 -0.0251,0.08781 -0.0078,0.02929 -0.01514,0.05865 -0.02198,0.0882 -0.0069,0.02954 -0.01321,0.05927 -0.01911,0.0893 -0.01181,0.06007 -0.02184,0.12132 -0.03033,0.184805 -0.0086,0.06349 -0.01548,0.129192 -0.02116,0.198028 -0.0057,0.06884 -0.01012,0.140872 -0.01351,0.216987 -0.0025,0.05629 -0.0043,0.110992 -0.0052,0.16448 -8.64e-4,0.05349 -9.69e-4,0.105698 -6.4e-5,0.156926 8.64e-4,0.05122 0.0027,0.101473 0.0056,0.150996 0.0029,0.04952 0.0067,0.09832 0.01168,0.146697 0.0049,0.04837 0.01103,0.09631 0.01829,0.144095 0.0073,0.04777 0.01565,0.09538 0.02537,0.1431138 0.0097,0.04773 0.02073,0.09559 0.03307,0.143831 0.01233,0.04823 0.02603,0.09688 0.04117,0.146177 0.01514,0.04931 0.03172,0.0993 0.04983,0.150215 0.01811,0.05092 0.03775,0.102736 0.05902,0.155817 0.02125,0.05309 0.04414,0.107386 0.0687,0.163179 0.02456,0.0558 0.05079,0.113155 0.07883,0.172233 0.02805,0.05908 0.0579,0.119891 0.0896,0.182787 0.03169,0.0629 0.06523,0.127824 0.100756,0.195098 0.03552,0.06727 0.07298,0.136893 0.112485,0.209101 0.03951,0.07221 0.08105,0.147045 0.124707,0.224738 0.06395,0.110373 0.12747,0.218614 0.190476,0.324728 0.063,0.10611 0.12555,0.210119 0.187612,0.312027 0.06207,0.101911 0.123617,0.201698 0.184741,0.299454 0.06112,0.09775 0.121762,0.19342 0.181938,0.287076 0.06017,0.09366 0.119894,0.185283 0.179133,0.274895 0.05924,0.08961 0.118038,0.177222 0.176331,0.262845 0.05829,0.08562 0.116105,0.1693 0.173462,0.250989 0.05736,0.08169 0.114249,0.161388 0.170659,0.239198 0.05641,0.0778 0.112317,0.153684 0.167791,0.227668 0.05546,0.07399 0.110513,0.14612 0.165051,0.216333 0.05453,0.07022 0.108593,0.138504 0.162182,0.204999 0.0027,0.0033 0.0053,0.0064 0.008,0.0098 C 8.00872,14.732698 7.120877,13.942779 6.658257,13.361473 5.598455,12.029821 5.055189,10.452858 5.217346,9.1790022 5.365603,8.0143522 5.882,7.0633652 6.841532,6.1881132 7.079748,5.9708212 7.106058,5.9999142 7.175394,6.0213522 7.413036,6.1657852 7.440231,6.1534602 7.2799,6.2422692 Z"
+           sodipodi:nodetypes="cssscssssssssssssssssssssssssssssssssssscsssssssssssccsscc" />
+        <path
+           style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:0.3;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="m 11.577603,11.492866 c 0.322335,-0.01399 0.357232,0.03938 0.593611,-0.181212 0.221983,-0.240393 0.274315,-0.351823 0.276651,-0.568905 0.0025,-0.225226 -0.0071,-0.251559 -0.197844,-0.709979 C 11.842608,9.0532972 11.354715,8.0707792 11.126601,7.7704282 10.78476,7.3203352 10.29549,6.9914762 9.74677,6.8222662 9.333842,6.6949312 8.625467,6.7136062 8.182495,6.8635162 6.779112,7.3384312 6.027958,8.8521302 6.491449,10.27125 c 0.271605,0.831606 0.705445,1.281983 1.214295,1.281983 z"
+           id="path3272-6"
+           sodipodi:nodetypes="ccsssssscc" />
+        <path
+           style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0.3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000"
+           id="path16756-1"
+           sodipodi:type="arc"
+           sodipodi:cx="-12.009243"
+           sodipodi:cy="12.377947"
+           sodipodi:rx="0.19409445"
+           sodipodi:ry="0.19840427"
+           sodipodi:start="0.57990659"
+           sodipodi:end="0.54828965"
+           sodipodi:arc-type="arc"
+           sodipodi:open="true"
+           transform="scale(-1,1)"
+           d="m -11.84688,12.486662 a 0.19409445,0.19840427 0 0 1 -0.26743,0.05811 0.19409445,0.19840427 0 0 1 -0.05896,-0.2729 0.19409445,0.19840427 0 0 1 0.266498,-0.06242 0.19409445,0.19840427 0 0 1 0.06317,0.271913" />
+        <path
+           id="rect20090-0"
+           style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:0.3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000"
+           d="m 11.857757,10.952689 -3.825845,0.06844 c -0.144962,0.0026 -0.261704,0.119311 -0.261704,0.267512 0,0.148204 0.11674,0.270106 0.261704,0.267514 l 3.825845,-0.06844 c 0.144962,-0.0026 0.261704,-0.119312 0.261704,-0.267515 0,-0.148201 -0.116741,-0.270105 -0.261704,-0.267511 z"
+           sodipodi:nodetypes="sssssss" />
+        <path
+           style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:0.4;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="m 12.18194,17.216199 c 0.624312,-0.131607 1.333297,-0.60414 1.680554,-1.120063 0.529917,-0.787312 0.660533,-1.614976 0.412007,-2.610703 -0.445153,-1.783509 -1.737094,-5.0026358 -2.421826,-6.0344618 -0.48947,-0.737586 -1.146722,-1.225567 -1.985164,-1.473899 -0.284388,-0.08423 -0.549789,-0.118307 -0.970098,-0.126588 -0.24378,-0.0048 -0.652706,0.03674 -1.040841,0.17381 -0.485591,0.168758 -0.640212,0.230083 -0.950323,0.458278 -0.405441,0.295742 -0.788291,0.729017 -1.012688,1.175025 -0.289449,0.575304 -0.391516,0.937594 -0.418687,1.546511 -0.04019,0.9006898 0.117467,1.4116638 0.816102,2.6547258 1.00275,1.681382 1.225081,2.020621 2.371836,3.434141 0.232245,0.299614 0.629643,0.75695 0.883104,1.016312 0.372595,0.381249 0.523321,0.502467 0.787118,0.633023 0.598301,0.296089 1.270931,0.395727 1.848906,0.273889 z"
+           id="path5762-6"
+           sodipodi:nodetypes="ssssssccssccsss" />
+      </g>
+      <g
+         id="g2347-1"
+         style="display:inline"
+         transform="matrix(-1,0,0,1,28.780726,6.499701)">
+        <path
+           id="path13615-2-5"
+           style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:0.4;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="m 7.279849,6.2422412 c -0.03346,0.01692 -0.06557,0.03428 -0.09731,0.05262 -0.03173,0.01835 -0.06309,0.03768 -0.09514,0.05843 -0.03205,0.02076 -0.06477,0.04295 -0.09916,0.0671 -0.03438,0.02415 -0.07046,0.05023 -0.109229,0.07876 -0.02534,0.01848 -0.05048,0.03753 -0.07551,0.05707 -0.02503,0.01954 -0.0499,0.0396 -0.07456,0.06013 -0.04934,0.04106 -0.09793,0.084 -0.145486,0.128648 -0.04756,0.04465 -0.09414,0.091 -0.139497,0.138751 -0.04536,0.04774 -0.08948,0.09688 -0.132231,0.147218 -0.04275,0.05034 -0.08411,0.101873 -0.123825,0.15432 -0.0397,0.05244 -0.07777,0.105815 -0.114003,0.159856 -0.03625,0.05404 -0.07062,0.108751 -0.102975,0.163896 -0.01618,0.02756 -0.0319,0.05524 -0.04703,0.08299 -0.01513,0.02775 -0.02969,0.05557 -0.04371,0.08346 -0.03618,0.07192 -0.06927,0.14029 -0.09954,0.205974 -0.03028,0.0657 -0.05776,0.1287 -0.08266,0.190082 -0.02488,0.06138 -0.04721,0.121101 -0.06723,0.180116 -0.01,0.02952 -0.01941,0.05886 -0.0283,0.08813 -0.009,0.02927 -0.01728,0.05852 -0.0251,0.08781 -0.0078,0.02929 -0.01514,0.05865 -0.02198,0.0882 -0.0069,0.02954 -0.01321,0.05927 -0.01911,0.0893 -0.01181,0.06007 -0.02184,0.12132 -0.03033,0.184805 -0.0086,0.06349 -0.01548,0.129192 -0.02116,0.198028 -0.0057,0.06884 -0.01012,0.140872 -0.01351,0.216987 -0.0025,0.05629 -0.0043,0.110992 -0.0052,0.16448 -8.64e-4,0.05349 -9.69e-4,0.105698 -6.4e-5,0.156926 8.64e-4,0.05122 0.0027,0.101473 0.0056,0.150996 0.0029,0.04952 0.0067,0.09832 0.01168,0.146697 0.0049,0.04837 0.01103,0.09631 0.01829,0.144095 0.0073,0.04777 0.01565,0.09538 0.02537,0.1431138 0.0097,0.04773 0.02073,0.09559 0.03307,0.143831 0.01233,0.04823 0.02603,0.09688 0.04117,0.146177 0.01514,0.04931 0.03172,0.0993 0.04983,0.150215 0.01811,0.05092 0.03775,0.102736 0.05902,0.155817 0.02125,0.05309 0.04414,0.107386 0.0687,0.163179 0.02456,0.0558 0.05079,0.113155 0.07883,0.172233 0.02805,0.05908 0.0579,0.119891 0.0896,0.182787 0.03169,0.0629 0.06523,0.127824 0.100756,0.195098 0.03552,0.06727 0.07298,0.136893 0.112485,0.209101 0.03951,0.07221 0.08105,0.147045 0.124707,0.224738 0.06395,0.110373 0.12747,0.218614 0.190476,0.324728 0.063,0.10611 0.12555,0.210119 0.187612,0.312027 0.06207,0.101911 0.123617,0.201698 0.184741,0.299454 0.06112,0.09775 0.121762,0.19342 0.181938,0.287076 0.06017,0.09366 0.119894,0.185283 0.179133,0.274895 0.05924,0.08961 0.118038,0.177222 0.176331,0.262845 0.05829,0.08562 0.116105,0.1693 0.173462,0.250989 0.05736,0.08169 0.114249,0.161388 0.170659,0.239198 0.05641,0.0778 0.112317,0.153684 0.167791,0.227668 0.05546,0.07399 0.110513,0.14612 0.165051,0.216333 0.05453,0.07022 0.108593,0.138504 0.162182,0.204999 0.0027,0.0033 0.0053,0.0064 0.008,0.0098 C 8.00872,14.732698 7.120877,13.942779 6.658257,13.361473 5.598455,12.029821 5.055189,10.452858 5.217346,9.1790022 5.365603,8.0143522 5.882,7.0633652 6.841532,6.1881132 7.079748,5.9708212 7.106058,5.9999142 7.175394,6.0213522 7.413036,6.1657852 7.440231,6.1534602 7.2799,6.2422692 Z"
+           sodipodi:nodetypes="cssscssssssssssssssssssssssssssssssssssscsssssssssssccsscc" />
+        <path
+           style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:0.3;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="m 11.577603,11.492866 c 0.322335,-0.01399 0.357232,0.03938 0.593611,-0.181212 0.221983,-0.240393 0.274315,-0.351823 0.276651,-0.568905 0.0025,-0.225226 -0.0071,-0.251559 -0.197844,-0.709979 C 11.842608,9.0532972 11.354715,8.0707792 11.126601,7.7704282 10.78476,7.3203352 10.29549,6.9914762 9.74677,6.8222662 9.333842,6.6949312 8.625467,6.7136062 8.182495,6.8635162 6.779112,7.3384312 6.027958,8.8521302 6.491449,10.27125 c 0.271605,0.831606 0.705445,1.281983 1.214295,1.281983 z"
+           id="path3272-6-9"
+           sodipodi:nodetypes="ccsssssscc" />
+        <path
+           style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0.3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000"
+           id="path16756-1-4"
+           sodipodi:type="arc"
+           sodipodi:cx="-12.009243"
+           sodipodi:cy="12.377947"
+           sodipodi:rx="0.19409445"
+           sodipodi:ry="0.19840427"
+           sodipodi:start="0.57990659"
+           sodipodi:end="0.54828965"
+           sodipodi:arc-type="arc"
+           sodipodi:open="true"
+           transform="scale(-1,1)"
+           d="m -11.84688,12.486662 a 0.19409445,0.19840427 0 0 1 -0.26743,0.05811 0.19409445,0.19840427 0 0 1 -0.05896,-0.2729 0.19409445,0.19840427 0 0 1 0.266498,-0.06242 0.19409445,0.19840427 0 0 1 0.06317,0.271913" />
+        <path
+           id="rect20090-0-9"
+           style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:0.3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000"
+           d="m 11.857757,10.952689 -3.825845,0.06844 c -0.144962,0.0026 -0.261704,0.119311 -0.261704,0.267512 0,0.148204 0.11674,0.270106 0.261704,0.267514 l 3.825845,-0.06844 c 0.144962,-0.0026 0.261704,-0.119312 0.261704,-0.267515 0,-0.148201 -0.116741,-0.270105 -0.261704,-0.267511 z"
+           sodipodi:nodetypes="sssssss" />
+        <path
+           style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:0.4;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="m 12.18194,17.216199 c 0.624312,-0.131607 1.333297,-0.60414 1.680554,-1.120063 0.529917,-0.787312 0.660533,-1.614976 0.412007,-2.610703 -0.445153,-1.783509 -1.737094,-5.0026358 -2.421826,-6.0344618 -0.48947,-0.737586 -1.146722,-1.225567 -1.985164,-1.473899 -0.284388,-0.08423 -0.549789,-0.118307 -0.970098,-0.126588 -0.24378,-0.0048 -0.652706,0.03674 -1.040841,0.17381 -0.485591,0.168758 -0.640212,0.230083 -0.950323,0.458278 -0.405441,0.295742 -0.788291,0.729017 -1.012688,1.175025 -0.289449,0.575304 -0.391516,0.937594 -0.418687,1.546511 -0.04019,0.9006898 0.117467,1.4116638 0.816102,2.6547258 1.00275,1.681382 1.225081,2.020621 2.371836,3.434141 0.232245,0.299614 0.629643,0.75695 0.883104,1.016312 0.372595,0.381249 0.523321,0.502467 0.787118,0.633023 0.598301,0.296089 1.270931,0.395727 1.848906,0.273889 z"
+           id="path5762-6-0"
+           sodipodi:nodetypes="ssssssccssccsss" />
+      </g>
+    </g>
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer5"
+     inkscape:label="Original"
+     style="display:none">
+    <image
+       y="0.028144173"
+       x="0.013794855"
+       id="image1291"
+       xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAJAAAACQCAYAAADnRuK4AAAABHNCSVQICAgIfAhkiAAAAAlwSFlz AABO4wAATuMBYdZxSQAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAAZdEVY dFRpdGxlAFR3ZWxmIEljb24gVGVtcGxhdGXyQOONAAAADHRFWHRBdXRob3IAeHBobnh/4OzMAAAA Y3RFWHRDb3B5cmlnaHQAQ0MgQXR0cmlidXRpb24tTm9uQ29tbWVyY2lhbC1TaGFyZUFsaWtlIGh0 dHA6Ly9jcmVhdGl2ZWNvbW1vbnMub3JnL2xpY2Vuc2VzL2J5LW5jLXNhLzQuMC9D0yJcAAANW0lE QVR4nO2dS4xc2VnH/98591VVXd3TbntC92ggwZ5R1BWRRZMoIQG1UIQIs0BCcpINESyyQIqySlgl 2I6yQ2xmtpEQilgQI4EUiAQaQQtCFAiNQjLVUWbsjII19iS2u931vI9zzseiqtxP21V9b7vrlr/f pp/33HPr/O53vvO4VYAgCIIgCIIgCIIgCILwLEBnUz6f8mmfZR7ZpKfyop+GQPvKHNX52mmLKjyS K8NGONAEhclUdMMOy2PsSdMcfr08+LK+JTKdNhurQ0GuD3/RGP58hfc1eSESeUUUMuSQPE0CLgPr ILRv0xp2EMd3CHf3DkiS+yJTQYTh0p4QjS1E0TJvYhGorzA2VjGQ6RoAHklEKECiIhuQDsiz3qC1 9jLF8R1KknNkzDYZs0vAi3CuJeKcEkrNM3ALnrfAnneOw3Cbo2iZN+t3GBtNHkSjh5FoagQ6Ik/j LlSSnKM4NirLbit3fo7Y9AhYgrP9vTjq+iJTTkhVHoqgdIWB+yCvyupeh31/xUWR58Jwm5sX4Abd 21ZhEhUo0NUD8nS7UGkKlS1C2QRq3kA5F5KrJ8Q2IaAOdqnIUxCkAgbaIB2yaoesVMItD06HcP4O XBDA1WpwA4lGkegqYwoEok++ygE/3/+CJv6MVrjIwEIB5QpFw9xyUG9ZuL+Jt+6+tnH1vUneKJRX IPrEN/nFiHrfJqBhHJBYwLqcpQqnglZAqAFPAc7xG0miX3n9s9GtPCOzkwpEAPDJVznQy73NxKBx p8PoZjJBWAbmAsJyjeArfqP747sf2rj6V+mhIf6IJzaomvDchIcJM4Of73+hm6Lx0wdO5CkRnZRx 84FDz9AHgpeWPj+Ycrk2zGOv0j5vnhhgJhHo0DzPNXJwn77VcnDiTulwDNxqOZDWn8LaosI6FLBK B2Vi4GHQOJ5xJxKPThKuN+h+D5esyFNaLAPbfXfp0m6owhgcre0MJx8xnDN68sTjBDPRI3lWCeug xl2oTsbVgq5FOCNaKeba7dCL43nX7d7hS17IYQxurjccNpo4JNERxunC6KA8Ww/neTJb4JUIZ0Jm gbSmvbj2rtefr+leb0l3u1CNu1BYb+zr0h52ZwcYMwcadVt78vT7HS29V/lhANVAedX+olfrWC+t 93SaDtr4oETH8ySB9mXkl7HWXqbRDLN97sKkIzhhGmGmNA79xE/8JHDeXFLVab2i03SwFLXWvj1Y FN+LQgcYX4L1LYrjO2TMLmWLUHNJXxd4GcIZ4uvMDzx4WdLxsijQc0lfZ4tQcfy2iuMVOrQF50A0 GiOJHnZf7UVKkpCcWyKbQJkalF/whQhng/XIQwYKgwBpljIZsE2gnFtwgy03Sxh2Y0dC0JgR6DLW sAZjlsier9G8gXLZxJOQwpTiZ/Csb7Q1mY5Mql0V6jkXkT3fIWOWht0YcNzO0oklcLZLzsVkLRSY ZTV9BnAM5RtPs4NyUUDOBeRcTM7ODdt37ZHHji3QKP9h0yPnIpKtGLMDe1BgQy4g5SwUc0rOxYfa 9/Kxx55gS+sSsNAHerUTVFWYRpg9YoDAIOaM2PEgSJgeGZNRHIOAxWOPHTMCjbLwF/edNJMINDNY YjYUPvx5/OBwghyoP9xRKMwWIdgZAioTBQcZSQkD2J4oKIhAQi5EICEXRT5Y+FR56ZzC5z7o46Mv eHi+RvBLditkDvhFl/Hddwy+/oMMb+2UcyN5KQX67Ad8fOXjIXSJU3lfAS/UCZff7+MPXvZx9TsJ /rqZnXW1JqZk9y3wykUPV36z3PIcRivgq78V4nd/tXz3c6kECjTw5Y+Fp/6eNGcBAfjKx8LSdcWl qu5HVjTeU5tFfQYszxE+vFKuXTKlEuilc6Wq7ol4uWTXWKra1vzZjT4j5kp2jaUSSJg+RCAhFyKQ kIvyTTw8ht2kHA8aLYSPznNePqfwexc97MSM/3nXIpnyZ+9mSqBf/8supv1RawJw80/mHvn3Vy55 eOXSoFluPnD4o3/o45329F6UdGFTzMXnFL78G+GT//EMEYGeMnrCV/xDy9M9sSgCPWUmXaqoTPm8 kAgk5EIEespM+mZcjqc3gQZmbBR2HH/+2xF+7fmzuU9++AuHL/1LfOB36YTD8p9sT/dGs5kX6MU6 4aXFsxFop58vemQO+Iv/TAuqzekw8wKVjTe3HW7sOPxfy+Hv3zR4UyKQMAn/eMPgtc3pjjr7kSRa yIUIJORCBBJyIQIJuRCBhFyIQEIuRCAhFyKQkAsRSMiFCCTkQgQSciECCbkQgYRciEBCLkQgIRci kJALEUjIhQgk5EIEEnIhAgm5EIGEXIhAQi5EICEXIpCQCxFIyIUIJORCBBJyIQIJuRCBhFyIQEIu RCAhFyKQkAsRSMjFzL9D2a02Y/GMPhH51hR/REFRzLxAh98lVSgW6cKEXIhAQi5EICEXIpCQCxFI yMVMjcL++49rZ12FZ46ZEuhxn0UqnA7ShQm5EIGEXIhAQi5KJVAnm/21pXZarmsslUA3pvyzs4rg rTNa+D0ppRLoe7ct3u2W6w6dhDsdxn/dnvAzMc+YUgmUWuBr/5FgFhViAF/9ToKsXAGoXAIBwLdv Glz99wS2ZC/047AO+LN/S/BPb5uzrsrElHIi8RtvZPjebYvPfdDHR1/w8Es1gi7ZrWAc8PMu47vv GHz9B1npcp8RpRQIAN7advjTf00AJGddlWeakt23wrQhAgm5EIGEXIhAwgDSJ5odmVggpStMOpzF qZhnnASkPAb6Ex01pkCrQ2FuTVgpoRxoJvJ4NJ4lGn9B7gRd2H1gd7KTCNMNkWGCZpBhIp9JBaxU zORV2fMWOIqWH9nWYwsURcvseQtMXnVQuApEoBmBDBzIskojRypjooCVig617/Vjjz1BDlRjpSLW Gg5EItEMoAgu87Ql1Xc6YadUykpFrHRn2L6bjz52vFNcxyY24XnnWN/rcsuDI5WIPDNC5sPozFql 4foKTvXgHqiY9b059rz7vFlfGbb1lSNtPoZAVxhoMOorHIbbrNQ86xDOj8Ny7TsQHok2bJSX2TRj 4/mB9Tw4HcIptcthuDSUpnFswBi/C9tY5UEe1GJ/B67loZyrf8IRUsMms37mh3MmSGE6YcX6O3BR 9D4XRbcZG6v75Tkg0pMEYmD0qMx1bNbvcK0GFwRwfrVjwdKLzQAchEHmJzBhqkwn7Fn94K4LArgw 3B52X6ME+uhjU2NGoGE3trHKzeg212pwldacBUsQKj3s0Df9LK5VsnYltkG7aiuVOVurwTUvwGGj OWj7Y/IfYDyBhlHoCgNbjM1PuOYFuFoNDnHaK/ZqhKcNx0k76FoTtPu21oWpVu/vk2d1nzwE4Ohm 0AmG8fsk2mhy8wKc6/duzOT+0mcFZnC//9N6/ZfN4iJMrQZ3YyHZF3m29stzLONuKGMANCiIGbgG bDTBH8+uc2t3jebnAZLHiksFM7jdBiW9v72x8IZDfWWYLDcBrDDQwCF5jg0Vk+xIPCKR+8ndV+n9 5/8QzjWoXge80m5wfLYwGbjdAZLkR+n/3nwNmztuIM0W9sQBniTPgf+YEBqV+ytf/OF7qVL5Fitq kO8D2gdkgno6YQJsBs4yENOP2HV//2df+7ufDf54RBrgMeKMyNvvEMB4z+98o1r5yIc/D8efBqmL rNR8znKFU4Act8C4odhe737/+6/9/J+/FQ+S5KsjUSa+8wsRCLhGAFSjAXXvXsdPa+e9auK81E/9 wKt4Jkt9Z632fa3ZQTFbAhQhAJidJE85IVKMFAAcE2kmBZdl1iqtrfbIZNZkfgoTV5FW491sYWHB DhJluMeNsMYhb9LCg+z5KoBVjqLXuVJZsejeQ78+xxUvQZakHEaBsybTzkJzpCmwRgEAsyfyFAE7 UGAYAFKtHSWW/TCz2oNN0tQGEZtQOWPb1nqV4faMjcVhznNyeYD8EWhYBgP4lMJ6gxp3oXZ353Wy 0NK1LrwsCrTJUh2ZVNuQlLNQQAVgQ8yZCFQQRP5AAspYaTidsIu9wHp+YP04td0aTLg7bxcWWnZv mP5Nl1egAodNDcbGKpprO3wpSZzbAXXqPTsXA2TAWTVw1kKx84k5I+aU5A3piqOLFEQBE1WZkLEL 4fwenGdT1wl7Ntipuqjqub3oU8wMXhEC7evGrgP1Bocx2Bg4tKvoLoJtAjWfQjkXk3MgnksIAAzq BZxeAIAQbQAJqANWKmZlI25Fg1X1YKe6b20LDLyOwXA9X/QBiunChuWMkukmjbqyJDlHcfy2cm6B 7PkaOdslNj1ytipd1ymhdG+wa1TXWN/rslK7HEXvc2G4zXvLEwdmmHMJVGAXdnCWurnecGvtkMJw gZPkPpkWyJjdoTjzcK4lEhWMUvMM7ALYheeBvep9DsMljqJwEHk2msOu6/HLE5NQlEDHLnVsYpWx fofQTmgNy4jjUa1bBZ1WOEgLwAKAwR72TdwG6hjmPK/j0MIoUEAeVHQUeDhDPZwbGtIk4PLw+y3C esFnFfbYAPYew7qOgzsJi5UHKF6gQ+WO6nhNuqszY/x1rZNw2g0r4kwPskApCIIgCIJQEP8P03/B 430mofMAAAAASUVORK5CYII= "
+       style="opacity:0.49074079;image-rendering:optimizeQuality"
+       preserveAspectRatio="none"
+       height="28.670942"
+       width="28.670942" />
+    <image
+       y="0.0055872202"
+       x="-0.031073861"
+       id="image3082"
+       xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAJAAAACQCAYAAADnRuK4AAAABHNCSVQICAgIfAhkiAAAAAlwSFlz AABO4wAATuMBYdZxSQAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAAZdEVY dFRpdGxlAFR3ZWxmIEljb24gVGVtcGxhdGXyQOONAAAADHRFWHRBdXRob3IAeHBobnh/4OzMAAAA Y3RFWHRDb3B5cmlnaHQAQ0MgQXR0cmlidXRpb24tTm9uQ29tbWVyY2lhbC1TaGFyZUFsaWtlIGh0 dHA6Ly9jcmVhdGl2ZWNvbW1vbnMub3JnL2xpY2Vuc2VzL2J5LW5jLXNhLzQuMC9D0yJcAAAL6klE QVR4nO3dTYvcRhrA8adKJZW6Zc0LmTEmmYUF5zYOJjQLOSTQEMhlA7uHsNlPsCHg5DP4MzghHyC3 xZvTGh8CgYaQXMwEkngOZo1f2JAYz2ReLHePSqqqZy+t2Z5xj6c1pbZa7ecHxo09LdVEf0rVkjIG IIQQQgghhBBCCCEvA9bw7ZPJ4TQ2Oo0DPG6bFFJ9xoVTWUxVH1g25vXxfTAAgG63W/GuSa/XK14e DwTH/HklEVUZ0PF4ilBYkiQMACBN0yP7U0rRzFQRKeWRIMIwRACAOI6x1+uNBlRpRNMIiAEAK8JJ 05QppZjWmmmtGQCAtZbCmRLOOQIACCFQCIFSSgzDEEdCGo1oZgJ6Jp6trS2ulGJpmvI8z/nKysph QMaYw/1STO6KaAAAPM87DGh7ext937dhGFopJa6urtqqI6oyoCPx9Pt9nmUZX15e5koprrXm1lpm rWWIyOI4pngqxDnHJEmAMYacc+ScoxDCSint7u6uDYLARlFkx0RUe0Ds2rVrQRRFn3qe93fO+UVE XKxgu6R6TxDxP4j4z4cPH3529epVNfzzM0fkGhD78ssv/2CtvckYW7fWgtYaEKdyyYE4YoyBEAI4 54CIt5VSf/7oo4/+O/IlpQ/cWQNiAADXrl0LFhYWNowx60mSQJZlZ9wceZGCIIA4jsHzvNsPHjz4 09WrVzM44/UiXnLfhx/PAQCiKPo0z/P1nZ0diqdBsiyDnZ0dyPP80tra2hUYWcPC+Gt5JyoT0DPX eRhjH+7t7dEpq4EQEfb29oAx9rdOp8O73S6H8SEdj+oIMeH+xl0kZP1+/3WKp7kQEQ4ODl7f39/n aZpip9NBAICNjY1xH/MZjDmlTRpQ4chH9SzL2mcdPJkNSqlzSZKINE1tv99HIQSur68X14yKLztx lpjkFDb2ImG/3+fGGLfRk9oZYyCKIhFFkVhYWPAGg4HX7/f51tYW73a7405nR0y6BnomnoODA6+i 74HUTCklDg4OxNOnT0Ucx16WZXxMRGOddgo78sYkSVhxhXlpaansJzgygxCR+b7ve55nfd83aZqa OI4hSRIQQuDwRjjCCWugiSPodrssTVOmtWbD2xM0A80Jz/P8LMuEUkqEYegppbzl5WWepilP05QN Z6HCkUllkkU0AwCWJAlTSjFrLSvubVX6XZDaaK2F7/ssz3PgnKPWGpVS3FprRx65cZuBhjtiw7vq vN1uU0BzwvM8YYzxgiDwtNZeu93m1lpmjGFa68PnucBhEX3IGMOGG+eISHfT5wAiciGEZ609fGKi +HXaeycOqFj/aK0n3jhpBmstR0RmreVSyuI1O3/+/KnvpdMQgeGZhCEiK+Kx1h5OGMcfRR5V5jrQ uJ2SORAEAUNEFoZh6feeaQ1E8cynYllS5vjSKYwAwNnPKBQQcUIBESdlH+eYGa+++ip0Oh1YW1uD KIqAsWYty4wxkCQJ3L9/H27dugX7+/t1D+lMGhnQO++8A2+99Vbdw3DieR4sLS3Bm2++CW+88Qbc vHkT7ty5U/ewSmvcKazT6TQ+nuOEEPD+++/D2tpa3UMprVEBtVotePvtt+sexlRwzuHdd9+texil NSqgixcvQhAEdQ9jas6fPw8rKyt1D6OURgXUtP+4Z/HKK6/UPYRSGhWQ7/t1D2HqpJR1D6GURgVE Zg8FRJxQQMRJIy8kjoOIoJQ6/Qtrxhh77jrnwoULoJSCfr8Pv/76K1hrX+DoypubgAaDAXzxxRd1 D+NU586dg48//vjEv798+TJcvnwZAAAePXoE169fhzRNX9TwSqNT2Ay7cOHCzF84pYBesHa73I8T mPXbGxTQC1b2WtasX/uigIgTCugFK/upatZ//tLcfAo7yQcffAALCwu17PvevXuj//wAAAA8ffq0 1Da2trYqHFH15j6gpaUlWF5ermXf4w5+mRklyzL4/vvvqxxS5eY+oKZ59OgR7O3twc7ODty+fXvm H3WlgGbMjz/+CD/99FPdw5gYLaKJEwqIOKGAiBMKiDihgIgTCog4oYCIEwqIOKGAiBMKiDihgIgT Cog4oYCIEwqIOKGAiBMKiDihgIgTCog4oYCIEwqIOKGAiBMKiDihgIgTCog4oYCIEwqIOKGAiBMK iDihgIgTCog4oYCIEwqIOKGAiJO5/wllu7u7YIypZd9JktSy3xdp7gP66quv6h7CXKNTGHFCAREn FBBxQgERJxQQcTI3n8La7TZ88skndQ/jVIyxuodQqbkJiDEGYRjWPYyXDp3CiBMKiDihgIiTRgWU ZVndQ5g6pVTdQyilUQH9/vvvdQ9h6pr2PTYqoLt37871LPT48WPY3t6uexilNCqgNE3h22+/rXsY U2GthW+++abuYZTWqIAAAH744YeZ/3dEy8rzHG7cuAG//PJL3UMprZEXEr/77ju4d+8edDodWFtb g3PnzjXuCq8xBp48eQL379+HW7duwZMnT+oe0pk0MiAAgN9++w1u3LhR9zBeeo07hZHZQgERJxQQ cUIBEQAAYIzhWd5XOiDP8/CsOyOzjXNe+rhOGhAFM8eyLEPGGKZpCgDlZqMzn8JoFpofw2OJjDFk jCHnHDnnKIRAIQSGYXjisZ44oDAMDzdY7KCS0ZPacc7tMBybpulhRI8fPz79vWV35nkecs7R8zxL s9B8YIxZrbXhnFvP82wxQUwySZQKSAiB29vbKISw/X6f4pkTxhjteZ4ZxmMHg4EdThIohMA4jotj /cwxnyQgBACM4xillMg5Ryml9X2/np9YQConhNBZlpk8z7Xv+0YIYaWUdnisT4wHoMQM1Ov1sFgH 7e7uWiGErWT0pHZaay2lzKWUOssyLaU0u7u7NgxDG4Yh9nq90XiOhHTazVQEgMPb3HEcY5qmFgAg SRKDiI27C06egVLKfDAYWEQ0Ukq7t7dnW62WlVKOnr7GKnMdCItZKIoi22q1DCItg5oOEUFrnUdR lLdaLZMkiWm1WiaKIru6umqHs0/x6xmTroGK33FjY8Ourq7aKIpslmWDir4PUhOlVNLv93WSJKbf 7+t2u/28eJ6JqOzzQAgA0Ov1oNvt2sFgcFdK2aHTWDMhIgwGg3txHOtisRyGIW5sbIyGU9kpbPQ1 9no91FpfT5IE6FTWPIgISZKAMeZfi4uLdnV11W5ubpqNjQ0LABaejWfsQfZK7vfIVPPaa69tRFH0 V2PMed/3gXO6ud8EWmtIkgSyLPv5zp07/+j1evrBgwfPi+XEGeKs557D9125cuWPUsp/c87XhRAg RGOfkn0paK1Baw3W2p+VUn/5/PPPHw7/alwkp55aXBcvDADgvffea1+6dOkKAHzIGLvIOV9w3C6Z AmvtE0S8i4jXNzc3P/v6669TOGWRfJpKAhr+ztfX1/n29rYfRZFQSgnf9/08z4UQwjfGeL7ve9Za joiseO/wNXEwck+yuBFq8zw3nueZPM91EAR5lmW63W5naZrmi4uLZnNzc3StA3CGeADc/6+M0QuN GIYhtlot0+/3IY5jPDg4gCAIUGttpZSeMcYDABYEAQegeKpURJTnuUVElFKaLMvM8HcdhqEeXuMp Hs84dYE8iaoWLAgArLhSrbVmUkqmtTZSSuCco9YajTFWSskRERCRUUDVKQISQqBSyiKiDYLA+L5v ENG0Wi2TZZmNosg+7+Zo6f26bgCOnsZYp9Ph+/v7fDAYeHEce0opT2vN2+02N8Zway2jeKZj9IEw z/PsYDCwwxujJkkS0263zeLioh1+VHda+xSqmIHG3S9DrbVNkgSWl5dRKcWzLOPWWlYENPzaCnZP AP7/zyoUARljMAxDK6W0u7u7NgiCk+5tOc1CVc0CR2ahbrfLtra2uFKKpWnKrbXMGMNWVlaY1poZ Y2j2mZLiGZ7t7W0sHv4bhoST3p4oo+qAites2+2yJElYmqZMKcW01kxrffh11lqKqGKjTxAWjx9L KTEMQ4zjGE+4MToTAR3f1uHH9CIkAIA0TSmaF6R4EH4kHICK4wGoNqDj25vkNZmOkyKpNB6A6R3M 49ulaOpT6aL5uGkfWApndtAjE4QQQgghFfkfLnfEbGu/P8gAAAAASUVORK5CYII= "
+       style="display:inline;image-rendering:optimizeQuality"
+       preserveAspectRatio="none"
+       height="28.697369"
+       width="28.697369" />
+  </g>
+</svg>
diff --git a/app/src/main/assets/ic_sony_wf_800n_left.svg b/app/src/main/assets/ic_sony_wf_800n_left.svg
new file mode 100644
index 000000000..d31ea351f
--- /dev/null
+++ b/app/src/main/assets/ic_sony_wf_800n_left.svg
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="12.321217mm"
+   height="12.3mm"
+   viewBox="0 0 12.321217 12.3"
+   version="1.1"
+   id="svg3988"
+   sodipodi:docname="ic_sony_wf_800n_right.svg"
+   inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview3990"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:document-units="mm"
+     showgrid="false"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     fit-margin-left="2"
+     fit-margin-right="2"
+     fit-margin-bottom="1"
+     fit-margin-top="1"
+     inkscape:zoom="10.248373"
+     inkscape:cx="5.7082231"
+     inkscape:cy="32.639327"
+     inkscape:window-width="1920"
+     inkscape:window-height="1035"
+     inkscape:window-x="0"
+     inkscape:window-y="45"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="layer1">
+    <sodipodi:guide
+       position="7.864604,2.6305704"
+       orientation="0,-1"
+       id="guide4472" />
+    <sodipodi:guide
+       position="3.8004999,2.3743318"
+       orientation="1,0"
+       id="guide14199" />
+  </sodipodi:namedview>
+  <defs
+     id="defs3985" />
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-81.704318,-153.92826)">
+    <path
+       id="path13615-2-5"
+       style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 90.053204,155.41797 c 0.02931,0.0131 0.05714,0.0295 0.0848,0.0455 0.02766,0.0164 0.05496,0.0328 0.08289,0.0508 0.02799,0.0164 0.05645,0.0373 0.08642,0.0583 0.02997,0.0196 0.06139,0.0436 0.09518,0.0681 0.02207,0.0164 0.044,0.0328 0.0658,0.0495 0.02174,0.0164 0.04347,0.0344 0.06498,0.0521 0.04298,0.0357 0.08533,0.0727 0.12676,0.11136 0.04143,0.0386 0.08204,0.0789 0.121557,0.12021 0.03952,0.0413 0.07795,0.0839 0.115234,0.12741 0.03725,0.0436 0.07328,0.0881 0.10789,0.13364 0.03458,0.0455 0.06778,0.0917 0.09933,0.13855 0.03162,0.0468 0.06155,0.0943 0.08974,0.14215 0.01416,0.0229 0.02766,0.0478 0.04097,0.0721 0.01317,0.0229 0.02602,0.0482 0.0381,0.0724 0.03162,0.0622 0.06037,0.12152 0.08675,0.17851 0.02635,0.057 0.05032,0.11169 0.07203,0.16475 0.02174,0.0531 0.04113,0.10482 0.05859,0.15624 0.0086,0.0262 0.0168,0.0511 0.0247,0.0763 0.0079,0.0262 0.01515,0.0508 0.02174,0.076 0.0069,0.0262 0.01317,0.0508 0.0191,0.0763 0.0059,0.0262 0.01153,0.0514 0.0168,0.0773 0.01021,0.0521 0.0191,0.10514 0.02635,0.16017 0.0076,0.055 0.0135,0.11202 0.01844,0.17163 0.0049,0.0596 0.0089,0.12218 0.01186,0.18801 0.0022,0.0488 0.0036,0.0963 0.0046,0.14248 7.51e-4,0.0465 8.43e-4,0.0917 5.6e-5,0.13593 -7.54e-4,0.0442 -0.0024,0.0878 -0.0049,0.13069 -0.0025,0.0429 -0.0059,0.0852 -0.01021,0.12709 -0.0043,0.0419 -0.0096,0.0835 -0.01581,0.12479 -0.0063,0.0413 -0.0135,0.0825 -0.02206,0.12414 -0.0086,0.0413 -0.01811,0.0829 -0.02898,0.12479 -0.01087,0.0419 -0.02272,0.0839 -0.03586,0.12676 -0.01317,0.0429 -0.02766,0.0861 -0.04341,0.13036 -0.01581,0.0442 -0.03293,0.0891 -0.05141,0.13495 -0.01844,0.0459 -0.03847,0.093 -0.05987,0.1415 -0.02141,0.0485 -0.04426,0.0979 -0.0687,0.14936 -0.02437,0.0511 -0.05045,0.10383 -0.07809,0.15853 -0.02766,0.0544 -0.05684,0.1107 -0.0878,0.16901 -0.03096,0.0583 -0.06359,0.11857 -0.09801,0.18113 -0.03441,0.0626 -0.07061,0.12741 -0.10868,0.19488 -0.05572,0.0957 -0.111084,0.18932 -0.165984,0.28136 -0.0549,0.092 -0.109405,0.18211 -0.163481,0.27022 -0.05408,0.0884 -0.107725,0.17491 -0.160978,0.25942 -0.05325,0.0848 -0.106112,0.1677 -0.158542,0.24893 -0.05243,0.0812 -0.104464,0.16049 -0.156104,0.23812 -0.05161,0.0776 -0.10285,0.15362 -0.153634,0.22764 -0.05078,0.074 -0.101171,0.14674 -0.151131,0.21749 -0.04999,0.0708 -0.09956,0.13986 -0.148694,0.20733 -0.04914,0.0675 -0.09788,0.13331 -0.146191,0.19718 -0.04831,0.0642 -0.0963,0.12676 -0.14382,0.18736 -0.04752,0.0609 -0.09462,0.11988 -0.141317,0.17752 -0.0024,0.003 -0.0046,0.007 -0.0069,0.01 0.194966,-0.0262 0.968613,-0.71204 1.37172,-1.21583 0.923471,-1.15403 1.396852,-2.52066 1.255554,-3.62461 -0.129197,-1.00932 -0.579152,-1.83344 -1.415251,-2.59196 -0.207579,-0.18834 -0.2305,-0.16312 -0.290933,-0.14445 -0.207085,0.12512 -0.230764,0.11464 -0.09106,0.19161 z"
+       sodipodi:nodetypes="cssscssssssssssssssssssssssssssssssssssscsssssssssssccsscc" />
+    <path
+       style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 86.308307,159.96828 c -0.280855,-0.0131 -0.311286,0.0341 -0.517248,-0.1569 -0.193417,-0.20831 -0.23903,-0.30494 -0.241072,-0.49305 -0.0022,-0.19521 0.0063,-0.21814 0.172406,-0.61528 0.355002,-0.84882 0.780135,-1.7003 0.978905,-1.96057 0.297882,-0.39006 0.724197,-0.67506 1.20233,-0.8217 0.35981,-0.11038 0.97706,-0.0943 1.363049,0.0357 1.222855,0.41159 1.877382,1.7234 1.473514,2.95321 -0.236659,0.72069 -0.614698,1.11099 -1.05809,1.11099 z"
+       id="path3272-6-9"
+       sodipodi:nodetypes="ccsssssscc" />
+    <path
+       id="rect20090-0-9"
+       style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000"
+       d="m 86.064192,159.50015 3.333695,0.0593 c 0.126299,0.002 0.22803,0.1035 0.22803,0.2319 0,0.12839 -0.101731,0.23419 -0.22803,0.2319 l -3.333695,-0.0593 c -0.126299,-0.002 -0.22803,-0.1035 -0.22803,-0.2319 0,-0.12839 0.101731,-0.23419 0.22803,-0.2319 z"
+       sodipodi:nodetypes="sssssss" />
+    <path
+       style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 85.781713,164.92823 c -0.544003,-0.11398 -1.161783,-0.52357 -1.464372,-0.97067 -0.461748,-0.6823 -0.575563,-1.39958 -0.359006,-2.26249 0.387889,-1.54563 1.513636,-4.33537 2.110287,-5.22959 0.426503,-0.63919 0.999207,-1.06208 1.729794,-1.27731 0.247791,-0.073 0.479065,-0.10252 0.845307,-0.10973 0.21242,-0.003 0.568742,0.0328 0.906948,0.15067 0.423124,0.14609 0.557855,0.19948 0.828076,0.39715 0.353286,0.25613 0.686884,0.63179 0.882416,1.01829 0.252204,0.49858 0.341154,0.81253 0.364829,1.34023 0.03501,0.78057 -0.102357,1.2234 -0.71112,2.30065 -0.873758,1.45714 -1.067488,1.7511 -2.066729,2.97611 -0.202375,0.25974 -0.548646,0.65597 -0.7695,0.88076 -0.324657,0.33039 -0.456002,0.43543 -0.685867,0.54856 -0.521335,0.25647 -1.10744,0.34297 -1.611063,0.23747 z"
+       id="path5762-6-0"
+       sodipodi:nodetypes="ssssssccssccsss" />
+    <g
+       aria-label="L"
+       id="text6720"
+       style="font-size:3.175px;font-family:Sans;-inkscape-font-specification:Sans;letter-spacing:0px;word-spacing:0px;stroke:#000000;stroke-width:0.264583px"
+       transform="translate(-1.0010411,0.02155759)">
+      <g
+         id="path14201">
+        <path
+           style="color:#000000;-inkscape-font-specification:Sans;fill:#000000;stroke:none;-inkscape-stroke:none"
+           d="m 86.637918,161.02382 h 0.313159 v 2.05104 h 1.127063 v 0.26355 h -1.440222 z"
+           id="path14206" />
+        <path
+           style="color:#000000;-inkscape-font-specification:Sans;fill:#000000;stroke:none;-inkscape-stroke:none"
+           d="m 86.505859,160.89062 v 0.13282 2.44726 h 1.705078 v -0.52734 h -1.126953 v -2.05274 z m 0.263672,0.26563 h 0.04883 v 2.05078 h -0.04883 z"
+           id="path14208" />
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/app/src/main/assets/ic_sony_wf_800n_right.svg b/app/src/main/assets/ic_sony_wf_800n_right.svg
new file mode 100644
index 000000000..c987dbe93
--- /dev/null
+++ b/app/src/main/assets/ic_sony_wf_800n_right.svg
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="12.321217mm"
+   height="12.3mm"
+   viewBox="0 0 12.321217 12.3"
+   version="1.1"
+   id="svg3988"
+   inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)"
+   sodipodi:docname="ic_sony_wf_800n_left.svg"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview3990"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:document-units="mm"
+     showgrid="false"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     fit-margin-left="2"
+     fit-margin-right="2"
+     fit-margin-bottom="1"
+     fit-margin-top="1"
+     inkscape:zoom="28.986776"
+     inkscape:cx="25.201147"
+     inkscape:cy="32.44583"
+     inkscape:window-width="1920"
+     inkscape:window-height="1035"
+     inkscape:window-x="0"
+     inkscape:window-y="45"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="layer1">
+    <sodipodi:guide
+       position="8.0623995,2.7429643"
+       orientation="0,-1"
+       id="guide4472" />
+    <sodipodi:guide
+       position="4.9027758,5.5559637"
+       orientation="1,0"
+       id="guide14199" />
+  </sodipodi:namedview>
+  <defs
+     id="defs3985" />
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-81.704318,-153.92826)">
+    <g
+       aria-label="R"
+       id="text19879"
+       style="font-size:3.175px;font-family:Sans;-inkscape-font-specification:Sans;letter-spacing:0px;word-spacing:0px;stroke:#000000;stroke-width:0.264583px"
+       transform="translate(0.9003844,-0.00688411)">
+      <g
+         id="path20419">
+        <path
+           style="color:#000000;-inkscape-font-specification:Sans;fill:#000000;stroke:none;-inkscape-stroke:none"
+           d="m 88.752478,162.27504 q 0.100769,0.0341 0.195337,0.14573 0.09612,0.11162 0.192236,0.30696 l 0.31781,0.63251 h -0.336413 l -0.296106,-0.59376 q -0.114722,-0.23254 -0.223242,-0.30851 -0.106971,-0.076 -0.293006,-0.076 H 87.96803 v 0.97823 h -0.313159 v -2.31458 h 0.706933 q 0.396875,0 0.592212,0.16588 0.195337,0.16588 0.195337,0.50074 0,0.21859 -0.102319,0.36277 -0.100769,0.14418 -0.294556,0.19999 z m -0.784448,-0.97203 v 0.82165 h 0.393774 q 0.226343,0 0.341065,-0.10387 0.116272,-0.10542 0.116272,-0.30851 0,-0.20309 -0.116272,-0.3054 -0.114722,-0.10387 -0.341065,-0.10387 z"
+           id="path20424" />
+        <path
+           style="color:#000000;-inkscape-font-specification:Sans;fill:#000000;stroke:none;-inkscape-stroke:none"
+           d="m 87.523437,160.91406 v 2.57813 h 0.576172 v -0.97852 h 0.208985 c 0.106008,0 0.175,0.023 0.216797,0.0527 0.03834,0.0268 0.109953,0.1125 0.18164,0.25781 v 0.002 l 0.332031,0.66602 h 0.632813 l -0.414063,-0.82227 v -0.002 c -0.06683,-0.13558 -0.13491,-0.24575 -0.208984,-0.33203 -0.02289,-0.027 -0.05326,-0.036 -0.07813,-0.0586 0.06187,-0.0418 0.140739,-0.0643 0.183594,-0.125 0.08647,-0.12185 0.126953,-0.27308 0.126953,-0.43945 0,-0.24896 -0.07849,-0.46255 -0.242188,-0.60156 -0.163919,-0.1392 -0.39472,-0.19727 -0.677734,-0.19727 z m 0.263672,0.26367 h 0.04883 v 0.125 0.94727 0.008 0.97071 h -0.04883 z m 0.710938,0.0371 c 0.148175,0.0194 0.300592,0.0378 0.371094,0.0977 0.09675,0.0822 0.148437,0.20287 0.148437,0.40039 0,0.12509 -0.02817,0.21477 -0.07813,0.28516 V 162 c -0.03013,0.0431 -0.08781,0.0643 -0.136719,0.0918 0.0941,-0.098 0.148438,-0.22921 0.148438,-0.37891 0,-0.15997 -0.051,-0.3074 -0.160156,-0.4043 -0.07397,-0.067 -0.186918,-0.0752 -0.292969,-0.0937 z m -0.398438,0.22071 h 0.261719 c 0.130659,0 0.207561,0.0301 0.251953,0.0703 h 0.002 c 0.04492,0.0395 0.07227,0.0969 0.07227,0.20703 0,0.11015 -0.02802,0.1671 -0.07422,0.20898 -0.04439,0.0402 -0.121294,0.0703 -0.251953,0.0703 h -0.261719 z m 0.632813,0.70312 c -0.0069,0.002 -0.0083,0.008 -0.01563,0.01 l -0.0957,0.0273 v 0.1582 c -0.08301,-0.0446 -0.176683,-0.0726 -0.283203,-0.0762 h 0.02344 c 0.147723,0 0.267887,-0.0478 0.371094,-0.11914 z m -0.01172,0.26953 c 0.03608,0.0144 0.07838,0.0403 0.126953,0.0977 v 0.002 c 0.05341,0.062 0.113057,0.15579 0.173828,0.2793 l 0.222657,0.44141 h -0.04102 l -0.259766,-0.52149 c -0.06801,-0.13786 -0.140605,-0.22429 -0.222656,-0.29883 z"
+           id="path20426" />
+      </g>
+    </g>
+    <path
+       id="path13615-2-5"
+       style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 85.676646,155.41797 c -0.02931,0.0131 -0.05714,0.0295 -0.0848,0.0455 -0.02766,0.0164 -0.05496,0.0328 -0.08289,0.0508 -0.02799,0.0164 -0.05645,0.0373 -0.08642,0.0583 -0.02997,0.0196 -0.06139,0.0436 -0.09518,0.0681 -0.02207,0.0164 -0.044,0.0328 -0.0658,0.0495 -0.02174,0.0164 -0.04347,0.0344 -0.06498,0.0521 -0.04298,0.0357 -0.08533,0.0727 -0.12676,0.11136 -0.04143,0.0386 -0.08204,0.0789 -0.121557,0.12021 -0.03952,0.0413 -0.07795,0.0839 -0.115234,0.12741 -0.03725,0.0436 -0.07328,0.0881 -0.10789,0.13364 -0.03458,0.0455 -0.06778,0.0917 -0.09933,0.13855 -0.03162,0.0468 -0.06155,0.0943 -0.08974,0.14215 -0.01416,0.0229 -0.02766,0.0478 -0.04097,0.0721 -0.01317,0.0229 -0.02602,0.0482 -0.0381,0.0724 -0.03162,0.0622 -0.06037,0.12152 -0.08675,0.17851 -0.02635,0.057 -0.05032,0.11169 -0.07203,0.16475 -0.02174,0.0531 -0.04113,0.10482 -0.05859,0.15624 -0.0086,0.0262 -0.0168,0.0511 -0.0247,0.0763 -0.0079,0.0262 -0.01515,0.0508 -0.02174,0.076 -0.0069,0.0262 -0.01317,0.0508 -0.0191,0.0763 -0.0059,0.0262 -0.01153,0.0514 -0.0168,0.0773 -0.01021,0.0521 -0.0191,0.10514 -0.02635,0.16017 -0.0076,0.055 -0.0135,0.11202 -0.01844,0.17163 -0.0049,0.0596 -0.0089,0.12218 -0.01186,0.18801 -0.0022,0.0488 -0.0036,0.0963 -0.0046,0.14248 -7.51e-4,0.0465 -8.43e-4,0.0917 -5.6e-5,0.13593 7.54e-4,0.0442 0.0024,0.0878 0.0049,0.13069 0.0025,0.0429 0.0059,0.0852 0.01021,0.12709 0.0043,0.0419 0.0096,0.0835 0.01581,0.12479 0.0063,0.0413 0.0135,0.0825 0.02206,0.12414 0.0086,0.0413 0.01811,0.0829 0.02898,0.12479 0.01087,0.0419 0.02272,0.0839 0.03586,0.12676 0.01317,0.0429 0.02766,0.0861 0.04341,0.13036 0.01581,0.0442 0.03293,0.0891 0.05141,0.13495 0.01844,0.0459 0.03847,0.093 0.05987,0.1415 0.02141,0.0485 0.04426,0.0979 0.0687,0.14936 0.02437,0.0511 0.05045,0.10383 0.07809,0.15853 0.02766,0.0544 0.05684,0.1107 0.0878,0.16901 0.03096,0.0583 0.06359,0.11857 0.09801,0.18113 0.03441,0.0626 0.07061,0.12741 0.10868,0.19488 0.05572,0.0957 0.111084,0.18932 0.165984,0.28136 0.0549,0.092 0.109405,0.18211 0.163481,0.27022 0.05408,0.0884 0.107725,0.17491 0.160978,0.25942 0.05325,0.0848 0.106112,0.1677 0.158542,0.24893 0.05243,0.0812 0.104464,0.16049 0.156104,0.23812 0.05161,0.0776 0.10285,0.15362 0.153634,0.22764 0.05078,0.074 0.101171,0.14674 0.151131,0.21749 0.04999,0.0708 0.09956,0.13986 0.148694,0.20733 0.04914,0.0675 0.09788,0.13331 0.146191,0.19718 0.04831,0.0642 0.0963,0.12676 0.14382,0.18736 0.04752,0.0609 0.09462,0.11988 0.141317,0.17752 0.0024,0.003 0.0046,0.007 0.0069,0.01 -0.194966,-0.0262 -0.968613,-0.71204 -1.37172,-1.21583 -0.923471,-1.15403 -1.396852,-2.52066 -1.255554,-3.62461 0.129197,-1.00932 0.579152,-1.83344 1.415251,-2.59196 0.207579,-0.18834 0.2305,-0.16312 0.290933,-0.14445 0.207085,0.12512 0.230764,0.11464 0.09106,0.19161 z"
+       sodipodi:nodetypes="cssscssssssssssssssssssssssssssssssssssscsssssssssssccsscc" />
+    <path
+       style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 89.421543,159.96828 c 0.280855,-0.0131 0.311286,0.0341 0.517248,-0.1569 0.193417,-0.20831 0.23903,-0.30494 0.241072,-0.49305 0.0022,-0.19521 -0.0063,-0.21814 -0.172406,-0.61528 -0.355002,-0.84882 -0.780135,-1.7003 -0.978905,-1.96057 -0.297882,-0.39006 -0.724197,-0.67506 -1.20233,-0.8217 -0.35981,-0.11038 -0.97706,-0.0943 -1.363049,0.0357 -1.222855,0.41159 -1.877382,1.7234 -1.473514,2.95321 0.236659,0.72069 0.614698,1.11099 1.05809,1.11099 z"
+       id="path3272-6-9"
+       sodipodi:nodetypes="ccsssssscc" />
+    <path
+       id="rect20090-0-9"
+       style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000"
+       d="m 89.665658,159.50015 -3.333695,0.0593 c -0.126299,0.002 -0.22803,0.1035 -0.22803,0.2319 0,0.12839 0.101731,0.23419 0.22803,0.2319 l 3.333695,-0.0593 c 0.126299,-0.002 0.22803,-0.1035 0.22803,-0.2319 0,-0.12839 -0.101731,-0.23419 -0.22803,-0.2319 z"
+       sodipodi:nodetypes="sssssss" />
+    <path
+       style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 89.948137,164.92823 c 0.544003,-0.11398 1.161783,-0.52357 1.464372,-0.97067 0.461748,-0.6823 0.575563,-1.39958 0.359006,-2.26249 -0.387889,-1.54563 -1.513636,-4.33537 -2.110287,-5.22959 -0.426503,-0.63919 -0.999207,-1.06208 -1.729794,-1.27731 -0.247791,-0.073 -0.479065,-0.10252 -0.845307,-0.10973 -0.21242,-0.003 -0.568742,0.0328 -0.906948,0.15067 -0.423124,0.14609 -0.557855,0.19948 -0.828076,0.39715 -0.353286,0.25613 -0.686884,0.63179 -0.882416,1.01829 -0.252204,0.49858 -0.341154,0.81253 -0.364829,1.34023 -0.03501,0.78057 0.102357,1.2234 0.71112,2.30065 0.873758,1.45714 1.067488,1.7511 2.066729,2.97611 0.202375,0.25974 0.548646,0.65597 0.7695,0.88076 0.324657,0.33039 0.456002,0.43543 0.685867,0.54856 0.521335,0.25647 1.10744,0.34297 1.611063,0.23747 z"
+       id="path5762-6-0"
+       sodipodi:nodetypes="ssssssccssccsss" />
+  </g>
+</svg>
diff --git a/app/src/main/assets/sony_800n.svg b/app/src/main/assets/sony_800n.svg
new file mode 100644
index 000000000..9811d475e
--- /dev/null
+++ b/app/src/main/assets/sony_800n.svg
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="75.157791mm"
+   height="91.070755mm"
+   viewBox="0 0 75.157791 91.070755"
+   version="1.1"
+   id="svg5"
+   inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)"
+   sodipodi:docname="sony_800n.svg"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview7"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:document-units="mm"
+     showgrid="false"
+     inkscape:zoom="0.90583672"
+     inkscape:cx="7.1756861"
+     inkscape:cy="221.34232"
+     inkscape:window-width="1920"
+     inkscape:window-height="1035"
+     inkscape:window-x="0"
+     inkscape:window-y="45"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="layer1" />
+  <defs
+     id="defs2" />
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-77.71272,-89.542777)">
+    <path
+       id="path13615"
+       style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 135.66527,92.903517 c 0.27135,0.13426 0.53173,0.27201 0.7891,0.41755 0.25737,0.14554 0.51166,0.2989 0.77153,0.46353 0.25987,0.16464 0.52522,0.34072 0.80408,0.53227 0.27886,0.19155 0.57139,0.39849 0.88574,0.62477 0.20548,0.14663 0.4094,0.29769 0.61236,0.45268 0.20297,0.155 0.4046,0.31412 0.60462,0.47698 0.40003,0.32571 0.79411,0.6664 1.17977,1.02061 0.38566,0.35421 0.76333,0.72195 1.1312,1.10071 0.36786,0.37876 0.72564,0.76852 1.07228,1.16788 0.34664,0.399359 0.68209,0.808199 1.00408,1.224223 0.32198,0.41601 0.63058,0.83942 0.92449,1.26814 0.2939,0.42871 0.57269,0.86271 0.83509,1.30018 0.13119,0.21873 0.25869,0.43817 0.38137,0.65835 0.12268,0.22019 0.24077,0.44084 0.3545,0.66198 0.2934,0.57048 0.56166,1.11292 0.80719,1.634 0.24552,0.52109 0.4684,1.02093 0.67024,1.50792 0.20184,0.48699 0.38286,0.96066 0.54519,1.42886 0.0812,0.23409 0.15736,0.46691 0.22944,0.69918 0.0721,0.23227 0.1401,0.46424 0.2036,0.6966 0.0635,0.23235 0.12283,0.46534 0.17829,0.6997 0.0555,0.23435 0.10709,0.47021 0.15503,0.70848 0.0959,0.47653 0.17707,0.9624 0.24598,1.46606 0.0689,0.50366 0.12543,1.02488 0.17156,1.57096 0.0461,0.54609 0.082,1.11753 0.10956,1.72135 0.0204,0.44657 0.0346,0.88054 0.0419,1.30482 0.007,0.42429 0.008,0.8385 5.1e-4,1.24489 -0.007,0.40639 -0.022,0.80498 -0.045,1.19786 -0.023,0.39288 -0.0544,0.78 -0.0946,1.16375 -0.0402,0.38375 -0.0895,0.76407 -0.14831,1.14309 -0.0588,0.37901 -0.12693,0.75667 -0.20567,1.13533 -0.0787,0.37865 -0.16812,0.75833 -0.2682,1.14101 -0.10008,0.38269 -0.21104,0.76852 -0.33383,1.15962 -0.12279,0.39111 -0.25722,0.78775 -0.40411,1.19166 -0.14688,0.40391 -0.30617,0.81501 -0.47852,1.2361 -0.17236,0.4211 -0.35788,0.85183 -0.55707,1.2945 -0.1992,0.44266 -0.41182,0.89769 -0.63924,1.36632 -0.22742,0.46863 -0.46955,0.95107 -0.72657,1.45004 -0.25702,0.49898 -0.52901,1.01401 -0.817,1.54771 -0.288,0.5337 -0.59174,1.08599 -0.9121,1.65881 -0.32035,0.57283 -0.65722,1.16651 -1.0113,1.78284 -0.51856,0.87562 -1.03369,1.73426 -1.54461,2.57607 -0.51092,0.84181 -1.01808,1.66687 -1.52136,2.4753 -0.50327,0.80843 -1.00246,1.60008 -1.4981,2.37557 -0.49564,0.77548 -0.98736,1.5344 -1.47536,2.27738 -0.488,0.74297 -0.97226,1.46985 -1.45262,2.18074 -0.48037,0.7109 -0.95716,1.4059 -1.42989,2.08515 -0.47273,0.67925 -0.94154,1.34305 -1.40663,1.99109 -0.4651,0.64804 -0.92644,1.2803 -1.3839,1.89756 -0.45746,0.61726 -0.91081,1.21918 -1.36064,1.80609 -0.44982,0.58691 -0.89622,1.15918 -1.33842,1.71617 -0.44219,0.557 -0.8806,1.09875 -1.31516,1.62626 -0.0219,0.0266 -0.0432,0.051 -0.0651,0.0775 1.81453,-0.25165 9.01417,-6.51807 12.76563,-11.12956 8.5941,-10.56399 12.99952,-23.07404 11.68456,-33.17953 -1.20223,-9.23918 -5.38978,-16.783353 -13.17077,-23.726723 -1.93172,-1.72377 -2.14508,-1.49298 -2.70733,-1.32291 -1.92707,1.14579 -2.14761,1.048007 -0.84748,1.75253 z"
+       sodipodi:nodetypes="cssscssssssssssssssssssssssssssssssssssscsssssssssssccsscc" />
+    <path
+       style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 100.81415,134.55672 c -2.613864,-0.11093 -2.896844,0.31251 -4.813676,-1.43755 -1.8001,-1.90704 -2.224465,-2.79101 -2.24341,-4.51313 -0.01966,-1.78671 0.0581,-1.99561 1.60434,-5.63226 3.30378,-7.77016 7.260176,-15.56447 9.109986,-17.94715 2.77204,-3.57059 6.7396,-6.179423 11.18926,-7.521773 3.34849,-1.01016 9.09281,-0.86199 12.68493,0.32721 11.38024,3.767503 17.47147,15.775673 13.71295,27.033553 -2.20249,6.59712 -5.72057,10.16997 -9.8469,10.16997 z"
+       id="path3272"
+       sodipodi:nodetypes="ccsssssscc" />
+    <path
+       style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.377953;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000"
+       id="path16756"
+       sodipodi:type="arc"
+       sodipodi:cx="97.313911"
+       sodipodi:cy="141.57806"
+       sodipodi:rx="1.5739406"
+       sodipodi:ry="1.5739406"
+       sodipodi:start="0.57990659"
+       sodipodi:end="0.54828965"
+       sodipodi:arc-type="arc"
+       d="m 98.630535,142.4405 a 1.5739406,1.5739406 0 0 1 -2.168624,0.46096 1.5739406,1.5739406 0 0 1 -0.478091,-2.16491 1.5739406,1.5739406 0 0 1 2.161065,-0.49519 1.5739406,1.5739406 0 0 1 0.512255,2.15709"
+       sodipodi:open="true" />
+    <path
+       id="rect20090"
+       style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000"
+       d="m 98.542336,130.27149 31.024354,0.54286 c 1.17552,0.0206 2.12219,0.94649 2.12219,2.12218 0,1.1757 -0.94667,2.14276 -2.12219,2.12219 l -31.024354,-0.54286 c -1.175513,-0.0206 -2.122189,-0.94649 -2.122189,-2.12219 0,-1.17569 0.946676,-2.14275 2.122189,-2.12218 z"
+       sodipodi:nodetypes="sssssss" />
+    <path
+       style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 95.913493,179.95992 c -5.06264,-1.04405 -10.8119,-4.79262 -13.62787,-8.88549 -4.297169,-6.24572 -5.356359,-12.81158 -3.341019,-20.71068 3.609809,-14.14857 14.086349,-39.6859 19.638949,-47.87138 3.969187,-5.851261 9.298937,-9.722411 16.097997,-11.692431 2.30613,-0.6682 4.45831,-0.93852 7.86666,-1.00422 1.97685,-0.03811 5.29289,0.29142 8.44033,1.37883 3.93773,1.33876 5.19157,1.825243 7.70631,3.635523 3.28778,2.34611 6.39237,5.783278 8.21204,9.321468 2.34718,4.56389 3.17486,7.43793 3.3952,12.26847 0.32592,7.14516 -0.95256,11.19873 -6.6179,21.05994 -8.13144,13.33839 -9.93436,16.02958 -19.23356,27.24303 -1.88331,2.37684 -5.10587,6.0049 -7.16123,8.06236 -3.02143,3.0245 -4.24368,3.98612 -6.38286,5.02178 -4.8517,2.34889 -10.30616,3.13935 -14.993047,2.1728 z"
+       id="path5762"
+       sodipodi:nodetypes="ssssssccssccsss" />
+  </g>
+</svg>
diff --git a/app/src/main/assets/sony_800n_case.svg b/app/src/main/assets/sony_800n_case.svg
new file mode 100644
index 000000000..3fd7343f1
--- /dev/null
+++ b/app/src/main/assets/sony_800n_case.svg
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="12.321217mm"
+   height="12.3mm"
+   viewBox="0 0 12.321217 12.3"
+   version="1.1"
+   id="svg3988"
+   inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)"
+   sodipodi:docname="sony_800n_case.svg"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview3990"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:document-units="mm"
+     showgrid="false"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     fit-margin-left="2"
+     fit-margin-right="2"
+     fit-margin-bottom="1"
+     fit-margin-top="1"
+     inkscape:zoom="10.248373"
+     inkscape:cx="27.662928"
+     inkscape:cy="19.076199"
+     inkscape:window-width="1920"
+     inkscape:window-height="1035"
+     inkscape:window-x="0"
+     inkscape:window-y="45"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="layer1">
+    <sodipodi:guide
+       position="14.349871,-1.5160295"
+       orientation="0,-1"
+       id="guide4472" />
+    <sodipodi:guide
+       position="-3.9933874,14.528046"
+       orientation="1,0"
+       id="guide14199" />
+  </sodipodi:namedview>
+  <defs
+     id="defs3985" />
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-81.704318,-153.92826)">
+    <g
+       id="g26612"
+       transform="matrix(0.10330033,0,0,0.09696175,75.13823,137.28434)"
+       style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:4.99595;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1">
+      <path
+         style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:4.99595;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 72.96681,225.65437 c 0.223576,0.58263 2.250534,1.71014 4.308817,2.39697 2.122774,0.70836 5.258828,1.34722 8.366393,1.70453 2.48165,0.28534 37.1587,1.1115 37.1587,1.1115 h 3.21119 c 0,0 34.67708,-0.82616 37.15873,-1.1115 3.10756,-0.35731 6.24361,-0.99617 8.36639,-1.70453 2.05828,-0.68683 4.08524,-1.81434 4.30882,-2.39697"
+         id="path23413"
+         sodipodi:nodetypes="cssccssc" />
+      <path
+         style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:4.99595;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 116.98218,265.2035 c -12.08548,-0.56413 -19.153432,-1.85996 -24.277133,-4.45093 -9.494531,-4.80122 -16.040643,-14.2392 -18.553206,-26.74943 -0.997929,-4.96876 -1.79383,-13.53037 -1.363114,-14.66323 1.002805,-2.63759 7.912285,-7.1158 15.890039,-10.29877 5.230526,-2.08687 12.919394,-3.81264 21.636084,-4.85622 5.58344,-0.66846 22.56789,-0.66846 28.15133,0 8.59247,1.02871 16.20658,2.72438 21.46386,4.78001 7.8805,3.08133 15.05476,7.72504 16.07321,10.40376 0.27311,0.71833 -0.11096,6.58993 -0.70631,10.79799 -1.49912,10.59604 -5.14752,18.6992 -11.07883,24.60625 -7.38953,7.3593 -14.41912,9.57903 -33.08072,10.44589 -6.13715,0.28508 -7.75734,0.28333 -14.15521,-0.0153 z"
+         id="path21760" />
+    </g>
+  </g>
+</svg>
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/coordinators/SonyWFSP800NCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/coordinators/SonyWFSP800NCoordinator.java
index 806f39e31..d021ab7c4 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/coordinators/SonyWFSP800NCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/coordinators/SonyWFSP800NCoordinator.java
@@ -53,9 +53,9 @@ public class SonyWFSP800NCoordinator extends SonyHeadphonesCoordinator {
 
     @Override
     public BatteryConfig[] getBatteryConfig() {
-        final BatteryConfig battery1 = new BatteryConfig(0, R.drawable.ic_tws_case, R.string.battery_case);
-        final BatteryConfig battery2 = new BatteryConfig(1, R.drawable.ic_galaxy_buds_l, R.string.left_earbud);
-        final BatteryConfig battery3 = new BatteryConfig(2, R.drawable.ic_galaxy_buds_r, R.string.right_earbud);
+        final BatteryConfig battery1 = new BatteryConfig(0, R.drawable.ic_sony_wf_800n_case, R.string.battery_case);
+        final BatteryConfig battery2 = new BatteryConfig(1, R.drawable.ic_sony_wf_800n_left, R.string.left_earbud);
+        final BatteryConfig battery3 = new BatteryConfig(2, R.drawable.ic_sony_wf_800n_right, R.string.right_earbud);
 
         return new BatteryConfig[]{battery1, battery2, battery3};
     }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java
index 841a9161b..0008e557c 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java
@@ -106,7 +106,7 @@ public enum DeviceType {
     GALAXY_BUDS_LIVE(419, R.drawable.ic_device_galaxy_buds_live, R.drawable.ic_device_galaxy_buds_live_disabled, R.string.devicetype_galaxybuds_live),
     GALAXY_BUDS(420, R.drawable.ic_device_galaxy_buds, R.drawable.ic_device_galaxy_buds_disabled, R.string.devicetype_galaxybuds),
     SONY_WH_1000XM3(430, R.drawable.ic_device_headphones, R.drawable.ic_device_headphones_disabled, R.string.devicetype_sony_wh_1000xm3),
-    SONY_WF_SP800N(431, R.drawable.ic_device_galaxy_buds, R.drawable.ic_device_galaxy_buds_disabled, R.string.devicetype_sony_wf_sp800n),
+    SONY_WF_SP800N(431, R.drawable.ic_device_sony_wf_800n, R.drawable.ic_device_sony_wf_800n_disabled, R.string.devicetype_sony_wf_sp800n),
     SONY_WH_1000XM4(432, R.drawable.ic_device_headphones, R.drawable.ic_device_headphones_disabled, R.string.devicetype_sony_wh_1000xm4),
     BOSE_QC35(440, R.drawable.ic_device_headphones, R.drawable.ic_device_headphones_disabled, R.string.devicetype_bose_qc35),
     VESC_NRF(500, R.drawable.ic_device_vesc, R.drawable.ic_device_vesc_disabled, R.string.devicetype_vesc),
diff --git a/app/src/main/res/drawable/ic_device_sony_wf_800n.xml b/app/src/main/res/drawable/ic_device_sony_wf_800n.xml
new file mode 100644
index 000000000..3eb7be41e
--- /dev/null
+++ b/app/src/main/res/drawable/ic_device_sony_wf_800n.xml
@@ -0,0 +1,14 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="28.740126dp" android:height="28.740126dp" android:viewportWidth="28.740126" android:viewportHeight="28.740126">
+    <path android:pathData="M3.871 3.877h20.925a0.947 0.947 0 0 1 0.948 0.947v20.01a0.947 0.947 0 0 1-0.948 0.948H3.871a0.947 0.947 0 0 1-0.947-0.948V4.824a0.947 0.947 0 0 1 0.947-0.947z" android:strokeWidth="3.57115" android:fillColor="#1f7fdb"/>
+    <path android:pathData="M3.879 3.035h20.925a0.947 0.947 0 0 1 0.947 0.947v20.01a0.947 0.947 0 0 1-0.947 0.948H3.88a0.947 0.947 0 0 1-0.947-0.948V3.982A0.947 0.947 0 0 1 3.88 3.035z" android:strokeWidth="3.57115" android:fillColor="#4dabf5"/>
+    <path android:pathData="M3.871 3.413h20.925a0.947 0.947 0 0 1 0.948 0.947v20.01a0.947 0.947 0 0 1-0.948 0.948H3.871a0.947 0.947 0 0 1-0.947-0.948V4.36A0.947 0.947 0 0 1 3.87 3.413z" android:strokeWidth="3.57115" android:fillColor="#2196f3"/>
+    <path android:pathData="M7.291 6.092L7.194 6.145C7.162 6.163 7.13 6.183 7.099 6.203l-0.1 0.067L6.89 6.35 6.815 6.405 6.74 6.466C6.691 6.507 6.642 6.55 6.595 6.595 6.547 6.64 6.5 6.685 6.455 6.734 6.41 6.78 6.365 6.83 6.323 6.88 6.28 6.93 6.24 6.983 6.2 7.035c-0.04 0.053-0.078 0.106-0.114 0.16C6.05 7.25 6.015 7.304 5.982 7.36L5.935 7.442C5.92 7.47 5.905 7.498 5.892 7.526c-0.037 0.071-0.07 0.14-0.1 0.206-0.03 0.065-0.058 0.128-0.083 0.19-0.025 0.061-0.047 0.12-0.067 0.18-0.01 0.03-0.02 0.059-0.028 0.088-0.01 0.03-0.017 0.058-0.025 0.088L5.567 8.366l-0.02 0.09c-0.011 0.06-0.021 0.12-0.03 0.184-0.008 0.063-0.015 0.13-0.02 0.198-0.007 0.069-0.01 0.14-0.014 0.217L5.477 9.219v0.157C5.478 9.428 5.48 9.478 5.483 9.527c0.003 0.05 0.007 0.099 0.012 0.147C5.5 9.722 5.505 9.77 5.513 9.818 5.52 9.866 5.529 9.914 5.538 9.961l0.033 0.144 0.042 0.146c0.015 0.05 0.031 0.1 0.05 0.15 0.018 0.051 0.037 0.103 0.059 0.156 0.02 0.053 0.044 0.108 0.068 0.163l0.079 0.173c0.028 0.059 0.058 0.12 0.09 0.182 0.031 0.063 0.065 0.128 0.1 0.196l0.113 0.209 0.125 0.224 0.19 0.325 0.188 0.312 0.184 0.3 0.182 0.287 0.18 0.275c0.059 0.09 0.117 0.177 0.176 0.262 0.058 0.086 0.116 0.17 0.173 0.251l0.17 0.24 0.169 0.227c0.055 0.074 0.11 0.146 0.165 0.217 0.054 0.07 0.108 0.138 0.162 0.205l0.008 0.01C8.02 14.582 7.132 13.792 6.67 13.21c-1.06-1.33-1.604-2.907-1.441-4.18 0.148-1.165 0.664-2.116 1.624-2.991C7.09 5.821 7.117 5.85 7.187 5.871 7.424 6.016 7.452 6.003 7.29 6.092z" android:strokeWidth="0.4" android:strokeColor="#ffffff"/>
+    <path android:pathData="M11.589 11.343c0.322-0.014 0.357 0.04 0.594-0.181 0.222-0.24 0.274-0.352 0.276-0.57 0.003-0.224-0.007-0.25-0.197-0.71-0.408-0.979-0.896-1.961-1.124-2.262-0.342-0.45-0.831-0.779-1.38-0.948-0.413-0.127-1.121-0.108-1.564 0.041-1.404 0.475-2.155 1.989-1.691 3.408 0.271 0.832 0.705 1.282 1.214 1.282z" android:strokeWidth="0.3" android:strokeColor="#ffffff"/>
+    <path android:pathData="M11.858 12.337a0.198 0.194 90 0 0 0.268 0.058 0.198 0.194 90 0 0 0.059-0.273 0.198 0.194 90 0 0-0.267-0.063 0.198 0.194 90 0 0-0.063 0.272" android:strokeLineJoin="round" android:strokeWidth="0.3" android:fillColor="#ffffff" android:strokeColor="#ffffff" android:strokeLineCap="round"/>
+    <path android:pathData="M11.87 10.803L8.042 10.87c-0.145 0.003-0.261 0.12-0.261 0.268 0 0.148 0.116 0.27 0.261 0.267l3.826-0.068c0.145-0.003 0.262-0.12 0.262-0.268 0-0.148-0.117-0.27-0.262-0.267z" android:strokeLineJoin="round" android:strokeWidth="0.3" android:strokeColor="#ffffff" android:strokeLineCap="round"/>
+    <path android:pathData="M12.193 17.066c0.625-0.132 1.334-0.604 1.68-1.12 0.53-0.787 0.661-1.615 0.413-2.61-0.445-1.784-1.737-5.003-2.422-6.035-0.49-0.738-1.147-1.226-1.985-1.474-0.284-0.084-0.55-0.118-0.97-0.127-0.244-0.005-0.653 0.037-1.041 0.174-0.486 0.169-0.64 0.23-0.95 0.458-0.406 0.296-0.789 0.73-1.013 1.175-0.29 0.576-0.392 0.938-0.419 1.547-0.04 0.9 0.118 1.412 0.816 2.655 1.003 1.681 1.225 2.02 2.372 3.434 0.232 0.3 0.63 0.757 0.883 1.016 0.373 0.381 0.524 0.502 0.787 0.633 0.599 0.296 1.271 0.396 1.85 0.274zm9.319-4.474c0.034 0.017 0.066 0.034 0.097 0.053 0.032 0.018 0.064 0.037 0.096 0.058 0.032 0.02 0.064 0.043 0.099 0.067l0.109 0.079 0.075 0.057 0.075 0.06c0.05 0.041 0.098 0.084 0.146 0.129 0.047 0.044 0.094 0.09 0.14 0.138 0.045 0.048 0.089 0.097 0.131 0.148 0.043 0.05 0.084 0.102 0.124 0.154 0.04 0.052 0.078 0.106 0.114 0.16 0.036 0.054 0.07 0.109 0.103 0.164l0.047 0.083 0.044 0.083c0.036 0.072 0.07 0.14 0.1 0.206 0.03 0.066 0.057 0.129 0.082 0.19 0.025 0.062 0.047 0.121 0.067 0.18l0.029 0.088 0.025 0.088 0.022 0.089 0.019 0.089c0.012 0.06 0.022 0.121 0.03 0.185 0.009 0.063 0.016 0.129 0.021 0.198 0.006 0.068 0.01 0.14 0.014 0.217l0.005 0.164v0.157c0 0.051-0.003 0.102-0.006 0.151-0.002 0.05-0.006 0.098-0.011 0.147-0.005 0.048-0.011 0.096-0.019 0.144-0.007 0.048-0.015 0.095-0.025 0.143-0.01 0.048-0.02 0.096-0.033 0.144-0.012 0.048-0.026 0.097-0.041 0.146-0.015 0.05-0.032 0.1-0.05 0.15-0.018 0.051-0.038 0.103-0.06 0.156-0.02 0.053-0.043 0.107-0.068 0.163-0.024 0.056-0.05 0.113-0.079 0.172-0.028 0.06-0.058 0.12-0.09 0.183-0.03 0.063-0.064 0.128-0.1 0.195l-0.113 0.21-0.124 0.224-0.19 0.325-0.188 0.312-0.185 0.3-0.182 0.286-0.179 0.275-0.176 0.263c-0.059 0.086-0.116 0.17-0.174 0.251l-0.17 0.24-0.168 0.227c-0.056 0.074-0.11 0.146-0.165 0.216-0.055 0.07-0.109 0.139-0.163 0.205l-0.008 0.01c0.224-0.032 1.112-0.822 1.575-1.403 1.06-1.332 1.603-2.909 1.44-4.182-0.148-1.165-0.664-2.116-1.623-2.991-0.239-0.218-0.265-0.188-0.334-0.167-0.238 0.144-0.265 0.132-0.105 0.22z" android:strokeWidth="0.4" android:strokeColor="#ffffff"/>
+    <path android:pathData="M17.215 17.843c-0.323-0.014-0.358 0.039-0.594-0.182-0.222-0.24-0.274-0.352-0.277-0.569-0.002-0.225 0.007-0.251 0.198-0.71 0.407-0.98 0.895-1.962 1.123-2.262 0.342-0.45 0.832-0.779 1.38-0.948 0.413-0.128 1.122-0.109 1.565 0.041 1.403 0.475 2.154 1.989 1.69 3.408-0.271 0.832-0.705 1.282-1.214 1.282z" android:strokeWidth="0.3" android:strokeColor="#ffffff"/>
+    <path android:pathData="M16.945 18.836a0.194 0.198 0 0 1-0.267 0.058 0.194 0.198 0 0 1-0.06-0.272 0.194 0.198 0 0 1 0.267-0.063 0.194 0.198 0 0 1 0.063 0.272" android:strokeLineJoin="round" android:strokeWidth="0.3" android:fillColor="#ffffff" android:strokeColor="#ffffff" android:strokeLineCap="round"/>
+    <path android:pathData="M16.934 17.302l3.826 0.069c0.145 0.002 0.262 0.119 0.262 0.267 0 0.148-0.117 0.27-0.262 0.268l-3.826-0.069c-0.145-0.002-0.261-0.119-0.261-0.267 0-0.148 0.116-0.27 0.261-0.268z" android:strokeLineJoin="round" android:strokeWidth="0.3" android:strokeColor="#ffffff" android:strokeLineCap="round"/>
+    <path android:pathData="M16.61 23.566c-0.624-0.132-1.333-0.604-1.68-1.12-0.53-0.788-0.661-1.615-0.413-2.611 0.446-1.784 1.738-5.003 2.422-6.035 0.49-0.737 1.147-1.225 1.985-1.473 0.285-0.085 0.55-0.119 0.97-0.127 0.244-0.005 0.653 0.037 1.041 0.174 0.486 0.169 0.64 0.23 0.95 0.458 0.406 0.296 0.789 0.73 1.013 1.175 0.29 0.575 0.392 0.938 0.42 1.547 0.04 0.9-0.118 1.411-0.817 2.654-1.003 1.682-1.225 2.02-2.372 3.434-0.232 0.3-0.63 0.757-0.883 1.017-0.373 0.38-0.523 0.502-0.787 0.633-0.598 0.296-1.27 0.395-1.849 0.274z" android:strokeWidth="0.4" android:strokeColor="#ffffff"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_device_sony_wf_800n_disabled.xml b/app/src/main/res/drawable/ic_device_sony_wf_800n_disabled.xml
new file mode 100644
index 000000000..05d51ea7f
--- /dev/null
+++ b/app/src/main/res/drawable/ic_device_sony_wf_800n_disabled.xml
@@ -0,0 +1,15 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="28.740126dp" android:height="28.740126dp" android:viewportWidth="28.740126" android:viewportHeight="28.740126">
+    <path android:pathData="M3.871 3.877h20.925a0.947 0.947 0 0 1 0.948 0.947v20.01a0.947 0.947 0 0 1-0.948 0.948H3.871a0.947 0.947 0 0 1-0.947-0.948V4.824a0.947 0.947 0 0 1 0.947-0.947z" android:strokeWidth="3.57115173" android:fillColor="#7a7a7a"/>
+    <path android:pathData="M3.879 3.035h20.925a0.947 0.947 0 0 1 0.947 0.947v20.01a0.947 0.947 0 0 1-0.947 0.948H3.88a0.947 0.947 0 0 1-0.947-0.948V3.982A0.947 0.947 0 0 1 3.88 3.035z" android:strokeWidth="3.57115173" android:fillColor="#9f9f9f" android:fillAlpha="0.9411765"/>
+    <path android:pathData="M3.871 3.413h20.925a0.947 0.947 0 0 1 0.948 0.947v20.01a0.947 0.947 0 0 1-0.948 0.948H3.871a0.947 0.947 0 0 1-0.947-0.948V4.36A0.947 0.947 0 0 1 3.87 3.413z" android:strokeWidth="3.57115173" android:fillColor="#8a8a8a"/>
+    <path android:pathData="M12.483 10.865h3.907v6.978h-3.907z" android:fillColor="#8a8a8a" android:fillAlpha="0.9411765"/>
+    <path android:pathData="M7.291 6.092L7.194 6.145C7.162 6.163 7.13 6.183 7.099 6.203l-0.1 0.067L6.89 6.35 6.815 6.405 6.74 6.466C6.691 6.507 6.642 6.55 6.595 6.595 6.547 6.64 6.5 6.685 6.455 6.734 6.41 6.78 6.365 6.83 6.323 6.88 6.28 6.93 6.24 6.983 6.2 7.035c-0.04 0.053-0.078 0.106-0.114 0.16C6.05 7.25 6.015 7.304 5.982 7.36L5.935 7.442C5.92 7.47 5.905 7.498 5.892 7.526c-0.037 0.071-0.07 0.14-0.1 0.206-0.03 0.065-0.058 0.128-0.083 0.19-0.025 0.061-0.047 0.12-0.067 0.18-0.01 0.03-0.02 0.059-0.028 0.088-0.01 0.03-0.017 0.058-0.025 0.088L5.567 8.366l-0.02 0.09c-0.011 0.06-0.021 0.12-0.03 0.184-0.008 0.063-0.015 0.13-0.02 0.198-0.007 0.069-0.01 0.14-0.014 0.217L5.477 9.219v0.157C5.478 9.428 5.48 9.478 5.483 9.527c0.003 0.05 0.007 0.099 0.012 0.147C5.5 9.722 5.505 9.77 5.513 9.818 5.52 9.866 5.529 9.914 5.538 9.961l0.033 0.144 0.042 0.146c0.015 0.05 0.031 0.1 0.05 0.15 0.018 0.051 0.037 0.103 0.059 0.156 0.02 0.053 0.044 0.108 0.068 0.163l0.079 0.173c0.028 0.059 0.058 0.12 0.09 0.182 0.031 0.063 0.065 0.128 0.1 0.196l0.113 0.209 0.125 0.224 0.19 0.325 0.188 0.312 0.184 0.3 0.182 0.287 0.18 0.275c0.059 0.09 0.117 0.177 0.176 0.262 0.058 0.086 0.116 0.17 0.173 0.251l0.17 0.24 0.169 0.227c0.055 0.074 0.11 0.146 0.165 0.217 0.054 0.07 0.108 0.138 0.162 0.205l0.008 0.01C8.02 14.582 7.132 13.792 6.67 13.21c-1.06-1.33-1.604-2.907-1.441-4.18 0.148-1.165 0.664-2.116 1.624-2.991C7.09 5.821 7.117 5.85 7.187 5.871 7.424 6.016 7.452 6.003 7.29 6.092z" android:strokeWidth="0.4" android:strokeColor="#ffffff"/>
+    <path android:pathData="M11.589 11.343c0.322-0.014 0.357 0.04 0.594-0.181 0.222-0.24 0.274-0.352 0.276-0.57 0.003-0.224-0.007-0.25-0.197-0.71-0.408-0.979-0.896-1.961-1.124-2.262-0.342-0.45-0.831-0.779-1.38-0.948-0.413-0.127-1.121-0.108-1.564 0.041-1.404 0.475-2.155 1.989-1.691 3.408 0.271 0.832 0.705 1.282 1.214 1.282z" android:strokeWidth="0.3" android:strokeColor="#ffffff"/>
+    <path android:pathData="M11.858 12.337a0.198 0.194 90 0 0 0.268 0.058 0.198 0.194 90 0 0 0.059-0.273 0.198 0.194 90 0 0-0.267-0.063 0.198 0.194 90 0 0-0.063 0.272" android:strokeLineJoin="round" android:strokeWidth="0.3" android:fillColor="#ffffff" android:strokeColor="#ffffff" android:strokeLineCap="round"/>
+    <path android:pathData="M11.87 10.803L8.042 10.87c-0.145 0.003-0.261 0.12-0.261 0.268 0 0.148 0.116 0.27 0.261 0.267l3.826-0.068c0.145-0.003 0.262-0.12 0.262-0.268 0-0.148-0.117-0.27-0.262-0.267z" android:strokeLineJoin="round" android:strokeWidth="0.3" android:strokeColor="#ffffff" android:strokeLineCap="round"/>
+    <path android:pathData="M12.193 17.066c0.625-0.132 1.334-0.604 1.68-1.12 0.53-0.787 0.661-1.615 0.413-2.61-0.445-1.784-1.737-5.003-2.422-6.035-0.49-0.738-1.147-1.226-1.985-1.474-0.284-0.084-0.55-0.118-0.97-0.127-0.244-0.005-0.653 0.037-1.041 0.174-0.486 0.169-0.64 0.23-0.95 0.458-0.406 0.296-0.789 0.73-1.013 1.175-0.29 0.576-0.392 0.938-0.419 1.547-0.04 0.9 0.118 1.412 0.816 2.655 1.003 1.681 1.225 2.02 2.372 3.434 0.232 0.3 0.63 0.757 0.883 1.016 0.373 0.381 0.524 0.502 0.787 0.633 0.599 0.296 1.271 0.396 1.85 0.274zm9.319-4.474c0.034 0.017 0.066 0.034 0.097 0.053 0.032 0.018 0.064 0.037 0.096 0.058 0.032 0.02 0.064 0.043 0.099 0.067l0.109 0.079 0.075 0.057 0.075 0.06c0.05 0.041 0.098 0.084 0.146 0.129 0.047 0.044 0.094 0.09 0.14 0.138 0.045 0.048 0.089 0.097 0.131 0.148 0.043 0.05 0.084 0.102 0.124 0.154 0.04 0.052 0.078 0.106 0.114 0.16 0.036 0.054 0.07 0.109 0.103 0.164l0.047 0.083 0.044 0.083c0.036 0.072 0.07 0.14 0.1 0.206 0.03 0.066 0.057 0.129 0.082 0.19 0.025 0.062 0.047 0.121 0.067 0.18l0.029 0.088 0.025 0.088 0.022 0.089 0.019 0.089c0.012 0.06 0.022 0.121 0.03 0.185 0.009 0.063 0.016 0.129 0.021 0.198 0.006 0.068 0.01 0.14 0.014 0.217l0.005 0.164v0.157c0 0.051-0.003 0.102-0.006 0.151-0.002 0.05-0.006 0.098-0.011 0.147-0.005 0.048-0.011 0.096-0.019 0.144-0.007 0.048-0.015 0.095-0.025 0.143-0.01 0.048-0.02 0.096-0.033 0.144-0.012 0.048-0.026 0.097-0.041 0.146-0.015 0.05-0.032 0.1-0.05 0.15-0.018 0.051-0.038 0.103-0.06 0.156-0.02 0.053-0.043 0.107-0.068 0.163-0.024 0.056-0.05 0.113-0.079 0.172-0.028 0.06-0.058 0.12-0.09 0.183-0.03 0.063-0.064 0.128-0.1 0.195l-0.113 0.21-0.124 0.224-0.19 0.325-0.188 0.312-0.185 0.3-0.182 0.286-0.179 0.275-0.176 0.263c-0.059 0.086-0.116 0.17-0.174 0.251l-0.17 0.24-0.168 0.227c-0.056 0.074-0.11 0.146-0.165 0.216-0.055 0.07-0.109 0.139-0.163 0.205l-0.008 0.01c0.224-0.032 1.112-0.822 1.575-1.403 1.06-1.332 1.603-2.909 1.44-4.182-0.148-1.165-0.664-2.116-1.623-2.991-0.239-0.218-0.265-0.188-0.334-0.167-0.238 0.144-0.265 0.132-0.105 0.22z" android:strokeWidth="0.4" android:strokeColor="#ffffff"/>
+    <path android:pathData="M17.215 17.843c-0.323-0.014-0.358 0.039-0.594-0.182-0.222-0.24-0.274-0.352-0.277-0.569-0.002-0.225 0.007-0.251 0.198-0.71 0.407-0.98 0.895-1.962 1.123-2.262 0.342-0.45 0.832-0.779 1.38-0.948 0.413-0.128 1.122-0.109 1.565 0.041 1.403 0.475 2.154 1.989 1.69 3.408-0.271 0.832-0.705 1.282-1.214 1.282z" android:strokeWidth="0.3" android:strokeColor="#ffffff"/>
+    <path android:pathData="M16.945 18.836a0.194 0.198 0 0 1-0.267 0.058 0.194 0.198 0 0 1-0.06-0.272 0.194 0.198 0 0 1 0.267-0.063 0.194 0.198 0 0 1 0.063 0.272" android:strokeLineJoin="round" android:strokeWidth="0.3" android:fillColor="#ffffff" android:strokeColor="#ffffff" android:strokeLineCap="round"/>
+    <path android:pathData="M16.934 17.302l3.826 0.069c0.145 0.002 0.262 0.119 0.262 0.267 0 0.148-0.117 0.27-0.262 0.268l-3.826-0.069c-0.145-0.002-0.261-0.119-0.261-0.267 0-0.148 0.116-0.27 0.261-0.268z" android:strokeLineJoin="round" android:strokeWidth="0.3" android:strokeColor="#ffffff" android:strokeLineCap="round"/>
+    <path android:pathData="M16.61 23.566c-0.624-0.132-1.333-0.604-1.68-1.12-0.53-0.788-0.661-1.615-0.413-2.611 0.446-1.784 1.738-5.003 2.422-6.035 0.49-0.737 1.147-1.225 1.985-1.473 0.285-0.085 0.55-0.119 0.97-0.127 0.244-0.005 0.653 0.037 1.041 0.174 0.486 0.169 0.64 0.23 0.95 0.458 0.406 0.296 0.789 0.73 1.013 1.175 0.29 0.575 0.392 0.938 0.42 1.547 0.04 0.9-0.118 1.411-0.817 2.654-1.003 1.682-1.225 2.02-2.372 3.434-0.232 0.3-0.63 0.757-0.883 1.017-0.373 0.38-0.523 0.502-0.787 0.633-0.598 0.296-1.27 0.395-1.849 0.274z" android:strokeWidth="0.4" android:strokeColor="#ffffff"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_sony_wf_800n_case.xml b/app/src/main/res/drawable/ic_sony_wf_800n_case.xml
new file mode 100644
index 000000000..d03918e1d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_sony_wf_800n_case.xml
@@ -0,0 +1,17 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="12.321217dp"
+    android:height="12.3dp"
+    android:tint="#7E7E7E"
+    android:viewportWidth="12.321217"
+    android:viewportHeight="12.3">
+  <path
+      android:pathData="m0.9714,5.2359c0.0231,0.0565 0.2325,0.1658 0.4451,0.2324 0.2193,0.0687 0.5432,0.1306 0.8643,0.1653 0.2564,0.0277 3.8385,0.1078 3.8385,0.1078l0.3317,0c0,0 3.5822,-0.0801 3.8385,-0.1078 0.321,-0.0346 0.645,-0.0966 0.8643,-0.1653 0.2126,-0.0666 0.422,-0.1759 0.4451,-0.2324"
+      android:strokeWidth="0.49999905"
+      android:fillColor="#00000000"
+      android:strokeColor="#000000"/>
+  <path
+      android:pathData="m5.5182,9.0707c-1.2484,-0.0547 -1.9786,-0.1803 -2.5078,-0.4316 -0.9808,-0.4655 -1.657,-1.3807 -1.9166,-2.5937 -0.1031,-0.4818 -0.1853,-1.3119 -0.1408,-1.4218 0.1036,-0.2557 0.8173,-0.69 1.6414,-0.9986 0.5403,-0.2023 1.3346,-0.3697 2.235,-0.4709 0.5768,-0.0648 2.3313,-0.0648 2.908,0 0.8876,0.0997 1.6741,0.2642 2.2172,0.4635 0.8141,0.2988 1.5552,0.749 1.6604,1.0088 0.0282,0.0697 -0.0115,0.639 -0.073,1.047 -0.1549,1.0274 -0.5317,1.8131 -1.1444,2.3859 -0.7633,0.7136 -1.4895,0.9288 -3.4172,1.0129 -0.634,0.0276 -0.8013,0.0275 -1.4622,-0.0015z"
+      android:strokeWidth="0.49999905"
+      android:fillColor="#00000000"
+      android:strokeColor="#000000"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_sony_wf_800n_left.xml b/app/src/main/res/drawable/ic_sony_wf_800n_left.xml
new file mode 100644
index 000000000..c65400804
--- /dev/null
+++ b/app/src/main/res/drawable/ic_sony_wf_800n_left.xml
@@ -0,0 +1,39 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="12.321217dp"
+    android:height="12.3dp"
+    android:tint="#7E7E7E"
+    android:viewportWidth="12.321217"
+    android:viewportHeight="12.3">
+  <path
+      android:pathData="m8.3489,1.4897c0.0293,0.0131 0.0571,0.0295 0.0848,0.0455 0.0277,0.0164 0.055,0.0328 0.0829,0.0508 0.028,0.0164 0.0564,0.0373 0.0864,0.0583 0.03,0.0196 0.0614,0.0436 0.0952,0.0681 0.0221,0.0164 0.044,0.0328 0.0658,0.0495 0.0217,0.0164 0.0435,0.0344 0.065,0.0521 0.043,0.0357 0.0853,0.0727 0.1268,0.1114 0.0414,0.0386 0.082,0.0789 0.1216,0.1202 0.0395,0.0413 0.078,0.0839 0.1152,0.1274 0.0373,0.0436 0.0733,0.0881 0.1079,0.1336 0.0346,0.0455 0.0678,0.0917 0.0993,0.1385 0.0316,0.0468 0.0615,0.0943 0.0897,0.1421 0.0142,0.0229 0.0277,0.0478 0.041,0.0721 0.0132,0.0229 0.026,0.0482 0.0381,0.0724 0.0316,0.0622 0.0604,0.1215 0.0868,0.1785 0.0264,0.057 0.0503,0.1117 0.072,0.1647 0.0217,0.0531 0.0411,0.1048 0.0586,0.1562 0.0086,0.0262 0.0168,0.0511 0.0247,0.0763 0.0079,0.0262 0.0152,0.0508 0.0217,0.076 0.0069,0.0262 0.0132,0.0508 0.0191,0.0763 0.0059,0.0262 0.0115,0.0514 0.0168,0.0773 0.0102,0.0521 0.0191,0.1051 0.0264,0.1602 0.0076,0.055 0.0135,0.112 0.0184,0.1716 0.0049,0.0596 0.0089,0.1222 0.0119,0.188 0.0022,0.0488 0.0036,0.0963 0.0046,0.1425 0.0008,0.0465 0.0008,0.0917 0.0001,0.1359 -0.0008,0.0442 -0.0024,0.0878 -0.0049,0.1307 -0.0025,0.0429 -0.0059,0.0852 -0.0102,0.1271 -0.0043,0.0419 -0.0096,0.0835 -0.0158,0.1248 -0.0063,0.0413 -0.0135,0.0825 -0.0221,0.1241 -0.0086,0.0413 -0.0181,0.0829 -0.029,0.1248 -0.0109,0.0419 -0.0227,0.0839 -0.0359,0.1268 -0.0132,0.0429 -0.0277,0.0861 -0.0434,0.1304 -0.0158,0.0442 -0.0329,0.0891 -0.0514,0.1349 -0.0184,0.0459 -0.0385,0.093 -0.0599,0.1415 -0.0214,0.0485 -0.0443,0.0979 -0.0687,0.1494 -0.0244,0.0511 -0.0505,0.1038 -0.0781,0.1585 -0.0277,0.0544 -0.0568,0.1107 -0.0878,0.169 -0.031,0.0583 -0.0636,0.1186 -0.098,0.1811 -0.0344,0.0626 -0.0706,0.1274 -0.1087,0.1949 -0.0557,0.0957 -0.1111,0.1893 -0.166,0.2814 -0.0549,0.092 -0.1094,0.1821 -0.1635,0.2702 -0.0541,0.0884 -0.1077,0.1749 -0.161,0.2594 -0.0532,0.0848 -0.1061,0.1677 -0.1585,0.2489 -0.0524,0.0812 -0.1045,0.1605 -0.1561,0.2381 -0.0516,0.0776 -0.1028,0.1536 -0.1536,0.2276 -0.0508,0.074 -0.1012,0.1467 -0.1511,0.2175 -0.05,0.0708 -0.0996,0.1399 -0.1487,0.2073 -0.0491,0.0675 -0.0979,0.1333 -0.1462,0.1972 -0.0483,0.0642 -0.0963,0.1268 -0.1438,0.1874 -0.0475,0.0609 -0.0946,0.1199 -0.1413,0.1775 -0.0024,0.003 -0.0046,0.007 -0.0069,0.01 0.195,-0.0262 0.9686,-0.712 1.3717,-1.2158 0.9235,-1.154 1.3969,-2.5207 1.2556,-3.6246 -0.1292,-1.0093 -0.5792,-1.8334 -1.4153,-2.592 -0.2076,-0.1883 -0.2305,-0.1631 -0.2909,-0.1444 -0.2071,0.1251 -0.2308,0.1146 -0.0911,0.1916z"
+      android:strokeWidth="0.5"
+      android:fillColor="#00000000"
+      android:strokeColor="#000000"/>
+  <path
+      android:pathData="m4.604,6.04c-0.2809,-0.0131 -0.3113,0.0341 -0.5172,-0.1569 -0.1934,-0.2083 -0.239,-0.3049 -0.2411,-0.4931 -0.0022,-0.1952 0.0063,-0.2181 0.1724,-0.6153 0.355,-0.8488 0.7801,-1.7003 0.9789,-1.9606 0.2979,-0.3901 0.7242,-0.6751 1.2023,-0.8217 0.3598,-0.1104 0.9771,-0.0943 1.363,0.0357 1.2229,0.4116 1.8774,1.7234 1.4735,2.9532 -0.2367,0.7207 -0.6147,1.111 -1.0581,1.111z"
+      android:strokeWidth="0.2"
+      android:fillColor="#00000000"
+      android:strokeColor="#000000"/>
+  <path
+      android:pathData="m4.3599,5.5719 l3.3337,0.0593c0.1263,0.002 0.228,0.1035 0.228,0.2319 0,0.1284 -0.1017,0.2342 -0.228,0.2319l-3.3337,-0.0593c-0.1263,-0.002 -0.228,-0.1035 -0.228,-0.2319 0,-0.1284 0.1017,-0.2342 0.228,-0.2319z"
+      android:strokeLineJoin="round"
+      android:strokeWidth="0.2"
+      android:fillColor="#00000000"
+      android:strokeColor="#000000"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="m4.0774,11c-0.544,-0.114 -1.1618,-0.5236 -1.4644,-0.9707 -0.4617,-0.6823 -0.5756,-1.3996 -0.359,-2.2625 0.3879,-1.5456 1.5136,-4.3354 2.1103,-5.2296 0.4265,-0.6392 0.9992,-1.0621 1.7298,-1.2773 0.2478,-0.073 0.4791,-0.1025 0.8453,-0.1097 0.2124,-0.003 0.5687,0.0328 0.9069,0.1507 0.4231,0.1461 0.5579,0.1995 0.8281,0.3972 0.3533,0.2561 0.6869,0.6318 0.8824,1.0183 0.2522,0.4986 0.3412,0.8125 0.3648,1.3402 0.035,0.7806 -0.1024,1.2234 -0.7111,2.3006 -0.8738,1.4571 -1.0675,1.7511 -2.0667,2.9761 -0.2024,0.2597 -0.5486,0.656 -0.7695,0.8808 -0.3247,0.3304 -0.456,0.4354 -0.6859,0.5486 -0.5213,0.2565 -1.1074,0.343 -1.6111,0.2375z"
+      android:strokeWidth="0.5"
+      android:fillColor="#00000000"
+      android:strokeColor="#000000"/>
+  <path
+      android:pathData="m3.9326,7.1171h0.3132v2.051h1.1271v0.2636h-1.4402z"
+      android:strokeWidth="0.264583"
+      android:fillColor="#000000"
+      android:strokeColor="#00000000"/>
+  <path
+      android:pathData="m3.8005,6.9839v0.1328,2.4473h1.7051v-0.5273h-1.127v-2.0527zM4.0642,7.2496h0.0488v2.0508h-0.0488z"
+      android:strokeWidth="0.264583"
+      android:fillColor="#000000"
+      android:strokeColor="#00000000"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_sony_wf_800n_right.xml b/app/src/main/res/drawable/ic_sony_wf_800n_right.xml
new file mode 100644
index 000000000..e2a1d4145
--- /dev/null
+++ b/app/src/main/res/drawable/ic_sony_wf_800n_right.xml
@@ -0,0 +1,39 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="12.321217dp"
+    android:height="12.3dp"
+    android:tint="#7E7E7E"
+    android:viewportWidth="12.321217"
+    android:viewportHeight="12.3">
+  <path
+      android:pathData="m7.9485,8.3399q0.1008,0.0341 0.1953,0.1457 0.0961,0.1116 0.1922,0.307l0.3178,0.6325h-0.3364l-0.2961,-0.5938q-0.1147,-0.2325 -0.2232,-0.3085 -0.107,-0.076 -0.293,-0.076L7.1641,8.4468v0.9782h-0.3132v-2.3146h0.7069q0.3969,0 0.5922,0.1659 0.1953,0.1659 0.1953,0.5007 0,0.2186 -0.1023,0.3628 -0.1008,0.1442 -0.2946,0.2zM7.1641,7.3679v0.8217h0.3938q0.2263,0 0.3411,-0.1039 0.1163,-0.1054 0.1163,-0.3085 0,-0.2031 -0.1163,-0.3054 -0.1147,-0.1039 -0.3411,-0.1039z"
+      android:strokeWidth="0.264583"
+      android:fillColor="#000000"
+      android:strokeColor="#00000000"/>
+  <path
+      android:pathData="m6.7195,6.9789v2.5781h0.5762v-0.9785h0.209c0.106,0 0.175,0.023 0.2168,0.0527 0.0383,0.0268 0.11,0.1125 0.1816,0.2578v0.002l0.332,0.666h0.6328l-0.4141,-0.8223v-0.002c-0.0668,-0.1356 -0.1349,-0.2457 -0.209,-0.332 -0.0229,-0.027 -0.0533,-0.036 -0.0781,-0.0586 0.0619,-0.0418 0.1407,-0.0643 0.1836,-0.125 0.0865,-0.1218 0.127,-0.2731 0.127,-0.4394 0,-0.249 -0.0785,-0.4626 -0.2422,-0.6016 -0.1639,-0.1392 -0.3947,-0.1973 -0.6777,-0.1973zM6.9832,7.2426h0.0488v0.125,0.9473 0.008,0.9707h-0.0488zM7.6941,7.2797c0.1482,0.0194 0.3006,0.0378 0.3711,0.0977 0.0967,0.0822 0.1484,0.2029 0.1484,0.4004 0,0.1251 -0.0282,0.2148 -0.0781,0.2852L8.1355,8.0649c-0.0301,0.0431 -0.0878,0.0643 -0.1367,0.0918 0.0941,-0.098 0.1484,-0.2292 0.1484,-0.3789 0,-0.16 -0.051,-0.3074 -0.1602,-0.4043 -0.074,-0.067 -0.1869,-0.0752 -0.293,-0.0937zM7.2957,7.5004h0.2617c0.1307,0 0.2076,0.0301 0.252,0.0703h0.002c0.0449,0.0395 0.0723,0.0969 0.0723,0.207 0,0.1102 -0.028,0.1671 -0.0742,0.209 -0.0444,0.0402 -0.1213,0.0703 -0.252,0.0703h-0.2617zM7.9285,8.2035c-0.0069,0.002 -0.0083,0.008 -0.0156,0.01l-0.0957,0.0273v0.1582c-0.083,-0.0446 -0.1767,-0.0726 -0.2832,-0.0762h0.0234c0.1477,0 0.2679,-0.0478 0.3711,-0.1191zM7.9168,8.4731c0.0361,0.0144 0.0784,0.0403 0.127,0.0977v0.002c0.0534,0.062 0.1131,0.1558 0.1738,0.2793l0.2227,0.4414h-0.041l-0.2598,-0.5215c-0.068,-0.1379 -0.1406,-0.2243 -0.2227,-0.2988z"
+      android:strokeWidth="0.264583"
+      android:fillColor="#000000"
+      android:strokeColor="#00000000"/>
+  <path
+      android:pathData="m3.9723,1.4897c-0.0293,0.0131 -0.0571,0.0295 -0.0848,0.0455 -0.0277,0.0164 -0.055,0.0328 -0.0829,0.0508 -0.028,0.0164 -0.0564,0.0373 -0.0864,0.0583 -0.03,0.0196 -0.0614,0.0436 -0.0952,0.0681 -0.0221,0.0164 -0.044,0.0328 -0.0658,0.0495 -0.0217,0.0164 -0.0435,0.0344 -0.065,0.0521 -0.043,0.0357 -0.0853,0.0727 -0.1268,0.1114 -0.0414,0.0386 -0.082,0.0789 -0.1216,0.1202 -0.0395,0.0413 -0.078,0.0839 -0.1152,0.1274 -0.0373,0.0436 -0.0733,0.0881 -0.1079,0.1336 -0.0346,0.0455 -0.0678,0.0917 -0.0993,0.1385 -0.0316,0.0468 -0.0615,0.0943 -0.0897,0.1421 -0.0142,0.0229 -0.0277,0.0478 -0.041,0.0721 -0.0132,0.0229 -0.026,0.0482 -0.0381,0.0724 -0.0316,0.0622 -0.0604,0.1215 -0.0868,0.1785 -0.0264,0.057 -0.0503,0.1117 -0.072,0.1647 -0.0217,0.0531 -0.0411,0.1048 -0.0586,0.1562 -0.0086,0.0262 -0.0168,0.0511 -0.0247,0.0763 -0.0079,0.0262 -0.0152,0.0508 -0.0217,0.076 -0.0069,0.0262 -0.0132,0.0508 -0.0191,0.0763 -0.0059,0.0262 -0.0115,0.0514 -0.0168,0.0773 -0.0102,0.0521 -0.0191,0.1051 -0.0264,0.1602 -0.0076,0.055 -0.0135,0.112 -0.0184,0.1716 -0.0049,0.0596 -0.0089,0.1222 -0.0119,0.188 -0.0022,0.0488 -0.0036,0.0963 -0.0046,0.1425 -0.0008,0.0465 -0.0008,0.0917 -0.0001,0.1359 0.0008,0.0442 0.0024,0.0878 0.0049,0.1307 0.0025,0.0429 0.0059,0.0852 0.0102,0.1271 0.0043,0.0419 0.0096,0.0835 0.0158,0.1248 0.0063,0.0413 0.0135,0.0825 0.0221,0.1241 0.0086,0.0413 0.0181,0.0829 0.029,0.1248 0.0109,0.0419 0.0227,0.0839 0.0359,0.1268 0.0132,0.0429 0.0277,0.0861 0.0434,0.1304 0.0158,0.0442 0.0329,0.0891 0.0514,0.1349 0.0184,0.0459 0.0385,0.093 0.0599,0.1415 0.0214,0.0485 0.0443,0.0979 0.0687,0.1494 0.0244,0.0511 0.0505,0.1038 0.0781,0.1585 0.0277,0.0544 0.0568,0.1107 0.0878,0.169 0.031,0.0583 0.0636,0.1186 0.098,0.1811 0.0344,0.0626 0.0706,0.1274 0.1087,0.1949 0.0557,0.0957 0.1111,0.1893 0.166,0.2814 0.0549,0.092 0.1094,0.1821 0.1635,0.2702 0.0541,0.0884 0.1077,0.1749 0.161,0.2594 0.0532,0.0848 0.1061,0.1677 0.1585,0.2489 0.0524,0.0812 0.1045,0.1605 0.1561,0.2381 0.0516,0.0776 0.1028,0.1536 0.1536,0.2276 0.0508,0.074 0.1012,0.1467 0.1511,0.2175 0.05,0.0708 0.0996,0.1399 0.1487,0.2073 0.0491,0.0675 0.0979,0.1333 0.1462,0.1972 0.0483,0.0642 0.0963,0.1268 0.1438,0.1874 0.0475,0.0609 0.0946,0.1199 0.1413,0.1775 0.0024,0.003 0.0046,0.007 0.0069,0.01 -0.195,-0.0262 -0.9686,-0.712 -1.3717,-1.2158 -0.9235,-1.154 -1.3969,-2.5207 -1.2556,-3.6246 0.1292,-1.0093 0.5792,-1.8334 1.4153,-2.592 0.2076,-0.1883 0.2305,-0.1631 0.2909,-0.1444 0.2071,0.1251 0.2308,0.1146 0.0911,0.1916z"
+      android:strokeWidth="0.5"
+      android:fillColor="#00000000"
+      android:strokeColor="#000000"/>
+  <path
+      android:pathData="m7.7172,6.04c0.2809,-0.0131 0.3113,0.0341 0.5172,-0.1569 0.1934,-0.2083 0.239,-0.3049 0.2411,-0.4931 0.0022,-0.1952 -0.0063,-0.2181 -0.1724,-0.6153 -0.355,-0.8488 -0.7801,-1.7003 -0.9789,-1.9606 -0.2979,-0.3901 -0.7242,-0.6751 -1.2023,-0.8217 -0.3598,-0.1104 -0.9771,-0.0943 -1.363,0.0357 -1.2229,0.4116 -1.8774,1.7234 -1.4735,2.9532 0.2367,0.7207 0.6147,1.111 1.0581,1.111z"
+      android:strokeWidth="0.2"
+      android:fillColor="#00000000"
+      android:strokeColor="#000000"/>
+  <path
+      android:pathData="m7.9613,5.5719 l-3.3337,0.0593c-0.1263,0.002 -0.228,0.1035 -0.228,0.2319 0,0.1284 0.1017,0.2342 0.228,0.2319l3.3337,-0.0593c0.1263,-0.002 0.228,-0.1035 0.228,-0.2319 0,-0.1284 -0.1017,-0.2342 -0.228,-0.2319z"
+      android:strokeLineJoin="round"
+      android:strokeWidth="0.2"
+      android:fillColor="#00000000"
+      android:strokeColor="#000000"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="m8.2438,11c0.544,-0.114 1.1618,-0.5236 1.4644,-0.9707 0.4617,-0.6823 0.5756,-1.3996 0.359,-2.2625 -0.3879,-1.5456 -1.5136,-4.3354 -2.1103,-5.2296 -0.4265,-0.6392 -0.9992,-1.0621 -1.7298,-1.2773 -0.2478,-0.073 -0.4791,-0.1025 -0.8453,-0.1097 -0.2124,-0.003 -0.5687,0.0328 -0.9069,0.1507 -0.4231,0.1461 -0.5579,0.1995 -0.8281,0.3972 -0.3533,0.2561 -0.6869,0.6318 -0.8824,1.0183 -0.2522,0.4986 -0.3412,0.8125 -0.3648,1.3402 -0.035,0.7806 0.1024,1.2234 0.7111,2.3006 0.8738,1.4571 1.0675,1.7511 2.0667,2.9761 0.2024,0.2597 0.5486,0.656 0.7695,0.8808 0.3247,0.3304 0.456,0.4354 0.6859,0.5486 0.5213,0.2565 1.1074,0.343 1.6111,0.2375z"
+      android:strokeWidth="0.5"
+      android:fillColor="#00000000"
+      android:strokeColor="#000000"/>
+</vector>

From 425dfac3e9edb4bb91b8edd1d63836d403148ef8 Mon Sep 17 00:00:00 2001
From: vanous <petr@linuks.cz>
Date: Sun, 15 May 2022 15:39:48 +0200
Subject: [PATCH 054/110] Miband6: new device icon

---
 app/src/main/assets/ic_device_miband6.svg     | 150 +++++++++++++
 .../assets/ic_device_miband6_disabled.svg     | 198 ++++++++++++++++++
 .../gadgetbridge/model/DeviceType.java        |   2 +-
 .../main/res/drawable/ic_device_miband6.xml   |  30 +++
 .../drawable/ic_device_miband6_disabled.xml   |  35 ++++
 5 files changed, 414 insertions(+), 1 deletion(-)
 create mode 100644 app/src/main/assets/ic_device_miband6.svg
 create mode 100644 app/src/main/assets/ic_device_miband6_disabled.svg
 create mode 100644 app/src/main/res/drawable/ic_device_miband6.xml
 create mode 100644 app/src/main/res/drawable/ic_device_miband6_disabled.xml

diff --git a/app/src/main/assets/ic_device_miband6.svg b/app/src/main/assets/ic_device_miband6.svg
new file mode 100644
index 000000000..c5622af53
--- /dev/null
+++ b/app/src/main/assets/ic_device_miband6.svg
@@ -0,0 +1,150 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   version="1.1"
+   id="svg2"
+   width="28.740126"
+   height="28.740126"
+   viewBox="0 0 28.740126 28.740126"
+   sodipodi:docname="ic_device_miband6.svg"
+   inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <metadata
+     id="metadata8">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs6">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 14.370063 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="28.740126 : 14.370063 : 1"
+       inkscape:persp3d-origin="14.370063 : 9.580042 : 1"
+       id="perspective903" />
+  </defs>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1035"
+     id="namedview4"
+     showgrid="false"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:zoom="16.000001"
+     inkscape:cx="7.5312495"
+     inkscape:cy="18.906249"
+     inkscape:window-x="0"
+     inkscape:window-y="45"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="layer1"
+     inkscape:pagecheckerboard="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid972" />
+  </sodipodi:namedview>
+  <g
+     inkscape:groupmode="layer"
+     id="layer1"
+     inkscape:label="Background"
+     style="display:inline">
+    <g
+       inkscape:groupmode="layer"
+       id="layer4"
+       inkscape:label="Bottom"
+       style="display:inline"
+       sodipodi:insensitive="true">
+      <rect
+         style="display:inline;fill:#1f7fdb;fill-opacity:1;stroke:none;stroke-width:3.57115;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect817-5"
+         width="22.819572"
+         height="21.904638"
+         x="2.9239759"
+         y="3.8768768"
+         ry="0.9472276" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer3"
+       inkscape:label="Middle"
+       style="display:inline"
+       sodipodi:insensitive="true">
+      <rect
+         style="display:inline;fill:#4dabf5;fill-opacity:1;stroke:none;stroke-width:3.57115;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect817-7"
+         width="22.819572"
+         height="21.904638"
+         x="2.9317887"
+         y="3.0349438"
+         ry="0.9472276" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer2"
+       inkscape:label="Top"
+       style="display:inline"
+       sodipodi:insensitive="true">
+      <rect
+         style="fill:#2196f3;fill-opacity:1;stroke:none;stroke-width:3.57115;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect817"
+         width="22.819572"
+         height="21.904638"
+         x="2.9238882"
+         y="3.4130721"
+         ry="0.9472276" />
+    </g>
+    <g
+       id="g3290"
+       transform="translate(0.06106299,-0.04193669)">
+      <path
+         style="fill:#ffffff;fill-opacity:1;stroke-width:3.77953"
+         d="m 5.7005371,14.062732 c 0.00345,-0.03232 0.013618,-0.134324 0.023098,-0.226674 0.052057,-0.502923 0.2664409,-1.351244 0.3915769,-1.549467 0.024477,-0.03878 0.076621,-0.09101 0.1157675,-0.116009 0.1381934,-0.0882 0.4683357,-0.160533 1.0160246,-0.222623 0.1544916,-0.0175 0.3033982,-0.04042 0.3308835,-0.05094 0.069898,-0.02672 0.2694919,-0.0674 0.330556,-0.0674 0.029045,0 0.1528109,-0.05016 0.2885308,-0.116957 0.4663707,-0.229536 0.9722843,-0.357145 1.597637,-0.40298 0.3197226,-0.02344 8.7265726,-0.02361 9.0500356,-1.89e-4 0.652071,0.04723 1.177696,0.187449 1.687436,0.450227 l 0.243463,0.125507 0.310621,0.0306 c 0.596954,0.05887 1.04326,0.137305 1.216256,0.213823 0.0981,0.04344 0.189561,0.12854 0.235198,0.21896 0.08601,0.170462 0.226243,0.687839 0.303984,1.121803 0.153044,0.854198 0.104262,1.629242 -0.16305,2.590391 -0.08412,0.302605 -0.139822,0.434653 -0.218589,0.518609 -0.138246,0.147338 -0.522565,0.238473 -1.348615,0.319808 l -0.335805,0.0331 -0.277042,0.14009 c -0.496631,0.251134 -0.965794,0.377985 -1.611884,0.435808 -0.35012,0.03129 -8.733467,0.03189 -9.1175547,5.69e-4 -0.6601552,-0.05378 -1.2013714,-0.200007 -1.6801359,-0.453951 -0.098125,-0.05206 -0.1498116,-0.06826 -0.2442131,-0.07662 -0.065847,-0.006 -0.1678593,-0.02499 -0.2266738,-0.04275 -0.05878,-0.01767 -0.2655963,-0.0518 -0.4595188,-0.07585 C 6.3912287,16.764537 6.1913765,16.692028 6.0776776,16.4675 6.0255336,16.364497 5.8912448,15.904677 5.8314304,15.624247 5.8166924,15.554947 5.7978174,15.468092 5.7896294,15.431152 5.7145594,15.094537 5.6685873,14.38872 5.7005374,14.06274 Z"
+         id="path1062" />
+      <path
+         id="path_3"
+         d="m 9.388,13.204 h 9.841 c 0.29,0 0.568,0.115 0.774,0.32 0.205,0.206 0.32,0.484 0.32,0.774 v 0.228 c 0,0.29 -0.115,0.568 -0.32,0.774 -0.206,0.205 -0.484,0.32 -0.774,0.32 H 9.39 C 9.198,15.62 9.009,15.57 8.843,15.474 8.676,15.378 8.538,15.24 8.442,15.073 8.346,14.907 8.295,14.718 8.295,14.526 v -0.228 c 0,-0.29 0.115,-0.568 0.32,-0.774 0.206,-0.205 0.484,-0.32 0.774,-0.32 z"
+         fill="#ffffff"
+         stroke="#ffffff"
+         stroke-width="2.22514"
+         style="fill:#4dabf5;fill-opacity:1;stroke:#4dabf5;stroke-opacity:1" />
+    </g>
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer5"
+     inkscape:label="Original"
+     style="display:none"
+     sodipodi:insensitive="true">
+    <image
+       y="0.0079936879"
+       x="0.010951031"
+       id="image4124"
+       xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGAAAABgCAMAAADVRocKAAAAA3NCSVQICAjb4U/gAAAACXBIWXMA ADFOAAAxTgGacD5yAAAAGXRFWHRTb2Z0d2FyZQB3d3cuaW5rc2NhcGUub3Jnm+48GgAAABF0RVh0 VGl0bGUAUGViYmxlIEljb26KvwD9AAAADHRFWHRBdXRob3IAeHBobnh/4OzMAAAAY3RFWHRDb3B5 cmlnaHQAQ0MgQXR0cmlidXRpb24tTm9uQ29tbWVyY2lhbC1TaGFyZUFsaWtlIGh0dHA6Ly9jcmVh dGl2ZWNvbW1vbnMub3JnL2xpY2Vuc2VzL2J5LW5jLXNhLzMuMC/eBBrlAAABy1BMVEUAAAAAAAAA AP8AAIAAAFUAAKoAVaoAAIAAQIAAM2YAM5kzM2YzM5krK4AkJG0kJJIgIIAcHHEcHI4aGoAXF3QX F4sXLnQXLosVK4AUJ3YUJ4kSJIAkJIARInciInciIogQIIAgIIAeHngeHoccHIAcK4AbKHkbKIYa GoAaJoAYJHkXI4AXI4sWIXoWIYUVIIAfH3ofH4UdJ4ATHIQcJnsbJIAaI4QaIoAZIXsZIYQYIHgY IIAXH4MXJ3wXHoAXJoBLpfAWJHwdJHwdJIMcI4Acas0VIoMbIoAaIXwaIIAZH3wZH4MZJXwYHoAY HoYYJIAehtsYHoIefdtHoO0jetZGovNEn+4gg+EfgN5Ep/VKqfREpvQgfdkgfttKqvQggd4hjesw nPMwnPRJqfUhgd4hjutJqfUgfttNq/VNq/QhlPEhlPIhlvMkmPMglvIff9sgjeoglPAhk/AhlPEh lPIhlvMkl/MkmPMlmPMmmPMnmfMpmvMzn/Q0n/Q1n/Q2oPRIqfVNq/VasfZbsvZhtPZitfdtuveQ yvmXzvmj0/qk1Pqu2fu83/vR6f3T6v3Z7f3i8f3j8v3l8/7m8/7p9f7q9f7x+P7y+f7////ougeB AAAAb3RSTlMAAQECAwMDBAQFBQUFBgcHCAkJCgsLCwsMDQ0ODg8PDxAQERESEhMTFBQVFhYXFxgZ GRobGxwdHh8fICAhISIiIiMjIyQkJSYnKCkpKSoqKiorKyssLC2xs7O0tba2tu7u7u7u7+/w8fHy +/v7+/ywJhX9AAAC0klEQVRo3u2a+VfTQBCAm00iW0nSTVNKbKQYbIMUC6jU4q2IB2rF+74vPEAR LSjIIXgAAiqef65py6MNJe17y1RF8/26L/N1N9O8ZGZcLof/DiYFoiV1cZHwiGVZjh7zalRAYYbn sFsQ6RFwGccyBeJjwSMrPn8lHX6fQqRy3tbAsFiU1So9FA4bNIRD63XNTwTO5pSYc9fuvwbgwaW9 SxqYs/eGBgcAGBy+fRrlpRPDsJdfJoEYuMgvzibz/vK3kmDcFMuxNZvM/BG74QTdFV6PJZsYlhe9 XXCCrlCVStwcyhG45QCkoCmiV0o4uwXEib4aQMHjbc0RTXYvCMx/mGdNHaSgraWxRhEXzsgUEC0C KWjfszlUYRWsrYcUHGttNlSRzxUEo5CCjrZYrSqVVlD3Nwj6vqcZsovzKrPeTy3o/5lmxE4wnFl/ 4QhKLvjy2YY5IEExHMH0B1umQQSj9o+EUUewIBh/m8c4qOBbfu58dQRLCmYnJmZLKphKJicdwR8X vJsymSmhIM37FSv4OJlhxnlUOAJHAC8Ye5PHmPNe9PsEJX/5dT5AigvmPtkw53wnr3xB34809uWc zDp9OWflV7xgBaBlzY79MWORALhuui+vbhoArfwe3rUp5MtWfl2Il1QDUtAaj+rKakv1XdEhBfGm Wo1kq+/pM1Ih+wdRI6iIq3IFvEAewgke6QHFg1mU26PjhbtwghsKEbG1X8ew3PmnUPGfXRAwv7hr yqAD13t6nwPQ23PnBMeivG4gg85c7XwCQOeVU+avZ5bslcrrNm7dfehIInGSguOJo+0Hd27ZoOam j3ULvOjTI02x+PYddLTEY42GJpfnpo/L0g50k8pqI1IfbWikoSFaXxfSFKnMrqFsZpKbKKoWDFbT EdQCqlfCdhtIG7AoESLTQogk4EJd/VRTn8fLgecKTg3MjyUsA4SKDD7MT1bQ8++NmvwCRmydh2Fg UvEAAAAASUVORK5CYII= "
+       style="opacity:0.49074079;image-rendering:optimizeQuality"
+       preserveAspectRatio="none"
+       height="28.710279"
+       width="28.710279" />
+  </g>
+</svg>
diff --git a/app/src/main/assets/ic_device_miband6_disabled.svg b/app/src/main/assets/ic_device_miband6_disabled.svg
new file mode 100644
index 000000000..3796c8d1e
--- /dev/null
+++ b/app/src/main/assets/ic_device_miband6_disabled.svg
@@ -0,0 +1,198 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   version="1.1"
+   id="svg2"
+   width="28.740126"
+   height="28.740126"
+   viewBox="0 0 28.740126 28.740126"
+   sodipodi:docname="ic_device_miband6_disabled.svg"
+   inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:android="http://schemas.android.com/apk/res/android">
+  <metadata
+     id="metadata8">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs6">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 14.370063 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="28.740126 : 14.370063 : 1"
+       inkscape:persp3d-origin="14.370063 : 9.580042 : 1"
+       id="perspective903" />
+  </defs>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1035"
+     id="namedview4"
+     showgrid="false"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:zoom="16"
+     inkscape:cx="7.34375"
+     inkscape:cy="7.65625"
+     inkscape:window-x="0"
+     inkscape:window-y="45"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="layer6"
+     inkscape:pagecheckerboard="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid972" />
+  </sodipodi:namedview>
+  <g
+     inkscape:groupmode="layer"
+     id="layer1"
+     inkscape:label="Background"
+     style="display:inline">
+    <g
+       inkscape:groupmode="layer"
+       id="layer4"
+       inkscape:label="Bottom"
+       style="display:inline"
+       sodipodi:insensitive="true">
+      <rect
+         style="display:inline;fill:#7a7a7a;fill-opacity:1;stroke:none;stroke-width:3.57115173;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect817-5"
+         width="22.819572"
+         height="21.904638"
+         x="2.9239759"
+         y="3.8768768"
+         ry="0.9472276" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer3"
+       inkscape:label="Middle"
+       style="display:inline"
+       sodipodi:insensitive="true">
+      <rect
+         style="display:inline;fill:#9f9f9f;fill-opacity:0.94117647;stroke:none;stroke-width:3.57115173;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect817-7"
+         width="22.819572"
+         height="21.904638"
+         x="2.9317887"
+         y="3.0349438"
+         ry="0.9472276" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer2"
+       inkscape:label="Top"
+       style="display:inline"
+       sodipodi:insensitive="true">
+      <rect
+         style="fill:#8a8a8a;fill-opacity:1;stroke:none;stroke-width:3.57115173;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect817"
+         width="22.819572"
+         height="21.904638"
+         x="2.9238882"
+         y="3.4130721"
+         ry="0.9472276" />
+    </g>
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer6"
+     inkscape:label="Foreground"
+     style="display:inline">
+    <g
+       inkscape:groupmode="layer"
+       id="layer7"
+       inkscape:label="Backplane"
+       style="display:inline" />
+    <g
+       inkscape:groupmode="layer"
+       id="layer8"
+       inkscape:label="Frontplane"
+       style="display:inline">
+      <g
+         inkscape:groupmode="layer"
+         id="layer9"
+         inkscape:label="Base"
+         style="display:inline" />
+      <g
+         inkscape:groupmode="layer"
+         id="layer10"
+         inkscape:label="Top"
+         style="display:inline" />
+      <g
+         inkscape:groupmode="layer"
+         id="layer11"
+         inkscape:label="Toptop"
+         style="display:inline" />
+      <g
+         inkscape:groupmode="layer"
+         id="layer12"
+         inkscape:label="Toptoptop"
+         style="display:inline" />
+    </g>
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:#8a8a8a;fill-opacity:0.94117647"
+       d="m 12.48275,10.865376 h 3.907 v 6.978 h -3.907 z"
+       android:strokeWidth="1"
+       id="path2735" />
+    <path
+       style="fill:#ffffff;fill-opacity:1;stroke-width:3.77953"
+       d="m 5.7616001,14.020795 c 0.00345,-0.03232 0.013618,-0.134324 0.023098,-0.226674 0.052057,-0.502923 0.2664409,-1.351244 0.3915769,-1.549467 0.024477,-0.03878 0.076621,-0.09101 0.1157675,-0.116009 0.1381934,-0.0882 0.4683357,-0.160533 1.0160246,-0.222623 0.1544916,-0.0175 0.3033982,-0.04042 0.3308835,-0.05094 0.069898,-0.02672 0.2694919,-0.0674 0.330556,-0.0674 0.029045,0 0.1528109,-0.05016 0.2885308,-0.116957 0.4663707,-0.229536 0.9722843,-0.357145 1.597637,-0.40298 0.3197226,-0.02344 8.7265726,-0.02361 9.0500356,-1.89e-4 0.652071,0.04723 1.177696,0.187449 1.687436,0.450227 l 0.243463,0.125507 0.310621,0.0306 c 0.596954,0.05887 1.04326,0.137305 1.216256,0.213823 0.0981,0.04344 0.189561,0.12854 0.235198,0.21896 0.08601,0.170462 0.226243,0.687839 0.303984,1.121803 0.153044,0.854198 0.104262,1.629242 -0.16305,2.590391 -0.08412,0.302605 -0.139822,0.434653 -0.218589,0.518609 -0.138246,0.147338 -0.522565,0.238473 -1.348615,0.319808 l -0.335805,0.0331 -0.277042,0.14009 c -0.496631,0.251134 -0.965794,0.377985 -1.611884,0.435808 -0.35012,0.03129 -8.733467,0.03189 -9.1175547,5.69e-4 C 9.1699731,17.413071 8.6287569,17.266844 8.1499924,17.0129 8.0518674,16.96084 8.0001808,16.94464 7.9057793,16.93628 7.8399323,16.93028 7.73792,16.91129 7.6791055,16.89353 7.6203255,16.87586 7.4135092,16.84173 7.2195867,16.81768 6.4522917,16.7226 6.2524395,16.650091 6.1387406,16.425563 6.0865966,16.32256 5.9523078,15.86274 5.8924934,15.58231 5.8777554,15.51301 5.8588804,15.426155 5.8506924,15.389215 5.7756224,15.0526 5.7296503,14.346783 5.7616004,14.020803 Z"
+       id="path1062" />
+    <path
+       id="path_3"
+       d="m 9.449063,13.162063 h 9.841 c 0.29,0 0.568,0.115 0.774,0.32 0.205,0.206 0.32,0.484 0.32,0.774 v 0.228 c 0,0.29 -0.115,0.568 -0.32,0.774 -0.206,0.205 -0.484,0.32 -0.774,0.32 h -9.839 c -0.192,0 -0.381,-0.05 -0.547,-0.146 -0.167,-0.096 -0.305,-0.234 -0.401,-0.401 -0.096,-0.166 -0.147,-0.355 -0.147,-0.547 v -0.228 c 0,-0.29 0.115,-0.568 0.32,-0.774 0.206,-0.205 0.484,-0.32 0.774,-0.32 z"
+       fill="#ffffff"
+       stroke="#ffffff"
+       stroke-width="2.22514"
+       style="fill:#9f9f9f;fill-opacity:1;stroke:#9f9f9f;stroke-opacity:1" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer5"
+     inkscape:label="Original"
+     style="display:none">
+    <image
+       y="0.028144173"
+       x="0.013794855"
+       id="image1291"
+       xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAJAAAACQCAYAAADnRuK4AAAABHNCSVQICAgIfAhkiAAAAAlwSFlz AABO4wAATuMBYdZxSQAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAAZdEVY dFRpdGxlAFR3ZWxmIEljb24gVGVtcGxhdGXyQOONAAAADHRFWHRBdXRob3IAeHBobnh/4OzMAAAA Y3RFWHRDb3B5cmlnaHQAQ0MgQXR0cmlidXRpb24tTm9uQ29tbWVyY2lhbC1TaGFyZUFsaWtlIGh0 dHA6Ly9jcmVhdGl2ZWNvbW1vbnMub3JnL2xpY2Vuc2VzL2J5LW5jLXNhLzQuMC9D0yJcAAANW0lE QVR4nO2dS4xc2VnH/98591VVXd3TbntC92ggwZ5R1BWRRZMoIQG1UIQIs0BCcpINESyyQIqySlgl 2I6yQ2xmtpEQilgQI4EUiAQaQQtCFAiNQjLVUWbsjII19iS2u931vI9zzseiqtxP21V9b7vrlr/f pp/33HPr/O53vvO4VYAgCIIgCIIgCIIgCILwLEBnUz6f8mmfZR7ZpKfyop+GQPvKHNX52mmLKjyS K8NGONAEhclUdMMOy2PsSdMcfr08+LK+JTKdNhurQ0GuD3/RGP58hfc1eSESeUUUMuSQPE0CLgPr ILRv0xp2EMd3CHf3DkiS+yJTQYTh0p4QjS1E0TJvYhGorzA2VjGQ6RoAHklEKECiIhuQDsiz3qC1 9jLF8R1KknNkzDYZs0vAi3CuJeKcEkrNM3ALnrfAnneOw3Cbo2iZN+t3GBtNHkSjh5FoagQ6Ik/j LlSSnKM4NirLbit3fo7Y9AhYgrP9vTjq+iJTTkhVHoqgdIWB+yCvyupeh31/xUWR58Jwm5sX4Abd 21ZhEhUo0NUD8nS7UGkKlS1C2QRq3kA5F5KrJ8Q2IaAOdqnIUxCkAgbaIB2yaoesVMItD06HcP4O XBDA1WpwA4lGkegqYwoEok++ygE/3/+CJv6MVrjIwEIB5QpFw9xyUG9ZuL+Jt+6+tnH1vUneKJRX IPrEN/nFiHrfJqBhHJBYwLqcpQqnglZAqAFPAc7xG0miX3n9s9GtPCOzkwpEAPDJVznQy73NxKBx p8PoZjJBWAbmAsJyjeArfqP747sf2rj6V+mhIf6IJzaomvDchIcJM4Of73+hm6Lx0wdO5CkRnZRx 84FDz9AHgpeWPj+Ycrk2zGOv0j5vnhhgJhHo0DzPNXJwn77VcnDiTulwDNxqOZDWn8LaosI6FLBK B2Vi4GHQOJ5xJxKPThKuN+h+D5esyFNaLAPbfXfp0m6owhgcre0MJx8xnDN68sTjBDPRI3lWCeug xl2oTsbVgq5FOCNaKeba7dCL43nX7d7hS17IYQxurjccNpo4JNERxunC6KA8Ww/neTJb4JUIZ0Jm gbSmvbj2rtefr+leb0l3u1CNu1BYb+zr0h52ZwcYMwcadVt78vT7HS29V/lhANVAedX+olfrWC+t 93SaDtr4oETH8ySB9mXkl7HWXqbRDLN97sKkIzhhGmGmNA79xE/8JHDeXFLVab2i03SwFLXWvj1Y FN+LQgcYX4L1LYrjO2TMLmWLUHNJXxd4GcIZ4uvMDzx4WdLxsijQc0lfZ4tQcfy2iuMVOrQF50A0 GiOJHnZf7UVKkpCcWyKbQJkalF/whQhng/XIQwYKgwBpljIZsE2gnFtwgy03Sxh2Y0dC0JgR6DLW sAZjlsier9G8gXLZxJOQwpTiZ/Csb7Q1mY5Mql0V6jkXkT3fIWOWht0YcNzO0oklcLZLzsVkLRSY ZTV9BnAM5RtPs4NyUUDOBeRcTM7ODdt37ZHHji3QKP9h0yPnIpKtGLMDe1BgQy4g5SwUc0rOxYfa 9/Kxx55gS+sSsNAHerUTVFWYRpg9YoDAIOaM2PEgSJgeGZNRHIOAxWOPHTMCjbLwF/edNJMINDNY YjYUPvx5/OBwghyoP9xRKMwWIdgZAioTBQcZSQkD2J4oKIhAQi5EICEXRT5Y+FR56ZzC5z7o46Mv eHi+RvBLditkDvhFl/Hddwy+/oMMb+2UcyN5KQX67Ad8fOXjIXSJU3lfAS/UCZff7+MPXvZx9TsJ /rqZnXW1JqZk9y3wykUPV36z3PIcRivgq78V4nd/tXz3c6kECjTw5Y+Fp/6eNGcBAfjKx8LSdcWl qu5HVjTeU5tFfQYszxE+vFKuXTKlEuilc6Wq7ol4uWTXWKra1vzZjT4j5kp2jaUSSJg+RCAhFyKQ kIvyTTw8ht2kHA8aLYSPznNePqfwexc97MSM/3nXIpnyZ+9mSqBf/8supv1RawJw80/mHvn3Vy55 eOXSoFluPnD4o3/o45329F6UdGFTzMXnFL78G+GT//EMEYGeMnrCV/xDy9M9sSgCPWUmXaqoTPm8 kAgk5EIEespM+mZcjqc3gQZmbBR2HH/+2xF+7fmzuU9++AuHL/1LfOB36YTD8p9sT/dGs5kX6MU6 4aXFsxFop58vemQO+Iv/TAuqzekw8wKVjTe3HW7sOPxfy+Hv3zR4UyKQMAn/eMPgtc3pjjr7kSRa yIUIJORCBBJyIQIJuRCBhFyIQEIuRCAhFyKQkAsRSMiFCCTkQgQSciECCbkQgYRciEBCLkQgIRci kJALEUjIhQgk5EIEEnIhAgm5EIGEXIhAQi5EICEXIpCQCxFIyIUIJORCBBJyIQIJuRCBhFyIQEIu RCAhFyKQkAsRSMjFzL9D2a02Y/GMPhH51hR/REFRzLxAh98lVSgW6cKEXIhAQi5EICEXIpCQCxFI yMVMjcL++49rZ12FZ46ZEuhxn0UqnA7ShQm5EIGEXIhAQi5KJVAnm/21pXZarmsslUA3pvyzs4rg rTNa+D0ppRLoe7ct3u2W6w6dhDsdxn/dnvAzMc+YUgmUWuBr/5FgFhViAF/9ToKsXAGoXAIBwLdv Glz99wS2ZC/047AO+LN/S/BPb5uzrsrElHIi8RtvZPjebYvPfdDHR1/w8Es1gi7ZrWAc8PMu47vv GHz9B1npcp8RpRQIAN7advjTf00AJGddlWeakt23wrQhAgm5EIGEXIhAwgDSJ5odmVggpStMOpzF qZhnnASkPAb6Ex01pkCrQ2FuTVgpoRxoJvJ4NJ4lGn9B7gRd2H1gd7KTCNMNkWGCZpBhIp9JBaxU zORV2fMWOIqWH9nWYwsURcvseQtMXnVQuApEoBmBDBzIskojRypjooCVig617/Vjjz1BDlRjpSLW Gg5EItEMoAgu87Ql1Xc6YadUykpFrHRn2L6bjz52vFNcxyY24XnnWN/rcsuDI5WIPDNC5sPozFql 4foKTvXgHqiY9b059rz7vFlfGbb1lSNtPoZAVxhoMOorHIbbrNQ86xDOj8Ny7TsQHok2bJSX2TRj 4/mB9Tw4HcIptcthuDSUpnFswBi/C9tY5UEe1GJ/B67loZyrf8IRUsMms37mh3MmSGE6YcX6O3BR 9D4XRbcZG6v75Tkg0pMEYmD0qMx1bNbvcK0GFwRwfrVjwdKLzQAchEHmJzBhqkwn7Fn94K4LArgw 3B52X6ME+uhjU2NGoGE3trHKzeg212pwldacBUsQKj3s0Df9LK5VsnYltkG7aiuVOVurwTUvwGGj OWj7Y/IfYDyBhlHoCgNbjM1PuOYFuFoNDnHaK/ZqhKcNx0k76FoTtPu21oWpVu/vk2d1nzwE4Ohm 0AmG8fsk2mhy8wKc6/duzOT+0mcFZnC//9N6/ZfN4iJMrQZ3YyHZF3m29stzLONuKGMANCiIGbgG bDTBH8+uc2t3jebnAZLHiksFM7jdBiW9v72x8IZDfWWYLDcBrDDQwCF5jg0Vk+xIPCKR+8ndV+n9 5/8QzjWoXge80m5wfLYwGbjdAZLkR+n/3nwNmztuIM0W9sQBniTPgf+YEBqV+ytf/OF7qVL5Fitq kO8D2gdkgno6YQJsBs4yENOP2HV//2df+7ufDf54RBrgMeKMyNvvEMB4z+98o1r5yIc/D8efBqmL rNR8znKFU4Act8C4odhe737/+6/9/J+/FQ+S5KsjUSa+8wsRCLhGAFSjAXXvXsdPa+e9auK81E/9 wKt4Jkt9Z632fa3ZQTFbAhQhAJidJE85IVKMFAAcE2kmBZdl1iqtrfbIZNZkfgoTV5FW491sYWHB DhJluMeNsMYhb9LCg+z5KoBVjqLXuVJZsejeQ78+xxUvQZakHEaBsybTzkJzpCmwRgEAsyfyFAE7 UGAYAFKtHSWW/TCz2oNN0tQGEZtQOWPb1nqV4faMjcVhznNyeYD8EWhYBgP4lMJ6gxp3oXZ353Wy 0NK1LrwsCrTJUh2ZVNuQlLNQQAVgQ8yZCFQQRP5AAspYaTidsIu9wHp+YP04td0aTLg7bxcWWnZv mP5Nl1egAodNDcbGKpprO3wpSZzbAXXqPTsXA2TAWTVw1kKx84k5I+aU5A3piqOLFEQBE1WZkLEL 4fwenGdT1wl7Ntipuqjqub3oU8wMXhEC7evGrgP1Bocx2Bg4tKvoLoJtAjWfQjkXk3MgnksIAAzq BZxeAIAQbQAJqANWKmZlI25Fg1X1YKe6b20LDLyOwXA9X/QBiunChuWMkukmjbqyJDlHcfy2cm6B 7PkaOdslNj1ytipd1ymhdG+wa1TXWN/rslK7HEXvc2G4zXvLEwdmmHMJVGAXdnCWurnecGvtkMJw gZPkPpkWyJjdoTjzcK4lEhWMUvMM7ALYheeBvep9DsMljqJwEHk2msOu6/HLE5NQlEDHLnVsYpWx fofQTmgNy4jjUa1bBZ1WOEgLwAKAwR72TdwG6hjmPK/j0MIoUEAeVHQUeDhDPZwbGtIk4PLw+y3C esFnFfbYAPYew7qOgzsJi5UHKF6gQ+WO6nhNuqszY/x1rZNw2g0r4kwPskApCIIgCIJQEP8P03/B 430mofMAAAAASUVORK5CYII= "
+       style="opacity:0.49074079;image-rendering:optimizeQuality"
+       preserveAspectRatio="none"
+       height="28.670942"
+       width="28.670942" />
+    <image
+       y="0.0055872202"
+       x="-0.031073861"
+       id="image3082"
+       xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAJAAAACQCAYAAADnRuK4AAAABHNCSVQICAgIfAhkiAAAAAlwSFlz AABO4wAATuMBYdZxSQAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAAZdEVY dFRpdGxlAFR3ZWxmIEljb24gVGVtcGxhdGXyQOONAAAADHRFWHRBdXRob3IAeHBobnh/4OzMAAAA Y3RFWHRDb3B5cmlnaHQAQ0MgQXR0cmlidXRpb24tTm9uQ29tbWVyY2lhbC1TaGFyZUFsaWtlIGh0 dHA6Ly9jcmVhdGl2ZWNvbW1vbnMub3JnL2xpY2Vuc2VzL2J5LW5jLXNhLzQuMC9D0yJcAAAL6klE QVR4nO3dTYvcRhrA8adKJZW6Zc0LmTEmmYUF5zYOJjQLOSTQEMhlA7uHsNlPsCHg5DP4MzghHyC3 xZvTGh8CgYaQXMwEkngOZo1f2JAYz2ReLHePSqqqZy+t2Z5xj6c1pbZa7ecHxo09LdVEf0rVkjIG IIQQQgghhBBCCCEvA9bw7ZPJ4TQ2Oo0DPG6bFFJ9xoVTWUxVH1g25vXxfTAAgG63W/GuSa/XK14e DwTH/HklEVUZ0PF4ilBYkiQMACBN0yP7U0rRzFQRKeWRIMIwRACAOI6x1+uNBlRpRNMIiAEAK8JJ 05QppZjWmmmtGQCAtZbCmRLOOQIACCFQCIFSSgzDEEdCGo1oZgJ6Jp6trS2ulGJpmvI8z/nKysph QMaYw/1STO6KaAAAPM87DGh7ext937dhGFopJa6urtqqI6oyoCPx9Pt9nmUZX15e5koprrXm1lpm rWWIyOI4pngqxDnHJEmAMYacc+ScoxDCSint7u6uDYLARlFkx0RUe0Ds2rVrQRRFn3qe93fO+UVE XKxgu6R6TxDxP4j4z4cPH3529epVNfzzM0fkGhD78ssv/2CtvckYW7fWgtYaEKdyyYE4YoyBEAI4 54CIt5VSf/7oo4/+O/IlpQ/cWQNiAADXrl0LFhYWNowx60mSQJZlZ9wceZGCIIA4jsHzvNsPHjz4 09WrVzM44/UiXnLfhx/PAQCiKPo0z/P1nZ0diqdBsiyDnZ0dyPP80tra2hUYWcPC+Gt5JyoT0DPX eRhjH+7t7dEpq4EQEfb29oAx9rdOp8O73S6H8SEdj+oIMeH+xl0kZP1+/3WKp7kQEQ4ODl7f39/n aZpip9NBAICNjY1xH/MZjDmlTRpQ4chH9SzL2mcdPJkNSqlzSZKINE1tv99HIQSur68X14yKLztx lpjkFDb2ImG/3+fGGLfRk9oZYyCKIhFFkVhYWPAGg4HX7/f51tYW73a7405nR0y6BnomnoODA6+i 74HUTCklDg4OxNOnT0Ucx16WZXxMRGOddgo78sYkSVhxhXlpaansJzgygxCR+b7ve55nfd83aZqa OI4hSRIQQuDwRjjCCWugiSPodrssTVOmtWbD2xM0A80Jz/P8LMuEUkqEYegppbzl5WWepilP05QN Z6HCkUllkkU0AwCWJAlTSjFrLSvubVX6XZDaaK2F7/ssz3PgnKPWGpVS3FprRx65cZuBhjtiw7vq vN1uU0BzwvM8YYzxgiDwtNZeu93m1lpmjGFa68PnucBhEX3IGMOGG+eISHfT5wAiciGEZ609fGKi +HXaeycOqFj/aK0n3jhpBmstR0RmreVSyuI1O3/+/KnvpdMQgeGZhCEiK+Kx1h5OGMcfRR5V5jrQ uJ2SORAEAUNEFoZh6feeaQ1E8cynYllS5vjSKYwAwNnPKBQQcUIBESdlH+eYGa+++ip0Oh1YW1uD KIqAsWYty4wxkCQJ3L9/H27dugX7+/t1D+lMGhnQO++8A2+99Vbdw3DieR4sLS3Bm2++CW+88Qbc vHkT7ty5U/ewSmvcKazT6TQ+nuOEEPD+++/D2tpa3UMprVEBtVotePvtt+sexlRwzuHdd9+texil NSqgixcvQhAEdQ9jas6fPw8rKyt1D6OURgXUtP+4Z/HKK6/UPYRSGhWQ7/t1D2HqpJR1D6GURgVE Zg8FRJxQQMRJIy8kjoOIoJQ6/Qtrxhh77jrnwoULoJSCfr8Pv/76K1hrX+DoypubgAaDAXzxxRd1 D+NU586dg48//vjEv798+TJcvnwZAAAePXoE169fhzRNX9TwSqNT2Ay7cOHCzF84pYBesHa73I8T mPXbGxTQC1b2WtasX/uigIgTCugFK/upatZ//tLcfAo7yQcffAALCwu17PvevXuj//wAAAA8ffq0 1Da2trYqHFH15j6gpaUlWF5ermXf4w5+mRklyzL4/vvvqxxS5eY+oKZ59OgR7O3twc7ODty+fXvm H3WlgGbMjz/+CD/99FPdw5gYLaKJEwqIOKGAiBMKiDihgIgTCog4oYCIEwqIOKGAiBMKiDihgIgT Cog4oYCIEwqIOKGAiBMKiDihgIgTCog4oYCIEwqIOKGAiBMKiDihgIgTCog4oYCIEwqIOKGAiBMK iDihgIgTCog4oYCIEwqIOKGAiJO5/wllu7u7YIypZd9JktSy3xdp7gP66quv6h7CXKNTGHFCAREn FBBxQgERJxQQcTI3n8La7TZ88skndQ/jVIyxuodQqbkJiDEGYRjWPYyXDp3CiBMKiDihgIiTRgWU ZVndQ5g6pVTdQyilUQH9/vvvdQ9h6pr2PTYqoLt37871LPT48WPY3t6uexilNCqgNE3h22+/rXsY U2GthW+++abuYZTWqIAAAH744YeZ/3dEy8rzHG7cuAG//PJL3UMprZEXEr/77ju4d+8edDodWFtb g3PnzjXuCq8xBp48eQL379+HW7duwZMnT+oe0pk0MiAAgN9++w1u3LhR9zBeeo07hZHZQgERJxQQ cUIBEQAAYIzhWd5XOiDP8/CsOyOzjXNe+rhOGhAFM8eyLEPGGKZpCgDlZqMzn8JoFpofw2OJjDFk jCHnHDnnKIRAIQSGYXjisZ44oDAMDzdY7KCS0ZPacc7tMBybpulhRI8fPz79vWV35nkecs7R8zxL s9B8YIxZrbXhnFvP82wxQUwySZQKSAiB29vbKISw/X6f4pkTxhjteZ4ZxmMHg4EdThIohMA4jotj /cwxnyQgBACM4xillMg5Ryml9X2/np9YQConhNBZlpk8z7Xv+0YIYaWUdnisT4wHoMQM1Ov1sFgH 7e7uWiGErWT0pHZaay2lzKWUOssyLaU0u7u7NgxDG4Yh9nq90XiOhHTazVQEgMPb3HEcY5qmFgAg SRKDiI27C06egVLKfDAYWEQ0Ukq7t7dnW62WlVKOnr7GKnMdCItZKIoi22q1DCItg5oOEUFrnUdR lLdaLZMkiWm1WiaKIru6umqHs0/x6xmTroGK33FjY8Ourq7aKIpslmWDir4PUhOlVNLv93WSJKbf 7+t2u/28eJ6JqOzzQAgA0Ov1oNvt2sFgcFdK2aHTWDMhIgwGg3txHOtisRyGIW5sbIyGU9kpbPQ1 9no91FpfT5IE6FTWPIgISZKAMeZfi4uLdnV11W5ubpqNjQ0LABaejWfsQfZK7vfIVPPaa69tRFH0 V2PMed/3gXO6ud8EWmtIkgSyLPv5zp07/+j1evrBgwfPi+XEGeKs557D9125cuWPUsp/c87XhRAg RGOfkn0paK1Baw3W2p+VUn/5/PPPHw7/alwkp55aXBcvDADgvffea1+6dOkKAHzIGLvIOV9w3C6Z AmvtE0S8i4jXNzc3P/v6669TOGWRfJpKAhr+ztfX1/n29rYfRZFQSgnf9/08z4UQwjfGeL7ve9Za joiseO/wNXEwck+yuBFq8zw3nueZPM91EAR5lmW63W5naZrmi4uLZnNzc3StA3CGeADc/6+M0QuN GIYhtlot0+/3IY5jPDg4gCAIUGttpZSeMcYDABYEAQegeKpURJTnuUVElFKaLMvM8HcdhqEeXuMp Hs84dYE8iaoWLAgArLhSrbVmUkqmtTZSSuCco9YajTFWSskRERCRUUDVKQISQqBSyiKiDYLA+L5v ENG0Wi2TZZmNosg+7+Zo6f26bgCOnsZYp9Ph+/v7fDAYeHEce0opT2vN2+02N8Zway2jeKZj9IEw z/PsYDCwwxujJkkS0263zeLioh1+VHda+xSqmIHG3S9DrbVNkgSWl5dRKcWzLOPWWlYENPzaCnZP AP7/zyoUARljMAxDK6W0u7u7NgiCk+5tOc1CVc0CR2ahbrfLtra2uFKKpWnKrbXMGMNWVlaY1poZ Y2j2mZLiGZ7t7W0sHv4bhoST3p4oo+qAites2+2yJElYmqZMKcW01kxrffh11lqKqGKjTxAWjx9L KTEMQ4zjGE+4MToTAR3f1uHH9CIkAIA0TSmaF6R4EH4kHICK4wGoNqDj25vkNZmOkyKpNB6A6R3M 49ulaOpT6aL5uGkfWApndtAjE4QQQgghFfkfLnfEbGu/P8gAAAAASUVORK5CYII= "
+       style="display:inline;image-rendering:optimizeQuality"
+       preserveAspectRatio="none"
+       height="28.697369"
+       width="28.697369" />
+  </g>
+</svg>
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java
index 0008e557c..e36839e64 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java
@@ -61,7 +61,7 @@ public enum DeviceType {
     AMAZFITGTR2E(34, R.drawable.ic_device_zetime, R.drawable.ic_device_zetime_disabled, R.string.devicetype_amazfit_gtr2e),
     AMAZFITGTS2E(35, R.drawable.ic_device_amazfit_bip, R.drawable.ic_device_amazfit_bip_disabled,R.string .devicetype_amazfit_gts2e),
     AMAZFITX(36, R.drawable.ic_device_miband2, R.drawable.ic_device_miband2_disabled, R.string.devicetype_amazfit_x),
-    MIBAND6(37, R.drawable.ic_device_miband2, R.drawable.ic_device_miband2_disabled, R.string.devicetype_miband6),
+    MIBAND6(37, R.drawable.ic_device_miband6, R.drawable.ic_device_miband6_disabled, R.string.devicetype_miband6),
     AMAZFITTREXPRO(38, R.drawable.ic_device_zetime, R.drawable.ic_device_zetime_disabled, R.string.devicetype_amazfit_trex_pro),
     AMAZFITPOP(39, R.drawable.ic_device_amazfit_bip, R.drawable.ic_device_amazfit_bip_disabled, R.string.devicetype_amazfit_pop),
     AMAZFITPOPPRO(10040, R.drawable.ic_device_amazfit_bip, R.drawable.ic_device_amazfit_bip_disabled, R.string.devicetype_amazfit_pop_pro),
diff --git a/app/src/main/res/drawable/ic_device_miband6.xml b/app/src/main/res/drawable/ic_device_miband6.xml
new file mode 100644
index 000000000..89551edb6
--- /dev/null
+++ b/app/src/main/res/drawable/ic_device_miband6.xml
@@ -0,0 +1,30 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="28.740126dp"
+    android:height="28.740126dp"
+    android:viewportWidth="28.740126"
+    android:viewportHeight="28.740126">
+  <path
+      android:pathData="M3.8712,3.8769L24.7963,3.8769A0.9472,0.9472 0,0 1,25.7435 4.8241L25.7435,24.8343A0.9472,0.9472 0,0 1,24.7963 25.7815L3.8712,25.7815A0.9472,0.9472 0,0 1,2.924 24.8343L2.924,4.8241A0.9472,0.9472 0,0 1,3.8712 3.8769z"
+      android:strokeWidth="3.57115"
+      android:fillColor="#1f7fdb"
+      android:strokeColor="#00000000"/>
+  <path
+      android:pathData="M3.879,3.0349L24.8041,3.0349A0.9472,0.9472 0,0 1,25.7514 3.9822L25.7514,23.9924A0.9472,0.9472 0,0 1,24.8041 24.9396L3.879,24.9396A0.9472,0.9472 0,0 1,2.9318 23.9924L2.9318,3.9822A0.9472,0.9472 0,0 1,3.879 3.0349z"
+      android:strokeWidth="3.57115"
+      android:fillColor="#4dabf5"
+      android:strokeColor="#00000000"/>
+  <path
+      android:pathData="M3.8711,3.4131L24.7962,3.4131A0.9472,0.9472 0,0 1,25.7435 4.3603L25.7435,24.3705A0.9472,0.9472 0,0 1,24.7962 25.3177L3.8711,25.3177A0.9472,0.9472 0,0 1,2.9239 24.3705L2.9239,4.3603A0.9472,0.9472 0,0 1,3.8711 3.4131z"
+      android:strokeWidth="3.57115"
+      android:fillColor="#2196f3"
+      android:strokeColor="#00000000"/>
+  <path
+      android:pathData="m5.7616,14.0208c0.0034,-0.0323 0.0136,-0.1343 0.0231,-0.2267 0.0521,-0.5029 0.2664,-1.3512 0.3916,-1.5495 0.0245,-0.0388 0.0766,-0.091 0.1158,-0.116 0.1382,-0.0882 0.4683,-0.1605 1.016,-0.2226 0.1545,-0.0175 0.3034,-0.0404 0.3309,-0.0509 0.0699,-0.0267 0.2695,-0.0674 0.3306,-0.0674 0.029,0 0.1528,-0.0502 0.2885,-0.117 0.4664,-0.2295 0.9723,-0.3571 1.5976,-0.403 0.3197,-0.0234 8.7266,-0.0236 9.05,-0.0002 0.6521,0.0472 1.1777,0.1874 1.6874,0.4502l0.2435,0.1255 0.3106,0.0306c0.597,0.0589 1.0433,0.1373 1.2163,0.2138 0.0981,0.0434 0.1896,0.1285 0.2352,0.219 0.086,0.1705 0.2262,0.6878 0.304,1.1218 0.153,0.8542 0.1043,1.6292 -0.163,2.5904 -0.0841,0.3026 -0.1398,0.4347 -0.2186,0.5186 -0.1382,0.1473 -0.5226,0.2385 -1.3486,0.3198l-0.3358,0.0331 -0.277,0.1401c-0.4966,0.2511 -0.9658,0.378 -1.6119,0.4358 -0.3501,0.0313 -8.7335,0.0319 -9.1176,0.0006 -0.6602,-0.0538 -1.2014,-0.2 -1.6801,-0.454 -0.0981,-0.0521 -0.1498,-0.0683 -0.2442,-0.0766 -0.0658,-0.006 -0.1679,-0.025 -0.2267,-0.0428 -0.0588,-0.0177 -0.2656,-0.0518 -0.4595,-0.0759C6.4523,16.7226 6.2524,16.6501 6.1387,16.4256 6.0866,16.3226 5.9523,15.8627 5.8925,15.5823 5.8778,15.513 5.8589,15.4262 5.8507,15.3892 5.7756,15.0526 5.7297,14.3468 5.7616,14.0208Z"
+      android:strokeWidth="3.77953"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="m9.4491,13.1621h9.841c0.29,0 0.568,0.115 0.774,0.32 0.205,0.206 0.32,0.484 0.32,0.774v0.228c0,0.29 -0.115,0.568 -0.32,0.774 -0.206,0.205 -0.484,0.32 -0.774,0.32L9.4511,15.5781C9.2591,15.5781 9.0701,15.5281 8.9041,15.4321 8.7371,15.3361 8.5991,15.1981 8.5031,15.0311 8.4071,14.8651 8.3561,14.6761 8.3561,14.4841v-0.228c0,-0.29 0.115,-0.568 0.32,-0.774 0.206,-0.205 0.484,-0.32 0.774,-0.32z"
+      android:strokeWidth="2.22514"
+      android:fillColor="#4dabf5"
+      android:strokeColor="#4dabf5"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_device_miband6_disabled.xml b/app/src/main/res/drawable/ic_device_miband6_disabled.xml
new file mode 100644
index 000000000..9a841e43f
--- /dev/null
+++ b/app/src/main/res/drawable/ic_device_miband6_disabled.xml
@@ -0,0 +1,35 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="28.740126dp"
+    android:height="28.740126dp"
+    android:viewportWidth="28.740126"
+    android:viewportHeight="28.740126">
+  <path
+      android:pathData="M3.8712,3.8769L24.7963,3.8769A0.9472,0.9472 0,0 1,25.7435 4.8241L25.7435,24.8343A0.9472,0.9472 0,0 1,24.7963 25.7815L3.8712,25.7815A0.9472,0.9472 0,0 1,2.924 24.8343L2.924,4.8241A0.9472,0.9472 0,0 1,3.8712 3.8769z"
+      android:strokeWidth="3.57115173"
+      android:fillColor="#7a7a7a"
+      android:strokeColor="#00000000"/>
+  <path
+      android:pathData="M3.879,3.0349L24.8041,3.0349A0.9472,0.9472 0,0 1,25.7514 3.9822L25.7514,23.9924A0.9472,0.9472 0,0 1,24.8041 24.9396L3.879,24.9396A0.9472,0.9472 0,0 1,2.9318 23.9924L2.9318,3.9822A0.9472,0.9472 0,0 1,3.879 3.0349z"
+      android:strokeWidth="3.57115173"
+      android:fillColor="#9f9f9f"
+      android:strokeColor="#00000000"
+      android:fillAlpha="0.9411765"/>
+  <path
+      android:pathData="M3.8711,3.4131L24.7962,3.4131A0.9472,0.9472 0,0 1,25.7435 4.3603L25.7435,24.3705A0.9472,0.9472 0,0 1,24.7962 25.3177L3.8711,25.3177A0.9472,0.9472 0,0 1,2.9239 24.3705L2.9239,4.3603A0.9472,0.9472 0,0 1,3.8711 3.4131z"
+      android:strokeWidth="3.57115173"
+      android:fillColor="#8a8a8a"
+      android:strokeColor="#00000000"/>
+  <path
+      android:pathData="m12.4827,10.8654h3.907v6.978h-3.907z"
+      android:fillColor="#8a8a8a"
+      android:fillAlpha="0.9411765"/>
+  <path
+      android:pathData="m5.7616,14.0208c0.0034,-0.0323 0.0136,-0.1343 0.0231,-0.2267 0.0521,-0.5029 0.2664,-1.3512 0.3916,-1.5495 0.0245,-0.0388 0.0766,-0.091 0.1158,-0.116 0.1382,-0.0882 0.4683,-0.1605 1.016,-0.2226 0.1545,-0.0175 0.3034,-0.0404 0.3309,-0.0509 0.0699,-0.0267 0.2695,-0.0674 0.3306,-0.0674 0.029,0 0.1528,-0.0502 0.2885,-0.117 0.4664,-0.2295 0.9723,-0.3571 1.5976,-0.403 0.3197,-0.0234 8.7266,-0.0236 9.05,-0.0002 0.6521,0.0472 1.1777,0.1874 1.6874,0.4502l0.2435,0.1255 0.3106,0.0306c0.597,0.0589 1.0433,0.1373 1.2163,0.2138 0.0981,0.0434 0.1896,0.1285 0.2352,0.219 0.086,0.1705 0.2262,0.6878 0.304,1.1218 0.153,0.8542 0.1043,1.6292 -0.163,2.5904 -0.0841,0.3026 -0.1398,0.4347 -0.2186,0.5186 -0.1382,0.1473 -0.5226,0.2385 -1.3486,0.3198l-0.3358,0.0331 -0.277,0.1401c-0.4966,0.2511 -0.9658,0.378 -1.6119,0.4358 -0.3501,0.0313 -8.7335,0.0319 -9.1176,0.0006C9.17,17.4131 8.6288,17.2668 8.15,17.0129 8.0519,16.9608 8.0002,16.9446 7.9058,16.9363 7.8399,16.9303 7.7379,16.9113 7.6791,16.8935 7.6203,16.8759 7.4135,16.8417 7.2196,16.8177 6.4523,16.7226 6.2524,16.6501 6.1387,16.4256 6.0866,16.3226 5.9523,15.8627 5.8925,15.5823 5.8778,15.513 5.8589,15.4262 5.8507,15.3892 5.7756,15.0526 5.7297,14.3468 5.7616,14.0208Z"
+      android:strokeWidth="3.77953"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="m9.4491,13.1621h9.841c0.29,0 0.568,0.115 0.774,0.32 0.205,0.206 0.32,0.484 0.32,0.774v0.228c0,0.29 -0.115,0.568 -0.32,0.774 -0.206,0.205 -0.484,0.32 -0.774,0.32h-9.839c-0.192,0 -0.381,-0.05 -0.547,-0.146 -0.167,-0.096 -0.305,-0.234 -0.401,-0.401 -0.096,-0.166 -0.147,-0.355 -0.147,-0.547v-0.228c0,-0.29 0.115,-0.568 0.32,-0.774 0.206,-0.205 0.484,-0.32 0.774,-0.32z"
+      android:strokeWidth="2.22514"
+      android:fillColor="#9f9f9f"
+      android:strokeColor="#9f9f9f"/>
+</vector>

From 634edc0061634b46dde1b05ea39095e2e220fdc8 Mon Sep 17 00:00:00 2001
From: vanous <petr@linuks.cz>
Date: Sun, 15 May 2022 15:41:43 +0200
Subject: [PATCH 055/110] optimize icons with avocado

---
 .../main/res/drawable/ic_device_miband6.xml   | 45 +++++-----
 .../drawable/ic_device_miband6_disabled.xml   | 55 ++++++-------
 .../res/drawable/ic_device_sony_wf_800n.xml   | 76 ++++++++++++++---
 .../ic_device_sony_wf_800n_disabled.xml       | 82 +++++++++++++++----
 4 files changed, 178 insertions(+), 80 deletions(-)

diff --git a/app/src/main/res/drawable/ic_device_miband6.xml b/app/src/main/res/drawable/ic_device_miband6.xml
index 89551edb6..4d59e071e 100644
--- a/app/src/main/res/drawable/ic_device_miband6.xml
+++ b/app/src/main/res/drawable/ic_device_miband6.xml
@@ -3,28 +3,25 @@
     android:height="28.740126dp"
     android:viewportWidth="28.740126"
     android:viewportHeight="28.740126">
-  <path
-      android:pathData="M3.8712,3.8769L24.7963,3.8769A0.9472,0.9472 0,0 1,25.7435 4.8241L25.7435,24.8343A0.9472,0.9472 0,0 1,24.7963 25.7815L3.8712,25.7815A0.9472,0.9472 0,0 1,2.924 24.8343L2.924,4.8241A0.9472,0.9472 0,0 1,3.8712 3.8769z"
-      android:strokeWidth="3.57115"
-      android:fillColor="#1f7fdb"
-      android:strokeColor="#00000000"/>
-  <path
-      android:pathData="M3.879,3.0349L24.8041,3.0349A0.9472,0.9472 0,0 1,25.7514 3.9822L25.7514,23.9924A0.9472,0.9472 0,0 1,24.8041 24.9396L3.879,24.9396A0.9472,0.9472 0,0 1,2.9318 23.9924L2.9318,3.9822A0.9472,0.9472 0,0 1,3.879 3.0349z"
-      android:strokeWidth="3.57115"
-      android:fillColor="#4dabf5"
-      android:strokeColor="#00000000"/>
-  <path
-      android:pathData="M3.8711,3.4131L24.7962,3.4131A0.9472,0.9472 0,0 1,25.7435 4.3603L25.7435,24.3705A0.9472,0.9472 0,0 1,24.7962 25.3177L3.8711,25.3177A0.9472,0.9472 0,0 1,2.9239 24.3705L2.9239,4.3603A0.9472,0.9472 0,0 1,3.8711 3.4131z"
-      android:strokeWidth="3.57115"
-      android:fillColor="#2196f3"
-      android:strokeColor="#00000000"/>
-  <path
-      android:pathData="m5.7616,14.0208c0.0034,-0.0323 0.0136,-0.1343 0.0231,-0.2267 0.0521,-0.5029 0.2664,-1.3512 0.3916,-1.5495 0.0245,-0.0388 0.0766,-0.091 0.1158,-0.116 0.1382,-0.0882 0.4683,-0.1605 1.016,-0.2226 0.1545,-0.0175 0.3034,-0.0404 0.3309,-0.0509 0.0699,-0.0267 0.2695,-0.0674 0.3306,-0.0674 0.029,0 0.1528,-0.0502 0.2885,-0.117 0.4664,-0.2295 0.9723,-0.3571 1.5976,-0.403 0.3197,-0.0234 8.7266,-0.0236 9.05,-0.0002 0.6521,0.0472 1.1777,0.1874 1.6874,0.4502l0.2435,0.1255 0.3106,0.0306c0.597,0.0589 1.0433,0.1373 1.2163,0.2138 0.0981,0.0434 0.1896,0.1285 0.2352,0.219 0.086,0.1705 0.2262,0.6878 0.304,1.1218 0.153,0.8542 0.1043,1.6292 -0.163,2.5904 -0.0841,0.3026 -0.1398,0.4347 -0.2186,0.5186 -0.1382,0.1473 -0.5226,0.2385 -1.3486,0.3198l-0.3358,0.0331 -0.277,0.1401c-0.4966,0.2511 -0.9658,0.378 -1.6119,0.4358 -0.3501,0.0313 -8.7335,0.0319 -9.1176,0.0006 -0.6602,-0.0538 -1.2014,-0.2 -1.6801,-0.454 -0.0981,-0.0521 -0.1498,-0.0683 -0.2442,-0.0766 -0.0658,-0.006 -0.1679,-0.025 -0.2267,-0.0428 -0.0588,-0.0177 -0.2656,-0.0518 -0.4595,-0.0759C6.4523,16.7226 6.2524,16.6501 6.1387,16.4256 6.0866,16.3226 5.9523,15.8627 5.8925,15.5823 5.8778,15.513 5.8589,15.4262 5.8507,15.3892 5.7756,15.0526 5.7297,14.3468 5.7616,14.0208Z"
-      android:strokeWidth="3.77953"
-      android:fillColor="#ffffff"/>
-  <path
-      android:pathData="m9.4491,13.1621h9.841c0.29,0 0.568,0.115 0.774,0.32 0.205,0.206 0.32,0.484 0.32,0.774v0.228c0,0.29 -0.115,0.568 -0.32,0.774 -0.206,0.205 -0.484,0.32 -0.774,0.32L9.4511,15.5781C9.2591,15.5781 9.0701,15.5281 8.9041,15.4321 8.7371,15.3361 8.5991,15.1981 8.5031,15.0311 8.4071,14.8651 8.3561,14.6761 8.3561,14.4841v-0.228c0,-0.29 0.115,-0.568 0.32,-0.774 0.206,-0.205 0.484,-0.32 0.774,-0.32z"
-      android:strokeWidth="2.22514"
-      android:fillColor="#4dabf5"
-      android:strokeColor="#4dabf5"/>
+    <path
+        android:fillColor="#1f7fdb"
+        android:pathData="M3.871 3.877h20.925a0.947 0.947 0 0 1 0.948 0.947v20.01a0.947 0.947 0 0 1-0.948 0.948H3.871a0.947 0.947 0 0 1-0.947-0.948V4.824a0.947 0.947 0 0 1 0.947-0.947z"
+        android:strokeWidth="3.57115" />
+    <path
+        android:fillColor="#4dabf5"
+        android:pathData="M3.879 3.035h20.925a0.947 0.947 0 0 1 0.947 0.947v20.01a0.947 0.947 0 0 1-0.947 0.948H3.88a0.947 0.947 0 0 1-0.947-0.948V3.982A0.947 0.947 0 0 1 3.88 3.035z"
+        android:strokeWidth="3.57115" />
+    <path
+        android:fillColor="#2196f3"
+        android:pathData="M3.871 3.413h20.925a0.947 0.947 0 0 1 0.948 0.947v20.01a0.947 0.947 0 0 1-0.948 0.948H3.871a0.947 0.947 0 0 1-0.947-0.948V4.36A0.947 0.947 0 0 1 3.87 3.413z"
+        android:strokeWidth="3.57115" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M5.762 14.02l0.023-0.226c0.052-0.503 0.266-1.351 0.391-1.55 0.025-0.038 0.077-0.09 0.116-0.115 0.138-0.089 0.468-0.16 1.016-0.223 0.155-0.018 0.304-0.04 0.331-0.05 0.07-0.028 0.27-0.068 0.33-0.068 0.03 0 0.153-0.05 0.29-0.117 0.465-0.23 0.971-0.357 1.597-0.403 0.32-0.024 8.726-0.024 9.05 0 0.652 0.047 1.177 0.187 1.687 0.45l0.244 0.125 0.31 0.03c0.597 0.06 1.044 0.138 1.217 0.215 0.098 0.043 0.19 0.128 0.235 0.219 0.086 0.17 0.226 0.687 0.304 1.121 0.153 0.855 0.104 1.63-0.163 2.59-0.084 0.303-0.14 0.436-0.219 0.52-0.138 0.147-0.523 0.238-1.349 0.32l-0.335 0.032-0.277 0.14c-0.497 0.252-0.966 0.378-1.612 0.436-0.35 0.032-8.734 0.032-9.118 0-0.66-0.053-1.201-0.2-1.68-0.453C8.052 16.96 8 16.945 7.906 16.936c-0.066-0.006-0.168-0.025-0.227-0.043-0.059-0.017-0.265-0.051-0.46-0.075-0.767-0.095-0.967-0.168-1.08-0.392-0.052-0.103-0.187-0.563-0.247-0.844L5.851 15.39c-0.075-0.336-0.121-1.042-0.09-1.368z"
+        android:strokeWidth="3.77953" />
+    <path
+        android:fillColor="#4dabf5"
+        android:pathData="M9.45 13.162h9.84c0.29 0 0.568 0.115 0.774 0.32 0.205 0.206 0.32 0.484 0.32 0.774v0.228c0 0.29-0.115 0.568-0.32 0.774-0.206 0.205-0.484 0.32-0.774 0.32H9.451c-0.192 0-0.38-0.05-0.547-0.146-0.167-0.096-0.305-0.234-0.4-0.4-0.097-0.167-0.148-0.356-0.148-0.548v-0.228c0-0.29 0.115-0.568 0.32-0.774 0.206-0.205 0.484-0.32 0.774-0.32z"
+        android:strokeWidth="2.22514"
+        android:strokeColor="#4dabf5" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_device_miband6_disabled.xml b/app/src/main/res/drawable/ic_device_miband6_disabled.xml
index 9a841e43f..6a4db7980 100644
--- a/app/src/main/res/drawable/ic_device_miband6_disabled.xml
+++ b/app/src/main/res/drawable/ic_device_miband6_disabled.xml
@@ -3,33 +3,30 @@
     android:height="28.740126dp"
     android:viewportWidth="28.740126"
     android:viewportHeight="28.740126">
-  <path
-      android:pathData="M3.8712,3.8769L24.7963,3.8769A0.9472,0.9472 0,0 1,25.7435 4.8241L25.7435,24.8343A0.9472,0.9472 0,0 1,24.7963 25.7815L3.8712,25.7815A0.9472,0.9472 0,0 1,2.924 24.8343L2.924,4.8241A0.9472,0.9472 0,0 1,3.8712 3.8769z"
-      android:strokeWidth="3.57115173"
-      android:fillColor="#7a7a7a"
-      android:strokeColor="#00000000"/>
-  <path
-      android:pathData="M3.879,3.0349L24.8041,3.0349A0.9472,0.9472 0,0 1,25.7514 3.9822L25.7514,23.9924A0.9472,0.9472 0,0 1,24.8041 24.9396L3.879,24.9396A0.9472,0.9472 0,0 1,2.9318 23.9924L2.9318,3.9822A0.9472,0.9472 0,0 1,3.879 3.0349z"
-      android:strokeWidth="3.57115173"
-      android:fillColor="#9f9f9f"
-      android:strokeColor="#00000000"
-      android:fillAlpha="0.9411765"/>
-  <path
-      android:pathData="M3.8711,3.4131L24.7962,3.4131A0.9472,0.9472 0,0 1,25.7435 4.3603L25.7435,24.3705A0.9472,0.9472 0,0 1,24.7962 25.3177L3.8711,25.3177A0.9472,0.9472 0,0 1,2.9239 24.3705L2.9239,4.3603A0.9472,0.9472 0,0 1,3.8711 3.4131z"
-      android:strokeWidth="3.57115173"
-      android:fillColor="#8a8a8a"
-      android:strokeColor="#00000000"/>
-  <path
-      android:pathData="m12.4827,10.8654h3.907v6.978h-3.907z"
-      android:fillColor="#8a8a8a"
-      android:fillAlpha="0.9411765"/>
-  <path
-      android:pathData="m5.7616,14.0208c0.0034,-0.0323 0.0136,-0.1343 0.0231,-0.2267 0.0521,-0.5029 0.2664,-1.3512 0.3916,-1.5495 0.0245,-0.0388 0.0766,-0.091 0.1158,-0.116 0.1382,-0.0882 0.4683,-0.1605 1.016,-0.2226 0.1545,-0.0175 0.3034,-0.0404 0.3309,-0.0509 0.0699,-0.0267 0.2695,-0.0674 0.3306,-0.0674 0.029,0 0.1528,-0.0502 0.2885,-0.117 0.4664,-0.2295 0.9723,-0.3571 1.5976,-0.403 0.3197,-0.0234 8.7266,-0.0236 9.05,-0.0002 0.6521,0.0472 1.1777,0.1874 1.6874,0.4502l0.2435,0.1255 0.3106,0.0306c0.597,0.0589 1.0433,0.1373 1.2163,0.2138 0.0981,0.0434 0.1896,0.1285 0.2352,0.219 0.086,0.1705 0.2262,0.6878 0.304,1.1218 0.153,0.8542 0.1043,1.6292 -0.163,2.5904 -0.0841,0.3026 -0.1398,0.4347 -0.2186,0.5186 -0.1382,0.1473 -0.5226,0.2385 -1.3486,0.3198l-0.3358,0.0331 -0.277,0.1401c-0.4966,0.2511 -0.9658,0.378 -1.6119,0.4358 -0.3501,0.0313 -8.7335,0.0319 -9.1176,0.0006C9.17,17.4131 8.6288,17.2668 8.15,17.0129 8.0519,16.9608 8.0002,16.9446 7.9058,16.9363 7.8399,16.9303 7.7379,16.9113 7.6791,16.8935 7.6203,16.8759 7.4135,16.8417 7.2196,16.8177 6.4523,16.7226 6.2524,16.6501 6.1387,16.4256 6.0866,16.3226 5.9523,15.8627 5.8925,15.5823 5.8778,15.513 5.8589,15.4262 5.8507,15.3892 5.7756,15.0526 5.7297,14.3468 5.7616,14.0208Z"
-      android:strokeWidth="3.77953"
-      android:fillColor="#ffffff"/>
-  <path
-      android:pathData="m9.4491,13.1621h9.841c0.29,0 0.568,0.115 0.774,0.32 0.205,0.206 0.32,0.484 0.32,0.774v0.228c0,0.29 -0.115,0.568 -0.32,0.774 -0.206,0.205 -0.484,0.32 -0.774,0.32h-9.839c-0.192,0 -0.381,-0.05 -0.547,-0.146 -0.167,-0.096 -0.305,-0.234 -0.401,-0.401 -0.096,-0.166 -0.147,-0.355 -0.147,-0.547v-0.228c0,-0.29 0.115,-0.568 0.32,-0.774 0.206,-0.205 0.484,-0.32 0.774,-0.32z"
-      android:strokeWidth="2.22514"
-      android:fillColor="#9f9f9f"
-      android:strokeColor="#9f9f9f"/>
+    <path
+        android:fillColor="#7a7a7a"
+        android:pathData="M3.871 3.877h20.925a0.947 0.947 0 0 1 0.948 0.947v20.01a0.947 0.947 0 0 1-0.948 0.948H3.871a0.947 0.947 0 0 1-0.947-0.948V4.824a0.947 0.947 0 0 1 0.947-0.947z"
+        android:strokeWidth="3.57115173" />
+    <path
+        android:fillAlpha="0.9411765"
+        android:fillColor="#9f9f9f"
+        android:pathData="M3.879 3.035h20.925a0.947 0.947 0 0 1 0.947 0.947v20.01a0.947 0.947 0 0 1-0.947 0.948H3.88a0.947 0.947 0 0 1-0.947-0.948V3.982A0.947 0.947 0 0 1 3.88 3.035z"
+        android:strokeWidth="3.57115173" />
+    <path
+        android:fillColor="#8a8a8a"
+        android:pathData="M3.871 3.413h20.925a0.947 0.947 0 0 1 0.948 0.947v20.01a0.947 0.947 0 0 1-0.948 0.948H3.871a0.947 0.947 0 0 1-0.947-0.948V4.36A0.947 0.947 0 0 1 3.87 3.413z"
+        android:strokeWidth="3.57115173" />
+    <path
+        android:fillAlpha="0.9411765"
+        android:fillColor="#8a8a8a"
+        android:pathData="M12.483 10.865h3.907v6.978h-3.907z" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M5.762 14.02l0.023-0.226c0.052-0.503 0.266-1.351 0.391-1.55 0.025-0.038 0.077-0.09 0.116-0.115 0.138-0.089 0.468-0.16 1.016-0.223 0.155-0.018 0.304-0.04 0.331-0.05 0.07-0.028 0.27-0.068 0.33-0.068 0.03 0 0.153-0.05 0.29-0.117 0.465-0.23 0.971-0.357 1.597-0.403 0.32-0.024 8.726-0.024 9.05 0 0.652 0.047 1.177 0.187 1.687 0.45l0.244 0.125 0.31 0.03c0.597 0.06 1.044 0.138 1.217 0.215 0.098 0.043 0.19 0.128 0.235 0.219 0.086 0.17 0.226 0.687 0.304 1.121 0.153 0.855 0.104 1.63-0.163 2.59-0.084 0.303-0.14 0.436-0.219 0.52-0.138 0.147-0.523 0.238-1.349 0.32l-0.335 0.032-0.277 0.14c-0.497 0.252-0.966 0.378-1.612 0.436-0.35 0.032-8.734 0.032-9.118 0-0.66-0.053-1.201-0.2-1.68-0.453C8.052 16.96 8 16.945 7.906 16.936c-0.066-0.006-0.168-0.025-0.227-0.043-0.059-0.017-0.266-0.051-0.46-0.075-0.767-0.095-0.967-0.168-1.08-0.392-0.052-0.103-0.187-0.563-0.247-0.844L5.851 15.39c-0.075-0.336-0.121-1.042-0.09-1.368z"
+        android:strokeWidth="3.77953" />
+    <path
+        android:fillColor="#9f9f9f"
+        android:pathData="M9.45 13.162h9.84c0.29 0 0.568 0.115 0.774 0.32 0.205 0.206 0.32 0.484 0.32 0.774v0.228c0 0.29-0.115 0.568-0.32 0.774-0.206 0.205-0.484 0.32-0.774 0.32H9.451c-0.192 0-0.38-0.05-0.547-0.146-0.167-0.096-0.305-0.234-0.4-0.4-0.097-0.167-0.148-0.356-0.148-0.548v-0.228c0-0.29 0.115-0.568 0.32-0.774 0.206-0.205 0.484-0.32 0.774-0.32z"
+        android:strokeWidth="2.22514"
+        android:strokeColor="#9f9f9f" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_device_sony_wf_800n.xml b/app/src/main/res/drawable/ic_device_sony_wf_800n.xml
index 3eb7be41e..bb4cad64a 100644
--- a/app/src/main/res/drawable/ic_device_sony_wf_800n.xml
+++ b/app/src/main/res/drawable/ic_device_sony_wf_800n.xml
@@ -1,14 +1,64 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="28.740126dp" android:height="28.740126dp" android:viewportWidth="28.740126" android:viewportHeight="28.740126">
-    <path android:pathData="M3.871 3.877h20.925a0.947 0.947 0 0 1 0.948 0.947v20.01a0.947 0.947 0 0 1-0.948 0.948H3.871a0.947 0.947 0 0 1-0.947-0.948V4.824a0.947 0.947 0 0 1 0.947-0.947z" android:strokeWidth="3.57115" android:fillColor="#1f7fdb"/>
-    <path android:pathData="M3.879 3.035h20.925a0.947 0.947 0 0 1 0.947 0.947v20.01a0.947 0.947 0 0 1-0.947 0.948H3.88a0.947 0.947 0 0 1-0.947-0.948V3.982A0.947 0.947 0 0 1 3.88 3.035z" android:strokeWidth="3.57115" android:fillColor="#4dabf5"/>
-    <path android:pathData="M3.871 3.413h20.925a0.947 0.947 0 0 1 0.948 0.947v20.01a0.947 0.947 0 0 1-0.948 0.948H3.871a0.947 0.947 0 0 1-0.947-0.948V4.36A0.947 0.947 0 0 1 3.87 3.413z" android:strokeWidth="3.57115" android:fillColor="#2196f3"/>
-    <path android:pathData="M7.291 6.092L7.194 6.145C7.162 6.163 7.13 6.183 7.099 6.203l-0.1 0.067L6.89 6.35 6.815 6.405 6.74 6.466C6.691 6.507 6.642 6.55 6.595 6.595 6.547 6.64 6.5 6.685 6.455 6.734 6.41 6.78 6.365 6.83 6.323 6.88 6.28 6.93 6.24 6.983 6.2 7.035c-0.04 0.053-0.078 0.106-0.114 0.16C6.05 7.25 6.015 7.304 5.982 7.36L5.935 7.442C5.92 7.47 5.905 7.498 5.892 7.526c-0.037 0.071-0.07 0.14-0.1 0.206-0.03 0.065-0.058 0.128-0.083 0.19-0.025 0.061-0.047 0.12-0.067 0.18-0.01 0.03-0.02 0.059-0.028 0.088-0.01 0.03-0.017 0.058-0.025 0.088L5.567 8.366l-0.02 0.09c-0.011 0.06-0.021 0.12-0.03 0.184-0.008 0.063-0.015 0.13-0.02 0.198-0.007 0.069-0.01 0.14-0.014 0.217L5.477 9.219v0.157C5.478 9.428 5.48 9.478 5.483 9.527c0.003 0.05 0.007 0.099 0.012 0.147C5.5 9.722 5.505 9.77 5.513 9.818 5.52 9.866 5.529 9.914 5.538 9.961l0.033 0.144 0.042 0.146c0.015 0.05 0.031 0.1 0.05 0.15 0.018 0.051 0.037 0.103 0.059 0.156 0.02 0.053 0.044 0.108 0.068 0.163l0.079 0.173c0.028 0.059 0.058 0.12 0.09 0.182 0.031 0.063 0.065 0.128 0.1 0.196l0.113 0.209 0.125 0.224 0.19 0.325 0.188 0.312 0.184 0.3 0.182 0.287 0.18 0.275c0.059 0.09 0.117 0.177 0.176 0.262 0.058 0.086 0.116 0.17 0.173 0.251l0.17 0.24 0.169 0.227c0.055 0.074 0.11 0.146 0.165 0.217 0.054 0.07 0.108 0.138 0.162 0.205l0.008 0.01C8.02 14.582 7.132 13.792 6.67 13.21c-1.06-1.33-1.604-2.907-1.441-4.18 0.148-1.165 0.664-2.116 1.624-2.991C7.09 5.821 7.117 5.85 7.187 5.871 7.424 6.016 7.452 6.003 7.29 6.092z" android:strokeWidth="0.4" android:strokeColor="#ffffff"/>
-    <path android:pathData="M11.589 11.343c0.322-0.014 0.357 0.04 0.594-0.181 0.222-0.24 0.274-0.352 0.276-0.57 0.003-0.224-0.007-0.25-0.197-0.71-0.408-0.979-0.896-1.961-1.124-2.262-0.342-0.45-0.831-0.779-1.38-0.948-0.413-0.127-1.121-0.108-1.564 0.041-1.404 0.475-2.155 1.989-1.691 3.408 0.271 0.832 0.705 1.282 1.214 1.282z" android:strokeWidth="0.3" android:strokeColor="#ffffff"/>
-    <path android:pathData="M11.858 12.337a0.198 0.194 90 0 0 0.268 0.058 0.198 0.194 90 0 0 0.059-0.273 0.198 0.194 90 0 0-0.267-0.063 0.198 0.194 90 0 0-0.063 0.272" android:strokeLineJoin="round" android:strokeWidth="0.3" android:fillColor="#ffffff" android:strokeColor="#ffffff" android:strokeLineCap="round"/>
-    <path android:pathData="M11.87 10.803L8.042 10.87c-0.145 0.003-0.261 0.12-0.261 0.268 0 0.148 0.116 0.27 0.261 0.267l3.826-0.068c0.145-0.003 0.262-0.12 0.262-0.268 0-0.148-0.117-0.27-0.262-0.267z" android:strokeLineJoin="round" android:strokeWidth="0.3" android:strokeColor="#ffffff" android:strokeLineCap="round"/>
-    <path android:pathData="M12.193 17.066c0.625-0.132 1.334-0.604 1.68-1.12 0.53-0.787 0.661-1.615 0.413-2.61-0.445-1.784-1.737-5.003-2.422-6.035-0.49-0.738-1.147-1.226-1.985-1.474-0.284-0.084-0.55-0.118-0.97-0.127-0.244-0.005-0.653 0.037-1.041 0.174-0.486 0.169-0.64 0.23-0.95 0.458-0.406 0.296-0.789 0.73-1.013 1.175-0.29 0.576-0.392 0.938-0.419 1.547-0.04 0.9 0.118 1.412 0.816 2.655 1.003 1.681 1.225 2.02 2.372 3.434 0.232 0.3 0.63 0.757 0.883 1.016 0.373 0.381 0.524 0.502 0.787 0.633 0.599 0.296 1.271 0.396 1.85 0.274zm9.319-4.474c0.034 0.017 0.066 0.034 0.097 0.053 0.032 0.018 0.064 0.037 0.096 0.058 0.032 0.02 0.064 0.043 0.099 0.067l0.109 0.079 0.075 0.057 0.075 0.06c0.05 0.041 0.098 0.084 0.146 0.129 0.047 0.044 0.094 0.09 0.14 0.138 0.045 0.048 0.089 0.097 0.131 0.148 0.043 0.05 0.084 0.102 0.124 0.154 0.04 0.052 0.078 0.106 0.114 0.16 0.036 0.054 0.07 0.109 0.103 0.164l0.047 0.083 0.044 0.083c0.036 0.072 0.07 0.14 0.1 0.206 0.03 0.066 0.057 0.129 0.082 0.19 0.025 0.062 0.047 0.121 0.067 0.18l0.029 0.088 0.025 0.088 0.022 0.089 0.019 0.089c0.012 0.06 0.022 0.121 0.03 0.185 0.009 0.063 0.016 0.129 0.021 0.198 0.006 0.068 0.01 0.14 0.014 0.217l0.005 0.164v0.157c0 0.051-0.003 0.102-0.006 0.151-0.002 0.05-0.006 0.098-0.011 0.147-0.005 0.048-0.011 0.096-0.019 0.144-0.007 0.048-0.015 0.095-0.025 0.143-0.01 0.048-0.02 0.096-0.033 0.144-0.012 0.048-0.026 0.097-0.041 0.146-0.015 0.05-0.032 0.1-0.05 0.15-0.018 0.051-0.038 0.103-0.06 0.156-0.02 0.053-0.043 0.107-0.068 0.163-0.024 0.056-0.05 0.113-0.079 0.172-0.028 0.06-0.058 0.12-0.09 0.183-0.03 0.063-0.064 0.128-0.1 0.195l-0.113 0.21-0.124 0.224-0.19 0.325-0.188 0.312-0.185 0.3-0.182 0.286-0.179 0.275-0.176 0.263c-0.059 0.086-0.116 0.17-0.174 0.251l-0.17 0.24-0.168 0.227c-0.056 0.074-0.11 0.146-0.165 0.216-0.055 0.07-0.109 0.139-0.163 0.205l-0.008 0.01c0.224-0.032 1.112-0.822 1.575-1.403 1.06-1.332 1.603-2.909 1.44-4.182-0.148-1.165-0.664-2.116-1.623-2.991-0.239-0.218-0.265-0.188-0.334-0.167-0.238 0.144-0.265 0.132-0.105 0.22z" android:strokeWidth="0.4" android:strokeColor="#ffffff"/>
-    <path android:pathData="M17.215 17.843c-0.323-0.014-0.358 0.039-0.594-0.182-0.222-0.24-0.274-0.352-0.277-0.569-0.002-0.225 0.007-0.251 0.198-0.71 0.407-0.98 0.895-1.962 1.123-2.262 0.342-0.45 0.832-0.779 1.38-0.948 0.413-0.128 1.122-0.109 1.565 0.041 1.403 0.475 2.154 1.989 1.69 3.408-0.271 0.832-0.705 1.282-1.214 1.282z" android:strokeWidth="0.3" android:strokeColor="#ffffff"/>
-    <path android:pathData="M16.945 18.836a0.194 0.198 0 0 1-0.267 0.058 0.194 0.198 0 0 1-0.06-0.272 0.194 0.198 0 0 1 0.267-0.063 0.194 0.198 0 0 1 0.063 0.272" android:strokeLineJoin="round" android:strokeWidth="0.3" android:fillColor="#ffffff" android:strokeColor="#ffffff" android:strokeLineCap="round"/>
-    <path android:pathData="M16.934 17.302l3.826 0.069c0.145 0.002 0.262 0.119 0.262 0.267 0 0.148-0.117 0.27-0.262 0.268l-3.826-0.069c-0.145-0.002-0.261-0.119-0.261-0.267 0-0.148 0.116-0.27 0.261-0.268z" android:strokeLineJoin="round" android:strokeWidth="0.3" android:strokeColor="#ffffff" android:strokeLineCap="round"/>
-    <path android:pathData="M16.61 23.566c-0.624-0.132-1.333-0.604-1.68-1.12-0.53-0.788-0.661-1.615-0.413-2.611 0.446-1.784 1.738-5.003 2.422-6.035 0.49-0.737 1.147-1.225 1.985-1.473 0.285-0.085 0.55-0.119 0.97-0.127 0.244-0.005 0.653 0.037 1.041 0.174 0.486 0.169 0.64 0.23 0.95 0.458 0.406 0.296 0.789 0.73 1.013 1.175 0.29 0.575 0.392 0.938 0.42 1.547 0.04 0.9-0.118 1.411-0.817 2.654-1.003 1.682-1.225 2.02-2.372 3.434-0.232 0.3-0.63 0.757-0.883 1.017-0.373 0.38-0.523 0.502-0.787 0.633-0.598 0.296-1.27 0.395-1.849 0.274z" android:strokeWidth="0.4" android:strokeColor="#ffffff"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="28.740126dp"
+    android:height="28.740126dp"
+    android:viewportWidth="28.740126"
+    android:viewportHeight="28.740126">
+    <path
+        android:fillColor="#1f7fdb"
+        android:pathData="M3.871 3.877h20.925a0.947 0.947 0 0 1 0.948 0.947v20.01a0.947 0.947 0 0 1-0.948 0.948H3.871a0.947 0.947 0 0 1-0.947-0.948V4.824a0.947 0.947 0 0 1 0.947-0.947z"
+        android:strokeWidth="3.57115" />
+    <path
+        android:fillColor="#4dabf5"
+        android:pathData="M3.879 3.035h20.925a0.947 0.947 0 0 1 0.947 0.947v20.01a0.947 0.947 0 0 1-0.947 0.948H3.88a0.947 0.947 0 0 1-0.947-0.948V3.982A0.947 0.947 0 0 1 3.88 3.035z"
+        android:strokeWidth="3.57115" />
+    <path
+        android:fillColor="#2196f3"
+        android:pathData="M3.871 3.413h20.925a0.947 0.947 0 0 1 0.948 0.947v20.01a0.947 0.947 0 0 1-0.948 0.948H3.871a0.947 0.947 0 0 1-0.947-0.948V4.36A0.947 0.947 0 0 1 3.87 3.413z"
+        android:strokeWidth="3.57115" />
+    <path
+        android:pathData="M7.291 6.092L7.194 6.145C7.162 6.163 7.13 6.183 7.099 6.203l-0.1 0.067L6.89 6.35 6.815 6.405 6.74 6.466C6.691 6.507 6.642 6.55 6.595 6.595 6.547 6.64 6.5 6.685 6.455 6.734 6.41 6.78 6.365 6.83 6.323 6.88 6.28 6.93 6.24 6.983 6.2 7.035c-0.04 0.053-0.078 0.106-0.114 0.16C6.05 7.25 6.015 7.304 5.982 7.36L5.935 7.442C5.92 7.47 5.905 7.498 5.892 7.526c-0.037 0.071-0.07 0.14-0.1 0.206-0.03 0.065-0.058 0.128-0.083 0.19-0.025 0.061-0.047 0.12-0.067 0.18-0.01 0.03-0.02 0.059-0.028 0.088-0.01 0.03-0.017 0.058-0.025 0.088L5.567 8.366l-0.02 0.09c-0.011 0.06-0.021 0.12-0.03 0.184-0.008 0.063-0.015 0.13-0.02 0.198-0.007 0.069-0.01 0.14-0.014 0.217L5.477 9.219v0.157C5.478 9.428 5.48 9.478 5.483 9.527c0.003 0.05 0.007 0.099 0.012 0.147C5.5 9.722 5.505 9.77 5.513 9.818 5.52 9.866 5.529 9.914 5.538 9.961l0.033 0.144 0.042 0.146c0.015 0.05 0.031 0.1 0.05 0.15 0.018 0.051 0.037 0.103 0.059 0.156 0.02 0.053 0.044 0.108 0.068 0.163l0.079 0.173c0.028 0.059 0.058 0.12 0.09 0.182 0.031 0.063 0.065 0.128 0.1 0.196l0.113 0.209 0.125 0.224 0.19 0.325 0.188 0.312 0.184 0.3 0.182 0.287 0.18 0.275c0.059 0.09 0.117 0.177 0.176 0.262 0.058 0.086 0.116 0.17 0.173 0.251l0.17 0.24 0.169 0.227c0.055 0.074 0.11 0.146 0.165 0.217 0.054 0.07 0.108 0.138 0.162 0.205l0.008 0.01C8.02 14.582 7.132 13.792 6.67 13.21c-1.06-1.33-1.604-2.907-1.441-4.18 0.148-1.165 0.664-2.116 1.624-2.991C7.09 5.821 7.117 5.85 7.187 5.871 7.424 6.016 7.452 6.003 7.29 6.092z"
+        android:strokeWidth="0.4"
+        android:strokeColor="#ffffff" />
+    <path
+        android:pathData="M11.589 11.343c0.322-0.014 0.357 0.04 0.594-0.181 0.222-0.24 0.274-0.352 0.276-0.57 0.003-0.224-0.007-0.25-0.197-0.71-0.408-0.979-0.896-1.961-1.124-2.262-0.342-0.45-0.831-0.779-1.38-0.948-0.413-0.127-1.121-0.108-1.564 0.041-1.404 0.475-2.155 1.989-1.691 3.408 0.271 0.832 0.705 1.282 1.214 1.282z"
+        android:strokeWidth="0.3"
+        android:strokeColor="#ffffff" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M11.858 12.337a0.198 0.194 90 0 0 0.268 0.058 0.198 0.194 90 0 0 0.059-0.273 0.198 0.194 90 0 0-0.267-0.063 0.198 0.194 90 0 0-0.063 0.272"
+        android:strokeWidth="0.3"
+        android:strokeColor="#ffffff"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round" />
+    <path
+        android:pathData="M11.87 10.803L8.042 10.87c-0.145 0.003-0.261 0.12-0.261 0.268 0 0.148 0.116 0.27 0.261 0.267l3.826-0.068c0.145-0.003 0.262-0.12 0.262-0.268 0-0.148-0.117-0.27-0.262-0.267z"
+        android:strokeWidth="0.3"
+        android:strokeColor="#ffffff"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round" />
+    <path
+        android:pathData="M12.193 17.066c0.625-0.132 1.334-0.604 1.68-1.12 0.53-0.787 0.661-1.615 0.413-2.61-0.445-1.784-1.737-5.003-2.422-6.035-0.49-0.738-1.147-1.226-1.985-1.474-0.284-0.084-0.55-0.118-0.97-0.127-0.244-0.005-0.653 0.037-1.041 0.174-0.486 0.169-0.64 0.23-0.95 0.458-0.406 0.296-0.789 0.73-1.013 1.175-0.29 0.576-0.392 0.938-0.419 1.547-0.04 0.9 0.118 1.412 0.816 2.655 1.003 1.681 1.225 2.02 2.372 3.434 0.232 0.3 0.63 0.757 0.883 1.016 0.373 0.381 0.524 0.502 0.787 0.633 0.599 0.296 1.271 0.396 1.85 0.274zm9.319-4.474c0.034 0.017 0.066 0.034 0.097 0.053 0.032 0.018 0.064 0.037 0.096 0.058 0.032 0.02 0.064 0.043 0.099 0.067l0.109 0.079 0.075 0.057 0.075 0.06c0.05 0.041 0.098 0.084 0.146 0.129 0.047 0.044 0.094 0.09 0.14 0.138 0.045 0.048 0.089 0.097 0.131 0.148 0.043 0.05 0.084 0.102 0.124 0.154 0.04 0.052 0.078 0.106 0.114 0.16 0.036 0.054 0.07 0.109 0.103 0.164l0.047 0.083 0.044 0.083c0.036 0.072 0.07 0.14 0.1 0.206 0.03 0.066 0.057 0.129 0.082 0.19 0.025 0.062 0.047 0.121 0.067 0.18l0.029 0.088 0.025 0.088 0.022 0.089 0.019 0.089c0.012 0.06 0.022 0.121 0.03 0.185 0.009 0.063 0.016 0.129 0.021 0.198 0.006 0.068 0.01 0.14 0.014 0.217l0.005 0.164v0.157c0 0.051-0.003 0.102-0.006 0.151-0.002 0.05-0.006 0.098-0.011 0.147-0.005 0.048-0.011 0.096-0.019 0.144-0.007 0.048-0.015 0.095-0.025 0.143-0.01 0.048-0.02 0.096-0.033 0.144-0.012 0.048-0.026 0.097-0.041 0.146-0.015 0.05-0.032 0.1-0.05 0.15-0.018 0.051-0.038 0.103-0.06 0.156-0.02 0.053-0.043 0.107-0.068 0.163-0.024 0.056-0.05 0.113-0.079 0.172-0.028 0.06-0.058 0.12-0.09 0.183-0.03 0.063-0.064 0.128-0.1 0.195l-0.113 0.21-0.124 0.224-0.19 0.325-0.188 0.312-0.185 0.3-0.182 0.286-0.179 0.275-0.176 0.263c-0.059 0.086-0.116 0.17-0.174 0.251l-0.17 0.24-0.168 0.227c-0.056 0.074-0.11 0.146-0.165 0.216-0.055 0.07-0.109 0.139-0.163 0.205l-0.008 0.01c0.224-0.032 1.112-0.822 1.575-1.403 1.06-1.332 1.603-2.909 1.44-4.182-0.148-1.165-0.664-2.116-1.623-2.991-0.239-0.218-0.265-0.188-0.334-0.167-0.238 0.144-0.265 0.132-0.105 0.22z"
+        android:strokeWidth="0.4"
+        android:strokeColor="#ffffff" />
+    <path
+        android:pathData="M17.215 17.843c-0.323-0.014-0.358 0.039-0.594-0.182-0.222-0.24-0.274-0.352-0.277-0.569-0.002-0.225 0.007-0.251 0.198-0.71 0.407-0.98 0.895-1.962 1.123-2.262 0.342-0.45 0.832-0.779 1.38-0.948 0.413-0.128 1.122-0.109 1.565 0.041 1.403 0.475 2.154 1.989 1.69 3.408-0.271 0.832-0.705 1.282-1.214 1.282z"
+        android:strokeWidth="0.3"
+        android:strokeColor="#ffffff" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M16.945 18.836a0.194 0.198 0 0 1-0.267 0.058 0.194 0.198 0 0 1-0.06-0.272 0.194 0.198 0 0 1 0.267-0.063 0.194 0.198 0 0 1 0.063 0.272"
+        android:strokeWidth="0.3"
+        android:strokeColor="#ffffff"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round" />
+    <path
+        android:pathData="M16.934 17.302l3.826 0.069c0.145 0.002 0.262 0.119 0.262 0.267 0 0.148-0.117 0.27-0.262 0.268l-3.826-0.069c-0.145-0.002-0.261-0.119-0.261-0.267 0-0.148 0.116-0.27 0.261-0.268z"
+        android:strokeWidth="0.3"
+        android:strokeColor="#ffffff"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round" />
+    <path
+        android:pathData="M16.61 23.566c-0.624-0.132-1.333-0.604-1.68-1.12-0.53-0.788-0.661-1.615-0.413-2.611 0.446-1.784 1.738-5.003 2.422-6.035 0.49-0.737 1.147-1.225 1.985-1.473 0.285-0.085 0.55-0.119 0.97-0.127 0.244-0.005 0.653 0.037 1.041 0.174 0.486 0.169 0.64 0.23 0.95 0.458 0.406 0.296 0.789 0.73 1.013 1.175 0.29 0.575 0.392 0.938 0.42 1.547 0.04 0.9-0.118 1.411-0.817 2.654-1.003 1.682-1.225 2.02-2.372 3.434-0.232 0.3-0.63 0.757-0.883 1.017-0.373 0.38-0.523 0.502-0.787 0.633-0.598 0.296-1.27 0.395-1.849 0.274z"
+        android:strokeWidth="0.4"
+        android:strokeColor="#ffffff" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_device_sony_wf_800n_disabled.xml b/app/src/main/res/drawable/ic_device_sony_wf_800n_disabled.xml
index 05d51ea7f..e65f781a7 100644
--- a/app/src/main/res/drawable/ic_device_sony_wf_800n_disabled.xml
+++ b/app/src/main/res/drawable/ic_device_sony_wf_800n_disabled.xml
@@ -1,15 +1,69 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="28.740126dp" android:height="28.740126dp" android:viewportWidth="28.740126" android:viewportHeight="28.740126">
-    <path android:pathData="M3.871 3.877h20.925a0.947 0.947 0 0 1 0.948 0.947v20.01a0.947 0.947 0 0 1-0.948 0.948H3.871a0.947 0.947 0 0 1-0.947-0.948V4.824a0.947 0.947 0 0 1 0.947-0.947z" android:strokeWidth="3.57115173" android:fillColor="#7a7a7a"/>
-    <path android:pathData="M3.879 3.035h20.925a0.947 0.947 0 0 1 0.947 0.947v20.01a0.947 0.947 0 0 1-0.947 0.948H3.88a0.947 0.947 0 0 1-0.947-0.948V3.982A0.947 0.947 0 0 1 3.88 3.035z" android:strokeWidth="3.57115173" android:fillColor="#9f9f9f" android:fillAlpha="0.9411765"/>
-    <path android:pathData="M3.871 3.413h20.925a0.947 0.947 0 0 1 0.948 0.947v20.01a0.947 0.947 0 0 1-0.948 0.948H3.871a0.947 0.947 0 0 1-0.947-0.948V4.36A0.947 0.947 0 0 1 3.87 3.413z" android:strokeWidth="3.57115173" android:fillColor="#8a8a8a"/>
-    <path android:pathData="M12.483 10.865h3.907v6.978h-3.907z" android:fillColor="#8a8a8a" android:fillAlpha="0.9411765"/>
-    <path android:pathData="M7.291 6.092L7.194 6.145C7.162 6.163 7.13 6.183 7.099 6.203l-0.1 0.067L6.89 6.35 6.815 6.405 6.74 6.466C6.691 6.507 6.642 6.55 6.595 6.595 6.547 6.64 6.5 6.685 6.455 6.734 6.41 6.78 6.365 6.83 6.323 6.88 6.28 6.93 6.24 6.983 6.2 7.035c-0.04 0.053-0.078 0.106-0.114 0.16C6.05 7.25 6.015 7.304 5.982 7.36L5.935 7.442C5.92 7.47 5.905 7.498 5.892 7.526c-0.037 0.071-0.07 0.14-0.1 0.206-0.03 0.065-0.058 0.128-0.083 0.19-0.025 0.061-0.047 0.12-0.067 0.18-0.01 0.03-0.02 0.059-0.028 0.088-0.01 0.03-0.017 0.058-0.025 0.088L5.567 8.366l-0.02 0.09c-0.011 0.06-0.021 0.12-0.03 0.184-0.008 0.063-0.015 0.13-0.02 0.198-0.007 0.069-0.01 0.14-0.014 0.217L5.477 9.219v0.157C5.478 9.428 5.48 9.478 5.483 9.527c0.003 0.05 0.007 0.099 0.012 0.147C5.5 9.722 5.505 9.77 5.513 9.818 5.52 9.866 5.529 9.914 5.538 9.961l0.033 0.144 0.042 0.146c0.015 0.05 0.031 0.1 0.05 0.15 0.018 0.051 0.037 0.103 0.059 0.156 0.02 0.053 0.044 0.108 0.068 0.163l0.079 0.173c0.028 0.059 0.058 0.12 0.09 0.182 0.031 0.063 0.065 0.128 0.1 0.196l0.113 0.209 0.125 0.224 0.19 0.325 0.188 0.312 0.184 0.3 0.182 0.287 0.18 0.275c0.059 0.09 0.117 0.177 0.176 0.262 0.058 0.086 0.116 0.17 0.173 0.251l0.17 0.24 0.169 0.227c0.055 0.074 0.11 0.146 0.165 0.217 0.054 0.07 0.108 0.138 0.162 0.205l0.008 0.01C8.02 14.582 7.132 13.792 6.67 13.21c-1.06-1.33-1.604-2.907-1.441-4.18 0.148-1.165 0.664-2.116 1.624-2.991C7.09 5.821 7.117 5.85 7.187 5.871 7.424 6.016 7.452 6.003 7.29 6.092z" android:strokeWidth="0.4" android:strokeColor="#ffffff"/>
-    <path android:pathData="M11.589 11.343c0.322-0.014 0.357 0.04 0.594-0.181 0.222-0.24 0.274-0.352 0.276-0.57 0.003-0.224-0.007-0.25-0.197-0.71-0.408-0.979-0.896-1.961-1.124-2.262-0.342-0.45-0.831-0.779-1.38-0.948-0.413-0.127-1.121-0.108-1.564 0.041-1.404 0.475-2.155 1.989-1.691 3.408 0.271 0.832 0.705 1.282 1.214 1.282z" android:strokeWidth="0.3" android:strokeColor="#ffffff"/>
-    <path android:pathData="M11.858 12.337a0.198 0.194 90 0 0 0.268 0.058 0.198 0.194 90 0 0 0.059-0.273 0.198 0.194 90 0 0-0.267-0.063 0.198 0.194 90 0 0-0.063 0.272" android:strokeLineJoin="round" android:strokeWidth="0.3" android:fillColor="#ffffff" android:strokeColor="#ffffff" android:strokeLineCap="round"/>
-    <path android:pathData="M11.87 10.803L8.042 10.87c-0.145 0.003-0.261 0.12-0.261 0.268 0 0.148 0.116 0.27 0.261 0.267l3.826-0.068c0.145-0.003 0.262-0.12 0.262-0.268 0-0.148-0.117-0.27-0.262-0.267z" android:strokeLineJoin="round" android:strokeWidth="0.3" android:strokeColor="#ffffff" android:strokeLineCap="round"/>
-    <path android:pathData="M12.193 17.066c0.625-0.132 1.334-0.604 1.68-1.12 0.53-0.787 0.661-1.615 0.413-2.61-0.445-1.784-1.737-5.003-2.422-6.035-0.49-0.738-1.147-1.226-1.985-1.474-0.284-0.084-0.55-0.118-0.97-0.127-0.244-0.005-0.653 0.037-1.041 0.174-0.486 0.169-0.64 0.23-0.95 0.458-0.406 0.296-0.789 0.73-1.013 1.175-0.29 0.576-0.392 0.938-0.419 1.547-0.04 0.9 0.118 1.412 0.816 2.655 1.003 1.681 1.225 2.02 2.372 3.434 0.232 0.3 0.63 0.757 0.883 1.016 0.373 0.381 0.524 0.502 0.787 0.633 0.599 0.296 1.271 0.396 1.85 0.274zm9.319-4.474c0.034 0.017 0.066 0.034 0.097 0.053 0.032 0.018 0.064 0.037 0.096 0.058 0.032 0.02 0.064 0.043 0.099 0.067l0.109 0.079 0.075 0.057 0.075 0.06c0.05 0.041 0.098 0.084 0.146 0.129 0.047 0.044 0.094 0.09 0.14 0.138 0.045 0.048 0.089 0.097 0.131 0.148 0.043 0.05 0.084 0.102 0.124 0.154 0.04 0.052 0.078 0.106 0.114 0.16 0.036 0.054 0.07 0.109 0.103 0.164l0.047 0.083 0.044 0.083c0.036 0.072 0.07 0.14 0.1 0.206 0.03 0.066 0.057 0.129 0.082 0.19 0.025 0.062 0.047 0.121 0.067 0.18l0.029 0.088 0.025 0.088 0.022 0.089 0.019 0.089c0.012 0.06 0.022 0.121 0.03 0.185 0.009 0.063 0.016 0.129 0.021 0.198 0.006 0.068 0.01 0.14 0.014 0.217l0.005 0.164v0.157c0 0.051-0.003 0.102-0.006 0.151-0.002 0.05-0.006 0.098-0.011 0.147-0.005 0.048-0.011 0.096-0.019 0.144-0.007 0.048-0.015 0.095-0.025 0.143-0.01 0.048-0.02 0.096-0.033 0.144-0.012 0.048-0.026 0.097-0.041 0.146-0.015 0.05-0.032 0.1-0.05 0.15-0.018 0.051-0.038 0.103-0.06 0.156-0.02 0.053-0.043 0.107-0.068 0.163-0.024 0.056-0.05 0.113-0.079 0.172-0.028 0.06-0.058 0.12-0.09 0.183-0.03 0.063-0.064 0.128-0.1 0.195l-0.113 0.21-0.124 0.224-0.19 0.325-0.188 0.312-0.185 0.3-0.182 0.286-0.179 0.275-0.176 0.263c-0.059 0.086-0.116 0.17-0.174 0.251l-0.17 0.24-0.168 0.227c-0.056 0.074-0.11 0.146-0.165 0.216-0.055 0.07-0.109 0.139-0.163 0.205l-0.008 0.01c0.224-0.032 1.112-0.822 1.575-1.403 1.06-1.332 1.603-2.909 1.44-4.182-0.148-1.165-0.664-2.116-1.623-2.991-0.239-0.218-0.265-0.188-0.334-0.167-0.238 0.144-0.265 0.132-0.105 0.22z" android:strokeWidth="0.4" android:strokeColor="#ffffff"/>
-    <path android:pathData="M17.215 17.843c-0.323-0.014-0.358 0.039-0.594-0.182-0.222-0.24-0.274-0.352-0.277-0.569-0.002-0.225 0.007-0.251 0.198-0.71 0.407-0.98 0.895-1.962 1.123-2.262 0.342-0.45 0.832-0.779 1.38-0.948 0.413-0.128 1.122-0.109 1.565 0.041 1.403 0.475 2.154 1.989 1.69 3.408-0.271 0.832-0.705 1.282-1.214 1.282z" android:strokeWidth="0.3" android:strokeColor="#ffffff"/>
-    <path android:pathData="M16.945 18.836a0.194 0.198 0 0 1-0.267 0.058 0.194 0.198 0 0 1-0.06-0.272 0.194 0.198 0 0 1 0.267-0.063 0.194 0.198 0 0 1 0.063 0.272" android:strokeLineJoin="round" android:strokeWidth="0.3" android:fillColor="#ffffff" android:strokeColor="#ffffff" android:strokeLineCap="round"/>
-    <path android:pathData="M16.934 17.302l3.826 0.069c0.145 0.002 0.262 0.119 0.262 0.267 0 0.148-0.117 0.27-0.262 0.268l-3.826-0.069c-0.145-0.002-0.261-0.119-0.261-0.267 0-0.148 0.116-0.27 0.261-0.268z" android:strokeLineJoin="round" android:strokeWidth="0.3" android:strokeColor="#ffffff" android:strokeLineCap="round"/>
-    <path android:pathData="M16.61 23.566c-0.624-0.132-1.333-0.604-1.68-1.12-0.53-0.788-0.661-1.615-0.413-2.611 0.446-1.784 1.738-5.003 2.422-6.035 0.49-0.737 1.147-1.225 1.985-1.473 0.285-0.085 0.55-0.119 0.97-0.127 0.244-0.005 0.653 0.037 1.041 0.174 0.486 0.169 0.64 0.23 0.95 0.458 0.406 0.296 0.789 0.73 1.013 1.175 0.29 0.575 0.392 0.938 0.42 1.547 0.04 0.9-0.118 1.411-0.817 2.654-1.003 1.682-1.225 2.02-2.372 3.434-0.232 0.3-0.63 0.757-0.883 1.017-0.373 0.38-0.523 0.502-0.787 0.633-0.598 0.296-1.27 0.395-1.849 0.274z" android:strokeWidth="0.4" android:strokeColor="#ffffff"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="28.740126dp"
+    android:height="28.740126dp"
+    android:viewportWidth="28.740126"
+    android:viewportHeight="28.740126">
+    <path
+        android:fillColor="#7a7a7a"
+        android:pathData="M3.871 3.877h20.925a0.947 0.947 0 0 1 0.948 0.947v20.01a0.947 0.947 0 0 1-0.948 0.948H3.871a0.947 0.947 0 0 1-0.947-0.948V4.824a0.947 0.947 0 0 1 0.947-0.947z"
+        android:strokeWidth="3.57115173" />
+    <path
+        android:fillAlpha="0.9411765"
+        android:fillColor="#9f9f9f"
+        android:pathData="M3.879 3.035h20.925a0.947 0.947 0 0 1 0.947 0.947v20.01a0.947 0.947 0 0 1-0.947 0.948H3.88a0.947 0.947 0 0 1-0.947-0.948V3.982A0.947 0.947 0 0 1 3.88 3.035z"
+        android:strokeWidth="3.57115173" />
+    <path
+        android:fillColor="#8a8a8a"
+        android:pathData="M3.871 3.413h20.925a0.947 0.947 0 0 1 0.948 0.947v20.01a0.947 0.947 0 0 1-0.948 0.948H3.871a0.947 0.947 0 0 1-0.947-0.948V4.36A0.947 0.947 0 0 1 3.87 3.413z"
+        android:strokeWidth="3.57115173" />
+    <path
+        android:fillAlpha="0.9411765"
+        android:fillColor="#8a8a8a"
+        android:pathData="M12.483 10.865h3.907v6.978h-3.907z" />
+    <path
+        android:pathData="M7.291 6.092L7.194 6.145C7.162 6.163 7.13 6.183 7.099 6.203l-0.1 0.067L6.89 6.35 6.815 6.405 6.74 6.466C6.691 6.507 6.642 6.55 6.595 6.595 6.547 6.64 6.5 6.685 6.455 6.734 6.41 6.78 6.365 6.83 6.323 6.88 6.28 6.93 6.24 6.983 6.2 7.035c-0.04 0.053-0.078 0.106-0.114 0.16C6.05 7.25 6.015 7.304 5.982 7.36L5.935 7.442C5.92 7.47 5.905 7.498 5.892 7.526c-0.037 0.071-0.07 0.14-0.1 0.206-0.03 0.065-0.058 0.128-0.083 0.19-0.025 0.061-0.047 0.12-0.067 0.18-0.01 0.03-0.02 0.059-0.028 0.088-0.01 0.03-0.017 0.058-0.025 0.088L5.567 8.366l-0.02 0.09c-0.011 0.06-0.021 0.12-0.03 0.184-0.008 0.063-0.015 0.13-0.02 0.198-0.007 0.069-0.01 0.14-0.014 0.217L5.477 9.219v0.157C5.478 9.428 5.48 9.478 5.483 9.527c0.003 0.05 0.007 0.099 0.012 0.147C5.5 9.722 5.505 9.77 5.513 9.818 5.52 9.866 5.529 9.914 5.538 9.961l0.033 0.144 0.042 0.146c0.015 0.05 0.031 0.1 0.05 0.15 0.018 0.051 0.037 0.103 0.059 0.156 0.02 0.053 0.044 0.108 0.068 0.163l0.079 0.173c0.028 0.059 0.058 0.12 0.09 0.182 0.031 0.063 0.065 0.128 0.1 0.196l0.113 0.209 0.125 0.224 0.19 0.325 0.188 0.312 0.184 0.3 0.182 0.287 0.18 0.275c0.059 0.09 0.117 0.177 0.176 0.262 0.058 0.086 0.116 0.17 0.173 0.251l0.17 0.24 0.169 0.227c0.055 0.074 0.11 0.146 0.165 0.217 0.054 0.07 0.108 0.138 0.162 0.205l0.008 0.01C8.02 14.582 7.132 13.792 6.67 13.21c-1.06-1.33-1.604-2.907-1.441-4.18 0.148-1.165 0.664-2.116 1.624-2.991C7.09 5.821 7.117 5.85 7.187 5.871 7.424 6.016 7.452 6.003 7.29 6.092z"
+        android:strokeWidth="0.4"
+        android:strokeColor="#ffffff" />
+    <path
+        android:pathData="M11.589 11.343c0.322-0.014 0.357 0.04 0.594-0.181 0.222-0.24 0.274-0.352 0.276-0.57 0.003-0.224-0.007-0.25-0.197-0.71-0.408-0.979-0.896-1.961-1.124-2.262-0.342-0.45-0.831-0.779-1.38-0.948-0.413-0.127-1.121-0.108-1.564 0.041-1.404 0.475-2.155 1.989-1.691 3.408 0.271 0.832 0.705 1.282 1.214 1.282z"
+        android:strokeWidth="0.3"
+        android:strokeColor="#ffffff" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M11.858 12.337a0.198 0.194 90 0 0 0.268 0.058 0.198 0.194 90 0 0 0.059-0.273 0.198 0.194 90 0 0-0.267-0.063 0.198 0.194 90 0 0-0.063 0.272"
+        android:strokeWidth="0.3"
+        android:strokeColor="#ffffff"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round" />
+    <path
+        android:pathData="M11.87 10.803L8.042 10.87c-0.145 0.003-0.261 0.12-0.261 0.268 0 0.148 0.116 0.27 0.261 0.267l3.826-0.068c0.145-0.003 0.262-0.12 0.262-0.268 0-0.148-0.117-0.27-0.262-0.267z"
+        android:strokeWidth="0.3"
+        android:strokeColor="#ffffff"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round" />
+    <path
+        android:pathData="M12.193 17.066c0.625-0.132 1.334-0.604 1.68-1.12 0.53-0.787 0.661-1.615 0.413-2.61-0.445-1.784-1.737-5.003-2.422-6.035-0.49-0.738-1.147-1.226-1.985-1.474-0.284-0.084-0.55-0.118-0.97-0.127-0.244-0.005-0.653 0.037-1.041 0.174-0.486 0.169-0.64 0.23-0.95 0.458-0.406 0.296-0.789 0.73-1.013 1.175-0.29 0.576-0.392 0.938-0.419 1.547-0.04 0.9 0.118 1.412 0.816 2.655 1.003 1.681 1.225 2.02 2.372 3.434 0.232 0.3 0.63 0.757 0.883 1.016 0.373 0.381 0.524 0.502 0.787 0.633 0.599 0.296 1.271 0.396 1.85 0.274zm9.319-4.474c0.034 0.017 0.066 0.034 0.097 0.053 0.032 0.018 0.064 0.037 0.096 0.058 0.032 0.02 0.064 0.043 0.099 0.067l0.109 0.079 0.075 0.057 0.075 0.06c0.05 0.041 0.098 0.084 0.146 0.129 0.047 0.044 0.094 0.09 0.14 0.138 0.045 0.048 0.089 0.097 0.131 0.148 0.043 0.05 0.084 0.102 0.124 0.154 0.04 0.052 0.078 0.106 0.114 0.16 0.036 0.054 0.07 0.109 0.103 0.164l0.047 0.083 0.044 0.083c0.036 0.072 0.07 0.14 0.1 0.206 0.03 0.066 0.057 0.129 0.082 0.19 0.025 0.062 0.047 0.121 0.067 0.18l0.029 0.088 0.025 0.088 0.022 0.089 0.019 0.089c0.012 0.06 0.022 0.121 0.03 0.185 0.009 0.063 0.016 0.129 0.021 0.198 0.006 0.068 0.01 0.14 0.014 0.217l0.005 0.164v0.157c0 0.051-0.003 0.102-0.006 0.151-0.002 0.05-0.006 0.098-0.011 0.147-0.005 0.048-0.011 0.096-0.019 0.144-0.007 0.048-0.015 0.095-0.025 0.143-0.01 0.048-0.02 0.096-0.033 0.144-0.012 0.048-0.026 0.097-0.041 0.146-0.015 0.05-0.032 0.1-0.05 0.15-0.018 0.051-0.038 0.103-0.06 0.156-0.02 0.053-0.043 0.107-0.068 0.163-0.024 0.056-0.05 0.113-0.079 0.172-0.028 0.06-0.058 0.12-0.09 0.183-0.03 0.063-0.064 0.128-0.1 0.195l-0.113 0.21-0.124 0.224-0.19 0.325-0.188 0.312-0.185 0.3-0.182 0.286-0.179 0.275-0.176 0.263c-0.059 0.086-0.116 0.17-0.174 0.251l-0.17 0.24-0.168 0.227c-0.056 0.074-0.11 0.146-0.165 0.216-0.055 0.07-0.109 0.139-0.163 0.205l-0.008 0.01c0.224-0.032 1.112-0.822 1.575-1.403 1.06-1.332 1.603-2.909 1.44-4.182-0.148-1.165-0.664-2.116-1.623-2.991-0.239-0.218-0.265-0.188-0.334-0.167-0.238 0.144-0.265 0.132-0.105 0.22z"
+        android:strokeWidth="0.4"
+        android:strokeColor="#ffffff" />
+    <path
+        android:pathData="M17.215 17.843c-0.323-0.014-0.358 0.039-0.594-0.182-0.222-0.24-0.274-0.352-0.277-0.569-0.002-0.225 0.007-0.251 0.198-0.71 0.407-0.98 0.895-1.962 1.123-2.262 0.342-0.45 0.832-0.779 1.38-0.948 0.413-0.128 1.122-0.109 1.565 0.041 1.403 0.475 2.154 1.989 1.69 3.408-0.271 0.832-0.705 1.282-1.214 1.282z"
+        android:strokeWidth="0.3"
+        android:strokeColor="#ffffff" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M16.945 18.836a0.194 0.198 0 0 1-0.267 0.058 0.194 0.198 0 0 1-0.06-0.272 0.194 0.198 0 0 1 0.267-0.063 0.194 0.198 0 0 1 0.063 0.272"
+        android:strokeWidth="0.3"
+        android:strokeColor="#ffffff"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round" />
+    <path
+        android:pathData="M16.934 17.302l3.826 0.069c0.145 0.002 0.262 0.119 0.262 0.267 0 0.148-0.117 0.27-0.262 0.268l-3.826-0.069c-0.145-0.002-0.261-0.119-0.261-0.267 0-0.148 0.116-0.27 0.261-0.268z"
+        android:strokeWidth="0.3"
+        android:strokeColor="#ffffff"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round" />
+    <path
+        android:pathData="M16.61 23.566c-0.624-0.132-1.333-0.604-1.68-1.12-0.53-0.788-0.661-1.615-0.413-2.611 0.446-1.784 1.738-5.003 2.422-6.035 0.49-0.737 1.147-1.225 1.985-1.473 0.285-0.085 0.55-0.119 0.97-0.127 0.244-0.005 0.653 0.037 1.041 0.174 0.486 0.169 0.64 0.23 0.95 0.458 0.406 0.296 0.789 0.73 1.013 1.175 0.29 0.575 0.392 0.938 0.42 1.547 0.04 0.9-0.118 1.411-0.817 2.654-1.003 1.682-1.225 2.02-2.372 3.434-0.232 0.3-0.63 0.757-0.883 1.017-0.373 0.38-0.523 0.502-0.787 0.633-0.598 0.296-1.27 0.395-1.849 0.274z"
+        android:strokeWidth="0.4"
+        android:strokeColor="#ffffff" />
 </vector>

From b018a4b5f4fceb3b6c6f83dea49a8147c6d8e48b Mon Sep 17 00:00:00 2001
From: vanous <petr@linuks.cz>
Date: Sun, 15 May 2022 16:33:12 +0200
Subject: [PATCH 056/110] optimeze dimensions for icons

---
 app/src/main/res/drawable/ic_device_miband6.xml           | 8 ++++----
 app/src/main/res/drawable/ic_device_miband6_disabled.xml  | 8 ++++----
 app/src/main/res/drawable/ic_device_sony_wf_800n.xml      | 8 ++++----
 .../main/res/drawable/ic_device_sony_wf_800n_disabled.xml | 8 ++++----
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/app/src/main/res/drawable/ic_device_miband6.xml b/app/src/main/res/drawable/ic_device_miband6.xml
index 4d59e071e..0b5700c96 100644
--- a/app/src/main/res/drawable/ic_device_miband6.xml
+++ b/app/src/main/res/drawable/ic_device_miband6.xml
@@ -1,8 +1,8 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="28.740126dp"
-    android:height="28.740126dp"
-    android:viewportWidth="28.740126"
-    android:viewportHeight="28.740126">
+    android:width="45sp"
+    android:height="45sp"
+    android:viewportWidth="30"
+    android:viewportHeight="30">
     <path
         android:fillColor="#1f7fdb"
         android:pathData="M3.871 3.877h20.925a0.947 0.947 0 0 1 0.948 0.947v20.01a0.947 0.947 0 0 1-0.948 0.948H3.871a0.947 0.947 0 0 1-0.947-0.948V4.824a0.947 0.947 0 0 1 0.947-0.947z"
diff --git a/app/src/main/res/drawable/ic_device_miband6_disabled.xml b/app/src/main/res/drawable/ic_device_miband6_disabled.xml
index 6a4db7980..81fc75e8a 100644
--- a/app/src/main/res/drawable/ic_device_miband6_disabled.xml
+++ b/app/src/main/res/drawable/ic_device_miband6_disabled.xml
@@ -1,8 +1,8 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="28.740126dp"
-    android:height="28.740126dp"
-    android:viewportWidth="28.740126"
-    android:viewportHeight="28.740126">
+    android:width="45sp"
+    android:height="45sp"
+    android:viewportWidth="30"
+    android:viewportHeight="30">
     <path
         android:fillColor="#7a7a7a"
         android:pathData="M3.871 3.877h20.925a0.947 0.947 0 0 1 0.948 0.947v20.01a0.947 0.947 0 0 1-0.948 0.948H3.871a0.947 0.947 0 0 1-0.947-0.948V4.824a0.947 0.947 0 0 1 0.947-0.947z"
diff --git a/app/src/main/res/drawable/ic_device_sony_wf_800n.xml b/app/src/main/res/drawable/ic_device_sony_wf_800n.xml
index bb4cad64a..3b8e3e9a2 100644
--- a/app/src/main/res/drawable/ic_device_sony_wf_800n.xml
+++ b/app/src/main/res/drawable/ic_device_sony_wf_800n.xml
@@ -1,8 +1,8 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="28.740126dp"
-    android:height="28.740126dp"
-    android:viewportWidth="28.740126"
-    android:viewportHeight="28.740126">
+    android:width="45sp"
+    android:height="45sp"
+    android:viewportWidth="30"
+    android:viewportHeight="30">
     <path
         android:fillColor="#1f7fdb"
         android:pathData="M3.871 3.877h20.925a0.947 0.947 0 0 1 0.948 0.947v20.01a0.947 0.947 0 0 1-0.948 0.948H3.871a0.947 0.947 0 0 1-0.947-0.948V4.824a0.947 0.947 0 0 1 0.947-0.947z"
diff --git a/app/src/main/res/drawable/ic_device_sony_wf_800n_disabled.xml b/app/src/main/res/drawable/ic_device_sony_wf_800n_disabled.xml
index e65f781a7..d8992d8d7 100644
--- a/app/src/main/res/drawable/ic_device_sony_wf_800n_disabled.xml
+++ b/app/src/main/res/drawable/ic_device_sony_wf_800n_disabled.xml
@@ -1,8 +1,8 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="28.740126dp"
-    android:height="28.740126dp"
-    android:viewportWidth="28.740126"
-    android:viewportHeight="28.740126">
+    android:width="45sp"
+    android:height="45sp"
+    android:viewportWidth="30"
+    android:viewportHeight="30">
     <path
         android:fillColor="#7a7a7a"
         android:pathData="M3.871 3.877h20.925a0.947 0.947 0 0 1 0.948 0.947v20.01a0.947 0.947 0 0 1-0.948 0.948H3.871a0.947 0.947 0 0 1-0.947-0.948V4.824a0.947 0.947 0 0 1 0.947-0.947z"

From 0a28ce92a9d3b6cc9adcc20cd7a5ee254bc8fbc3 Mon Sep 17 00:00:00 2001
From: vanous <petr@linuks.cz>
Date: Sun, 15 May 2022 16:33:48 +0200
Subject: [PATCH 057/110] Sony overhead headphones: new device icon

---
 .../main/assets/ic_device_sony_overhead.svg   | 140 +++++++++++++
 .../ic_device_sony_overhead_disabled.svg      | 192 ++++++++++++++++++
 .../gadgetbridge/model/DeviceType.java        |   4 +-
 .../res/drawable/ic_device_sony_overhead.xml  |  23 +++
 .../ic_device_sony_overhead_disabled.xml      |  28 +++
 5 files changed, 385 insertions(+), 2 deletions(-)
 create mode 100644 app/src/main/assets/ic_device_sony_overhead.svg
 create mode 100644 app/src/main/assets/ic_device_sony_overhead_disabled.svg
 create mode 100644 app/src/main/res/drawable/ic_device_sony_overhead.xml
 create mode 100644 app/src/main/res/drawable/ic_device_sony_overhead_disabled.xml

diff --git a/app/src/main/assets/ic_device_sony_overhead.svg b/app/src/main/assets/ic_device_sony_overhead.svg
new file mode 100644
index 000000000..b4a7c5a4c
--- /dev/null
+++ b/app/src/main/assets/ic_device_sony_overhead.svg
@@ -0,0 +1,140 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   version="1.1"
+   id="svg2"
+   width="28.740126"
+   height="28.740126"
+   viewBox="0 0 28.740126 28.740126"
+   sodipodi:docname="ic_device_sony_overhead.svg"
+   inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <metadata
+     id="metadata8">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs6">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 14.370063 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="28.740126 : 14.370063 : 1"
+       inkscape:persp3d-origin="14.370063 : 9.580042 : 1"
+       id="perspective903" />
+  </defs>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1035"
+     id="namedview4"
+     showgrid="false"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:zoom="14.060255"
+     inkscape:cx="16.038116"
+     inkscape:cy="16.820463"
+     inkscape:window-x="0"
+     inkscape:window-y="45"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="layer1"
+     inkscape:pagecheckerboard="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid972" />
+  </sodipodi:namedview>
+  <g
+     inkscape:groupmode="layer"
+     id="layer1"
+     inkscape:label="Background"
+     style="display:inline">
+    <g
+       inkscape:groupmode="layer"
+       id="layer4"
+       inkscape:label="Bottom"
+       style="display:inline"
+       sodipodi:insensitive="true">
+      <rect
+         style="display:inline;fill:#1f7fdb;fill-opacity:1;stroke:none;stroke-width:3.57115;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect817-5"
+         width="22.819572"
+         height="21.904638"
+         x="2.9239759"
+         y="3.8768768"
+         ry="0.9472276" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer3"
+       inkscape:label="Middle"
+       style="display:inline"
+       sodipodi:insensitive="true">
+      <rect
+         style="display:inline;fill:#4dabf5;fill-opacity:1;stroke:none;stroke-width:3.57115;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect817-7"
+         width="22.819572"
+         height="21.904638"
+         x="2.9317887"
+         y="3.0349438"
+         ry="0.9472276" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer2"
+       inkscape:label="Top"
+       style="display:inline"
+       sodipodi:insensitive="true">
+      <rect
+         style="fill:#2196f3;fill-opacity:1;stroke:none;stroke-width:3.57115;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect817"
+         width="22.819572"
+         height="21.904638"
+         x="2.9238882"
+         y="3.4130721"
+         ry="0.9472276" />
+    </g>
+    <path
+       style="fill:#fffffe;fill-opacity:1;stroke:#ffffff;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 11.787869,22.120059 c 0,0 -2.0910928,-0.292225 -2.6575991,-1.224839 C 8.591619,20.070641 8.1561259,19.180865 7.631892,18.347822 7.1090996,17.567626 7.597652,16.75833 7.689044,15.972138 7.681324,14.958429 7.4045423,13.938261 7.660211,12.932578 8.0157417,10.868804 9.1613178,8.9354471 10.817587,7.6863456 c 2.688723,-1.872765 6.803457,-1.2142137 8.663673,1.5537297 1.346536,1.7828427 2.026474,4.1325137 1.553678,6.3603877 -0.08676,0.923119 0.697056,1.927541 0.06127,2.790481 -0.596062,0.923479 -1.055471,1.947842 -1.712391,2.823233 -0.755807,0.595235 -2.691274,0.772608 -2.691274,0.772608 0,0 -1.514132,-0.618389 -1.649831,-1.431339 0.04222,-0.63115 0.500806,-1.13731 0.745842,-1.700974 0.841894,-1.549407 1.744777,-3.066705 2.737174,-4.521276 0.490354,-0.443872 1.602437,0.740266 1.564181,-0.407131 0.0762,-1.293714 -0.5099,-2.515494 -1.130701,-3.606183 C 18.440464,9.4639663 17.592752,8.8615802 16.642705,8.6047311 14.609615,7.9145591 12.211932,8.1319408 10.47655,9.4725077 9.3167635,10.728865 8.5844629,12.446821 8.637239,14.181989 c 0.3008752,0.859132 1.1571611,-0.488382 1.685694,0.352971 0.605742,0.619625 0.904223,1.470703 1.405699,2.171243 0.728953,1.200475 1.437492,2.419372 1.999338,3.711723 -0.01029,0.972211 -1.940049,1.702133 -1.940049,1.702133 z"
+       id="path4466"
+       sodipodi:nodetypes="cccccccccccccccccccccccc" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer5"
+     inkscape:label="Original"
+     style="display:none"
+     sodipodi:insensitive="true">
+    <image
+       y="0.0079936879"
+       x="0.010951031"
+       id="image4124"
+       xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGAAAABgCAMAAADVRocKAAAAA3NCSVQICAjb4U/gAAAACXBIWXMA ADFOAAAxTgGacD5yAAAAGXRFWHRTb2Z0d2FyZQB3d3cuaW5rc2NhcGUub3Jnm+48GgAAABF0RVh0 VGl0bGUAUGViYmxlIEljb26KvwD9AAAADHRFWHRBdXRob3IAeHBobnh/4OzMAAAAY3RFWHRDb3B5 cmlnaHQAQ0MgQXR0cmlidXRpb24tTm9uQ29tbWVyY2lhbC1TaGFyZUFsaWtlIGh0dHA6Ly9jcmVh dGl2ZWNvbW1vbnMub3JnL2xpY2Vuc2VzL2J5LW5jLXNhLzMuMC/eBBrlAAABy1BMVEUAAAAAAAAA AP8AAIAAAFUAAKoAVaoAAIAAQIAAM2YAM5kzM2YzM5krK4AkJG0kJJIgIIAcHHEcHI4aGoAXF3QX F4sXLnQXLosVK4AUJ3YUJ4kSJIAkJIARInciInciIogQIIAgIIAeHngeHoccHIAcK4AbKHkbKIYa GoAaJoAYJHkXI4AXI4sWIXoWIYUVIIAfH3ofH4UdJ4ATHIQcJnsbJIAaI4QaIoAZIXsZIYQYIHgY IIAXH4MXJ3wXHoAXJoBLpfAWJHwdJHwdJIMcI4Acas0VIoMbIoAaIXwaIIAZH3wZH4MZJXwYHoAY HoYYJIAehtsYHoIefdtHoO0jetZGovNEn+4gg+EfgN5Ep/VKqfREpvQgfdkgfttKqvQggd4hjesw nPMwnPRJqfUhgd4hjutJqfUgfttNq/VNq/QhlPEhlPIhlvMkmPMglvIff9sgjeoglPAhk/AhlPEh lPIhlvMkl/MkmPMlmPMmmPMnmfMpmvMzn/Q0n/Q1n/Q2oPRIqfVNq/VasfZbsvZhtPZitfdtuveQ yvmXzvmj0/qk1Pqu2fu83/vR6f3T6v3Z7f3i8f3j8v3l8/7m8/7p9f7q9f7x+P7y+f7////ougeB AAAAb3RSTlMAAQECAwMDBAQFBQUFBgcHCAkJCgsLCwsMDQ0ODg8PDxAQERESEhMTFBQVFhYXFxgZ GRobGxwdHh8fICAhISIiIiMjIyQkJSYnKCkpKSoqKiorKyssLC2xs7O0tba2tu7u7u7u7+/w8fHy +/v7+/ywJhX9AAAC0klEQVRo3u2a+VfTQBCAm00iW0nSTVNKbKQYbIMUC6jU4q2IB2rF+74vPEAR LSjIIXgAAiqef65py6MNJe17y1RF8/26L/N1N9O8ZGZcLof/DiYFoiV1cZHwiGVZjh7zalRAYYbn sFsQ6RFwGccyBeJjwSMrPn8lHX6fQqRy3tbAsFiU1So9FA4bNIRD63XNTwTO5pSYc9fuvwbgwaW9 SxqYs/eGBgcAGBy+fRrlpRPDsJdfJoEYuMgvzibz/vK3kmDcFMuxNZvM/BG74QTdFV6PJZsYlhe9 XXCCrlCVStwcyhG45QCkoCmiV0o4uwXEib4aQMHjbc0RTXYvCMx/mGdNHaSgraWxRhEXzsgUEC0C KWjfszlUYRWsrYcUHGttNlSRzxUEo5CCjrZYrSqVVlD3Nwj6vqcZsovzKrPeTy3o/5lmxE4wnFl/ 4QhKLvjy2YY5IEExHMH0B1umQQSj9o+EUUewIBh/m8c4qOBbfu58dQRLCmYnJmZLKphKJicdwR8X vJsymSmhIM37FSv4OJlhxnlUOAJHAC8Ye5PHmPNe9PsEJX/5dT5AigvmPtkw53wnr3xB34809uWc zDp9OWflV7xgBaBlzY79MWORALhuui+vbhoArfwe3rUp5MtWfl2Il1QDUtAaj+rKakv1XdEhBfGm Wo1kq+/pM1Ih+wdRI6iIq3IFvEAewgke6QHFg1mU26PjhbtwghsKEbG1X8ew3PmnUPGfXRAwv7hr yqAD13t6nwPQ23PnBMeivG4gg85c7XwCQOeVU+avZ5bslcrrNm7dfehIInGSguOJo+0Hd27ZoOam j3ULvOjTI02x+PYddLTEY42GJpfnpo/L0g50k8pqI1IfbWikoSFaXxfSFKnMrqFsZpKbKKoWDFbT EdQCqlfCdhtIG7AoESLTQogk4EJd/VRTn8fLgecKTg3MjyUsA4SKDD7MT1bQ8++NmvwCRmydh2Fg UvEAAAAASUVORK5CYII= "
+       style="opacity:0.49074079;image-rendering:optimizeQuality"
+       preserveAspectRatio="none"
+       height="28.710279"
+       width="28.710279" />
+  </g>
+</svg>
diff --git a/app/src/main/assets/ic_device_sony_overhead_disabled.svg b/app/src/main/assets/ic_device_sony_overhead_disabled.svg
new file mode 100644
index 000000000..3cd7f091b
--- /dev/null
+++ b/app/src/main/assets/ic_device_sony_overhead_disabled.svg
@@ -0,0 +1,192 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   version="1.1"
+   id="svg2"
+   width="28.740126"
+   height="28.740126"
+   viewBox="0 0 28.740126 28.740126"
+   sodipodi:docname="ic_device_sony_overhead_disabled.svg"
+   inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:android="http://schemas.android.com/apk/res/android">
+  <metadata
+     id="metadata8">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs6">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 14.370063 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="28.740126 : 14.370063 : 1"
+       inkscape:persp3d-origin="14.370063 : 9.580042 : 1"
+       id="perspective903" />
+  </defs>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1035"
+     id="namedview4"
+     showgrid="false"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:zoom="16"
+     inkscape:cx="7.34375"
+     inkscape:cy="7.65625"
+     inkscape:window-x="0"
+     inkscape:window-y="45"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="layer6"
+     inkscape:pagecheckerboard="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid972" />
+  </sodipodi:namedview>
+  <g
+     inkscape:groupmode="layer"
+     id="layer1"
+     inkscape:label="Background"
+     style="display:inline">
+    <g
+       inkscape:groupmode="layer"
+       id="layer4"
+       inkscape:label="Bottom"
+       style="display:inline"
+       sodipodi:insensitive="true">
+      <rect
+         style="display:inline;fill:#7a7a7a;fill-opacity:1;stroke:none;stroke-width:3.57115173;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect817-5"
+         width="22.819572"
+         height="21.904638"
+         x="2.9239759"
+         y="3.8768768"
+         ry="0.9472276" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer3"
+       inkscape:label="Middle"
+       style="display:inline"
+       sodipodi:insensitive="true">
+      <rect
+         style="display:inline;fill:#9f9f9f;fill-opacity:0.94117647;stroke:none;stroke-width:3.57115173;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect817-7"
+         width="22.819572"
+         height="21.904638"
+         x="2.9317887"
+         y="3.0349438"
+         ry="0.9472276" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer2"
+       inkscape:label="Top"
+       style="display:inline"
+       sodipodi:insensitive="true">
+      <rect
+         style="fill:#8a8a8a;fill-opacity:1;stroke:none;stroke-width:3.57115173;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect817"
+         width="22.819572"
+         height="21.904638"
+         x="2.9238882"
+         y="3.4130721"
+         ry="0.9472276" />
+    </g>
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer6"
+     inkscape:label="Foreground"
+     style="display:inline">
+    <g
+       inkscape:groupmode="layer"
+       id="layer7"
+       inkscape:label="Backplane"
+       style="display:inline" />
+    <g
+       inkscape:groupmode="layer"
+       id="layer8"
+       inkscape:label="Frontplane"
+       style="display:inline">
+      <g
+         inkscape:groupmode="layer"
+         id="layer9"
+         inkscape:label="Base"
+         style="display:inline" />
+      <g
+         inkscape:groupmode="layer"
+         id="layer10"
+         inkscape:label="Top"
+         style="display:inline" />
+      <g
+         inkscape:groupmode="layer"
+         id="layer11"
+         inkscape:label="Toptop"
+         style="display:inline" />
+      <g
+         inkscape:groupmode="layer"
+         id="layer12"
+         inkscape:label="Toptoptop"
+         style="display:inline" />
+    </g>
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:#8a8a8a;fill-opacity:0.94117647"
+       d="m 12.48275,10.865376 h 3.907 v 6.978 h -3.907 z"
+       android:strokeWidth="1"
+       id="path2735" />
+    <path
+       style="display:inline;fill:#fffffe;fill-opacity:1;stroke:#ffffff;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 11.787869,22.120059 c 0,0 -2.0910935,-0.292225 -2.6575995,-1.224839 -0.538651,-0.824579 -0.974144,-1.714355 -1.498378,-2.547398 -0.522792,-0.780196 -0.03424,-1.589492 0.05715,-2.375684 -0.0077,-1.013709 -0.284501,-2.033877 -0.02883,-3.03956 0.355531,-2.063774 1.501107,-3.99713 3.1573765,-5.246232 2.688723,-1.872765 6.803457,-1.2142137 8.663673,1.55373 1.346536,1.782842 2.026474,4.132513 1.553678,6.360387 -0.08676,0.923119 0.697056,1.927541 0.06127,2.790481 -0.596062,0.923479 -1.055471,1.947842 -1.712391,2.823233 -0.755807,0.595235 -2.691274,0.772608 -2.691274,0.772608 0,0 -1.514132,-0.618389 -1.649831,-1.431339 0.04222,-0.63115 0.500806,-1.13731 0.745842,-1.700974 0.841894,-1.549407 1.744777,-3.066705 2.737174,-4.521276 0.490354,-0.443872 1.602437,0.740266 1.564181,-0.407131 0.0762,-1.293714 -0.5099,-2.515494 -1.130701,-3.606183 -0.518744,-0.855915 -1.366456,-1.458301 -2.316503,-1.71515 -2.03309,-0.690172 -4.430773,-0.472791 -6.166155,0.867776 -1.1597865,1.256357 -1.8920875,2.974313 -1.8393115,4.709481 0.300875,0.859132 1.157161,-0.488382 1.6856945,0.352971 0.605742,0.619625 0.904223,1.470703 1.405699,2.171243 0.728953,1.200475 1.437492,2.419372 1.999338,3.711723 -0.01029,0.972211 -1.940049,1.702133 -1.940049,1.702133 z"
+       id="path4466"
+       sodipodi:nodetypes="cccccccccccccccccccccccc" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer5"
+     inkscape:label="Original"
+     style="display:none">
+    <image
+       y="0.028144173"
+       x="0.013794855"
+       id="image1291"
+       xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAJAAAACQCAYAAADnRuK4AAAABHNCSVQICAgIfAhkiAAAAAlwSFlz AABO4wAATuMBYdZxSQAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAAZdEVY dFRpdGxlAFR3ZWxmIEljb24gVGVtcGxhdGXyQOONAAAADHRFWHRBdXRob3IAeHBobnh/4OzMAAAA Y3RFWHRDb3B5cmlnaHQAQ0MgQXR0cmlidXRpb24tTm9uQ29tbWVyY2lhbC1TaGFyZUFsaWtlIGh0 dHA6Ly9jcmVhdGl2ZWNvbW1vbnMub3JnL2xpY2Vuc2VzL2J5LW5jLXNhLzQuMC9D0yJcAAANW0lE QVR4nO2dS4xc2VnH/98591VVXd3TbntC92ggwZ5R1BWRRZMoIQG1UIQIs0BCcpINESyyQIqySlgl 2I6yQ2xmtpEQilgQI4EUiAQaQQtCFAiNQjLVUWbsjII19iS2u931vI9zzseiqtxP21V9b7vrlr/f pp/33HPr/O53vvO4VYAgCIIgCIIgCIIgCILwLEBnUz6f8mmfZR7ZpKfyop+GQPvKHNX52mmLKjyS K8NGONAEhclUdMMOy2PsSdMcfr08+LK+JTKdNhurQ0GuD3/RGP58hfc1eSESeUUUMuSQPE0CLgPr ILRv0xp2EMd3CHf3DkiS+yJTQYTh0p4QjS1E0TJvYhGorzA2VjGQ6RoAHklEKECiIhuQDsiz3qC1 9jLF8R1KknNkzDYZs0vAi3CuJeKcEkrNM3ALnrfAnneOw3Cbo2iZN+t3GBtNHkSjh5FoagQ6Ik/j LlSSnKM4NirLbit3fo7Y9AhYgrP9vTjq+iJTTkhVHoqgdIWB+yCvyupeh31/xUWR58Jwm5sX4Abd 21ZhEhUo0NUD8nS7UGkKlS1C2QRq3kA5F5KrJ8Q2IaAOdqnIUxCkAgbaIB2yaoesVMItD06HcP4O XBDA1WpwA4lGkegqYwoEok++ygE/3/+CJv6MVrjIwEIB5QpFw9xyUG9ZuL+Jt+6+tnH1vUneKJRX IPrEN/nFiHrfJqBhHJBYwLqcpQqnglZAqAFPAc7xG0miX3n9s9GtPCOzkwpEAPDJVznQy73NxKBx p8PoZjJBWAbmAsJyjeArfqP747sf2rj6V+mhIf6IJzaomvDchIcJM4Of73+hm6Lx0wdO5CkRnZRx 84FDz9AHgpeWPj+Ycrk2zGOv0j5vnhhgJhHo0DzPNXJwn77VcnDiTulwDNxqOZDWn8LaosI6FLBK B2Vi4GHQOJ5xJxKPThKuN+h+D5esyFNaLAPbfXfp0m6owhgcre0MJx8xnDN68sTjBDPRI3lWCeug xl2oTsbVgq5FOCNaKeba7dCL43nX7d7hS17IYQxurjccNpo4JNERxunC6KA8Ww/neTJb4JUIZ0Jm gbSmvbj2rtefr+leb0l3u1CNu1BYb+zr0h52ZwcYMwcadVt78vT7HS29V/lhANVAedX+olfrWC+t 93SaDtr4oETH8ySB9mXkl7HWXqbRDLN97sKkIzhhGmGmNA79xE/8JHDeXFLVab2i03SwFLXWvj1Y FN+LQgcYX4L1LYrjO2TMLmWLUHNJXxd4GcIZ4uvMDzx4WdLxsijQc0lfZ4tQcfy2iuMVOrQF50A0 GiOJHnZf7UVKkpCcWyKbQJkalF/whQhng/XIQwYKgwBpljIZsE2gnFtwgy03Sxh2Y0dC0JgR6DLW sAZjlsier9G8gXLZxJOQwpTiZ/Csb7Q1mY5Mql0V6jkXkT3fIWOWht0YcNzO0oklcLZLzsVkLRSY ZTV9BnAM5RtPs4NyUUDOBeRcTM7ODdt37ZHHji3QKP9h0yPnIpKtGLMDe1BgQy4g5SwUc0rOxYfa 9/Kxx55gS+sSsNAHerUTVFWYRpg9YoDAIOaM2PEgSJgeGZNRHIOAxWOPHTMCjbLwF/edNJMINDNY YjYUPvx5/OBwghyoP9xRKMwWIdgZAioTBQcZSQkD2J4oKIhAQi5EICEXRT5Y+FR56ZzC5z7o46Mv eHi+RvBLditkDvhFl/Hddwy+/oMMb+2UcyN5KQX67Ad8fOXjIXSJU3lfAS/UCZff7+MPXvZx9TsJ /rqZnXW1JqZk9y3wykUPV36z3PIcRivgq78V4nd/tXz3c6kECjTw5Y+Fp/6eNGcBAfjKx8LSdcWl qu5HVjTeU5tFfQYszxE+vFKuXTKlEuilc6Wq7ol4uWTXWKra1vzZjT4j5kp2jaUSSJg+RCAhFyKQ kIvyTTw8ht2kHA8aLYSPznNePqfwexc97MSM/3nXIpnyZ+9mSqBf/8supv1RawJw80/mHvn3Vy55 eOXSoFluPnD4o3/o45329F6UdGFTzMXnFL78G+GT//EMEYGeMnrCV/xDy9M9sSgCPWUmXaqoTPm8 kAgk5EIEespM+mZcjqc3gQZmbBR2HH/+2xF+7fmzuU9++AuHL/1LfOB36YTD8p9sT/dGs5kX6MU6 4aXFsxFop58vemQO+Iv/TAuqzekw8wKVjTe3HW7sOPxfy+Hv3zR4UyKQMAn/eMPgtc3pjjr7kSRa yIUIJORCBBJyIQIJuRCBhFyIQEIuRCAhFyKQkAsRSMiFCCTkQgQSciECCbkQgYRciEBCLkQgIRci kJALEUjIhQgk5EIEEnIhAgm5EIGEXIhAQi5EICEXIpCQCxFIyIUIJORCBBJyIQIJuRCBhFyIQEIu RCAhFyKQkAsRSMjFzL9D2a02Y/GMPhH51hR/REFRzLxAh98lVSgW6cKEXIhAQi5EICEXIpCQCxFI yMVMjcL++49rZ12FZ46ZEuhxn0UqnA7ShQm5EIGEXIhAQi5KJVAnm/21pXZarmsslUA3pvyzs4rg rTNa+D0ppRLoe7ct3u2W6w6dhDsdxn/dnvAzMc+YUgmUWuBr/5FgFhViAF/9ToKsXAGoXAIBwLdv Glz99wS2ZC/047AO+LN/S/BPb5uzrsrElHIi8RtvZPjebYvPfdDHR1/w8Es1gi7ZrWAc8PMu47vv GHz9B1npcp8RpRQIAN7advjTf00AJGddlWeakt23wrQhAgm5EIGEXIhAwgDSJ5odmVggpStMOpzF qZhnnASkPAb6Ex01pkCrQ2FuTVgpoRxoJvJ4NJ4lGn9B7gRd2H1gd7KTCNMNkWGCZpBhIp9JBaxU zORV2fMWOIqWH9nWYwsURcvseQtMXnVQuApEoBmBDBzIskojRypjooCVig617/Vjjz1BDlRjpSLW Gg5EItEMoAgu87Ql1Xc6YadUykpFrHRn2L6bjz52vFNcxyY24XnnWN/rcsuDI5WIPDNC5sPozFql 4foKTvXgHqiY9b059rz7vFlfGbb1lSNtPoZAVxhoMOorHIbbrNQ86xDOj8Ny7TsQHok2bJSX2TRj 4/mB9Tw4HcIptcthuDSUpnFswBi/C9tY5UEe1GJ/B67loZyrf8IRUsMms37mh3MmSGE6YcX6O3BR 9D4XRbcZG6v75Tkg0pMEYmD0qMx1bNbvcK0GFwRwfrVjwdKLzQAchEHmJzBhqkwn7Fn94K4LArgw 3B52X6ME+uhjU2NGoGE3trHKzeg212pwldacBUsQKj3s0Df9LK5VsnYltkG7aiuVOVurwTUvwGGj OWj7Y/IfYDyBhlHoCgNbjM1PuOYFuFoNDnHaK/ZqhKcNx0k76FoTtPu21oWpVu/vk2d1nzwE4Ohm 0AmG8fsk2mhy8wKc6/duzOT+0mcFZnC//9N6/ZfN4iJMrQZ3YyHZF3m29stzLONuKGMANCiIGbgG bDTBH8+uc2t3jebnAZLHiksFM7jdBiW9v72x8IZDfWWYLDcBrDDQwCF5jg0Vk+xIPCKR+8ndV+n9 5/8QzjWoXge80m5wfLYwGbjdAZLkR+n/3nwNmztuIM0W9sQBniTPgf+YEBqV+ytf/OF7qVL5Fitq kO8D2gdkgno6YQJsBs4yENOP2HV//2df+7ufDf54RBrgMeKMyNvvEMB4z+98o1r5yIc/D8efBqmL rNR8znKFU4Act8C4odhe737/+6/9/J+/FQ+S5KsjUSa+8wsRCLhGAFSjAXXvXsdPa+e9auK81E/9 wKt4Jkt9Z632fa3ZQTFbAhQhAJidJE85IVKMFAAcE2kmBZdl1iqtrfbIZNZkfgoTV5FW491sYWHB DhJluMeNsMYhb9LCg+z5KoBVjqLXuVJZsejeQ78+xxUvQZakHEaBsybTzkJzpCmwRgEAsyfyFAE7 UGAYAFKtHSWW/TCz2oNN0tQGEZtQOWPb1nqV4faMjcVhznNyeYD8EWhYBgP4lMJ6gxp3oXZ353Wy 0NK1LrwsCrTJUh2ZVNuQlLNQQAVgQ8yZCFQQRP5AAspYaTidsIu9wHp+YP04td0aTLg7bxcWWnZv mP5Nl1egAodNDcbGKpprO3wpSZzbAXXqPTsXA2TAWTVw1kKx84k5I+aU5A3piqOLFEQBE1WZkLEL 4fwenGdT1wl7Ntipuqjqub3oU8wMXhEC7evGrgP1Bocx2Bg4tKvoLoJtAjWfQjkXk3MgnksIAAzq BZxeAIAQbQAJqANWKmZlI25Fg1X1YKe6b20LDLyOwXA9X/QBiunChuWMkukmjbqyJDlHcfy2cm6B 7PkaOdslNj1ytipd1ymhdG+wa1TXWN/rslK7HEXvc2G4zXvLEwdmmHMJVGAXdnCWurnecGvtkMJw gZPkPpkWyJjdoTjzcK4lEhWMUvMM7ALYheeBvep9DsMljqJwEHk2msOu6/HLE5NQlEDHLnVsYpWx fofQTmgNy4jjUa1bBZ1WOEgLwAKAwR72TdwG6hjmPK/j0MIoUEAeVHQUeDhDPZwbGtIk4PLw+y3C esFnFfbYAPYew7qOgzsJi5UHKF6gQ+WO6nhNuqszY/x1rZNw2g0r4kwPskApCIIgCIJQEP8P03/B 430mofMAAAAASUVORK5CYII= "
+       style="opacity:0.49074079;image-rendering:optimizeQuality"
+       preserveAspectRatio="none"
+       height="28.670942"
+       width="28.670942" />
+    <image
+       y="0.0055872202"
+       x="-0.031073861"
+       id="image3082"
+       xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAJAAAACQCAYAAADnRuK4AAAABHNCSVQICAgIfAhkiAAAAAlwSFlz AABO4wAATuMBYdZxSQAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAAZdEVY dFRpdGxlAFR3ZWxmIEljb24gVGVtcGxhdGXyQOONAAAADHRFWHRBdXRob3IAeHBobnh/4OzMAAAA Y3RFWHRDb3B5cmlnaHQAQ0MgQXR0cmlidXRpb24tTm9uQ29tbWVyY2lhbC1TaGFyZUFsaWtlIGh0 dHA6Ly9jcmVhdGl2ZWNvbW1vbnMub3JnL2xpY2Vuc2VzL2J5LW5jLXNhLzQuMC9D0yJcAAAL6klE QVR4nO3dTYvcRhrA8adKJZW6Zc0LmTEmmYUF5zYOJjQLOSTQEMhlA7uHsNlPsCHg5DP4MzghHyC3 xZvTGh8CgYaQXMwEkngOZo1f2JAYz2ReLHePSqqqZy+t2Z5xj6c1pbZa7ecHxo09LdVEf0rVkjIG IIQQQgghhBBCCCEvA9bw7ZPJ4TQ2Oo0DPG6bFFJ9xoVTWUxVH1g25vXxfTAAgG63W/GuSa/XK14e DwTH/HklEVUZ0PF4ilBYkiQMACBN0yP7U0rRzFQRKeWRIMIwRACAOI6x1+uNBlRpRNMIiAEAK8JJ 05QppZjWmmmtGQCAtZbCmRLOOQIACCFQCIFSSgzDEEdCGo1oZgJ6Jp6trS2ulGJpmvI8z/nKysph QMaYw/1STO6KaAAAPM87DGh7ext937dhGFopJa6urtqqI6oyoCPx9Pt9nmUZX15e5koprrXm1lpm rWWIyOI4pngqxDnHJEmAMYacc+ScoxDCSint7u6uDYLARlFkx0RUe0Ds2rVrQRRFn3qe93fO+UVE XKxgu6R6TxDxP4j4z4cPH3529epVNfzzM0fkGhD78ssv/2CtvckYW7fWgtYaEKdyyYE4YoyBEAI4 54CIt5VSf/7oo4/+O/IlpQ/cWQNiAADXrl0LFhYWNowx60mSQJZlZ9wceZGCIIA4jsHzvNsPHjz4 09WrVzM44/UiXnLfhx/PAQCiKPo0z/P1nZ0diqdBsiyDnZ0dyPP80tra2hUYWcPC+Gt5JyoT0DPX eRhjH+7t7dEpq4EQEfb29oAx9rdOp8O73S6H8SEdj+oIMeH+xl0kZP1+/3WKp7kQEQ4ODl7f39/n aZpip9NBAICNjY1xH/MZjDmlTRpQ4chH9SzL2mcdPJkNSqlzSZKINE1tv99HIQSur68X14yKLztx lpjkFDb2ImG/3+fGGLfRk9oZYyCKIhFFkVhYWPAGg4HX7/f51tYW73a7405nR0y6BnomnoODA6+i 74HUTCklDg4OxNOnT0Ucx16WZXxMRGOddgo78sYkSVhxhXlpaansJzgygxCR+b7ve55nfd83aZqa OI4hSRIQQuDwRjjCCWugiSPodrssTVOmtWbD2xM0A80Jz/P8LMuEUkqEYegppbzl5WWepilP05QN Z6HCkUllkkU0AwCWJAlTSjFrLSvubVX6XZDaaK2F7/ssz3PgnKPWGpVS3FprRx65cZuBhjtiw7vq vN1uU0BzwvM8YYzxgiDwtNZeu93m1lpmjGFa68PnucBhEX3IGMOGG+eISHfT5wAiciGEZ609fGKi +HXaeycOqFj/aK0n3jhpBmstR0RmreVSyuI1O3/+/KnvpdMQgeGZhCEiK+Kx1h5OGMcfRR5V5jrQ uJ2SORAEAUNEFoZh6feeaQ1E8cynYllS5vjSKYwAwNnPKBQQcUIBESdlH+eYGa+++ip0Oh1YW1uD KIqAsWYty4wxkCQJ3L9/H27dugX7+/t1D+lMGhnQO++8A2+99Vbdw3DieR4sLS3Bm2++CW+88Qbc vHkT7ty5U/ewSmvcKazT6TQ+nuOEEPD+++/D2tpa3UMprVEBtVotePvtt+sexlRwzuHdd9+texil NSqgixcvQhAEdQ9jas6fPw8rKyt1D6OURgXUtP+4Z/HKK6/UPYRSGhWQ7/t1D2HqpJR1D6GURgVE Zg8FRJxQQMRJIy8kjoOIoJQ6/Qtrxhh77jrnwoULoJSCfr8Pv/76K1hrX+DoypubgAaDAXzxxRd1 D+NU586dg48//vjEv798+TJcvnwZAAAePXoE169fhzRNX9TwSqNT2Ay7cOHCzF84pYBesHa73I8T mPXbGxTQC1b2WtasX/uigIgTCugFK/upatZ//tLcfAo7yQcffAALCwu17PvevXuj//wAAAA8ffq0 1Da2trYqHFH15j6gpaUlWF5ermXf4w5+mRklyzL4/vvvqxxS5eY+oKZ59OgR7O3twc7ODty+fXvm H3WlgGbMjz/+CD/99FPdw5gYLaKJEwqIOKGAiBMKiDihgIgTCog4oYCIEwqIOKGAiBMKiDihgIgT Cog4oYCIEwqIOKGAiBMKiDihgIgTCog4oYCIEwqIOKGAiBMKiDihgIgTCog4oYCIEwqIOKGAiBMK iDihgIgTCog4oYCIEwqIOKGAiJO5/wllu7u7YIypZd9JktSy3xdp7gP66quv6h7CXKNTGHFCAREn FBBxQgERJxQQcTI3n8La7TZ88skndQ/jVIyxuodQqbkJiDEGYRjWPYyXDp3CiBMKiDihgIiTRgWU ZVndQ5g6pVTdQyilUQH9/vvvdQ9h6pr2PTYqoLt37871LPT48WPY3t6uexilNCqgNE3h22+/rXsY U2GthW+++abuYZTWqIAAAH744YeZ/3dEy8rzHG7cuAG//PJL3UMprZEXEr/77ju4d+8edDodWFtb g3PnzjXuCq8xBp48eQL379+HW7duwZMnT+oe0pk0MiAAgN9++w1u3LhR9zBeeo07hZHZQgERJxQQ cUIBEQAAYIzhWd5XOiDP8/CsOyOzjXNe+rhOGhAFM8eyLEPGGKZpCgDlZqMzn8JoFpofw2OJjDFk jCHnHDnnKIRAIQSGYXjisZ44oDAMDzdY7KCS0ZPacc7tMBybpulhRI8fPz79vWV35nkecs7R8zxL s9B8YIxZrbXhnFvP82wxQUwySZQKSAiB29vbKISw/X6f4pkTxhjteZ4ZxmMHg4EdThIohMA4jotj /cwxnyQgBACM4xillMg5Ryml9X2/np9YQConhNBZlpk8z7Xv+0YIYaWUdnisT4wHoMQM1Ov1sFgH 7e7uWiGErWT0pHZaay2lzKWUOssyLaU0u7u7NgxDG4Yh9nq90XiOhHTazVQEgMPb3HEcY5qmFgAg SRKDiI27C06egVLKfDAYWEQ0Ukq7t7dnW62WlVKOnr7GKnMdCItZKIoi22q1DCItg5oOEUFrnUdR lLdaLZMkiWm1WiaKIru6umqHs0/x6xmTroGK33FjY8Ourq7aKIpslmWDir4PUhOlVNLv93WSJKbf 7+t2u/28eJ6JqOzzQAgA0Ov1oNvt2sFgcFdK2aHTWDMhIgwGg3txHOtisRyGIW5sbIyGU9kpbPQ1 9no91FpfT5IE6FTWPIgISZKAMeZfi4uLdnV11W5ubpqNjQ0LABaejWfsQfZK7vfIVPPaa69tRFH0 V2PMed/3gXO6ud8EWmtIkgSyLPv5zp07/+j1evrBgwfPi+XEGeKs557D9125cuWPUsp/c87XhRAg RGOfkn0paK1Baw3W2p+VUn/5/PPPHw7/alwkp55aXBcvDADgvffea1+6dOkKAHzIGLvIOV9w3C6Z AmvtE0S8i4jXNzc3P/v6669TOGWRfJpKAhr+ztfX1/n29rYfRZFQSgnf9/08z4UQwjfGeL7ve9Za joiseO/wNXEwck+yuBFq8zw3nueZPM91EAR5lmW63W5naZrmi4uLZnNzc3StA3CGeADc/6+M0QuN GIYhtlot0+/3IY5jPDg4gCAIUGttpZSeMcYDABYEAQegeKpURJTnuUVElFKaLMvM8HcdhqEeXuMp Hs84dYE8iaoWLAgArLhSrbVmUkqmtTZSSuCco9YajTFWSskRERCRUUDVKQISQqBSyiKiDYLA+L5v ENG0Wi2TZZmNosg+7+Zo6f26bgCOnsZYp9Ph+/v7fDAYeHEce0opT2vN2+02N8Zway2jeKZj9IEw z/PsYDCwwxujJkkS0263zeLioh1+VHda+xSqmIHG3S9DrbVNkgSWl5dRKcWzLOPWWlYENPzaCnZP AP7/zyoUARljMAxDK6W0u7u7NgiCk+5tOc1CVc0CR2ahbrfLtra2uFKKpWnKrbXMGMNWVlaY1poZ Y2j2mZLiGZ7t7W0sHv4bhoST3p4oo+qAites2+2yJElYmqZMKcW01kxrffh11lqKqGKjTxAWjx9L KTEMQ4zjGE+4MToTAR3f1uHH9CIkAIA0TSmaF6R4EH4kHICK4wGoNqDj25vkNZmOkyKpNB6A6R3M 49ulaOpT6aL5uGkfWApndtAjE4QQQgghFfkfLnfEbGu/P8gAAAAASUVORK5CYII= "
+       style="display:inline;image-rendering:optimizeQuality"
+       preserveAspectRatio="none"
+       height="28.697369"
+       width="28.697369" />
+  </g>
+</svg>
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java
index e36839e64..ef4e95cde 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java
@@ -105,9 +105,9 @@ public enum DeviceType {
     NOTHING_EAR1(410, R.drawable.ic_device_nothingear, R.drawable.ic_device_nothingear_disabled, R.string.devicetype_nothingear1),
     GALAXY_BUDS_LIVE(419, R.drawable.ic_device_galaxy_buds_live, R.drawable.ic_device_galaxy_buds_live_disabled, R.string.devicetype_galaxybuds_live),
     GALAXY_BUDS(420, R.drawable.ic_device_galaxy_buds, R.drawable.ic_device_galaxy_buds_disabled, R.string.devicetype_galaxybuds),
-    SONY_WH_1000XM3(430, R.drawable.ic_device_headphones, R.drawable.ic_device_headphones_disabled, R.string.devicetype_sony_wh_1000xm3),
+    SONY_WH_1000XM3(430, R.drawable.ic_device_sony_overhead, R.drawable.ic_device_sony_overhead_disabled, R.string.devicetype_sony_wh_1000xm3),
     SONY_WF_SP800N(431, R.drawable.ic_device_sony_wf_800n, R.drawable.ic_device_sony_wf_800n_disabled, R.string.devicetype_sony_wf_sp800n),
-    SONY_WH_1000XM4(432, R.drawable.ic_device_headphones, R.drawable.ic_device_headphones_disabled, R.string.devicetype_sony_wh_1000xm4),
+    SONY_WH_1000XM4(432, R.drawable.ic_device_sony_overhead, R.drawable.ic_device_sony_overhead_disabled, R.string.devicetype_sony_wh_1000xm4),
     BOSE_QC35(440, R.drawable.ic_device_headphones, R.drawable.ic_device_headphones_disabled, R.string.devicetype_bose_qc35),
     VESC_NRF(500, R.drawable.ic_device_vesc, R.drawable.ic_device_vesc_disabled, R.string.devicetype_vesc),
     VESC_HM10(501, R.drawable.ic_device_vesc, R.drawable.ic_device_vesc_disabled, R.string.devicetype_vesc),
diff --git a/app/src/main/res/drawable/ic_device_sony_overhead.xml b/app/src/main/res/drawable/ic_device_sony_overhead.xml
new file mode 100644
index 000000000..4162a62a1
--- /dev/null
+++ b/app/src/main/res/drawable/ic_device_sony_overhead.xml
@@ -0,0 +1,23 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="45sp"
+    android:height="45sp"
+    android:viewportWidth="30"
+    android:viewportHeight="30">
+    <path
+        android:fillColor="#1f7fdb"
+        android:pathData="M3.871 3.877h20.925a0.947 0.947 0 0 1 0.948 0.947v20.01a0.947 0.947 0 0 1-0.948 0.948H3.871a0.947 0.947 0 0 1-0.947-0.948V4.824a0.947 0.947 0 0 1 0.947-0.947z"
+        android:strokeWidth="3.57115" />
+    <path
+        android:fillColor="#4dabf5"
+        android:pathData="M3.879 3.035h20.925a0.947 0.947 0 0 1 0.947 0.947v20.01a0.947 0.947 0 0 1-0.947 0.948H3.88a0.947 0.947 0 0 1-0.947-0.948V3.982A0.947 0.947 0 0 1 3.88 3.035z"
+        android:strokeWidth="3.57115" />
+    <path
+        android:fillColor="#2196f3"
+        android:pathData="M3.871 3.413h20.925a0.947 0.947 0 0 1 0.948 0.947v20.01a0.947 0.947 0 0 1-0.948 0.948H3.871a0.947 0.947 0 0 1-0.947-0.948V4.36A0.947 0.947 0 0 1 3.87 3.413z"
+        android:strokeWidth="3.57115" />
+    <path
+        android:fillColor="#fffffe"
+        android:pathData="M11.788 22.12s-2.091-0.292-2.658-1.225c-0.538-0.824-0.974-1.714-1.498-2.547-0.523-0.78-0.034-1.59 0.057-2.376-0.008-1.014-0.285-2.034-0.029-3.04 0.356-2.063 1.501-3.997 3.158-5.246 2.688-1.872 6.803-1.214 8.663 1.554 1.347 1.783 2.027 4.133 1.554 6.36-0.087 0.924 0.697 1.928 0.061 2.79-0.596 0.924-1.055 1.949-1.712 2.824-0.756 0.595-2.691 0.773-2.691 0.773s-1.515-0.619-1.65-1.432c0.042-0.63 0.5-1.137 0.746-1.7 0.841-1.55 1.744-3.067 2.737-4.522 0.49-0.444 1.602 0.74 1.564-0.407 0.076-1.294-0.51-2.515-1.13-3.606-0.52-0.856-1.367-1.458-2.317-1.715-2.033-0.69-4.431-0.473-6.166 0.867-1.16 1.257-1.893 2.975-1.84 4.71 0.301 0.86 1.157-0.488 1.686 0.353 0.606 0.62 0.904 1.47 1.406 2.171 0.729 1.2 1.437 2.42 1.999 3.712-0.01 0.972-1.94 1.702-1.94 1.702z"
+        android:strokeWidth="0.5"
+        android:strokeColor="#ffffff" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_device_sony_overhead_disabled.xml b/app/src/main/res/drawable/ic_device_sony_overhead_disabled.xml
new file mode 100644
index 000000000..1f2293218
--- /dev/null
+++ b/app/src/main/res/drawable/ic_device_sony_overhead_disabled.xml
@@ -0,0 +1,28 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="45sp"
+    android:height="45sp"
+    android:viewportWidth="30"
+    android:viewportHeight="30">
+    <path
+        android:fillColor="#7a7a7a"
+        android:pathData="M3.871 3.877h20.925a0.947 0.947 0 0 1 0.948 0.947v20.01a0.947 0.947 0 0 1-0.948 0.948H3.871a0.947 0.947 0 0 1-0.947-0.948V4.824a0.947 0.947 0 0 1 0.947-0.947z"
+        android:strokeWidth="3.57115173" />
+    <path
+        android:fillAlpha="0.9411765"
+        android:fillColor="#9f9f9f"
+        android:pathData="M3.879 3.035h20.925a0.947 0.947 0 0 1 0.947 0.947v20.01a0.947 0.947 0 0 1-0.947 0.948H3.88a0.947 0.947 0 0 1-0.947-0.948V3.982A0.947 0.947 0 0 1 3.88 3.035z"
+        android:strokeWidth="3.57115173" />
+    <path
+        android:fillColor="#8a8a8a"
+        android:pathData="M3.871 3.413h20.925a0.947 0.947 0 0 1 0.948 0.947v20.01a0.947 0.947 0 0 1-0.948 0.948H3.871a0.947 0.947 0 0 1-0.947-0.948V4.36A0.947 0.947 0 0 1 3.87 3.413z"
+        android:strokeWidth="3.57115173" />
+    <path
+        android:fillAlpha="0.9411765"
+        android:fillColor="#8a8a8a"
+        android:pathData="M12.483 10.865h3.907v6.978h-3.907z" />
+    <path
+        android:fillColor="#fffffe"
+        android:pathData="M11.788 22.12s-2.091-0.292-2.658-1.225c-0.538-0.824-0.974-1.714-1.498-2.547-0.523-0.78-0.034-1.59 0.057-2.376-0.008-1.014-0.284-2.034-0.029-3.04 0.356-2.063 1.501-3.997 3.158-5.246 2.688-1.872 6.803-1.214 8.663 1.554 1.347 1.783 2.027 4.133 1.554 6.36-0.087 0.924 0.697 1.928 0.061 2.791-0.596 0.923-1.055 1.948-1.712 2.823-0.756 0.595-2.691 0.773-2.691 0.773s-1.515-0.619-1.65-1.431c0.042-0.632 0.5-1.138 0.746-1.702 0.841-1.549 1.744-3.066 2.737-4.52 0.49-0.445 1.602 0.74 1.564-0.408 0.076-1.294-0.51-2.515-1.13-3.606-0.52-0.856-1.367-1.458-2.317-1.715-2.033-0.69-4.431-0.473-6.166 0.868-1.16 1.256-1.893 2.974-1.84 4.71 0.301 0.858 1.157-0.49 1.686 0.352 0.606 0.62 0.904 1.47 1.406 2.171 0.729 1.2 1.437 2.42 1.999 3.712-0.01 0.972-1.94 1.702-1.94 1.702z"
+        android:strokeWidth="0.5"
+        android:strokeColor="#ffffff" />
+</vector>

From a5a3e57a343557ac354dd1c403d8f51e6778135d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Sun, 15 May 2022 17:22:55 +0100
Subject: [PATCH 058/110] Sony Headphones: Simplify capability definition

---
 .../SonyHeadphonesCapabilities.java           |  38 ++++++
 .../headphones/SonyHeadphonesCoordinator.java | 121 ++++++++++++++++++
 .../coordinators/SonyWFSP800NCoordinator.java |  39 +++---
 .../SonyWH1000XM3Coordinator.java             |  37 +++---
 .../SonyWH1000XM4Coordinator.java             |  33 ++---
 .../gadgetbridge/model/BatteryConfig.java     |  16 ++-
 .../protocol/impl/v1/SonyProtocolImplV1.java  |  98 ++++++--------
 .../service/TestDeviceSupport.java            |  11 ++
 8 files changed, 272 insertions(+), 121 deletions(-)
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/SonyHeadphonesCapabilities.java

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/SonyHeadphonesCapabilities.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/SonyHeadphonesCapabilities.java
new file mode 100644
index 000000000..8fbf9b72e
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/SonyHeadphonesCapabilities.java
@@ -0,0 +1,38 @@
+/*  Copyright (C) 2022 José Rebelo
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.devices.sony.headphones;
+
+public enum SonyHeadphonesCapabilities {
+    BatterySingle,
+    BatteryDual,
+    BatteryCase,
+    PowerOffFromPhone,
+    AmbientSoundControl,
+    WindNoiseReduction,
+    AncOptimizer,
+    AudioSettingsOnlyOnSbcCodec,
+    AudioUpsampling,
+    ButtonModesLeftRight,
+    VoiceNotifications,
+    AutomaticPowerOffWhenTakenOff,
+    AutomaticPowerOffByTime,
+    TouchSensorSingle,
+    Equalizer,
+    SoundPosition,
+    SurroundMode,
+    PauseWhenTakenOff
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/SonyHeadphonesCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/SonyHeadphonesCoordinator.java
index 10e6a2ea1..a6b93585b 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/SonyHeadphonesCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/SonyHeadphonesCoordinator.java
@@ -23,7 +23,18 @@ import android.net.Uri;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
+import org.apache.commons.lang3.ArrayUtils;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
 import nodomain.freeyourgadget.gadgetbridge.GBException;
+import nodomain.freeyourgadget.gadgetbridge.R;
 import nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSpecificSettingsCustomizer;
 import nodomain.freeyourgadget.gadgetbridge.devices.AbstractDeviceCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.InstallHandler;
@@ -32,6 +43,7 @@ import nodomain.freeyourgadget.gadgetbridge.entities.DaoSession;
 import nodomain.freeyourgadget.gadgetbridge.entities.Device;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
 import nodomain.freeyourgadget.gadgetbridge.model.ActivitySample;
+import nodomain.freeyourgadget.gadgetbridge.model.BatteryConfig;
 
 public abstract class SonyHeadphonesCoordinator extends AbstractDeviceCoordinator {
     @Override
@@ -123,4 +135,113 @@ public abstract class SonyHeadphonesCoordinator extends AbstractDeviceCoordinato
     public boolean supportsFindDevice() {
         return false;
     }
+
+    @Override
+    public boolean supportsPowerOff() {
+        return supports(SonyHeadphonesCapabilities.PowerOffFromPhone);
+    }
+
+    @Override
+    public int getBatteryCount() {
+        if (supports(SonyHeadphonesCapabilities.BatterySingle)) {
+            if (supports(SonyHeadphonesCapabilities.BatteryDual)) {
+                throw new IllegalStateException("A device can't have both single and dual battery");
+            } else if(supports(SonyHeadphonesCapabilities.BatteryCase)) {
+                throw new IllegalStateException("Devices with single battery + case are not supported by the protocol");
+            }
+        }
+
+        int batteryCount = 0;
+
+        if (supports(SonyHeadphonesCapabilities.BatterySingle)) {
+            batteryCount += 1;
+        }
+
+        if (supports(SonyHeadphonesCapabilities.BatteryCase)) {
+            batteryCount += 1;
+        }
+
+        if (supports(SonyHeadphonesCapabilities.BatteryDual)) {
+            batteryCount += 2;
+        }
+
+        return batteryCount;
+    }
+
+    @Override
+    public int[] getSupportedDeviceSpecificSettings(final GBDevice device) {
+        final List<Integer> settings = new ArrayList<>();
+
+        if (supports(SonyHeadphonesCapabilities.AmbientSoundControl)) {
+            if (supports(SonyHeadphonesCapabilities.WindNoiseReduction)) {
+                settings.add(R.xml.devicesettings_sony_headphones_ambient_sound_control_wind_noise_reduction);
+            } else {
+                settings.add(R.xml.devicesettings_sony_headphones_ambient_sound_control);
+            }
+
+            if (supports(SonyHeadphonesCapabilities.AncOptimizer)) {
+                settings.add(R.xml.devicesettings_sony_headphones_anc_optimizer);
+            }
+        }
+
+        addSettingsUnderHeader(settings, R.xml.devicesettings_header_other, new LinkedHashMap<SonyHeadphonesCapabilities, Integer>() {{
+            put(SonyHeadphonesCapabilities.AudioSettingsOnlyOnSbcCodec, R.xml.devicesettings_sony_warning_wh1000xm3);
+            put(SonyHeadphonesCapabilities.Equalizer, R.xml.devicesettings_sony_headphones_equalizer);
+            put(SonyHeadphonesCapabilities.SoundPosition, R.xml.devicesettings_sony_headphones_sound_position);
+            put(SonyHeadphonesCapabilities.SurroundMode, R.xml.devicesettings_sony_headphones_surround_mode);
+            put(SonyHeadphonesCapabilities.AudioUpsampling, R.xml.devicesettings_sony_headphones_audio_upsampling);
+        }});
+
+        addSettingsUnderHeader(settings, R.xml.devicesettings_header_system, new LinkedHashMap<SonyHeadphonesCapabilities, Integer>() {{
+            put(SonyHeadphonesCapabilities.ButtonModesLeftRight, R.xml.devicesettings_sony_headphones_button_modes_left_right);
+            put(SonyHeadphonesCapabilities.TouchSensorSingle, R.xml.devicesettings_sony_headphones_touch_sensor_single);
+            put(SonyHeadphonesCapabilities.PauseWhenTakenOff, R.xml.devicesettings_sony_headphones_pause_when_taken_off);
+            put(SonyHeadphonesCapabilities.AutomaticPowerOffWhenTakenOff, R.xml.devicesettings_automatic_power_off_when_taken_off);
+            put(SonyHeadphonesCapabilities.AutomaticPowerOffByTime, R.xml.devicesettings_automatic_power_off_by_time);
+            put(SonyHeadphonesCapabilities.VoiceNotifications, R.xml.devicesettings_sony_headphones_notifications_voice_guide);
+        }});
+
+        settings.add(R.xml.devicesettings_sony_headphones_device_info);
+
+        return ArrayUtils.toPrimitive(settings.toArray(new Integer[0]));
+    }
+
+    public List<SonyHeadphonesCapabilities> getCapabilities() {
+        return Collections.emptyList();
+    }
+
+    public boolean supports(final SonyHeadphonesCapabilities capability) {
+        return getCapabilities().contains(capability);
+    }
+
+    /**
+     * Add the preference screens for capabilities under a header. The header is also only added if at least one capability is supported by the device.
+     *
+     * @param settings the list of settings to update
+     * @param header the header to add, if any capability supported
+     * @param capabilities the map of capability to preference screen
+     */
+    private void addSettingsUnderHeader(final List<Integer> settings,
+                                        final int header,
+                                        final Map<SonyHeadphonesCapabilities, Integer> capabilities) {
+        final Set<SonyHeadphonesCapabilities> supportedCapabilities = new HashSet<>(capabilities.keySet());
+        for (SonyHeadphonesCapabilities capability : capabilities.keySet()) {
+            if (!supports(capability)) {
+                supportedCapabilities.remove(capability);
+            }
+        }
+
+        if (supportedCapabilities.isEmpty()) {
+            // None of the capabilities in the map are supported
+            return;
+        }
+
+        settings.add(header);
+
+        for (Map.Entry<SonyHeadphonesCapabilities, Integer> capabilitiesSetting : capabilities.entrySet()) {
+            if (supports(capabilitiesSetting.getKey())) {
+                settings.add(capabilitiesSetting.getValue());
+            }
+        }
+    }
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/coordinators/SonyWFSP800NCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/coordinators/SonyWFSP800NCoordinator.java
index d021ab7c4..6dd9d0124 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/coordinators/SonyWFSP800NCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/coordinators/SonyWFSP800NCoordinator.java
@@ -18,9 +18,12 @@ package nodomain.freeyourgadget.gadgetbridge.devices.sony.headphones.coordinator
 
 import androidx.annotation.NonNull;
 
+import java.util.Arrays;
+import java.util.List;
+
 import nodomain.freeyourgadget.gadgetbridge.R;
+import nodomain.freeyourgadget.gadgetbridge.devices.sony.headphones.SonyHeadphonesCapabilities;
 import nodomain.freeyourgadget.gadgetbridge.devices.sony.headphones.SonyHeadphonesCoordinator;
-import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDeviceCandidate;
 import nodomain.freeyourgadget.gadgetbridge.model.BatteryConfig;
 import nodomain.freeyourgadget.gadgetbridge.model.DeviceType;
@@ -41,16 +44,6 @@ public class SonyWFSP800NCoordinator extends SonyHeadphonesCoordinator {
         return DeviceType.SONY_WF_SP800N;
     }
 
-    @Override
-    public int getBatteryCount() {
-        return 3;
-    }
-
-    @Override
-    public boolean supportsPowerOff() {
-        return true;
-    }
-
     @Override
     public BatteryConfig[] getBatteryConfig() {
         final BatteryConfig battery1 = new BatteryConfig(0, R.drawable.ic_sony_wf_800n_case, R.string.battery_case);
@@ -61,17 +54,17 @@ public class SonyWFSP800NCoordinator extends SonyHeadphonesCoordinator {
     }
 
     @Override
-    public int[] getSupportedDeviceSpecificSettings(final GBDevice device) {
-        return new int[]{
-                R.xml.devicesettings_sony_headphones_ambient_sound_control,
-                R.xml.devicesettings_header_other,
-                R.xml.devicesettings_sony_headphones_equalizer,
-                R.xml.devicesettings_header_system,
-                R.xml.devicesettings_sony_headphones_button_modes_left_right,
-                R.xml.devicesettings_sony_headphones_pause_when_taken_off,
-                R.xml.devicesettings_automatic_power_off_when_taken_off,
-                R.xml.devicesettings_sony_headphones_notifications_voice_guide,
-                R.xml.devicesettings_sony_headphones_device_info
-        };
+    public List<SonyHeadphonesCapabilities> getCapabilities() {
+        return Arrays.asList(
+                SonyHeadphonesCapabilities.BatteryDual,
+                SonyHeadphonesCapabilities.BatteryCase,
+                SonyHeadphonesCapabilities.PowerOffFromPhone,
+                SonyHeadphonesCapabilities.AmbientSoundControl,
+                SonyHeadphonesCapabilities.Equalizer,
+                SonyHeadphonesCapabilities.ButtonModesLeftRight,
+                SonyHeadphonesCapabilities.PauseWhenTakenOff,
+                SonyHeadphonesCapabilities.AutomaticPowerOffWhenTakenOff,
+                SonyHeadphonesCapabilities.VoiceNotifications
+        );
     }
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/coordinators/SonyWH1000XM3Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/coordinators/SonyWH1000XM3Coordinator.java
index 16a9ea508..0318b40db 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/coordinators/SonyWH1000XM3Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/coordinators/SonyWH1000XM3Coordinator.java
@@ -18,9 +18,11 @@ package nodomain.freeyourgadget.gadgetbridge.devices.sony.headphones.coordinator
 
 import androidx.annotation.NonNull;
 
-import nodomain.freeyourgadget.gadgetbridge.R;
+import java.util.Arrays;
+import java.util.List;
+
+import nodomain.freeyourgadget.gadgetbridge.devices.sony.headphones.SonyHeadphonesCapabilities;
 import nodomain.freeyourgadget.gadgetbridge.devices.sony.headphones.SonyHeadphonesCoordinator;
-import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDeviceCandidate;
 import nodomain.freeyourgadget.gadgetbridge.model.DeviceType;
 
@@ -41,21 +43,20 @@ public class SonyWH1000XM3Coordinator extends SonyHeadphonesCoordinator {
     }
 
     @Override
-    public int[] getSupportedDeviceSpecificSettings(final GBDevice device) {
-        return new int[]{
-                R.xml.devicesettings_sony_headphones_ambient_sound_control_wind_noise_reduction,
-                R.xml.devicesettings_sony_headphones_anc_optimizer,
-                R.xml.devicesettings_header_other,
-                R.xml.devicesettings_sony_warning_wh1000xm3,
-                R.xml.devicesettings_sony_headphones_equalizer,
-                R.xml.devicesettings_sony_headphones_sound_position,
-                R.xml.devicesettings_sony_headphones_surround_mode,
-                R.xml.devicesettings_sony_headphones_audio_upsampling,
-                R.xml.devicesettings_header_system,
-                R.xml.devicesettings_sony_headphones_touch_sensor_single,
-                R.xml.devicesettings_automatic_power_off_by_time,
-                R.xml.devicesettings_sony_headphones_notifications_voice_guide,
-                R.xml.devicesettings_sony_headphones_device_info
-        };
+    public List<SonyHeadphonesCapabilities> getCapabilities() {
+        return Arrays.asList(
+                SonyHeadphonesCapabilities.BatterySingle,
+                SonyHeadphonesCapabilities.AmbientSoundControl,
+                SonyHeadphonesCapabilities.WindNoiseReduction,
+                SonyHeadphonesCapabilities.AncOptimizer,
+                SonyHeadphonesCapabilities.AudioSettingsOnlyOnSbcCodec,
+                SonyHeadphonesCapabilities.Equalizer,
+                SonyHeadphonesCapabilities.SoundPosition,
+                SonyHeadphonesCapabilities.SurroundMode,
+                SonyHeadphonesCapabilities.AudioUpsampling,
+                SonyHeadphonesCapabilities.TouchSensorSingle,
+                SonyHeadphonesCapabilities.AutomaticPowerOffByTime,
+                SonyHeadphonesCapabilities.VoiceNotifications
+        );
     }
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/coordinators/SonyWH1000XM4Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/coordinators/SonyWH1000XM4Coordinator.java
index fac10a307..47e846c6b 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/coordinators/SonyWH1000XM4Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/coordinators/SonyWH1000XM4Coordinator.java
@@ -18,9 +18,11 @@ package nodomain.freeyourgadget.gadgetbridge.devices.sony.headphones.coordinator
 
 import androidx.annotation.NonNull;
 
-import nodomain.freeyourgadget.gadgetbridge.R;
+import java.util.Arrays;
+import java.util.List;
+
+import nodomain.freeyourgadget.gadgetbridge.devices.sony.headphones.SonyHeadphonesCapabilities;
 import nodomain.freeyourgadget.gadgetbridge.devices.sony.headphones.SonyHeadphonesCoordinator;
-import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDeviceCandidate;
 import nodomain.freeyourgadget.gadgetbridge.model.DeviceType;
 
@@ -41,22 +43,21 @@ public class SonyWH1000XM4Coordinator extends SonyHeadphonesCoordinator {
     }
 
     @Override
-    public int[] getSupportedDeviceSpecificSettings(final GBDevice device) {
-        return new int[]{
+    public List<SonyHeadphonesCapabilities> getCapabilities() {
+        return Arrays.asList(
                 // TODO: Function of [CUSTOM] button
-                R.xml.devicesettings_sony_headphones_ambient_sound_control_wind_noise_reduction,
-                R.xml.devicesettings_sony_headphones_anc_optimizer,
-                R.xml.devicesettings_header_other,
-                R.xml.devicesettings_sony_headphones_equalizer,
-                R.xml.devicesettings_sony_headphones_audio_upsampling,
-                R.xml.devicesettings_header_system,
                 // TODO R.xml.devicesettings_connect_two_devices,
                 // TODO R.xml.devicesettings_sony_headphones_speak_to_chat_with_settings,
-                R.xml.devicesettings_sony_headphones_touch_sensor_single,
-                R.xml.devicesettings_sony_headphones_pause_when_taken_off,
-                R.xml.devicesettings_automatic_power_off_when_taken_off,
-                R.xml.devicesettings_sony_headphones_notifications_voice_guide,
-                R.xml.devicesettings_sony_headphones_device_info
-        };
+                SonyHeadphonesCapabilities.BatterySingle,
+                SonyHeadphonesCapabilities.AmbientSoundControl,
+                SonyHeadphonesCapabilities.WindNoiseReduction,
+                SonyHeadphonesCapabilities.AncOptimizer,
+                SonyHeadphonesCapabilities.Equalizer,
+                SonyHeadphonesCapabilities.AudioUpsampling,
+                SonyHeadphonesCapabilities.TouchSensorSingle,
+                SonyHeadphonesCapabilities.PauseWhenTakenOff,
+                SonyHeadphonesCapabilities.AutomaticPowerOffWhenTakenOff,
+                SonyHeadphonesCapabilities.VoiceNotifications
+        );
     }
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/BatteryConfig.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/BatteryConfig.java
index 126fffeaa..cc627b598 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/BatteryConfig.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/BatteryConfig.java
@@ -17,6 +17,8 @@
 
 package nodomain.freeyourgadget.gadgetbridge.model;
 
+import java.util.Objects;
+
 public class BatteryConfig {
 
     private final int batteryIndex;
@@ -41,6 +43,16 @@ public class BatteryConfig {
         return batteryLabel;
     }
 
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (!(o instanceof BatteryConfig)) return false;
+        BatteryConfig that = (BatteryConfig) o;
+        return getBatteryIndex() == that.getBatteryIndex() && getBatteryIcon() == that.getBatteryIcon() && getBatteryLabel() == that.getBatteryLabel();
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(getBatteryIndex(), getBatteryIcon(), getBatteryLabel());
+    }
 }
-
-
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/headphones/protocol/impl/v1/SonyProtocolImplV1.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/headphones/protocol/impl/v1/SonyProtocolImplV1.java
index 9f46600df..5c8eca4b5 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/headphones/protocol/impl/v1/SonyProtocolImplV1.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/headphones/protocol/impl/v1/SonyProtocolImplV1.java
@@ -26,8 +26,10 @@ import java.nio.ByteBuffer;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Locale;
+import java.util.Map;
 import java.util.regex.Pattern;
 
 import nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst;
@@ -36,6 +38,8 @@ import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventBatteryInf
 import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventUpdateDeviceInfo;
 import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventUpdatePreferences;
 import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventVersionInfo;
+import nodomain.freeyourgadget.gadgetbridge.devices.sony.headphones.SonyHeadphonesCapabilities;
+import nodomain.freeyourgadget.gadgetbridge.devices.sony.headphones.SonyHeadphonesCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.sony.headphones.prefs.AmbientSoundControl;
 import nodomain.freeyourgadget.gadgetbridge.devices.sony.headphones.prefs.AudioUpsampling;
 import nodomain.freeyourgadget.gadgetbridge.devices.sony.headphones.prefs.AutomaticPowerOff;
@@ -49,7 +53,6 @@ import nodomain.freeyourgadget.gadgetbridge.devices.sony.headphones.prefs.TouchS
 import nodomain.freeyourgadget.gadgetbridge.devices.sony.headphones.prefs.VoiceNotifications;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
 import nodomain.freeyourgadget.gadgetbridge.model.BatteryState;
-import nodomain.freeyourgadget.gadgetbridge.model.DeviceType;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.sony.headphones.deviceevents.SonyHeadphonesEnqueueRequestEvent;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.sony.headphones.protocol.Request;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.sony.headphones.protocol.MessageType;
@@ -58,6 +61,7 @@ import nodomain.freeyourgadget.gadgetbridge.service.devices.sony.headphones.prot
 import nodomain.freeyourgadget.gadgetbridge.service.devices.sony.headphones.protocol.impl.v1.params.BatteryType;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.sony.headphones.protocol.impl.v1.params.NoiseCancellingOptimizerStatus;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.sony.headphones.protocol.impl.v1.params.VirtualSoundParam;
+import nodomain.freeyourgadget.gadgetbridge.util.DeviceHelper;
 import nodomain.freeyourgadget.gadgetbridge.util.GB;
 
 public class SonyProtocolImplV1 extends AbstractSonyProtocolImpl {
@@ -494,55 +498,36 @@ public class SonyProtocolImplV1 extends AbstractSonyProtocolImpl {
             return Collections.emptyList();
         }
 
-        final DeviceType deviceType = getDevice().getType();
-
-        final List<Request> capabilityRequests = new ArrayList<>();
+        final SonyHeadphonesCoordinator coordinator = (SonyHeadphonesCoordinator) DeviceHelper.getInstance().getCoordinator(getDevice());
 
         // Populate the init requests
-        // TODO: We should be determine which of these we need from the device...
-        switch (deviceType) {
-            case SONY_WH_1000XM3:
-                capabilityRequests.add(getFirmwareVersion());
-                capabilityRequests.add(getBattery(BatteryType.SINGLE));
-                capabilityRequests.add(getAudioCodec());
-                capabilityRequests.add(getAmbientSoundControl());
-                capabilityRequests.add(getNoiseCancellingOptimizerState());
-                capabilityRequests.add(getAudioUpsampling());
-                capabilityRequests.add(getVoiceNotifications());
-                capabilityRequests.add(getAutomaticPowerOff());
-                capabilityRequests.add(getTouchSensor());
-                capabilityRequests.add(getSurroundMode());
-                capabilityRequests.add(getSoundPosition());
-                capabilityRequests.add(getEqualizer());
-                break;
-            case SONY_WH_1000XM4:
-                capabilityRequests.add(getFirmwareVersion());
-                capabilityRequests.add(getBattery(BatteryType.SINGLE));
-                capabilityRequests.add(getAudioCodec());
-                capabilityRequests.add(getAmbientSoundControl());
-                capabilityRequests.add(getNoiseCancellingOptimizerState());
-                capabilityRequests.add(getAudioUpsampling());
-                capabilityRequests.add(getVoiceNotifications());
-                capabilityRequests.add(getAutomaticPowerOff());
-                capabilityRequests.add(getTouchSensor());
-                capabilityRequests.add(getEqualizer());
-                capabilityRequests.add(getPauseWhenTakenOff());
-                break;
-            case SONY_WF_SP800N:
-                capabilityRequests.add(getFirmwareVersion());
-                capabilityRequests.add(getBattery(BatteryType.DUAL));
-                capabilityRequests.add(getBattery(BatteryType.CASE));
-                capabilityRequests.add(getAudioCodec());
-                capabilityRequests.add(getAmbientSoundControl());
-                capabilityRequests.add(getVoiceNotifications());
-                capabilityRequests.add(getAutomaticPowerOff());
-                capabilityRequests.add(getEqualizer());
-                capabilityRequests.add(getButtonModes());
-                capabilityRequests.add(getPauseWhenTakenOff());
-                break;
-            default:
-                LOG.error("Unsupported Sony device type '{}' with key '{}'", deviceType, deviceType.getKey());
-                return null;
+        final List<Request> capabilityRequests = new ArrayList<>();
+
+        capabilityRequests.add(getFirmwareVersion());
+        capabilityRequests.add(getAudioCodec());
+
+        final Map<SonyHeadphonesCapabilities, Request> capabilityRequestMap = new LinkedHashMap<SonyHeadphonesCapabilities, Request>() {{
+            put(SonyHeadphonesCapabilities.BatterySingle, getBattery(BatteryType.SINGLE));
+            put(SonyHeadphonesCapabilities.BatteryDual, getBattery(BatteryType.DUAL));
+            put(SonyHeadphonesCapabilities.BatteryCase, getBattery(BatteryType.CASE));
+            put(SonyHeadphonesCapabilities.AmbientSoundControl, getAmbientSoundControl());
+            put(SonyHeadphonesCapabilities.AncOptimizer, getNoiseCancellingOptimizerState());
+            put(SonyHeadphonesCapabilities.AudioUpsampling, getAudioUpsampling());
+            put(SonyHeadphonesCapabilities.ButtonModesLeftRight, getButtonModes());
+            put(SonyHeadphonesCapabilities.VoiceNotifications, getVoiceNotifications());
+            put(SonyHeadphonesCapabilities.AutomaticPowerOffWhenTakenOff, getAutomaticPowerOff());
+            put(SonyHeadphonesCapabilities.AutomaticPowerOffByTime, getAutomaticPowerOff());
+            put(SonyHeadphonesCapabilities.TouchSensorSingle, getTouchSensor());
+            put(SonyHeadphonesCapabilities.Equalizer, getEqualizer());
+            put(SonyHeadphonesCapabilities.SoundPosition, getSoundPosition());
+            put(SonyHeadphonesCapabilities.SurroundMode, getSurroundMode());
+            put(SonyHeadphonesCapabilities.PauseWhenTakenOff, getPauseWhenTakenOff());
+        }};
+
+        for (Map.Entry<SonyHeadphonesCapabilities, Request> capabilityEntry : capabilityRequestMap.entrySet()) {
+            if (coordinator.supports(capabilityEntry.getKey())) {
+                capabilityRequests.add(capabilityEntry.getValue());
+            }
         }
 
         return Collections.singletonList(new SonyHeadphonesEnqueueRequestEvent(capabilityRequests));
@@ -644,7 +629,7 @@ public class SonyProtocolImplV1 extends AbstractSonyProtocolImpl {
 
         final float pressure = payload[5] / 10.0f;
 
-        if (pressure <= 0 || pressure >  1.0f) {
+        if (pressure <= 0 || pressure > 1.0f) {
             LOG.warn("Invalid Noise Cancelling Optimizer pressure: {} atm, ignoring", pressure);
             return Collections.emptyList();
         }
@@ -1076,19 +1061,8 @@ public class SonyProtocolImplV1 extends AbstractSonyProtocolImpl {
     }
 
     private boolean supportsWindNoiseCancelling() {
-        // TODO: We should be able to determine this dynamically...
+        final SonyHeadphonesCoordinator coordinator = (SonyHeadphonesCoordinator) DeviceHelper.getInstance().getCoordinator(getDevice());
 
-        final DeviceType deviceType = getDevice().getType();
-
-        switch (deviceType) {
-            case SONY_WH_1000XM3:
-            case SONY_WH_1000XM4:
-                return true;
-            case SONY_WF_SP800N:
-                return false;
-            default:
-                LOG.error("Unknown Sony device type '{}' with key '{}'", deviceType, deviceType.getKey());
-                return false;
-        }
+        return coordinator.supports(SonyHeadphonesCapabilities.WindNoiseReduction);
     }
 }
diff --git a/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/service/TestDeviceSupport.java b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/service/TestDeviceSupport.java
index aa71841db..ab336b28a 100644
--- a/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/service/TestDeviceSupport.java
+++ b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/service/TestDeviceSupport.java
@@ -17,6 +17,7 @@ import nodomain.freeyourgadget.gadgetbridge.model.MusicStateSpec;
 import nodomain.freeyourgadget.gadgetbridge.model.NotificationSpec;
 import nodomain.freeyourgadget.gadgetbridge.model.Reminder;
 import nodomain.freeyourgadget.gadgetbridge.model.WeatherSpec;
+import nodomain.freeyourgadget.gadgetbridge.model.WorldClock;
 
 class TestDeviceSupport extends AbstractDeviceSupport {
 
@@ -70,6 +71,11 @@ class TestDeviceSupport extends AbstractDeviceSupport {
 
     }
 
+    @Override
+    public void onSetWorldClocks(ArrayList<? extends WorldClock> clocks) {
+
+    }
+
     @Override
     public void onSetCallState(CallSpec callSpec) {
 
@@ -90,6 +96,11 @@ class TestDeviceSupport extends AbstractDeviceSupport {
 
     }
 
+    @Override
+    public void onSetPhoneVolume(float volume) {
+
+    }
+
     @Override
     public void onInstallApp(Uri uri) {
 

From bfdc24ab879be341039cb7f78b690ecea242ff48 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Sat, 14 May 2022 14:41:46 +0100
Subject: [PATCH 059/110] Add auto export and auto fetch preference
 dependencies

---
 app/src/main/res/xml/preferences.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index c0b21f207..1b2ab2787 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -337,10 +337,12 @@
             android:key="auto_export_enabled"
             android:title="@string/pref_title_auto_export_enabled" />
         <Preference
+            android:dependency="auto_export_enabled"
             android:key="auto_export_location"
             android:title="@string/pref_title_auto_export_location"
             android:summary="%s" />
         <EditTextPreference
+            android:dependency="auto_export_enabled"
             android:inputType="number"
             android:key="auto_export_interval"
             android:defaultValue="3"
@@ -358,6 +360,7 @@
             android:title="@string/pref_auto_fetch"
             android:summary="@string/pref_auto_fetch_summary"/>
         <EditTextPreference
+            android:dependency="auto_fetch_enabled"
             android:inputType="number"
             android:key="auto_fetch_interval_limit"
             android:defaultValue="0"

From 3b348a5d5d05cb83235918c38ada33d74446c9b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Sat, 14 May 2022 21:08:32 +0100
Subject: [PATCH 060/110] Huami: Move inactivity warnings and goal notification
 to device-specific settings

---
 .../gadgetbridge/GBApplication.java           |  38 +++++-
 .../DeviceSettingsPreferenceConst.java        |   1 +
 .../DeviceSpecificSettingsFragment.java       |   4 +
 .../devices/huami/HuamiCoordinator.java       |  34 ++---
 .../amazfitband5/AmazfitBand5Coordinator.java |   2 +
 .../amazfitbip/AmazfitBipCoordinator.java     |   2 +
 .../amazfitbip/AmazfitBipLiteCoordinator.java |   2 +
 .../amazfitbips/AmazfitBipSCoordinator.java   |   2 +
 .../amazfitbipu/AmazfitBipUCoordinator.java   |   2 +
 .../AmazfitBipUProCoordinator.java            |   2 +
 .../amazfitcor/AmazfitCorCoordinator.java     |   2 +
 .../amazfitcor2/AmazfitCor2Coordinator.java   |   2 +
 .../amazfitgtr/AmazfitGTRCoordinator.java     |   2 +
 .../amazfitgtr/AmazfitGTRLiteCoordinator.java |   2 +
 .../amazfitgtr2/AmazfitGTR2Coordinator.java   |   2 +
 .../amazfitgtr2/AmazfitGTR2eCoordinator.java  |   2 +
 .../amazfitgts/AmazfitGTSCoordinator.java     |   2 +
 .../amazfitgts2/AmazfitGTS2Coordinator.java   |   2 +
 .../AmazfitGTS2MiniCoordinator.java           |   2 +
 .../amazfitgts2/AmazfitGTS2eCoordinator.java  |   2 +
 .../amazfitneo/AmazfitNeoCoordinator.java     |   2 +
 .../amazfittrex/AmazfitTRexCoordinator.java   |   2 +
 .../AmazfitTRexProCoordinator.java            |   2 +
 .../AmazfitVergeLCoordinator.java             |   2 +
 .../huami/amazfitx/AmazfitXCoordinator.java   |   2 +
 .../huami/miband2/MiBand2Coordinator.java     |   2 +
 .../huami/miband2/MiBand2HRXCoordinator.java  |   2 +
 .../huami/miband3/MiBand3Coordinator.java     |   2 +
 .../huami/miband4/MiBand4Coordinator.java     |   2 +
 .../huami/miband5/MiBand5Coordinator.java     |   2 +
 .../huami/miband6/MiBand6Coordinator.java     |   2 +
 .../devices/huami/zeppe/ZeppECoordinator.java |   2 +
 .../devices/miband/MiBandConst.java           |   1 -
 .../miband/MiBandPreferencesActivity.java     | 121 ------------------
 .../service/devices/huami/HuamiSupport.java   |  19 +--
 app/src/main/res/drawable/ic_seat_normal.xml  |   5 -
 .../xml/devicesettings_goal_notification.xml  |   9 ++
 .../res/xml/devicesettings_inactivity.xml     |   9 +-
 .../res/xml/devicesettings_inactivity_dnd.xml |  56 ++++++++
 .../devicesettings_inactivity_extended.xml    |   5 +-
 .../xml/devicesettings_miband5_vibration.xml  |   2 +-
 app/src/main/res/xml/miband_preferences.xml   |  63 ---------
 42 files changed, 200 insertions(+), 223 deletions(-)
 delete mode 100644 app/src/main/res/drawable/ic_seat_normal.xml
 create mode 100644 app/src/main/res/xml/devicesettings_goal_notification.xml
 create mode 100644 app/src/main/res/xml/devicesettings_inactivity_dnd.xml

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GBApplication.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GBApplication.java
index 6523fabe9..10ac359e1 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GBApplication.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GBApplication.java
@@ -117,7 +117,7 @@ public class GBApplication extends Application {
     private static SharedPreferences sharedPrefs;
     private static final String PREFS_VERSION = "shared_preferences_version";
     //if preferences have to be migrated, increment the following and add the migration logic in migratePrefs below; see http://stackoverflow.com/questions/16397848/how-can-i-migrate-android-preferences-with-a-new-version
-    private static final int CURRENT_PREFS_VERSION = 12;
+    private static final int CURRENT_PREFS_VERSION = 13;
 
     private static LimitedQueue mIDSenderLookup = new LimitedQueue(16);
     private static Prefs prefs;
@@ -1085,6 +1085,42 @@ public class GBApplication extends Application {
             editor.putString("inactivity_warnings_threshold", String.valueOf(prefs.getInt("inactivity_warnings_threshold", 60)));
             editor.putString("fitness_goal", String.valueOf(prefs.getInt("fitness_goal", 8000)));
         }
+
+        if (oldVersion < 13) {
+            try (DBHandler db = acquireDB()) {
+                final DaoSession daoSession = db.getDaoSession();
+                final List<Device> activeDevices = DBHelper.getActiveDevices(daoSession);
+
+                for (Device dbDevice : activeDevices) {
+                    final SharedPreferences deviceSharedPrefs = GBApplication.getDeviceSpecificSharedPrefs(dbDevice.getIdentifier());
+                    final SharedPreferences.Editor deviceSharedPrefsEdit = deviceSharedPrefs.edit();
+
+                    if (dbDevice.getManufacturer().equals("Huami")) {
+                        deviceSharedPrefsEdit.putBoolean("inactivity_warnings_enable", prefs.getBoolean("inactivity_warnings_enable", false));
+                        deviceSharedPrefsEdit.putString("inactivity_warnings_threshold", prefs.getString("inactivity_warnings_threshold", "60"));
+                        deviceSharedPrefsEdit.putString("inactivity_warnings_start", prefs.getString("inactivity_warnings_start", "06:00"));
+                        deviceSharedPrefsEdit.putString("inactivity_warnings_end", prefs.getString("inactivity_warnings_end", "22:00"));
+
+                        deviceSharedPrefsEdit.putBoolean("inactivity_warnings_dnd", prefs.getBoolean("inactivity_warnings_dnd", false));
+                        deviceSharedPrefsEdit.putString("inactivity_warnings_dnd_start", prefs.getString("inactivity_warnings_dnd_start", "12:00"));
+                        deviceSharedPrefsEdit.putString("inactivity_warnings_dnd_end", prefs.getString("inactivity_warnings_dnd_end", "14:00"));
+
+                        deviceSharedPrefsEdit.putBoolean("fitness_goal_notification", prefs.getBoolean("mi2_goal_notification", false));
+                    }
+
+                    // Not removing the first 4 preferences since they're still used by some devices (ZeTime)
+                    editor.remove("inactivity_warnings_dnd");
+                    editor.remove("inactivity_warnings_dnd_start");
+                    editor.remove("inactivity_warnings_dnd_end");
+                    editor.remove("mi2_goal_notification");
+
+                    deviceSharedPrefsEdit.apply();
+                }
+            } catch (Exception e) {
+                Log.w(TAG, "error acquiring DB lock");
+            }
+        }
+
         editor.putString(PREFS_VERSION, Integer.toString(CURRENT_PREFS_VERSION));
         editor.apply();
     }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsPreferenceConst.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsPreferenceConst.java
index ad1aa2c91..03f2cbf7d 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsPreferenceConst.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsPreferenceConst.java
@@ -190,4 +190,5 @@ public class DeviceSettingsPreferenceConst {
     public static final String PREF_SOUNDS = "sounds";
     public static final String PREF_AUTH_KEY = "authkey";
     public static final String PREF_USER_FITNESS_GOAL = "fitness_goal";
+    public static final String PREF_USER_FITNESS_GOAL_NOTIFICATION = "fitness_goal_notification";
 }
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 cc7d588b1..a8ca0648f 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
@@ -471,6 +471,7 @@ public class DeviceSpecificSettingsFragment extends PreferenceFragmentCompat imp
 
         addPreferenceHandlerFor(PREF_QC35_NOISE_CANCELLING_LEVEL);
         addPreferenceHandlerFor(PREF_USER_FITNESS_GOAL);
+        addPreferenceHandlerFor(PREF_USER_FITNESS_GOAL_NOTIFICATION);
 
         addPreferenceHandlerFor(PREF_UM25_SHOW_THRESHOLD_NOTIFICATION);
         addPreferenceHandlerFor(PREF_UM25_SHOW_THRESHOLD);
@@ -643,6 +644,7 @@ public class DeviceSpecificSettingsFragment extends PreferenceFragmentCompat imp
         setInputTypeFor(DeviceSettingsPreferenceConst.PREF_FIND_PHONE_DURATION, InputType.TYPE_CLASS_NUMBER);
         setInputTypeFor(DeviceSettingsPreferenceConst.PREF_RESERVER_ALARMS_CALENDAR, InputType.TYPE_CLASS_NUMBER);
         setInputTypeFor(DeviceSettingsPreferenceConst.PREF_RESERVER_REMINDERS_CALENDAR, InputType.TYPE_CLASS_NUMBER);
+        setInputTypeFor(DeviceSettingsPreferenceConst.PREF_INACTIVITY_THRESHOLD, InputType.TYPE_CLASS_NUMBER);
 
         String deviceActionsFellSleepSelection = prefs.getString(PREF_DEVICE_ACTION_FELL_SLEEP_SELECTION, PREF_DEVICE_ACTION_SELECTION_OFF);
         final Preference deviceActionsFellSleep = findPreference(PREF_DEVICE_ACTION_FELL_SLEEP_SELECTION);
@@ -827,6 +829,8 @@ public class DeviceSpecificSettingsFragment extends PreferenceFragmentCompat imp
     protected Set<String> getPreferenceKeysWithSummary() {
         final Set<String> keysWithSummary = new HashSet<>();
 
+        keysWithSummary.add(PREF_INACTIVITY_THRESHOLD);
+
         if (deviceSpecificSettingsCustomizer != null) {
             keysWithSummary.addAll(deviceSpecificSettingsCustomizer.getPreferenceKeysWithSummary());
         }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiCoordinator.java
index c19c6b18d..e7fa967e5 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiCoordinator.java
@@ -209,9 +209,9 @@ public abstract class HuamiCoordinator extends AbstractDeviceCoordinator {
         return prefs.getBoolean(HuamiConst.PREF_USE_CUSTOM_FONT, false);
     }
 
-    public static boolean getGoalNotification() {
-        Prefs prefs = GBApplication.getPrefs();
-        return prefs.getBoolean(MiBandConst.PREF_MI2_GOAL_NOTIFICATION, false);
+    public static boolean getGoalNotification(String deviceAddress) {
+        SharedPreferences prefs = GBApplication.getDeviceSpecificSharedPrefs(deviceAddress);
+        return prefs.getBoolean(DeviceSettingsPreferenceConst.PREF_USER_FITNESS_GOAL_NOTIFICATION, false);
     }
 
     public static boolean getRotateWristToSwitchInfo(String deviceAddress) {
@@ -219,35 +219,35 @@ public abstract class HuamiCoordinator extends AbstractDeviceCoordinator {
         return prefs.getBoolean(MiBandConst.PREF_MI2_ROTATE_WRIST_TO_SWITCH_INFO, false);
     }
 
-    public static boolean getInactivityWarnings() {
-        Prefs prefs = GBApplication.getPrefs();
+    public static boolean getInactivityWarnings(String deviceAddress) {
+        SharedPreferences prefs = GBApplication.getDeviceSpecificSharedPrefs(deviceAddress);
         return prefs.getBoolean(DeviceSettingsPreferenceConst.PREF_INACTIVITY_ENABLE, false);
     }
 
-    public static int getInactivityWarningsThreshold() {
-        Prefs prefs = GBApplication.getPrefs();
+    public static int getInactivityWarningsThreshold(String deviceAddress) {
+        Prefs prefs = new Prefs(GBApplication.getDeviceSpecificSharedPrefs(deviceAddress));
         return prefs.getInt(DeviceSettingsPreferenceConst.PREF_INACTIVITY_THRESHOLD, 60);
     }
 
-    public static boolean getInactivityWarningsDnd() {
-        Prefs prefs = GBApplication.getPrefs();
+    public static boolean getInactivityWarningsDnd(String deviceAddress) {
+        SharedPreferences prefs = GBApplication.getDeviceSpecificSharedPrefs(deviceAddress);
         return prefs.getBoolean(DeviceSettingsPreferenceConst.PREF_INACTIVITY_DND, false);
     }
 
-    public static Date getInactivityWarningsStart() {
-        return getTimePreference(DeviceSettingsPreferenceConst.PREF_INACTIVITY_START, "06:00");
+    public static Date getInactivityWarningsStart(String deviceAddress) {
+        return getTimePreference(DeviceSettingsPreferenceConst.PREF_INACTIVITY_START, "06:00", deviceAddress);
     }
 
-    public static Date getInactivityWarningsEnd() {
-        return getTimePreference(DeviceSettingsPreferenceConst.PREF_INACTIVITY_END, "22:00");
+    public static Date getInactivityWarningsEnd(String deviceAddress) {
+        return getTimePreference(DeviceSettingsPreferenceConst.PREF_INACTIVITY_END, "22:00", deviceAddress);
     }
 
-    public static Date getInactivityWarningsDndStart() {
-        return getTimePreference(DeviceSettingsPreferenceConst.PREF_INACTIVITY_DND_START, "12:00");
+    public static Date getInactivityWarningsDndStart(String deviceAddress) {
+        return getTimePreference(DeviceSettingsPreferenceConst.PREF_INACTIVITY_DND_START, "12:00", deviceAddress);
     }
 
-    public static Date getInactivityWarningsDndEnd() {
-        return getTimePreference(DeviceSettingsPreferenceConst.PREF_INACTIVITY_DND_END, "14:00");
+    public static Date getInactivityWarningsDndEnd(String deviceAddress) {
+        return getTimePreference(DeviceSettingsPreferenceConst.PREF_INACTIVITY_DND_END, "14:00", deviceAddress);
     }
 
     public static Date getDoNotDisturbStart(String deviceAddress) {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitband5/AmazfitBand5Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitband5/AmazfitBand5Coordinator.java
index 8d577709b..062c241fe 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitband5/AmazfitBand5Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitband5/AmazfitBand5Coordinator.java
@@ -101,12 +101,14 @@ public class AmazfitBand5Coordinator extends HuamiCoordinator {
                 R.xml.devicesettings_amazfitband5,
                 R.xml.devicesettings_miband5_vibration,
                 R.xml.devicesettings_wearlocation,
+                R.xml.devicesettings_goal_notification,
                 R.xml.devicesettings_custom_emoji_font,
                 R.xml.devicesettings_timeformat,
                 R.xml.devicesettings_dateformat,
                 R.xml.devicesettings_world_clocks,
                 R.xml.devicesettings_nightmode,
                 R.xml.devicesettings_liftwrist_display_sensitivity,
+                R.xml.devicesettings_inactivity_dnd,
                 R.xml.devicesettings_swipeunlock,
                 R.xml.devicesettings_sync_calendar,
                 R.xml.devicesettings_reserve_reminders_calendar,
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbip/AmazfitBipCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbip/AmazfitBipCoordinator.java
index a1a4963b1..6e97c9f9b 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbip/AmazfitBipCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbip/AmazfitBipCoordinator.java
@@ -83,8 +83,10 @@ public class AmazfitBipCoordinator extends HuamiCoordinator {
                 R.xml.devicesettings_amazfitbip,
                 R.xml.devicesettings_timeformat,
                 R.xml.devicesettings_wearlocation,
+                R.xml.devicesettings_goal_notification,
                 R.xml.devicesettings_custom_emoji_font,
                 R.xml.devicesettings_liftwrist_display,
+                R.xml.devicesettings_inactivity_dnd,
                 R.xml.devicesettings_disconnectnotification,
                 R.xml.devicesettings_sync_calendar,
                 R.xml.devicesettings_reserve_reminders_calendar,
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbip/AmazfitBipLiteCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbip/AmazfitBipLiteCoordinator.java
index d1680ea64..160d9ca27 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbip/AmazfitBipLiteCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbip/AmazfitBipLiteCoordinator.java
@@ -72,8 +72,10 @@ public class AmazfitBipLiteCoordinator extends AmazfitBipCoordinator {
                 R.xml.devicesettings_amazfitbip,
                 R.xml.devicesettings_timeformat,
                 R.xml.devicesettings_wearlocation,
+                R.xml.devicesettings_goal_notification,
                 R.xml.devicesettings_custom_emoji_font,
                 R.xml.devicesettings_liftwrist_display,
+                R.xml.devicesettings_inactivity_dnd,
                 R.xml.devicesettings_disconnectnotification,
                 R.xml.devicesettings_sync_calendar,
                 R.xml.devicesettings_bt_connected_advertisement,
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbips/AmazfitBipSCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbips/AmazfitBipSCoordinator.java
index b40541bbe..25e8919f1 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbips/AmazfitBipSCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbips/AmazfitBipSCoordinator.java
@@ -99,8 +99,10 @@ public class AmazfitBipSCoordinator extends HuamiCoordinator {
                 R.xml.devicesettings_timeformat,
                 R.xml.devicesettings_world_clocks,
                 R.xml.devicesettings_wearlocation,
+                R.xml.devicesettings_goal_notification,
                 R.xml.devicesettings_custom_emoji_font,
                 R.xml.devicesettings_liftwrist_display,
+                R.xml.devicesettings_inactivity_dnd,
                 R.xml.devicesettings_sync_calendar,
                 R.xml.devicesettings_reserve_reminders_calendar,
                 R.xml.devicesettings_expose_hr_thirdparty,
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbipu/AmazfitBipUCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbipu/AmazfitBipUCoordinator.java
index d866addcc..523c0bcf8 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbipu/AmazfitBipUCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbipu/AmazfitBipUCoordinator.java
@@ -111,8 +111,10 @@ public class AmazfitBipUCoordinator extends HuamiCoordinator {
                 R.xml.devicesettings_timeformat,
                 R.xml.devicesettings_world_clocks,
                 R.xml.devicesettings_wearlocation,
+                R.xml.devicesettings_goal_notification,
                 R.xml.devicesettings_custom_emoji_font,
                 R.xml.devicesettings_liftwrist_display_sensitivity,
+                R.xml.devicesettings_inactivity_dnd,
                 R.xml.devicesettings_sync_calendar,
                 R.xml.devicesettings_reserve_reminders_calendar,
                 R.xml.devicesettings_expose_hr_thirdparty,
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbipupro/AmazfitBipUProCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbipupro/AmazfitBipUProCoordinator.java
index ea0af7783..c87c8d89c 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbipupro/AmazfitBipUProCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbipupro/AmazfitBipUProCoordinator.java
@@ -110,8 +110,10 @@ public class AmazfitBipUProCoordinator extends HuamiCoordinator {
                 R.xml.devicesettings_timeformat,
                 R.xml.devicesettings_world_clocks,
                 R.xml.devicesettings_wearlocation,
+                R.xml.devicesettings_goal_notification,
                 R.xml.devicesettings_custom_emoji_font,
                 R.xml.devicesettings_liftwrist_display_sensitivity,
+                R.xml.devicesettings_inactivity_dnd,
                 R.xml.devicesettings_sync_calendar,
                 R.xml.devicesettings_reserve_reminders_calendar,
                 R.xml.devicesettings_expose_hr_thirdparty,
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitcor/AmazfitCorCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitcor/AmazfitCorCoordinator.java
index 3c4f2b13f..109fbe6bb 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitcor/AmazfitCorCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitcor/AmazfitCorCoordinator.java
@@ -90,9 +90,11 @@ public class AmazfitCorCoordinator extends HuamiCoordinator {
         return new int[]{
                 R.xml.devicesettings_amazfitcor,
                 R.xml.devicesettings_wearlocation,
+                R.xml.devicesettings_goal_notification,
                 R.xml.devicesettings_timeformat,
                 R.xml.devicesettings_custom_emoji_font,
                 R.xml.devicesettings_liftwrist_display,
+                R.xml.devicesettings_inactivity_dnd,
                 R.xml.devicesettings_disconnectnotification,
                 R.xml.devicesettings_sync_calendar,
                 R.xml.devicesettings_reserve_reminders_calendar,
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitcor2/AmazfitCor2Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitcor2/AmazfitCor2Coordinator.java
index 7adb1313b..d5a662517 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitcor2/AmazfitCor2Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitcor2/AmazfitCor2Coordinator.java
@@ -92,9 +92,11 @@ public class AmazfitCor2Coordinator extends HuamiCoordinator {
         return new int[]{
                 R.xml.devicesettings_amazfitcor,
                 R.xml.devicesettings_wearlocation,
+                R.xml.devicesettings_goal_notification,
                 R.xml.devicesettings_timeformat,
                 R.xml.devicesettings_custom_emoji_font,
                 R.xml.devicesettings_liftwrist_display,
+                R.xml.devicesettings_inactivity_dnd,
                 R.xml.devicesettings_disconnectnotification,
                 R.xml.devicesettings_sync_calendar,
                 R.xml.devicesettings_reserve_reminders_calendar,
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr/AmazfitGTRCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr/AmazfitGTRCoordinator.java
index ee6d765e6..6656b5c4b 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr/AmazfitGTRCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr/AmazfitGTRCoordinator.java
@@ -90,8 +90,10 @@ public class AmazfitGTRCoordinator extends HuamiCoordinator {
         return new int[]{
                 R.xml.devicesettings_amazfitgtsgtr,
                 R.xml.devicesettings_wearlocation,
+                R.xml.devicesettings_goal_notification,
                 R.xml.devicesettings_timeformat,
                 R.xml.devicesettings_liftwrist_display,
+                R.xml.devicesettings_inactivity_dnd,
                 R.xml.devicesettings_disconnectnotification,
                 R.xml.devicesettings_sync_calendar,
                 R.xml.devicesettings_reserve_reminders_calendar,
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr/AmazfitGTRLiteCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr/AmazfitGTRLiteCoordinator.java
index a16be8fa9..8a826f832 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr/AmazfitGTRLiteCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr/AmazfitGTRLiteCoordinator.java
@@ -91,8 +91,10 @@ public class AmazfitGTRLiteCoordinator extends HuamiCoordinator {
         return new int[]{
                 R.xml.devicesettings_amazfitgtsgtr,
                 R.xml.devicesettings_wearlocation,
+                R.xml.devicesettings_goal_notification,
                 R.xml.devicesettings_timeformat,
                 R.xml.devicesettings_liftwrist_display,
+                R.xml.devicesettings_inactivity_dnd,
                 R.xml.devicesettings_disconnectnotification,
                 R.xml.devicesettings_sync_calendar,
                 R.xml.devicesettings_reserve_reminders_calendar,
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr2/AmazfitGTR2Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr2/AmazfitGTR2Coordinator.java
index 10de70a5d..d3f1804b5 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr2/AmazfitGTR2Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr2/AmazfitGTR2Coordinator.java
@@ -96,8 +96,10 @@ public class AmazfitGTR2Coordinator extends HuamiCoordinator {
         return new int[]{
                 R.xml.devicesettings_amazfitgtsgtr2,
                 R.xml.devicesettings_wearlocation,
+                R.xml.devicesettings_goal_notification,
                 R.xml.devicesettings_timeformat,
                 R.xml.devicesettings_liftwrist_display,
+                R.xml.devicesettings_inactivity_dnd,
                 R.xml.devicesettings_disconnectnotification,
                 R.xml.devicesettings_sync_calendar,
                 R.xml.devicesettings_reserve_reminders_calendar,
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr2/AmazfitGTR2eCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr2/AmazfitGTR2eCoordinator.java
index 9a8949877..f82dc929a 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr2/AmazfitGTR2eCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr2/AmazfitGTR2eCoordinator.java
@@ -96,8 +96,10 @@ public class AmazfitGTR2eCoordinator extends HuamiCoordinator {
         return new int[]{
                 R.xml.devicesettings_amazfitgtsgtr2,
                 R.xml.devicesettings_wearlocation,
+                R.xml.devicesettings_goal_notification,
                 R.xml.devicesettings_timeformat,
                 R.xml.devicesettings_liftwrist_display,
+                R.xml.devicesettings_inactivity_dnd,
                 R.xml.devicesettings_disconnectnotification,
                 R.xml.devicesettings_sync_calendar,
                 R.xml.devicesettings_reserve_reminders_calendar,
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts/AmazfitGTSCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts/AmazfitGTSCoordinator.java
index 62ced61b0..8762b65e4 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts/AmazfitGTSCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts/AmazfitGTSCoordinator.java
@@ -90,8 +90,10 @@ public class AmazfitGTSCoordinator extends HuamiCoordinator {
         return new int[]{
                 R.xml.devicesettings_amazfitgtsgtr,
                 R.xml.devicesettings_wearlocation,
+                R.xml.devicesettings_goal_notification,
                 R.xml.devicesettings_timeformat,
                 R.xml.devicesettings_liftwrist_display,
+                R.xml.devicesettings_inactivity_dnd,
                 R.xml.devicesettings_disconnectnotification,
                 R.xml.devicesettings_sync_calendar,
                 R.xml.devicesettings_reserve_reminders_calendar,
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts2/AmazfitGTS2Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts2/AmazfitGTS2Coordinator.java
index 9d3eb2722..6a69adfa0 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts2/AmazfitGTS2Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts2/AmazfitGTS2Coordinator.java
@@ -96,8 +96,10 @@ public class AmazfitGTS2Coordinator extends HuamiCoordinator {
         return new int[]{
                 R.xml.devicesettings_amazfitgtsgtr2,
                 R.xml.devicesettings_wearlocation,
+                R.xml.devicesettings_goal_notification,
                 R.xml.devicesettings_timeformat,
                 R.xml.devicesettings_liftwrist_display,
+                R.xml.devicesettings_inactivity_dnd,
                 R.xml.devicesettings_disconnectnotification,
                 R.xml.devicesettings_sync_calendar,
                 R.xml.devicesettings_reserve_reminders_calendar,
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts2/AmazfitGTS2MiniCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts2/AmazfitGTS2MiniCoordinator.java
index c94e2aef0..5ffd26c9a 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts2/AmazfitGTS2MiniCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts2/AmazfitGTS2MiniCoordinator.java
@@ -65,8 +65,10 @@ public class AmazfitGTS2MiniCoordinator extends AmazfitGTS2Coordinator {
         return new int[]{
                 R.xml.devicesettings_amazfitgts2mini,
                 R.xml.devicesettings_wearlocation,
+                R.xml.devicesettings_goal_notification,
                 R.xml.devicesettings_timeformat,
                 R.xml.devicesettings_liftwrist_display,
+                R.xml.devicesettings_inactivity_dnd,
                 R.xml.devicesettings_disconnectnotification,
                 R.xml.devicesettings_sync_calendar,
                 R.xml.devicesettings_reserve_reminders_calendar,
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts2/AmazfitGTS2eCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts2/AmazfitGTS2eCoordinator.java
index 50cd462af..5788b9111 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts2/AmazfitGTS2eCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts2/AmazfitGTS2eCoordinator.java
@@ -96,8 +96,10 @@ public class AmazfitGTS2eCoordinator extends HuamiCoordinator {
         return new int[]{
                 R.xml.devicesettings_amazfitgtsgtr2,
                 R.xml.devicesettings_wearlocation,
+                R.xml.devicesettings_goal_notification,
                 R.xml.devicesettings_timeformat,
                 R.xml.devicesettings_liftwrist_display,
+                R.xml.devicesettings_inactivity_dnd,
                 R.xml.devicesettings_disconnectnotification,
                 R.xml.devicesettings_sync_calendar,
                 R.xml.devicesettings_reserve_reminders_calendar,
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitneo/AmazfitNeoCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitneo/AmazfitNeoCoordinator.java
index b94003e80..b2291dbeb 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitneo/AmazfitNeoCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitneo/AmazfitNeoCoordinator.java
@@ -84,8 +84,10 @@ public class AmazfitNeoCoordinator extends HuamiCoordinator {
         return new int[]{
                 R.xml.devicesettings_amazfitneo,
                 R.xml.devicesettings_wearlocation,
+                R.xml.devicesettings_goal_notification,
                 R.xml.devicesettings_timeformat,
                 R.xml.devicesettings_liftwrist_display,
+                R.xml.devicesettings_inactivity_dnd,
                 R.xml.devicesettings_disconnectnotification,
                 R.xml.devicesettings_expose_hr_thirdparty,
                 R.xml.devicesettings_bt_connected_advertisement,
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfittrex/AmazfitTRexCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfittrex/AmazfitTRexCoordinator.java
index 8ea939196..9baeb3065 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfittrex/AmazfitTRexCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfittrex/AmazfitTRexCoordinator.java
@@ -90,8 +90,10 @@ public class AmazfitTRexCoordinator extends HuamiCoordinator {
         return new int[]{
                 R.xml.devicesettings_amazfittrex,
                 R.xml.devicesettings_wearlocation,
+                R.xml.devicesettings_goal_notification,
                 R.xml.devicesettings_timeformat,
                 R.xml.devicesettings_liftwrist_display,
+                R.xml.devicesettings_inactivity_dnd,
                 R.xml.devicesettings_disconnectnotification,
                 R.xml.devicesettings_sync_calendar,
                 R.xml.devicesettings_reserve_reminders_calendar,
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfittrexpro/AmazfitTRexProCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfittrexpro/AmazfitTRexProCoordinator.java
index 909d6fffd..2ac407a3a 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfittrexpro/AmazfitTRexProCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfittrexpro/AmazfitTRexProCoordinator.java
@@ -90,8 +90,10 @@ public class AmazfitTRexProCoordinator extends HuamiCoordinator {
         return new int[]{
                 R.xml.devicesettings_amazfittrexpro,
                 R.xml.devicesettings_wearlocation,
+                R.xml.devicesettings_goal_notification,
                 R.xml.devicesettings_timeformat,
                 R.xml.devicesettings_liftwrist_display,
+                R.xml.devicesettings_inactivity_dnd,
                 R.xml.devicesettings_disconnectnotification,
                 R.xml.devicesettings_sync_calendar,
                 R.xml.devicesettings_reserve_reminders_calendar,
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitvergel/AmazfitVergeLCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitvergel/AmazfitVergeLCoordinator.java
index 4817c359e..673d95af4 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitvergel/AmazfitVergeLCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitvergel/AmazfitVergeLCoordinator.java
@@ -91,7 +91,9 @@ public class AmazfitVergeLCoordinator extends HuamiCoordinator {
         return new int[]{
                 R.xml.devicesettings_amazfitvergel,
                 R.xml.devicesettings_wearlocation,
+                R.xml.devicesettings_goal_notification,
                 R.xml.devicesettings_liftwrist_display,
+                R.xml.devicesettings_inactivity_dnd,
                 R.xml.devicesettings_timeformat,
                 R.xml.devicesettings_sync_calendar,
                 R.xml.devicesettings_reserve_reminders_calendar,
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitx/AmazfitXCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitx/AmazfitXCoordinator.java
index 0f1437363..40e3abeac 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitx/AmazfitXCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitx/AmazfitXCoordinator.java
@@ -93,11 +93,13 @@ public class AmazfitXCoordinator extends HuamiCoordinator {
         return new int[]{
                 R.xml.devicesettings_amazfitx,
                 R.xml.devicesettings_wearlocation,
+                R.xml.devicesettings_goal_notification,
                 R.xml.devicesettings_custom_emoji_font,
                 R.xml.devicesettings_timeformat,
                 R.xml.devicesettings_dateformat,
                 R.xml.devicesettings_nightmode,
                 R.xml.devicesettings_liftwrist_display,
+                R.xml.devicesettings_inactivity_dnd,
                 R.xml.devicesettings_swipeunlock,
                 R.xml.devicesettings_sync_calendar,
                 R.xml.devicesettings_reserve_reminders_calendar,
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband2/MiBand2Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband2/MiBand2Coordinator.java
index fb111bd5e..4b5af567b 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband2/MiBand2Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband2/MiBand2Coordinator.java
@@ -84,9 +84,11 @@ public class MiBand2Coordinator extends HuamiCoordinator {
         return new int[]{
                 R.xml.devicesettings_miband2,
                 R.xml.devicesettings_wearlocation,
+                R.xml.devicesettings_goal_notification,
                 R.xml.devicesettings_timeformat,
                 R.xml.devicesettings_donotdisturb_withauto,
                 R.xml.devicesettings_liftwrist_display,
+                R.xml.devicesettings_inactivity_dnd,
                 R.xml.devicesettings_rotatewrist_cycleinfo,
                 R.xml.devicesettings_buttonactions,
                 R.xml.devicesettings_reserve_alarms_calendar,
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband2/MiBand2HRXCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband2/MiBand2HRXCoordinator.java
index c0b70c32a..daa22a027 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband2/MiBand2HRXCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband2/MiBand2HRXCoordinator.java
@@ -87,8 +87,10 @@ public class MiBand2HRXCoordinator extends HuamiCoordinator {
         return new int[]{
                 R.xml.devicesettings_miband2,
                 R.xml.devicesettings_wearlocation,
+                R.xml.devicesettings_goal_notification,
                 R.xml.devicesettings_donotdisturb_withauto,
                 R.xml.devicesettings_liftwrist_display,
+                R.xml.devicesettings_inactivity_dnd,
                 R.xml.devicesettings_rotatewrist_cycleinfo,
                 R.xml.devicesettings_pairingkey,
                 R.xml.devicesettings_transliteration
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband3/MiBand3Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband3/MiBand3Coordinator.java
index 274277708..ab27548ac 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband3/MiBand3Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband3/MiBand3Coordinator.java
@@ -103,11 +103,13 @@ public class MiBand3Coordinator extends HuamiCoordinator {
         return new int[]{
                 R.xml.devicesettings_miband3,
                 R.xml.devicesettings_wearlocation,
+                R.xml.devicesettings_goal_notification,
                 R.xml.devicesettings_timeformat,
                 R.xml.devicesettings_dateformat,
                 R.xml.devicesettings_nightmode,
                 R.xml.devicesettings_donotdisturb_withauto,
                 R.xml.devicesettings_liftwrist_display,
+                R.xml.devicesettings_inactivity_dnd,
                 R.xml.devicesettings_donotdisturb_lift_wrist,
                 R.xml.devicesettings_swipeunlock,
                 R.xml.devicesettings_sync_calendar,
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband4/MiBand4Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband4/MiBand4Coordinator.java
index baa08af55..c467674b1 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband4/MiBand4Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband4/MiBand4Coordinator.java
@@ -90,11 +90,13 @@ public class MiBand4Coordinator extends HuamiCoordinator {
         return new int[]{
                 R.xml.devicesettings_miband3,
                 R.xml.devicesettings_wearlocation,
+                R.xml.devicesettings_goal_notification,
                 R.xml.devicesettings_custom_emoji_font,
                 R.xml.devicesettings_timeformat,
                 R.xml.devicesettings_dateformat,
                 R.xml.devicesettings_nightmode,
                 R.xml.devicesettings_liftwrist_display,
+                R.xml.devicesettings_inactivity_dnd,
                 R.xml.devicesettings_swipeunlock,
                 R.xml.devicesettings_sync_calendar,
                 R.xml.devicesettings_reserve_reminders_calendar,
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband5/MiBand5Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband5/MiBand5Coordinator.java
index d8bd5ac5f..54ee13778 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband5/MiBand5Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband5/MiBand5Coordinator.java
@@ -101,12 +101,14 @@ public class MiBand5Coordinator extends HuamiCoordinator {
                 R.xml.devicesettings_miband5,
                 R.xml.devicesettings_miband5_vibration,
                 R.xml.devicesettings_wearlocation,
+                R.xml.devicesettings_goal_notification,
                 R.xml.devicesettings_custom_emoji_font,
                 R.xml.devicesettings_timeformat,
                 R.xml.devicesettings_dateformat,
                 R.xml.devicesettings_world_clocks,
                 R.xml.devicesettings_nightmode,
                 R.xml.devicesettings_liftwrist_display_sensitivity,
+                R.xml.devicesettings_inactivity_dnd,
                 R.xml.devicesettings_swipeunlock,
                 R.xml.devicesettings_sync_calendar,
                 R.xml.devicesettings_reserve_reminders_calendar,
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband6/MiBand6Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband6/MiBand6Coordinator.java
index 527fb5361..386c2a3cf 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband6/MiBand6Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband6/MiBand6Coordinator.java
@@ -85,12 +85,14 @@ public class MiBand6Coordinator extends HuamiCoordinator {
         return new int[]{
                 R.xml.devicesettings_miband6,
                 R.xml.devicesettings_wearlocation,
+                R.xml.devicesettings_goal_notification,
                 R.xml.devicesettings_custom_emoji_font,
                 R.xml.devicesettings_timeformat,
                 R.xml.devicesettings_dateformat,
                 R.xml.devicesettings_world_clocks,
                 R.xml.devicesettings_nightmode,
                 R.xml.devicesettings_liftwrist_display_sensitivity,
+                R.xml.devicesettings_inactivity_dnd,
                 R.xml.devicesettings_swipeunlock,
                 R.xml.devicesettings_sync_calendar,
                 R.xml.devicesettings_reserve_reminders_calendar,
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/zeppe/ZeppECoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/zeppe/ZeppECoordinator.java
index 455a24936..862e3c012 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/zeppe/ZeppECoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/zeppe/ZeppECoordinator.java
@@ -90,8 +90,10 @@ public class ZeppECoordinator extends HuamiCoordinator {
         return new int[]{
                 R.xml.devicesettings_amazfitgtsgtr,
                 R.xml.devicesettings_wearlocation,
+                R.xml.devicesettings_goal_notification,
                 R.xml.devicesettings_timeformat,
                 R.xml.devicesettings_liftwrist_display,
+                R.xml.devicesettings_inactivity_dnd,
                 R.xml.devicesettings_disconnectnotification,
                 R.xml.devicesettings_sync_calendar,
                 R.xml.devicesettings_expose_hr_thirdparty,
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBandConst.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBandConst.java
index 83cadd3a2..0a7345606 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBandConst.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBandConst.java
@@ -27,7 +27,6 @@ public final class MiBandConst {
     public static final String PREF_MIBAND_USE_HR_FOR_SLEEP_DETECTION = "mi_hr_sleep_detection";
     public static final String PREF_MIBAND_DEVICE_TIME_OFFSET_HOURS = "device_time_offset_hours";
 	public static final String PREF_MI2_DATEFORMAT = "mi2_dateformat";
-    public static final String PREF_MI2_GOAL_NOTIFICATION = "mi2_goal_notification";
 	public static final String PREF_MI2_DISPLAY_ITEM_CLOCK = "clock";
 	public static final String PREF_MI2_DISPLAY_ITEM_STEPS = "steps";
 	public static final String PREF_MI2_DISPLAY_ITEM_DISTANCE = "distance";
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBandPreferencesActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBandPreferencesActivity.java
index 882cb0316..6353be03d 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBandPreferencesActivity.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBandPreferencesActivity.java
@@ -37,16 +37,9 @@ import nodomain.freeyourgadget.gadgetbridge.model.NotificationType;
 import nodomain.freeyourgadget.gadgetbridge.util.GB;
 import nodomain.freeyourgadget.gadgetbridge.util.Prefs;
 
-import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst.PREF_INACTIVITY_ENABLE;
-import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst.PREF_INACTIVITY_START;
-import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst.PREF_INACTIVITY_END;
 import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst.PREF_INACTIVITY_THRESHOLD;
-import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst.PREF_INACTIVITY_DND;
-import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst.PREF_INACTIVITY_DND_START;
-import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst.PREF_INACTIVITY_DND_END;
 import static nodomain.freeyourgadget.gadgetbridge.devices.miband.MiBandConst.ORIGIN_ALARM_CLOCK;
 import static nodomain.freeyourgadget.gadgetbridge.devices.miband.MiBandConst.ORIGIN_INCOMING_CALL;
-import static nodomain.freeyourgadget.gadgetbridge.devices.miband.MiBandConst.PREF_MI2_GOAL_NOTIFICATION;
 import static nodomain.freeyourgadget.gadgetbridge.devices.miband.MiBandConst.PREF_MIBAND_ADDRESS;
 import static nodomain.freeyourgadget.gadgetbridge.devices.miband.MiBandConst.PREF_MIBAND_USE_HR_FOR_SLEEP_DETECTION;
 import static nodomain.freeyourgadget.gadgetbridge.devices.miband.MiBandConst.VIBRATION_COUNT;
@@ -82,120 +75,6 @@ public class MiBandPreferencesActivity extends AbstractSettingsActivity {
             }
         });
 
-        final Preference goalNotification = findPreference(PREF_MI2_GOAL_NOTIFICATION);
-        goalNotification.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
-            @Override
-            public boolean onPreferenceChange(Preference preference, Object newVal) {
-                invokeLater(new Runnable() {
-                    @Override
-                    public void run() {
-                        GBApplication.deviceService().onSendConfiguration(PREF_MI2_GOAL_NOTIFICATION);
-                    }
-                });
-                return true;
-            }
-        });
-
-
-        final Preference inactivityWarnings = findPreference(PREF_INACTIVITY_ENABLE);
-        inactivityWarnings.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
-            @Override
-            public boolean onPreferenceChange(Preference preference, Object newVal) {
-                invokeLater(new Runnable() {
-                    @Override
-                    public void run() {
-                        GBApplication.deviceService().onSendConfiguration(PREF_INACTIVITY_ENABLE);
-                    }
-                });
-                return true;
-            }
-        });
-
-        final Preference inactivityWarningsThreshold = findPreference(PREF_INACTIVITY_THRESHOLD);
-        inactivityWarningsThreshold.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
-            @Override
-            public boolean onPreferenceChange(Preference preference, Object newVal) {
-                invokeLater(new Runnable() {
-                    @Override
-                    public void run() {
-                        GBApplication.deviceService().onSendConfiguration(PREF_INACTIVITY_THRESHOLD);
-                    }
-                });
-                return true;
-            }
-        });
-
-        final Preference inactivityWarningsStart = findPreference(PREF_INACTIVITY_START);
-        inactivityWarningsStart.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
-            @Override
-            public boolean onPreferenceChange(Preference preference, Object newVal) {
-                invokeLater(new Runnable() {
-                    @Override
-                    public void run() {
-                        GBApplication.deviceService().onSendConfiguration(PREF_INACTIVITY_START);
-                    }
-                });
-                return true;
-            }
-        });
-
-        final Preference inactivityWarningsEnd = findPreference(PREF_INACTIVITY_END);
-        inactivityWarningsEnd.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
-            @Override
-            public boolean onPreferenceChange(Preference preference, Object newVal) {
-                invokeLater(new Runnable() {
-                    @Override
-                    public void run() {
-                        GBApplication.deviceService().onSendConfiguration(PREF_INACTIVITY_END);
-                    }
-                });
-                return true;
-            }
-        });
-
-        final Preference inactivityWarningsDnd = findPreference(PREF_INACTIVITY_DND);
-        inactivityWarningsDnd.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
-            @Override
-            public boolean onPreferenceChange(Preference preference, Object newVal) {
-                invokeLater(new Runnable() {
-                    @Override
-                    public void run() {
-                        GBApplication.deviceService().onSendConfiguration(PREF_INACTIVITY_DND);
-                    }
-                });
-                return true;
-            }
-        });
-
-        final Preference inactivityWarningsDndStart = findPreference(PREF_INACTIVITY_DND_START);
-        inactivityWarningsDndStart.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
-            @Override
-            public boolean onPreferenceChange(Preference preference, Object newVal) {
-                invokeLater(new Runnable() {
-                    @Override
-                    public void run() {
-                        GBApplication.deviceService().onSendConfiguration(PREF_INACTIVITY_DND_START);
-                    }
-                });
-                return true;
-            }
-        });
-
-        final Preference inactivityWarningsDndEnd = findPreference(PREF_INACTIVITY_DND_END);
-        inactivityWarningsDndEnd.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
-            @Override
-            public boolean onPreferenceChange(Preference preference, Object newVal) {
-                invokeLater(new Runnable() {
-                    @Override
-                    public void run() {
-                        GBApplication.deviceService().onSendConfiguration(PREF_INACTIVITY_DND_END);
-                    }
-                });
-                return true;
-            }
-        });
-
-
         final Preference fitnessGoal = findPreference(ActivityUser.PREF_USER_STEPS_GOAL);
         fitnessGoal.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
             @Override
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiSupport.java
index a2b4b40b9..86839d28b 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiSupport.java
@@ -184,6 +184,7 @@ import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.Dev
 import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst.PREF_SOUNDS;
 import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst.PREF_SYNC_CALENDAR;
 import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst.PREF_TIMEFORMAT;
+import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst.PREF_USER_FITNESS_GOAL_NOTIFICATION;
 import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst.PREF_WEARLOCATION;
 import static nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst.PREF_BUTTON_ACTION_SELECTION_BROADCAST;
 import static nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst.PREF_BUTTON_ACTION_SELECTION_FITNESS_APP_START;
@@ -2410,7 +2411,7 @@ public class HuamiSupport extends AbstractBTLEDeviceSupport {
                 case MiBandConst.PREF_MI2_DATEFORMAT:
                     setDateDisplay(builder);
                     break;
-                case MiBandConst.PREF_MI2_GOAL_NOTIFICATION:
+                case PREF_USER_FITNESS_GOAL_NOTIFICATION:
                     setGoalNotification(builder);
                     break;
                 case PREF_ACTIVATE_DISPLAY_ON_LIFT:
@@ -2904,7 +2905,7 @@ public class HuamiSupport extends AbstractBTLEDeviceSupport {
     }
 
     private HuamiSupport setGoalNotification(TransactionBuilder builder) {
-        boolean enable = HuamiCoordinator.getGoalNotification();
+        boolean enable = HuamiCoordinator.getGoalNotification(gbDevice.getAddress());
         LOG.info("Setting goal notification to " + enable);
         if (enable) {
             writeToConfiguration(builder,HuamiService.COMMAND_ENABLE_GOAL_NOTIFICATION);
@@ -3236,23 +3237,23 @@ public class HuamiSupport extends AbstractBTLEDeviceSupport {
     }
 
     private HuamiSupport setInactivityWarnings(TransactionBuilder builder) {
-        boolean enable = HuamiCoordinator.getInactivityWarnings();
+        boolean enable = HuamiCoordinator.getInactivityWarnings(gbDevice.getAddress());
         LOG.info("Setting inactivity warnings to " + enable);
 
         if (enable) {
             byte[] data = HuamiService.COMMAND_ENABLE_INACTIVITY_WARNINGS.clone();
 
-            int threshold = HuamiCoordinator.getInactivityWarningsThreshold();
+            int threshold = HuamiCoordinator.getInactivityWarningsThreshold(gbDevice.getAddress());
             data[HuamiService.INACTIVITY_WARNINGS_THRESHOLD] = (byte) threshold;
 
             Calendar calendar = GregorianCalendar.getInstance();
 
-            boolean enableDnd = HuamiCoordinator.getInactivityWarningsDnd();
+            boolean enableDnd = HuamiCoordinator.getInactivityWarningsDnd(gbDevice.getAddress());
 
-            Date intervalStart = HuamiCoordinator.getInactivityWarningsStart();
-            Date intervalEnd = HuamiCoordinator.getInactivityWarningsEnd();
-            Date dndStart = HuamiCoordinator.getInactivityWarningsDndStart();
-            Date dndEnd = HuamiCoordinator.getInactivityWarningsDndEnd();
+            Date intervalStart = HuamiCoordinator.getInactivityWarningsStart(gbDevice.getAddress());
+            Date intervalEnd = HuamiCoordinator.getInactivityWarningsEnd(gbDevice.getAddress());
+            Date dndStart = HuamiCoordinator.getInactivityWarningsDndStart(gbDevice.getAddress());
+            Date dndEnd = HuamiCoordinator.getInactivityWarningsDndEnd(gbDevice.getAddress());
 
             // The first interval always starts when the warnings interval starts
             calendar.setTime(intervalStart);
diff --git a/app/src/main/res/drawable/ic_seat_normal.xml b/app/src/main/res/drawable/ic_seat_normal.xml
deleted file mode 100644
index ca5626916..000000000
--- a/app/src/main/res/drawable/ic_seat_normal.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:height="24dp" android:tint="#7E7E7E"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@android:color/white" android:pathData="M7.59,5.41c-0.78,-0.78 -0.78,-2.05 0,-2.83 0.78,-0.78 2.05,-0.78 2.83,0 0.78,0.78 0.78,2.05 0,2.83 -0.79,0.79 -2.05,0.79 -2.83,0zM6,16L6,7L4,7v9c0,2.76 2.24,5 5,5h6v-2L9,19c-1.66,0 -3,-1.34 -3,-3zM20,20.07L14.93,15L11.5,15v-3.68c1.4,1.15 3.6,2.16 5.5,2.16v-2.16c-1.66,0.02 -3.61,-0.87 -4.67,-2.04l-1.4,-1.55c-0.19,-0.21 -0.43,-0.38 -0.69,-0.5 -0.29,-0.14 -0.62,-0.23 -0.96,-0.23h-0.03C8.01,7 7,8.01 7,9.25L7,15c0,1.66 1.34,3 3,3h5.07l3.5,3.5L20,20.07z"/>
-</vector>
diff --git a/app/src/main/res/xml/devicesettings_goal_notification.xml b/app/src/main/res/xml/devicesettings_goal_notification.xml
new file mode 100644
index 000000000..143a14040
--- /dev/null
+++ b/app/src/main/res/xml/devicesettings_goal_notification.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+    <SwitchPreference
+        android:defaultValue="false"
+        android:icon="@drawable/ic_star_gray"
+        android:key="fitness_goal_notification"
+        android:summary="@string/mi2_prefs_goal_notification_summary"
+        android:title="@string/mi2_prefs_goal_notification" />
+</androidx.preference.PreferenceScreen>
diff --git a/app/src/main/res/xml/devicesettings_inactivity.xml b/app/src/main/res/xml/devicesettings_inactivity.xml
index b25408ee2..a5cddd42c 100644
--- a/app/src/main/res/xml/devicesettings_inactivity.xml
+++ b/app/src/main/res/xml/devicesettings_inactivity.xml
@@ -7,25 +7,26 @@
         android:summary="@string/mi2_prefs_inactivity_warnings_summary"
         android:title="@string/mi2_prefs_inactivity_warnings">
 
-        <!-- workaround for missing toolbar -->
-        <PreferenceCategory android:title="@string/mi2_prefs_inactivity_warnings_summary" />
-
         <SwitchPreference
             android:defaultValue="false"
             android:key="inactivity_warnings_enable"
-            android:title="@string/mi2_prefs_inactivity_warnings" />
+            android:title="@string/mi2_prefs_inactivity_warnings"
+            android:summary="@string/mi2_prefs_inactivity_warnings_summary" />
         <EditTextPreference
             android:defaultValue="60"
+            android:dependency="inactivity_warnings_enable"
             android:key="inactivity_warnings_threshold"
             android:summary="@string/mi2_prefs_inactivity_warnings_summary"
             android:title="@string/mi2_prefs_inactivity_warnings_threshold"/>
         <nodomain.freeyourgadget.gadgetbridge.util.XTimePreference
             android:defaultValue="06:00"
+            android:dependency="inactivity_warnings_enable"
             android:key="inactivity_warnings_start"
             android:title="@string/mi2_prefs_do_not_disturb_start" />
 
         <nodomain.freeyourgadget.gadgetbridge.util.XTimePreference
             android:defaultValue="23:00"
+            android:dependency="inactivity_warnings_enable"
             android:key="inactivity_warnings_end"
             android:title="@string/mi2_prefs_do_not_disturb_end" />
 
diff --git a/app/src/main/res/xml/devicesettings_inactivity_dnd.xml b/app/src/main/res/xml/devicesettings_inactivity_dnd.xml
new file mode 100644
index 000000000..3cb86d648
--- /dev/null
+++ b/app/src/main/res/xml/devicesettings_inactivity_dnd.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+    <PreferenceScreen
+        android:icon="@drawable/ic_chair"
+        android:key="screen_inactivity"
+        android:persistent="false"
+        android:summary="@string/mi2_prefs_inactivity_warnings_summary"
+        android:title="@string/mi2_prefs_inactivity_warnings">
+
+        <SwitchPreference
+            android:defaultValue="false"
+            android:key="inactivity_warnings_enable"
+            android:title="@string/mi2_prefs_inactivity_warnings"
+            android:summary="@string/mi2_prefs_inactivity_warnings_summary" />
+
+        <EditTextPreference
+            android:defaultValue="60"
+            android:dependency="inactivity_warnings_enable"
+            android:inputType="number"
+            android:key="inactivity_warnings_threshold"
+            android:maxLength="2"
+            android:title="@string/mi2_prefs_inactivity_warnings_threshold" />
+
+        <nodomain.freeyourgadget.gadgetbridge.util.XTimePreference
+            android:defaultValue="06:00"
+            android:dependency="inactivity_warnings_enable"
+            android:key="inactivity_warnings_start"
+            android:title="@string/mi2_prefs_do_not_disturb_start" />
+
+        <nodomain.freeyourgadget.gadgetbridge.util.XTimePreference
+            android:defaultValue="22:00"
+            android:dependency="inactivity_warnings_enable"
+            android:key="inactivity_warnings_end"
+            android:title="@string/mi2_prefs_do_not_disturb_end" />
+
+        <SwitchPreference
+            android:defaultValue="false"
+            android:dependency="inactivity_warnings_enable"
+            android:key="inactivity_warnings_dnd"
+            android:summary="@string/mi2_prefs_inactivity_warnings_dnd_summary"
+            android:title="@string/mi2_prefs_do_not_disturb" />
+
+        <nodomain.freeyourgadget.gadgetbridge.util.XTimePreference
+            android:defaultValue="12:00"
+            android:dependency="inactivity_warnings_dnd"
+            android:key="inactivity_warnings_dnd_start"
+            android:title="@string/mi2_prefs_do_not_disturb_start" />
+
+        <nodomain.freeyourgadget.gadgetbridge.util.XTimePreference
+            android:defaultValue="14:00"
+            android:dependency="inactivity_warnings_dnd"
+            android:key="inactivity_warnings_dnd_end"
+            android:title="@string/mi2_prefs_do_not_disturb_end" />
+
+    </PreferenceScreen>
+</androidx.preference.PreferenceScreen>
diff --git a/app/src/main/res/xml/devicesettings_inactivity_extended.xml b/app/src/main/res/xml/devicesettings_inactivity_extended.xml
index 966b758ec..7063b8572 100644
--- a/app/src/main/res/xml/devicesettings_inactivity_extended.xml
+++ b/app/src/main/res/xml/devicesettings_inactivity_extended.xml
@@ -13,7 +13,8 @@
         <SwitchPreference
             android:defaultValue="false"
             android:key="inactivity_warnings_enable"
-            android:title="@string/mi2_prefs_inactivity_warnings" />
+            android:title="@string/mi2_prefs_inactivity_warnings"
+            android:summary="@string/mi2_prefs_inactivity_warnings_summary" />
 
         <ListPreference
             android:defaultValue="4"
@@ -26,11 +27,13 @@
 
         <nodomain.freeyourgadget.gadgetbridge.util.XTimePreference
             android:defaultValue="08:00"
+            android:dependency="inactivity_warnings_enable"
             android:key="inactivity_warnings_start"
             android:title="@string/mi2_prefs_do_not_disturb_start" />
 
         <nodomain.freeyourgadget.gadgetbridge.util.XTimePreference
             android:defaultValue="16:00"
+            android:dependency="inactivity_warnings_enable"
             android:key="inactivity_warnings_end"
             android:title="@string/mi2_prefs_do_not_disturb_end" />
     </PreferenceScreen>
diff --git a/app/src/main/res/xml/devicesettings_miband5_vibration.xml b/app/src/main/res/xml/devicesettings_miband5_vibration.xml
index 4f0332585..e225a5130 100644
--- a/app/src/main/res/xml/devicesettings_miband5_vibration.xml
+++ b/app/src/main/res/xml/devicesettings_miband5_vibration.xml
@@ -161,7 +161,7 @@
 
         <PreferenceScreen
             android:key="vibration_profile_key_idle_alerts"
-            android:icon="@drawable/ic_seat_normal"
+            android:icon="@drawable/ic_chair"
             android:title="@string/pref_screen_notification_idle_alerts"
             android:persistent="false">
 
diff --git a/app/src/main/res/xml/miband_preferences.xml b/app/src/main/res/xml/miband_preferences.xml
index ca1ba6553..0d4ea4a79 100644
--- a/app/src/main/res/xml/miband_preferences.xml
+++ b/app/src/main/res/xml/miband_preferences.xml
@@ -16,12 +16,6 @@
             android:maxLength="5"
             android:title="@string/miband_prefs_fitness_goal" />
 
-        <CheckBoxPreference
-            android:defaultValue="false"
-            android:key="mi2_goal_notification"
-            android:summary="@string/mi2_prefs_goal_notification_summary"
-            android:title="@string/mi2_prefs_goal_notification" />
-
         <CheckBoxPreference
             android:defaultValue="false"
             android:key="mi_hr_sleep_detection"
@@ -35,63 +29,6 @@
             android:summary="%s"
             android:title="@string/prefs_title_heartrate_measurement_interval" />
 
-        <PreferenceScreen
-            android:key="inactivity_warnings_key"
-            android:summary="@string/mi2_prefs_inactivity_warnings_summary"
-            android:title="@string/mi2_prefs_inactivity_warnings"
-            android:persistent="false">
-
-            <!-- workaround for missing toolbar -->
-            <PreferenceCategory
-                android:title="@string/mi2_prefs_inactivity_warnings"
-                />
-
-            <CheckBoxPreference
-                android:defaultValue="false"
-                android:key="inactivity_warnings_enable"
-                android:summary="@string/mi2_prefs_inactivity_warnings_summary"
-                android:title="@string/mi2_prefs_inactivity_warnings" />
-
-            <EditTextPreference
-                android:defaultValue="60"
-                android:dependency="inactivity_warnings_enable"
-                android:inputType="numberSigned"
-                android:key="inactivity_warnings_threshold"
-                android:maxLength="2"
-                android:title="@string/mi2_prefs_inactivity_warnings_threshold" />
-
-            <nodomain.freeyourgadget.gadgetbridge.util.TimePreference
-                android:defaultValue="06:00"
-                android:dependency="inactivity_warnings_enable"
-                android:key="inactivity_warnings_start"
-                android:title="@string/mi2_prefs_do_not_disturb_start" />
-
-            <nodomain.freeyourgadget.gadgetbridge.util.TimePreference
-                android:defaultValue="22:00"
-                android:dependency="inactivity_warnings_enable"
-                android:key="inactivity_warnings_end"
-                android:title="@string/mi2_prefs_do_not_disturb_end" />
-
-            <CheckBoxPreference
-                android:defaultValue="false"
-                android:dependency="inactivity_warnings_enable"
-                android:key="inactivity_warnings_dnd"
-                android:summary="@string/mi2_prefs_inactivity_warnings_dnd_summary"
-                android:title="@string/mi2_prefs_do_not_disturb" />
-
-            <nodomain.freeyourgadget.gadgetbridge.util.TimePreference
-                android:defaultValue="12:00"
-                android:dependency="inactivity_warnings_dnd"
-                android:key="inactivity_warnings_dnd_start"
-                android:title="@string/mi2_prefs_do_not_disturb_start" />
-
-            <nodomain.freeyourgadget.gadgetbridge.util.TimePreference
-                android:defaultValue="14:00"
-                android:dependency="inactivity_warnings_dnd"
-                android:key="inactivity_warnings_dnd_end"
-                android:title="@string/mi2_prefs_do_not_disturb_end" />
-        </PreferenceScreen>
-
     </PreferenceCategory>
 
     <PreferenceCategory

From f08fe7f65f5bc41f6867157cec52f09d27528067 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Sun, 15 May 2022 17:52:01 +0100
Subject: [PATCH 061/110] Huami: Distinguish between alarm and workout activity
 type responses

---
 .../devices/huami/HuamiService.java           | 12 +++--
 .../service/devices/huami/HuamiSupport.java   | 45 ++++++++++++-------
 2 files changed, 39 insertions(+), 18 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiService.java
index 9cc8245f8..d2a07bb41 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiService.java
@@ -165,10 +165,16 @@ public class HuamiService {
     public static final byte[] COMMAND_ENABLE_DISCONNECT_NOTIFCATION = new byte[]{ENDPOINT_DISPLAY, 0x0c, 0x00, 0x01, 0, 0, 0, 0};
     public static final byte[] COMMAND_DISABLE_DISCONNECT_NOTIFCATION = new byte[]{ENDPOINT_DISPLAY, 0x0c, 0x00, 0x00, 0, 0, 0, 0};
 
-    public static final byte[] COMMAND_REQUEST_ALARMS = new byte[]{0x0d};
-    public static final byte[] COMMAND_REQUEST_ALARMS_WITH_TIMES = new byte[]{(byte) 0xff,0x01,0x00,0x00,0x00};
+    public static final byte COMMAND_ALARMS = 0x0d;
+    public static final byte COMMAND_ALARMS_WITH_TIMES = 0x01;
+    public static final byte COMMAND_WORKOUT_ACTIVITY_TYPES = 0x11;
+    public static final byte COMMAND_GPS_VERSION = 0x0e;
 
-    public static final byte[] COMMAND_REQUEST_GPS_VERSION = new byte[]{0x0e};
+    public static final byte[] COMMAND_REQUEST_ALARMS = new byte[]{COMMAND_ALARMS};
+    public static final byte[] COMMAND_REQUEST_ALARMS_WITH_TIMES = new byte[]{(byte) 0xff, COMMAND_ALARMS_WITH_TIMES, 0x00, 0x00, 0x00};
+    public static final byte[] COMMAND_REQUEST_WORKOUT_ACTIVITY_TYPES = new byte[]{(byte) 0xff, COMMAND_WORKOUT_ACTIVITY_TYPES, 0x00, 0x00, 0x00};
+
+    public static final byte[] COMMAND_REQUEST_GPS_VERSION = new byte[]{COMMAND_GPS_VERSION};
 
     // The third byte controls the threshold, in minutes
     // The last 8 bytes represent 2 separate time intervals for the inactivity warnings
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiSupport.java
index 86839d28b..590a727aa 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiSupport.java
@@ -225,6 +225,10 @@ import static nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst.PREF
 import static nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst.PREF_HUAMI_VIBRATION_TRY_INCOMING_CALL;
 import static nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst.PREF_HUAMI_VIBRATION_TRY_INCOMING_SMS;
 import static nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst.PREF_HUAMI_VIBRATION_TRY_PREFIX;
+import static nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiService.COMMAND_ALARMS;
+import static nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiService.COMMAND_ALARMS_WITH_TIMES;
+import static nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiService.COMMAND_GPS_VERSION;
+import static nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiService.COMMAND_WORKOUT_ACTIVITY_TYPES;
 import static nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiService.DISPLAY_ITEM_BIT_CLOCK;
 import static nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiService.ENDPOINT_DISPLAY_ITEMS;
 import static nodomain.freeyourgadget.gadgetbridge.devices.miband.MiBandConst.DEFAULT_VALUE_VIBRATION_COUNT;
@@ -2043,18 +2047,19 @@ public class HuamiSupport extends AbstractBTLEDeviceSupport {
         }
     }
 
-    byte[] alarmConfigurationReassemblyBuffer;
+    byte[] reassemblyBuffer;
+    byte reassemblyType = 0x00;
 
     private void handleConfigurationInfo(byte[] value) {
         if (value == null || value.length < 4) {
             return;
         }
         if (value[0] == 0x10 && value[2] == 0x01) {
-            if (value[1] == 0x0e) {
+            if (value[1] == COMMAND_GPS_VERSION) {
                 String gpsVersion = new String(value, 3, value.length - 3);
                 LOG.info("got gps version = " + gpsVersion);
                 gbDevice.setFirmwareVersion2(gpsVersion);
-            } else if (value[1] == 0x0d) {
+            } else if (value[1] == COMMAND_ALARMS) {
                 LOG.info("got alarms from watch");
                 decodeAndUpdateAlarmStatus(value, false);
             } else {
@@ -2062,26 +2067,38 @@ public class HuamiSupport extends AbstractBTLEDeviceSupport {
             }
         } else if (value[0] == ((byte) 0x80) && value[1] == 0x01) {
             boolean done = false;
-            if (value[2] == 0x00 || value[2] == (byte) 0xc0 && (value[4] == 0x01 && value[5] == 0x00 && value[6] == 0x00 && value[7] == 0x00 && value[8] == 0x01)) { // first chunk or complete data
-                alarmConfigurationReassemblyBuffer = new byte[value.length - 8];
-                System.arraycopy(value, 8, alarmConfigurationReassemblyBuffer, 0, alarmConfigurationReassemblyBuffer.length);
+            if (value[2] == 0x00 || value[2] == (byte) 0xc0) { // first chunk or complete data
+                reassemblyBuffer = new byte[value.length - 8];
+                reassemblyType = value[4];
+                System.arraycopy(value, 8, reassemblyBuffer, 0, reassemblyBuffer.length);
                 if (value[2] == (byte) 0xc0) {
                     done = true;
                 }
-            } else if (alarmConfigurationReassemblyBuffer != null && (value[2] == 0x40 || value[2] == (byte) 0x80)) {
+            } else if (reassemblyBuffer != null && (value[2] == 0x40 || value[2] == (byte) 0x80)) {
                 byte[] payload = new byte[value.length - 4];
                 System.arraycopy(value, 4, payload, 0, payload.length);
-                alarmConfigurationReassemblyBuffer = ArrayUtils.addAll(alarmConfigurationReassemblyBuffer, payload);
+                reassemblyBuffer = ArrayUtils.addAll(reassemblyBuffer, payload);
                 if (value[2] == (byte) 0x80) {
                     done = true;
                 }
             }
             if (!done) {
-                LOG.info("got chunk of alarm configuration data");
+                LOG.info("got chunk of configuration data for {}", String.format("0x%x", reassemblyType));
             } else {
                 LOG.info("got full/reassembled configuration data");
-                decodeAndUpdateAlarmStatus(alarmConfigurationReassemblyBuffer, true);
-                alarmConfigurationReassemblyBuffer = null;
+                switch (reassemblyType) {
+                    case COMMAND_ALARMS_WITH_TIMES:
+                        decodeAndUpdateAlarmStatus(reassemblyBuffer, true);
+                        break;
+                    case COMMAND_WORKOUT_ACTIVITY_TYPES:
+                        LOG.warn("got workout activity types, not handled");
+                        break;
+                    default:
+                        LOG.warn("got unknown chunked configuration response for {}, not handled", String.format("0x%x", reassemblyType));
+                        break;
+                }
+
+                reassemblyBuffer = null;
             }
         } else {
             LOG.warn("unknown response got from configuration request " + GB.hexdump(value, 0, -1));
@@ -2535,10 +2552,8 @@ public class HuamiSupport extends AbstractBTLEDeviceSupport {
     public void onTestNewFunction() {
         //requestMTU(23);
         try {
-            final TransactionBuilder builder = performInitialized("test pattern");
-            final VibrationProfile profile = VibrationProfile.getProfile(VibrationProfile.ID_SHORT, (short) 2);
-
-            setVibrationPattern(builder, HuamiVibrationPatternNotificationType.APP_ALERTS, true, profile);
+            final TransactionBuilder builder = performInitialized("test request");
+            writeToConfiguration(builder, HuamiService.COMMAND_REQUEST_WORKOUT_ACTIVITY_TYPES);
             builder.queue(getQueue());
         } catch (final Exception e) {
             LOG.error("onTestNewFunction failed", e);

From 410b74e1a25977ba17f682c67a0d366816a1c1fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Sun, 15 May 2022 17:23:59 +0100
Subject: [PATCH 062/110] Mi Band 5: Increase number of reminder slots to 50

---
 .../devices/huami/miband5/MiBand5Coordinator.java            | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband5/MiBand5Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband5/MiBand5Coordinator.java
index 54ee13778..0cfddda57 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband5/MiBand5Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband5/MiBand5Coordinator.java
@@ -85,6 +85,11 @@ public class MiBand5Coordinator extends HuamiCoordinator {
         return true;
     }
 
+    @Override
+    public int getReminderSlotCount() {
+        return 50; // as enforced by Zepp Life
+    }
+
     @Override
     public int getWorldClocksSlotCount() {
         return 20; // as enforced by Mi Fit

From 4761168958f04f99084768eb178be6c85a5865bb Mon Sep 17 00:00:00 2001
From: Andreas Shimokawa <shimokawa@fsfe.org>
Date: Mon, 16 May 2022 10:59:03 +0200
Subject: [PATCH 063/110] Mi Band 6: enable vibration patttern settings (tested
 working)

also rename devicesettings_miband5_vibration to devicesettings_vibrationpatterns
---
 .../devices/huami/amazfitband5/AmazfitBand5Coordinator.java     | 2 +-
 .../gadgetbridge/devices/huami/miband5/MiBand5Coordinator.java  | 2 +-
 .../gadgetbridge/devices/huami/miband6/MiBand6Coordinator.java  | 1 +
 ...band5_vibration.xml => devicesettings_vibrationpatterns.xml} | 0
 4 files changed, 3 insertions(+), 2 deletions(-)
 rename app/src/main/res/xml/{devicesettings_miband5_vibration.xml => devicesettings_vibrationpatterns.xml} (100%)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitband5/AmazfitBand5Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitband5/AmazfitBand5Coordinator.java
index 062c241fe..fb75b393a 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitband5/AmazfitBand5Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitband5/AmazfitBand5Coordinator.java
@@ -99,7 +99,7 @@ public class AmazfitBand5Coordinator extends HuamiCoordinator {
     public int[] getSupportedDeviceSpecificSettings(GBDevice device) {
         return new int[]{
                 R.xml.devicesettings_amazfitband5,
-                R.xml.devicesettings_miband5_vibration,
+                R.xml.devicesettings_vibrationpatterns,
                 R.xml.devicesettings_wearlocation,
                 R.xml.devicesettings_goal_notification,
                 R.xml.devicesettings_custom_emoji_font,
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband5/MiBand5Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband5/MiBand5Coordinator.java
index 0cfddda57..020ae69c3 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband5/MiBand5Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband5/MiBand5Coordinator.java
@@ -104,7 +104,7 @@ public class MiBand5Coordinator extends HuamiCoordinator {
     public int[] getSupportedDeviceSpecificSettings(GBDevice device) {
         return new int[]{
                 R.xml.devicesettings_miband5,
-                R.xml.devicesettings_miband5_vibration,
+                R.xml.devicesettings_vibrationpatterns,
                 R.xml.devicesettings_wearlocation,
                 R.xml.devicesettings_goal_notification,
                 R.xml.devicesettings_custom_emoji_font,
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband6/MiBand6Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband6/MiBand6Coordinator.java
index 386c2a3cf..00012fa07 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband6/MiBand6Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband6/MiBand6Coordinator.java
@@ -84,6 +84,7 @@ public class MiBand6Coordinator extends HuamiCoordinator {
     public int[] getSupportedDeviceSpecificSettings(GBDevice device) {
         return new int[]{
                 R.xml.devicesettings_miband6,
+                R.xml.devicesettings_vibrationpatterns,
                 R.xml.devicesettings_wearlocation,
                 R.xml.devicesettings_goal_notification,
                 R.xml.devicesettings_custom_emoji_font,
diff --git a/app/src/main/res/xml/devicesettings_miband5_vibration.xml b/app/src/main/res/xml/devicesettings_vibrationpatterns.xml
similarity index 100%
rename from app/src/main/res/xml/devicesettings_miband5_vibration.xml
rename to app/src/main/res/xml/devicesettings_vibrationpatterns.xml

From c50c333f8b0298b9a55f71f4b914b19c50c2efb2 Mon Sep 17 00:00:00 2001
From: Andreas Shimokawa <shimokawa@fsfe.org>
Date: Mon, 16 May 2022 11:03:10 +0200
Subject: [PATCH 064/110] Mi Band 4: enable vibration patterns

---
 .../gadgetbridge/devices/huami/miband4/MiBand4Coordinator.java   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband4/MiBand4Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband4/MiBand4Coordinator.java
index c467674b1..d34634ff2 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband4/MiBand4Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband4/MiBand4Coordinator.java
@@ -89,6 +89,7 @@ public class MiBand4Coordinator extends HuamiCoordinator {
     public int[] getSupportedDeviceSpecificSettings(GBDevice device) {
         return new int[]{
                 R.xml.devicesettings_miband3,
+                R.xml.devicesettings_vibrationpatterns,
                 R.xml.devicesettings_wearlocation,
                 R.xml.devicesettings_goal_notification,
                 R.xml.devicesettings_custom_emoji_font,

From b46b1278b3e7d8dc000dba7469c883db608cac46 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Quang=20Ng=C3=B4?= <ngoquang2708@gmail.com>
Date: Sat, 14 May 2022 00:26:24 +0700
Subject: [PATCH 065/110] Add support for Sony WF-1000XM3

---
 README.md                                     |  2 +-
 .../SonyWF1000XM3Coordinator.java             | 74 +++++++++++++++++++
 .../gadgetbridge/model/DeviceType.java        |  1 +
 .../service/DeviceSupportFactory.java         |  3 +
 .../gadgetbridge/util/DeviceHelper.java       |  2 +
 app/src/main/res/values/strings.xml           |  1 +
 6 files changed, 82 insertions(+), 1 deletion(-)
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/coordinators/SonyWF1000XM3Coordinator.java

diff --git a/README.md b/README.md
index 76fe04b61..11782aac9 100644
--- a/README.md
+++ b/README.md
@@ -83,7 +83,7 @@ vendor's servers.
 - PineTime (InfiniTime Firmware)
 - Roidmi, Roidmi 3, Mojietu 3 (Bluetooth FM Transmitters)
 - [SMA](https://codeberg.org/Freeyourgadget/Gadgetbridge/wiki/SMA) Q2 (SMA-Q2-OSS Firmware)
-- [Sony WH-1000XM3, WH-1000XM4, WF-SP800N](https://codeberg.org/Freeyourgadget/Gadgetbridge/wiki/Sony-Headphones)
+- [Sony WH-1000XM3, WH-1000XM4, WF-SP800N, WF-1000XM3](https://codeberg.org/Freeyourgadget/Gadgetbridge/wiki/Sony-Headphones)
 - Teclast H10, H30
 - TLW64
 - Vibratissimo (Experimental)
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/coordinators/SonyWF1000XM3Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/coordinators/SonyWF1000XM3Coordinator.java
new file mode 100644
index 000000000..8341dadf8
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/coordinators/SonyWF1000XM3Coordinator.java
@@ -0,0 +1,74 @@
+/*  Copyright (C) 2022 Ngô Minh Quang
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.devices.sony.headphones.coordinators;
+
+import androidx.annotation.NonNull;
+
+import java.util.Arrays;
+import java.util.List;
+
+import nodomain.freeyourgadget.gadgetbridge.R;
+import nodomain.freeyourgadget.gadgetbridge.devices.sony.headphones.SonyHeadphonesCapabilities;
+import nodomain.freeyourgadget.gadgetbridge.devices.sony.headphones.SonyHeadphonesCoordinator;
+import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
+import nodomain.freeyourgadget.gadgetbridge.impl.GBDeviceCandidate;
+import nodomain.freeyourgadget.gadgetbridge.model.BatteryConfig;
+import nodomain.freeyourgadget.gadgetbridge.model.DeviceType;
+
+public class SonyWF1000XM3Coordinator extends SonyHeadphonesCoordinator {
+
+    @NonNull
+    @Override
+    public DeviceType getSupportedType(GBDeviceCandidate candidate) {
+        if (candidate.getName().contains("WF-1000XM3")) {
+            return DeviceType.SONY_WF_1000XM3;
+        }
+
+        return DeviceType.UNKNOWN;
+    }
+
+    @Override
+    public DeviceType getDeviceType() {
+        return DeviceType.SONY_WF_1000XM3;
+    }
+
+    @Override
+    public BatteryConfig[] getBatteryConfig() {
+        final BatteryConfig battery1 = new BatteryConfig(0, R.drawable.ic_tws_case, R.string.battery_case);
+        final BatteryConfig battery2 = new BatteryConfig(1, R.drawable.ic_galaxy_buds_l, R.string.left_earbud);
+        final BatteryConfig battery3 = new BatteryConfig(2, R.drawable.ic_galaxy_buds_r, R.string.right_earbud);
+
+        return new BatteryConfig[]{battery1, battery2, battery3};
+    }
+
+    @Override
+    public List<SonyHeadphonesCapabilities> getCapabilities() {
+        return Arrays.asList(
+                SonyHeadphonesCapabilities.BatteryDual,
+                SonyHeadphonesCapabilities.BatteryCase,
+                SonyHeadphonesCapabilities.PowerOffFromPhone,
+                SonyHeadphonesCapabilities.AmbientSoundControl,
+                SonyHeadphonesCapabilities.WindNoiseReduction,
+                SonyHeadphonesCapabilities.Equalizer,
+                SonyHeadphonesCapabilities.AudioUpsampling,
+                SonyHeadphonesCapabilities.ButtonModesLeftRight,
+                SonyHeadphonesCapabilities.PauseWhenTakenOff,
+                SonyHeadphonesCapabilities.AutomaticPowerOffWhenTakenOff,
+                SonyHeadphonesCapabilities.VoiceNotifications
+        );
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java
index ef4e95cde..c2d7a780a 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java
@@ -108,6 +108,7 @@ public enum DeviceType {
     SONY_WH_1000XM3(430, R.drawable.ic_device_sony_overhead, R.drawable.ic_device_sony_overhead_disabled, R.string.devicetype_sony_wh_1000xm3),
     SONY_WF_SP800N(431, R.drawable.ic_device_sony_wf_800n, R.drawable.ic_device_sony_wf_800n_disabled, R.string.devicetype_sony_wf_sp800n),
     SONY_WH_1000XM4(432, R.drawable.ic_device_sony_overhead, R.drawable.ic_device_sony_overhead_disabled, R.string.devicetype_sony_wh_1000xm4),
+    SONY_WF_1000XM3(433, R.drawable.ic_device_galaxy_buds, R.drawable.ic_device_galaxy_buds_disabled, R.string.devicetype_sony_wf_1000xm3),
     BOSE_QC35(440, R.drawable.ic_device_headphones, R.drawable.ic_device_headphones_disabled, R.string.devicetype_bose_qc35),
     VESC_NRF(500, R.drawable.ic_device_vesc, R.drawable.ic_device_vesc_disabled, R.string.devicetype_vesc),
     VESC_HM10(501, R.drawable.ic_device_vesc, R.drawable.ic_device_vesc_disabled, R.string.devicetype_vesc),
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceSupportFactory.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceSupportFactory.java
index 936a4ee9d..420d558de 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceSupportFactory.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceSupportFactory.java
@@ -389,6 +389,9 @@ public class DeviceSupportFactory {
                     case SONY_WF_SP800N:
                         deviceSupport = new ServiceDeviceSupport(new SonyHeadphonesSupport(), EnumSet.of(ServiceDeviceSupport.Flags.BUSY_CHECKING));
                         break;
+                    case SONY_WF_1000XM3:
+                        deviceSupport = new ServiceDeviceSupport(new SonyHeadphonesSupport(), EnumSet.of(ServiceDeviceSupport.Flags.BUSY_CHECKING));
+                        break;
                     case VESC_NRF:
                     case VESC_HM10:
                         deviceSupport = new ServiceDeviceSupport(new VescDeviceSupport(gbDevice.getType()), EnumSet.of(ServiceDeviceSupport.Flags.BUSY_CHECKING));
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/DeviceHelper.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/DeviceHelper.java
index bf7753e61..eb0429c84 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/DeviceHelper.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/DeviceHelper.java
@@ -120,6 +120,7 @@ import nodomain.freeyourgadget.gadgetbridge.devices.waspos.WaspOSCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.watch9.Watch9DeviceCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.sony.headphones.coordinators.SonyWFSP800NCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.sony.headphones.coordinators.SonyWH1000XM3Coordinator;
+import nodomain.freeyourgadget.gadgetbridge.devices.sony.headphones.coordinators.SonyWF1000XM3Coordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.xwatch.XWatchCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.zetime.ZeTimeCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.entities.Device;
@@ -326,6 +327,7 @@ public class DeviceHelper {
         result.add(new SonyWH1000XM3Coordinator());
         result.add(new SonyWH1000XM4Coordinator());
         result.add(new SonyWFSP800NCoordinator());
+        result.add(new SonyWF1000XM3Coordinator());
         result.add(new QC35Coordinator());
 
         return result;
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index f00cdc87e..29ca3d806 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -996,6 +996,7 @@
     <string name="devicetype_sony_wh_1000xm3">Sony WH-1000XM3</string>
     <string name="devicetype_sony_wh_1000xm4">Sony WH-1000XM4</string>
     <string name="devicetype_sony_wf_sp800n">Sony WF-SP800N</string>
+    <string name="devicetype_sony_wf_1000xm3">Sony WF-1000XM3</string>
     <string name="choose_auto_export_location">Choose export location</string>
     <string name="notification_channel_name">General</string>
     <string name="notification_channel_high_priority_name">High-priority</string>

From 32230151fc839135139ad1171f48d50d44fb8a39 Mon Sep 17 00:00:00 2001
From: Andreas Shimokawa <shimokawa@fsfe.org>
Date: Mon, 16 May 2022 14:57:55 +0200
Subject: [PATCH 066/110] draft changelog

---
 CHANGELOG.md | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9ec0f27c9..dc326eb45 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,25 @@
 ### Changelog
 
+### NEXT
+* Initial Support for Sony WF-1000XM3
+* Huami: Add Toggle function for Open Tracks tracking to button actionss
+* Huami: Move inactivity warnings and goal notification to device-specific settings
+* Mi Band 6: set time on connect
+* Mi Band 5/6, Amazfit Bip S/U/Pro: Add world clock configuration
+* Mi Band 5/6: support sensitivity setting for lift wrist configuration
+* Mi Band 5: Add support for configuring workout menu on device
+* Mi Band 4/5/6: Add support for vibration patterns
+* Mi Band 5: Increase number of reminder slots to 50
+* Amazfit Neo: Allow to disable beeps for email notifications
+* Bangle.js: Fix incoming calls in release builds
+* Fossil Hybrid HR: Support flexible custom menu on watch
+* VESC: added battery indicator
+* UM25: Add reset option to current accumulation
+* UM25: Add notification on below current threshold
+* Fix crash when calender is accessed but permission is denied
+* Add com.asus.asusincallui to blacklist
+* New icons for Sony WF 800n and Mi Band 6
+
 ### 0.66.0
 * Add basic support for Casio GBD-H1000
 * Add support for Hama Fit Track 1900 - via FitPro device support

From b3ffb157331b257d9b33b7454df4249e52e11b64 Mon Sep 17 00:00:00 2001
From: Shimon <simonfarm0@gmail.com>
Date: Mon, 2 May 2022 08:31:53 +0000
Subject: [PATCH 067/110] Translated using Weblate (Czech)

Currently translated at 99.2% (1479 of 1490 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/cs/
---
 app/src/main/res/values-cs/strings.xml | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index ef0c4a36a..803d8c9a0 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -1596,4 +1596,17 @@
     <string name="activity_db_management_autoexport_enabled_no">AutoExport není aktivní.</string>
     <string name="activity_db_management_autoexport_scheduled_no">AutoExport zatím nebyl naplánován.</string>
     <string name="menuitem_email">E-mail</string>
+    <string name="gadgetbridge_running_banglejs_main">Bangle.js běží</string>
+    <string name="application_name_banglejs_nopebble">Bangle.js Gadgetbridge</string>
+    <string name="about_description_banglejs_nopebble">Doprovodná aplikace pro Bangle.js pro Android vytvořená na základě projektu Gadgetbridge s přidaným přístupem k internetu.</string>
+    <string name="title_activity_controlcenter_main_nightly">Gadgetbridge Nightly</string>
+    <string name="title_activity_controlcenter_banglejs_main">Bangle.js Gadgetbridge</string>
+    <string name="about_activity_title_banglejs_nopebble">O Bangle.js Gadgetbridge</string>
+    <string name="application_name_banglejs_main">Bangle.js Gadgetbridge</string>
+    <string name="about_activity_title_banglejs_main">O Bangle.js Gadgetbridge</string>
+    <string name="about_description_banglejs_main">Doprovodná aplikace pro Bangle.js pro Android vytvořená na základě projektu Gadgetbridge s přidaným přístupem k internetu.</string>
+    <string name="application_name_main_nightly">Gadgetbridge (Nightly)</string>
+    <string name="title_activity_controlcenter_banglejs_nopebble">Bangle.js Gadgetbridge</string>
+    <string name="gadgetbridge_running_banglejs_nopebble">Bangle.js běží</string>
+    <string name="about_activity_title_main_nightly">O Gadgetbridge Nightly</string>
 </resources>
\ No newline at end of file

From 69efbe5ddd7e686c5b5d03636307a2db7bb4aec0 Mon Sep 17 00:00:00 2001
From: vanous <petr+weblate@linuks.cz>
Date: Mon, 2 May 2022 17:58:01 +0000
Subject: [PATCH 068/110] Translated using Weblate (Czech)

Currently translated at 100.0% (1490 of 1490 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/cs/
---
 app/src/main/res/values-cs/strings.xml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 803d8c9a0..e1c248853 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -1609,4 +1609,12 @@
     <string name="title_activity_controlcenter_banglejs_nopebble">Bangle.js Gadgetbridge</string>
     <string name="gadgetbridge_running_banglejs_nopebble">Bangle.js běží</string>
     <string name="about_activity_title_main_nightly">O Gadgetbridge Nightly</string>
+    <string name="gadgetbridge_running_main_nightly">Noční GB běží</string>
+    <string name="application_name_main_nopebble">Gadgetbridge (Noční vydání, Bez poskytovatele služeb Pebble)</string>
+    <string name="about_activity_title_main_nopebble">O Aplikaci Gadgetbridge Noční, bez Pebble</string>
+    <string name="watchface_setting_light_up_on_notification">Rozsvítit display při notifikaci</string>
+    <string name="about_description_main_nightly">Svobodná a lokální náhrada za uzavřenou aplikaci vašich hodinek/náramku. Noční vydání Gadgetbridge. Tato verze nelze nainstalovat, máte-li již nainstalovánu jinou verzi Gadgetbridge nebo Pebble aplikace, z důvodu konfliktu v poskytovali služeb Pebble.</string>
+    <string name="title_activity_controlcenter_main_nopebble">Gadgetbridge Noční, Bez Pebble</string>
+    <string name="about_description_main_nopebble">Svobodná a lokální náhrada za uzavřenou aplikaci vašich hodinek/náramku. Noční vydání Gadgetbridge. Tato verze má přejmenovanou službu poskytovatele Pebble pro eliminaci konfliktů poskytovatelů. Některé Pebble integrace nebudou fungovat, ale tuto verzi je možno nainstalovat paralelně k již nainstalované jiné verzi Gadgetbridge.</string>
+    <string name="gadgetbridge_running_main_nopebble">Noční NoPebble GB běží</string>
 </resources>
\ No newline at end of file

From a9fdf8db67d0c3aeacd94c1436c5a5b2b8123f0f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vinc=C3=A8n=20PUJOL?= <vincen@vincen.org>
Date: Mon, 2 May 2022 06:47:41 +0000
Subject: [PATCH 069/110] Translated using Weblate (French)

Currently translated at 98.8% (1473 of 1490 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/fr/
---
 app/src/main/res/values-fr/strings.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 05adb2646..80b59f423 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -1598,4 +1598,7 @@ Temps de sommeil préféré en heures</string>
     <string name="watchface_dialog_pre_setting_position">pré-configuration de la position à %s</string>
     <string name="watchface_setting_light_up_on_notification">S\'allumer pour une nouvelle notification</string>
     <string name="menuitem_email">Email</string>
+    <string name="title_activity_controlcenter_banglejs_main">Bangle.js Gadgetbridge</string>
+    <string name="about_activity_title_banglejs_main">A propos de Bangle.js Gadgetbridge</string>
+    <string name="application_name_banglejs_main">Bangle.js Gadgetbridge</string>
 </resources>
\ No newline at end of file

From e23499029823f4731a131f4ca8aee42b66a6d62a Mon Sep 17 00:00:00 2001
From: Yaron Shahrabani <sh.yaron@gmail.com>
Date: Mon, 2 May 2022 06:26:31 +0000
Subject: [PATCH 070/110] Translated using Weblate (Hebrew)

Currently translated at 99.5% (1483 of 1490 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/he/
---
 app/src/main/res/values-he/strings.xml | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/app/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml
index aef1dbfbb..8b45d9f91 100644
--- a/app/src/main/res/values-he/strings.xml
+++ b/app/src/main/res/values-he/strings.xml
@@ -1594,4 +1594,17 @@
     <string name="watchface_dialog_pre_setting_position">המיקום מוגדר מראש לכדי %s</string>
     <string name="watchface_setting_light_up_on_notification">הארה עם התראות חדשות</string>
     <string name="menuitem_email">דוא״ל</string>
+    <string name="application_name_banglejs_main">Bangle.js Gadgetbridge</string>
+    <string name="title_activity_controlcenter_main_nightly">גרסה נסיונית של Gadgetbridge</string>
+    <string name="about_activity_title_main_nightly">על הגרסה הנסיונית של Gadgetbridge</string>
+    <string name="gadgetbridge_running_banglejs_nopebble">Bangle.js פעיל</string>
+    <string name="title_activity_controlcenter_banglejs_main">Bangle.js Gadgetbridge</string>
+    <string name="about_activity_title_banglejs_main">על Bangle.js Gadgetbridge</string>
+    <string name="title_activity_controlcenter_banglejs_nopebble">Bangle.js Gadgetbridge</string>
+    <string name="about_activity_title_banglejs_nopebble">על Bangle.js Gadgetbridge</string>
+    <string name="about_description_banglejs_nopebble">יישומון Android מלווה ל־Bangle.js שנבנה על גבי מיזם Gadgetbridge עם תוספת של גישה לאינטרנט.</string>
+    <string name="about_description_banglejs_main">יישומון Android מלווה ל־Bangle.js שנבנה על גבי מיזם Gadgetbridge עם תוספת של גישה לאינטרנט.</string>
+    <string name="application_name_main_nightly">Gadgetbridge (גרסה ניסיונית)</string>
+    <string name="application_name_banglejs_nopebble">Bangle.js Gadgetbridge</string>
+    <string name="gadgetbridge_running_banglejs_main">Bangle.js פעיל</string>
 </resources>
\ No newline at end of file

From 6efd2eaa7bf9d18be23a06a70b658930b35a0f51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?O=C4=9Fuz=20Ersen?= <oguz@ersen.moe>
Date: Mon, 2 May 2022 10:52:28 +0000
Subject: [PATCH 071/110] Translated using Weblate (Turkish)

Currently translated at 100.0% (1490 of 1490 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/tr/
---
 app/src/main/res/values-tr/strings.xml | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 3ed1c3fc2..5c66463e6 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -1611,4 +1611,24 @@
     <string name="watchface_dialog_pre_setting_position">konumu %s olarak ön ayarlama</string>
     <string name="watchface_setting_light_up_on_notification">Yeni bildirimde ışığı aç</string>
     <string name="menuitem_email">E-posta</string>
+    <string name="gadgetbridge_running_banglejs_main">Bangle.js çalışıyor</string>
+    <string name="application_name_banglejs_nopebble">Bangle.js Gadgetbridge</string>
+    <string name="title_activity_controlcenter_banglejs_nopebble">Bangle.js Gadgetbridge</string>
+    <string name="about_activity_title_banglejs_nopebble">Bangle.js Gadgetbridge Hakkında</string>
+    <string name="about_activity_title_main_nightly">Gadgetbridge Gecelik Hakkında</string>
+    <string name="about_description_main_nightly">Satıcıların kapalı kaynaklı Android aygıt uygulamalarının yerine bulut gerektirmeyen copyleft özgür alternatif. Gadgetbridge gecelik sürümleri. Pebble sağlayıcısındaki bir çakışma nedeniyle Gadgetbridge veya Pebble uygulaması zaten kuruluysa bu kurulamaz.</string>
+    <string name="gadgetbridge_running_main_nightly">Gecelik GB çalışıyor</string>
+    <string name="title_activity_controlcenter_main_nopebble">Gadgetbridge Gecelik Pebble Yok</string>
+    <string name="about_activity_title_main_nopebble">Gadgetbridge Gecelik Pebble Yok Hakkında</string>
+    <string name="gadgetbridge_running_main_nopebble">Gecelik PebbleYok GB çalışıyor</string>
+    <string name="title_activity_controlcenter_banglejs_main">Bangle.js Gadgetbridge</string>
+    <string name="about_activity_title_banglejs_main">Bangle.js Gadgetbridge Hakkında</string>
+    <string name="about_description_banglejs_main">İnternet erişimi eklenen Gadgetbridge projesinin üzerine inşa edilmiş Bangle.js için Android yardımcı uygulaması.</string>
+    <string name="title_activity_controlcenter_main_nightly">Gadgetbridge Gecelik</string>
+    <string name="application_name_main_nopebble">Gadgetbridge (Gecelik, Pebble sağlayıcısı yok)</string>
+    <string name="application_name_banglejs_main">Bangle.js Gadgetbridge</string>
+    <string name="about_description_main_nopebble">Satıcıların kapalı kaynaklı Android aygıt uygulamalarının yerine bulut gerektirmeyen copyleft özgür alternatif. Gadgetbridge gecelik sürümleri. Bu sürümde, çakışmaları önlemek için Pebble sağlayıcısının adı değiştirilmiştir, bu nedenle Pebble ile ilgili bazı bütünleşmeler çalışmayacaktır, ancak mevcut bir Gadgetbridge kurulumunun yanına kurulabilir.</string>
+    <string name="about_description_banglejs_nopebble">İnternet erişimi eklenen Gadgetbridge projesinin üzerine inşa edilmiş Bangle.js için Android yardımcı uygulaması.</string>
+    <string name="gadgetbridge_running_banglejs_nopebble">Bangle.js çalışıyor</string>
+    <string name="application_name_main_nightly">Gadgetbridge (Gecelik)</string>
 </resources>
\ No newline at end of file

From 4fe8d4265244be9c07bacd8e8cec0378c0f0c1df Mon Sep 17 00:00:00 2001
From: Ihor Hordiichuk <igor_ck@outlook.com>
Date: Mon, 2 May 2022 10:49:56 +0000
Subject: [PATCH 072/110] Translated using Weblate (Ukrainian)

Currently translated at 100.0% (1490 of 1490 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/uk/
---
 app/src/main/res/values-uk/strings.xml | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 4422a3df7..2cbee6809 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -1602,4 +1602,24 @@
     <string name="watchface_dialog_pre_setting_position">попереднє встановлення розташування на %s</string>
     <string name="watchface_setting_light_up_on_notification">Засвітлювати за нового сповіщення</string>
     <string name="menuitem_email">Е-пошта</string>
+    <string name="application_name_banglejs_main">Bangle.js Gadgetbridge</string>
+    <string name="about_description_banglejs_main">Засосунок-компаньйон Android для Bangle.js побудований на основі проєкту Gadgetbridge, з додаванням доступу до інтернету.</string>
+    <string name="gadgetbridge_running_banglejs_main">Bangle.js працює</string>
+    <string name="application_name_banglejs_nopebble">Bangle.js Gadgetbridge</string>
+    <string name="title_activity_controlcenter_banglejs_nopebble">Bangle.js Gadgetbridge</string>
+    <string name="gadgetbridge_running_banglejs_nopebble">Bangle.js працює</string>
+    <string name="application_name_main_nightly">Gadgetbridge (Nightly)</string>
+    <string name="about_activity_title_main_nightly">Про Gadgetbridge Nightly</string>
+    <string name="gadgetbridge_running_main_nightly">Nightly GB працює</string>
+    <string name="application_name_main_nopebble">Gadgetbridge (Nightly, без постачальника Pebble)</string>
+    <string name="title_activity_controlcenter_main_nopebble">Gadgetbridge Nightly без Pebble</string>
+    <string name="about_activity_title_main_nopebble">Про Gadgetbridge Nightly без Pebble</string>
+    <string name="gadgetbridge_running_main_nopebble">Nightly NoPebble GB працює</string>
+    <string name="about_activity_title_banglejs_nopebble">Про Bangle.js Gadgetbridge</string>
+    <string name="about_activity_title_banglejs_main">Про Bangle.js Gadgetbridge</string>
+    <string name="title_activity_controlcenter_banglejs_main">Bangle.js Gadgetbridge</string>
+    <string name="about_description_banglejs_nopebble">Засосунок-компаньйон Android для Bangle.js побудований на основі проєкту Gadgetbridge, з додаванням доступу до інтернету.</string>
+    <string name="title_activity_controlcenter_main_nightly">Gadgetbridge Nightly</string>
+    <string name="about_description_main_nightly">Безхмарна вільна з копілефт ліцензією заміна власницьких застосунків для пристроїв Android. Випуски Gadgetbridge Nightly. Його не можна встановити, якщо у вас уже встановлено застосунок Gadgetbridge або Pebble через конфлікт у постачальника Pebble.</string>
+    <string name="about_description_main_nopebble">Безхмарна вільна з копілефт ліцензією заміна власницьких застосунків для пристроїв Android. Випуски Gadgetbridge Nightly. У цій версії постачальник Pebble перейменований для запобігання конфліктів, тому деякі інтеграції, пов\'язані з Pebble, не працюватимуть, але його можна встановити разом із наявним установленим Gadgetbridge.</string>
 </resources>
\ No newline at end of file

From c3be9b436a1a3b5fcb102be75e05fcf235b94b47 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=B0=91=E4=B8=BE?= <oshirisu.red@gmail.com>
Date: Mon, 2 May 2022 05:41:56 +0000
Subject: [PATCH 073/110] Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (1490 of 1490 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/zh_Hans/
---
 app/src/main/res/values-zh-rCN/strings.xml | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index ab20c7d41..815375e0a 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -1600,4 +1600,24 @@
     <string name="watchface_dialog_pre_setting_position">预设位置为 %s</string>
     <string name="watchface_setting_light_up_on_notification">有新通知时亮起</string>
     <string name="menuitem_email">电子邮件</string>
+    <string name="about_description_banglejs_main">Bangle.js 的 Android 配套应用程序构建在 Gadgetbridge 项目之上，增加了 Internet 访问。</string>
+    <string name="gadgetbridge_running_banglejs_main">Bangle.js 正在运行</string>
+    <string name="application_name_banglejs_nopebble">Bangle.js Gadgetbridge</string>
+    <string name="title_activity_controlcenter_banglejs_nopebble">Bangle.js Gadgetbridge</string>
+    <string name="about_activity_title_banglejs_nopebble">关于 Bangle.js Gadgetbridge</string>
+    <string name="about_description_banglejs_nopebble">Bangle.js 的 Android 配套应用程序构建在 Gadgetbridge 项目之上，增加了 Internet 访问。</string>
+    <string name="gadgetbridge_running_banglejs_nopebble">Bangle.js 正在运行</string>
+    <string name="application_name_main_nightly">Gadgetbridge (每夜编译版本)</string>
+    <string name="title_activity_controlcenter_main_nightly">Gadgetbridge 每夜编译版本</string>
+    <string name="about_activity_title_main_nightly">关于 Gadgetbridge 每夜编译版本</string>
+    <string name="gadgetbridge_running_main_nightly">每夜编译版本的 GB 正在运行</string>
+    <string name="title_activity_controlcenter_main_nopebble">Gadgetbridge 每夜编译版本，无 Pebble</string>
+    <string name="gadgetbridge_running_main_nopebble">无 Pebble 的每夜编译版 GB 正在运行</string>
+    <string name="about_activity_title_main_nopebble">关于 Gadgetbridge 每夜编译版本，无 Pebble</string>
+    <string name="about_description_main_nopebble">供应商提供的闭源 Android 小工具应用程序的无云无版权库替代品。 Gadgetbridge 的夜间版本。 此版本重命名了 Pebble 提供程序以防止冲突，因此某些与 Pebble 相关的集成将不起作用，但它可以与现有的 Gadgetbridge 安装一起安装。</string>
+    <string name="application_name_main_nopebble">Gadgetbridge （每夜编译版本，无 Pebble 服务商）</string>
+    <string name="application_name_banglejs_main">Bangle.js Gadgetbridge</string>
+    <string name="about_activity_title_banglejs_main">关于 Bangle.js Gadgetbridge</string>
+    <string name="title_activity_controlcenter_banglejs_main">Bangle.js Gadgetbridge</string>
+    <string name="about_description_main_nightly">服务商提供的闭源 Android 小工具应用程序的无云无版本的替代品。 Gadgetbridge 的每夜编译版本。 如果您已经安装了 Gadgetbridge 或 Pebble 应用程序，则无法安装它，因为 Pebble 提供程序存在冲突。</string>
 </resources>
\ No newline at end of file

From b446d57eb031bd9b388bb467d8f2a186718d5cec Mon Sep 17 00:00:00 2001
From: Yaron Shahrabani <sh.yaron@gmail.com>
Date: Sat, 7 May 2022 12:39:44 +0000
Subject: [PATCH 074/110] Translated using Weblate (Hebrew)

Currently translated at 100.0% (1490 of 1490 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/he/
---
 app/src/main/res/values-he/strings.xml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/app/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml
index 8b45d9f91..ca53cbbd6 100644
--- a/app/src/main/res/values-he/strings.xml
+++ b/app/src/main/res/values-he/strings.xml
@@ -1607,4 +1607,11 @@
     <string name="application_name_main_nightly">Gadgetbridge (גרסה ניסיונית)</string>
     <string name="application_name_banglejs_nopebble">Bangle.js Gadgetbridge</string>
     <string name="gadgetbridge_running_banglejs_main">Bangle.js פעיל</string>
+    <string name="gadgetbridge_running_main_nightly">GB במהדורה לילית פעיל</string>
+    <string name="about_activity_title_main_nopebble">על מהדורה לילית של Gadgetbridge בלי Pebble</string>
+    <string name="gadgetbridge_running_main_nopebble">GB ללא Pebble במהדורה לילית פעיל</string>
+    <string name="about_description_main_nightly">חלופה חופשית ונטולת ענן ליישומוני הגאדג׳טים הסגורים ל־Android מהיצרנים. מהדורות ליליות של Gadgetbridge. אי אפשר להתקין אם כבר יש לך את היישומונים Gadgetbridge או Pebble מותקנים עקב סתירה בספק ה־Pebble.</string>
+    <string name="title_activity_controlcenter_main_nopebble">מהדורה לילית של Gadgetbridge בלי Pebble</string>
+    <string name="application_name_main_nopebble">Gadgetbridge (מהדורה לילית, בלי ספק Pebble)</string>
+    <string name="about_description_main_nopebble">חלופה חופשית ונטולת ענן ליישומוני הגאדג׳טים הסגורים ל־Android מהיצרנים. מהדורות ליליות של Gadgetbridge. במהדורה זו שמו של ספק ה־Pebble השתנה כדי למנוע סתירות, לכן כמה מהשילובים מול Pebble לא יעבדו אך ניתן להתקין אותו לצד התקנה קיימת של Gadgetbridge.</string>
 </resources>
\ No newline at end of file

From 6dd7da97100767891ec37a44e9c3209ee6e1f9c0 Mon Sep 17 00:00:00 2001
From: Ihor Hordiichuk <igor_ck@outlook.com>
Date: Mon, 9 May 2022 15:27:29 +0000
Subject: [PATCH 075/110] Translated using Weblate (Ukrainian)

Currently translated at 100.0% (1491 of 1491 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/uk/
---
 app/src/main/res/values-uk/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 2cbee6809..eee7255f6 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -1622,4 +1622,5 @@
     <string name="title_activity_controlcenter_main_nightly">Gadgetbridge Nightly</string>
     <string name="about_description_main_nightly">Безхмарна вільна з копілефт ліцензією заміна власницьких застосунків для пристроїв Android. Випуски Gadgetbridge Nightly. Його не можна встановити, якщо у вас уже встановлено застосунок Gadgetbridge або Pebble через конфлікт у постачальника Pebble.</string>
     <string name="about_description_main_nopebble">Безхмарна вільна з копілефт ліцензією заміна власницьких застосунків для пристроїв Android. Випуски Gadgetbridge Nightly. У цій версії постачальник Pebble перейменований для запобігання конфліктів, тому деякі інтеграції, пов\'язані з Pebble, не працюватимуть, але його можна встановити разом із наявним установленим Gadgetbridge.</string>
+    <string name="pref_device_action_fitness_app_control_toggle">Перемкнути стеження фітнес-застосунку</string>
 </resources>
\ No newline at end of file

From cbc11baa5d36ce4221a1370bc4eaf125cd27f0c1 Mon Sep 17 00:00:00 2001
From: nautilusx <translate@disroot.org>
Date: Mon, 9 May 2022 16:11:36 +0000
Subject: [PATCH 076/110] Translated using Weblate (German)

Currently translated at 100.0% (1494 of 1494 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/de/
---
 app/src/main/res/values-de/strings.xml | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index e0dc57876..0da11a744 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -1603,4 +1603,28 @@
     <string name="autoExport_lastTime_label">Letzter autom. Export: %1$s</string>
     <string name="activity_db_management_autoexport_location">Standort ermittelt nicht möglich. Wahrscheinlich ein Problem des neueren Android-Berechtigungssystems. Höchstwahrscheinlich funktioniert der autom. Export jetzt nicht.</string>
     <string name="menuitem_email">E-Mail</string>
+    <string name="application_name_banglejs_main">Bangle.js Gadgetbridge</string>
+    <string name="title_activity_controlcenter_banglejs_main">Bangle.js Gadgetbridge</string>
+    <string name="about_description_banglejs_main">Android-Begleit-App für Bangle.js, die auf dem Gadgetbridge-Projekt aufbaut, mit zusätzlichem Internetzugang.</string>
+    <string name="gadgetbridge_running_banglejs_main">Bangle.js läuft</string>
+    <string name="about_description_banglejs_nopebble">Android-Begleit-App für Bangle.js, die auf dem Gadgetbridge-Projekt aufbaut, mit zusätzlichem Internetzugang.</string>
+    <string name="application_name_main_nightly">Gadgetbridge (Nightly)</string>
+    <string name="title_activity_controlcenter_main_nightly">Gadgetbridge Nightly</string>
+    <string name="about_activity_title_main_nightly">Über Gadgetbridge Nightly</string>
+    <string name="about_description_main_nightly">Cloudloser und freier quelloffener Ersatz für Closed-Source Android-Gadget-Apps von Anbietern. Nächtliche Veröffentlichungen von Gadgetbridge. Es kann nicht installiert werden, wenn du bereits die Gadgetbridge- oder die Pebble-App installiert hast, da es einen Konflikt mit dem Pebble-Anbieter gibt.</string>
+    <string name="gadgetbridge_running_main_nightly">Nightly GB läuft</string>
+    <string name="application_name_main_nopebble">Gadgetbridge (Nightly, kein Pebble-Anbieter)</string>
+    <string name="title_activity_controlcenter_main_nopebble">Gadgetbridge Nightly kein Pebble</string>
+    <string name="about_activity_title_main_nopebble">Über Gadgetbridge Nightly kein Pebble</string>
+    <string name="gadgetbridge_running_main_nopebble">Nightly kein Pebble GB läuft</string>
+    <string name="prefs_activate_display_on_lift_sensitivity">Empfindlichkeit</string>
+    <string name="normal">Normal</string>
+    <string name="sensitive">Empfindlich</string>
+    <string name="application_name_banglejs_nopebble">Bangle.js Gadgetbridge</string>
+    <string name="about_activity_title_banglejs_main">Über Bangle.js Gadgetbridge</string>
+    <string name="about_description_main_nopebble">Cloudloser und freier quelloffener Ersatz für Closed-Source Android-Gadget-Apps von Anbietern. Nächtliche Veröffentlichungen von Gadgetbridge. Bei dieser Version wurde der Pebble-Provider umbenannt, um Konflikte zu vermeiden. Daher werden einige Pebble-bezogene Integrationen nicht funktionieren, aber sie kann neben einer bestehenden Gadgetbridge-Installation installiert werden.</string>
+    <string name="title_activity_controlcenter_banglejs_nopebble">Bangle.js Gadgetbridge</string>
+    <string name="gadgetbridge_running_banglejs_nopebble">Bangle.js läuft</string>
+    <string name="about_activity_title_banglejs_nopebble">Über Bangle.js Gadgetbridge</string>
+    <string name="pref_device_action_fitness_app_control_toggle">Fitness-App-Tracking umschalten</string>
 </resources>
\ No newline at end of file

From 6015e5c931564ab444f6cc7f671234584070379a Mon Sep 17 00:00:00 2001
From: Yaron Shahrabani <sh.yaron@gmail.com>
Date: Mon, 9 May 2022 18:16:34 +0000
Subject: [PATCH 077/110] Translated using Weblate (Hebrew)

Currently translated at 100.0% (1494 of 1494 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/he/
---
 app/src/main/res/values-he/strings.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml
index ca53cbbd6..ef51230cc 100644
--- a/app/src/main/res/values-he/strings.xml
+++ b/app/src/main/res/values-he/strings.xml
@@ -1614,4 +1614,8 @@
     <string name="title_activity_controlcenter_main_nopebble">מהדורה לילית של Gadgetbridge בלי Pebble</string>
     <string name="application_name_main_nopebble">Gadgetbridge (מהדורה לילית, בלי ספק Pebble)</string>
     <string name="about_description_main_nopebble">חלופה חופשית ונטולת ענן ליישומוני הגאדג׳טים הסגורים ל־Android מהיצרנים. מהדורות ליליות של Gadgetbridge. במהדורה זו שמו של ספק ה־Pebble השתנה כדי למנוע סתירות, לכן כמה מהשילובים מול Pebble לא יעבדו אך ניתן להתקין אותו לצד התקנה קיימת של Gadgetbridge.</string>
+    <string name="prefs_activate_display_on_lift_sensitivity">רגישות</string>
+    <string name="normal">רגילה</string>
+    <string name="sensitive">רגישה</string>
+    <string name="pref_device_action_fitness_app_control_toggle">החלפת מצב מעקב ביישומון חיטוב</string>
 </resources>
\ No newline at end of file

From b72bec94d957e11422538923f3b57e51f7fae497 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?O=C4=9Fuz=20Ersen?= <oguz@ersen.moe>
Date: Mon, 9 May 2022 18:14:06 +0000
Subject: [PATCH 078/110] Translated using Weblate (Turkish)

Currently translated at 100.0% (1494 of 1494 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/tr/
---
 app/src/main/res/values-tr/strings.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 5c66463e6..0695aedd6 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -1631,4 +1631,8 @@
     <string name="about_description_banglejs_nopebble">İnternet erişimi eklenen Gadgetbridge projesinin üzerine inşa edilmiş Bangle.js için Android yardımcı uygulaması.</string>
     <string name="gadgetbridge_running_banglejs_nopebble">Bangle.js çalışıyor</string>
     <string name="application_name_main_nightly">Gadgetbridge (Gecelik)</string>
+    <string name="prefs_activate_display_on_lift_sensitivity">Hassasiyet</string>
+    <string name="normal">Normal</string>
+    <string name="sensitive">Hassas</string>
+    <string name="pref_device_action_fitness_app_control_toggle">Fitness Uygulaması İzlemesini Değiştir</string>
 </resources>
\ No newline at end of file

From 1f0764cc81ff91a19fd0c33c17f24d59113beb0b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=B0=91=E4=B8=BE?= <oshirisu.red@gmail.com>
Date: Tue, 10 May 2022 01:46:39 +0000
Subject: [PATCH 079/110] Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (1494 of 1494 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/zh_Hans/
---
 app/src/main/res/values-zh-rCN/strings.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 815375e0a..1f076e7a4 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -1620,4 +1620,8 @@
     <string name="about_activity_title_banglejs_main">关于 Bangle.js Gadgetbridge</string>
     <string name="title_activity_controlcenter_banglejs_main">Bangle.js Gadgetbridge</string>
     <string name="about_description_main_nightly">服务商提供的闭源 Android 小工具应用程序的无云无版本的替代品。 Gadgetbridge 的每夜编译版本。 如果您已经安装了 Gadgetbridge 或 Pebble 应用程序，则无法安装它，因为 Pebble 提供程序存在冲突。</string>
+    <string name="prefs_activate_display_on_lift_sensitivity">敏感度</string>
+    <string name="normal">正常</string>
+    <string name="sensitive">敏感</string>
+    <string name="pref_device_action_fitness_app_control_toggle">切换健身应用跟踪</string>
 </resources>
\ No newline at end of file

From 7f5989d88aca443b6cb169c407af9449e1f608af Mon Sep 17 00:00:00 2001
From: Yaron Shahrabani <sh.yaron@gmail.com>
Date: Tue, 10 May 2022 15:40:22 +0000
Subject: [PATCH 080/110] Translated using Weblate (Hebrew)

Currently translated at 100.0% (1503 of 1503 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/he/
---
 app/src/main/res/values-he/strings.xml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/app/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml
index ef51230cc..97d29b1ea 100644
--- a/app/src/main/res/values-he/strings.xml
+++ b/app/src/main/res/values-he/strings.xml
@@ -1618,4 +1618,13 @@
     <string name="normal">רגילה</string>
     <string name="sensitive">רגישה</string>
     <string name="pref_device_action_fitness_app_control_toggle">החלפת מצב מעקב ביישומון חיטוב</string>
+    <string name="world_clock_no_free_slots_title">אין מקומות פנויים</string>
+    <string name="world_clock_no_free_slots_description">למכשיר אין עוד מקומות פנויים לשעוני העולם (סך כל המקומות: %1$s)</string>
+    <string name="world_clock_timezone">אזור זמן</string>
+    <string name="world_clock_label">תווית</string>
+    <string name="pref_world_clocks_title">שעוני העולם</string>
+    <string name="pref_world_clocks_summary">הגדרת שעונים לאזורי זמן אחרים</string>
+    <string name="world_clock_delete_confirm_description">למחוק את השעון העולמי\?</string>
+    <string name="world_clock_delete_confirm_title">מחיקת ‚%1$s’</string>
+    <string name="title_activity_world_clock_details">פרטי השעון העולמי</string>
 </resources>
\ No newline at end of file

From 0fea491ff67b778555bae3532ca2a7050a79995c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?O=C4=9Fuz=20Ersen?= <oguz@ersen.moe>
Date: Tue, 10 May 2022 18:36:45 +0000
Subject: [PATCH 081/110] Translated using Weblate (Turkish)

Currently translated at 100.0% (1503 of 1503 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/tr/
---
 app/src/main/res/values-tr/strings.xml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 0695aedd6..9bac6eb7c 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -1635,4 +1635,13 @@
     <string name="normal">Normal</string>
     <string name="sensitive">Hassas</string>
     <string name="pref_device_action_fitness_app_control_toggle">Fitness Uygulaması İzlemesini Değiştir</string>
+    <string name="pref_world_clocks_title">Dünya Saatleri</string>
+    <string name="pref_world_clocks_summary">Diğer saat dilimleri için saatleri yapılandırın</string>
+    <string name="world_clock_delete_confirm_title">\'%1$s\' sil</string>
+    <string name="world_clock_delete_confirm_description">Dünya saatini silmek istediğinizden emin misiniz\?</string>
+    <string name="world_clock_no_free_slots_title">Boş yuva yok</string>
+    <string name="title_activity_world_clock_details">Dünya saati ayrıntıları</string>
+    <string name="world_clock_no_free_slots_description">Aygıtta dünya saatleri için boş yuva yok (toplam yuva: %1$s)</string>
+    <string name="world_clock_timezone">Saat Dilimi</string>
+    <string name="world_clock_label">Etiket</string>
 </resources>
\ No newline at end of file

From d5bc4dcce235ddda94957a49bac1763f00d04b60 Mon Sep 17 00:00:00 2001
From: Ihor Hordiichuk <igor_ck@outlook.com>
Date: Tue, 10 May 2022 15:06:32 +0000
Subject: [PATCH 082/110] Translated using Weblate (Ukrainian)

Currently translated at 100.0% (1503 of 1503 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/uk/
---
 app/src/main/res/values-uk/strings.xml | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index eee7255f6..bd2d9da07 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -1623,4 +1623,16 @@
     <string name="about_description_main_nightly">Безхмарна вільна з копілефт ліцензією заміна власницьких застосунків для пристроїв Android. Випуски Gadgetbridge Nightly. Його не можна встановити, якщо у вас уже встановлено застосунок Gadgetbridge або Pebble через конфлікт у постачальника Pebble.</string>
     <string name="about_description_main_nopebble">Безхмарна вільна з копілефт ліцензією заміна власницьких застосунків для пристроїв Android. Випуски Gadgetbridge Nightly. У цій версії постачальник Pebble перейменований для запобігання конфліктів, тому деякі інтеграції, пов\'язані з Pebble, не працюватимуть, але його можна встановити разом із наявним установленим Gadgetbridge.</string>
     <string name="pref_device_action_fitness_app_control_toggle">Перемкнути стеження фітнес-застосунку</string>
+    <string name="world_clock_delete_confirm_title">Видалити«%1$s»</string>
+    <string name="world_clock_delete_confirm_description">Ви впевнені, що хочете видалити світовий годинник\?</string>
+    <string name="world_clock_no_free_slots_description">Пристрій не має вільних комірок для світових годинників (загальна кількість комірок: %1$s)</string>
+    <string name="prefs_activate_display_on_lift_sensitivity">Чутливість</string>
+    <string name="normal">Звичайно</string>
+    <string name="sensitive">Чутливо</string>
+    <string name="pref_world_clocks_title">Світовий час</string>
+    <string name="pref_world_clocks_summary">Налаштувати годинник для інших часових поясів</string>
+    <string name="title_activity_world_clock_details">Подробиці світового годинника</string>
+    <string name="world_clock_no_free_slots_title">Немає вільних комірок</string>
+    <string name="world_clock_timezone">Часовий пояс</string>
+    <string name="world_clock_label">Мітка</string>
 </resources>
\ No newline at end of file

From dfc69c3ea548d93a68bee0b58b77e65856ad4888 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=B0=91=E4=B8=BE?= <oshirisu.red@gmail.com>
Date: Tue, 10 May 2022 16:22:46 +0000
Subject: [PATCH 083/110] Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (1503 of 1503 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/zh_Hans/
---
 app/src/main/res/values-zh-rCN/strings.xml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 1f076e7a4..cf975e870 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -1624,4 +1624,13 @@
     <string name="normal">正常</string>
     <string name="sensitive">敏感</string>
     <string name="pref_device_action_fitness_app_control_toggle">切换健身应用跟踪</string>
+    <string name="world_clock_delete_confirm_description">您确定想要删除此世界时钟？</string>
+    <string name="world_clock_no_free_slots_title">没有可用的位置</string>
+    <string name="world_clock_no_free_slots_description">此设备已经没有可用的位置放置世界时钟了（总可用位置：%1$s）</string>
+    <string name="world_clock_timezone">时区</string>
+    <string name="world_clock_label">标签</string>
+    <string name="title_activity_world_clock_details">世界时钟详情</string>
+    <string name="pref_world_clocks_summary">为其他时区配置时钟</string>
+    <string name="world_clock_delete_confirm_title">删除\'%1$s\'</string>
+    <string name="pref_world_clocks_title">世界时钟</string>
 </resources>
\ No newline at end of file

From 2e3ff80d766374f14598e01e2a5eb80d3976c7d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vinc=C3=A8n=20PUJOL?= <vincen@vincen.org>
Date: Fri, 13 May 2022 11:52:57 +0000
Subject: [PATCH 084/110] Translated using Weblate (French)

Currently translated at 98.6% (1488 of 1509 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/fr/
---
 app/src/main/res/values-fr/strings.xml | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 80b59f423..e73fea645 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -1601,4 +1601,19 @@ Temps de sommeil préféré en heures</string>
     <string name="title_activity_controlcenter_banglejs_main">Bangle.js Gadgetbridge</string>
     <string name="about_activity_title_banglejs_main">A propos de Bangle.js Gadgetbridge</string>
     <string name="application_name_banglejs_main">Bangle.js Gadgetbridge</string>
+    <string name="about_description_banglejs_main">Application complémentaire Android pour Bangle.js élaborée sur la base du projet Gadgetbridge, avec des fonctionnalités Internet supplémentaires.</string>
+    <string name="application_name_banglejs_nopebble">Bangle.js pour Gadgetbridge</string>
+    <string name="title_activity_controlcenter_banglejs_nopebble">Bangle.js pour Gadgetbridge</string>
+    <string name="about_activity_title_main_nightly">A propos de Gatgetbridge Nightly</string>
+    <string name="about_activity_title_banglejs_nopebble">A propos de Bangle.js pour Gadgetbridge</string>
+    <string name="about_activity_title_main_nopebble">A propos de Gadgetbridge Nightly sans Pebble</string>
+    <string name="about_description_main_nightly">Remplaçant autonome et sous licence libre pour remplacer les applications propriétaires des fabricants. Version Nightly de Gadgetbridge. Ne peut pas être installé si vous avez déja Gadgetbridge ou Pebble d\'installé, en raison d\'un conflit avec l\'application Pebble.</string>
+    <string name="application_name_main_nopebble">Gadgetbridage (Nightly, pas defournisseur Pebble)</string>
+    <string name="title_activity_controlcenter_main_nopebble">Gadgetbridge Nightly Sans Pebble</string>
+    <string name="gadgetbridge_running_main_nightly">GB Nightly en fonctionnement</string>
+    <string name="gadgetbridge_running_banglejs_main">Bangle.js en fonctionnement</string>
+    <string name="about_description_banglejs_nopebble">Application complémentaire Android pour Bangle.js élaborée sur la base du projet Gadgetbridge, avec des fonctionnalités Internet supplémentaires.</string>
+    <string name="gadgetbridge_running_banglejs_nopebble">Bangle.js en fonctionnement</string>
+    <string name="application_name_main_nightly">Gadgetbridge (version Nightly)</string>
+    <string name="title_activity_controlcenter_main_nightly">Gadgetbrigde version Nightly</string>
 </resources>
\ No newline at end of file

From 4ccbb636e5f32fb1c4ecc37c4194fcfdfc0b7069 Mon Sep 17 00:00:00 2001
From: Yaron Shahrabani <sh.yaron@gmail.com>
Date: Thu, 12 May 2022 10:43:17 +0000
Subject: [PATCH 085/110] Translated using Weblate (Hebrew)

Currently translated at 100.0% (1509 of 1509 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/he/
---
 app/src/main/res/values-he/strings.xml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml
index 97d29b1ea..d4c1deaf2 100644
--- a/app/src/main/res/values-he/strings.xml
+++ b/app/src/main/res/values-he/strings.xml
@@ -1009,7 +1009,7 @@
     <string name="prefs_events_forwarding_summary">להשתמש באירועי המכשיר כדי לגרור פעולות ושידורי Android</string>
     <string name="activity_type_yoga">יוגה</string>
     <string name="activity_type_jump_roping">קפיצה בחבל</string>
-    <string name="activity_type_elliptical_trainer">אליפטיקל</string>
+    <string name="activity_type_elliptical_trainer">אליפטיקל עם ידיות</string>
     <string name="activity_type_indoor_cycling">רכיבה בתוך מבנה</string>
     <string name="activity_type_swimming_openwater">שחייה במים פתוחים</string>
     <string name="activity_filter_apply_filter">החלת מסנן</string>
@@ -1627,4 +1627,10 @@
     <string name="world_clock_delete_confirm_description">למחוק את השעון העולמי\?</string>
     <string name="world_clock_delete_confirm_title">מחיקת ‚%1$s’</string>
     <string name="title_activity_world_clock_details">פרטי השעון העולמי</string>
+    <string name="activity_type_outdoor_running">ריצה בחוץ</string>
+    <string name="activity_type_freestyle">סגנון חופשי</string>
+    <string name="activity_type_outdoor_cycling">רכיבת אופניים בחוץ</string>
+    <string name="activity_type_elliptical">אליפטיקל בלי ידיות</string>
+    <string name="mi5_prefs_workout_activity_types_summary">נא לבחור את סוגי הפעילות להצגה במסך האימון</string>
+    <string name="mi5_prefs_workout_activity_types">סוגי פעילות אימון</string>
 </resources>
\ No newline at end of file

From ba33f8d247e0796fbbaa82c44aa029ff137e87cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?O=C4=9Fuz=20Ersen?= <oguz@ersen.moe>
Date: Thu, 12 May 2022 18:43:45 +0000
Subject: [PATCH 086/110] Translated using Weblate (Turkish)

Currently translated at 100.0% (1509 of 1509 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/tr/
---
 app/src/main/res/values-tr/strings.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 9bac6eb7c..63c11f3bf 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -1644,4 +1644,10 @@
     <string name="world_clock_no_free_slots_description">Aygıtta dünya saatleri için boş yuva yok (toplam yuva: %1$s)</string>
     <string name="world_clock_timezone">Saat Dilimi</string>
     <string name="world_clock_label">Etiket</string>
+    <string name="activity_type_freestyle">Serbest Stil</string>
+    <string name="activity_type_elliptical">Eliptik Bisiklet</string>
+    <string name="mi5_prefs_workout_activity_types">Egzersiz Etkinlik Türleri</string>
+    <string name="activity_type_outdoor_cycling">Açık Havada Bisiklet Sürme</string>
+    <string name="mi5_prefs_workout_activity_types_summary">Egzersizler ekranında görüntülenecek etkinlik türlerini seçin</string>
+    <string name="activity_type_outdoor_running">Açık Havada Koşu</string>
 </resources>
\ No newline at end of file

From 43fcc4e079bdc6cd76a98cf030791e709925473f Mon Sep 17 00:00:00 2001
From: Ihor Hordiichuk <igor_ck@outlook.com>
Date: Thu, 12 May 2022 21:08:50 +0000
Subject: [PATCH 087/110] Translated using Weblate (Ukrainian)

Currently translated at 100.0% (1509 of 1509 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/uk/
---
 app/src/main/res/values-uk/strings.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index bd2d9da07..f2f03e4c8 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -1635,4 +1635,10 @@
     <string name="world_clock_no_free_slots_title">Немає вільних комірок</string>
     <string name="world_clock_timezone">Часовий пояс</string>
     <string name="world_clock_label">Мітка</string>
+    <string name="mi5_prefs_workout_activity_types">Типи тренувань</string>
+    <string name="activity_type_outdoor_running">Біг надворі</string>
+    <string name="mi5_prefs_workout_activity_types_summary">Виберіть які типи активності показувати на екрані тренувань</string>
+    <string name="activity_type_freestyle">Фристайл</string>
+    <string name="activity_type_outdoor_cycling">Велоїзда надворі</string>
+    <string name="activity_type_elliptical">Еліптичний</string>
 </resources>
\ No newline at end of file

From 5c14ddcb7511a5b0c4f112d6def2f3a69dd7fa70 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=B0=91=E4=B8=BE?= <oshirisu.red@gmail.com>
Date: Thu, 12 May 2022 10:19:13 +0000
Subject: [PATCH 088/110] Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (1509 of 1509 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/zh_Hans/
---
 app/src/main/res/values-zh-rCN/strings.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index cf975e870..0d753b2df 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -1633,4 +1633,10 @@
     <string name="pref_world_clocks_summary">为其他时区配置时钟</string>
     <string name="world_clock_delete_confirm_title">删除\'%1$s\'</string>
     <string name="pref_world_clocks_title">世界时钟</string>
+    <string name="mi5_prefs_workout_activity_types">锻炼活动类型</string>
+    <string name="mi5_prefs_workout_activity_types_summary">选择要在锻炼屏幕上显示的活动类型</string>
+    <string name="activity_type_elliptical">椭圆机</string>
+    <string name="activity_type_freestyle">自由式</string>
+    <string name="activity_type_outdoor_running">户外跑步</string>
+    <string name="activity_type_outdoor_cycling">户外单车</string>
 </resources>
\ No newline at end of file

From 4491c93a031b85438cf42541f1a3e84c4da3b5b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=93scar=20Fern=C3=A1ndez=20D=C3=ADaz?=
 <oscfdezdz@tuta.io>
Date: Sat, 14 May 2022 09:47:39 +0000
Subject: [PATCH 089/110] Translated using Weblate (Spanish)

Currently translated at 99.0% (1494 of 1509 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/es/
---
 app/src/main/res/values-es/strings.xml | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index bf85b9cd1..7cddb3f44 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -1600,4 +1600,28 @@
     <string name="activity_db_management_autoexport_location">No se ha podido entender la ubicación. Probablemente un problema del nuevo sistema de permisos de Android. Lo más probable es que la autoexportación no funcione ahora.</string>
     <string name="watchface_setting_light_up_on_notification">Encender al recibir una notificación nueva</string>
     <string name="menuitem_email">Correo electrónico</string>
+    <string name="application_name_banglejs_main">Bangle.js Gadgetbridge</string>
+    <string name="title_activity_controlcenter_banglejs_main">Bangle.js Gadgetbridge</string>
+    <string name="about_activity_title_banglejs_main">Acerca de Bangle.js Gadgetbridge</string>
+    <string name="about_description_banglejs_main">Aplicación complementaria de Android para Bangle.js construida sobre el proyecto Gadgetbridge, con acceso a Internet añadido.</string>
+    <string name="gadgetbridge_running_banglejs_main">Bangle.js ejecutándose</string>
+    <string name="application_name_banglejs_nopebble">Bangle.js Gadgetbridge</string>
+    <string name="title_activity_controlcenter_banglejs_nopebble">Bangle.js Gadgetbridge</string>
+    <string name="about_activity_title_banglejs_nopebble">Acerca de Bangle.js Gadgetbridge</string>
+    <string name="about_description_banglejs_nopebble">Aplicación complementaria de Android para Bangle.js construida sobre el proyecto Gadgetbridge, con acceso a Internet añadido.</string>
+    <string name="gadgetbridge_running_banglejs_nopebble">Bangle.js ejecutándose</string>
+    <string name="application_name_main_nightly">Gadgetbridge (Nightly)</string>
+    <string name="title_activity_controlcenter_main_nightly">Gadgetbridge Nightly</string>
+    <string name="about_activity_title_main_nightly">Acerca de Gadgetbridge Nightly</string>
+    <string name="about_description_main_nightly">Reemplazo libre y sin copias de las aplicaciones de código cerrado para Android de los vendedores. Versiones nightly de Gadgetbridge. No se puede instalar si ya tiene instalada la aplicación de Gadgetbridge o la de Pebble, debido a un conflicto en el proveedor de Pebble.</string>
+    <string name="gadgetbridge_running_main_nightly">GB Nightly ejecutándose</string>
+    <string name="application_name_main_nopebble">Gadgetbridge (Nightly, Sin proveedor de Pebble)</string>
+    <string name="title_activity_controlcenter_main_nopebble">Gadgetbridge Nightly sin Pebble</string>
+    <string name="about_activity_title_main_nopebble">Acerca de Gadgetbridge Nightly sin Pebble</string>
+    <string name="about_description_main_nopebble">Reemplazo libre y sin copias de las aplicaciones de código cerrado para Android de los vendedores. Versiones nightly de Gadgetbridge. Esta versión tiene el proveedor de Pebble renombrado para evitar conflictos, por lo que algunas integraciones relacionadas con Pebble no funcionarán, pero se puede instalar junto a la instalación existente de Gadgetbridge.</string>
+    <string name="gadgetbridge_running_main_nopebble">GB Nightly sin Pebble ejecutándose</string>
+    <string name="pref_world_clocks_title">Relojes mundiales</string>
+    <string name="pref_world_clocks_summary">Configurar los relojes para otras zonas horarias</string>
+    <string name="world_clock_delete_confirm_title">Eliminar \'%1$s\'</string>
+    <string name="world_clock_delete_confirm_description">¿Está seguro de que quiere eliminar el reloj mundial\?</string>
 </resources>
\ No newline at end of file

From b8e490703cd1125ce51b1c8efab6edcd0a517204 Mon Sep 17 00:00:00 2001
From: vanous <petr+weblate@linuks.cz>
Date: Sat, 14 May 2022 14:28:22 +0000
Subject: [PATCH 090/110] Translated using Weblate (Czech)

Currently translated at 100.0% (1514 of 1514 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/cs/
---
 app/src/main/res/values-cs/strings.xml | 26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index e1c248853..c86c56640 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -1521,7 +1521,7 @@
     <string name="pref_media_rewind">Přeskočit zpět</string>
     <string name="about_hash">Zápis (commit) %s</string>
     <string name="pref_media_pause">Zapauzování</string>
-    <string name="pref_media_playpause">Přepnout přehrávání</string>
+    <string name="pref_media_playpause">Zapnout/vypnout přehrávání</string>
     <string name="pref_device_action_broadcast">Odeslat vysílání (broadcast)</string>
     <string name="pref_button_action_disabled">Deaktivováno</string>
     <string name="pref_media_previous">Předchozí skladba</string>
@@ -1617,4 +1617,28 @@
     <string name="title_activity_controlcenter_main_nopebble">Gadgetbridge Noční, Bez Pebble</string>
     <string name="about_description_main_nopebble">Svobodná a lokální náhrada za uzavřenou aplikaci vašich hodinek/náramku. Noční vydání Gadgetbridge. Tato verze má přejmenovanou službu poskytovatele Pebble pro eliminaci konfliktů poskytovatelů. Některé Pebble integrace nebudou fungovat, ale tuto verzi je možno nainstalovat paralelně k již nainstalované jiné verzi Gadgetbridge.</string>
     <string name="gadgetbridge_running_main_nopebble">Noční NoPebble GB běží</string>
+    <string name="pref_screen_notification_idle_alerts">Upozornění na nečinnost</string>
+    <string name="pref_screen_vibration_patterns_title">Vzory vibrací</string>
+    <string name="activity_type_elliptical">Eliptický trenér</string>
+    <string name="pref_screen_notification_profile_event_reminder">Události</string>
+    <string name="mi5_prefs_workout_activity_types">Typy tréninkových aktivit</string>
+    <string name="pref_screen_notification_profile_find_device">Najít zařízení</string>
+    <string name="prefs_activate_display_on_lift_sensitivity">Citlivost</string>
+    <string name="mi5_prefs_workout_activity_types_summary">Výběr typů aktivit, které se mají zobrazit na obrazovce tréninků</string>
+    <string name="sensitive">Citlivé</string>
+    <string name="normal">Normální</string>
+    <string name="activity_type_outdoor_running">Venkovní běh</string>
+    <string name="activity_type_outdoor_cycling">Venkovní cyklistika</string>
+    <string name="pref_screen_vibration_patterns_summary">Konfigurace vibračních vzorů pro různá oznámení</string>
+    <string name="pref_device_action_fitness_app_control_toggle">Zapnout/vypnout Sledování Sportovní aplikací</string>
+    <string name="activity_type_freestyle">Volný styl</string>
+    <string name="world_clock_delete_confirm_description">Opravdu chcete smazat položku světových hodin\?</string>
+    <string name="world_clock_no_free_slots_description">Zařízení nemá žádná volná místa pro světové hodiny (celkový počet slotů: %1$s)</string>
+    <string name="world_clock_timezone">Časové pásmo</string>
+    <string name="world_clock_label">Titulek</string>
+    <string name="title_activity_world_clock_details">Podrobnosti světových hodin</string>
+    <string name="pref_world_clocks_title">Světové hodiny</string>
+    <string name="pref_world_clocks_summary">Konfigurace hodin pro jiná časová pásma</string>
+    <string name="world_clock_delete_confirm_title">Odstranit \'%1$s\'</string>
+    <string name="world_clock_no_free_slots_title">Žádné volné místo</string>
 </resources>
\ No newline at end of file

From 39c25e3c507722c0d24d56b1db74574555822988 Mon Sep 17 00:00:00 2001
From: Yaron Shahrabani <sh.yaron@gmail.com>
Date: Sat, 14 May 2022 20:50:51 +0000
Subject: [PATCH 091/110] Translated using Weblate (Hebrew)

Currently translated at 100.0% (1514 of 1514 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/he/
---
 app/src/main/res/values-he/strings.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml
index d4c1deaf2..6ff0704b2 100644
--- a/app/src/main/res/values-he/strings.xml
+++ b/app/src/main/res/values-he/strings.xml
@@ -1633,4 +1633,9 @@
     <string name="activity_type_elliptical">אליפטיקל בלי ידיות</string>
     <string name="mi5_prefs_workout_activity_types_summary">נא לבחור את סוגי הפעילות להצגה במסך האימון</string>
     <string name="mi5_prefs_workout_activity_types">סוגי פעילות אימון</string>
+    <string name="pref_screen_vibration_patterns_title">תבניות רטט</string>
+    <string name="pref_screen_vibration_patterns_summary">הגדרת תבניות רטט להתראות השונות</string>
+    <string name="pref_screen_notification_profile_event_reminder">מתזכר אירועים</string>
+    <string name="pref_screen_notification_idle_alerts">התראות בטלה</string>
+    <string name="pref_screen_notification_profile_find_device">איתור המכשיר</string>
 </resources>
\ No newline at end of file

From 94049a4da8777c34f83411562977fb05ea3abe06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?O=C4=9Fuz=20Ersen?= <oguz@ersen.moe>
Date: Sat, 14 May 2022 15:07:03 +0000
Subject: [PATCH 092/110] Translated using Weblate (Turkish)

Currently translated at 100.0% (1514 of 1514 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/tr/
---
 app/src/main/res/values-tr/strings.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 63c11f3bf..d71be1eb9 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -1650,4 +1650,9 @@
     <string name="activity_type_outdoor_cycling">Açık Havada Bisiklet Sürme</string>
     <string name="mi5_prefs_workout_activity_types_summary">Egzersizler ekranında görüntülenecek etkinlik türlerini seçin</string>
     <string name="activity_type_outdoor_running">Açık Havada Koşu</string>
+    <string name="pref_screen_notification_idle_alerts">Boşta Kalma Uyarıları</string>
+    <string name="pref_screen_vibration_patterns_title">Titreşim Modelleri</string>
+    <string name="pref_screen_notification_profile_event_reminder">Etkinlik hatırlatıcı</string>
+    <string name="pref_screen_notification_profile_find_device">Aygıt bul</string>
+    <string name="pref_screen_vibration_patterns_summary">Farklı bildirimler için titreşim modellerini yapılandırın</string>
 </resources>
\ No newline at end of file

From a9fec4fddb0ac0b78fa9b3a58db0429079a18739 Mon Sep 17 00:00:00 2001
From: Ihor Hordiichuk <igor_ck@outlook.com>
Date: Sat, 14 May 2022 16:14:57 +0000
Subject: [PATCH 093/110] Translated using Weblate (Ukrainian)

Currently translated at 100.0% (1514 of 1514 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/uk/
---
 app/src/main/res/values-uk/strings.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index f2f03e4c8..ce7d58456 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -1641,4 +1641,9 @@
     <string name="activity_type_freestyle">Фристайл</string>
     <string name="activity_type_outdoor_cycling">Велоїзда надворі</string>
     <string name="activity_type_elliptical">Еліптичний</string>
+    <string name="pref_screen_notification_idle_alerts">Сповіщення про простій</string>
+    <string name="pref_screen_notification_profile_event_reminder">Нагадування про події</string>
+    <string name="pref_screen_notification_profile_find_device">Знайти пристрій</string>
+    <string name="pref_screen_vibration_patterns_title">Шаблони вібрацій</string>
+    <string name="pref_screen_vibration_patterns_summary">Налаштуйте шаблони вібрації для різних сповіщень</string>
 </resources>
\ No newline at end of file

From bc81678859351c27263e5fb51260797a3fbf4182 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=B0=91=E4=B8=BE?= <oshirisu.red@gmail.com>
Date: Sat, 14 May 2022 17:36:11 +0000
Subject: [PATCH 094/110] Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (1514 of 1514 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/zh_Hans/
---
 app/src/main/res/values-zh-rCN/strings.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 0d753b2df..42884263c 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -1639,4 +1639,9 @@
     <string name="activity_type_freestyle">自由式</string>
     <string name="activity_type_outdoor_running">户外跑步</string>
     <string name="activity_type_outdoor_cycling">户外单车</string>
+    <string name="pref_screen_notification_profile_find_device">查找设备</string>
+    <string name="pref_screen_vibration_patterns_summary">为不同的通知配置振动模式</string>
+    <string name="pref_screen_notification_profile_event_reminder">事件提醒</string>
+    <string name="pref_screen_notification_idle_alerts">空闲警报</string>
+    <string name="pref_screen_vibration_patterns_title">振动模式</string>
 </resources>
\ No newline at end of file

From dd1b16ea8e76f024d21afb44d38dfe335f8b21e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=B0=91=E4=B8=BE?= <oshirisu.red@gmail.com>
Date: Mon, 16 May 2022 12:36:56 +0000
Subject: [PATCH 095/110] Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (1515 of 1515 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/zh_Hans/
---
 app/src/main/res/values-zh-rCN/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 42884263c..00a378699 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -1644,4 +1644,5 @@
     <string name="pref_screen_notification_profile_event_reminder">事件提醒</string>
     <string name="pref_screen_notification_idle_alerts">空闲警报</string>
     <string name="pref_screen_vibration_patterns_title">振动模式</string>
+    <string name="devicetype_sony_wf_1000xm3">Sony WF-1000XM3</string>
 </resources>
\ No newline at end of file

From 65ebdb6ff8cdf00dd62f2c8fe2e4364d53176e0a Mon Sep 17 00:00:00 2001
From: Andreas Shimokawa <shimokawa@fsfe.org>
Date: Mon, 16 May 2022 16:05:04 +0200
Subject: [PATCH 096/110] Amazfit Bip U/Pro: Enable vibration pattern settings

---
 CHANGELOG.md                                                    | 2 +-
 .../devices/huami/amazfitbipu/AmazfitBipUCoordinator.java       | 1 +
 .../devices/huami/amazfitbipupro/AmazfitBipUProCoordinator.java | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dc326eb45..9667605e8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,7 +8,7 @@
 * Mi Band 5/6, Amazfit Bip S/U/Pro: Add world clock configuration
 * Mi Band 5/6: support sensitivity setting for lift wrist configuration
 * Mi Band 5: Add support for configuring workout menu on device
-* Mi Band 4/5/6: Add support for vibration patterns
+* Mi Band 4/5/6, Amazfit Bip U/Pro: Add support for vibration patterns
 * Mi Band 5: Increase number of reminder slots to 50
 * Amazfit Neo: Allow to disable beeps for email notifications
 * Bangle.js: Fix incoming calls in release builds
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbipu/AmazfitBipUCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbipu/AmazfitBipUCoordinator.java
index 523c0bcf8..e6c131318 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbipu/AmazfitBipUCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbipu/AmazfitBipUCoordinator.java
@@ -107,6 +107,7 @@ public class AmazfitBipUCoordinator extends HuamiCoordinator {
     public int[] getSupportedDeviceSpecificSettings(GBDevice device) {
         return new int[]{
                 R.xml.devicesettings_amazfitbipu,
+                R.xml.devicesettings_vibrationpatterns,
                 //R.xml.devicesettings_canned_dismisscall_16,
                 R.xml.devicesettings_timeformat,
                 R.xml.devicesettings_world_clocks,
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbipupro/AmazfitBipUProCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbipupro/AmazfitBipUProCoordinator.java
index c87c8d89c..56b3de59d 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbipupro/AmazfitBipUProCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbipupro/AmazfitBipUProCoordinator.java
@@ -107,6 +107,7 @@ public class AmazfitBipUProCoordinator extends HuamiCoordinator {
     public int[] getSupportedDeviceSpecificSettings(GBDevice device) {
         return new int[]{
                 R.xml.devicesettings_amazfitbipupro,
+                R.xml.devicesettings_vibrationpatterns,
                 R.xml.devicesettings_timeformat,
                 R.xml.devicesettings_world_clocks,
                 R.xml.devicesettings_wearlocation,

From 9ca3fff101cfd2d40796d8cd83b79e7d53fd0792 Mon Sep 17 00:00:00 2001
From: mvn23 <schopdiedwaas@gmail.com>
Date: Sun, 15 May 2022 16:51:41 +0200
Subject: [PATCH 097/110] Add support for native `Do Not Disturb` call/SMS
 functionality on Fossil watches

---
 .../freeyourgadget/gadgetbridge/GBApplication.java |  6 ++----
 .../externalevents/PhoneCallReceiver.java          | 10 ++++++++--
 .../gadgetbridge/externalevents/SMSReceiver.java   | 10 ++++++++--
 .../gadgetbridge/impl/GBDeviceService.java         |  3 ++-
 .../gadgetbridge/model/CallSpec.java               |  1 +
 .../gadgetbridge/model/DeviceService.java          |  1 +
 .../service/DeviceCommunicationService.java        |  2 ++
 .../adapter/fossil_hr/FossilHRWatchAdapter.java    |  6 +++---
 .../notification/PlayCallNotificationRequest.java  | 14 ++++++++------
 9 files changed, 35 insertions(+), 18 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GBApplication.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GBApplication.java
index 10ac359e1..f746608d3 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GBApplication.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GBApplication.java
@@ -438,10 +438,8 @@ public class GBApplication extends Application {
 
     @TargetApi(Build.VERSION_CODES.M)
     public static int getGrantedInterruptionFilter() {
-        if (prefs.getBoolean("notification_filter", false) && GBApplication.isRunningMarshmallowOrLater()) {
-            if (notificationManager.isNotificationPolicyAccessGranted()) {
-                return notificationManager.getCurrentInterruptionFilter();
-            }
+        if (GBApplication.isRunningMarshmallowOrLater() && notificationManager.isNotificationPolicyAccessGranted()) {
+            return notificationManager.getCurrentInterruptionFilter();
         }
         return NotificationManager.INTERRUPTION_FILTER_ALL;
     }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/PhoneCallReceiver.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/PhoneCallReceiver.java
index 027772269..d4922d543 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/PhoneCallReceiver.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/PhoneCallReceiver.java
@@ -107,22 +107,28 @@ public class PhoneCallReceiver extends BroadcastReceiver {
             if ("never".equals(prefs.getString("notification_mode_calls", "always"))) {
                 return;
             }
+            int dndSuppressed = 0;
             switch (GBApplication.getGrantedInterruptionFilter()) {
                 case NotificationManager.INTERRUPTION_FILTER_ALL:
                     break;
                 case NotificationManager.INTERRUPTION_FILTER_ALARMS:
                 case NotificationManager.INTERRUPTION_FILTER_NONE:
-                    return;
+                    dndSuppressed = 1;
+                    break;
                 case NotificationManager.INTERRUPTION_FILTER_PRIORITY:
                     if (GBApplication.isPriorityNumber(Policy.PRIORITY_CATEGORY_CALLS, mSavedNumber)) {
                         break;
                     }
                     // FIXME: Handle Repeat callers if it is enabled in Do Not Disturb
-                    return;
+                    dndSuppressed = 1;
+            }
+            if (prefs.getBoolean("notification_filter", false) && dndSuppressed == 1) {
+                return;
             }
             CallSpec callSpec = new CallSpec();
             callSpec.number = mSavedNumber;
             callSpec.command = callCommand;
+            callSpec.dndSuppressed = dndSuppressed;
             GBApplication.deviceService().onSetCallState(callSpec);
         }
         mLastState = state;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/SMSReceiver.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/SMSReceiver.java
index 7065c39bb..6d1812133 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/SMSReceiver.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/SMSReceiver.java
@@ -87,18 +87,24 @@ public class SMSReceiver extends BroadcastReceiver {
                         dismissAllAction.type = NotificationSpec.Action.TYPE_SYNTECTIC_DISMISS_ALL;
                         notificationSpec.attachedActions.add(dismissAllAction);
 
+                        int dndSuppressed = 0;
                         switch (GBApplication.getGrantedInterruptionFilter()) {
                             case NotificationManager.INTERRUPTION_FILTER_ALL:
                                 break;
                             case NotificationManager.INTERRUPTION_FILTER_ALARMS:
                             case NotificationManager.INTERRUPTION_FILTER_NONE:
-                                return;
+                                dndSuppressed = 1;
+                                break;
                             case NotificationManager.INTERRUPTION_FILTER_PRIORITY:
                                 if (GBApplication.isPriorityNumber(Policy.PRIORITY_CATEGORY_MESSAGES, notificationSpec.phoneNumber)) {
                                     break;
                                 }
-                                return;
+                                dndSuppressed = 1;
                         }
+                        if (prefs.getBoolean("notification_filter", false) && dndSuppressed == 1) {
+                            return;
+                        }
+                        notificationSpec.dndSuppressed = dndSuppressed;
                         GBApplication.deviceService().onNotification(notificationSpec);
                     }
                 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/impl/GBDeviceService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/impl/GBDeviceService.java
index 15f842bb7..d0f12cc73 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/impl/GBDeviceService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/impl/GBDeviceService.java
@@ -201,7 +201,8 @@ public class GBDeviceService implements DeviceService {
         Intent intent = createIntent().setAction(ACTION_CALLSTATE)
                 .putExtra(EXTRA_CALL_PHONENUMBER, callSpec.number)
                 .putExtra(EXTRA_CALL_DISPLAYNAME, callSpec.name)
-                .putExtra(EXTRA_CALL_COMMAND, callSpec.command);
+                .putExtra(EXTRA_CALL_COMMAND, callSpec.command)
+                .putExtra(EXTRA_CALL_DNDSUPPRESSED, callSpec.dndSuppressed);
         invokeService(intent);
     }
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/CallSpec.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/CallSpec.java
index 817ba872c..97a4efd94 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/CallSpec.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/CallSpec.java
@@ -28,4 +28,5 @@ public class CallSpec {
     public String number;
     public String name;
     public int command;
+    public int dndSuppressed;
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceService.java
index edb88e8b6..bd22e9af3 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceService.java
@@ -91,6 +91,7 @@ public interface DeviceService extends EventHandler {
     String EXTRA_CALL_COMMAND = "call_command";
     String EXTRA_CALL_PHONENUMBER = "call_phonenumber";
     String EXTRA_CALL_DISPLAYNAME = "call_displayname";
+    String EXTRA_CALL_DNDSUPPRESSED = "call_dndsuppressed";
     String EXTRA_CANNEDMESSAGES = "cannedmessages";
     String EXTRA_CANNEDMESSAGES_TYPE = "cannedmessages_type";
     String EXTRA_MUSIC_ARTIST = "music_artist";
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceCommunicationService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceCommunicationService.java
index 0708899dd..d83db85c6 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceCommunicationService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceCommunicationService.java
@@ -141,6 +141,7 @@ import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.EXTRA_CAL
 import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.EXTRA_CALENDAREVENT_TYPE;
 import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.EXTRA_CALL_COMMAND;
 import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.EXTRA_CALL_DISPLAYNAME;
+import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.EXTRA_CALL_DNDSUPPRESSED;
 import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.EXTRA_CALL_PHONENUMBER;
 import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.EXTRA_CANNEDMESSAGES;
 import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.EXTRA_CANNEDMESSAGES_TYPE;
@@ -511,6 +512,7 @@ public class DeviceCommunicationService extends Service implements SharedPrefere
                 callSpec.command = intent.getIntExtra(EXTRA_CALL_COMMAND, CallSpec.CALL_UNDEFINED);
                 callSpec.number = intent.getStringExtra(EXTRA_CALL_PHONENUMBER);
                 callSpec.name = sanitizeNotifText(intent.getStringExtra(EXTRA_CALL_DISPLAYNAME));
+                callSpec.dndSuppressed = intent.getIntExtra(EXTRA_CALL_DNDSUPPRESSED, 0);
                 mDeviceSupport.onSetCallState(callSpec);
                 break;
             case ACTION_SETCANNEDMESSAGES:
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/adapter/fossil_hr/FossilHRWatchAdapter.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/adapter/fossil_hr/FossilHRWatchAdapter.java
index 3f17f3029..bdd0a63f6 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/adapter/fossil_hr/FossilHRWatchAdapter.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/adapter/fossil_hr/FossilHRWatchAdapter.java
@@ -1157,10 +1157,10 @@ public class FossilHRWatchAdapter extends FossilWatchAdapter {
         boolean quickRepliesEnabled = quickReplies.length > 0 && callSpec.number != null && callSpec.number.matches("^\\+(?:[0-9] ?){6,14}[0-9]$");
         if (callSpec.command == CallSpec.CALL_INCOMING) {
             currentCallSpec = callSpec;
-            queueWrite(new PlayCallNotificationRequest(StringUtils.getFirstOf(callSpec.name, callSpec.number), true, quickRepliesEnabled, this));
+            queueWrite(new PlayCallNotificationRequest(StringUtils.getFirstOf(callSpec.name, callSpec.number), true, quickRepliesEnabled, callSpec.dndSuppressed, this));
         } else {
             currentCallSpec = null;
-            queueWrite(new PlayCallNotificationRequest(StringUtils.getFirstOf(callSpec.name, callSpec.number), false, quickRepliesEnabled, this));
+            queueWrite(new PlayCallNotificationRequest(StringUtils.getFirstOf(callSpec.name, callSpec.number), false, quickRepliesEnabled, callSpec.dndSuppressed, this));
         }
     }
 
@@ -1616,7 +1616,7 @@ public class FossilHRWatchAdapter extends FossilWatchAdapter {
 
     private void handleCallRequest(byte[] value) {
         boolean acceptCall = value[7] == (byte) 0x00;
-        queueWrite(new PlayCallNotificationRequest("", false, false, this));
+        queueWrite(new PlayCallNotificationRequest("", false, false, 0,this));
 
         GBDeviceEventCallControl callControlEvent = new GBDeviceEventCallControl();
         callControlEvent.event = acceptCall ? GBDeviceEventCallControl.Event.START : GBDeviceEventCallControl.Event.REJECT;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil/notification/PlayCallNotificationRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil/notification/PlayCallNotificationRequest.java
index 15d2d0994..64906aa85 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil/notification/PlayCallNotificationRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil/notification/PlayCallNotificationRequest.java
@@ -24,18 +24,20 @@ import nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.adapter.foss
 public class PlayCallNotificationRequest extends PlayNotificationRequest {
     private final static int MESSAGE_ID_CALL = 1;
 
-    private static int notificationFlags(boolean callStart, boolean quickReplies) {
+    private static int notificationFlags(boolean callStart, boolean quickReplies, int dndSuppressed) {
+        int flags = 0;
         if (callStart && quickReplies) {
-            return 0b00111000;
+            flags = 0b00111000;
         } else if (callStart) {
-            return 0b00011000;
+            flags = 0b00011000;
         } else {
-            return 0b00000010;
+            flags = 0b00000010;
         }
+        return (flags | dndSuppressed);
     }
 
-    public PlayCallNotificationRequest(String number, boolean callStart, boolean quickReplies, FossilWatchAdapter adapter) {
-        super(callStart ? NotificationType.INCOMING_CALL : NotificationType.DISMISS_NOTIFICATION, notificationFlags(callStart, quickReplies),
+    public PlayCallNotificationRequest(String number, boolean callStart, boolean quickReplies, int dndSuppressed, FossilWatchAdapter adapter) {
+        super(callStart ? NotificationType.INCOMING_CALL : NotificationType.DISMISS_NOTIFICATION, notificationFlags(callStart, quickReplies, dndSuppressed),
                 ByteBuffer.wrap(new byte[]{(byte) 0x80, (byte) 0x00, (byte) 0x59, (byte) 0xB7}).order(ByteOrder.LITTLE_ENDIAN).getInt(),
                 number, "Incoming Call", MESSAGE_ID_CALL, adapter);
     }

From ed6b2e44b9bf04fc7e15dde04586ada3a8fd28a8 Mon Sep 17 00:00:00 2001
From: theghostofheathledger <theghostofheathledger@noreply.codeberg.org>
Date: Tue, 17 May 2022 11:55:29 +0200
Subject: [PATCH 098/110] Add com.samsung.android.incallui to
 handleCallNotification blacklist

---
 .../gadgetbridge/externalevents/NotificationListener.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/NotificationListener.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/NotificationListener.java
index 16e9c34b1..547afd723 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/NotificationListener.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/NotificationListener.java
@@ -494,7 +494,7 @@ public class NotificationListener extends NotificationListenerService {
     private void handleCallNotification(StatusBarNotification sbn) {
         String app = sbn.getPackageName();
         LOG.debug("got call from: " + app);
-        if (app.equals("com.android.dialer") || app.equals("com.android.incallui") || app.equals("com.google.android.dialer") || app.equals("com.asus.asusincallui")) {
+        if (app.equals("com.android.dialer") || app.equals("com.android.incallui") || app.equals("com.google.android.dialer") || app.equals("com.asus.asusincallui") || app.equals("com.samsung.android.incallui")) {
             LOG.debug("Ignoring non-voip call");
             return;
         }

From 948db604e5ec45a47f2d198816f8cc803703d86e Mon Sep 17 00:00:00 2001
From: vanous <petr@linuks.cz>
Date: Tue, 17 May 2022 22:18:49 +0200
Subject: [PATCH 099/110] Add support for Galaxy Buds Pro

- add generic coordinator and settings customizer for Galaxy Buds
- add Prefs to the DeviceSpecificSettingsCustomizer
- edit Changelog
---
 CHANGELOG.md                                  |   7 +-
 app/src/main/assets/buds_pro_case.svg         |  51 ++++
 app/src/main/assets/buds_pro_left.svg         |  67 +++++
 app/src/main/assets/buds_pro_right.svg        |  73 +++++
 .../main/assets/ic_device_galaxy_buds_pro.svg | 147 ++++++++++
 .../ic_device_galaxy_buds_pro_disabled.svg    | 200 ++++++++++++++
 .../DeviceSettingsPreferenceConst.java        |  17 ++
 .../DeviceSpecificSettingsCustomizer.java     |   5 +-
 .../DeviceSpecificSettingsFragment.java       |  20 +-
 .../GalaxyBudsDeviceCoordinator.java          | 108 +-------
 .../GalaxyBudsGenericCoordinator.java         | 114 ++++++++
 .../GalaxyBudsLiveDeviceCoordinator.java      | 107 +-------
 .../GalaxyBudsProDeviceCoordinator.java       |  57 ++++
 .../GalaxyBudsSettingsCustomizer.java         | 241 +++++++++++++++++
 .../huami/HuamiSettingsCustomizer.java        |   4 +-
 .../SonyHeadphonesSettingsCustomizer.java     |   3 +-
 .../gadgetbridge/model/DeviceType.java        |   1 +
 .../service/DeviceSupportFactory.java         |   3 +
 .../galaxy_buds/GalaxyBudsIOThread.java       |   3 +-
 .../galaxy_buds/GalaxyBudsProtocol.java       | 253 ++++++++++++++++--
 .../gadgetbridge/util/DeviceHelper.java       |   2 +
 .../main/res/drawable/ic_buds_pro_case.xml    |   3 +
 .../main/res/drawable/ic_buds_pro_left.xml    |  17 ++
 .../main/res/drawable/ic_buds_pro_right.xml   |  17 ++
 .../drawable/ic_device_galaxy_buds_pro.xml    |  31 +++
 .../ic_device_galaxy_buds_pro_disabled.xml    |  36 +++
 app/src/main/res/drawable/ic_switch_right.xml |  10 +
 app/src/main/res/values/arrays.xml            |  89 +++++-
 app/src/main/res/values/strings.xml           |  40 +++
 app/src/main/res/values/values.xml            |   5 -
 .../res/xml/devicesettings_galaxy_buds.xml    |  15 +-
 .../xml/devicesettings_galaxy_buds_live.xml   |   4 +-
 .../xml/devicesettings_galaxy_buds_pro.xml    | 239 +++++++++++++++++
 33 files changed, 1719 insertions(+), 270 deletions(-)
 create mode 100644 app/src/main/assets/buds_pro_case.svg
 create mode 100644 app/src/main/assets/buds_pro_left.svg
 create mode 100644 app/src/main/assets/buds_pro_right.svg
 create mode 100644 app/src/main/assets/ic_device_galaxy_buds_pro.svg
 create mode 100644 app/src/main/assets/ic_device_galaxy_buds_pro_disabled.svg
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/galaxy_buds/GalaxyBudsGenericCoordinator.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/galaxy_buds/GalaxyBudsProDeviceCoordinator.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/galaxy_buds/GalaxyBudsSettingsCustomizer.java
 create mode 100644 app/src/main/res/drawable/ic_buds_pro_case.xml
 create mode 100644 app/src/main/res/drawable/ic_buds_pro_left.xml
 create mode 100644 app/src/main/res/drawable/ic_buds_pro_right.xml
 create mode 100644 app/src/main/res/drawable/ic_device_galaxy_buds_pro.xml
 create mode 100644 app/src/main/res/drawable/ic_device_galaxy_buds_pro_disabled.xml
 create mode 100644 app/src/main/res/drawable/ic_switch_right.xml
 create mode 100644 app/src/main/res/xml/devicesettings_galaxy_buds_pro.xml

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9667605e8..f78cd5ee3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,8 @@
 
 ### NEXT
 * Initial Support for Sony WF-1000XM3
-* Huami: Add Toggle function for Open Tracks tracking to button actionss
+* Initial Support for Galaxy Buds Pro
+* Huami: Add Toggle function for Open Tracks tracking to button actions
 * Huami: Move inactivity warnings and goal notification to device-specific settings
 * Mi Band 6: set time on connect
 * Mi Band 5/6, Amazfit Bip S/U/Pro: Add world clock configuration
@@ -16,9 +17,9 @@
 * VESC: added battery indicator
 * UM25: Add reset option to current accumulation
 * UM25: Add notification on below current threshold
-* Fix crash when calender is accessed but permission is denied
+* Fix crash when calendar is accessed but permission is denied
 * Add com.asus.asusincallui to blacklist
-* New icons for Sony WF 800n and Mi Band 6
+* New icons for Sony overhead headphones, Sony WF 800n and Mi Band 6
 
 ### 0.66.0
 * Add basic support for Casio GBD-H1000
diff --git a/app/src/main/assets/buds_pro_case.svg b/app/src/main/assets/buds_pro_case.svg
new file mode 100644
index 000000000..985c459da
--- /dev/null
+++ b/app/src/main/assets/buds_pro_case.svg
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="10.399478mm"
+   height="10.338884mm"
+   viewBox="0 0 10.399477 10.338885"
+   version="1.1"
+   id="svg5"
+   inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)"
+   sodipodi:docname="buds_pro_case.svg"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview7"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:document-units="mm"
+     showgrid="false"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="1"
+     fit-margin-top="1"
+     inkscape:zoom="8"
+     inkscape:cx="39.6875"
+     inkscape:cy="37.9375"
+     inkscape:window-width="1920"
+     inkscape:window-height="1035"
+     inkscape:window-x="0"
+     inkscape:window-y="45"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="layer1" />
+  <defs
+     id="defs2" />
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-95.852619,-146.01635)">
+    <path
+       style="fill:#000000;stroke:#000000;stroke-width:0.4;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 98.725767,155.07946 c -2.011931,-0.33512 -3.224531,-2.80083 -2.421739,-4.92438 0.698696,-1.8482 1.220768,-2.38464 2.716612,-2.79141 0.622809,-0.16937 3.23294,-0.2015 3.88217,-0.0478 1.27757,0.30245 1.88675,0.72802 2.36901,1.65499 0.70733,1.35957 0.89693,2.22299 0.71935,3.27582 -0.25793,1.52921 -1.29315,2.61077 -2.72307,2.84497 -0.55609,0.0911 -3.977465,0.0819 -4.542333,-0.0122 z m 4.644383,-0.15465 c 0.60321,-0.1105 1.30489,-0.48711 1.65427,-0.88788 0.30716,-0.35233 0.68597,-1.10792 0.76801,-1.53187 l 0.053,-0.27397 -0.22851,0.24421 c -0.33209,0.35491 -0.77469,0.62265 -1.34022,0.81074 -1.13605,0.37784 -5.214307,0.38683 -6.410497,0.0141 -0.55739,-0.17367 -1.193139,-0.55571 -1.433201,-0.86126 l -0.163268,-0.2078 0.04663,0.27396 c 0.07099,0.4171 0.462077,1.19611 0.773559,1.54089 0.330733,0.36608 0.957492,0.72348 1.500185,0.85545 0.505093,0.12283 4.140102,0.14063 4.780022,0.0234 z m 0.5638,-1.66846 c 0.91653,-0.23153 1.68237,-0.77465 1.90019,-1.34755 0.20798,-0.54704 -0.0205,-1.55801 -0.623,-2.75628 -0.4674,-0.9296 -1.05748,-1.37665 -2.19843,-1.66553 -0.67764,-0.17157 -3.410689,-0.14747 -4.065651,0.0359 -1.070946,0.29976 -1.649067,0.76556 -2.081871,1.67737 -0.99471,2.09563 -0.884667,3.03994 0.434692,3.73021 0.829113,0.43377 1.468822,0.5086 4.06904,0.47594 1.56307,-0.0196 2.19526,-0.0566 2.56503,-0.15002 z"
+       id="path1716" />
+  </g>
+</svg>
diff --git a/app/src/main/assets/buds_pro_left.svg b/app/src/main/assets/buds_pro_left.svg
new file mode 100644
index 000000000..3fcbe9457
--- /dev/null
+++ b/app/src/main/assets/buds_pro_left.svg
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="10.999999mm"
+   height="10.999998mm"
+   viewBox="0 0 11 10.999998"
+   version="1.1"
+   id="svg4576"
+   inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)"
+   sodipodi:docname="buds_pro_left.svg"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview4578"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:document-units="mm"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-bottom="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     inkscape:zoom="16"
+     inkscape:cx="32.09375"
+     inkscape:cy="39.15625"
+     inkscape:window-width="1920"
+     inkscape:window-height="1035"
+     inkscape:window-x="0"
+     inkscape:window-y="45"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="layer1"
+     showguides="true"
+     inkscape:guide-bbox="true">
+    <sodipodi:guide
+       position="-47.790315,6.0004159"
+       orientation="0,-1"
+       id="guide34420" />
+  </sodipodi:namedview>
+  <defs
+     id="defs4573" />
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-93.982649,-153.80574)">
+    <path
+       id="path61748"
+       style="font-size:4.23333px;line-height:124%;font-family:Sans;-inkscape-font-specification:Sans;letter-spacing:0px;word-spacing:0px;stroke:#000000;stroke-width:0.265"
+       d="m 98.636978,156.07032 h 0.367759 v 2.42358 h 1.323583 v 0.31142 h -1.691342 z m 0.315833,7.6524 c 0.356876,-0.14916 0.822437,-0.53623 0.968511,-0.80526 0.07231,-0.13321 0.02551,-0.13439 -0.475169,-0.012 -0.984441,0.24062 -1.681127,0.009 -2.306585,-0.76927 -0.26071,-0.32411 -0.295617,-0.44513 -0.339874,-1.17836 l -0.04933,-0.81715 -0.256509,0.30582 c -0.822265,0.98037 -0.459417,2.6469 0.70147,3.22181 0.48908,0.24221 1.251667,0.26583 1.757481,0.0544 z m -1.330485,0.32864 c -0.541904,-0.12922 -0.867149,-0.32727 -1.225662,-0.74633 -0.606112,-0.70845 -0.727348,-1.77669 -0.299201,-2.6363 0.135175,-0.2714 0.322096,-0.53432 0.415381,-0.58427 0.157826,-0.0845 0.159638,-0.11891 0.0261,-0.49524 -0.352113,-0.99233 -0.20943,-2.51608 0.328134,-3.50425 0.328783,-0.60438 1.0431,-1.2434 1.603455,-1.43443 1.115376,-0.38024 2.679607,0.0425 3.461337,0.93534 1.21161,1.38389 1.52834,3.21746 0.81726,4.73098 -0.23868,0.50801 -1.21551,1.49715 -1.92601,1.95027 -0.34353,0.21907 -0.56429,0.44351 -0.67787,0.68916 -0.371437,0.80334 -1.568126,1.32275 -2.522924,1.09507 z m 2.19911,-1.4967 c 0.978664,-0.37204 2.470754,-1.6715 2.795454,-2.43453 0.78312,-1.84035 -0.11926,-4.30442 -1.87124,-5.10964 -0.806242,-0.37056 -1.788981,-0.3857 -2.470056,-0.038 -1.451067,0.74068 -2.106198,2.85414 -1.464365,4.72405 0.0966,0.28145 0.176572,0.77122 0.177715,1.08843 0.0044,1.23212 0.671638,1.94724 1.817915,1.94848 0.305191,3.3e-4 0.749449,-0.0779 1.014577,-0.17873 z" />
+    <g
+       id="g1961"
+       transform="translate(5.7478236e-5,3.0300929e-4)">
+      <path
+         style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.4;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 99.687906,159.96304 c 0.03116,-0.0812 0.399384,-0.2858 0.818354,-0.45477 0.84931,-0.34253 1.0686,-0.3103 1.0686,0.15703 0,0.24663 -0.0628,0.29752 -0.70948,0.57453 -0.86444,0.37031 -0.952978,0.55914 -1.060626,0.26518 -0.107648,-0.29395 -0.14798,-0.46082 -0.116848,-0.54197 z"
+         id="path1775"
+         sodipodi:nodetypes="ccsccc" />
+    </g>
+  </g>
+</svg>
diff --git a/app/src/main/assets/buds_pro_right.svg b/app/src/main/assets/buds_pro_right.svg
new file mode 100644
index 000000000..cd0075f58
--- /dev/null
+++ b/app/src/main/assets/buds_pro_right.svg
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="10.999999mm"
+   height="10.999999mm"
+   viewBox="0 0 11 10.999999"
+   version="1.1"
+   id="svg4576"
+   inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)"
+   sodipodi:docname="buds_pro_right.svg"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview4578"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:document-units="mm"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-bottom="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     inkscape:zoom="11.313709"
+     inkscape:cx="36.63697"
+     inkscape:cy="29.831067"
+     inkscape:window-width="1920"
+     inkscape:window-height="1035"
+     inkscape:window-x="0"
+     inkscape:window-y="45"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="layer1"
+     showguides="true"
+     inkscape:guide-bbox="true">
+    <sodipodi:guide
+       position="1.2413708,6.0162603"
+       orientation="0,-1"
+       id="guide34430" />
+  </sodipodi:namedview>
+  <defs
+     id="defs4573" />
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-85.996183,-154.42373)">
+    <g
+       aria-label="R"
+       id="text28286"
+       style="font-style:italic;font-size:4.23333px;line-height:124%;font-family:Sans;-inkscape-font-specification:'Sans Italic';letter-spacing:0px;word-spacing:0px;stroke-width:0.299542px"
+       transform="matrix(0.88023484,0,0,0.88636119,10.922244,18.114874)">
+      <path
+         id="path61769"
+         style="font-size:4.23333px;line-height:124%;font-family:Sans;-inkscape-font-specification:Sans;letter-spacing:0px;word-spacing:0px;stroke:#000000;stroke-width:0.299542px"
+         d="m 91.7518,157.96053 q 0.134359,0.0455 0.260449,0.1943 0.128158,0.14883 0.256315,0.40928 l 0.423747,0.84336 h -0.448552 l -0.394807,-0.79169 q -0.152962,-0.31005 -0.297656,-0.41134 -0.142627,-0.10128 -0.390674,-0.10128 H 90.70587 v 1.30431 h -0.417545 v -3.08612 h 0.942577 q 0.529166,0 0.789615,0.22118 0.260449,0.22117 0.260449,0.66766 0,0.29145 -0.136425,0.48369 -0.134359,0.19223 -0.392741,0.26665 z m -1.04593,-1.29605 v 1.09554 h 0.525032 q 0.30179,0 0.454752,-0.13849 0.15503,-0.14056 0.15503,-0.41134 0,-0.27079 -0.15503,-0.40721 -0.152962,-0.1385 -0.454752,-0.1385 z m 1.432917,8.30872 c -0.405432,-0.16828 -0.934338,-0.60499 -1.100286,-0.9085 -0.08215,-0.15028 -0.02898,-0.15162 0.53982,-0.0135 1.118385,0.27146 1.909867,0.0101 2.620416,-0.8679 0.296193,-0.36567 0.335853,-0.50221 0.386124,-1.32944 l 0.05601,-0.92191 0.291411,0.34503 c 0.934148,1.10606 0.521917,2.98625 -0.796913,3.63487 -0.555624,0.27326 -1.421972,0.29991 -1.996603,0.0614 z m -0.98681,-1.31781 c -1.111824,-0.41974 -2.806926,-1.8858 -3.175801,-2.74666 -0.889675,-2.0763 0.135483,-4.85628 2.125836,-5.76475 0.915942,-0.41805 2.032389,-0.43513 2.806137,-0.0429 1.648492,0.83564 2.39276,3.22007 1.663613,5.32971 -0.109743,0.31753 -0.200605,0.8701 -0.2019,1.22797 -0.0057,1.3901 -0.763024,2.1969 -2.065267,2.19829 -0.346714,3.8e-4 -0.851416,-0.0879 -1.152618,-0.20163 z m 2.498327,1.68859 c 0.615631,-0.14579 0.985134,-0.36923 1.392423,-0.84202 0.688578,-0.79928 0.826314,-2.00447 0.33991,-2.97429 -0.153562,-0.3062 -0.365914,-0.60283 -0.471897,-0.65918 -0.179304,-0.0953 -0.181361,-0.13416 -0.02965,-0.55873 0.400029,-1.11956 0.237925,-2.83867 -0.372776,-3.95353 -0.373514,-0.68188 -1.185013,-1.40282 -1.821627,-1.61833 -1.267129,-0.42899 -3.044181,0.048 -3.932276,1.05525 -1.376461,1.56132 -1.736294,3.62997 -0.928459,5.33754 0.271153,0.57314 1.380895,1.68909 2.188066,2.20031 0.390272,0.24715 0.641063,0.50037 0.770097,0.77751 0.421974,0.90634 1.781479,1.49234 2.86619,1.23547 z" />
+    </g>
+    <g
+       id="g3227"
+       transform="translate(2.1600298e-4,2.9611944e-4)">
+      <path
+         style="fill:#000000;stroke:#000000;stroke-width:0.4;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 91.29092,160.58104 c -0.03116,-0.0812 -0.399381,-0.2858 -0.818345,-0.45477 -0.849311,-0.34253 -1.068608,-0.31031 -1.068608,0.15703 0,0.24663 0.06281,0.29752 0.709484,0.57453 0.864443,0.37031 0.947778,0.40745 1.058024,0.18934 0.110245,-0.21811 0.150577,-0.38498 0.119445,-0.46613 z"
+         id="path3121"
+         sodipodi:nodetypes="cssccc" />
+    </g>
+  </g>
+</svg>
diff --git a/app/src/main/assets/ic_device_galaxy_buds_pro.svg b/app/src/main/assets/ic_device_galaxy_buds_pro.svg
new file mode 100644
index 000000000..17cdc49e8
--- /dev/null
+++ b/app/src/main/assets/ic_device_galaxy_buds_pro.svg
@@ -0,0 +1,147 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   version="1.1"
+   id="svg2"
+   width="28.740126"
+   height="28.740126"
+   viewBox="0 0 28.740126 28.740126"
+   sodipodi:docname="ic_device_galaxy_buds_pro.svg"
+   inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <metadata
+     id="metadata8">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs6">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 14.370063 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="28.740126 : 14.370063 : 1"
+       inkscape:persp3d-origin="14.370063 : 9.580042 : 1"
+       id="perspective903" />
+  </defs>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1035"
+     id="namedview4"
+     showgrid="false"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:zoom="16"
+     inkscape:cx="9.59375"
+     inkscape:cy="19.78125"
+     inkscape:window-x="0"
+     inkscape:window-y="45"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="layer1"
+     inkscape:pagecheckerboard="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid972" />
+  </sodipodi:namedview>
+  <g
+     inkscape:groupmode="layer"
+     id="layer1"
+     inkscape:label="Background"
+     style="display:inline">
+    <g
+       inkscape:groupmode="layer"
+       id="layer4"
+       inkscape:label="Bottom"
+       style="display:inline"
+       sodipodi:insensitive="true">
+      <rect
+         style="display:inline;fill:#1f7fdb;fill-opacity:1;stroke:none;stroke-width:3.57115;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect817-5"
+         width="22.819572"
+         height="21.904638"
+         x="2.9239759"
+         y="3.8768768"
+         ry="0.9472276" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer3"
+       inkscape:label="Middle"
+       style="display:inline"
+       sodipodi:insensitive="true">
+      <rect
+         style="display:inline;fill:#4dabf5;fill-opacity:1;stroke:none;stroke-width:3.57115;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect817-7"
+         width="22.819572"
+         height="21.904638"
+         x="2.9317887"
+         y="3.0349438"
+         ry="0.9472276" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer2"
+       inkscape:label="Top"
+       style="display:inline"
+       sodipodi:insensitive="true">
+      <rect
+         style="fill:#2196f3;fill-opacity:1;stroke:none;stroke-width:3.57115;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect817"
+         width="22.819572"
+         height="21.904638"
+         x="2.9238882"
+         y="3.4130721"
+         ry="0.9472276" />
+    </g>
+    <g
+       id="g63739"
+       transform="translate(0.05413571,0.02254964)">
+      <path
+         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0.499999;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 21.237726,23.178927 c 0.634206,-0.154792 1.014861,-0.392033 1.434432,-0.894023 0.709355,-0.848648 0.851246,-2.128284 0.35017,-3.158004 -0.158194,-0.325102 -0.376956,-0.640059 -0.486135,-0.699886 -0.184713,-0.101225 -0.186831,-0.142449 -0.0305,-0.593252 0.4121,-1.188704 0.245104,-3.013982 -0.384023,-4.197709 -0.384785,-0.723994 -1.220769,-1.489466 -1.876589,-1.718287 -1.305362,-0.455487 -3.136032,0.05098 -4.050919,1.120434 -1.417995,1.657746 -1.788681,3.854161 -0.956476,5.667197 0.279331,0.608544 1.422559,1.793423 2.254089,2.336206 0.402046,0.262429 0.660398,0.531288 0.79333,0.825545 0.434706,0.962313 1.83523,1.584515 2.952669,1.311779 z m -1.557124,-0.393681 c -0.417663,-0.178671 -0.962525,-0.642359 -1.13348,-0.964615 -0.08464,-0.159567 -0.02985,-0.160978 0.556108,-0.01438 1.152123,0.288237 1.967488,0.0109 2.699481,-0.921499 0.305122,-0.388252 0.34598,-0.533223 0.397766,-1.411541 l 0.05768,-0.978857 0.300204,0.366331 c 0.962332,1.174379 0.537663,3.170699 -0.820959,3.859379 -0.572392,0.290149 -1.464875,0.318438 -2.056846,0.0651 z M 18.664017,21.38604 c -1.145368,-0.445668 -2.891616,-2.002277 -3.271619,-2.916302 -0.916517,-2.204544 0.139572,-5.156228 2.189977,-6.12081 0.943576,-0.443884 2.09371,-0.462014 2.890806,-0.04544 1.698228,0.887254 2.464953,3.418948 1.713805,5.658899 -0.113052,0.337133 -0.206657,0.923837 -0.207992,1.30381 -0.0056,1.475953 -0.786045,2.332595 -2.127581,2.334067 -0.357171,4.12e-4 -0.877106,-0.09332 -1.187396,-0.214086 z m 0.05143,-2.660283 c 0.09413,-0.1471 0.141331,-0.346993 0.104904,-0.444199 -0.03648,-0.09727 -0.46741,-0.342356 -0.95774,-0.544765 -0.99398,-0.410316 -1.250633,-0.37172 -1.250633,0.188105 0,0.29544 0.0735,0.356398 0.830335,0.688221 1.011691,0.443601 1.058716,0.44776 1.273129,0.112618 z"
+         id="path4913" />
+      <path
+         style="fill:#ffffff;fill-opacity:1;stroke:#fffffd;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 7.8095555,17.66233 c -0.643309,-0.154792 -1.029417,-0.392034 -1.455018,-0.894023 -0.719533,-0.848647 -0.863456,-2.128283 -0.35519,-3.158003 0.16047,-0.325108 0.382369,-0.640058 0.493111,-0.699893 0.187359,-0.101222 0.189511,-0.142441 0.03099,-0.593244 -0.418003,-1.188704 -0.24862,-3.0139926 0.389538,-4.1977137 0.390307,-0.7239821 1.238294,-1.4894593 1.903507,-1.7182926 1.3240955,-0.4554866 3.1810385,0.05091 4.1090525,1.1204365 1.438337,1.6577511 1.814337,3.8541708 0.970193,5.6672038 -0.283344,0.608542 -1.442967,1.793425 -2.286421,2.336214 -0.407815,0.262422 -0.669885,0.531277 -0.804719,0.825539 -0.440944,0.962315 -1.8615685,1.584512 -2.9950365,1.311776 z m 1.579457,-0.393675 c 0.423658,-0.178678 0.9763395,-0.642346 1.1497485,-0.964615 0.08584,-0.159571 0.03028,-0.160985 -0.5640875,-0.01437 -1.168658,0.288237 -1.995714,0.01078 -2.738213,-0.921502 -0.309496,-0.388249 -0.350936,-0.533218 -0.403474,-1.411549 l -0.05856,-0.978857 -0.30451,0.366339 c -0.976134,1.174378 -0.545387,3.170701 0.832735,3.859381 0.580601,0.290142 1.48589,0.318436 2.086356,0.06516 z m 1.0311705,-1.39921 c 1.1618,-0.445664 2.933103,-2.002277 3.318564,-2.916305 C 14.668411,10.748599 13.59717,7.7969088 11.517344,6.832342 10.560231,6.3884511 9.3935935,6.370315 8.5850695,6.786822 c -1.722603,0.8872548 -2.500328,3.418952 -1.73839,5.658903 0.114677,0.337147 0.209614,0.923838 0.210971,1.303822 0.0052,1.475947 0.79732,2.332583 2.158099,2.334069 0.362301,3.8e-4 0.8896925,-0.09332 1.2044335,-0.214099 z m -0.05212,-2.660279 c -0.09548,-0.147102 -0.14336,-0.346994 -0.106402,-0.444203 0.03699,-0.09727 0.47412,-0.342357 0.971491,-0.544765 1.008241,-0.410314 1.268566,-0.371706 1.268566,0.188105 0,0.295436 -0.07455,0.356397 -0.842244,0.688225 -1.026201,0.443591 -1.073911,0.44776 -1.291402,0.112602 z"
+         id="path4913-6" />
+    </g>
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer5"
+     inkscape:label="Original"
+     style="display:none"
+     sodipodi:insensitive="true">
+    <image
+       y="0.0079936879"
+       x="0.010951031"
+       id="image4124"
+       xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGAAAABgCAMAAADVRocKAAAAA3NCSVQICAjb4U/gAAAACXBIWXMA ADFOAAAxTgGacD5yAAAAGXRFWHRTb2Z0d2FyZQB3d3cuaW5rc2NhcGUub3Jnm+48GgAAABF0RVh0 VGl0bGUAUGViYmxlIEljb26KvwD9AAAADHRFWHRBdXRob3IAeHBobnh/4OzMAAAAY3RFWHRDb3B5 cmlnaHQAQ0MgQXR0cmlidXRpb24tTm9uQ29tbWVyY2lhbC1TaGFyZUFsaWtlIGh0dHA6Ly9jcmVh dGl2ZWNvbW1vbnMub3JnL2xpY2Vuc2VzL2J5LW5jLXNhLzMuMC/eBBrlAAABy1BMVEUAAAAAAAAA AP8AAIAAAFUAAKoAVaoAAIAAQIAAM2YAM5kzM2YzM5krK4AkJG0kJJIgIIAcHHEcHI4aGoAXF3QX F4sXLnQXLosVK4AUJ3YUJ4kSJIAkJIARInciInciIogQIIAgIIAeHngeHoccHIAcK4AbKHkbKIYa GoAaJoAYJHkXI4AXI4sWIXoWIYUVIIAfH3ofH4UdJ4ATHIQcJnsbJIAaI4QaIoAZIXsZIYQYIHgY IIAXH4MXJ3wXHoAXJoBLpfAWJHwdJHwdJIMcI4Acas0VIoMbIoAaIXwaIIAZH3wZH4MZJXwYHoAY HoYYJIAehtsYHoIefdtHoO0jetZGovNEn+4gg+EfgN5Ep/VKqfREpvQgfdkgfttKqvQggd4hjesw nPMwnPRJqfUhgd4hjutJqfUgfttNq/VNq/QhlPEhlPIhlvMkmPMglvIff9sgjeoglPAhk/AhlPEh lPIhlvMkl/MkmPMlmPMmmPMnmfMpmvMzn/Q0n/Q1n/Q2oPRIqfVNq/VasfZbsvZhtPZitfdtuveQ yvmXzvmj0/qk1Pqu2fu83/vR6f3T6v3Z7f3i8f3j8v3l8/7m8/7p9f7q9f7x+P7y+f7////ougeB AAAAb3RSTlMAAQECAwMDBAQFBQUFBgcHCAkJCgsLCwsMDQ0ODg8PDxAQERESEhMTFBQVFhYXFxgZ GRobGxwdHh8fICAhISIiIiMjIyQkJSYnKCkpKSoqKiorKyssLC2xs7O0tba2tu7u7u7u7+/w8fHy +/v7+/ywJhX9AAAC0klEQVRo3u2a+VfTQBCAm00iW0nSTVNKbKQYbIMUC6jU4q2IB2rF+74vPEAR LSjIIXgAAiqef65py6MNJe17y1RF8/26L/N1N9O8ZGZcLof/DiYFoiV1cZHwiGVZjh7zalRAYYbn sFsQ6RFwGccyBeJjwSMrPn8lHX6fQqRy3tbAsFiU1So9FA4bNIRD63XNTwTO5pSYc9fuvwbgwaW9 SxqYs/eGBgcAGBy+fRrlpRPDsJdfJoEYuMgvzibz/vK3kmDcFMuxNZvM/BG74QTdFV6PJZsYlhe9 XXCCrlCVStwcyhG45QCkoCmiV0o4uwXEib4aQMHjbc0RTXYvCMx/mGdNHaSgraWxRhEXzsgUEC0C KWjfszlUYRWsrYcUHGttNlSRzxUEo5CCjrZYrSqVVlD3Nwj6vqcZsovzKrPeTy3o/5lmxE4wnFl/ 4QhKLvjy2YY5IEExHMH0B1umQQSj9o+EUUewIBh/m8c4qOBbfu58dQRLCmYnJmZLKphKJicdwR8X vJsymSmhIM37FSv4OJlhxnlUOAJHAC8Ye5PHmPNe9PsEJX/5dT5AigvmPtkw53wnr3xB34809uWc zDp9OWflV7xgBaBlzY79MWORALhuui+vbhoArfwe3rUp5MtWfl2Il1QDUtAaj+rKakv1XdEhBfGm Wo1kq+/pM1Ih+wdRI6iIq3IFvEAewgke6QHFg1mU26PjhbtwghsKEbG1X8ew3PmnUPGfXRAwv7hr yqAD13t6nwPQ23PnBMeivG4gg85c7XwCQOeVU+avZ5bslcrrNm7dfehIInGSguOJo+0Hd27ZoOam j3ULvOjTI02x+PYddLTEY42GJpfnpo/L0g50k8pqI1IfbWikoSFaXxfSFKnMrqFsZpKbKKoWDFbT EdQCqlfCdhtIG7AoESLTQogk4EJd/VRTn8fLgecKTg3MjyUsA4SKDD7MT1bQ8++NmvwCRmydh2Fg UvEAAAAASUVORK5CYII= "
+       style="opacity:0.49074079;image-rendering:optimizeQuality"
+       preserveAspectRatio="none"
+       height="28.710279"
+       width="28.710279" />
+  </g>
+</svg>
diff --git a/app/src/main/assets/ic_device_galaxy_buds_pro_disabled.svg b/app/src/main/assets/ic_device_galaxy_buds_pro_disabled.svg
new file mode 100644
index 000000000..4f40a69bd
--- /dev/null
+++ b/app/src/main/assets/ic_device_galaxy_buds_pro_disabled.svg
@@ -0,0 +1,200 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   version="1.1"
+   id="svg2"
+   width="28.740126"
+   height="28.740126"
+   viewBox="0 0 28.740126 28.740126"
+   sodipodi:docname="ic_device_galaxy_buds_pro_disabled.svg"
+   inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:android="http://schemas.android.com/apk/res/android">
+  <metadata
+     id="metadata8">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs6">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 14.370063 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="28.740126 : 14.370063 : 1"
+       inkscape:persp3d-origin="14.370063 : 9.580042 : 1"
+       id="perspective903" />
+  </defs>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1035"
+     id="namedview4"
+     showgrid="false"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:zoom="16"
+     inkscape:cx="7.34375"
+     inkscape:cy="7.65625"
+     inkscape:window-x="0"
+     inkscape:window-y="45"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="layer6"
+     inkscape:pagecheckerboard="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid972" />
+  </sodipodi:namedview>
+  <g
+     inkscape:groupmode="layer"
+     id="layer1"
+     inkscape:label="Background"
+     style="display:inline">
+    <g
+       inkscape:groupmode="layer"
+       id="layer4"
+       inkscape:label="Bottom"
+       style="display:inline"
+       sodipodi:insensitive="true">
+      <rect
+         style="display:inline;fill:#7a7a7a;fill-opacity:1;stroke:none;stroke-width:3.57115173;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect817-5"
+         width="22.819572"
+         height="21.904638"
+         x="2.9239759"
+         y="3.8768768"
+         ry="0.9472276" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer3"
+       inkscape:label="Middle"
+       style="display:inline"
+       sodipodi:insensitive="true">
+      <rect
+         style="display:inline;fill:#9f9f9f;fill-opacity:0.94117647;stroke:none;stroke-width:3.57115173;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect817-7"
+         width="22.819572"
+         height="21.904638"
+         x="2.9317887"
+         y="3.0349438"
+         ry="0.9472276" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer2"
+       inkscape:label="Top"
+       style="display:inline"
+       sodipodi:insensitive="true">
+      <rect
+         style="fill:#8a8a8a;fill-opacity:1;stroke:none;stroke-width:3.57115173;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect817"
+         width="22.819572"
+         height="21.904638"
+         x="2.9238882"
+         y="3.4130721"
+         ry="0.9472276" />
+    </g>
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer6"
+     inkscape:label="Foreground"
+     style="display:inline">
+    <g
+       inkscape:groupmode="layer"
+       id="layer7"
+       inkscape:label="Backplane"
+       style="display:inline" />
+    <g
+       inkscape:groupmode="layer"
+       id="layer8"
+       inkscape:label="Frontplane"
+       style="display:inline">
+      <g
+         inkscape:groupmode="layer"
+         id="layer9"
+         inkscape:label="Base"
+         style="display:inline" />
+      <g
+         inkscape:groupmode="layer"
+         id="layer10"
+         inkscape:label="Top"
+         style="display:inline" />
+      <g
+         inkscape:groupmode="layer"
+         id="layer11"
+         inkscape:label="Toptop"
+         style="display:inline" />
+      <g
+         inkscape:groupmode="layer"
+         id="layer12"
+         inkscape:label="Toptoptop"
+         style="display:inline" />
+    </g>
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:#8a8a8a;fill-opacity:0.94117647"
+       d="m 12.48275,10.865376 h 3.907 v 6.978 h -3.907 z"
+       android:strokeWidth="1"
+       id="path2735" />
+    <g
+       id="g63739"
+       transform="translate(0.05413571,0.02254964)"
+       style="display:inline">
+      <path
+         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0.499999;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 21.237726,23.178927 c 0.634206,-0.154792 1.014861,-0.392033 1.434432,-0.894023 0.709355,-0.848648 0.851246,-2.128284 0.35017,-3.158004 -0.158194,-0.325102 -0.376956,-0.640059 -0.486135,-0.699886 -0.184713,-0.101225 -0.186831,-0.142449 -0.0305,-0.593252 0.4121,-1.188704 0.245104,-3.013982 -0.384023,-4.197709 -0.384785,-0.723994 -1.220769,-1.489466 -1.876589,-1.718287 -1.305362,-0.455487 -3.136032,0.05098 -4.050919,1.120434 -1.417995,1.657746 -1.788681,3.854161 -0.956476,5.667197 0.279331,0.608544 1.422559,1.793423 2.254089,2.336206 0.402046,0.262429 0.660398,0.531288 0.79333,0.825545 0.434706,0.962313 1.83523,1.584515 2.952669,1.311779 z m -1.557124,-0.393681 c -0.417663,-0.178671 -0.962525,-0.642359 -1.13348,-0.964615 -0.08464,-0.159567 -0.02985,-0.160978 0.556108,-0.01438 1.152123,0.288237 1.967488,0.0109 2.699481,-0.921499 0.305122,-0.388252 0.34598,-0.533223 0.397766,-1.411541 l 0.05768,-0.978857 0.300204,0.366331 c 0.962332,1.174379 0.537663,3.170699 -0.820959,3.859379 -0.572392,0.290149 -1.464875,0.318438 -2.056846,0.0651 z M 18.664017,21.38604 c -1.145368,-0.445668 -2.891616,-2.002277 -3.271619,-2.916302 -0.916517,-2.204544 0.139572,-5.156228 2.189977,-6.12081 0.943576,-0.443884 2.09371,-0.462014 2.890806,-0.04544 1.698228,0.887254 2.464953,3.418948 1.713805,5.658899 -0.113052,0.337133 -0.206657,0.923837 -0.207992,1.30381 -0.0056,1.475953 -0.786045,2.332595 -2.127581,2.334067 -0.357171,4.12e-4 -0.877106,-0.09332 -1.187396,-0.214086 z m 0.05143,-2.660283 c 0.09413,-0.1471 0.141331,-0.346993 0.104904,-0.444199 -0.03648,-0.09727 -0.46741,-0.342356 -0.95774,-0.544765 -0.99398,-0.410316 -1.250633,-0.37172 -1.250633,0.188105 0,0.29544 0.0735,0.356398 0.830335,0.688221 1.011691,0.443601 1.058716,0.44776 1.273129,0.112618 z"
+         id="path4913" />
+      <path
+         style="fill:#ffffff;fill-opacity:1;stroke:#fffffd;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 7.8095555,17.66233 c -0.643309,-0.154792 -1.029417,-0.392034 -1.455018,-0.894023 -0.719533,-0.848647 -0.863456,-2.128283 -0.35519,-3.158003 0.16047,-0.325108 0.382369,-0.640058 0.493111,-0.699893 0.187359,-0.101222 0.189511,-0.142441 0.03099,-0.593244 -0.418003,-1.188704 -0.24862,-3.0139926 0.389538,-4.1977137 0.390307,-0.7239821 1.238294,-1.4894593 1.903507,-1.7182926 1.3240955,-0.4554866 3.1810385,0.05091 4.1090525,1.1204365 1.438337,1.6577511 1.814337,3.8541708 0.970193,5.6672038 -0.283344,0.608542 -1.442967,1.793425 -2.286421,2.336214 -0.407815,0.262422 -0.669885,0.531277 -0.804719,0.825539 -0.440944,0.962315 -1.8615685,1.584512 -2.9950365,1.311776 z m 1.579457,-0.393675 c 0.423658,-0.178678 0.9763395,-0.642346 1.1497485,-0.964615 0.08584,-0.159571 0.03028,-0.160985 -0.5640875,-0.01437 -1.168658,0.288237 -1.995714,0.01078 -2.738213,-0.921502 -0.309496,-0.388249 -0.350936,-0.533218 -0.403474,-1.411549 l -0.05856,-0.978857 -0.30451,0.366339 c -0.976134,1.174378 -0.545387,3.170701 0.832735,3.859381 0.580601,0.290142 1.48589,0.318436 2.086356,0.06516 z m 1.0311705,-1.39921 c 1.1618,-0.445664 2.933103,-2.002277 3.318564,-2.916305 C 14.668411,10.748599 13.59717,7.7969088 11.517344,6.832342 10.560231,6.3884511 9.3935935,6.370315 8.5850695,6.786822 c -1.722603,0.8872548 -2.500328,3.418952 -1.73839,5.658903 0.114677,0.337147 0.209614,0.923838 0.210971,1.303822 0.0052,1.475947 0.79732,2.332583 2.158099,2.334069 0.362301,3.8e-4 0.8896925,-0.09332 1.2044335,-0.214099 z m -0.05212,-2.660279 c -0.09548,-0.147102 -0.14336,-0.346994 -0.106402,-0.444203 0.03699,-0.09727 0.47412,-0.342357 0.971491,-0.544765 1.008241,-0.410314 1.268566,-0.371706 1.268566,0.188105 0,0.295436 -0.07455,0.356397 -0.842244,0.688225 -1.026201,0.443591 -1.073911,0.44776 -1.291402,0.112602 z"
+         id="path4913-6" />
+    </g>
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer5"
+     inkscape:label="Original"
+     style="display:none">
+    <image
+       y="0.028144173"
+       x="0.013794855"
+       id="image1291"
+       xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAJAAAACQCAYAAADnRuK4AAAABHNCSVQICAgIfAhkiAAAAAlwSFlz AABO4wAATuMBYdZxSQAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAAZdEVY dFRpdGxlAFR3ZWxmIEljb24gVGVtcGxhdGXyQOONAAAADHRFWHRBdXRob3IAeHBobnh/4OzMAAAA Y3RFWHRDb3B5cmlnaHQAQ0MgQXR0cmlidXRpb24tTm9uQ29tbWVyY2lhbC1TaGFyZUFsaWtlIGh0 dHA6Ly9jcmVhdGl2ZWNvbW1vbnMub3JnL2xpY2Vuc2VzL2J5LW5jLXNhLzQuMC9D0yJcAAANW0lE QVR4nO2dS4xc2VnH/98591VVXd3TbntC92ggwZ5R1BWRRZMoIQG1UIQIs0BCcpINESyyQIqySlgl 2I6yQ2xmtpEQilgQI4EUiAQaQQtCFAiNQjLVUWbsjII19iS2u931vI9zzseiqtxP21V9b7vrlr/f pp/33HPr/O53vvO4VYAgCIIgCIIgCIIgCILwLEBnUz6f8mmfZR7ZpKfyop+GQPvKHNX52mmLKjyS K8NGONAEhclUdMMOy2PsSdMcfr08+LK+JTKdNhurQ0GuD3/RGP58hfc1eSESeUUUMuSQPE0CLgPr ILRv0xp2EMd3CHf3DkiS+yJTQYTh0p4QjS1E0TJvYhGorzA2VjGQ6RoAHklEKECiIhuQDsiz3qC1 9jLF8R1KknNkzDYZs0vAi3CuJeKcEkrNM3ALnrfAnneOw3Cbo2iZN+t3GBtNHkSjh5FoagQ6Ik/j LlSSnKM4NirLbit3fo7Y9AhYgrP9vTjq+iJTTkhVHoqgdIWB+yCvyupeh31/xUWR58Jwm5sX4Abd 21ZhEhUo0NUD8nS7UGkKlS1C2QRq3kA5F5KrJ8Q2IaAOdqnIUxCkAgbaIB2yaoesVMItD06HcP4O XBDA1WpwA4lGkegqYwoEok++ygE/3/+CJv6MVrjIwEIB5QpFw9xyUG9ZuL+Jt+6+tnH1vUneKJRX IPrEN/nFiHrfJqBhHJBYwLqcpQqnglZAqAFPAc7xG0miX3n9s9GtPCOzkwpEAPDJVznQy73NxKBx p8PoZjJBWAbmAsJyjeArfqP747sf2rj6V+mhIf6IJzaomvDchIcJM4Of73+hm6Lx0wdO5CkRnZRx 84FDz9AHgpeWPj+Ycrk2zGOv0j5vnhhgJhHo0DzPNXJwn77VcnDiTulwDNxqOZDWn8LaosI6FLBK B2Vi4GHQOJ5xJxKPThKuN+h+D5esyFNaLAPbfXfp0m6owhgcre0MJx8xnDN68sTjBDPRI3lWCeug xl2oTsbVgq5FOCNaKeba7dCL43nX7d7hS17IYQxurjccNpo4JNERxunC6KA8Ww/neTJb4JUIZ0Jm gbSmvbj2rtefr+leb0l3u1CNu1BYb+zr0h52ZwcYMwcadVt78vT7HS29V/lhANVAedX+olfrWC+t 93SaDtr4oETH8ySB9mXkl7HWXqbRDLN97sKkIzhhGmGmNA79xE/8JHDeXFLVab2i03SwFLXWvj1Y FN+LQgcYX4L1LYrjO2TMLmWLUHNJXxd4GcIZ4uvMDzx4WdLxsijQc0lfZ4tQcfy2iuMVOrQF50A0 GiOJHnZf7UVKkpCcWyKbQJkalF/whQhng/XIQwYKgwBpljIZsE2gnFtwgy03Sxh2Y0dC0JgR6DLW sAZjlsier9G8gXLZxJOQwpTiZ/Csb7Q1mY5Mql0V6jkXkT3fIWOWht0YcNzO0oklcLZLzsVkLRSY ZTV9BnAM5RtPs4NyUUDOBeRcTM7ODdt37ZHHji3QKP9h0yPnIpKtGLMDe1BgQy4g5SwUc0rOxYfa 9/Kxx55gS+sSsNAHerUTVFWYRpg9YoDAIOaM2PEgSJgeGZNRHIOAxWOPHTMCjbLwF/edNJMINDNY YjYUPvx5/OBwghyoP9xRKMwWIdgZAioTBQcZSQkD2J4oKIhAQi5EICEXRT5Y+FR56ZzC5z7o46Mv eHi+RvBLditkDvhFl/Hddwy+/oMMb+2UcyN5KQX67Ad8fOXjIXSJU3lfAS/UCZff7+MPXvZx9TsJ /rqZnXW1JqZk9y3wykUPV36z3PIcRivgq78V4nd/tXz3c6kECjTw5Y+Fp/6eNGcBAfjKx8LSdcWl qu5HVjTeU5tFfQYszxE+vFKuXTKlEuilc6Wq7ol4uWTXWKra1vzZjT4j5kp2jaUSSJg+RCAhFyKQ kIvyTTw8ht2kHA8aLYSPznNePqfwexc97MSM/3nXIpnyZ+9mSqBf/8supv1RawJw80/mHvn3Vy55 eOXSoFluPnD4o3/o45329F6UdGFTzMXnFL78G+GT//EMEYGeMnrCV/xDy9M9sSgCPWUmXaqoTPm8 kAgk5EIEespM+mZcjqc3gQZmbBR2HH/+2xF+7fmzuU9++AuHL/1LfOB36YTD8p9sT/dGs5kX6MU6 4aXFsxFop58vemQO+Iv/TAuqzekw8wKVjTe3HW7sOPxfy+Hv3zR4UyKQMAn/eMPgtc3pjjr7kSRa yIUIJORCBBJyIQIJuRCBhFyIQEIuRCAhFyKQkAsRSMiFCCTkQgQSciECCbkQgYRciEBCLkQgIRci kJALEUjIhQgk5EIEEnIhAgm5EIGEXIhAQi5EICEXIpCQCxFIyIUIJORCBBJyIQIJuRCBhFyIQEIu RCAhFyKQkAsRSMjFzL9D2a02Y/GMPhH51hR/REFRzLxAh98lVSgW6cKEXIhAQi5EICEXIpCQCxFI yMVMjcL++49rZ12FZ46ZEuhxn0UqnA7ShQm5EIGEXIhAQi5KJVAnm/21pXZarmsslUA3pvyzs4rg rTNa+D0ppRLoe7ct3u2W6w6dhDsdxn/dnvAzMc+YUgmUWuBr/5FgFhViAF/9ToKsXAGoXAIBwLdv Glz99wS2ZC/047AO+LN/S/BPb5uzrsrElHIi8RtvZPjebYvPfdDHR1/w8Es1gi7ZrWAc8PMu47vv GHz9B1npcp8RpRQIAN7advjTf00AJGddlWeakt23wrQhAgm5EIGEXIhAwgDSJ5odmVggpStMOpzF qZhnnASkPAb6Ex01pkCrQ2FuTVgpoRxoJvJ4NJ4lGn9B7gRd2H1gd7KTCNMNkWGCZpBhIp9JBaxU zORV2fMWOIqWH9nWYwsURcvseQtMXnVQuApEoBmBDBzIskojRypjooCVig617/Vjjz1BDlRjpSLW Gg5EItEMoAgu87Ql1Xc6YadUykpFrHRn2L6bjz52vFNcxyY24XnnWN/rcsuDI5WIPDNC5sPozFql 4foKTvXgHqiY9b059rz7vFlfGbb1lSNtPoZAVxhoMOorHIbbrNQ86xDOj8Ny7TsQHok2bJSX2TRj 4/mB9Tw4HcIptcthuDSUpnFswBi/C9tY5UEe1GJ/B67loZyrf8IRUsMms37mh3MmSGE6YcX6O3BR 9D4XRbcZG6v75Tkg0pMEYmD0qMx1bNbvcK0GFwRwfrVjwdKLzQAchEHmJzBhqkwn7Fn94K4LArgw 3B52X6ME+uhjU2NGoGE3trHKzeg212pwldacBUsQKj3s0Df9LK5VsnYltkG7aiuVOVurwTUvwGGj OWj7Y/IfYDyBhlHoCgNbjM1PuOYFuFoNDnHaK/ZqhKcNx0k76FoTtPu21oWpVu/vk2d1nzwE4Ohm 0AmG8fsk2mhy8wKc6/duzOT+0mcFZnC//9N6/ZfN4iJMrQZ3YyHZF3m29stzLONuKGMANCiIGbgG bDTBH8+uc2t3jebnAZLHiksFM7jdBiW9v72x8IZDfWWYLDcBrDDQwCF5jg0Vk+xIPCKR+8ndV+n9 5/8QzjWoXge80m5wfLYwGbjdAZLkR+n/3nwNmztuIM0W9sQBniTPgf+YEBqV+ytf/OF7qVL5Fitq kO8D2gdkgno6YQJsBs4yENOP2HV//2df+7ufDf54RBrgMeKMyNvvEMB4z+98o1r5yIc/D8efBqmL rNR8znKFU4Act8C4odhe737/+6/9/J+/FQ+S5KsjUSa+8wsRCLhGAFSjAXXvXsdPa+e9auK81E/9 wKt4Jkt9Z632fa3ZQTFbAhQhAJidJE85IVKMFAAcE2kmBZdl1iqtrfbIZNZkfgoTV5FW491sYWHB DhJluMeNsMYhb9LCg+z5KoBVjqLXuVJZsejeQ78+xxUvQZakHEaBsybTzkJzpCmwRgEAsyfyFAE7 UGAYAFKtHSWW/TCz2oNN0tQGEZtQOWPb1nqV4faMjcVhznNyeYD8EWhYBgP4lMJ6gxp3oXZ353Wy 0NK1LrwsCrTJUh2ZVNuQlLNQQAVgQ8yZCFQQRP5AAspYaTidsIu9wHp+YP04td0aTLg7bxcWWnZv mP5Nl1egAodNDcbGKpprO3wpSZzbAXXqPTsXA2TAWTVw1kKx84k5I+aU5A3piqOLFEQBE1WZkLEL 4fwenGdT1wl7Ntipuqjqub3oU8wMXhEC7evGrgP1Bocx2Bg4tKvoLoJtAjWfQjkXk3MgnksIAAzq BZxeAIAQbQAJqANWKmZlI25Fg1X1YKe6b20LDLyOwXA9X/QBiunChuWMkukmjbqyJDlHcfy2cm6B 7PkaOdslNj1ytipd1ymhdG+wa1TXWN/rslK7HEXvc2G4zXvLEwdmmHMJVGAXdnCWurnecGvtkMJw gZPkPpkWyJjdoTjzcK4lEhWMUvMM7ALYheeBvep9DsMljqJwEHk2msOu6/HLE5NQlEDHLnVsYpWx fofQTmgNy4jjUa1bBZ1WOEgLwAKAwR72TdwG6hjmPK/j0MIoUEAeVHQUeDhDPZwbGtIk4PLw+y3C esFnFfbYAPYew7qOgzsJi5UHKF6gQ+WO6nhNuqszY/x1rZNw2g0r4kwPskApCIIgCIJQEP8P03/B 430mofMAAAAASUVORK5CYII= "
+       style="opacity:0.49074079;image-rendering:optimizeQuality"
+       preserveAspectRatio="none"
+       height="28.670942"
+       width="28.670942" />
+    <image
+       y="0.0055872202"
+       x="-0.031073861"
+       id="image3082"
+       xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAJAAAACQCAYAAADnRuK4AAAABHNCSVQICAgIfAhkiAAAAAlwSFlz AABO4wAATuMBYdZxSQAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAAZdEVY dFRpdGxlAFR3ZWxmIEljb24gVGVtcGxhdGXyQOONAAAADHRFWHRBdXRob3IAeHBobnh/4OzMAAAA Y3RFWHRDb3B5cmlnaHQAQ0MgQXR0cmlidXRpb24tTm9uQ29tbWVyY2lhbC1TaGFyZUFsaWtlIGh0 dHA6Ly9jcmVhdGl2ZWNvbW1vbnMub3JnL2xpY2Vuc2VzL2J5LW5jLXNhLzQuMC9D0yJcAAAL6klE QVR4nO3dTYvcRhrA8adKJZW6Zc0LmTEmmYUF5zYOJjQLOSTQEMhlA7uHsNlPsCHg5DP4MzghHyC3 xZvTGh8CgYaQXMwEkngOZo1f2JAYz2ReLHePSqqqZy+t2Z5xj6c1pbZa7ecHxo09LdVEf0rVkjIG IIQQQgghhBBCCCEvA9bw7ZPJ4TQ2Oo0DPG6bFFJ9xoVTWUxVH1g25vXxfTAAgG63W/GuSa/XK14e DwTH/HklEVUZ0PF4ilBYkiQMACBN0yP7U0rRzFQRKeWRIMIwRACAOI6x1+uNBlRpRNMIiAEAK8JJ 05QppZjWmmmtGQCAtZbCmRLOOQIACCFQCIFSSgzDEEdCGo1oZgJ6Jp6trS2ulGJpmvI8z/nKysph QMaYw/1STO6KaAAAPM87DGh7ext937dhGFopJa6urtqqI6oyoCPx9Pt9nmUZX15e5koprrXm1lpm rWWIyOI4pngqxDnHJEmAMYacc+ScoxDCSint7u6uDYLARlFkx0RUe0Ds2rVrQRRFn3qe93fO+UVE XKxgu6R6TxDxP4j4z4cPH3529epVNfzzM0fkGhD78ssv/2CtvckYW7fWgtYaEKdyyYE4YoyBEAI4 54CIt5VSf/7oo4/+O/IlpQ/cWQNiAADXrl0LFhYWNowx60mSQJZlZ9wceZGCIIA4jsHzvNsPHjz4 09WrVzM44/UiXnLfhx/PAQCiKPo0z/P1nZ0diqdBsiyDnZ0dyPP80tra2hUYWcPC+Gt5JyoT0DPX eRhjH+7t7dEpq4EQEfb29oAx9rdOp8O73S6H8SEdj+oIMeH+xl0kZP1+/3WKp7kQEQ4ODl7f39/n aZpip9NBAICNjY1xH/MZjDmlTRpQ4chH9SzL2mcdPJkNSqlzSZKINE1tv99HIQSur68X14yKLztx lpjkFDb2ImG/3+fGGLfRk9oZYyCKIhFFkVhYWPAGg4HX7/f51tYW73a7405nR0y6BnomnoODA6+i 74HUTCklDg4OxNOnT0Ucx16WZXxMRGOddgo78sYkSVhxhXlpaansJzgygxCR+b7ve55nfd83aZqa OI4hSRIQQuDwRjjCCWugiSPodrssTVOmtWbD2xM0A80Jz/P8LMuEUkqEYegppbzl5WWepilP05QN Z6HCkUllkkU0AwCWJAlTSjFrLSvubVX6XZDaaK2F7/ssz3PgnKPWGpVS3FprRx65cZuBhjtiw7vq vN1uU0BzwvM8YYzxgiDwtNZeu93m1lpmjGFa68PnucBhEX3IGMOGG+eISHfT5wAiciGEZ609fGKi +HXaeycOqFj/aK0n3jhpBmstR0RmreVSyuI1O3/+/KnvpdMQgeGZhCEiK+Kx1h5OGMcfRR5V5jrQ uJ2SORAEAUNEFoZh6feeaQ1E8cynYllS5vjSKYwAwNnPKBQQcUIBESdlH+eYGa+++ip0Oh1YW1uD KIqAsWYty4wxkCQJ3L9/H27dugX7+/t1D+lMGhnQO++8A2+99Vbdw3DieR4sLS3Bm2++CW+88Qbc vHkT7ty5U/ewSmvcKazT6TQ+nuOEEPD+++/D2tpa3UMprVEBtVotePvtt+sexlRwzuHdd9+texil NSqgixcvQhAEdQ9jas6fPw8rKyt1D6OURgXUtP+4Z/HKK6/UPYRSGhWQ7/t1D2HqpJR1D6GURgVE Zg8FRJxQQMRJIy8kjoOIoJQ6/Qtrxhh77jrnwoULoJSCfr8Pv/76K1hrX+DoypubgAaDAXzxxRd1 D+NU586dg48//vjEv798+TJcvnwZAAAePXoE169fhzRNX9TwSqNT2Ay7cOHCzF84pYBesHa73I8T mPXbGxTQC1b2WtasX/uigIgTCugFK/upatZ//tLcfAo7yQcffAALCwu17PvevXuj//wAAAA8ffq0 1Da2trYqHFH15j6gpaUlWF5ermXf4w5+mRklyzL4/vvvqxxS5eY+oKZ59OgR7O3twc7ODty+fXvm H3WlgGbMjz/+CD/99FPdw5gYLaKJEwqIOKGAiBMKiDihgIgTCog4oYCIEwqIOKGAiBMKiDihgIgT Cog4oYCIEwqIOKGAiBMKiDihgIgTCog4oYCIEwqIOKGAiBMKiDihgIgTCog4oYCIEwqIOKGAiBMK iDihgIgTCog4oYCIEwqIOKGAiJO5/wllu7u7YIypZd9JktSy3xdp7gP66quv6h7CXKNTGHFCAREn FBBxQgERJxQQcTI3n8La7TZ88skndQ/jVIyxuodQqbkJiDEGYRjWPYyXDp3CiBMKiDihgIiTRgWU ZVndQ5g6pVTdQyilUQH9/vvvdQ9h6pr2PTYqoLt37871LPT48WPY3t6uexilNCqgNE3h22+/rXsY U2GthW+++abuYZTWqIAAAH744YeZ/3dEy8rzHG7cuAG//PJL3UMprZEXEr/77ju4d+8edDodWFtb g3PnzjXuCq8xBp48eQL379+HW7duwZMnT+oe0pk0MiAAgN9++w1u3LhR9zBeeo07hZHZQgERJxQQ cUIBEQAAYIzhWd5XOiDP8/CsOyOzjXNe+rhOGhAFM8eyLEPGGKZpCgDlZqMzn8JoFpofw2OJjDFk jCHnHDnnKIRAIQSGYXjisZ44oDAMDzdY7KCS0ZPacc7tMBybpulhRI8fPz79vWV35nkecs7R8zxL s9B8YIxZrbXhnFvP82wxQUwySZQKSAiB29vbKISw/X6f4pkTxhjteZ4ZxmMHg4EdThIohMA4jotj /cwxnyQgBACM4xillMg5Ryml9X2/np9YQConhNBZlpk8z7Xv+0YIYaWUdnisT4wHoMQM1Ov1sFgH 7e7uWiGErWT0pHZaay2lzKWUOssyLaU0u7u7NgxDG4Yh9nq90XiOhHTazVQEgMPb3HEcY5qmFgAg SRKDiI27C06egVLKfDAYWEQ0Ukq7t7dnW62WlVKOnr7GKnMdCItZKIoi22q1DCItg5oOEUFrnUdR lLdaLZMkiWm1WiaKIru6umqHs0/x6xmTroGK33FjY8Ourq7aKIpslmWDir4PUhOlVNLv93WSJKbf 7+t2u/28eJ6JqOzzQAgA0Ov1oNvt2sFgcFdK2aHTWDMhIgwGg3txHOtisRyGIW5sbIyGU9kpbPQ1 9no91FpfT5IE6FTWPIgISZKAMeZfi4uLdnV11W5ubpqNjQ0LABaejWfsQfZK7vfIVPPaa69tRFH0 V2PMed/3gXO6ud8EWmtIkgSyLPv5zp07/+j1evrBgwfPi+XEGeKs557D9125cuWPUsp/c87XhRAg RGOfkn0paK1Baw3W2p+VUn/5/PPPHw7/alwkp55aXBcvDADgvffea1+6dOkKAHzIGLvIOV9w3C6Z AmvtE0S8i4jXNzc3P/v6669TOGWRfJpKAhr+ztfX1/n29rYfRZFQSgnf9/08z4UQwjfGeL7ve9Za joiseO/wNXEwck+yuBFq8zw3nueZPM91EAR5lmW63W5naZrmi4uLZnNzc3StA3CGeADc/6+M0QuN GIYhtlot0+/3IY5jPDg4gCAIUGttpZSeMcYDABYEAQegeKpURJTnuUVElFKaLMvM8HcdhqEeXuMp Hs84dYE8iaoWLAgArLhSrbVmUkqmtTZSSuCco9YajTFWSskRERCRUUDVKQISQqBSyiKiDYLA+L5v ENG0Wi2TZZmNosg+7+Zo6f26bgCOnsZYp9Ph+/v7fDAYeHEce0opT2vN2+02N8Zway2jeKZj9IEw z/PsYDCwwxujJkkS0263zeLioh1+VHda+xSqmIHG3S9DrbVNkgSWl5dRKcWzLOPWWlYENPzaCnZP AP7/zyoUARljMAxDK6W0u7u7NgiCk+5tOc1CVc0CR2ahbrfLtra2uFKKpWnKrbXMGMNWVlaY1poZ Y2j2mZLiGZ7t7W0sHv4bhoST3p4oo+qAites2+2yJElYmqZMKcW01kxrffh11lqKqGKjTxAWjx9L KTEMQ4zjGE+4MToTAR3f1uHH9CIkAIA0TSmaF6R4EH4kHICK4wGoNqDj25vkNZmOkyKpNB6A6R3M 49ulaOpT6aL5uGkfWApndtAjE4QQQgghFfkfLnfEbGu/P8gAAAAASUVORK5CYII= "
+       style="display:inline;image-rendering:optimizeQuality"
+       preserveAspectRatio="none"
+       height="28.697369"
+       width="28.697369" />
+  </g>
+</svg>
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsPreferenceConst.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsPreferenceConst.java
index 03f2cbf7d..1e59059d2 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsPreferenceConst.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsPreferenceConst.java
@@ -139,8 +139,25 @@ public class DeviceSettingsPreferenceConst {
     public static final String PREF_GALAXY_BUDS_EQUALIZER_MODE = "pref_galaxy_buds_equalizer_mode";
     public static final String PREF_GALAXY_BUDS_TOUCH_LEFT = "pref_galaxy_buds_touch_left";
     public static final String PREF_GALAXY_BUDS_TOUCH_RIGHT = "pref_galaxy_buds_touch_right";
+    public static final String PREF_GALAXY_BUDS_TOUCH_RIGHT_SWITCH = "pref_galaxy_buds_touch_right_switch";
+    public static final String PREF_GALAXY_BUDS_TOUCH_LEFT_SWITCH = "pref_galaxy_buds_touch_left_switch";
     public static final String PREF_GALAXY_BUDS_LIVE_ANC = "pref_galaxy_buds_live_anc";
     public static final String PREF_GALAXY_BUDS_PRESSURE_RELIEF = "pref_galaxy_buds_live_pressure_relief";
+    public static final String PREF_GALAXY_BUDS_AMBIENT_SOUND = "pref_galaxy_buds_ambient_sound";
+    public static final String PREF_GALAXY_BUDS_PRO_NOISE_CONTROL="pref_galaxy_buds_pro_noise_control";
+    public static final String PREF_GALAXY_PRO_DOUBLE_TAP_EDGE ="pref_galaxy_pro_double_tap_edge";
+    public static final String PREF_GALAXY_BUDS_PRO_IN_EAR_DETECTION ="pref_galaxy_buds_pro_in_ear_detection";
+    public static final String PREF_GALAXY_BUDS_PRO_VOICE_DETECT ="pref_galaxy_buds_pro_voice_detect";
+    public static final String PREF_GALAXY_BUDS_PRO_VOICE_DETECT_DURATION ="pref_galaxy_buds_pro_voice_detect_duration";
+    public static final String PREF_GALAXY_BUDS_PRO_BALANCE="pref_galaxy_buds_pro_balance";
+    public static final String PREF_GALAXY_BUDS_PRO_READ_NOTIFICATIONS_OUTLOUD ="pref_galaxy_buds_pro_read_notifications_outloud";
+    public static final String PREF_GALAXY_BUDS_AMBIENT_MODE_DURING_CALL ="pref_galaxy_buds_ambient_mode_during_call";
+    public static final String PREF_GALAXY_BUDS_PRO_AMBIENT_VOLUME_RIGHT ="pref_galaxy_buds_pro_ambient_volume_right";
+    public static final String PREF_GALAXY_BUDS_PRO_AMBIENT_VOLUME_LEFT="pref_galaxy_buds_pro_ambient_volume_left";
+    public static final String PREF_GALAXY_BUDS_PRO_AMBIENT_SOUND_TONE ="pref_galaxy_buds_pro_ambient_sound_tone";
+    public static final String PREFS_NOISE_CONTROL_WITH_ONE_EARBUD ="pref_galaxy_buds_noise_controls_with_one_earbud";
+    public static final String PREF_GALAXY_BUDS_PRO_ANC_LEVEL="pref_galaxy_buds_pro_anc_level";
+    public static final String PREFS_GALAXY_BUDS_SEAMLESS_CONNECTION="prefs_galaxy_buds_seamless_connection";
 
     public static final String PREF_SONY_AUDIO_CODEC = "pref_sony_audio_codec";
     public static final String PREF_SONY_AMBIENT_SOUND_CONTROL = "pref_sony_ambient_sound_control";
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSpecificSettingsCustomizer.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSpecificSettingsCustomizer.java
index fc948131a..40516ec96 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSpecificSettingsCustomizer.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSpecificSettingsCustomizer.java
@@ -21,6 +21,7 @@ import android.os.Parcelable;
 import androidx.preference.Preference;
 
 import java.util.Set;
+import nodomain.freeyourgadget.gadgetbridge.util.Prefs;
 
 /**
  * A device-specific preference handler, that allows for concrete implementations to customize the preferences in
@@ -37,10 +38,10 @@ public interface DeviceSpecificSettingsCustomizer extends Parcelable {
 
     /**
      * Customize the settings on the {@link DeviceSpecificSettingsFragment}.
-     *
      * @param handler the {@link DeviceSpecificSettingsHandler}
+     * @param prefs the {@link android.content.SharedPreferences}
      */
-    void customizeSettings(final DeviceSpecificSettingsHandler handler);
+    void customizeSettings(final DeviceSpecificSettingsHandler handler, Prefs prefs);
 
     /**
      * Keys of preferences which should print its values as a summary below the preference name.
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 a8ca0648f..d4271d269 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
@@ -431,7 +431,6 @@ public class DeviceSpecificSettingsFragment extends PreferenceFragmentCompat imp
         addPreferenceHandlerFor(PREF_NOTHING_EAR1_INEAR);
         addPreferenceHandlerFor(PREF_NOTHING_EAR1_AUDIOMODE);
 
-        addPreferenceHandlerFor(PREF_GALAXY_BUDS_AMBIENT_MODE);
         addPreferenceHandlerFor(PREF_GALAXY_BUDS_AMBIENT_VOICE_FOCUS);
         addPreferenceHandlerFor(PREF_GALAXY_BUDS_AMBIENT_VOLUME);
         addPreferenceHandlerFor(PREF_GALAXY_BUDS_LOCK_TOUCH);
@@ -443,6 +442,23 @@ public class DeviceSpecificSettingsFragment extends PreferenceFragmentCompat imp
         addPreferenceHandlerFor(PREF_GALAXY_BUDS_TOUCH_RIGHT);
         addPreferenceHandlerFor(PREF_GALAXY_BUDS_LIVE_ANC);
         addPreferenceHandlerFor(PREF_GALAXY_BUDS_PRESSURE_RELIEF);
+        addPreferenceHandlerFor(PREF_GALAXY_BUDS_PRO_ANC_LEVEL);
+        addPreferenceHandlerFor(PREF_GALAXY_BUDS_AMBIENT_SOUND);
+        addPreferenceHandlerFor(PREF_GALAXY_PRO_DOUBLE_TAP_EDGE);
+        addPreferenceHandlerFor(PREF_GALAXY_BUDS_PRO_IN_EAR_DETECTION);
+        addPreferenceHandlerFor(PREF_GALAXY_BUDS_PRO_VOICE_DETECT);
+        addPreferenceHandlerFor(PREF_GALAXY_BUDS_PRO_VOICE_DETECT_DURATION);
+        addPreferenceHandlerFor(PREF_GALAXY_BUDS_PRO_BALANCE);
+        addPreferenceHandlerFor(PREF_GALAXY_BUDS_PRO_READ_NOTIFICATIONS_OUTLOUD);
+        addPreferenceHandlerFor(PREF_GALAXY_BUDS_AMBIENT_MODE_DURING_CALL);
+        addPreferenceHandlerFor(PREF_GALAXY_BUDS_PRO_AMBIENT_VOLUME_RIGHT);
+        addPreferenceHandlerFor(PREF_GALAXY_BUDS_PRO_AMBIENT_VOLUME_LEFT);
+        addPreferenceHandlerFor(PREF_GALAXY_BUDS_PRO_AMBIENT_SOUND_TONE);
+        addPreferenceHandlerFor(PREFS_NOISE_CONTROL_WITH_ONE_EARBUD);
+        addPreferenceHandlerFor(PREF_GALAXY_BUDS_AMBIENT_MODE);
+        addPreferenceHandlerFor(PREFS_GALAXY_BUDS_SEAMLESS_CONNECTION);
+        addPreferenceHandlerFor(PREF_GALAXY_BUDS_TOUCH_LEFT_SWITCH);
+        addPreferenceHandlerFor(PREF_GALAXY_BUDS_TOUCH_RIGHT_SWITCH);
 
         addPreferenceHandlerFor(PREF_SONY_AMBIENT_SOUND_CONTROL);
         addPreferenceHandlerFor(PREF_SONY_FOCUS_VOICE);
@@ -731,7 +747,7 @@ public class DeviceSpecificSettingsFragment extends PreferenceFragmentCompat imp
         }
 
         if (deviceSpecificSettingsCustomizer != null) {
-            deviceSpecificSettingsCustomizer.customizeSettings(this);
+            deviceSpecificSettingsCustomizer.customizeSettings(this, prefs);
         }
     }
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/galaxy_buds/GalaxyBudsDeviceCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/galaxy_buds/GalaxyBudsDeviceCoordinator.java
index 2149a3d97..c26965570 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/galaxy_buds/GalaxyBudsDeviceCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/galaxy_buds/GalaxyBudsDeviceCoordinator.java
@@ -1,26 +1,14 @@
 package nodomain.freeyourgadget.gadgetbridge.devices.galaxy_buds;
 
-import android.app.Activity;
-import android.content.Context;
-import android.net.Uri;
-
 import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 
-import nodomain.freeyourgadget.gadgetbridge.GBException;
 import nodomain.freeyourgadget.gadgetbridge.R;
-import nodomain.freeyourgadget.gadgetbridge.devices.AbstractDeviceCoordinator;
-import nodomain.freeyourgadget.gadgetbridge.devices.InstallHandler;
-import nodomain.freeyourgadget.gadgetbridge.devices.SampleProvider;
-import nodomain.freeyourgadget.gadgetbridge.entities.DaoSession;
-import nodomain.freeyourgadget.gadgetbridge.entities.Device;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDeviceCandidate;
-import nodomain.freeyourgadget.gadgetbridge.model.ActivitySample;
 import nodomain.freeyourgadget.gadgetbridge.model.BatteryConfig;
 import nodomain.freeyourgadget.gadgetbridge.model.DeviceType;
 
-public class GalaxyBudsDeviceCoordinator extends AbstractDeviceCoordinator {
+public class GalaxyBudsDeviceCoordinator extends GalaxyBudsGenericCoordinator {
 
     @NonNull
     @Override
@@ -53,100 +41,6 @@ public class GalaxyBudsDeviceCoordinator extends AbstractDeviceCoordinator {
         return new BatteryConfig[]{battery1, battery2};
     }
 
-    @Override
-    public int getBondingStyle() {
-        return BONDING_STYLE_BOND;
-    }
-
-    @Nullable
-    @Override
-    public Class<? extends Activity> getPairingActivity() {
-        return null;
-    }
-
-    @Override
-    public boolean supportsActivityDataFetching() {
-        return false;
-    }
-
-    @Override
-    public boolean supportsActivityTracking() {
-        return false;
-    }
-
-    @Override
-    public SampleProvider<? extends ActivitySample> getSampleProvider(GBDevice
-                                                                              device, DaoSession session) {
-        return null;
-    }
-
-    @Override
-    public InstallHandler findInstallHandler(Uri uri, Context context) {
-        return null;
-    }
-
-    @Override
-    public boolean supportsScreenshots() {
-        return false;
-    }
-
-    @Override
-    public int getAlarmSlotCount() {
-        return 0;
-    }
-
-    @Override
-    public boolean supportsSmartWakeup(GBDevice device) {
-        return false;
-    }
-
-    @Override
-    public boolean supportsHeartRateMeasurement(GBDevice device) {
-        return false;
-    }
-
-    @Override
-    public String getManufacturer() {
-        return "Samsung";
-    }
-
-    @Override
-    public boolean supportsAppsManagement() {
-        return false;
-    }
-
-    @Override
-    public Class<? extends Activity> getAppsManagementActivity() {
-        return null;
-    }
-
-    @Override
-    public boolean supportsCalendarEvents() {
-        return false;
-    }
-
-    @Override
-    public boolean supportsRealtimeData() {
-        return false;
-    }
-
-    @Override
-    public boolean supportsWeather() {
-        return false;
-    }
-
-    @Override
-    public boolean supportsFindDevice() {
-        return true;
-    }
-
-    @Override
-    protected void deleteDevice(@NonNull GBDevice gbDevice, @NonNull Device
-            device, @NonNull DaoSession session) throws GBException {
-
-    }
-
-
     @Override
     public int[] getSupportedDeviceSpecificSettings(GBDevice device) {
         return new int[]{
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/galaxy_buds/GalaxyBudsGenericCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/galaxy_buds/GalaxyBudsGenericCoordinator.java
new file mode 100644
index 000000000..78400c621
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/galaxy_buds/GalaxyBudsGenericCoordinator.java
@@ -0,0 +1,114 @@
+package nodomain.freeyourgadget.gadgetbridge.devices.galaxy_buds;
+
+import android.app.Activity;
+import android.content.Context;
+import android.net.Uri;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import nodomain.freeyourgadget.gadgetbridge.GBException;
+import nodomain.freeyourgadget.gadgetbridge.devices.AbstractDeviceCoordinator;
+import nodomain.freeyourgadget.gadgetbridge.devices.InstallHandler;
+import nodomain.freeyourgadget.gadgetbridge.devices.SampleProvider;
+import nodomain.freeyourgadget.gadgetbridge.entities.DaoSession;
+import nodomain.freeyourgadget.gadgetbridge.entities.Device;
+import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
+import nodomain.freeyourgadget.gadgetbridge.model.ActivitySample;
+
+public abstract class GalaxyBudsGenericCoordinator extends AbstractDeviceCoordinator {
+
+    @Override
+    public int getBondingStyle() {
+        return BONDING_STYLE_BOND;
+    }
+
+    @Nullable
+    @Override
+    public Class<? extends Activity> getPairingActivity() {
+        return null;
+    }
+
+    @Override
+    public boolean supportsActivityDataFetching() {
+        return false;
+    }
+
+    @Override
+    public boolean supportsActivityTracking() {
+        return false;
+    }
+
+    @Override
+    public SampleProvider<? extends ActivitySample> getSampleProvider(GBDevice
+                                                                              device, DaoSession session) {
+        return null;
+    }
+
+    @Override
+    public InstallHandler findInstallHandler(Uri uri, Context context) {
+        return null;
+    }
+
+    @Override
+    public boolean supportsScreenshots() {
+        return false;
+    }
+
+    @Override
+    public int getAlarmSlotCount() {
+        return 0;
+    }
+
+    @Override
+    public boolean supportsSmartWakeup(GBDevice device) {
+        return false;
+    }
+
+    @Override
+    public boolean supportsHeartRateMeasurement(GBDevice device) {
+        return false;
+    }
+
+    @Override
+    public String getManufacturer() {
+        return "Samsung";
+    }
+
+    @Override
+    public boolean supportsAppsManagement() {
+        return false;
+    }
+
+    @Override
+    public Class<? extends Activity> getAppsManagementActivity() {
+        return null;
+    }
+
+    @Override
+    public boolean supportsCalendarEvents() {
+        return false;
+    }
+
+    @Override
+    public boolean supportsRealtimeData() {
+        return false;
+    }
+
+    @Override
+    public boolean supportsWeather() {
+        return false;
+    }
+
+    @Override
+    public boolean supportsFindDevice() {
+        return true;
+    }
+
+    @Override
+    protected void deleteDevice(@NonNull GBDevice gbDevice, @NonNull Device
+            device, @NonNull DaoSession session) throws GBException {
+
+    }
+
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/galaxy_buds/GalaxyBudsLiveDeviceCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/galaxy_buds/GalaxyBudsLiveDeviceCoordinator.java
index 1b1f85b67..5d9cff134 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/galaxy_buds/GalaxyBudsLiveDeviceCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/galaxy_buds/GalaxyBudsLiveDeviceCoordinator.java
@@ -1,26 +1,14 @@
 package nodomain.freeyourgadget.gadgetbridge.devices.galaxy_buds;
 
-import android.app.Activity;
-import android.content.Context;
-import android.net.Uri;
-
 import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 
-import nodomain.freeyourgadget.gadgetbridge.GBException;
 import nodomain.freeyourgadget.gadgetbridge.R;
-import nodomain.freeyourgadget.gadgetbridge.devices.AbstractDeviceCoordinator;
-import nodomain.freeyourgadget.gadgetbridge.devices.InstallHandler;
-import nodomain.freeyourgadget.gadgetbridge.devices.SampleProvider;
-import nodomain.freeyourgadget.gadgetbridge.entities.DaoSession;
-import nodomain.freeyourgadget.gadgetbridge.entities.Device;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDeviceCandidate;
-import nodomain.freeyourgadget.gadgetbridge.model.ActivitySample;
 import nodomain.freeyourgadget.gadgetbridge.model.BatteryConfig;
 import nodomain.freeyourgadget.gadgetbridge.model.DeviceType;
 
-public class GalaxyBudsLiveDeviceCoordinator extends AbstractDeviceCoordinator {
+public class GalaxyBudsLiveDeviceCoordinator extends GalaxyBudsGenericCoordinator {
 
     @NonNull
     @Override
@@ -54,99 +42,6 @@ public class GalaxyBudsLiveDeviceCoordinator extends AbstractDeviceCoordinator {
         return new BatteryConfig[]{battery1, battery2, battery3};
     }
 
-    @Override
-    public int getBondingStyle() {
-        return BONDING_STYLE_BOND;
-    }
-
-    @Nullable
-    @Override
-    public Class<? extends Activity> getPairingActivity() {
-        return null;
-    }
-
-    @Override
-    public boolean supportsActivityDataFetching() {
-        return false;
-    }
-
-    @Override
-    public boolean supportsActivityTracking() {
-        return false;
-    }
-
-    @Override
-    public SampleProvider<? extends ActivitySample> getSampleProvider(GBDevice
-                                                                              device, DaoSession session) {
-        return null;
-    }
-
-    @Override
-    public InstallHandler findInstallHandler(Uri uri, Context context) {
-        return null;
-    }
-
-    @Override
-    public boolean supportsScreenshots() {
-        return false;
-    }
-
-    @Override
-    public int getAlarmSlotCount() {
-        return 0;
-    }
-
-    @Override
-    public boolean supportsSmartWakeup(GBDevice device) {
-        return false;
-    }
-
-    @Override
-    public boolean supportsHeartRateMeasurement(GBDevice device) {
-        return false;
-    }
-
-    @Override
-    public String getManufacturer() {
-        return "Samsung";
-    }
-
-    @Override
-    public boolean supportsAppsManagement() {
-        return false;
-    }
-
-    @Override
-    public Class<? extends Activity> getAppsManagementActivity() {
-        return null;
-    }
-
-    @Override
-    public boolean supportsCalendarEvents() {
-        return false;
-    }
-
-    @Override
-    public boolean supportsRealtimeData() {
-        return false;
-    }
-
-    @Override
-    public boolean supportsWeather() {
-        return false;
-    }
-
-    @Override
-    public boolean supportsFindDevice() {
-        return true;
-    }
-
-    @Override
-    protected void deleteDevice(@NonNull GBDevice gbDevice, @NonNull Device
-            device, @NonNull DaoSession session) throws GBException {
-
-    }
-
 
     @Override
     public int[] getSupportedDeviceSpecificSettings(GBDevice device) {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/galaxy_buds/GalaxyBudsProDeviceCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/galaxy_buds/GalaxyBudsProDeviceCoordinator.java
new file mode 100644
index 000000000..f3966a285
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/galaxy_buds/GalaxyBudsProDeviceCoordinator.java
@@ -0,0 +1,57 @@
+package nodomain.freeyourgadget.gadgetbridge.devices.galaxy_buds;
+
+import androidx.annotation.NonNull;
+
+import nodomain.freeyourgadget.gadgetbridge.R;
+import nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSpecificSettingsCustomizer;
+import nodomain.freeyourgadget.gadgetbridge.devices.sony.headphones.SonyHeadphonesSettingsCustomizer;
+import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
+import nodomain.freeyourgadget.gadgetbridge.impl.GBDeviceCandidate;
+import nodomain.freeyourgadget.gadgetbridge.model.BatteryConfig;
+import nodomain.freeyourgadget.gadgetbridge.model.DeviceType;
+
+public class GalaxyBudsProDeviceCoordinator extends GalaxyBudsGenericCoordinator {
+
+    @NonNull
+    @Override
+    public DeviceType getSupportedType(GBDeviceCandidate candidate) {
+
+        String name = candidate.getName();
+
+        if (name != null && (
+                name.startsWith("Galaxy Buds Pro (")
+        )) {
+            return DeviceType.GALAXY_BUDS_PRO;
+        }
+        return DeviceType.UNKNOWN;
+    }
+
+    @Override
+    public DeviceSpecificSettingsCustomizer getDeviceSpecificSettingsCustomizer(final GBDevice device) {
+        return new GalaxyBudsSettingsCustomizer(device);
+    }
+    @Override
+    public DeviceType getDeviceType() {
+        return DeviceType.GALAXY_BUDS_PRO;
+    }
+
+    @Override
+    public int getBatteryCount() {
+        return 3;
+    }
+
+    @Override
+    public BatteryConfig[] getBatteryConfig() {
+        BatteryConfig battery1 = new BatteryConfig(0, R.drawable.ic_buds_pro_case, R.string.battery_case);
+        BatteryConfig battery2 = new BatteryConfig(1, R.drawable.ic_buds_pro_left, R.string.left_earbud);
+        BatteryConfig battery3 = new BatteryConfig(2, R.drawable.ic_buds_pro_right, R.string.right_earbud);
+        return new BatteryConfig[]{battery1, battery2, battery3};
+    }
+
+    @Override
+    public int[] getSupportedDeviceSpecificSettings(GBDevice device) {
+        return new int[]{
+                R.xml.devicesettings_galaxy_buds_pro,
+        };
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/galaxy_buds/GalaxyBudsSettingsCustomizer.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/galaxy_buds/GalaxyBudsSettingsCustomizer.java
new file mode 100644
index 000000000..29a5d20e7
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/galaxy_buds/GalaxyBudsSettingsCustomizer.java
@@ -0,0 +1,241 @@
+/*  Copyright (C) 2021 José Rebelo
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.devices.galaxy_buds;
+
+import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst.PREF_GALAXY_BUDS_AMBIENT_VOLUME;
+import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst.PREF_GALAXY_BUDS_PRO_ANC_LEVEL;
+import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst.PREF_GALAXY_BUDS_PRO_BALANCE;
+import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst.PREF_GALAXY_BUDS_PRO_NOISE_CONTROL;
+import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst.PREF_GALAXY_BUDS_TOUCH_LEFT;
+import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst.PREF_GALAXY_BUDS_TOUCH_LEFT_SWITCH;
+import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst.PREF_GALAXY_BUDS_TOUCH_RIGHT;
+import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst.PREF_GALAXY_BUDS_TOUCH_RIGHT_SWITCH;
+
+import android.os.Parcel;
+
+import androidx.preference.Preference;
+
+import java.util.Collections;
+import java.util.Set;
+
+import nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSpecificSettingsCustomizer;
+import nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSpecificSettingsHandler;
+import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
+import nodomain.freeyourgadget.gadgetbridge.util.Prefs;
+
+public class GalaxyBudsSettingsCustomizer implements DeviceSpecificSettingsCustomizer {
+
+    final GBDevice device;
+
+    public GalaxyBudsSettingsCustomizer(final GBDevice device) {
+        this.device = device;
+    }
+
+    @Override
+    public void onPreferenceChange(final Preference preference, final DeviceSpecificSettingsHandler handler) {
+    }
+
+    @Override
+    public void customizeSettings(final DeviceSpecificSettingsHandler handler, Prefs prefs) {
+
+        final Preference pref_galaxy_buds_pro_balance = handler.findPreference(PREF_GALAXY_BUDS_PRO_BALANCE);
+        if (pref_galaxy_buds_pro_balance != null) {
+            pref_galaxy_buds_pro_balance.setSummary(String.valueOf((prefs.getInt(PREF_GALAXY_BUDS_PRO_BALANCE, 16) - 16)));
+
+            pref_galaxy_buds_pro_balance.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
+                @Override
+                public boolean onPreferenceChange(Preference preference, Object newVal) {
+                    String newValue = String.valueOf((int) newVal - 16);
+                    pref_galaxy_buds_pro_balance.setSummary(newValue);
+                    handler.notifyPreferenceChanged(PREF_GALAXY_BUDS_PRO_BALANCE);
+                    return true;
+                }
+            });
+        }
+
+        final Preference pref_galaxy_buds_pro_noise_control = handler.findPreference(PREF_GALAXY_BUDS_PRO_NOISE_CONTROL);
+        String pref_galaxy_buds_pro_noise_control_value = prefs.getString(PREF_GALAXY_BUDS_PRO_NOISE_CONTROL, "0");
+        final Preference pref_galaxy_buds_pro_anc_level = handler.findPreference(PREF_GALAXY_BUDS_PRO_ANC_LEVEL);
+        final Preference pref_galaxy_buds_ambient_volume = handler.findPreference(PREF_GALAXY_BUDS_AMBIENT_VOLUME);
+
+        if (pref_galaxy_buds_pro_noise_control != null) {
+
+            switch (pref_galaxy_buds_pro_noise_control_value) {
+                case "0":
+                    pref_galaxy_buds_pro_anc_level.setEnabled(false);
+                    pref_galaxy_buds_ambient_volume.setEnabled(false);
+                    break;
+                case "1":
+                    pref_galaxy_buds_pro_anc_level.setEnabled(true);
+                    pref_galaxy_buds_ambient_volume.setEnabled(false);
+                    break;
+                case "2":
+                    pref_galaxy_buds_pro_anc_level.setEnabled(false);
+                    pref_galaxy_buds_ambient_volume.setEnabled(true);
+                    break;
+            }
+
+            pref_galaxy_buds_pro_noise_control.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
+                @Override
+                public boolean onPreferenceChange(Preference preference, Object newVal) {
+                    handler.notifyPreferenceChanged(PREF_GALAXY_BUDS_PRO_NOISE_CONTROL);
+                    switch (newVal.toString()) {
+                        case "0":
+                            pref_galaxy_buds_pro_anc_level.setEnabled(false);
+                            pref_galaxy_buds_ambient_volume.setEnabled(false);
+                            break;
+                        case "1":
+                            pref_galaxy_buds_pro_anc_level.setEnabled(true);
+                            pref_galaxy_buds_ambient_volume.setEnabled(false);
+                            break;
+                        case "2":
+                            pref_galaxy_buds_pro_anc_level.setEnabled(false);
+                            pref_galaxy_buds_ambient_volume.setEnabled(true);
+                            break;
+                    }
+
+                    return true;
+                }
+            });
+        }
+
+
+        final Preference pref_galaxy_buds_touch_right = handler.findPreference(PREF_GALAXY_BUDS_TOUCH_RIGHT);
+        String pref_galaxy_buds_touch_right_value = prefs.getString(PREF_GALAXY_BUDS_TOUCH_RIGHT, "1");
+        final Preference pref_galaxy_buds_touch_right_switch = handler.findPreference(PREF_GALAXY_BUDS_TOUCH_RIGHT_SWITCH);
+
+        if (pref_galaxy_buds_touch_right != null) {
+
+            switch (pref_galaxy_buds_touch_right_value) {
+                case "2":
+                    pref_galaxy_buds_touch_right_switch.setEnabled(true);
+                    break;
+                default:
+                    pref_galaxy_buds_touch_right_switch.setEnabled(false);
+            }
+
+            pref_galaxy_buds_touch_right.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
+                @Override
+                public boolean onPreferenceChange(Preference preference, Object newVal) {
+                    handler.notifyPreferenceChanged(PREF_GALAXY_BUDS_TOUCH_RIGHT);
+                    switch (newVal.toString()) {
+                        case "2":
+                            pref_galaxy_buds_touch_right_switch.setEnabled(true);
+                            break;
+                        default:
+                            pref_galaxy_buds_touch_right_switch.setEnabled(false);
+
+                    }
+
+                    return true;
+                }
+            });
+        }
+
+        final Preference pref_galaxy_buds_touch_left = handler.findPreference(PREF_GALAXY_BUDS_TOUCH_LEFT);
+        String pref_galaxy_buds_touch_left_value = prefs.getString(PREF_GALAXY_BUDS_TOUCH_LEFT, "1");
+        final Preference pref_galaxy_buds_touch_left_switch = handler.findPreference(PREF_GALAXY_BUDS_TOUCH_LEFT_SWITCH);
+
+        if (pref_galaxy_buds_touch_left != null) {
+
+            switch (pref_galaxy_buds_touch_left_value) {
+                case "2":
+                    pref_galaxy_buds_touch_left_switch.setEnabled(true);
+                    break;
+                default:
+                    pref_galaxy_buds_touch_left_switch.setEnabled(false);
+            }
+
+            pref_galaxy_buds_touch_left.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
+                @Override
+                public boolean onPreferenceChange(Preference preference, Object newVal) {
+                    handler.notifyPreferenceChanged(PREF_GALAXY_BUDS_TOUCH_LEFT);
+                    switch (newVal.toString()) {
+                        case "2":
+                            pref_galaxy_buds_touch_left_switch.setEnabled(true);
+                            break;
+                        default:
+                            pref_galaxy_buds_touch_left_switch.setEnabled(false);
+
+                    }
+
+                    return true;
+                }
+            });
+        }
+
+
+/*
+        final Preference pref_galaxy_buds_ambient_mode = handler.findPreference(PREF_GALAXY_BUDS_AMBIENT_SOUND);
+        boolean is_pref_galaxy_buds_ambient_mode_enabled = prefs.getBoolean(PREF_GALAXY_BUDS_AMBIENT_SOUND, false);
+        final Preference pref_galaxy_buds_ambient_voice_focus_preference = handler.findPreference(PREF_GALAXY_BUDS_AMBIENT_VOICE_FOCUS_PREFERENCE);
+
+        if (pref_galaxy_buds_ambient_mode != null) {
+            if (is_pref_galaxy_buds_ambient_mode_enabled) {
+                pref_galaxy_buds_ambient_voice_focus_preference.setEnabled(true);
+            } else {
+                pref_galaxy_buds_ambient_voice_focus_preference.setEnabled(false);
+            }
+
+
+            pref_galaxy_buds_ambient_mode.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
+                @Override
+                public boolean onPreferenceChange(Preference preference, Object newVal) {
+                    handler.notifyPreferenceChanged(PREF_GALAXY_BUDS_AMBIENT_SOUND);
+                    if ((boolean) newVal) {
+                        pref_galaxy_buds_ambient_voice_focus_preference.setEnabled(true);
+                    } else {
+                        pref_galaxy_buds_ambient_voice_focus_preference.setEnabled(false);
+                    }
+
+                    return true;
+                }
+            });
+        }
+
+ */
+    }
+
+    @Override
+    public Set<String> getPreferenceKeysWithSummary() {
+        return Collections.emptySet();
+    }
+
+
+    public static final Creator<GalaxyBudsSettingsCustomizer> CREATOR = new Creator<GalaxyBudsSettingsCustomizer>() {
+        @Override
+        public GalaxyBudsSettingsCustomizer createFromParcel(final Parcel in) {
+            final GBDevice device = in.readParcelable(GalaxyBudsSettingsCustomizer.class.getClassLoader());
+            return new GalaxyBudsSettingsCustomizer(device);
+        }
+
+        @Override
+        public GalaxyBudsSettingsCustomizer[] newArray(final int size) {
+            return new GalaxyBudsSettingsCustomizer[size];
+        }
+    };
+
+    @Override
+    public int describeContents() {
+        return 0;
+    }
+
+    @Override
+    public void writeToParcel(final Parcel dest, final int flags) {
+        dest.writeParcelable(device, 0);
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiSettingsCustomizer.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiSettingsCustomizer.java
index fef6626d2..566283399 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiSettingsCustomizer.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiSettingsCustomizer.java
@@ -18,7 +18,6 @@ package nodomain.freeyourgadget.gadgetbridge.devices.huami;
 
 import android.os.Parcel;
 import android.text.InputType;
-import android.widget.Toast;
 
 import androidx.preference.Preference;
 
@@ -31,6 +30,7 @@ import nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSpec
 import nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSpecificSettingsHandler;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.HuamiVibrationPatternNotificationType;
+import nodomain.freeyourgadget.gadgetbridge.util.Prefs;
 
 public class HuamiSettingsCustomizer implements DeviceSpecificSettingsCustomizer {
     final GBDevice device;
@@ -45,7 +45,7 @@ public class HuamiSettingsCustomizer implements DeviceSpecificSettingsCustomizer
     }
 
     @Override
-    public void customizeSettings(final DeviceSpecificSettingsHandler handler) {
+    public void customizeSettings(final DeviceSpecificSettingsHandler handler, Prefs prefs) {
         for (HuamiVibrationPatternNotificationType notificationType : HuamiVibrationPatternNotificationType.values()) {
             final String typeKey = notificationType.name().toLowerCase(Locale.ROOT);
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/SonyHeadphonesSettingsCustomizer.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/SonyHeadphonesSettingsCustomizer.java
index 0a8eb477d..7744b4a15 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/SonyHeadphonesSettingsCustomizer.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/SonyHeadphonesSettingsCustomizer.java
@@ -59,6 +59,7 @@ import nodomain.freeyourgadget.gadgetbridge.devices.sony.headphones.prefs.Ambien
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
 import nodomain.freeyourgadget.gadgetbridge.model.DeviceType;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.sony.headphones.protocol.impl.v1.params.NoiseCancellingOptimizerStatus;
+import nodomain.freeyourgadget.gadgetbridge.util.Prefs;
 
 public class SonyHeadphonesSettingsCustomizer implements DeviceSpecificSettingsCustomizer {
     private ProgressDialog ancOptimizerProgressDialog;
@@ -116,7 +117,7 @@ public class SonyHeadphonesSettingsCustomizer implements DeviceSpecificSettingsC
     }
 
     @Override
-    public void customizeSettings(final DeviceSpecificSettingsHandler handler) {
+    public void customizeSettings(final DeviceSpecificSettingsHandler handler, Prefs prefs) {
         // Only enable the focus on voice check and voice level slider if the ambient sound control mode is ambient sound
 
         final ListPreference ambientSoundControl = handler.findPreference(PREF_SONY_AMBIENT_SOUND_CONTROL);
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java
index c2d7a780a..f9bacf8fe 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java
@@ -103,6 +103,7 @@ public enum DeviceType {
     UM25(350, R.drawable.ic_device_default, R.drawable.ic_device_default_disabled, R.string.devicetype_um25),
     DOMYOS_T540(400, R.drawable.ic_device_lovetoy, R.drawable.ic_device_lovetoy_disabled, R.string.devicetype_domyos_t540),
     NOTHING_EAR1(410, R.drawable.ic_device_nothingear, R.drawable.ic_device_nothingear_disabled, R.string.devicetype_nothingear1),
+    GALAXY_BUDS_PRO(418, R.drawable.ic_device_galaxy_buds_pro, R.drawable.ic_device_galaxy_buds_pro_disabled, R.string.devicetype_galaxybuds_pro),
     GALAXY_BUDS_LIVE(419, R.drawable.ic_device_galaxy_buds_live, R.drawable.ic_device_galaxy_buds_live_disabled, R.string.devicetype_galaxybuds_live),
     GALAXY_BUDS(420, R.drawable.ic_device_galaxy_buds, R.drawable.ic_device_galaxy_buds_disabled, R.string.devicetype_galaxybuds),
     SONY_WH_1000XM3(430, R.drawable.ic_device_sony_overhead, R.drawable.ic_device_sony_overhead_disabled, R.string.devicetype_sony_wh_1000xm3),
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceSupportFactory.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceSupportFactory.java
index 420d558de..0172aef6c 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceSupportFactory.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceSupportFactory.java
@@ -380,6 +380,9 @@ public class DeviceSupportFactory {
                     case GALAXY_BUDS_LIVE:
                         deviceSupport = new ServiceDeviceSupport(new GalaxyBudsDeviceSupport(), EnumSet.of(ServiceDeviceSupport.Flags.BUSY_CHECKING));
                         break;
+                    case GALAXY_BUDS_PRO:
+                        deviceSupport = new ServiceDeviceSupport(new GalaxyBudsDeviceSupport(), EnumSet.of(ServiceDeviceSupport.Flags.BUSY_CHECKING));
+                        break;
                     case SONY_WH_1000XM3:
                         deviceSupport = new ServiceDeviceSupport(new SonyHeadphonesSupport(), EnumSet.of(ServiceDeviceSupport.Flags.BUSY_CHECKING));
                         break;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/galaxy_buds/GalaxyBudsIOThread.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/galaxy_buds/GalaxyBudsIOThread.java
index 7d8aca91d..22dfbb3e7 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/galaxy_buds/GalaxyBudsIOThread.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/galaxy_buds/GalaxyBudsIOThread.java
@@ -31,7 +31,8 @@ public class GalaxyBudsIOThread extends BtClassicIoThread {
         if (gbDevice.getType().equals(DeviceType.GALAXY_BUDS)) {
             return galaxyBudsProtocol.UUID_GALAXY_BUDS_DEVICE_CTRL;
         }
-        if (gbDevice.getType().equals(DeviceType.GALAXY_BUDS_LIVE)) {
+        if (gbDevice.getType().equals(DeviceType.GALAXY_BUDS_LIVE)
+                || gbDevice.getType().equals(DeviceType.GALAXY_BUDS_PRO)) {
             return galaxyBudsProtocol.UUID_GALAXY_BUDS_LIVE_DEVICE_CTRL;
         }
         return galaxyBudsProtocol.UUID_GALAXY_BUDS_DEVICE_CTRL;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/galaxy_buds/GalaxyBudsProtocol.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/galaxy_buds/GalaxyBudsProtocol.java
index aaa2a2a4b..cfde9aa50 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/galaxy_buds/GalaxyBudsProtocol.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/galaxy_buds/GalaxyBudsProtocol.java
@@ -8,6 +8,8 @@ import android.content.SharedPreferences;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 import java.util.ArrayList;
@@ -16,7 +18,6 @@ import java.util.List;
 import java.util.UUID;
 
 import nodomain.freeyourgadget.gadgetbridge.GBApplication;
-import nodomain.freeyourgadget.gadgetbridge.R;
 import nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst;
 import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEvent;
 import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventBatteryInfo;
@@ -32,18 +33,19 @@ public class GalaxyBudsProtocol extends GBDeviceProtocol {
     final UUID UUID_GALAXY_BUDS_DEVICE_CTRL = UUID.fromString("00001102-0000-1000-8000-00805f9b34fd");
     final UUID UUID_GALAXY_BUDS_LIVE_DEVICE_CTRL = UUID.fromString("00001101-0000-1000-8000-00805F9B34FB");
 
-    private static final byte SOMBuds = (byte) 0xFE;
-    private static final byte EOMBuds = (byte) 0xEE;
-    private static final byte SOMPlus = (byte) 0xFD;
-    private static final byte EOMPlus = (byte) 0xDD;
+    private static final byte SOM_BUDS = (byte) 0xFE;
+    private static final byte EOM_BUDS = (byte) 0xEE;
+    private static final byte SOM_BUDS_PLUS = (byte) 0xFD;
+    private static final byte EOM_BUDS_PLUS = (byte) 0xDD;
 
-    private byte SOM = SOMBuds;
-    private byte EOM = EOMBuds;
+    private byte StartOfMessage = SOM_BUDS;
+    private byte EndOfMessage = EOM_BUDS;
 
     private boolean isFirstExchange = true;
 
     //incoming
     private static final byte battery_status = (byte) 0x60;
+
     private static final byte battery_status2 = (byte) 0x61;
 
     //outgoing
@@ -52,11 +54,14 @@ public class GalaxyBudsProtocol extends GBDeviceProtocol {
 
     private static final byte set_ambient_mode = (byte) 0x80; //0x0/0x1
     private static final byte set_ambient_volume = (byte) 0x84; // 0x1-0x5
+
     private static final byte set_ambient_voice_focus = (byte) 0x85; // 0x0/0x1
 
     private static final byte set_lock_touch = (byte) 0x90; // 0x0/0x1
-    private static final byte set_game_mode = (byte) 0x87; // 0x0/0x2 no idea if this is doing anything
-    private static final byte set_equalizer = (byte) 0x86; // 0x0/0x1
+    private static final byte set_game_mode = (byte) 0x87; // 0x0/0x2 no idea if this is doing anything...
+    // this is sent dynamically based on whether the current running app is a game or not
+
+    private static final byte set_equalizer = (byte) 0x86;
 
     private static final byte set_reset = (byte) 0x50;
 
@@ -69,9 +74,86 @@ public class GalaxyBudsProtocol extends GBDeviceProtocol {
 
     //Live
     private static final byte set_automatic_noise_cancelling = (byte) 0x98; //0x0/0x1
-    private static final byte set_live_game_mode = (byte) 0x85; // 0x0/0x1 no idea if this is doing anything
     private static final byte set_pressure_relief = (byte) 0x9f; //0x0/0x1
 
+    //Live and Pro
+    private static final byte set_live_pro_game_mode = (byte) 0x85; // 0x0/0x1 no idea if this is doing anything
+
+    //Pro
+    // Comments thanks to phh as per https://codeberg.org/Freeyourgadget/Gadgetbridge/issues/2642#issuecomment-445962
+
+    private static final byte set_spatial_audio_control = (byte) 0xc3; //0x0/0x1
+    // takes a boolean '1' or '0' to enable or disable 360 Audio (probably useless until someone
+    // manage to send Dolby Atmos to the headset). 360 audio is a feature where (Shown only on Samsung rom)
+
+    private static final byte set_outside_double_tap = (byte) 0x95; //0x0/0x1
+    // This is an option in "Labs", to detect double tap even when not taped on touch pad (so I presume it's using accelerometer)
+
+    private static final byte set_adjust_sound_sync = (byte) 0x85; //0x0/0x1
+    // This is an option in "Labs" available only on Samsung ROM, exposed to the user as "automatic game mode".
+    // This is used in confunction with GAME_MODE. My guess is that this says to the ear buds
+    // "yes, I know that the reported latency might change on the fly, I'm fine with that".
+
+    private static final byte set_detect_conversations = (byte) 0x7a; //0x0/0x1
+    // This is called "Voice detect -- Noise controls and sound settings go back to the previous state
+    // when your voice isn't detected for 10 seconds". This triggers the feature that when you talk,
+    // the ear buds automatically go into "ambient sound" mode, and enhance the sound of your interlocutor
+
+    private static final byte set_detect_conversations_duration = (byte) 0x7b; //0x0/0x1/0x2
+    // Takes {0,1,2}: 0 means 5 seconds, 1 means 10 seconds, 2 means 15s. This is the duration after
+    // which the ear buds go back to ANC after switching to ambient sound when the user talks.
+
+    private static final byte set_ambient_mode_during_calls = (byte) 0x8b; //0x0/0x1
+    // "Use ambient sound during calls"
+
+    private static final byte set_noise_controls_with_one_earbud = (byte) 0x6f; //0x0/0x1
+    // "Noise controls with one earbud" in Accessibility menu. I'm not exactly sure what it means,
+    // my guess is that it allows ANC even if only one earbuds is in-ear
+
+    private static final byte set_balance = (byte) 0x8f;
+    // takes value in 0-32 range, it is used to change left/right balance
+
+    private static final byte extra_high_ambient = (byte) 0x96; //0x0/0x1
+    //  "Maximize ambient sound volume"/"Amplify sounds from your surroundings so you can stay aware of what's going on around you.
+
+    private static final byte set_seamless_connection = (byte) 0xaf; //0x0/0x1
+    // It is used to allow the ear buds to roam across devices, like devices being allowed to take ear buds "focus".
+
+    private static final byte set_voice_wake_up = (byte) 0x97; //0x0/0x1
+    // Enables "Hey Bixby" wake up word. Shown only on Samsung ROM
+
+    private static final byte set_speak_seamlessly = (byte) 0x7d; //0x0/0x1
+    //  "After Voice wake up, you can say the command you want right away without waiting for sound feedback."
+
+    private static final byte voice_wake_up_language = (byte) 0x99;
+    // Language for "Hey bixby" wakeup - 1 = "de-DE", 2 = "en-GB", 3 = "en-US", 4 = "es-ES", 5 = "fr-FR", 6 = "it-IT", 7 = "ko-KR", 8 = "pt-BR", 9 = "zh-CN"
+
+    private static final byte set_voice_noti_status = (byte) 0xa4; //0x0/0x1
+    // I have no idea why it does that. It sends "1" when it starts reading notification aloud, and "0" when it finished.
+
+    private static final byte set_noise_controls = (byte) 0x78; //Takes 0/1/2.
+    // 0 is Ambient Sound and ANC OFF, 1 is ANC on, 2 is Ambient sound ON
+
+    private static final byte set_mute_earbud = (byte) 0xa2;
+    // Takes two booleans (left then right). This is used in conjuction with FIND_MY_EARBUDS_START to alternate between tweeting the left and the right earbud
+
+    private static final byte set_customize_ambient_sound = (byte) 0x82;
+    //one byte for left volume 0-4, one byte for right volume 0-4, and one byte 0-4 for ambient sound tone from "soft" to "clear"
+
+    private static final byte set_noise_reduction_level = (byte) 0x83;
+    // 1 means High noise reduction, 0 low noise reduction.
+
+    private static final byte set_touch_and_hold_noise_controls = (byte) 0x79;
+    // Takes either 3 booleans or 6 booleans depending on earbuds revision.
+    // It is used when long press on touchpad is set in SET_TOUCHPAD_OPTION to "Switch noise control",
+    // to control whether the long press switches between ANC on <=> Ambient sound on, or to anc+ambient off,
+    // or ambient <=> off or anc <=> off, and when it's 6 bytes, it can have different behavior between right and left earbud.
+
+    private static final byte voice_wake_up_event = (byte) 0x9a;
+    // Just a reponse. It's a ACK for when received "Hey bixby" command ?
+
+    private static final byte in_ear_detection = (byte) 0x6e;
+
     @Override
     public GBDeviceEvent[] decodeResponse(byte[] responseData) {
         List<GBDeviceEvent> devEvts = new ArrayList<>();
@@ -90,12 +172,12 @@ public class GalaxyBudsProtocol extends GBDeviceProtocol {
         byte type = 0;
 
         byte sof = incoming.get();
-        if (sof != SOM) {
+        if (sof != StartOfMessage) {
             LOG.error("Error in message, wrong start of frame: " + hexdump(responseData));
             return null;
         }
 
-        if (SOM == SOMPlus) {
+        if (StartOfMessage == SOM_BUDS_PLUS) {
             length = (int) (incoming.get() & 0xff);
             type = incoming.get();
         } else {
@@ -130,9 +212,9 @@ public class GalaxyBudsProtocol extends GBDeviceProtocol {
     byte[] encodeMessage(byte command) {
         ByteBuffer msgBuf = ByteBuffer.allocate(7);
         msgBuf.order(ByteOrder.LITTLE_ENDIAN);
-        msgBuf.put(SOM);
+        msgBuf.put(StartOfMessage);
         byte size = 0x3;
-        if (SOM == SOMPlus) {
+        if (StartOfMessage == SOM_BUDS_PLUS) {
             msgBuf.put((byte) size);
             msgBuf.put((byte) 0x0); //0x0 for sending
         } else {
@@ -141,7 +223,7 @@ public class GalaxyBudsProtocol extends GBDeviceProtocol {
         }
         msgBuf.put((byte) command); //command id
         msgBuf.putShort((short) crc16_ccitt(new byte[]{command}));
-        msgBuf.put(EOM);
+        msgBuf.put(EndOfMessage);
         LOG.debug("DEBUG: " + hexdump(msgBuf.array()));
         return msgBuf.array();
     }
@@ -149,9 +231,9 @@ public class GalaxyBudsProtocol extends GBDeviceProtocol {
     byte[] encodeMessage(byte command, byte parameter) {
         ByteBuffer msgBuf = ByteBuffer.allocate(8);
         msgBuf.order(ByteOrder.LITTLE_ENDIAN);
-        msgBuf.put(SOM);
+        msgBuf.put(StartOfMessage);
         byte size = 0x4;
-        if (SOM == SOMPlus) {
+        if (StartOfMessage == SOM_BUDS_PLUS) {
             msgBuf.put((byte) size);
             msgBuf.put((byte) 0x0); //0x0 for sending
         } else {
@@ -161,7 +243,7 @@ public class GalaxyBudsProtocol extends GBDeviceProtocol {
         msgBuf.put((byte) command); //command id
         msgBuf.put((byte) parameter);
         msgBuf.putShort((short) crc16_ccitt(new byte[]{command, parameter}));
-        msgBuf.put(EOM);
+        msgBuf.put(EndOfMessage);
         LOG.debug("DEBUG: " + hexdump(msgBuf.array()));
         return msgBuf.array();
     }
@@ -169,9 +251,9 @@ public class GalaxyBudsProtocol extends GBDeviceProtocol {
     byte[] encodeMessage(byte command, byte parameter, byte value) {
         ByteBuffer msgBuf = ByteBuffer.allocate(9);
         msgBuf.order(ByteOrder.LITTLE_ENDIAN);
-        msgBuf.put(SOM);
+        msgBuf.put(StartOfMessage);
         byte size = 0x5;
-        if (SOM == SOMPlus) {
+        if (StartOfMessage == SOM_BUDS_PLUS) {
             msgBuf.put((byte) size);
             msgBuf.put((byte) 0x0); //0x0 for sending
         } else {
@@ -182,11 +264,43 @@ public class GalaxyBudsProtocol extends GBDeviceProtocol {
         msgBuf.put((byte) parameter);
         msgBuf.put((byte) value);
         msgBuf.putShort((short) crc16_ccitt(new byte[]{command, parameter, value}));
-        msgBuf.put(EOM);
+        msgBuf.put(EndOfMessage);
         LOG.debug("DEBUG: " + hexdump(msgBuf.array()));
         return msgBuf.array();
     }
 
+    byte[] encodeMessage(byte command, byte[] payload) {
+        byte payload_size = (byte) (3 + payload.length);
+        ByteBuffer msgBuf = ByteBuffer.allocate(4 + payload_size);
+        msgBuf.order(ByteOrder.LITTLE_ENDIAN);
+        msgBuf.put(StartOfMessage);
+
+        if (StartOfMessage == SOM_BUDS_PLUS) {
+            msgBuf.put((byte) payload_size);
+            msgBuf.put((byte) 0x0); //0x0 for sending
+        } else {
+            msgBuf.put((byte) 0x0); //0x0 for sending
+            msgBuf.put((byte) payload_size); //size
+        }
+        msgBuf.put((byte) command);
+        msgBuf.put(payload);
+
+        ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+
+        try {
+            outputStream.write(command);
+            outputStream.write(payload);
+        } catch (IOException e) {
+            LOG.warn("Assembling message failed: " + e.getMessage());
+        }
+
+        msgBuf.putShort((short) crc16_ccitt(outputStream.toByteArray()));
+        msgBuf.put(EndOfMessage);
+        LOG.debug("DEBUG: " + hexdump(msgBuf.array()));
+        return msgBuf.array();
+    }
+
+
     @Override
     public byte[] encodeFindDevice(boolean start) {
         byte command = (byte) (start ? find_device_start : find_device_stop);
@@ -213,23 +327,76 @@ public class GalaxyBudsProtocol extends GBDeviceProtocol {
         SharedPreferences prefs = GBApplication.getDeviceSpecificSharedPrefs(getDevice().getAddress());
 
         switch (config) {
+            case DeviceSettingsPreferenceConst.PREF_GALAXY_PRO_DOUBLE_TAP_EDGE:
+                byte outside_double_tap = (byte) (prefs.getBoolean(DeviceSettingsPreferenceConst.PREF_GALAXY_PRO_DOUBLE_TAP_EDGE, false) ? 0x01 : 0x00);
+                return encodeMessage(set_outside_double_tap, outside_double_tap);
+
+            case DeviceSettingsPreferenceConst.PREF_GALAXY_BUDS_PRO_VOICE_DETECT:
+                byte detect_conversations = (byte) (prefs.getBoolean(DeviceSettingsPreferenceConst.PREF_GALAXY_BUDS_PRO_VOICE_DETECT, false) ? 0x01 : 0x00);
+                return encodeMessage(set_detect_conversations, detect_conversations);
+
+            case DeviceSettingsPreferenceConst.PREF_GALAXY_BUDS_PRO_VOICE_DETECT_DURATION:
+                String voice_detect_duration = prefs.getString(DeviceSettingsPreferenceConst.PREF_GALAXY_BUDS_PRO_VOICE_DETECT_DURATION, "1");
+                byte voice_detect_duration_b = (byte) Integer.parseInt(voice_detect_duration);
+                return encodeMessage(set_detect_conversations_duration, voice_detect_duration_b);
+
+
+            case DeviceSettingsPreferenceConst.PREF_GALAXY_BUDS_AMBIENT_MODE_DURING_CALL:
+                byte ambient_mode_during_calls = (byte) (prefs.getBoolean(DeviceSettingsPreferenceConst.PREF_GALAXY_BUDS_AMBIENT_MODE_DURING_CALL, false) ? 0x01 : 0x00);
+                return encodeMessage(set_ambient_mode_during_calls, ambient_mode_during_calls);
+
+            case DeviceSettingsPreferenceConst.PREFS_NOISE_CONTROL_WITH_ONE_EARBUD:
+                byte noise_controls_with_one_earbud = (byte) (prefs.getBoolean(DeviceSettingsPreferenceConst.PREFS_NOISE_CONTROL_WITH_ONE_EARBUD, false) ? 0x01 : 0x00);
+                return encodeMessage(set_noise_controls_with_one_earbud, noise_controls_with_one_earbud);
+
+            case DeviceSettingsPreferenceConst.PREF_GALAXY_BUDS_PRO_IN_EAR_DETECTION:
+                byte ear_detection = (byte) (prefs.getBoolean(DeviceSettingsPreferenceConst.PREF_GALAXY_BUDS_PRO_IN_EAR_DETECTION, false) ? 0x01 : 0x00);
+                return encodeMessage(in_ear_detection, ear_detection);
+
+            case DeviceSettingsPreferenceConst.PREF_GALAXY_BUDS_PRO_BALANCE:
+                int hearing_enhancements = prefs.getInt(DeviceSettingsPreferenceConst.PREF_GALAXY_BUDS_PRO_BALANCE, 16);
+                return encodeMessage(set_balance, (byte) hearing_enhancements);
+
+            case DeviceSettingsPreferenceConst.PREF_GALAXY_BUDS_PRO_NOISE_CONTROL:
+                int noise_controls = Integer.parseInt(prefs.getString(DeviceSettingsPreferenceConst.PREF_GALAXY_BUDS_PRO_NOISE_CONTROL, "0"));
+                return encodeMessage(set_noise_controls, (byte) noise_controls);
+
+            case DeviceSettingsPreferenceConst.PREF_GALAXY_BUDS_PRO_ANC_LEVEL:
+                int anc_level = Integer.parseInt(prefs.getString(DeviceSettingsPreferenceConst.PREF_GALAXY_BUDS_PRO_ANC_LEVEL, "0"));
+                return encodeMessage(set_noise_reduction_level, (byte) anc_level);
+
+            case DeviceSettingsPreferenceConst.PREF_GALAXY_BUDS_AMBIENT_SOUND:
+            case DeviceSettingsPreferenceConst.PREF_GALAXY_BUDS_PRO_AMBIENT_VOLUME_RIGHT:
+            case DeviceSettingsPreferenceConst.PREF_GALAXY_BUDS_PRO_AMBIENT_VOLUME_LEFT:
+            case DeviceSettingsPreferenceConst.PREF_GALAXY_BUDS_PRO_AMBIENT_SOUND_TONE:
+                byte ambient_sound = prefs.getBoolean(DeviceSettingsPreferenceConst.PREF_GALAXY_BUDS_AMBIENT_SOUND, true) ? (byte) 1 : (byte) 0;
+                int ambient_right = prefs.getInt(DeviceSettingsPreferenceConst.PREF_GALAXY_BUDS_PRO_AMBIENT_VOLUME_RIGHT, 1);
+                int ambient_left = prefs.getInt(DeviceSettingsPreferenceConst.PREF_GALAXY_BUDS_PRO_AMBIENT_VOLUME_LEFT, 1);
+                int sound_tone = prefs.getInt(DeviceSettingsPreferenceConst.PREF_GALAXY_BUDS_PRO_AMBIENT_SOUND_TONE, 1);
+                return encodeMessage(set_customize_ambient_sound, new byte[]{ambient_sound, (byte) ambient_left, (byte) ambient_right, (byte) sound_tone});
+
             case DeviceSettingsPreferenceConst.PREF_GALAXY_BUDS_AMBIENT_MODE:
                 byte enable_ambient = (byte) (prefs.getBoolean(DeviceSettingsPreferenceConst.PREF_GALAXY_BUDS_AMBIENT_MODE, false) ? 0x01 : 0x00);
                 return encodeMessage(set_ambient_mode, enable_ambient);
+
+            case DeviceSettingsPreferenceConst.PREFS_GALAXY_BUDS_SEAMLESS_CONNECTION:
+                byte seamless_switch = (byte) (prefs.getBoolean(DeviceSettingsPreferenceConst.PREFS_GALAXY_BUDS_SEAMLESS_CONNECTION, false) ? 0x01 : 0x00);
+                return encodeMessage(set_seamless_connection, seamless_switch);
+
             case DeviceSettingsPreferenceConst.PREF_GALAXY_BUDS_AMBIENT_VOICE_FOCUS:
                 byte enable_voice = (byte) (prefs.getBoolean(DeviceSettingsPreferenceConst.PREF_GALAXY_BUDS_AMBIENT_VOICE_FOCUS, false) ? 0x01 : 0x00);
                 return encodeMessage(set_ambient_voice_focus, enable_voice);
             case DeviceSettingsPreferenceConst.PREF_GALAXY_BUDS_AMBIENT_VOLUME:
                 int ambient_volume = prefs.getInt(DeviceSettingsPreferenceConst.PREF_GALAXY_BUDS_AMBIENT_VOLUME, 0);
-                byte ambient_volume_byte = (byte) (ambient_volume + 1); //seek bar is 0-4, we need 1-5
+                byte ambient_volume_byte = (byte) (ambient_volume);
                 return encodeMessage(set_ambient_volume, ambient_volume_byte);
             case DeviceSettingsPreferenceConst.PREF_GALAXY_BUDS_LOCK_TOUCH:
                 byte set_lock = (byte) (prefs.getBoolean(DeviceSettingsPreferenceConst.PREF_GALAXY_BUDS_LOCK_TOUCH, false) ? 0x01 : 0x00);
                 return encodeMessage(set_lock_touch, set_lock);
             case DeviceSettingsPreferenceConst.PREF_GALAXY_BUDS_GAME_MODE:
-                if (SOM == SOMPlus) {
+                if (StartOfMessage == SOM_BUDS_PLUS) {
                     byte game_mode = (byte) (prefs.getBoolean(DeviceSettingsPreferenceConst.PREF_GALAXY_BUDS_GAME_MODE, false) ? 0x1 : 0x00);
-                    return encodeMessage(set_live_game_mode, game_mode);
+                    return encodeMessage(set_live_pro_game_mode, game_mode);
                 } else {
                     byte game_mode = (byte) (prefs.getBoolean(DeviceSettingsPreferenceConst.PREF_GALAXY_BUDS_GAME_MODE, false) ? 0x2 : 0x00);
                     return encodeMessage(set_game_mode, game_mode);
@@ -246,7 +413,7 @@ public class GalaxyBudsProtocol extends GBDeviceProtocol {
                 }
                 String equalizer_mode = prefs.getString(DeviceSettingsPreferenceConst.PREF_GALAXY_BUDS_EQUALIZER_MODE, "0");
 
-                if (SOM == SOMPlus) {
+                if (StartOfMessage == SOM_BUDS_PLUS) {
                     return encodeMessage(set_equalizer, (byte) (Integer.parseInt(equalizer_mode)));
                 } else {
                     byte mode = (byte) (Integer.parseInt(equalizer_mode) + dolby);
@@ -261,6 +428,22 @@ public class GalaxyBudsProtocol extends GBDeviceProtocol {
                 byte touchmode_right = (byte) Integer.parseInt(touch_right);
                 return encodeMessage(set_touchpad_options, touchmode_left, touchmode_right);
 
+            case DeviceSettingsPreferenceConst.PREF_GALAXY_BUDS_TOUCH_RIGHT_SWITCH:
+            case DeviceSettingsPreferenceConst.PREF_GALAXY_BUDS_TOUCH_LEFT_SWITCH:
+                String touch_right_switch = prefs.getString(DeviceSettingsPreferenceConst.PREF_GALAXY_BUDS_TOUCH_RIGHT_SWITCH, "1");
+                String touch_left_switch = prefs.getString(DeviceSettingsPreferenceConst.PREF_GALAXY_BUDS_TOUCH_LEFT_SWITCH, "1");
+                byte[] touch_right_switch_b = encode_touch_switch(touch_right_switch);
+                byte[] touch_left_switch_b = encode_touch_switch(touch_left_switch);
+                ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+                try {
+                    outputStream.write(touch_left_switch_b);
+                    outputStream.write(touch_right_switch_b);
+                } catch (IOException e) {
+                    LOG.warn("Assembling message failed: " + e.getMessage());
+                }
+                return encodeMessage(set_touch_and_hold_noise_controls, outputStream.toByteArray());
+
+
             case DeviceSettingsPreferenceConst.PREF_GALAXY_BUDS_LIVE_ANC:
                 byte enable_anc = (byte) (prefs.getBoolean(DeviceSettingsPreferenceConst.PREF_GALAXY_BUDS_LIVE_ANC, false) ? 0x1 : 0x00);
                 return encodeMessage(set_automatic_noise_cancelling, enable_anc);
@@ -304,7 +487,7 @@ public class GalaxyBudsProtocol extends GBDeviceProtocol {
         deviceEvents.add(evBattery2);
 
 
-        if (SOM == SOMPlus) {
+        if (StartOfMessage == SOM_BUDS_PLUS) {
             GBDeviceEventBatteryInfo evBattery3 = new GBDeviceEventBatteryInfo();
             // reorder for the non OG version
             evBattery1.batteryIndex = 1; //left
@@ -320,11 +503,23 @@ public class GalaxyBudsProtocol extends GBDeviceProtocol {
         return deviceEvents;
     }
 
+    private byte[] encode_touch_switch(String input) {
+        switch (input) {
+            case "1":
+                return new byte[]{0x1, 0x0, 0x1};
+            case "2":
+                return new byte[]{0x0, 0x1, 0x1};
+            default:
+                return new byte[]{0x1, 0x1, 0x0};
+        }
+    }
+
     protected GalaxyBudsProtocol(GBDevice device) {
         super(device);
-        if (device.getType().equals(DeviceType.GALAXY_BUDS_LIVE)) {
-            SOM = SOMPlus;
-            EOM = EOMPlus;
+        if (device.getType().equals(DeviceType.GALAXY_BUDS_LIVE)
+                || device.getType().equals(DeviceType.GALAXY_BUDS_PRO)) {
+            StartOfMessage = SOM_BUDS_PLUS;
+            EndOfMessage = EOM_BUDS_PLUS;
         }
     }
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/DeviceHelper.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/DeviceHelper.java
index eb0429c84..3328e952c 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/DeviceHelper.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/DeviceHelper.java
@@ -51,6 +51,7 @@ import nodomain.freeyourgadget.gadgetbridge.devices.casio.gbx100.CasioGBX100Devi
 import nodomain.freeyourgadget.gadgetbridge.devices.domyos.DomyosT540Cooridnator;
 import nodomain.freeyourgadget.gadgetbridge.devices.galaxy_buds.GalaxyBudsDeviceCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.galaxy_buds.GalaxyBudsLiveDeviceCoordinator;
+import nodomain.freeyourgadget.gadgetbridge.devices.galaxy_buds.GalaxyBudsProDeviceCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.hplus.EXRIZUK8Coordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.hplus.HPlusCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.hplus.MakibesF68Coordinator;
@@ -323,6 +324,7 @@ public class DeviceHelper {
         result.add(new Ear1Coordinator());
         result.add(new GalaxyBudsDeviceCoordinator());
         result.add(new GalaxyBudsLiveDeviceCoordinator());
+        result.add(new GalaxyBudsProDeviceCoordinator());
         result.add(new VescCoordinator());
         result.add(new SonyWH1000XM3Coordinator());
         result.add(new SonyWH1000XM4Coordinator());
diff --git a/app/src/main/res/drawable/ic_buds_pro_case.xml b/app/src/main/res/drawable/ic_buds_pro_case.xml
new file mode 100644
index 000000000..769645bac
--- /dev/null
+++ b/app/src/main/res/drawable/ic_buds_pro_case.xml
@@ -0,0 +1,3 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="10.399478dp" android:height="10.338884dp" android:tint="#7E7E7E" android:viewportWidth="10.399477" android:viewportHeight="10.338885">
+    <path android:fillColor="#000000" android:pathData="M2.873 9.063C0.861 8.728-0.35 6.263 0.452 4.14c0.698-1.85 1.22-2.386 2.716-2.793C3.791 1.177 6.401 1.146 7.05 1.3c1.278 0.302 1.887 0.728 2.37 1.655 0.707 1.36 0.896 2.223 0.719 3.275C9.88 7.76 8.846 8.841 7.416 9.075 6.858 9.166 3.437 9.157 2.872 9.063zm4.644-0.155c0.604-0.11 1.305-0.487 1.655-0.887 0.307-0.353 0.686-1.108 0.768-1.532l0.053-0.274-0.229 0.244c-0.332 0.355-0.774 0.623-1.34 0.81-1.136 0.378-5.214 0.387-6.41 0.015C1.456 7.11 0.82 6.728 0.58 6.422L0.417 6.215l0.047 0.274c0.07 0.417 0.462 1.196 0.773 1.54 0.331 0.367 0.958 0.724 1.5 0.856 0.506 0.123 4.14 0.14 4.78 0.023zM8.082 7.24c0.917-0.232 1.683-0.775 1.9-1.348 0.209-0.547-0.02-1.558-0.622-2.756-0.47-0.93-1.06-1.376-2.2-1.665-0.677-0.172-3.41-0.148-4.066 0.036-1.07 0.3-1.649 0.765-2.081 1.677-0.995 2.096-0.885 3.04 0.434 3.73 0.83 0.434 1.469 0.509 4.07 0.476C7.078 7.37 7.711 7.333 8.08 7.24z" android:strokeWidth="0.4" android:strokeColor="#000000"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_buds_pro_left.xml b/app/src/main/res/drawable/ic_buds_pro_left.xml
new file mode 100644
index 000000000..12af00c73
--- /dev/null
+++ b/app/src/main/res/drawable/ic_buds_pro_left.xml
@@ -0,0 +1,17 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="10.999999dp"
+    android:height="10.999998dp"
+    android:tint="#7E7E7E"
+    android:viewportWidth="11"
+    android:viewportHeight="10.999998">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M4.654 2.265h0.368v2.423h1.324V5H4.654zM4.97 9.917c0.357-0.15 0.823-0.536 0.969-0.805C6.01 8.978 5.964 8.977 5.463 9.1 4.48 9.34 3.784 9.109 3.157 8.33c-0.26-0.324-0.296-0.445-0.34-1.178l-0.05-0.817L2.512 6.64C1.69 7.62 2.051 9.288 3.213 9.862c0.489 0.243 1.251 0.266 1.757 0.055zm-1.33 0.329c-0.542-0.13-0.867-0.328-1.226-0.747-0.606-0.708-0.727-1.776-0.3-2.636C2.25 6.592 2.438 6.329 2.53 6.279c0.158-0.085 0.16-0.12 0.026-0.496-0.352-0.992-0.21-2.516 0.328-3.504 0.33-0.604 1.043-1.243 1.604-1.434 1.115-0.38 2.68 0.042 3.461 0.935 1.212 1.384 1.528 3.218 0.817 4.731C8.528 7.02 7.551 8.008 6.84 8.461c-0.343 0.22-0.564 0.444-0.677 0.69-0.372 0.803-1.569 1.322-2.523 1.095zm2.199-1.497c0.978-0.372 2.47-1.672 2.795-2.435 0.783-1.84-0.119-4.304-1.87-5.11-0.807-0.37-1.79-0.385-2.471-0.037C2.842 1.907 2.187 4.02 2.829 5.89c0.096 0.281 0.176 0.771 0.177 1.088 0.005 1.232 0.672 1.948 1.818 1.949 0.305 0 0.75-0.078 1.015-0.179z"
+        android:strokeWidth="0.265"
+        android:strokeColor="#000000" />
+    <path
+        android:fillColor="#000000"
+        android:pathData="M5.705 6.158c0.032-0.082 0.4-0.286 0.819-0.455 0.849-0.343 1.068-0.31 1.068 0.157 0 0.246-0.062 0.297-0.71 0.574-0.864 0.37-0.952 0.56-1.06 0.266-0.107-0.294-0.148-0.461-0.117-0.542z"
+        android:strokeWidth="0.4"
+        android:strokeColor="#000000" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_buds_pro_right.xml b/app/src/main/res/drawable/ic_buds_pro_right.xml
new file mode 100644
index 000000000..0304040bb
--- /dev/null
+++ b/app/src/main/res/drawable/ic_buds_pro_right.xml
@@ -0,0 +1,17 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="10.999999dp"
+    android:height="10.999999dp"
+    android:tint="#7E7E7E"
+    android:viewportWidth="11"
+    android:viewportHeight="10.999999">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M5.69 3.701q0.117 0.04 0.228 0.172 0.113 0.132 0.226 0.363l0.373 0.748H6.122L5.775 4.282Q5.64 4.007 5.513 3.917q-0.126-0.09-0.344-0.09h-0.4v1.157H4.4V2.248h0.83q0.466 0 0.695 0.196 0.229 0.196 0.229 0.592 0 0.258-0.12 0.429Q5.917 3.635 5.689 3.7zM4.768 2.552v0.971H5.23q0.265 0 0.4-0.122 0.137-0.125 0.137-0.365T5.63 2.676q-0.135-0.124-0.4-0.124zm1.26 7.365C5.672 9.767 5.206 9.381 5.06 9.112 4.99 8.978 5.036 8.977 5.537 9.1c0.984 0.24 1.68 0.009 2.306-0.77 0.26-0.324 0.296-0.445 0.34-1.178l0.05-0.817 0.256 0.306c0.822 0.98 0.46 2.647-0.702 3.221-0.489 0.243-1.251 0.266-1.757 0.055zM5.162 8.749c-0.978-0.372-2.47-1.672-2.795-2.435-0.783-1.84 0.119-4.304 1.87-5.11 0.807-0.37 1.79-0.385 2.471-0.037 1.45 0.74 2.105 2.853 1.463 4.723-0.096 0.282-0.176 0.77-0.177 1.089-0.005 1.232-0.672 1.947-1.818 1.949-0.305 0-0.75-0.078-1.015-0.18zm2.2 1.497c0.541-0.13 0.866-0.328 1.225-0.747 0.606-0.708 0.727-1.776 0.3-2.636C8.75 6.592 8.562 6.329 8.47 6.279c-0.158-0.085-0.16-0.12-0.026-0.496 0.352-0.992 0.21-2.516-0.328-3.504-0.33-0.604-1.043-1.243-1.604-1.434-1.115-0.38-2.68 0.042-3.461 0.935-1.212 1.384-1.528 3.218-0.817 4.731 0.238 0.508 1.215 1.497 1.926 1.95 0.343 0.22 0.564 0.444 0.677 0.69 0.372 0.803 1.569 1.322 2.523 1.095z"
+        android:strokeWidth="0.299542"
+        android:strokeColor="#000000" />
+    <path
+        android:fillColor="#000000"
+        android:pathData="M5.295 6.158c-0.031-0.082-0.4-0.286-0.818-0.455-0.85-0.343-1.069-0.31-1.069 0.157 0 0.246 0.063 0.297 0.71 0.574 0.864 0.37 0.947 0.408 1.058 0.19 0.11-0.218 0.15-0.385 0.119-0.466z"
+        android:strokeWidth="0.4"
+        android:strokeColor="#000000" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_device_galaxy_buds_pro.xml b/app/src/main/res/drawable/ic_device_galaxy_buds_pro.xml
new file mode 100644
index 000000000..4b5b21950
--- /dev/null
+++ b/app/src/main/res/drawable/ic_device_galaxy_buds_pro.xml
@@ -0,0 +1,31 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="45sp"
+    android:height="45sp"
+    android:viewportWidth="30"
+    android:viewportHeight="30">
+    <path
+        android:fillColor="#1f7fdb"
+        android:pathData="M3.8712,3.8769L24.7963,3.8769A0.9472,0.9472 0,0 1,25.7435 4.8241L25.7435,24.8343A0.9472,0.9472 0,0 1,24.7963 25.7815L3.8712,25.7815A0.9472,0.9472 0,0 1,2.924 24.8343L2.924,4.8241A0.9472,0.9472 0,0 1,3.8712 3.8769z"
+        android:strokeWidth="3.57115"
+        android:strokeColor="#00000000" />
+    <path
+        android:fillColor="#4dabf5"
+        android:pathData="M3.879,3.0349L24.8041,3.0349A0.9472,0.9472 0,0 1,25.7514 3.9822L25.7514,23.9924A0.9472,0.9472 0,0 1,24.8041 24.9396L3.879,24.9396A0.9472,0.9472 0,0 1,2.9318 23.9924L2.9318,3.9822A0.9472,0.9472 0,0 1,3.879 3.0349z"
+        android:strokeWidth="3.57115"
+        android:strokeColor="#00000000" />
+    <path
+        android:fillColor="#2196f3"
+        android:pathData="M3.8711,3.4131L24.7962,3.4131A0.9472,0.9472 0,0 1,25.7435 4.3603L25.7435,24.3705A0.9472,0.9472 0,0 1,24.7962 25.3177L3.8711,25.3177A0.9472,0.9472 0,0 1,2.9239 24.3705L2.9239,4.3603A0.9472,0.9472 0,0 1,3.8711 3.4131z"
+        android:strokeWidth="3.57115"
+        android:strokeColor="#00000000" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="m21.2919,23.2015c0.6342,-0.1548 1.0149,-0.392 1.4344,-0.894 0.7094,-0.8486 0.8512,-2.1283 0.3502,-3.158 -0.1582,-0.3251 -0.377,-0.6401 -0.4861,-0.6999 -0.1847,-0.1012 -0.1868,-0.1424 -0.0305,-0.5933 0.4121,-1.1887 0.2451,-3.014 -0.384,-4.1977 -0.3848,-0.724 -1.2208,-1.4895 -1.8766,-1.7183 -1.3054,-0.4555 -3.136,0.051 -4.0509,1.1204 -1.418,1.6577 -1.7887,3.8542 -0.9565,5.6672 0.2793,0.6085 1.4226,1.7934 2.2541,2.3362 0.402,0.2624 0.6604,0.5313 0.7933,0.8255 0.4347,0.9623 1.8352,1.5845 2.9527,1.3118zM19.7347,22.8078c-0.4177,-0.1787 -0.9625,-0.6424 -1.1335,-0.9646 -0.0846,-0.1596 -0.0299,-0.161 0.5561,-0.0144 1.1521,0.2882 1.9675,0.0109 2.6995,-0.9215 0.3051,-0.3883 0.346,-0.5332 0.3978,-1.4115l0.0577,-0.9789 0.3002,0.3663c0.9623,1.1744 0.5377,3.1707 -0.821,3.8594 -0.5724,0.2901 -1.4649,0.3184 -2.0568,0.0651zM18.7182,21.4086c-1.1454,-0.4457 -2.8916,-2.0023 -3.2716,-2.9163 -0.9165,-2.2045 0.1396,-5.1562 2.19,-6.1208 0.9436,-0.4439 2.0937,-0.462 2.8908,-0.0454 1.6982,0.8873 2.465,3.4189 1.7138,5.6589 -0.1131,0.3371 -0.2067,0.9238 -0.208,1.3038 -0.0056,1.476 -0.786,2.3326 -2.1276,2.3341 -0.3572,0.0004 -0.8771,-0.0933 -1.1874,-0.2141zM18.7696,18.7483c0.0941,-0.1471 0.1413,-0.347 0.1049,-0.4442 -0.0365,-0.0973 -0.4674,-0.3424 -0.9577,-0.5448 -0.994,-0.4103 -1.2506,-0.3717 -1.2506,0.1881 0,0.2954 0.0735,0.3564 0.8303,0.6882 1.0117,0.4436 1.0587,0.4478 1.2731,0.1126z"
+        android:strokeWidth="0.499999"
+        android:strokeColor="#ffffff" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="m7.8637,17.6849c-0.6433,-0.1548 -1.0294,-0.392 -1.455,-0.894 -0.7195,-0.8486 -0.8635,-2.1283 -0.3552,-3.158 0.1605,-0.3251 0.3824,-0.6401 0.4931,-0.6999 0.1874,-0.1012 0.1895,-0.1424 0.031,-0.5932 -0.418,-1.1887 -0.2486,-3.014 0.3895,-4.1977 0.3903,-0.724 1.2383,-1.4895 1.9035,-1.7183 1.3241,-0.4555 3.181,0.0509 4.1091,1.1204 1.4383,1.6578 1.8143,3.8542 0.9702,5.6672 -0.2833,0.6085 -1.443,1.7934 -2.2864,2.3362 -0.4078,0.2624 -0.6699,0.5313 -0.8047,0.8255 -0.4409,0.9623 -1.8616,1.5845 -2.995,1.3118zM9.4431,17.2912c0.4237,-0.1787 0.9763,-0.6423 1.1497,-0.9646 0.0858,-0.1596 0.0303,-0.161 -0.5641,-0.0144 -1.1687,0.2882 -1.9957,0.0108 -2.7382,-0.9215 -0.3095,-0.3882 -0.3509,-0.5332 -0.4035,-1.4115l-0.0586,-0.9789 -0.3045,0.3663c-0.9761,1.1744 -0.5454,3.1707 0.8327,3.8594 0.5806,0.2901 1.4859,0.3184 2.0864,0.0652zM10.4743,15.892c1.1618,-0.4457 2.9331,-2.0023 3.3186,-2.9163C14.7225,10.7711 13.6513,7.8195 11.5715,6.8549 10.6144,6.411 9.4477,6.3929 8.6392,6.8094c-1.7226,0.8873 -2.5003,3.419 -1.7384,5.6589 0.1147,0.3371 0.2096,0.9238 0.211,1.3038 0.0052,1.4759 0.7973,2.3326 2.1581,2.3341 0.3623,0.0004 0.8897,-0.0933 1.2044,-0.2141zM10.4222,13.2317c-0.0955,-0.1471 -0.1434,-0.347 -0.1064,-0.4442 0.037,-0.0973 0.4741,-0.3424 0.9715,-0.5448 1.0082,-0.4103 1.2686,-0.3717 1.2686,0.1881 0,0.2954 -0.0746,0.3564 -0.8422,0.6882 -1.0262,0.4436 -1.0739,0.4478 -1.2914,0.1126z"
+        android:strokeWidth="0.5"
+        android:strokeColor="#fffffd" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_device_galaxy_buds_pro_disabled.xml b/app/src/main/res/drawable/ic_device_galaxy_buds_pro_disabled.xml
new file mode 100644
index 000000000..9d9584b39
--- /dev/null
+++ b/app/src/main/res/drawable/ic_device_galaxy_buds_pro_disabled.xml
@@ -0,0 +1,36 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="45sp"
+    android:height="45sp"
+    android:viewportWidth="30"
+    android:viewportHeight="30">
+    <path
+        android:fillColor="#7a7a7a"
+        android:pathData="M3.8712,3.8769L24.7963,3.8769A0.9472,0.9472 0,0 1,25.7435 4.8241L25.7435,24.8343A0.9472,0.9472 0,0 1,24.7963 25.7815L3.8712,25.7815A0.9472,0.9472 0,0 1,2.924 24.8343L2.924,4.8241A0.9472,0.9472 0,0 1,3.8712 3.8769z"
+        android:strokeWidth="3.57115173"
+        android:strokeColor="#00000000" />
+    <path
+        android:fillAlpha="0.9411765"
+        android:fillColor="#9f9f9f"
+        android:pathData="M3.879,3.0349L24.8041,3.0349A0.9472,0.9472 0,0 1,25.7514 3.9822L25.7514,23.9924A0.9472,0.9472 0,0 1,24.8041 24.9396L3.879,24.9396A0.9472,0.9472 0,0 1,2.9318 23.9924L2.9318,3.9822A0.9472,0.9472 0,0 1,3.879 3.0349z"
+        android:strokeWidth="3.57115173"
+        android:strokeColor="#00000000" />
+    <path
+        android:fillColor="#8a8a8a"
+        android:pathData="M3.8711,3.4131L24.7962,3.4131A0.9472,0.9472 0,0 1,25.7435 4.3603L25.7435,24.3705A0.9472,0.9472 0,0 1,24.7962 25.3177L3.8711,25.3177A0.9472,0.9472 0,0 1,2.9239 24.3705L2.9239,4.3603A0.9472,0.9472 0,0 1,3.8711 3.4131z"
+        android:strokeWidth="3.57115173"
+        android:strokeColor="#00000000" />
+    <path
+        android:fillAlpha="0.9411765"
+        android:fillColor="#8a8a8a"
+        android:pathData="m12.4827,10.8654h3.907v6.978h-3.907z" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="m21.2919,23.2015c0.6342,-0.1548 1.0149,-0.392 1.4344,-0.894 0.7094,-0.8486 0.8512,-2.1283 0.3502,-3.158 -0.1582,-0.3251 -0.377,-0.6401 -0.4861,-0.6999 -0.1847,-0.1012 -0.1868,-0.1424 -0.0305,-0.5933 0.4121,-1.1887 0.2451,-3.014 -0.384,-4.1977 -0.3848,-0.724 -1.2208,-1.4895 -1.8766,-1.7183 -1.3054,-0.4555 -3.136,0.051 -4.0509,1.1204 -1.418,1.6577 -1.7887,3.8542 -0.9565,5.6672 0.2793,0.6085 1.4226,1.7934 2.2541,2.3362 0.402,0.2624 0.6604,0.5313 0.7933,0.8255 0.4347,0.9623 1.8352,1.5845 2.9527,1.3118zM19.7347,22.8078c-0.4177,-0.1787 -0.9625,-0.6424 -1.1335,-0.9646 -0.0846,-0.1596 -0.0299,-0.161 0.5561,-0.0144 1.1521,0.2882 1.9675,0.0109 2.6995,-0.9215 0.3051,-0.3883 0.346,-0.5332 0.3978,-1.4115l0.0577,-0.9789 0.3002,0.3663c0.9623,1.1744 0.5377,3.1707 -0.821,3.8594 -0.5724,0.2901 -1.4649,0.3184 -2.0568,0.0651zM18.7182,21.4086c-1.1454,-0.4457 -2.8916,-2.0023 -3.2716,-2.9163 -0.9165,-2.2045 0.1396,-5.1562 2.19,-6.1208 0.9436,-0.4439 2.0937,-0.462 2.8908,-0.0454 1.6982,0.8873 2.465,3.4189 1.7138,5.6589 -0.1131,0.3371 -0.2067,0.9238 -0.208,1.3038 -0.0056,1.476 -0.786,2.3326 -2.1276,2.3341 -0.3572,0.0004 -0.8771,-0.0933 -1.1874,-0.2141zM18.7696,18.7483c0.0941,-0.1471 0.1413,-0.347 0.1049,-0.4442 -0.0365,-0.0973 -0.4674,-0.3424 -0.9577,-0.5448 -0.994,-0.4103 -1.2506,-0.3717 -1.2506,0.1881 0,0.2954 0.0735,0.3564 0.8303,0.6882 1.0117,0.4436 1.0587,0.4478 1.2731,0.1126z"
+        android:strokeWidth="0.499999"
+        android:strokeColor="#ffffff" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="m7.8637,17.6849c-0.6433,-0.1548 -1.0294,-0.392 -1.455,-0.894 -0.7195,-0.8486 -0.8635,-2.1283 -0.3552,-3.158 0.1605,-0.3251 0.3824,-0.6401 0.4931,-0.6999 0.1874,-0.1012 0.1895,-0.1424 0.031,-0.5932 -0.418,-1.1887 -0.2486,-3.014 0.3895,-4.1977 0.3903,-0.724 1.2383,-1.4895 1.9035,-1.7183 1.3241,-0.4555 3.181,0.0509 4.1091,1.1204 1.4383,1.6578 1.8143,3.8542 0.9702,5.6672 -0.2833,0.6085 -1.443,1.7934 -2.2864,2.3362 -0.4078,0.2624 -0.6699,0.5313 -0.8047,0.8255 -0.4409,0.9623 -1.8616,1.5845 -2.995,1.3118zM9.4431,17.2912c0.4237,-0.1787 0.9763,-0.6423 1.1497,-0.9646 0.0858,-0.1596 0.0303,-0.161 -0.5641,-0.0144 -1.1687,0.2882 -1.9957,0.0108 -2.7382,-0.9215 -0.3095,-0.3882 -0.3509,-0.5332 -0.4035,-1.4115l-0.0586,-0.9789 -0.3045,0.3663c-0.9761,1.1744 -0.5454,3.1707 0.8327,3.8594 0.5806,0.2901 1.4859,0.3184 2.0864,0.0652zM10.4743,15.892c1.1618,-0.4457 2.9331,-2.0023 3.3186,-2.9163C14.7225,10.7711 13.6513,7.8195 11.5715,6.8549 10.6144,6.411 9.4477,6.3929 8.6392,6.8094c-1.7226,0.8873 -2.5003,3.419 -1.7384,5.6589 0.1147,0.3371 0.2096,0.9238 0.211,1.3038 0.0052,1.4759 0.7973,2.3326 2.1581,2.3341 0.3623,0.0004 0.8897,-0.0933 1.2044,-0.2141zM10.4222,13.2317c-0.0955,-0.1471 -0.1434,-0.347 -0.1064,-0.4442 0.037,-0.0973 0.4741,-0.3424 0.9715,-0.5448 1.0082,-0.4103 1.2686,-0.3717 1.2686,0.1881 0,0.2954 -0.0746,0.3564 -0.8422,0.6882 -1.0262,0.4436 -1.0739,0.4478 -1.2914,0.1126z"
+        android:strokeWidth="0.5"
+        android:strokeColor="#fffffd" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_switch_right.xml b/app/src/main/res/drawable/ic_switch_right.xml
new file mode 100644
index 000000000..3fbf74610
--- /dev/null
+++ b/app/src/main/res/drawable/ic_switch_right.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#7E7E7E"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M15.5,15.38V8.62L18.88,12L15.5,15.38M20.29,12.71c0.39,-0.39 0.39,-1.02 0,-1.41l-4.59,-4.59C15.08,6.08 14,6.52 14,7.41v9.17c0,0.89 1.08,1.34 1.71,0.71L20.29,12.71zM10,16.59V7.41c0,-0.89 -1.08,-1.34 -1.71,-0.71l-4.59,4.59c-0.39,0.39 -0.39,1.02 0,1.41l4.59,4.59C8.92,17.92 10,17.48 10,16.59z" />
+</vector>
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index 73cea0d25..aa3c82889 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -1957,10 +1957,85 @@
         <item>5</item>
     </string-array>
 
-    <string-array name="galaxy_touch_options">
+    <string-array name="galaxy_pro_noise_controls_options_values">
+        <item>0</item>
+        <item>1</item>
+        <item>2</item>
+    </string-array>
+
+    <string-array name="galaxy_pro_noise_controls_options">
+        <item>@string/off</item>
+        <item>@string/prefs_active_noise_cancelling</item>
+        <item>@string/prefs_ambient_sound</item>
+    </string-array>
+
+    <string-array name="galaxy_pro_anc_level_values">
+        <item>0</item>
+        <item>1</item>
+    </string-array>
+
+    <string-array name="galaxy_pro_anc_level_options">
+        <item>@string/prefs_active_noise_cancelling_level_low</item>
+        <item>@string/prefs_active_noise_cancelling_level_high</item>
+    </string-array>
+
+
+    <string-array name="galaxy_pro_touch_options_left">
+        <item>@string/pref_switch_noise_control</item>
+        <item>@string/pref_title_touch_voice_assistant</item>
+        <item>@string/pref_media_volumedown</item>
+        <item>@string/pref_title_touch_spotify</item>
+    </string-array>
+
+    <string-array name="galaxy_pro_touch_options_right">
+        <item>@string/pref_switch_noise_control</item>
+        <item>@string/pref_title_touch_voice_assistant</item>
+        <item>@string/pref_media_volumeup</item>
+        <item>@string/pref_title_touch_spotify</item>
+    </string-array>
+
+    <string-array name="galaxy_pro_touch_options_values">
+        <item>2</item>
+        <item>1</item>
+        <item>3</item>
+        <item>4</item>
+    </string-array>
+
+    <string-array name="galaxy_pro_touch_switch_controls_options">
+        <item>@string/pref_switch_controls_anc_ambient</item>
+        <item>@string/pref_switch_controls_anc_off</item>
+        <item>@string/pref_switch_controls_ambient_off</item>
+    </string-array>
+
+    <string-array name="galaxy_pro_touch_switch_controls_values">
+        <item>0</item>
+        <item>1</item>
+        <item>2</item>
+    </string-array>
+
+    <string-array name="galaxy_pro_voice_detect_duration_options">
+        <item>@string/pref_voice_detect_duration_5</item>
+        <item>@string/pref_voice_detect_duration_10</item>
+        <item>@string/pref_voice_detect_duration_15</item>
+    </string-array>
+
+    <string-array name="galaxy_pro_voice_detect_duration_values">
+        <item>0</item>
+        <item>1</item>
+        <item>2</item>
+    </string-array>
+
+    <string-array name="galaxy_touch_options_left">
         <item>@string/pref_title_touch_voice_assistant</item>
         <item>@string/pref_title_touch_quick_ambient</item>
-        <item>@string/pref_title_touch_volume</item>
+        <item>@string/pref_media_volumedown</item>
+        <item>@string/pref_title_touch_ambient</item>
+    </string-array>
+
+    <string-array name="galaxy_touch_options_right">
+        <item>@string/pref_title_touch_voice_assistant</item>
+        <item>@string/pref_title_touch_quick_ambient</item>
+        <item>@string/pref_media_volumeup</item>
         <item>@string/pref_title_touch_ambient</item>
     </string-array>
 
@@ -1971,10 +2046,16 @@
         <item>3</item>
     </string-array>
 
-    <string-array name="galaxy_buds_live_touch_options">
+    <string-array name="galaxy_buds_live_touch_options_left">
         <item>@string/pref_title_touch_voice_assistant</item>
         <item>@string/pref_title_touch_anc</item>
-        <item>@string/pref_title_touch_volume</item>
+        <item>@string/pref_media_volumedown</item>
+    </string-array>
+
+    <string-array name="galaxy_buds_live_touch_options_right">
+        <item>@string/pref_title_touch_voice_assistant</item>
+        <item>@string/pref_title_touch_anc</item>
+        <item>@string/pref_media_volumeup</item>
     </string-array>
 
     <string-array name="galaxy_buds_live_touch_options_values">
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 29ca3d806..32f0ddada 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1411,8 +1411,10 @@
     <string name="devicetype_nothingear1">Nothing Ear (1)</string>
     <string name="devicetype_galaxybuds">Galaxy Buds</string>
     <string name="devicetype_galaxybuds_live">Galaxy Buds Live</string>
+    <string name="devicetype_galaxybuds_pro">Galaxy Buds Pro</string>
     <string name="nothing_prefs_inear_summary">Play/pause the music depending if you wear the earbuds</string>
     <string name="nothing_prefs_inear_title">In-Ear detection</string>
+    <string name="prefs_in_ear_detection_summary">Play calls through your earbuds when they are in your ears</string>
     <string name="nothing_prefs_audiomode_title">Audio mode</string>
     <string name="prefs_equalizer_preset">Equalizer Preset</string>
     <string name="pref_title_equalizer_normal">Normal</string>
@@ -1430,22 +1432,60 @@
     <string name="prefs_touch_lock">Touch Lock</string>
     <string name="prefs_touch_lock_summary">Disable touch events</string>
     <string name="prefs_galaxy_buds_experimental">Experimental</string>
+    <string name="prefs_seamless_connection_switch_title">Seamless connection switch</string>
+    <string name="prefs_seamless_connection_switch_summary">Switches the buds between paired devices automatically</string>
     <string name="prefs_ambient_volume">Ambient volume</string>
+    <string name="prefs_ambient_volume_left">Ambient Volume Left</string>
+    <string name="prefs_ambient_volume_right">Ambient Volume Right</string>
     <string name="prefs_ambient_voice_focus">Voice Focus</string>
     <string name="prefs_ambient_voice_summary">Make voice stand out</string>
     <string name="prefs_ambient_sound">Ambient Sound</string>
+    <string name="prefs_customize_ambient_sound_summary">Customize Ambient Sound</string>
+    <string name="prefs_ambient_sound_during_call_title">Ambient Sound during call</string>
+    <string name="prefs_ambient_sound_during_call_summary">Hear own voice during call</string>
     <string name="prefs_ambient_mode">Ambient Mode</string>
+    <string name="prefs_ambient_settings_title">Ambient Sound Options</string>
     <string name="prefs_active_noise_cancelling">Active Noise Cancelling</string>
+    <string name="prefs_active_noise_cancelling_level">Active Noise Cancelling Level</string>
+    <string name="prefs_active_noise_cancelling_level_high">High</string>
+    <string name="prefs_active_noise_cancelling_level_low">Low</string>
     <string name="prefs_active_noise_cancelling_summary">Block noises of the surroundings</string>
     <string name="prefs_pressure_relief">Pressure relief with ambient sound</string>
     <string name="pressure_relief_summary">Prevent feeling of pressure in ears when not using Active Noise Cancelling</string>
     <string name="prefs_left">Left</string>
     <string name="prefs_right">Right</string>
+    <string name="prefs_switch_control_left">Switch control left</string>
+    <string name="prefs_switch_control_right">Switch control right</string>
     <string name="prefs_galaxy_touch_options">Touch Options</string>
     <string name="battery_case">Battery case</string>
     <string name="left_earbud">Left earbud</string>
     <string name="right_earbud">Right earbud</string>
     <string name="audio_codec">Audio Codec</string>
+    <string name="pref_title_touch_voice_assistant">Voice Assistant</string>
+    <string name="pref_title_touch_anc">Active Noise Cancelling</string>
+    <string name="pref_title_touch_quick_ambient">Quick Ambient Sound</string>
+    <string name="pref_title_touch_volume">Volume</string>
+    <string name="pref_title_touch_ambient">Ambient Sound</string>
+    <string name="pref_title_touch_spotify">Spotify</string>
+    <string name="pref_switch_noise_control">Switch Noise Control</string>
+    <string name="prefs_noise_control_with_one_earbud">Noise Control with one earbud</string>
+    <string name="prefs_noise_control_with_one_earbud_summary">Allow noise control when using one earbud only</string>
+    <string name="pref_ambient_sound_tone">Ambient Sound Tone</string>
+    <string name="pref_ambient_sound_tone_summary">From Soft to Clear</string>
+    <string name="pref_balance">Balance</string>
+    <string name="pref_switch_controls_anc_ambient">Noise cancelling ←→ Ambient</string>
+    <string name="pref_switch_controls_anc_off">Noise cancelling ←→ Off</string>
+    <string name="pref_switch_controls_ambient_off">Ambient ←→ Off</string>
+    <string name="prefs_noise_control">Noise control</string>
+    <string name="prefs_voice_detect">Voice detect</string>
+    <string name="prefs_voice_detect_summary">Enable Ambient sound and lower playback automatically after voice has been detected</string>
+    <string name="prefs_double_tap_edge">Double tap edge</string>
+    <string name="prefs_double_tap_edge_summary">Detect double tap even when not taped on touch pad</string>
+    <string name="prefs_voice_detect_duration">End after quiet for:</string>
+    <string name="pref_voice_detect_duration_5">5 seconds</string>
+    <string name="pref_voice_detect_duration_10">10 seconds</string>
+    <string name="pref_voice_detect_duration_15">15 seconds</string>
+
     <string name="pref_header_sony_ambient_sound_control">Ambient Sound Control</string>
     <string name="pref_header_sony_device_info">Device Information</string>
     <string name="sony_ambient_sound">Mode</string>
diff --git a/app/src/main/res/values/values.xml b/app/src/main/res/values/values.xml
index e71663e87..994aa41ee 100644
--- a/app/src/main/res/values/values.xml
+++ b/app/src/main/res/values/values.xml
@@ -113,11 +113,6 @@
     <item name="pref_device_action_fitness_app_control_start_value" translatable="false" type="string">FITNESS_CONTROL_START</item>
     <item name="pref_device_action_fitness_app_control_stop_value" translatable="false" type="string">FITNESS_CONTROL_STOP</item>
     <item name="pref_device_action_fitness_app_control_toggle_value" translatable="false" type="string">FITNESS_CONTROL_TOGGLE</item>
-    <item name="pref_title_touch_voice_assistant" type="string">Voice Assistant</item>
-    <item name="pref_title_touch_anc" type="string">Active Noise Cancelling</item>
-    <item name="pref_title_touch_quick_ambient" type="string">Quick Ambient Sound</item>
-    <item name="pref_title_touch_volume" type="string">Volume</item>
-    <item name="pref_title_touch_ambient" type="string">Ambient Sound</item>
 
     <item name="pref_theme_value_system" translatable="false" type="string">system</item>
     <item name="pref_theme_value_light" translatable="false" type="string">light</item>
diff --git a/app/src/main/res/xml/devicesettings_galaxy_buds.xml b/app/src/main/res/xml/devicesettings_galaxy_buds.xml
index a86a87a72..a44eb570f 100644
--- a/app/src/main/res/xml/devicesettings_galaxy_buds.xml
+++ b/app/src/main/res/xml/devicesettings_galaxy_buds.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
     <PreferenceScreen
         android:icon="@drawable/ic_hearing"
         android:key="prefs_ambient_mode"
@@ -22,11 +23,13 @@
                 android:title="@string/prefs_ambient_voice_focus" />
 
             <SeekBarPreference
+                style="@style/Widget.AppCompat.SeekBar.Discrete"
                 android:icon="@drawable/ic_volume_up"
                 android:key="pref_galaxy_buds_ambient_volume"
-                android:max="4"
-                android:min="1"
-                android:title="@string/prefs_ambient_volume" />
+                android:max="5"
+                android:title="@string/prefs_ambient_volume"
+                app:min="1"
+                app:showSeekBarValue="true" />
         </PreferenceCategory>
     </PreferenceScreen>
 
@@ -75,7 +78,7 @@
                 android:title="@string/prefs_touch_lock" />
             <ListPreference
                 android:dependency="pref_galaxy_buds_lock_touch"
-                android:entries="@array/galaxy_touch_options"
+                android:entries="@array/galaxy_touch_options_left"
                 android:entryValues="@array/galaxy_touch_options_values"
                 android:icon="@drawable/ic_touch"
                 android:key="pref_galaxy_buds_touch_left"
@@ -83,7 +86,7 @@
                 android:title="@string/prefs_left" />
             <ListPreference
                 android:dependency="pref_galaxy_buds_lock_touch"
-                android:entries="@array/galaxy_touch_options"
+                android:entries="@array/galaxy_touch_options_right"
                 android:entryValues="@array/galaxy_touch_options_values"
                 android:icon="@drawable/ic_touch"
                 android:key="pref_galaxy_buds_touch_right"
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 dace3a9cc..6f1bc0d33 100644
--- a/app/src/main/res/xml/devicesettings_galaxy_buds_live.xml
+++ b/app/src/main/res/xml/devicesettings_galaxy_buds_live.xml
@@ -32,7 +32,7 @@
                 android:title="@string/prefs_touch_lock" />
             <ListPreference
                 android:dependency="pref_galaxy_buds_lock_touch"
-                android:entries="@array/galaxy_buds_live_touch_options"
+                android:entries="@array/galaxy_buds_live_touch_options_left"
                 android:entryValues="@array/galaxy_buds_live_touch_options_values"
                 android:icon="@drawable/ic_touch"
                 android:key="pref_galaxy_buds_touch_left"
@@ -40,7 +40,7 @@
                 android:title="@string/prefs_left" />
             <ListPreference
                 android:dependency="pref_galaxy_buds_lock_touch"
-                android:entries="@array/galaxy_buds_live_touch_options"
+                android:entries="@array/galaxy_buds_live_touch_options_right"
                 android:entryValues="@array/galaxy_buds_live_touch_options_values"
                 android:icon="@drawable/ic_touch"
                 android:key="pref_galaxy_buds_touch_right"
diff --git a/app/src/main/res/xml/devicesettings_galaxy_buds_pro.xml b/app/src/main/res/xml/devicesettings_galaxy_buds_pro.xml
new file mode 100644
index 000000000..fb5aff023
--- /dev/null
+++ b/app/src/main/res/xml/devicesettings_galaxy_buds_pro.xml
@@ -0,0 +1,239 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <PreferenceScreen
+        android:icon="@drawable/ic_surround"
+        android:key="pref_galaxy_buds_pro_noise_control_preference"
+        android:persistent="false"
+        android:title="@string/prefs_noise_control">
+        <PreferenceCategory android:title="@string/prefs_noise_control">
+
+            <ListPreference
+                android:defaultValue="0"
+                android:entries="@array/galaxy_pro_noise_controls_options"
+                android:entryValues="@array/galaxy_pro_noise_controls_options_values"
+                android:icon="@drawable/ic_surround"
+                android:key="pref_galaxy_buds_pro_noise_control"
+                android:summary="%s"
+                android:title="@string/prefs_noise_control" />
+
+            <ListPreference
+                android:defaultValue="0"
+                android:dependency="pref_galaxy_buds_pro_noise_control"
+                android:entries="@array/galaxy_pro_anc_level_options"
+                android:entryValues="@array/galaxy_pro_anc_level_values"
+                android:icon="@drawable/ic_surround"
+                android:key="pref_galaxy_buds_pro_anc_level"
+                android:summary="%s"
+                android:title="@string/prefs_active_noise_cancelling_level" />
+
+
+            <SeekBarPreference
+                android:icon="@drawable/ic_volume_up"
+                android:key="pref_galaxy_buds_ambient_volume"
+                android:max="3"
+                android:min="0"
+                android:title="@string/prefs_ambient_volume"
+                app:showSeekBarValue="false" />
+
+        </PreferenceCategory>
+    </PreferenceScreen>
+    <ListPreference
+        android:defaultValue="0"
+        android:entries="@array/galaxy_buds_live_equalizer_modes"
+        android:entryValues="@array/galaxy_buds_live_equalizer_values"
+        android:icon="@drawable/ic_equalizer"
+        android:key="pref_galaxy_buds_equalizer_mode"
+        android:summary="%s"
+        android:title="@string/prefs_equalizer_preset" />
+
+    <PreferenceScreen
+        android:icon="@drawable/ic_touch"
+        android:key="prefs_galaxy_touch_options"
+        android:persistent="false"
+        android:title="@string/prefs_galaxy_touch_options">
+        <PreferenceCategory android:title="@string/prefs_galaxy_touch_options">
+            <SwitchPreference
+                android:defaultValue="false"
+                android:disableDependentsState="true"
+                android:icon="@drawable/ic_lock_open"
+                android:key="pref_galaxy_buds_lock_touch"
+                android:summary="@string/prefs_touch_lock_summary"
+                android:title="@string/prefs_touch_lock" />
+            <ListPreference
+                android:defaultValue="0"
+                android:dependency="pref_galaxy_buds_lock_touch"
+                android:entries="@array/galaxy_pro_touch_options_left"
+                android:entryValues="@array/galaxy_pro_touch_options_values"
+                android:icon="@drawable/ic_touch"
+                android:key="pref_galaxy_buds_touch_left"
+                android:summary="%s"
+                android:title="@string/prefs_left" />
+
+            <ListPreference
+                android:defaultValue="0"
+                android:dependency="pref_galaxy_buds_lock_touch"
+                android:entries="@array/galaxy_pro_touch_switch_controls_options"
+                android:entryValues="@array/galaxy_pro_touch_switch_controls_values"
+                android:icon="@drawable/ic_switch_left"
+                android:key="pref_galaxy_buds_touch_left_switch"
+                android:summary="%s"
+                android:title="@string/prefs_switch_control_left" />
+
+            <ListPreference
+                android:defaultValue="0"
+                android:dependency="pref_galaxy_buds_lock_touch"
+                android:entries="@array/galaxy_pro_touch_options_right"
+                android:entryValues="@array/galaxy_pro_touch_options_values"
+                android:icon="@drawable/ic_touch"
+                android:key="pref_galaxy_buds_touch_right"
+                android:summary="%s"
+                android:title="@string/prefs_right" />
+            <ListPreference
+                android:defaultValue="0"
+                android:dependency="pref_galaxy_buds_lock_touch"
+                android:entries="@array/galaxy_pro_touch_switch_controls_options"
+                android:entryValues="@array/galaxy_pro_touch_switch_controls_values"
+                android:icon="@drawable/ic_switch_right"
+                android:key="pref_galaxy_buds_touch_right_switch"
+                android:summary="%s"
+                android:title="@string/prefs_switch_control_right" />
+
+            <SwitchPreference
+                android:defaultValue="false"
+                android:dependency="pref_galaxy_buds_lock_touch"
+                android:icon="@drawable/ic_touch"
+                android:key="pref_galaxy_pro_double_tap_edge"
+                android:summary="@string/prefs_double_tap_edge_summary"
+                android:title="@string/prefs_double_tap_edge" />
+        </PreferenceCategory>
+    </PreferenceScreen>
+
+    <PreferenceScreen
+        android:icon="@drawable/ic_settings"
+        android:key="prefs_settings"
+        android:persistent="false"
+        android:title="@string/title_activity_settings">
+        <SwitchPreference
+            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
+            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
+            android:defaultValue="false"
+            android:icon="@drawable/ic_hearing"
+            android:key="pref_galaxy_buds_noise_controls_with_one_earbud"
+            android:summary="@string/prefs_noise_control_with_one_earbud_summary"
+            android:title="@string/prefs_noise_control_with_one_earbud" />
+
+        <SeekBarPreference
+            android:defaultValue="50"
+            android:icon="@drawable/ic_volume_up"
+            android:key="pref_galaxy_buds_pro_balance"
+            android:max="32"
+            android:min="0"
+            android:title="@string/pref_balance"
+            app:defaultValue="16"
+            app:showSeekBarValue="true" />
+
+        <PreferenceCategory android:title="@string/prefs_galaxy_buds_experimental">
+            <SwitchPreference
+                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" />
+        </PreferenceCategory>
+
+        <!-- <SwitchPreference
+            android:defaultValue="false"
+            android:icon="@drawable/ic_graphic_eq"
+            android:key="pref_galaxy_buds_pro_read_notifications_outloud"
+            android:title="@string/prefs_read_notification_outloud" />
+            -->
+
+    </PreferenceScreen>
+
+
+    <PreferenceScreen
+        android:icon="@drawable/ic_settings_applications"
+        android:key="prefs_accessibility"
+        android:persistent="false"
+        android:title="@string/prefs_ambient_settings_title">
+
+        <PreferenceCategory android:title="@string/prefs_voice_detect">
+            <SwitchPreference
+                android:defaultValue="false"
+                android:icon="@drawable/ic_voice"
+                android:key="pref_galaxy_buds_pro_voice_detect"
+                android:summary="@string/prefs_voice_detect_summary"
+                android:title="@string/prefs_voice_detect" />
+            <ListPreference
+                android:defaultValue="5"
+                android:dependency="pref_galaxy_buds_pro_voice_detect"
+                android:entries="@array/galaxy_pro_voice_detect_duration_options"
+                android:entryValues="@array/galaxy_pro_voice_detect_duration_values"
+                android:icon="@drawable/ic_timer"
+                android:key="pref_galaxy_buds_pro_voice_detect_duration"
+                android:summary="%s"
+                android:title="@string/prefs_voice_detect_duration" />
+
+        </PreferenceCategory>
+        <PreferenceCategory android:title="@string/prefs_ambient_sound">
+
+
+            <SwitchPreference
+                android:defaultValue="false"
+                android:icon="@drawable/ic_hearing"
+                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
+                android:defaultValue="false"
+                android:icon="@drawable/ic_hearing"
+                android:key="pref_galaxy_buds_ambient_sound"
+                android:summary="@string/prefs_customize_ambient_sound_summary"
+                android:title="@string/prefs_ambient_sound" />
+
+            <SeekBarPreference
+                android:defaultValue="1"
+                android:dependency="pref_galaxy_buds_ambient_sound"
+                android:icon="@drawable/ic_volume_up"
+                android:key="pref_galaxy_buds_pro_ambient_volume_right"
+                android:max="4"
+                android:min="0"
+                android:title="@string/prefs_ambient_volume_right"
+                app:showSeekBarValue="false" />
+
+            <SeekBarPreference
+                android:defaultValue="1"
+                android:dependency="pref_galaxy_buds_ambient_sound"
+                android:icon="@drawable/ic_volume_up"
+                android:key="pref_galaxy_buds_pro_ambient_volume_left"
+                android:max="4"
+                android:min="0"
+                android:title="@string/prefs_ambient_volume_left"
+                app:showSeekBarValue="false" />
+
+            <SeekBarPreference
+                android:defaultValue="1"
+                android:dependency="pref_galaxy_buds_ambient_sound"
+                android:icon="@drawable/ic_surround"
+                android:key="pref_galaxy_buds_pro_ambient_sound_tone"
+                android:max="4"
+                android:min="0"
+                android:summary="@string/pref_ambient_sound_tone_summary"
+                android:title="@string/pref_ambient_sound_tone"
+                app:showSeekBarValue="false" />
+        </PreferenceCategory>
+    </PreferenceScreen>
+</androidx.preference.PreferenceScreen>

From 428af7f21e6001b778e393b40f7a3a77add2bb28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Sun, 15 May 2022 22:15:10 +0100
Subject: [PATCH 100/110] Huami/Mi Band: Move heart rate monitoring to
 device-specific settings

---
 .../gadgetbridge/GBApplication.java           | 26 ++++++++++++++++++-
 .../DeviceSettingsPreferenceConst.java        |  3 +++
 .../DeviceSpecificSettingsFragment.java       | 22 ++++++++++++++++
 .../devices/huami/HuamiCoordinator.java       |  5 ++++
 .../amazfitband5/AmazfitBand5Coordinator.java |  1 +
 .../amazfitbip/AmazfitBipCoordinator.java     |  1 +
 .../amazfitbip/AmazfitBipLiteCoordinator.java |  1 +
 .../amazfitbips/AmazfitBipSCoordinator.java   |  1 +
 .../amazfitbipu/AmazfitBipUCoordinator.java   |  1 +
 .../AmazfitBipUProCoordinator.java            |  1 +
 .../amazfitcor/AmazfitCorCoordinator.java     |  1 +
 .../amazfitcor2/AmazfitCor2Coordinator.java   |  1 +
 .../amazfitgtr/AmazfitGTRCoordinator.java     |  1 +
 .../amazfitgtr/AmazfitGTRLiteCoordinator.java |  1 +
 .../amazfitgtr2/AmazfitGTR2Coordinator.java   |  1 +
 .../amazfitgtr2/AmazfitGTR2eCoordinator.java  |  1 +
 .../amazfitgts/AmazfitGTSCoordinator.java     |  1 +
 .../amazfitgts2/AmazfitGTS2Coordinator.java   |  1 +
 .../AmazfitGTS2MiniCoordinator.java           |  1 +
 .../amazfitgts2/AmazfitGTS2eCoordinator.java  |  1 +
 .../amazfitneo/AmazfitNeoCoordinator.java     |  1 +
 .../amazfittrex/AmazfitTRexCoordinator.java   |  1 +
 .../AmazfitTRexProCoordinator.java            |  1 +
 .../AmazfitVergeLCoordinator.java             |  1 +
 .../huami/amazfitx/AmazfitXCoordinator.java   |  1 +
 .../huami/miband2/MiBand2Coordinator.java     |  1 +
 .../huami/miband2/MiBand2HRXCoordinator.java  |  1 +
 .../huami/miband3/MiBand3Coordinator.java     |  1 +
 .../huami/miband4/MiBand4Coordinator.java     |  1 +
 .../huami/miband5/MiBand5Coordinator.java     |  1 +
 .../huami/miband6/MiBand6Coordinator.java     |  1 +
 .../devices/huami/zeppe/ZeppECoordinator.java |  1 +
 .../devices/miband/MiBandConst.java           |  1 -
 .../devices/miband/MiBandCoordinator.java     |  7 ++---
 .../miband/MiBandPreferencesActivity.java     | 19 --------------
 .../service/devices/huami/HuamiSupport.java   |  6 +----
 app/src/main/res/values/strings.xml           |  2 ++
 .../xml/devicesettings_heartrate_sleep.xml    | 25 ++++++++++++++++++
 app/src/main/res/xml/miband_preferences.xml   | 13 ----------
 39 files changed, 115 insertions(+), 42 deletions(-)
 create mode 100644 app/src/main/res/xml/devicesettings_heartrate_sleep.xml

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GBApplication.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GBApplication.java
index f746608d3..085370cb4 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GBApplication.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GBApplication.java
@@ -117,7 +117,7 @@ public class GBApplication extends Application {
     private static SharedPreferences sharedPrefs;
     private static final String PREFS_VERSION = "shared_preferences_version";
     //if preferences have to be migrated, increment the following and add the migration logic in migratePrefs below; see http://stackoverflow.com/questions/16397848/how-can-i-migrate-android-preferences-with-a-new-version
-    private static final int CURRENT_PREFS_VERSION = 13;
+    private static final int CURRENT_PREFS_VERSION = 14;
 
     private static LimitedQueue mIDSenderLookup = new LimitedQueue(16);
     private static Prefs prefs;
@@ -1119,6 +1119,30 @@ public class GBApplication extends Application {
             }
         }
 
+        if (oldVersion < 14) {
+            try (DBHandler db = acquireDB()) {
+                final DaoSession daoSession = db.getDaoSession();
+                final List<Device> activeDevices = DBHelper.getActiveDevices(daoSession);
+
+                for (Device dbDevice : activeDevices) {
+                    final SharedPreferences deviceSharedPrefs = GBApplication.getDeviceSpecificSharedPrefs(dbDevice.getIdentifier());
+                    final SharedPreferences.Editor deviceSharedPrefsEdit = deviceSharedPrefs.edit();
+
+                    if (DeviceType.MIBAND.equals(dbDevice.getType()) || dbDevice.getManufacturer().equals("Huami")) {
+                        deviceSharedPrefsEdit.putBoolean("heartrate_sleep_detection", prefs.getBoolean("mi_hr_sleep_detection", false));
+                        deviceSharedPrefsEdit.putString("heartrate_measurement_interval", prefs.getString("heartrate_measurement_interval", "0"));
+                    }
+
+                    // Not removing heartrate_measurement_interval since it's still used by some devices (ZeTime)
+                    editor.remove("mi_hr_sleep_detection");
+
+                    deviceSharedPrefsEdit.apply();
+                }
+            } catch (Exception e) {
+                Log.w(TAG, "error acquiring DB lock");
+            }
+        }
+
         editor.putString(PREFS_VERSION, Integer.toString(CURRENT_PREFS_VERSION));
         editor.apply();
     }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsPreferenceConst.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsPreferenceConst.java
index 1e59059d2..f4ba54ea1 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsPreferenceConst.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsPreferenceConst.java
@@ -83,6 +83,9 @@ public class DeviceSettingsPreferenceConst {
     public static final String PREF_INACTIVITY_DND_START = "inactivity_warnings_dnd_start";
     public static final String PREF_INACTIVITY_DND_END = "inactivity_warnings_dnd_end";
 
+    public static final String PREF_HEARTRATE_USE_FOR_SLEEP_DETECTION = "heartrate_sleep_detection";
+    public static final String PREF_HEARTRATE_MEASUREMENT_INTERVAL = "heartrate_measurement_interval";
+
     public static final String PREF_AUTOHEARTRATE_SWITCH = "pref_autoheartrate_switch";
     public static final String PREF_AUTOHEARTRATE_SLEEP = "pref_autoheartrate_sleep";
     public static final String PREF_AUTOHEARTRATE_INTERVAL = "pref_autoheartrate_interval";
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 d4271d269..31d6290b6 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
@@ -344,6 +344,28 @@ public class DeviceSpecificSettingsFragment extends PreferenceFragmentCompat imp
             });
         }
 
+        final Preference enableHeartrateSleepSupport = findPreference(PREF_HEARTRATE_USE_FOR_SLEEP_DETECTION);
+        if (enableHeartrateSleepSupport != null) {
+            enableHeartrateSleepSupport.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
+                @Override
+                public boolean onPreferenceChange(Preference preference, Object newVal) {
+                    GBApplication.deviceService().onEnableHeartRateSleepSupport(Boolean.TRUE.equals(newVal));
+                    return true;
+                }
+            });
+        }
+
+        final Preference heartrateMeasurementInterval = findPreference(PREF_HEARTRATE_MEASUREMENT_INTERVAL);
+        if (heartrateMeasurementInterval != null) {
+            heartrateMeasurementInterval.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
+                @Override
+                public boolean onPreferenceChange(Preference preference, Object newVal) {
+                    GBApplication.deviceService().onSetHeartRateMeasurementInterval(Integer.parseInt((String) newVal));
+                    return true;
+                }
+            });
+        }
+
         addPreferenceHandlerFor(PREF_SWIPE_UNLOCK);
         addPreferenceHandlerFor(PREF_MI2_DATEFORMAT);
         addPreferenceHandlerFor(PREF_DATEFORMAT);
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiCoordinator.java
index e7fa967e5..11a4a0d39 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiCoordinator.java
@@ -268,6 +268,11 @@ public abstract class HuamiCoordinator extends AbstractDeviceCoordinator {
         return prefs.getBoolean(HuamiConst.PREF_EXPOSE_HR_THIRDPARTY, false);
     }
 
+    public static int getHeartRateMeasurementInterval(String deviceAddress) {
+        Prefs prefs = new Prefs(GBApplication.getDeviceSpecificSharedPrefs(deviceAddress));
+        return GBApplication.getPrefs().getInt(DeviceSettingsPreferenceConst.PREF_HEARTRATE_MEASUREMENT_INTERVAL, 0) / 60;
+    }
+
     public static boolean getBtConnectedAdvertising(String deviceAddress) {
         Prefs prefs = new Prefs(GBApplication.getDeviceSpecificSharedPrefs(deviceAddress));
         return prefs.getBoolean(DeviceSettingsPreferenceConst.PREF_BT_CONNECTED_ADVERTISEMENT, false);
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitband5/AmazfitBand5Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitband5/AmazfitBand5Coordinator.java
index fb75b393a..735bda426 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitband5/AmazfitBand5Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitband5/AmazfitBand5Coordinator.java
@@ -101,6 +101,7 @@ public class AmazfitBand5Coordinator extends HuamiCoordinator {
                 R.xml.devicesettings_amazfitband5,
                 R.xml.devicesettings_vibrationpatterns,
                 R.xml.devicesettings_wearlocation,
+                R.xml.devicesettings_heartrate_sleep,
                 R.xml.devicesettings_goal_notification,
                 R.xml.devicesettings_custom_emoji_font,
                 R.xml.devicesettings_timeformat,
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbip/AmazfitBipCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbip/AmazfitBipCoordinator.java
index 6e97c9f9b..b8b354ccb 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbip/AmazfitBipCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbip/AmazfitBipCoordinator.java
@@ -83,6 +83,7 @@ public class AmazfitBipCoordinator extends HuamiCoordinator {
                 R.xml.devicesettings_amazfitbip,
                 R.xml.devicesettings_timeformat,
                 R.xml.devicesettings_wearlocation,
+                R.xml.devicesettings_heartrate_sleep,
                 R.xml.devicesettings_goal_notification,
                 R.xml.devicesettings_custom_emoji_font,
                 R.xml.devicesettings_liftwrist_display,
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbip/AmazfitBipLiteCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbip/AmazfitBipLiteCoordinator.java
index 160d9ca27..fb7b31bf2 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbip/AmazfitBipLiteCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbip/AmazfitBipLiteCoordinator.java
@@ -72,6 +72,7 @@ public class AmazfitBipLiteCoordinator extends AmazfitBipCoordinator {
                 R.xml.devicesettings_amazfitbip,
                 R.xml.devicesettings_timeformat,
                 R.xml.devicesettings_wearlocation,
+                R.xml.devicesettings_heartrate_sleep,
                 R.xml.devicesettings_goal_notification,
                 R.xml.devicesettings_custom_emoji_font,
                 R.xml.devicesettings_liftwrist_display,
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbips/AmazfitBipSCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbips/AmazfitBipSCoordinator.java
index 25e8919f1..78bd9565b 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbips/AmazfitBipSCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbips/AmazfitBipSCoordinator.java
@@ -99,6 +99,7 @@ public class AmazfitBipSCoordinator extends HuamiCoordinator {
                 R.xml.devicesettings_timeformat,
                 R.xml.devicesettings_world_clocks,
                 R.xml.devicesettings_wearlocation,
+                R.xml.devicesettings_heartrate_sleep,
                 R.xml.devicesettings_goal_notification,
                 R.xml.devicesettings_custom_emoji_font,
                 R.xml.devicesettings_liftwrist_display,
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbipu/AmazfitBipUCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbipu/AmazfitBipUCoordinator.java
index e6c131318..faa3dc412 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbipu/AmazfitBipUCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbipu/AmazfitBipUCoordinator.java
@@ -112,6 +112,7 @@ public class AmazfitBipUCoordinator extends HuamiCoordinator {
                 R.xml.devicesettings_timeformat,
                 R.xml.devicesettings_world_clocks,
                 R.xml.devicesettings_wearlocation,
+                R.xml.devicesettings_heartrate_sleep,
                 R.xml.devicesettings_goal_notification,
                 R.xml.devicesettings_custom_emoji_font,
                 R.xml.devicesettings_liftwrist_display_sensitivity,
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbipupro/AmazfitBipUProCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbipupro/AmazfitBipUProCoordinator.java
index 56b3de59d..6a090b402 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbipupro/AmazfitBipUProCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbipupro/AmazfitBipUProCoordinator.java
@@ -111,6 +111,7 @@ public class AmazfitBipUProCoordinator extends HuamiCoordinator {
                 R.xml.devicesettings_timeformat,
                 R.xml.devicesettings_world_clocks,
                 R.xml.devicesettings_wearlocation,
+                R.xml.devicesettings_heartrate_sleep,
                 R.xml.devicesettings_goal_notification,
                 R.xml.devicesettings_custom_emoji_font,
                 R.xml.devicesettings_liftwrist_display_sensitivity,
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitcor/AmazfitCorCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitcor/AmazfitCorCoordinator.java
index 109fbe6bb..182271c79 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitcor/AmazfitCorCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitcor/AmazfitCorCoordinator.java
@@ -90,6 +90,7 @@ public class AmazfitCorCoordinator extends HuamiCoordinator {
         return new int[]{
                 R.xml.devicesettings_amazfitcor,
                 R.xml.devicesettings_wearlocation,
+                R.xml.devicesettings_heartrate_sleep,
                 R.xml.devicesettings_goal_notification,
                 R.xml.devicesettings_timeformat,
                 R.xml.devicesettings_custom_emoji_font,
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitcor2/AmazfitCor2Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitcor2/AmazfitCor2Coordinator.java
index d5a662517..1dddcbec4 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitcor2/AmazfitCor2Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitcor2/AmazfitCor2Coordinator.java
@@ -92,6 +92,7 @@ public class AmazfitCor2Coordinator extends HuamiCoordinator {
         return new int[]{
                 R.xml.devicesettings_amazfitcor,
                 R.xml.devicesettings_wearlocation,
+                R.xml.devicesettings_heartrate_sleep,
                 R.xml.devicesettings_goal_notification,
                 R.xml.devicesettings_timeformat,
                 R.xml.devicesettings_custom_emoji_font,
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr/AmazfitGTRCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr/AmazfitGTRCoordinator.java
index 6656b5c4b..fcc9a73bf 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr/AmazfitGTRCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr/AmazfitGTRCoordinator.java
@@ -90,6 +90,7 @@ public class AmazfitGTRCoordinator extends HuamiCoordinator {
         return new int[]{
                 R.xml.devicesettings_amazfitgtsgtr,
                 R.xml.devicesettings_wearlocation,
+                R.xml.devicesettings_heartrate_sleep,
                 R.xml.devicesettings_goal_notification,
                 R.xml.devicesettings_timeformat,
                 R.xml.devicesettings_liftwrist_display,
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr/AmazfitGTRLiteCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr/AmazfitGTRLiteCoordinator.java
index 8a826f832..09393a27b 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr/AmazfitGTRLiteCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr/AmazfitGTRLiteCoordinator.java
@@ -91,6 +91,7 @@ public class AmazfitGTRLiteCoordinator extends HuamiCoordinator {
         return new int[]{
                 R.xml.devicesettings_amazfitgtsgtr,
                 R.xml.devicesettings_wearlocation,
+                R.xml.devicesettings_heartrate_sleep,
                 R.xml.devicesettings_goal_notification,
                 R.xml.devicesettings_timeformat,
                 R.xml.devicesettings_liftwrist_display,
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr2/AmazfitGTR2Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr2/AmazfitGTR2Coordinator.java
index d3f1804b5..3f715a697 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr2/AmazfitGTR2Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr2/AmazfitGTR2Coordinator.java
@@ -96,6 +96,7 @@ public class AmazfitGTR2Coordinator extends HuamiCoordinator {
         return new int[]{
                 R.xml.devicesettings_amazfitgtsgtr2,
                 R.xml.devicesettings_wearlocation,
+                R.xml.devicesettings_heartrate_sleep,
                 R.xml.devicesettings_goal_notification,
                 R.xml.devicesettings_timeformat,
                 R.xml.devicesettings_liftwrist_display,
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr2/AmazfitGTR2eCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr2/AmazfitGTR2eCoordinator.java
index f82dc929a..9e82c84cb 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr2/AmazfitGTR2eCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr2/AmazfitGTR2eCoordinator.java
@@ -96,6 +96,7 @@ public class AmazfitGTR2eCoordinator extends HuamiCoordinator {
         return new int[]{
                 R.xml.devicesettings_amazfitgtsgtr2,
                 R.xml.devicesettings_wearlocation,
+                R.xml.devicesettings_heartrate_sleep,
                 R.xml.devicesettings_goal_notification,
                 R.xml.devicesettings_timeformat,
                 R.xml.devicesettings_liftwrist_display,
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts/AmazfitGTSCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts/AmazfitGTSCoordinator.java
index 8762b65e4..718823260 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts/AmazfitGTSCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts/AmazfitGTSCoordinator.java
@@ -90,6 +90,7 @@ public class AmazfitGTSCoordinator extends HuamiCoordinator {
         return new int[]{
                 R.xml.devicesettings_amazfitgtsgtr,
                 R.xml.devicesettings_wearlocation,
+                R.xml.devicesettings_heartrate_sleep,
                 R.xml.devicesettings_goal_notification,
                 R.xml.devicesettings_timeformat,
                 R.xml.devicesettings_liftwrist_display,
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts2/AmazfitGTS2Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts2/AmazfitGTS2Coordinator.java
index 6a69adfa0..d50344dd4 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts2/AmazfitGTS2Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts2/AmazfitGTS2Coordinator.java
@@ -96,6 +96,7 @@ public class AmazfitGTS2Coordinator extends HuamiCoordinator {
         return new int[]{
                 R.xml.devicesettings_amazfitgtsgtr2,
                 R.xml.devicesettings_wearlocation,
+                R.xml.devicesettings_heartrate_sleep,
                 R.xml.devicesettings_goal_notification,
                 R.xml.devicesettings_timeformat,
                 R.xml.devicesettings_liftwrist_display,
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts2/AmazfitGTS2MiniCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts2/AmazfitGTS2MiniCoordinator.java
index 5ffd26c9a..dacfb8928 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts2/AmazfitGTS2MiniCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts2/AmazfitGTS2MiniCoordinator.java
@@ -65,6 +65,7 @@ public class AmazfitGTS2MiniCoordinator extends AmazfitGTS2Coordinator {
         return new int[]{
                 R.xml.devicesettings_amazfitgts2mini,
                 R.xml.devicesettings_wearlocation,
+                R.xml.devicesettings_heartrate_sleep,
                 R.xml.devicesettings_goal_notification,
                 R.xml.devicesettings_timeformat,
                 R.xml.devicesettings_liftwrist_display,
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts2/AmazfitGTS2eCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts2/AmazfitGTS2eCoordinator.java
index 5788b9111..8f3b7685e 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts2/AmazfitGTS2eCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts2/AmazfitGTS2eCoordinator.java
@@ -96,6 +96,7 @@ public class AmazfitGTS2eCoordinator extends HuamiCoordinator {
         return new int[]{
                 R.xml.devicesettings_amazfitgtsgtr2,
                 R.xml.devicesettings_wearlocation,
+                R.xml.devicesettings_heartrate_sleep,
                 R.xml.devicesettings_goal_notification,
                 R.xml.devicesettings_timeformat,
                 R.xml.devicesettings_liftwrist_display,
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitneo/AmazfitNeoCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitneo/AmazfitNeoCoordinator.java
index b2291dbeb..96af7d957 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitneo/AmazfitNeoCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitneo/AmazfitNeoCoordinator.java
@@ -84,6 +84,7 @@ public class AmazfitNeoCoordinator extends HuamiCoordinator {
         return new int[]{
                 R.xml.devicesettings_amazfitneo,
                 R.xml.devicesettings_wearlocation,
+                R.xml.devicesettings_heartrate_sleep,
                 R.xml.devicesettings_goal_notification,
                 R.xml.devicesettings_timeformat,
                 R.xml.devicesettings_liftwrist_display,
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfittrex/AmazfitTRexCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfittrex/AmazfitTRexCoordinator.java
index 9baeb3065..fd3e34ffd 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfittrex/AmazfitTRexCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfittrex/AmazfitTRexCoordinator.java
@@ -90,6 +90,7 @@ public class AmazfitTRexCoordinator extends HuamiCoordinator {
         return new int[]{
                 R.xml.devicesettings_amazfittrex,
                 R.xml.devicesettings_wearlocation,
+                R.xml.devicesettings_heartrate_sleep,
                 R.xml.devicesettings_goal_notification,
                 R.xml.devicesettings_timeformat,
                 R.xml.devicesettings_liftwrist_display,
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfittrexpro/AmazfitTRexProCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfittrexpro/AmazfitTRexProCoordinator.java
index 2ac407a3a..f4c459761 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfittrexpro/AmazfitTRexProCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfittrexpro/AmazfitTRexProCoordinator.java
@@ -90,6 +90,7 @@ public class AmazfitTRexProCoordinator extends HuamiCoordinator {
         return new int[]{
                 R.xml.devicesettings_amazfittrexpro,
                 R.xml.devicesettings_wearlocation,
+                R.xml.devicesettings_heartrate_sleep,
                 R.xml.devicesettings_goal_notification,
                 R.xml.devicesettings_timeformat,
                 R.xml.devicesettings_liftwrist_display,
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitvergel/AmazfitVergeLCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitvergel/AmazfitVergeLCoordinator.java
index 673d95af4..453799751 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitvergel/AmazfitVergeLCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitvergel/AmazfitVergeLCoordinator.java
@@ -91,6 +91,7 @@ public class AmazfitVergeLCoordinator extends HuamiCoordinator {
         return new int[]{
                 R.xml.devicesettings_amazfitvergel,
                 R.xml.devicesettings_wearlocation,
+                R.xml.devicesettings_heartrate_sleep,
                 R.xml.devicesettings_goal_notification,
                 R.xml.devicesettings_liftwrist_display,
                 R.xml.devicesettings_inactivity_dnd,
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitx/AmazfitXCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitx/AmazfitXCoordinator.java
index 40e3abeac..57fc256f9 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitx/AmazfitXCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitx/AmazfitXCoordinator.java
@@ -93,6 +93,7 @@ public class AmazfitXCoordinator extends HuamiCoordinator {
         return new int[]{
                 R.xml.devicesettings_amazfitx,
                 R.xml.devicesettings_wearlocation,
+                R.xml.devicesettings_heartrate_sleep,
                 R.xml.devicesettings_goal_notification,
                 R.xml.devicesettings_custom_emoji_font,
                 R.xml.devicesettings_timeformat,
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband2/MiBand2Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband2/MiBand2Coordinator.java
index 4b5af567b..8602af164 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband2/MiBand2Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband2/MiBand2Coordinator.java
@@ -84,6 +84,7 @@ public class MiBand2Coordinator extends HuamiCoordinator {
         return new int[]{
                 R.xml.devicesettings_miband2,
                 R.xml.devicesettings_wearlocation,
+                R.xml.devicesettings_heartrate_sleep,
                 R.xml.devicesettings_goal_notification,
                 R.xml.devicesettings_timeformat,
                 R.xml.devicesettings_donotdisturb_withauto,
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband2/MiBand2HRXCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband2/MiBand2HRXCoordinator.java
index daa22a027..a912f5b1d 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband2/MiBand2HRXCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband2/MiBand2HRXCoordinator.java
@@ -87,6 +87,7 @@ public class MiBand2HRXCoordinator extends HuamiCoordinator {
         return new int[]{
                 R.xml.devicesettings_miband2,
                 R.xml.devicesettings_wearlocation,
+                R.xml.devicesettings_heartrate_sleep,
                 R.xml.devicesettings_goal_notification,
                 R.xml.devicesettings_donotdisturb_withauto,
                 R.xml.devicesettings_liftwrist_display,
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband3/MiBand3Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband3/MiBand3Coordinator.java
index ab27548ac..4ad87437f 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband3/MiBand3Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband3/MiBand3Coordinator.java
@@ -103,6 +103,7 @@ public class MiBand3Coordinator extends HuamiCoordinator {
         return new int[]{
                 R.xml.devicesettings_miband3,
                 R.xml.devicesettings_wearlocation,
+                R.xml.devicesettings_heartrate_sleep,
                 R.xml.devicesettings_goal_notification,
                 R.xml.devicesettings_timeformat,
                 R.xml.devicesettings_dateformat,
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband4/MiBand4Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband4/MiBand4Coordinator.java
index d34634ff2..83e9730a3 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband4/MiBand4Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband4/MiBand4Coordinator.java
@@ -91,6 +91,7 @@ public class MiBand4Coordinator extends HuamiCoordinator {
                 R.xml.devicesettings_miband3,
                 R.xml.devicesettings_vibrationpatterns,
                 R.xml.devicesettings_wearlocation,
+                R.xml.devicesettings_heartrate_sleep,
                 R.xml.devicesettings_goal_notification,
                 R.xml.devicesettings_custom_emoji_font,
                 R.xml.devicesettings_timeformat,
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband5/MiBand5Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband5/MiBand5Coordinator.java
index 020ae69c3..57d9531af 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband5/MiBand5Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband5/MiBand5Coordinator.java
@@ -106,6 +106,7 @@ public class MiBand5Coordinator extends HuamiCoordinator {
                 R.xml.devicesettings_miband5,
                 R.xml.devicesettings_vibrationpatterns,
                 R.xml.devicesettings_wearlocation,
+                R.xml.devicesettings_heartrate_sleep,
                 R.xml.devicesettings_goal_notification,
                 R.xml.devicesettings_custom_emoji_font,
                 R.xml.devicesettings_timeformat,
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband6/MiBand6Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband6/MiBand6Coordinator.java
index 00012fa07..bb70de28c 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband6/MiBand6Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband6/MiBand6Coordinator.java
@@ -86,6 +86,7 @@ public class MiBand6Coordinator extends HuamiCoordinator {
                 R.xml.devicesettings_miband6,
                 R.xml.devicesettings_vibrationpatterns,
                 R.xml.devicesettings_wearlocation,
+                R.xml.devicesettings_heartrate_sleep,
                 R.xml.devicesettings_goal_notification,
                 R.xml.devicesettings_custom_emoji_font,
                 R.xml.devicesettings_timeformat,
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/zeppe/ZeppECoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/zeppe/ZeppECoordinator.java
index 862e3c012..c8c8358ff 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/zeppe/ZeppECoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/zeppe/ZeppECoordinator.java
@@ -90,6 +90,7 @@ public class ZeppECoordinator extends HuamiCoordinator {
         return new int[]{
                 R.xml.devicesettings_amazfitgtsgtr,
                 R.xml.devicesettings_wearlocation,
+                R.xml.devicesettings_heartrate_sleep,
                 R.xml.devicesettings_goal_notification,
                 R.xml.devicesettings_timeformat,
                 R.xml.devicesettings_liftwrist_display,
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBandConst.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBandConst.java
index 0a7345606..e605f28fa 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBandConst.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBandConst.java
@@ -24,7 +24,6 @@ public final class MiBandConst {
     public static final String PREF_MIBAND_ADDRESS = "development_miaddr";  // FIXME: should be prefixed mi_
     public static final String PREF_MIBAND_ALARMS = "mi_alarms";
     public static final String PREF_MIBAND_DONT_ACK_TRANSFER = "mi_dont_ack_transfer";
-    public static final String PREF_MIBAND_USE_HR_FOR_SLEEP_DETECTION = "mi_hr_sleep_detection";
     public static final String PREF_MIBAND_DEVICE_TIME_OFFSET_HOURS = "device_time_offset_hours";
 	public static final String PREF_MI2_DATEFORMAT = "mi2_dateformat";
 	public static final String PREF_MI2_DISPLAY_ITEM_CLOCK = "clock";
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBandCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBandCoordinator.java
index de579f243..79f8af5c4 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBandCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBandCoordinator.java
@@ -245,9 +245,9 @@ public class MiBandCoordinator extends AbstractDeviceCoordinator {
 		return prefs.getInt(MiBandConst.PREF_MIBAND_DEVICE_TIME_OFFSET_HOURS, 0);
 	}
 
-    public static boolean getHeartrateSleepSupport(String miBandAddress) throws IllegalArgumentException {
-        Prefs prefs = GBApplication.getPrefs();
-        return prefs.getBoolean(MiBandConst.PREF_MIBAND_USE_HR_FOR_SLEEP_DETECTION, false);
+    public static boolean getHeartrateSleepSupport(String deviceAddress) throws IllegalArgumentException {
+        Prefs prefs = new Prefs(GBApplication.getDeviceSpecificSharedPrefs(deviceAddress));
+        return prefs.getBoolean(DeviceSettingsPreferenceConst.PREF_HEARTRATE_USE_FOR_SLEEP_DETECTION, false);
     }
 
     public static int getReservedAlarmSlots(String miBandAddress) throws IllegalArgumentException {
@@ -265,6 +265,7 @@ public class MiBandCoordinator extends AbstractDeviceCoordinator {
     public int[] getSupportedDeviceSpecificSettings(GBDevice device) {
         return new int[]{
                 R.xml.devicesettings_wearlocation,
+                R.xml.devicesettings_heartrate_sleep,
                 R.xml.devicesettings_lowlatency_fwupdate,
                 R.xml.devicesettings_reserve_alarms_calendar,
                 R.xml.devicesettings_fake_timeoffset
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBandPreferencesActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBandPreferencesActivity.java
index 6353be03d..6d6f6d9b2 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBandPreferencesActivity.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBandPreferencesActivity.java
@@ -41,7 +41,6 @@ import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.Dev
 import static nodomain.freeyourgadget.gadgetbridge.devices.miband.MiBandConst.ORIGIN_ALARM_CLOCK;
 import static nodomain.freeyourgadget.gadgetbridge.devices.miband.MiBandConst.ORIGIN_INCOMING_CALL;
 import static nodomain.freeyourgadget.gadgetbridge.devices.miband.MiBandConst.PREF_MIBAND_ADDRESS;
-import static nodomain.freeyourgadget.gadgetbridge.devices.miband.MiBandConst.PREF_MIBAND_USE_HR_FOR_SLEEP_DETECTION;
 import static nodomain.freeyourgadget.gadgetbridge.devices.miband.MiBandConst.VIBRATION_COUNT;
 import static nodomain.freeyourgadget.gadgetbridge.devices.miband.MiBandConst.getNotificationPrefKey;
 import static nodomain.freeyourgadget.gadgetbridge.model.ActivityUser.PREF_USER_NAME;
@@ -57,24 +56,6 @@ public class MiBandPreferencesActivity extends AbstractSettingsActivity {
 
         Prefs prefs = GBApplication.getPrefs();
 
-        final Preference enableHeartrateSleepSupport = findPreference(PREF_MIBAND_USE_HR_FOR_SLEEP_DETECTION);
-        enableHeartrateSleepSupport.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
-            @Override
-            public boolean onPreferenceChange(Preference preference, Object newVal) {
-                GBApplication.deviceService().onEnableHeartRateSleepSupport(Boolean.TRUE.equals(newVal));
-                return true;
-            }
-        });
-
-        final Preference heartrateMeasurementInterval = findPreference("heartrate_measurement_interval");
-        heartrateMeasurementInterval.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
-            @Override
-            public boolean onPreferenceChange(Preference preference, Object newVal) {
-                GBApplication.deviceService().onSetHeartRateMeasurementInterval(Integer.parseInt((String) newVal));
-                return true;
-            }
-        });
-
         final Preference fitnessGoal = findPreference(ActivityUser.PREF_USER_STEPS_GOAL);
         fitnessGoal.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
             @Override
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiSupport.java
index 590a727aa..006cf6290 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiSupport.java
@@ -3679,16 +3679,12 @@ public class HuamiSupport extends AbstractBTLEDeviceSupport {
         setHeartrateSleepSupport(builder);
         setDisconnectNotification(builder);
         setExposeHRThridParty(builder);
-        setHeartrateMeasurementInterval(builder, getHeartRateMeasurementInterval());
+        setHeartrateMeasurementInterval(builder, HuamiCoordinator.getHeartRateMeasurementInterval(getDevice().getAddress()));
         sendReminders(builder);
         setWorldClocks(builder);
         requestAlarms(builder);
     }
 
-    private int getHeartRateMeasurementInterval() {
-        return GBApplication.getPrefs().getInt("heartrate_measurement_interval", 0) / 60;
-    }
-
     public HuamiFWHelper createFWHelper(Uri uri, Context context) throws IOException {
         return new MiBand2FWHelper(uri, context);
     }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 32f0ddada..bd5c99c3c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -683,6 +683,8 @@
     <string name="mi2_prefs_inactivity_warnings_summary">The band will vibrate when you have been inactive for a while</string>
     <string name="mi2_prefs_inactivity_warnings_threshold">Inactivity threshold (in minutes)</string>
     <string name="mi2_prefs_inactivity_warnings_dnd_summary">Disable inactivity warnings for a time interval</string>
+    <string name="mi2_prefs_heart_rate_monitoring">Heart Rate Monitoring</string>
+    <string name="mi2_prefs_heart_rate_monitoring_summary">Configure heart rate monitoring</string>
     <string name="mi2_prefs_do_not_disturb_start">Start time</string>
     <string name="mi2_prefs_do_not_disturb_end">End time</string>
     <string name="mi2_prefs_do_not_disturb_lift_wrist">Activate display upon lift during Do Not Disturb</string>
diff --git a/app/src/main/res/xml/devicesettings_heartrate_sleep.xml b/app/src/main/res/xml/devicesettings_heartrate_sleep.xml
new file mode 100644
index 000000000..9cc3d09b6
--- /dev/null
+++ b/app/src/main/res/xml/devicesettings_heartrate_sleep.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+    <PreferenceScreen
+        android:icon="@drawable/ic_heartrate"
+        android:key="heartrate_monitoring_key"
+        android:persistent="false"
+        android:summary="@string/mi2_prefs_heart_rate_monitoring_summary"
+        android:title="@string/mi2_prefs_heart_rate_monitoring">
+
+        <SwitchPreference
+            android:defaultValue="false"
+            android:icon="@drawable/ic_activity_sleep"
+            android:key="heartrate_sleep_detection"
+            android:title="@string/miband_prefs_hr_sleep_detection" />
+
+        <ListPreference
+            android:defaultValue="0"
+            android:entries="@array/prefs_heartrate_measurement_interval"
+            android:entryValues="@array/prefs_heartrate_measurement_interval_values"
+            android:icon="@drawable/ic_heartrate"
+            android:key="heartrate_measurement_interval"
+            android:summary="%s"
+            android:title="@string/prefs_title_heartrate_measurement_interval" />
+    </PreferenceScreen>
+</androidx.preference.PreferenceScreen>
diff --git a/app/src/main/res/xml/miband_preferences.xml b/app/src/main/res/xml/miband_preferences.xml
index 0d4ea4a79..b4e5bf91f 100644
--- a/app/src/main/res/xml/miband_preferences.xml
+++ b/app/src/main/res/xml/miband_preferences.xml
@@ -16,19 +16,6 @@
             android:maxLength="5"
             android:title="@string/miband_prefs_fitness_goal" />
 
-        <CheckBoxPreference
-            android:defaultValue="false"
-            android:key="mi_hr_sleep_detection"
-            android:title="@string/miband_prefs_hr_sleep_detection" />
-
-        <ListPreference
-            android:defaultValue="0"
-            android:entries="@array/prefs_heartrate_measurement_interval"
-            android:entryValues="@array/prefs_heartrate_measurement_interval_values"
-            android:key="heartrate_measurement_interval"
-            android:summary="%s"
-            android:title="@string/prefs_title_heartrate_measurement_interval" />
-
     </PreferenceCategory>
 
     <PreferenceCategory

From 91e9451a87428f08ac28dd49502fe37f7497dd3e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Mon, 16 May 2022 17:42:02 +0100
Subject: [PATCH 101/110] Mi Band 5: Add HR activity monitoring, HR alerts,
 stress monitoring

---
 .../DeviceSettingsPreferenceConst.java        |  4 ++
 .../DeviceSpecificSettingsFragment.java       | 38 +++++++++++-
 .../devices/huami/HuamiCoordinator.java       | 20 ++++++
 .../huami/miband5/MiBand5Coordinator.java     |  2 +-
 .../service/devices/huami/HuamiSupport.java   | 49 +++++++++++++++
 app/src/main/res/drawable/ic_mood_bad.xml     |  5 ++
 app/src/main/res/drawable/ic_warning_gray.xml |  5 ++
 app/src/main/res/values/arrays.xml            | 28 +++++++++
 app/src/main/res/values/strings.xml           | 19 ++++++
 .../heartrate_sleep_alert_activity_stress.xml | 62 +++++++++++++++++++
 10 files changed, 228 insertions(+), 4 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_mood_bad.xml
 create mode 100644 app/src/main/res/drawable/ic_warning_gray.xml
 create mode 100644 app/src/main/res/xml/heartrate_sleep_alert_activity_stress.xml

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsPreferenceConst.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsPreferenceConst.java
index f4ba54ea1..a083c1724 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsPreferenceConst.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsPreferenceConst.java
@@ -85,6 +85,10 @@ public class DeviceSettingsPreferenceConst {
 
     public static final String PREF_HEARTRATE_USE_FOR_SLEEP_DETECTION = "heartrate_sleep_detection";
     public static final String PREF_HEARTRATE_MEASUREMENT_INTERVAL = "heartrate_measurement_interval";
+    public static final String PREF_HEARTRATE_ACTIVITY_MONITORING = "heartrate_activity_monitoring";
+    public static final String PREF_HEARTRATE_ALERT_ENABLED = "heartrate_alert_enabled";
+    public static final String PREF_HEARTRATE_ALERT_THRESHOLD = "heartrate_alert_threshold";
+    public static final String PREF_HEARTRATE_STRESS_MONITORING = "heartrate_stress_monitoring";
 
     public static final String PREF_AUTOHEARTRATE_SWITCH = "pref_autoheartrate_switch";
     public static final String PREF_AUTOHEARTRATE_SLEEP = "pref_autoheartrate_sleep";
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 31d6290b6..efe23cbca 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
@@ -355,15 +355,43 @@ public class DeviceSpecificSettingsFragment extends PreferenceFragmentCompat imp
             });
         }
 
-        final Preference heartrateMeasurementInterval = findPreference(PREF_HEARTRATE_MEASUREMENT_INTERVAL);
+        final ListPreference heartrateMeasurementInterval = findPreference(PREF_HEARTRATE_MEASUREMENT_INTERVAL);
         if (heartrateMeasurementInterval != null) {
+            final SwitchPreference activityMonitoring = findPreference(PREF_HEARTRATE_ACTIVITY_MONITORING);
+            final SwitchPreference heartrateAlertEnabled = findPreference(PREF_HEARTRATE_ALERT_ENABLED);
+            final SwitchPreference stressMonitoring = findPreference(PREF_HEARTRATE_STRESS_MONITORING);
+
             heartrateMeasurementInterval.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
-                @Override
-                public boolean onPreferenceChange(Preference preference, Object newVal) {
+                public boolean onPreferenceChange(final Preference preference, final Object newVal) {
                     GBApplication.deviceService().onSetHeartRateMeasurementInterval(Integer.parseInt((String) newVal));
+
+                    final boolean isMeasurementIntervalEnabled = !newVal.equals("0");
+
+                    if (activityMonitoring != null) {
+                        activityMonitoring.setEnabled(isMeasurementIntervalEnabled);
+                    }
+                    if (heartrateAlertEnabled != null) {
+                        heartrateAlertEnabled.setEnabled(isMeasurementIntervalEnabled);
+                    }
+                    if (stressMonitoring != null) {
+                        stressMonitoring.setEnabled(isMeasurementIntervalEnabled);
+                    }
+
                     return true;
                 }
             });
+
+            final boolean isMeasurementIntervalEnabled = !heartrateMeasurementInterval.getValue().equals("0");
+
+            if (activityMonitoring != null) {
+                activityMonitoring.setEnabled(isMeasurementIntervalEnabled);
+            }
+            if (heartrateAlertEnabled != null) {
+                heartrateAlertEnabled.setEnabled(isMeasurementIntervalEnabled);
+            }
+            if (stressMonitoring != null) {
+                stressMonitoring.setEnabled(isMeasurementIntervalEnabled);
+            }
         }
 
         addPreferenceHandlerFor(PREF_SWIPE_UNLOCK);
@@ -416,6 +444,10 @@ public class DeviceSpecificSettingsFragment extends PreferenceFragmentCompat imp
         addPreferenceHandlerFor(PREF_AUTOHEARTRATE_INTERVAL);
         addPreferenceHandlerFor(PREF_AUTOHEARTRATE_START);
         addPreferenceHandlerFor(PREF_AUTOHEARTRATE_END);
+        addPreferenceHandlerFor(PREF_HEARTRATE_ACTIVITY_MONITORING);
+        addPreferenceHandlerFor(PREF_HEARTRATE_ALERT_THRESHOLD);
+        addPreferenceHandlerFor(PREF_HEARTRATE_ALERT_ENABLED);
+        addPreferenceHandlerFor(PREF_HEARTRATE_STRESS_MONITORING);
         addPreferenceHandlerFor(PREF_DO_NOT_DISTURB_NOAUTO);
         addPreferenceHandlerFor(PREF_DO_NOT_DISTURB_NOAUTO_START);
         addPreferenceHandlerFor(PREF_DO_NOT_DISTURB_NOAUTO_END);
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiCoordinator.java
index 11a4a0d39..42575cf63 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiCoordinator.java
@@ -273,6 +273,26 @@ public abstract class HuamiCoordinator extends AbstractDeviceCoordinator {
         return GBApplication.getPrefs().getInt(DeviceSettingsPreferenceConst.PREF_HEARTRATE_MEASUREMENT_INTERVAL, 0) / 60;
     }
 
+    public static boolean getHeartrateActivityMonitoring(String deviceAddress) throws IllegalArgumentException {
+        Prefs prefs = new Prefs(GBApplication.getDeviceSpecificSharedPrefs(deviceAddress));
+        return prefs.getBoolean(DeviceSettingsPreferenceConst.PREF_HEARTRATE_ACTIVITY_MONITORING, false);
+    }
+
+    public static boolean getHeartrateAlert(String deviceAddress) throws IllegalArgumentException {
+        Prefs prefs = new Prefs(GBApplication.getDeviceSpecificSharedPrefs(deviceAddress));
+        return prefs.getBoolean(DeviceSettingsPreferenceConst.PREF_HEARTRATE_ALERT_ENABLED, false);
+    }
+
+    public static int getHeartrateAlertThreshold(String deviceAddress) throws IllegalArgumentException {
+        Prefs prefs = new Prefs(GBApplication.getDeviceSpecificSharedPrefs(deviceAddress));
+        return prefs.getInt(DeviceSettingsPreferenceConst.PREF_HEARTRATE_ALERT_THRESHOLD, 150);
+    }
+
+    public static boolean getHeartrateStressMonitoring(String deviceAddress) throws IllegalArgumentException {
+        Prefs prefs = new Prefs(GBApplication.getDeviceSpecificSharedPrefs(deviceAddress));
+        return prefs.getBoolean(DeviceSettingsPreferenceConst.PREF_HEARTRATE_STRESS_MONITORING, false);
+    }
+
     public static boolean getBtConnectedAdvertising(String deviceAddress) {
         Prefs prefs = new Prefs(GBApplication.getDeviceSpecificSharedPrefs(deviceAddress));
         return prefs.getBoolean(DeviceSettingsPreferenceConst.PREF_BT_CONNECTED_ADVERTISEMENT, false);
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband5/MiBand5Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband5/MiBand5Coordinator.java
index 57d9531af..edf442680 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband5/MiBand5Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband5/MiBand5Coordinator.java
@@ -106,7 +106,7 @@ public class MiBand5Coordinator extends HuamiCoordinator {
                 R.xml.devicesettings_miband5,
                 R.xml.devicesettings_vibrationpatterns,
                 R.xml.devicesettings_wearlocation,
-                R.xml.devicesettings_heartrate_sleep,
+                R.xml.heartrate_sleep_alert_activity_stress,
                 R.xml.devicesettings_goal_notification,
                 R.xml.devicesettings_custom_emoji_font,
                 R.xml.devicesettings_timeformat,
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiSupport.java
index 006cf6290..a74f3079d 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiSupport.java
@@ -171,6 +171,10 @@ import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.Dev
 import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst.PREF_DO_NOT_DISTURB_START;
 import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst.PREF_DO_NOT_DISTURB_END;
 import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst.PREF_DO_NOT_DISTURB_LIFT_WRIST;
+import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst.PREF_HEARTRATE_ACTIVITY_MONITORING;
+import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst.PREF_HEARTRATE_ALERT_ENABLED;
+import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst.PREF_HEARTRATE_ALERT_THRESHOLD;
+import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst.PREF_HEARTRATE_STRESS_MONITORING;
 import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst.PREF_INACTIVITY_ENABLE;
 import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst.PREF_INACTIVITY_START;
 import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst.PREF_INACTIVITY_END;
@@ -230,6 +234,7 @@ import static nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiService.CO
 import static nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiService.COMMAND_GPS_VERSION;
 import static nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiService.COMMAND_WORKOUT_ACTIVITY_TYPES;
 import static nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiService.DISPLAY_ITEM_BIT_CLOCK;
+import static nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiService.ENDPOINT_DISPLAY;
 import static nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiService.ENDPOINT_DISPLAY_ITEMS;
 import static nodomain.freeyourgadget.gadgetbridge.devices.miband.MiBandConst.DEFAULT_VALUE_VIBRATION_COUNT;
 import static nodomain.freeyourgadget.gadgetbridge.devices.miband.MiBandConst.DEFAULT_VALUE_VIBRATION_PROFILE;
@@ -679,6 +684,37 @@ public class HuamiSupport extends AbstractBTLEDeviceSupport {
         return this;
     }
 
+    private HuamiSupport setHeartrateActivityMonitoring(TransactionBuilder builder) {
+        final boolean enableHrActivityMonitoring = HuamiCoordinator.getHeartrateActivityMonitoring(gbDevice.getAddress());
+        final byte[] cmd = {ENDPOINT_DISPLAY, 0x22, 0x00, (byte) (enableHrActivityMonitoring ? 0x01 : 0x00)};
+        writeToConfiguration(builder, cmd);
+        return this;
+    }
+
+    private HuamiSupport setHeartrateAlert(TransactionBuilder builder) {
+        final boolean enableHrAlert = HuamiCoordinator.getHeartrateAlert(gbDevice.getAddress());
+        final int hrAlertThreshold = HuamiCoordinator.getHeartrateAlertThreshold(gbDevice.getAddress());
+
+        final byte[] cmd = {
+                ENDPOINT_DISPLAY,
+                0x1a,
+                0x00,
+                (byte) (enableHrAlert ? 0x01 : 0x00),
+                (byte) hrAlertThreshold
+        };
+
+        writeToConfiguration(builder, cmd);
+
+        return this;
+    }
+
+    private HuamiSupport setHeartrateStressMonitoring(TransactionBuilder builder) {
+        final boolean enableHrStressMonitoring = HuamiCoordinator.getHeartrateStressMonitoring(gbDevice.getAddress());
+        final byte[] cmd = new byte[] {(byte) 0xfe, 0x06, 0x00, (byte) (enableHrStressMonitoring ? 0x01 : 0x00)};
+        writeToConfiguration(builder, cmd);
+        return this;
+    }
+
     private HuamiSupport setHeartrateMeasurementInterval(TransactionBuilder builder, int minutes) {
         if (characteristicHRControlPoint != null) {
             builder.notify(characteristicHRControlPoint, true);
@@ -2536,6 +2572,16 @@ public class HuamiSupport extends AbstractBTLEDeviceSupport {
                 case PREF_HUAMI_VIBRATION_TRY_FIND_BAND:
                     setVibrationPattern(builder, config);
                     break;
+                case PREF_HEARTRATE_ACTIVITY_MONITORING:
+                    setHeartrateActivityMonitoring(builder);
+                    break;
+                case PREF_HEARTRATE_ALERT_ENABLED:
+                case PREF_HEARTRATE_ALERT_THRESHOLD:
+                    setHeartrateAlert(builder);
+                    break;
+                case PREF_HEARTRATE_STRESS_MONITORING:
+                    setHeartrateStressMonitoring(builder);
+                    break;
             }
             builder.queue(getQueue());
         } catch (IOException e) {
@@ -3677,6 +3723,9 @@ public class HuamiSupport extends AbstractBTLEDeviceSupport {
         setGoalNotification(builder);
         setInactivityWarnings(builder);
         setHeartrateSleepSupport(builder);
+        setHeartrateActivityMonitoring(builder);
+        setHeartrateAlert(builder);
+        setHeartrateStressMonitoring(builder);
         setDisconnectNotification(builder);
         setExposeHRThridParty(builder);
         setHeartrateMeasurementInterval(builder, HuamiCoordinator.getHeartRateMeasurementInterval(getDevice().getAddress()));
diff --git a/app/src/main/res/drawable/ic_mood_bad.xml b/app/src/main/res/drawable/ic_mood_bad.xml
new file mode 100644
index 000000000..7548a5887
--- /dev/null
+++ b/app/src/main/res/drawable/ic_mood_bad.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#7E7E7E"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M11.99,2C6.47,2 2,6.48 2,12s4.47,10 9.99,10C17.52,22 22,17.52 22,12S17.52,2 11.99,2zM12,20c-4.42,0 -8,-3.58 -8,-8s3.58,-8 8,-8 8,3.58 8,8 -3.58,8 -8,8zM15.5,11c0.83,0 1.5,-0.67 1.5,-1.5S16.33,8 15.5,8 14,8.67 14,9.5s0.67,1.5 1.5,1.5zM8.5,11c0.83,0 1.5,-0.67 1.5,-1.5S9.33,8 8.5,8 7,8.67 7,9.5 7.67,11 8.5,11zM12,14c-2.33,0 -4.31,1.46 -5.11,3.5h10.22c-0.8,-2.04 -2.78,-3.5 -5.11,-3.5z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_warning_gray.xml b/app/src/main/res/drawable/ic_warning_gray.xml
new file mode 100644
index 000000000..98ce89163
--- /dev/null
+++ b/app/src/main/res/drawable/ic_warning_gray.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#7E7E7E"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M1,21h22L12,2 1,21zM13,18h-2v-2h2v2zM13,14h-2v-4h2v4z"/>
+</vector>
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index aa3c82889..f9d8d1377 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -1581,6 +1581,34 @@
         <item>3600</item>
     </string-array>
 
+    <string-array name="prefs_miband_heartrate_alert_threshold">
+        <item name="100">@string/heartrate_bpm_100</item>
+        <item name="105">@string/heartrate_bpm_105</item>
+        <item name="110">@string/heartrate_bpm_110</item>
+        <item name="112">@string/heartrate_bpm_112</item>
+        <item name="120">@string/heartrate_bpm_120</item>
+        <item name="125">@string/heartrate_bpm_125</item>
+        <item name="130">@string/heartrate_bpm_130</item>
+        <item name="135">@string/heartrate_bpm_135</item>
+        <item name="140">@string/heartrate_bpm_140</item>
+        <item name="145">@string/heartrate_bpm_145</item>
+        <item name="150">@string/heartrate_bpm_150</item>
+    </string-array>
+
+    <string-array name="prefs_miband_heartrate_alert_threshold_values">
+        <item>100</item>
+        <item>105</item>
+        <item>110</item>
+        <item>112</item>
+        <item>120</item>
+        <item>125</item>
+        <item>130</item>
+        <item>135</item>
+        <item>140</item>
+        <item>145</item>
+        <item>150</item>
+    </string-array>
+
     <string-array name="prefs_zetime_heartrate_measurement_interval">
         <item name="0">@string/off</item>
         <item name="300">@string/interval_five_minutes</item>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index bd5c99c3c..895419d9c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -482,6 +482,17 @@
     <string name="interval_fifteen_minutes">every 15 minutes</string>
     <string name="interval_thirty_minutes">every 30 minutes</string>
     <string name="interval_forty_five_minutes">every 45 minutes</string>
+    <string name="heartrate_bpm_100">100 bpm</string>
+    <string name="heartrate_bpm_105">105 bpm</string>
+    <string name="heartrate_bpm_110">110 bpm</string>
+    <string name="heartrate_bpm_112">112 bpm</string>
+    <string name="heartrate_bpm_120">120 bpm</string>
+    <string name="heartrate_bpm_125">125 bpm</string>
+    <string name="heartrate_bpm_130">130 bpm</string>
+    <string name="heartrate_bpm_135">135 bpm</string>
+    <string name="heartrate_bpm_140">140 bpm</string>
+    <string name="heartrate_bpm_145">145 bpm</string>
+    <string name="heartrate_bpm_150">150 bpm</string>
     <string name="interval_one_hour">once an hour</string>
     <string name="stats_title">Speed zones</string>
     <string name="stats_x_axis_label">Total minutes</string>
@@ -538,6 +549,13 @@
     <string name="chart_get_active_and_synchronize">Do some activity and synchronize device.</string>
     <string name="user_feedback_miband_activity_data_transfer">About to transfer %1$s of data starting from %2$s</string>
     <string name="miband_prefs_fitness_goal">Daily step target</string>
+    <string name="prefs_heartrate_alert_experimental_title">Heart rate alert (experimental)</string>
+    <string name="prefs_heartrate_alert_experimental_description">Vibrate the band when the heart rate is over a threshold, without any obvious physical activity in the last 10 minutes. This feature is experimental, and was not extensively tested.</string>
+    <string name="prefs_heartrate_alert_threshold">Heart rate alert threshold</string>
+    <string name="prefs_stress_monitoring_title">Stress monitoring</string>
+    <string name="prefs_stress_monitoring_description">Monitor stress level while resting</string>
+    <string name="prefs_activity_monitoring_title">Activity monitoring</string>
+    <string name="prefs_activity_monitoring_description">Automatically increase the heart rate detection frequency when the band detects physical exercise, to increase heart rate capture accuracy.</string>
     <string name="dbaccess_error_executing">Error executing \'%1$s\'</string>
     <string name="controlcenter_start_activitymonitor">Your activity (ALPHA)</string>
     <string name="cannot_connect">Cannot connect: %1$s</string>
@@ -685,6 +703,7 @@
     <string name="mi2_prefs_inactivity_warnings_dnd_summary">Disable inactivity warnings for a time interval</string>
     <string name="mi2_prefs_heart_rate_monitoring">Heart Rate Monitoring</string>
     <string name="mi2_prefs_heart_rate_monitoring_summary">Configure heart rate monitoring</string>
+    <string name="mi2_prefs_heart_rate_monitoring_alerts_summary">Configure heart rate monitoring and alert thresholds</string>
     <string name="mi2_prefs_do_not_disturb_start">Start time</string>
     <string name="mi2_prefs_do_not_disturb_end">End time</string>
     <string name="mi2_prefs_do_not_disturb_lift_wrist">Activate display upon lift during Do Not Disturb</string>
diff --git a/app/src/main/res/xml/heartrate_sleep_alert_activity_stress.xml b/app/src/main/res/xml/heartrate_sleep_alert_activity_stress.xml
new file mode 100644
index 000000000..7abecfa16
--- /dev/null
+++ b/app/src/main/res/xml/heartrate_sleep_alert_activity_stress.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+    <PreferenceScreen
+        android:icon="@drawable/ic_heartrate"
+        android:key="heartrate_monitoring_key"
+        android:persistent="false"
+        android:summary="@string/mi2_prefs_heart_rate_monitoring_alerts_summary"
+        android:title="@string/mi2_prefs_heart_rate_monitoring">
+
+        <SwitchPreference
+            android:defaultValue="false"
+            android:icon="@drawable/ic_activity_sleep"
+            android:key="heartrate_sleep_detection"
+            android:title="@string/miband_prefs_hr_sleep_detection" />
+
+        <ListPreference
+            android:defaultValue="0"
+            android:entries="@array/prefs_heartrate_measurement_interval"
+            android:entryValues="@array/prefs_heartrate_measurement_interval_values"
+            android:icon="@drawable/ic_heartrate"
+            android:key="heartrate_measurement_interval"
+            android:summary="%s"
+            android:title="@string/prefs_title_heartrate_measurement_interval" />
+
+        <!-- Activity Monitoring -->
+
+        <SwitchPreference
+            android:defaultValue="false"
+            android:icon="@drawable/ic_activity_unknown_small"
+            android:key="heartrate_activity_monitoring"
+            android:summary="@string/prefs_activity_monitoring_description"
+            android:title="@string/prefs_activity_monitoring_title" />
+
+        <!-- Heart Rate Alerts -->
+
+        <SwitchPreference
+            android:defaultValue="false"
+            android:icon="@drawable/ic_warning_gray"
+            android:key="heartrate_alert_enabled"
+            android:summary="@string/prefs_heartrate_alert_experimental_description"
+            android:title="@string/prefs_heartrate_alert_experimental_title" />
+
+        <ListPreference
+            android:defaultValue="0"
+            android:dependency="heartrate_alert_enabled"
+            android:entries="@array/prefs_miband_heartrate_alert_threshold"
+            android:entryValues="@array/prefs_miband_heartrate_alert_threshold_values"
+            android:icon="@drawable/ic_heartrate"
+            android:key="heartrate_alert_threshold"
+            android:summary="%s"
+            android:title="@string/prefs_heartrate_alert_threshold" />
+
+        <!-- Stress Monitoring -->
+
+        <SwitchPreference
+            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" />
+    </PreferenceScreen>
+</androidx.preference.PreferenceScreen>

From 569cd59dd5821e2f8a26842eaa80d617dd7f0548 Mon Sep 17 00:00:00 2001
From: Yaron Shahrabani <sh.yaron@gmail.com>
Date: Mon, 16 May 2022 13:05:32 +0000
Subject: [PATCH 102/110] Translated using Weblate (Hebrew)

Currently translated at 100.0% (1515 of 1515 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/he/
---
 app/src/main/res/values-he/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml
index 6ff0704b2..e9c790f96 100644
--- a/app/src/main/res/values-he/strings.xml
+++ b/app/src/main/res/values-he/strings.xml
@@ -1638,4 +1638,5 @@
     <string name="pref_screen_notification_profile_event_reminder">מתזכר אירועים</string>
     <string name="pref_screen_notification_idle_alerts">התראות בטלה</string>
     <string name="pref_screen_notification_profile_find_device">איתור המכשיר</string>
+    <string name="devicetype_sony_wf_1000xm3">Sony WF-1000XM3</string>
 </resources>
\ No newline at end of file

From 0d9259a351ec39031148869c755933f7f599e0be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?O=C4=9Fuz=20Ersen?= <oguz@ersen.moe>
Date: Mon, 16 May 2022 19:42:21 +0000
Subject: [PATCH 103/110] Translated using Weblate (Turkish)

Currently translated at 100.0% (1515 of 1515 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/tr/
---
 app/src/main/res/values-tr/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index d71be1eb9..759fecacc 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -1655,4 +1655,5 @@
     <string name="pref_screen_notification_profile_event_reminder">Etkinlik hatırlatıcı</string>
     <string name="pref_screen_notification_profile_find_device">Aygıt bul</string>
     <string name="pref_screen_vibration_patterns_summary">Farklı bildirimler için titreşim modellerini yapılandırın</string>
+    <string name="devicetype_sony_wf_1000xm3">Sony WF-1000XM3</string>
 </resources>
\ No newline at end of file

From 34d2daf9df52a32818fbb9f95e9c9022bac98e1e Mon Sep 17 00:00:00 2001
From: Ihor Hordiichuk <igor_ck@outlook.com>
Date: Mon, 16 May 2022 21:24:33 +0000
Subject: [PATCH 104/110] Translated using Weblate (Ukrainian)

Currently translated at 100.0% (1515 of 1515 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/uk/
---
 app/src/main/res/values-uk/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index ce7d58456..eff7401af 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -1646,4 +1646,5 @@
     <string name="pref_screen_notification_profile_find_device">Знайти пристрій</string>
     <string name="pref_screen_vibration_patterns_title">Шаблони вібрацій</string>
     <string name="pref_screen_vibration_patterns_summary">Налаштуйте шаблони вібрації для різних сповіщень</string>
+    <string name="devicetype_sony_wf_1000xm3">Sony WF-1000XM3</string>
 </resources>
\ No newline at end of file

From 9ef6c05af1a470a850c3db08eae202d45c4b014b Mon Sep 17 00:00:00 2001
From: arjan-s <a_gitlab@anymore.nl>
Date: Mon, 16 May 2022 13:29:49 +0000
Subject: [PATCH 105/110] Translated using Weblate (Dutch)

Currently translated at 100.0% (1515 of 1515 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/nl/
---
 app/src/main/res/values-nl/strings.xml | 45 ++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)

diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 9f26eba66..037c21543 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -1595,4 +1595,49 @@
     <string name="watchface_dialog_pre_setting_position">Positie ingesteld op %s</string>
     <string name="watchface_setting_light_up_on_notification">Scherm oplichten bij nieuwe melding</string>
     <string name="menuitem_email">E-mail</string>
+    <string name="pref_screen_notification_profile_event_reminder">Evenement-herinnering</string>
+    <string name="pref_screen_notification_profile_find_device">Zoek apparaat</string>
+    <string name="pref_screen_notification_idle_alerts">Inactiviteitswaarschuwingen</string>
+    <string name="pref_screen_vibration_patterns_title">Trillingspatronen</string>
+    <string name="pref_screen_vibration_patterns_summary">Configureer de trillingspatronen voor verschillende meldingen</string>
+    <string name="pref_world_clocks_summary">Klokken configureren voor andere tijdzones</string>
+    <string name="world_clock_delete_confirm_title">Verwijder \'%1$s\'</string>
+    <string name="world_clock_delete_confirm_description">Weet je zeker dat je de wereldklok wilt verwijderen\?</string>
+    <string name="world_clock_no_free_slots_title">Geen vrije plekken</string>
+    <string name="world_clock_no_free_slots_description">Het apparaat heeft geen vrije slots voor wereldklokken (totaal aantal slots: %1$s)</string>
+    <string name="world_clock_timezone">Tijdzone</string>
+    <string name="world_clock_label">Label</string>
+    <string name="title_activity_world_clock_details">Details wereldklok</string>
+    <string name="mi5_prefs_workout_activity_types">Soorten trainingsactiviteiten</string>
+    <string name="mi5_prefs_workout_activity_types_summary">Kies de activiteitstypes om op het workouts-scherm weer te geven</string>
+    <string name="normal">Normaal</string>
+    <string name="sensitive">Gevoelig</string>
+    <string name="activity_type_outdoor_cycling">Buiten fietsen</string>
+    <string name="activity_type_elliptical">Crosstrainer</string>
+    <string name="devicetype_sony_wf_1000xm3">Sony WF-1000XM3</string>
+    <string name="title_activity_controlcenter_main_nopebble">Gadgetbridge Nightly Geen Pebble</string>
+    <string name="activity_type_outdoor_running">Buiten hardlopen</string>
+    <string name="about_activity_title_main_nightly">Over Gadgetbridge Nightly</string>
+    <string name="application_name_main_nopebble">Gadgetbridge (Nightly, geen Pebble-provider)</string>
+    <string name="gadgetbridge_running_main_nopebble">Nightly NoPebble GB actief</string>
+    <string name="activity_type_freestyle">Freestyle</string>
+    <string name="pref_device_action_fitness_app_control_toggle">Fitness-app-tracking in-/uitschakelen</string>
+    <string name="application_name_banglejs_main">Bangle.js Gadgetbridge</string>
+    <string name="title_activity_controlcenter_banglejs_main">Bangle.js Gadgetbridge</string>
+    <string name="about_activity_title_banglejs_main">Over Bangle.js Gadgetbridge</string>
+    <string name="about_description_banglejs_main">Android-app voor Bangle.js gebouwd bovenop het Gadgetbridge-project, met toegevoegde internettoegang.</string>
+    <string name="gadgetbridge_running_banglejs_main">Bangle.js actief</string>
+    <string name="application_name_banglejs_nopebble">Bangle.js Gadgetbridge</string>
+    <string name="title_activity_controlcenter_banglejs_nopebble">Bangle.js Gadgetbridge</string>
+    <string name="about_activity_title_banglejs_nopebble">Over Bangle.js Gadgetbridge</string>
+    <string name="about_description_banglejs_nopebble">Android-app voor Bangle.js gebouwd bovenop het Gadgetbridge-project, met toegevoegde internettoegang.</string>
+    <string name="gadgetbridge_running_banglejs_nopebble">Bangle.js actief</string>
+    <string name="application_name_main_nightly">Gadgetbridge (Nightly)</string>
+    <string name="title_activity_controlcenter_main_nightly">Gadgetbridge Nightly</string>
+    <string name="about_description_main_nightly">Cloudless copyleft libre-vervanging voor closed source Android-gadget-apps van leveranciers. Nightly releases van Gadgetbridge. Het kan niet worden geïnstalleerd als je de Gadgetbridge- of de Pebble-app al hebt geïnstalleerd, vanwege een conflict in de Pebble-provider.</string>
+    <string name="gadgetbridge_running_main_nightly">Nightly GB actief</string>
+    <string name="about_activity_title_main_nopebble">Over Gadgetbridge Nightly No Pebble</string>
+    <string name="about_description_main_nopebble">Cloudloze copyleft libre-vervanging voor closed source Android-gadget-apps van leveranciers. Nightly releases van Gadgetbridge. Deze versie heeft de naam van de Pebble-provider hernoemd om conflicten te voorkomen, dus sommige Pebble-gerelateerde integraties zullen niet werken, maar het kan naast de bestaande Gadgetbridge-installatie worden geïnstalleerd.</string>
+    <string name="pref_world_clocks_title">Wereldklokken</string>
+    <string name="prefs_activate_display_on_lift_sensitivity">Gevoeligheid</string>
 </resources>
\ No newline at end of file

From c5b4763fbfc0fde45c7ba96932c7c5a8d5890552 Mon Sep 17 00:00:00 2001
From: Ihor Hordiichuk <igor_ck@outlook.com>
Date: Tue, 17 May 2022 21:12:41 +0000
Subject: [PATCH 106/110] Translated using Weblate (Ukrainian)

Currently translated at 100.0% (1554 of 1554 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/uk/
---
 app/src/main/res/values-uk/strings.xml | 39 ++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index eff7401af..a8102ff04 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -1647,4 +1647,43 @@
     <string name="pref_screen_vibration_patterns_title">Шаблони вібрацій</string>
     <string name="pref_screen_vibration_patterns_summary">Налаштуйте шаблони вібрації для різних сповіщень</string>
     <string name="devicetype_sony_wf_1000xm3">Sony WF-1000XM3</string>
+    <string name="devicetype_galaxybuds_pro">Galaxy Buds Pro</string>
+    <string name="prefs_in_ear_detection_summary">Відтворення викликів через навушники, коли вони у ваших вухах</string>
+    <string name="prefs_seamless_connection_switch_summary">Автоматичне перемикає навушники між пов\'язаними пристроями</string>
+    <string name="prefs_ambient_volume_left">Гучність навколишнього середовища зліва</string>
+    <string name="prefs_customize_ambient_sound_summary">Налаштування навколишнього звуку</string>
+    <string name="prefs_ambient_sound_during_call_title">Навколишній звук під час виклику</string>
+    <string name="prefs_active_noise_cancelling_level">Активний рівень пригнічення шуму</string>
+    <string name="prefs_active_noise_cancelling_level_high">Високий</string>
+    <string name="prefs_switch_control_left">Перемикання елемента керування ліворуч</string>
+    <string name="prefs_switch_control_right">Перемикання елемента керування праворуч</string>
+    <string name="pref_title_touch_anc">Активне пригнічення шуму</string>
+    <string name="pref_title_touch_volume">Гучність</string>
+    <string name="pref_ambient_sound_tone_summary">Від м’якого до чистого</string>
+    <string name="pref_switch_controls_anc_off">Пригнічення шуму ←→ Вимкнено</string>
+    <string name="pref_switch_controls_ambient_off">Навколишнє середовище ←→ Вимкнено</string>
+    <string name="prefs_noise_control">Контроль шуму</string>
+    <string name="prefs_voice_detect">Виявлення голосу</string>
+    <string name="prefs_double_tap_edge">Подвійний дотик краю</string>
+    <string name="prefs_voice_detect_duration">Завершення після тиші за:</string>
+    <string name="pref_voice_detect_duration_15">15 секунд</string>
+    <string name="prefs_ambient_volume_right">Гучність навколишнього середовища вправо</string>
+    <string name="prefs_ambient_sound_during_call_summary">Чути власний голос під час виклику</string>
+    <string name="prefs_seamless_connection_switch_title">Плавне перемикання з\'єднання</string>
+    <string name="prefs_ambient_settings_title">Параметри навколишнього звуку</string>
+    <string name="pref_title_touch_voice_assistant">Голосовий помічник</string>
+    <string name="prefs_active_noise_cancelling_level_low">Низький</string>
+    <string name="prefs_noise_control_with_one_earbud">Керування шумом за допомогою одного навушника</string>
+    <string name="pref_title_touch_quick_ambient">Швидкий навколишній звук</string>
+    <string name="pref_title_touch_spotify">Spotify</string>
+    <string name="pref_switch_noise_control">Перемикання керування шумом</string>
+    <string name="pref_title_touch_ambient">Навколишній звук</string>
+    <string name="prefs_noise_control_with_one_earbud_summary">Дозволити контроль шуму під час використання лише одного навушника</string>
+    <string name="pref_balance">Баланс</string>
+    <string name="pref_ambient_sound_tone">Тон навколишнього звуку</string>
+    <string name="pref_switch_controls_anc_ambient">Пригнічення шуму ←→ Навколишнє середовище</string>
+    <string name="prefs_voice_detect_summary">Увімкнути навколишній звук і автоматичне стишення відтворення після виявлення голосу</string>
+    <string name="prefs_double_tap_edge_summary">Виявлення подвійного дотику, навіть якщо він не під\'єднаний до сенсорної панелі</string>
+    <string name="pref_voice_detect_duration_10">10 секунд</string>
+    <string name="pref_voice_detect_duration_5">5 секунд</string>
 </resources>
\ No newline at end of file

From 18f4d62009bc48e11f3392e203f3eaeb6de0acf3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=B0=91=E4=B8=BE?= <oshirisu.red@gmail.com>
Date: Wed, 18 May 2022 01:52:35 +0000
Subject: [PATCH 107/110] Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (1554 of 1554 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/zh_Hans/
---
 app/src/main/res/values-zh-rCN/strings.xml | 39 ++++++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 00a378699..c366beafa 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -1645,4 +1645,43 @@
     <string name="pref_screen_notification_idle_alerts">空闲警报</string>
     <string name="pref_screen_vibration_patterns_title">振动模式</string>
     <string name="devicetype_sony_wf_1000xm3">Sony WF-1000XM3</string>
+    <string name="prefs_ambient_settings_title">环境声音选项</string>
+    <string name="prefs_voice_detect_duration">安静多久后结束：</string>
+    <string name="pref_voice_detect_duration_5">5秒</string>
+    <string name="pref_voice_detect_duration_10">10秒</string>
+    <string name="pref_voice_detect_duration_15">15秒</string>
+    <string name="devicetype_galaxybuds_pro">Galaxy Buds Pro</string>
+    <string name="prefs_ambient_volume_right">右侧环境音量</string>
+    <string name="prefs_customize_ambient_sound_summary">自定义环境音</string>
+    <string name="pref_ambient_sound_tone">环境音声调</string>
+    <string name="prefs_seamless_connection_switch_title">无缝连接开关</string>
+    <string name="prefs_in_ear_detection_summary">当耳塞在你的耳朵里时，通过耳塞接听电话</string>
+    <string name="prefs_seamless_connection_switch_summary">在配对设备之间自动切换耳机</string>
+    <string name="prefs_ambient_volume_left">左侧环境音量</string>
+    <string name="prefs_ambient_sound_during_call_title">通话期间的环境音</string>
+    <string name="prefs_active_noise_cancelling_level">主动降噪级别</string>
+    <string name="prefs_active_noise_cancelling_level_high">高</string>
+    <string name="prefs_active_noise_cancelling_level_low">低</string>
+    <string name="prefs_switch_control_left">左侧开关控制</string>
+    <string name="prefs_ambient_sound_during_call_summary">在通话过程中听到自己的声音</string>
+    <string name="prefs_switch_control_right">右侧开关控制</string>
+    <string name="pref_title_touch_anc">主动降噪</string>
+    <string name="pref_title_touch_volume">音量</string>
+    <string name="pref_title_touch_ambient">环境音</string>
+    <string name="pref_title_touch_spotify">Spotify</string>
+    <string name="pref_switch_noise_control">切换噪声控制</string>
+    <string name="prefs_noise_control_with_one_earbud">单个耳塞的噪音控制</string>
+    <string name="prefs_noise_control_with_one_earbud_summary">只使用一个耳塞的情况下允许使用噪音控制</string>
+    <string name="pref_title_touch_voice_assistant">语音助理</string>
+    <string name="pref_title_touch_quick_ambient">快速环境音效</string>
+    <string name="pref_ambient_sound_tone_summary">从柔软到清晰</string>
+    <string name="pref_switch_controls_ambient_off">环境音 ←→ 关闭</string>
+    <string name="prefs_voice_detect_summary">启用环境音，并在检测到语音后自动降低播放音量</string>
+    <string name="prefs_double_tap_edge">双击边缘</string>
+    <string name="prefs_double_tap_edge_summary">即使没有触摸板上按下也进行双击检测</string>
+    <string name="pref_balance">平衡</string>
+    <string name="pref_switch_controls_anc_ambient">降噪 ←→ 环境</string>
+    <string name="pref_switch_controls_anc_off">降噪 ←→ 关闭</string>
+    <string name="prefs_noise_control">噪音控制</string>
+    <string name="prefs_voice_detect">语音检测</string>
 </resources>
\ No newline at end of file

From 21fbcfa530a023598145c1fbb35f764cff6387aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Allan=20Nordh=C3=B8y?= <epost@anotheragency.no>
Date: Tue, 17 May 2022 21:32:55 +0000
Subject: [PATCH 108/110] =?UTF-8?q?Translated=20using=20Weblate=20(Norwegi?=
 =?UTF-8?q?an=20Bokm=C3=A5l)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Currently translated at 87.6% (1362 of 1554 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/nb_NO/
---
 app/src/main/res/values-nb-rNO/strings.xml | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml
index a4ec29f47..323584de5 100644
--- a/app/src/main/res/values-nb-rNO/strings.xml
+++ b/app/src/main/res/values-nb-rNO/strings.xml
@@ -1596,4 +1596,21 @@
     <string name="activity_db_management_autoexport_location">Forsto ikke plassering. Antagelig er dette et tilgangsproblem i Android. Mest sannsynlig fungerer ikke auto-eksport nå.</string>
     <string name="watchface_dialog_pre_setting_position">forhåndsinnstiller posisjon til %s</string>
     <string name="watchface_setting_light_up_on_notification">Slå på lys ved nye merknader</string>
+    <string name="pref_title_touch_ambient">Omgivelseslyd</string>
+    <string name="pref_balance">Balanse</string>
+    <string name="activity_type_outdoor_cycling">Utendørssykling</string>
+    <string name="activity_type_outdoor_running">Utendørsløping</string>
+    <string name="prefs_active_noise_cancelling_level_low">Lavt</string>
+    <string name="pref_title_touch_spotify">Spotify</string>
+    <string name="prefs_active_noise_cancelling_level_high">Høy</string>
+    <string name="pref_title_touch_voice_assistant">Stemmeassistent</string>
+    <string name="pref_title_touch_volume">Lydstyrke</string>
+    <string name="pref_title_touch_anc">Aktiv lydkansellering</string>
+    <string name="prefs_noise_control">Støykontroll</string>
+    <string name="pref_voice_detect_duration_5">5 sekunder</string>
+    <string name="pref_voice_detect_duration_10">10 sekunder</string>
+    <string name="pref_voice_detect_duration_15">15 sekunder</string>
+    <string name="normal">Normal</string>
+    <string name="sensitive">Sensitiv</string>
+    <string name="menuitem_email">E-post</string>
 </resources>
\ No newline at end of file

From 79d5c246a2261b479f37711afce626756ff25bd6 Mon Sep 17 00:00:00 2001
From: Andreas Shimokawa <shimokawa@fsfe.org>
Date: Wed, 18 May 2022 10:41:30 +0200
Subject: [PATCH 109/110] Mi Band 6: enable new settings

---
 CHANGELOG.md                                                   | 3 ++-
 .../gadgetbridge/devices/huami/miband6/MiBand6Coordinator.java | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f78cd5ee3..d1b446111 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,13 +4,14 @@
 * Initial Support for Sony WF-1000XM3
 * Initial Support for Galaxy Buds Pro
 * Huami: Add Toggle function for Open Tracks tracking to button actions
-* Huami: Move inactivity warnings and goal notification to device-specific settings
+* Huami: Move inactivity warnings, goal notification and HR monitoring to device-specific settings
 * Mi Band 6: set time on connect
 * Mi Band 5/6, Amazfit Bip S/U/Pro: Add world clock configuration
 * Mi Band 5/6: support sensitivity setting for lift wrist configuration
 * Mi Band 5: Add support for configuring workout menu on device
 * Mi Band 4/5/6, Amazfit Bip U/Pro: Add support for vibration patterns
 * Mi Band 5: Increase number of reminder slots to 50
+* Mi Band 5/6: Add setting for HR activity monitoring, HR alerts, stress monitoring
 * Amazfit Neo: Allow to disable beeps for email notifications
 * Bangle.js: Fix incoming calls in release builds
 * Fossil Hybrid HR: Support flexible custom menu on watch
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband6/MiBand6Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband6/MiBand6Coordinator.java
index bb70de28c..8b3e2ead4 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband6/MiBand6Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband6/MiBand6Coordinator.java
@@ -86,7 +86,7 @@ public class MiBand6Coordinator extends HuamiCoordinator {
                 R.xml.devicesettings_miband6,
                 R.xml.devicesettings_vibrationpatterns,
                 R.xml.devicesettings_wearlocation,
-                R.xml.devicesettings_heartrate_sleep,
+                R.xml.heartrate_sleep_alert_activity_stress,
                 R.xml.devicesettings_goal_notification,
                 R.xml.devicesettings_custom_emoji_font,
                 R.xml.devicesettings_timeformat,

From 603d56c7aa1a182a9d29e7f5a63089996edc4db2 Mon Sep 17 00:00:00 2001
From: Andreas Shimokawa <shimokawa@fsfe.org>
Date: Wed, 18 May 2022 10:45:44 +0200
Subject: [PATCH 110/110] update changelog, bump version

---
 CHANGELOG.md                                  |  6 +++--
 app/build.gradle                              |  4 ++--
 app/src/main/res/xml/changelog_master.xml     | 23 +++++++++++++++++++
 .../metadata/android/en-US/changelogs/211.txt | 21 +++++++++++++++++
 4 files changed, 50 insertions(+), 4 deletions(-)
 create mode 100644 fastlane/metadata/android/en-US/changelogs/211.txt

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d1b446111..da38ceee8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 ### Changelog
 
-### NEXT
+### 0.67.0
 * Initial Support for Sony WF-1000XM3
 * Initial Support for Galaxy Buds Pro
 * Huami: Add Toggle function for Open Tracks tracking to button actions
@@ -15,13 +15,15 @@
 * Amazfit Neo: Allow to disable beeps for email notifications
 * Bangle.js: Fix incoming calls in release builds
 * Fossil Hybrid HR: Support flexible custom menu on watch
+* Fossil Hybrid HR: Add support for native DND Call/SMS functionality
 * VESC: added battery indicator
 * UM25: Add reset option to current accumulation
 * UM25: Add notification on below current threshold
 * Fix crash when calendar is accessed but permission is denied
-* Add com.asus.asusincallui to blacklist
+* Add com.asus.asusincallui and com.samsung.android.incallui to blacklist
 * New icons for Sony overhead headphones, Sony WF 800n and Mi Band 6
 
+
 ### 0.66.0
 * Add basic support for Casio GBD-H1000
 * Add support for Hama Fit Track 1900 - via FitPro device support
diff --git a/app/build.gradle b/app/build.gradle
index aff0035ab..76d42bd87 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -55,8 +55,8 @@ android {
         multiDexEnabled true
 
         // Note: always bump BOTH versionCode and versionName!
-        versionName "0.66.0"
-        versionCode 210
+        versionName "0.67.0"
+        versionCode 211
         vectorDrawables.useSupportLibrary = true
         multiDexEnabled true
         buildConfigField "String", "GIT_HASH_SHORT", "\"${getGitHashShort()}\""
diff --git a/app/src/main/res/xml/changelog_master.xml b/app/src/main/res/xml/changelog_master.xml
index 6d845686b..01eae68c0 100644
--- a/app/src/main/res/xml/changelog_master.xml
+++ b/app/src/main/res/xml/changelog_master.xml
@@ -1,5 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <changelog>
+    <release version="0.67.0" versioncode="211">
+        <change>Initial Support for Sony WF-1000XM3</change>
+        <change>Initial Support for Galaxy Buds Pro</change>
+        <change>Huami: Add Toggle function for Open Tracks tracking to button actions</change>
+        <change>Huami: Move inactivity warnings, goal notification and HR monitoring to device-specific settings</change>
+        <change>Mi Band 6: set time on connect</change>
+        <change>Mi Band 5/6, Amazfit Bip S/U/Pro: Add world clock configuration</change>
+        <change>Mi Band 5/6: support sensitivity setting for lift wrist configuration</change>
+        <change>Mi Band 5: Add support for configuring workout menu on device</change>
+        <change>Mi Band 4/5/6, Amazfit Bip U/Pro: Add support for vibration patterns</change>
+        <change>Mi Band 5: Increase number of reminder slots to 50</change>
+        <change>Mi Band 5/6: Add setting for HR activity monitoring, HR alerts, stress monitoring</change>
+        <change>Amazfit Neo: Allow to disable beeps for email notifications</change>
+        <change>Bangle.js: Fix incoming calls in release builds</change>
+        <change>Fossil Hybrid HR: Support flexible custom menu on watch</change>
+        <change>Fossil Hybrid HR: Add support for native DND Call/SMS functionality</change>
+        <change>VESC: added battery indicator</change>
+        <change>UM25: Add reset option to current accumulation</change>
+        <change>UM25: Add notification on below current threshold</change>
+        <change>Fix crash when calendar is accessed but permission is denied</change>
+        <change>Add com.asus.asusincallui and com.samsung.android.incallui to blacklist</change>
+        <change>New icons for Sony overhead headphones, Sony WF 800n and Mi Band 6</change>
+    </release>
     <release version="0.66.0" versioncode="210">
         <change>Add basic support for Casio GBD-H1000</change>
         <change>Add support for Hama Fit Track 1900 - via FitPro device support</change>
diff --git a/fastlane/metadata/android/en-US/changelogs/211.txt b/fastlane/metadata/android/en-US/changelogs/211.txt
new file mode 100644
index 000000000..b92a455c4
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/211.txt
@@ -0,0 +1,21 @@
+* Initial Support for Sony WF-1000XM3
+* Initial Support for Galaxy Buds Pro
+* Huami: Add Toggle function for Open Tracks tracking to button actions
+* Huami: Move inactivity warnings, goal notification and HR monitoring to device-specific settings
+* Mi Band 6: set time on connect
+* Mi Band 5/6, Amazfit Bip S/U/Pro: Add world clock configuration
+* Mi Band 5/6: support sensitivity setting for lift wrist configuration
+* Mi Band 5: Add support for configuring workout menu on device
+* Mi Band 4/5/6, Amazfit Bip U/Pro: Add support for vibration patterns
+* Mi Band 5: Increase number of reminder slots to 50
+* Mi Band 5/6: Add setting for HR activity monitoring, HR alerts, stress monitoring
+* Amazfit Neo: Allow to disable beeps for email notifications
+* Bangle.js: Fix incoming calls in release builds
+* Fossil Hybrid HR: Support flexible custom menu on watch
+* Fossil Hybrid HR: Add support for native DND Call/SMS functionality
+* VESC: added battery indicator
+* UM25: Add reset option to current accumulation
+* UM25: Add notification on below current threshold
+* Fix crash when calendar is accessed but permission is denied
+* Add com.asus.asusincallui and com.samsung.android.incallui to blacklist
+* New icons for Sony overhead headphones, Sony WF 800n and Mi Band 6