From 1c728596998ea0905b64a208115fa2de432bc910 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9gis=20Brid?=
 <36547063+RBrid@users.noreply.github.com>
Date: Mon, 15 Mar 2021 16:03:54 -0700
Subject: [PATCH] Fix MUXControls.ReleaseTest tests regression (#4529)

---
 dev/CommonStyles/ScrollViewer_themeresources_v1.xaml     | 9 +++++++++
 test/MUXControlsTestApp/App.xaml                         | 2 --
 .../Themes/DisableAnimationsStyles.xaml                  | 4 ++--
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/dev/CommonStyles/ScrollViewer_themeresources_v1.xaml b/dev/CommonStyles/ScrollViewer_themeresources_v1.xaml
index 3a63d9618d..03f7740bba 100644
--- a/dev/CommonStyles/ScrollViewer_themeresources_v1.xaml
+++ b/dev/CommonStyles/ScrollViewer_themeresources_v1.xaml
@@ -14,6 +14,15 @@
         </ResourceDictionary>
     </ResourceDictionary.ThemeDictionaries>
 
+    <Thickness x:Key="ScrollViewerScrollBarMargin">0</Thickness>
+    
+    <x:String x:Key="ScrollViewerSeparatorExpandBeginTime">00:00:00.40</x:String>
+    <x:String x:Key="ScrollViewerSeparatorExpandDuration">00:00:00.1</x:String>
+    <x:String x:Key="ScrollViewerSeparatorContractBeginTime">00:00:02.00</x:String>
+    <x:String x:Key="ScrollViewerSeparatorContractDelay">00:00:02</x:String>
+    <x:String x:Key="ScrollViewerSeparatorContractDuration">00:00:00.1</x:String>
+    <x:String x:Key="ScrollViewerSeparatorContractFinalKeyframe">00:00:02.1</x:String>
+
     <Style TargetType="ScrollViewer" BasedOn="{StaticResource DefaultScrollViewerStyle}" />
 
     <Style x:Key="DefaultScrollViewerStyle" TargetType="ScrollViewer">
diff --git a/test/MUXControlsTestApp/App.xaml b/test/MUXControlsTestApp/App.xaml
index f71c92e60e..cd317cc98d 100644
--- a/test/MUXControlsTestApp/App.xaml
+++ b/test/MUXControlsTestApp/App.xaml
@@ -24,8 +24,6 @@
                 <ResourceDictionary x:Name="_styleOverridesPlaceholder"/>
             </ResourceDictionary.MergedDictionaries>
 
-            <Thickness x:Key="AppScrollViewerScrollBarMargin">1</Thickness> <!-- use 0 when switching to Version1 -->
-
             <Style x:Key="StandardGroupHeader" TargetType="TextBlock">
                 <Setter Property="FontSize" Value="22"/>
                 <Setter Property="Margin" Value="0,0,0,8"/>
diff --git a/test/MUXControlsTestApp/Themes/DisableAnimationsStyles.xaml b/test/MUXControlsTestApp/Themes/DisableAnimationsStyles.xaml
index 755c330b2d..fdc4c6c9fa 100644
--- a/test/MUXControlsTestApp/Themes/DisableAnimationsStyles.xaml
+++ b/test/MUXControlsTestApp/Themes/DisableAnimationsStyles.xaml
@@ -40,7 +40,7 @@
                             <Grid
                                 Grid.Column="1"
                                 Visibility="{TemplateBinding ComputedVerticalScrollBarVisibility}"
-                                Padding="{ThemeResource AppScrollViewerScrollBarMargin}">
+                                Padding="{ThemeResource ScrollViewerScrollBarMargin}">
                                 <ScrollBar x:Name="VerticalScrollBar"
                                     IsTabStop="False"
                                     Maximum="{TemplateBinding ScrollableHeight}"
@@ -53,7 +53,7 @@
                             <Grid
                                 Grid.Row="1"
                                 Visibility="{TemplateBinding ComputedHorizontalScrollBarVisibility}"
-                                Padding="{ThemeResource AppScrollViewerScrollBarMargin}">
+                                Padding="{ThemeResource ScrollViewerScrollBarMargin}">
                                 <ScrollBar x:Name="HorizontalScrollBar"
                                     IsTabStop="False"
                                     Maximum="{TemplateBinding ScrollableWidth}"