chromium/src
0
Fork 0
Code Activity

[Quick Share v2] Quick Share state announced via screenreader

Browse Source 
When Quick Share v2 and screenreader are enabled:
----------------------------------------------
Quick Share state announced on Quick Share quick settings tile focus.
All announcements are "Show Quick Share settings. " +
Quick Share enabled, no high visibility:
"<selected visibility> selected"

Quick Share enabled, high visibility enabled:
"Visible to everyone for <remaining time>"

Quick Share disabled:
"Quick Share disabled"
----------------------------------------------
In Quick Share quick settings detailed dialog, visibility buttons
are announced as checked or unchecked when scrolling over them.

Tested: verified manually via DUT.
Fixed: 396431605
Change-Id: I2258a546f54c8573e76672df4007526aceb2c5c5
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6265358
Reviewed-by: Ahmed Fakhry <afakhry@chromium.org>
Commit-Queue: Brando Socarras <brandosocarras@google.com>
Cr-Commit-Position: refs/heads/main@{#1420754}
This commit is contained in:
Brando Socarras
2025-02-14 14:46:23 -08:00
committed by Chromium LUCI CQ
parent 7a93566588
commit a476d9c480
6 changed files with 43 additions and 5 deletions

9
ash/ash_strings.grd

@ -458,6 +458,15 @@ Style notes:
<message name="IDS_ASH_STATUS_TRAY_NEARBY_SHARE_TILE_TOOLTIP" desc="Quick Share tile tooltip.">
Show Quick Share settings
</message>
<message name="IDS_ASH_STATUS_TRAY_NEARBY_SHARE_TILE_TOOLTIP_ENABLED" desc="Quick Share tile tooltip when enabled.">
Show Quick Share settings. <ph name="visibility">$1<ex>Your devices</ex></ph> visibility selected
</message>
<message name="IDS_ASH_STATUS_TRAY_NEARBY_SHARE_TILE_TOOLTIP_DISABLED" desc="Quick Share tile tooltip when disabled.">
Show Quick Share settings. Quick Share disabled
</message>
<message name="IDS_ASH_STATUS_TRAY_NEARBY_SHARE_TILE_TOOLTIP_HIGH_VISIBILITY" desc="Quick Share tile tooltip when device is in high visibility.">
Show Quick Share settings. Visible to everyone for <ph name="time_remaining">$1<ex>10 min</ex></ph>
</message>
<message name="IDS_ASH_STATUS_TRAY_NEARBY_SHARE_DETAILED_VIEW_SETTINGS_BUTTON_TOOLTIP" desc="Settings button tooltip.">
Quick Share settings
</message>

1
ash/ash_strings_grd/IDS_ASH_STATUS_TRAY_NEARBY_SHARE_TILE_TOOLTIP_DISABLED.png.sha1 Normal file

@ -0,0 +1 @@
6d63d57407386112e45a4d679e09dfc505c40a6a

1
ash/ash_strings_grd/IDS_ASH_STATUS_TRAY_NEARBY_SHARE_TILE_TOOLTIP_ENABLED.png.sha1 Normal file

@ -0,0 +1 @@
e95a817f8222ddcc3099d177b272e6869a23f92b

1
ash/ash_strings_grd/IDS_ASH_STATUS_TRAY_NEARBY_SHARE_TILE_TOOLTIP_HIGH_VISIBILITY.png.sha1 Normal file

@ -0,0 +1 @@
ed7a36aaef06c039d92d0b1ff5c7e5942c2d17d6

8
ash/system/nearby_share/nearby_share_detailed_view_impl.cc

@ -55,6 +55,8 @@ void FormatVisibilityRow(ash::HoverHighlightView* visibility_row,
/*color_id=*/cros_tokens::kCrosSysOnSurface),
20);
visibility_row->SetRightViewVisible(false);
visibility_row->SetAccessibilityState(
ash::HoverHighlightView::AccessibilityState::UNCHECKED_CHECKBOX);
visibility_row->SetEnabled(is_row_enabled);
}
@ -439,14 +441,20 @@ void NearbyShareDetailedViewImpl::SetCheckCircle(
case ::nearby_share::mojom::Visibility::kYourDevices:
CHECK(your_devices_row_);
your_devices_row_->SetRightViewVisible(true);
your_devices_row_->SetAccessibilityState(
HoverHighlightView::AccessibilityState::CHECKED_CHECKBOX);
break;
case ::nearby_share::mojom::Visibility::kAllContacts:
CHECK(contacts_row_);
contacts_row_->SetRightViewVisible(true);
contacts_row_->SetAccessibilityState(
HoverHighlightView::AccessibilityState::CHECKED_CHECKBOX);
break;
case ::nearby_share::mojom::Visibility::kNoOne:
CHECK(hidden_row_);
hidden_row_->SetRightViewVisible(true);
hidden_row_->SetAccessibilityState(
HoverHighlightView::AccessibilityState::CHECKED_CHECKBOX);
break;
default:
break;

28
ash/system/nearby_share/nearby_share_feature_pod_controller.cc

@ -4,6 +4,8 @@
#include "ash/system/nearby_share/nearby_share_feature_pod_controller.h"
#include <string>
#include "ash/constants/quick_settings_catalogs.h"
#include "ash/public/cpp/nearby_share_delegate.h"
#include "ash/resources/vector_icons/vector_icons.h"
@ -107,9 +109,6 @@ std::unique_ptr<FeatureTile> NearbyShareFeaturePodController::CreateTile(
base::BindRepeating(&NearbyShareFeaturePodController::OnIconPressed,
weak_ptr_factory_.GetWeakPtr()));
tile_->SetTooltipText(l10n_util::GetStringUTF16(
IDS_ASH_STATUS_TRAY_NEARBY_SHARE_TILE_TOOLTIP));
// Set tile appearance.
UpdateQSv2Button();
} else {
@ -239,10 +238,15 @@ void NearbyShareFeaturePodController::ToggleTileOn() {
tile_->SetIconButtonTooltipText(IconTooltipString(/*is_enabled=*/true));
tile_->SetToggled(true);
const std::u16string remaining_time_string =
RemainingTimeString(RemainingHighVisibilityTime());
if (nearby_share_delegate_->IsHighVisibilityOn()) {
tile_->SetSubLabel(l10n_util::GetStringFUTF16(
IDS_ASH_STATUS_TRAY_NEARBY_SHARE_TILE_ON_STATE,
RemainingTimeString(RemainingHighVisibilityTime())));
IDS_ASH_STATUS_TRAY_NEARBY_SHARE_TILE_ON_STATE, remaining_time_string));
tile_->SetTooltipText(l10n_util::GetStringFUTF16(
IDS_ASH_STATUS_TRAY_NEARBY_SHARE_TILE_TOOLTIP_HIGH_VISIBILITY,
remaining_time_string));
return;
}
@ -250,14 +254,26 @@ void NearbyShareFeaturePodController::ToggleTileOn() {
case ::nearby_share::mojom::Visibility::kYourDevices:
tile_->SetSubLabel(l10n_util::GetStringUTF16(
IDS_ASH_STATUS_TRAY_NEARBY_SHARE_TILE_LABEL_YOUR_DEVICES));
tile_->SetTooltipText(l10n_util::GetStringFUTF16(
IDS_ASH_STATUS_TRAY_NEARBY_SHARE_TILE_TOOLTIP_ENABLED,
l10n_util::GetStringUTF16(
IDS_ASH_STATUS_TRAY_NEARBY_SHARE_TILE_LABEL_YOUR_DEVICES)));
break;
case ::nearby_share::mojom::Visibility::kAllContacts:
tile_->SetSubLabel(l10n_util::GetStringUTF16(
IDS_ASH_STATUS_TRAY_NEARBY_SHARE_TILE_LABEL_CONTACTS));
tile_->SetTooltipText(l10n_util::GetStringFUTF16(
IDS_ASH_STATUS_TRAY_NEARBY_SHARE_TILE_TOOLTIP_ENABLED,
l10n_util::GetStringUTF16(
IDS_ASH_STATUS_TRAY_NEARBY_SHARE_TILE_LABEL_CONTACTS)));
break;
case ::nearby_share::mojom::Visibility::kNoOne:
tile_->SetSubLabel(l10n_util::GetStringUTF16(
IDS_ASH_STATUS_TRAY_NEARBY_SHARE_TILE_LABEL_HIDDEN));
tile_->SetTooltipText(l10n_util::GetStringFUTF16(
IDS_ASH_STATUS_TRAY_NEARBY_SHARE_TILE_TOOLTIP_ENABLED,
l10n_util::GetStringUTF16(
IDS_ASH_STATUS_TRAY_NEARBY_SHARE_TILE_LABEL_HIDDEN)));
break;
default:
break;
@ -275,6 +291,8 @@ void NearbyShareFeaturePodController::ToggleTileOff() {
tile_->SetIconButtonTooltipText(IconTooltipString(/*is_enabled=*/false));
tile_->SetSubLabel(l10n_util::GetStringUTF16(
IDS_ASH_STATUS_TRAY_NEARBY_SHARE_TILE_LABEL_OFF));
tile_->SetTooltipText(l10n_util::GetStringUTF16(
IDS_ASH_STATUS_TRAY_NEARBY_SHARE_TILE_TOOLTIP_DISABLED));
}
base::TimeDelta NearbyShareFeaturePodController::RemainingHighVisibilityTime()