[TIMOB-17729] Android: Add CanceledOnTouchOutside property to Titaniu…

…m.UI.Android.ProgressIndicator
tidev · Jan 7, 2015 · 49acb79 · 49acb79
1 parent 9b02f63
commit 49acb79
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 1 deletion.
diff --git a/android/modules/ui/src/java/ti/modules/titanium/ui/android/ProgressIndicatorProxy.java b/android/modules/ui/src/java/ti/modules/titanium/ui/android/ProgressIndicatorProxy.java
@@ -24,7 +24,8 @@
 	TiC.PROPERTY_TYPE,
 	TiC.PROPERTY_MIN,
 	TiC.PROPERTY_MAX,
-	TiC.PROPERTY_CANCELABLE
+	TiC.PROPERTY_CANCELABLE,
+	TiC.PROPERTY_CANCELED_ON_TOUCH_OUTSIDE
 })
 @Kroll.dynamicApis(methods = {
 	"hide", "show"

diff --git a/android/modules/ui/src/java/ti/modules/titanium/ui/widget/TiUIProgressIndicator.java b/android/modules/ui/src/java/ti/modules/titanium/ui/widget/TiUIProgressIndicator.java
@@ -120,6 +120,8 @@ public void propertyChanged(String key, Object oldValue, Object newValue, KrollP
 				progressDialog.setCancelable(TiConvert.toBoolean(newValue));
 			}
 
+		} else if (key.equals(TiC.PROPERTY_CANCELED_ON_TOUCH_OUTSIDE) && progressDialog != null) {
+			progressDialog.setCanceledOnTouchOutside(TiConvert.toBoolean(newValue));
 		} else {
 			super.propertyChanged(key, oldValue, newValue, proxy);
 		}
@@ -207,6 +209,7 @@ protected void handleShow()
 
 			progressDialog.setMessage(message);
 			progressDialog.setCancelable(proxy.getProperties().optBoolean(TiC.PROPERTY_CANCELABLE, false));
+			progressDialog.setCanceledOnTouchOutside(proxy.getProperties().optBoolean(TiC.PROPERTY_CANCELED_ON_TOUCH_OUTSIDE, true));
 
 			if (type == INDETERMINANT) {
 				progressDialog.setIndeterminate(true);

diff --git a/android/titanium/src/java/org/appcelerator/titanium/TiC.java b/android/titanium/src/java/org/appcelerator/titanium/TiC.java
@@ -883,6 +883,11 @@ public class TiC
 	 */
 	public static final String PROPERTY_CANCELABLE = "cancelable";
 
+	/**
+	 * @module.api
+	 */
+	public static final String PROPERTY_CANCELED_ON_TOUCH_OUTSIDE = "canceledOnTouchOutside";
+
 	/**
 	 * @module.api
 	 */

diff --git a/apidoc/Titanium/UI/Android/ProgressIndicator.yml b/apidoc/Titanium/UI/Android/ProgressIndicator.yml
@@ -42,6 +42,14 @@ properties:
     type: Boolean
     platforms: [android]
 
+  - name: canceledOnTouchOutside
+    summary: |
+        Sets whether this dialog is canceled when touched outside the window's bounds.
+    type: Boolean
+    default: true
+    platforms: [android]
+    since: "3.6.0"
+
   - name: message
     summary: Message text.
     type: String