From ea8dedf5eb1b038357405bf58ca67a94d203dcd1 Mon Sep 17 00:00:00 2001
From: Darren Hoehna <dahoehna@microsoft.com>
Date: Tue, 9 Apr 2024 15:28:57 -0700
Subject: [PATCH 1/5] Removing the first item from tab stop

---
 .../DevHome.SetupFlow/Views/DevDriveView.xaml          |  2 +-
 .../DevHome.SetupFlow/Views/DevDriveView.xaml.cs       | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/tools/SetupFlow/DevHome.SetupFlow/Views/DevDriveView.xaml b/tools/SetupFlow/DevHome.SetupFlow/Views/DevDriveView.xaml
index 6db32e637f..8396f51778 100644
--- a/tools/SetupFlow/DevHome.SetupFlow/Views/DevDriveView.xaml
+++ b/tools/SetupFlow/DevHome.SetupFlow/Views/DevDriveView.xaml
@@ -54,7 +54,7 @@
                     <Span
                         xml:space="preserve">
                         <Run x:Uid="ms-resource:///DevHome.SetupFlow/Resources/DevDriveWindowOnlyOneDevDriveAllowedHeader" /> <!--
-                        --><Hyperlink
+                        --><Hyperlink x:Name="GoToLearnMoreHyperlink"
                                 UnderlineStyle="None"
                                 NavigateUri="https://go.microsoft.com/fwlink/?linkid=2226090"><!--
                             --> <Run x:Uid="ms-resource:///DevHome.SetupFlow/Resources/LearnMore" /> <!--
diff --git a/tools/SetupFlow/DevHome.SetupFlow/Views/DevDriveView.xaml.cs b/tools/SetupFlow/DevHome.SetupFlow/Views/DevDriveView.xaml.cs
index efc1950ef1..05c2b886cd 100644
--- a/tools/SetupFlow/DevHome.SetupFlow/Views/DevDriveView.xaml.cs
+++ b/tools/SetupFlow/DevHome.SetupFlow/Views/DevDriveView.xaml.cs
@@ -2,7 +2,9 @@
 // Licensed under the MIT License.
 
 using DevHome.SetupFlow.ViewModels;
+using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Input;
 
 namespace DevHome.SetupFlow.Views;
 
@@ -14,5 +16,13 @@ public DevDriveView(DevDriveViewModel viewModel)
     {
         ViewModel = viewModel;
         this.InitializeComponent();
+
+        this.Loaded += (_, _) =>
+        {
+            var option = new FindNextElementOptions();
+            option.SearchRoot = GoToLearnMoreHyperlink;
+            var focusableElement = FocusManager.FindNextElement(FocusNavigationDirection.Up, option);
+            focusableElement.SetValue(IsTabStopProperty, false);
+        };
     }
 }

From 1fb6a1cceaf5bd72c582978f1dd5ce06a0c2eaa1 Mon Sep 17 00:00:00 2001
From: Darren Hoehna <dahoehna@microsoft.com>
Date: Tue, 9 Apr 2024 15:33:02 -0700
Subject: [PATCH 2/5] Removing an un-used using

---
 tools/SetupFlow/DevHome.SetupFlow/Views/DevDriveView.xaml.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tools/SetupFlow/DevHome.SetupFlow/Views/DevDriveView.xaml.cs b/tools/SetupFlow/DevHome.SetupFlow/Views/DevDriveView.xaml.cs
index 05c2b886cd..15eafebca5 100644
--- a/tools/SetupFlow/DevHome.SetupFlow/Views/DevDriveView.xaml.cs
+++ b/tools/SetupFlow/DevHome.SetupFlow/Views/DevDriveView.xaml.cs
@@ -2,7 +2,6 @@
 // Licensed under the MIT License.
 
 using DevHome.SetupFlow.ViewModels;
-using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Input;
 

From d63e187d1fe81ad3c38e5b6a04c00e793c311014 Mon Sep 17 00:00:00 2001
From: Darren Hoehna <dahoehna@microsoft.com>
Date: Tue, 9 Apr 2024 15:34:06 -0700
Subject: [PATCH 3/5] Adding comments

