From 07e8ae716c3233f62de59b409d0c2f017f9ebb16 Mon Sep 17 00:00:00 2001 From: Greyson Parrelli Date: Tue, 22 May 2018 13:56:02 -0400 Subject: [PATCH] Fix EmojiTextView regression. Using the singleLine attribute will make the TextView report that the lineCount is always 1, regardless of actual text length. This breaks our manual ellipsize calculation. Because you can't actually read the singleLine attribute at runtime, I've switched relevant usages of singleLine to use maxLines=1 (relevant usages are EmojiTextViews where singleLine was set and ellipsize was set to 'end'). Fixes #7744 --- res/layout/conversation_list_item_view.xml | 4 ++-- res/layout/conversation_title_view.xml | 4 ++-- res/layout/recipient_filter_item.xml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/res/layout/conversation_list_item_view.xml b/res/layout/conversation_list_item_view.xml index 91685ae3a..39c98f42f 100644 --- a/res/layout/conversation_list_item_view.xml +++ b/res/layout/conversation_list_item_view.xml @@ -51,7 +51,7 @@ android:layout_toStartOf="@+id/thumbnail" android:textAppearance="?android:attr/textAppearanceMedium" android:textColor="?attr/conversation_list_item_contact_color" - android:singleLine="true" + android:maxLines="1" tools:text="Jules Bonnot" android:ellipsize="end" android:layout_marginBottom="2dp" @@ -84,7 +84,7 @@ android:textAppearance="?android:attr/textAppearanceSmall" android:textColor="?attr/conversation_list_item_subject_color" android:fontFamily="sans-serif-light" - android:singleLine="true" + android:maxLines="1" tools:text="Wheels arrive at 3pm flat. This is a somewhat longer message." android:ellipsize="end" /> diff --git a/res/layout/conversation_title_view.xml b/res/layout/conversation_title_view.xml index 6e474a4e8..3f1d6bb86 100644 --- a/res/layout/conversation_title_view.xml +++ b/res/layout/conversation_title_view.xml @@ -50,7 +50,7 @@ android:id="@+id/title" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:singleLine="true" + android:maxLines="1" android:ellipsize="end" android:textSize="18dp" android:transitionName="recipient_name" @@ -80,7 +80,7 @@ android:id="@+id/subtitle" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:singleLine="true" + android:maxLines="1" android:ellipsize="end" android:layout_gravity="center_vertical|start" android:gravity="center_vertical" diff --git a/res/layout/recipient_filter_item.xml b/res/layout/recipient_filter_item.xml index 4891ba185..4f5f49cd9 100644 --- a/res/layout/recipient_filter_item.xml +++ b/res/layout/recipient_filter_item.xml @@ -35,7 +35,7 @@ style="?android:attr/dropDownItemStyle" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:singleLine="true" + android:maxLines="1" />