commit a52691e38b618b75a1c8618c3a292e0891fe8539
author George Lin <giolin@google.com> Thu Nov 16 22:22:03 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Nov 16 22:22:03 2023 +0000
tree ddfee2007c693fdd2999e1a5b20972d9e34dc1c2
parent a626301984e97b556b74ed89c9b4129b3d17f07b
parent 65c5beaa2805a68d99218208e9212e439d381234

Merge "Fix stale state of the shortcut slot tab a11y content description" into main

src/com/android/customization/picker/quickaffordance/ui/adapter/SlotTabAdapter.kt

diff --git a/src/com/android/customization/picker/quickaffordance/ui/adapter/SlotTabAdapter.kt b/src/com/android/customization/picker/quickaffordance/ui/adapter/SlotTabAdapter.kt
index 8891b03..0e3b716 100644
--- a/src/com/android/customization/picker/quickaffordance/ui/adapter/SlotTabAdapter.kt
+++ b/src/com/android/customization/picker/quickaffordance/ui/adapter/SlotTabAdapter.kt
@@ -67,7 +67,9 @@
                 .find { it.isSelected.value }
                 ?.text
                 ?.asString(holder.itemView.context)
-        stateDescription?.let { holder.itemView.stateDescription = it }
+        holder.itemView.stateDescription =
+            stateDescription
+                ?: holder.itemView.resources.getString(R.string.keyguard_affordance_none)
     }
 
     class ViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {