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

Commit 73d9d208 authored by Hawkwood Glazier's avatar Hawkwood Glazier Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: I5addd6a8d2580e7f85e22bdcdcd4a1de5912d499
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 97fa0bad 35544234

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

+5 −7
Original line number Diff line number Diff line
@@ -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()