Merge "Disable quick settings panel in setup wizard (user 0)." into jb-mr1-dev

1 files changed, 5 insertions, 2 deletions

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 160f3b4d0a4c..e5874221fb5e 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
@@ -274,10 +274,13 @@ public class PhoneStatusBar extends BaseStatusBar {
                     Settings.Secure.USER_SETUP_COMPLETE,
                     0 /*default */,
                     mCurrentUserId);
+            if (MULTIUSER_DEBUG) Slog.d(TAG, String.format("User setup changed: " +
+                    "selfChange=%s userSetup=%s mUserSetup=%s",
+                    selfChange, userSetup, mUserSetup));
+            if (mSettingsPanel != null)
+                mSettingsPanel.setEnabled(userSetup);
             if (userSetup != mUserSetup) {
                 mUserSetup = userSetup;
-                if (mSettingsPanel != null)
-                    mSettingsPanel.setEnabled(mUserSetup);
                 if (!mUserSetup && mStatusBarView != null)
                     animateCollapseQuickSettings();
             }