commit 6d59b10d9525d86af68c6981bb5db1bd8813e493
author Sherry Zhou <yuandizhou@google.com> Mon Apr 10 23:39:11 2023 +0000
committer Sherry Zhou <yuandizhou@google.com> Mon Apr 10 23:39:31 2023 +0000
tree 031cb533cd8bc6975318e5dbbdfd19f2d6b0f237
parent 6a0399496fd6d8479a3faafd96c39baf93dd7211

Fix clock showing 12 hour format when 24 hour format is chosen

Test: Manually
Bug: 271988126
Change-Id: Id3e71bfa79073558c15c921781ce5326c23b5a15

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 925e293..c7dc792 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 67c7002..d6a0b5d 100644
--- a/src/com/android/customization/picker/clock/ui/view/ClockViewFactory.kt
+++ b/src/com/android/customization/picker/clock/ui/view/ClockViewFactory.kt
@@ -59,6 +59,12 @@
             .onSeedColorChanged(seedColor)
     }
 
+    fun updateTimeFormat(clockId: String) {
+        getController(clockId)
+            .events
+            .onTimeFormatChanged(android.text.format.DateFormat.is24HourFormat(activity))
+    }
+
     fun registerTimeTicker(owner: LifecycleOwner) {
         val hashCode = owner.hashCode()
         if (timeTickListeners.keys.contains(hashCode)) {