Fixed android toolbar icon change

src/Controls/samples/Controls.Sample.UITests/Issues/Issue19673.xaml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<TabbedPage
+    xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+    x:Class="Maui.Controls.Sample.Issues.Issue19673"
+    xmlns:local="clr-namespace:Maui.Controls.Sample.Issues"
+    xmlns:ns="clr-namespace:Maui.Controls.Sample.Issues"
+    xmlns:android="clr-namespace:Microsoft.Maui.Controls.PlatformConfiguration.AndroidSpecific;assembly=Microsoft.Maui.Controls"
+    android:TabbedPage.ToolbarPlacement="Bottom">
+    <local:Issue19673Page1 Title="Page 1" AutomationId="Page1" />
+    <!-- Page 2 has the TabarItem with an Icon -->
+    <local:Issue19673Page2 Title="Page 2" AutomationId="Page2" />
+    <local:Issue19673Page3 Title="Page 3" AutomationId="Page3" />
+</TabbedPage>

src/Controls/samples/Controls.Sample.UITests/Issues/Issue19673.xaml.cs

@@ -0,0 +1,15 @@
+using Microsoft.Maui.Controls;
+using Microsoft.Maui.Controls.Xaml;
+
+namespace Maui.Controls.Sample.Issues
+{
+	[XamlCompilation(XamlCompilationOptions.Compile)]
+	[Issue(IssueTracker.Github, 19673, "ToolbarItem icon/image doesn't update on page navigation on Android", PlatformAffected.Android, NavigationBehavior.PushAsync)]
+	public partial class Issue19673 : TabbedPage
+	{
+		public Issue19673()
+		{
+			InitializeComponent();
+		}
+	}
+}

src/Controls/samples/Controls.Sample.UITests/Issues/Issue19673Page1.xaml

@@ -0,0 +1,12 @@
+<?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"
+             x:Class="Maui.Controls.Sample.Issues.Issue19673Page1"
+             Title="Page 1">
+    <VerticalStackLayout>
+        <Label 
+            Text="Page 1 - Content"
+            VerticalOptions="Center" 
+            HorizontalOptions="Center" />
+    </VerticalStackLayout>
+</ContentPage>

src/Controls/samples/Controls.Sample.UITests/Issues/Issue19673Page1.xaml.cs

@@ -0,0 +1,11 @@
+using Microsoft.Maui.Controls;
+
+namespace Maui.Controls.Sample.Issues;
+
+public partial class Issue19673Page1 : ContentPage
+{
+	public Issue19673Page1()
+	{
+		InitializeComponent();
+	}
+}

src/Controls/samples/Controls.Sample.UITests/Issues/Issue19673Page2.xaml

@@ -0,0 +1,23 @@
+<?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"
+             x:Class="Maui.Controls.Sample.Issues.Issue19673Page2"
+             Title="Page 2">
+    <ContentPage.ToolbarItems>
+        <ToolbarItem 
+            AutomationId="TestToolbarItem"
+            Text="new"
+            IconImageSource="shopping_cart.png"
+            x:Name="Page2Item"
+            Clicked="OnToolbarItemClicked">
+        </ToolbarItem>
+    </ContentPage.ToolbarItems>
+    <VerticalStackLayout>
+        <Label 
+            x:Name="LabelResult"
+            AutomationId="TestLabelResult"
+            Text="Page 2 - Content"
+            VerticalOptions="Center" 
+            HorizontalOptions="Center" />
+    </VerticalStackLayout>
+</ContentPage>

src/Controls/samples/Controls.Sample.UITests/Issues/Issue19673Page2.xaml.cs

@@ -0,0 +1,16 @@
+using Microsoft.Maui.Controls;
+
+namespace Maui.Controls.Sample.Issues;
+
+public partial class Issue19673Page2 : ContentPage
+{
+	public Issue19673Page2()
+	{
+		InitializeComponent();
+	}
+
+	void OnToolbarItemClicked(object sender, System.EventArgs e)
+	{
+		LabelResult.Text = "Success";
+	}
+}

src/Controls/samples/Controls.Sample.UITests/Issues/Issue19673Page3.xaml

@@ -0,0 +1,12 @@
+<?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"
+             x:Class="Maui.Controls.Sample.Issues.Issue19673Page3"
+             Title="Page 3">
+    <VerticalStackLayout>
+        <Label 
+            Text="Page 3 - Content"
+            VerticalOptions="Center" 
+            HorizontalOptions="Center" />
+    </VerticalStackLayout>
+</ContentPage>

src/Controls/samples/Controls.Sample.UITests/Issues/Issue19673Page3.xaml.cs

