diff --git a/core/res/res/values-sw600dp/config.xml b/core/res/res/values-sw600dp/config.xml index c891268a04daa..368e307f9ff56 100644 --- a/core/res/res/values-sw600dp/config.xml +++ b/core/res/res/values-sw600dp/config.xml @@ -45,5 +45,8 @@ false + + + true diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index 94764caf300f2..e3a73377e365f 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -4420,4 +4420,8 @@ + + + false + diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index e0e607476a49e..137baa1d801b4 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -3939,4 +3939,7 @@ + + + diff --git a/packages/SystemUI/res/values-sw600dp/config.xml b/packages/SystemUI/res/values-sw600dp/config.xml index f91af03f58894..5d20564a3ab83 100644 --- a/packages/SystemUI/res/values-sw600dp/config.xml +++ b/packages/SystemUI/res/values-sw600dp/config.xml @@ -26,9 +26,6 @@ 1 - - true - left;back,home,recent;right diff --git a/packages/SystemUI/res/values/config.xml b/packages/SystemUI/res/values/config.xml index 4d6b759c86e44..922acff7f6f2f 100644 --- a/packages/SystemUI/res/values/config.xml +++ b/packages/SystemUI/res/values/config.xml @@ -175,9 +175,6 @@ be 'platform' or 'noisy' (i.e. for noisy touch screens). --> platform - - false - false diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyguardUserSwitcher.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyguardUserSwitcher.java index 2abae3e260134..7d5498157136a 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyguardUserSwitcher.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyguardUserSwitcher.java @@ -60,7 +60,8 @@ public class KeyguardUserSwitcher { KeyguardStatusBarView statusBarView, NotificationPanelViewController panelViewController) { boolean keyguardUserSwitcherEnabled = - context.getResources().getBoolean(R.bool.config_keyguardUserSwitcher) || ALWAYS_ON; + context.getResources().getBoolean( + com.android.internal.R.bool.config_keyguardUserSwitcher) || ALWAYS_ON; UserSwitcherController userSwitcherController = Dependency.get(UserSwitcherController.class); if (userSwitcherController != null && keyguardUserSwitcherEnabled) { mUserSwitcherContainer = (Container) userSwitcher.inflate();