From 57341d0d4b54aca7d88a0d32bdea69214ca5a3e0 Mon Sep 17 00:00:00 2001
From: Yining Liu <liuyining@google.com>
Date: Fri, 10 Mar 2023 00:12:11 +0000
Subject: [PATCH] Fix Group Notification expand button clipping text when the
 system font size is at maximum

Fixes the visually clipped text of Group Notification expand button - children count, 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 Group Notification, then open the Shade. The Group Notification's expand button text shouldn't be clipped.
Bug: 264009793
Bug: 273401782
Change-Id: I1c6afac818f4ceba6b5c7d78a6c75a941b77cc3e
---
 core/res/res/layout/notification_expand_button.xml | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/core/res/res/layout/notification_expand_button.xml b/core/res/res/layout/notification_expand_button.xml
index e752431ce75fb..8eae064cba1f8 100644
--- a/core/res/res/layout/notification_expand_button.xml
+++ b/core/res/res/layout/notification_expand_button.xml
@@ -19,23 +19,28 @@
     android:id="@+id/expand_button"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
+    android:minHeight="@dimen/notification_header_height"
     android:layout_gravity="top|end"
     android:contentDescription="@string/expand_button_content_description_collapsed"
-    android:padding="16dp"
+    android:paddingHorizontal="16dp"
     >
 
     <LinearLayout
         android:id="@+id/expand_button_pill"
         android:layout_width="wrap_content"
-        android:layout_height="@dimen/notification_expand_button_pill_height"
+        android:layout_height="wrap_content"
+        android:minHeight="@dimen/notification_expand_button_pill_height"
         android:orientation="horizontal"
         android:background="@drawable/expand_button_pill_bg"
+        android:gravity="center_vertical"
+        android:layout_gravity="center_vertical"
         >
 
         <TextView
             android:id="@+id/expand_button_number"
             android:layout_width="wrap_content"
-            android:layout_height="@dimen/notification_expand_button_pill_height"
+            android:layout_height="wrap_content"
+            android:minHeight="@dimen/notification_expand_button_pill_height"
             android:textAppearance="@style/TextAppearance.DeviceDefault.Notification.Info"
             android:gravity="center_vertical"
             android:paddingStart="8dp"