From 6e75d42a9280618eda95d99d649e3b5f012dbbab Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Sun, 19 Jul 2020 11:01:10 -0400
Subject: [PATCH] Enable skin tone selection for emoji reactions.

---
 .../securesms/reactions/any/ReactWithAnyEmojiAdapter.java   | 2 +-
 .../any/ReactWithAnyEmojiBottomSheetDialogFragment.java     | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/reactions/any/ReactWithAnyEmojiAdapter.java b/app/src/main/java/org/thoughtcrime/securesms/reactions/any/ReactWithAnyEmojiAdapter.java
index d6b98b5d3..f6c847fc7 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/reactions/any/ReactWithAnyEmojiAdapter.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/reactions/any/ReactWithAnyEmojiAdapter.java
@@ -32,7 +32,7 @@ final class ReactWithAnyEmojiAdapter extends RecyclerView.Adapter<ReactWithAnyEm
 
   @Override
   public @NonNull ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-    return new ViewHolder(new EmojiPageView(parent.getContext(), emojiEventListener, variationSelectorListener, false));
+    return new ViewHolder(new EmojiPageView(parent.getContext(), emojiEventListener, variationSelectorListener, true));
   }
 
   @Override
diff --git a/app/src/main/java/org/thoughtcrime/securesms/reactions/any/ReactWithAnyEmojiBottomSheetDialogFragment.java b/app/src/main/java/org/thoughtcrime/securesms/reactions/any/ReactWithAnyEmojiBottomSheetDialogFragment.java
index 1c8acee6a..494891da6 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/reactions/any/ReactWithAnyEmojiBottomSheetDialogFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/reactions/any/ReactWithAnyEmojiBottomSheetDialogFragment.java
@@ -40,7 +40,10 @@ import org.thoughtcrime.securesms.util.ViewUtil;
 
 import static org.thoughtcrime.securesms.R.layout.react_with_any_emoji_tab;
 
-public final class ReactWithAnyEmojiBottomSheetDialogFragment extends BottomSheetDialogFragment implements EmojiKeyboardProvider.EmojiEventListener, EmojiPageViewGridAdapter.VariationSelectorListener {
+public final class ReactWithAnyEmojiBottomSheetDialogFragment extends BottomSheetDialogFragment
+                                                              implements EmojiKeyboardProvider.EmojiEventListener,
+                                                                         EmojiPageViewGridAdapter.VariationSelectorListener
+{
 
   private static final String ARG_MESSAGE_ID = "arg_message_id";
   private static final String ARG_IS_MMS     = "arg_is_mms";
@@ -202,6 +205,7 @@ public final class ReactWithAnyEmojiBottomSheetDialogFragment extends BottomShee
 
   @Override
   public void onVariationSelectorStateChanged(boolean open) {
+    categoryPager.setUserInputEnabled(!open);
   }
 
   private void updateFocusedRecycler(int position) {