From a3163f64e3419055fbd8fbb84051fe18028a2da6 Mon Sep 17 00:00:00 2001
From: Vignesh M <32194608+vishegn@users.noreply.github.com>
Date: Sat, 27 Jun 2020 03:08:42 +0530
Subject: [PATCH] =?UTF-8?q?Narrator=20reads=20incorrect=20information=20as?=
 =?UTF-8?q?=20=E2=80=9CHistory=20and=20Memory=20list=E2=80=9D=20in=20Progr?=
 =?UTF-8?q?ammer=20Calculator=20#1174=20(#1286)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Calculator/Resources/en-US/Resources.resw |  8 ++++++++
 src/Calculator/Views/Calculator.xaml.cpp      | 11 +++++++++++
 src/Calculator/Views/Calculator.xaml.h        |  2 ++
 3 files changed, 21 insertions(+)

diff --git a/src/Calculator/Resources/en-US/Resources.resw b/src/Calculator/Resources/en-US/Resources.resw
index 0ebbc687..308b59d0 100644
--- a/src/Calculator/Resources/en-US/Resources.resw
+++ b/src/Calculator/Resources/en-US/Resources.resw
@@ -4707,4 +4707,12 @@
     <value>Graph Options</value>
     <comment>Screen reader prompt for the graph options panel</comment>
   </data>
+  <data name="DockPanel_HistoryMemoryLists" xml:space="preserve">
+    <value>History and Memory lists</value>
+    <comment>Automation name for the group of controls for history and memory lists.</comment>
+  </data>
+  <data name="DockPanel_MemoryList" xml:space="preserve">
+    <value>Memory list</value>
+    <comment>Automation name for the group of controls for memory list.</comment>
+  </data>
 </root>
diff --git a/src/Calculator/Views/Calculator.xaml.cpp b/src/Calculator/Views/Calculator.xaml.cpp
index c1884b49..ee61d372 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 16979d83..cb949773 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;