---
 tools/SetupFlow/DevHome.SetupFlow/Views/DevDriveView.xaml.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tools/SetupFlow/DevHome.SetupFlow/Views/DevDriveView.xaml.cs b/tools/SetupFlow/DevHome.SetupFlow/Views/DevDriveView.xaml.cs
index 15eafebca5..13256103f9 100644
--- a/tools/SetupFlow/DevHome.SetupFlow/Views/DevDriveView.xaml.cs
+++ b/tools/SetupFlow/DevHome.SetupFlow/Views/DevDriveView.xaml.cs
@@ -20,6 +20,10 @@ public DevDriveView(DevDriveViewModel viewModel)
         {
             var option = new FindNextElementOptions();
             option.SearchRoot = GoToLearnMoreHyperlink;
+
+            // An invisible element above the hyperlink is eating a tab.
+            // Set IsTabStop to false to prevent users having to double-tab to get to the first
+            // focusable element.
             var focusableElement = FocusManager.FindNextElement(FocusNavigationDirection.Up, option);
             focusableElement.SetValue(IsTabStopProperty, false);
         };

From d50a364c9de0fd8b0bb08941fed7fb091463f97d Mon Sep 17 00:00:00 2001
From: Darren Hoehna <dahoehna@microsoft.com>
Date: Wed, 10 Apr 2024 11:14:09 -0700
Subject: [PATCH 4/5] Using content instead of WindowContent

---
 common/Windows/SecondaryWindow.cs                   |  2 +-
 .../DevHome.SetupFlow/Views/DevDriveView.xaml       | 13 ++++---------
 .../DevHome.SetupFlow/Views/DevDriveView.xaml.cs    | 13 -------------
 3 files changed, 5 insertions(+), 23 deletions(-)

diff --git a/common/Windows/SecondaryWindow.cs b/common/Windows/SecondaryWindow.cs
index 32794dc0dc..845dbddfec 100644
--- a/common/Windows/SecondaryWindow.cs
+++ b/common/Windows/SecondaryWindow.cs
@@ -184,7 +184,7 @@ public SecondaryWindow()
 
         // Initialize window content template
         _windowTemplate = new(this);
-        WindowContent = _windowTemplate;
+        Content = _windowTemplate;
 
         // Register secondary window events handlers
         Activated += OnSecondaryWindowActivated;
diff --git a/tools/SetupFlow/DevHome.SetupFlow/Views/DevDriveView.xaml b/tools/SetupFlow/DevHome.SetupFlow/Views/DevDriveView.xaml
index 8396f51778..ee85cea2f7 100644
--- a/tools/SetupFlow/DevHome.SetupFlow/Views/DevDriveView.xaml
+++ b/tools/SetupFlow/DevHome.SetupFlow/Views/DevDriveView.xaml
@@ -51,15 +51,10 @@
                         The comment tags and the spaces Before the Run tags are necessary so the clickable area
                         of the hyperlink does not extend to edge of the grid column, and instead stay only over the text.
                     -->
-                    <Span
-                        xml:space="preserve">
-                        <Run x:Uid="ms-resource:///DevHome.SetupFlow/Resources/DevDriveWindowOnlyOneDevDriveAllowedHeader" /> <!--
-                        --><Hyperlink x:Name="GoToLearnMoreHyperlink"
-                                UnderlineStyle="None"
-                                NavigateUri="https://go.microsoft.com/fwlink/?linkid=2226090"><!--
-                            --> <Run x:Uid="ms-resource:///DevHome.SetupFlow/Resources/LearnMore" /> <!--
-                            --></Hyperlink> <!--
-                        --></Span>
+                        <Run x:Uid="ms-resource:///DevHome.SetupFlow/Resources/DevDriveWindowOnlyOneDevDriveAllowedHeader" />
+                        <Hyperlink UnderlineStyle="None" NavigateUri="https://go.microsoft.com/fwlink/?linkid=2226090">
+                            <Run x:Uid="ms-resource:///DevHome.SetupFlow/Resources/LearnMore" />
+                        </Hyperlink>
                 </TextBlock>
                 <TextBlock
                     x:Uid="ms-resource:///DevHome.SetupFlow/Resources/DevDriveWindowLaunchSettingsDisksAndVolumesHeader"
