From 3ad242df7214e946a9a99e83b991bc9be0e636a2 Mon Sep 17 00:00:00 2001 From: Jason Monk Date: Mon, 15 Sep 2014 11:13:35 -0400 Subject: [PATCH] Block QS in sec. users setup when simple When simple user switcher is enabled block QS for secondary users during setup. Bug: 16782635 Change-Id: Ibc39c61675f8728d73a5f8ef04d0613ff36af909 --- .../android/systemui/statusbar/phone/PhoneStatusBar.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java index 1b4254c95aa3a..353c8877d0533 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java @@ -1485,7 +1485,11 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, updateClearAll(); updateEmptyShadeView(); - mNotificationPanel.setQsExpansionEnabled(isDeviceProvisioned()); + // Disable QS if device not provisioned. + // If the user switcher is simple then disable QS during setup because + // the user intends to use the lock screen user switcher, QS in not needed. + mNotificationPanel.setQsExpansionEnabled(isDeviceProvisioned() + && (!mUserSwitcherController.isSimpleUserSwitcher() || mUserSetup)); mShadeUpdates.check(); }