PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix multi-toggle flicker bug" into main

Browse Source
This commit is contained in:
Haijie Hong
2024-10-15 14:50:12 +00:00
committed by Android (Google) Code Review
parent 49677b7af2 7a3baf7d2e
commit 068ac9d264
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/bluetooth/ui/viewmodel/BluetoothDeviceDetailsViewModel.kt
View File

@@ -58,6 +58,8 @@ class BluetoothDeviceDetailsViewModel(
deviceSettingRepository.getDeviceSettingsConfig(cachedDevice) deviceSettingRepository.getDeviceSettingsConfig(cachedDevice)
} }
private val spatialAudioModel by lazy { spatialAudioInteractor.getDeviceSetting(cachedDevice) }
suspend fun getItems(fragment: FragmentTypeModel): List<DeviceSettingConfigItemModel>? = suspend fun getItems(fragment: FragmentTypeModel): List<DeviceSettingConfigItemModel>? =
when (fragment) { when (fragment) {
is FragmentTypeModel.DeviceDetailsMainFragment -> items.await()?.mainItems is FragmentTypeModel.DeviceDetailsMainFragment -> items.await()?.mainItems
@@ -81,7 +83,7 @@ class BluetoothDeviceDetailsViewModel(
} }
return when (settingId) { return when (settingId) {
DeviceSettingId.DEVICE_SETTING_ID_SPATIAL_AUDIO_MULTI_TOGGLE -> DeviceSettingId.DEVICE_SETTING_ID_SPATIAL_AUDIO_MULTI_TOGGLE ->
spatialAudioInteractor.getDeviceSetting(cachedDevice) spatialAudioModel
else -> deviceSettingRepository.getDeviceSetting(cachedDevice, settingId) else -> deviceSettingRepository.getDeviceSetting(cachedDevice, settingId)
}.map { it?.toPreferenceModel() } }.map { it?.toPreferenceModel() }
} }