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

Allow none lockscreen with multiple users

Browse Source 
Bug: 19962043
Change-Id: Ic7dcbd371d700bf8796f50469a7ac7d529ec491d
This commit is contained in:
Adrian Roos
2015-04-07 16:55:29 +02:00
parent e06c34464e
commit 591dc85017
2 changed files with 3 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/com/android/settings/ChooseLockGeneric.java
View File

@@ -27,10 +27,8 @@ import android.app.admin.DevicePolicyManager;
import android.content.Context; import android.content.Context;
import android.content.DialogInterface; import android.content.DialogInterface;
import android.content.Intent; import android.content.Intent;
import android.content.pm.UserInfo;
import android.os.Bundle; import android.os.Bundle;
import android.os.Process; import android.os.Process;
import android.os.UserManager;
import android.preference.Preference; import android.preference.Preference;
import android.preference.PreferenceScreen; import android.preference.PreferenceScreen;
import android.security.KeyStore; import android.security.KeyStore;
@@ -45,8 +43,6 @@ import android.widget.Toast;
import com.android.internal.logging.MetricsLogger; import com.android.internal.logging.MetricsLogger;
import com.android.internal.widget.LockPatternUtils; import com.android.internal.widget.LockPatternUtils;
import java.util.List;
public class ChooseLockGeneric extends SettingsActivity { public class ChooseLockGeneric extends SettingsActivity {
public static final String CONFIRM_CREDENTIALS = "confirm_credentials"; public static final String CONFIRM_CREDENTIALS = "confirm_credentials";
@@ -296,22 +292,15 @@ public class ChooseLockGeneric extends SettingsActivity {
protected void disableUnusablePreferencesImpl(final int quality, protected void disableUnusablePreferencesImpl(final int quality,
boolean hideDisabled) { boolean hideDisabled) {
final PreferenceScreen entries = getPreferenceScreen(); 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) { for (int i = entries.getPreferenceCount() - 1; i >= 0; --i) {
Preference pref = entries.getPreference(i); Preference pref = entries.getPreference(i);
if (pref instanceof PreferenceScreen) { if (pref instanceof PreferenceScreen) {
final String key = ((PreferenceScreen) pref).getKey(); final String key = pref.getKey();
boolean enabled = true; boolean enabled = true;
boolean visible = true; boolean visible = true;
if (KEY_UNLOCK_SET_OFF.equals(key)) { if (KEY_UNLOCK_SET_OFF.equals(key)) {
enabled = quality <= DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED; 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)) { } else if (KEY_UNLOCK_SET_NONE.equals(key)) {
enabled = quality <= DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED; enabled = quality <= DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED;
} else if (KEY_UNLOCK_SET_PATTERN.equals(key)) { } else if (KEY_UNLOCK_SET_PATTERN.equals(key)) {
@@ -322,7 +311,7 @@ public class ChooseLockGeneric extends SettingsActivity {
enabled = quality <= DevicePolicyManager.PASSWORD_QUALITY_COMPLEX; enabled = quality <= DevicePolicyManager.PASSWORD_QUALITY_COMPLEX;
} }
if (hideDisabled) { if (hideDisabled) {
visible = visible && enabled; visible = enabled;
} }
if (!visible) { if (!visible) {
entries.removePreference(pref); entries.removePreference(pref);

7
src/com/android/settings/SecuritySettings.java
View File

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