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

Merge "Show user management UI if a managed profile exists" into lmp-preview-dev

Browse Source
This commit is contained in:
Amith Yamasani
2014-06-06 22:03:36 +00:00
committed by Android (Google) Code Review
parent 5c8f1352e4 4093e40e18
commit fd1710bf9e
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/SettingsActivity.java
View File

@@ -1043,8 +1043,12 @@ public class SettingsActivity extends Activity
category.removeTile(n); category.removeTile(n);
} }
} else if (id == R.id.user_settings) { } else if (id == R.id.user_settings) {
boolean hasMultipleUsers =
((UserManager) getSystemService(Context.USER_SERVICE))
.getUserCount() > 1;
if (!UserHandle.MU_ENABLED if (!UserHandle.MU_ENABLED
|| !UserManager.supportsMultipleUsers() || (!UserManager.supportsMultipleUsers()
&& !hasMultipleUsers)
|| Utils.isMonkeyRunning()) { || Utils.isMonkeyRunning()) {
category.removeTile(n); category.removeTile(n);
} }

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

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