Merge "Select the default clock if current clock id was not found" into udc-dev am: 355442341c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/ThemePicker/+/24498863
Change-Id: If3b72c03742727a2a63564f2768a350182f96402
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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 be6c6cb..370668e 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 @@
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 @@
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()