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

auto import from //branches/cupcake/...@132276

Browse Source
This commit is contained in:
The Android Open Source Project
2009-02-19 10:57:36 -08:00
parent b9f5851434
commit 4772968987
64 changed files with 1990 additions and 2455 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -45,7 +45,8 @@ public class SecuritySettings extends PreferenceActivity
private static final String KEY_LOCK_ENABLED = "lockenabled";
private static final String KEY_VISIBLE_PATTERN = "visiblepattern";
private static final String KEY_TACTILE_FEEDBACK_ENABLED = "tactilefeedback";
private static final int CONFIRM_PATTERN_REQUEST_CODE = 55;
private static final int CONFIRM_PATTERN_THEN_DISABLE_REQUEST_CODE = 55;
private static final int CONFIRM_PATTERN_THEN_ENABLE_REQUEST_CODE = 56;
private LockPatternUtils mLockPatternUtils;
private CheckBoxPreference mLockEnabled;
@@ -256,14 +257,24 @@ public class SecuritySettings extends PreferenceActivity
@Override
protected void onClick() {
if (isChecked() && mLockPatternUtils.savedPatternExists()) {
confirmPatternThenDisable();
if (mLockPatternUtils.savedPatternExists()) {
if (isChecked()) {
confirmPatternThenDisable();
} else {
confirmPatternThenEnable();
}
} else {
super.onClick();
}
}
}
private void confirmPatternThenEnable() {
final Intent intent = new Intent();
intent.setClassName("com.android.settings", "com.android.settings.ConfirmLockPattern");
startActivityForResult(intent, CONFIRM_PATTERN_THEN_ENABLE_REQUEST_CODE);
}
/**
* Launch screen to confirm the existing lock pattern.
* @see #onActivityResult(int, int, android.content.Intent)
@@ -271,7 +282,7 @@ public class SecuritySettings extends PreferenceActivity
private void confirmPatternThenDisable() {
final Intent intent = new Intent();
intent.setClassName("com.android.settings", "com.android.settings.ConfirmLockPattern");
startActivityForResult(intent, CONFIRM_PATTERN_REQUEST_CODE);
startActivityForResult(intent, CONFIRM_PATTERN_THEN_DISABLE_REQUEST_CODE);
}
/**
@@ -282,12 +293,12 @@ public class SecuritySettings extends PreferenceActivity
Intent data) {
super.onActivityResult(requestCode, resultCode, data);
if (requestCode != CONFIRM_PATTERN_REQUEST_CODE) {
return;
}
final boolean resultOk = resultCode == Activity.RESULT_OK;
if (resultCode == Activity.RESULT_OK) {
mLockPatternUtils.setLockPatternEnabled(false);
if ((requestCode == CONFIRM_PATTERN_THEN_DISABLE_REQUEST_CODE) && resultOk) {
mLockPatternUtils.setLockPatternEnabled(false);
} else if ((requestCode == CONFIRM_PATTERN_THEN_ENABLE_REQUEST_CODE) && resultOk) {
mLockPatternUtils.setLockPatternEnabled(true);
}
}
}