From afdb2916537f648f17122fa2c96f8b88759d28cc Mon Sep 17 00:00:00 2001 From: Tobrun Date: Wed, 31 Jan 2018 14:30:25 +0100 Subject: [android] - blacklist flaky instrumentation tests --- platform/android/scripts/exclude-activity-gen.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'platform/android/scripts') diff --git a/platform/android/scripts/exclude-activity-gen.json b/platform/android/scripts/exclude-activity-gen.json index f05001c6ae..c1a6b5bb48 100644 --- a/platform/android/scripts/exclude-activity-gen.json +++ b/platform/android/scripts/exclude-activity-gen.json @@ -27,5 +27,10 @@ "QueryRenderedFeaturesBoxHighlightActivity", "MultiMapActivity", "MapInDialogActivity", - "SimpleMapActivity" + "SimpleMapActivity", + "ManualZoomActivity", + "MaxMinZoomActivity", + "ScrollByActivity", + "ZoomFunctionSymbolLayerActivity", + "SymbolGeneratorActivity" ] \ No newline at end of file -- cgit v1.2.1 From 143c346d9d809a93d802dc087cffe517659e1077 Mon Sep 17 00:00:00 2001 From: Tobrun Date: Fri, 26 Jan 2018 15:32:16 +0100 Subject: [android] - translucent surface on TextureView --- platform/android/scripts/exclude-activity-gen.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'platform/android/scripts') diff --git a/platform/android/scripts/exclude-activity-gen.json b/platform/android/scripts/exclude-activity-gen.json index c1a6b5bb48..2170c4d9f8 100644 --- a/platform/android/scripts/exclude-activity-gen.json +++ b/platform/android/scripts/exclude-activity-gen.json @@ -27,10 +27,11 @@ "QueryRenderedFeaturesBoxHighlightActivity", "MultiMapActivity", "MapInDialogActivity", - "SimpleMapActivity", "ManualZoomActivity", "MaxMinZoomActivity", "ScrollByActivity", "ZoomFunctionSymbolLayerActivity", - "SymbolGeneratorActivity" + "SymbolGeneratorActivity", + "TextureViewTransparentBackgroundActivity", + "SimpleMapActivity" ] \ No newline at end of file -- cgit v1.2.1 From b630dbc35755e4ac71ec8d82749d311893522457 Mon Sep 17 00:00:00 2001 From: Fabian Guerra Date: Fri, 16 Feb 2018 12:42:01 -0500 Subject: [android] Reverted master changes that doesn't apply to boba. --- platform/android/scripts/exclude-activity-gen.json | 1 - 1 file changed, 1 deletion(-) (limited to 'platform/android/scripts') diff --git a/platform/android/scripts/exclude-activity-gen.json b/platform/android/scripts/exclude-activity-gen.json index 1d61d93943..eff7fb9cbf 100644 --- a/platform/android/scripts/exclude-activity-gen.json +++ b/platform/android/scripts/exclude-activity-gen.json @@ -27,7 +27,6 @@ "QueryRenderedFeaturesBoxHighlightActivity", "MultiMapActivity", "MapInDialogActivity", - "SimpleMapActivity", "ManualZoomActivity", "MaxMinZoomActivity", "ScrollByActivity", -- cgit v1.2.1 From 278cd580fc963ef8604de4e280501fd85564c274 Mon Sep 17 00:00:00 2001 From: Tobrun Date: Tue, 20 Feb 2018 18:04:49 +0100 Subject: [android] - fix javadoc utf8 encoding issues, add missing package-info.java items --- platform/android/scripts/generate-style-code.js | 1 + 1 file changed, 1 insertion(+) (limited to 'platform/android/scripts') diff --git a/platform/android/scripts/generate-style-code.js b/platform/android/scripts/generate-style-code.js index 6e6d3cfa67..8a6648cc79 100755 --- a/platform/android/scripts/generate-style-code.js +++ b/platform/android/scripts/generate-style-code.js @@ -13,6 +13,7 @@ const lightProperties = Object.keys(spec[`light`]).reduce((memo, name) => { var property = spec[`light`][name]; property.name = name; property['light-property'] = true; + property.doc = property.doc.replace(/°/g,'°'); memo.push(property); return memo; }, []); -- cgit v1.2.1 From 2e008aa29ef0ae783f8461a712011dcdba3f0653 Mon Sep 17 00:00:00 2001 From: Tobrun Date: Fri, 16 Feb 2018 10:47:06 +0100 Subject: [android] - add heatmap color property --- platform/android/scripts/generate-style-code.js | 3 --- 1 file changed, 3 deletions(-) (limited to 'platform/android/scripts') diff --git a/platform/android/scripts/generate-style-code.js b/platform/android/scripts/generate-style-code.js index 8a6648cc79..406364c1d7 100755 --- a/platform/android/scripts/generate-style-code.js +++ b/platform/android/scripts/generate-style-code.js @@ -29,9 +29,6 @@ var layers = Object.keys(spec.layer.type.values).map((type) => { }, []); const paintProperties = Object.keys(spec[`paint_${type}`]).reduce((memo, name) => { - // disabled for now, see https://github.com/mapbox/mapbox-gl-native/issues/11172 - if (name === 'heatmap-color') return memo; - spec[`paint_${type}`][name].name = name; memo.push(spec[`paint_${type}`][name]); return memo; -- cgit v1.2.1 From 6179110b6bfe8ee0880a055a31c12a88f9bd9b20 Mon Sep 17 00:00:00 2001 From: Tobrun Date: Thu, 8 Mar 2018 16:27:02 +0100 Subject: [android] - add expression conversion, add getters (#11352) --- platform/android/scripts/generate-style-code.js | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'platform/android/scripts') diff --git a/platform/android/scripts/generate-style-code.js b/platform/android/scripts/generate-style-code.js index 406364c1d7..3b0363cc19 100755 --- a/platform/android/scripts/generate-style-code.js +++ b/platform/android/scripts/generate-style-code.js @@ -149,6 +149,24 @@ global.propertyTypeAnnotation = function propertyTypeAnnotation(property) { } }; +global.defaultExpressionJava = function(property) { + switch (property.type) { + case 'boolean': + return 'boolean'; + case 'number': + return 'number'; + case 'string': + return "string"; + case 'enum': + return "string"; + case 'color': + return 'toColor'; + case 'array': + return "array"; + default: return "string"; + } +} + global.defaultValueJava = function(property) { if(property.name.endsWith("-pattern")) { return '"pedestrian-polygon"'; -- cgit v1.2.1