From e7304b0c31452155c9eba2c5b44809bf51489e6b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A1s=20Kurucz?= <kurucz@google.com>
Date: Fri, 29 Jul 2022 14:32:26 +0000
Subject: [PATCH] Fix overlapping text in NotificationHistoryActivity

Align the TextViews to end at the start at the expand button.
Make the label TextView single line and ellipsize it at the end.
Remove the RelativeLayout and flatten the view hierarchy.
Update background to fix the corners of the ripple effect.
Remove unused drawable xml.

Test: manual (a custom app with a long app name sends a notification)

Fixes: 239066636
Change-Id: I07c82c382138309417e3394574811afb7423c1e7
---
 res/drawable/button_ripple_radius.xml         |  26 -----
 .../notification_history_app_layout.xml       | 108 ++++++++++--------
 2 files changed, 62 insertions(+), 72 deletions(-)
 delete mode 100644 res/drawable/button_ripple_radius.xml

diff --git a/res/drawable/button_ripple_radius.xml b/res/drawable/button_ripple_radius.xml
deleted file mode 100644
index 511520c2866..00000000000
--- a/res/drawable/button_ripple_radius.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  Copyright (C) 2019 The Android Open Source Project
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  -->
-<ripple
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="?android:attr/colorControlHighlight">
-    <item android:id="@android:id/mask">
-        <shape android:shape="rectangle">
-            <solid android:color="@android:color/white" />
-            <corners android:radius="@dimen/rect_button_radius" />
-        </shape>
-    </item>
-</ripple>
\ No newline at end of file
diff --git a/res/layout/notification_history_app_layout.xml b/res/layout/notification_history_app_layout.xml
index 52c0e421408..7d53b4d4142 100644
--- a/res/layout/notification_history_app_layout.xml
+++ b/res/layout/notification_history_app_layout.xml
@@ -21,63 +21,79 @@
     android:layout_height="wrap_content"
     android:orientation="vertical">
 
-    <RelativeLayout
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/app_header"
-        android:layout_height="wrap_content"
         android:layout_width="match_parent"
-        android:clipChildren="true"
-        android:background="@drawable/button_ripple_radius"
+        android:layout_height="wrap_content"
         android:paddingTop="20dp"
-        android:orientation="horizontal"
         android:paddingBottom="18dp"
-        android:paddingStart="16dp">
+        android:paddingStart="16dp"
+        android:background="?android:attr/selectableItemBackground"
+        android:clipChildren="true">
+
         <ImageView
             android:id="@+id/icon"
-            android:layout_height="24dp"
             android:layout_width="24dp"
-            android:layout_gravity="center_vertical|start"
+            android:layout_height="24dp"
             android:layout_marginEnd="14dp"
-            android:layout_centerVertical="true"
-            android:scaleType="centerInside"/>
+            android:scaleType="centerInside"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toStartOf="@id/text_start_guideline"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
 
-        <LinearLayout
+        <androidx.constraintlayout.widget.Guideline
+            android:id="@+id/text_start_guideline"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:id="@+id/text"
-            android:layout_toEndOf="@+id/icon"
-            android:layout_gravity="center_vertical"
-            android:layout_centerVertical="true"
-            android:orientation="vertical">
-            <TextView
-                android:id="@+id/label"
-                android:layout_height="wrap_content"
-                android:layout_width="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Notification.Title"/>
-            <TextView
-                android:id="@+id/count"
-                android:layout_height="wrap_content"
-                android:layout_width="wrap_content"
-                android:layout_gravity="start|center_vertical"
-                android:textDirection="locale"
-                android:paddingTop="4dp"
-                android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Notification"/>
-        </LinearLayout>
+            android:orientation="vertical"
+            app:layout_constraintStart_toEndOf="@id/icon" />
 
-        <include layout="@*android:layout/notification_expand_button"
-                 android:layout_width="wrap_content"
-                 android:layout_height="wrap_content"
-                 android:layout_alignParentEnd="true"
-                 android:layout_centerVertical="true"
-                 android:layout_gravity="center_vertical"
-        />
+        <TextView
+            android:id="@+id/label"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:ellipsize="end"
+            android:lines="1"
+            android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Notification.Title"
+            app:layout_constraintBottom_toTopOf="@id/count"
+            app:layout_constraintEnd_toStartOf="@id/expand_button_wrapper"
+            app:layout_constraintStart_toEndOf="@id/text_start_guideline"
+            app:layout_constraintTop_toTopOf="parent" />
 
-    </RelativeLayout>
+        <TextView
+            android:id="@+id/count"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:paddingTop="4dp"
+            android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Notification"
+            android:textDirection="locale"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toStartOf="@id/expand_button_wrapper"
+            app:layout_constraintStart_toEndOf="@id/text_start_guideline"
+            app:layout_constraintTop_toBottomOf="@id/label" />
+
+        <FrameLayout
+            android:id="@+id/expand_button_wrapper"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent">
+
+            <include
+                layout="@*android:layout/notification_expand_button"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content" />
+
+        </FrameLayout>
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
 
     <View
         android:layout_width="match_parent"
         android:layout_height="1dp"
-        android:background="?android:attr/listDivider"/>
+        android:background="?android:attr/listDivider" />
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/notification_list_wrapper"
@@ -85,20 +101,20 @@
         android:layout_height="wrap_content">
 
         <com.android.settings.notification.history.NotificationHistoryRecyclerView
+            android:id="@+id/notification_list"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:id="@+id/notification_list"
             android:clipChildren="true"
-            android:clipToPadding="true"
             android:clipToOutline="true"
+            android:clipToPadding="true"
             android:importantForAccessibility="yes"
             app:layout_constrainedHeight="true"
-            app:layout_constraintHeight_min="48dp"
-            app:layout_constraintHeight_max="500dp"
-            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHeight_max="500dp"
+            app:layout_constraintHeight_min="48dp"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintBottom_toBottomOf="parent"/>
+            app:layout_constraintTop_toTopOf="parent" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>