diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-10-26 22:38:35 +0100 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-10-26 22:38:35 +0100 |
| commit | be31815ee80dd6770bc09804216f732ef58d055b (patch) | |
| tree | 424904029620191ab39c7518f584c5b601571d76 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ProgressDialogFragment.java | |
| parent | fa73362a9faed746a272bfe9e4329b1ee606e09e (diff) | |
| parent | 84b234af3720368fcf6c61dcd61b8a7d8986a1b4 (diff) | |
| download | open-keychain-be31815ee80dd6770bc09804216f732ef58d055b.tar.gz open-keychain-be31815ee80dd6770bc09804216f732ef58d055b.tar.bz2 open-keychain-be31815ee80dd6770bc09804216f732ef58d055b.zip | |
Merge branch 'development' of github.com:open-keychain/open-keychain into development
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ProgressDialogFragment.java')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ProgressDialogFragment.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ProgressDialogFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ProgressDialogFragment.java index d09be2d51..df7943f55 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ProgressDialogFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ProgressDialogFragment.java @@ -145,7 +145,7 @@ public class ProgressDialogFragment extends DialogFragment { mPreventCancel = preventCancel; final Button negative = ((ProgressDialog) getDialog()).getButton(DialogInterface.BUTTON_NEGATIVE); - negative.setVisibility(preventCancel ? View.GONE : View.VISIBLE); + negative.setEnabled(mIsCancelled && !preventCancel); } @Override |