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

Commit 6736dd9c authored by Jeff DeCew's avatar Jeff DeCew Committed by Automerger Merge Worker
Browse files

Merge "Conversation visual updates" into sc-dev am: 594b99d6 

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

Change-Id: I40cfe3902fbb40ced73dd08515e04074c3466b83
parents 50d2b931 594b99d6

core/res/res/layout/notification_template_conversation_header.xml

+6 −24
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
    android:layout_width="wrap_content"

    android:layout_height="wrap_content"

    android:orientation="horizontal"

    android:paddingTop="16dp"

    android:paddingTop="20dp"

    >



    <TextView
@@ -42,8 +42,6 @@ 
        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"

        android:singleLine="true"

        android:visibility="gone"

        />
@@ -54,10 +52,8 @@ 
        android:textAppearance="@style/TextAppearance.DeviceDefault.Notification.Info"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_gravity="center"

        android:layout_marginStart="@dimen/notification_conversation_header_separating_margin"

        android:layout_marginEnd="@dimen/notification_conversation_header_separating_margin"

        android:paddingTop="1sp"

        android:singleLine="true"

        android:visibility="gone"

        />
@@ -70,8 +66,6 @@ 
        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"

        android:singleLine="true"

        android:visibility="gone"

        />
@@ -81,9 +75,7 @@ 
        android:textAppearance="@style/TextAppearance.DeviceDefault.Notification.Time"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_gravity="center"

        android:layout_marginStart="@dimen/notification_conversation_header_separating_margin"

        android:paddingTop="1sp"

        android:showRelative="true"

        android:singleLine="true"

        android:visibility="gone"
@@ -93,7 +85,6 @@ 
        android:id="@+id/chronometer"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_gravity="center"

        android:layout_marginStart="@dimen/notification_conversation_header_separating_margin"

        android:layout="@layout/notification_template_part_chronometer"

        android:visibility="gone"
@@ -107,8 +98,6 @@ 
        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"

        android:singleLine="true"

        android:visibility="gone"

        />
@@ -117,9 +106,8 @@ 
        android:id="@+id/verification_icon"

        android:layout_width="@dimen/notification_verification_icon_size"

        android:layout_height="@dimen/notification_verification_icon_size"

        android:layout_gravity="center"

        android:layout_marginStart="4dp"

        android:paddingTop="2dp"

        android:baseline="10dp"

        android:scaleType="fitCenter"

        android:src="@drawable/ic_notifications_alerted"

        android:visibility="gone"
@@ -130,9 +118,7 @@ 
        android:textAppearance="@style/TextAppearance.DeviceDefault.Notification.Info"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_gravity="center"

        android:layout_marginStart="@dimen/notification_conversation_header_separating_margin"

        android:paddingTop="1sp"

        android:showRelative="true"

        android:singleLine="true"

        android:visibility="gone"
@@ -142,11 +128,10 @@ 
        android:id="@+id/feedback"

        android:layout_width="@dimen/notification_feedback_size"

        android:layout_height="@dimen/notification_feedback_size"

        android:layout_gravity="center"

        android:layout_marginStart="@dimen/notification_header_separating_margin"

        android:background="?android:selectableItemBackgroundBorderless"

        android:contentDescription="@string/notification_feedback_indicator"

        android:paddingTop="2dp"

        android:baseline="13dp"

        android:scaleType="fitCenter"

        android:src="@drawable/ic_feedback_indicator"

        android:visibility="gone"
@@ -157,21 +142,19 @@ 
        android:layout_width="@dimen/notification_phishing_alert_size"

        android:layout_height="@dimen/notification_phishing_alert_size"

        android:layout_marginStart="4dp"

        android:paddingTop="2dp"

        android:baseline="10dp"

        android:scaleType="fitCenter"

        android:src="@drawable/ic_dialog_alert_material"

        android:visibility="gone"

        android:contentDescription="@string/notification_phishing_alert_content_description"

        />





    <ImageView

        android:id="@+id/profile_badge"

        android:layout_width="@dimen/notification_badge_size"

        android:layout_height="@dimen/notification_badge_size"

        android:layout_gravity="center"

        android:layout_marginStart="4dp"

        android:paddingTop="2dp"

        android:baseline="10dp"

        android:scaleType="fitCenter"

        android:visibility="gone"

        android:contentDescription="@string/notification_work_profile_content_description"
