Merge pull request #6982 from ashcoding/TIMOB-19199

[TIMOB-19199] Android: Picker has 'selectionOpens' property to contro…
tidev · Aug 14, 2015 · 7d210cb · 7d210cb
2 parents 1b0d4a8 + c616a52
commit 7d210cb
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 2 deletions.
diff --git a/android/modules/ui/src/java/ti/modules/titanium/ui/PickerProxy.java b/android/modules/ui/src/java/ti/modules/titanium/ui/PickerProxy.java
@@ -46,7 +46,7 @@
 import android.widget.TimePicker;
 
 @Kroll.proxy(creatableInModule=UIModule.class, propertyAccessors={
-	"locale", "visibleItems", "value", TiC.PROPERTY_CALENDAR_VIEW_SHOWN, TiC.PROPERTY_FONT
+	"locale", TiC.PROPERTY_SELECTION_OPENS, "visibleItems", "value", TiC.PROPERTY_CALENDAR_VIEW_SHOWN, TiC.PROPERTY_FONT
 })
 public class PickerProxy extends TiViewProxy implements PickerColumnListener
 {
@@ -461,7 +461,9 @@ private void handleSelectRow(int column, int row, boolean animated)
 			return;
 		}
 		((TiUIPicker)peekView()).selectRow(column, row, animated);
-		((TiUIPicker)peekView()).openPicker();
+		if (TiConvert.toBoolean(getProperty(TiC.PROPERTY_SELECTION_OPENS), false)) {
+			((TiUIPicker)peekView()).openPicker();
+		}
 	}
 
 	public int getColumnCount()

diff --git a/android/titanium/src/java/org/appcelerator/titanium/TiC.java b/android/titanium/src/java/org/appcelerator/titanium/TiC.java
@@ -2188,6 +2188,11 @@ public class TiC
 	 */
 	public static final String PROPERTY_SELECTION_INDICATOR = "selectionIndicator";
 
+	/**
+	 * @module.api
+	 */
+	public static final String PROPERTY_SELECTION_OPENS = "selectionOpens";
+
 	/**
 	 * @module.api
 	 */

diff --git a/apidoc/Titanium/UI/Picker.yml b/apidoc/Titanium/UI/Picker.yml
@@ -339,6 +339,18 @@ properties:
     default: true (Android), false (iPhone, iPad)
     platforms: [android, iphone, ipad]
 
+  - name: selectionOpens
+    summary: |
+        Determines whether calling the method `setSelectedRow` opens when called
+    description: |
+        If `true`, selection will open when `setSelectedRow` is called.
+
+        If `false`, selection will not open when `setSelectedRow` is called.
+    type: Boolean
+    default: false (Android)
+    platforms: [android]
+    since: "4.3.0"
+
   - name: type
     summary: Determines the type of picker displayed
     description: |