Merge "Show user management UI if a managed profile exists" into lmp-preview-dev (fd1710bf) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/SettingsActivity.java

+5 −1

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

+5 −2

Original line number	Diff line number	Diff line
		@@ -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);