From 74ab3fc20747a5f975167c5fd2eb1994a57a3a32 Mon Sep 17 00:00:00 2001
From: Yining Liu <liuyining@google.com>
Date: Mon, 13 Mar 2023 22:42:45 +0000
Subject: [PATCH] Fix collapsed CallStyle Notification content text clipping
 when the system font size is at maximum

Fixes the visually clipped content text of collapsed CallStyle Notifications, 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 CallStyle Notification and an Inbox Notification with Notify2, then open the Shade. The collapsed CallStyle Notification's content text shouldn't be clipped.
Bug: 264009793
Bug: 273401782
Change-Id: Ic514096b7c48b4929df252545fc0f002cb0e8828
---
 .../res/layout/notification_template_material_call.xml   | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/core/res/res/layout/notification_template_material_call.xml b/core/res/res/layout/notification_template_material_call.xml
index 1b3bd2673a7a5..76bcc965f28b9 100644
--- a/core/res/res/layout/notification_template_material_call.xml
+++ b/core/res/res/layout/notification_template_material_call.xml
@@ -29,7 +29,8 @@
     <LinearLayout
         xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="match_parent"
-        android:layout_height="88dp"
+        android:layout_height="wrap_content"
+        android:minHeight="88dp"
         android:orientation="horizontal"
         >
 
@@ -41,6 +42,7 @@
             android:layout_marginStart="@dimen/conversation_content_start"
             android:orientation="vertical"
             android:minHeight="68dp"
+            android:paddingBottom="@dimen/notification_headerless_margin_twoline"
             >
 
             <include
@@ -49,7 +51,10 @@
                 android:layout_height="wrap_content"
                 />
 
-            <include layout="@layout/notification_template_text" />
+            <include layout="@layout/notification_template_text"
+                android:layout_height="wrap_content"
+                android:minHeight="@dimen/notification_text_height"
+                />
 
         </LinearLayout>