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

Commit 3249f425 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix convo name / icon overlap on low DPI" into rvc-dev am: 501c451d am: 228e6db9 

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

Change-Id: Id18cbfed0ededdf22fe48bd1dcdcd681631f31b0
parents e71253ad 228e6db9

core/res/res/layout/notification_template_material_conversation.xml

+5 −2
Original line number Diff line number Diff line
@@ -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"