Merge pull request #13958 from ByAgenT/refactor-keybindings-overlay

Move and merge Overlays.KeyBinding into Overlays.Settings.Sections.Input

osu.Game.Tests/Visual/Settings/TestSceneKeyBindingPanel.cs

@@ -8,7 +8,7 @@ using osu.Framework.Testing;
 using osu.Framework.Threading;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Overlays;
-using osu.Game.Overlays.KeyBinding;
+using osu.Game.Overlays.Settings.Sections.Input;
 using osuTK.Input;
 
 namespace osu.Game.Tests.Visual.Settings

osu.Game/Overlays/Settings/Sections/Input/GlobalKeyBindingsSection.cs

@@ -5,9 +5,8 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Localisation;
 using osu.Game.Input.Bindings;
-using osu.Game.Overlays.Settings;
 
-namespace osu.Game.Overlays.KeyBinding
+namespace osu.Game.Overlays.Settings.Sections.Input
 {
     public class GlobalKeyBindingsSection : SettingsSection
     {

osu.Game/Overlays/Settings/Sections/Input/KeyBindingPanel.cs

@@ -4,11 +4,9 @@
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Game.Input.Bindings;
-using osu.Game.Overlays.KeyBinding;
-using osu.Game.Overlays.Settings;
 using osu.Game.Rulesets;
 
-namespace osu.Game.Overlays
+namespace osu.Game.Overlays.Settings.Sections.Input
 {
     public class KeyBindingPanel : SettingsSubPanel
     {

osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.cs

@@ -24,7 +24,7 @@ using osuTK;
 using osuTK.Graphics;
 using osuTK.Input;
 
-namespace osu.Game.Overlays.KeyBinding
+namespace osu.Game.Overlays.Settings.Sections.Input
 {
     public class KeyBindingRow : Container, IFilterable
     {

osu.Game/Overlays/Settings/Sections/Input/KeyBindingsSubsection.cs

@@ -9,11 +9,10 @@ using osu.Framework.Graphics;
 using osu.Game.Database;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Input.Bindings;
-using osu.Game.Overlays.Settings;
 using osu.Game.Rulesets;
 using osuTK;
 
-namespace osu.Game.Overlays.KeyBinding
+namespace osu.Game.Overlays.Settings.Sections.Input
 {
     public abstract class KeyBindingsSubsection : SettingsSubsection
     {

osu.Game/Overlays/Settings/Sections/Input/RulesetBindingsSection.cs

@@ -4,10 +4,9 @@
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
 using osu.Game.Graphics;
-using osu.Game.Overlays.Settings;
 using osu.Game.Rulesets;
 
-namespace osu.Game.Overlays.KeyBinding
+namespace osu.Game.Overlays.Settings.Sections.Input
 {
     public class RulesetBindingsSection : SettingsSection
     {

osu.Game/Overlays/Settings/Sections/Input/VariantBindingsSubsection.cs

@@ -4,7 +4,7 @@
 using osu.Framework.Localisation;
 using osu.Game.Rulesets;
 
-namespace osu.Game.Overlays.KeyBinding
+namespace osu.Game.Overlays.Settings.Sections.Input
 {
     public class VariantBindingsSubsection : KeyBindingsSubsection
     {

osu.Game/Overlays/SettingsOverlay.cs

@@ -6,6 +6,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Overlays.Settings;
 using osu.Game.Overlays.Settings.Sections;
+using osu.Game.Overlays.Settings.Sections.Input;
 using osuTK.Graphics;
 using System.Collections.Generic;
 using System.Linq;