mirror of
https://github.com/signalapp/Signal-Android.git
synced 2025-12-23 04:28:35 +00:00
Collapse timestamps on "deleted" messages.
This commit is contained in:
committed by
Greyson Parrelli
parent
b58cede072
commit
fec4a7692d
@@ -390,7 +390,9 @@ public final class ConversationItem extends RelativeLayout implements BindableCo
|
||||
int defaultBottomMargin = readDimen(R.dimen.message_bubble_bottom_padding);
|
||||
int collapsedBottomMargin = readDimen(R.dimen.message_bubble_collapsed_bottom_padding);
|
||||
if (!updatingFooter &&
|
||||
!isCaptionlessMms(messageRecord) &&
|
||||
!hasOnlyThumbnail(messageRecord) &&
|
||||
!hasSticker(messageRecord) &&
|
||||
!hasSharedContact(messageRecord) &&
|
||||
!isViewOnceMessage(messageRecord) &&
|
||||
!hasAudio(messageRecord) &&
|
||||
isFooterVisible(messageRecord, nextMessageRecord, groupThread) &&
|
||||
@@ -499,7 +501,7 @@ public final class ConversationItem extends RelativeLayout implements BindableCo
|
||||
|
||||
private int getMaxBubbleWidth() {
|
||||
int paddings = getPaddingLeft() + getPaddingRight() + ViewUtil.getLeftMargin(bodyBubble) + ViewUtil.getRightMargin(bodyBubble);
|
||||
if (groupThread && !messageRecord.isOutgoing()) {
|
||||
if (groupThread && !messageRecord.isOutgoing() && !messageRecord.isRemoteDelete()) {
|
||||
paddings += contactPhoto.getLayoutParams().width + ViewUtil.getLeftMargin(contactPhoto) + ViewUtil.getRightMargin(contactPhoto);
|
||||
}
|
||||
return getMeasuredWidth() - paddings;
|
||||
|
||||
Reference in New Issue
Block a user