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

Show user management UI if a managed profile exists

Browse Source 
Show UI even if flags to show multiuser UI are off, if there's a
second user on the device. This way there's an affordance to remove
the user.

Don't show the "Add user" item though.

Bug: 15447068
Change-Id: I40273005d6d8d66aed486328615acdab71d51fa4
This commit is contained in:
Amith Yamasani
2014-06-06 14:31:37 -07:00
parent b76de1d4fa
commit 4093e40e18
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -186,7 +186,9 @@ public class UserSettings extends RestrictedSettingsFragment
}
final Context context = getActivity();
mUserManager = (UserManager) context.getSystemService(Context.USER_SERVICE);
if (!mUserManager.supportsMultipleUsers() || Utils.isMonkeyRunning()) {
boolean hasMultipleUsers = mUserManager.getUserCount() > 1;
if ((!UserManager.supportsMultipleUsers() && !hasMultipleUsers)
|| Utils.isMonkeyRunning()) {
mEnabled = false;
return;
}
@@ -201,7 +203,8 @@ public class UserSettings extends RestrictedSettingsFragment
mMePreference.setSummary(R.string.user_owner);
}
mAddUser = findPreference(KEY_ADD_USER);
if (!mIsOwner || UserManager.getMaxSupportedUsers() < 2) {
if (!mIsOwner || UserManager.getMaxSupportedUsers() < 2
|| !UserManager.supportsMultipleUsers()) {
removePreference(KEY_ADD_USER);
} else {
mAddUser.setOnPreferenceClickListener(this);