From ee9f52586e343a90e6db1b18fe2e1ad7999c0cc6 Mon Sep 17 00:00:00 2001
From: Yining Liu <liuyining@google.com>
Date: Wed, 8 Mar 2023 21:18:46 +0000
Subject: [PATCH] Fix NotificationTopLineView clipping text when the font size
 is at maximum

Fixes the visually cut off text when the Accessibility - Display  size and text - font size is at its maximum.

Test: Manual.
Go to Settings > Accessibility > Display size and text. Adjust the "Font size" to the biggest.
Post a Message Notification, and a BigText Notification. Open the Shade.
The collapsed notifications' title texts shouldn't be cut off.
Bug: 264009793
Bug: 273401782
Change-Id: I9694e448d235b152117ff00d29597c66b64c6733
---
 core/res/res/layout/notification_template_material_base.xml    | 3 ++-
 .../res/layout/notification_template_material_messaging.xml    | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/core/res/res/layout/notification_template_material_base.xml b/core/res/res/layout/notification_template_material_base.xml
index fd787f6ea470d..16a8bb7280a4e 100644
--- a/core/res/res/layout/notification_template_material_base.xml
+++ b/core/res/res/layout/notification_template_material_base.xml
@@ -79,7 +79,8 @@
             <NotificationTopLineView
                 android:id="@+id/notification_top_line"
                 android:layout_width="wrap_content"
-                android:layout_height="@dimen/notification_headerless_line_height"
+                android:layout_height="wrap_content"
+                android:minHeight="@dimen/notification_headerless_line_height"
                 android:clipChildren="false"
                 android:theme="@style/Theme.DeviceDefault.Notification"
                 >
diff --git a/core/res/res/layout/notification_template_material_messaging.xml b/core/res/res/layout/notification_template_material_messaging.xml
index bef1d0b319b41..3e82bd1814c6c 100644
--- a/core/res/res/layout/notification_template_material_messaging.xml
+++ b/core/res/res/layout/notification_template_material_messaging.xml
@@ -102,7 +102,8 @@
                     <NotificationTopLineView
                         android:id="@+id/notification_top_line"
                         android:layout_width="wrap_content"
-                        android:layout_height="@dimen/notification_headerless_line_height"
+                        android:layout_height="wrap_content"
+                        android:minHeight="@dimen/notification_headerless_line_height"
                         android:layout_marginStart="@dimen/notification_content_margin_start"
                         android:clipChildren="false"
                         android:theme="@style/Theme.DeviceDefault.Notification"