Merge "Make Recents button work in demo mode" into nyc-mr1-dev

2016-07-13 22:37:30 +00:00
parent ebc3c9ca3f 6947636a58
commit 0aee1b4163
1 changed files with 2 additions and 2 deletions
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
@@ -883,9 +883,9 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
        mLightStatusBarController = new LightStatusBarController(mIconController,
                mBatteryController);
        mKeyguardMonitor = new KeyguardMonitor(mContext);
+        mUserSwitcherController = new UserSwitcherController(mContext, mKeyguardMonitor,
+                mHandler, this);
        if (UserManager.get(mContext).isUserSwitcherEnabled()) {
-            mUserSwitcherController = new UserSwitcherController(mContext, mKeyguardMonitor,
-                    mHandler, this);
            createUserSwitcher();
        }