diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyGridLayout_HorizontalOptionsCenter.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyGridLayout_HorizontalOptionsCenter.png
new file mode 100644
index 000000000000..b962033f1aa4
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyGridLayout_HorizontalOptionsCenter.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyGridLayout_HorizontalOptionsCenterWithWidthRequest.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyGridLayout_HorizontalOptionsCenterWithWidthRequest.png
new file mode 100644
index 000000000000..0bac5037c528
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyGridLayout_HorizontalOptionsCenterWithWidthRequest.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyGridLayout_HorizontalOptionsEnd.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyGridLayout_HorizontalOptionsEnd.png
new file mode 100644
index 000000000000..c122c0892242
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyGridLayout_HorizontalOptionsEnd.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyGridLayout_HorizontalOptionsEndWithWidthRequest.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyGridLayout_HorizontalOptionsEndWithWidthRequest.png
new file mode 100644
index 000000000000..3a051692a06d
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyGridLayout_HorizontalOptionsEndWithWidthRequest.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyGridLayout_HorizontalOptionsFill.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyGridLayout_HorizontalOptionsFill.png
new file mode 100644
index 000000000000..ac694cd8610c
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyGridLayout_HorizontalOptionsFill.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyGridLayout_HorizontalOptionsFillWithWidthRequest.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyGridLayout_HorizontalOptionsFillWithWidthRequest.png
new file mode 100644
index 000000000000..eacfa70267a4
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyGridLayout_HorizontalOptionsFillWithWidthRequest.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyGridLayout_HorizontalOptionsStart.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyGridLayout_HorizontalOptionsStart.png
new file mode 100644
index 000000000000..3093826ca043
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyGridLayout_HorizontalOptionsStart.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyGridLayout_HorizontalOptionsStartWithWidthRequest.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyGridLayout_HorizontalOptionsStartWithWidthRequest.png
new file mode 100644
index 000000000000..d117ecc7791e
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyGridLayout_HorizontalOptionsStartWithWidthRequest.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyGridLayout_VerticalOptionsCenter.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyGridLayout_VerticalOptionsCenter.png
new file mode 100644
index 000000000000..89de98255369
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyGridLayout_VerticalOptionsCenter.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyGridLayout_VerticalOptionsCenterWithHeightRequest.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyGridLayout_VerticalOptionsCenterWithHeightRequest.png
new file mode 100644
index 000000000000..4f3ef3bd4362
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyGridLayout_VerticalOptionsCenterWithHeightRequest.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyGridLayout_VerticalOptionsEnd.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyGridLayout_VerticalOptionsEnd.png
new file mode 100644
index 000000000000..e9f7dd93d85d
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyGridLayout_VerticalOptionsEnd.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyGridLayout_VerticalOptionsEndWithHeightRequest.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyGridLayout_VerticalOptionsEndWithHeightRequest.png
new file mode 100644
index 000000000000..8e489df960af
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyGridLayout_VerticalOptionsEndWithHeightRequest.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyGridLayout_VerticalOptionsFill.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyGridLayout_VerticalOptionsFill.png
new file mode 100644
index 000000000000..554879d8e230
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyGridLayout_VerticalOptionsFill.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyGridLayout_VerticalOptionsFillWithHeightRequest.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyGridLayout_VerticalOptionsFillWithHeightRequest.png
new file mode 100644
index 000000000000..c25c1658a4d7
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyGridLayout_VerticalOptionsFillWithHeightRequest.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyGridLayout_VerticalOptionsStart.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyGridLayout_VerticalOptionsStart.png
new file mode 100644
index 000000000000..cf431b77360a
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyGridLayout_VerticalOptionsStart.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyGridLayout_VerticalOptionsStartWithHeightRequest.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyGridLayout_VerticalOptionsStartWithHeightRequest.png
new file mode 100644
index 000000000000..c49167f1a149
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyGridLayout_VerticalOptionsStartWithHeightRequest.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyLayoutWithOrientationHorizontal_HorizontalOptionsCenter.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyLayoutWithOrientationHorizontal_HorizontalOptionsCenter.png
new file mode 100644
index 000000000000..b1ddd4d56188
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyLayoutWithOrientationHorizontal_HorizontalOptionsCenter.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyLayoutWithOrientationHorizontal_HorizontalOptionsCenterWithWidthRequest.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyLayoutWithOrientationHorizontal_HorizontalOptionsCenterWithWidthRequest.png
new file mode 100644
index 000000000000..5064089bbf4b
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyLayoutWithOrientationHorizontal_HorizontalOptionsCenterWithWidthRequest.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyLayoutWithOrientationHorizontal_HorizontalOptionsEnd.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyLayoutWithOrientationHorizontal_HorizontalOptionsEnd.png
new file mode 100644
index 000000000000..a150addb319a
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyLayoutWithOrientationHorizontal_HorizontalOptionsEnd.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyLayoutWithOrientationHorizontal_HorizontalOptionsEndWithWidthRequest.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyLayoutWithOrientationHorizontal_HorizontalOptionsEndWithWidthRequest.png
new file mode 100644
index 000000000000..c21f3037c833
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyLayoutWithOrientationHorizontal_HorizontalOptionsEndWithWidthRequest.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyLayoutWithOrientationHorizontal_HorizontalOptionsFill.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyLayoutWithOrientationHorizontal_HorizontalOptionsFill.png
new file mode 100644
index 000000000000..e05062bcf376
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyLayoutWithOrientationHorizontal_HorizontalOptionsFill.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyLayoutWithOrientationHorizontal_HorizontalOptionsFillWithWidthRequest.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyLayoutWithOrientationHorizontal_HorizontalOptionsFillWithWidthRequest.png
new file mode 100644
index 000000000000..2835222b6dac
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyLayoutWithOrientationHorizontal_HorizontalOptionsFillWithWidthRequest.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyLayoutWithOrientationHorizontal_HorizontalOptionsStart.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyLayoutWithOrientationHorizontal_HorizontalOptionsStart.png
new file mode 100644
index 000000000000..82b0e180e7ba
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyLayoutWithOrientationHorizontal_HorizontalOptionsStart.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyLayoutWithOrientationHorizontal_HorizontalOptionsStartWithWidthRequest.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyLayoutWithOrientationHorizontal_HorizontalOptionsStartWithWidthRequest.png
new file mode 100644
index 000000000000..c5e37e56d919
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyLayoutWithOrientationHorizontal_HorizontalOptionsStartWithWidthRequest.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyLayoutWithOrientationHorizontal_VerticalOptionsCenter.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyLayoutWithOrientationHorizontal_VerticalOptionsCenter.png
new file mode 100644
index 000000000000..382cd53ebc8d
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyLayoutWithOrientationHorizontal_VerticalOptionsCenter.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyLayoutWithOrientationHorizontal_VerticalOptionsCenterWithHeightRequest.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyLayoutWithOrientationHorizontal_VerticalOptionsCenterWithHeightRequest.png
new file mode 100644
index 000000000000..83c65703b899
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyLayoutWithOrientationHorizontal_VerticalOptionsCenterWithHeightRequest.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyLayoutWithOrientationHorizontal_VerticalOptionsEnd.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyLayoutWithOrientationHorizontal_VerticalOptionsEnd.png
new file mode 100644
index 000000000000..f36d837822c8
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyLayoutWithOrientationHorizontal_VerticalOptionsEnd.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyLayoutWithOrientationHorizontal_VerticalOptionsEndWithHeightRequest.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyLayoutWithOrientationHorizontal_VerticalOptionsEndWithHeightRequest.png
new file mode 100644
index 000000000000..25f5eed3a391
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyLayoutWithOrientationHorizontal_VerticalOptionsEndWithHeightRequest.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyLayoutWithOrientationHorizontal_VerticalOptionsFill.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyLayoutWithOrientationHorizontal_VerticalOptionsFill.png
new file mode 100644
index 000000000000..2ccf28f87056
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyLayoutWithOrientationHorizontal_VerticalOptionsFill.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyLayoutWithOrientationHorizontal_VerticalOptionsFillWithHeightRequest.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyLayoutWithOrientationHorizontal_VerticalOptionsFillWithHeightRequest.png
new file mode 100644
index 000000000000..8f4b7cdcca43
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyLayoutWithOrientationHorizontal_VerticalOptionsFillWithHeightRequest.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyLayoutWithOrientationHorizontal_VerticalOptionsStart.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyLayoutWithOrientationHorizontal_VerticalOptionsStart.png
new file mode 100644
index 000000000000..d1b8bb5dabad
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyLayoutWithOrientationHorizontal_VerticalOptionsStart.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyLayoutWithOrientationHorizontal_VerticalOptionsStartWithHeightRequest.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyLayoutWithOrientationHorizontal_VerticalOptionsStartWithHeightRequest.png
new file mode 100644
index 000000000000..04b47753dcae
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyLayoutWithOrientationHorizontal_VerticalOptionsStartWithHeightRequest.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyLayoutWithOrientationVertical_HorizontalOptionsCenter.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyLayoutWithOrientationVertical_HorizontalOptionsCenter.png
new file mode 100644
index 000000000000..3e3a692ec80e
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyLayoutWithOrientationVertical_HorizontalOptionsCenter.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyLayoutWithOrientationVertical_HorizontalOptionsCenterWithWidthRequest.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyLayoutWithOrientationVertical_HorizontalOptionsCenterWithWidthRequest.png
new file mode 100644
index 000000000000..4a3941678435
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyLayoutWithOrientationVertical_HorizontalOptionsCenterWithWidthRequest.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyLayoutWithOrientationVertical_HorizontalOptionsEnd.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyLayoutWithOrientationVertical_HorizontalOptionsEnd.png
new file mode 100644
index 000000000000..f8309515f064
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyLayoutWithOrientationVertical_HorizontalOptionsEnd.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyLayoutWithOrientationVertical_HorizontalOptionsEndWithWidthRequest.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyLayoutWithOrientationVertical_HorizontalOptionsEndWithWidthRequest.png
new file mode 100644
index 000000000000..cf07578e80f8
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyLayoutWithOrientationVertical_HorizontalOptionsEndWithWidthRequest.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyLayoutWithOrientationVertical_HorizontalOptionsFill.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyLayoutWithOrientationVertical_HorizontalOptionsFill.png
new file mode 100644
index 000000000000..f7848037012d
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyLayoutWithOrientationVertical_HorizontalOptionsFill.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyLayoutWithOrientationVertical_HorizontalOptionsFillWithWidthRequest.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyLayoutWithOrientationVertical_HorizontalOptionsFillWithWidthRequest.png
new file mode 100644
index 000000000000..bea71e142303
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyLayoutWithOrientationVertical_HorizontalOptionsFillWithWidthRequest.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyLayoutWithOrientationVertical_HorizontalOptionsStart.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyLayoutWithOrientationVertical_HorizontalOptionsStart.png
new file mode 100644
index 000000000000..4ee43f55e671
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyLayoutWithOrientationVertical_HorizontalOptionsStart.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyLayoutWithOrientationVertical_HorizontalOptionsStartWithWidthRequest.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyLayoutWithOrientationVertical_HorizontalOptionsStartWithWidthRequest.png
new file mode 100644
index 000000000000..a9d54c9c5405
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyLayoutWithOrientationVertical_HorizontalOptionsStartWithWidthRequest.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyLayoutWithOrientationVertical_VerticalOptionsCenter.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyLayoutWithOrientationVertical_VerticalOptionsCenter.png
new file mode 100644
index 000000000000..a6839436096d
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyLayoutWithOrientationVertical_VerticalOptionsCenter.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyLayoutWithOrientationVertical_VerticalOptionsCenterWithHeightRequest.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyLayoutWithOrientationVertical_VerticalOptionsCenterWithHeightRequest.png
new file mode 100644
index 000000000000..ccff057d2b0d
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyLayoutWithOrientationVertical_VerticalOptionsCenterWithHeightRequest.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyLayoutWithOrientationVertical_VerticalOptionsEnd.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyLayoutWithOrientationVertical_VerticalOptionsEnd.png
new file mode 100644
index 000000000000..698296ac1805
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyLayoutWithOrientationVertical_VerticalOptionsEnd.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyLayoutWithOrientationVertical_VerticalOptionsEndWithHeightRequest.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyLayoutWithOrientationVertical_VerticalOptionsEndWithHeightRequest.png
new file mode 100644
index 000000000000..f4582ff68ab4
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyLayoutWithOrientationVertical_VerticalOptionsEndWithHeightRequest.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyLayoutWithOrientationVertical_VerticalOptionsFill.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyLayoutWithOrientationVertical_VerticalOptionsFill.png
new file mode 100644
index 000000000000..761e20cbaa78
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyLayoutWithOrientationVertical_VerticalOptionsFill.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyLayoutWithOrientationVertical_VerticalOptionsFillWithHeightRequest.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyLayoutWithOrientationVertical_VerticalOptionsFillWithHeightRequest.png
new file mode 100644
index 000000000000..39dc86b4f7e9
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyLayoutWithOrientationVertical_VerticalOptionsFillWithHeightRequest.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyLayoutWithOrientationVertical_VerticalOptionsStart.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyLayoutWithOrientationVertical_VerticalOptionsStart.png
new file mode 100644
index 000000000000..e78502c96424
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyLayoutWithOrientationVertical_VerticalOptionsStart.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyLayoutWithOrientationVertical_VerticalOptionsStartWithHeightRequest.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyLayoutWithOrientationVertical_VerticalOptionsStartWithHeightRequest.png
new file mode 100644
index 000000000000..2b20d3b21b00
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyLayoutWithOrientationVertical_VerticalOptionsStartWithHeightRequest.png differ
diff --git a/src/Controls/tests/TestCases.HostApp/CoreViews/CorePageView.cs b/src/Controls/tests/TestCases.HostApp/CoreViews/CorePageView.cs
index 4687e175cb0c..1c04fe88061c 100644
--- a/src/Controls/tests/TestCases.HostApp/CoreViews/CorePageView.cs
+++ b/src/Controls/tests/TestCases.HostApp/CoreViews/CorePageView.cs
@@ -100,6 +100,7 @@ public override string ToString()
new GalleryPageFactory(() => new GraphicsViewControlPage(), "GraphicsView Feature Matrix"),
new GalleryPageFactory(() => new EditorControlPage(), "Editor Feature Matrix"),
new GalleryPageFactory(() => new ToolbarFeaturePage(), "Toolbar Feature Matrix"),
+ new GalleryPageFactory(() => new LayoutControlPage(), "ScrollView With LayoutOptions Feature Matrix"),
};
public CorePageView(Page rootPage)
diff --git a/src/Controls/tests/TestCases.HostApp/FeatureMatrix/ScrollViewWithLayoutOptions/LayoutControlPage.xaml b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/ScrollViewWithLayoutOptions/LayoutControlPage.xaml
new file mode 100644
index 000000000000..db6909dbe494
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/ScrollViewWithLayoutOptions/LayoutControlPage.xaml
@@ -0,0 +1,41 @@
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/Controls/tests/TestCases.HostApp/FeatureMatrix/ScrollViewWithLayoutOptions/LayoutControlPage.xaml.cs b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/ScrollViewWithLayoutOptions/LayoutControlPage.xaml.cs
new file mode 100644
index 000000000000..e41e7f57b271
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/ScrollViewWithLayoutOptions/LayoutControlPage.xaml.cs
@@ -0,0 +1,127 @@
+using System;
+using Microsoft.Maui.Controls;
+
+namespace Maui.Controls.Sample;
+
+public class LayoutControlPage : NavigationPage
+{
+ private LayoutViewModel _viewModel;
+ public LayoutControlPage()
+ {
+ _viewModel = new LayoutViewModel();
+
+ PushAsync(new LayoutMainPage(_viewModel));
+ }
+}
+
+public partial class LayoutMainPage : ContentPage
+{
+ private LayoutViewModel _viewModel;
+
+ public LayoutMainPage(LayoutViewModel viewModel)
+ {
+ InitializeComponent();
+ _viewModel = viewModel;
+ BindingContext = _viewModel;
+ InitializeContent();
+ }
+ protected override void OnAppearing()
+ {
+ base.OnAppearing();
+ InitializeContent();
+ }
+
+ private void InitializeContent()
+ {
+ var defaultLayout = new VerticalStackLayout
+ {
+ BackgroundColor = Colors.LightGray,
+ Children =
+ {
+ new Label { Text = "Welcome to LayoutPage" },
+ }
+ };
+
+ MyScrollView.Content = defaultLayout;
+ }
+
+ private async void NavigateToOptionsPage_Clicked(object sender, EventArgs e)
+ {
+ BindingContext = _viewModel = new LayoutViewModel();
+ await Navigation.PushAsync(new LayoutOptionsPage(_viewModel));
+ }
+
+ private void OnScrollViewWithStackLayoutClicked(object sender, EventArgs e)
+ {
+ Layout layout;
+
+ if (_viewModel.Orientation == ScrollOrientation.Horizontal)
+ {
+ layout = new HorizontalStackLayout
+ {
+ HorizontalOptions = _viewModel.HorizontalOptions,
+ VerticalOptions = _viewModel.VerticalOptions,
+ BackgroundColor = Colors.LightGray,
+ Spacing = 10,
+ Children =
+ {
+ new Label { Text = "StackLayout", VerticalOptions = LayoutOptions.Center },
+ new Button { Text = "Button1", VerticalOptions = LayoutOptions.Center },
+ new Button { Text = "Button2", VerticalOptions = LayoutOptions.Center }
+ }
+ };
+ }
+ else
+ {
+ layout = new VerticalStackLayout
+ {
+ HorizontalOptions = _viewModel.HorizontalOptions,
+ VerticalOptions = _viewModel.VerticalOptions,
+ BackgroundColor = Colors.LightGray,
+ Spacing = 10,
+ Children =
+ {
+ new Label { Text = "StackLayout", HorizontalOptions = LayoutOptions.Center },
+ new Button { Text = "Button1", HorizontalOptions = LayoutOptions.Center },
+ new Button { Text = "Button2", HorizontalOptions = LayoutOptions.Center }
+ }
+ };
+ }
+
+ MyScrollView.Content = layout;
+ }
+
+ private void OnGridWithChildrenClicked(object sender, EventArgs e)
+ {
+ var grid = new Grid
+ {
+ Padding = 15,
+ BackgroundColor = Colors.LightGray,
+ HorizontalOptions = _viewModel.HorizontalOptions,
+ VerticalOptions = _viewModel.VerticalOptions,
+ RowSpacing = 10,
+ ColumnSpacing = 10
+ };
+
+ grid.ColumnDefinitions.Add(new ColumnDefinition { Width = GridLength.Star });
+ grid.ColumnDefinitions.Add(new ColumnDefinition { Width = GridLength.Star });
+ grid.ColumnDefinitions.Add(new ColumnDefinition { Width = GridLength.Star });
+
+ grid.RowDefinitions.Add(new RowDefinition { Height = GridLength.Auto });
+ grid.RowDefinitions.Add(new RowDefinition { Height = GridLength.Auto });
+
+ var button1 = new Button { Text = "Button 1", BackgroundColor = Colors.Orange, TextColor = Colors.White };
+ var button2 = new Button { Text = "Button 2", BackgroundColor = Colors.Blue, TextColor = Colors.White };
+ var button3 = new Button { Text = "Button 3", BackgroundColor = Colors.Green, TextColor = Colors.White };
+ var button4 = new Button { Text = "Button 4", BackgroundColor = Colors.Red, TextColor = Colors.White };
+ var button5 = new Button { Text = "Button 5", BackgroundColor = Colors.Purple, TextColor = Colors.White };
+ var button6 = new Button { Text = "Button 6", BackgroundColor = Colors.Brown, TextColor = Colors.White };
+ grid.Add(button1, 0, 0);
+ grid.Add(button2, 1, 0);
+ grid.Add(button3, 2, 0);
+ grid.Add(button4, 0, 1);
+ grid.Add(button5, 1, 1);
+ grid.Add(button6, 2, 1);
+ MyScrollView.Content = grid;
+ }
+}
\ No newline at end of file
diff --git a/src/Controls/tests/TestCases.HostApp/FeatureMatrix/ScrollViewWithLayoutOptions/LayoutOptionsPage.xaml b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/ScrollViewWithLayoutOptions/LayoutOptionsPage.xaml
new file mode 100644
index 000000000000..653525305554
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/ScrollViewWithLayoutOptions/LayoutOptionsPage.xaml
@@ -0,0 +1,147 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/Controls/tests/TestCases.HostApp/FeatureMatrix/ScrollViewWithLayoutOptions/LayoutOptionsPage.xaml.cs b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/ScrollViewWithLayoutOptions/LayoutOptionsPage.xaml.cs
new file mode 100644
index 000000000000..5cdce1b44af2
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/ScrollViewWithLayoutOptions/LayoutOptionsPage.xaml.cs
@@ -0,0 +1,110 @@
+namespace Maui.Controls.Sample;
+
+public partial class LayoutOptionsPage : ContentPage
+{
+ private readonly LayoutViewModel _viewModel;
+
+ public LayoutOptionsPage(LayoutViewModel viewModel)
+ {
+ InitializeComponent();
+ _viewModel = viewModel;
+ BindingContext = _viewModel;
+ }
+
+ private async void ApplyButton_Clicked(object sender, EventArgs e)
+ {
+ await Navigation.PopAsync();
+ }
+
+ private void OnHorizontalOptionClicked(object sender, EventArgs e)
+ {
+ if (sender is not Button button)
+ return;
+
+ switch (button.Text)
+ {
+ case "Fill":
+ _viewModel.HorizontalOptions = LayoutOptions.Fill;
+ break;
+ case "Start":
+ _viewModel.HorizontalOptions = LayoutOptions.Start;
+ break;
+ case "Center":
+ _viewModel.HorizontalOptions = LayoutOptions.Center;
+ break;
+ case "End":
+ _viewModel.HorizontalOptions = LayoutOptions.End;
+ break;
+ }
+ }
+
+ private void OnVerticalOptionClicked(object sender, EventArgs e)
+ {
+ if (sender is not Button button)
+ return;
+
+ switch (button.Text)
+ {
+ case "Fill":
+ _viewModel.VerticalOptions = LayoutOptions.Fill;
+ break;
+ case "Start":
+ _viewModel.VerticalOptions = LayoutOptions.Start;
+ break;
+ case "Center":
+ _viewModel.VerticalOptions = LayoutOptions.Center;
+ break;
+ case "End":
+ _viewModel.VerticalOptions = LayoutOptions.End;
+ break;
+ }
+ }
+
+ private void OnWidthRequestClicked(object sender, EventArgs e)
+ {
+ if (sender is not Button button)
+ return;
+
+ switch (button.Text)
+ {
+ case "No Width":
+ _viewModel.WidthRequest = -1;
+ break;
+ case "350":
+ _viewModel.WidthRequest = 350;
+ break;
+ }
+ }
+
+ private void OnHeightRequestClicked(object sender, EventArgs e)
+ {
+ if (sender is not Button button)
+ return;
+
+ switch (button.Text)
+ {
+ case "No Height":
+ _viewModel.HeightRequest = -1;
+ break;
+ case "300":
+ _viewModel.HeightRequest = 300;
+ break;
+ }
+ }
+
+ private void OnOrientationClicked(object sender, EventArgs e)
+ {
+ if (sender is not Button button)
+ return;
+
+ switch (button.Text)
+ {
+ case "Vertical":
+ _viewModel.Orientation = ScrollOrientation.Vertical;
+ break;
+ case "Horizontal":
+ _viewModel.Orientation = ScrollOrientation.Horizontal;
+ break;
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/Controls/tests/TestCases.HostApp/FeatureMatrix/ScrollViewWithLayoutOptions/LayoutViewModel.cs b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/ScrollViewWithLayoutOptions/LayoutViewModel.cs
new file mode 100644
index 000000000000..ed8626356204
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/ScrollViewWithLayoutOptions/LayoutViewModel.cs
@@ -0,0 +1,84 @@
+using System.ComponentModel;
+using System.Runtime.CompilerServices;
+using Microsoft.Maui.Controls;
+
+namespace Maui.Controls.Sample;
+
+public class LayoutViewModel : INotifyPropertyChanged
+{
+ private LayoutOptions _horizontalOptions = LayoutOptions.Fill;
+ private LayoutOptions _verticalOptions = LayoutOptions.Fill;
+ private double _widthRequest = -1;
+ private double _heightRequest = -1;
+ private ScrollOrientation _orientation = ScrollOrientation.Vertical;
+
+ public ScrollOrientation Orientation
+ {
+ get => _orientation;
+ set
+ {
+ if (_orientation != value)
+ {
+ _orientation = value;
+ OnPropertyChanged(nameof(Orientation));
+ }
+ }
+ }
+
+ public LayoutOptions HorizontalOptions
+ {
+ get => _horizontalOptions;
+ set
+ {
+ if (_horizontalOptions != value)
+ {
+ _horizontalOptions = value;
+ OnPropertyChanged(nameof(HorizontalOptions));
+ }
+ }
+ }
+
+ public LayoutOptions VerticalOptions
+ {
+ get => _verticalOptions;
+ set
+ {
+ if (_verticalOptions != value)
+ {
+ _verticalOptions = value;
+ OnPropertyChanged(nameof(VerticalOptions));
+ }
+ }
+ }
+
+ public double WidthRequest
+ {
+ get => _widthRequest;
+ set
+ {
+ if (_widthRequest != value)
+ {
+ _widthRequest = value;
+ OnPropertyChanged(nameof(WidthRequest));
+ }
+ }
+ }
+
+ public double HeightRequest
+ {
+ get => _heightRequest;
+ set
+ {
+ if (_heightRequest != value)
+ {
+ _heightRequest = value;
+ OnPropertyChanged(nameof(HeightRequest));
+ }
+ }
+ }
+
+ public event PropertyChangedEventHandler PropertyChanged;
+
+ protected void OnPropertyChanged([CallerMemberName] string propertyName = "") =>
+ PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
+}
\ No newline at end of file
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyGridLayout_HorizontalOptionsCenter.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyGridLayout_HorizontalOptionsCenter.png
new file mode 100644
index 000000000000..2387cfc11c0e
Binary files /dev/null and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyGridLayout_HorizontalOptionsCenter.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyGridLayout_HorizontalOptionsCenterWithWidthRequest.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyGridLayout_HorizontalOptionsCenterWithWidthRequest.png
new file mode 100644
index 000000000000..c7576bdd3b7d
Binary files /dev/null and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyGridLayout_HorizontalOptionsCenterWithWidthRequest.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyGridLayout_HorizontalOptionsEnd.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyGridLayout_HorizontalOptionsEnd.png
new file mode 100644
index 000000000000..84a84d0bf87f
Binary files /dev/null and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyGridLayout_HorizontalOptionsEnd.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyGridLayout_HorizontalOptionsEndWithWidthRequest.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyGridLayout_HorizontalOptionsEndWithWidthRequest.png
new file mode 100644
index 000000000000..4fcff1bcd749
Binary files /dev/null and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyGridLayout_HorizontalOptionsEndWithWidthRequest.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyGridLayout_HorizontalOptionsFill.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyGridLayout_HorizontalOptionsFill.png
new file mode 100644
index 000000000000..30f7fa76336a
Binary files /dev/null and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyGridLayout_HorizontalOptionsFill.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyGridLayout_HorizontalOptionsFillWithWidthRequest.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyGridLayout_HorizontalOptionsFillWithWidthRequest.png
new file mode 100644
index 000000000000..cd4a6e22d558
Binary files /dev/null and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyGridLayout_HorizontalOptionsFillWithWidthRequest.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyGridLayout_HorizontalOptionsStart.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyGridLayout_HorizontalOptionsStart.png
new file mode 100644
index 000000000000..2610ebd77b0c
Binary files /dev/null and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyGridLayout_HorizontalOptionsStart.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyGridLayout_HorizontalOptionsStartWithWidthRequest.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyGridLayout_HorizontalOptionsStartWithWidthRequest.png
new file mode 100644
index 000000000000..eb3b86fc5f3b
Binary files /dev/null and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyGridLayout_HorizontalOptionsStartWithWidthRequest.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyGridLayout_VerticalOptionsCenter.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyGridLayout_VerticalOptionsCenter.png
new file mode 100644
index 000000000000..d7fac0c27dec
Binary files /dev/null and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyGridLayout_VerticalOptionsCenter.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyGridLayout_VerticalOptionsCenterWithHeightRequest.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyGridLayout_VerticalOptionsCenterWithHeightRequest.png
new file mode 100644
index 000000000000..e5c57d12a06d
Binary files /dev/null and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyGridLayout_VerticalOptionsCenterWithHeightRequest.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyGridLayout_VerticalOptionsEnd.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyGridLayout_VerticalOptionsEnd.png
new file mode 100644
index 000000000000..25353b7b5cf7
Binary files /dev/null and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyGridLayout_VerticalOptionsEnd.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyGridLayout_VerticalOptionsEndWithHeightRequest.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyGridLayout_VerticalOptionsEndWithHeightRequest.png
new file mode 100644
index 000000000000..339e96a5a02b
Binary files /dev/null and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyGridLayout_VerticalOptionsEndWithHeightRequest.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyGridLayout_VerticalOptionsFill.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyGridLayout_VerticalOptionsFill.png
new file mode 100644
index 000000000000..c2a273b8f083
Binary files /dev/null and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyGridLayout_VerticalOptionsFill.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyGridLayout_VerticalOptionsFillWithHeightRequest.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyGridLayout_VerticalOptionsFillWithHeightRequest.png
new file mode 100644
index 000000000000..d8aa6f005366
Binary files /dev/null and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyGridLayout_VerticalOptionsFillWithHeightRequest.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyGridLayout_VerticalOptionsStart.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyGridLayout_VerticalOptionsStart.png
new file mode 100644
index 000000000000..bea2e4fcac60
Binary files /dev/null and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyGridLayout_VerticalOptionsStart.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyGridLayout_VerticalOptionsStartWithHeightRequest.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyGridLayout_VerticalOptionsStartWithHeightRequest.png
new file mode 100644
index 000000000000..ad11b326d8e7
Binary files /dev/null and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyGridLayout_VerticalOptionsStartWithHeightRequest.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyLayoutWithOrientationHorizontal_HorizontalOptionsCenter.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyLayoutWithOrientationHorizontal_HorizontalOptionsCenter.png
new file mode 100644
index 000000000000..8d2c710ff0f5
Binary files /dev/null and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyLayoutWithOrientationHorizontal_HorizontalOptionsCenter.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyLayoutWithOrientationHorizontal_HorizontalOptionsCenterWithWidthRequest.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyLayoutWithOrientationHorizontal_HorizontalOptionsCenterWithWidthRequest.png
new file mode 100644
index 000000000000..fd7232f28f55
Binary files /dev/null and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyLayoutWithOrientationHorizontal_HorizontalOptionsCenterWithWidthRequest.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyLayoutWithOrientationHorizontal_HorizontalOptionsEnd.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyLayoutWithOrientationHorizontal_HorizontalOptionsEnd.png
new file mode 100644
index 000000000000..eac7376ad7bd
Binary files /dev/null and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyLayoutWithOrientationHorizontal_HorizontalOptionsEnd.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyLayoutWithOrientationHorizontal_HorizontalOptionsEndWithWidthRequest.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyLayoutWithOrientationHorizontal_HorizontalOptionsEndWithWidthRequest.png
new file mode 100644
index 000000000000..13926a1b6e55
Binary files /dev/null and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyLayoutWithOrientationHorizontal_HorizontalOptionsEndWithWidthRequest.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyLayoutWithOrientationHorizontal_HorizontalOptionsFill.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyLayoutWithOrientationHorizontal_HorizontalOptionsFill.png
new file mode 100644
index 000000000000..e293ba4aae29
Binary files /dev/null and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyLayoutWithOrientationHorizontal_HorizontalOptionsFill.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyLayoutWithOrientationHorizontal_HorizontalOptionsFillWithWidthRequest.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyLayoutWithOrientationHorizontal_HorizontalOptionsFillWithWidthRequest.png
new file mode 100644
index 000000000000..5031d8db633c
Binary files /dev/null and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyLayoutWithOrientationHorizontal_HorizontalOptionsFillWithWidthRequest.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyLayoutWithOrientationHorizontal_HorizontalOptionsStart.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyLayoutWithOrientationHorizontal_HorizontalOptionsStart.png
new file mode 100644
index 000000000000..fb81be67eb4f
Binary files /dev/null and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyLayoutWithOrientationHorizontal_HorizontalOptionsStart.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyLayoutWithOrientationHorizontal_HorizontalOptionsStartWithWidthRequest.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyLayoutWithOrientationHorizontal_HorizontalOptionsStartWithWidthRequest.png
new file mode 100644
index 000000000000..da45a69733c0
Binary files /dev/null and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyLayoutWithOrientationHorizontal_HorizontalOptionsStartWithWidthRequest.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyLayoutWithOrientationHorizontal_VerticalOptionsCenter.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyLayoutWithOrientationHorizontal_VerticalOptionsCenter.png
new file mode 100644
index 000000000000..71ed2ad6a12b
Binary files /dev/null and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyLayoutWithOrientationHorizontal_VerticalOptionsCenter.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyLayoutWithOrientationHorizontal_VerticalOptionsCenterWithHeightRequest.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyLayoutWithOrientationHorizontal_VerticalOptionsCenterWithHeightRequest.png
new file mode 100644
index 000000000000..92bcd7bfb471
Binary files /dev/null and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyLayoutWithOrientationHorizontal_VerticalOptionsCenterWithHeightRequest.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyLayoutWithOrientationHorizontal_VerticalOptionsEnd.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyLayoutWithOrientationHorizontal_VerticalOptionsEnd.png
new file mode 100644
index 000000000000..1a8fb7a97db6
Binary files /dev/null and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyLayoutWithOrientationHorizontal_VerticalOptionsEnd.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyLayoutWithOrientationHorizontal_VerticalOptionsEndWithHeightRequest.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyLayoutWithOrientationHorizontal_VerticalOptionsEndWithHeightRequest.png
new file mode 100644
index 000000000000..171ac05362ae
Binary files /dev/null and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyLayoutWithOrientationHorizontal_VerticalOptionsEndWithHeightRequest.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyLayoutWithOrientationHorizontal_VerticalOptionsFill.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyLayoutWithOrientationHorizontal_VerticalOptionsFill.png
new file mode 100644
index 000000000000..74c8cbbd0a17
Binary files /dev/null and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyLayoutWithOrientationHorizontal_VerticalOptionsFill.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyLayoutWithOrientationHorizontal_VerticalOptionsFillWithHeightRequest.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyLayoutWithOrientationHorizontal_VerticalOptionsFillWithHeightRequest.png
new file mode 100644
index 000000000000..fb5b61dc5edc
Binary files /dev/null and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyLayoutWithOrientationHorizontal_VerticalOptionsFillWithHeightRequest.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyLayoutWithOrientationHorizontal_VerticalOptionsStart.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyLayoutWithOrientationHorizontal_VerticalOptionsStart.png
new file mode 100644
index 000000000000..a4e0d7b97a7b
Binary files /dev/null and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyLayoutWithOrientationHorizontal_VerticalOptionsStart.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyLayoutWithOrientationHorizontal_VerticalOptionsStartWithHeightRequest.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyLayoutWithOrientationHorizontal_VerticalOptionsStartWithHeightRequest.png
new file mode 100644
index 000000000000..d5df5f769c00
Binary files /dev/null and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyLayoutWithOrientationHorizontal_VerticalOptionsStartWithHeightRequest.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyLayoutWithOrientationVertical_HorizontalOptionsCenter.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyLayoutWithOrientationVertical_HorizontalOptionsCenter.png
new file mode 100644
index 000000000000..07ea5e14cd2a
Binary files /dev/null and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyLayoutWithOrientationVertical_HorizontalOptionsCenter.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyLayoutWithOrientationVertical_HorizontalOptionsCenterWithWidthRequest.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyLayoutWithOrientationVertical_HorizontalOptionsCenterWithWidthRequest.png
new file mode 100644
index 000000000000..a1da5b46ae7a
Binary files /dev/null and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyLayoutWithOrientationVertical_HorizontalOptionsCenterWithWidthRequest.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyLayoutWithOrientationVertical_HorizontalOptionsEnd.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyLayoutWithOrientationVertical_HorizontalOptionsEnd.png
new file mode 100644
index 000000000000..4a7410f71f15
Binary files /dev/null and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyLayoutWithOrientationVertical_HorizontalOptionsEnd.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyLayoutWithOrientationVertical_HorizontalOptionsEndWithWidthRequest.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyLayoutWithOrientationVertical_HorizontalOptionsEndWithWidthRequest.png
new file mode 100644
index 000000000000..40985044f66d
Binary files /dev/null and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyLayoutWithOrientationVertical_HorizontalOptionsEndWithWidthRequest.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyLayoutWithOrientationVertical_HorizontalOptionsFill.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyLayoutWithOrientationVertical_HorizontalOptionsFill.png
new file mode 100644
index 000000000000..3493c39825a0
Binary files /dev/null and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyLayoutWithOrientationVertical_HorizontalOptionsFill.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyLayoutWithOrientationVertical_HorizontalOptionsFillWithWidthRequest.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyLayoutWithOrientationVertical_HorizontalOptionsFillWithWidthRequest.png
new file mode 100644
index 000000000000..b85af31ca7b5
Binary files /dev/null and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyLayoutWithOrientationVertical_HorizontalOptionsFillWithWidthRequest.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyLayoutWithOrientationVertical_HorizontalOptionsStart.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyLayoutWithOrientationVertical_HorizontalOptionsStart.png
new file mode 100644
index 000000000000..36d4265c6a85
Binary files /dev/null and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyLayoutWithOrientationVertical_HorizontalOptionsStart.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyLayoutWithOrientationVertical_HorizontalOptionsStartWithWidthRequest.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyLayoutWithOrientationVertical_HorizontalOptionsStartWithWidthRequest.png
new file mode 100644
index 000000000000..232251bd4469
Binary files /dev/null and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyLayoutWithOrientationVertical_HorizontalOptionsStartWithWidthRequest.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyLayoutWithOrientationVertical_VerticalOptionsCenter.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyLayoutWithOrientationVertical_VerticalOptionsCenter.png
new file mode 100644
index 000000000000..177ba44e2260
Binary files /dev/null and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyLayoutWithOrientationVertical_VerticalOptionsCenter.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyLayoutWithOrientationVertical_VerticalOptionsCenterWithHeightRequest.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyLayoutWithOrientationVertical_VerticalOptionsCenterWithHeightRequest.png
new file mode 100644
index 000000000000..a0a307606e1e
Binary files /dev/null and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyLayoutWithOrientationVertical_VerticalOptionsCenterWithHeightRequest.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyLayoutWithOrientationVertical_VerticalOptionsEnd.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyLayoutWithOrientationVertical_VerticalOptionsEnd.png
new file mode 100644
index 000000000000..03ce690dcbaf
Binary files /dev/null and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyLayoutWithOrientationVertical_VerticalOptionsEnd.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyLayoutWithOrientationVertical_VerticalOptionsEndWithHeightRequest.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyLayoutWithOrientationVertical_VerticalOptionsEndWithHeightRequest.png
new file mode 100644
index 000000000000..62b466698272
Binary files /dev/null and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyLayoutWithOrientationVertical_VerticalOptionsEndWithHeightRequest.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyLayoutWithOrientationVertical_VerticalOptionsFill.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyLayoutWithOrientationVertical_VerticalOptionsFill.png
new file mode 100644
index 000000000000..ffa50e38feb0
Binary files /dev/null and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyLayoutWithOrientationVertical_VerticalOptionsFill.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyLayoutWithOrientationVertical_VerticalOptionsFillWithHeightRequest.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyLayoutWithOrientationVertical_VerticalOptionsFillWithHeightRequest.png
new file mode 100644
index 000000000000..fe31708f35d0
Binary files /dev/null and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyLayoutWithOrientationVertical_VerticalOptionsFillWithHeightRequest.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyLayoutWithOrientationVertical_VerticalOptionsStart.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyLayoutWithOrientationVertical_VerticalOptionsStart.png
new file mode 100644
index 000000000000..88dd68b91aeb
Binary files /dev/null and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyLayoutWithOrientationVertical_VerticalOptionsStart.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyLayoutWithOrientationVertical_VerticalOptionsStartWithHeightRequest.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyLayoutWithOrientationVertical_VerticalOptionsStartWithHeightRequest.png
new file mode 100644
index 000000000000..4c84f21cb760
Binary files /dev/null and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyLayoutWithOrientationVertical_VerticalOptionsStartWithHeightRequest.png differ
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/ScrollViewWithLayoutOptionsFeatureTests.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/ScrollViewWithLayoutOptionsFeatureTests.cs
new file mode 100644
index 000000000000..2421cfd70483
--- /dev/null
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/ScrollViewWithLayoutOptionsFeatureTests.cs
@@ -0,0 +1,839 @@
+using NUnit.Framework;
+using UITest.Appium;
+using UITest.Core;
+
+
+namespace Microsoft.Maui.TestCases.Tests;
+
+public class ScrollViewWithLayoutOptionsFeatureTests : UITest
+{
+ public const string ScrollViewWithLayoutOptionsFeatureMatrix = "ScrollView With LayoutOptions Feature Matrix";
+ public const string Options = "Options";
+ public const string Apply = "Apply";
+ public const string HorizontalStart = "HorizontalStart";
+ public const string HorizontalCenter = "HorizontalCenter";
+ public const string HorizontalEnd = "HorizontalEnd";
+ public const string HorizontalFill = "HorizontalFill";
+ public const string VerticalFill = "VerticalFill";
+ public const string VerticalStart = "VerticalStart";
+ public const string VerticalCenter = "VerticalCenter";
+ public const string VerticalEnd = "VerticalEnd";
+ public const string WidthNone = "WidthNone";
+ public const string Width350 = "Width350";
+ public const string HeightNone = "HeightNone";
+ public const string Height300 = "Height300";
+ public const string StackLayoutButton = "StackLayoutButton";
+ public const string GridButton = "GridButton";
+ public const string OrientationHorizontal = "OrientationHorizontal";
+
+ public ScrollViewWithLayoutOptionsFeatureTests(TestDevice device)
+ : base(device)
+ {
+ }
+
+ protected override void FixtureSetup()
+ {
+ base.FixtureSetup();
+ App.NavigateToGallery(ScrollViewWithLayoutOptionsFeatureMatrix);
+ }
+
+ [Test, Order(1)]
+ [Category(UITestCategories.ScrollView)]
+ public void VerifyLayoutWithOrientationVertical_HorizontalOptionsStart()
+ {
+ App.WaitForElement(Options);
+ App.Tap(Options);
+ App.WaitForElement(HorizontalStart);
+ App.Tap(HorizontalStart);
+ App.WaitForElement(Apply);
+ App.Tap(Apply);
+ App.WaitForElement(StackLayoutButton);
+ App.Tap(StackLayoutButton);
+ VerifyScreenshot();
+ }
+
+ [Test, Order(2)]
+ [Category(UITestCategories.ScrollView)]
+ public void VerifyLayoutWithOrientationVertical_HorizontalOptionsFill()
+ {
+ App.WaitForElement(Options);
+ App.Tap(Options);
+ App.WaitForElement(HorizontalFill);
+ App.Tap(HorizontalFill);
+ App.WaitForElement(Apply);
+ App.Tap(Apply);
+ App.WaitForElement(StackLayoutButton);
+ App.Tap(StackLayoutButton);
+ VerifyScreenshot();
+ }
+
+ [Test, Order(3)]
+ [Category(UITestCategories.ScrollView)]
+ public void VerifyLayoutWithOrientationVertical_HorizontalOptionsCenter()
+ {
+ App.WaitForElement(Options);
+ App.Tap(Options);
+ App.WaitForElement(HorizontalCenter);
+ App.Tap(HorizontalCenter);
+ App.WaitForElement(Apply);
+ App.Tap(Apply);
+ App.WaitForElement(StackLayoutButton);
+ App.Tap(StackLayoutButton);
+ VerifyScreenshot();
+ }
+
+ [Test, Order(4)]
+ [Category(UITestCategories.ScrollView)]
+ public void VerifyLayoutWithOrientationVertical_HorizontalOptionsEnd()
+ {
+ App.WaitForElement(Options);
+ App.Tap(Options);
+ App.WaitForElement(HorizontalEnd);
+ App.Tap(HorizontalEnd);
+ App.WaitForElement(Apply);
+ App.Tap(Apply);
+ App.WaitForElement(StackLayoutButton);
+ App.Tap(StackLayoutButton);
+ VerifyScreenshot();
+ }
+
+ [Test, Order(5)]
+ [Category(UITestCategories.ScrollView)]
+ public void VerifyLayoutWithOrientationVertical_HorizontalOptionsStartWithWidthRequest()
+ {
+ App.WaitForElement(Options);
+ App.Tap(Options);
+ App.WaitForElement(HorizontalStart);
+ App.Tap(HorizontalStart);
+ App.WaitForElement(Width350);
+ App.Tap(Width350);
+ App.WaitForElement(Apply);
+ App.Tap(Apply);
+ App.WaitForElement(StackLayoutButton);
+ App.Tap(StackLayoutButton);
+ VerifyScreenshot();
+ }
+
+ [Test, Order(6)]
+ [Category(UITestCategories.ScrollView)]
+ public void VerifyLayoutWithOrientationVertical_HorizontalOptionsFillWithWidthRequest()
+ {
+ App.WaitForElement(Options);
+ App.Tap(Options);
+ App.WaitForElement(HorizontalFill);
+ App.Tap(HorizontalFill);
+ App.WaitForElement(Width350);
+ App.Tap(Width350);
+ App.WaitForElement(Apply);
+ App.Tap(Apply);
+ App.WaitForElement(StackLayoutButton);
+ App.Tap(StackLayoutButton);
+ VerifyScreenshot();
+ }
+
+ [Test, Order(7)]
+ [Category(UITestCategories.ScrollView)]
+ public void VerifyLayoutWithOrientationVertical_HorizontalOptionsCenterWithWidthRequest()
+ {
+ App.WaitForElement(Options);
+ App.Tap(Options);
+ App.WaitForElement(HorizontalCenter);
+ App.Tap(HorizontalCenter);
+ App.WaitForElement(Width350);
+ App.Tap(Width350);
+ App.WaitForElement(Apply);
+ App.Tap(Apply);
+ App.WaitForElement(StackLayoutButton);
+ App.Tap(StackLayoutButton);
+ VerifyScreenshot();
+ }
+
+ [Test, Order(8)]
+ [Category(UITestCategories.ScrollView)]
+ public void VerifyLayoutWithOrientationVertical_HorizontalOptionsEndWithWidthRequest()
+ {
+ App.WaitForElement(Options);
+ App.Tap(Options);
+ App.WaitForElement(HorizontalEnd);
+ App.Tap(HorizontalEnd);
+ App.WaitForElement(Width350);
+ App.Tap(Width350);
+ App.WaitForElement(Apply);
+ App.Tap(Apply);
+ App.WaitForElement(StackLayoutButton);
+ App.Tap(StackLayoutButton);
+ VerifyScreenshot();
+ }
+
+ [Test, Order(9)]
+ [Category(UITestCategories.ScrollView)]
+ public void VerifyLayoutWithOrientationVertical_VerticalOptionsStart()
+ {
+ App.WaitForElement(Options);
+ App.Tap(Options);
+ App.WaitForElement(VerticalStart);
+ App.Tap(VerticalStart);
+ App.WaitForElement(Apply);
+ App.Tap(Apply);
+ App.WaitForElement(StackLayoutButton);
+ App.Tap(StackLayoutButton);
+ VerifyScreenshot();
+ }
+
+ [Test, Order(10)]
+ [Category(UITestCategories.ScrollView)]
+ public void VerifyLayoutWithOrientationVertical_VerticalOptionsFill()
+ {
+ App.WaitForElement(Options);
+ App.Tap(Options);
+ App.WaitForElement(VerticalFill);
+ App.Tap(VerticalFill);
+ App.WaitForElement(Apply);
+ App.Tap(Apply);
+ App.WaitForElement(StackLayoutButton);
+ App.Tap(StackLayoutButton);
+ VerifyScreenshot();
+ }
+
+ [Test, Order(11)]
+ [Category(UITestCategories.ScrollView)]
+ public void VerifyLayoutWithOrientationVertical_VerticalOptionsCenter()
+ {
+ App.WaitForElement(Options);
+ App.Tap(Options);
+ App.WaitForElement(VerticalCenter);
+ App.Tap(VerticalCenter);
+ App.WaitForElement(Apply);
+ App.Tap(Apply);
+ App.WaitForElement(StackLayoutButton);
+ App.Tap(StackLayoutButton);
+ VerifyScreenshot();
+ }
+
+ [Test, Order(12)]
+ [Category(UITestCategories.ScrollView)]
+ public void VerifyLayoutWithOrientationVertical_VerticalOptionsEnd()
+ {
+ App.WaitForElement(Options);
+ App.Tap(Options);
+ App.WaitForElement(VerticalEnd);
+ App.Tap(VerticalEnd);
+ App.WaitForElement(Apply);
+ App.Tap(Apply);
+ App.WaitForElement(StackLayoutButton);
+ App.Tap(StackLayoutButton);
+ VerifyScreenshot();
+ }
+
+ [Test, Order(13)]
+ [Category(UITestCategories.ScrollView)]
+ public void VerifyLayoutWithOrientationVertical_VerticalOptionsStartWithHeightRequest()
+ {
+ App.WaitForElement(Options);
+ App.Tap(Options);
+ App.WaitForElement(VerticalStart);
+ App.Tap(VerticalStart);
+ App.WaitForElement(Height300);
+ App.Tap(Height300);
+ App.WaitForElement(Apply);
+ App.Tap(Apply);
+ App.WaitForElement(StackLayoutButton);
+ App.Tap(StackLayoutButton);
+ VerifyScreenshot();
+ }
+
+ [Test, Order(14)]
+ [Category(UITestCategories.ScrollView)]
+ public void VerifyLayoutWithOrientationVertical_VerticalOptionsFillWithHeightRequest()
+ {
+ App.WaitForElement(Options);
+ App.Tap(Options);
+ App.WaitForElement(VerticalFill);
+ App.Tap(VerticalFill);
+ App.WaitForElement(Height300);
+ App.Tap(Height300);
+ App.WaitForElement(Apply);
+ App.Tap(Apply);
+ App.WaitForElement(StackLayoutButton);
+ App.Tap(StackLayoutButton);
+ VerifyScreenshot();
+ }
+
+ [Test, Order(15)]
+ [Category(UITestCategories.ScrollView)]
+ public void VerifyLayoutWithOrientationVertical_VerticalOptionsCenterWithHeightRequest()
+ {
+ App.WaitForElement(Options);
+ App.Tap(Options);
+ App.WaitForElement(VerticalCenter);
+ App.Tap(VerticalCenter);
+ App.WaitForElement(Height300);
+ App.Tap(Height300);
+ App.WaitForElement(Apply);
+ App.Tap(Apply);
+ App.WaitForElement(StackLayoutButton);
+ App.Tap(StackLayoutButton);
+ VerifyScreenshot();
+ }
+
+ [Test, Order(16)]
+ [Category(UITestCategories.ScrollView)]
+ public void VerifyLayoutWithOrientationVertical_VerticalOptionsEndWithHeightRequest()
+ {
+ App.WaitForElement(Options);
+ App.Tap(Options);
+ App.WaitForElement(VerticalEnd);
+ App.Tap(VerticalEnd);
+ App.WaitForElement(Height300);
+ App.Tap(Height300);
+ App.WaitForElement(Apply);
+ App.Tap(Apply);
+ App.WaitForElement(StackLayoutButton);
+ App.Tap(StackLayoutButton);
+ VerifyScreenshot();
+ }
+
+ [Test, Order(17)]
+ [Category(UITestCategories.ScrollView)]
+ public void VerifyLayoutWithOrientationHorizontal_HorizontalOptionsStart()
+ {
+ App.WaitForElement(Options);
+ App.Tap(Options);
+ App.WaitForElement(HorizontalStart);
+ App.Tap(HorizontalStart);
+ App.WaitForElement(OrientationHorizontal);
+ App.Tap(OrientationHorizontal);
+ App.WaitForElement(Apply);
+ App.Tap(Apply);
+ App.WaitForElement(StackLayoutButton);
+ App.Tap(StackLayoutButton);
+ VerifyScreenshot();
+ }
+
+ [Test, Order(18)]
+ [Category(UITestCategories.ScrollView)]
+ public void VerifyLayoutWithOrientationHorizontal_HorizontalOptionsFill()
+ {
+ App.WaitForElement(Options);
+ App.Tap(Options);
+ App.WaitForElement(HorizontalFill);
+ App.Tap(HorizontalFill);
+ App.WaitForElement(OrientationHorizontal);
+ App.Tap(OrientationHorizontal);
+ App.WaitForElement(Apply);
+ App.Tap(Apply);
+ App.WaitForElement(StackLayoutButton);
+ App.Tap(StackLayoutButton);
+ VerifyScreenshot();
+ }
+
+ [Test, Order(19)]
+ [Category(UITestCategories.ScrollView)]
+ public void VerifyLayoutWithOrientationHorizontal_HorizontalOptionsCenter()
+ {
+ App.WaitForElement(Options);
+ App.Tap(Options);
+ App.WaitForElement(HorizontalCenter);
+ App.Tap(HorizontalCenter);
+ App.WaitForElement(OrientationHorizontal);
+ App.Tap(OrientationHorizontal);
+ App.WaitForElement(Apply);
+ App.Tap(Apply);
+ App.WaitForElement(StackLayoutButton);
+ App.Tap(StackLayoutButton);
+ VerifyScreenshot();
+ }
+
+ [Test, Order(20)]
+ [Category(UITestCategories.ScrollView)]
+ public void VerifyLayoutWithOrientationHorizontal_HorizontalOptionsEnd()
+ {
+ App.WaitForElement(Options);
+ App.Tap(Options);
+ App.WaitForElement(HorizontalEnd);
+ App.Tap(HorizontalEnd);
+ App.WaitForElement(OrientationHorizontal);
+ App.Tap(OrientationHorizontal);
+ App.WaitForElement(Apply);
+ App.Tap(Apply);
+ App.WaitForElement(StackLayoutButton);
+ App.Tap(StackLayoutButton);
+ VerifyScreenshot();
+ }
+
+ [Test, Order(21)]
+ [Category(UITestCategories.ScrollView)]
+ public void VerifyLayoutWithOrientationHorizontal_HorizontalOptionsStartWithWidthRequest()
+ {
+ App.WaitForElement(Options);
+ App.Tap(Options);
+ App.WaitForElement(HorizontalStart);
+ App.Tap(HorizontalStart);
+ App.WaitForElement(OrientationHorizontal);
+ App.Tap(OrientationHorizontal);
+ App.WaitForElement(Width350);
+ App.Tap(Width350);
+ App.WaitForElement(Apply);
+ App.Tap(Apply);
+ App.WaitForElement(StackLayoutButton);
+ App.Tap(StackLayoutButton);
+ VerifyScreenshot();
+ }
+
+ [Test, Order(22)]
+ [Category(UITestCategories.ScrollView)]
+ public void VerifyLayoutWithOrientationHorizontal_HorizontalOptionsFillWithWidthRequest()
+ {
+ App.WaitForElement(Options);
+ App.Tap(Options);
+ App.WaitForElement(HorizontalFill);
+ App.Tap(HorizontalFill);
+ App.WaitForElement(OrientationHorizontal);
+ App.Tap(OrientationHorizontal);
+ App.WaitForElement(Width350);
+ App.Tap(Width350);
+ App.WaitForElement(Apply);
+ App.Tap(Apply);
+ App.WaitForElement(StackLayoutButton);
+ App.Tap(StackLayoutButton);
+ VerifyScreenshot();
+ }
+
+ [Test, Order(23)]
+ [Category(UITestCategories.ScrollView)]
+ public void VerifyLayoutWithOrientationHorizontal_HorizontalOptionsCenterWithWidthRequest()
+ {
+ App.WaitForElement(Options);
+ App.Tap(Options);
+ App.WaitForElement(HorizontalCenter);
+ App.Tap(HorizontalCenter);
+ App.WaitForElement(OrientationHorizontal);
+ App.Tap(OrientationHorizontal);
+ App.WaitForElement(Width350);
+ App.Tap(Width350);
+ App.WaitForElement(Apply);
+ App.Tap(Apply);
+ App.WaitForElement(StackLayoutButton);
+ App.Tap(StackLayoutButton);
+ VerifyScreenshot();
+ }
+
+ [Test, Order(24)]
+ [Category(UITestCategories.ScrollView)]
+ public void VerifyLayoutWithOrientationHorizontal_HorizontalOptionsEndWithWidthRequest()
+ {
+ App.WaitForElement(Options);
+ App.Tap(Options);
+ App.WaitForElement(HorizontalEnd);
+ App.Tap(HorizontalEnd);
+ App.WaitForElement(OrientationHorizontal);
+ App.Tap(OrientationHorizontal);
+ App.WaitForElement(Width350);
+ App.Tap(Width350);
+ App.WaitForElement(Apply);
+ App.Tap(Apply);
+ App.WaitForElement(StackLayoutButton);
+ App.Tap(StackLayoutButton);
+ VerifyScreenshot();
+ }
+
+ [Test, Order(25)]
+ [Category(UITestCategories.ScrollView)]
+ public void VerifyLayoutWithOrientationHorizontal_VerticalOptionsStart()
+ {
+ App.WaitForElement(Options);
+ App.Tap(Options);
+ App.WaitForElement(VerticalStart);
+ App.Tap(VerticalStart);
+ App.WaitForElement(OrientationHorizontal);
+ App.Tap(OrientationHorizontal);
+ App.WaitForElement(Apply);
+ App.Tap(Apply);
+ App.WaitForElement(StackLayoutButton);
+ App.Tap(StackLayoutButton);
+ VerifyScreenshot();
+ }
+
+ [Test, Order(26)]
+ [Category(UITestCategories.ScrollView)]
+ public void VerifyLayoutWithOrientationHorizontal_VerticalOptionsFill()
+ {
+ App.WaitForElement(Options);
+ App.Tap(Options);
+ App.WaitForElement(VerticalFill);
+ App.Tap(VerticalFill);
+ App.WaitForElement(OrientationHorizontal);
+ App.Tap(OrientationHorizontal);
+ App.WaitForElement(Apply);
+ App.Tap(Apply);
+ App.WaitForElement(StackLayoutButton);
+ App.Tap(StackLayoutButton);
+ VerifyScreenshot();
+ }
+
+ [Test, Order(27)]
+ [Category(UITestCategories.ScrollView)]
+ public void VerifyLayoutWithOrientationHorizontal_VerticalOptionsCenter()
+ {
+ App.WaitForElement(Options);
+ App.Tap(Options);
+ App.WaitForElement(VerticalCenter);
+ App.Tap(VerticalCenter);
+ App.WaitForElement(OrientationHorizontal);
+ App.Tap(OrientationHorizontal);
+ App.WaitForElement(Apply);
+ App.Tap(Apply);
+ App.WaitForElement(StackLayoutButton);
+ App.Tap(StackLayoutButton);
+ VerifyScreenshot();
+ }
+
+ [Test, Order(28)]
+ [Category(UITestCategories.ScrollView)]
+ public void VerifyLayoutWithOrientationHorizontal_VerticalOptionsEnd()
+ {
+ App.WaitForElement(Options);
+ App.Tap(Options);
+ App.WaitForElement(VerticalEnd);
+ App.Tap(VerticalEnd);
+ App.WaitForElement(OrientationHorizontal);
+ App.Tap(OrientationHorizontal);
+ App.WaitForElement(Apply);
+ App.Tap(Apply);
+ App.WaitForElement(StackLayoutButton);
+ App.Tap(StackLayoutButton);
+ VerifyScreenshot();
+ }
+
+ [Test, Order(29)]
+ [Category(UITestCategories.ScrollView)]
+ public void VerifyLayoutWithOrientationHorizontal_VerticalOptionsStartWithHeightRequest()
+ {
+ App.WaitForElement(Options);
+ App.Tap(Options);
+ App.WaitForElement(VerticalStart);
+ App.Tap(VerticalStart);
+ App.WaitForElement(OrientationHorizontal);
+ App.Tap(OrientationHorizontal);
+ App.WaitForElement(Height300);
+ App.Tap(Height300);
+ App.WaitForElement(Apply);
+ App.Tap(Apply);
+ App.WaitForElement(StackLayoutButton);
+ App.Tap(StackLayoutButton);
+ VerifyScreenshot();
+ }
+
+ [Test, Order(30)]
+ [Category(UITestCategories.ScrollView)]
+ public void VerifyLayoutWithOrientationHorizontal_VerticalOptionsFillWithHeightRequest()
+ {
+ App.WaitForElement(Options);
+ App.Tap(Options);
+ App.WaitForElement(VerticalFill);
+ App.Tap(VerticalFill);
+ App.WaitForElement(OrientationHorizontal);
+ App.Tap(OrientationHorizontal);
+ App.WaitForElement(Height300);
+ App.Tap(Height300);
+ App.WaitForElement(Apply);
+ App.Tap(Apply);
+ App.WaitForElement(StackLayoutButton);
+ App.Tap(StackLayoutButton);
+ VerifyScreenshot();
+ }
+
+ [Test, Order(31)]
+ [Category(UITestCategories.ScrollView)]
+ public void VerifyLayoutWithOrientationHorizontal_VerticalOptionsCenterWithHeightRequest()
+ {
+ App.WaitForElement(Options);
+ App.Tap(Options);
+ App.WaitForElement(VerticalCenter);
+ App.Tap(VerticalCenter);
+ App.WaitForElement(OrientationHorizontal);
+ App.Tap(OrientationHorizontal);
+ App.WaitForElement(Height300);
+ App.Tap(Height300);
+ App.WaitForElement(Apply);
+ App.Tap(Apply);
+ App.WaitForElement(StackLayoutButton);
+ App.Tap(StackLayoutButton);
+ VerifyScreenshot();
+ }
+
+ [Test, Order(32)]
+ [Category(UITestCategories.ScrollView)]
+ public void VerifyLayoutWithOrientationHorizontal_VerticalOptionsEndWithHeightRequest()
+ {
+ App.WaitForElement(Options);
+ App.Tap(Options);
+ App.WaitForElement(VerticalEnd);
+ App.Tap(VerticalEnd);
+ App.WaitForElement(OrientationHorizontal);
+ App.Tap(OrientationHorizontal);
+ App.WaitForElement(Height300);
+ App.Tap(Height300);
+ App.WaitForElement(Apply);
+ App.Tap(Apply);
+ App.WaitForElement(StackLayoutButton);
+ App.Tap(StackLayoutButton);
+ VerifyScreenshot();
+ }
+
+ [Test, Order(33)]
+ [Category(UITestCategories.ScrollView)]
+ public void VerifyGridLayout_HorizontalOptionsStart()
+ {
+ App.WaitForElement(Options);
+ App.Tap(Options);
+ App.WaitForElement(HorizontalStart);
+ App.Tap(HorizontalStart);
+ App.WaitForElement(Apply);
+ App.Tap(Apply);
+ App.WaitForElement(GridButton);
+ App.Tap(GridButton);
+ VerifyScreenshot();
+ }
+
+ [Test, Order(34)]
+ [Category(UITestCategories.ScrollView)]
+ public void VerifyGridLayout_HorizontalOptionsCenter()
+ {
+ App.WaitForElement(Options);
+ App.Tap(Options);
+ App.WaitForElement(HorizontalCenter);
+ App.Tap(HorizontalCenter);
+ App.WaitForElement(Apply);
+ App.Tap(Apply);
+ App.WaitForElement(GridButton);
+ App.Tap(GridButton);
+ VerifyScreenshot();
+ }
+
+ [Test, Order(35)]
+ [Category(UITestCategories.ScrollView)]
+ public void VerifyGridLayout_HorizontalOptionsEnd()
+ {
+ App.WaitForElement(Options);
+ App.Tap(Options);
+ App.WaitForElement(HorizontalEnd);
+ App.Tap(HorizontalEnd);
+ App.WaitForElement(Apply);
+ App.Tap(Apply);
+ App.WaitForElement(GridButton);
+ App.Tap(GridButton);
+ VerifyScreenshot();
+ }
+
+ [Test, Order(36)]
+ [Category(UITestCategories.ScrollView)]
+ public void VerifyGridLayout_HorizontalOptionsFill()
+ {
+ App.WaitForElement(Options);
+ App.Tap(Options);
+ App.WaitForElement(HorizontalFill);
+ App.Tap(HorizontalFill);
+ App.WaitForElement(Apply);
+ App.Tap(Apply);
+ App.WaitForElement(GridButton);
+ App.Tap(GridButton);
+ VerifyScreenshot();
+ }
+
+ [Test, Order(37)]
+ [Category(UITestCategories.ScrollView)]
+ public void VerifyGridLayout_VerticalOptionsStart()
+ {
+ App.WaitForElement(Options);
+ App.Tap(Options);
+ App.WaitForElement(VerticalStart);
+ App.Tap(VerticalStart);
+ App.WaitForElement(Apply);
+ App.Tap(Apply);
+ App.WaitForElement(GridButton);
+ App.Tap(GridButton);
+ VerifyScreenshot();
+ }
+
+ [Test, Order(38)]
+ [Category(UITestCategories.ScrollView)]
+ public void VerifyGridLayout_VerticalOptionsCenter()
+ {
+ App.WaitForElement(Options);
+ App.Tap(Options);
+ App.WaitForElement(VerticalCenter);
+ App.Tap(VerticalCenter);
+ App.WaitForElement(Apply);
+ App.Tap(Apply);
+ App.WaitForElement(GridButton);
+ App.Tap(GridButton);
+ VerifyScreenshot();
+ }
+
+ [Test, Order(39)]
+ [Category(UITestCategories.ScrollView)]
+ public void VerifyGridLayout_VerticalOptionsEnd()
+ {
+ App.WaitForElement(Options);
+ App.Tap(Options);
+ App.WaitForElement(VerticalEnd);
+ App.Tap(VerticalEnd);
+ App.WaitForElement(Apply);
+ App.Tap(Apply);
+ App.WaitForElement(GridButton);
+ App.Tap(GridButton);
+ VerifyScreenshot();
+ }
+
+ [Test, Order(40)]
+ [Category(UITestCategories.ScrollView)]
+ public void VerifyGridLayout_VerticalOptionsFill()
+ {
+ App.WaitForElement(Options);
+ App.Tap(Options);
+ App.WaitForElement(VerticalFill);
+ App.Tap(VerticalFill);
+ App.WaitForElement(Apply);
+ App.Tap(Apply);
+ App.WaitForElement(GridButton);
+ App.Tap(GridButton);
+ VerifyScreenshot();
+ }
+
+ [Test, Order(41)]
+ [Category(UITestCategories.ScrollView)]
+ public void VerifyGridLayout_HorizontalOptionsStartWithWidthRequest()
+ {
+ App.WaitForElement(Options);
+ App.Tap(Options);
+ App.WaitForElement(HorizontalStart);
+ App.Tap(HorizontalStart);
+ App.WaitForElement(Width350);
+ App.Tap(Width350);
+ App.WaitForElement(Apply);
+ App.Tap(Apply);
+ App.WaitForElement(GridButton);
+ App.Tap(GridButton);
+ VerifyScreenshot();
+ }
+
+ [Test, Order(42)]
+ [Category(UITestCategories.ScrollView)]
+ public void VerifyGridLayout_HorizontalOptionsCenterWithWidthRequest()
+ {
+ App.WaitForElement(Options);
+ App.Tap(Options);
+ App.WaitForElement(HorizontalCenter);
+ App.Tap(HorizontalCenter);
+ App.WaitForElement(Width350);
+ App.Tap(Width350);
+ App.WaitForElement(Apply);
+ App.Tap(Apply);
+ App.WaitForElement(GridButton);
+ App.Tap(GridButton);
+ VerifyScreenshot();
+ }
+
+ [Test, Order(43)]
+ [Category(UITestCategories.ScrollView)]
+ public void VerifyGridLayout_HorizontalOptionsEndWithWidthRequest()
+ {
+ App.WaitForElement(Options);
+ App.Tap(Options);
+ App.WaitForElement(HorizontalEnd);
+ App.Tap(HorizontalEnd);
+ App.WaitForElement(Width350);
+ App.Tap(Width350);
+ App.WaitForElement(Apply);
+ App.Tap(Apply);
+ App.WaitForElement(GridButton);
+ App.Tap(GridButton);
+ VerifyScreenshot();
+ }
+
+ [Test, Order(44)]
+ [Category(UITestCategories.ScrollView)]
+ public void VerifyGridLayout_HorizontalOptionsFillWithWidthRequest()
+ {
+ App.WaitForElement(Options);
+ App.Tap(Options);
+ App.WaitForElement(HorizontalFill);
+ App.Tap(HorizontalFill);
+ App.WaitForElement(Width350);
+ App.Tap(Width350);
+ App.WaitForElement(Apply);
+ App.Tap(Apply);
+ App.WaitForElement(GridButton);
+ App.Tap(GridButton);
+ VerifyScreenshot();
+ }
+
+ [Test, Order(45)]
+ [Category(UITestCategories.ScrollView)]
+ public void VerifyGridLayout_VerticalOptionsStartWithHeightRequest()
+ {
+ App.WaitForElement(Options);
+ App.Tap(Options);
+ App.WaitForElement(VerticalStart);
+ App.Tap(VerticalStart);
+ App.WaitForElement(Height300);
+ App.Tap(Height300);
+ App.WaitForElement(Apply);
+ App.Tap(Apply);
+ App.WaitForElement(GridButton);
+ App.Tap(GridButton);
+ VerifyScreenshot();
+ }
+
+ [Test, Order(46)]
+ [Category(UITestCategories.ScrollView)]
+ public void VerifyGridLayout_VerticalOptionsCenterWithHeightRequest()
+ {
+ App.WaitForElement(Options);
+ App.Tap(Options);
+ App.WaitForElement(VerticalCenter);
+ App.Tap(VerticalCenter);
+ App.WaitForElement(Height300);
+ App.Tap(Height300);
+ App.WaitForElement(Apply);
+ App.Tap(Apply);
+ App.WaitForElement(GridButton);
+ App.Tap(GridButton);
+ VerifyScreenshot();
+ }
+
+ [Test, Order(47)]
+ [Category(UITestCategories.ScrollView)]
+ public void VerifyGridLayout_VerticalOptionsEndWithHeightRequest()
+ {
+ App.WaitForElement(Options);
+ App.Tap(Options);
+ App.WaitForElement(VerticalEnd);
+ App.Tap(VerticalEnd);
+ App.WaitForElement(Height300);
+ App.Tap(Height300);
+ App.WaitForElement(Apply);
+ App.Tap(Apply);
+ App.WaitForElement(GridButton);
+ App.Tap(GridButton);
+ VerifyScreenshot();
+ }
+
+ [Test, Order(48)]
+ [Category(UITestCategories.ScrollView)]
+ public void VerifyGridLayout_VerticalOptionsFillWithHeightRequest()
+ {
+ App.WaitForElement(Options);
+ App.Tap(Options);
+ App.WaitForElement(VerticalFill);
+ App.Tap(VerticalFill);
+ App.WaitForElement(Height300);
+ App.Tap(Height300);
+ App.WaitForElement(Apply);
+ App.Tap(Apply);
+ App.WaitForElement(GridButton);
+ App.Tap(GridButton);
+ VerifyScreenshot();
+ }
+}
\ No newline at end of file
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyGridLayout_HorizontalOptionsCenter.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyGridLayout_HorizontalOptionsCenter.png
new file mode 100644
index 000000000000..7148789c1ba6
Binary files /dev/null and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyGridLayout_HorizontalOptionsCenter.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyGridLayout_HorizontalOptionsCenterWithWidthRequest.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyGridLayout_HorizontalOptionsCenterWithWidthRequest.png
new file mode 100644
index 000000000000..ec08bc561709
Binary files /dev/null and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyGridLayout_HorizontalOptionsCenterWithWidthRequest.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyGridLayout_HorizontalOptionsEnd.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyGridLayout_HorizontalOptionsEnd.png
new file mode 100644
index 000000000000..c3fa3e8cad9c
Binary files /dev/null and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyGridLayout_HorizontalOptionsEnd.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyGridLayout_HorizontalOptionsEndWithWidthRequest.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyGridLayout_HorizontalOptionsEndWithWidthRequest.png
new file mode 100644
index 000000000000..4641f1f0524f
Binary files /dev/null and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyGridLayout_HorizontalOptionsEndWithWidthRequest.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyGridLayout_HorizontalOptionsFill.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyGridLayout_HorizontalOptionsFill.png
new file mode 100644
index 000000000000..2cafc0c102f2
Binary files /dev/null and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyGridLayout_HorizontalOptionsFill.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyGridLayout_HorizontalOptionsFillWithWidthRequest.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyGridLayout_HorizontalOptionsFillWithWidthRequest.png
new file mode 100644
index 000000000000..6eb6e0b4effe
Binary files /dev/null and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyGridLayout_HorizontalOptionsFillWithWidthRequest.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyGridLayout_HorizontalOptionsStart.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyGridLayout_HorizontalOptionsStart.png
new file mode 100644
index 000000000000..c7f18cb6a754
Binary files /dev/null and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyGridLayout_HorizontalOptionsStart.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyGridLayout_HorizontalOptionsStartWithWidthRequest.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyGridLayout_HorizontalOptionsStartWithWidthRequest.png
new file mode 100644
index 000000000000..9d3c83ba153b
Binary files /dev/null and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyGridLayout_HorizontalOptionsStartWithWidthRequest.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyGridLayout_VerticalOptionsCenter.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyGridLayout_VerticalOptionsCenter.png
new file mode 100644
index 000000000000..c5a3a3d9dcec
Binary files /dev/null and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyGridLayout_VerticalOptionsCenter.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyGridLayout_VerticalOptionsCenterWithHeightRequest.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyGridLayout_VerticalOptionsCenterWithHeightRequest.png
new file mode 100644
index 000000000000..a1d8528c25d3
Binary files /dev/null and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyGridLayout_VerticalOptionsCenterWithHeightRequest.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyGridLayout_VerticalOptionsEnd.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyGridLayout_VerticalOptionsEnd.png
new file mode 100644
index 000000000000..8cedde60a102
Binary files /dev/null and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyGridLayout_VerticalOptionsEnd.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyGridLayout_VerticalOptionsEndWithHeightRequest.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyGridLayout_VerticalOptionsEndWithHeightRequest.png
new file mode 100644
index 000000000000..fdd0a99d528b
Binary files /dev/null and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyGridLayout_VerticalOptionsEndWithHeightRequest.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyGridLayout_VerticalOptionsFill.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyGridLayout_VerticalOptionsFill.png
new file mode 100644
index 000000000000..4e5863685d7e
Binary files /dev/null and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyGridLayout_VerticalOptionsFill.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyGridLayout_VerticalOptionsFillWithHeightRequest.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyGridLayout_VerticalOptionsFillWithHeightRequest.png
new file mode 100644
index 000000000000..f96ccff7b143
Binary files /dev/null and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyGridLayout_VerticalOptionsFillWithHeightRequest.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyGridLayout_VerticalOptionsStart.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyGridLayout_VerticalOptionsStart.png
new file mode 100644
index 000000000000..4353dd914974
Binary files /dev/null and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyGridLayout_VerticalOptionsStart.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyGridLayout_VerticalOptionsStartWithHeightRequest.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyGridLayout_VerticalOptionsStartWithHeightRequest.png
new file mode 100644
index 000000000000..3e561de3d9e4
Binary files /dev/null and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyGridLayout_VerticalOptionsStartWithHeightRequest.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLayoutWithOrientationHorizontal_HorizontalOptionsCenter.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLayoutWithOrientationHorizontal_HorizontalOptionsCenter.png
new file mode 100644
index 000000000000..16e2e31be493
Binary files /dev/null and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLayoutWithOrientationHorizontal_HorizontalOptionsCenter.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLayoutWithOrientationHorizontal_HorizontalOptionsCenterWithWidthRequest.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLayoutWithOrientationHorizontal_HorizontalOptionsCenterWithWidthRequest.png
new file mode 100644
index 000000000000..a2f7bfac1642
Binary files /dev/null and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLayoutWithOrientationHorizontal_HorizontalOptionsCenterWithWidthRequest.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLayoutWithOrientationHorizontal_HorizontalOptionsEnd.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLayoutWithOrientationHorizontal_HorizontalOptionsEnd.png
new file mode 100644
index 000000000000..f64b46c9e29a
Binary files /dev/null and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLayoutWithOrientationHorizontal_HorizontalOptionsEnd.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLayoutWithOrientationHorizontal_HorizontalOptionsEndWithWidthRequest.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLayoutWithOrientationHorizontal_HorizontalOptionsEndWithWidthRequest.png
new file mode 100644
index 000000000000..51586a5d4990
Binary files /dev/null and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLayoutWithOrientationHorizontal_HorizontalOptionsEndWithWidthRequest.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLayoutWithOrientationHorizontal_HorizontalOptionsFill.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLayoutWithOrientationHorizontal_HorizontalOptionsFill.png
new file mode 100644
index 000000000000..981315cb429c
Binary files /dev/null and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLayoutWithOrientationHorizontal_HorizontalOptionsFill.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLayoutWithOrientationHorizontal_HorizontalOptionsFillWithWidthRequest.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLayoutWithOrientationHorizontal_HorizontalOptionsFillWithWidthRequest.png
new file mode 100644
index 000000000000..43c64385e5e6
Binary files /dev/null and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLayoutWithOrientationHorizontal_HorizontalOptionsFillWithWidthRequest.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLayoutWithOrientationHorizontal_HorizontalOptionsStart.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLayoutWithOrientationHorizontal_HorizontalOptionsStart.png
new file mode 100644
index 000000000000..2685035ce40a
Binary files /dev/null and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLayoutWithOrientationHorizontal_HorizontalOptionsStart.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLayoutWithOrientationHorizontal_HorizontalOptionsStartWithWidthRequest.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLayoutWithOrientationHorizontal_HorizontalOptionsStartWithWidthRequest.png
new file mode 100644
index 000000000000..edb5c53af9ff
Binary files /dev/null and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLayoutWithOrientationHorizontal_HorizontalOptionsStartWithWidthRequest.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLayoutWithOrientationHorizontal_VerticalOptionsCenter.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLayoutWithOrientationHorizontal_VerticalOptionsCenter.png
new file mode 100644
index 000000000000..6a288183403e
Binary files /dev/null and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLayoutWithOrientationHorizontal_VerticalOptionsCenter.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLayoutWithOrientationHorizontal_VerticalOptionsCenterWithHeightRequest.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLayoutWithOrientationHorizontal_VerticalOptionsCenterWithHeightRequest.png
new file mode 100644
index 000000000000..65a6a2222b36
Binary files /dev/null and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLayoutWithOrientationHorizontal_VerticalOptionsCenterWithHeightRequest.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLayoutWithOrientationHorizontal_VerticalOptionsEnd.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLayoutWithOrientationHorizontal_VerticalOptionsEnd.png
new file mode 100644
index 000000000000..c58070acfc1d
Binary files /dev/null and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLayoutWithOrientationHorizontal_VerticalOptionsEnd.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLayoutWithOrientationHorizontal_VerticalOptionsEndWithHeightRequest.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLayoutWithOrientationHorizontal_VerticalOptionsEndWithHeightRequest.png
new file mode 100644
index 000000000000..cb5f2fa5b9e6
Binary files /dev/null and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLayoutWithOrientationHorizontal_VerticalOptionsEndWithHeightRequest.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLayoutWithOrientationHorizontal_VerticalOptionsFill.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLayoutWithOrientationHorizontal_VerticalOptionsFill.png
new file mode 100644
index 000000000000..9f94e7171051
Binary files /dev/null and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLayoutWithOrientationHorizontal_VerticalOptionsFill.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLayoutWithOrientationHorizontal_VerticalOptionsFillWithHeightRequest.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLayoutWithOrientationHorizontal_VerticalOptionsFillWithHeightRequest.png
new file mode 100644
index 000000000000..adcaf9052dc6
Binary files /dev/null and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLayoutWithOrientationHorizontal_VerticalOptionsFillWithHeightRequest.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLayoutWithOrientationHorizontal_VerticalOptionsStart.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLayoutWithOrientationHorizontal_VerticalOptionsStart.png
new file mode 100644
index 000000000000..4df7791eed29
Binary files /dev/null and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLayoutWithOrientationHorizontal_VerticalOptionsStart.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLayoutWithOrientationHorizontal_VerticalOptionsStartWithHeightRequest.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLayoutWithOrientationHorizontal_VerticalOptionsStartWithHeightRequest.png
new file mode 100644
index 000000000000..a14c59adc8e2
Binary files /dev/null and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLayoutWithOrientationHorizontal_VerticalOptionsStartWithHeightRequest.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLayoutWithOrientationVertical_HorizontalOptionsCenter.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLayoutWithOrientationVertical_HorizontalOptionsCenter.png
new file mode 100644
index 000000000000..a4703fc6a4e3
Binary files /dev/null and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLayoutWithOrientationVertical_HorizontalOptionsCenter.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLayoutWithOrientationVertical_HorizontalOptionsCenterWithWidthRequest.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLayoutWithOrientationVertical_HorizontalOptionsCenterWithWidthRequest.png
new file mode 100644
index 000000000000..41d347381532
Binary files /dev/null and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLayoutWithOrientationVertical_HorizontalOptionsCenterWithWidthRequest.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLayoutWithOrientationVertical_HorizontalOptionsEnd.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLayoutWithOrientationVertical_HorizontalOptionsEnd.png
new file mode 100644
index 000000000000..ae914cff455c
Binary files /dev/null and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLayoutWithOrientationVertical_HorizontalOptionsEnd.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLayoutWithOrientationVertical_HorizontalOptionsEndWithWidthRequest.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLayoutWithOrientationVertical_HorizontalOptionsEndWithWidthRequest.png
new file mode 100644
index 000000000000..48a6bda5be6d
Binary files /dev/null and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLayoutWithOrientationVertical_HorizontalOptionsEndWithWidthRequest.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLayoutWithOrientationVertical_HorizontalOptionsFill.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLayoutWithOrientationVertical_HorizontalOptionsFill.png
new file mode 100644
index 000000000000..d851c21a634e
Binary files /dev/null and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLayoutWithOrientationVertical_HorizontalOptionsFill.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLayoutWithOrientationVertical_HorizontalOptionsFillWithWidthRequest.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLayoutWithOrientationVertical_HorizontalOptionsFillWithWidthRequest.png
new file mode 100644
index 000000000000..3d811412d597
Binary files /dev/null and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLayoutWithOrientationVertical_HorizontalOptionsFillWithWidthRequest.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLayoutWithOrientationVertical_HorizontalOptionsStart.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLayoutWithOrientationVertical_HorizontalOptionsStart.png
new file mode 100644
index 000000000000..2ec7e320b01d
Binary files /dev/null and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLayoutWithOrientationVertical_HorizontalOptionsStart.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLayoutWithOrientationVertical_HorizontalOptionsStartWithWidthRequest.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLayoutWithOrientationVertical_HorizontalOptionsStartWithWidthRequest.png
new file mode 100644
index 000000000000..03c860f522b9
Binary files /dev/null and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLayoutWithOrientationVertical_HorizontalOptionsStartWithWidthRequest.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLayoutWithOrientationVertical_VerticalOptionsCenter.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLayoutWithOrientationVertical_VerticalOptionsCenter.png
new file mode 100644
index 000000000000..09f3a2d4c56f
Binary files /dev/null and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLayoutWithOrientationVertical_VerticalOptionsCenter.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLayoutWithOrientationVertical_VerticalOptionsCenterWithHeightRequest.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLayoutWithOrientationVertical_VerticalOptionsCenterWithHeightRequest.png
new file mode 100644
index 000000000000..a7d1735995d4
Binary files /dev/null and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLayoutWithOrientationVertical_VerticalOptionsCenterWithHeightRequest.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLayoutWithOrientationVertical_VerticalOptionsEnd.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLayoutWithOrientationVertical_VerticalOptionsEnd.png
new file mode 100644
index 000000000000..2d7b1b02a0a5
Binary files /dev/null and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLayoutWithOrientationVertical_VerticalOptionsEnd.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLayoutWithOrientationVertical_VerticalOptionsEndWithHeightRequest.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLayoutWithOrientationVertical_VerticalOptionsEndWithHeightRequest.png
new file mode 100644
index 000000000000..8c18183d44cb
Binary files /dev/null and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLayoutWithOrientationVertical_VerticalOptionsEndWithHeightRequest.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLayoutWithOrientationVertical_VerticalOptionsFill.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLayoutWithOrientationVertical_VerticalOptionsFill.png
new file mode 100644
index 000000000000..b25629c77084
Binary files /dev/null and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLayoutWithOrientationVertical_VerticalOptionsFill.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLayoutWithOrientationVertical_VerticalOptionsFillWithHeightRequest.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLayoutWithOrientationVertical_VerticalOptionsFillWithHeightRequest.png
new file mode 100644
index 000000000000..e4cbf10052ee
Binary files /dev/null and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLayoutWithOrientationVertical_VerticalOptionsFillWithHeightRequest.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLayoutWithOrientationVertical_VerticalOptionsStart.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLayoutWithOrientationVertical_VerticalOptionsStart.png
new file mode 100644
index 000000000000..6d17246b8ad3
Binary files /dev/null and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLayoutWithOrientationVertical_VerticalOptionsStart.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLayoutWithOrientationVertical_VerticalOptionsStartWithHeightRequest.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLayoutWithOrientationVertical_VerticalOptionsStartWithHeightRequest.png
new file mode 100644
index 000000000000..4bc5e3daf74b
Binary files /dev/null and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLayoutWithOrientationVertical_VerticalOptionsStartWithHeightRequest.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyGridLayout_HorizontalOptionsCenter.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyGridLayout_HorizontalOptionsCenter.png
new file mode 100644
index 000000000000..1d85f8225a96
Binary files /dev/null and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyGridLayout_HorizontalOptionsCenter.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyGridLayout_HorizontalOptionsCenterWithWidthRequest.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyGridLayout_HorizontalOptionsCenterWithWidthRequest.png
new file mode 100644
index 000000000000..29fcd49af8f2
Binary files /dev/null and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyGridLayout_HorizontalOptionsCenterWithWidthRequest.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyGridLayout_HorizontalOptionsEnd.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyGridLayout_HorizontalOptionsEnd.png
new file mode 100644
index 000000000000..d521b1256812
Binary files /dev/null and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyGridLayout_HorizontalOptionsEnd.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyGridLayout_HorizontalOptionsEndWithWidthRequest.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyGridLayout_HorizontalOptionsEndWithWidthRequest.png
new file mode 100644
index 000000000000..68601506ecad
Binary files /dev/null and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyGridLayout_HorizontalOptionsEndWithWidthRequest.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyGridLayout_HorizontalOptionsFill.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyGridLayout_HorizontalOptionsFill.png
new file mode 100644
index 000000000000..1ab74157cc33
Binary files /dev/null and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyGridLayout_HorizontalOptionsFill.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyGridLayout_HorizontalOptionsFillWithWidthRequest.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyGridLayout_HorizontalOptionsFillWithWidthRequest.png
new file mode 100644
index 000000000000..364769015928
Binary files /dev/null and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyGridLayout_HorizontalOptionsFillWithWidthRequest.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyGridLayout_HorizontalOptionsStart.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyGridLayout_HorizontalOptionsStart.png
new file mode 100644
index 000000000000..c084bfcb8e96
Binary files /dev/null and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyGridLayout_HorizontalOptionsStart.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyGridLayout_HorizontalOptionsStartWithWidthRequest.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyGridLayout_HorizontalOptionsStartWithWidthRequest.png
new file mode 100644
index 000000000000..90ee5f1392a1
Binary files /dev/null and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyGridLayout_HorizontalOptionsStartWithWidthRequest.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyGridLayout_VerticalOptionsCenter.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyGridLayout_VerticalOptionsCenter.png
new file mode 100644
index 000000000000..67909edf6c4b
Binary files /dev/null and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyGridLayout_VerticalOptionsCenter.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyGridLayout_VerticalOptionsCenterWithHeightRequest.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyGridLayout_VerticalOptionsCenterWithHeightRequest.png
new file mode 100644
index 000000000000..606828aa8d37
Binary files /dev/null and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyGridLayout_VerticalOptionsCenterWithHeightRequest.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyGridLayout_VerticalOptionsEnd.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyGridLayout_VerticalOptionsEnd.png
new file mode 100644
index 000000000000..7dcd2f75b8c1
Binary files /dev/null and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyGridLayout_VerticalOptionsEnd.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyGridLayout_VerticalOptionsEndWithHeightRequest.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyGridLayout_VerticalOptionsEndWithHeightRequest.png
new file mode 100644
index 000000000000..9d3fe595f85f
Binary files /dev/null and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyGridLayout_VerticalOptionsEndWithHeightRequest.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyGridLayout_VerticalOptionsFill.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyGridLayout_VerticalOptionsFill.png
new file mode 100644
index 000000000000..4f73a9e158aa
Binary files /dev/null and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyGridLayout_VerticalOptionsFill.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyGridLayout_VerticalOptionsFillWithHeightRequest.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyGridLayout_VerticalOptionsFillWithHeightRequest.png
new file mode 100644
index 000000000000..7cc3e06f0ab5
Binary files /dev/null and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyGridLayout_VerticalOptionsFillWithHeightRequest.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyGridLayout_VerticalOptionsStart.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyGridLayout_VerticalOptionsStart.png
new file mode 100644
index 000000000000..5df20615a252
Binary files /dev/null and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyGridLayout_VerticalOptionsStart.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyGridLayout_VerticalOptionsStartWithHeightRequest.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyGridLayout_VerticalOptionsStartWithHeightRequest.png
new file mode 100644
index 000000000000..909cb99d71e8
Binary files /dev/null and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyGridLayout_VerticalOptionsStartWithHeightRequest.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyLayoutWithOrientationHorizontal_HorizontalOptionsCenter.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyLayoutWithOrientationHorizontal_HorizontalOptionsCenter.png
new file mode 100644
index 000000000000..bfef0ee34c29
Binary files /dev/null and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyLayoutWithOrientationHorizontal_HorizontalOptionsCenter.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyLayoutWithOrientationHorizontal_HorizontalOptionsCenterWithWidthRequest.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyLayoutWithOrientationHorizontal_HorizontalOptionsCenterWithWidthRequest.png
new file mode 100644
index 000000000000..c02adb714a4d
Binary files /dev/null and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyLayoutWithOrientationHorizontal_HorizontalOptionsCenterWithWidthRequest.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyLayoutWithOrientationHorizontal_HorizontalOptionsEnd.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyLayoutWithOrientationHorizontal_HorizontalOptionsEnd.png
new file mode 100644
index 000000000000..a12156d77711
Binary files /dev/null and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyLayoutWithOrientationHorizontal_HorizontalOptionsEnd.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyLayoutWithOrientationHorizontal_HorizontalOptionsEndWithWidthRequest.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyLayoutWithOrientationHorizontal_HorizontalOptionsEndWithWidthRequest.png
new file mode 100644
index 000000000000..a5f5b27261e0
Binary files /dev/null and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyLayoutWithOrientationHorizontal_HorizontalOptionsEndWithWidthRequest.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyLayoutWithOrientationHorizontal_HorizontalOptionsFill.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyLayoutWithOrientationHorizontal_HorizontalOptionsFill.png
new file mode 100644
index 000000000000..8c1d2c5592bf
Binary files /dev/null and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyLayoutWithOrientationHorizontal_HorizontalOptionsFill.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyLayoutWithOrientationHorizontal_HorizontalOptionsFillWithWidthRequest.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyLayoutWithOrientationHorizontal_HorizontalOptionsFillWithWidthRequest.png
new file mode 100644
index 000000000000..a905e790e79c
Binary files /dev/null and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyLayoutWithOrientationHorizontal_HorizontalOptionsFillWithWidthRequest.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyLayoutWithOrientationHorizontal_HorizontalOptionsStart.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyLayoutWithOrientationHorizontal_HorizontalOptionsStart.png
new file mode 100644
index 000000000000..41a9415fdb88
Binary files /dev/null and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyLayoutWithOrientationHorizontal_HorizontalOptionsStart.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyLayoutWithOrientationHorizontal_HorizontalOptionsStartWithWidthRequest.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyLayoutWithOrientationHorizontal_HorizontalOptionsStartWithWidthRequest.png
new file mode 100644
index 000000000000..1235bc881dfc
Binary files /dev/null and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyLayoutWithOrientationHorizontal_HorizontalOptionsStartWithWidthRequest.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyLayoutWithOrientationHorizontal_VerticalOptionsCenter.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyLayoutWithOrientationHorizontal_VerticalOptionsCenter.png
new file mode 100644
index 000000000000..087b1a6ef8fb
Binary files /dev/null and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyLayoutWithOrientationHorizontal_VerticalOptionsCenter.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyLayoutWithOrientationHorizontal_VerticalOptionsCenterWithHeightRequest.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyLayoutWithOrientationHorizontal_VerticalOptionsCenterWithHeightRequest.png
new file mode 100644
index 000000000000..e4927f5c3da5
Binary files /dev/null and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyLayoutWithOrientationHorizontal_VerticalOptionsCenterWithHeightRequest.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyLayoutWithOrientationHorizontal_VerticalOptionsEnd.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyLayoutWithOrientationHorizontal_VerticalOptionsEnd.png
new file mode 100644
index 000000000000..4a3a49dcb755
Binary files /dev/null and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyLayoutWithOrientationHorizontal_VerticalOptionsEnd.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyLayoutWithOrientationHorizontal_VerticalOptionsEndWithHeightRequest.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyLayoutWithOrientationHorizontal_VerticalOptionsEndWithHeightRequest.png
new file mode 100644
index 000000000000..767084bc327f
Binary files /dev/null and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyLayoutWithOrientationHorizontal_VerticalOptionsEndWithHeightRequest.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyLayoutWithOrientationHorizontal_VerticalOptionsFill.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyLayoutWithOrientationHorizontal_VerticalOptionsFill.png
new file mode 100644
index 000000000000..34477abd114c
Binary files /dev/null and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyLayoutWithOrientationHorizontal_VerticalOptionsFill.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyLayoutWithOrientationHorizontal_VerticalOptionsFillWithHeightRequest.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyLayoutWithOrientationHorizontal_VerticalOptionsFillWithHeightRequest.png
new file mode 100644
index 000000000000..1455ebd138e4
Binary files /dev/null and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyLayoutWithOrientationHorizontal_VerticalOptionsFillWithHeightRequest.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyLayoutWithOrientationHorizontal_VerticalOptionsStart.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyLayoutWithOrientationHorizontal_VerticalOptionsStart.png
new file mode 100644
index 000000000000..414b937eb9a8
Binary files /dev/null and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyLayoutWithOrientationHorizontal_VerticalOptionsStart.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyLayoutWithOrientationHorizontal_VerticalOptionsStartWithHeightRequest.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyLayoutWithOrientationHorizontal_VerticalOptionsStartWithHeightRequest.png
new file mode 100644
index 000000000000..492a05f1aecf
Binary files /dev/null and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyLayoutWithOrientationHorizontal_VerticalOptionsStartWithHeightRequest.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyLayoutWithOrientationVertical_HorizontalOptionsCenter.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyLayoutWithOrientationVertical_HorizontalOptionsCenter.png
new file mode 100644
index 000000000000..2b6d5e6e7f2c
Binary files /dev/null and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyLayoutWithOrientationVertical_HorizontalOptionsCenter.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyLayoutWithOrientationVertical_HorizontalOptionsCenterWithWidthRequest.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyLayoutWithOrientationVertical_HorizontalOptionsCenterWithWidthRequest.png
new file mode 100644
index 000000000000..f6fb7957e038
Binary files /dev/null and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyLayoutWithOrientationVertical_HorizontalOptionsCenterWithWidthRequest.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyLayoutWithOrientationVertical_HorizontalOptionsEnd.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyLayoutWithOrientationVertical_HorizontalOptionsEnd.png
new file mode 100644
index 000000000000..f614c0f6f446
Binary files /dev/null and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyLayoutWithOrientationVertical_HorizontalOptionsEnd.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyLayoutWithOrientationVertical_HorizontalOptionsEndWithWidthRequest.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyLayoutWithOrientationVertical_HorizontalOptionsEndWithWidthRequest.png
new file mode 100644
index 000000000000..41cbd06c4c20
Binary files /dev/null and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyLayoutWithOrientationVertical_HorizontalOptionsEndWithWidthRequest.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyLayoutWithOrientationVertical_HorizontalOptionsFill.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyLayoutWithOrientationVertical_HorizontalOptionsFill.png
new file mode 100644
index 000000000000..9d69db60cbca
Binary files /dev/null and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyLayoutWithOrientationVertical_HorizontalOptionsFill.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyLayoutWithOrientationVertical_HorizontalOptionsFillWithWidthRequest.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyLayoutWithOrientationVertical_HorizontalOptionsFillWithWidthRequest.png
new file mode 100644
index 000000000000..1b8849a54c18
Binary files /dev/null and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyLayoutWithOrientationVertical_HorizontalOptionsFillWithWidthRequest.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyLayoutWithOrientationVertical_HorizontalOptionsStart.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyLayoutWithOrientationVertical_HorizontalOptionsStart.png
new file mode 100644
index 000000000000..fd4d4357f8f7
Binary files /dev/null and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyLayoutWithOrientationVertical_HorizontalOptionsStart.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyLayoutWithOrientationVertical_HorizontalOptionsStartWithWidthRequest.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyLayoutWithOrientationVertical_HorizontalOptionsStartWithWidthRequest.png
new file mode 100644
index 000000000000..7a0b5e463dd6
Binary files /dev/null and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyLayoutWithOrientationVertical_HorizontalOptionsStartWithWidthRequest.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyLayoutWithOrientationVertical_VerticalOptionsCenter.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyLayoutWithOrientationVertical_VerticalOptionsCenter.png
new file mode 100644
index 000000000000..99d87a20145c
Binary files /dev/null and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyLayoutWithOrientationVertical_VerticalOptionsCenter.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyLayoutWithOrientationVertical_VerticalOptionsCenterWithHeightRequest.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyLayoutWithOrientationVertical_VerticalOptionsCenterWithHeightRequest.png
new file mode 100644
index 000000000000..142e469c68be
Binary files /dev/null and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyLayoutWithOrientationVertical_VerticalOptionsCenterWithHeightRequest.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyLayoutWithOrientationVertical_VerticalOptionsEnd.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyLayoutWithOrientationVertical_VerticalOptionsEnd.png
new file mode 100644
index 000000000000..1821031d1f9b
Binary files /dev/null and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyLayoutWithOrientationVertical_VerticalOptionsEnd.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyLayoutWithOrientationVertical_VerticalOptionsEndWithHeightRequest.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyLayoutWithOrientationVertical_VerticalOptionsEndWithHeightRequest.png
new file mode 100644
index 000000000000..0fb99660dbc2
Binary files /dev/null and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyLayoutWithOrientationVertical_VerticalOptionsEndWithHeightRequest.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyLayoutWithOrientationVertical_VerticalOptionsFill.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyLayoutWithOrientationVertical_VerticalOptionsFill.png
new file mode 100644
index 000000000000..97325ecb795c
Binary files /dev/null and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyLayoutWithOrientationVertical_VerticalOptionsFill.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyLayoutWithOrientationVertical_VerticalOptionsFillWithHeightRequest.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyLayoutWithOrientationVertical_VerticalOptionsFillWithHeightRequest.png
new file mode 100644
index 000000000000..8f5fffed0991
Binary files /dev/null and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyLayoutWithOrientationVertical_VerticalOptionsFillWithHeightRequest.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyLayoutWithOrientationVertical_VerticalOptionsStart.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyLayoutWithOrientationVertical_VerticalOptionsStart.png
new file mode 100644
index 000000000000..ca01801806e2
Binary files /dev/null and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyLayoutWithOrientationVertical_VerticalOptionsStart.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyLayoutWithOrientationVertical_VerticalOptionsStartWithHeightRequest.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyLayoutWithOrientationVertical_VerticalOptionsStartWithHeightRequest.png
new file mode 100644
index 000000000000..10eaf713e829
Binary files /dev/null and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyLayoutWithOrientationVertical_VerticalOptionsStartWithHeightRequest.png differ