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

Commit b1a21505 authored by Tetiana Meronyk's avatar Tetiana Meronyk Committed by Android (Google) Code Review
Browse files

Merge "Hide "Add user" button for secondary user"

parents 61e8616d 19fcb87e

src/com/android/settings/users/UserSettings.java

+1 −1
Original line number Diff line number Diff line
@@ -1489,7 +1489,7 @@ public class UserSettings extends SettingsPreferenceFragment 


    private void updateAddUserCommon(Context context, RestrictedPreference addUser,

            boolean canAddRestrictedProfile) {

        if ((mUserCaps.mCanAddUser || !mUserCaps.mDisallowAddUserSetByAdmin)

        if ((mUserCaps.mCanAddUser && !mUserCaps.mDisallowAddUserSetByAdmin)

                && WizardManagerHelper.isDeviceProvisioned(context)

                && mUserCaps.mUserSwitcherEnabled) {

            addUser.setVisible(true);

tests/robotests/src/com/android/settings/users/UserSettingsTest.java

+2 −2
Original line number Diff line number Diff line
@@ -417,12 +417,12 @@ public class UserSettingsTest { 
    }



    @Test

    public void updateUserList_cannotAddUserButCanSwitchUser_shouldShowDisabledAddUser() {

    public void updateUserList_cannotAddUserButCanSwitchUser_shouldNotShowAddUser() {

        mUserCapabilities.mCanAddUser = false;



        mFragment.updateUserList();



        verify(mAddUserPreference).setEnabled(false);

        verify(mAddUserPreference).setVisible(false);

    }



    @Test