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

Merge "Fixed an issue where the messaging layout could appear empty" into pi-dev

Browse Source 
am: 1e543887f5

Change-Id: I0bfda0c9b5700f5d1d27133b0ac9b7d8640d4e60
This commit is contained in:
Selim Cinek
2018-05-01 16:03:28 -07:00
committed by android-build-merger
parent 54715a409f 1e543887f5
commit 9d136e7968
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/com/android/internal/widget/MessagingTextMessage.java
View File

@@ -105,7 +105,7 @@ public class MessagingTextMessage extends ImageFloatingTextView implements Messa
public int getMeasuredType() {
boolean measuredTooSmall = getMeasuredHeight()
< getLayoutHeight() + getPaddingTop() + getPaddingBottom();
if (measuredTooSmall) {
if (measuredTooSmall && getLineCount() <= 1) {
return MEASURED_TOO_SMALL;
} else {
Layout layout = getLayout();

3
core/res/res/layout/notification_template_messaging_group.xml
View File

@@ -42,8 +42,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/notification_text_margin_top"
android:spacing="2dp"
android:layout_weight="1"/>
android:spacing="2dp"/>
</com.android.internal.widget.RemeasuringLinearLayout>
<FrameLayout
android:id="@+id/messaging_group_icon_container"