diff --git a/src/Calculator/Resources/en-US/Resources.resw b/src/Calculator/Resources/en-US/Resources.resw index 0ebbc68..308b59d 100644 --- a/src/Calculator/Resources/en-US/Resources.resw +++ b/src/Calculator/Resources/en-US/Resources.resw @@ -4707,4 +4707,12 @@ Graph Options Screen reader prompt for the graph options panel + + History and Memory lists + Automation name for the group of controls for history and memory lists. + + + Memory list + Automation name for the group of controls for memory list. + diff --git a/src/Calculator/Views/Calculator.xaml.cpp b/src/Calculator/Views/Calculator.xaml.cpp index c1884b4..ee61d37 100644 --- a/src/Calculator/Views/Calculator.xaml.cpp +++ b/src/Calculator/Views/Calculator.xaml.cpp @@ -71,8 +71,11 @@ void Calculator::LoadResourceStrings() m_closeMemoryFlyoutAutomationName = resProvider->GetResourceString(L"MemoryButton_Close"); m_openHistoryFlyoutAutomationName = resProvider->GetResourceString(L"HistoryButton_Open"); m_closeHistoryFlyoutAutomationName = resProvider->GetResourceString(L"HistoryButton_Close"); + m_dockPanelHistoryMemoryLists = resProvider->GetResourceString(L"DockPanel_HistoryMemoryLists"); + m_dockPanelMemoryList = resProvider->GetResourceString(L"DockPanel_MemoryList"); AutomationProperties::SetName(MemoryButton, m_openMemoryFlyoutAutomationName); AutomationProperties::SetName(HistoryButton, m_openHistoryFlyoutAutomationName); + AutomationProperties::SetName(DockPanel, m_dockPanelHistoryMemoryLists); } void Calculator::InitializeHistoryView(_In_ HistoryViewModel ^ historyVM) @@ -343,6 +346,14 @@ void Calculator::OnModeVisualStateCompleted(_In_ Object ^ sender, _In_ Object ^ AnimateWithoutResult->Begin(); } } + if (IsProgrammer) + { + AutomationProperties::SetName(DockPanel, m_dockPanelMemoryList); + } + else + { + AutomationProperties::SetName(DockPanel, m_dockPanelHistoryMemoryLists); + } } void Calculator::EnsureScientific() diff --git a/src/Calculator/Views/Calculator.xaml.h b/src/Calculator/Views/Calculator.xaml.h index 16979d8..cb94977 100644 --- a/src/Calculator/Views/Calculator.xaml.h +++ b/src/Calculator/Views/Calculator.xaml.h @@ -116,6 +116,8 @@ public Platform::String ^ m_closeMemoryFlyoutAutomationName; Platform::String ^ m_openHistoryFlyoutAutomationName; Platform::String ^ m_closeHistoryFlyoutAutomationName; + Platform::String ^ m_dockPanelHistoryMemoryLists; + Platform::String ^ m_dockPanelMemoryList; Windows::UI::Xaml::Controls::PivotItem ^ m_pivotItem; bool m_IsDigit = false;