Merge pull request #842 from SmartThingsCommunity/staging

Rolling up changes to production from staging 2016-05-03 Release

devicetypes/smartthings/light-sensor.src/light-sensor.groovy

@@ -58,4 +58,4 @@ def parse(String description) {
 	}
 	log.debug "Parse returned ${result?.descriptionText}"
 	return result
-}
+}

devicetypes/smartthings/tile-ux/tile-basic-standard.src/tile-basic-standard.groovy

@@ -80,31 +80,19 @@ metadata {
 			state "default", label:''
 		}
 
-		// multi-line text (explicit newlines)
-		standardTile("multiLine", "device.multiLine", width: 2, height: 2) {
-			state "default", label: '${currentValue}'
-		}
-
-		standardTile("multiLineWithIcon", "device.multiLine", width: 2, height: 2) {
-			state "default", label: '${currentValue}', icon: "st.switches.switch.off"
-		}
-
-		main("actionRings")
+		main("standard1")
 		details([
 			"actionRings", "actionFlat", "noActionFlat",
 
 			"flatLabel", "flatIconLabel", "flatIcon",
 
 			"flatDefaultState", "flatImplicitDefaultState1", "flatImplicitDefaultState2",
-
-			"multiLine", "multiLineWithIcon"
 		])
 	}
 }
 
 def installed() {
 	sendEvent(name: "switch", value: "off")
-	sendEvent(name: "multiLine", value: "Line 1\nLine 2\nLine 3")
 }
 
 def parse(String description) {

devicetypes/smartthings/tile-ux/tile-basic-value.src/tile-basic-value.groovy

@@ -69,25 +69,16 @@ metadata {
 			]
 		}
 
-		valueTile("noValue", "device.nada", width: 4, height: 2) {
+		valueTile("noValue", "device.nada", width: 2, height: 2) {
 			state "default", label:'${currentValue}'
 		}
 
-		valueTile("multiLine", "device.multiLine", width: 3, height: 2) {
-			state "default", label: '${currentValue}'
-		}
-
-		valueTile("multiLineWithIcon", "device.multiLine", width: 3, height: 2) {
-			state "default", label: '${currentValue}', icon: "st.switches.switch.off"
-		}
-
 		main("text")
 		details([
 			"text", "longText", "integer", 
             "integerFloat", "pi", "floatAsText",
             "bgColor", "bgColorRange", "bgColorRangeSingleItem",
-            "bgColorRangeConflict", "noValue",
-            "multiLine", "multiLineWithIcon"
+            "bgColorRangeConflict", "noValue"
 		])
 	}
 }
@@ -99,7 +90,6 @@ def installed() {
 	sendEvent(name: "integerFloat", value: 47.0)
 	sendEvent(name: "pi", value: 3.14159)
 	sendEvent(name: "floatAsText", value: "3.14159")
-	sendEvent(name: "multiLine", value: "Line 1\nLine 2\nLine 3")
 }
 
 def parse(String description) {

devicetypes/smartthings/tile-ux/tile-multiattribute-generic.src/tile-multiattribute-generic.groovy

@@ -67,47 +67,14 @@ metadata {
 				attributeState "VALUE_DOWN", action: "levelDown"
 			}
 		}
