diff options
| author | Konstantin Lopyrev <klopyrev@google.com> | 2010-05-24 17:10:56 -0700 |
|---|---|---|
| committer | Konstantin Lopyrev <klopyrev@google.com> | 2010-05-27 15:27:06 -0700 |
| commit | a15dcfaf2bc7cbd13b30db6766afe3bbaa01db97 (patch) | |
| tree | f58aeeaf40b2c9eec459fca00ee4fa2126629652 /policy | |
| parent | afd52a0b40e7986d0993217b3fe0cf44fea21274 (diff) | |
| download | frameworks_base-a15dcfaf2bc7cbd13b30db6766afe3bbaa01db97.zip frameworks_base-a15dcfaf2bc7cbd13b30db6766afe3bbaa01db97.tar.gz frameworks_base-a15dcfaf2bc7cbd13b30db6766afe3bbaa01db97.tar.bz2 | |
Fix 2677197: Adding minimum complex character support.
Change-Id: I520bc5f9aa924bf9b5585b2235a91cc96cb99c25
Diffstat (limited to 'policy')
| -rw-r--r-- | policy/com/android/internal/policy/impl/LockPatternKeyguardView.java | 1 | ||||
| -rw-r--r-- | policy/com/android/internal/policy/impl/PasswordUnlockScreen.java | 6 |
2 files changed, 5 insertions, 2 deletions
diff --git a/policy/com/android/internal/policy/impl/LockPatternKeyguardView.java b/policy/com/android/internal/policy/impl/LockPatternKeyguardView.java index 587f9c1..8693294 100644 --- a/policy/com/android/internal/policy/impl/LockPatternKeyguardView.java +++ b/policy/com/android/internal/policy/impl/LockPatternKeyguardView.java @@ -667,6 +667,7 @@ public class LockPatternKeyguardView extends KeyguardViewBase { case DevicePolicyManager.PASSWORD_QUALITY_NUMERIC: case DevicePolicyManager.PASSWORD_QUALITY_ALPHABETIC: case DevicePolicyManager.PASSWORD_QUALITY_ALPHANUMERIC: + case DevicePolicyManager.PASSWORD_QUALITY_COMPLEX: currentMode = UnlockMode.Password; break; case DevicePolicyManager.PASSWORD_QUALITY_SOMETHING: diff --git a/policy/com/android/internal/policy/impl/PasswordUnlockScreen.java b/policy/com/android/internal/policy/impl/PasswordUnlockScreen.java index c519d82..8fdff92 100644 --- a/policy/com/android/internal/policy/impl/PasswordUnlockScreen.java +++ b/policy/com/android/internal/policy/impl/PasswordUnlockScreen.java @@ -88,7 +88,8 @@ public class PasswordUnlockScreen extends LinearLayout implements KeyguardScreen final int quality = lockPatternUtils.getKeyguardStoredPasswordQuality(); final boolean isAlpha = DevicePolicyManager.PASSWORD_QUALITY_ALPHABETIC == quality - || DevicePolicyManager.PASSWORD_QUALITY_ALPHANUMERIC == quality; + || DevicePolicyManager.PASSWORD_QUALITY_ALPHANUMERIC == quality + || DevicePolicyManager.PASSWORD_QUALITY_COMPLEX == quality; mKeyboardView = (PasswordEntryKeyboardView) findViewById(R.id.keyboard); mPasswordEntry = (EditText) findViewById(R.id.passwordEntry); @@ -200,7 +201,8 @@ public class PasswordUnlockScreen extends LinearLayout implements KeyguardScreen mPasswordEntry.setEnabled(true); final int quality = mLockPatternUtils.getKeyguardStoredPasswordQuality(); final boolean isAlpha = DevicePolicyManager.PASSWORD_QUALITY_ALPHABETIC == quality - || DevicePolicyManager.PASSWORD_QUALITY_ALPHANUMERIC == quality; + || DevicePolicyManager.PASSWORD_QUALITY_ALPHANUMERIC == quality + || DevicePolicyManager.PASSWORD_QUALITY_COMPLEX == quality; if(isAlpha) { mTitle.setText(R.string.keyguard_password_enter_password_code); } else { |