From ee9f52586e343a90e6db1b18fe2e1ad7999c0cc6 Mon Sep 17 00:00:00 2001 From: Yining Liu Date: Wed, 8 Mar 2023 21:18:46 +0000 Subject: [PATCH 1/5] 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 @@ 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 @@ Date: Fri, 10 Mar 2023 00:09:39 +0000 Subject: [PATCH 2/5] Fix MediaStyle Notification clipping text when the system font size is at maximum Fixes the visually cut off text inside MediaStyle Notification 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 MediaStyle Notification, then open the Shade. The MediaStyle Notification's media_seamless_button texts shouldn't be cut off. Bug: 264009793 Bug: 273401782 Change-Id: I4d8a973d76fba5c6e519f7e152ef762aa9b31209 --- packages/SystemUI/res/layout/media_session_view.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/SystemUI/res/layout/media_session_view.xml b/packages/SystemUI/res/layout/media_session_view.xml index 9d914197c05a9..85b6e8dc12b36 100644 --- a/packages/SystemUI/res/layout/media_session_view.xml +++ b/packages/SystemUI/res/layout/media_session_view.xml @@ -97,7 +97,8 @@ android:background="@drawable/qs_media_light_source" android:forceHasOverlappingRendering="false" android:layout_width="wrap_content" - android:layout_height="@dimen/min_clickable_item_size" + android:minHeight="@dimen/min_clickable_item_size" + android:layout_height="wrap_content" android:layout_marginStart="@dimen/qs_center_guideline_padding" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" From 57341d0d4b54aca7d88a0d32bdea69214ca5a3e0 Mon Sep 17 00:00:00 2001 From: Yining Liu Date: Fri, 10 Mar 2023 00:12:11 +0000 Subject: [PATCH 3/5] 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" > Date: Mon, 13 Mar 2023 22:42:45 +0000 Subject: [PATCH 4/5] 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 @@ @@ -41,6 +42,7 @@ android:layout_marginStart="@dimen/conversation_content_start" android:orientation="vertical" android:minHeight="68dp" + android:paddingBottom="@dimen/notification_headerless_margin_twoline" > - + From 458dba0c7e1b83e54088a6b8cd3e0887672007a7 Mon Sep 17 00:00:00 2001 From: Yining Liu Date: Tue, 14 Mar 2023 04:55:02 +0000 Subject: [PATCH 5/5] Fix collapsed OldMediaStyle Notification title text clipping when the system font size is at maximum Fixes the visually clipped title text of collapsed OldMediaStyle 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 OldMediaStyle Notification and an Inbox Notification with Notify2, then open the Shade. The collapsed OldMediaStyle Notification's title text shouldn't be clipped. Bug: 264009793 Bug: 273401782 Change-Id: I966465c77c502cb26beed4a0c18ccac7dd17a516 --- .../res/res/layout/notification_template_material_media.xml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/core/res/res/layout/notification_template_material_media.xml b/core/res/res/layout/notification_template_material_media.xml index 95ddc2e4ea796..df32d30918c89 100644 --- a/core/res/res/layout/notification_template_material_media.xml +++ b/core/res/res/layout/notification_template_material_media.xml @@ -19,7 +19,8 @@ android:id="@+id/status_bar_latest_event_content" xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" - android:layout_height="@dimen/notification_min_height" + android:layout_height="wrap_content" + android:minHeight="@dimen/notification_min_height" android:tag="media" > @@ -77,7 +78,8 @@