diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSpecificSettingsScreen.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSpecificSettingsScreen.java index 5db95fba6..542aad723 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSpecificSettingsScreen.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSpecificSettingsScreen.java @@ -22,6 +22,7 @@ import nodomain.freeyourgadget.gadgetbridge.R; public enum DeviceSpecificSettingsScreen { ACTIVITY_INFO("pref_screen_activity_info", R.xml.devicesettings_root_activity_info), + AUDIO("pref_screen_audio", R.xml.devicesettings_root_audio), AUTHENTICATION("pref_screen_authentication", R.xml.devicesettings_root_authentication), CALENDAR("pref_screen_calendar", R.xml.devicesettings_root_calendar), CONNECTION("pref_screen_connection", R.xml.devicesettings_root_connection), 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 61075ef03..0c8ae52a6 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 @@ -16,15 +16,14 @@ along with this program. If not, see . */ package nodomain.freeyourgadget.gadgetbridge.devices.galaxy_buds; -import androidx.annotation.NonNull; - +import java.util.List; import java.util.regex.Pattern; import nodomain.freeyourgadget.gadgetbridge.R; +import nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSpecificSettings; +import nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSpecificSettingsScreen; 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 GalaxyBudsLiveDeviceCoordinator extends GalaxyBudsGenericCoordinator { @Override @@ -45,15 +44,14 @@ public class GalaxyBudsLiveDeviceCoordinator extends GalaxyBudsGenericCoordinato return new BatteryConfig[]{battery1, battery2, battery3}; } - @Override - public int[] getSupportedDeviceSpecificSettings(GBDevice device) { - return new int[]{ - R.xml.devicesettings_galaxy_buds_live, - }; + public DeviceSpecificSettings getDeviceSpecificSettings(final GBDevice device) { + final DeviceSpecificSettings deviceSpecificSettings = new DeviceSpecificSettings(); + final List audio = deviceSpecificSettings.addRootScreen(DeviceSpecificSettingsScreen.AUDIO); + audio.add(R.xml.devicesettings_galaxy_buds_live); + return deviceSpecificSettings; } - @Override public int getDeviceNameResource() { return R.string.devicetype_galaxybuds_live; diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index a045cf162..271e4627f 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -195,6 +195,7 @@ General settings Other System + Audio Calendar Connection Display diff --git a/app/src/main/res/xml/devicesettings_root_audio.xml b/app/src/main/res/xml/devicesettings_root_audio.xml new file mode 100644 index 000000000..930016396 --- /dev/null +++ b/app/src/main/res/xml/devicesettings_root_audio.xml @@ -0,0 +1,9 @@ + + + + +