diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-09-15 21:23:31 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-09-15 21:23:31 +0000 |
| commit | bb453deab4611238d8f9c7f7fb4a3bfe3e2f080f (patch) | |
| tree | b7325d6392447a62ec0a1424f20168495970c0a6 | |
| parent | 087efa48c6f44cdf94ac584916e4f0489890b19d (diff) | |
| parent | c7865c30467c15297d914638baa800d54d69b064 (diff) | |
| download | ThemePicker-android14-release.tar.gz | |
Merge cherrypicks of ['googleplex-android-review.googlesource.com/24498863'] into udc-release.android-14.0.0_r28android-14.0.0_r15android-14.0.0_r14android-14.0.0_r13android14-s2-releaseandroid14-release
Change-Id: I2f6289040c8652c9cf3ff3056affac4ac6cecf21
| -rw-r--r-- | src/com/android/customization/picker/clock/data/repository/ClockPickerRepositoryImpl.kt | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/com/android/customization/picker/clock/data/repository/ClockPickerRepositoryImpl.kt b/src/com/android/customization/picker/clock/data/repository/ClockPickerRepositoryImpl.kt index be6c6cbd..370668ef 100644 --- a/src/com/android/customization/picker/clock/data/repository/ClockPickerRepositoryImpl.kt +++ b/src/com/android/customization/picker/clock/data/repository/ClockPickerRepositoryImpl.kt @@ -52,11 +52,9 @@ class ClockPickerRepositoryImpl( override val allClocks: Flow<List<ClockMetadataModel>> = callbackFlow { fun send() { - val allClocks = - registry - .getClocks() - .filter { "NOT_IN_USE" !in it.clockId } - .map { it.toModel() } + val activeClockId = registry.activeClockId + val allClocks = registry.getClocks().map { it.toModel() } + trySend(allClocks) } @@ -83,12 +81,12 @@ class ClockPickerRepositoryImpl( override val selectedClock: Flow<ClockMetadataModel> = callbackFlow { fun send() { - val currentClockId = registry.currentClockId + val activeClockId = registry.activeClockId val metadata = registry.settings?.metadata val model = registry .getClocks() - .find { clockMetadata -> clockMetadata.clockId == currentClockId } + .find { clockMetadata -> clockMetadata.clockId == activeClockId } ?.toModel( selectedColorId = metadata?.getSelectedColorId(), colorTone = metadata?.getColorTone() |