Merge "add listener to the viewHolder.itemView" into androidx-main am: 74efb84dd5

Original change: https://android-review.googlesource.com/c/platform/frameworks/support/+/2496345

Change-Id: Ibfba0c01d0099cb7b892f0c415c7d6f077ed2310
Signed-off-by: Automerger Merge Worker <[email protected]>
diff --git a/emoji2/emoji2-emojipicker/src/main/java/androidx/emoji2/emojipicker/EmojiPickerHeaderAdapter.kt b/emoji2/emoji2-emojipicker/src/main/java/androidx/emoji2/emojipicker/EmojiPickerHeaderAdapter.kt
index 5e1993d..4dac647 100644
--- a/emoji2/emoji2-emojipicker/src/main/java/androidx/emoji2/emojipicker/EmojiPickerHeaderAdapter.kt
+++ b/emoji2/emoji2-emojipicker/src/main/java/androidx/emoji2/emojipicker/EmojiPickerHeaderAdapter.kt
@@ -58,10 +58,10 @@
             R.id.emoji_picker_header_icon
         ).apply {
             setImageDrawable(context.getDrawable(emojiPickerItems.getHeaderIconId(i)))
-            setOnClickListener { onHeaderIconClicked(i) }
             isSelected = isItemSelected
             contentDescription = emojiPickerItems.getHeaderIconDescription(i)
         }
+        viewHolder.itemView.setOnClickListener { onHeaderIconClicked(i) }
         if (isItemSelected) {
             headerIcon.post {
                 headerIcon.sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_HOVER_ENTER)