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

Commit 80d6c875 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Select the default clock if current clock id was not found" into udc-qpr-dev am: 6bcdc993 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/ThemePicker/+/24443680



Change-Id: I2563871ad3b791b38638139a36936ef5a2923a10
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3c594e80 6bcdc993

src/com/android/customization/picker/clock/data/repository/ClockPickerRepositoryImpl.kt

+7 −6
Original line number Diff line number Diff line
@@ -53,11 +53,12 @@ class ClockPickerRepositoryImpl( 
    override val allClocks: Flow<List<ClockMetadataModel>> =

        callbackFlow {

                fun send() {

                    val activeClockId = registry.activeClockId

                    val allClocks =

                        registry

                            .getClocks()

                            .filter { "NOT_IN_USE" !in it.clockId }

                            .map { it.toModel(isSelected = it.clockId == registry.currentClockId) }

                        registry.getClocks().map {

                            it.toModel(isSelected = it.clockId == activeClockId)

                        }



                    trySend(allClocks)

                }
@@ -84,12 +85,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(

                                isSelected = true,

                                selectedColorId = metadata?.getSelectedColorId(),