Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 95b2db64 authored by Jim Miller's avatar Jim Miller Committed by Android Git Automerger
Browse files

am fd34f989: Merge "Disable the "none" security selection in settings when... 

am fd34f989: Merge "Disable the "none" security selection in settings when there\'s only 1 user" into jb-mr1-lockscreen-dev

* commit 'fd34f989':
  Disable the "none" security selection in settings when there's only 1 user
parents 7c99551a fd34f989

src/com/android/settings/ChooseLockGeneric.java

+11 −0
Original line number Diff line number Diff line
@@ -21,7 +21,9 @@ import android.app.PendingIntent; 
import android.app.admin.DevicePolicyManager;

import android.content.Context;

import android.content.Intent;

import android.content.pm.UserInfo;

import android.os.Bundle;

import android.os.UserManager;

import android.preference.Preference;

import android.preference.PreferenceActivity;

import android.preference.PreferenceScreen;
@@ -33,6 +35,8 @@ import android.widget.ListView; 


import com.android.internal.widget.LockPatternUtils;



import java.util.List;



import libcore.util.MutableBoolean;



public class ChooseLockGeneric extends PreferenceActivity {
@@ -270,6 +274,12 @@ public class ChooseLockGeneric extends PreferenceActivity { 
                    .getBooleanExtra(LockPatternUtils.LOCKSCREEN_BIOMETRIC_WEAK_FALLBACK, false);

            final boolean weakBiometricAvailable =

                    mChooseLockSettingsHelper.utils().isBiometricWeakInstalled();



            // 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) {
@@ -278,6 +288,7 @@ public class ChooseLockGeneric extends PreferenceActivity { 
                    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_BIOMETRIC_WEAK.equals(key)) {

src/com/android/settings/SecuritySettings.java

+8 −1
Original line number Diff line number Diff line
@@ -27,8 +27,10 @@ import android.content.DialogInterface; 
import android.content.Intent;

import android.content.pm.PackageManager;

import android.content.pm.ResolveInfo;

import android.content.pm.UserInfo;

import android.os.Bundle;

import android.os.UserHandle;

import android.os.UserManager;

import android.preference.CheckBoxPreference;

import android.preference.ListPreference;

import android.preference.Preference;
@@ -120,7 +122,12 @@ public class SecuritySettings extends SettingsPreferenceFragment 
        // Add options for lock/unlock screen

        int resid = 0;

        if (!mLockPatternUtils.isSecure()) {

            if (mLockPatternUtils.isLockScreenDisabled()) {

            // 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;



            if (singleUser && mLockPatternUtils.isLockScreenDisabled()) {

                resid = R.xml.security_settings_lockscreen;

            } else {

                resid = R.xml.security_settings_chooser;