diff options
author | Brian Carlstrom <bdc@google.com> | 2011-06-26 17:13:54 -0700 |
---|---|---|
committer | Brian Carlstrom <bdc@google.com> | 2011-06-26 17:13:54 -0700 |
commit | df17230fbddfd959658368bcfd3c87d34ce3c097 (patch) | |
tree | 3505ab19b861dbb952b6c3131a375b86cd35004b /src | |
parent | 65e649e856d88520ac04f5b16313a3f167e569e0 (diff) | |
download | android_packages_apps_KeyChain-df17230fbddfd959658368bcfd3c87d34ce3c097.tar.gz android_packages_apps_KeyChain-df17230fbddfd959658368bcfd3c87d34ce3c097.tar.bz2 android_packages_apps_KeyChain-df17230fbddfd959658368bcfd3c87d34ce3c097.zip |
Use cancel instead deny when only one button
Change-Id: I2b77a343508d6e38a3d25ebc0c24d1df5da2f5d5
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/keychain/KeyChainActivity.java | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/com/android/keychain/KeyChainActivity.java b/src/com/android/keychain/KeyChainActivity.java index 1073556..0702c3f 100644 --- a/src/com/android/keychain/KeyChainActivity.java +++ b/src/com/android/keychain/KeyChainActivity.java @@ -141,20 +141,22 @@ public class KeyChainActivity extends Activity { } private Dialog createCertChooserDialog() { - View view = View.inflate(this, R.layout.cert_chooser, null); - AlertDialog.Builder builder = new AlertDialog.Builder(this); + + View view = View.inflate(this, R.layout.cert_chooser, null); builder.setView(view); - builder.setNegativeButton(R.string.deny_button, new DialogInterface.OnClickListener() { + + boolean empty = mCertificateAdapter.mAliases.isEmpty(); + int negativeLabel = empty ? android.R.string.cancel : R.string.deny_button; + builder.setNegativeButton(negativeLabel, new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int id) { dialog.cancel(); // will cause OnDismissListener to be called } }); - Resources res = getResources(); - String title; - if (mCertificateAdapter.mAliases.isEmpty()) { + Resources res = getResources(); + if (empty) { title = res.getString(R.string.title_no_certs); } else { title = res.getString(R.string.title_select_cert); |