Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-20 08:39:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix talkback saying meters instead of minutes.

Browse Source
This commit is contained in:
Michelle Tang
2025-12-17 13:20:36 -05:00
committed by jeffrey-signal
parent 942c155723
commit 282a707bf9
20 changed files with 106 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/org/thoughtcrime/securesms/components/ConversationItemFooter.java
View File

@@ -306,16 +306,21 @@ public class ConversationItemFooter extends ConstraintLayout {
long timestamp = (displayMode == ConversationItemDisplayMode.EditHistory.INSTANCE) ? messageRecord.getDateSent() : messageRecord.getTimestamp();
FormattedDate date = DateUtils.getDatelessRelativeTimeSpanFormattedDate(getContext(), locale, timestamp);
String dateLabel = date.getValue();
String dateLabelContentDesc = date.getContentDescValue();
if (displayMode != ConversationItemDisplayMode.Detailed.INSTANCE && messageRecord.isEditMessage() && messageRecord.isLatestRevision()) {
if (date.isNow()) {
dateLabel = getContext().getString(R.string.ConversationItem_edited_now_timestamp_footer);
dateLabelContentDesc = dateLabel;
} else if (date.isRelative()) {
dateLabel = getContext().getString(R.string.ConversationItem_edited_relative_timestamp_footer, date.getValue());
dateLabelContentDesc = getContext().getString(R.string.ConversationItem_edited_relative_timestamp_footer, date.getContentDescValue());
} else {
dateLabel = getContext().getString(R.string.ConversationItem_edited_absolute_timestamp_footer, date.getValue());
dateLabelContentDesc = dateLabel;
}
}
dateView.setText(dateLabel);
dateView.setContentDescription(dateLabelContentDesc);
}
}

3
app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/PrivacySettingsFragment.kt
View File

@@ -168,6 +168,7 @@ class PrivacySettingsFragment : DSLSettingsFragment(R.string.preferences__privac
customPref(
ValueClickPreference(
value = DSLSettingsText.from(ExpirationUtil.getExpirationAbbreviatedDisplayValue(requireContext(), state.universalExpireTimer)),
contentDescription = DSLSettingsText.from(ExpirationUtil.getExpirationDisplayValue(requireContext(), state.universalExpireTimer)),
clickPreference = ClickPreference(
title = DSLSettingsText.from(R.string.PrivacySettingsFragment__default_timer_for_new_changes),
summary = DSLSettingsText.from(R.string.PrivacySettingsFragment__set_a_default_disappearing_message_timer_for_all_new_chats_started_by_you),
@@ -364,6 +365,7 @@ class PrivacySettingsFragment : DSLSettingsFragment(R.string.preferences__privac
private class ValueClickPreference(
val value: DSLSettingsText,
val contentDescription: DSLSettingsText,
val clickPreference: ClickPreference
) : PreferenceModel<ValueClickPreference>(
title = clickPreference.title,
@@ -386,6 +388,7 @@ class PrivacySettingsFragment : DSLSettingsFragment(R.string.preferences__privac
super.bind(model)
clickPreferenceViewHolder.bind(model.clickPreference)
valueText.text = model.value.resolve(context)
valueText.contentDescription = model.contentDescription.resolve(context)
}
}