Merge branch 'master' into fix-music-controller-regressed

osu.Game/OsuGame.cs

@@ -720,24 +720,6 @@ namespace osu.Game
                 overlayContent.ChangeChildDepth(overlay, (float)-Clock.CurrentTime);
         }
 
-        public class GameIdleTracker : IdleTracker
-        {
-            private InputManager inputManager;
-
-            public GameIdleTracker(int time)
-                : base(time)
-            {
-            }
-
-            protected override void LoadComplete()
-            {
-                base.LoadComplete();
-                inputManager = GetContainingInputManager();
-            }
-
-            protected override bool AllowIdle => inputManager.FocusedDrawable == null;
-        }
-
         private void forwardLoggedErrorsToNotifications()
         {
             int recentLogCount = 0;
@@ -993,10 +975,4 @@ namespace osu.Game
                 Exit();
         }
     }
-
-    public enum ScorePresentType
-    {
-        Results,
-        Gameplay
-    }
 }