commit bc1db1f4b0918ebc4c494fbadff9eb7169b40df1
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Tue Jan 21 03:34:05 2025 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jan 21 03:34:05 2025 -0800
tree a18bc0c1adf8d8ac57fa5b8a1117d7a66c9b520b
parent 4398edcc853554ec1924142ffc10b4228db8a496
parent 6068878512bdccc93bad748f5d4c6e61622ffda0

Merge "Fix clock color option content description" into main

src/com/android/customization/picker/clock/ui/viewmodel/ClockSettingsViewModel.kt

diff --git a/src/com/android/customization/picker/clock/ui/viewmodel/ClockSettingsViewModel.kt b/src/com/android/customization/picker/clock/ui/viewmodel/ClockSettingsViewModel.kt
index 2a93f27..52521d6 100644
--- a/src/com/android/customization/picker/clock/ui/viewmodel/ClockSettingsViewModel.kt
+++ b/src/com/android/customization/picker/clock/ui/viewmodel/ClockSettingsViewModel.kt
@@ -161,10 +161,11 @@
                                 ),
                             text =
                                 Text.Loaded(
-                                    context.getString(
-                                        R.string.content_description_color_option,
-                                        index,
-                                    )
+                                    colorModel.colorName
+                                        ?: context.getString(
+                                            R.string.content_description_color_option,
+                                            index,
+                                        )
                                 ),
                             isTextUserVisible = false,
                             isSelected = isSelectedFlow,
@@ -180,7 +181,7 @@
                                                         color = colorModel.color,
                                                         colorTone =
                                                             colorModel.getColorTone(
-                                                                colorToneProgress,
+                                                                colorToneProgress
                                                             ),
                                                     )
                                                 clockPickerInteractor.setClockColor(
@@ -282,7 +283,7 @@
                             null
                         } else {
                             { _selectedTabPosition.tryEmit(Tab.COLOR) }
-                        }
+                        },
                 ),
                 ClockSettingsTabViewModel(
                     name = context.resources.getString(R.string.clock_size),
@@ -292,7 +293,7 @@
                             null
                         } else {
                             { _selectedTabPosition.tryEmit(Tab.SIZE) }
-                        }
+                        },
                 ),
             )
         }
@@ -302,11 +303,7 @@
 
         fun blendColorWithTone(color: Int, colorTone: Double): Int {
             ColorUtils.colorToLAB(color, helperColorLab)
-            return ColorUtils.LABToColor(
-                colorTone,
-                helperColorLab[1],
-                helperColorLab[2],
-            )
+            return ColorUtils.LABToColor(colorTone, helperColorLab[1], helperColorLab[2])
         }
 
         const val COLOR_OPTIONS_EVENT_UPDATE_DELAY_MILLIS: Long = 100