From cf3eaa589e2c6ec6c2f5b323d2da0029b32b06dc Mon Sep 17 00:00:00 2001
From: Dhivya-SF4094 <127717131+Dhivya-SF4094@users.noreply.github.com>
Date: Wed, 12 Aug 2026 12:55:25 +0530
Subject: [PATCH 1/3] Fixed material3 test failure

---
 .../Core/Platform/Android/Extensions/ToolbarExtensions.cs | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/src/Controls/src/Core/Platform/Android/Extensions/ToolbarExtensions.cs b/src/Controls/src/Core/Platform/Android/Extensions/ToolbarExtensions.cs
index e476a863fcb5..10677a74190a 100644
--- a/src/Controls/src/Core/Platform/Android/Extensions/ToolbarExtensions.cs
+++ b/src/Controls/src/Core/Platform/Android/Extensions/ToolbarExtensions.cs
@@ -209,10 +209,6 @@ public static void UpdateBarTextColor(this AToolbar nativeToolbar, Toolbar toolb
 			{
 				nativeToolbar.SetTitleTextColor(defaultTitleTextColor);
 			}
-			else if (GetDefaultForegroundColor() is { } defaultForegroundColor)
-			{
-				nativeToolbar.SetTitleTextColor(defaultForegroundColor.ToPlatform().ToArgb());
-			}
 
 			nativeToolbar.UpdateNavigationIconColor(toolbar);
 			nativeToolbar.UpdateOverflowIconColor(toolbar);
@@ -245,10 +241,6 @@ static void UpdateNavigationIconColor(this AToolbar nativeToolbar, Toolbar toolb
 				{
 					icon.Color = textColor.ToPlatform().ToArgb();
 				}
-				else if (GetDefaultForegroundColor() is { } defaultForegroundColor)
-				{
-					icon.Color = defaultForegroundColor.ToPlatform().ToArgb();
-				}
 				else if (GetDefaultNavigationIconColor(nativeToolbar) is int defaultNavigationIconColor)
 				{
 					icon.Color = defaultNavigationIconColor;

From 6c8e860ea88b7495f87b438dfb7af35698c29b9d Mon Sep 17 00:00:00 2001
From: Dhivya-SF4094 <127717131+Dhivya-SF4094@users.noreply.github.com>
Date: Wed, 12 Aug 2026 15:34:06 +0530
Subject: [PATCH 2/3] Updated ToolbarExtensions.cs

---
 .../Android/Extensions/ToolbarExtensions.cs   | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/src/Controls/src/Core/Platform/Android/Extensions/ToolbarExtensions.cs b/src/Controls/src/Core/Platform/Android/Extensions/ToolbarExtensions.cs
index 10677a74190a..4a842594e10c 100644
--- a/src/Controls/src/Core/Platform/Android/Extensions/ToolbarExtensions.cs
+++ b/src/Controls/src/Core/Platform/Android/Extensions/ToolbarExtensions.cs
@@ -261,8 +261,18 @@ static void UpdateNavigationIconColor(this AToolbar nativeToolbar, Toolbar toolb
 		static ColorStateList? GetDefaultTitleTextColor(AToolbar nativeToolbar)
 		{
 			var context = nativeToolbar.Context?.GetThemedContext();
-			return PlatformInterop.GetColorStateListForToolbarStyleableAttribute(context,
-				Resource.Attribute.toolbarStyle, Resource.Styleable.Toolbar_titleTextColor);
+			if (RuntimeFeature.IsMaterial3Enabled)
+			{
+				var colorContext = context is null
+				 ? null
+				 : ColorStateList.ValueOf(new global::Android.Graphics.Color(context.GetThemeAttrColor(Resource.Attribute.colorOnSurface)));
+				return colorContext;
+			}
+			else
+			{
+				return PlatformInterop.GetColorStateListForToolbarStyleableAttribute(context,
+				 Resource.Attribute.toolbarStyle, Resource.Styleable.Toolbar_titleTextColor);
+			}
 		}
 
 		static int? GetDefaultNavigationIconColor(AToolbar nativeToolbar)
@@ -273,6 +283,11 @@ static void UpdateNavigationIconColor(this AToolbar nativeToolbar, Toolbar toolb
 				return null;
 			}
 
+			if (RuntimeFeature.IsMaterial3Enabled)
+			{
+				return context.GetThemeAttrColor(Resource.Attribute.colorOnSurface);
+			}
+
 			using var icon = new DrawerArrowDrawable(context);
 			return icon.Color;
 		}

From a326350f83ad3d986b85bffb94d55527e2a40240 Mon Sep 17 00:00:00 2001
From: Dhivya-SF4094 <127717131+Dhivya-SF4094@users.noreply.github.com>
Date: Wed, 12 Aug 2026 16:19:13 +0530
Subject: [PATCH 3/3] Removed GetDefaultForegroundColor

---
 .../Platform/Android/Extensions/ToolbarExtensions.cs | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/src/Controls/src/Core/Platform/Android/Extensions/ToolbarExtensions.cs b/src/Controls/src/Core/Platform/Android/Extensions/ToolbarExtensions.cs
index 4a842594e10c..7ef4ac57377e 100644
--- a/src/Controls/src/Core/Platform/Android/Extensions/ToolbarExtensions.cs
+++ b/src/Controls/src/Core/Platform/Android/Extensions/ToolbarExtensions.cs
@@ -248,16 +248,6 @@ static void UpdateNavigationIconColor(this AToolbar nativeToolbar, Toolbar toolb
 			}
 		}
 
-		static Color? GetDefaultForegroundColor()
-		{
-			return Application.Current?.RequestedTheme switch
-			{
-				ApplicationModel.AppTheme.Light => Colors.Black,
-				ApplicationModel.AppTheme.Dark => Colors.White,
-				_ => null
-			};
-		}
-
 		static ColorStateList? GetDefaultTitleTextColor(AToolbar nativeToolbar)
 		{
 			var context = nativeToolbar.Context?.GetThemedContext();
@@ -299,7 +289,7 @@ static void UpdateOverflowIconColor(this AToolbar nativeToolbar, Toolbar toolbar
 				return;
 			}
 
-			var iconColor = toolbar.IconColor ?? toolbar.BarTextColor ?? GetDefaultForegroundColor();
+			var iconColor = toolbar.IconColor ?? toolbar.BarTextColor;
 			if (iconColor is null)
 			{
 				overflowIcon.ClearColorFilter();