From f6645b04ed7540197f4790678d3282a3e75f6a31 Mon Sep 17 00:00:00 2001
From: Andrey Nekrasov <yuyoyuppe@users.noreply.github.com>
Date: Tue, 10 Aug 2021 14:40:08 +0300
Subject: [PATCH] [FZE][Accessibility] Announce custom layout creation (#12702)

---
 .../editor/FancyZonesEditor/MainWindow.xaml      |  5 ++++-
 .../editor/FancyZonesEditor/MainWindow.xaml.cs   | 16 ++++++++++++++++
 .../Properties/Resources.Designer.cs             |  9 +++++++++
 .../FancyZonesEditor/Properties/Resources.resx   |  3 +++
 4 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/src/modules/fancyzones/editor/FancyZonesEditor/MainWindow.xaml b/src/modules/fancyzones/editor/FancyZonesEditor/MainWindow.xaml
index 750232bbb7..4a007b9e81 100644
--- a/src/modules/fancyzones/editor/FancyZonesEditor/MainWindow.xaml
+++ b/src/modules/fancyzones/editor/FancyZonesEditor/MainWindow.xaml
@@ -352,7 +352,10 @@
                             FontFamily="Segoe MDL2 Assets"
                             Style="{StaticResource IconOnlyButtonStyle}"
                             Visibility="{Binding Path=Type, Converter={StaticResource LayoutTypeCustomToVisibilityConverter}}" />
-
+                    
+                    <!--Used by narrator for announcements-->
+                    <TextBlock x:Name="LayoutCreationAnnounce" />
+                    
                     <Button Click="DuplicateLayout_Click"
                             x:Name="createFromTemplateLayoutButton"
                             AutomationProperties.Name="{x:Static props:Resources.Create_Custom_From_Template}"
diff --git a/src/modules/fancyzones/editor/FancyZonesEditor/MainWindow.xaml.cs b/src/modules/fancyzones/editor/FancyZonesEditor/MainWindow.xaml.cs
index 5766df7d70..b0d15986c1 100644
--- a/src/modules/fancyzones/editor/FancyZonesEditor/MainWindow.xaml.cs
+++ b/src/modules/fancyzones/editor/FancyZonesEditor/MainWindow.xaml.cs
@@ -5,7 +5,10 @@
 using System;
 using System.Collections.Generic;
 using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Automation.Peers;
 using System.Windows.Controls;
+using System.Windows.Forms.Automation;
 using System.Windows.Input;
 using FancyZonesEditor.Models;
 using FancyZonesEditor.Utils;
@@ -26,6 +29,7 @@ namespace FancyZonesEditor
         private LayoutModel _backup;
 
         private ContentDialog _openedDialog;
+        private TextBlock _createLayoutAnnounce;
         private bool _openingDialog = false; // Is the dialog being opened.
 
         public int WrapPanelItemSize { get; set; } = DefaultWrapPanelItemSize;
@@ -33,6 +37,7 @@ namespace FancyZonesEditor
         public MainWindow(bool spanZonesAcrossMonitors, Rect workArea)
         {
             InitializeComponent();
+            _createLayoutAnnounce = (TextBlock)FindName("LayoutCreationAnnounce");
             DataContext = _settings;
 
             KeyUp += MainWindow_KeyUp;
@@ -191,6 +196,7 @@ namespace FancyZonesEditor
                 name = name.TrimEnd();
             }
 
+            AnnounceSuccessfulLayoutCreation(name);
             int maxCustomIndex = 0;
             foreach (LayoutModel customModel in MainWindowSettingsModel.CustomModels)
             {
@@ -222,6 +228,16 @@ namespace FancyZonesEditor
             App.FancyZonesEditorIO.SerializeZoneSettings();
         }
 
+        private void AnnounceSuccessfulLayoutCreation(string name)
+        {
+            if (AutomationPeer.ListenerExists(AutomationEvents.MenuOpened))
+            {
+                var peer = UIElementAutomationPeer.FromElement(_createLayoutAnnounce);
+                AutomationProperties.SetName(_createLayoutAnnounce, name + " " + FancyZonesEditor.Properties.Resources.Layout_Creation_Announce);
+                peer?.RaiseAutomationEvent(AutomationEvents.MenuOpened);
+            }
+        }
+
         private void Apply()
         {
             var mainEditor = App.Overlay;
diff --git a/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.Designer.cs b/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.Designer.cs
index ab12da6d47..1c9a39e3d6 100644
--- a/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.Designer.cs
+++ b/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.Designer.cs
@@ -465,6 +465,15 @@ namespace FancyZonesEditor.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to custom layout was created successfully..
+        /// </summary>
+        public static string Layout_Creation_Announce {
+            get {
+                return ResourceManager.GetString("Layout_Creation_Announce", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Create layouts that are horizontally or vertically stacked.
         /// </summary>
diff --git a/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx b/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx
index bd32b10891..c8d3ffd41b 100644
--- a/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx
+++ b/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx
@@ -363,4 +363,7 @@
   <data name="Edit_Layout" xml:space="preserve">
     <value>Edit layout</value>
   </data>
+    <data name="Layout_Creation_Announce" xml:space="preserve">
+    <value>custom layout was created successfully.</value>
+  </data>
 </root>
\ No newline at end of file