From b451fc7a413c37bcc1a24f2a2824695092942d6a Mon Sep 17 00:00:00 2001
From: Julien Lebosquain <julien@lebosquain.net>
Date: Thu, 9 Jul 2026 12:20:42 +0200
Subject: [PATCH] Fix AvaloniaView double root creation on Android (#21738)

---
 src/Android/Avalonia.Android/AvaloniaView.cs | 41 +++-----------------
 1 file changed, 5 insertions(+), 36 deletions(-)

diff --git a/src/Android/Avalonia.Android/AvaloniaView.cs b/src/Android/Avalonia.Android/AvaloniaView.cs
index cec520acb7..a5a45be61a 100644
--- a/src/Android/Avalonia.Android/AvaloniaView.cs
+++ b/src/Android/Avalonia.Android/AvaloniaView.cs
@@ -20,12 +20,10 @@ namespace Avalonia.Android
     public partial class AvaloniaView : FrameLayout
     {
         private EmbeddableControlRoot? _root;
-        private ExploreByTouchHelper? _accessHelper;
-
         private readonly ViewImpl _view;
+        private readonly ExploreByTouchHelper _accessHelper;
 
         private IDisposable? _timerSubscription;
-        private object? _content;
         private bool _surfaceCreated;
 
         public AvaloniaView(Context context) : base(context)
@@ -34,8 +32,6 @@ namespace Avalonia.Android
 
             AddView(_view.View);
 
-            this.SetBackgroundColor(global::Android.Graphics.Color.Transparent);
-
             _root = new EmbeddableControlRoot(_view);
             _root.Prepare();
 
@@ -73,47 +69,20 @@ namespace Avalonia.Android
 
         public object? Content
         {
-            get { return _root?.Content; }
-            set
-            {
-                _content = value;
-                if (_root != null)
-                    _root.Content = value;
-            }
+            get => _root?.Content;
+            set => _root?.Content = value;
         }
 
         internal new void Dispose()
         {
-            _root?.Dispose();
-            _root = null;
-            _content = null;
-        }
-
-        protected override void OnDetachedFromWindow()
-        {
-            base.OnDetachedFromWindow();
             OnVisibilityChanged(false);
             _surfaceCreated = false;
-
-            if (_accessHelper is { } accessHelper)
-            {
-                ViewCompat.SetAccessibilityDelegate(this, null);
-                _accessHelper = null;
-            }
+            _root?.Dispose();
+            _root = null;
         }
 
         protected override void OnAttachedToWindow()
         {
-            _root?.Content = null;
-            _root = new EmbeddableControlRoot(_view);
-            _root.Prepare();
-            if (_content != null)
-            {
-                _root.Content = _content;
-            }
-
-            _accessHelper = new AvaloniaAccessHelper(this);
-            ViewCompat.SetAccessibilityDelegate(this, _accessHelper);
             SendConfigurationChanged(Context?.Resources?.Configuration);
 
             base.OnAttachedToWindow();