From d61a35b118c99fc093745f6ad9a0772dc939f181 Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Wed, 2 Nov 2022 13:37:47 -0400
Subject: [PATCH] Fix layering issue with action buttons in the contact list.

---
 .../contact_selection_list_fragment.xml       | 35 ++++++++++---------
 1 file changed, 18 insertions(+), 17 deletions(-)

diff --git a/app/src/main/res/layout/contact_selection_list_fragment.xml b/app/src/main/res/layout/contact_selection_list_fragment.xml
index 34ad0a4a56..92cc5bbe02 100644
--- a/app/src/main/res/layout/contact_selection_list_fragment.xml
+++ b/app/src/main/res/layout/contact_selection_list_fragment.xml
@@ -113,23 +113,6 @@
 
     </LinearLayout>
 
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/chipRecycler"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:clipChildren="false"
-        android:clipToPadding="false"
-        android:minHeight="48sp"
-        android:orientation="horizontal"
-        android:paddingStart="@dimen/dsl_settings_gutter"
-        android:paddingEnd="@dimen/dsl_settings_gutter"
-        android:scrollbars="none"
-        android:visibility="gone"
-        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:listitem="@layout/contact_selection_list_chip"
-        tools:visibility="visible" />
-
     <com.google.android.material.button.MaterialButton
         android:id="@+id/header_action"
         style="@style/Widget.Signal.Button.Small"
@@ -149,4 +132,22 @@
         tools:text="@string/ContactsCursorLoader_new_story"
         tools:visibility="visible" />
 
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/chipRecycler"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:clipChildren="false"
+        android:clipToPadding="false"
+        android:minHeight="48sp"
+        android:orientation="horizontal"
+        android:paddingStart="@dimen/dsl_settings_gutter"
+        android:paddingEnd="@dimen/dsl_settings_gutter"
+        android:scrollbars="none"
+        android:visibility="gone"
+        android:background="@color/signal_colorSurface"
+        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:listitem="@layout/contact_selection_list_chip"
+        tools:visibility="visible" />
+
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file