From a75a708bd643534773c9b5e8bd1447670a7a58dc Mon Sep 17 00:00:00 2001
From: Lyn Han <lynhan@google.com>
Date: Tue, 5 May 2020 14:10:16 -0700
Subject: [PATCH] Overflow labels: two lines with ellipsis

Increase overflow height by 20dp to adjust for label heights.

Fixes: 155497429
Test: manual
Change-Id: I3545a6408b586348bdde20e5183baea3f6fb60c3
---
 packages/SystemUI/res/layout/bubble_overflow_view.xml | 2 ++
 packages/SystemUI/res/values/dimens.xml               | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/SystemUI/res/layout/bubble_overflow_view.xml b/packages/SystemUI/res/layout/bubble_overflow_view.xml
index 88a05ec5824a7..1ed1f07fb2777 100644
--- a/packages/SystemUI/res/layout/bubble_overflow_view.xml
+++ b/packages/SystemUI/res/layout/bubble_overflow_view.xml
@@ -36,6 +36,8 @@
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:maxLines="1"
+        android:lines="2"
+        android:ellipsize="end"
         android:layout_gravity="center"
         android:paddingTop="@dimen/bubble_overflow_text_padding"
         android:gravity="center"/>
diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml
index 2c2e7244ce2ed..47ffc4b659464 100644
--- a/packages/SystemUI/res/values/dimens.xml
+++ b/packages/SystemUI/res/values/dimens.xml
@@ -1168,7 +1168,7 @@
     <!-- Default (and minimum) height of the expanded view shown when the bubble is expanded -->
     <dimen name="bubble_expanded_default_height">180dp</dimen>
     <!-- Default height of bubble overflow -->
-    <dimen name="bubble_overflow_height">460dp</dimen>
+    <dimen name="bubble_overflow_height">480dp</dimen>
     <!-- Bubble overflow padding when there are no bubbles  -->
     <dimen name="bubble_overflow_empty_state_padding">16dp</dimen>
     <!-- Padding of container for overflow bubbles -->