diff --git a/tools/SetupFlow/DevHome.SetupFlow/Views/DevDriveView.xaml.cs b/tools/SetupFlow/DevHome.SetupFlow/Views/DevDriveView.xaml.cs
index 13256103f9..efc1950ef1 100644
--- a/tools/SetupFlow/DevHome.SetupFlow/Views/DevDriveView.xaml.cs
+++ b/tools/SetupFlow/DevHome.SetupFlow/Views/DevDriveView.xaml.cs
@@ -3,7 +3,6 @@
 
 using DevHome.SetupFlow.ViewModels;
 using Microsoft.UI.Xaml.Controls;
-using Microsoft.UI.Xaml.Input;
 
 namespace DevHome.SetupFlow.Views;
 
@@ -15,17 +14,5 @@ public DevDriveView(DevDriveViewModel viewModel)
     {
         ViewModel = viewModel;
         this.InitializeComponent();
-
-        this.Loaded += (_, _) =>
-        {
-            var option = new FindNextElementOptions();
-            option.SearchRoot = GoToLearnMoreHyperlink;
-
-            // An invisible element above the hyperlink is eating a tab.
-            // Set IsTabStop to false to prevent users having to double-tab to get to the first
-            // focusable element.
-            var focusableElement = FocusManager.FindNextElement(FocusNavigationDirection.Up, option);
-            focusableElement.SetValue(IsTabStopProperty, false);
-        };
     }
 }

From 7b63fa235826ef1f905ab5b9a6ed64271af3219c Mon Sep 17 00:00:00 2001
From: Darren Hoehna <dahoehna@microsoft.com>
Date: Wed, 10 Apr 2024 12:23:06 -0700
Subject: [PATCH 5/5] Reverting DevDriveView.

---
 .../DevHome.SetupFlow/Views/DevDriveView.xaml       | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/tools/SetupFlow/DevHome.SetupFlow/Views/DevDriveView.xaml b/tools/SetupFlow/DevHome.SetupFlow/Views/DevDriveView.xaml
index ee85cea2f7..6db32e637f 100644
--- a/tools/SetupFlow/DevHome.SetupFlow/Views/DevDriveView.xaml
+++ b/tools/SetupFlow/DevHome.SetupFlow/Views/DevDriveView.xaml
@@ -51,10 +51,15 @@
                         The comment tags and the spaces Before the Run tags are necessary so the clickable area
                         of the hyperlink does not extend to edge of the grid column, and instead stay only over the text.
                     -->
-                        <Run x:Uid="ms-resource:///DevHome.SetupFlow/Resources/DevDriveWindowOnlyOneDevDriveAllowedHeader" />
-                        <Hyperlink UnderlineStyle="None" NavigateUri="https://go.microsoft.com/fwlink/?linkid=2226090">
-                            <Run x:Uid="ms-resource:///DevHome.SetupFlow/Resources/LearnMore" />
-                        </Hyperlink>
+                    <Span
+                        xml:space="preserve">
+                        <Run x:Uid="ms-resource:///DevHome.SetupFlow/Resources/DevDriveWindowOnlyOneDevDriveAllowedHeader" /> <!--
+                        --><Hyperlink
+                                UnderlineStyle="None"
+                                NavigateUri="https://go.microsoft.com/fwlink/?linkid=2226090"><!--
+                            --> <Run x:Uid="ms-resource:///DevHome.SetupFlow/Resources/LearnMore" /> <!--
+                            --></Hyperlink> <!--
+                        --></Span>
                 </TextBlock>
                 <TextBlock
                     x:Uid="ms-resource:///DevHome.SetupFlow/Resources/DevDriveWindowLaunchSettingsDisksAndVolumesHeader"