Snap for 11224086 from bcb07ac49f36b523b141548e605f22fa60549ff2 to mainline-tzdata5-releaseaml_tz5_341510070aml_tz5_341510050aml_tz5_341510010aml_tz5_341510010

Change-Id: Ia3aae3bffe194cde707d28fc2c33bc5d99597474

2 files changed, 7 insertions, 8 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()
diff --git a/src/com/android/customization/picker/clock/utils/ThemePickerClockDescriptionUtils.kt b/src/com/android/customization/picker/clock/utils/ThemePickerClockDescriptionUtils.kt
index 6b3b4055..43f19b39 100644
--- a/src/com/android/customization/picker/clock/utils/ThemePickerClockDescriptionUtils.kt
+++ b/src/com/android/customization/picker/clock/utils/ThemePickerClockDescriptionUtils.kt
@@ -16,10 +16,11 @@
 package com.android.customization.picker.clock.utils
 
 import androidx.annotation.StringRes
+import com.android.wallpaper.R
 
 class ThemePickerClockDescriptionUtils : ClockDescriptionUtils {
     @StringRes
     override fun getDescriptionResId(clockId: String): Int {
-        return -1
+        return R.string.clock_title
     }
 }