commit 7d2cca3a775b67effa1e0d4ab9c99cd14be9681d
author Sherry Zhou <yuandizhou@google.com> Wed Apr 12 05:51:26 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Apr 12 05:51:26 2023 +0000
tree 088429923fc1ecee3b09cb3ee8dd9adcf4a243fc
parent cd86d7d283c52fc64d94bc0716eee3aeaaae4330
parent 53aeae186f2ecf697674a248903b09b76e9e6cf4

Merge "Fix clock showing 12 hour format when 24 hour format is chosen" into udc-dev am: 53aeae186f

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

Change-Id: I8d882974853c3b70b3bc3ef202dc38e5c3b7f25b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

src/com/android/customization/picker/clock/ui/binder/ClockCarouselViewBinder.kt

diff --git a/src/com/android/customization/picker/clock/ui/binder/ClockCarouselViewBinder.kt b/src/com/android/customization/picker/clock/ui/binder/ClockCarouselViewBinder.kt
index 30eac55..8d5924e 100644
--- a/src/com/android/customization/picker/clock/ui/binder/ClockCarouselViewBinder.kt
+++ b/src/com/android/customization/picker/clock/ui/binder/ClockCarouselViewBinder.kt
@@ -59,6 +59,12 @@
                 }
 
                 launch {
+                    viewModel.allClockIds.collect {
+                        it.forEach { clockId -> clockViewFactory.updateTimeFormat(clockId) }
+                    }
+                }
+
+                launch {
                     viewModel.selectedIndex.collect { selectedIndex ->
                         carouselView.setSelectedClockIndex(selectedIndex)
                     }

src/com/android/customization/picker/clock/ui/view/ClockViewFactory.kt

diff --git a/src/com/android/customization/picker/clock/ui/view/ClockViewFactory.kt b/src/com/android/customization/picker/clock/ui/view/ClockViewFactory.kt
index 1a58d7a..cf154d5 100644
--- a/src/com/android/customization/picker/clock/ui/view/ClockViewFactory.kt
+++ b/src/com/android/customization/picker/clock/ui/view/ClockViewFactory.kt
@@ -60,6 +60,12 @@
             .onSeedColorChanged(seedColor)
     }
 
+    fun updateTimeFormat(clockId: String) {
+        getController(clockId)
+            .events
+            .onTimeFormatChanged(android.text.format.DateFormat.is24HourFormat(activity))
+    }
+
     fun registerTimeTicker(owner: LifecycleOwner) {
         registerTimeTicker(owner, null)
     }