Merge "Only show head tracking enabled when spatial audio is enabled" into main (54ad1eaa) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/volume/panel/component/spatial/domain/interactor/SpatialAudioComponentInteractor.kt

+6 −6

Original line number	Diff line number	Diff line
		@@ -74,10 +74,10 @@ constructor(
		) { attributes, _,
		->
		attributes ?: return@combine SpatialAudioAvailabilityModel.Unavailable
		if (spatializerInteractor.isSpatialAudioAvailable(attributes)) {
		if (spatializerInteractor.isHeadTrackingAvailable(attributes)) {
		return@combine SpatialAudioAvailabilityModel.HeadTracking
		}
		if (spatializerInteractor.isSpatialAudioAvailable(attributes)) {
		return@combine SpatialAudioAvailabilityModel.SpatialAudio
		}
		SpatialAudioAvailabilityModel.Unavailable
		@@ -104,10 +104,10 @@ constructor(
		return@combine SpatialAudioEnabledModel.Disabled
		}
		attributes ?: return@combine SpatialAudioEnabledModel.Disabled
		if (spatializerInteractor.isSpatialAudioEnabled(attributes)) {
		if (spatializerInteractor.isHeadTrackingEnabled(attributes)) {
		return@combine SpatialAudioEnabledModel.HeadTrackingEnabled
		}
		if (spatializerInteractor.isSpatialAudioEnabled(attributes)) {
		return@combine SpatialAudioEnabledModel.SpatialAudioEnabled
		}
		SpatialAudioEnabledModel.Disabled