Merge "Compress hybrid conversation layout" into rvc-dev

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:gravity="center_vertical|start"

    android:paddingTop="1dp"

    android:paddingBottom="1dp"

    android:paddingEnd="12dp">

    <FrameLayout

        android:layout_width="@*android:dimen/conversation_content_start"

        android:layout_height="36dp"

        android:layout_height="25dp"

    >

        <ImageView

            android:id="@*android:id/conversation_icon"

            android:layout_width="24dp"

            android:layout_height="24dp"

            android:layout_width="20dp"

            android:layout_height="20dp"

            android:layout_gravity="center"

        />

        <ViewStub

            android:id="@*android:id/conversation_face_pile"

            android:layout="@*android:layout/conversation_face_pile_layout"

            android:layout_width="36dp"

            android:layout_height="36dp"

            android:layout_width="25dp"

            android:layout_height="25dp"

            android:layout_gravity="center"

        />

    </FrameLayout>

    <dimen name="notification_section_divider_height">@dimen/notification_side_paddings</dimen>

    <!-- Size of the face pile shown on one-line (children of a group) conversation notifications -->

    <dimen name="conversation_single_line_face_pile_size">36dp</dimen>

    <dimen name="conversation_single_line_face_pile_size">25dp</dimen>

    <!-- Size of an avatar shown on one-line (children of a group) conversation notifications -->

    <dimen name="conversation_single_line_avatar_size">24dp</dimen>

    <dimen name="conversation_single_line_avatar_size">20dp</dimen>

    <!-- Border width for avatars in the face pile shown on one-line (children of a group) conversation notifications -->

    <dimen name="conversation_single_line_face_pile_protection_width">1dp</dimen>