diff --git a/src/CalcViewModel/Common/Automation/NarratorAnnouncement.cpp b/src/CalcViewModel/Common/Automation/NarratorAnnouncement.cpp index 9751c7d..35a8a69 100644 --- a/src/CalcViewModel/Common/Automation/NarratorAnnouncement.cpp +++ b/src/CalcViewModel/Common/Automation/NarratorAnnouncement.cpp @@ -30,6 +30,7 @@ namespace CalculatorApp::ViewModel::Common::Automation StringReference GraphViewBestFitChanged(L"GraphViewBestFitChanged"); StringReference AlwaysOnTop(L"AlwaysOnTop"); StringReference BitShiftRadioButtonContent(L"BitShiftRadioButtonContent"); + StringReference SettingsPageOpened(L"SettingsPageOpened"); } } @@ -204,3 +205,12 @@ NarratorAnnouncement ^ CalculatorAnnouncement::GetBitShiftRadioButtonCheckedAnno AutomationNotificationKind::ActionCompleted, AutomationNotificationProcessing::ImportantMostRecent); } + +NarratorAnnouncement ^ CalculatorAnnouncement::GetSettingsPageOpenedAnnouncement(Platform::String ^ announcement) +{ + return ref new NarratorAnnouncement( + announcement, + CalculatorActivityIds::SettingsPageOpened, + AutomationNotificationKind::ActionCompleted, + AutomationNotificationProcessing::ImportantMostRecent); +} diff --git a/src/CalcViewModel/Common/Automation/NarratorAnnouncement.h b/src/CalcViewModel/Common/Automation/NarratorAnnouncement.h index da323e5..26196b9 100644 --- a/src/CalcViewModel/Common/Automation/NarratorAnnouncement.h +++ b/src/CalcViewModel/Common/Automation/NarratorAnnouncement.h @@ -75,5 +75,7 @@ public static NarratorAnnouncement ^ GetAlwaysOnTopChangedAnnouncement(Platform::String ^ announcement); static NarratorAnnouncement ^ GetBitShiftRadioButtonCheckedAnnouncement(Platform::String ^ announcement); + + static NarratorAnnouncement ^ GetSettingsPageOpenedAnnouncement(Platform::String ^ announcement); }; } diff --git a/src/Calculator/Resources/en-US/Resources.resw b/src/Calculator/Resources/en-US/Resources.resw index bbbef48..79a65ce 100644 --- a/src/Calculator/Resources/en-US/Resources.resw +++ b/src/Calculator/Resources/en-US/Resources.resw @@ -4705,11 +4705,11 @@ App theme - Title of App Theme expender + Title of App Theme expander Select which app theme to display - Description of App Theme expender + Description of App Theme expander Light @@ -4723,4 +4723,16 @@ Use system setting Lable for the app theme option to use system setting + + Back + Screen reader prompt for the Back button in title bar to back to main page + + + Settings Page + Announcement used when Settings page is opened + + + App theme Setting + Screen reader prompt for the App theme Setting radio buttons group + diff --git a/src/Calculator/Views/DateCalculator.xaml b/src/Calculator/Views/DateCalculator.xaml index 93dcef7..2bd148f 100644 --- a/src/Calculator/Views/DateCalculator.xaml +++ b/src/Calculator/Views/DateCalculator.xaml @@ -30,6 +30,7 @@ + @@ -40,6 +41,7 @@ + @@ -50,6 +52,7 @@ + @@ -421,21 +424,7 @@ contract7Present:BackgroundSizing="{TemplateBinding BackgroundSizing}" contract7Present:CornerRadius="{TemplateBinding CornerRadius}" AutomationProperties.AccessibilityView="Raw"> - - - - - - - - - - - - - - - + diff --git a/src/Calculator/Views/MainPage.xaml b/src/Calculator/Views/MainPage.xaml index 123d878..ce56b9d 100644 --- a/src/Calculator/Views/MainPage.xaml +++ b/src/Calculator/Views/MainPage.xaml @@ -157,6 +157,7 @@ - + + + + + + @@ -95,9 +101,12 @@ - + + Style="{ThemeResource BodyStrongTextBlockStyle}" + AutomationProperties.HeadingLevel="Level1"/> @@ -167,32 +177,38 @@ - - - - - - - - - - - - - - - - - - + + + + + + + + + + + +