From 99ab9d87f0d4af08c63925ebfbbba6d2bc511837 Mon Sep 17 00:00:00 2001
From: Yiyi Zhang <Yiyi.Zhang@microsoft.com>
Date: Fri, 30 Jul 2021 16:38:05 +0800
Subject: [PATCH] add automation name for history and memory list item

---
 src/Calculator/Views/HistoryList.xaml    | 9 +++++----
 src/Calculator/Views/HistoryList.xaml.cs | 5 +++++
 src/Calculator/Views/Memory.xaml         | 4 ++--
 src/Calculator/Views/MemoryListItem.xaml | 3 ++-
 4 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/Calculator/Views/HistoryList.xaml b/src/Calculator/Views/HistoryList.xaml
index d1547237..444f1034 100644
--- a/src/Calculator/Views/HistoryList.xaml
+++ b/src/Calculator/Views/HistoryList.xaml
@@ -1,9 +1,10 @@
-<UserControl x:Class="CalculatorApp.HistoryList"
+<UserControl x:Class="CalculatorApp.HistoryList"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:automation="using:CalculatorApp.ViewModel.Common.Automation"
              xmlns:converters="using:CalculatorApp.Converters"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:local="using:CalculatorApp"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:model="using:CalculatorApp.ViewModel"
              xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
@@ -56,14 +57,14 @@
             </MenuFlyout>
 
             <DataTemplate x:Key="HistoryItemTemplate" x:DataType="model:HistoryItemViewModel">
-                <muxc:SwipeControl RightItems="{StaticResource HistorySwipeItems}">
+                <muxc:SwipeControl AutomationProperties.Name="{x:Bind local:HistoryList.GetHistoryItemAutomationName(AccExpression, AccResult)}" RightItems="{StaticResource HistorySwipeItems}">
                     <StackPanel Margin="0,6,16,6" Background="Transparent">
                         <TextBlock x:Name="ExprTextBlock"
                                    Margin="0,0,0,4"
                                    HorizontalAlignment="Right"
                                    Style="{ThemeResource BodyTextBlockMediumStyle}"
+                                   AutomationProperties.AccessibilityView="Raw"
                                    AutomationProperties.AutomationId="HistoryItemExpression"
-                                   AutomationProperties.Name="{x:Bind AccExpression}"
                                    IsTextSelectionEnabled="True"
                                    Text="{x:Bind Expression}"
                                    TextAlignment="Right"
@@ -71,8 +72,8 @@
                         <TextBlock x:Name="ResultTextBlock"
                                    HorizontalAlignment="Right"
                                    Style="{ThemeResource SubtitleTextBlockStyle}"
+                                   AutomationProperties.AccessibilityView="Raw"
                                    AutomationProperties.AutomationId="HistoryItemValue"
-                                   AutomationProperties.Name="{x:Bind AccResult}"
                                    IsTextSelectionEnabled="True"
                                    Text="{x:Bind Result}"
                                    TextAlignment="Right"
diff --git a/src/Calculator/Views/HistoryList.xaml.cs b/src/Calculator/Views/HistoryList.xaml.cs
index 14faadd2..a473e561 100644
--- a/src/Calculator/Views/HistoryList.xaml.cs
+++ b/src/Calculator/Views/HistoryList.xaml.cs
@@ -43,6 +43,11 @@ namespace CalculatorApp
         public static readonly DependencyProperty RowHeightProperty =
             DependencyProperty.Register(nameof(RowHeight), typeof(Windows.UI.Xaml.GridLength), typeof(HistoryList), new PropertyMetadata(default(Windows.UI.Xaml.GridLength)));
 
+        public static string GetHistoryItemAutomationName(string accExpression, string accResult)
+        {
+            return $"{accExpression} {accResult}";
+        }
+
         private void ListView_ItemClick(object sender, ItemClickEventArgs e)
         {
             HistoryViewModel historyVM = (DataContext as HistoryViewModel);
diff --git a/src/Calculator/Views/Memory.xaml b/src/Calculator/Views/Memory.xaml
index 7e96d780..7cbfd51c 100644
--- a/src/Calculator/Views/Memory.xaml
+++ b/src/Calculator/Views/Memory.xaml
@@ -1,4 +1,4 @@
-<UserControl x:Class="CalculatorApp.Memory"
+<UserControl x:Class="CalculatorApp.Memory"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:common="using:CalculatorApp.Common"
@@ -36,7 +36,7 @@
         </MenuFlyout>
 
         <DataTemplate x:Key="MemoryItemTemplate" x:DataType="model:MemoryItemViewModel">
-            <local:MemoryListItem Model="{x:Bind Mode=OneWay}"/>
+            <local:MemoryListItem AutomationProperties.Name="{x:Bind Value, Mode=OneWay}" Model="{x:Bind Mode=OneWay}"/>
         </DataTemplate>
         <Style x:Key="MemoryItemContainerStyle"
                BasedOn="{StaticResource HistoryMemoryItemContainerStyle}"
diff --git a/src/Calculator/Views/MemoryListItem.xaml b/src/Calculator/Views/MemoryListItem.xaml
index f4687e58..230c2d09 100644
--- a/src/Calculator/Views/MemoryListItem.xaml
+++ b/src/Calculator/Views/MemoryListItem.xaml
@@ -1,4 +1,4 @@
-<UserControl x:Class="CalculatorApp.MemoryListItem"
+<UserControl x:Class="CalculatorApp.MemoryListItem"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
@@ -52,6 +52,7 @@
             <TextBlock Margin="0,4,20,0"
                        HorizontalAlignment="Right"
                        Style="{ThemeResource SubtitleTextBlockStyle}"
+                       AutomationProperties.AccessibilityView="Raw"
                        AutomationProperties.AutomationId="MemoryItemValue"
                        FlowDirection="LeftToRight"
                        IsTextSelectionEnabled="True"