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

Commit 666124b0 authored by Steve Elliott's avatar Steve Elliott
Browse files

Adjust conversation layout paddings to match UX spec 

Fixes: 157757386
Fixes: 157144647
Test: manual, visual
Change-Id: Ibeccc0fe2269aea69b882895fbb1a280cd6bf126
parent 275248dd

core/java/com/android/internal/widget/ConversationLayout.java

+1 −2
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ public class ConversationLayout extends FrameLayout 


    private static final float COLOR_SHIFT_AMOUNT = 60;

    /**

     *  Pattren for filter some ingonable characters.

     *  Pattern for filter some ignorable characters.

     *  p{Z} for any kind of whitespace or invisible separator.

     *  p{C} for any kind of punctuation character.

     */
@@ -1245,7 +1245,6 @@ public class ConversationLayout extends FrameLayout 
    }



    private void updateContentEndPaddings() {



        // Let's make sure the conversation header can't run into the expand button when we're

        // collapsed and update the paddings of the content

        int headerPaddingEnd;

core/res/res/layout/notification_template_material_conversation.xml

+8 −7
Original line number Diff line number Diff line
@@ -141,7 +141,7 @@ 
                        android:id="@+id/conversation_text"

                        android:layout_width="wrap_content"

                        android:layout_height="wrap_content"

                        android:layout_marginEnd="@dimen/notification_header_separating_margin"

                        android:layout_marginEnd="@dimen/notification_conversation_header_separating_margin"

                        android:textAppearance="@style/TextAppearance.DeviceDefault.Notification.Title"

                        android:textSize="16sp"

                        android:singleLine="true"
@@ -154,8 +154,8 @@ 
                        android:layout_width="wrap_content"

                        android:layout_height="wrap_content"

                        android:textAppearance="?attr/notificationHeaderTextAppearance"

                        android:layout_marginStart="@dimen/notification_header_separating_margin"

                        android:layout_marginEnd="@dimen/notification_header_separating_margin"

                        android:layout_marginStart="@dimen/notification_conversation_header_separating_margin"

                        android:layout_marginEnd="@dimen/notification_conversation_header_separating_margin"

                        android:text="@string/notification_header_divider_symbol"

                        android:layout_gravity="center"

                        android:paddingTop="1sp"
@@ -170,7 +170,8 @@ 
                        android:layout_width="wrap_content"

                        android:layout_height="wrap_content"

                        android:layout_gravity="center"

                        android:layout_marginStart="@dimen/notification_header_separating_margin"

                        android:layout_marginStart="@dimen/notification_conversation_header_separating_margin"

                        android:layout_marginEnd="@dimen/notification_conversation_header_separating_margin"

                        android:paddingTop="1sp"

                        android:singleLine="true"

                    />
@@ -180,8 +181,8 @@ 
                        android:layout_width="wrap_content"

                        android:layout_height="wrap_content"

                        android:textAppearance="?attr/notificationHeaderTextAppearance"

                        android:layout_marginStart="@dimen/notification_header_separating_margin"

                        android:layout_marginEnd="@dimen/notification_header_separating_margin"

                        android:layout_marginStart="@dimen/notification_conversation_header_separating_margin"

                        android:layout_marginEnd="@dimen/notification_conversation_header_separating_margin"

                        android:text="@string/notification_header_divider_symbol"

                        android:layout_gravity="center"

                        android:paddingTop="1sp"
@@ -195,7 +196,7 @@ 
                        android:layout_width="wrap_content"

                        android:layout_height="wrap_content"

                        android:layout_gravity="center"

                        android:layout_marginStart="@dimen/notification_header_separating_margin"

                        android:layout_marginStart="@dimen/notification_conversation_header_separating_margin"

                        android:paddingTop="1sp"

                        android:showRelative="true"

                        android:singleLine="true"

core/res/res/values/dimens.xml

+5 −2
Original line number Diff line number Diff line
@@ -273,6 +273,9 @@ 
    <!-- The margin before and after each of the items in the notification header. -->

    <dimen name="notification_header_separating_margin">2dp</dimen>



    <!-- The margin before and after each of the items in the conversation header. -->

    <dimen name="notification_conversation_header_separating_margin">4dp</dimen>



    <!-- The absolute size of the notification expand icon. -2 for wrap_content. -->

    <dimen name="notification_header_expand_icon_size">-2px</dimen>
@@ -719,7 +722,7 @@ 
    <!-- The width of the protection of the face pile layout when expanded-->

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

    <!-- The padding of the expanded message container-->

    <dimen name="expanded_group_conversation_message_padding">14dp</dimen>

    <dimen name="expanded_group_conversation_message_padding">17dp</dimen>

    <!-- The stroke width of the ring used to visually mark a conversation as important -->

    <dimen name="importance_ring_stroke_width">2dp</dimen>

    <!-- The maximum stroke width used for the animation shown when a conversation is marked as important -->
@@ -728,7 +731,7 @@ 
    <dimen name="importance_ring_size">20dp</dimen>



    <!-- The top padding of the conversation icon container in the regular state-->

    <dimen name="conversation_icon_container_top_padding">9dp</dimen>

    <dimen name="conversation_icon_container_top_padding">12dp</dimen>



    <!-- The top padding of the conversation icon container when the avatar is small-->

    <dimen name="conversation_icon_container_top_padding_small_avatar">17.5dp</dimen>