summaryrefslogtreecommitdiffstats
path: root/packages/SystemUI
diff options
context:
space:
mode:
authorJason Monk <jmonk@google.com>2014-09-03 14:57:02 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-09-03 14:57:02 +0000
commit464775b39d077d7d586d1a24719755aab21840e2 (patch)
treec999b1f041fb743a541d9385d10f0652b1e35ade /packages/SystemUI
parent0b79b9a4d13a86cb631f7db50edf138b8ddaa5bb (diff)
parent52c4f6466677df9710ad8c3cdd2939fd59a8edd1 (diff)
downloadframeworks_base-464775b39d077d7d586d1a24719755aab21840e2.zip
frameworks_base-464775b39d077d7d586d1a24719755aab21840e2.tar.gz
frameworks_base-464775b39d077d7d586d1a24719755aab21840e2.tar.bz2
am 1ab4a05d: am 46295dc1: Merge "Don\'t show add user for simple user switcher" into lmp-dev
* commit '1ab4a05d305588854bfe93a1757c60459eb20b11': Don't show add user for simple user switcher
Diffstat (limited to 'packages/SystemUI')
-rw-r--r--packages/SystemUI/src/com/android/systemui/statusbar/policy/UserSwitcherController.java2
1 files changed, 1 insertions, 1 deletions
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 adb71e7..e4b1945 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/UserSwitcherController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/UserSwitcherController.java
@@ -188,7 +188,7 @@ public class UserSwitcherController {
}
}
- if (canCreateUser) {
+ if (!mSimpleUserSwitcher && canCreateUser) {
records.add(new UserRecord(null /* info */, null /* picture */,
false /* isGuest */, false /* isCurrent */, true /* isAddUser */,
createIsRestricted));