commit fc7f96a43a09ffc0703a9d8129cf62e0890934f7
author Charlie Anderson <charlander@google.com> Mon Jun 05 17:27:39 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jun 05 17:27:39 2023 +0000
tree 5c4176475dab37568d1f8dbffd70916ceba6d6a0
parent f4425cdf3c855b9be1a8e11db80bde7564fdfe36
parent 1caaad6356cee73c94a0b860ac594b77c0350802

Merge "Marks clock view in preview as not important for Talkback" into udc-dev

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

diff --git a/src/com/android/customization/picker/clock/ui/binder/ClockSettingsBinder.kt b/src/com/android/customization/picker/clock/ui/binder/ClockSettingsBinder.kt
index d8c5dce..053ac55 100644
--- a/src/com/android/customization/picker/clock/ui/binder/ClockSettingsBinder.kt
+++ b/src/com/android/customization/picker/clock/ui/binder/ClockSettingsBinder.kt
@@ -159,11 +159,12 @@
                         if (selectedPosition != -1) {
                             val colorOptionContainerListView: LinearLayout =
                                 view.requireViewById(R.id.color_options)
+
                             val selectedView =
-                                colorOptionContainerListView.requireViewById<View>(
+                                colorOptionContainerListView.findViewById<View>(
                                     COLOR_PICKER_ITEM_PREFIX_ID + selectedPosition
                                 )
-                            selectedView.parent.requestChildFocus(selectedView, selectedView)
+                            selectedView?.parent?.requestChildFocus(selectedView, selectedView)
                         }
                     }
                 }