Merge pull request #4199 from pingwang2011/timob-13559_3_1_X

timob-13559_3_1_X: Android: the bubbleParent property is not set correctly during creation
tidev · Apr 25, 2013 · 90aa50e · 90aa50e
2 parents 4c1e324 + 32ea051
commit 90aa50e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/android/titanium/src/java/org/appcelerator/kroll/KrollProxy.java b/android/titanium/src/java/org/appcelerator/kroll/KrollProxy.java
@@ -380,6 +380,9 @@ public void handleCreationDict(KrollDict dict)
 			return;
 		}
 
+		if (dict.containsKey(TiC.PROPERTY_BUBBLE_PARENT)) {
+			bubbleParent = TiConvert.toBoolean(dict, TiC.PROPERTY_BUBBLE_PARENT, true);
+		}
 		properties.putAll(dict);
 		handleDefaultValues();
 		handleLocaleProperties();

diff --git a/android/titanium/src/java/org/appcelerator/titanium/TiC.java b/android/titanium/src/java/org/appcelerator/titanium/TiC.java
@@ -773,6 +773,11 @@ public class TiC
 	 */
 	public static final String PROPERTY_BUTTON = "button";
 
+	/**
+	 * @module.api
+	 */
+	public static final String PROPERTY_BUBBLE_PARENT = "bubbleParent";
+
 	/**
 	 * @module.api
 	 */