aboutsummaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authorBananeweizen <Bananeweizen@gmx.de>2012-06-30 00:15:03 -0700
committerBananeweizen <Bananeweizen@gmx.de>2012-06-30 00:15:03 -0700
commit46d99a2bd58876e93821fbfef35985ab2e95287a (patch)
tree67526367eb194b6d780f3f08d8f1c9b171c7e589 /main
parentd1399dadad3886d8b60eb271a7631699e61dd5ee (diff)
parentc26de73288f4deaa1d5affe02dce388b2fb21030 (diff)
downloadcgeo-46d99a2bd58876e93821fbfef35985ab2e95287a.zip
cgeo-46d99a2bd58876e93821fbfef35985ab2e95287a.tar.gz
cgeo-46d99a2bd58876e93821fbfef35985ab2e95287a.tar.bz2
Merge pull request #1855 from campbeb/fix1837
Don't cancel progress dialog when clicking outside - Fixes #1837
Diffstat (limited to 'main')
-rw-r--r--main/src/cgeo/geocaching/activity/Progress.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/main/src/cgeo/geocaching/activity/Progress.java b/main/src/cgeo/geocaching/activity/Progress.java
index dbe4700..7a1995d 100644
--- a/main/src/cgeo/geocaching/activity/Progress.java
+++ b/main/src/cgeo/geocaching/activity/Progress.java
@@ -27,6 +27,7 @@ public class Progress {
dialog = ProgressDialog.show(context, title, message, indeterminate, cancelMessage != null);
dialog.getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
dialog.setProgress(0);
+ dialog.setCanceledOnTouchOutside(false);
this.progress = 0;
if (cancelMessage != null) {
dialog.setCancelMessage(cancelMessage);
@@ -38,6 +39,7 @@ public class Progress {
if (dialog == null) {
dialog = new ProgressDialog(context);
dialog.setProgress(0);
+ dialog.setCanceledOnTouchOutside(false);
this.progress = 0;
dialog.setTitle(title);
dialog.setMessage(message);