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 232c20731..fdd1f3b8d 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 @@ -88,6 +88,7 @@ public class AmazfitBand5Coordinator extends HuamiCoordinator { final List generic = deviceSpecificSettings.addRootScreen(DeviceSpecificSettingsScreen.GENERIC); generic.add(R.xml.devicesettings_wearlocation); + generic.add(R.xml.devicesettings_device_actions); final List dateTime = deviceSpecificSettings.addRootScreen(DeviceSpecificSettingsScreen.DATE_TIME); dateTime.add(R.xml.devicesettings_timeformat); dateTime.add(R.xml.devicesettings_dateformat); @@ -115,7 +116,6 @@ public class AmazfitBand5Coordinator extends HuamiCoordinator { final List connection = deviceSpecificSettings.addRootScreen(DeviceSpecificSettingsScreen.CONNECTION); connection.add(R.xml.devicesettings_expose_hr_thirdparty); connection.add(R.xml.devicesettings_bt_connected_advertisement); - connection.add(R.xml.devicesettings_device_actions); connection.add(R.xml.devicesettings_high_mtu); connection.add(R.xml.devicesettings_overwrite_settings_on_connection); final List developer = deviceSpecificSettings.addRootScreen(DeviceSpecificSettingsScreen.DEVELOPER); 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 3018981b6..f5a89f0d4 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 @@ -68,6 +68,7 @@ public class AmazfitBipCoordinator extends HuamiCoordinator { final List generic = deviceSpecificSettings.addRootScreen(DeviceSpecificSettingsScreen.GENERIC); generic.add(R.xml.devicesettings_wearlocation); generic.add(R.xml.devicesettings_buttonactions_with_longpress); + generic.add(R.xml.devicesettings_device_actions); final List dateTime = deviceSpecificSettings.addRootScreen(DeviceSpecificSettingsScreen.DATE_TIME); dateTime.add(R.xml.devicesettings_timeformat); final List display = deviceSpecificSettings.addRootScreen(DeviceSpecificSettingsScreen.DISPLAY); @@ -87,7 +88,6 @@ public class AmazfitBipCoordinator extends HuamiCoordinator { final List connection = deviceSpecificSettings.addRootScreen(DeviceSpecificSettingsScreen.CONNECTION); connection.add(R.xml.devicesettings_disconnectnotification); connection.add(R.xml.devicesettings_bt_connected_advertisement); - connection.add(R.xml.devicesettings_device_actions); connection.add(R.xml.devicesettings_overwrite_settings_on_connection); final List developer = deviceSpecificSettings.addRootScreen(DeviceSpecificSettingsScreen.DEVELOPER); developer.add(R.xml.devicesettings_huami2021_fetch_operation_time_unit); 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 edb115866..5eae922c4 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 @@ -57,6 +57,7 @@ public class AmazfitBipLiteCoordinator extends AmazfitBipCoordinator { final List generic = deviceSpecificSettings.addRootScreen(DeviceSpecificSettingsScreen.GENERIC); generic.add(R.xml.devicesettings_wearlocation); generic.add(R.xml.devicesettings_buttonactions_with_longpress); + generic.add(R.xml.devicesettings_device_actions); final List dateTime = deviceSpecificSettings.addRootScreen(DeviceSpecificSettingsScreen.DATE_TIME); dateTime.add(R.xml.devicesettings_timeformat); final List display = deviceSpecificSettings.addRootScreen(DeviceSpecificSettingsScreen.DISPLAY); @@ -76,7 +77,6 @@ public class AmazfitBipLiteCoordinator extends AmazfitBipCoordinator { final List connection = deviceSpecificSettings.addRootScreen(DeviceSpecificSettingsScreen.CONNECTION); connection.add(R.xml.devicesettings_disconnectnotification); connection.add(R.xml.devicesettings_bt_connected_advertisement); - connection.add(R.xml.devicesettings_device_actions); connection.add(R.xml.devicesettings_overwrite_settings_on_connection); final List developer = deviceSpecificSettings.addRootScreen(DeviceSpecificSettingsScreen.DEVELOPER); developer.add(R.xml.devicesettings_relax_firmware_checks); diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbip3/AmazfitBip3Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbip3/AmazfitBip3Coordinator.java index f7b8339ad..8fc23ebfb 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbip3/AmazfitBip3Coordinator.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbip3/AmazfitBip3Coordinator.java @@ -106,6 +106,7 @@ public class AmazfitBip3Coordinator extends HuamiCoordinator { final List generic = deviceSpecificSettings.addRootScreen(DeviceSpecificSettingsScreen.GENERIC); generic.add(R.xml.devicesettings_wearlocation); + generic.add(R.xml.devicesettings_device_actions); final List dateTime = deviceSpecificSettings.addRootScreen(DeviceSpecificSettingsScreen.DATE_TIME); dateTime.add(R.xml.devicesettings_timeformat); dateTime.add(R.xml.devicesettings_dateformat); @@ -126,7 +127,6 @@ public class AmazfitBip3Coordinator extends HuamiCoordinator { final List connection = deviceSpecificSettings.addRootScreen(DeviceSpecificSettingsScreen.CONNECTION); connection.add(R.xml.devicesettings_expose_hr_thirdparty); connection.add(R.xml.devicesettings_bt_connected_advertisement); - connection.add(R.xml.devicesettings_device_actions); connection.add(R.xml.devicesettings_high_mtu); connection.add(R.xml.devicesettings_overwrite_settings_on_connection); final List developer = deviceSpecificSettings.addRootScreen(DeviceSpecificSettingsScreen.DEVELOPER); diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbip3pro/AmazfitBip3ProCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbip3pro/AmazfitBip3ProCoordinator.java index b7ca81997..d63e7aef9 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbip3pro/AmazfitBip3ProCoordinator.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbip3pro/AmazfitBip3ProCoordinator.java @@ -106,6 +106,7 @@ public class AmazfitBip3ProCoordinator extends HuamiCoordinator { final List generic = deviceSpecificSettings.addRootScreen(DeviceSpecificSettingsScreen.GENERIC); generic.add(R.xml.devicesettings_wearlocation); + generic.add(R.xml.devicesettings_device_actions); final List dateTime = deviceSpecificSettings.addRootScreen(DeviceSpecificSettingsScreen.DATE_TIME); dateTime.add(R.xml.devicesettings_timeformat); dateTime.add(R.xml.devicesettings_dateformat); @@ -126,7 +127,6 @@ public class AmazfitBip3ProCoordinator extends HuamiCoordinator { final List connection = deviceSpecificSettings.addRootScreen(DeviceSpecificSettingsScreen.CONNECTION); connection.add(R.xml.devicesettings_expose_hr_thirdparty); connection.add(R.xml.devicesettings_bt_connected_advertisement); - connection.add(R.xml.devicesettings_device_actions); connection.add(R.xml.devicesettings_high_mtu); connection.add(R.xml.devicesettings_overwrite_settings_on_connection); final List developer = deviceSpecificSettings.addRootScreen(DeviceSpecificSettingsScreen.DEVELOPER); 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 e0115e011..13ee1b9c1 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,6 +82,7 @@ public class AmazfitBipSCoordinator extends HuamiCoordinator { final List generic = deviceSpecificSettings.addRootScreen(DeviceSpecificSettingsScreen.GENERIC); generic.add(R.xml.devicesettings_wearlocation); + generic.add(R.xml.devicesettings_device_actions); final List dateTime = deviceSpecificSettings.addRootScreen(DeviceSpecificSettingsScreen.DATE_TIME); dateTime.add(R.xml.devicesettings_timeformat); dateTime.add(R.xml.devicesettings_world_clocks); @@ -102,7 +103,6 @@ public class AmazfitBipSCoordinator extends HuamiCoordinator { final List connection = deviceSpecificSettings.addRootScreen(DeviceSpecificSettingsScreen.CONNECTION); connection.add(R.xml.devicesettings_expose_hr_thirdparty); connection.add(R.xml.devicesettings_bt_connected_advertisement); - connection.add(R.xml.devicesettings_device_actions); connection.add(R.xml.devicesettings_high_mtu); connection.add(R.xml.devicesettings_overwrite_settings_on_connection); final List developer = deviceSpecificSettings.addRootScreen(DeviceSpecificSettingsScreen.DEVELOPER); 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 56d4f4510..fa71c524b 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 @@ -98,6 +98,7 @@ public class AmazfitBipUCoordinator extends HuamiCoordinator { final List generic = deviceSpecificSettings.addRootScreen(DeviceSpecificSettingsScreen.GENERIC); generic.add(R.xml.devicesettings_wearlocation); + generic.add(R.xml.devicesettings_device_actions); final List dateTime = deviceSpecificSettings.addRootScreen(DeviceSpecificSettingsScreen.DATE_TIME); dateTime.add(R.xml.devicesettings_timeformat); dateTime.add(R.xml.devicesettings_world_clocks); @@ -122,7 +123,6 @@ public class AmazfitBipUCoordinator extends HuamiCoordinator { final List connection = deviceSpecificSettings.addRootScreen(DeviceSpecificSettingsScreen.CONNECTION); connection.add(R.xml.devicesettings_expose_hr_thirdparty); connection.add(R.xml.devicesettings_bt_connected_advertisement); - connection.add(R.xml.devicesettings_device_actions); connection.add(R.xml.devicesettings_high_mtu); connection.add(R.xml.devicesettings_overwrite_settings_on_connection); final List developer = deviceSpecificSettings.addRootScreen(DeviceSpecificSettingsScreen.DEVELOPER); 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 a3df069d0..68af6065e 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 @@ -92,6 +92,7 @@ public class AmazfitBipUProCoordinator extends HuamiCoordinator { final List generic = deviceSpecificSettings.addRootScreen(DeviceSpecificSettingsScreen.GENERIC); generic.add(R.xml.devicesettings_wearlocation); + generic.add(R.xml.devicesettings_device_actions); final List dateTime = deviceSpecificSettings.addRootScreen(DeviceSpecificSettingsScreen.DATE_TIME); dateTime.add(R.xml.devicesettings_timeformat); dateTime.add(R.xml.devicesettings_world_clocks); @@ -113,7 +114,6 @@ public class AmazfitBipUProCoordinator extends HuamiCoordinator { final List connection = deviceSpecificSettings.addRootScreen(DeviceSpecificSettingsScreen.CONNECTION); connection.add(R.xml.devicesettings_expose_hr_thirdparty); connection.add(R.xml.devicesettings_bt_connected_advertisement); - connection.add(R.xml.devicesettings_device_actions); connection.add(R.xml.devicesettings_high_mtu); connection.add(R.xml.devicesettings_overwrite_settings_on_connection); final List developer = deviceSpecificSettings.addRootScreen(DeviceSpecificSettingsScreen.DEVELOPER); 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 b826d21f8..75816b50b 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 @@ -82,6 +82,7 @@ public class AmazfitCorCoordinator extends HuamiCoordinator { final List generic = deviceSpecificSettings.addRootScreen(DeviceSpecificSettingsScreen.GENERIC); generic.add(R.xml.devicesettings_wearlocation); + generic.add(R.xml.devicesettings_device_actions); final List dateTime = deviceSpecificSettings.addRootScreen(DeviceSpecificSettingsScreen.DATE_TIME); dateTime.add(R.xml.devicesettings_timeformat); final List display = deviceSpecificSettings.addRootScreen(DeviceSpecificSettingsScreen.DISPLAY); @@ -102,7 +103,6 @@ public class AmazfitCorCoordinator extends HuamiCoordinator { final List connection = deviceSpecificSettings.addRootScreen(DeviceSpecificSettingsScreen.CONNECTION); connection.add(R.xml.devicesettings_disconnectnotification); connection.add(R.xml.devicesettings_bt_connected_advertisement); - connection.add(R.xml.devicesettings_device_actions); connection.add(R.xml.devicesettings_overwrite_settings_on_connection); final List developer = deviceSpecificSettings.addRootScreen(DeviceSpecificSettingsScreen.DEVELOPER); developer.add(R.xml.devicesettings_huami2021_fetch_operation_time_unit); 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 abe840b6b..c475406f2 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 @@ -77,6 +77,7 @@ public class AmazfitCor2Coordinator extends HuamiCoordinator { final List generic = deviceSpecificSettings.addRootScreen(DeviceSpecificSettingsScreen.GENERIC); generic.add(R.xml.devicesettings_wearlocation); + generic.add(R.xml.devicesettings_device_actions); final List dateTime = deviceSpecificSettings.addRootScreen(DeviceSpecificSettingsScreen.DATE_TIME); dateTime.add(R.xml.devicesettings_timeformat); final List display = deviceSpecificSettings.addRootScreen(DeviceSpecificSettingsScreen.DISPLAY); @@ -97,7 +98,6 @@ public class AmazfitCor2Coordinator extends HuamiCoordinator { final List connection = deviceSpecificSettings.addRootScreen(DeviceSpecificSettingsScreen.CONNECTION); connection.add(R.xml.devicesettings_disconnectnotification); connection.add(R.xml.devicesettings_bt_connected_advertisement); - connection.add(R.xml.devicesettings_device_actions); connection.add(R.xml.devicesettings_overwrite_settings_on_connection); final List developer = deviceSpecificSettings.addRootScreen(DeviceSpecificSettingsScreen.DEVELOPER); developer.add(R.xml.devicesettings_huami2021_fetch_operation_time_unit); 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 9680e0883..566eeaf8e 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 @@ -77,6 +77,7 @@ public class AmazfitGTRCoordinator extends HuamiCoordinator { final List generic = deviceSpecificSettings.addRootScreen(DeviceSpecificSettingsScreen.GENERIC); generic.add(R.xml.devicesettings_wearlocation); generic.add(R.xml.devicesettings_buttonactions_with_longpress); + generic.add(R.xml.devicesettings_device_actions); final List dateTime = deviceSpecificSettings.addRootScreen(DeviceSpecificSettingsScreen.DATE_TIME); dateTime.add(R.xml.devicesettings_timeformat); final List display = deviceSpecificSettings.addRootScreen(DeviceSpecificSettingsScreen.DISPLAY); @@ -97,7 +98,6 @@ public class AmazfitGTRCoordinator extends HuamiCoordinator { connection.add(R.xml.devicesettings_disconnectnotification); connection.add(R.xml.devicesettings_expose_hr_thirdparty); connection.add(R.xml.devicesettings_bt_connected_advertisement); - connection.add(R.xml.devicesettings_device_actions); connection.add(R.xml.devicesettings_high_mtu); connection.add(R.xml.devicesettings_overwrite_settings_on_connection); final List developer = deviceSpecificSettings.addRootScreen(DeviceSpecificSettingsScreen.DEVELOPER); 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 db429d804..da85846c2 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 @@ -82,6 +82,7 @@ public class AmazfitGTR2Coordinator extends HuamiCoordinator { final List generic = deviceSpecificSettings.addRootScreen(DeviceSpecificSettingsScreen.GENERIC); generic.add(R.xml.devicesettings_wearlocation); + generic.add(R.xml.devicesettings_device_actions); final List dateTime = deviceSpecificSettings.addRootScreen(DeviceSpecificSettingsScreen.DATE_TIME); dateTime.add(R.xml.devicesettings_timeformat); final List display = deviceSpecificSettings.addRootScreen(DeviceSpecificSettingsScreen.DISPLAY); @@ -102,7 +103,6 @@ public class AmazfitGTR2Coordinator extends HuamiCoordinator { connection.add(R.xml.devicesettings_disconnectnotification); connection.add(R.xml.devicesettings_expose_hr_thirdparty); connection.add(R.xml.devicesettings_bt_connected_advertisement); - connection.add(R.xml.devicesettings_device_actions); connection.add(R.xml.devicesettings_high_mtu); connection.add(R.xml.devicesettings_overwrite_settings_on_connection); final List developer = deviceSpecificSettings.addRootScreen(DeviceSpecificSettingsScreen.DEVELOPER); 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 1e3b71d60..dbb3b5d1b 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 @@ -82,6 +82,7 @@ public class AmazfitGTR2eCoordinator extends HuamiCoordinator { final List generic = deviceSpecificSettings.addRootScreen(DeviceSpecificSettingsScreen.GENERIC); generic.add(R.xml.devicesettings_wearlocation); + generic.add(R.xml.devicesettings_device_actions); final List dateTime = deviceSpecificSettings.addRootScreen(DeviceSpecificSettingsScreen.DATE_TIME); dateTime.add(R.xml.devicesettings_timeformat); final List display = deviceSpecificSettings.addRootScreen(DeviceSpecificSettingsScreen.DISPLAY); @@ -102,7 +103,6 @@ public class AmazfitGTR2eCoordinator extends HuamiCoordinator { connection.add(R.xml.devicesettings_disconnectnotification); connection.add(R.xml.devicesettings_expose_hr_thirdparty); connection.add(R.xml.devicesettings_bt_connected_advertisement); - connection.add(R.xml.devicesettings_device_actions); connection.add(R.xml.devicesettings_high_mtu); connection.add(R.xml.devicesettings_overwrite_settings_on_connection); final List developer = deviceSpecificSettings.addRootScreen(DeviceSpecificSettingsScreen.DEVELOPER); 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 3d763f6bf..21fd5a4d6 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 @@ -77,6 +77,7 @@ public class AmazfitGTSCoordinator extends HuamiCoordinator { final List generic = deviceSpecificSettings.addRootScreen(DeviceSpecificSettingsScreen.GENERIC); generic.add(R.xml.devicesettings_wearlocation); + generic.add(R.xml.devicesettings_device_actions); final List dateTime = deviceSpecificSettings.addRootScreen(DeviceSpecificSettingsScreen.DATE_TIME); dateTime.add(R.xml.devicesettings_timeformat); final List display = deviceSpecificSettings.addRootScreen(DeviceSpecificSettingsScreen.DISPLAY); @@ -97,7 +98,6 @@ public class AmazfitGTSCoordinator extends HuamiCoordinator { connection.add(R.xml.devicesettings_disconnectnotification); connection.add(R.xml.devicesettings_expose_hr_thirdparty); connection.add(R.xml.devicesettings_bt_connected_advertisement); - connection.add(R.xml.devicesettings_device_actions); connection.add(R.xml.devicesettings_high_mtu); connection.add(R.xml.devicesettings_overwrite_settings_on_connection); final List developer = deviceSpecificSettings.addRootScreen(DeviceSpecificSettingsScreen.DEVELOPER); 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 ced32ed1d..0a4fcae4a 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 @@ -82,6 +82,7 @@ public class AmazfitGTS2Coordinator extends HuamiCoordinator { final List generic = deviceSpecificSettings.addRootScreen(DeviceSpecificSettingsScreen.GENERIC); generic.add(R.xml.devicesettings_wearlocation); + generic.add(R.xml.devicesettings_device_actions); final List dateTime = deviceSpecificSettings.addRootScreen(DeviceSpecificSettingsScreen.DATE_TIME); dateTime.add(R.xml.devicesettings_timeformat); final List display = deviceSpecificSettings.addRootScreen(DeviceSpecificSettingsScreen.DISPLAY); @@ -102,7 +103,6 @@ public class AmazfitGTS2Coordinator extends HuamiCoordinator { connection.add(R.xml.devicesettings_disconnectnotification); connection.add(R.xml.devicesettings_expose_hr_thirdparty); connection.add(R.xml.devicesettings_bt_connected_advertisement); - connection.add(R.xml.devicesettings_device_actions); connection.add(R.xml.devicesettings_high_mtu); connection.add(R.xml.devicesettings_overwrite_settings_on_connection); final List developer = deviceSpecificSettings.addRootScreen(DeviceSpecificSettingsScreen.DEVELOPER); 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 38b77a67d..a7aef13b1 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 @@ -51,6 +51,7 @@ public class AmazfitGTS2MiniCoordinator extends AmazfitGTS2Coordinator { final List generic = deviceSpecificSettings.addRootScreen(DeviceSpecificSettingsScreen.GENERIC); generic.add(R.xml.devicesettings_wearlocation); + generic.add(R.xml.devicesettings_device_actions); final List dateTime = deviceSpecificSettings.addRootScreen(DeviceSpecificSettingsScreen.DATE_TIME); dateTime.add(R.xml.devicesettings_timeformat); final List display = deviceSpecificSettings.addRootScreen(DeviceSpecificSettingsScreen.DISPLAY); @@ -71,7 +72,6 @@ public class AmazfitGTS2MiniCoordinator extends AmazfitGTS2Coordinator { connection.add(R.xml.devicesettings_disconnectnotification); connection.add(R.xml.devicesettings_expose_hr_thirdparty); connection.add(R.xml.devicesettings_bt_connected_advertisement); - connection.add(R.xml.devicesettings_device_actions); connection.add(R.xml.devicesettings_high_mtu); connection.add(R.xml.devicesettings_overwrite_settings_on_connection); final List developer = deviceSpecificSettings.addRootScreen(DeviceSpecificSettingsScreen.DEVELOPER); 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 eaa34ca28..274815d15 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 @@ -82,6 +82,7 @@ public class AmazfitGTS2eCoordinator extends HuamiCoordinator { final List generic = deviceSpecificSettings.addRootScreen(DeviceSpecificSettingsScreen.GENERIC); generic.add(R.xml.devicesettings_wearlocation); + generic.add(R.xml.devicesettings_device_actions); final List dateTime = deviceSpecificSettings.addRootScreen(DeviceSpecificSettingsScreen.DATE_TIME); dateTime.add(R.xml.devicesettings_timeformat); final List display = deviceSpecificSettings.addRootScreen(DeviceSpecificSettingsScreen.DISPLAY); @@ -102,7 +103,6 @@ public class AmazfitGTS2eCoordinator extends HuamiCoordinator { connection.add(R.xml.devicesettings_disconnectnotification); connection.add(R.xml.devicesettings_expose_hr_thirdparty); connection.add(R.xml.devicesettings_bt_connected_advertisement); - connection.add(R.xml.devicesettings_device_actions); connection.add(R.xml.devicesettings_high_mtu); connection.add(R.xml.devicesettings_overwrite_settings_on_connection); final List developer = deviceSpecificSettings.addRootScreen(DeviceSpecificSettingsScreen.DEVELOPER); 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 878fdc139..d0a42844c 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 @@ -80,6 +80,7 @@ public class AmazfitNeoCoordinator extends HuamiCoordinator { final List generic = deviceSpecificSettings.addRootScreen(DeviceSpecificSettingsScreen.GENERIC); generic.add(R.xml.devicesettings_wearlocation); + generic.add(R.xml.devicesettings_device_actions); final List dateTime = deviceSpecificSettings.addRootScreen(DeviceSpecificSettingsScreen.DATE_TIME); dateTime.add(R.xml.devicesettings_timeformat); dateTime.add(R.xml.devicesettings_world_clocks); @@ -99,7 +100,6 @@ public class AmazfitNeoCoordinator extends HuamiCoordinator { final List connection = deviceSpecificSettings.addRootScreen(DeviceSpecificSettingsScreen.CONNECTION); connection.add(R.xml.devicesettings_expose_hr_thirdparty); connection.add(R.xml.devicesettings_bt_connected_advertisement); - connection.add(R.xml.devicesettings_device_actions); connection.add(R.xml.devicesettings_high_mtu); connection.add(R.xml.devicesettings_overwrite_settings_on_connection); final List developer = deviceSpecificSettings.addRootScreen(DeviceSpecificSettingsScreen.DEVELOPER); 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 73c5e875d..05dce981a 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 @@ -77,6 +77,7 @@ public class AmazfitTRexCoordinator extends HuamiCoordinator { final List generic = deviceSpecificSettings.addRootScreen(DeviceSpecificSettingsScreen.GENERIC); generic.add(R.xml.devicesettings_wearlocation); + generic.add(R.xml.devicesettings_device_actions); final List dateTime = deviceSpecificSettings.addRootScreen(DeviceSpecificSettingsScreen.DATE_TIME); dateTime.add(R.xml.devicesettings_timeformat); final List display = deviceSpecificSettings.addRootScreen(DeviceSpecificSettingsScreen.DISPLAY); @@ -97,7 +98,6 @@ public class AmazfitTRexCoordinator extends HuamiCoordinator { connection.add(R.xml.devicesettings_disconnectnotification); connection.add(R.xml.devicesettings_expose_hr_thirdparty); connection.add(R.xml.devicesettings_bt_connected_advertisement); - connection.add(R.xml.devicesettings_device_actions); connection.add(R.xml.devicesettings_high_mtu); connection.add(R.xml.devicesettings_overwrite_settings_on_connection); final List developer = deviceSpecificSettings.addRootScreen(DeviceSpecificSettingsScreen.DEVELOPER); 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 5bdeed5d7..608556a22 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 @@ -77,6 +77,7 @@ public class AmazfitTRexProCoordinator extends HuamiCoordinator { final List generic = deviceSpecificSettings.addRootScreen(DeviceSpecificSettingsScreen.GENERIC); generic.add(R.xml.devicesettings_wearlocation); + generic.add(R.xml.devicesettings_device_actions); final List dateTime = deviceSpecificSettings.addRootScreen(DeviceSpecificSettingsScreen.DATE_TIME); dateTime.add(R.xml.devicesettings_timeformat); final List display = deviceSpecificSettings.addRootScreen(DeviceSpecificSettingsScreen.DISPLAY); @@ -97,7 +98,6 @@ public class AmazfitTRexProCoordinator extends HuamiCoordinator { connection.add(R.xml.devicesettings_disconnectnotification); connection.add(R.xml.devicesettings_expose_hr_thirdparty); connection.add(R.xml.devicesettings_bt_connected_advertisement); - connection.add(R.xml.devicesettings_device_actions); connection.add(R.xml.devicesettings_high_mtu); connection.add(R.xml.devicesettings_overwrite_settings_on_connection); final List developer = deviceSpecificSettings.addRootScreen(DeviceSpecificSettingsScreen.DEVELOPER); 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 bf458a5ee..8876bb5b6 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 @@ -75,6 +75,7 @@ public class AmazfitXCoordinator extends HuamiCoordinator { final List generic = deviceSpecificSettings.addRootScreen(DeviceSpecificSettingsScreen.GENERIC); generic.add(R.xml.devicesettings_wearlocation); + generic.add(R.xml.devicesettings_device_actions); final List dateTime = deviceSpecificSettings.addRootScreen(DeviceSpecificSettingsScreen.DATE_TIME); dateTime.add(R.xml.devicesettings_timeformat); dateTime.add(R.xml.devicesettings_dateformat); @@ -98,7 +99,6 @@ public class AmazfitXCoordinator extends HuamiCoordinator { final List connection = deviceSpecificSettings.addRootScreen(DeviceSpecificSettingsScreen.CONNECTION); connection.add(R.xml.devicesettings_expose_hr_thirdparty); connection.add(R.xml.devicesettings_bt_connected_advertisement); - connection.add(R.xml.devicesettings_device_actions); connection.add(R.xml.devicesettings_high_mtu); connection.add(R.xml.devicesettings_overwrite_settings_on_connection); final List developer = deviceSpecificSettings.addRootScreen(DeviceSpecificSettingsScreen.DEVELOPER); 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 8df6b0f57..cd18ea2f2 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 @@ -89,6 +89,7 @@ public class MiBand3Coordinator extends HuamiCoordinator { final List generic = deviceSpecificSettings.addRootScreen(DeviceSpecificSettingsScreen.GENERIC); generic.add(R.xml.devicesettings_wearlocation); + generic.add(R.xml.devicesettings_device_actions); final List dateTime = deviceSpecificSettings.addRootScreen(DeviceSpecificSettingsScreen.DATE_TIME); dateTime.add(R.xml.devicesettings_timeformat); dateTime.add(R.xml.devicesettings_dateformat); @@ -112,7 +113,6 @@ public class MiBand3Coordinator extends HuamiCoordinator { final List connection = deviceSpecificSettings.addRootScreen(DeviceSpecificSettingsScreen.CONNECTION); connection.add(R.xml.devicesettings_expose_hr_thirdparty); connection.add(R.xml.devicesettings_bt_connected_advertisement); - connection.add(R.xml.devicesettings_device_actions); connection.add(R.xml.devicesettings_overwrite_settings_on_connection); final List developer = deviceSpecificSettings.addRootScreen(DeviceSpecificSettingsScreen.DEVELOPER); developer.add(R.xml.devicesettings_huami2021_fetch_operation_time_unit); 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 9fcd0762e..290eb3bf3 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 @@ -76,6 +76,7 @@ public class MiBand4Coordinator extends HuamiCoordinator { final List generic = deviceSpecificSettings.addRootScreen(DeviceSpecificSettingsScreen.GENERIC); generic.add(R.xml.devicesettings_wearlocation); + generic.add(R.xml.devicesettings_device_actions); final List dateTime = deviceSpecificSettings.addRootScreen(DeviceSpecificSettingsScreen.DATE_TIME); dateTime.add(R.xml.devicesettings_timeformat); dateTime.add(R.xml.devicesettings_dateformat); @@ -102,7 +103,6 @@ public class MiBand4Coordinator extends HuamiCoordinator { final List connection = deviceSpecificSettings.addRootScreen(DeviceSpecificSettingsScreen.CONNECTION); connection.add(R.xml.devicesettings_expose_hr_thirdparty); connection.add(R.xml.devicesettings_bt_connected_advertisement); - connection.add(R.xml.devicesettings_device_actions); connection.add(R.xml.devicesettings_high_mtu); connection.add(R.xml.devicesettings_overwrite_settings_on_connection); final List developer = deviceSpecificSettings.addRootScreen(DeviceSpecificSettingsScreen.DEVELOPER); 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 beb049f1e..aa19c5895 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 @@ -95,6 +95,7 @@ public class MiBand5Coordinator extends HuamiCoordinator { final List generic = deviceSpecificSettings.addRootScreen(DeviceSpecificSettingsScreen.GENERIC); generic.add(R.xml.devicesettings_wearlocation); + generic.add(R.xml.devicesettings_device_actions); final List dateTime = deviceSpecificSettings.addRootScreen(DeviceSpecificSettingsScreen.DATE_TIME); dateTime.add(R.xml.devicesettings_timeformat); dateTime.add(R.xml.devicesettings_dateformat); @@ -122,7 +123,6 @@ public class MiBand5Coordinator extends HuamiCoordinator { final List connection = deviceSpecificSettings.addRootScreen(DeviceSpecificSettingsScreen.CONNECTION); connection.add(R.xml.devicesettings_expose_hr_thirdparty); connection.add(R.xml.devicesettings_bt_connected_advertisement); - connection.add(R.xml.devicesettings_device_actions); connection.add(R.xml.devicesettings_high_mtu); connection.add(R.xml.devicesettings_overwrite_settings_on_connection); final List developer = deviceSpecificSettings.addRootScreen(DeviceSpecificSettingsScreen.DEVELOPER); 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 98db99ce5..de270d718 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 @@ -77,6 +77,7 @@ public class ZeppECoordinator extends HuamiCoordinator { final List generic = deviceSpecificSettings.addRootScreen(DeviceSpecificSettingsScreen.GENERIC); generic.add(R.xml.devicesettings_wearlocation); + generic.add(R.xml.devicesettings_device_actions); final List dateTime = deviceSpecificSettings.addRootScreen(DeviceSpecificSettingsScreen.DATE_TIME); dateTime.add(R.xml.devicesettings_timeformat); final List display = deviceSpecificSettings.addRootScreen(DeviceSpecificSettingsScreen.DISPLAY); @@ -97,7 +98,6 @@ public class ZeppECoordinator extends HuamiCoordinator { connection.add(R.xml.devicesettings_disconnectnotification); connection.add(R.xml.devicesettings_expose_hr_thirdparty); connection.add(R.xml.devicesettings_bt_connected_advertisement); - connection.add(R.xml.devicesettings_device_actions); connection.add(R.xml.devicesettings_high_mtu); connection.add(R.xml.devicesettings_overwrite_settings_on_connection); final List developer = deviceSpecificSettings.addRootScreen(DeviceSpecificSettingsScreen.DEVELOPER);