Fix Android CollectionVIew Header and Footer Template (#22889)

src/Controls/src/Core/Handlers/Items/Android/Adapters/StructuredItemsViewAdapter.cs

@@ -121,12 +121,12 @@ protected override void BindTemplatedItemViewHolder(TemplatedItemViewHolder temp
 
 		void UpdateHasHeader()
 		{
-			ItemsSource.HasHeader = ItemsView.Header != null;
+			ItemsSource.HasHeader = (ItemsView.Header ?? ItemsView.HeaderTemplate) is not null;
 		}
 
 		void UpdateHasFooter()
 		{
-			ItemsSource.HasFooter = ItemsView.Footer != null;
+			ItemsSource.HasFooter =  (ItemsView.Footer ?? ItemsView.FooterTemplate) is not null;
 		}
 
 		bool IsHeader(int position)

src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue8761.cs

@@ -0,0 +1,29 @@
+#if ANDROID
+// https://github.com/dotnet/maui/issues/22892
+using NUnit.Framework;
+using UITest.Appium;
+using UITest.Core;
+
+namespace Microsoft.Maui.TestCases.Tests.Issues;
+
+public class Issue8761 : _IssuesUITest
+{
+	public override string Issue => "CollectionView Header Template and Footer Template don't work";
+
+	public Issue8761(TestDevice device)
+		: base(device)
+	{ }
+
+	[Test]
+	[Category(UITestCategories.CollectionView)]
+	public void CollectionViewHeaderTemplateAndFooterTemplateDontWork()
+	{
+		for( int i = 0; i < 4; i++)
+		{
+			App.WaitForElement("AddItem");
+			App.Tap("AddItem");
+			App.WaitForElement("FooterLabel");
+		}
+	}
+}
+#endif

src/Controls/tests/TestCases/Issues/Issue8761.xaml

@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ContentPage
+    xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+    xmlns:local="clr-namespace:MauiCollectionViewFooterBug"
+    x:Class="Maui.Controls.Sample.Issues.Issue8761">
+
+    <CollectionView ItemsSource="{Binding Items}">
+        <CollectionView.HeaderTemplate>
+            <DataTemplate>
+                <Button
+                    HorizontalOptions="Center"
+                    Margin="12,24"
+                    Text="Add Item"
+                    AutomationId="AddItem"
+                    Clicked="AddItem" />
+            </DataTemplate>
+        </CollectionView.HeaderTemplate>
+
+        <CollectionView.ItemTemplate>
+            <DataTemplate>
+                <Label Text="{Binding Identifier}" Margin="12,0" />
+            </DataTemplate>
+        </CollectionView.ItemTemplate>
+
+        <CollectionView.FooterTemplate>
+            <DataTemplate>
+                <Label
+                    Text="Footer"
+                    HorizontalOptions="Center"
+                    AutomationId="FooterLabel"
+                    Margin="12,24" />
+            </DataTemplate>
+        </CollectionView.FooterTemplate>
+    </CollectionView>
+
+</ContentPage>

src/Controls/tests/TestCases/Issues/Issue8761.xaml.cs

@@ -0,0 +1,27 @@
+using System;
+using System.Collections.ObjectModel;
+using Microsoft.Maui.Controls;
+
+namespace Maui.Controls.Sample.Issues;
+
+public sealed class ListItem
+{
+    public string Identifier { get; } = Guid.NewGuid().ToString("D");
+}
+
+[Issue(IssueTracker.Github, 8761, "CollectionView Header Template and Footer Template don't work", PlatformAffected.Android)]
+public partial class Issue8761 : ContentPage
+{
+    public ObservableCollection<ListItem> Items { get; } = new();
+
+    public Issue8761()
+    {
+        BindingContext = this;
+        InitializeComponent();
+    }
+
+    private void AddItem(object sender, EventArgs e)
+    {
+        Items.Add(new ListItem());
+    }
+}

src/TestUtils/src/UITest.Appium/Actions/AppiumLifecycleActions.cs

@@ -146,7 +146,17 @@ CommandResponse CloseApp(IDictionary<string, object> parameters)
 #pragma warning restore CS0618 // Type or member is obsolete
 			}
 			else
-				_app.Driver.TerminateApp(_app.GetAppId());
+			{
+				try
+				{
+					_app.Driver.TerminateApp(_app.GetAppId());
+				}
+				catch (Exception)
+				{
+					// Occasionally the app seems like it's already closed before we get here
+					// and then this throws an exception
+				}
+			}
 
 			return CommandResponse.SuccessEmptyResponse;
 		}