PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update to follow password mode->quality API change.

Browse Source
This commit is contained in:
Dianne Hackborn
2010-01-29 10:49:32 -08:00
parent 454b7a4a04
commit 33111717d5
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/com/android/settings/ChooseLockGeneric.java
View File

@@ -37,22 +37,22 @@ public class ChooseLockGeneric extends Activity {
final LockPatternUtils lockPatternUtils = mChooseLockSettingsHelper.utils(); final LockPatternUtils lockPatternUtils = mChooseLockSettingsHelper.utils();
int mode = getIntent().getIntExtra(LockPatternUtils.PASSWORD_TYPE_KEY, -1); int quality = getIntent().getIntExtra(LockPatternUtils.PASSWORD_TYPE_KEY, -1);
if (mode == -1) { if (quality == -1) {
mode = lockPatternUtils.getPasswordMode(); quality = lockPatternUtils.getPasswordMode();
} }
int minMode = mDPM.getPasswordMode(null); int minQuality = mDPM.getPasswordQuality(null);
if (mode < minMode) { if (quality < minQuality) {
mode = minMode; quality = minQuality;
} }
if (mode >= DevicePolicyManager.PASSWORD_MODE_NUMERIC) { if (quality >= DevicePolicyManager.PASSWORD_QUALITY_NUMERIC) {
int minLength = mDPM.getPasswordMinimumLength(null); int minLength = mDPM.getPasswordMinimumLength(null);
if (minLength < 4) { if (minLength < 4) {
minLength = 4; minLength = 4;
} }
final int maxLength = mDPM.getPasswordMaximumLength(mode); final int maxLength = mDPM.getPasswordMaximumLength(quality);
Intent intent = new Intent().setClass(this, ChooseLockPassword.class); 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_MIN_KEY, minLength);
intent.putExtra(ChooseLockPassword.PASSWORD_MAX_KEY, maxLength); intent.putExtra(ChooseLockPassword.PASSWORD_MAX_KEY, maxLength);
startActivity(intent); startActivity(intent);

4
src/com/android/settings/SecuritySettings.java
View File

@@ -224,7 +224,7 @@ public class SecuritySettings extends PreferenceActivity {
protected void handleUpdateUnlockMethod(final String value) { protected void handleUpdateUnlockMethod(final String value) {
if ("none".equals(value)) { if ("none".equals(value)) {
if (mDPM.getPasswordMode(null) == DevicePolicyManager.PASSWORD_MODE_UNSPECIFIED) { if (mDPM.getPasswordQuality(null) == DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED) {
mChooseLockSettingsHelper.launchConfirmationActivity(CONFIRM_EXISTING_REQUEST); mChooseLockSettingsHelper.launchConfirmationActivity(CONFIRM_EXISTING_REQUEST);
} }
} else { } else {
@@ -236,7 +236,7 @@ public class SecuritySettings extends PreferenceActivity {
} else { } else {
reqMode = LockPatternUtils.MODE_PATTERN; reqMode = LockPatternUtils.MODE_PATTERN;
} }
int minMode = mDPM.getPasswordMode(null); int minMode = mDPM.getPasswordQuality(null);
if (reqMode < minMode) { if (reqMode < minMode) {
reqMode = minMode; reqMode = minMode;
} }