Skip to content

GitLab

T
tangled
Commit cdc6f428 authored by Yue Li's avatar Yue Li Committed by Commit Bot
Browse files
Options

Quick Answers: Move more A11y strings into grd file 

Bug: b/149758492
Test: Manual Test
Change-Id: I66fe3baa162659f22ae4e756ac364861d60f12b2
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2516390
Commit-Queue: Yue Li <updowndota@chromium.org>
Reviewed-by: default avatarXiyuan Xia <xiyuan@chromium.org>
Cr-Commit-Position: refs/heads/master@{#823752}
parent 82064acd
Hide whitespace changes
Inline Side-by-side
Showing with 52 additions and 28 deletions
ash/ash_strings.grd
View file @ cdc6f428
......@@ -2891,6 +2891,30 @@ Here are some things you can try to get started.
<message name="IDS_ASH_QUICK_ANSWERS_USER_NOTICE_VIEW_A11Y_INFO_DESC_TEMPLATE" desc="A11y description template for the Quick Answers user notice view.">
<ph name="DESC_TEXT">$1<ex>With a right-click or a long press, Assistant shows info such as the definition, translation or unit conversion for your selection.</ex></ph> Use Left or Right arrow keys to manage this feature.
</message>
<message name="IDS_ASH_QUICK_ANSWERS_VIEW_LOADING" desc="Display text when the Quick Answers view is loading.">
Loading...
</message>
<message name="IDS_ASH_QUICK_ANSWERS_VIEW_NETWORK_ERROR" desc="Display text when network error occurs in the Quick Answers view.">
Cannot connect to internet.
</message>
<message name="IDS_ASH_QUICK_ANSWERS_VIEW_RETRY" desc="Display text when the Quick Answers view is retry.">
Retry
</message>
<message name="IDS_ASH_QUICK_ANSWERS_VIEW_A11Y_INFO_ALERT_TEXT" desc="A11y alert text for the Quick Answers view.">
Info related to your selection available. Use Up arrow key to access.
</message>
<message name="IDS_ASH_QUICK_ANSWERS_VIEW_A11Y_INFO_DESC_TEMPLATE" desc="A11y description template for the Quick Answers view.">
<ph name="DESC_TEXT">$1<ex>Query texts</ex></ph>; Click the dialog to see result in Assistant.
</message>
<message name="IDS_ASH_QUICK_ANSWERS_VIEW_A11Y_NAME_TEXT" desc="A11y name text for the Quick Answers view.">
Info related to your selection
</message>
<message name="IDS_ASH_QUICK_ANSWERS_VIEW_A11Y_RETRY_LABEL_DESC" desc="A11y retry label description for the Quick Answers view.">
Cannot connect to the internet. Click to try again.
</message>
<message name="IDS_ASH_QUICK_ANSWERS_VIEW_A11Y_RETRY_LABEL_NAME_TEMPLATE" desc="A11y retry label name template for the Quick Answers view.">
<ph name="DESC_TEXT">$1<ex>Cannot connect to the internet. Click to try again.</ex></ph>: Retry
</message>
<!-- Media Notification -->
<message name="IDS_ASH_MEDIA_NOTIFICATION_ACTION_PREVIOUS_TRACK" desc="The button to trigger media playback to go to the previous track.">
......
ash/ash_strings_grd/IDS_ASH_QUICK_ANSWERS_VIEW_A11Y_INFO_ALERT_TEXT.png.sha1 0 → 100644
View file @ cdc6f428
f84d1c5b4a95681de2f200c338b9c3f4a04e57c8
\ No newline at end of file
ash/ash_strings_grd/IDS_ASH_QUICK_ANSWERS_VIEW_A11Y_INFO_DESC_TEMPLATE.png.sha1 0 → 100644
View file @ cdc6f428
a54a9781638401dc399f5aa506d1db54944abda7
\ No newline at end of file
ash/ash_strings_grd/IDS_ASH_QUICK_ANSWERS_VIEW_A11Y_NAME_TEXT.png.sha1 0 → 100644
View file @ cdc6f428
a54a9781638401dc399f5aa506d1db54944abda7
\ No newline at end of file
ash/ash_strings_grd/IDS_ASH_QUICK_ANSWERS_VIEW_A11Y_RETRY_LABEL_DESC.png.sha1 0 → 100644
View file @ cdc6f428
73b923c3df266a2b4aaa45053e96e0663a1d1bee
\ No newline at end of file
ash/ash_strings_grd/IDS_ASH_QUICK_ANSWERS_VIEW_A11Y_RETRY_LABEL_NAME_TEMPLATE.png.sha1 0 → 100644
View file @ cdc6f428
73b923c3df266a2b4aaa45053e96e0663a1d1bee
\ No newline at end of file
ash/ash_strings_grd/IDS_ASH_QUICK_ANSWERS_VIEW_LOADING.png.sha1 0 → 100644
View file @ cdc6f428
3233246718c54ce2806f0b698326ffcc229b3c7d
\ No newline at end of file
ash/ash_strings_grd/IDS_ASH_QUICK_ANSWERS_VIEW_NETWORK_ERROR.png.sha1 0 → 100644
View file @ cdc6f428
a1fe5e969ddcc39a7cdf9101a788ec1c80d2704b
\ No newline at end of file
ash/ash_strings_grd/IDS_ASH_QUICK_ANSWERS_VIEW_RETRY.png.sha1 0 → 100644
View file @ cdc6f428
a1fe5e969ddcc39a7cdf9101a788ec1c80d2704b
\ No newline at end of file
ash/quick_answers/ui/quick_answers_view.cc
View file @ cdc6f428
......@@ -61,27 +61,11 @@ constexpr int kLineHeightDip = 20;
// Spacing between labels in the horizontal elements view.
constexpr int kLabelSpacingDip = 2;
// TODO(llin): Move to grd after confirming specs (b/149758492).
constexpr char kDefaultLoadingStr[] = "Loading...";
constexpr char kDefaultRetryStr[] = "Retry";
constexpr char kNetworkErrorStr[] = "Cannot connect to internet.";
// Dogfood button.
constexpr int kDogfoodButtonMarginDip = 4;
constexpr int kDogfoodButtonSizeDip = 20;
constexpr SkColor kDogfoodButtonColor = gfx::kGoogleGrey500;
// Accessibility.
// TODO(siabhijeet): Move to grd (tracked in b/149758492).
constexpr char kA11yAlertAnnouncement[] =
"Info related to your selection available. Use Up arrow key to access.";
constexpr char kA11yNameText[] = "Info related to your selection";
constexpr char kA11yDescTemplate[] =
"%s; Click the dialog to see result in Assistant.";
constexpr char kA11yRetryLabelNameTemplate[] = "%s: Retry";
constexpr char kA11yRetryLabelDesc[] =
"Cannot connect to the internet. Click to try again.";
// Maximum height QuickAnswersView can expand to.
int MaximumViewHeight() {
return kMainViewInsets.height() + kContentViewInsets.height() +
......@@ -199,7 +183,8 @@ void QuickAnswersView::GetAccessibleNodeData(ui::AXNodeData* node_data) {
}
node_data->role = ax::mojom::Role::kDialog;
node_data->SetName(kA11yNameText);
node_data->SetName(
l10n_util::GetStringUTF8(IDS_ASH_QUICK_ANSWERS_VIEW_A11Y_NAME_TEXT));
}
std::vector<views::View*> QuickAnswersView::GetFocusableViews() {
......@@ -260,8 +245,9 @@ void QuickAnswersView::ShowRetryView() {
// Add error label.
std::vector<std::unique_ptr<QuickAnswerUiElement>> description_labels;
description_labels.push_back(
std::make_unique<QuickAnswerText>(kNetworkErrorStr, gfx::kGoogleGrey700));
description_labels.push_back(std::make_unique<QuickAnswerText>(
l10n_util::GetStringUTF8(IDS_ASH_QUICK_ANSWERS_VIEW_NETWORK_ERROR),
gfx::kGoogleGrey700));
auto* description_container =
AddHorizontalUiElements(description_labels, content_view_);
......@@ -270,13 +256,16 @@ void QuickAnswersView::ShowRetryView() {
description_container->AddChildView(std::make_unique<views::LabelButton>(
base::BindRepeating(&QuickAnswersUiController::OnRetryLabelPressed,
base::Unretained(controller_)),
base::UTF8ToUTF16(kDefaultRetryStr)));
l10n_util::GetStringUTF16(IDS_ASH_QUICK_ANSWERS_VIEW_RETRY)));
retry_label_->SetEnabledTextColors(gfx::kGoogleBlue600);
retry_label_->SetRequestFocusOnPress(true);
SetButtonNotifyActionToOnPress(retry_label_);
retry_label_->SetAccessibleName(base::UTF8ToUTF16(
base::StringPrintf(kA11yRetryLabelNameTemplate, kA11yNameText)));
retry_label_->GetViewAccessibility().OverrideDescription(kA11yRetryLabelDesc);
retry_label_->SetAccessibleName(l10n_util::GetStringFUTF16(
IDS_ASH_QUICK_ANSWERS_VIEW_A11Y_RETRY_LABEL_NAME_TEMPLATE,
l10n_util::GetStringUTF16(IDS_ASH_QUICK_ANSWERS_VIEW_A11Y_NAME_TEXT)));
retry_label_->GetViewAccessibility().OverrideDescription(
l10n_util::GetStringUTF8(
IDS_ASH_QUICK_ANSWERS_VIEW_A11Y_RETRY_LABEL_DESC));
}
void QuickAnswersView::AddAssistantIcon() {
......@@ -328,7 +317,9 @@ void QuickAnswersView::InitLayout() {
views::BoxLayout::Orientation::kVertical, kContentViewInsets,
kLineSpacingDip));
AddTextElement({title_}, content_view_);
AddTextElement({kDefaultLoadingStr, gfx::kGoogleGrey700}, content_view_);
AddTextElement({l10n_util::GetStringUTF8(IDS_ASH_QUICK_ANSWERS_VIEW_LOADING),
gfx::kGoogleGrey700},
content_view_);
// Add dogfood button, if in dogfood.
if (chromeos::features::IsQuickAnswersDogfood())
......@@ -412,8 +403,9 @@ void QuickAnswersView::UpdateQuickAnswerResult(
// Update answer announcement.
auto* answer_label =
static_cast<Label*>(first_answer_view->children().front());
GetViewAccessibility().OverrideDescription(base::StringPrintf(
kA11yDescTemplate, base::UTF16ToUTF8(answer_label->GetText()).c_str()));
GetViewAccessibility().OverrideDescription(l10n_util::GetStringFUTF8(
IDS_ASH_QUICK_ANSWERS_VIEW_A11Y_INFO_DESC_TEMPLATE,
answer_label->GetText()));
}
// Add second row answer.
......@@ -436,8 +428,8 @@ void QuickAnswersView::UpdateQuickAnswerResult(
RequestFocus();
} else {
// Announce that a Quick Answer is available.
GetViewAccessibility().AnnounceText(
base::UTF8ToUTF16(kA11yAlertAnnouncement));
GetViewAccessibility().AnnounceText(l10n_util::GetStringUTF16(
IDS_ASH_QUICK_ANSWERS_VIEW_A11Y_INFO_ALERT_TEXT));
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment