dotnet · rmarinho · Aug 1, 2025 · Jul 18, 2025 · Jul 18, 2025 · Jul 25, 2025
diff --git a/...tCases.Android.Tests/snapshots/android/ClearButtonVisiblityButton_TextEmpty.png b/...tCases.Android.Tests/snapshots/android/ClearButtonVisiblityButton_TextEmpty.png
diff --git a/...ases.Android.Tests/snapshots/android/ClearButtonVisiblityButton_TextPresent.png b/...ases.Android.Tests/snapshots/android/ClearButtonVisiblityButton_TextPresent.png
diff --git a/...TestCases.Android.Tests/snapshots/android/PlaceholderWithClearButtonVisible.png b/...TestCases.Android.Tests/snapshots/android/PlaceholderWithClearButtonVisible.png
diff --git a/...tCases.Android.Tests/snapshots/android/VerifyCharacterSpacingWhenFontFamily.png b/...tCases.Android.Tests/snapshots/android/VerifyCharacterSpacingWhenFontFamily.png
diff --git a/...ases.Android.Tests/snapshots/android/VerifyCharacterSpacingWhenMaxLengthSet.png b/...ases.Android.Tests/snapshots/android/VerifyCharacterSpacingWhenMaxLengthSet.png
diff --git a/...Tests/snapshots/android/VerifyClearButtonVisiblityWhenIsPasswordTrueOrFalse.png b/...Tests/snapshots/android/VerifyClearButtonVisiblityWhenIsPasswordTrueOrFalse.png
diff --git a/...sts/snapshots/android/VerifyClearButtonVisiblityWhenTextAlignedHorizontally.png b/...sts/snapshots/android/VerifyClearButtonVisiblityWhenTextAlignedHorizontally.png
diff --git a/...Tests/snapshots/android/VerifyClearButtonVisiblityWhenTextAlignedVertically.png b/...Tests/snapshots/android/VerifyClearButtonVisiblityWhenTextAlignedVertically.png
diff --git a/...roid.Tests/snapshots/android/VerifyClearVisiblityButtonWhenTextColorChanged.png b/...roid.Tests/snapshots/android/VerifyClearVisiblityButtonWhenTextColorChanged.png
diff --git a/...ases.Android.Tests/snapshots/android/VerifyEntryControlWhenFlowDirectionSet.png b/...ases.Android.Tests/snapshots/android/VerifyEntryControlWhenFlowDirectionSet.png
diff --git a/...s.Android.Tests/snapshots/android/VerifyEntryControlWhenPlaceholderColorSet.png b/...s.Android.Tests/snapshots/android/VerifyEntryControlWhenPlaceholderColorSet.png
diff --git a/...es.Android.Tests/snapshots/android/VerifyEntryControlWhenPlaceholderTextSet.png b/...es.Android.Tests/snapshots/android/VerifyEntryControlWhenPlaceholderTextSet.png
diff --git a/...rols/tests/TestCases.Android.Tests/snapshots/android/VerifyEntry_WithShadow.png b/...rols/tests/TestCases.Android.Tests/snapshots/android/VerifyEntry_WithShadow.png
diff --git a/...ests/snapshots/android/VerifyHorizontalTextAlignmentBasedOnCharacterSpacing.png b/...ests/snapshots/android/VerifyHorizontalTextAlignmentBasedOnCharacterSpacing.png
diff --git a/...snapshots/android/VerifyHorizontalTextAlignmentWhenVerticalTextAlignmentSet.png b/...snapshots/android/VerifyHorizontalTextAlignmentWhenVerticalTextAlignmentSet.png
diff --git a/...ses.Android.Tests/snapshots/android/VerifyIsPasswordBasedOnCharacterSpacing.png b/...ses.Android.Tests/snapshots/android/VerifyIsPasswordBasedOnCharacterSpacing.png
diff --git a/...roid.Tests/snapshots/android/VerifyIsPasswordBasedOnHorizontalTextAlignment.png b/...roid.Tests/snapshots/android/VerifyIsPasswordBasedOnHorizontalTextAlignment.png
diff --git a/...ndroid.Tests/snapshots/android/VerifyIsPasswordBasedOnVerticalTextAlignment.png b/...ndroid.Tests/snapshots/android/VerifyIsPasswordBasedOnVerticalTextAlignment.png
diff --git a/...s/TestCases.Android.Tests/snapshots/android/VerifyIsPasswordWhenFontSizeSet.png b/...s/TestCases.Android.Tests/snapshots/android/VerifyIsPasswordWhenFontSizeSet.png
diff --git a/...Cases.Android.Tests/snapshots/android/VerifyIsPasswordWhenMaxLenghtSetValue.png b/...Cases.Android.Tests/snapshots/android/VerifyIsPasswordWhenMaxLenghtSetValue.png
diff --git a/...Cases.Android.Tests/snapshots/android/VerifyPlaceholderWhenFlowDirectionSet.png b/...Cases.Android.Tests/snapshots/android/VerifyPlaceholderWhenFlowDirectionSet.png
diff --git a/...Cases.Android.Tests/snapshots/android/VerifyPlaceholderWithCharacterSpacing.png b/...Cases.Android.Tests/snapshots/android/VerifyPlaceholderWithCharacterSpacing.png
diff --git a/...stCases.Android.Tests/snapshots/android/VerifyPlaceholderWithFontAttributes.png b/...stCases.Android.Tests/snapshots/android/VerifyPlaceholderWithFontAttributes.png
diff --git a/...s/TestCases.Android.Tests/snapshots/android/VerifyPlaceholderWithFontFamily.png b/...s/TestCases.Android.Tests/snapshots/android/VerifyPlaceholderWithFontFamily.png
diff --git a/...sts/TestCases.Android.Tests/snapshots/android/VerifyPlaceholderWithFontSize.png b/...sts/TestCases.Android.Tests/snapshots/android/VerifyPlaceholderWithFontSize.png
diff --git a/...es.Android.Tests/snapshots/android/VerifyPlaceholderWithHorizontalAlignment.png b/...es.Android.Tests/snapshots/android/VerifyPlaceholderWithHorizontalAlignment.png
diff --git a/...TestCases.Android.Tests/snapshots/android/VerifyPlaceholderWithPasswordTrue.png b/...TestCases.Android.Tests/snapshots/android/VerifyPlaceholderWithPasswordTrue.png
diff --git a/...tests/TestCases.Android.Tests/snapshots/android/VerifyPlaceholderWithShadow.png b/...tests/TestCases.Android.Tests/snapshots/android/VerifyPlaceholderWithShadow.png
diff --git a/...ases.Android.Tests/snapshots/android/VerifyPlaceholderWithVerticalAlignment.png b/...ases.Android.Tests/snapshots/android/VerifyPlaceholderWithVerticalAlignment.png
diff --git a/...estCases.Android.Tests/snapshots/android/VerifyTextWhenAlingnedHorizontally.png b/...estCases.Android.Tests/snapshots/android/VerifyTextWhenAlingnedHorizontally.png
diff --git a/.../TestCases.Android.Tests/snapshots/android/VerifyTextWhenAlingnedVertically.png b/.../TestCases.Android.Tests/snapshots/android/VerifyTextWhenAlingnedVertically.png
diff --git a/...ses.Android.Tests/snapshots/android/VerifyTextWhenCharacterSpacingSetValues.png b/...ses.Android.Tests/snapshots/android/VerifyTextWhenCharacterSpacingSetValues.png
diff --git a/...es.Android.Tests/snapshots/android/VerifyTextWhenClearButtonVisibleSetNever.png b/...es.Android.Tests/snapshots/android/VerifyTextWhenClearButtonVisibleSetNever.png
diff --git a/...s/TestCases.Android.Tests/snapshots/android/VerifyTextWhenFontAttributesSet.png b/...s/TestCases.Android.Tests/snapshots/android/VerifyTextWhenFontAttributesSet.png
diff --git a/.../TestCases.Android.Tests/snapshots/android/VerifyTextWhenFontFamilySetValue.png b/.../TestCases.Android.Tests/snapshots/android/VerifyTextWhenFontFamilySetValue.png
diff --git a/...estCases.Android.Tests/snapshots/android/VerifyTextWhenFontSizeSetCorrectly.png b/...estCases.Android.Tests/snapshots/android/VerifyTextWhenFontSizeSetCorrectly.png
diff --git a/...stCases.Android.Tests/snapshots/android/VerifyTextWhenIsPasswordTrueOrFalse.png b/...stCases.Android.Tests/snapshots/android/VerifyTextWhenIsPasswordTrueOrFalse.png
diff --git a/...sts/TestCases.Android.Tests/snapshots/android/VerifyTextWhenKeyboardTypeSet.png b/...sts/TestCases.Android.Tests/snapshots/android/VerifyTextWhenKeyboardTypeSet.png
diff --git a/...stCases.Android.Tests/snapshots/android/VerifyTextWhenTextColorSetCorrectly.png b/...stCases.Android.Tests/snapshots/android/VerifyTextWhenTextColorSetCorrectly.png
diff --git a/....Tests/snapshots/android/VerifyVerticalTextAlignmentBasedOnCharacterSpacing.png b/....Tests/snapshots/android/VerifyVerticalTextAlignmentBasedOnCharacterSpacing.png
diff --git a/src/Controls/tests/TestCases.HostApp/FeatureMatrix/EntryControl/EntryControlPage.xaml b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/EntryControl/EntryControlPage.xaml
@@ -4,13 +4,14 @@
              x:DataType="local:EntryViewModel"
              x:Class="Maui.Controls.Sample.EntryControlMainPage">
        <VerticalStackLayout Padding="20"
-                    Spacing="8">
+                            Spacing="8">
               <Label Text="Entry Control"
-                     FontSize="20" Margin="0,0,0,50"
+                     FontSize="20"
+                     Margin="0,0,0,50"
                      HorizontalOptions="Center"/>
 
-              <local:UITestEntry x:Name="EntryControl" 
-                                 IsCursorVisible="False"  
+              <local:UITestEntry x:Name="EntryControl"
+                                 IsCursorVisible="False"
                                  Text="{Binding Text}"
                                  Placeholder="{Binding Placeholder}"
                                  PlaceholderColor="{Binding PlaceholderColor}"
@@ -47,7 +48,13 @@
 
               <Grid HeightRequest="130"/>
 
-              <Grid ColumnSpacing="10" Margin="0,10,0,10">
+              <Button Text="Options"
+                      FontSize="11"
+                      Clicked="NavigateToOptionsPage_Clicked"
+                      AutomationId="OptionsButton"/>
+
+              <Grid ColumnSpacing="10"
+                    Margin="0,10,0,10">
                      <Grid.RowDefinitions>
                             <RowDefinition Height="Auto"/>
                             <RowDefinition Height="Auto"/>
@@ -56,38 +63,38 @@
                             <ColumnDefinition Width="*"/>
                             <ColumnDefinition Width="*"/>
                      </Grid.ColumnDefinitions>
-                     
+
                      <!-- Row 1: Labels -->
-                     <Label Text="Selection Length:" 
-                               FontSize="11" 
-                               Grid.Row="0" 
-                               Grid.Column="0"/>
+                     <Label Text="Selection Length:"
+                            FontSize="11"
+                            Grid.Row="0"
+                            Grid.Column="0"/>
                      <Label Text="Cursor position:"
-                               FontSize="11" 
-                               Grid.Row="0" 
-                               Grid.Column="1"/>
-                     
+                            FontSize="11"
+                            Grid.Row="0"
+                            Grid.Column="1"/>
+
                      <!-- Row 2: Entries -->
                      <local:UITestEntry x:Name="SelectionLengthEntry"
-                                                    Text="{Binding SelectionLength}"
-                                                    AutomationId="SelectionLengthEntry"
-                                                    IsCursorVisible="False"
-                                                    TextChanged="SelectionLength_Clicked"
-                                                    Grid.Row="1"
-                                                    Grid.Column="0"/>
+                                        Text="{Binding SelectionLength}"
+                                        AutomationId="SelectionLengthEntry"
+                                        IsCursorVisible="False"
+                                        TextChanged="SelectionLength_Clicked"
+                                        Grid.Row="1"
+                                        Grid.Column="0"/>
                      <local:UITestEntry x:Name="CursorPositionEntry"
-                                                    Text="{Binding CursorPosition}"
-                                                    AutomationId="CursorPositionEntry"
-                                                    IsCursorVisible="False"
-                                                    Grid.Row="1"
-                                                    Grid.Column="1"/>
+                                        Text="{Binding CursorPosition}"
+                                        AutomationId="CursorPositionEntry"
+                                        IsCursorVisible="False"
+                                        Grid.Row="1"
+                                        Grid.Column="1"/>
               </Grid>
 
               <Button Text="Update Cursor Selection"
                       FontSize="11"
                       Clicked="OnUpdateCursorAndSelectionClicked"
                       AutomationId="UpdateCursorAndSelectionButton"/>
-              
+
               <Label Text="Events:"
                      FontSize="11"/>
               <Label x:Name="TextChangedLabel"
@@ -107,9 +114,4 @@
                      AutomationId="UnfocusedLabel"
                      FontSize="11"/>
        </VerticalStackLayout>
-
-       <ContentPage.ToolbarItems>
-              <ToolbarItem Text="Options"
-                           Clicked="NavigateToOptionsPage_Clicked"></ToolbarItem>
-       </ContentPage.ToolbarItems>
 </ContentPage>