From 28af9ace9b94d50825bca725d049a9f04d59b5e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Wed, 19 Mar 2025 23:08:49 +0000
Subject: [PATCH] Amazfit Active 2: Fix menu and control center configs

---
 .../amazfitactive2/AmazfitActive2Coordinator.java  |  2 +-
 .../devices/huami/zeppos/ZeppOsMenuType.java       |  3 +++
 app/src/main/res/values/arrays.xml                 | 14 ++++++++++++++
 .../devicesettings_huami2021_control_center.xml    |  2 +-
 4 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitactive2/AmazfitActive2Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitactive2/AmazfitActive2Coordinator.java
index 7f4a737ac3..e84bae5c73 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitactive2/AmazfitActive2Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitactive2/AmazfitActive2Coordinator.java
@@ -57,7 +57,7 @@ public class AmazfitActive2Coordinator extends ZeppOsCoordinator {
 
     @Override
     public boolean mainMenuHasMoreSection() {
-        return true;
+        return false;
     }
 
     @Override
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/ZeppOsMenuType.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/ZeppOsMenuType.java
index f70c451430..31195a3465 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/ZeppOsMenuType.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/ZeppOsMenuType.java
@@ -74,6 +74,7 @@ public class ZeppOsMenuType {
         put("00000100", "alexa");
         put("00000101", "offline_voice");
         put("00000102", "flashlight");
+        put("000FFD39", "hrv");
     }};
 
     public static final Map<String, String> shortcutsNameLookup = new HashMap<String, String>() {{
@@ -128,6 +129,7 @@ public class ZeppOsMenuType {
         put("0000000A", "bluetooth");
         put("0000000B", "wifi");
         put("0000000D", "calendar");
+        put("00000010", "music");
         put("00000012", "alarm");
         put("00000013", "settings");
         put("00000014", "buzzer_intensity");
@@ -138,5 +140,6 @@ public class ZeppOsMenuType {
         put("00000019", "eject_water");
         put("0000001A", "headphone");
         put("0000001B", "night_display");
+        put("0000001C", "always_on_display");
     }};
 }
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index d559894c12..89eed437a0 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -1139,6 +1139,13 @@
         <item>@string/menuitem_headphone</item>
         <item>@string/menuitem_buzzer_intensity</item>
         <item>@string/menuitem_night_display</item>
+        <item>@string/prefs_always_on_display</item>
+        <item>@string/menuitem_music</item>
+        <item>@string/menuitem_barometer</item>
+        <item>@string/menuitem_compass</item>
+        <item>@string/menuitem_countdown</item>
+        <item>@string/menuitem_stopwatch</item>
+        <item>@string/menuitem_alarm</item>
     </string-array>
 
     <string-array name="pref_huami2021_control_center_values">
@@ -1160,6 +1167,13 @@
         <item>headphone</item>
         <item>buzzer_intensity</item>
         <item>night_display</item>
+        <item>always_on_display</item>
+        <item>music</item>
+        <item>barometer</item>
+        <item>compass</item>
+        <item>countdown</item>
+        <item>stopwatch</item>
+        <item>alarm</item>
     </string-array>
 
     <string-array name="pref_miband5_workout_activity_types">
diff --git a/app/src/main/res/xml/devicesettings_huami2021_control_center.xml b/app/src/main/res/xml/devicesettings_huami2021_control_center.xml
index fb685c5428..6dcfea3799 100644
--- a/app/src/main/res/xml/devicesettings_huami2021_control_center.xml
+++ b/app/src/main/res/xml/devicesettings_huami2021_control_center.xml
@@ -2,7 +2,7 @@
 <androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
     <com.mobeta.android.dslv.DragSortListPreference
         android:defaultValue="@array/pref_huami2021_empty_array"
-        android:dialogTitle="@string/bip_prefs_shortcuts"
+        android:dialogTitle="@string/prefs_control_center"
         android:entries="@array/pref_huami2021_control_center"
         android:entryValues="@array/pref_huami2021_control_center_values"
         android:icon="@drawable/ic_menu"