Only show head tracking enabled when spatial audio is enabled
When Spatial Audio is disabled, head tracking should be also disabled.
Bug: 346908292
Flag: com.android.systemui.new_volume_panel
Test: atest SpatialAudioComponentInteractorTest
Change-Id: I1e84fc9c05d480db5a123ae238b04f6530026f15
diff --git a/packages/SystemUI/src/com/android/systemui/volume/panel/component/spatial/domain/interactor/SpatialAudioComponentInteractor.kt b/packages/SystemUI/src/com/android/systemui/volume/panel/component/spatial/domain/interactor/SpatialAudioComponentInteractor.kt
index 9ca50d6..7f1faee 100644
--- a/packages/SystemUI/src/com/android/systemui/volume/panel/component/spatial/domain/interactor/SpatialAudioComponentInteractor.kt
+++ b/packages/SystemUI/src/com/android/systemui/volume/panel/component/spatial/domain/interactor/SpatialAudioComponentInteractor.kt
@@ -74,10 +74,10 @@
) { attributes, _,
->
attributes ?: return@combine SpatialAudioAvailabilityModel.Unavailable
- if (spatializerInteractor.isHeadTrackingAvailable(attributes)) {
- return@combine SpatialAudioAvailabilityModel.HeadTracking
- }
if (spatializerInteractor.isSpatialAudioAvailable(attributes)) {
+ if (spatializerInteractor.isHeadTrackingAvailable(attributes)) {
+ return@combine SpatialAudioAvailabilityModel.HeadTracking
+ }
return@combine SpatialAudioAvailabilityModel.SpatialAudio
}
SpatialAudioAvailabilityModel.Unavailable
@@ -104,10 +104,10 @@
return@combine SpatialAudioEnabledModel.Disabled
}
attributes ?: return@combine SpatialAudioEnabledModel.Disabled
- if (spatializerInteractor.isHeadTrackingEnabled(attributes)) {
- return@combine SpatialAudioEnabledModel.HeadTrackingEnabled
- }
if (spatializerInteractor.isSpatialAudioEnabled(attributes)) {
+ if (spatializerInteractor.isHeadTrackingEnabled(attributes)) {
+ return@combine SpatialAudioEnabledModel.HeadTrackingEnabled
+ }
return@combine SpatialAudioEnabledModel.SpatialAudioEnabled
}
SpatialAudioEnabledModel.Disabled