Update semantics

src/Controls/samples/Controls.Sample/Pages/SemanticsPage.xaml

@@ -9,6 +9,7 @@
         <VerticalStackLayout>
             <Label
                 Text="Welcome to .NET MAUI Semantics!"
+                SemanticProperties.Description="Welcome to dotnet MAUI Semantics!"
                 TextColor="DodgerBlue"
                 FontSize="30"
                 HorizontalTextAlignment="Center"/>
@@ -55,18 +56,18 @@
                 SemanticProperties.Hint="Hint text"/>
 
             <Entry
-                Text="Entry text TH"
+                Text="Entry text, DTH"
                 FontSize="14"
                 SemanticProperties.Description="Description text"
-                SemanticProperties.Hint="Hint text"/>
+                SemanticProperties.Hint="Hint text" />
 
             <Entry
                 FontSize="14"
                 SemanticProperties.Description="Description text"
                 SemanticProperties.Hint="Hint text"/>
 
             <Editor
-                Text="Editor text TH"
+                Text="Editor text, DTH"
                 FontSize="14"
                 SemanticProperties.Description="Description text"
                 SemanticProperties.Hint="Hint text"/>
@@ -77,14 +78,21 @@
                 SemanticProperties.Hint="Hint text"/>
 
             <SearchBar
-                Text="Search bar text"
+                Text="Search bar text, DH (Android reads T when focus is on entry)"
                 Placeholder="Placeholder text"
                 PlaceholderColor="DodgerBlue"
                 SemanticProperties.Description="Description text"
                 SemanticProperties.Hint="Hint text"/>
 
+            <Label
+                Text="The next 3 controls read out DTH"
+                TextColor="RoyalBlue"
+                FontAttributes="Bold"
+                FontSize="16"
+                Margin="0,10"/>
+
             <Picker
-                Title="Select a monkey TH"
+                Title="Select a monkey, DTH"
                 SemanticProperties.Description="Description text"
                 SemanticProperties.Hint="Hint text">
                 <Picker.ItemsSource>
@@ -108,6 +116,13 @@
                 SemanticProperties.Description="Description text"
                 SemanticProperties.Hint="Hint text"/>
 
+            <Label
+                Text="The rest of the controls read out DH"
+                TextColor="RoyalBlue"
+                FontAttributes="Bold"
+                FontSize="16"
+                Margin="0,10"/>
+
             <ActivityIndicator 
                 IsRunning="True"
                 Color="DodgerBlue"
@@ -124,6 +139,7 @@
                 SemanticProperties.Description="Description text"
                 SemanticProperties.Hint="Hint text"/>
 
+            <!-- iOS: currently not accessible as a whole; only focuses on increment/decrement buttons individually -->
             <Stepper
                 SemanticProperties.Description="Description text"
                 SemanticProperties.Hint="Hint text"/>
@@ -179,7 +195,26 @@
                 FontSize="14"
                 SemanticProperties.HeadingLevel="Level3"/>
 
+            <VerticalStackLayout SemanticProperties.Description="Layout description text">
+                <Label
+                    Text="Label in StackLayout with semantic description"
+                    FontSize="14"/>
+                <Label
+                    Text="Label in StackLayout with semantic description"
+                    FontSize="14"/>
+            </VerticalStackLayout>
+
+            <VerticalStackLayout SemanticProperties.Description="Layout description text">
+                <Label
+                    Text="Label in StackLayout with semantic description"
+                    FontSize="14"/>
+                <Button
+                    Text="Button in StackLayout with semantic description"
+                    FontSize="14"/>
+            </VerticalStackLayout>
+
         </VerticalStackLayout>
+
     </ScrollView>
 
 </controls:BasePage>

src/Core/src/Handlers/View/ViewHandler.Android.cs

@@ -1,4 +1,6 @@
-using Android.Widget;
+using System;
+using Android.Views;
+using Android.Widget;
 using AndroidX.Core.View;
 using AndroidX.Core.View.Accessibility;
 using NativeView = Android.Views.View;
