From d14d72f6d2155e549cd976c688098d0045fefbc5 Mon Sep 17 00:00:00 2001
From: Jeff DeCew <jeffdq@google.com>
Date: Tue, 22 Dec 2020 15:05:25 -0500
Subject: [PATCH] Text gets 2 lines for Standard expanded and BigPicture
 notifications.

Test: manual
Fixes: 175325206
Change-Id: I01c693b1b990b7ac3538eb0a9d1fe3ee77e14c72
---
 ...otification_template_material_big_base.xml |  2 +-
 ...fication_template_material_big_picture.xml |  2 +-
 .../notification_template_text_multiline.xml  | 30 +++++++++++++++++++
 3 files changed, 32 insertions(+), 2 deletions(-)
 create mode 100644 core/res/res/layout/notification_template_text_multiline.xml

diff --git a/core/res/res/layout/notification_template_material_big_base.xml b/core/res/res/layout/notification_template_material_big_base.xml
index 36903fffb26cb..de537b2058665 100644
--- a/core/res/res/layout/notification_template_material_big_base.xml
+++ b/core/res/res/layout/notification_template_material_big_base.xml
@@ -56,7 +56,7 @@
 
                 <include layout="@layout/notification_template_part_line1" />
 
-                <include layout="@layout/notification_template_text" />
+                <include layout="@layout/notification_template_text_multiline" />
 
                 <include
                     android:layout_width="match_parent"
diff --git a/core/res/res/layout/notification_template_material_big_picture.xml b/core/res/res/layout/notification_template_material_big_picture.xml
index 38853c64a3c8f..25d396f94b2c1 100644
--- a/core/res/res/layout/notification_template_material_big_picture.xml
+++ b/core/res/res/layout/notification_template_material_big_picture.xml
@@ -59,7 +59,7 @@
                 android:layout_marginTop="@dimen/notification_progress_margin_top"
                 />
 
-            <include layout="@layout/notification_template_text" />
+            <include layout="@layout/notification_template_text_multiline" />
         </LinearLayout>
 
         <ImageView
diff --git a/core/res/res/layout/notification_template_text_multiline.xml b/core/res/res/layout/notification_template_text_multiline.xml
new file mode 100644
index 0000000000000..d632ac9527d19
--- /dev/null
+++ b/core/res/res/layout/notification_template_text_multiline.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (C) 2020 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
+  -->
+<com.android.internal.widget.ImageFloatingTextView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    style="@style/Widget.DeviceDefault.Notification.Text"
+    android:id="@+id/text"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_gravity="top"
+    android:layout_marginTop="@dimen/notification_text_margin_top"
+    android:minHeight="@dimen/notification_text_height"
+    android:ellipsize="marquee"
+    android:fadingEdge="horizontal"
+    android:gravity="top"
+    android:maxLines="2"
+    android:textAlignment="viewStart"
+    />