Merge branch 'master' into removeOldAssets

Alloy/commands/compile/parsers/Ti.UI.Android.CollapseToolbar.ContentView.js

@@ -0,0 +1,11 @@
+exports.parse = function(node, state) {
+	_.extend(state, {
+		proxyPropertyDefinition: {
+			parents: [
+				'Ti.UI.Android.CollapseToolbar',
+				'Ti.UI.iPad.Popover'
+			]
+		}
+	});
+	return require('./Ti.UI.Android.CollapseToolbar._ProxyProperty').parse(node, state);
+};

Alloy/commands/compile/parsers/Ti.UI.Android.CollapseToolbar._ProxyProperty.js

@@ -0,0 +1,13 @@
+const _ = require('lodash');
+
+exports.parse = function(node, state) {
+	_.extend(state, {
+		proxyPropertyDefinition: {
+			parents: [
+				'Ti.UI.Android.CollapseToolbar',
+				'Ti.UI.iPad.Popover'
+			]
+		}
+	});
+	return require('./Alloy.Abstract._ProxyProperty').parse(node, state);
+};

Alloy/commands/compile/parsers/Ti.UI.Android.CollapseToolbar.js

@@ -0,0 +1,34 @@
+const _ = require('lodash'),
+	U = require('../../../utils'),
+	MIN_VERSION = '12.1.0';
+
+exports.parse = function(node, state) {
+	return require('./base').parse(node, state, parse);
+};
+
+function parse(node, state, args) {
+	const tiappSdkVersion = tiapp.getSdkVersion();
+	if (tiapp.version.lt(tiappSdkVersion, MIN_VERSION)) {
+		U.die(`Ti.UI.Android.CollapseToolbar requires Titanium SDK ${MIN_VERSION}+`);
+	}
+
+	var children = U.XML.getElementsFromNodes(node.childNodes),
+		code = '',
+		extras = [],
+		proxyProperties = {};
+
+	// add all proxy properties at creation time
+	_.each(proxyProperties, function(v, k) {
+		extras.push([k, v]);
+	});
+
+	// if we got any extras, add them to the state
+	if (extras.length) {
+		state.extraStyle = styler.createVariableStyle(extras);
+	}
+
+	viewState = require('./default').parse(node, state);
+	viewState.code = code + viewState.code;
+
+	return viewState;
+}

Alloy/commands/compile/parsers/Ti.UI.Android.DrawerLayout._ProxyProperty.js

@@ -1,7 +1,6 @@
 var _ = require('lodash');
 
 exports.parse = function(node, state) {
-	console.log(' Ti.UI.Android.DrawerLayout');
 	_.extend(state, {
 		proxyPropertyDefinition: {
 			parents: [

Alloy/common/constants.js

@@ -235,8 +235,10 @@ exports.IMPLICIT_NAMESPACES = {
 	TitleControl: 'Ti.UI.Window',
 	WindowToolbar: 'Ti.UI.Window',
 
-	// Ti.UI.iPad.Popover
-	ContentView: 'Ti.UI.iPad.Popover',
+	ContentView: isTitanium && Ti.Platform.osname === 'android' ?
+		'Ti.UI.Android.CollapseToolbar' : 'Ti.UI.iPad.Popover',
+
+	CollapseToolbar: 'Ti.UI.Android',
 
 	DrawerLayout: 'Ti.UI.Android',
 	LeftView: 'Ti.UI.Android.DrawerLayout',

test/lib/testUtils.js

@@ -19,7 +19,7 @@ exports.paths = {
 };
 
 function createEnv () {
-	return Object.assign(process.env, { PATH: `${process.env.PATH}${path.delimiter}${path.join(process.cwd(), 'bin')}`})
+	return Object.assign(process.env, { PATH: `${path.join(process.cwd(), 'bin')}${path.delimiter}${process.env.PATH}`})
 }
 
 // Recreate the test app harness