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

am 85ed0862: Merge change I454a0dbf into eclair

Browse Source 
Merge commit '85ed086217427308c3b2df5b4ba77fa5ae7326e6'

* commit '85ed086217427308c3b2df5b4ba77fa5ae7326e6':
  SecuritySettings: revert "minor tuning".
This commit is contained in:
Chia-chi Yeh
2009-10-12 11:17:26 -07:00
committed by Android Git Automerger
parent c76a17c9c9 85ed086217
commit cbd42fb747
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -419,9 +419,7 @@ public class SecuritySettings extends PreferenceActivity {
public boolean onPreferenceChange(Preference preference, Object value) {
if (preference == mAccessCheckBox) {
boolean checked = (Boolean) value;
mAccessCheckBox.setChecked(!checked);
if (checked) {
if ((Boolean) value) {
showDialog((mState == KeyStore.UNINITIALIZED) ?
PASSWORD_DIALOG : UNLOCK_DIALOG);
} else {
@@ -461,6 +459,7 @@ public class SecuritySettings extends PreferenceActivity {
}
}
removeDialog(mDialogId);
updatePreferences(mState);
if (mExternalIntent != null) {
mExternalIntent = null;
finish();