-		multiAttributeTile(name:"lengthyTile", type:"generic", width:6, height:4) {
-			tileAttribute("device.lengthyText", key: "PRIMARY_CONTROL") {
-				attributeState "default", label:'The value of this tile is long and should wrap to two lines', backgroundColor:"#79b821"
-			}
-			tileAttribute("device.lengthyText", key: "SECONDARY_CONTROL") {
-				attributeState "default", label:'The value of this tile is long and should wrap to two lines', backgroundColor:"#79b821"
-			}
-		}
-		multiAttributeTile(name:"multilineTile", type:"generic", width:6, height:4) {
-			tileAttribute("device.multilineText", key: "PRIMARY_CONTROL") {
-				attributeState "default", label:'Line 1 YES\nLine 2 YES\nLine 3 NO', backgroundColor:"#79b821"
-			}
-			tileAttribute("device.multilineText", key: "SECONDARY_CONTROL") {
-				attributeState "default", label:'Line 1 YES\nLine 2 YES\nLine 3 NO', backgroundColor:"#79b821"
-			}
-		}
-		multiAttributeTile(name:"lengthyTileWithIcon", type:"generic", width:6, height:4) {
-			tileAttribute("device.lengthyText", key: "PRIMARY_CONTROL") {
-				attributeState "default", label:'The value of this tile is long and should wrap to two lines', backgroundColor:"#79b821", icon: "st.switches.switch.on"
-			}
-			tileAttribute("device.lengthyText", key: "SECONDARY_CONTROL") {
-				attributeState "default", label:'The value of this tile is long and should wrap to two lines', backgroundColor:"#79b821", icon: "st.switches.switch.on"
-			}
-		}
-		multiAttributeTile(name:"multilineTileWithIcon", type:"generic", width:6, height:4) {
-			tileAttribute("device.multilineText", key: "PRIMARY_CONTROL") {
-				attributeState "default", label:'Line 1 YES\nLine 2 YES\nLine 3 NO', backgroundColor:"#79b821", icon: "st.switches.switch.on"
-			}
-			tileAttribute("device.multilineText", key: "SECONDARY_CONTROL") {
-				attributeState "default", label:'Line 1 YES\nLine 2 YES\nLine 3 NO', backgroundColor:"#79b821", icon: "st.switches.switch.on"
-			}
-		}
 
 		main(["basicTile"])
-		details(["basicTile", "sliderTile", "valueTile", "lengthyTile", "multilineTile", "lengthyTileWithIcon", "multilineTileWithIcon"])
+		details(["basicTile", "sliderTile", "valueTile"])
 	}
 }
 
 def installed() {
-	sendEvent(name: "lengthyText", value: "The value of this tile is long and should wrap to two lines")
-	sendEvent(name: "multilineText", value: "Line 1 YES\nLine 2 YES\nLine 3 NO")
+
 }
 
 def parse() {

smartapps/smartthings/hue-connect.src/hue-connect.groovy

@@ -332,7 +332,8 @@ private addChildBulb(dni, hueType, name, hub, update=false, device = null) {
 
 	if (deviceType) {
 		return addChildDevice("smartthings", deviceType, dni, hub, ["label": name])
-	} else {
+	}
+	else {
 		log.warn "Device type $hueType not supported"
 		return null
 	}
@@ -348,10 +349,8 @@ def addBulbs() {
 				newHueBulb = bulbs.find { (app.id + "/" + it.value.id) == dni }
                 if (newHueBulb != null) {
                     d = addChildBulb(dni, newHueBulb?.value?.type, newHueBulb?.value?.name, newHueBulb?.value?.hub)
-					if (d) {
-						log.debug "created ${d.displayName} with id $dni"
-						d.refresh()
-					}
+                    log.debug "created ${d.displayName} with id $dni"
+                    d.refresh()
                 } else {
                 	log.debug "$dni in not longer paired to the Hue Bridge or ID changed"
                 }
@@ -359,7 +358,7 @@ def addBulbs() {
             	//backwards compatable
 				newHueBulb = bulbs.find { (app.id + "/" + it.id) == dni }
 				d = addChildBulb(dni, "Extended Color Light", newHueBulb?.value?.name, newHueBulb?.value?.hub)
-				d?.refresh()
+                d.refresh()
 			}
 		} else {
 			log.debug "found ${d.displayName} with id $dni already exists, type: '$d.typeName'"

smartapps/smartthings/speaker-mood-music.src/speaker-mood-music.groovy

@@ -335,4 +335,5 @@ private timeIntervalLabel()
 {
 	(starting && ending) ? hhmm(starting) + "-" + hhmm(ending, "h:mm a z") : ""
 }
-// TODO - End Centralize
+// TODO - End Centralize
+