diff options
| author | Aidan Follestad <drummer.aidan@gmail.com> | 2016-01-28 19:48:22 -0600 |
|---|---|---|
| committer | Aidan Follestad <drummer.aidan@gmail.com> | 2016-01-28 19:48:22 -0600 |
| commit | ffe972a07593b41d5392e1f9269d6eb5cdcde9ba (patch) | |
| tree | 122f08d75c56e78bd44d542efd438f5537cc137a | |
| parent | 24e06274442ce061968d55c23b3de4b1a346da13 (diff) | |
| parent | de13cce31a2b21be4a9ef9c8336b2aa4362b69f7 (diff) | |
| download | afollestad-ffe972a07593b41d5392e1f9269d6eb5cdcde9ba.tar.gz | |
Merge pull request #931 from TheFinestArtist/setCanceledOnTouchOutside
Add setCanceledOnTouchOutside(boolean) method
| -rw-r--r-- | core/src/main/java/com/afollestad/materialdialogs/DialogInit.java | 2 | ||||
| -rw-r--r-- | core/src/main/java/com/afollestad/materialdialogs/MaterialDialog.java | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/core/src/main/java/com/afollestad/materialdialogs/DialogInit.java b/core/src/main/java/com/afollestad/materialdialogs/DialogInit.java index 5d643de..24043ca 100644 --- a/core/src/main/java/com/afollestad/materialdialogs/DialogInit.java +++ b/core/src/main/java/com/afollestad/materialdialogs/DialogInit.java @@ -74,7 +74,7 @@ class DialogInit { // Set cancelable flag and dialog background color dialog.setCancelable(builder.cancelable); - dialog.setCanceledOnTouchOutside(builder.cancelable); + dialog.setCanceledOnTouchOutside(builder.canceledOnTouchOutside); if (builder.backgroundColor == 0) builder.backgroundColor = DialogUtils.resolveColor(builder.context, R.attr.md_background_color); if (builder.backgroundColor != 0) { diff --git a/core/src/main/java/com/afollestad/materialdialogs/MaterialDialog.java b/core/src/main/java/com/afollestad/materialdialogs/MaterialDialog.java index f46eadd..a9f0b8c 100644 --- a/core/src/main/java/com/afollestad/materialdialogs/MaterialDialog.java +++ b/core/src/main/java/com/afollestad/materialdialogs/MaterialDialog.java @@ -404,6 +404,7 @@ public class MaterialDialog extends DialogBase implements protected boolean alwaysCallSingleChoiceCallback = false; protected Theme theme = Theme.LIGHT; protected boolean cancelable = true; + protected boolean canceledOnTouchOutside = true; protected float contentLineSpacingMultiplier = 1.2f; protected int selectedIndex = -1; protected Integer[] selectedIndices = null; @@ -1162,6 +1163,11 @@ public class MaterialDialog extends DialogBase implements return this; } + public Builder canceledOnTouchOutside(boolean canceledOnTouchOutside) { + this.canceledOnTouchOutside = canceledOnTouchOutside; + return this; + } + /** * This defaults to true. If set to false, the dialog will not automatically be dismissed * when an action button is pressed, and not automatically dismissed when the user selects |