Merge "Fix convo name / icon overlap on low DPI" into rvc-dev am: 501c451d7a am: 228e6db9f8 am: 3249f4259e

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

Change-Id: I2c5a184445765ce144c51a432f8e4af6945bb37d
This commit is contained in:
TreeHugger Robot
2020-06-25 01:04:00 +00:00
committed by Automerger Merge Worker

View File

@@ -128,6 +128,9 @@
android:layout_weight="1">
<!-- Header -->
<!-- Use layout_marginStart instead of paddingStart to work around strange
measurement behavior on lower display densities. -->
<LinearLayout
android:id="@+id/conversation_header"
android:layout_width="wrap_content"
@@ -135,11 +138,11 @@
android:orientation="horizontal"
android:paddingTop="16dp"
android:layout_marginBottom="2dp"
android:paddingStart="@dimen/conversation_content_start"
android:layout_marginStart="@dimen/conversation_content_start"
>
<TextView
android:id="@+id/conversation_text"
android:layout_width="0dp"
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"