chromium/src
0
Fork 0
Code Activity

Update calendar up/down button titles in the event list mode

Browse Source 
Currently we display "Show next/previous month" text in both modes. But
in fact, in the event list mode those buttons change weeks, not months.

BUG=chromium:1295361

Change-Id: I7a4f2183d25bdb2720cc7363840d89964c632655
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3638824
Reviewed-by: Alex Newcomer <newcomer@chromium.org>
Reviewed-by: Jiaming Cheng <jiamingc@chromium.org>
Commit-Queue: Artsiom Mitrokhin <amitrokhin@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1002123}
This commit is contained in:
Artsiom Mitrokhin
2022-05-11 16:03:59 +00:00
committed by Chromium LUCI CQ
parent 0fd8354344
commit d61d1fe2ba
4 changed files with 20 additions and 0 deletions

8
ash/ash_strings.grd

@ -3467,10 +3467,18 @@ This file contains the strings for ash.
Show previous month
</message>
<message name="IDS_ASH_CALENDAR_UP_BUTTON_EVENT_LIST_ACCESSIBLE_DESCRIPTION" desc="The accessible/tooltip description of the calendar up button in the event list mode.">
Show previous week
</message>
<message name="IDS_ASH_CALENDAR_DOWN_BUTTON_ACCESSIBLE_DESCRIPTION" desc="The accessible/tooltip description of the calendar down button.">
Show next month
</message>
<message name="IDS_ASH_CALENDAR_DOWN_BUTTON_EVENT_LIST_ACCESSIBLE_DESCRIPTION" desc="The accessible/tooltip description of the calendar down button in the event list mode.">
Show next week
</message>
<message name="IDS_ASH_CALENDAR_INFO_BUTTON_ACCESSIBLE_DESCRIPTION" desc="The accessible description of the calendar today's button.">
Today <ph name="today_date">$1<ex>August 31, 2021</ex></ph>
</message>

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

@ -0,0 +1 @@
3f1c3372440ef89ae3ae2fc41fe4d915a96ec0e1

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

@ -0,0 +1 @@
150e80472525c2ec525f7dc77104116d7bee32f0

10
ash/system/time/calendar_view.cc

@ -1562,12 +1562,22 @@ void CalendarView::OnOpenEventListAnimationComplete() {
next_next_month_->DisableFocus();
content_view_->SetFocusBehavior(FocusBehavior::ALWAYS);
}
up_button_->SetTooltipText(l10n_util::GetStringUTF16(
IDS_ASH_CALENDAR_UP_BUTTON_EVENT_LIST_ACCESSIBLE_DESCRIPTION));
down_button_->SetTooltipText(l10n_util::GetStringUTF16(
IDS_ASH_CALENDAR_DOWN_BUTTON_EVENT_LIST_ACCESSIBLE_DESCRIPTION));
}
void CalendarView::OnCloseEventListAnimationComplete() {
RemoveChildViewT(event_list_view_);
event_list_view_ = nullptr;
calendar_view_controller_->OnEventListClosed();
up_button_->SetTooltipText(l10n_util::GetStringUTF16(
IDS_ASH_CALENDAR_UP_BUTTON_ACCESSIBLE_DESCRIPTION));
down_button_->SetTooltipText(l10n_util::GetStringUTF16(
IDS_ASH_CALENDAR_DOWN_BUTTON_ACCESSIBLE_DESCRIPTION));
}
BEGIN_METADATA(CalendarView, views::View)