Improve Android mouse input and restructure Android input handlers

osu.Framework.Android/AndroidGameActivity.cs

@@ -17,10 +17,12 @@ public abstract class AndroidGameActivity : Activity
     {
         protected const ConfigChanges DEFAULT_CONFIG_CHANGES = ConfigChanges.Keyboard
                                                                | ConfigChanges.KeyboardHidden
+                                                               | ConfigChanges.Navigation
                                                                | ConfigChanges.Orientation
                                                                | ConfigChanges.ScreenLayout
                                                                | ConfigChanges.ScreenSize
                                                                | ConfigChanges.SmallestScreenSize
+                                                               | ConfigChanges.Touchscreen
                                                                | ConfigChanges.UiMode;
 
         protected const LaunchMode DEFAULT_LAUNCH_MODE = LaunchMode.SingleInstance;

osu.Framework.Android/AndroidGameHost.cs

@@ -51,6 +51,7 @@ protected override void SetupConfig(IDictionary<FrameworkSetting, object> defaul
         protected override IEnumerable<InputHandler> CreateAvailableInputHandlers() =>
             new InputHandler[]
             {
+                new AndroidMouseHandler(gameView),
                 new AndroidKeyboardHandler(gameView),
                 new AndroidTouchHandler(gameView),
                 new MidiHandler()

osu.Framework.Android/AndroidGameView.cs

@@ -19,12 +19,6 @@ public class AndroidGameView : osuTK.Android.AndroidGameView
 
         private readonly Game game;
 
-        public new event Action<Keycode, KeyEvent> KeyDown;
-        public new event Action<Keycode, KeyEvent> KeyUp;
-        public event Action<Keycode, KeyEvent> KeyLongPress;
-        public event Action<string> CommitText;
-        public event Action<AndroidGameHost> HostStarted;
-
         public AndroidGameView(Context context, Game game)
             : base(context)
         {
@@ -141,5 +135,34 @@ public override IInputConnection OnCreateInputConnection(EditorInfo outAttrs)
             outAttrs.InputType = InputTypes.TextVariationVisiblePassword | InputTypes.TextFlagNoSuggestions;
             return new AndroidInputConnection(this, true);
         }
+
+        #region Events
+
+        /// <summary>
+        /// Invoked on a key down event.
+        /// </summary>
+        public new event Action<Keycode, KeyEvent> KeyDown;
+
+        /// <summary>
+        /// Invoked on a key up event.
+        /// </summary>
+        public new event Action<Keycode, KeyEvent> KeyUp;
+
+        /// <summary>
+        /// Invoked on a key long press event.
+        /// </summary>
+        public event Action<Keycode, KeyEvent> KeyLongPress;
+
+        /// <summary>
+        /// Invoked when text is committed by an <see cref="AndroidInputConnection"/>.
+        /// </summary>
+        public event Action<string> CommitText;
+
+        /// <summary>
+        /// Invoked when the <see cref="game"/> has been started on the <see cref="Host"/>.
+        /// </summary>
+        public event Action<AndroidGameHost> HostStarted;
+
+        #endregion
     }
 }

osu.Framework.Android/Input/AndroidInputExtensions.cs

@@ -0,0 +1,65 @@
+// Copyright (c) ppy Pty Ltd <[email protected]>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System;
+using Android.Views;
+using osuTK.Input;
+
+namespace osu.Framework.Android.Input
+{
+    public static class AndroidInputExtensions
+    {
+        /// <summary>
+        /// Returns the corresponding <see cref="MouseButton"/> for a mouse button given as a <see cref="MotionEventButtonState"/>.
+        /// </summary>
+        /// <param name="motionEventMouseButton">The given button. Must not be a raw state or a non-mouse button.</param>
+        /// <returns>The corresponding <see cref="MouseButton"/>.</returns>
+        /// <exception cref="ArgumentOutOfRangeException">Thrown if the provided button <paramref name="motionEventMouseButton"/> is not a </exception>
+        public static MouseButton ToMouseButton(this MotionEventButtonState motionEventMouseButton)
+        {
+            switch (motionEventMouseButton)
+            {
+                case MotionEventButtonState.Primary:
+                    return MouseButton.Left;
+
+                case MotionEventButtonState.Secondary:
+                    return MouseButton.Right;
+
+                case MotionEventButtonState.Tertiary:
+                    return MouseButton.Middle;
+
+                case MotionEventButtonState.Back:
+                    return MouseButton.Button1;
+
+                case MotionEventButtonState.Forward:
+                    return MouseButton.Button2;
+
+                default:
+                    throw new ArgumentOutOfRangeException(nameof(motionEventMouseButton), motionEventMouseButton, "Given button is not a mouse button.");
+            }
+        }
+
+        /// <summary>
+        /// Returns the corresponding <see cref="MouseButton"/> for a mouse button given as a <see cref="Keycode"/>.
+        /// </summary>
+        /// <param name="keycode">The given keycode. Should be <see cref="Keycode.Back"/> or <see cref="Keycode.Forward"/>.</param>
+        /// <param name="button">The corresponding <see cref="MouseButton"/>.</param>
+        /// <returns><c>true</c> if this <paramref name="keycode"/> is a valid <see cref="MouseButton"/>.</returns>
+        public static bool TryGetMouseButton(this Keycode keycode, out MouseButton button)
+        {
+            switch (keycode)
+            {
+                case Keycode.Back:
+                    button = MouseButton.Button1;
+                    return true;
+
+                case Keycode.Forward:
+                    button = MouseButton.Button2;
+                    return true;
+            }
+
+            button = MouseButton.LastButton;
+            return false;
+        }
+    }
+}