Merge remote-tracking branch 'upstream/master' (b1637574) · Commits · e / os / GmsCore

artwork/styles/style-microg-normal-openmaptiles.json

+117 −53

Original line number	Diff line number	Diff line
		@@ -1140,7 +1140,7 @@
		"class"
		],
		[
		"track"
		"rail"
		],
		true,
		false
		@@ -3249,6 +3249,8 @@
		false,
		true
		],
		[
		"any",
		[
		"!=",
		[
		@@ -3272,6 +3274,14 @@
		],
		250
		]
		],
		[
		">=",
		[
		"zoom"
		],
		16
		]
		]
		],
		"layout": {
		@@ -3343,7 +3353,9 @@
		"poi_generic_green",
		[
		"bank",
		"atm",
		"parking",
		"toilets",
		"garages"
		],
		"poi_generic_purple",
		@@ -3392,6 +3404,7 @@
		]
		],
		[
		"clothing_store",
		"shop"
		],
		"poi_generic_blue",
		@@ -3465,7 +3478,9 @@
		"hsl(117, 53%, 31%)",
		[
		"bank",
		"atm",
		"parking",
		"toilets",
		"garages"
		],
		"#737b9b",
		@@ -3507,6 +3522,7 @@
		"#df7db1",
		[
		"grocery",
		"clothing_store",
		"shop"
		],
		"hsl(213, 40%, 48%)",
		@@ -3555,6 +3571,8 @@
		false,
		true
		],
		[
		"any",
		[
		"!=",
		[
		@@ -3578,6 +3596,14 @@
		],
		250
		]
		],
		[
		">=",
		[
		"zoom"
		],
		16
		]
		]
		],
		"layout": {
		@@ -3649,7 +3675,9 @@
		"poi_generic_green",
		[
		"bank",
		"atm",
		"parking",
		"toilets",
		"garages"
		],
		"poi_generic_purple",
		@@ -3698,6 +3726,7 @@
		]
		],
		[
		"clothing_store",
		"shop"
		],
		"poi_generic_blue",
		@@ -3771,7 +3800,9 @@
		"hsl(117, 53%, 31%)",
		[
		"bank",
		"atm",
		"parking",
		"toilets",
		"garages"
		],
		"#737b9b",
		@@ -3813,6 +3844,7 @@
		"#df7db1",
		[
		"grocery",
		"clothing_store",
		"shop"
		],
		"hsl(213, 40%, 48%)",
		@@ -3861,6 +3893,8 @@
		false,
		true
		],
		[
		"any",
		[
		"!=",
		[
		@@ -3884,6 +3918,14 @@
		],
		250
		]
		],
		[
		">=",
		[
		"zoom"
		],
		16
		]
		]
		],
		"layout": {
		@@ -3954,7 +3996,9 @@
		"poi_generic_green",
		[
		"bank",
		"atm",
		"parking",
		"toilets",
		"garages"
		],
		"poi_generic_purple",
		@@ -4003,6 +4047,7 @@
		]
		],
		[
		"clothing_store",
		"shop"
		],
		"poi_generic_blue",
		@@ -4098,7 +4143,9 @@
		"hsl(117, 53%, 31%)",
		[
		"bank",
		"atm",
		"parking",
		"toilets",
		"garages"
		],
		"#737b9b",
		@@ -4140,6 +4187,7 @@
		"#df7db1",
		[
		"grocery",
		"clothing_store",
		"shop"
		],
		"hsl(213, 40%, 48%)",
		@@ -4188,6 +4236,8 @@
		false,
		true
		],
		[
		"any",
		[
		"!=",
		[
		@@ -4211,6 +4261,14 @@
		],
		250
		]
		],
		[
		">=",
		[
		"zoom"
		],
		16
		]
		]
		],
		"layout": {
		@@ -4281,7 +4339,9 @@
		"poi_generic_green",
		[
		"bank",
		"atm",
		"parking",
		"toilets",
		"garages"
		],
		"poi_generic_purple",
		@@ -4330,6 +4390,7 @@
		]
		],
		[
		"clothing_store",
		"shop"
		],
		"poi_generic_blue",
		@@ -4425,7 +4486,9 @@
		"hsl(117, 53%, 31%)",
		[
		"bank",
		"atm",
		"parking",
		"toilets",
		"garages"
		],
		"#737b9b",
		@@ -4467,6 +4530,7 @@
		"#df7db1",
		[
		"grocery",
		"clothing_store",
		"shop"
		],
		"hsl(213, 40%, 48%)",

artwork/styles/style-microg-normal-stadia.json

+139 −59

