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

Commit 6550e43e authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Conversations UX polish pass" into rvc-dev am: 62a1b9d1 

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

Change-Id: I8b3acc6296a05b49b130140edb984bae216ac25d
parents b467333c 62a1b9d1

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

+5 −1
Original line number Diff line number Diff line
@@ -761,9 +761,13 @@ public class ConversationLayout extends FrameLayout 
                // group

                : mExpandedGroupMessagePadding;



        int iconPadding = mIsOneToOne || mIsCollapsed

                ? mConversationIconTopPadding

                : mConversationIconTopPaddingExpandedGroup;



        mConversationIconContainer.setPaddingRelative(

                mConversationIconContainer.getPaddingStart(),

                mConversationIconTopPadding,

                iconPadding,

                mConversationIconContainer.getPaddingEnd(),

                mConversationIconContainer.getPaddingBottom());

core/res/res/layout/notification_template_material_conversation.xml

+2 −2
Original line number Diff line number Diff line
@@ -148,7 +148,6 @@ 
                        android:layout_weight="1"

                        />





                    <TextView

                        android:id="@+id/app_name_divider"

                        android:layout_width="wrap_content"
@@ -174,6 +173,7 @@ 
                        android:layout_marginEnd="@dimen/notification_conversation_header_separating_margin"

                        android:paddingTop="1sp"

                        android:singleLine="true"

                        android:visibility="gone"

                    />



                    <TextView
@@ -192,7 +192,7 @@ 


                    <DateTimeView

                        android:id="@+id/time"

                        android:textAppearance="@style/TextAppearance.Material.Notification.Time"

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

                        android:layout_width="wrap_content"

                        android:layout_height="wrap_content"

                        android:layout_gravity="center"

core/res/res/values/dimens.xml

+1 −1
Original line number Diff line number Diff line
@@ -734,7 +734,7 @@ 
    <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>

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



    <!-- The padding of the conversation header when expanded. This is calculated from the expand button size + notification_content_margin_end -->

    <dimen name="conversation_header_expanded_padding_end">38dp</dimen>

core/res/res/values/styles_device_defaults.xml

+5 −2
Original line number Diff line number Diff line
@@ -296,9 +296,12 @@ easier. 
    <style name="TextAppearance.DeviceDefault.Notification.Info" parent="TextAppearance.Material.Notification.Info">

        <item name="fontFamily">@string/config_bodyFontFamily</item>

    </style>

    <style name="TextAppearance.DeviceDefault.Notification.Time" parent="TextAppearance.Material.Notification.Time">

        <item name="fontFamily">@string/config_bodyFontFamily</item>

    </style>

    <style name="TextAppearance.DeviceDefault.Notification.Conversation.AppName"

           parent="@*android:style/TextAppearance.DeviceDefault.Notification.Title">

        <item name="android:textSize">16sp</item>

           parent="TextAppearance.Material.Notification.Conversation.AppName">

        <item name="fontFamily">@string/config_headlineFontFamilyMedium</item>

    </style>

    <style name="TextAppearance.DeviceDefault.Widget" parent="TextAppearance.Material.Widget">

        <item name="fontFamily">@string/config_bodyFontFamily</item>

core/res/res/values/styles_material.xml

+4 −0
Original line number Diff line number Diff line
@@ -491,6 +491,10 @@ please see styles_device_defaults.xml. 
        <item name="textColor">#66000000</item>

    </style>



    <style name="TextAppearance.Material.Notification.Conversation.AppName" parent="TextAppearance.Material.Notification.Title">

        <item name="android:textSize">16sp</item>

    </style>



    <style name="TextAppearance.Material.ListItem" parent="TextAppearance.Material.Subhead" />

    <style name="TextAppearance.Material.ListItemSecondary" parent="TextAppearance.Material.Body1" />