From d54d2d4d860b97ad9c12b2eb248d1a00aa2e32e0 Mon Sep 17 00:00:00 2001
From: Yining Liu <liuyining@google.com>
Date: Wed, 15 Mar 2023 22:54:54 +0000
Subject: [PATCH 1/2] Fix text clipping of Turn off notifications button in
 Guts, when the system font size is at maximum

Fixes the visually clipped Turn off notifications button in Guts, 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 Notification with Notify2, then open the Shade. Long-press the notification to open the guts, the Turn off notifications button shouldn't be clipped.
Bug: 264007955
Bug: 273401782
Change-Id: I66763cc514e49e63c4f6e4a89a9cff4868769af5
---
 packages/SystemUI/res/layout/notification_info.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/SystemUI/res/layout/notification_info.xml b/packages/SystemUI/res/layout/notification_info.xml
index 4f7d09963fc64..4d6c2022c3b86 100644
--- a/packages/SystemUI/res/layout/notification_info.xml
+++ b/packages/SystemUI/res/layout/notification_info.xml
@@ -321,7 +321,8 @@ asked for it -->
         <RelativeLayout
             android:id="@+id/bottom_buttons"
             android:layout_width="match_parent"
-            android:layout_height="60dp"
+            android:layout_height="wrap_content"
+            android:minHeight="60dp"
             android:gravity="center_vertical"
             android:paddingStart="4dp"
             android:paddingEnd="4dp"

From a43e4cb45d1b3428de00fe3732499d67a7b333f2 Mon Sep 17 00:00:00 2001
From: Yining Liu <liuyining@google.com>
Date: Thu, 16 Mar 2023 22:48:41 +0000
Subject: [PATCH 2/2] Fix text clipping of NotificationVanishingFrameLayout,
 when the system font size is at maximum

Fixes the visually clipped notification content text inside NotificationVanishingFrameLayout, when the Accessibility - Display size and text - font size is at its maximum(2.0 scale).

Test: Manual, Go to Settings > Accessibility > Display size and text. Adjust the "Font size" to the biggest. Post an Account update alert notification, then open the Shade. The notification's content text shouldn't be clipped.
Bug: 273401782
Change-Id: I2fcaae6a68692a4bc19eedf4cdd84d3a0716663b
---
 core/res/res/layout/notification_template_material_base.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/res/res/layout/notification_template_material_base.xml b/core/res/res/layout/notification_template_material_base.xml
index 16a8bb7280a4e..710a70a32955a 100644
--- a/core/res/res/layout/notification_template_material_base.xml
+++ b/core/res/res/layout/notification_template_material_base.xml
@@ -116,7 +116,8 @@
 
                 <com.android.internal.widget.NotificationVanishingFrameLayout
                     android:layout_width="match_parent"
-                    android:layout_height="@dimen/notification_headerless_line_height"
+                    android:layout_height="wrap_content"
+                    android:minHeight="@dimen/notification_headerless_line_height"
                     >
                     <!-- This is the simplest way to keep this text vertically centered without
                      gravity="center_vertical" which causes jumpiness in expansion animations. -->