From d4e2213614c506521b001e73ae46ef176d8fcdfd Mon Sep 17 00:00:00 2001
From: Carl de Billy <carl.debilly@nventive.com>
Date: Wed, 26 May 2021 13:55:08 -0400
Subject: [PATCH] test(scrollviewer): Added a sample to illustrate nested
 scrollviewer problem on Android

---
 .../UITests.Shared/UITests.Shared.projitems   |  7 ++++++
 .../ScrollViewer_Nested.xaml                  | 22 +++++++++++++++++++
 .../ScrollViewer_Nested.xaml.cs               | 14 ++++++++++++
 3 files changed, 43 insertions(+)
 create mode 100644 src/SamplesApp/UITests.Shared/Windows_UI_Xaml_Controls/ScrollViewerTests/ScrollViewer_Nested.xaml
 create mode 100644 src/SamplesApp/UITests.Shared/Windows_UI_Xaml_Controls/ScrollViewerTests/ScrollViewer_Nested.xaml.cs

diff --git a/src/SamplesApp/UITests.Shared/UITests.Shared.projitems b/src/SamplesApp/UITests.Shared/UITests.Shared.projitems
index ae03dcbaa1aa..1c99cee19118 100644
--- a/src/SamplesApp/UITests.Shared/UITests.Shared.projitems
+++ b/src/SamplesApp/UITests.Shared/UITests.Shared.projitems
@@ -1545,6 +1545,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="$(MSBuildThisFileDirectory)Windows_UI_Xaml_Controls\ScrollViewerTests\ScrollViewer_Nested.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="$(MSBuildThisFileDirectory)Windows_UI_Xaml_Controls\ScrollViewerTests\ScrollViewer_Padding.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -5193,6 +5197,9 @@
     <Compile Include="$(MSBuildThisFileDirectory)Windows_UI_Xaml_Controls\ScrollViewerTests\ScrollViewer_Margin.xaml.cs">
       <DependentUpon>ScrollViewer_Margin.xaml</DependentUpon>
     </Compile>
+    <Compile Include="$(MSBuildThisFileDirectory)Windows_UI_Xaml_Controls\ScrollViewerTests\ScrollViewer_Nested.xaml.cs">
+      <DependentUpon>ScrollViewer_Nested.xaml</DependentUpon>
+    </Compile>
     <Compile Include="$(MSBuildThisFileDirectory)Windows_UI_Xaml_Controls\ScrollViewerTests\ScrollViewer_Padding.xaml.cs">
       <DependentUpon>ScrollViewer_Padding.xaml</DependentUpon>
     </Compile>
diff --git a/src/SamplesApp/UITests.Shared/Windows_UI_Xaml_Controls/ScrollViewerTests/ScrollViewer_Nested.xaml b/src/SamplesApp/UITests.Shared/Windows_UI_Xaml_Controls/ScrollViewerTests/ScrollViewer_Nested.xaml
new file mode 100644
index 000000000000..abfaf267bb44
--- /dev/null
+++ b/src/SamplesApp/UITests.Shared/Windows_UI_Xaml_Controls/ScrollViewerTests/ScrollViewer_Nested.xaml
@@ -0,0 +1,22 @@
+<Page
+    x:Class="UITests.Windows_UI_Xaml_Controls.ScrollViewerTests.ScrollViewer_Nested"
+    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"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    mc:Ignorable="d"
+    Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
+
+	<ScrollViewer Width="400" Height="400" Background="Yellow">
+		<StackPanel Padding="20" Spacing="10">
+			<Border Background="Blue" Height="200" />
+			<ScrollViewer Height="200" Background="Red">
+				<StackPanel Padding="20" Spacing="10">
+					<Border Background="Green" Height="150" />
+					<Border Background="Green" Height="150" />
+				</StackPanel>
+			</ScrollViewer>
+			<Border Background="Blue" Height="200" />
+		</StackPanel>
+	</ScrollViewer>
+</Page>
diff --git a/src/SamplesApp/UITests.Shared/Windows_UI_Xaml_Controls/ScrollViewerTests/ScrollViewer_Nested.xaml.cs b/src/SamplesApp/UITests.Shared/Windows_UI_Xaml_Controls/ScrollViewerTests/ScrollViewer_Nested.xaml.cs
new file mode 100644
index 000000000000..9b4b61815d2b
--- /dev/null
+++ b/src/SamplesApp/UITests.Shared/Windows_UI_Xaml_Controls/ScrollViewerTests/ScrollViewer_Nested.xaml.cs
@@ -0,0 +1,14 @@
+using Windows.UI.Xaml.Controls;
+using Uno.UI.Samples.Controls;
+
+namespace UITests.Windows_UI_Xaml_Controls.ScrollViewerTests
+{
+	[Sample("ScrollViewer")]
+	public sealed partial class ScrollViewer_Nested : Page
+	{
+		public ScrollViewer_Nested()
+		{
+			this.InitializeComponent();
+		}
+	}
+}