diff options
| author | 2015-08-18 15:54:08 +0000 | |
|---|---|---|
| committer | 2015-08-18 15:54:08 +0000 | |
| commit | f931053e3386c42ba53af4d288605c2d2c8b941a (patch) | |
| tree | b25192bd4bdc610728cfb2425a8c316aae50eee3 | |
| parent | d920ac6e6f6e580affdd0c48792f9d69bc104db6 (diff) | |
| parent | 40f9dabaa880eaff54099a3763224b241a6668e6 (diff) | |
Merge "Rename fullscreen user switcher config"
| -rw-r--r-- | packages/SystemUI/res/values/config.xml | 2 | ||||
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/policy/UserSwitcherController.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/packages/SystemUI/res/values/config.xml b/packages/SystemUI/res/values/config.xml index 66470cb915fa..8da11488c482 100644 --- a/packages/SystemUI/res/values/config.xml +++ b/packages/SystemUI/res/values/config.xml @@ -295,7 +295,7 @@ <bool name="config_enableAppShelf">false</bool> <!-- Whether to show the full screen user switcher. --> - <bool name="enable_fullscreen_user_switcher">false</bool> + <bool name="config_enableFullscreenUserSwitcher">false</bool> </resources> diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/UserSwitcherController.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/UserSwitcherController.java index 709b7083b63e..bc7d1b77d75e 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/UserSwitcherController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/UserSwitcherController.java @@ -286,7 +286,7 @@ public class UserSwitcherController { return overrideUseFullscreenUserSwitcher != 0; } // Otherwise default to the build setting. - return mContext.getResources().getBoolean(R.bool.enable_fullscreen_user_switcher); + return mContext.getResources().getBoolean(R.bool.config_enableFullscreenUserSwitcher); } public void removeUserId(int userId) { |