[Android] The number of SearchHandler toolbar item increases abnormally - fix

src/Controls/src/Core/Compatibility/Handlers/Shell/Android/ShellToolbarTracker.cs

@@ -136,7 +136,7 @@ public Color TintColor
 				_tintColor = value;
 				if (Page != null)
 				{
-					UpdateToolbarItems();
+					UpdateToolbarItemsTintColors();
 					UpdateLeftBarButtonItem();
 				}
 			}
@@ -628,9 +628,21 @@ protected virtual void UpdateTitleView(Context context, AToolbar toolbar, View t
 				_toolbar.Handler?.UpdateValue(nameof(Toolbar.TitleView));
 		}
 
+		private void UpdateToolbarItemsTintColors(AToolbar toolbar)
+		{
+			var menu = toolbar.Menu;
+			int _placeholderMenuItemId = 100;
+			if (menu.FindItem(_placeholderMenuItemId) is IMenuItem item)
+			{
+				using (var icon = item.Icon)
+					icon.SetColorFilter(TintColor.ToPlatform(Colors.White), FilterMode.SrcAtop);
+			}
+		}
+
 		protected virtual void UpdateToolbarItems(AToolbar toolbar, Page page)
 		{
 			var menu = toolbar.Menu;
+			int _placeholderMenuItemId = 100;
 			SearchHandler = Shell.GetSearchHandler(page);
 			if (SearchHandler != null && SearchHandler.SearchBoxVisibility != SearchBoxVisibility.Hidden)
 			{
@@ -650,7 +662,7 @@ protected virtual void UpdateToolbarItems(AToolbar toolbar, Page page)
 				if (SearchHandler.SearchBoxVisibility == SearchBoxVisibility.Collapsible)
 				{
 					var placeholder = new Java.Lang.String(SearchHandler.Placeholder);
-					var item = menu.Add(placeholder);
+					var item = menu.Add(0, _placeholderMenuItemId, 0, placeholder);
 					placeholder.Dispose();
 
 					item.SetEnabled(SearchHandler.IsSearchEnabled);
@@ -725,6 +737,11 @@ void UpdateToolbarItems()
 			UpdateToolbarItems(_platformToolbar, Page);
 		}
 
+		void UpdateToolbarItemsTintColors()
+		{
+			UpdateToolbarItemsTintColors(_platformToolbar);
+		}
+
 		class FlyoutIconDrawerDrawable : DrawerArrowDrawable
 		{
 			public Drawable IconBitmap { get; set; }

src/Controls/tests/TestCases.HostApp/Issues/Issue29499.cs

@@ -0,0 +1,59 @@
+namespace Maui.Controls.Sample.Issues;
+
+[Issue(IssueTracker.Github, 29499, "[Android] The number of SearchHandler toolbar item increases abnormally", PlatformAffected.Android)]
+public class Issue29499 : Shell
+{
+	public Issue29499()
+	{
+		Routing.RegisterRoute(nameof(Issue29499Subpage), typeof(Issue29499Subpage));
+		Items.Add(new Issue29499Page());
+	}
+
+	public class Issue29499Page : ContentPage
+	{
+		public Issue29499Page()
+		{
+			SetForegroundColor(this, Colors.Red);
+			ToolbarItems.Add(new ToolbarItem { Text = "Item1", Order = ToolbarItemOrder.Secondary });
+			ToolbarItems.Add(new ToolbarItem { Text = "Item2", Order = ToolbarItemOrder.Secondary });
+			ToolbarItems.Add(new ToolbarItem { Text = "Item3", Order = ToolbarItemOrder.Secondary });
+			ToolbarItems.Add(new ToolbarItem { Text = "Item4", Order = ToolbarItemOrder.Secondary });
+			SetSearchHandler(this, new MainSearchHandler { SearchBoxVisibility = SearchBoxVisibility.Collapsible });
+			Content = new Button
+			{
+				Text = "Go to subpage page",
+				AutomationId = "GotoIssue29499Subpage",
+				Command = new Command(async () =>
+				{
+					await Current.GoToAsync(nameof(Issue29499Subpage));
+				})
+			};
+		}
+
+		public class MainSearchHandler : SearchHandler { }
+	}
+
+	public class Issue29499Subpage : ContentPage
+	{
+		public Issue29499Subpage()
+		{
+			Content = new StackLayout
+			{
+				Children =
+				{
+					new Button
+					{
+						Text = "Go back",
+						AutomationId = "GoBackButton",
+						Command = new Command(async () =>
+						{
+							await Current.GoToAsync("..");
+						})
+					},
+				}
+			};
+		}
+	}
+}
+
+

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

@@ -0,0 +1,27 @@
+#if ANDROID
+using NUnit.Framework;
+using UITest.Appium;
+using UITest.Core;
+
+namespace Microsoft.Maui.TestCases.Tests.Issues;
+
+public class Issue29499 : _IssuesUITest
+{
+	public Issue29499(TestDevice testDevice) : base(testDevice) { }
+
+	public override string Issue => "[Android] The number of SearchHandler toolbar item increases abnormally";
+
+	[Test]
+	[Category(UITestCategories.SearchBar)]
+	public void NumberOfToolbarItemsShouldNotIncrease()
+	{
+		App.WaitForElement("GotoIssue29499Subpage");
+		App.Click("GotoIssue29499Subpage");
+		App.WaitForElement("GoBackButton");
+		App.Click("GoBackButton");
+		App.WaitForElement("GotoIssue29499Subpage");
+		((AppiumApp)App).Driver.FindElement(OpenQA.Selenium.By.XPath("//*[@content-desc=\"More options\"]")).Click();
+		VerifyScreenshot();
+	}
+}
+#endif