Merge "Allow none lockscreen with multiple users" (c2ab9341) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/ChooseLockGeneric.java

+2 −13

Original line number	Diff line number	Diff line
		@@ -27,10 +27,8 @@ import android.app.admin.DevicePolicyManager;
		import android.content.Context;
		import android.content.DialogInterface;
		import android.content.Intent;
		import android.content.pm.UserInfo;
		import android.os.Bundle;
		import android.os.Process;
		import android.os.UserManager;
		import android.preference.Preference;
		import android.preference.PreferenceScreen;
		import android.security.KeyStore;
		@@ -45,8 +43,6 @@ import android.widget.Toast;
		import com.android.internal.logging.MetricsLogger;
		import com.android.internal.widget.LockPatternUtils;

		import java.util.List;

		public class ChooseLockGeneric extends SettingsActivity {
		public static final String CONFIRM_CREDENTIALS = "confirm_credentials";

		@@ -324,22 +320,15 @@ public class ChooseLockGeneric extends SettingsActivity {
		protected void disableUnusablePreferencesImpl(final int quality,
		boolean hideDisabled) {
		final PreferenceScreen entries = getPreferenceScreen();
		final Intent intent = getActivity().getIntent();

		// if there are multiple users, disable "None" setting
		UserManager mUm = (UserManager) getSystemService(Context.USER_SERVICE);
		List<UserInfo> users = mUm.getUsers(true);
		final boolean singleUser = users.size() == 1;

		for (int i = entries.getPreferenceCount() - 1; i >= 0; --i) {
		Preference pref = entries.getPreference(i);
		if (pref instanceof PreferenceScreen) {
		final String key = ((PreferenceScreen) pref).getKey();
		final String key = pref.getKey();
		boolean enabled = true;
		boolean visible = true;
		if (KEY_UNLOCK_SET_OFF.equals(key)) {
		enabled = quality <= DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED;
		visible = singleUser; // don't show when there's more than 1 user
		} else if (KEY_UNLOCK_SET_NONE.equals(key)) {
		enabled = quality <= DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED;
		} else if (KEY_UNLOCK_SET_PATTERN.equals(key)) {
		@@ -350,7 +339,7 @@ public class ChooseLockGeneric extends SettingsActivity {
		enabled = quality <= DevicePolicyManager.PASSWORD_QUALITY_COMPLEX;
		}
		if (hideDisabled) {
		visible = visible && enabled;
		visible = enabled;
		}
		if (!visible) {
		entries.removePreference(pref);

src/com/android/settings/SecuritySettings.java

+1 −6

Original line number	Diff line number	Diff line
		@@ -157,12 +157,7 @@ public class SecuritySettings extends SettingsPreferenceFragment
		LockPatternUtils lockPatternUtils) {
		int resid = 0;
		if (!lockPatternUtils.isSecure()) {
		// if there are multiple users, disable "None" setting
		UserManager mUm = (UserManager) context. getSystemService(Context.USER_SERVICE);
		List<UserInfo> users = mUm.getUsers(true);
		final boolean singleUser = users.size() == 1;

		if (singleUser && lockPatternUtils.isLockScreenDisabled()) {
		if (lockPatternUtils.isLockScreenDisabled()) {
		resid = R.xml.security_settings_lockscreen;
		} else {
		resid = R.xml.security_settings_chooser;