Merge "Fix visibility of AddUser when toggling multiuser."

2018-09-12 22:34:55 +00:00
parent de3ff1eee1 73d7773eb2
commit b01d15aab1
2 changed files with 29 additions and 1 deletions
--- a/src/com/android/settings/users/UserSettings.java
+++ b/src/com/android/settings/users/UserSettings.java
@@ -964,9 +964,10 @@ public class UserSettings extends SettingsPreferenceFragment
                mAddUserWhenLockedPreferenceController.getPreferenceKey());
        mAddUserWhenLockedPreferenceController.updateState(addUserOnLockScreen);
        mMultiUserFooterPreferenceController.updateState(null /* preference */);
+        mAddUser.setVisible(mUserCaps.mCanAddUser && Utils.isDeviceProvisioned(context)
+                && mUserCaps.mUserSwitcherEnabled);
        mUserListCategory.setVisible(mUserCaps.mUserSwitcherEnabled);
        if (!mUserCaps.mUserSwitcherEnabled) {
-            mAddUser.setVisible(false);
            return;
        }