From e9073507007d2d28b7fbc53783cee81ad50f000a Mon Sep 17 00:00:00 2001
From: Dmitry Lyzo <ashephard0@gmail.com>
Date: Thu, 14 Nov 2019 20:34:17 +0300
Subject: [PATCH] Disable autoFocus in user settings on non-TV layouts (in sync
 with AutoFocuser)

---
 src/controllers/user/display.js   | 4 ++--
 src/controllers/user/home.js      | 4 ++--
 src/controllers/user/playback.js  | 4 ++--
 src/controllers/user/subtitles.js | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/controllers/user/display.js b/src/controllers/user/display.js
index aea471685e..f348f28750 100644
--- a/src/controllers/user/display.js
+++ b/src/controllers/user/display.js
@@ -1,4 +1,4 @@
-define(["displaySettings", "userSettingsBuilder", "userSettings"], function (DisplaySettings, userSettingsBuilder, currentUserSettings) {
+define(["displaySettings", "userSettingsBuilder", "userSettings", "autoFocuser"], function (DisplaySettings, userSettingsBuilder, currentUserSettings, autoFocuser) {
     "use strict";
 
     return function (view, params) {
@@ -25,7 +25,7 @@ define(["displaySettings", "userSettingsBuilder", "userSettings"], function (Dis
                     userSettings: userSettings,
                     enableSaveButton: false,
                     enableSaveConfirmation: false,
-                    autoFocus: true
+                    autoFocus: autoFocuser.isEnabled()
                 });
             }
         });
diff --git a/src/controllers/user/home.js b/src/controllers/user/home.js
index 7f1e1a4858..7f12efc7fb 100644
--- a/src/controllers/user/home.js
+++ b/src/controllers/user/home.js
@@ -1,4 +1,4 @@
-define(["homescreenSettings", "userSettingsBuilder", "dom", "globalize", "loading", "userSettings", "listViewStyle"], function (HomescreenSettings, userSettingsBuilder, dom, globalize, loading, currentUserSettings) {
+define(["homescreenSettings", "userSettingsBuilder", "dom", "globalize", "loading", "userSettings", "autoFocuser", "listViewStyle"], function (HomescreenSettings, userSettingsBuilder, dom, globalize, loading, currentUserSettings, autoFocuser) {
     "use strict";
 
     return function (view, params) {
@@ -25,7 +25,7 @@ define(["homescreenSettings", "userSettingsBuilder", "dom", "globalize", "loadin
                     userSettings: userSettings,
                     enableSaveButton: false,
                     enableSaveConfirmation: false,
-                    autoFocus: true
+                    autoFocus: autoFocuser.isEnabled()
                 });
             }
         });
diff --git a/src/controllers/user/playback.js b/src/controllers/user/playback.js
index a3661e4096..3def9d1931 100644
--- a/src/controllers/user/playback.js
+++ b/src/controllers/user/playback.js
@@ -1,4 +1,4 @@
-define(["playbackSettings", "userSettingsBuilder", "dom", "globalize", "loading", "userSettings", "listViewStyle"], function (PlaybackSettings, userSettingsBuilder, dom, globalize, loading, currentUserSettings) {
+define(["playbackSettings", "userSettingsBuilder", "dom", "globalize", "loading", "userSettings", "autoFocuser", "listViewStyle"], function (PlaybackSettings, userSettingsBuilder, dom, globalize, loading, currentUserSettings, autoFocuser) {
     "use strict";
 
     return function (view, params) {
@@ -25,7 +25,7 @@ define(["playbackSettings", "userSettingsBuilder", "dom", "globalize", "loading"
                     userSettings: userSettings,
                     enableSaveButton: false,
                     enableSaveConfirmation: false,
-                    autoFocus: true
+                    autoFocus: autoFocuser.isEnabled()
                 });
             }
         });
diff --git a/src/controllers/user/subtitles.js b/src/controllers/user/subtitles.js
index 2f48848593..1f1102194e 100644
--- a/src/controllers/user/subtitles.js
+++ b/src/controllers/user/subtitles.js
@@ -1,4 +1,4 @@
-define(["subtitleSettings", "userSettingsBuilder", "userSettings"], function (SubtitleSettings, userSettingsBuilder, currentUserSettings) {
+define(["subtitleSettings", "userSettingsBuilder", "userSettings", "autoFocuser"], function (SubtitleSettings, userSettingsBuilder, currentUserSettings, autoFocuser) {
     "use strict";
 
     return function (view, params) {
@@ -25,7 +25,7 @@ define(["subtitleSettings", "userSettingsBuilder", "userSettings"], function (Su
                     userSettings: userSettings,
                     enableSaveButton: false,
                     enableSaveConfirmation: false,
-                    autoFocus: true
+                    autoFocus: autoFocuser.isEnabled()
                 });
             }
         });