@@ -0,0 +1,11 @@
+using Microsoft.Maui.Controls;
+
+namespace Maui.Controls.Sample.Issues;
+
+public partial class Issue19673Page3 : ContentPage
+{
+	public Issue19673Page3()
+	{
+		InitializeComponent();
+	}
+}

src/Controls/samples/Controls.Sample.UITests/Issues/Issue19950.xaml

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Shell xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             x:Class="Maui.Controls.Sample.Issues.Issue19950"
+             Title="Issue19950">
+
+     <TabBar x:Name="tabbar">
+        <ShellContent Title="Tab 1" Icon="groceries.png">
+            <ContentPage>
+                <ContentPage.ToolbarItems>
+                    <ToolbarItem IconImageSource="groceries.png" />
+                </ContentPage.ToolbarItems>
+                <Button
+                    Text="Navigate to tab 2"
+                    VerticalOptions="Start"
+                    AutomationId="button"
+                    Clicked="Button_Clicked"/>
+            </ContentPage>
+        </ShellContent>
+        <ShellContent x:Name="tab2" Route="tab2" Title="Tab 2" Icon="groceries.png">
+            <ContentPage>
+                <ContentPage.ToolbarItems>
+                    <ToolbarItem Text="Toolbar Item" />
+                </ContentPage.ToolbarItems>
+                <Label Text="Page 2" AutomationId="labelOnPage2"/>
+            </ContentPage>
+        </ShellContent>
+    </TabBar>
+</Shell>

src/Controls/samples/Controls.Sample.UITests/Issues/Issue19950.xaml.cs

@@ -0,0 +1,38 @@
+using Microsoft.Maui.Controls;
+using Microsoft.Maui.Controls.Xaml;
+
+namespace Maui.Controls.Sample.Issues;
+
+[XamlCompilation(XamlCompilationOptions.Compile)]
+[Issue(IssueTracker.Github, 19950, "[Android] ToolbarItem shows incorrect image", PlatformAffected.Android)]
+public class Issue19950Test : ContentPage
+{
+	public Issue19950Test()
+	{
+		Content = new VerticalStackLayout()
+		{
+			Children =
+				{
+					new Button()
+					{
+						Text = "Go To Test",
+						AutomationId = "GoToTest",
+						Command = new Command(() => Application.Current.MainPage = new Issue19950())
+					}
+				}
+		};
+	}
+}
+
+public partial class Issue19950 : Shell
+{
+	public Issue19950()
+	{
+		InitializeComponent();
+	}
+
+	void Button_Clicked(object sender, System.EventArgs e)
+	{
+		tabbar.CurrentItem = tab2;
+	}
+}

src/Controls/src/Core/Platform/Android/Extensions/ToolbarExtensions.cs

@@ -320,6 +320,7 @@ static void UpdateMenuItem(AToolbar toolbar,
 					return;
 
 				menuitem.SetTitle(newTitle);
+				menuitem.SetIcon(null);
 			}
 
 			menuitem.SetEnabled(item.IsEnabled);

src/Controls/tests/UITests/Tests/Issues/Issue19673.cs

@@ -0,0 +1,25 @@
+using Microsoft.Maui.AppiumTests;
+using NUnit.Framework;
+using UITest.Appium;
+using UITest.Core;
+
+namespace Controls.AppiumTests.Tests.Issues
+{
+	public class Issue19673 : _IssuesUITest
+	{
+		public Issue19673(TestDevice device) : base(device) { }
+
+		public override string Issue => "ToolbarItem icon/image doesn't update on page navigation on Android";
+
+		[Test]
+		public void ToolbarItemUpdateOnNavigation()
+		{
+			// 1. Swipe to second page.
+			App.WaitForElement("Page1");
+			App.SwipeRightToLeft("Page1");
+
+			// 2. Verify that the ToolbarItem is rendered.
+			VerifyScreenshot();
+		}
+	}
+}

src/Controls/tests/UITests/Tests/Issues/Issue19950.cs

@@ -0,0 +1,35 @@
+using NUnit.Framework;
+using UITest.Appium;
+using UITest.Core;
+
+namespace Microsoft.Maui.AppiumTests.Issues;
+
+public class Issue19950 : _IssuesUITest
+{
+	public override string Issue => "[Android] ToolbarItem shows incorrect image";
+
+	public Issue19950(TestDevice device)
+		: base(device)
+	{ }
+
+    [Test]
+	public void ToolbarItemShouldShowCorrectImage()
+	{
+		try
+		{
+			_ = App.WaitForElement("GoToTest");
+			App.Tap("GoToTest");
+
+			App.WaitForElement("button");
+			App.Click("button");
+			App.WaitForElement("labelOnPage2");
+
+			//The test passes if the gorcery icon is visible
+			VerifyScreenshot();
+		}
+		finally
+		{
+			Reset();
+		}
+	}
+}

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

