Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 068ac9d2 authored by Haijie Hong's avatar Haijie Hong Committed by Android (Google) Code Review
Browse files

Merge "Fix multi-toggle flicker bug" into main

parents 49677b7a 7a3baf7d

src/com/android/settings/bluetooth/ui/viewmodel/BluetoothDeviceDetailsViewModel.kt

+3 −1
Original line number Diff line number Diff line
@@ -58,6 +58,8 @@ class BluetoothDeviceDetailsViewModel( 
            deviceSettingRepository.getDeviceSettingsConfig(cachedDevice)

        }



    private val spatialAudioModel by lazy { spatialAudioInteractor.getDeviceSetting(cachedDevice) }



    suspend fun getItems(fragment: FragmentTypeModel): List<DeviceSettingConfigItemModel>? =

        when (fragment) {

            is FragmentTypeModel.DeviceDetailsMainFragment -> items.await()?.mainItems
@@ -81,7 +83,7 @@ class BluetoothDeviceDetailsViewModel( 
        }

        return when (settingId) {

            DeviceSettingId.DEVICE_SETTING_ID_SPATIAL_AUDIO_MULTI_TOGGLE ->

                spatialAudioInteractor.getDeviceSetting(cachedDevice)

                spatialAudioModel

            else -> deviceSettingRepository.getDeviceSetting(cachedDevice, settingId)

        }.map { it?.toPreferenceModel() }

    }