Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit be16c427 authored by Brian Attwell's avatar Brian Attwell Committed by Android Git Automerger
Browse files

am 4841c445: Merge "Add missing background behind account header" into lmp-dev

* commit '4841c4458cd2db7efeb5eefcfb66df36346a1f07':
  Add missing background behind account header
parents e4125550 091bd695
Loading
Loading
Loading
Loading
+22 −16
Original line number Diff line number Diff line
@@ -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:layout_width="match_parent"
    android:layout_height="wrap_content"
    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: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">
        <!-- 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" />
</LinearLayout>
    </FrameLayout>
</FrameLayout>
+1 −3
Original line number Diff line number Diff line
@@ -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"