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

Commit d1bd8119 authored by Jeff DeCew's avatar Jeff DeCew Committed by Android (Google) Code Review
Browse files

Merge "Reduce double header spacing in Conversation and Call notifications." into sc-dev

parents c3e6fc7a 86650152

core/res/res/layout/notification_template_conversation_header.xml

+4 −9
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ 
        android:id="@+id/conversation_text"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_marginEnd="@dimen/notification_conversation_header_separating_margin"

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

        android:textSize="16sp"

        android:singleLine="true"
@@ -40,7 +39,6 @@ 
        android:layout_height="wrap_content"

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

        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:singleLine="true"

        android:visibility="gone"
@@ -53,7 +51,6 @@ 
        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_marginStart="@dimen/notification_conversation_header_separating_margin"

        android:layout_marginEnd="@dimen/notification_conversation_header_separating_margin"

        android:singleLine="true"

        android:visibility="gone"

        />
@@ -64,7 +61,6 @@ 
        android:layout_height="wrap_content"

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

        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:singleLine="true"

        android:visibility="gone"
@@ -96,7 +92,6 @@ 
        android:layout_height="wrap_content"

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

        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:singleLine="true"

        android:visibility="gone"
@@ -106,7 +101,7 @@ 
        android:id="@+id/verification_icon"

        android:layout_width="@dimen/notification_verification_icon_size"

        android:layout_height="@dimen/notification_verification_icon_size"

        android:layout_marginStart="4dp"

        android:layout_marginStart="@dimen/notification_conversation_header_separating_margin"

        android:baseline="10dp"

        android:scaleType="fitCenter"

        android:src="@drawable/ic_notifications_alerted"
@@ -142,7 +137,7 @@ 
        android:id="@+id/phishing_alert"

        android:layout_width="@dimen/notification_phishing_alert_size"

        android:layout_height="@dimen/notification_phishing_alert_size"

        android:layout_marginStart="4dp"

        android:layout_marginStart="@dimen/notification_conversation_header_separating_margin"

        android:baseline="10dp"

        android:scaleType="fitCenter"

        android:src="@drawable/ic_dialog_alert_material"
@@ -154,7 +149,7 @@ 
        android:id="@+id/profile_badge"

        android:layout_width="@dimen/notification_badge_size"

        android:layout_height="@dimen/notification_badge_size"

        android:layout_marginStart="4dp"

        android:layout_marginStart="@dimen/notification_conversation_header_separating_margin"

        android:baseline="10dp"

        android:scaleType="fitCenter"

        android:visibility="gone"
@@ -165,7 +160,7 @@ 
        android:id="@+id/alerted_icon"

        android:layout_width="@dimen/notification_alerted_size"

        android:layout_height="@dimen/notification_alerted_size"

        android:layout_marginStart="4dp"

        android:layout_marginStart="@dimen/notification_conversation_header_separating_margin"

        android:baseline="10dp"

        android:contentDescription="@string/notification_alerted_content_description"

        android:scaleType="fitCenter"