0

CloseAll: Fix accessibility strings

This CL edits the accessibility announcements to reflect the new
behavior introduced in CloseAll and adds an announcement for when Undo
is performed.

Fixed: 1329563
Change-Id: I792ef6eae42bae58c059726fb3b5963e1510a6ac
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3692681
Commit-Queue: Ben Becker <benbecker@chromium.org>
Reviewed-by: Ahmed Fakhry <afakhry@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1012555}
This commit is contained in:
Ben Becker
2022-06-09 16:52:55 +00:00
committed by Chromium LUCI CQ
parent 8967bfef5e
commit 462f19186c
3 changed files with 17 additions and 5 deletions

@ -1978,6 +1978,9 @@ This file contains the strings for ash.
<message name="IDS_ASH_DESKS_CLOSE_ALL_UNDO_TEXT" desc="Label for the undo button in the close-all toast.">
Undo
</message>
<message name="IDS_ASH_DESKS_CLOSE_ALL_UNDONE_NOTIFICATION" desc="ChromeVox announcement that is read when the user presses the button to undo desk removal.">
Desk and windows reopened
</message>
<!-- Status tray charging strings. -->
<message name="IDS_ASH_STATUS_TRAY_LOW_POWER_CHARGER_TITLE" desc="The title of a notification indicating that a low-current USB charger has been connected.">

@ -0,0 +1 @@
a0c95f7a719ec4b1ba63a3fd379529aeb42eb939

@ -1624,11 +1624,14 @@ void DesksController::RemoveDeskInternal(const Desk* desk,
UMA_HISTOGRAM_ENUMERATION(kRemoveDeskHistogramName, source);
UMA_HISTOGRAM_ENUMERATION(kRemoveDeskTypeHistogramName, close_type);
Shell::Get()
->accessibility_controller()
->TriggerAccessibilityAlertWithMessage(l10n_util::GetStringFUTF8(
IDS_ASH_VIRTUAL_DESKS_ALERT_DESK_REMOVED, removed_desk->name(),
active_desk_->name()));
// We should only announce desks are being merged if we are combining desks.
if (close_type == DeskCloseType::kCombineDesks) {
Shell::Get()
->accessibility_controller()
->TriggerAccessibilityAlertWithMessage(l10n_util::GetStringFUTF8(
IDS_ASH_VIRTUAL_DESKS_ALERT_DESK_REMOVED, removed_desk->name(),
active_desk_->name()));
}
desks_restore_util::UpdatePrimaryUserDeskNamesPrefs();
desks_restore_util::UpdatePrimaryUserDeskMetricsPrefs();
@ -1678,6 +1681,11 @@ void DesksController::UndoDeskRemoval() {
AppendWindowsToOverview(readded_desk_ptr->windows());
}
Shell::Get()
->accessibility_controller()
->TriggerAccessibilityAlertWithMessage(l10n_util::GetStringUTF8(
IDS_ASH_DESKS_CLOSE_ALL_UNDONE_NOTIFICATION));
UpdateDesksDefaultNames();
}