@@ -77,35 +79,103 @@ public static void MapAnchorY(ViewHandler handler, IView view)
 
 		static partial void MappingSemantics(ViewHandler handler, IView view)
 		{
+			if (handler.NativeView == null)
+				return;
+
 			if (view.Semantics != null &&
 				handler is ViewHandler viewHandler &&
 				viewHandler.AccessibilityDelegate == null &&
 				ViewCompat.GetAccessibilityDelegate(handler.NativeView as NativeView) == null)
 			{
-				if (!string.IsNullOrEmpty(view.Semantics.Hint))
+				if (handler.NativeView is not NativeView nativeView)
+					return;
+
+				if (nativeView is AndroidX.AppCompat.Widget.SearchView sv)
+					nativeView = sv.FindViewById(Resource.Id.search_button)!;
+
+				if (!string.IsNullOrWhiteSpace(view.Semantics.Hint) || !string.IsNullOrWhiteSpace(view.Semantics.Description))
+				{
+					if (viewHandler.AccessibilityDelegate == null)
+					{
+						viewHandler.AccessibilityDelegate = new MauiAccessibilityDelegate() { Handler = viewHandler };
+						ViewCompat.SetAccessibilityDelegate(nativeView, viewHandler.AccessibilityDelegate);
+					}
+				}
+				else if (viewHandler.AccessibilityDelegate != null)
 				{
-					viewHandler.AccessibilityDelegate = new MauiAccessibilityDelegate() { Handler = viewHandler };
-					ViewCompat.SetAccessibilityDelegate(handler.NativeView as NativeView, viewHandler.AccessibilityDelegate);
+					viewHandler.AccessibilityDelegate = null;
+					ViewCompat.SetAccessibilityDelegate(nativeView, null);
+				}
+
+				if (viewHandler.AccessibilityDelegate != null)
+				{
+					nativeView.ImportantForAccessibility = ImportantForAccessibility.Yes;
 				}
 			}
 		}
 
 		public void OnInitializeAccessibilityNodeInfo(NativeView? host, AccessibilityNodeInfoCompat? info)
 		{
 			var semantics = VirtualView?.Semantics;
+
 			if (semantics == null)
 				return;
 
 			if (info == null)
 				return;
 
-			if (!string.IsNullOrEmpty(semantics.Hint))
-			{
-				info.HintText = semantics.Hint;
+			string? newText = null;
+			string? newContentDescription = null;
 
+			var desc = semantics.Description;
+			if (!string.IsNullOrEmpty(desc))
+			{
+				// Edit Text fields won't read anything for the content description
 				if (host is EditText)
-					info.ShowingHintText = false;
+					newText = $"{desc}, {((EditText)host).Text}";
+				else
+					newContentDescription = desc;
 			}
+
+			var hint = semantics.Hint;
+			if (!string.IsNullOrEmpty(hint))
+			{
+				// info HintText won't read anything back when using TalkBack pre API 26
+				if (NativeVersion.IsAtLeast(26))
+				{
+					info.HintText = hint;
+
+					if (host is EditText)
+						info.ShowingHintText = false;
+				}
+				else
+				{
+					if (host is TextView tv)
+					{
+						newText = newText ?? tv.Text;
+						newText = $"{newText}, {hint}";
+					}
+					else
+					{
+						if (newContentDescription != null)
+						{
+							newText = $"{newContentDescription}, {hint}";
+						}
+						else
+						{
+							newText = $"{hint}";
+						}
+					}
+
+					newContentDescription = null;
+				}
+			}
+
+			if (!String.IsNullOrWhiteSpace(newContentDescription))
+				info.ContentDescription = newContentDescription;
+
+			if (!String.IsNullOrWhiteSpace(newText))
+				info.Text = newText;
 		}
 
 		class MauiAccessibilityDelegate : AccessibilityDelegateCompat

src/Core/src/Platform/Android/ViewExtensions.cs

@@ -1,6 +1,8 @@
 using Android.Graphics.Drawables;
 using Android.Views;
+using Android.Widget;
 using AndroidX.Core.View;
+using AndroidX.Core.View.Accessibility;
 using Microsoft.Maui.Graphics;
 using AView = Android.Views.View;
 
@@ -80,7 +82,6 @@ public static void UpdateSemantics(this AView nativeView, IView view)
 			if (semantics == null)
 				return;
 
-			nativeView.ContentDescription = semantics.Description;
 			ViewCompat.SetAccessibilityHeading(nativeView, semantics.IsHeading);
 		}
 

src/Core/src/Platform/iOS/ViewExtensions.cs

@@ -91,6 +91,10 @@ public static void UpdateSemantics(this UIView nativeView, IView view)
 			nativeView.AccessibilityLabel = semantics.Description;
 			nativeView.AccessibilityHint = semantics.Hint;
 
+			// UIControl elements automatically have IsAccessibilityElement set to true
+			if (nativeView is not UIControl && (!string.IsNullOrWhiteSpace(semantics.Hint) || !string.IsNullOrWhiteSpace(semantics.Description)))
+				nativeView.IsAccessibilityElement = true;
+
 			if (semantics.IsHeading)
 				nativeView.AccessibilityTraits |= UIAccessibilityTrait.Header;
 			else

src/Core/tests/DeviceTests/Handlers/HandlerTestBase.Tests.cs

@@ -47,7 +47,11 @@ public virtual async Task SetVisibility(Visibility visibility)
 			Assert.Equal(view.Visibility, id);
 		}
 
-		[Fact(DisplayName = "Semantic Description is set correctly")]
+		[Fact(DisplayName = "Semantic Description is set correctly"
+#if MONOANDROID
+			, Skip = "This value can't be validated through automated tests"
+#endif
+		)]
 		[InlineData()]
 		public async Task SetSemanticDescription()
 		{