Merge "Select the default clock if current clock id was not found" into udc-dev (35544234) · Commits · e / os / android_packages_apps_ThemePicker

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()