summaryrefslogtreecommitdiff
path: root/src/com/android/customization/picker
diff options
context:
space:
mode:
authorGeorge Lin <giolin@google.com>2023-11-16 22:22:03 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2023-11-16 22:22:03 +0000
commita52691e38b618b75a1c8618c3a292e0891fe8539 (patch)
treeddfee2007c693fdd2999e1a5b20972d9e34dc1c2 /src/com/android/customization/picker
parenta626301984e97b556b74ed89c9b4129b3d17f07b (diff)
parent65c5beaa2805a68d99218208e9212e439d381234 (diff)
downloadThemePicker-a52691e38b618b75a1c8618c3a292e0891fe8539.tar.gz
Merge "Fix stale state of the shortcut slot tab a11y content description" into main
Diffstat (limited to 'src/com/android/customization/picker')
-rw-r--r--src/com/android/customization/picker/quickaffordance/ui/adapter/SlotTabAdapter.kt4
1 files changed, 3 insertions, 1 deletions
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 8891b03f..0e3b7167 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 @@ class SlotTabAdapter : RecyclerView.Adapter<SlotTabAdapter.ViewHolder>() {
.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) {