From 59cfddde83f39873e50a2b99682e3eca79c4b0a6 Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Wed, 17 Nov 2021 17:24:04 +0100 Subject: [PATCH] Added setting to disable automatically switch audio route to bluetooth device when available --- .../main/settings/viewmodels/AudioSettingsViewModel.kt | 8 ++++++++ app/src/main/res/layout/settings_audio_fragment.xml | 6 ++++++ app/src/main/res/values-fr/strings.xml | 2 ++ app/src/main/res/values/strings.xml | 2 ++ 4 files changed, 18 insertions(+) diff --git a/app/src/main/java/org/linphone/activities/main/settings/viewmodels/AudioSettingsViewModel.kt b/app/src/main/java/org/linphone/activities/main/settings/viewmodels/AudioSettingsViewModel.kt index 16551c4cb..5e356b891 100644 --- a/app/src/main/java/org/linphone/activities/main/settings/viewmodels/AudioSettingsViewModel.kt +++ b/app/src/main/java/org/linphone/activities/main/settings/viewmodels/AudioSettingsViewModel.kt @@ -110,6 +110,13 @@ class AudioSettingsViewModel : GenericSettingsViewModel() { val outputAudioDeviceLabels = MutableLiveData>() private val outputAudioDeviceValues = MutableLiveData>() + val preferBluetoothDevicesListener = object : SettingListenerStub() { + override fun onBoolValueChanged(newValue: Boolean) { + prefs.routeAudioToBluetoothIfAvailable = newValue + } + } + val preferBluetoothDevices = MutableLiveData() + val codecBitrateListener = object : SettingListenerStub() { override fun onListValueChanged(position: Int) { for (payloadType in core.audioPayloadTypes) { @@ -154,6 +161,7 @@ class AudioSettingsViewModel : GenericSettingsViewModel() { prefs.getString(R.string.audio_settings_echo_canceller_calibration_summary) } echoTesterStatus.value = prefs.getString(R.string.audio_settings_echo_tester_summary) + preferBluetoothDevices.value = prefs.routeAudioToBluetoothIfAvailable initInputAudioDevicesList() initOutputAudioDevicesList() initCodecBitrateList() diff --git a/app/src/main/res/layout/settings_audio_fragment.xml b/app/src/main/res/layout/settings_audio_fragment.xml index ef34b864e..75fa5a969 100644 --- a/app/src/main/res/layout/settings_audio_fragment.xml +++ b/app/src/main/res/layout/settings_audio_fragment.xml @@ -110,6 +110,12 @@ linphone:selectedIndex="@{viewModel.outputAudioDeviceIndex}" linphone:labels="@{viewModel.outputAudioDeviceLabels}"/> + + %1$d messages non lus %1$d message non lu Aller au dernier message reçu ou au premier message non lu + Acheminer l\'audio vers l\'appareil bluetooth, s\'il existe + Il aura la priorité sur le périphérique de sortie par défaut \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 2f5d1f797..6ed825ea7 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -376,6 +376,8 @@ Changes will take effect starting next call Default output audio device Changes will take effect starting next call + Route audio to the bluetooth device if any + It will have priority over the default output device Codec bitrate limit Microphone gain (in decibels)