Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public override void PopulateNodeInfo(AccessibilityNodeInfoCompat nodeInfo)
if (s_checkedProperty?.PropertyType == typeof(int))
{
// Needed for Xamarin.AndroidX.Core 1.17+
s_checkedProperty.SetValue(this,
s_checkedProperty.SetValue(nodeInfo,
provider.ToggleState switch
{
ToggleState.On => 1,
Expand All @@ -56,7 +56,7 @@ public override void PopulateNodeInfo(AccessibilityNodeInfoCompat nodeInfo)
else if (s_checkedProperty?.PropertyType == typeof(bool))
{
// Needed for Xamarin.AndroidX.Core < 1.17
s_checkedProperty.SetValue(this, provider.ToggleState == ToggleState.On);
s_checkedProperty.SetValue(nodeInfo, provider.ToggleState == ToggleState.On);
}

nodeInfo.Checkable = true;
Expand Down
26 changes: 23 additions & 3 deletions src/Android/Avalonia.Android/AvaloniaAccessHelper.cs
Original file line number Diff line number Diff line change
Expand Up @@ -147,13 +147,33 @@ protected override void GetVisibleVirtualViews(IList<Integer>? virtualViewIds)
protected override bool OnPerformActionForVirtualView(int virtualViewId, int action, Bundle? arguments)
{
return (GetNodeInfoProvidersFromVirtualViewId(virtualViewId) ?? [])
.Select(x => x.PerformNodeAction(action, arguments))
.Select(x => TryPerformNodeAction(x, action, arguments))
.Aggregate(false, (a, b) => a | b);
}

protected override void OnPopulateNodeForVirtualView(int virtualViewId, AccessibilityNodeInfoCompat nodeInfo)
private static bool TryPerformNodeAction(INodeInfoProvider nodeInfoProvider, int action, Bundle? arguments)
{
if (!_peers.TryGetValue(virtualViewId, out AutomationPeer? peer))
try
{
return nodeInfoProvider.PerformNodeAction(action, arguments);
}
catch (ElementNotEnabledException)
{
return false;
}
catch (InvalidOperationException)
{
return false;
}
catch (NotSupportedException)
{
return false;
}
}

protected override void OnPopulateNodeForVirtualView(int virtualViewId, AccessibilityNodeInfoCompat? nodeInfo)
{
if (nodeInfo is null || !_peers.TryGetValue(virtualViewId, out AutomationPeer? peer))
{
return; // BAIL!! No work to be done
}
Expand Down