Add missing background behind account header

Bug: 17399714
Change-Id: I9f43c3cea3d8b916b3d5f347296deae3a29ff438
diff --git a/res-common/layout/account_filter_header.xml b/res-common/layout/account_filter_header.xml
index 268a17e..2b6e110 100644
--- a/res-common/layout/account_filter_header.xml
+++ b/res-common/layout/account_filter_header.xml
@@ -17,22 +17,28 @@
 <!-- Layout showing the type of account filter
      (e.g. All contacts filter, custom filter, etc.),
      which is the header of all contact lists. -->
-<LinearLayout
+
+<!-- Solely used to set a background color -->
+<FrameLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/account_filter_header_container"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:orientation="vertical"
-    android:paddingTop="@dimen/list_header_extra_top_padding"
-    android:layout_marginLeft="@dimen/contact_browser_list_header_left_margin"
-    android:layout_marginRight="@dimen/contact_browser_list_header_right_margin"
-    android:layout_marginStart="@dimen/contact_browser_list_header_left_margin"
-    android:layout_marginEnd="@dimen/contact_browser_list_header_right_margin"
-    android:background="?android:attr/selectableItemBackground"
-    android:visibility="gone">
-    <TextView
-        android:id="@+id/account_filter_header"
-        style="@style/ContactListSeparatorTextViewStyle"
-        android:paddingLeft="@dimen/contact_browser_list_item_text_indent"
-        android:paddingStart="@dimen/contact_browser_list_item_text_indent" />
-</LinearLayout>
+    android:background="@color/background_primary">
+    <!-- Used to show the touch feedback -->
+    <FrameLayout
+        android:id="@+id/account_filter_header_container"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingTop="@dimen/list_header_extra_top_padding"
+        android:layout_marginStart="@dimen/contact_browser_list_header_left_margin"
+        android:layout_marginEnd="@dimen/contact_browser_list_header_right_margin"
+        android:background="?android:attr/selectableItemBackground"
+        android:visibility="gone">
+        <!-- Shows the text and underlining -->
+        <TextView
+            android:id="@+id/account_filter_header"
+            style="@style/ContactListSeparatorTextViewStyle"
+            android:paddingLeft="@dimen/contact_browser_list_item_text_indent"
+            android:paddingStart="@dimen/contact_browser_list_item_text_indent" />
+    </FrameLayout>
+</FrameLayout>
diff --git a/res-common/layout/contact_list_content.xml b/res-common/layout/contact_list_content.xml
index 1e5934c..67c78c3 100644
--- a/res-common/layout/contact_list_content.xml
+++ b/res-common/layout/contact_list_content.xml
@@ -29,9 +29,7 @@
 
     <!-- Shown only when an Account filter is set.
          - paddingTop should be here to show "shade" effect correctly. -->
-    <include
-        android:id="@+id/account_filter_header_container"
-        layout="@layout/account_filter_header" />
+    <include layout="@layout/account_filter_header" />
 
     <FrameLayout
         android:layout_width="match_parent"