From 0709b20043e268ed8e7747bba8acb928fa4c1fab Mon Sep 17 00:00:00 2001 From: vanous Date: Tue, 5 Jul 2022 23:06:16 +0200 Subject: [PATCH] Fossil: move device specific icon setting to application specific settings menu --- .../devices/qhybrid/QHybridCoordinator.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/QHybridCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/QHybridCoordinator.java index 95bc3220b..9307a9c4e 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/QHybridCoordinator.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/QHybridCoordinator.java @@ -257,7 +257,6 @@ public class QHybridCoordinator extends AbstractBLEDeviceCoordinator { R.xml.devicesettings_fossilhybridhr, R.xml.devicesettings_autoremove_notifications, R.xml.devicesettings_canned_dismisscall_16, - R.xml.devicesettings_custom_deviceicon, R.xml.devicesettings_transliteration }; } @@ -266,11 +265,9 @@ public class QHybridCoordinator extends AbstractBLEDeviceCoordinator { R.xml.devicesettings_fossilhybridhr, R.xml.devicesettings_autoremove_notifications, R.xml.devicesettings_canned_dismisscall_16, - R.xml.devicesettings_custom_deviceicon }; } return new int[]{ - R.xml.devicesettings_custom_deviceicon }; } @@ -281,6 +278,13 @@ public class QHybridCoordinator extends AbstractBLEDeviceCoordinator { }; } + @Override + public int[] getSupportedDeviceSpecificApplicationSettings() { + return new int[]{ + R.xml.devicesettings_custom_deviceicon, + }; + } + private boolean isHybridHR() { List devices = GBApplication.app().getDeviceManager().getSelectedDevices(); for(GBDevice device : devices){