Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Set max width on sender/group name too" into rvc-dev am: 0d07c9ac52

Browse Source 
Change-Id: I030523c49fac1b594ced4597a2aa7d5c4609cff4
This commit is contained in:
TreeHugger Robot
2020-05-29 21:47:49 +00:00
committed by Automerger Merge Worker
parent 7a4f041cc0 0d07c9ac52
commit 6a68dfc8aa
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/res/layout/bubble_flyout.xml
View File

@@ -47,6 +47,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:fontFamily="@*android:string/config_bodyFontFamilyMedium" android:fontFamily="@*android:string/config_bodyFontFamilyMedium"
android:maxLines="1" android:maxLines="1"
android:ellipsize="end"
android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body2"/> android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body2"/>
<TextView <TextView
@@ -55,6 +56,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:fontFamily="@*android:string/config_bodyFontFamily" android:fontFamily="@*android:string/config_bodyFontFamily"
android:maxLines="2" android:maxLines="2"
android:ellipsize="end"
android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body2"/> android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body2"/>
</LinearLayout> </LinearLayout>

7
packages/SystemUI/src/com/android/systemui/bubbles/BubbleFlyoutView.java
View File

@@ -230,8 +230,12 @@ public class BubbleFlyoutView extends FrameLayout {
mSenderText.setTranslationX(0); mSenderText.setTranslationX(0);
} }
final int maxTextViewWidth =
(int) (parentWidth * FLYOUT_MAX_WIDTH_PERCENT) - mFlyoutPadding * 2;
// Name visibility // Name visibility
if (!TextUtils.isEmpty(flyoutMessage.senderName)) { if (!TextUtils.isEmpty(flyoutMessage.senderName)) {
mSenderText.setMaxWidth(maxTextViewWidth);
mSenderText.setText(flyoutMessage.senderName); mSenderText.setText(flyoutMessage.senderName);
mSenderText.setVisibility(VISIBLE); mSenderText.setVisibility(VISIBLE);
} else { } else {
@@ -248,8 +252,7 @@ public class BubbleFlyoutView extends FrameLayout {
// Set the flyout TextView's max width in terms of percent, and then subtract out the // Set the flyout TextView's max width in terms of percent, and then subtract out the
// padding so that the entire flyout view will be the desired width (rather than the // padding so that the entire flyout view will be the desired width (rather than the
// TextView being the desired width + extra padding). // TextView being the desired width + extra padding).
mMessageText.setMaxWidth( mMessageText.setMaxWidth(maxTextViewWidth);
(int) (parentWidth * FLYOUT_MAX_WIDTH_PERCENT) - mFlyoutPadding * 2);
mMessageText.setText(flyoutMessage.message); mMessageText.setText(flyoutMessage.message);
// Wait for the TextView to lay out so we know its line count. // Wait for the TextView to lay out so we know its line count.