summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Sergey Serokurov <serokurov@google.com> 2021-11-04 23:40:47 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2021-11-04 23:40:47 +0000
commit76fa9af431015fa297af1a94e8c8538e8e1a401c (patch)
tree8903a5eec5415557a2b6a1328d25bcdf11f664f4
parentd1695232367e52b28c11f93c3adfeddec6de0607 (diff)
parent34ba68727c50c92b21458148fb468eb2d9da9ae5 (diff)
Merge "In overflow view, set bubble name TextView width to a fixed value" into sc-v2-dev am: 34ba68727c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16187196 Change-Id: I8c6513ef6f28ada491d79fe4276e593d533413e7
-rw-r--r--libs/WindowManager/Shell/res/layout/bubble_overflow_view.xml2
-rw-r--r--libs/WindowManager/Shell/res/values/dimen.xml2
2 files changed, 3 insertions, 1 deletions
diff --git a/libs/WindowManager/Shell/res/layout/bubble_overflow_view.xml b/libs/WindowManager/Shell/res/layout/bubble_overflow_view.xml
index 544b731bb550..05b15060946d 100644
--- a/libs/WindowManager/Shell/res/layout/bubble_overflow_view.xml
+++ b/libs/WindowManager/Shell/res/layout/bubble_overflow_view.xml
@@ -32,7 +32,7 @@
android:id="@+id/bubble_view_name"
android:textAppearance="@*android:style/TextAppearance.DeviceDefault.ListItem"
android:textSize="13sp"
- android:layout_width="wrap_content"
+ android:layout_width="@dimen/bubble_name_width"
android:layout_height="wrap_content"
android:maxLines="1"
android:lines="2"
diff --git a/libs/WindowManager/Shell/res/values/dimen.xml b/libs/WindowManager/Shell/res/values/dimen.xml
index 11bb4e92bfdb..e9b9ec3f7d89 100644
--- a/libs/WindowManager/Shell/res/values/dimen.xml
+++ b/libs/WindowManager/Shell/res/values/dimen.xml
@@ -115,6 +115,8 @@
<dimen name="bubble_spacing">3dp</dimen>
<!-- Size of the bubble. -->
<dimen name="bubble_size">60dp</dimen>
+ <!-- Width of bubble name view -->
+ <dimen name="bubble_name_width">90dp</dimen>
<!-- Size of the badge shown on the bubble. -->
<dimen name="bubble_badge_size">24dp</dimen>
<!-- Extra padding added to the touchable rect for bubbles so they are easier to grab. -->