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

am 1ddccd07: Fix dialog handling.

Browse Source 
Merge commit '1ddccd07f744344b5248dd5418ee526f26d520dc'

* commit '1ddccd07f744344b5248dd5418ee526f26d520dc':
  Fix dialog handling.
This commit is contained in:
Hung-ying Tyan
2009-07-12 23:44:38 -07:00
committed by The Android Open Source Project
parent 97beba7ba2 1ddccd07f7
commit 15384ee22a
5 changed files with 166 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -454,8 +454,9 @@ public class SecuritySettings extends PreferenceActivity implements
}
}
private class CstorHelper implements
DialogInterface.OnClickListener, DialogInterface.OnDismissListener {
private class CstorHelper implements DialogInterface.OnClickListener,
DialogInterface.OnDismissListener,
DialogInterface.OnCancelListener {
private Keystore mKeystore = Keystore.getInstance();
private View mView;
private int mDialogId;
@@ -535,14 +536,18 @@ public class SecuritySettings extends PreferenceActivity implements
.show();
}
public void onCancel(DialogInterface dialog) {
if (mCstorAddCredentialHelper != null) {
// release the object here so that it doesn't get triggerred in
// onDismiss()
mCstorAddCredentialHelper = null;
finish();
}
}
public void onClick(DialogInterface dialog, int which) {
if (which == DialogInterface.BUTTON_NEGATIVE) {
if (mCstorAddCredentialHelper != null) {
// release the object here so that it doesn't get triggerred in
// onDismiss()
mCstorAddCredentialHelper = null;
finish();
}
onCancel(dialog);
return;
}
@@ -809,7 +814,7 @@ public class SecuritySettings extends PreferenceActivity implements
.setTitle(R.string.cstor_access_dialog_title)
.setPositiveButton(android.R.string.ok, this)
.setNegativeButton(android.R.string.cancel, this)
.setCancelable(false)
.setOnCancelListener(this)
.create();
d.setOnDismissListener(this);
return d;
@@ -849,7 +854,7 @@ public class SecuritySettings extends PreferenceActivity implements
.setTitle(R.string.cstor_set_passwd_dialog_title)
.setPositiveButton(android.R.string.ok, this)
.setNegativeButton(android.R.string.cancel, this)
.setCancelable(false)
.setOnCancelListener(this)
.create();
d.setOnDismissListener(this);
return d;
@@ -884,7 +889,7 @@ public class SecuritySettings extends PreferenceActivity implements
.setTitle(R.string.cstor_name_credential_dialog_title)
.setPositiveButton(android.R.string.ok, this)
.setNegativeButton(android.R.string.cancel, this)
.setCancelable(false)
.setOnCancelListener(this)
.create();
d.setOnDismissListener(this);
return d;