Add volume assistant sensor

Author: TimoPtr

app/src/main/kotlin/io/homeassistant/companion/android/sensors/SensorReceiver.kt

@@ -65,6 +65,7 @@ class SensorReceiver : SensorReceiverBase() {
         AudioSensorManager.VOLUME_CHANGED_ACTION to listOf(
             AudioSensorManager.volAccessibility.id,
             AudioSensorManager.volAlarm.id,
+            AudioSensorManager.volAssistant.id,
             AudioSensorManager.volCall.id,
             AudioSensorManager.volDTMF.id,
             AudioSensorManager.volNotification.id,

common/src/main/kotlin/io/homeassistant/companion/android/common/sensors/AudioSensorManager.kt

@@ -184,6 +184,17 @@ class AudioSensorManager @Inject constructor(
             entityCategory = SensorManager.ENTITY_CATEGORY_DIAGNOSTIC,
             updateType = SensorManager.BasicSensor.UpdateType.INTENT,
         )
+
+        @CatalogSensor
+        val volAssistant = SensorManager.BasicSensor(
+            "volume_assistant",
+            "sensor",
+            commonR.string.sensor_name_volume_assistant,
+            commonR.string.sensor_description_volume_assistant,
+            "mdi:assistant",
+            entityCategory = SensorManager.ENTITY_CATEGORY_DIAGNOSTIC,
+            updateType = SensorManager.BasicSensor.UpdateType.INTENT,
+        )
     }
 
     override fun docsLink(): String {
@@ -194,15 +205,20 @@ class AudioSensorManager @Inject constructor(
         get() = commonR.string.sensor_name_audio
 
     override suspend fun getAvailableSensors(): List<SensorManager.BasicSensor> {
-        val allSupportedSensors = listOf(
-            audioSensor, audioState, headphoneState, micMuted, speakerphoneState,
-            musicActive, volAlarm, volCall, volMusic, volRing, volNotification, volSystem,
-            volDTMF,
-        )
-        return if (SdkVersion.isAtLeast(Build.VERSION_CODES.O)) {
-            allSupportedSensors.plus(volAccessibility)
-        } else {
-            allSupportedSensors
+        return buildList {
+            addAll(
+                listOf(
+                    audioSensor, audioState, headphoneState, micMuted, speakerphoneState,
+                    musicActive, volAlarm, volCall, volMusic, volRing, volNotification, volSystem,
+                    volDTMF,
+                ),
+            )
+            if (SdkVersion.isAtLeast(Build.VERSION_CODES.O)) {
+                add(volAccessibility)
+            }
+            if (SdkVersion.isAtLeast(Build.VERSION_CODES.CINNAMON_BUN)) {
+                add(volAssistant)
+            }
         }
     }
 
@@ -228,6 +244,9 @@ class AudioSensorManager @Inject constructor(
         if (SdkVersion.isAtLeast(Build.VERSION_CODES.O)) {
             updateVolumeAccessibility(audioManager)
         }
+        if (SdkVersion.isAtLeast(Build.VERSION_CODES.CINNAMON_BUN)) {
+            updateVolumeAssistant(audioManager)
+        }
     }
 
     private suspend fun updateAudioSensor(audioManager: AudioManager) {
@@ -271,6 +290,7 @@ class AudioSensorManager @Inject constructor(
             AudioManager.MODE_CALL_SCREENING -> "call_screening"
             AudioManager.MODE_CALL_REDIRECT -> "call_redirect"
             AudioManager.MODE_COMMUNICATION_REDIRECT -> "communication_redirect"
+            AudioManager.MODE_ASSISTANT_CONVERSATION -> "assistant_conversation"
             else -> STATE_UNKNOWN
         }
 
@@ -282,6 +302,7 @@ class AudioSensorManager @Inject constructor(
             AudioManager.MODE_CALL_SCREENING -> "mdi:microphone-message"
             AudioManager.MODE_CALL_REDIRECT -> "mdi:phone"
             AudioManager.MODE_COMMUNICATION_REDIRECT -> "mdi:message-video"
+            AudioManager.MODE_ASSISTANT_CONVERSATION -> "mdi:assistant"
             else -> "mdi:volume-low"
         }
 
@@ -298,6 +319,7 @@ class AudioSensorManager @Inject constructor(
                     "call_screening",
                     "call_redirect",
                     "communication_redirect",
+                    "assistant_conversation",
                 ),
             ),
         )
@@ -415,6 +437,11 @@ class AudioSensorManager @Inject constructor(
         updateVolumeSensor(audioManager, volDTMF, AudioManager.STREAM_DTMF)
     }
 
+    @RequiresApi(Build.VERSION_CODES.CINNAMON_BUN)
+    private suspend fun updateVolumeAssistant(audioManager: AudioManager) {
+        updateVolumeSensor(audioManager, volAssistant, AudioManager.STREAM_ASSISTANT)
+    }
+
     private suspend fun updateVolumeSensor(
         audioManager: AudioManager,
         sensor: SensorManager.BasicSensor,

common/src/main/res/values/strings.xml

@@ -1139,6 +1139,8 @@
     <string name="sensor_description_volume_accessibility">Volume level for accessibility prompts on the device</string>
     <string name="sensor_name_volume_dtmf">Volume level DTMF</string>
     <string name="sensor_description_volume_dtmf">Volume level for DTMF tones on the device</string>
+    <string name="sensor_name_volume_assistant">Volume level assistant</string>
+    <string name="sensor_description_volume_assistant">Volume level for digital assistant on the device</string>
     <string name="basic_sensor_name_high_accuracy_interval">High accuracy update interval</string>
     <string name="sensor_description_high_accuracy_interval">The update interval set for high accuracy mode</string>
     <string name="update">Update</string>

wear/src/main/kotlin/io/homeassistant/companion/android/sensors/SensorReceiver.kt

@@ -63,6 +63,7 @@ class SensorReceiver : SensorReceiverBase() {
         AudioSensorManager.VOLUME_CHANGED_ACTION to listOf(
             AudioSensorManager.volAccessibility.id,
             AudioSensorManager.volAlarm.id,
+            AudioSensorManager.volAssistant.id,
             AudioSensorManager.volCall.id,
             AudioSensorManager.volDTMF.id,
             AudioSensorManager.volNotification.id,