From 85fa644acaa69194c7cf60e0b62acfc0a6f9b742 Mon Sep 17 00:00:00 2001
From: Alekhya <reddykalekhya@gmail.com>
Date: Tue, 8 Sep 2020 10:25:53 -0700
Subject: [PATCH] Fix KBM Settings page Property related and screen reader
 Accessibility issues (#6289)

* Add accessible names for the KBM key remapping list and list item

* Add accessible name for the shortcut list item

* Add accessible name for shortcut remapping list

* Added accessible names to all icons

* Add accessible name for image

* Fix font icon narrator issue
---
 .../Strings/en-us/Resources.resw              | 24 +++++++++++++++++++
 .../Views/KeyboardManagerPage.xaml            | 19 +++++++++++----
 2 files changed, 39 insertions(+), 4 deletions(-)

diff --git a/src/core/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw b/src/core/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw
index 832563e337..de6385c1de 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw
+++ b/src/core/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw
@@ -197,6 +197,30 @@
     <value>Remap shortcuts</value>
     <comment>Keyboard Manager remap shortcuts header</comment>
   </data>
+  <data name="RemapKeysList.AutomationProperties.Name" xml:space="preserve">
+    <value>Current Key Remappings</value>
+  </data>
+  <data name="RemapShortcutsList.AutomationProperties.Name" xml:space="preserve">
+    <value>Current Shortcut Remappings</value>
+  </data>
+  <data name="KeyboardManager_RemappedKeysListItem.AutomationProperties.Name" xml:space="preserve">
+    <value>Key Remapping</value>
+  </data>
+  <data name="KeyboardManager_RemappedShortcutsListItem.AutomationProperties.Name" xml:space="preserve">
+    <value>Shortcut Remapping</value>
+  </data>
+  <data name="KeyboardManager_RemappedTo.AutomationProperties.Name" xml:space="preserve">
+    <value>Remapped to</value>
+  </data>
+  <data name="KeyboardManager_ShortcutRemappedTo.AutomationProperties.Name" xml:space="preserve">
+    <value>Remapped to</value>
+  </data>
+  <data name="KeyboardManager_TargetApp.AutomationProperties.Name" xml:space="preserve">
+    <value>For Target Application</value>
+  </data>
+  <data name="KeyboardManager_Image.AutomationProperties.Name" xml:space="preserve">
+    <value>Keyboard Manager</value>
+  </data>
   <data name="ColorPicker_Description.Text" xml:space="preserve">
     <value>Quick and simple system-wide color picker.</value>
   </data>
diff --git a/src/core/Microsoft.PowerToys.Settings.UI/Views/KeyboardManagerPage.xaml b/src/core/Microsoft.PowerToys.Settings.UI/Views/KeyboardManagerPage.xaml
index 5e2a04221f..fc7cf459bc 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI/Views/KeyboardManagerPage.xaml
+++ b/src/core/Microsoft.PowerToys.Settings.UI/Views/KeyboardManagerPage.xaml
@@ -18,7 +18,9 @@
             <Setter Property="IsTabStop" Value="False"/>
         </Style>
         <DataTemplate x:Name="KeysListViewTemplate" x:DataType="Lib:KeysDataModel">
-            <StackPanel
+            <StackPanel 
+                Name="KeyboardManager_RemappedKeysListItem" 
+                x:Uid="KeyboardManager_RemappedKeysListItem"
                 Orientation="Horizontal"
                 Height="56">
                 <ItemsControl
@@ -55,6 +57,8 @@
                           VerticalAlignment="Center" 
                           Margin="5,0,5,0"/>
                 <ItemsControl
+                    Name="KeyboardManager_RemappedTo"
+                    x:Uid="KeyboardManager_RemappedTo"
                     ItemsSource="{x:Bind GetNewRemapKeys()}"
                     Grid.Column="2"
                     IsTabStop="False">
@@ -87,7 +91,9 @@
             </StackPanel>
         </DataTemplate>
         <DataTemplate x:Name="ShortcutKeysListViewTemplate" x:DataType="Lib:AppSpecificKeysDataModel">
-            <StackPanel
+            <StackPanel 
+                Name="KeyboardManager_RemappedShortcutsListItem" 
+                x:Uid="KeyboardManager_RemappedShortcutsListItem"
                 Orientation="Horizontal"
                 Height="56">
                 <ItemsControl
@@ -123,7 +129,8 @@
                           FontSize="14"
                           VerticalAlignment="Center" 
                           Margin="5,0,5,0"/>
-                <ItemsControl
+                <ItemsControl Name="KeyboardManager_ShortcutRemappedTo"
+                    x:Uid="KeyboardManager_ShortcutRemappedTo"
                     ItemsSource="{x:Bind GetNewRemapKeys()}"
                     Grid.Column="2"
                     IsTabStop="False">
@@ -159,6 +166,8 @@
                           VerticalAlignment="Center" 
                           Margin="5,0,5,0"/>
                 <Border
+                    Name="KeyboardManager_TargetApp"
+                    x:Uid="KeyboardManager_TargetApp"
                     Background="{ThemeResource SystemAccentColor}"
                     Grid.Column="4"
                     CornerRadius="4"
@@ -245,6 +254,7 @@
                     IsEnabled="{x:Bind Path=ViewModel.Enabled, Mode=OneWay}"/>
 
             <ListView x:Name="RemapKeysList"
+                      x:Uid="RemapKeysList"
                       extensions:ListViewExtensions.AlternateColor="{ThemeResource SystemControlBackgroundListLowBrush}"
                       ItemsSource="{x:Bind Path=ViewModel.RemapKeys, Mode=OneWay}"
                       ItemTemplate="{StaticResource KeysListViewTemplate}"
@@ -288,6 +298,7 @@
                     />
 
             <ListView x:Name="RemapShortcutsList"
+                      x:Uid="RemapShortcutsList"
                       extensions:ListViewExtensions.AlternateColor="{ThemeResource SystemControlBackgroundListLowBrush}"
                       ItemsSource="{x:Bind Path=ViewModel.RemapShortcuts, Mode=OneWay}"
                       ItemTemplate="{StaticResource ShortcutKeysListViewTemplate}"
@@ -341,7 +352,7 @@
                     HorizontalAlignment="Left"
                     Margin="{StaticResource SmallTopBottomMargin}"
                     RelativePanel.Below="DescriptionPanel">
-                <Image Source="ms-appx:///Assets/Modules/KBM.png" />
+                <Image x:Uid="KeyboardManager_Image" Source="ms-appx:///Assets/Modules/KBM.png" />
             </Border>
 
             <StackPanel x:Name="LinksPanel"