From 92a64f59a4e126dd5d0cb6b5ec591d0176132121 Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Wed, 23 May 2018 11:06:07 -0400
Subject: [PATCH] Switch search to use the existing header.

Probably best to not try out any possible new design changes just yet.
Let's stick with what we have.
---
 res/drawable/header_search_background.xml           | 13 -------------
 res/layout/header_search_result.xml                 | 13 -------------
 .../securesms/search/SearchListAdapter.java         |  4 ++--
 3 files changed, 2 insertions(+), 28 deletions(-)
 delete mode 100644 res/drawable/header_search_background.xml
 delete mode 100644 res/layout/header_search_result.xml

diff --git a/res/drawable/header_search_background.xml b/res/drawable/header_search_background.xml
deleted file mode 100644
index 7932fc93d1..0000000000
--- a/res/drawable/header_search_background.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape android:shape="rectangle" >
-            <solid android:color="@color/grey_200"/>
-        </shape>
-    </item>
-    <item android:top="1dp">
-        <shape android:shape="rectangle" >
-            <solid android:color="?attr/search_background" />
-        </shape>
-    </item>
-</layer-list>
diff --git a/res/layout/header_search_result.xml b/res/layout/header_search_result.xml
deleted file mode 100644
index 7b8eed1cee..0000000000
--- a/res/layout/header_search_result.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<TextView
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    style="@style/Base.TextAppearance.AppCompat.Body2"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:padding="8dp"
-    android:background="@drawable/header_search_background"
-    tools:text="Conversations">
-
-</TextView>
\ No newline at end of file
diff --git a/src/org/thoughtcrime/securesms/search/SearchListAdapter.java b/src/org/thoughtcrime/securesms/search/SearchListAdapter.java
index a4d4d681ac..69c8f4c4ef 100644
--- a/src/org/thoughtcrime/securesms/search/SearchListAdapter.java
+++ b/src/org/thoughtcrime/securesms/search/SearchListAdapter.java
@@ -97,7 +97,7 @@ class SearchListAdapter extends    RecyclerView.Adapter<SearchListAdapter.Search
   @Override
   public HeaderViewHolder onCreateHeaderViewHolder(ViewGroup parent) {
     return new HeaderViewHolder(LayoutInflater.from(parent.getContext())
-                                              .inflate(R.layout.header_search_result, parent, false));
+                                              .inflate(R.layout.contact_selection_list_divider, parent, false));
   }
 
   @Override
@@ -199,7 +199,7 @@ class SearchListAdapter extends    RecyclerView.Adapter<SearchListAdapter.Search
 
     public HeaderViewHolder(View itemView) {
       super(itemView);
-      titleView = (TextView) itemView;
+      titleView = itemView.findViewById(R.id.label);
     }
 
     public void bind(int headerType) {