Original line number	Diff line number	Diff line
		@@ -1287,6 +1287,8 @@
		"source-layer": "transportation",
		"filter": [
		"all",
		[
		"any",
		[
		"match",
		[
		@@ -1294,11 +1296,25 @@
		"class"
		],
		[
		"track"
		"rail"
		],
		true,
		false
		],
		[
		"match",
		[
		"get",
		"subclass"
		],
		[
		"light_rail",
		"tram"
		],
		true,
		false
		]
		],
		[
		"match",
		[
		@@ -3403,6 +3419,8 @@
		false,
		true
		],
		[
		"any",
		[
		"!=",
		[
		@@ -3426,6 +3444,14 @@
		],
		250
		]
		],
		[
		">=",
		[
		"zoom"
		],
		16
		]
		]
		],
		"layout": {
		@@ -3497,7 +3523,9 @@
		"poi_generic_green",
		[
		"bank",
		"atm",
		"parking",
		"toilets",
		"garages"
		],
		"poi_generic_purple",
		@@ -3546,6 +3574,7 @@
		]
		],
		[
		"clothing_store",
		"shop"
		],
		"poi_generic_blue",
		@@ -3619,7 +3648,9 @@
		"hsl(117, 53%, 31%)",
		[
		"bank",
		"atm",
		"parking",
		"toilets",
		"garages"
		],
		"#737b9b",
		@@ -3661,6 +3692,7 @@
		"#df7db1",
		[
		"grocery",
		"clothing_store",
		"shop"
		],
		"hsl(213, 40%, 48%)",
		@@ -3709,6 +3741,8 @@
		false,
		true
		],
		[
		"any",
		[
		"!=",
		[
		@@ -3732,6 +3766,14 @@
		],
		250
		]
		],
		[
		">=",
		[
		"zoom"
		],
		16
		]
		]
		],
		"layout": {
		@@ -3803,7 +3845,9 @@
		"poi_generic_green",
		[
		"bank",
		"atm",
		"parking",
		"toilets",
		"garages"
		],
		"poi_generic_purple",
		@@ -3852,6 +3896,7 @@
		]
		],
		[
		"clothing_store",
		"shop"
		],
		"poi_generic_blue",
		@@ -3925,7 +3970,9 @@
		"hsl(117, 53%, 31%)",
		[
		"bank",
		"atm",
		"parking",
		"toilets",
		"garages"
		],
		"#737b9b",
		@@ -3967,6 +4014,7 @@
		"#df7db1",
		[
		"grocery",
		"clothing_store",
		"shop"
		],
		"hsl(213, 40%, 48%)",
		@@ -4015,6 +4063,8 @@
		false,
		true
		],
		[
		"any",
		[
		"!=",
		[
		@@ -4038,6 +4088,14 @@
		],
		250
		]
		],
		[
		">=",
		[
		"zoom"
		],
		16
		]
		]
		],
		"layout": {
		@@ -4108,7 +4166,9 @@
		"poi_generic_green",
		[
		"bank",
		"atm",
		"parking",
		"toilets",
		"garages"
		],
		"poi_generic_purple",
		@@ -4157,6 +4217,7 @@
		]
		],
		[
		"clothing_store",
		"shop"
		],
		"poi_generic_blue",
		@@ -4252,7 +4313,9 @@
		"hsl(117, 53%, 31%)",
		[
		"bank",
		"atm",
		"parking",
		"toilets",
		"garages"
		],
		"#737b9b",
		@@ -4294,6 +4357,7 @@
		"#df7db1",
		[
		"grocery",
		"clothing_store",
		"shop"
		],
		"hsl(213, 40%, 48%)",
		@@ -4342,6 +4406,8 @@
		false,
		true
		],
		[
		"any",
		[
		"!=",
		[
		@@ -4365,6 +4431,14 @@
		],
		250
		]
		],
		[
		">=",
		[
		"zoom"
		],
		16
		]
		]
		],
		"layout": {
		@@ -4435,7 +4509,9 @@
		"poi_generic_green",
		[
		"bank",
		"atm",
		"parking",
		"toilets",
		"garages"
		],
		"poi_generic_purple",
		@@ -4484,6 +4560,7 @@
		]
		],
		[
		"clothing_store",
		"shop"
		],
		"poi_generic_blue",
		@@ -4579,7 +4656,9 @@
		"hsl(117, 53%, 31%)",
		[
		"bank",
		"atm",
		"parking",
		"toilets",
		"garages"
		],
		"#737b9b",
		@@ -4621,6 +4700,7 @@
		"#df7db1",
		[
		"grocery",
		"clothing_store",
		"shop"
		],
		"hsl(213, 40%, 48%)",

artwork/styles/style-microg-satellite-stadia.json

+139 −59

