PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Tetiana Meronyk
2022-11-11 14:19:23 +00:00
committed by Android (Google) Code Review
parent 61e8616ddf 19fcb87e39
commit b1a21505d7
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/users/UserSettings.java
View File

@@ -1489,7 +1489,7 @@ public class UserSettings extends SettingsPreferenceFragment
private void updateAddUserCommon(Context context, RestrictedPreference addUser, private void updateAddUserCommon(Context context, RestrictedPreference addUser,
boolean canAddRestrictedProfile) { boolean canAddRestrictedProfile) {
if ((mUserCaps.mCanAddUser || !mUserCaps.mDisallowAddUserSetByAdmin) if ((mUserCaps.mCanAddUser && !mUserCaps.mDisallowAddUserSetByAdmin)
&& WizardManagerHelper.isDeviceProvisioned(context) && WizardManagerHelper.isDeviceProvisioned(context)
&& mUserCaps.mUserSwitcherEnabled) { && mUserCaps.mUserSwitcherEnabled) {
addUser.setVisible(true); addUser.setVisible(true);

4
tests/robotests/src/com/android/settings/users/UserSettingsTest.java
View File

@@ -417,12 +417,12 @@ public class UserSettingsTest {
} }
@Test @Test
public void updateUserList_cannotAddUserButCanSwitchUser_shouldShowDisabledAddUser() { public void updateUserList_cannotAddUserButCanSwitchUser_shouldNotShowAddUser() {
mUserCapabilities.mCanAddUser = false; mUserCapabilities.mCanAddUser = false;
mFragment.updateUserList(); mFragment.updateUserList();
verify(mAddUserPreference).setEnabled(false); verify(mAddUserPreference).setVisible(false);
} }
@Test @Test