diff options
author | Jason Monk <jmonk@google.com> | 2015-04-03 14:56:52 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-04-03 14:56:53 +0000 |
commit | bca21083a3f511bca0369deaf8684b145c281044 (patch) | |
tree | 990949c6281d243a071c07a7f139856e5348b72c /src/com/android/settings/ChooseLockGeneric.java | |
parent | cefa4395598d2eb0d299175934d9a13a4396f574 (diff) | |
parent | 9a64a4215e9a8ac6d3af72479aa162d0701deb48 (diff) | |
download | packages_apps_Settings-bca21083a3f511bca0369deaf8684b145c281044.zip packages_apps_Settings-bca21083a3f511bca0369deaf8684b145c281044.tar.gz packages_apps_Settings-bca21083a3f511bca0369deaf8684b145c281044.tar.bz2 |
Merge "Show current screen lock as summary"
Diffstat (limited to 'src/com/android/settings/ChooseLockGeneric.java')
-rw-r--r-- | src/com/android/settings/ChooseLockGeneric.java | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/src/com/android/settings/ChooseLockGeneric.java b/src/com/android/settings/ChooseLockGeneric.java index cb0ce5f..1da9ac7 100644 --- a/src/com/android/settings/ChooseLockGeneric.java +++ b/src/com/android/settings/ChooseLockGeneric.java @@ -244,12 +244,40 @@ public class ChooseLockGeneric extends SettingsActivity { } addPreferencesFromResource(R.xml.security_settings_picker); disableUnusablePreferences(quality, hideDisabledPrefs); + updateCurrentPreference(); updatePreferenceSummaryIfNeeded(); } else { updateUnlockMethodAndFinish(quality, false); } } + private void updateCurrentPreference() { + String currentKey = getKeyForCurrent(); + Preference preference = findPreference(currentKey); + if (preference != null) { + preference.setSummary(R.string.current_screen_lock); + } + } + + private String getKeyForCurrent() { + if (mLockPatternUtils.isLockScreenDisabled()) { + return KEY_UNLOCK_SET_OFF; + } + switch (mLockPatternUtils.getKeyguardStoredPasswordQuality()) { + case DevicePolicyManager.PASSWORD_QUALITY_SOMETHING: + return KEY_UNLOCK_SET_PATTERN; + case DevicePolicyManager.PASSWORD_QUALITY_NUMERIC: + case DevicePolicyManager.PASSWORD_QUALITY_NUMERIC_COMPLEX: + return KEY_UNLOCK_SET_PIN; + case DevicePolicyManager.PASSWORD_QUALITY_ALPHABETIC: + case DevicePolicyManager.PASSWORD_QUALITY_ALPHANUMERIC: + return KEY_UNLOCK_SET_PASSWORD; + case DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED: + return KEY_UNLOCK_SET_NONE; + } + return null; + } + /** increases the quality if necessary */ private int upgradeQuality(int quality) { quality = upgradeQualityForDPM(quality); |