diff options
Diffstat (limited to 'src/com/android/settings/ChooseLockGeneric.java')
| -rw-r--r-- | src/com/android/settings/ChooseLockGeneric.java | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/com/android/settings/ChooseLockGeneric.java b/src/com/android/settings/ChooseLockGeneric.java index a3c8d8a..b244a75 100644 --- a/src/com/android/settings/ChooseLockGeneric.java +++ b/src/com/android/settings/ChooseLockGeneric.java @@ -37,22 +37,22 @@ public class ChooseLockGeneric extends Activity { final LockPatternUtils lockPatternUtils = mChooseLockSettingsHelper.utils(); - int mode = getIntent().getIntExtra(LockPatternUtils.PASSWORD_TYPE_KEY, -1); - if (mode == -1) { - mode = lockPatternUtils.getPasswordMode(); + int quality = getIntent().getIntExtra(LockPatternUtils.PASSWORD_TYPE_KEY, -1); + if (quality == -1) { + quality = lockPatternUtils.getPasswordMode(); } - int minMode = mDPM.getPasswordMode(); - if (mode < minMode) { - mode = minMode; + int minQuality = mDPM.getPasswordQuality(null); + if (quality < minQuality) { + quality = minQuality; } - if (mode >= DevicePolicyManager.PASSWORD_MODE_NUMERIC) { - int minLength = mDPM.getMinimumPasswordLength(); + if (quality >= DevicePolicyManager.PASSWORD_QUALITY_NUMERIC) { + int minLength = mDPM.getPasswordMinimumLength(null); if (minLength < 4) { minLength = 4; } - final int maxLength = 16; + final int maxLength = mDPM.getPasswordMaximumLength(quality); Intent intent = new Intent().setClass(this, ChooseLockPassword.class); - intent.putExtra(LockPatternUtils.PASSWORD_TYPE_KEY, mode); + intent.putExtra(LockPatternUtils.PASSWORD_TYPE_KEY, quality); intent.putExtra(ChooseLockPassword.PASSWORD_MIN_KEY, minLength); intent.putExtra(ChooseLockPassword.PASSWORD_MAX_KEY, maxLength); startActivity(intent); |