Original line number	Diff line number	Diff line
		@@ -391,6 +391,8 @@
		"source-layer": "transportation",
		"filter": [
		"all",
		[
		"any",
		[
		"match",
		[
		@@ -398,11 +400,25 @@
		"class"
		],
		[
		"track"
		"rail"
		],
		true,
		false
		],
		[
		"match",
		[
		"get",
		"subclass"
		],
		[
		"light_rail",
		"tram"
		],
		true,
		false
		]
		],
		[
		"match",
		[
		@@ -2300,6 +2316,8 @@
		false,
		true
		],
		[
		"any",
		[
		"!=",
		[
		@@ -2323,6 +2341,14 @@
		],
		250
		]
		],
		[
		">=",
		[
		"zoom"
		],
		16
		]
		]
		],
		"layout": {
		@@ -2394,7 +2420,9 @@
		"poi_generic_green",
		[
		"bank",
		"atm",
		"parking",
		"toilets",
		"garages"
		],
		"poi_generic_purple",
		@@ -2443,6 +2471,7 @@
		]
		],
		[
		"clothing_store",
		"shop"
		],
		"poi_generic_blue",
		@@ -2516,7 +2545,9 @@
		"hsl(117, 53%, 31%)",
		[
		"bank",
		"atm",
		"parking",
		"toilets",
		"garages"
		],
		"#737b9b",
		@@ -2558,6 +2589,7 @@
		"#df7db1",
		[
		"grocery",
		"clothing_store",
		"shop"
		],
		"hsl(213, 40%, 48%)",
		@@ -2606,6 +2638,8 @@
		false,
		true
		],
		[
		"any",
		[
		"!=",
		[
		@@ -2629,6 +2663,14 @@
		],
		250
		]
		],
		[
		">=",
		[
		"zoom"
		],
		16
		]
		]
		],
		"layout": {
		@@ -2700,7 +2742,9 @@
		"poi_generic_green",
		[
		"bank",
		"atm",
		"parking",
		"toilets",
		"garages"
		],
		"poi_generic_purple",
		@@ -2749,6 +2793,7 @@
		]
		],
		[
		"clothing_store",
		"shop"
		],
		"poi_generic_blue",
		@@ -2822,7 +2867,9 @@
		"hsl(117, 53%, 31%)",
		[
		"bank",
		"atm",
		"parking",
		"toilets",
		"garages"
		],
		"#737b9b",
		@@ -2864,6 +2911,7 @@
		"#df7db1",
		[
		"grocery",
		"clothing_store",
		"shop"
		],
		"hsl(213, 40%, 48%)",
		@@ -2912,6 +2960,8 @@
		false,
		true
		],
		[
		"any",
		[
		"!=",
		[
		@@ -2935,6 +2985,14 @@
		],
		250
		]
		],
		[
		">=",
		[
		"zoom"
		],
		16
		]
		]
		],
		"layout": {
		@@ -3005,7 +3063,9 @@
		"poi_generic_green",
		[
		"bank",
		"atm",
		"parking",
		"toilets",
		"garages"
		],
		"poi_generic_purple",
		@@ -3054,6 +3114,7 @@
		]
		],
		[
		"clothing_store",
		"shop"
		],
		"poi_generic_blue",
		@@ -3149,7 +3210,9 @@
		"hsl(117, 53%, 31%)",
		[
		"bank",
		"atm",
		"parking",
		"toilets",
		"garages"
		],
		"#737b9b",
		@@ -3191,6 +3254,7 @@
		"#df7db1",
		[
		"grocery",
		"clothing_store",
		"shop"
		],
		"hsl(213, 40%, 48%)",
		@@ -3239,6 +3303,8 @@
		false,
		true
		],
		[
		"any",
		[
		"!=",
		[
		@@ -3262,6 +3328,14 @@
		],
		250
		]
		],
		[
		">=",
		[
		"zoom"
		],
		16
		]
		]
		],
		"layout": {
		@@ -3332,7 +3406,9 @@
		"poi_generic_green",
		[
		"bank",
		"atm",
		"parking",
		"toilets",
		"garages"
		],
		"poi_generic_purple",
		@@ -3381,6 +3457,7 @@
		]
		],
		[
		"clothing_store",
		"shop"
		],
		"poi_generic_blue",
		@@ -3476,7 +3553,9 @@
		"hsl(117, 53%, 31%)",
		[
		"bank",
		"atm",
		"parking",
		"toilets",
		"garages"
		],
		"#737b9b",
		@@ -3518,6 +3597,7 @@
		"#df7db1",
		[
		"grocery",
		"clothing_store",
		"shop"
		],
		"hsl(213, 40%, 48%)",

fake-signature/build.gradle

0 → 100644

+28 −0

Original line number	Diff line number	Diff line
		/*
		* SPDX-FileCopyrightText: 2023 microG Project Team
		* SPDX-License-Identifier: Apache-2.0
		*/

		apply plugin: 'com.android.library'

		android {
		namespace 'org.microg.signature.fake'
		compileSdk androidCompileSdk

		defaultConfig {
		minSdk androidMinSdk
		targetSdk androidTargetSdk
		}

		buildFeatures {
		aidl = true
		}

		compileOptions {
		sourceCompatibility JavaVersion.VERSION_1_8
		targetCompatibility JavaVersion.VERSION_1_8
		}
		}

		dependencies {
		}
		No newline at end of file