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

Merge change I454a0dbf into eclair

Browse Source 
* changes:
  SecuritySettings: revert "minor tuning".
This commit is contained in:
Android (Google) Code Review
2009-10-01 14:35:13 -04:00
parent 9767612cc8 454a0dbf8f
commit 85ed086217
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) { public boolean onPreferenceChange(Preference preference, Object value) {
if (preference == mAccessCheckBox) { if (preference == mAccessCheckBox) {
boolean checked = (Boolean) value; if ((Boolean) value) {
mAccessCheckBox.setChecked(!checked);
if (checked) {
showDialog((mState == KeyStore.UNINITIALIZED) ? showDialog((mState == KeyStore.UNINITIALIZED) ?
PASSWORD_DIALOG : UNLOCK_DIALOG); PASSWORD_DIALOG : UNLOCK_DIALOG);
} else { } else {
@@ -461,6 +459,7 @@ public class SecuritySettings extends PreferenceActivity {
} }
} }
removeDialog(mDialogId); removeDialog(mDialogId);
updatePreferences(mState);
if (mExternalIntent != null) { if (mExternalIntent != null) {
mExternalIntent = null; mExternalIntent = null;
finish(); finish();