diff options
author | Adrian Roos <roosa@google.com> | 2015-04-08 15:24:29 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-04-08 15:24:30 +0000 |
commit | c2ab9341179c876b782c45d3d69897f9fd5fab80 (patch) | |
tree | 46ee1a2bd7cb777de5c6b1be6d68ab58faa9d76d /src/com/android/settings/ChooseLockGeneric.java | |
parent | 1951726152cc8b0dde8b35f50c3710f8a56b8934 (diff) | |
parent | 591dc85017ea19e56c416ae6d1a55b82e29743f4 (diff) | |
download | packages_apps_Settings-c2ab9341179c876b782c45d3d69897f9fd5fab80.zip packages_apps_Settings-c2ab9341179c876b782c45d3d69897f9fd5fab80.tar.gz packages_apps_Settings-c2ab9341179c876b782c45d3d69897f9fd5fab80.tar.bz2 |
Merge "Allow none lockscreen with multiple users"
Diffstat (limited to 'src/com/android/settings/ChooseLockGeneric.java')
-rw-r--r-- | src/com/android/settings/ChooseLockGeneric.java | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/src/com/android/settings/ChooseLockGeneric.java b/src/com/android/settings/ChooseLockGeneric.java index 1da9ac7..479baf7 100644 --- a/src/com/android/settings/ChooseLockGeneric.java +++ b/src/com/android/settings/ChooseLockGeneric.java @@ -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); |