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

Commit 67afec25 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Compress hybrid conversation layout" into rvc-dev am: 444d74fa 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11841229

Change-Id: Iff5d33901160e98efc86b1225a829252a49df040
parents d2091c27 444d74fa

packages/SystemUI/res/layout/hybrid_conversation_notification.xml

+7 −5
Original line number Diff line number Diff line
@@ -20,24 +20,26 @@ 
    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>

packages/SystemUI/res/values/dimens.xml

+2 −2
Original line number Diff line number Diff line
@@ -631,10 +631,10 @@ 
    <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>