From 165f4ea76e86bc0d8bb3ee0158be9c3e0b02ace7 Mon Sep 17 00:00:00 2001 From: Daniel Norman Date: Thu, 20 Feb 2025 13:11:16 -0800 Subject: [PATCH] feat(expressive): Add new magnification banner for expressive design Fix: 378876803 Flag: EXEMPT custom flagging helpers from Settings and Setup Test: observe new image; see bug screenshots Change-Id: I3654563352e223af1a0d679318da45da2b4bc8be --- ...ility_magnification_banner_expressive.json | 2350 +++++++++++++++++ ...ScreenMagnificationPreferenceFragment.java | 9 +- 2 files changed, 2358 insertions(+), 1 deletion(-) create mode 100644 res/raw/accessibility_magnification_banner_expressive.json diff --git a/res/raw/accessibility_magnification_banner_expressive.json b/res/raw/accessibility_magnification_banner_expressive.json new file mode 100644 index 00000000000..2039fea8a7f --- /dev/null +++ b/res/raw/accessibility_magnification_banner_expressive.json @@ -0,0 +1,2350 @@ +{ + "v": "5.12.1", + "fr": 60, + "ip": 0, + "op": 540, + "w": 412, + "h": 300, + "nm": "Magnification", + "ddd": 0, + "assets": [], + "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, + "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.419, 149.916, 0], + "to": [6.292, -0.755, 0], + "ti": [-6.292, 0.755, 0] + }, + { + "i": { "x": 0.667, "y": 0.667 }, + "o": { "x": 0.333, "y": 0.333 }, + "t": 207, + "s": [244.169, 145.386, 0], + "to": [0, 0, 0], + "ti": [0, 0, 0] + }, + { + "i": { "x": 0.423, "y": 1 }, + "o": { "x": 0.488, "y": 0 }, + "t": 214, + "s": [244.169, 145.386, 0], + "to": [-1.258, 7.047, 0], + "ti": [1.258, -7.047, 0] + }, + { + "i": { "x": 0.667, "y": 0.667 }, + "o": { "x": 0.333, "y": 0.333 }, + "t": 247, + "s": [236.619, 187.666, 0], + "to": [0, 0, 0], + "ti": [0, 0, 0] + }, + { + "i": { "x": 0.667, "y": 1 }, + "o": { "x": 0.735, "y": 0.022 }, + "t": 438, + "s": [236.619, 187.666, 0], + "to": [-5.033, -6.292, 0], + "ti": [5.033, 6.292, 0] + }, + { "t": 478, "s": [206.419, 149.916, 0] } + ], + "ix": 2, + "l": 2 + }, + "a": { "a": 0, "k": [0, 0, 0], "ix": 1, "l": 2 }, + "s": { "a": 0, "k": [151, 151, 100], "ix": 6, "l": 2 } + }, + "ao": 0, + "ip": 0, + "op": 540, + "st": 0, + "bm": 0 + }, + { + "ddd": 0, + "ind": 3, + "ty": 4, + "nm": ".tertiary", + "cl": "tertiary", + "sr": 1, + "ks": { + "o": { + "a": 1, + "k": [ + { + "i": { "x": [0.833], "y": [0.833] }, + "o": { "x": [0.167], "y": [0.167] }, + "t": 465, + "s": [99] + }, + { "t": 472, "s": [0] } + ], + "ix": 11 + }, + "r": { "a": 0, "k": 0, "ix": 10 }, + "p": { + "a": 1, + "k": [ + { + "i": { "x": 0.667, "y": 1 }, + "o": { "x": 0.568, "y": 0.023 }, + "t": 438, + "s": [247, 157.5, 0], + "to": [-6.167, -0.417, 0], + "ti": [6.167, 0.417, 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.779, 0.779], "y": [1, 1] }, + "o": { "x": [0.318, 0.318], "y": [0, 0] }, + "t": 334, + "s": [19, 19] + }, + { + "i": { "x": [0.833, 0.833], "y": [0.833, 0.833] }, + "o": { "x": [0.386, 0.386], "y": [0, 0] }, + "t": 445, + "s": [28, 28] + }, + { "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.960784375668, 0.721568644047, 0.654901981354, 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": ".onTertiary", + "cl": "onTertiary", + "sr": 1, + "ks": { + "o": { + "a": 1, + "k": [ + { + "i": { "x": [0.833], "y": [0.833] }, + "o": { "x": [0.167], "y": [0.167] }, + "t": 465, + "s": [99] + }, + { "t": 472, "s": [0] } + ], + "ix": 11 + }, + "r": { "a": 0, "k": 0, "ix": 10 }, + "p": { + "a": 1, + "k": [ + { + "i": { "x": 0.667, "y": 1 }, + "o": { "x": 0.568, "y": 0.023 }, + "t": 438, + "s": [247, 157.5, 0], + "to": [-6.167, -0.417, 0], + "ti": [6.167, 0.417, 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": [125, 125, 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.779, 0.779], "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.386, 0.386], "y": [0, 0] }, + "t": 445, + "s": [28, 28] + }, + { "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.298039227724, 0.149019613862, 0.101960793138, 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": 5, + "ty": 4, + "nm": ".tertiary", + "cl": "tertiary", + "sr": 1, + "ks": { + "o": { + "a": 1, + "k": [ + { + "i": { "x": [0.833], "y": [0.833] }, + "o": { "x": [0.167], "y": [0.167] }, + "t": 465, + "s": [99] + }, + { "t": 472, "s": [0] } + ], + "ix": 11 + }, + "r": { "a": 0, "k": 0, "ix": 10 }, + "p": { + "a": 1, + "k": [ + { + "i": { "x": 0.667, "y": 1 }, + "o": { "x": 0.568, "y": 0.012 }, + "t": 438, + "s": [177.75, 218, 0], + "to": [4.375, -10.5, 0], + "ti": [-4.375, 10.5, 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.754, 0.754], "y": [1, 1] }, + "o": { "x": [0.16, 0.16], "y": [0, 0] }, + "t": 334, + "s": [19, 19] + }, + { + "i": { "x": [0.833, 0.833], "y": [0.833, 0.833] }, + "o": { "x": [0.401, 0.401], "y": [0, 0] }, + "t": 445, + "s": [28, 28] + }, + { "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.960784375668, 0.721568644047, 0.654901981354, 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": ".onTertiary", + "cl": "onTertiary", + "sr": 1, + "ks": { + "o": { + "a": 1, + "k": [ + { + "i": { "x": [0.833], "y": [0.833] }, + "o": { "x": [0.167], "y": [0.167] }, + "t": 465, + "s": [99] + }, + { "t": 472, "s": [0] } + ], + "ix": 11 + }, + "r": { "a": 0, "k": 0, "ix": 10 }, + "p": { + "a": 1, + "k": [ + { + "i": { "x": 0.667, "y": 1 }, + "o": { "x": 0.568, "y": 0.012 }, + "t": 438, + "s": [177.75, 218, 0], + "to": [4.375, -10.5, 0], + "ti": [-4.375, 10.5, 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": [125, 125, 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": [0.833, 0.833] }, + "o": { "x": [0.16, 0.16], "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.167, 0.167] }, + "t": 445, + "s": [28, 28] + }, + { "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.298039227724, 0.149019613862, 0.101960793138, 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": 7, + "ty": 4, + "nm": ".tertiary", + "cl": "tertiary", + "parent": 2, + "sr": 1, + "ks": { + "o": { + "a": 1, + "k": [ + { + "i": { "x": [0.833], "y": [0.833] }, + "o": { "x": [0.167], "y": [0.167] }, + "t": 138, + "s": [0] + }, + { "t": 147, "s": [100] } + ], + "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": 290, + "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": 297, + "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": 344, + "s": [-3, -10, 0], + "to": [1.667, -1.667, 0], + "ti": [-1.667, 1.667, 0] + }, + { "t": 385, "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": 138, + "s": [13, 13] + }, + { + "i": { "x": [0.667, 0.667], "y": [1, 1] }, + "o": { "x": [0.333, 0.333], "y": [0, 0] }, + "t": 155, + "s": [19, 19] + }, + { + "i": { "x": [0.833, 0.833], "y": [0.833, 0.833] }, + "o": { "x": [0.333, 0.333], "y": [0, 0] }, + "t": 262, + "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": 271, + "s": [13, 13] + }, + { + "i": { "x": [0.667, 0.667], "y": [1, 1] }, + "o": { "x": [0.167, 0.167], "y": [0.167, 0.167] }, + "t": 317, + "s": [13, 13] + }, + { "t": 326, "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.960784375668, 0.721568644047, 0.654901981354, 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": -8, + "op": 438, + "st": -8, + "ct": 1, + "bm": 0 + }, + { + "ddd": 0, + "ind": 8, + "ty": 4, + "nm": ".onTertiary", + "cl": "onTertiary", + "parent": 2, + "sr": 1, + "ks": { + "o": { + "a": 1, + "k": [ + { + "i": { "x": [0.833], "y": [0.833] }, + "o": { "x": [0.167], "y": [0.167] }, + "t": 138, + "s": [0] + }, + { "t": 147, "s": [100] } + ], + "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": 290, + "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": 297, + "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": 344, + "s": [-3, -10, 0], + "to": [1.667, -1.667, 0], + "ti": [-1.667, 1.667, 0] + }, + { "t": 385, "s": [7, -20, 0] } + ], + "ix": 2, + "l": 2 + }, + "a": { "a": 0, "k": [0, 0, 0], "ix": 1, "l": 2 }, + "s": { "a": 0, "k": [125, 125, 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": 138, + "s": [13, 13] + }, + { + "i": { "x": [0.667, 0.667], "y": [1, 1] }, + "o": { "x": [0.333, 0.333], "y": [0, 0] }, + "t": 155, + "s": [19, 19] + }, + { + "i": { "x": [0.833, 0.833], "y": [0.833, 0.833] }, + "o": { "x": [0.333, 0.333], "y": [0, 0] }, + "t": 262, + "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": 271, + "s": [13, 13] + }, + { + "i": { "x": [0.667, 0.667], "y": [1, 1] }, + "o": { "x": [0.167, 0.167], "y": [0.167, 0.167] }, + "t": 317, + "s": [13, 13] + }, + { "t": 326, "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.298039227724, 0.149019613862, 0.101960793138, 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": -8, + "op": 438, + "st": -8, + "ct": 1, + "bm": 0 + }, + { + "ddd": 0, + "ind": 9, + "ty": 4, + "nm": ".tertiary", + "cl": "tertiary", + "parent": 2, + "sr": 1, + "ks": { + "o": { + "a": 1, + "k": [ + { + "i": { "x": [0.833], "y": [0.833] }, + "o": { "x": [0.167], "y": [0.167] }, + "t": 32, + "s": [0] + }, + { + "i": { "x": [0.833], "y": [0.833] }, + "o": { "x": [0.167], "y": [0.167] }, + "t": 41, + "s": [85] + }, + { + "i": { "x": [0.833], "y": [0.833] }, + "o": { "x": [0.167], "y": [0.167] }, + "t": 59, + "s": [100] + }, + { + "i": { "x": [0.833], "y": [0.833] }, + "o": { "x": [0.167], "y": [0.167] }, + "t": 135, + "s": [100] + }, + { + "i": { "x": [0.833], "y": [0.833] }, + "o": { "x": [0.167], "y": [0.167] }, + "t": 149, + "s": [100] + }, + { + "i": { "x": [0.833], "y": [0.833] }, + "o": { "x": [0.167], "y": [0.167] }, + "t": 262, + "s": [100] + }, + { + "i": { "x": [0.833], "y": [0.833] }, + "o": { "x": [0.167], "y": [0.167] }, + "t": 271, + "s": [100] + }, + { + "i": { "x": [0.833], "y": [0.833] }, + "o": { "x": [0.167], "y": [0.167] }, + "t": 317, + "s": [100] + }, + { "t": 326, "s": [100] } + ], + "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": 106, + "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": 127, + "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": 290, + "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": 297, + "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": 344, + "s": [-29, 10, 0], + "to": [-1.667, 1.667, 0], + "ti": [1.667, -1.667, 0] + }, + { "t": 385, "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": 32, + "s": [13, 13] + }, + { + "i": { "x": [0.833, 0.833], "y": [0.833, 0.833] }, + "o": { "x": [0.333, 0.333], "y": [0, 0] }, + "t": 49, + "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": 61, + "s": [13, 13] + }, + { + "i": { "x": [0.667, 0.667], "y": [1, 1] }, + "o": { "x": [0.167, 0.167], "y": [0.167, 0.167] }, + "t": 135, + "s": [13, 13] + }, + { + "i": { "x": [0.667, 0.667], "y": [1, 1] }, + "o": { "x": [0.333, 0.333], "y": [0, 0] }, + "t": 149, + "s": [19, 19] + }, + { + "i": { "x": [0.833, 0.833], "y": [0.833, 0.833] }, + "o": { "x": [0.167, 0.167], "y": [0, 0] }, + "t": 262, + "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": 271, + "s": [13, 13] + }, + { + "i": { "x": [0.833, 0.833], "y": [1, 1] }, + "o": { "x": [0.167, 0.167], "y": [0.167, 0.167] }, + "t": 317, + "s": [13, 13] + }, + { "t": 326, "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.960784375668, 0.721568644047, 0.654901981354, 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": -8, + "op": 438, + "st": -8, + "ct": 1, + "bm": 0 + }, + { + "ddd": 0, + "ind": 10, + "ty": 4, + "nm": ".onTertiary", + "cl": "onTertiary", + "parent": 2, + "sr": 1, + "ks": { + "o": { + "a": 1, + "k": [ + { + "i": { "x": [0.833], "y": [0.833] }, + "o": { "x": [0.167], "y": [0.167] }, + "t": 32, + "s": [0] + }, + { + "i": { "x": [0.833], "y": [0.833] }, + "o": { "x": [0.167], "y": [0.167] }, + "t": 41, + "s": [85] + }, + { + "i": { "x": [0.833], "y": [0.833] }, + "o": { "x": [0.167], "y": [0.167] }, + "t": 59, + "s": [100] + }, + { + "i": { "x": [0.833], "y": [0.833] }, + "o": { "x": [0.167], "y": [0.167] }, + "t": 135, + "s": [100] + }, + { + "i": { "x": [0.833], "y": [0.833] }, + "o": { "x": [0.167], "y": [0.167] }, + "t": 149, + "s": [100] + }, + { + "i": { "x": [0.833], "y": [0.833] }, + "o": { "x": [0.167], "y": [0.167] }, + "t": 262, + "s": [100] + }, + { + "i": { "x": [0.833], "y": [0.833] }, + "o": { "x": [0.167], "y": [0.167] }, + "t": 271, + "s": [100] + }, + { + "i": { "x": [0.833], "y": [0.833] }, + "o": { "x": [0.167], "y": [0.167] }, + "t": 317, + "s": [100] + }, + { "t": 326, "s": [100] } + ], + "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": 106, + "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": 127, + "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": 290, + "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": 297, + "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": 344, + "s": [-29, 10, 0], + "to": [-1.667, 1.667, 0], + "ti": [1.667, -1.667, 0] + }, + { "t": 385, "s": [-39, 20, 0] } + ], + "ix": 2, + "l": 2 + }, + "a": { "a": 0, "k": [0, 0, 0], "ix": 1, "l": 2 }, + "s": { "a": 0, "k": [125, 125, 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": 32, + "s": [13, 13] + }, + { + "i": { "x": [0.833, 0.833], "y": [0.833, 0.833] }, + "o": { "x": [0.333, 0.333], "y": [0, 0] }, + "t": 49, + "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": 61, + "s": [13, 13] + }, + { + "i": { "x": [0.667, 0.667], "y": [1, 1] }, + "o": { "x": [0.167, 0.167], "y": [0.167, 0.167] }, + "t": 135, + "s": [13, 13] + }, + { + "i": { "x": [0.667, 0.667], "y": [1, 1] }, + "o": { "x": [0.333, 0.333], "y": [0, 0] }, + "t": 149, + "s": [19, 19] + }, + { + "i": { "x": [0.833, 0.833], "y": [0.833, 0.833] }, + "o": { "x": [0.167, 0.167], "y": [0, 0] }, + "t": 262, + "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": 271, + "s": [13, 13] + }, + { + "i": { "x": [0.833, 0.833], "y": [1, 1] }, + "o": { "x": [0.167, 0.167], "y": [0.167, 0.167] }, + "t": 317, + "s": [13, 13] + }, + { "t": 326, "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.298039227724, 0.149019613862, 0.101960793138, 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": -8, + "op": 438, + "st": -8, + "ct": 1, + "bm": 0 + }, + { + "ddd": 0, + "ind": 11, + "ty": 4, + "nm": ".surfaceContainer", + "cl": "surfaceContainer", + "td": 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, "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.133333333333, 0.109803929048, 0.125490196078, 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": 12, + "ty": 4, + "nm": ".primary", + "cl": "primary", + "parent": 13, + "tt": 1, + "tp": 11, + "sr": 1, + "ks": { + "o": { "a": 0, "k": 100, "ix": 11 }, + "r": { "a": 0, "k": 0, "ix": 10 }, + "p": { "a": 0, "k": [0.175, 0.195, 0], "ix": 2, "l": 2 }, + "a": { "a": 0, "k": [132.391, 67.66, 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": [ + [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], + [0, 0], + [1.68, 1.62], + [0, 2.28], + [-1.68, 1.62], + [-2.28, 0], + [0, 0], + [-3.9, 3.54], + [0, 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": [ + [-7.14, 0], + [-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, -2.28], + [1.68, -1.68], + [0, 0], + [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, 11.16], + [-8.04, 7.38] + ], + "v": [ + [-1.53, 67.41], + [-20.07, 63.81], + [-33.21, 54.18], + [-40.32, 43.11], + [-40.68, 34.65], + [-35.91, 29.7], + [-29.25, 29.07], + [-24.3, 33.03], + [-19.44, 40.05], + [-11.79, 46.53], + [-1.35, 48.87], + [14.67, 42.48], + [20.88, 27.18], + [14.04, 11.34], + [-2.7, 5.67], + [-6.75, 5.67], + [-12.69, 3.24], + [-15.21, -2.7], + [-12.69, -8.55], + [-6.75, -11.07], + [-3.87, -11.07], + [11.07, -16.38], + [17.01, -30.51], + [11.61, -43.83], + [-2.61, -48.96], + [-11.34, -47.07], + [-17.82, -42.21], + [-22.5, -36.63], + [-27.72, -33.39], + [-34.2, -34.65], + [-38.25, -40.23], + [-37.08, -47.88], + [-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 + }, + "ix": 2 + }, + "nm": "Path 1", + "mn": "ADBE Vector Shape - Group", + "hd": false + }, + { + "ty": "fl", + "c": { + "a": 0, + "k": [0.945098099054, 0.701960784314, 0.901960844152, 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": [222.666, 67.66], "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 + }, + { + "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": [0.945098099054, 0.701960784314, 0.901960844152, 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": [0.945098099054, 0.701960784314, 0.901960844152, 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": 540, + "st": 0, + "ct": 1, + "bm": 0 + }, + { + "ddd": 0, + "ind": 13, + "ty": 3, + "nm": "abc", + "parent": 14, + "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": 14, + "ty": 3, + "nm": ".grey200", + "cl": "grey200", + "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": 15, + "ty": 4, + "nm": ".surfaceContainer", + "cl": "surfaceContainer", + "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.133333333333, 0.109803929048, 0.125490196078, 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 + } + ], + "markers": [], + "props": {} +} diff --git a/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java b/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java index e0da6f4af29..c9b8b2b49b2 100644 --- a/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java +++ b/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java @@ -62,8 +62,10 @@ import com.android.settingslib.search.Indexable; import com.android.settingslib.search.SearchIndexable; import com.android.settingslib.search.SearchIndexableRaw; import com.android.settingslib.widget.IllustrationPreference; +import com.android.settingslib.widget.SettingsThemeHelper; import com.google.android.setupcompat.util.WizardManagerHelper; +import com.google.android.setupdesign.util.ThemeHelper; import java.util.ArrayList; import java.util.List; @@ -113,9 +115,14 @@ public class ToggleScreenMagnificationPreferenceFragment extends public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @NonNull Bundle savedInstanceState) { mFeatureName = getString(R.string.accessibility_screen_magnification_title); + final boolean useExpressiveTheme = WizardManagerHelper.isAnySetupWizard(getIntent()) + ? ThemeHelper.shouldApplyGlifExpressiveStyle(getPrefContext()) + : SettingsThemeHelper.isExpressiveTheme(getPrefContext()); mImageUri = new Uri.Builder().scheme(ContentResolver.SCHEME_ANDROID_RESOURCE) .authority(getPrefContext().getPackageName()) - .appendPath(String.valueOf(R.raw.a11y_magnification_banner)) + .appendPath(String.valueOf(useExpressiveTheme + ? R.raw.accessibility_magnification_banner_expressive + : R.raw.a11y_magnification_banner)) .build(); mTouchExplorationStateChangeListener = isTouchExplorationEnabled -> { mShortcutPreference.setSummary(getShortcutTypeSummary(getPrefContext()));