@@ -143,10 +143,10 @@ CommandResponse ScrollUp(IDictionary<string, object> parameters)
 
 		static void ScrollToLeft(AppiumDriver driver, AppiumElement element, ScrollStrategy strategy, double swipePercentage, int swipeSpeed, bool withInertia = true)
 		{
-            var position = element is not null ? element.Location : System.Drawing.Point.Empty;
-            var size = element is not null ? element.Size : driver.Manage().Window.Size;
+			var position = element is not null ? element.Location : System.Drawing.Point.Empty;
+			var size = element is not null ? element.Size : driver.Manage().Window.Size;
 
-            int startX = (int)(position.X + (size.Width * 0.05));
+			int startX = (int)(position.X + (size.Width * 0.05));
 			int startY = position.Y + size.Height / 2;
 
 			int endX = (int)(position.X + (size.Width * swipePercentage));
@@ -164,10 +164,10 @@ static void ScrollToLeft(AppiumDriver driver, AppiumElement element, ScrollStrat
 
 		static void ScrollToDown(AppiumDriver driver, AppiumElement element, ScrollStrategy strategy, double swipePercentage, int swipeSpeed, bool withInertia = true)
 		{
-            var position = element is not null ? element.Location : System.Drawing.Point.Empty;
-            var size = element is not null ? element.Size : driver.Manage().Window.Size;
+			var position = element is not null ? element.Location : System.Drawing.Point.Empty;
+			var size = element is not null ? element.Size : driver.Manage().Window.Size;
 
-            int startX = position.X + size.Width / 2;
+			int startX = position.X + size.Width / 2;
 			int startY = (int)(position.Y + (size.Height * swipePercentage));
 
 			int endX = startX;
@@ -185,10 +185,10 @@ static void ScrollToDown(AppiumDriver driver, AppiumElement element, ScrollStrat
 
 		static void ScrollToRight(AppiumDriver driver, AppiumElement element, ScrollStrategy strategy, double swipePercentage, int swipeSpeed, bool withInertia = true)
 		{
-            var position = element is not null ? element.Location : System.Drawing.Point.Empty;
-            var size = element is not null ? element.Size : driver.Manage().Window.Size;
+			var position = element is not null ? element.Location : System.Drawing.Point.Empty;
+			var size = element is not null ? element.Size : driver.Manage().Window.Size;
 
-            int startX = (int)(position.X + (size.Width * swipePercentage));
+			int startX = (int)(position.X + (size.Width * swipePercentage));
 			int startY = position.Y + size.Height / 2;
 
 			int endX = (int)(position.X + (size.Width * 0.05));
@@ -206,10 +206,10 @@ static void ScrollToRight(AppiumDriver driver, AppiumElement element, ScrollStra
 
 		static void ScrollToUp(AppiumDriver driver, AppiumElement element, ScrollStrategy strategy, double swipePercentage, int swipeSpeed, bool withInertia = true)
 		{
-            var position = element is not null ? element.Location : System.Drawing.Point.Empty;
-            var size = element is not null ? element.Size : driver.Manage().Window.Size;
+			var position = element is not null ? element.Location : System.Drawing.Point.Empty;
+			var size = element is not null ? element.Size : driver.Manage().Window.Size;
 
-            int startX = position.X + size.Width / 2;
+			int startX = position.X + size.Width / 2;
 			int startY = (int)(position.Y + (size.Height * 0.05));
 
 			int endX = startX;

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

@@ -44,7 +44,7 @@ CommandResponse SwipeLeftToRight(IDictionary<string, object> parameters)
 			parameters.TryGetValue("element", out var value);
 			var element = GetAppiumElement(value);
 
-            double swipePercentage = (double)parameters["swipePercentage"];
+			double swipePercentage = (double)parameters["swipePercentage"];
 			int swipeSpeed = (int)parameters["swipeSpeed"];
 			bool withInertia = (bool)parameters["withInertia"];
 
@@ -58,7 +58,7 @@ CommandResponse SwipeRightToLeft(IDictionary<string, object> parameters)
 			parameters.TryGetValue("element", out var value);
 			var element = GetAppiumElement(value);
 
-            double swipePercentage = (double)parameters["swipePercentage"];
+			double swipePercentage = (double)parameters["swipePercentage"];
 			int swipeSpeed = (int)parameters["swipeSpeed"];
 			bool withInertia = (bool)parameters["withInertia"];