From 3e7cff024e9975c181f85f1d08e701451e77625e Mon Sep 17 00:00:00 2001
From: Julia Reynolds <juliacr@google.com>
Date: Fri, 14 Jan 2022 14:43:24 -0500
Subject: [PATCH] Fix notif log header overlap

By matching it to notification history

Test: with low screen density and large text
Fixes: 209635125
Change-Id: I8e4334b7ed0585986d4a38b4877ba8c23458e8a9
---
 res/layout/notification_log_row.xml | 58 ++++++++++++-----------------
 1 file changed, 24 insertions(+), 34 deletions(-)

diff --git a/res/layout/notification_log_row.xml b/res/layout/notification_log_row.xml
index fea8a290efa..847a699386b 100644
--- a/res/layout/notification_log_row.xml
+++ b/res/layout/notification_log_row.xml
@@ -24,62 +24,57 @@
     android:background="?android:attr/selectableItemBackground"
     >
 
-    <RelativeLayout
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        >
+        android:minHeight="@*android:dimen/status_bar_icon_size"
+        android:gravity="center_vertical"
+        android:layout_marginBottom="11dp">
 
         <ImageView
             android:id="@+id/icon"
-            android:layout_width="@*android:dimen/status_bar_icon_size"
-            android:layout_height="@*android:dimen/status_bar_icon_size"
+            android:layout_height="24dp"
+            android:layout_width="24dp"
+            android:padding="4dp"
             android:layout_centerVertical="true"
-            android:layout_toEndOf="@+id/pkgicon"
-            android:layout_marginStart="0dp"
-            android:layout_marginEnd="8dp"
+            android:layout_marginEnd="14dp"
             android:contentDescription="@null"
-            android:adjustViewBounds="true"
-            android:tint="?android:attr/textColorPrimary"
-            android:maxHeight="@*android:dimen/status_bar_icon_size"
-            android:maxWidth="@*android:dimen/status_bar_icon_size"
-            android:scaleType="fitCenter" />
+            android:scaleType="centerInside" />
 
         <TextView
             android:id="@+id/pkgname"
-            android:layout_width="wrap_content"
+            android:layout_weight="1"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_centerVertical="true"
-            android:layout_toEndOf="@id/icon"
             android:ellipsize="end"
             android:singleLine="true"
             android:textColor="?android:attr/textColorPrimary"
-            android:textAppearance="?android:attr/textAppearanceSmall"
-            android:textStyle="bold"
+            android:textSize="12sp"
+            android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Notification"
+            android:marqueeRepeatLimit = "marquee_forever"
+            android:scrollHorizontally = "true"
             android:textAlignment="viewStart" />
 
         <ImageView
             android:id="@+id/alerted_icon"
-            android:layout_width="@*android:dimen/status_bar_icon_size"
-            android:layout_height="@*android:dimen/status_bar_icon_size"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
             android:layout_centerVertical="true"
             android:layout_marginStart="6dp"
-            android:paddingTop="1dp"
             android:scaleType="fitCenter"
             android:visibility="gone"
-            android:layout_toEndOf="@id/pkgname"
             android:tint="?android:attr/textColorSecondary"
             android:src="@drawable/ic_notifications_alert"
         />
 
         <ImageView
             android:id="@+id/profile_badge"
-            android:layout_width="@*android:dimen/status_bar_icon_size"
-            android:layout_height="@*android:dimen/status_bar_icon_size"
-            android:layout_centerVertical="true"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
             android:layout_marginEnd="6dp"
-            android:paddingTop="1dp"
             android:scaleType="fitCenter"
-            android:visibility="gone"
+            android:contentDescription="@*android:string/notification_work_profile_content_description"
             android:layout_toStartOf="@id/timestamp"
         />
 
@@ -87,19 +82,14 @@
             android:id="@+id/timestamp"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:paddingTop="13dp"
-            android:paddingBottom="13dp"
-            android:layout_alignBottom="@android:id/widget_frame"
             android:layout_alignParentEnd="true"
-            android:layout_alignTop="@android:id/widget_frame"
-            android:layout_centerVertical="true"
             android:ellipsize="end"
             android:singleLine="true"
-            android:textColor="?android:attr/textColorPrimary"
-            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:textSize="12sp"
+            android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Notification"
             android:textAlignment="viewEnd"
-            />
-    </RelativeLayout>
+        />
+    </LinearLayout>
 
     <LinearLayout
         android:layout_width="match_parent"