Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 868fdf98 authored by Fabian Kozynski's avatar Fabian Kozynski Committed by android-build-merger
Browse files

Merge "Fixes default setting for showing MultiUserSwitch" into qt-dev am: 4244434b 

am: 959350fd

Change-Id: I71717c7568057598412aa1ef2400a87d5318c6ea
parents 0d1105b7 959350fd

packages/SystemUI/src/com/android/systemui/statusbar/phone/MultiUserSwitch.java

+3 −1
Original line number Diff line number Diff line
@@ -98,8 +98,10 @@ public class MultiUserSwitch extends FrameLayout implements View.OnClickListener 
        // Short-circuiting from UserManager. Needs to be extracted because of SystemUI boolean flag

        // qs_show_user_switcher_for_single_user



        // The default in UserManager is to show the switcher. We want to not show it unless the

        // user explicitly requests it in Settings

        final boolean userSwitcherEnabled = Settings.Global.getInt(mContext.getContentResolver(),

                Settings.Global.USER_SWITCHER_ENABLED, 1) != 0;

                Settings.Global.USER_SWITCHER_ENABLED, 0) != 0;



        if (!UserManager.supportsMultipleUsers()

                || mUserManager.hasUserRestriction(UserManager.DISALLOW_USER_SWITCH)