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

am 1e98dfb4: Merge change I446bf8b5 into eclair

Browse Source 
Merge commit '1e98dfb480f7c7be6bd2c0dc752d7742765cd74e'

* commit '1e98dfb480f7c7be6bd2c0dc752d7742765cd74e':
  SecuritySettings: minor tuning.
This commit is contained in:
Chia-chi Yeh
2009-10-12 11:17:15 -07:00
committed by Android Git Automerger
parent bb5247da2a 1e98dfb480
commit fd8ac18009
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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) {