diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-10-01 13:12:21 -0400 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-10-01 13:12:21 -0400 |
| commit | 1e98dfb480f7c7be6bd2c0dc752d7742765cd74e (patch) | |
| tree | 8bff7e118fb1cb467d3e095d5448f63220c609fa /src/com/android | |
| parent | b83ff4af8c359fd5cea276318f0c9e4487ec7465 (diff) | |
| parent | 446bf8b5bc845d14df2f7e1a860d3e28d4542bb6 (diff) | |
| download | packages_apps_settings-1e98dfb480f7c7be6bd2c0dc752d7742765cd74e.zip packages_apps_settings-1e98dfb480f7c7be6bd2c0dc752d7742765cd74e.tar.gz packages_apps_settings-1e98dfb480f7c7be6bd2c0dc752d7742765cd74e.tar.bz2 | |
Merge change I446bf8b5 into eclair
* changes:
SecuritySettings: minor tuning.
Diffstat (limited to 'src/com/android')
| -rw-r--r-- | src/com/android/settings/SecuritySettings.java | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/com/android/settings/SecuritySettings.java b/src/com/android/settings/SecuritySettings.java index f5ea101..2e92f3a 100644 --- a/src/com/android/settings/SecuritySettings.java +++ b/src/com/android/settings/SecuritySettings.java @@ -419,12 +419,14 @@ public class SecuritySettings extends PreferenceActivity { public boolean onPreferenceChange(Preference preference, Object value) { if (preference == mAccessCheckBox) { - if ((Boolean) value) { + boolean checked = (Boolean) value; + if (checked) { showDialog((mState == KeyStore.UNINITIALIZED) ? PASSWORD_DIALOG : UNLOCK_DIALOG); } else { lock(); } + mAccessCheckBox.setChecked(!checked); return true; } return false; @@ -459,7 +461,6 @@ public class SecuritySettings extends PreferenceActivity { } } removeDialog(mDialogId); - updatePreferences(mState); if (mExternalIntent != null) { mExternalIntent = null; finish(); @@ -566,8 +567,9 @@ public class SecuritySettings extends PreferenceActivity { mResetButton.setEnabled(state != KeyStore.UNINITIALIZED); // Show a toast message if the state is changed. - if (mState == state) return; - if (state == KeyStore.NO_ERROR) { + if (mState == state) { + return; + } else if (state == KeyStore.NO_ERROR) { Toast.makeText(SecuritySettings.this, R.string.credentials_enabled, Toast.LENGTH_SHORT).show(); } else if (state == KeyStore.UNINITIALIZED) { |