@@ -181,10 +164,9 @@ 
        android:id="@+id/alerted_icon"

        android:layout_width="@dimen/notification_alerted_size"

        android:layout_height="@dimen/notification_alerted_size"

        android:layout_gravity="center"

        android:layout_marginStart="4dp"

        android:baseline="10dp"

        android:contentDescription="@string/notification_alerted_content_description"

        android:paddingTop="2dp"

        android:scaleType="fitCenter"

        android:src="@drawable/ic_notifications_alerted"

        android:visibility="gone"

core/res/res/layout/notification_template_conversation_icon_container.xml

+2 −2
Original line number Diff line number Diff line
@@ -23,8 +23,8 @@ 
    android:gravity="start|top"

    android:clipChildren="false"

    android:clipToPadding="false"

    android:paddingTop="12dp"

    android:paddingBottom="12dp"

    android:paddingTop="20dp"

    android:paddingBottom="16dp"

    android:importantForAccessibility="no"

    >

core/res/res/layout/notification_template_material_call.xml

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ 
    <LinearLayout

        xmlns:android="http://schemas.android.com/apk/res/android"

        android:layout_width="match_parent"

        android:layout_height="80dp"

        android:layout_height="88dp"

        android:orientation="horizontal"

        >

core/res/res/layout/notification_top_line_views.xml

+1 −2
Original line number Diff line number Diff line
@@ -113,11 +113,10 @@ 
        android:layout_width="@dimen/notification_feedback_size"

        android:layout_height="@dimen/notification_feedback_size"

        android:layout_marginStart="@dimen/notification_header_separating_margin"

        android:layout_gravity="center"

        android:baseline="13dp"

        android:scaleType="fitCenter"

        android:src="@drawable/ic_feedback_indicator"

        android:background="?android:selectableItemBackgroundBorderless"

        android:paddingTop="2dp"

        android:visibility="gone"

        android:contentDescription="@string/notification_feedback_indicator"

        />

core/res/res/values/dimens.xml

+5 −5
Original line number Diff line number Diff line
@@ -758,23 +758,23 @@ 
    <dimen name="notification_grayscale_icon_max_size">256dp</dimen>



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

    <dimen name="conversation_avatar_size">52dp</dimen>

    <dimen name="conversation_avatar_size">48dp</dimen>

    <!-- start margin of the icon circle in the conversation's skin of the header -->

    <dimen name="conversation_icon_circle_start">28dp</dimen>

    <!-- Start of the content in the conversation template -->

    <dimen name="conversation_content_start">80dp</dimen>

    <!-- Height of the expand button in the conversation layout -->

    <dimen name="conversation_expand_button_height">80dp</dimen>

    <dimen name="conversation_expand_button_height">88dp</dimen>

    <!-- this is the margin between the Conversation image and the content -->

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

    <!-- Side margins of the conversation badge in relation to the conversation icon -->

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

    <dimen name="conversation_badge_side_margin">32dp</dimen>

    <!-- size of the notification badge when applied to the conversation icon -->

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

    <!-- size of the conversation avatar in an expanded group -->

    <dimen name="conversation_avatar_size_group_expanded">@dimen/messaging_avatar_size</dimen>

    <!-- size of the face pile icons -->

    <dimen name="conversation_face_pile_avatar_size">@dimen/messaging_avatar_size</dimen>

    <dimen name="conversation_face_pile_avatar_size">32dp</dimen>

    <!-- size of the face pile icons when the group is expanded -->

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

    <!-- Side margins of the conversation badge in relation to the conversation icon when the group is expanded-->
@@ -795,7 +795,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">12dp</dimen>

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



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

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