Merge "Update title in Face and Fingerprint settings for private space" into main
diff --git a/res-product/values/config.xml b/res-product/values/config.xml
index 39fbdff..ba49418 100755
--- a/res-product/values/config.xml
+++ b/res-product/values/config.xml
@@ -26,7 +26,6 @@
<item name="a11y_color_inversion_banner" type="raw" product="tablet">@raw/accessibility_color_inversion_banner_tablet</item>
<item name="a11y_magnification_banner" type="raw" product="default">@raw/accessibility_magnification_banner</item>
- <item name="a11y_magnification_banner" type="raw" product="tablet">@raw/accessibility_magnification_banner_tablet</item>
<item name="a11y_extra_dim_banner" type="raw" product="default">@raw/extra_dim_banner</item>
<item name="a11y_extra_dim_banner" type="raw" product="tablet">@raw/extra_dim_banner_tablet</item>
diff --git a/res/raw/accessibility_magnification_banner.json b/res/raw/accessibility_magnification_banner.json
index 23cd154..e703baf 100644
--- a/res/raw/accessibility_magnification_banner.json
+++ b/res/raw/accessibility_magnification_banner.json
@@ -1,19 +1,469 @@
{
- "v": "5.6.5",
+ "v": "5.12.1",
"fr": 60,
"ip": 0,
"op": 540,
"w": 412,
"h": 300,
- "nm": "Magnification",
+ "nm": "Magnification_cream_v4_export",
"ddd": 0,
"assets": [
{
"id": "comp_0",
+ "nm": "Crop_dup",
+ "fr": 60,
"layers": [
{
"ddd": 0,
"ind": 1,
+ "ty": 4,
+ "nm": ".yellow700",
+ "cl": "yellow700",
+ "sr": 1,
+ "ks": {
+ "o": {
+ "a": 1,
+ "k": [
+ {
+ "i": {
+ "x": [
+ 0.67
+ ],
+ "y": [
+ 1
+ ]
+ },
+ "o": {
+ "x": [
+ 0.17
+ ],
+ "y": [
+ 0.17
+ ]
+ },
+ "t": 0,
+ "s": [
+ 0
+ ]
+ },
+ {
+ "i": {
+ "x": [
+ 0.776
+ ],
+ "y": [
+ 1
+ ]
+ },
+ "o": {
+ "x": [
+ 0.165
+ ],
+ "y": [
+ 0
+ ]
+ },
+ "t": 23,
+ "s": [
+ 100
+ ]
+ },
+ {
+ "i": {
+ "x": [
+ 0.83
+ ],
+ "y": [
+ 0.83
+ ]
+ },
+ "o": {
+ "x": [
+ 0.33
+ ],
+ "y": [
+ 0
+ ]
+ },
+ "t": 460,
+ "s": [
+ 100
+ ]
+ },
+ {
+ "t": 475,
+ "s": [
+ 0
+ ]
+ }
+ ],
+ "ix": 11
+ },
+ "r": {
+ "a": 0,
+ "k": 0,
+ "ix": 10
+ },
+ "p": {
+ "a": 0,
+ "k": [
+ 206,
+ 150,
+ 0
+ ],
+ "ix": 2,
+ "l": 2
+ },
+ "a": {
+ "a": 0,
+ "k": [
+ 0,
+ 0,
+ 0
+ ],
+ "ix": 1,
+ "l": 2
+ },
+ "s": {
+ "a": 0,
+ "k": [
+ 100,
+ 100,
+ 100
+ ],
+ "ix": 6,
+ "l": 2
+ }
+ },
+ "ao": 0,
+ "shapes": [
+ {
+ "ty": "gr",
+ "it": [
+ {
+ "ind": 0,
+ "ty": "sh",
+ "ix": 1,
+ "ks": {
+ "a": 0,
+ "k": {
+ "i": [
+ [
+ 0,
+ 0
+ ],
+ [
+ 0,
+ -8.837
+ ],
+ [
+ 0,
+ 0
+ ],
+ [
+ -8.837,
+ 0
+ ],
+ [
+ 0,
+ 0
+ ],
+ [
+ 0,
+ 8.837
+ ],
+ [
+ 0,
+ 0
+ ],
+ [
+ 8.837,
+ 0
+ ]
+ ],
+ "o": [
+ [
+ -8.837,
+ 0
+ ],
+ [
+ 0,
+ 0
+ ],
+ [
+ 0,
+ 8.837
+ ],
+ [
+ 0,
+ 0
+ ],
+ [
+ 8.837,
+ 0
+ ],
+ [
+ 0,
+ 0
+ ],
+ [
+ 0,
+ -8.837
+ ],
+ [
+ 0,
+ 0
+ ]
+ ],
+ "v": [
+ [
+ -178,
+ -138
+ ],
+ [
+ -194,
+ -122
+ ],
+ [
+ -194,
+ 122
+ ],
+ [
+ -178,
+ 138
+ ],
+ [
+ 178,
+ 138
+ ],
+ [
+ 194,
+ 122
+ ],
+ [
+ 194,
+ -122
+ ],
+ [
+ 178,
+ -138
+ ]
+ ],
+ "c": true
+ },
+ "ix": 2
+ },
+ "nm": "Path 1",
+ "mn": "ADBE Vector Shape - Group",
+ "hd": false
+ },
+ {
+ "ind": 1,
+ "ty": "sh",
+ "ix": 2,
+ "ks": {
+ "a": 0,
+ "k": {
+ "i": [
+ [
+ 0,
+ 0
+ ],
+ [
+ -15.464,
+ 0
+ ],
+ [
+ 0,
+ 0
+ ],
+ [
+ 0,
+ -15.464
+ ],
+ [
+ 0,
+ 0
+ ],
+ [
+ 15.464,
+ 0
+ ],
+ [
+ 0,
+ 0
+ ],
+ [
+ 0,
+ 15.464
+ ]
+ ],
+ "o": [
+ [
+ 0,
+ -15.464
+ ],
+ [
+ 0,
+ 0
+ ],
+ [
+ 15.464,
+ 0
+ ],
+ [
+ 0,
+ 0
+ ],
+ [
+ 0,
+ 15.464
+ ],
+ [
+ 0,
+ 0
+ ],
+ [
+ -15.464,
+ 0
+ ],
+ [
+ 0,
+ 0
+ ]
+ ],
+ "v": [
+ [
+ -206,
+ -122
+ ],
+ [
+ -178,
+ -150
+ ],
+ [
+ 178,
+ -150
+ ],
+ [
+ 206,
+ -122
+ ],
+ [
+ 206,
+ 122
+ ],
+ [
+ 178,
+ 150
+ ],
+ [
+ -178,
+ 150
+ ],
+ [
+ -206,
+ 122
+ ]
+ ],
+ "c": true
+ },
+ "ix": 2
+ },
+ "nm": "Path 2",
+ "mn": "ADBE Vector Shape - Group",
+ "hd": false
+ },
+ {
+ "ty": "fl",
+ "c": {
+ "a": 0,
+ "k": [
+ 0.949019610882,
+ 0.600000023842,
+ 0,
+ 1
+ ],
+ "ix": 4
+ },
+ "o": {
+ "a": 0,
+ "k": 100,
+ "ix": 5
+ },
+ "r": 1,
+ "bm": 0,
+ "nm": "Fill 1",
+ "mn": "ADBE Vector Graphic - Fill",
+ "hd": false
+ },
+ {
+ "ty": "tr",
+ "p": {
+ "a": 0,
+ "k": [
+ 0,
+ 0
+ ],
+ "ix": 2
+ },
+ "a": {
+ "a": 0,
+ "k": [
+ 0,
+ 0
+ ],
+ "ix": 1
+ },
+ "s": {
+ "a": 0,
+ "k": [
+ 100,
+ 100
+ ],
+ "ix": 3
+ },
+ "r": {
+ "a": 0,
+ "k": 0,
+ "ix": 6
+ },
+ "o": {
+ "a": 0,
+ "k": 100,
+ "ix": 7
+ },
+ "sk": {
+ "a": 0,
+ "k": 0,
+ "ix": 4
+ },
+ "sa": {
+ "a": 0,
+ "k": 0,
+ "ix": 5
+ },
+ "nm": "Transform"
+ }
+ ],
+ "nm": "Rectangle 68986 (Stroke)",
+ "np": 3,
+ "cix": 2,
+ "bm": 0,
+ "ix": 1,
+ "mn": "ADBE Vector Group",
+ "hd": false
+ }
+ ],
+ "ip": 0,
+ "op": 1800,
+ "st": 0,
+ "ct": 1,
+ "bm": 0
+ },
+ {
+ "ddd": 0,
+ "ind": 2,
"ty": 3,
"nm": "MoveA+Dots",
"sr": 1,
@@ -42,18 +492,18 @@
},
"t": 170,
"s": [
- 206,
- 150,
+ 206.419,
+ 149.916,
0
],
"to": [
- 4.167,
- -0.833,
+ 6.292,
+ -0.755,
0
],
"ti": [
- -4.167,
- 0.833,
+ -6.292,
+ 0.755,
0
]
},
@@ -68,8 +518,8 @@
},
"t": 207,
"s": [
- 231,
- 145,
+ 244.169,
+ 145.386,
0
],
"to": [
@@ -94,18 +544,18 @@
},
"t": 214,
"s": [
- 231,
- 145,
+ 244.169,
+ 145.386,
0
],
"to": [
- -0.833,
- 5,
+ -1.258,
+ 7.047,
0
],
"ti": [
- 0.833,
- -5,
+ 1.258,
+ -7.047,
0
]
},
@@ -120,8 +570,8 @@
},
"t": 247,
"s": [
- 226,
- 175,
+ 236.619,
+ 187.666,
0
],
"to": [
@@ -142,35 +592,36 @@
},
"o": {
"x": 0.735,
- "y": 0.034
+ "y": 0.022
},
"t": 438,
"s": [
- 226,
- 175,
+ 236.619,
+ 187.666,
0
],
"to": [
- -3.333,
- -4.167,
+ -5.033,
+ -6.292,
0
],
"ti": [
- 3.333,
- 4.167,
+ 5.033,
+ 6.292,
0
]
},
{
"t": 478,
"s": [
- 206,
- 150,
+ 206.419,
+ 149.916,
0
]
}
],
- "ix": 2
+ "ix": 2,
+ "l": 2
},
"a": {
"a": 0,
@@ -179,16 +630,18 @@
0,
0
],
- "ix": 1
+ "ix": 1,
+ "l": 2
},
"s": {
"a": 0,
"k": [
- 100,
- 100,
+ 151,
+ 151,
100
],
- "ix": 6
+ "ix": 6,
+ "l": 2
}
},
"ao": 0,
@@ -199,10 +652,10 @@
},
{
"ddd": 0,
- "ind": 2,
+ "ind": 3,
"ty": 4,
- "nm": ".yellow600",
- "cl": "yellow600",
+ "nm": ".blue400",
+ "cl": "blue400",
"sr": 1,
"ks": {
"o": {
@@ -518,7 +971,8 @@
]
}
],
- "ix": 2
+ "ix": 2,
+ "l": 2
},
"a": {
"a": 0,
@@ -527,7 +981,8 @@
0,
0
],
- "ix": 1
+ "ix": 1,
+ "l": 2
},
"s": {
"a": 0,
@@ -536,7 +991,8 @@
100,
100
],
- "ix": 6
+ "ix": 6,
+ "l": 2
}
},
"ao": 0,
@@ -762,43 +1218,13 @@
"hd": false
},
{
- "ty": "st",
- "c": {
- "a": 0,
- "k": [
- 0.4,
- 0.615685975318,
- 0.96470600203,
- 1
- ],
- "ix": 3
- },
- "o": {
- "a": 0,
- "k": 100,
- "ix": 4
- },
- "w": {
- "a": 0,
- "k": 7,
- "ix": 5
- },
- "lc": 1,
- "lj": 1,
- "ml": 4,
- "bm": 0,
- "nm": "Stroke 1",
- "mn": "ADBE Vector Graphic - Stroke",
- "hd": true
- },
- {
"ty": "fl",
"c": {
"a": 0,
"k": [
- 0.976470588235,
- 0.670588235294,
- 0,
+ 0.4,
+ 0.61568627451,
+ 0.964705882353,
1
],
"ix": 4
@@ -875,15 +1301,16 @@
"ip": 438,
"op": 540,
"st": 0,
+ "ct": 1,
"bm": 0
},
{
"ddd": 0,
- "ind": 3,
+ "ind": 4,
"ty": 4,
- "nm": ".yellow600",
- "cl": "yellow600",
- "parent": 1,
+ "nm": ".blue400",
+ "cl": "blue400",
+ "parent": 2,
"sr": 1,
"ks": {
"o": {
@@ -1103,7 +1530,8 @@
]
}
],
- "ix": 2
+ "ix": 2,
+ "l": 2
},
"a": {
"a": 0,
@@ -1112,7 +1540,8 @@
0,
0
],
- "ix": 1
+ "ix": 1,
+ "l": 2
},
"s": {
"a": 0,
@@ -1121,7 +1550,8 @@
100,
100
],
- "ix": 6
+ "ix": 6,
+ "l": 2
}
},
"ao": 0,
@@ -1293,43 +1723,13 @@
"hd": false
},
{
- "ty": "st",
- "c": {
- "a": 0,
- "k": [
- 0.4,
- 0.615685975318,
- 0.96470600203,
- 1
- ],
- "ix": 3
- },
- "o": {
- "a": 0,
- "k": 100,
- "ix": 4
- },
- "w": {
- "a": 0,
- "k": 7,
- "ix": 5
- },
- "lc": 1,
- "lj": 1,
- "ml": 4,
- "bm": 0,
- "nm": "Stroke 1",
- "mn": "ADBE Vector Graphic - Stroke",
- "hd": true
- },
- {
"ty": "fl",
"c": {
"a": 0,
"k": [
- 0.976470588235,
- 0.670588235294,
- 0,
+ 0.40000000596,
+ 0.615686297417,
+ 0.964705884457,
1
],
"ix": 4
@@ -1406,14 +1806,15 @@
"ip": 0,
"op": 438,
"st": 0,
+ "ct": 1,
"bm": 0
},
{
"ddd": 0,
- "ind": 4,
+ "ind": 5,
"ty": 4,
- "nm": ".yellow600",
- "cl": "yellow600",
+ "nm": ".blue400",
+ "cl": "blue400",
"sr": 1,
"ks": {
"o": {
@@ -1847,7 +2248,8 @@
]
}
],
- "ix": 2
+ "ix": 2,
+ "l": 2
},
"a": {
"a": 0,
@@ -1856,7 +2258,8 @@
0,
0
],
- "ix": 1
+ "ix": 1,
+ "l": 2
},
"s": {
"a": 0,
@@ -1865,7 +2268,8 @@
100,
100
],
- "ix": 6
+ "ix": 6,
+ "l": 2
}
},
"ao": 0,
@@ -2172,43 +2576,13 @@
"hd": false
},
{
- "ty": "st",
- "c": {
- "a": 0,
- "k": [
- 0.4,
- 0.615685975318,
- 0.96470600203,
- 1
- ],
- "ix": 3
- },
- "o": {
- "a": 0,
- "k": 100,
- "ix": 4
- },
- "w": {
- "a": 0,
- "k": 7,
- "ix": 5
- },
- "lc": 1,
- "lj": 1,
- "ml": 4,
- "bm": 0,
- "nm": "Stroke 1",
- "mn": "ADBE Vector Graphic - Stroke",
- "hd": true
- },
- {
"ty": "fl",
"c": {
"a": 0,
"k": [
- 0.976470588235,
- 0.670588235294,
- 0,
+ 0.40000000596,
+ 0.615686297417,
+ 0.964705884457,
1
],
"ix": 4
@@ -2285,15 +2659,16 @@
"ip": 438,
"op": 540,
"st": 0,
+ "ct": 1,
"bm": 0
},
{
"ddd": 0,
- "ind": 5,
+ "ind": 6,
"ty": 4,
- "nm": ".yellow600",
- "cl": "yellow600",
- "parent": 1,
+ "nm": ".blue400",
+ "cl": "blue400",
+ "parent": 2,
"sr": 1,
"ks": {
"o": {
@@ -2631,7 +3006,8 @@
]
}
],
- "ix": 2
+ "ix": 2,
+ "l": 2
},
"a": {
"a": 0,
@@ -2640,7 +3016,8 @@
0,
0
],
- "ix": 1
+ "ix": 1,
+ "l": 2
},
"s": {
"a": 0,
@@ -2649,7 +3026,8 @@
100,
100
],
- "ix": 6
+ "ix": 6,
+ "l": 2
}
},
"ao": 0,
@@ -2902,43 +3280,13 @@
"hd": false
},
{
- "ty": "st",
- "c": {
- "a": 0,
- "k": [
- 0.4,
- 0.615685975318,
- 0.96470600203,
- 1
- ],
- "ix": 3
- },
- "o": {
- "a": 0,
- "k": 100,
- "ix": 4
- },
- "w": {
- "a": 0,
- "k": 7,
- "ix": 5
- },
- "lc": 1,
- "lj": 1,
- "ml": 4,
- "bm": 0,
- "nm": "Stroke 1",
- "mn": "ADBE Vector Graphic - Stroke",
- "hd": true
- },
- {
"ty": "fl",
"c": {
"a": 0,
"k": [
- 0.976470588235,
- 0.670588235294,
- 0,
+ 0.40000000596,
+ 0.615686297417,
+ 0.964705884457,
1
],
"ix": 4
@@ -3015,19 +3363,16 @@
"ip": 0,
"op": 438,
"st": 0,
+ "ct": 1,
"bm": 0
- }
- ]
- },
- {
- "id": "comp_1",
- "layers": [
+ },
{
"ddd": 0,
- "ind": 1,
+ "ind": 7,
"ty": 4,
- "nm": ".yellow600",
- "cl": "yellow600",
+ "nm": ".cream",
+ "cl": "cream",
+ "parent": 8,
"sr": 1,
"ks": {
"o": {
@@ -3043,20 +3388,22 @@
"p": {
"a": 0,
"k": [
- 206,
- 150,
+ 0.175,
+ 0.195,
0
],
- "ix": 2
+ "ix": 2,
+ "l": 2
},
"a": {
"a": 0,
"k": [
- 206,
- 150,
+ 132.391,
+ 67.66,
0
],
- "ix": 1
+ "ix": 1,
+ "l": 2
},
"s": {
"a": 0,
@@ -3065,7 +3412,8 @@
100,
100
],
- "ix": 6
+ "ix": 6,
+ "l": 2
}
},
"ao": 0,
@@ -3082,7 +3430,63 @@
"k": {
"i": [
[
- 5.251,
+ 12.66,
+ 0
+ ],
+ [
+ 5.22,
+ 2.4
+ ],
+ [
+ 3.6,
+ 4.02
+ ],
+ [
+ 1.14,
+ 3.36
+ ],
+ [
+ -0.9,
+ 2.22
+ ],
+ [
+ -2.28,
+ 1.02
+ ],
+ [
+ -2.16,
+ -0.66
+ ],
+ [
+ -1.08,
+ -1.98
+ ],
+ [
+ -2.16,
+ -2.7
+ ],
+ [
+ -2.88,
+ -1.62
+ ],
+ [
+ -4.08,
+ 0
+ ],
+ [
+ -4.08,
+ 4.26
+ ],
+ [
+ 0,
+ 5.94
+ ],
+ [
+ 4.56,
+ 3.78
+ ],
+ [
+ 6.6,
0
],
[
@@ -3090,15 +3494,19 @@
0
],
[
- 0,
- -5.252
+ 1.68,
+ 1.62
],
[
0,
- 0
+ 2.28
],
[
- -5.251,
+ -1.68,
+ 1.62
+ ],
+ [
+ -2.28,
0
],
[
@@ -3106,709 +3514,440 @@
0
],
[
+ -3.9,
+ 3.54
+ ],
+ [
0,
- 5.252
+ 5.88
+ ],
+ [
+ 3.6,
+ 3.42
+ ],
+ [
+ 5.94,
+ 0
+ ],
+ [
+ 2.52,
+ -1.26
+ ],
+ [
+ 1.86,
+ -2.04
+ ],
+ [
+ 1.26,
+ -1.68
+ ],
+ [
+ 2.28,
+ -0.48
+ ],
+ [
+ 2.1,
+ 1.32
+ ],
+ [
+ 0.66,
+ 2.34
+ ],
+ [
+ -1.38,
+ 2.7
+ ],
+ [
+ -3.54,
+ 3.3
+ ],
+ [
+ -4.62,
+ 1.8
+ ],
+ [
+ -6.18,
+ 0
+ ],
+ [
+ -6.96,
+ -6.3
+ ],
+ [
+ 0,
+ -10.2
+ ],
+ [
+ 3.18,
+ -5.04
+ ],
+ [
+ 5.7,
+ -2.1
],
[
0,
0
+ ],
+ [
+ -3.9,
+ -5.64
+ ],
+ [
+ 0,
+ -7.86
+ ],
+ [
+ 8.04,
+ -7.38
]
],
"o": [
[
- 0,
+ -7.14,
0
],
[
- -5.251,
+ -5.16,
+ -2.4
+ ],
+ [
+ -3.6,
+ -4.02
+ ],
+ [
+ -1.14,
+ -3.42
+ ],
+ [
+ 0.9,
+ -2.28
+ ],
+ [
+ 2.28,
+ -1.08
+ ],
+ [
+ 2.22,
+ 0.66
+ ],
+ [
+ 1.08,
+ 1.98
+ ],
+ [
+ 2.22,
+ 2.7
+ ],
+ [
+ 2.88,
+ 1.56
+ ],
+ [
+ 6.6,
0
],
[
+ 4.14,
+ -4.26
+ ],
+ [
+ 0,
+ -6.78
+ ],
+ [
+ -4.56,
+ -3.78
+ ],
+ [
0,
0
],
[
+ -2.28,
+ 0
+ ],
+ [
+ -1.68,
+ -1.68
+ ],
+ [
0,
- 5.252
+ -2.28
+ ],
+ [
+ 1.68,
+ -1.68
],
[
0,
0
],
[
- 5.251,
+ 6.06,
0
],
[
+ 3.96,
+ -3.54
+ ],
+ [
+ 0,
+ -5.46
+ ],
+ [
+ -3.54,
+ -3.42
+ ],
+ [
+ -3.3,
+ 0
+ ],
+ [
+ -2.46,
+ 1.2
+ ],
+ [
+ -1.86,
+ 2.04
+ ],
+ [
+ -1.2,
+ 1.68
+ ],
+ [
+ -2.22,
+ 0.48
+ ],
+ [
+ -2.04,
+ -1.38
+ ],
+ [
+ -0.6,
+ -2.4
+ ],
+ [
+ 1.38,
+ -2.76
+ ],
+ [
+ 3.54,
+ -3.36
+ ],
+ [
+ 4.68,
+ -1.8
+ ],
+ [
+ 11.76,
+ 0
+ ],
+ [
+ 6.96,
+ 6.24
+ ],
+ [
+ 0,
+ 7.02
+ ],
+ [
+ -3.18,
+ 4.98
+ ],
+ [
0,
0
],
[
+ 7.02,
+ 2.58
+ ],
+ [
+ 3.96,
+ 5.58
+ ],
+ [
0,
- -5.252
+ 11.16
+ ],
+ [
+ -8.04,
+ 7.38
]
],
"v": [
[
- 54.68,
- -123.622
+ -1.53,
+ 67.41
],
[
- -54.68,
- -123.622
+ -20.07,
+ 63.81
],
[
- -64.188,
- -114.113
+ -33.21,
+ 54.18
],
[
- -64.188,
- 114.113
+ -40.32,
+ 43.11
],
[
- -54.68,
- 123.622
+ -40.68,
+ 34.65
],
[
- 54.68,
- 123.622
+ -35.91,
+ 29.7
],
[
- 64.188,
- 114.113
+ -29.25,
+ 29.07
],
[
- 64.188,
- -114.113
- ]
- ],
- "c": true
- },
- "ix": 2
- },
- "nm": "Path 1",
- "mn": "ADBE Vector Shape - Group",
- "hd": false
- },
- {
- "ind": 1,
- "ty": "sh",
- "ix": 2,
- "ks": {
- "a": 0,
- "k": {
- "i": [
- [
- 0,
- 0
+ -24.3,
+ 33.03
],
[
- 0,
- -3.038
+ -19.44,
+ 40.05
],
[
- 0,
- 0
+ -11.79,
+ 46.53
],
[
- 3.037,
- 0
+ -1.35,
+ 48.87
],
[
- 0,
- 0
+ 14.67,
+ 42.48
],
[
- 0,
- 3.038
+ 20.88,
+ 27.18
],
[
- 0,
- 0
+ 14.04,
+ 11.34
],
[
- -3.037,
- 0
- ]
- ],
- "o": [
- [
- 3.037,
- 0
+ -2.7,
+ 5.67
],
[
- 0,
- 0
+ -6.75,
+ 5.67
],
[
- 0,
- 3.038
+ -12.69,
+ 3.24
],
[
- 0,
- 0
+ -15.21,
+ -2.7
],
[
- -3.037,
- 0
+ -12.69,
+ -8.55
],
[
- 0,
- 0
+ -6.75,
+ -11.07
],
[
- 0,
- -3.038
+ -3.87,
+ -11.07
],
[
- 0,
- 0
- ]
- ],
- "v": [
- [
- 54.68,
- -119.622
+ 11.07,
+ -16.38
],
[
- 60.188,
- -114.113
+ 17.01,
+ -30.51
],
[
- 60.188,
- 114.113
+ 11.61,
+ -43.83
],
[
- 54.68,
- 119.622
+ -2.61,
+ -48.96
],
[
- -54.68,
- 119.622
+ -11.34,
+ -47.07
],
[
- -60.188,
- 114.113
+ -17.82,
+ -42.21
],
[
- -60.188,
- -114.113
+ -22.5,
+ -36.63
],
[
- -54.68,
- -119.622
- ]
- ],
- "c": true
- },
- "ix": 2
- },
- "nm": "Path 2",
- "mn": "ADBE Vector Shape - Group",
- "hd": false
- },
- {
- "ty": "mm",
- "mm": 1,
- "nm": "Merge Paths 1",
- "mn": "ADBE Vector Filter - Merge",
- "hd": false
- },
- {
- "ty": "fl",
- "c": {
- "a": 1,
- "k": [
- {
- "i": {
- "x": [
- 0.667
- ],
- "y": [
- 1
- ]
- },
- "o": {
- "x": [
- 0.167
- ],
- "y": [
- 0.197
- ]
- },
- "t": 0,
- "s": [
- 0,
- 0,
- 0,
- 1
- ]
- },
- {
- "i": {
- "x": [
- 0.667
- ],
- "y": [
- 1
- ]
- },
- "o": {
- "x": [
- 0.333
- ],
- "y": [
- 0
- ]
- },
- "t": 23,
- "s": [
- 0.949019607843,
- 0.6,
- 0,
- 1
- ]
- },
- {
- "i": {
- "x": [
- 0.667
- ],
- "y": [
- 1
- ]
- },
- "o": {
- "x": [
- 0.333
- ],
- "y": [
- 0
- ]
- },
- "t": 62,
- "s": [
- 0.976470588235,
- 0.670588235294,
- 0,
- 1
- ]
- },
- {
- "i": {
- "x": [
- 0.833
- ],
- "y": [
- 1.197
- ]
- },
- "o": {
- "x": [
- 0.333
- ],
- "y": [
- 0
- ]
- },
- "t": 460,
- "s": [
- 0.949019607843,
- 0.6,
- 0,
- 1
- ]
- },
- {
- "t": 475,
- "s": [
- 0,
- 0,
- 0,
- 1
- ]
- }
- ],
- "ix": 4
- },
- "o": {
- "a": 0,
- "k": 100,
- "ix": 5
- },
- "r": 1,
- "bm": 0,
- "nm": "Fill 1",
- "mn": "ADBE Vector Graphic - Fill",
- "hd": false
- },
- {
- "ty": "tr",
- "p": {
- "a": 0,
- "k": [
- 206,
- 150
- ],
- "ix": 2
- },
- "a": {
- "a": 0,
- "k": [
- 0,
- 0
- ],
- "ix": 1
- },
- "s": {
- "a": 0,
- "k": [
- 100,
- 100
- ],
- "ix": 3
- },
- "r": {
- "a": 0,
- "k": 0,
- "ix": 6
- },
- "o": {
- "a": 0,
- "k": 100,
- "ix": 7
- },
- "sk": {
- "a": 0,
- "k": 0,
- "ix": 4
- },
- "sa": {
- "a": 0,
- "k": 0,
- "ix": 5
- },
- "nm": "Transform"
- }
- ],
- "nm": "Group 2",
- "np": 4,
- "cix": 2,
- "bm": 0,
- "ix": 1,
- "mn": "ADBE Vector Group",
- "hd": false
- }
- ],
- "ip": 0,
- "op": 540,
- "st": 0,
- "bm": 0
- }
- ]
- },
- {
- "id": "comp_2",
- "layers": [
- {
- "ddd": 0,
- "ind": 1,
- "ty": 4,
- "nm": ".white",
- "cl": "white",
- "sr": 1,
- "ks": {
- "o": {
- "a": 0,
- "k": 100,
- "ix": 11
- },
- "r": {
- "a": 0,
- "k": 0,
- "ix": 10
- },
- "p": {
- "a": 0,
- "k": [
- 206,
- 150,
- 0
- ],
- "ix": 2
- },
- "a": {
- "a": 0,
- "k": [
- 0,
- 0,
- 0
- ],
- "ix": 1
- },
- "s": {
- "a": 1,
- "k": [
- {
- "i": {
- "x": [
- 0.18,
- 0.18,
- 0.667
- ],
- "y": [
- 1,
- 1,
- 1
- ]
- },
- "o": {
- "x": [
- 0.333,
- 0.333,
- 0.333
- ],
- "y": [
- 0,
- 0,
- 0
- ]
- },
- "t": 76,
- "s": [
- 30,
- 30,
- 100
- ]
- },
- {
- "i": {
- "x": [
- 0.667,
- 0.667,
- 0.667
- ],
- "y": [
- 1,
- 1,
- 1
- ]
- },
- "o": {
- "x": [
- 0.333,
- 0.333,
- 0.333
- ],
- "y": [
- 0,
- 0,
- 0
- ]
- },
- "t": 95,
- "s": [
- 119,
- 119,
- 100
- ]
- },
- {
- "i": {
- "x": [
- 0.257,
- 0.257,
- 0.667
- ],
- "y": [
- 1,
- 1,
- 1
- ]
- },
- "o": {
- "x": [
- 0.333,
- 0.333,
- 0.333
- ],
- "y": [
- 0,
- 0,
- 0
- ]
- },
- "t": 352,
- "s": [
- 119,
- 119,
- 100
- ]
- },
- {
- "i": {
- "x": [
- 0.667,
- 0.667,
- 0.667
- ],
- "y": [
- 1,
- 1,
- 1
- ]
- },
- "o": {
- "x": [
- 0.333,
- 0.333,
- 0.333
- ],
- "y": [
- 0,
- 0,
- 0
- ]
- },
- "t": 393,
- "s": [
- 161,
- 161,
- 100
- ]
- },
- {
- "i": {
- "x": [
- 0.667,
- 0.667,
- 0.667
- ],
- "y": [
- 1,
- 1,
- 1
- ]
- },
- "o": {
- "x": [
- 0.735,
- 0.735,
- 0.333
- ],
- "y": [
- -0.008,
- -0.008,
- 0
- ]
- },
- "t": 438,
- "s": [
- 161,
- 161,
- 100
- ]
- },
- {
- "t": 478,
- "s": [
- 30,
- 30,
- 100
- ]
- }
- ],
- "ix": 6
- }
- },
- "ao": 0,
- "shapes": [
- {
- "ty": "gr",
- "it": [
- {
- "ind": 0,
- "ty": "sh",
- "ix": 1,
- "ks": {
- "a": 0,
- "k": {
- "i": [
- [
- 0,
- 0
+ -27.72,
+ -33.39
],
[
- 0,
- 0
- ],
- [
- 0,
- 0
- ],
- [
- 0,
- 0
- ],
- [
- 0,
- 0
- ],
- [
- 0,
- 0
- ]
- ],
- "o": [
- [
- 0,
- 0
- ],
- [
- 0,
- 0
- ],
- [
- 0,
- 0
- ],
- [
- 0,
- 0
- ],
- [
- 0,
- 0
- ],
- [
- 0,
- 0
- ]
- ],
- "v": [
- [
- 13.974,
- 5.25
- ],
- [
- 4.524,
- -21.75
- ],
- [
- 0.624,
+ -34.2,
-34.65
],
[
- -0.576,
- -34.65
+ -38.25,
+ -40.23
],
[
- -4.476,
- -21.75
+ -37.08,
+ -47.88
],
[
- -14.076,
- 5.25
+ -29.7,
+ -56.97
+ ],
+ [
+ -17.46,
+ -64.71
+ ],
+ [
+ -1.17,
+ -67.41
+ ],
+ [
+ 26.91,
+ -57.96
+ ],
+ [
+ 37.35,
+ -33.3
+ ],
+ [
+ 32.58,
+ -15.21
+ ],
+ [
+ 19.26,
+ -4.59
+ ],
+ [
+ 19.26,
+ -3.96
+ ],
+ [
+ 35.64,
+ 8.37
+ ],
+ [
+ 41.58,
+ 28.53
+ ],
+ [
+ 29.52,
+ 56.34
]
],
"c": true
@@ -3820,130 +3959,13 @@
"hd": false
},
{
- "ind": 1,
- "ty": "sh",
- "ix": 2,
- "ks": {
- "a": 0,
- "k": {
- "i": [
- [
- 0,
- 0
- ],
- [
- 0,
- 0
- ],
- [
- 0,
- 0
- ],
- [
- 0,
- 0
- ],
- [
- 0,
- 0
- ],
- [
- 0,
- 0
- ],
- [
- 0,
- 0
- ],
- [
- 0,
- 0
- ]
- ],
- "o": [
- [
- 0,
- 0
- ],
- [
- 0,
- 0
- ],
- [
- 0,
- 0
- ],
- [
- 0,
- 0
- ],
- [
- 0,
- 0
- ],
- [
- 0,
- 0
- ],
- [
- 0,
- 0
- ],
- [
- 0,
- 0
- ]
- ],
- "v": [
- [
- -11.676,
- -57.9
- ],
- [
- 11.574,
- -57.9
- ],
- [
- 51.924,
- 49.5
- ],
- [
- 29.574,
- 49.5
- ],
- [
- 20.574,
- 23.85
- ],
- [
- -20.526,
- 23.85
- ],
- [
- -29.526,
- 49.5
- ],
- [
- -51.876,
- 49.5
- ]
- ],
- "c": true
- },
- "ix": 2
- },
- "nm": "Path 2",
- "mn": "ADBE Vector Shape - Group",
- "hd": false
- },
- {
"ty": "fl",
"c": {
"a": 0,
"k": [
1,
- 1,
- 1,
+ 0.980392216701,
+ 0.941176530427,
1
],
"ix": 4
@@ -3964,739 +3986,8 @@
"p": {
"a": 0,
"k": [
- 0,
- 0
- ],
- "ix": 2
- },
- "a": {
- "a": 0,
- "k": [
- 0,
- 0
- ],
- "ix": 1
- },
- "s": {
- "a": 0,
- "k": [
- 100,
- 100
- ],
- "ix": 3
- },
- "r": {
- "a": 0,
- "k": 0,
- "ix": 6
- },
- "o": {
- "a": 0,
- "k": 100,
- "ix": 7
- },
- "sk": {
- "a": 0,
- "k": 0,
- "ix": 4
- },
- "sa": {
- "a": 0,
- "k": 0,
- "ix": 5
- },
- "nm": "Transform"
- }
- ],
- "nm": "Group 1",
- "np": 3,
- "cix": 2,
- "bm": 0,
- "ix": 1,
- "mn": "ADBE Vector Group",
- "hd": false
- }
- ],
- "ip": 0,
- "op": 540,
- "st": 0,
- "bm": 0
- }
- ]
- },
- {
- "id": "comp_3",
- "layers": [
- {
- "ddd": 0,
- "ind": 1,
- "ty": 4,
- "nm": ".grey300",
- "cl": "grey300",
- "sr": 1,
- "ks": {
- "o": {
- "a": 0,
- "k": 100,
- "ix": 11
- },
- "r": {
- "a": 0,
- "k": 0,
- "ix": 10
- },
- "p": {
- "a": 0,
- "k": [
- 206,
- 150,
- 0
- ],
- "ix": 2
- },
- "a": {
- "a": 0,
- "k": [
- 0,
- 0,
- 0
- ],
- "ix": 1
- },
- "s": {
- "a": 0,
- "k": [
- 100,
- 100,
- 100
- ],
- "ix": 6
- }
- },
- "ao": 0,
- "shapes": [
- {
- "ty": "gr",
- "it": [
- {
- "ind": 0,
- "ty": "sh",
- "ix": 1,
- "ks": {
- "a": 0,
- "k": {
- "i": [
- [
- 0,
- 0
- ],
- [
- 5.243,
- 0
- ],
- [
- 0,
- 0
- ],
- [
- 0,
- 5.244
- ],
- [
- 0,
- 0
- ],
- [
- -5.243,
- 0
- ],
- [
- 0,
- 0
- ],
- [
- 0,
- -5.244
- ]
- ],
- "o": [
- [
- 0,
- 5.244
- ],
- [
- 0,
- 0
- ],
- [
- -5.243,
- 0
- ],
- [
- 0,
- 0
- ],
- [
- 0,
- -5.244
- ],
- [
- 0,
- 0
- ],
- [
- 5.243,
- 0
- ],
- [
- 0,
- 0
- ]
- ],
- "v": [
- [
- 64.12,
- 114.112
- ],
- [
- 54.611,
- 123.622
- ],
- [
- -54.747,
- 123.622
- ],
- [
- -64.256,
- 114.112
- ],
- [
- -64.256,
- -114.112
- ],
- [
- -54.747,
- -123.622
- ],
- [
- 54.611,
- -123.622
- ],
- [
- 64.12,
- -114.112
- ]
- ],
- "c": true
- },
- "ix": 2
- },
- "nm": "Path 1",
- "mn": "ADBE Vector Shape - Group",
- "hd": false
- },
- {
- "ind": 1,
- "ty": "sh",
- "ix": 2,
- "ks": {
- "a": 0,
- "k": {
- "i": [
- [
- 0,
- 1.313
- ],
- [
- 0,
- 0
- ],
- [
- 1.313,
- 0
- ],
- [
- 0,
- 0
- ],
- [
- 6.554,
- 0
- ],
- [
- 0,
- 0
- ],
- [
- 0,
- -6.555
- ],
- [
- 0,
- 0
- ],
- [
- -6.554,
- 0
- ],
- [
- 0,
- 0
- ],
- [
- 0,
- 6.555
- ],
- [
- 0,
- 0
- ],
- [
- 0,
- 1.313
- ],
- [
- 0,
- 0
- ],
- [
- 1.313,
- 0
- ],
- [
- 0,
- 0
- ]
- ],
- "o": [
- [
- 0,
- 0
- ],
- [
- 0,
- -1.313
- ],
- [
- 0,
- 0
- ],
- [
- 0,
- -6.555
- ],
- [
- 0,
- 0
- ],
- [
- -6.554,
- 0
- ],
- [
- 0,
- 0
- ],
- [
- 0,
- 6.555
- ],
- [
- 0,
- 0
- ],
- [
- 6.554,
- 0
- ],
- [
- 0,
- 0
- ],
- [
- 1.313,
- 0
- ],
- [
- 0,
- 0
- ],
- [
- 0,
- -1.313
- ],
- [
- 0,
- 0
- ],
- [
- 1.313,
- 0
- ]
- ],
- "v": [
- [
- 68.875,
- -52.302
- ],
- [
- 68.875,
- -61.811
- ],
- [
- 66.498,
- -64.188
- ],
- [
- 66.498,
- -114.112
- ],
- [
- 54.611,
- -126
- ],
- [
- -54.747,
- -126
- ],
- [
- -66.634,
- -114.112
- ],
- [
- -66.634,
- 114.112
- ],
- [
- -54.747,
- 126
- ],
- [
- 54.611,
- 126
- ],
- [
- 66.498,
- 114.112
- ],
- [
- 66.498,
- -2.378
- ],
- [
- 68.875,
- -4.755
- ],
- [
- 68.875,
- -28.528
- ],
- [
- 66.498,
- -30.906
- ],
- [
- 66.498,
- -49.924
- ]
- ],
- "c": true
- },
- "ix": 2
- },
- "nm": "Path 2",
- "mn": "ADBE Vector Shape - Group",
- "hd": false
- },
- {
- "ty": "fl",
- "c": {
- "a": 0,
- "k": [
- 0.854901969433,
- 0.86274510622,
- 0.878431379795,
- 1
- ],
- "ix": 4
- },
- "o": {
- "a": 0,
- "k": 100,
- "ix": 5
- },
- "r": 1,
- "bm": 0,
- "nm": "Fill 1",
- "mn": "ADBE Vector Graphic - Fill",
- "hd": false
- },
- {
- "ty": "tr",
- "p": {
- "a": 0,
- "k": [
- 0,
- 0
- ],
- "ix": 2
- },
- "a": {
- "a": 0,
- "k": [
- 0,
- 0
- ],
- "ix": 1
- },
- "s": {
- "a": 0,
- "k": [
- 100,
- 100
- ],
- "ix": 3
- },
- "r": {
- "a": 0,
- "k": 0,
- "ix": 6
- },
- "o": {
- "a": 0,
- "k": 100,
- "ix": 7
- },
- "sk": {
- "a": 0,
- "k": 0,
- "ix": 4
- },
- "sa": {
- "a": 0,
- "k": 0,
- "ix": 5
- },
- "nm": "Transform"
- }
- ],
- "nm": "Group 1",
- "np": 3,
- "cix": 2,
- "bm": 0,
- "ix": 1,
- "mn": "ADBE Vector Group",
- "hd": false
- }
- ],
- "ip": 0,
- "op": 607,
- "st": 0,
- "bm": 0
- }
- ]
- },
- {
- "id": "comp_4",
- "layers": [
- {
- "ddd": 0,
- "ind": 1,
- "ty": 4,
- "nm": ".black",
- "cl": "black",
- "sr": 1,
- "ks": {
- "o": {
- "a": 0,
- "k": 100,
- "ix": 11
- },
- "r": {
- "a": 0,
- "k": 0,
- "ix": 10
- },
- "p": {
- "a": 0,
- "k": [
- 206,
- 150,
- 0
- ],
- "ix": 2
- },
- "a": {
- "a": 0,
- "k": [
- 0,
- 0,
- 0
- ],
- "ix": 1
- },
- "s": {
- "a": 0,
- "k": [
- 100,
- 100,
- 100
- ],
- "ix": 6
- }
- },
- "ao": 0,
- "shapes": [
- {
- "ty": "gr",
- "it": [
- {
- "ind": 0,
- "ty": "sh",
- "ix": 1,
- "ks": {
- "a": 0,
- "k": {
- "i": [
- [
- 0,
- 0
- ],
- [
- 5.243,
- 0
- ],
- [
- 0,
- 0
- ],
- [
- 0,
- 5.244
- ],
- [
- 0,
- 0
- ],
- [
- -5.243,
- 0
- ],
- [
- 0,
- 0
- ],
- [
- 0,
- -5.244
- ]
- ],
- "o": [
- [
- 0,
- 5.244
- ],
- [
- 0,
- 0
- ],
- [
- -5.243,
- 0
- ],
- [
- 0,
- 0
- ],
- [
- 0,
- -5.244
- ],
- [
- 0,
- 0
- ],
- [
- 5.243,
- 0
- ],
- [
- 0,
- 0
- ]
- ],
- "v": [
- [
- 64.12,
- 114.112
- ],
- [
- 54.611,
- 123.622
- ],
- [
- -54.747,
- 123.622
- ],
- [
- -64.256,
- 114.112
- ],
- [
- -64.256,
- -114.112
- ],
- [
- -54.747,
- -123.622
- ],
- [
- 54.611,
- -123.622
- ],
- [
- 64.12,
- -114.112
- ]
- ],
- "c": true
- },
- "ix": 2
- },
- "nm": "Path 1",
- "mn": "ADBE Vector Shape - Group",
- "hd": false
- },
- {
- "ty": "fl",
- "c": {
- "a": 0,
- "k": [
- 0,
- 0,
- 0,
- 1
- ],
- "ix": 4
- },
- "o": {
- "a": 0,
- "k": 100,
- "ix": 5
- },
- "r": 1,
- "bm": 0,
- "nm": "Fill 1",
- "mn": "ADBE Vector Graphic - Fill",
- "hd": false
- },
- {
- "ty": "tr",
- "p": {
- "a": 0,
- "k": [
- 0,
- 0
+ 222.666,
+ 67.66
],
"ix": 2
},
@@ -4746,11 +4037,1351 @@
"ix": 1,
"mn": "ADBE Vector Group",
"hd": false
+ },
+ {
+ "ty": "gr",
+ "it": [
+ {
+ "ind": 0,
+ "ty": "sh",
+ "ix": 1,
+ "ks": {
+ "a": 0,
+ "k": {
+ "i": [
+ [
+ 0,
+ 0
+ ],
+ [
+ 2.46,
+ 2.34
+ ],
+ [
+ 0,
+ 3.42
+ ],
+ [
+ -0.72,
+ 1.38
+ ],
+ [
+ -0.96,
+ 1.02
+ ],
+ [
+ 0,
+ 0
+ ],
+ [
+ -2.52,
+ 4.68
+ ],
+ [
+ 0,
+ 4.44
+ ],
+ [
+ 3.54,
+ 3.42
+ ],
+ [
+ 5.94,
+ 0
+ ],
+ [
+ 2.16,
+ -0.96
+ ],
+ [
+ 2.16,
+ -1.8
+ ],
+ [
+ 1.44,
+ -2.4
+ ],
+ [
+ 2.46,
+ -0.6
+ ],
+ [
+ 2.34,
+ 1.2
+ ],
+ [
+ 0.78,
+ 2.52
+ ],
+ [
+ -1.68,
+ 3.3
+ ],
+ [
+ -3.48,
+ 3.24
+ ],
+ [
+ -4.68,
+ 1.92
+ ],
+ [
+ -6.9,
+ 0
+ ],
+ [
+ -7.38,
+ -6.84
+ ],
+ [
+ 0,
+ -10.98
+ ],
+ [
+ 3.42,
+ -6.78
+ ],
+ [
+ 7.32,
+ -7.44
+ ],
+ [
+ 0,
+ 0
+ ],
+ [
+ 0,
+ 0
+ ],
+ [
+ 0,
+ 0
+ ],
+ [
+ -1.86,
+ -1.86
+ ],
+ [
+ 0,
+ -2.52
+ ],
+ [
+ 1.86,
+ -1.86
+ ],
+ [
+ 2.58,
+ 0
+ ]
+ ],
+ "o": [
+ [
+ -3.48,
+ 0
+ ],
+ [
+ -2.4,
+ -2.34
+ ],
+ [
+ 0,
+ -1.92
+ ],
+ [
+ 0.78,
+ -1.44
+ ],
+ [
+ 0,
+ 0
+ ],
+ [
+ 5.88,
+ -6.24
+ ],
+ [
+ 2.52,
+ -4.68
+ ],
+ [
+ 0,
+ -5.64
+ ],
+ [
+ -3.48,
+ -3.42
+ ],
+ [
+ -3.36,
+ 0
+ ],
+ [
+ -2.16,
+ 0.9
+ ],
+ [
+ -2.16,
+ 1.74
+ ],
+ [
+ -1.38,
+ 2.4
+ ],
+ [
+ -2.46,
+ 0.6
+ ],
+ [
+ -2.28,
+ -1.2
+ ],
+ [
+ -0.78,
+ -2.52
+ ],
+ [
+ 1.68,
+ -3.3
+ ],
+ [
+ 3.48,
+ -3.24
+ ],
+ [
+ 4.74,
+ -1.92
+ ],
+ [
+ 11.4,
+ 0
+ ],
+ [
+ 7.44,
+ 6.78
+ ],
+ [
+ 0,
+ 6.6
+ ],
+ [
+ -3.36,
+ 6.72
+ ],
+ [
+ 0,
+ 0
+ ],
+ [
+ 0,
+ 0
+ ],
+ [
+ 0,
+ 0
+ ],
+ [
+ 2.58,
+ 0
+ ],
+ [
+ 1.86,
+ 1.86
+ ],
+ [
+ 0,
+ 2.58
+ ],
+ [
+ -1.86,
+ 1.8
+ ],
+ [
+ 0,
+ 0
+ ]
+ ],
+ "v": [
+ [
+ -29.385,
+ 65.925
+ ],
+ [
+ -38.295,
+ 62.415
+ ],
+ [
+ -41.895,
+ 53.775
+ ],
+ [
+ -40.815,
+ 48.825
+ ],
+ [
+ -38.205,
+ 45.135
+ ],
+ [
+ 1.935,
+ 2.295
+ ],
+ [
+ 14.535,
+ -14.085
+ ],
+ [
+ 18.315,
+ -27.765
+ ],
+ [
+ 13.005,
+ -41.355
+ ],
+ [
+ -1.125,
+ -46.485
+ ],
+ [
+ -9.405,
+ -45.045
+ ],
+ [
+ -15.885,
+ -40.995
+ ],
+ [
+ -21.285,
+ -34.785
+ ],
+ [
+ -27.045,
+ -30.285
+ ],
+ [
+ -34.245,
+ -31.185
+ ],
+ [
+ -38.835,
+ -36.765
+ ],
+ [
+ -37.485,
+ -45.495
+ ],
+ [
+ -29.745,
+ -55.305
+ ],
+ [
+ -17.505,
+ -63.045
+ ],
+ [
+ -0.045,
+ -65.925
+ ],
+ [
+ 28.125,
+ -55.665
+ ],
+ [
+ 39.285,
+ -29.025
+ ],
+ [
+ 34.155,
+ -8.955
+ ],
+ [
+ 18.135,
+ 12.285
+ ],
+ [
+ -14.895,
+ 46.665
+ ],
+ [
+ -14.625,
+ 47.205
+ ],
+ [
+ 32.445,
+ 47.205
+ ],
+ [
+ 39.105,
+ 49.995
+ ],
+ [
+ 41.895,
+ 56.565
+ ],
+ [
+ 39.105,
+ 63.225
+ ],
+ [
+ 32.445,
+ 65.925
+ ]
+ ],
+ "c": true
+ },
+ "ix": 2
+ },
+ "nm": "Path 1",
+ "mn": "ADBE Vector Shape - Group",
+ "hd": false
+ },
+ {
+ "ty": "fl",
+ "c": {
+ "a": 0,
+ "k": [
+ 1,
+ 0.980392216701,
+ 0.941176530427,
+ 1
+ ],
+ "ix": 4
+ },
+ "o": {
+ "a": 0,
+ "k": 100,
+ "ix": 5
+ },
+ "r": 1,
+ "bm": 0,
+ "nm": "Fill 1",
+ "mn": "ADBE Vector Graphic - Fill",
+ "hd": false
+ },
+ {
+ "ty": "tr",
+ "p": {
+ "a": 0,
+ "k": [
+ 120.844,
+ 66.175
+ ],
+ "ix": 2
+ },
+ "a": {
+ "a": 0,
+ "k": [
+ 0,
+ 0
+ ],
+ "ix": 1
+ },
+ "s": {
+ "a": 0,
+ "k": [
+ 100,
+ 100
+ ],
+ "ix": 3
+ },
+ "r": {
+ "a": 0,
+ "k": 0,
+ "ix": 6
+ },
+ "o": {
+ "a": 0,
+ "k": 100,
+ "ix": 7
+ },
+ "sk": {
+ "a": 0,
+ "k": 0,
+ "ix": 4
+ },
+ "sa": {
+ "a": 0,
+ "k": 0,
+ "ix": 5
+ },
+ "nm": "Transform"
+ }
+ ],
+ "nm": "Group 2",
+ "np": 2,
+ "cix": 2,
+ "bm": 0,
+ "ix": 2,
+ "mn": "ADBE Vector Group",
+ "hd": false
+ },
+ {
+ "ty": "gr",
+ "it": [
+ {
+ "ind": 0,
+ "ty": "sh",
+ "ix": 1,
+ "ks": {
+ "a": 0,
+ "k": {
+ "i": [
+ [
+ 2.82,
+ 0
+ ],
+ [
+ 2.04,
+ 1.98
+ ],
+ [
+ 0,
+ 2.88
+ ],
+ [
+ 0,
+ 0
+ ],
+ [
+ 0,
+ 0
+ ],
+ [
+ 2.46,
+ 0.36
+ ],
+ [
+ 1.44,
+ 1.92
+ ],
+ [
+ -0.42,
+ 2.52
+ ],
+ [
+ -2.1,
+ 1.5
+ ],
+ [
+ 0,
+ 0
+ ],
+ [
+ -0.78,
+ 0.42
+ ],
+ [
+ -1.32,
+ 0
+ ],
+ [
+ -1.86,
+ -1.92
+ ],
+ [
+ 0,
+ -2.7
+ ],
+ [
+ 0,
+ 0
+ ],
+ [
+ 2.04,
+ -2.04
+ ]
+ ],
+ "o": [
+ [
+ -2.82,
+ 0
+ ],
+ [
+ -1.98,
+ -2.04
+ ],
+ [
+ 0,
+ 0
+ ],
+ [
+ 0,
+ 0
+ ],
+ [
+ -1.98,
+ 1.44
+ ],
+ [
+ -2.4,
+ -0.42
+ ],
+ [
+ -1.56,
+ -2.04
+ ],
+ [
+ 0.42,
+ -2.52
+ ],
+ [
+ 0,
+ 0
+ ],
+ [
+ 0.72,
+ -0.54
+ ],
+ [
+ 0.84,
+ -0.42
+ ],
+ [
+ 2.7,
+ 0
+ ],
+ [
+ 1.86,
+ 1.92
+ ],
+ [
+ 0,
+ 0
+ ],
+ [
+ 0,
+ 2.88
+ ],
+ [
+ -2.04,
+ 1.98
+ ]
+ ],
+ "v": [
+ [
+ 14.152,
+ 65.43
+ ],
+ [
+ 6.862,
+ 62.46
+ ],
+ [
+ 3.892,
+ 55.08
+ ],
+ [
+ 3.892,
+ -37.44
+ ],
+ [
+ -10.238,
+ -27.36
+ ],
+ [
+ -16.898,
+ -25.74
+ ],
+ [
+ -22.658,
+ -29.25
+ ],
+ [
+ -24.368,
+ -36.09
+ ],
+ [
+ -20.588,
+ -42.12
+ ],
+ [
+ 9.382,
+ -63.36
+ ],
+ [
+ 11.632,
+ -64.8
+ ],
+ [
+ 14.872,
+ -65.43
+ ],
+ [
+ 21.712,
+ -62.55
+ ],
+ [
+ 24.502,
+ -55.62
+ ],
+ [
+ 24.502,
+ 55.08
+ ],
+ [
+ 21.442,
+ 62.46
+ ]
+ ],
+ "c": true
+ },
+ "ix": 2
+ },
+ "nm": "Path 1",
+ "mn": "ADBE Vector Shape - Group",
+ "hd": false
+ },
+ {
+ "ty": "fl",
+ "c": {
+ "a": 0,
+ "k": [
+ 1,
+ 0.980392216701,
+ 0.941176530427,
+ 1
+ ],
+ "ix": 4
+ },
+ "o": {
+ "a": 0,
+ "k": 100,
+ "ix": 5
+ },
+ "r": 1,
+ "bm": 0,
+ "nm": "Fill 1",
+ "mn": "ADBE Vector Graphic - Fill",
+ "hd": false
+ },
+ {
+ "ty": "tr",
+ "p": {
+ "a": 0,
+ "k": [
+ 25.038,
+ 67.75
+ ],
+ "ix": 2
+ },
+ "a": {
+ "a": 0,
+ "k": [
+ 0,
+ 0
+ ],
+ "ix": 1
+ },
+ "s": {
+ "a": 0,
+ "k": [
+ 100,
+ 100
+ ],
+ "ix": 3
+ },
+ "r": {
+ "a": 0,
+ "k": 0,
+ "ix": 6
+ },
+ "o": {
+ "a": 0,
+ "k": 100,
+ "ix": 7
+ },
+ "sk": {
+ "a": 0,
+ "k": 0,
+ "ix": 4
+ },
+ "sa": {
+ "a": 0,
+ "k": 0,
+ "ix": 5
+ },
+ "nm": "Transform"
+ }
+ ],
+ "nm": "Group 3",
+ "np": 2,
+ "cix": 2,
+ "bm": 0,
+ "ix": 3,
+ "mn": "ADBE Vector Group",
+ "hd": false
}
],
"ip": 0,
- "op": 607,
+ "op": 540,
"st": 0,
+ "ct": 1,
+ "bm": 0
+ },
+ {
+ "ddd": 0,
+ "ind": 8,
+ "ty": 3,
+ "nm": "abc",
+ "parent": 9,
+ "sr": 1,
+ "ks": {
+ "o": {
+ "a": 0,
+ "k": 100,
+ "ix": 11
+ },
+ "r": {
+ "a": 0,
+ "k": 0,
+ "ix": 10
+ },
+ "p": {
+ "a": 0,
+ "k": [
+ -97.379,
+ 0.847,
+ 0
+ ],
+ "ix": 2,
+ "l": 2
+ },
+ "a": {
+ "a": 0,
+ "k": [
+ -43.411,
+ -0.166,
+ 0
+ ],
+ "ix": 1,
+ "l": 2
+ },
+ "s": {
+ "a": 1,
+ "k": [
+ {
+ "i": {
+ "x": [
+ 0.2,
+ 0.2,
+ 0.667
+ ],
+ "y": [
+ 1,
+ 1,
+ 1
+ ]
+ },
+ "o": {
+ "x": [
+ 0.333,
+ 0.333,
+ 0.333
+ ],
+ "y": [
+ 0,
+ 0,
+ 0
+ ]
+ },
+ "t": 352,
+ "s": [
+ 220.751,
+ 220.751,
+ 100
+ ]
+ },
+ {
+ "i": {
+ "x": [
+ 0.667,
+ 0.667,
+ 0.667
+ ],
+ "y": [
+ 1,
+ 1,
+ 1
+ ]
+ },
+ "o": {
+ "x": [
+ 0.333,
+ 0.333,
+ 0.333
+ ],
+ "y": [
+ 0,
+ 0,
+ 0
+ ]
+ },
+ "t": 397,
+ "s": [
+ 300.751,
+ 300.751,
+ 100
+ ]
+ },
+ {
+ "i": {
+ "x": [
+ 0.667,
+ 0.667,
+ 0.667
+ ],
+ "y": [
+ 1,
+ 1,
+ 1
+ ]
+ },
+ "o": {
+ "x": [
+ 0.735,
+ 0.735,
+ 0.735
+ ],
+ "y": [
+ 0.008,
+ 0.008,
+ -0.008
+ ]
+ },
+ "t": 438,
+ "s": [
+ 300.751,
+ 300.751,
+ 100
+ ]
+ },
+ {
+ "t": 478,
+ "s": [
+ 220.751,
+ 220.751,
+ 100
+ ]
+ }
+ ],
+ "ix": 6,
+ "l": 2
+ }
+ },
+ "ao": 0,
+ "ip": 0,
+ "op": 542,
+ "st": 0,
+ "ct": 1,
+ "bm": 0
+ },
+ {
+ "ddd": 0,
+ "ind": 9,
+ "ty": 3,
+ "nm": ".grey100",
+ "cl": "grey100",
+ "parent": 2,
+ "sr": 1,
+ "ks": {
+ "o": {
+ "a": 0,
+ "k": 100,
+ "ix": 11
+ },
+ "r": {
+ "a": 0,
+ "k": 0,
+ "ix": 10
+ },
+ "p": {
+ "a": 1,
+ "k": [
+ {
+ "i": {
+ "x": 0.18,
+ "y": 1
+ },
+ "o": {
+ "x": 0.333,
+ "y": 0
+ },
+ "t": 76,
+ "s": [
+ 0,
+ 0,
+ 0
+ ],
+ "to": [
+ 0,
+ 0,
+ 0
+ ],
+ "ti": [
+ 0,
+ 0,
+ 0
+ ]
+ },
+ {
+ "i": {
+ "x": 0.18,
+ "y": 0.18
+ },
+ "o": {
+ "x": 0.333,
+ "y": 0.333
+ },
+ "t": 95,
+ "s": [
+ 168.623,
+ 77.974,
+ 0
+ ],
+ "to": [
+ 0,
+ 0,
+ 0
+ ],
+ "ti": [
+ 0,
+ 0,
+ 0
+ ]
+ },
+ {
+ "i": {
+ "x": 0.667,
+ "y": 1
+ },
+ "o": {
+ "x": 0.333,
+ "y": 0
+ },
+ "t": 438,
+ "s": [
+ 168.623,
+ 77.974,
+ 0
+ ],
+ "to": [
+ 0,
+ 0,
+ 0
+ ],
+ "ti": [
+ 0,
+ 0,
+ 0
+ ]
+ },
+ {
+ "t": 478,
+ "s": [
+ 0,
+ 0,
+ 0
+ ]
+ }
+ ],
+ "ix": 2,
+ "l": 2
+ },
+ "a": {
+ "a": 0,
+ "k": [
+ 0,
+ 0,
+ 0
+ ],
+ "ix": 1,
+ "l": 2
+ },
+ "s": {
+ "a": 1,
+ "k": [
+ {
+ "i": {
+ "x": [
+ 0.18,
+ 0.18,
+ 0.667
+ ],
+ "y": [
+ 1,
+ 1,
+ 1
+ ]
+ },
+ "o": {
+ "x": [
+ 0.333,
+ 0.333,
+ 0.333
+ ],
+ "y": [
+ 0,
+ 0,
+ 0
+ ]
+ },
+ "t": 76,
+ "s": [
+ 30,
+ 30,
+ 100
+ ]
+ },
+ {
+ "i": {
+ "x": [
+ 0.18,
+ 0.18,
+ 0.667
+ ],
+ "y": [
+ 1,
+ 1,
+ 1
+ ]
+ },
+ "o": {
+ "x": [
+ 0.333,
+ 0.333,
+ 0.333
+ ],
+ "y": [
+ 0,
+ 0,
+ 0
+ ]
+ },
+ "t": 95,
+ "s": [
+ 119,
+ 119,
+ 100
+ ]
+ },
+ {
+ "i": {
+ "x": [
+ 0.667,
+ 0.667,
+ 0.667
+ ],
+ "y": [
+ 1,
+ 1,
+ 1
+ ]
+ },
+ "o": {
+ "x": [
+ 0.333,
+ 0.333,
+ 0.333
+ ],
+ "y": [
+ 0,
+ 0,
+ 0
+ ]
+ },
+ "t": 438,
+ "s": [
+ 119,
+ 119,
+ 100
+ ]
+ },
+ {
+ "t": 478,
+ "s": [
+ 30,
+ 30,
+ 100
+ ]
+ }
+ ],
+ "ix": 6,
+ "l": 2
+ }
+ },
+ "ao": 0,
+ "ip": 0,
+ "op": 540,
+ "st": 0,
+ "ct": 1,
+ "bm": 0
+ },
+ {
+ "ddd": 0,
+ "ind": 10,
+ "ty": 4,
+ "nm": ".black",
+ "cl": "black",
+ "sr": 1,
+ "ks": {
+ "o": {
+ "a": 0,
+ "k": 100,
+ "ix": 11
+ },
+ "r": {
+ "a": 0,
+ "k": 0,
+ "ix": 10
+ },
+ "p": {
+ "a": 0,
+ "k": [
+ 206,
+ 150,
+ 0
+ ],
+ "ix": 2,
+ "l": 2
+ },
+ "a": {
+ "a": 0,
+ "k": [
+ 0,
+ 0,
+ 0
+ ],
+ "ix": 1,
+ "l": 2
+ },
+ "s": {
+ "a": 0,
+ "k": [
+ 100,
+ 100,
+ 100
+ ],
+ "ix": 6,
+ "l": 2
+ }
+ },
+ "ao": 0,
+ "shapes": [
+ {
+ "ty": "gr",
+ "it": [
+ {
+ "ty": "rc",
+ "d": 1,
+ "s": {
+ "a": 0,
+ "k": [
+ 412,
+ 300
+ ],
+ "ix": 2
+ },
+ "p": {
+ "a": 0,
+ "k": [
+ 0,
+ 0
+ ],
+ "ix": 3
+ },
+ "r": {
+ "a": 0,
+ "k": 28,
+ "ix": 4
+ },
+ "nm": "Rectangle Path 1",
+ "mn": "ADBE Vector Shape - Rect",
+ "hd": false
+ },
+ {
+ "ty": "fl",
+ "c": {
+ "a": 0,
+ "k": [
+ 0,
+ 0,
+ 0,
+ 1
+ ],
+ "ix": 4
+ },
+ "o": {
+ "a": 0,
+ "k": 100,
+ "ix": 5
+ },
+ "r": 1,
+ "bm": 0,
+ "nm": "Fill 1",
+ "mn": "ADBE Vector Graphic - Fill",
+ "hd": false
+ },
+ {
+ "ty": "tr",
+ "p": {
+ "a": 0,
+ "k": [
+ 0,
+ 0
+ ],
+ "ix": 2
+ },
+ "a": {
+ "a": 0,
+ "k": [
+ 0,
+ 0
+ ],
+ "ix": 1
+ },
+ "s": {
+ "a": 0,
+ "k": [
+ 100,
+ 100
+ ],
+ "ix": 3
+ },
+ "r": {
+ "a": 0,
+ "k": 0,
+ "ix": 6
+ },
+ "o": {
+ "a": 0,
+ "k": 100,
+ "ix": 7
+ },
+ "sk": {
+ "a": 0,
+ "k": 0,
+ "ix": 4
+ },
+ "sa": {
+ "a": 0,
+ "k": 0,
+ "ix": 5
+ },
+ "nm": "Transform"
+ }
+ ],
+ "nm": "Rectangle 68986",
+ "np": 3,
+ "cix": 2,
+ "bm": 0,
+ "ix": 1,
+ "mn": "ADBE Vector Group",
+ "hd": false
+ }
+ ],
+ "ip": 0,
+ "op": 540,
+ "st": 0,
+ "ct": 1,
"bm": 0
}
]
@@ -4760,13 +5391,15 @@
{
"ddd": 0,
"ind": 1,
- "ty": 3,
- "nm": "MoveA+Dots 2",
+ "ty": 4,
+ "nm": ".black",
+ "cl": "black",
+ "td": 1,
"sr": 1,
"ks": {
"o": {
"a": 0,
- "k": 0,
+ "k": 100,
"ix": 11
},
"r": {
@@ -4775,148 +5408,14 @@
"ix": 10
},
"p": {
- "a": 1,
+ "a": 0,
"k": [
- {
- "i": {
- "x": 0.351,
- "y": 1
- },
- "o": {
- "x": 0.167,
- "y": 0.167
- },
- "t": 170,
- "s": [
- 206,
- 150,
- 0
- ],
- "to": [
- 4.167,
- -0.833,
- 0
- ],
- "ti": [
- -4.167,
- 0.833,
- 0
- ]
- },
- {
- "i": {
- "x": 0.667,
- "y": 0.667
- },
- "o": {
- "x": 0.333,
- "y": 0.333
- },
- "t": 207,
- "s": [
- 231,
- 145,
- 0
- ],
- "to": [
- 0,
- 0,
- 0
- ],
- "ti": [
- 0,
- 0,
- 0
- ]
- },
- {
- "i": {
- "x": 0.423,
- "y": 1
- },
- "o": {
- "x": 0.488,
- "y": 0
- },
- "t": 214,
- "s": [
- 231,
- 145,
- 0
- ],
- "to": [
- -0.833,
- 5,
- 0
- ],
- "ti": [
- 0.833,
- -5,
- 0
- ]
- },
- {
- "i": {
- "x": 0.667,
- "y": 0.667
- },
- "o": {
- "x": 0.333,
- "y": 0.333
- },
- "t": 247,
- "s": [
- 226,
- 175,
- 0
- ],
- "to": [
- 0,
- 0,
- 0
- ],
- "ti": [
- 0,
- 0,
- 0
- ]
- },
- {
- "i": {
- "x": 0.667,
- "y": 1
- },
- "o": {
- "x": 0.735,
- "y": 0.034
- },
- "t": 438,
- "s": [
- 226,
- 175,
- 0
- ],
- "to": [
- -3.333,
- -4.167,
- 0
- ],
- "ti": [
- 3.333,
- 4.167,
- 0
- ]
- },
- {
- "t": 478,
- "s": [
- 206,
- 150,
- 0
- ]
- }
+ 206,
+ 150,
+ 0
],
- "ix": 2
+ "ix": 2,
+ "l": 2
},
"a": {
"a": 0,
@@ -4925,7 +5424,8 @@
0,
0
],
- "ix": 1
+ "ix": 1,
+ "l": 2
},
"s": {
"a": 0,
@@ -4934,20 +5434,137 @@
100,
100
],
- "ix": 6
+ "ix": 6,
+ "l": 2
}
},
"ao": 0,
+ "shapes": [
+ {
+ "ty": "gr",
+ "it": [
+ {
+ "ty": "rc",
+ "d": 1,
+ "s": {
+ "a": 0,
+ "k": [
+ 412,
+ 300
+ ],
+ "ix": 2
+ },
+ "p": {
+ "a": 0,
+ "k": [
+ 0,
+ 0
+ ],
+ "ix": 3
+ },
+ "r": {
+ "a": 0,
+ "k": 28,
+ "ix": 4
+ },
+ "nm": "Rectangle Path 1",
+ "mn": "ADBE Vector Shape - Rect",
+ "hd": false
+ },
+ {
+ "ty": "fl",
+ "c": {
+ "a": 0,
+ "k": [
+ 0,
+ 0,
+ 0,
+ 1
+ ],
+ "ix": 4
+ },
+ "o": {
+ "a": 0,
+ "k": 100,
+ "ix": 5
+ },
+ "r": 1,
+ "bm": 0,
+ "nm": "Fill 1",
+ "mn": "ADBE Vector Graphic - Fill",
+ "hd": false
+ },
+ {
+ "ty": "tr",
+ "p": {
+ "a": 0,
+ "k": [
+ 0,
+ 0
+ ],
+ "ix": 2
+ },
+ "a": {
+ "a": 0,
+ "k": [
+ 0,
+ 0
+ ],
+ "ix": 1
+ },
+ "s": {
+ "a": 0,
+ "k": [
+ 100,
+ 100
+ ],
+ "ix": 3
+ },
+ "r": {
+ "a": 0,
+ "k": 0,
+ "ix": 6
+ },
+ "o": {
+ "a": 0,
+ "k": 100,
+ "ix": 7
+ },
+ "sk": {
+ "a": 0,
+ "k": 0,
+ "ix": 4
+ },
+ "sa": {
+ "a": 0,
+ "k": 0,
+ "ix": 5
+ },
+ "nm": "Transform"
+ }
+ ],
+ "nm": "Rectangle 68986",
+ "np": 3,
+ "cix": 2,
+ "bm": 0,
+ "ix": 1,
+ "mn": "ADBE Vector Group",
+ "hd": false
+ }
+ ],
"ip": 0,
"op": 540,
"st": 0,
+ "ct": 1,
"bm": 0
},
{
"ddd": 0,
"ind": 2,
"ty": 0,
- "nm": "Dots",
+ "nm": "Crop_dup",
+ "tt": 1,
+ "tp": 1,
"refId": "comp_0",
"sr": 1,
"ks": {
@@ -4968,7 +5585,8 @@
150,
0
],
- "ix": 2
+ "ix": 2,
+ "l": 2
},
"a": {
"a": 0,
@@ -4977,371 +5595,8 @@
150,
0
],
- "ix": 1
- },
- "s": {
- "a": 0,
- "k": [
- 100,
- 100,
- 100
- ],
- "ix": 6
- }
- },
- "ao": 0,
- "w": 412,
- "h": 300,
- "ip": 0,
- "op": 540,
- "st": 0,
- "bm": 0
- },
- {
- "ddd": 0,
- "ind": 3,
- "ty": 0,
- "nm": "Outline",
- "refId": "comp_1",
- "sr": 1,
- "ks": {
- "o": {
- "a": 0,
- "k": 100,
- "ix": 11
- },
- "r": {
- "a": 0,
- "k": 0,
- "ix": 10
- },
- "p": {
- "a": 0,
- "k": [
- 206,
- 150,
- 0
- ],
- "ix": 2
- },
- "a": {
- "a": 0,
- "k": [
- 206,
- 150,
- 0
- ],
- "ix": 1
- },
- "s": {
- "a": 0,
- "k": [
- 100,
- 100,
- 100
- ],
- "ix": 6
- }
- },
- "ao": 0,
- "w": 412,
- "h": 300,
- "ip": 0,
- "op": 540,
- "st": 0,
- "bm": 0
- },
- {
- "ddd": 0,
- "ind": 4,
- "ty": 4,
- "nm": "screenMatte",
- "td": 1,
- "sr": 1,
- "ks": {
- "o": {
- "a": 0,
- "k": 100,
- "ix": 11
- },
- "r": {
- "a": 0,
- "k": 0,
- "ix": 10
- },
- "p": {
- "a": 0,
- "k": [
- 207.176,
- 150,
- 0
- ],
- "ix": 2
- },
- "a": {
- "a": 0,
- "k": [
- 207.176,
- 150,
- 0
- ],
- "ix": 1
- },
- "s": {
- "a": 0,
- "k": [
- 99.6,
- 99.4,
- 100
- ],
- "ix": 6
- }
- },
- "ao": 0,
- "shapes": [
- {
- "ty": "gr",
- "it": [
- {
- "ind": 0,
- "ty": "sh",
- "ix": 1,
- "ks": {
- "a": 0,
- "k": {
- "i": [
- [
- 0,
- 0
- ],
- [
- 5.243,
- 0
- ],
- [
- 0,
- 0
- ],
- [
- 0,
- 5.243
- ],
- [
- 0,
- 0
- ],
- [
- -5.243,
- 0
- ],
- [
- 0,
- 0
- ],
- [
- 0,
- -5.243
- ]
- ],
- "o": [
- [
- 0,
- 5.243
- ],
- [
- 0,
- 0
- ],
- [
- -5.243,
- 0
- ],
- [
- 0,
- 0
- ],
- [
- 0,
- -5.243
- ],
- [
- 0,
- 0
- ],
- [
- 5.243,
- 0
- ],
- [
- 0,
- 0
- ]
- ],
- "v": [
- [
- 63,
- 114.112
- ],
- [
- 53.491,
- 123.622
- ],
- [
- -55.867,
- 123.622
- ],
- [
- -65.376,
- 114.112
- ],
- [
- -65.376,
- -114.113
- ],
- [
- -55.867,
- -123.622
- ],
- [
- 53.491,
- -123.622
- ],
- [
- 63,
- -114.113
- ]
- ],
- "c": true
- },
- "ix": 2
- },
- "nm": "Path 1",
- "mn": "ADBE Vector Shape - Group",
- "hd": false
- },
- {
- "ty": "fl",
- "c": {
- "a": 0,
- "k": [
- 0,
- 0,
- 0,
- 1
- ],
- "ix": 4
- },
- "o": {
- "a": 0,
- "k": 100,
- "ix": 5
- },
- "r": 1,
- "bm": 0,
- "nm": "Fill 1",
- "mn": "ADBE Vector Graphic - Fill",
- "hd": false
- },
- {
- "ty": "tr",
- "p": {
- "a": 0,
- "k": [
- 207.176,
- 150
- ],
- "ix": 2
- },
- "a": {
- "a": 0,
- "k": [
- 0,
- 0
- ],
- "ix": 1
- },
- "s": {
- "a": 0,
- "k": [
- 100,
- 100
- ],
- "ix": 3
- },
- "r": {
- "a": 0,
- "k": 0,
- "ix": 6
- },
- "o": {
- "a": 0,
- "k": 100,
- "ix": 7
- },
- "sk": {
- "a": 0,
- "k": 0,
- "ix": 4
- },
- "sa": {
- "a": 0,
- "k": 0,
- "ix": 5
- },
- "nm": "Transform"
- }
- ],
- "nm": "Group 1",
- "np": 2,
- "cix": 2,
- "bm": 0,
"ix": 1,
- "mn": "ADBE Vector Group",
- "hd": false
- }
- ],
- "ip": 0,
- "op": 540,
- "st": 0,
- "bm": 0
- },
- {
- "ddd": 0,
- "ind": 5,
- "ty": 0,
- "nm": "A",
- "parent": 1,
- "tt": 1,
- "refId": "comp_2",
- "sr": 1,
- "ks": {
- "o": {
- "a": 0,
- "k": 100,
- "ix": 11
- },
- "r": {
- "a": 0,
- "k": 0,
- "ix": 10
- },
- "p": {
- "a": 0,
- "k": [
- 0,
- 0,
- 0
- ],
- "ix": 2
- },
- "a": {
- "a": 0,
- "k": [
- 206,
- 150,
- 0
- ],
- "ix": 1
+ "l": 2
},
"s": {
"a": 0,
@@ -5350,7 +5605,8 @@
100,
100
],
- "ix": 6
+ "ix": 6,
+ "l": 2
}
},
"ao": 0,
@@ -5360,370 +5616,8 @@
"op": 540,
"st": 0,
"bm": 0
- },
- {
- "ddd": 0,
- "ind": 6,
- "ty": 0,
- "nm": "Phone",
- "refId": "comp_3",
- "sr": 1,
- "ks": {
- "o": {
- "a": 0,
- "k": 100,
- "ix": 11
- },
- "r": {
- "a": 0,
- "k": 0,
- "ix": 10
- },
- "p": {
- "a": 0,
- "k": [
- 206,
- 150,
- 0
- ],
- "ix": 2
- },
- "a": {
- "a": 0,
- "k": [
- 206,
- 150,
- 0
- ],
- "ix": 1
- },
- "s": {
- "a": 0,
- "k": [
- 100,
- 100,
- 100
- ],
- "ix": 6
- }
- },
- "ao": 0,
- "w": 412,
- "h": 300,
- "ip": 0,
- "op": 540,
- "st": 0,
- "bm": 0
- },
- {
- "ddd": 0,
- "ind": 7,
- "ty": 0,
- "nm": "ScreenBlack",
- "refId": "comp_4",
- "sr": 1,
- "ks": {
- "o": {
- "a": 0,
- "k": 100,
- "ix": 11
- },
- "r": {
- "a": 0,
- "k": 0,
- "ix": 10
- },
- "p": {
- "a": 0,
- "k": [
- 206,
- 150,
- 0
- ],
- "ix": 2
- },
- "a": {
- "a": 0,
- "k": [
- 206,
- 150,
- 0
- ],
- "ix": 1
- },
- "s": {
- "a": 0,
- "k": [
- 100,
- 100,
- 100
- ],
- "ix": 6
- }
- },
- "ao": 0,
- "w": 412,
- "h": 300,
- "ip": 0,
- "op": 600,
- "st": 0,
- "bm": 0
- },
- {
- "ddd": 0,
- "ind": 8,
- "ty": 4,
- "nm": ".white",
- "cl": "white",
- "hd": true,
- "sr": 1,
- "ks": {
- "o": {
- "a": 0,
- "k": 100,
- "ix": 11
- },
- "r": {
- "a": 0,
- "k": 0,
- "ix": 10
- },
- "p": {
- "a": 0,
- "k": [
- 206.106,
- 150.168,
- 0
- ],
- "ix": 2
- },
- "a": {
- "a": 0,
- "k": [
- 206.106,
- 150.168,
- 0
- ],
- "ix": 1
- },
- "s": {
- "a": 0,
- "k": [
- 100,
- 100,
- 100
- ],
- "ix": 6
- }
- },
- "ao": 0,
- "shapes": [
- {
- "ty": "gr",
- "it": [
- {
- "ind": 0,
- "ty": "sh",
- "ix": 1,
- "ks": {
- "a": 0,
- "k": {
- "i": [
- [
- 15.291,
- 0
- ],
- [
- 0,
- 0
- ],
- [
- 0,
- 15.653
- ],
- [
- 0,
- 0
- ],
- [
- -15.291,
- 0
- ],
- [
- 0,
- 0
- ],
- [
- 0,
- -15.652
- ],
- [
- 0,
- 0
- ]
- ],
- "o": [
- [
- 0,
- 0
- ],
- [
- -15.291,
- 0
- ],
- [
- 0,
- 0
- ],
- [
- 0,
- -15.652
- ],
- [
- 0,
- 0
- ],
- [
- 15.185,
- 0
- ],
- [
- 0,
- 0
- ],
- [
- 0,
- 15.543
- ]
- ],
- "v": [
- [
- 178.285,
- 150.168
- ],
- [
- -178.073,
- 150.168
- ],
- [
- -205.894,
- 121.689
- ],
- [
- -205.894,
- -121.354
- ],
- [
- -178.073,
- -149.832
- ],
- [
- 178.391,
- -149.832
- ],
- [
- 206.106,
- -121.354
- ],
- [
- 206.106,
- 121.799
- ]
- ],
- "c": true
- },
- "ix": 2
- },
- "nm": "Path 1",
- "mn": "ADBE Vector Shape - Group",
- "hd": false
- },
- {
- "ty": "fl",
- "c": {
- "a": 0,
- "k": [
- 1,
- 1,
- 1,
- 1
- ],
- "ix": 4
- },
- "o": {
- "a": 0,
- "k": 100,
- "ix": 5
- },
- "r": 1,
- "bm": 0,
- "nm": "Fill 1",
- "mn": "ADBE Vector Graphic - Fill",
- "hd": false
- },
- {
- "ty": "tr",
- "p": {
- "a": 0,
- "k": [
- 206.106,
- 150.168
- ],
- "ix": 2
- },
- "a": {
- "a": 0,
- "k": [
- 0,
- 0
- ],
- "ix": 1
- },
- "s": {
- "a": 0,
- "k": [
- 100,
- 100
- ],
- "ix": 3
- },
- "r": {
- "a": 0,
- "k": 0,
- "ix": 6
- },
- "o": {
- "a": 0,
- "k": 100,
- "ix": 7
- },
- "sk": {
- "a": 0,
- "k": 0,
- "ix": 4
- },
- "sa": {
- "a": 0,
- "k": 0,
- "ix": 5
- },
- "nm": "Transform"
- }
- ],
- "nm": "Group 3",
- "np": 4,
- "cix": 2,
- "bm": 0,
- "ix": 1,
- "mn": "ADBE Vector Group",
- "hd": false
- }
- ],
- "ip": 0,
- "op": 540,
- "st": 0,
- "bm": 0
}
],
- "markers": []
+ "markers": [],
+ "props": {}
}
\ No newline at end of file
diff --git a/res/raw/accessibility_magnification_banner_tablet.json b/res/raw/accessibility_magnification_banner_tablet.json
deleted file mode 100644
index 8142267..0000000
--- a/res/raw/accessibility_magnification_banner_tablet.json
+++ /dev/null
@@ -1 +0,0 @@
-{"v":"5.10.0","fr":60,"ip":0,"op":540,"w":412,"h":300,"nm":"Magnification_Tablet","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":2,"ty":3,"nm":"MoveA+Dots","sr":1,"ks":{"o":{"a":0,"k":0,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.351,"y":1},"o":{"x":0.167,"y":0.167},"t":170,"s":[206,150,0],"to":[4.167,-0.833,0],"ti":[-4.167,0.833,0]},{"i":{"x":0.667,"y":0.667},"o":{"x":0.333,"y":0.333},"t":207,"s":[231,145,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.423,"y":1},"o":{"x":0.488,"y":0},"t":214,"s":[231,145,0],"to":[-0.833,5,0],"ti":[0.833,-5,0]},{"i":{"x":0.667,"y":0.667},"o":{"x":0.333,"y":0.333},"t":247,"s":[226,175,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.667,"y":1},"o":{"x":0.735,"y":0.034},"t":438,"s":[226,175,0],"to":[-3.333,-4.167,0],"ti":[3.333,4.167,0]},{"t":478,"s":[206,150,0]}],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"ip":0,"op":540,"st":0,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":".yellow600","cl":"yellow600","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":146,"s":[0]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":155,"s":[85]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":270,"s":[85]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":279,"s":[50]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":325,"s":[50]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":334,"s":[85]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":465,"s":[85]},{"t":472,"s":[0]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":298,"s":[226,175,0],"to":[-0.5,-1.667,0],"ti":[0.5,1.667,0]},{"i":{"x":0.667,"y":0.667},"o":{"x":0.167,"y":0.167},"t":305,"s":[223,165,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.257,"y":1},"o":{"x":0.333,"y":0},"t":352,"s":[223,165,0],"to":[1.667,-1.667,0],"ti":[-1.667,1.667,0]},{"i":{"x":0.667,"y":0.667},"o":{"x":0.167,"y":0.167},"t":393,"s":[233,155,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.667,"y":1},"o":{"x":0.568,"y":0.036},"t":438,"s":[233,155,0],"to":[-3.833,0,0],"ti":[3.833,0,0]},{"t":478,"s":[210,155,0]}],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":1,"k":[{"i":{"x":[0.667,0.667],"y":[1,1]},"o":{"x":[0.167,0.167],"y":[0.167,0.167]},"t":146,"s":[13,13]},{"i":{"x":[0.667,0.667],"y":[1,1]},"o":{"x":[0.333,0.333],"y":[0,0]},"t":163,"s":[19,19]},{"i":{"x":[0.833,0.833],"y":[0.833,0.833]},"o":{"x":[0.333,0.333],"y":[0,0]},"t":270,"s":[19,19]},{"i":{"x":[0.833,0.833],"y":[0.833,0.833]},"o":{"x":[0.167,0.167],"y":[0.167,0.167]},"t":279,"s":[13,13]},{"i":{"x":[0.667,0.667],"y":[1,1]},"o":{"x":[0.167,0.167],"y":[0.167,0.167]},"t":325,"s":[13,13]},{"i":{"x":[0.833,0.833],"y":[1,1]},"o":{"x":[0.333,0.333],"y":[0,0]},"t":334,"s":[19,19]},{"i":{"x":[0.833,0.833],"y":[0.833,0.833]},"o":{"x":[0.167,0.167],"y":[0,0]},"t":445,"s":[19,19]},{"t":474,"s":[13,13]}],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"fl","c":{"a":0,"k":[0.976470588235,0.670588235294,0,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Ellipse 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":438,"op":540,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":4,"ty":4,"nm":".yellow600","cl":"yellow600","parent":2,"sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":146,"s":[0]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":155,"s":[85]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":270,"s":[85]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":279,"s":[50]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":325,"s":[50]},{"t":334,"s":[85]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":298,"s":[0,0,0],"to":[-0.5,-1.667,0],"ti":[0.5,1.667,0]},{"i":{"x":0.667,"y":0.667},"o":{"x":0.167,"y":0.167},"t":305,"s":[-3,-10,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.257,"y":1},"o":{"x":0.333,"y":0},"t":352,"s":[-3,-10,0],"to":[1.667,-1.667,0],"ti":[-1.667,1.667,0]},{"t":393,"s":[7,-20,0]}],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":1,"k":[{"i":{"x":[0.667,0.667],"y":[1,1]},"o":{"x":[0.167,0.167],"y":[0.167,0.167]},"t":146,"s":[13,13]},{"i":{"x":[0.667,0.667],"y":[1,1]},"o":{"x":[0.333,0.333],"y":[0,0]},"t":163,"s":[19,19]},{"i":{"x":[0.833,0.833],"y":[0.833,0.833]},"o":{"x":[0.333,0.333],"y":[0,0]},"t":270,"s":[19,19]},{"i":{"x":[0.833,0.833],"y":[0.833,0.833]},"o":{"x":[0.167,0.167],"y":[0.167,0.167]},"t":279,"s":[13,13]},{"i":{"x":[0.667,0.667],"y":[1,1]},"o":{"x":[0.167,0.167],"y":[0.167,0.167]},"t":325,"s":[13,13]},{"t":334,"s":[19,19]}],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"fl","c":{"a":0,"k":[0.976470588235,0.670588235294,0,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Ellipse 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":438,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":5,"ty":4,"nm":".yellow600","cl":"yellow600","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":40,"s":[0]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":49,"s":[85]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":67,"s":[50]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":143,"s":[50]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":157,"s":[85]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":270,"s":[85]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":279,"s":[50]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":325,"s":[50]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":334,"s":[85]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":465,"s":[85]},{"t":472,"s":[0]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":114,"s":[226,175,0],"to":[-5.333,0,0],"ti":[5.333,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":135,"s":[194,175,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":298,"s":[194,175,0],"to":[0.5,1.667,0],"ti":[-0.5,-1.667,0]},{"i":{"x":0.667,"y":0.667},"o":{"x":0.167,"y":0.167},"t":305,"s":[197,185,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.257,"y":1},"o":{"x":0.333,"y":0},"t":352,"s":[197,185,0],"to":[-1.667,1.667,0],"ti":[1.667,-1.667,0]},{"i":{"x":0.667,"y":0.667},"o":{"x":0.167,"y":0.167},"t":393,"s":[187,195,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.667,"y":1},"o":{"x":0.568,"y":0.019},"t":438,"s":[187,195,0],"to":[2.833,-6.667,0],"ti":[-2.833,6.667,0]},{"t":478,"s":[204,155,0]}],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":1,"k":[{"i":{"x":[0.667,0.667],"y":[1,1]},"o":{"x":[0.167,0.167],"y":[0.167,0.167]},"t":40,"s":[13,13]},{"i":{"x":[0.833,0.833],"y":[0.833,0.833]},"o":{"x":[0.333,0.333],"y":[0,0]},"t":57,"s":[19,19]},{"i":{"x":[0.833,0.833],"y":[0.833,0.833]},"o":{"x":[0.167,0.167],"y":[0.167,0.167]},"t":69,"s":[13,13]},{"i":{"x":[0.667,0.667],"y":[1,1]},"o":{"x":[0.167,0.167],"y":[0.167,0.167]},"t":143,"s":[13,13]},{"i":{"x":[0.667,0.667],"y":[1,1]},"o":{"x":[0.333,0.333],"y":[0,0]},"t":157,"s":[19,19]},{"i":{"x":[0.833,0.833],"y":[0.833,0.833]},"o":{"x":[0.167,0.167],"y":[0,0]},"t":270,"s":[19,19]},{"i":{"x":[0.833,0.833],"y":[0.833,0.833]},"o":{"x":[0.167,0.167],"y":[0.167,0.167]},"t":279,"s":[13,13]},{"i":{"x":[0.833,0.833],"y":[1,1]},"o":{"x":[0.167,0.167],"y":[0.167,0.167]},"t":325,"s":[13,13]},{"i":{"x":[0.833,0.833],"y":[1,1]},"o":{"x":[0.167,0.167],"y":[0,0]},"t":334,"s":[19,19]},{"i":{"x":[0.833,0.833],"y":[0.833,0.833]},"o":{"x":[0.167,0.167],"y":[0,0]},"t":445,"s":[19,19]},{"t":474,"s":[13,13]}],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"fl","c":{"a":0,"k":[0.976470588235,0.670588235294,0,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Ellipse 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":438,"op":540,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":6,"ty":4,"nm":".yellow600","cl":"yellow600","parent":2,"sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":40,"s":[0]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":49,"s":[85]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":67,"s":[50]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":143,"s":[50]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":157,"s":[85]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":270,"s":[85]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":279,"s":[50]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":325,"s":[50]},{"t":334,"s":[85]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":114,"s":[0,0,0],"to":[-5.333,0,0],"ti":[5.333,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":135,"s":[-32,0,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":298,"s":[-32,0,0],"to":[0.5,1.667,0],"ti":[-0.5,-1.667,0]},{"i":{"x":0.667,"y":0.667},"o":{"x":0.167,"y":0.167},"t":305,"s":[-29,10,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.257,"y":1},"o":{"x":0.333,"y":0},"t":352,"s":[-29,10,0],"to":[-1.667,1.667,0],"ti":[1.667,-1.667,0]},{"t":393,"s":[-39,20,0]}],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":1,"k":[{"i":{"x":[0.667,0.667],"y":[1,1]},"o":{"x":[0.167,0.167],"y":[0.167,0.167]},"t":40,"s":[13,13]},{"i":{"x":[0.833,0.833],"y":[0.833,0.833]},"o":{"x":[0.333,0.333],"y":[0,0]},"t":57,"s":[19,19]},{"i":{"x":[0.833,0.833],"y":[0.833,0.833]},"o":{"x":[0.167,0.167],"y":[0.167,0.167]},"t":69,"s":[13,13]},{"i":{"x":[0.667,0.667],"y":[1,1]},"o":{"x":[0.167,0.167],"y":[0.167,0.167]},"t":143,"s":[13,13]},{"i":{"x":[0.667,0.667],"y":[1,1]},"o":{"x":[0.333,0.333],"y":[0,0]},"t":157,"s":[19,19]},{"i":{"x":[0.833,0.833],"y":[0.833,0.833]},"o":{"x":[0.167,0.167],"y":[0,0]},"t":270,"s":[19,19]},{"i":{"x":[0.833,0.833],"y":[0.833,0.833]},"o":{"x":[0.167,0.167],"y":[0.167,0.167]},"t":279,"s":[13,13]},{"i":{"x":[0.833,0.833],"y":[1,1]},"o":{"x":[0.167,0.167],"y":[0.167,0.167]},"t":325,"s":[13,13]},{"t":334,"s":[19,19]}],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"fl","c":{"a":0,"k":[0.976470588235,0.670588235294,0,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Ellipse 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":438,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":7,"ty":4,"nm":".grey300","cl":"grey300","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[205.999,150,0],"ix":2,"l":2},"a":{"a":0,"k":[205.999,150,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[201.948,319.538],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":16,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"st","c":{"a":0,"k":[0.854901969433,0.86274510622,0.878431379795,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":2.5,"ix":5},"lc":1,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":-90,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"frame","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tr","p":{"a":0,"k":[205.999,151.162],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[-100,-100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"frame","np":1,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,-1.372],[0,0],[0,0],[1.367,0]],"o":[[-1.367,0],[0,0],[0,0],[0,-1.372],[0,0]],"v":[[-4.457,-1.74],[-6.933,0.746],[0.99,0.746],[6.933,0.746],[4.457,-1.74]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.854901969433,0.86274510622,0.878431379795,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"button2","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tr","p":{"a":0,"k":[318.382,49.604],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"button2","np":1,"cix":2,"bm":0,"ix":2,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,-1.372],[0,0],[0,0],[1.367,0]],"o":[[-1.367,0],[0,0],[0,0],[0,-1.372],[0,0]],"v":[[-10.894,-1.74],[-13.37,0.746],[0.495,0.746],[13.37,0.746],[10.894,-1.74]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.854901969433,0.86274510622,0.878431379795,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"button1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tr","p":{"a":0,"k":[276.958,49.604],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"button1","np":1,"cix":2,"bm":0,"ix":3,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":540,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":8,"ty":4,"nm":".yellow600","cl":"yellow600","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.67],"y":[1]},"o":{"x":[0.17],"y":[0.17]},"t":0,"s":[0]},{"i":{"x":[0.776],"y":[1]},"o":{"x":[0.165],"y":[0]},"t":23,"s":[100]},{"i":{"x":[0.83],"y":[0.83]},"o":{"x":[0.33],"y":[0]},"t":460,"s":[100]},{"t":475,"s":[0]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[205.998,151.162,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[-100,-100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[201.948,319.538],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":16,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"op","nm":"Offset Paths 1","a":{"a":0,"k":-3,"ix":1},"lj":1,"ml":{"a":0,"k":4,"ix":3},"ix":2,"mn":"ADBE Vector Filter - Offset","hd":false},{"ty":"st","c":{"a":0,"k":[0.976470589638,0.670588254929,0,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":5,"ix":5},"lc":1,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":-90,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Highlight","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":540,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":9,"ty":4,"nm":"screenMatte","td":1,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[205.999,151.162,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[-100,-100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[201.948,319.538],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":16,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0,0,0,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":-90,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"BG","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":540,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":10,"ty":4,"nm":".grey100","cl":"grey100","parent":2,"tt":1,"tp":9,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[0,0,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":1,"k":[{"i":{"x":[0.18,0.18,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":76,"s":[30,30,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":95,"s":[119,119,100]},{"i":{"x":[0.257,0.257,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":352,"s":[119,119,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":393,"s":[161,161,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.735,0.735,0.333],"y":[-0.008,-0.008,0]},"t":438,"s":[161,161,100]},{"t":478,"s":[30,30,100]}],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]],"v":[[13.974,5.25],[4.524,-21.75],[0.624,-34.65],[-0.576,-34.65],[-4.476,-21.75],[-14.076,5.25]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ind":1,"ty":"sh","ix":2,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]],"v":[[-11.676,-57.9],[11.574,-57.9],[51.924,49.5],[29.574,49.5],[20.574,23.85],[-20.526,23.85],[-29.526,49.5],[-51.876,49.5]],"c":true},"ix":2},"nm":"Path 2","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.945098039216,0.952941176471,0.956862745098,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,8],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[155,155],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":540,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":12,"ty":4,"nm":".black","cl":"black","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[205.999,151.162,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[-100,-100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[201.948,319.538],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":16,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0,0,0,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":-90,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"BG","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":540,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":13,"ty":4,"nm":".white","cl":"white","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[206,150,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[15.4,0],[0,0],[0,15.4],[0,0],[-15.4,0],[0,0],[0,-15.4],[0,0]],"o":[[0,0],[-15.4,0],[0,0],[0,-15.4],[0,0],[15.4,0],[0,0],[0,15.4]],"v":[[178,150],[-178,150],[-206,122],[-206,-122],[-178,-150],[178,-150],[206,-122],[206,122]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":1800,"st":0,"ct":1,"bm":0}],"markers":[]}
\ No newline at end of file
diff --git a/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java b/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java
index f804e33..fc75cde 100644
--- a/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java
@@ -60,6 +60,7 @@
import com.android.settings.accessibility.shortcuts.EditShortcutsPreferenceFragment;
import com.android.settings.utils.LocaleUtils;
import com.android.settingslib.core.AbstractPreferenceController;
+import com.android.settingslib.widget.IllustrationPreference;
import com.google.android.setupcompat.util.WizardManagerHelper;
@@ -130,6 +131,11 @@
@Override
public void onResume() {
super.onResume();
+ final IllustrationPreference illustrationPreference =
+ getPreferenceScreen().findPreference(KEY_ANIMATED_IMAGE);
+ if (illustrationPreference != null) {
+ illustrationPreference.applyDynamicColor();
+ }
final AccessibilityManager am = getPrefContext().getSystemService(
AccessibilityManager.class);
diff --git a/src/com/android/settings/connecteddevice/AvailableMediaDeviceGroupController.java b/src/com/android/settings/connecteddevice/AvailableMediaDeviceGroupController.java
index d64bcbb..420fb97 100644
--- a/src/com/android/settings/connecteddevice/AvailableMediaDeviceGroupController.java
+++ b/src/com/android/settings/connecteddevice/AvailableMediaDeviceGroupController.java
@@ -17,6 +17,7 @@
import static com.android.settingslib.Utils.isAudioModeOngoingCall;
+import android.app.settings.SettingsEnums;
import android.bluetooth.BluetoothDevice;
import android.bluetooth.BluetoothLeBroadcast;
import android.bluetooth.BluetoothLeBroadcastAssistant;
@@ -47,6 +48,7 @@
import com.android.settings.connecteddevice.audiosharing.AudioSharingUtils;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.dashboard.DashboardFragment;
+import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.bluetooth.BluetoothCallback;
import com.android.settingslib.bluetooth.BluetoothUtils;
import com.android.settingslib.bluetooth.CachedBluetoothDevice;
@@ -279,6 +281,8 @@
((BluetoothDevicePreference) preference).getBluetoothDevice();
if (AudioSharingUtils.isFeatureEnabled() && mDialogHandler != null) {
mDialogHandler.handleDeviceConnected(cachedDevice, /* userTriggered= */ true);
+ FeatureFactory.getFeatureFactory().getMetricsFeatureProvider()
+ .action(mContext, SettingsEnums.ACTION_MEDIA_DEVICE_CLICK);
} else {
cachedDevice.setActive();
}
diff --git a/src/com/android/settings/connecteddevice/audiosharing/AudioSharingBluetoothDeviceUpdater.java b/src/com/android/settings/connecteddevice/audiosharing/AudioSharingBluetoothDeviceUpdater.java
index 50517fb..4d7e699 100644
--- a/src/com/android/settings/connecteddevice/audiosharing/AudioSharingBluetoothDeviceUpdater.java
+++ b/src/com/android/settings/connecteddevice/audiosharing/AudioSharingBluetoothDeviceUpdater.java
@@ -16,6 +16,7 @@
package com.android.settings.connecteddevice.audiosharing;
+import android.app.settings.SettingsEnums;
import android.content.Context;
import android.util.Log;
@@ -70,6 +71,7 @@
@Override
public boolean onPreferenceClick(Preference preference) {
mMetricsFeatureProvider.logClickedPreference(preference, mMetricsCategory);
+ mMetricsFeatureProvider.action(mContext, SettingsEnums.ACTION_AUDIO_SHARING_DEVICE_CLICK);
return true;
}
diff --git a/src/com/android/settings/connecteddevice/audiosharing/AudioSharingCallAudioDialogFragment.java b/src/com/android/settings/connecteddevice/audiosharing/AudioSharingCallAudioDialogFragment.java
index db82619..75b4acf 100644
--- a/src/com/android/settings/connecteddevice/audiosharing/AudioSharingCallAudioDialogFragment.java
+++ b/src/com/android/settings/connecteddevice/audiosharing/AudioSharingCallAudioDialogFragment.java
@@ -51,7 +51,7 @@
@Override
public int getMetricsCategory() {
- return SettingsEnums.DIALOG_AUDIO_SHARING_SWITCH_ACTIVE;
+ return SettingsEnums.DIALOG_AUDIO_SHARING_CALL_AUDIO;
}
/**
diff --git a/src/com/android/settings/connecteddevice/audiosharing/AudioSharingCompatibilityPreferenceController.java b/src/com/android/settings/connecteddevice/audiosharing/AudioSharingCompatibilityPreferenceController.java
index 84b769d..d2f23ed 100644
--- a/src/com/android/settings/connecteddevice/audiosharing/AudioSharingCompatibilityPreferenceController.java
+++ b/src/com/android/settings/connecteddevice/audiosharing/AudioSharingCompatibilityPreferenceController.java
@@ -16,6 +16,7 @@
package com.android.settings.connecteddevice.audiosharing;
+import android.app.settings.SettingsEnums;
import android.bluetooth.BluetoothLeBroadcast;
import android.bluetooth.BluetoothLeBroadcastMetadata;
import android.content.Context;
@@ -32,9 +33,11 @@
import com.android.settings.R;
import com.android.settings.bluetooth.Utils;
import com.android.settings.core.TogglePreferenceController;
+import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.bluetooth.LocalBluetoothLeBroadcast;
import com.android.settingslib.bluetooth.LocalBluetoothManager;
import com.android.settingslib.bluetooth.LocalBluetoothProfileManager;
+import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
import com.android.settingslib.utils.ThreadUtils;
import java.util.concurrent.Executor;
@@ -53,6 +56,7 @@
@Nullable private final LocalBluetoothLeBroadcast mBroadcast;
@Nullable private TwoStatePreference mPreference;
private final Executor mExecutor;
+ private final MetricsFeatureProvider mMetricsFeatureProvider;
private AtomicBoolean mCallbacksRegistered = new AtomicBoolean(false);
private final BluetoothLeBroadcast.Callback mBroadcastCallback =
@@ -108,6 +112,7 @@
mProfileManager = mBtManager == null ? null : mBtManager.getProfileManager();
mBroadcast = mProfileManager == null ? null : mProfileManager.getLeAudioBroadcastProfile();
mExecutor = Executors.newSingleThreadExecutor();
+ mMetricsFeatureProvider = FeatureFactory.getFeatureFactory().getMetricsFeatureProvider();
}
@Override
@@ -178,6 +183,8 @@
}
mBroadcast.setImproveCompatibility(isChecked);
// TODO: call updateBroadcast once framework change ready.
+ mMetricsFeatureProvider.action(
+ mContext, SettingsEnums.ACTION_AUDIO_SHARING_IMPROVE_COMPATIBILITY, isChecked);
return true;
}
diff --git a/src/com/android/settings/connecteddevice/audiosharing/AudioSharingConfirmDialogFragment.java b/src/com/android/settings/connecteddevice/audiosharing/AudioSharingConfirmDialogFragment.java
index 9dd466d..e9013d7 100644
--- a/src/com/android/settings/connecteddevice/audiosharing/AudioSharingConfirmDialogFragment.java
+++ b/src/com/android/settings/connecteddevice/audiosharing/AudioSharingConfirmDialogFragment.java
@@ -17,6 +17,7 @@
package com.android.settings.connecteddevice.audiosharing;
import android.app.Dialog;
+import android.app.settings.SettingsEnums;
import android.os.Bundle;
import android.util.Log;
@@ -33,8 +34,7 @@
@Override
public int getMetricsCategory() {
- // TODO: add metrics category.
- return 0;
+ return SettingsEnums.DIALOG_AUDIO_SHARING_CONFIRMATION;
}
/**
@@ -63,7 +63,7 @@
.setTitleIcon(com.android.settingslib.R.drawable.ic_bt_le_audio_sharing)
.setIsCustomBodyEnabled(true)
.setCustomMessage(R.string.audio_sharing_comfirm_dialog_content)
- .setPositiveButton(com.android.settings.R.string.okay, (d, w) -> dismiss())
+ .setPositiveButton(com.android.settings.R.string.okay, (d, w) -> {})
.build();
dialog.setCanceledOnTouchOutside(true);
return dialog;
diff --git a/src/com/android/settings/connecteddevice/audiosharing/AudioSharingDeviceVolumeControlUpdater.java b/src/com/android/settings/connecteddevice/audiosharing/AudioSharingDeviceVolumeControlUpdater.java
index 257ae77..660229d 100644
--- a/src/com/android/settings/connecteddevice/audiosharing/AudioSharingDeviceVolumeControlUpdater.java
+++ b/src/com/android/settings/connecteddevice/audiosharing/AudioSharingDeviceVolumeControlUpdater.java
@@ -16,6 +16,7 @@
package com.android.settings.connecteddevice.audiosharing;
+import android.app.settings.SettingsEnums;
import android.bluetooth.BluetoothCsipSetCoordinator;
import android.bluetooth.BluetoothDevice;
import android.content.Context;
@@ -156,6 +157,10 @@
if (mVolumeControl != null) {
mVolumeControl.setDeviceVolume(
cachedDevice.getDevice(), progress, /* isGroupOp= */ true);
+ mMetricsFeatureProvider.action(
+ mContext,
+ SettingsEnums.ACTION_AUDIO_SHARING_CHANGE_MEDIA_DEVICE_VOLUME,
+ /* isPrimary= */ false);
}
}
@@ -170,6 +175,10 @@
- audioManager.getStreamMinVolume(AudioManager.STREAM_MUSIC);
int volume = Math.round((float) progress * streamVolumeRange / seekbarRange);
audioManager.setStreamVolume(AudioManager.STREAM_MUSIC, volume, 0);
+ mMetricsFeatureProvider.action(
+ mContext,
+ SettingsEnums.ACTION_AUDIO_SHARING_CHANGE_MEDIA_DEVICE_VOLUME,
+ /* isPrimary= */ true);
} catch (RuntimeException e) {
Log.e(TAG, "Fail to setAudioManagerStreamVolumeForFallbackDevice, error = " + e);
}
diff --git a/src/com/android/settings/connecteddevice/audiosharing/AudioSharingJoinDialogFragment.java b/src/com/android/settings/connecteddevice/audiosharing/AudioSharingJoinDialogFragment.java
index 0a5961d..4982179 100644
--- a/src/com/android/settings/connecteddevice/audiosharing/AudioSharingJoinDialogFragment.java
+++ b/src/com/android/settings/connecteddevice/audiosharing/AudioSharingJoinDialogFragment.java
@@ -56,7 +56,7 @@
@Override
public int getMetricsCategory() {
return AudioSharingUtils.isBroadcasting(Utils.getLocalBtManager(getContext()))
- ? SettingsEnums.DIALOG_START_AUDIO_SHARING
+ ? SettingsEnums.DIALOG_AUDIO_SHARING_ADD_DEVICE
: SettingsEnums.DIALOG_START_AUDIO_SHARING;
}
diff --git a/src/com/android/settings/connecteddevice/audiosharing/AudioSharingPlaySoundPreferenceController.java b/src/com/android/settings/connecteddevice/audiosharing/AudioSharingPlaySoundPreferenceController.java
index e6e11af..46c7f9c 100644
--- a/src/com/android/settings/connecteddevice/audiosharing/AudioSharingPlaySoundPreferenceController.java
+++ b/src/com/android/settings/connecteddevice/audiosharing/AudioSharingPlaySoundPreferenceController.java
@@ -16,6 +16,7 @@
package com.android.settings.connecteddevice.audiosharing;
+import android.app.settings.SettingsEnums;
import android.content.ContentResolver;
import android.content.Context;
import android.media.AudioAttributes;
@@ -31,6 +32,8 @@
import androidx.preference.PreferenceScreen;
import com.android.settings.R;
+import com.android.settings.overlay.FeatureFactory;
+import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
public class AudioSharingPlaySoundPreferenceController
extends AudioSharingBasePreferenceController {
@@ -39,6 +42,7 @@
private static final String PREF_KEY = "audio_sharing_play_sound";
+ private final MetricsFeatureProvider mMetricsFeatureProvider;
private Ringtone mRingtone;
public AudioSharingPlaySoundPreferenceController(Context context) {
@@ -47,6 +51,7 @@
if (mRingtone != null) {
mRingtone.setStreamType(AudioManager.STREAM_MUSIC);
}
+ mMetricsFeatureProvider = FeatureFactory.getFeatureFactory().getMetricsFeatureProvider();
}
@Override
@@ -74,6 +79,9 @@
.build());
if (!mRingtone.isPlaying()) {
mRingtone.play();
+ mMetricsFeatureProvider.action(
+ mContext,
+ SettingsEnums.ACTION_AUDIO_SHARING_PLAY_TEST_SOUND);
}
} catch (Throwable e) {
Log.w(TAG, "Fail to play sample, error = " + e);
diff --git a/src/com/android/settings/connecteddevice/audiosharing/AudioSharingReceiver.java b/src/com/android/settings/connecteddevice/audiosharing/AudioSharingReceiver.java
index eda4256..2b976d2 100644
--- a/src/com/android/settings/connecteddevice/audiosharing/AudioSharingReceiver.java
+++ b/src/com/android/settings/connecteddevice/audiosharing/AudioSharingReceiver.java
@@ -20,6 +20,7 @@
import android.app.NotificationChannel;
import android.app.NotificationManager;
import android.app.PendingIntent;
+import android.app.settings.SettingsEnums;
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
@@ -30,8 +31,10 @@
import com.android.settings.R;
import com.android.settings.bluetooth.Utils;
+import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.bluetooth.LocalBluetoothLeBroadcast;
import com.android.settingslib.bluetooth.LocalBluetoothManager;
+import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
public class AudioSharingReceiver extends BroadcastReceiver {
private static final String TAG = "AudioSharingNotification";
@@ -54,6 +57,8 @@
Log.w(TAG, "Received unexpected intent with null action.");
return;
}
+ MetricsFeatureProvider metricsFeatureProvider =
+ FeatureFactory.getFeatureFactory().getMetricsFeatureProvider();
switch (action) {
case LocalBluetoothLeBroadcast.ACTION_LE_AUDIO_SHARING_STATE_CHANGE:
int state =
@@ -61,8 +66,12 @@
LocalBluetoothLeBroadcast.EXTRA_LE_AUDIO_SHARING_STATE, -1);
if (state == LocalBluetoothLeBroadcast.BROADCAST_STATE_ON) {
showSharingNotification(context);
+ metricsFeatureProvider.action(
+ context, SettingsEnums.ACTION_SHOW_AUDIO_SHARING_NOTIFICATION);
} else if (state == LocalBluetoothLeBroadcast.BROADCAST_STATE_OFF) {
cancelSharingNotification(context);
+ metricsFeatureProvider.action(
+ context, SettingsEnums.ACTION_CANCEL_AUDIO_SHARING_NOTIFICATION);
} else {
Log.w(
TAG,
@@ -72,6 +81,8 @@
case ACTION_LE_AUDIO_SHARING_STOP:
LocalBluetoothManager manager = Utils.getLocalBtManager(context);
AudioSharingUtils.stopBroadcasting(manager);
+ metricsFeatureProvider.action(
+ context, SettingsEnums.ACTION_STOP_AUDIO_SHARING_FROM_NOTIFICATION);
break;
default:
Log.w(TAG, "Received unexpected intent " + intent.getAction());
@@ -98,7 +109,11 @@
stopIntent,
PendingIntent.FLAG_IMMUTABLE);
Intent settingsIntent =
- new Intent(ACTION_LE_AUDIO_SHARING_SETTINGS).setPackage(context.getPackageName());
+ new Intent(ACTION_LE_AUDIO_SHARING_SETTINGS)
+ .setPackage(context.getPackageName())
+ .putExtra(
+ MetricsFeatureProvider.EXTRA_SOURCE_METRICS_CATEGORY,
+ SettingsEnums.NOTIFICATION_AUDIO_SHARING);
PendingIntent settingsPendingIntent =
PendingIntent.getActivity(
context,
diff --git a/src/com/android/settings/localepicker/LocalePickerWithRegionActivity.java b/src/com/android/settings/localepicker/LocalePickerWithRegionActivity.java
index b8c80f3..6e596e1 100644
--- a/src/com/android/settings/localepicker/LocalePickerWithRegionActivity.java
+++ b/src/com/android/settings/localepicker/LocalePickerWithRegionActivity.java
@@ -16,6 +16,8 @@
package com.android.settings.localepicker;
+import static android.window.OnBackInvokedDispatcher.PRIORITY_DEFAULT;
+
import android.app.FragmentTransaction;
import android.content.Intent;
import android.os.Bundle;
@@ -23,6 +25,7 @@
import android.provider.Settings;
import android.util.Log;
import android.view.MenuItem;
+import android.window.OnBackInvokedCallback;
import androidx.core.view.ViewCompat;
@@ -39,6 +42,10 @@
private LocalePickerWithRegion mSelector;
+ private final OnBackInvokedCallback mOnBackInvokedCallback = () -> {
+ handleBackPressed();
+ };
+
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
@@ -52,7 +59,8 @@
: bundle.getParcelable(Settings.EXTRA_EXPLICIT_LOCALES, LocaleList.class);
Log.i(TAG, "Has explicit locales : " + explicitLocales);
}
-
+ getOnBackInvokedDispatcher()
+ .registerOnBackInvokedCallback(PRIORITY_DEFAULT, mOnBackInvokedCallback);
mSelector = LocalePickerWithRegion.createLanguagePicker(
this,
LocalePickerWithRegionActivity.this,
@@ -69,6 +77,12 @@
}
@Override
+ public void onDestroy() {
+ super.onDestroy();
+ getOnBackInvokedDispatcher().unregisterOnBackInvokedCallback(mOnBackInvokedCallback);
+ }
+
+ @Override
public boolean onOptionsItemSelected(MenuItem item) {
if (item.getItemId() == android.R.id.home) {
handleBackPressed();
@@ -85,11 +99,6 @@
finish();
}
- @Override
- public void onBackPressed() {
- handleBackPressed();
- }
-
private void handleBackPressed() {
if (getFragmentManager().getBackStackEntryCount() > 1) {
super.onBackPressed();
diff --git a/src/com/android/settings/vpn2/VpnSettings.java b/src/com/android/settings/vpn2/VpnSettings.java
index 0ee21b9..093d2be 100644
--- a/src/com/android/settings/vpn2/VpnSettings.java
+++ b/src/com/android/settings/vpn2/VpnSettings.java
@@ -61,6 +61,7 @@
import com.android.internal.net.VpnConfig;
import com.android.internal.net.VpnProfile;
import com.android.settings.R;
+import com.android.settings.Utils;
import com.android.settings.dashboard.RestrictedDashboardFragment;
import com.android.settings.overlay.FeatureFactory;
import com.android.settings.widget.GearPreference;
@@ -592,6 +593,9 @@
// Mark connected third-party services
Set<AppVpnInfo> connections = new ArraySet<>();
for (UserHandle profile : mUserManager.getUserProfiles()) {
+ if (Utils.shouldHideUser(profile, mUserManager)) {
+ continue;
+ }
VpnConfig config = mVpnManager.getVpnConfig(profile.getIdentifier());
if (config != null && !config.legacy) {
connections.add(new AppVpnInfo(profile.getIdentifier(), config.user));
@@ -604,6 +608,9 @@
private Set<AppVpnInfo> getAlwaysOnAppVpnInfos() {
Set<AppVpnInfo> result = new ArraySet<>();
for (UserHandle profile : mUserManager.getUserProfiles()) {
+ if (Utils.shouldHideUser(profile, mUserManager)) {
+ continue;
+ }
final int profileId = profile.getIdentifier();
final String packageName = mVpnManager.getAlwaysOnVpnPackageForUser(profileId);
if (packageName != null) {
@@ -627,7 +634,11 @@
final Set<Integer> profileIds;
if (includeProfiles) {
profileIds = new ArraySet<>();
- for (UserHandle profile : UserManager.get(context).getUserProfiles()) {
+ UserManager userManager = UserManager.get(context);
+ for (UserHandle profile : userManager.getUserProfiles()) {
+ if (Utils.shouldHideUser(profile, userManager)) {
+ continue;
+ }
profileIds.add(profile.getIdentifier());
}
} else {
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/AvailableMediaDeviceGroupControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/AvailableMediaDeviceGroupControllerTest.java
index ab95c2c..976ddf1 100644
--- a/tests/robotests/src/com/android/settings/connecteddevice/AvailableMediaDeviceGroupControllerTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/AvailableMediaDeviceGroupControllerTest.java
@@ -30,6 +30,7 @@
import static org.robolectric.Shadows.shadowOf;
import static org.robolectric.shadows.ShadowLooper.shadowMainLooper;
+import android.app.settings.SettingsEnums;
import android.bluetooth.BluetoothAdapter;
import android.bluetooth.BluetoothDevice;
import android.bluetooth.BluetoothLeBroadcast;
@@ -58,6 +59,7 @@
import com.android.settings.bluetooth.BluetoothDevicePreference;
import com.android.settings.bluetooth.Utils;
import com.android.settings.connecteddevice.audiosharing.AudioSharingDialogHandler;
+import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.shadow.ShadowAlertDialogCompat;
import com.android.settings.testutils.shadow.ShadowAudioManager;
import com.android.settings.testutils.shadow.ShadowBluetoothAdapter;
@@ -128,6 +130,7 @@
private PreferenceGroup mPreferenceGroup;
private Context mContext;
private FragmentManager mFragManager;
+ private FakeFeatureFactory mFeatureFactory;
private Preference mPreference;
private AvailableMediaDeviceGroupController mAvailableMediaDeviceGroupController;
private AudioManager mAudioManager;
@@ -157,6 +160,7 @@
BluetoothStatusCodes.FEATURE_NOT_SUPPORTED);
ShadowBluetoothUtils.sLocalBluetoothManager = mLocalBluetoothManager;
mLocalBluetoothManager = Utils.getLocalBtManager(mContext);
+ mFeatureFactory = FakeFeatureFactory.setupForTest();
mAudioManager = mContext.getSystemService(AudioManager.class);
doReturn(mEventManager).when(mLocalBluetoothManager).getEventManager();
when(mLocalBluetoothManager.getProfileManager()).thenReturn(mLocalBtProfileManager);
@@ -414,6 +418,8 @@
mAvailableMediaDeviceGroupController.onDeviceClick(preference);
verify(mDialogHandler)
.handleDeviceConnected(mCachedBluetoothDevice, /* userTriggered= */ true);
+ verify(mFeatureFactory.metricsFeatureProvider)
+ .action(mContext, SettingsEnums.ACTION_MEDIA_DEVICE_CLICK);
}
private void setUpBroadcast() {
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingBluetoothDeviceUpdaterTest.java b/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingBluetoothDeviceUpdaterTest.java
index f1c3126..23be208 100644
--- a/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingBluetoothDeviceUpdaterTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingBluetoothDeviceUpdaterTest.java
@@ -26,6 +26,7 @@
import static org.mockito.Mockito.when;
import static org.robolectric.Shadows.shadowOf;
+import android.app.settings.SettingsEnums;
import android.bluetooth.BluetoothAdapter;
import android.bluetooth.BluetoothDevice;
import android.bluetooth.BluetoothLeBroadcastReceiveState;
@@ -43,6 +44,7 @@
import com.android.settings.bluetooth.BluetoothDevicePreference;
import com.android.settings.bluetooth.Utils;
import com.android.settings.connecteddevice.DevicePreferenceCallback;
+import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.shadow.ShadowBluetoothAdapter;
import com.android.settings.testutils.shadow.ShadowBluetoothUtils;
import com.android.settings.testutils.shadow.ShadowThreadUtils;
@@ -102,6 +104,7 @@
private AudioSharingBluetoothDeviceUpdater mDeviceUpdater;
private Collection<CachedBluetoothDevice> mCachedDevices;
private ShadowBluetoothAdapter mShadowBluetoothAdapter;
+ private FakeFeatureFactory mFeatureFactory;
@Before
public void setUp() {
@@ -113,6 +116,7 @@
mShadowBluetoothAdapter.setIsLeAudioBroadcastAssistantSupported(
BluetoothStatusCodes.FEATURE_SUPPORTED);
ShadowBluetoothUtils.sLocalBluetoothManager = mLocalBtManager;
+ mFeatureFactory = FakeFeatureFactory.setupForTest();
mLocalBtManager = Utils.getLocalBtManager(mContext);
when(mLocalBtManager.getCachedDeviceManager()).thenReturn(mCachedDeviceManager);
when(mLocalBtManager.getProfileManager()).thenReturn(mLocalBtProfileManager);
@@ -255,6 +259,14 @@
assertThat(mDeviceUpdater.getPreferenceKey()).isEqualTo(PREF_KEY);
}
+ @Test
+ public void onPreferenceClick_logClick() {
+ Preference preference = new Preference(mContext);
+ mDeviceUpdater.onPreferenceClick(preference);
+ verify(mFeatureFactory.metricsFeatureProvider)
+ .action(mContext, SettingsEnums.ACTION_AUDIO_SHARING_DEVICE_CLICK);
+ }
+
private void setupPreferenceMapWithDevice() {
// Add device to preferenceMap
mSetFlagsRule.enableFlags(Flags.FLAG_ENABLE_LE_AUDIO_SHARING);
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingCallAudioDialogFragmentTest.java b/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingCallAudioDialogFragmentTest.java
index 4477fa3..979f149 100644
--- a/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingCallAudioDialogFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingCallAudioDialogFragmentTest.java
@@ -20,6 +20,7 @@
import static org.robolectric.shadows.ShadowLooper.shadowMainLooper;
+import android.app.settings.SettingsEnums;
import android.bluetooth.BluetoothAdapter;
import android.bluetooth.BluetoothStatusCodes;
import android.platform.test.flag.junit.SetFlagsRule;
@@ -83,6 +84,12 @@
}
@Test
+ public void getMetricsCategory_correctValue() {
+ assertThat(mFragment.getMetricsCategory())
+ .isEqualTo(SettingsEnums.DIALOG_AUDIO_SHARING_CALL_AUDIO);
+ }
+
+ @Test
public void onCreateDialog_flagOff_dialogNotExist() {
mSetFlagsRule.disableFlags(Flags.FLAG_ENABLE_LE_AUDIO_SHARING);
mFragment.show(mParent, new ArrayList<>(), (item) -> {});
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingCompatibilityPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingCompatibilityPreferenceControllerTest.java
index a395716..1a9d09e 100644
--- a/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingCompatibilityPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingCompatibilityPreferenceControllerTest.java
@@ -27,9 +27,11 @@
import static org.mockito.Mockito.doNothing;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoInteractions;
import static org.mockito.Mockito.when;
import static org.robolectric.Shadows.shadowOf;
+import android.app.settings.SettingsEnums;
import android.bluetooth.BluetoothAdapter;
import android.bluetooth.BluetoothLeBroadcast;
import android.bluetooth.BluetoothStatusCodes;
@@ -44,6 +46,7 @@
import com.android.settings.R;
import com.android.settings.bluetooth.Utils;
+import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.shadow.ShadowBluetoothAdapter;
import com.android.settings.testutils.shadow.ShadowBluetoothUtils;
import com.android.settings.testutils.shadow.ShadowThreadUtils;
@@ -94,6 +97,7 @@
private AudioSharingCompatibilityPreferenceController mController;
private ShadowBluetoothAdapter mShadowBluetoothAdapter;
private LocalBluetoothManager mLocalBluetoothManager;
+ private FakeFeatureFactory mFeatureFactory;
private Lifecycle mLifecycle;
private LifecycleOwner mLifecycleOwner;
@@ -109,6 +113,7 @@
mLifecycle = new Lifecycle(mLifecycleOwner);
ShadowBluetoothUtils.sLocalBluetoothManager = mLocalBtManager;
mLocalBluetoothManager = Utils.getLocalBtManager(mContext);
+ mFeatureFactory = FakeFeatureFactory.setupForTest();
when(mLocalBluetoothManager.getEventManager()).thenReturn(mBtEventManager);
when(mLocalBluetoothManager.getProfileManager()).thenReturn(mBtProfileManager);
when(mBtProfileManager.getLeAudioBroadcastProfile()).thenReturn(mBroadcast);
@@ -258,6 +263,8 @@
doNothing().when(mBroadcast).setImproveCompatibility(anyBoolean());
boolean setChecked = mController.setChecked(false);
verify(mBroadcast).setImproveCompatibility(false);
+ verify(mFeatureFactory.metricsFeatureProvider)
+ .action(mContext, SettingsEnums.ACTION_AUDIO_SHARING_IMPROVE_COMPATIBILITY, false);
assertThat(setChecked).isTrue();
}
@@ -266,6 +273,7 @@
when(mBroadcast.getImproveCompatibility()).thenReturn(true);
boolean setChecked = mController.setChecked(true);
verify(mBroadcast, times(0)).setImproveCompatibility(anyBoolean());
+ verifyNoInteractions(mFeatureFactory.metricsFeatureProvider);
assertThat(setChecked).isFalse();
}
}
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingDeviceVolumeControlUpdaterTest.java b/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingDeviceVolumeControlUpdaterTest.java
index a8563d1..7a21f02 100644
--- a/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingDeviceVolumeControlUpdaterTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingDeviceVolumeControlUpdaterTest.java
@@ -28,6 +28,7 @@
import static org.mockito.Mockito.when;
import static org.robolectric.Shadows.shadowOf;
+import android.app.settings.SettingsEnums;
import android.bluetooth.BluetoothDevice;
import android.bluetooth.BluetoothLeBroadcastReceiveState;
import android.bluetooth.BluetoothProfile;
@@ -42,6 +43,7 @@
import com.android.settings.bluetooth.Utils;
import com.android.settings.connecteddevice.DevicePreferenceCallback;
+import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.shadow.ShadowBluetoothUtils;
import com.android.settingslib.bluetooth.CachedBluetoothDevice;
import com.android.settingslib.bluetooth.CachedBluetoothDeviceManager;
@@ -96,12 +98,14 @@
private Context mContext;
private AudioSharingDeviceVolumeControlUpdater mDeviceUpdater;
private Collection<CachedBluetoothDevice> mCachedDevices;
+ private FakeFeatureFactory mFeatureFactory;
@Before
public void setUp() {
mContext = spy(ApplicationProvider.getApplicationContext());
ShadowBluetoothUtils.sLocalBluetoothManager = mLocalBtManager;
mLocalBtManager = Utils.getLocalBtManager(mContext);
+ mFeatureFactory = FakeFeatureFactory.setupForTest();
when(mLocalBtManager.getCachedDeviceManager()).thenReturn(mCachedDeviceManager);
when(mLocalBtManager.getProfileManager()).thenReturn(mLocalBtProfileManager);
when(mLocalBtProfileManager.getLeAudioBroadcastProfile()).thenReturn(mBroadcast);
@@ -250,6 +254,11 @@
verify(mVolumeControl).setDeviceVolume(mBluetoothDevice, 255, true);
verifyNoInteractions(mAudioManager);
+ verify(mFeatureFactory.metricsFeatureProvider)
+ .action(
+ mContext,
+ SettingsEnums.ACTION_AUDIO_SHARING_CHANGE_MEDIA_DEVICE_VOLUME,
+ /* isPrimary= */ false);
}
@Test
@@ -272,6 +281,11 @@
verifyNoInteractions(mVolumeControl);
verify(mAudioManager).setStreamVolume(AudioManager.STREAM_MUSIC, 10, 0);
+ verify(mFeatureFactory.metricsFeatureProvider)
+ .action(
+ mContext,
+ SettingsEnums.ACTION_AUDIO_SHARING_CHANGE_MEDIA_DEVICE_VOLUME,
+ /* isPrimary= */ true);
}
@Test
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingJoinDialogFragmentTest.java b/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingJoinDialogFragmentTest.java
index 5d43ccc..2d55d97 100644
--- a/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingJoinDialogFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingJoinDialogFragmentTest.java
@@ -21,6 +21,7 @@
import static org.mockito.Mockito.when;
import static org.robolectric.shadows.ShadowLooper.shadowMainLooper;
+import android.app.settings.SettingsEnums;
import android.bluetooth.BluetoothAdapter;
import android.bluetooth.BluetoothStatusCodes;
import android.platform.test.flag.junit.SetFlagsRule;
@@ -30,9 +31,14 @@
import androidx.fragment.app.FragmentActivity;
import com.android.settings.R;
+import com.android.settings.bluetooth.Utils;
import com.android.settings.testutils.shadow.ShadowAlertDialogCompat;
import com.android.settings.testutils.shadow.ShadowBluetoothAdapter;
+import com.android.settings.testutils.shadow.ShadowBluetoothUtils;
import com.android.settingslib.bluetooth.CachedBluetoothDevice;
+import com.android.settingslib.bluetooth.LocalBluetoothLeBroadcast;
+import com.android.settingslib.bluetooth.LocalBluetoothManager;
+import com.android.settingslib.bluetooth.LocalBluetoothProfileManager;
import com.android.settingslib.flags.Flags;
import org.junit.Before;
@@ -55,6 +61,7 @@
shadows = {
ShadowAlertDialogCompat.class,
ShadowBluetoothAdapter.class,
+ ShadowBluetoothUtils.class,
})
public class AudioSharingJoinDialogFragmentTest {
@@ -78,6 +85,9 @@
@Mock private CachedBluetoothDevice mCachedDevice1;
@Mock private CachedBluetoothDevice mCachedDevice2;
+ @Mock private LocalBluetoothManager mLocalBtManager;
+ @Mock private LocalBluetoothProfileManager mBtProfileManager;
+ @Mock private LocalBluetoothLeBroadcast mBroadcast;
private Fragment mParent;
private AudioSharingJoinDialogFragment mFragment;
private ShadowBluetoothAdapter mShadowBluetoothAdapter;
@@ -98,12 +108,33 @@
when(mCachedDevice1.getName()).thenReturn(TEST_DEVICE_NAME1);
when(mCachedDevice2.getName()).thenReturn(TEST_DEVICE_NAME2);
mFragment = new AudioSharingJoinDialogFragment();
+ ShadowBluetoothUtils.sLocalBluetoothManager = mLocalBtManager;
+ mLocalBtManager = Utils.getLocalBtManager(mFragment.getContext());
+ when(mLocalBtManager.getProfileManager()).thenReturn(mBtProfileManager);
+ when(mBtProfileManager.getLeAudioBroadcastProfile()).thenReturn(mBroadcast);
mParent = new Fragment();
FragmentController.setupFragment(
mParent, FragmentActivity.class, /* containerViewId= */ 0, /* bundle= */ null);
}
@Test
+ public void getMetricsCategory_notInSharing_correctValue() {
+ when(mBroadcast.isEnabled(null)).thenReturn(false);
+ int category = mFragment.getMetricsCategory();
+ shadowMainLooper().idle();
+ assertThat(category).isEqualTo(SettingsEnums.DIALOG_START_AUDIO_SHARING);
+ }
+
+ @Test
+ public void getMetricsCategory_inSharing_correctValue() {
+ mSetFlagsRule.enableFlags(Flags.FLAG_ENABLE_LE_AUDIO_SHARING);
+ when(mBroadcast.isEnabled(null)).thenReturn(true);
+ int category = mFragment.getMetricsCategory();
+ shadowMainLooper().idle();
+ assertThat(category).isEqualTo(SettingsEnums.DIALOG_AUDIO_SHARING_ADD_DEVICE);
+ }
+
+ @Test
public void onCreateDialog_flagOff_dialogNotExist() {
mSetFlagsRule.disableFlags(Flags.FLAG_ENABLE_LE_AUDIO_SHARING);
mFragment.show(mParent, new ArrayList<>(), mCachedDevice2, EMPTY_EVENT_LISTENER);
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingPlaySoundPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingPlaySoundPreferenceControllerTest.java
index f811930..43e3ba6 100644
--- a/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingPlaySoundPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingPlaySoundPreferenceControllerTest.java
@@ -26,6 +26,7 @@
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
+import android.app.settings.SettingsEnums;
import android.bluetooth.BluetoothAdapter;
import android.bluetooth.BluetoothStatusCodes;
import android.content.Context;
@@ -39,6 +40,7 @@
import androidx.preference.PreferenceScreen;
import androidx.test.core.app.ApplicationProvider;
+import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.shadow.ShadowBluetoothAdapter;
import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.flags.Flags;
@@ -71,6 +73,7 @@
private Lifecycle mLifecycle;
private LifecycleOwner mLifecycleOwner;
private Preference mPreference;
+ private FakeFeatureFactory mFeatureFactory;
@Before
public void setUp() {
@@ -80,6 +83,7 @@
BluetoothStatusCodes.FEATURE_SUPPORTED);
mShadowBluetoothAdapter.setIsLeAudioBroadcastAssistantSupported(
BluetoothStatusCodes.FEATURE_SUPPORTED);
+ mFeatureFactory = FakeFeatureFactory.setupForTest();
mLifecycleOwner = () -> mLifecycle;
mLifecycle = new Lifecycle(mLifecycleOwner);
when(mRingtone.getStreamType()).thenReturn(AudioManager.STREAM_MUSIC);
@@ -165,6 +169,8 @@
mController.displayPreference(mScreen);
mPreference.performClick();
verify(mRingtone).play();
+ verify(mFeatureFactory.metricsFeatureProvider)
+ .action(mContext, SettingsEnums.ACTION_AUDIO_SHARING_PLAY_TEST_SOUND);
}
@Test
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingReceiverTest.java b/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingReceiverTest.java
index d750297..d542b98 100644
--- a/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingReceiverTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingReceiverTest.java
@@ -32,6 +32,7 @@
import android.app.Notification;
import android.app.NotificationManager;
+import android.app.settings.SettingsEnums;
import android.bluetooth.BluetoothAdapter;
import android.bluetooth.BluetoothStatusCodes;
import android.content.BroadcastReceiver;
@@ -40,6 +41,7 @@
import android.platform.test.flag.junit.SetFlagsRule;
import com.android.settings.bluetooth.Utils;
+import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.shadow.ShadowBluetoothAdapter;
import com.android.settings.testutils.shadow.ShadowBluetoothUtils;
import com.android.settingslib.R;
@@ -77,6 +79,7 @@
private ShadowApplication mShadowApplication;
private ShadowBluetoothAdapter mShadowBluetoothAdapter;
private LocalBluetoothManager mLocalBluetoothManager;
+ private FakeFeatureFactory mFeatureFactory;
@Mock private LocalBluetoothProfileManager mLocalBtProfileManager;
@Mock private LocalBluetoothLeBroadcast mBroadcast;
@Mock private LocalBluetoothManager mLocalBtManager;
@@ -97,6 +100,7 @@
mLocalBluetoothManager = Utils.getLocalBtManager(mContext);
when(mLocalBluetoothManager.getProfileManager()).thenReturn(mLocalBtProfileManager);
when(mLocalBtProfileManager.getLeAudioBroadcastProfile()).thenReturn(mBroadcast);
+ mFeatureFactory = FakeFeatureFactory.setupForTest();
}
@Test
@@ -156,6 +160,8 @@
verify(mNm, times(1))
.notify(eq(R.drawable.ic_bt_le_audio_sharing), any(Notification.class));
+ verify(mFeatureFactory.metricsFeatureProvider)
+ .action(mContext, SettingsEnums.ACTION_SHOW_AUDIO_SHARING_NOTIFICATION);
}
@Test
@@ -170,6 +176,8 @@
audioSharingReceiver.onReceive(mContext, intent);
verify(mNm, times(1)).cancel(R.drawable.ic_bt_le_audio_sharing);
+ verify(mFeatureFactory.metricsFeatureProvider)
+ .action(mContext, SettingsEnums.ACTION_CANCEL_AUDIO_SHARING_NOTIFICATION);
}
@Test
@@ -196,6 +204,8 @@
audioSharingReceiver.onReceive(mContext, intent);
verify(mBroadcast, times(1)).stopBroadcast(broadcastId);
+ verify(mFeatureFactory.metricsFeatureProvider)
+ .action(mContext, SettingsEnums.ACTION_STOP_AUDIO_SHARING_FROM_NOTIFICATION);
}
private AudioSharingReceiver getAudioSharingReceiver(Intent intent) {