From 244aaf596f570ce249541f8f3b0c3bb82541aca8 Mon Sep 17 00:00:00 2001
From: ili <chudinia@gmail.com>
Date: Wed, 7 Apr 2021 23:13:38 +0500
Subject: [PATCH] Cleanup

---
 src/Android/Avalonia.Android/AvaloniaView.cs             | 5 -----
 .../SkiaPlatform/InvalidationAwareSurfaceView.cs         | 8 --------
 .../Specific/Helpers/AndroidKeyboardEventsHelper.cs      | 9 ---------
 3 files changed, 22 deletions(-)

diff --git a/src/Android/Avalonia.Android/AvaloniaView.cs b/src/Android/Avalonia.Android/AvaloniaView.cs
index 5be72bb0f4..8de3657283 100644
--- a/src/Android/Avalonia.Android/AvaloniaView.cs
+++ b/src/Android/Avalonia.Android/AvaloniaView.cs
@@ -2,8 +2,6 @@ using System;
 using Android.Content;
 using Android.Runtime;
 using Android.Views;
-using Android.Views.Accessibility;
-using Android.Views.InputMethods;
 using Android.Widget;
 using Avalonia.Android.Platform.SkiaPlatform;
 using Avalonia.Controls;
@@ -25,9 +23,6 @@ namespace Avalonia.Android
             AddView(_view.View);
             _root = new EmbeddableControlRoot(_view);
             _root.Prepare();
-
-            Focusable = true;
-            FocusableInTouchMode = true;
         }
 
         public object Content
diff --git a/src/Android/Avalonia.Android/Platform/SkiaPlatform/InvalidationAwareSurfaceView.cs b/src/Android/Avalonia.Android/Platform/SkiaPlatform/InvalidationAwareSurfaceView.cs
index 07f42e7e9f..bc62bcde65 100644
--- a/src/Android/Avalonia.Android/Platform/SkiaPlatform/InvalidationAwareSurfaceView.cs
+++ b/src/Android/Avalonia.Android/Platform/SkiaPlatform/InvalidationAwareSurfaceView.cs
@@ -2,13 +2,8 @@ using System;
 using Android.Content;
 using Android.Graphics;
 using Android.OS;
-using Android.Runtime;
 using Android.Util;
 using Android.Views;
-using Android.Views.Accessibility;
-using Android.Views.InputMethods;
-using Avalonia.Android.Platform.Specific;
-using Avalonia.Input;
 using Avalonia.Platform;
 
 namespace Avalonia.Android
@@ -23,9 +18,6 @@ namespace Avalonia.Android
         {
             Holder.AddCallback(this);
             _handler = new Handler(context.MainLooper);
-
-            Focusable = true;
-            FocusableInTouchMode = true;
         }
 
         public override void Invalidate()
diff --git a/src/Android/Avalonia.Android/Platform/Specific/Helpers/AndroidKeyboardEventsHelper.cs b/src/Android/Avalonia.Android/Platform/Specific/Helpers/AndroidKeyboardEventsHelper.cs
index c7821d495e..2b2a9dd2b4 100644
--- a/src/Android/Avalonia.Android/Platform/Specific/Helpers/AndroidKeyboardEventsHelper.cs
+++ b/src/Android/Avalonia.Android/Platform/Specific/Helpers/AndroidKeyboardEventsHelper.cs
@@ -1,18 +1,9 @@
 using System;
-using System.ComponentModel;
-using Android.App;
-using Android.Content;
-using Android.Runtime;
 using Android.Views;
-using Android.Views.InputMethods;
-using Android.Widget;
 using Avalonia.Android.Platform.Input;
 using Avalonia.Android.Platform.SkiaPlatform;
-using Avalonia.Controls;
-using Avalonia.Controls.Platform;
 using Avalonia.Input;
 using Avalonia.Input.Raw;
-using Avalonia.Input.TextInput;
 
 namespace Avalonia.Android.Platform.Specific.Helpers
 {