Merge tag 'android-11.0.0_r29' into r
Android 11.0.0 release 29
Change-Id: I910e34ddb006ca2c04077d41b1e9eee1a21a18c8
diff --git a/.gitreview b/.gitreview
new file mode 100644
index 0000000..db3c9ca
--- /dev/null
+++ b/.gitreview
@@ -0,0 +1,5 @@
+[gerrit]
+host=review.blissroms.com
+port=29418
+project=platform_packages_apps_Settings.git
+defaultbranch=r
diff --git a/Android.bp b/Android.bp
index 8e075b6..755bf68 100644
--- a/Android.bp
+++ b/Android.bp
@@ -27,7 +27,14 @@
"SettingsLib-search-defaults",
],
- srcs: ["src/**/*.java"],
+ srcs: ["src/**/*.java",
+ "Blissify/src/**/*.java"],
+
+ aaptflags: ["--extra-packages com.blissroms.blissify"],
+
+ resource_dirs: ["res",
+ "Blissify/res"
+ ],
static_libs: [
"androidx-constraintlayout_constraintlayout",
@@ -55,6 +62,9 @@
"zxing-core-1.7",
"android.hardware.dumpstate-V1.0-java",
"android.hardware.dumpstate-V1.1-java",
+ "org.lineageos.platform.internal",
+ "airbnb-lottie",
+ "VendorSupport-preference",
],
libs: [
@@ -62,6 +72,10 @@
"ims-common",
"app-compat-annotations",
],
+
+ optimize: {
+ proguard_flags_files: ["proguard-core.flags"],
+ },
}
platform_compat_config {
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index de4ae39..95cbb02 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -106,7 +106,7 @@
<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
<application android:label="@string/settings_label"
- android:icon="@drawable/ic_launcher_settings"
+ android:icon="@mipmap/ic_launcher"
android:theme="@style/Theme.Settings"
android:hardwareAccelerated="true"
android:requiredForAllUsers="true"
@@ -1784,6 +1784,10 @@
android:label="@string/lockpassword_choose_lock_generic_header"
android:excludeFromRecents="true" />
+ <activity android:name=".password.ChooseLockPatternSize"
+ android:exported="false"
+ android:theme="@style/GlifTheme.Light" />
+
<activity android:name=".password.SetupChooseLockPattern"
android:exported="false"
android:theme="@style/GlifTheme.Light" />
@@ -3410,6 +3414,31 @@
android:value="com.android.settings.sound.MediaControlsSettings" />
</activity>
+ <activity android:name=".backup.transport.TransportActivity"
+ android:label="@string/backup_transport_title"
+ android:icon="@drawable/ic_settings_backup"
+ android:exported="false">
+ <intent-filter>
+ <action android:name="android.intent.action.VIEW" />
+ <category android:name="android.intent.category.DEFAULT" />
+ <data android:scheme="settings"
+ android:host="com.android.settings.backup.transport" />
+ </intent-filter>
+ </activity>
+
+ <!-- Blissify -->
+ <activity android:name=".Settings$BlissifySettingsActivity"
+ android:label="@string/blissify_settings_title"
+ android:icon="@drawable/ic_homepage_blissify"
+ android:parentActivityName="com.android.settings">
+ <intent-filter android:priority="31">
+ <action android:name="android.intent.action.MAIN" />
+ <category android:name="com.android.settings.SHORTCUT" />
+ </intent-filter>
+ <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+ android:value="com.blissroms.blissify.Blissify" />
+ </activity>
+
<!-- This is the longest AndroidManifest.xml ever. -->
</application>
</manifest>
diff --git a/Blissify b/Blissify
new file mode 120000
index 0000000..0ce7fdc
--- /dev/null
+++ b/Blissify
@@ -0,0 +1 @@
+../Blissify/
\ No newline at end of file
diff --git a/proguard.flags b/proguard.flags
index b66a786..2510deb 100644
--- a/proguard.flags
+++ b/proguard.flags
@@ -13,6 +13,8 @@
*;
}
+-keep class com.blissroms.blissify.**
+
-keep class * extends com.android.settings.core.TogglePreferenceController {
*;
}
@@ -66,3 +68,6 @@
-keepclasseswithmembers class * extends com.android.settings.slices.SliceBackgroundWorker {
public <init>(android.content.Context, android.net.Uri);
}
+
+# Custom rules
+-keep class com.google.android.settings.** { *; }
diff --git a/res/color/audio_icon.xml b/res/color/audio_icon.xml
new file mode 100644
index 0000000..ca93eca
--- /dev/null
+++ b/res/color/audio_icon.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2014 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+ <item android:state_enabled="false" android:color="#24000000" />
+ <item android:color="#8a000000" />
+</selector>
diff --git a/res/drawable-nodpi/fingerprint_sensor_location_front_overlay.png b/res/drawable-nodpi/fingerprint_sensor_location_front_overlay.png
new file mode 100644
index 0000000..f1e5bde
--- /dev/null
+++ b/res/drawable-nodpi/fingerprint_sensor_location_front_overlay.png
Binary files differ
diff --git a/res/drawable/battery_metter_gauage.xml b/res/drawable/battery_metter_gauage.xml
new file mode 100644
index 0000000..d6c6744
--- /dev/null
+++ b/res/drawable/battery_metter_gauage.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ ~ Aurora Store
+ ~ Copyright (C) 2018 Rahul Kumar Patel <whyorean@gmail.com>
+ ~
+ ~ Yalp Store
+ ~ Copyright (C) 2018 Sergey Yeriomin <yeriomin@gmail.com>
+ ~
+ ~ Aurora Store (a fork of Yalp Store )is free software: you can redistribute it and/or modify
+ ~ it under the terms of the GNU General Public License as published by
+ ~ the Free Software Foundation, either version 2 of the License, or
+ ~ (at your option) any later version.
+ ~
+ ~ Aurora Store is distributed in the hope that it will be useful,
+ ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ ~ GNU General Public License for more details.
+ ~
+ ~ You should have received a copy of the GNU General Public License
+ ~ along with Aurora Store. If not, see <http://www.gnu.org/licenses/>.
+ -->
+
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+ android:shape="rectangle">
+ <corners android:radius="6000dp" />
+ <solid android:color="@android:color/transparent" />
+ <stroke
+ android:width="6px"
+ android:color="?android:attr/colorAccent" />
+</shape>
\ No newline at end of file
diff --git a/res/drawable/ic_audio_ring.xml b/res/drawable/ic_audio_ring.xml
new file mode 100644
index 0000000..a7f04a8
--- /dev/null
+++ b/res/drawable/ic_audio_ring.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2016 The CyanogenMod Project
+ Copyright (C) 2018 The LineageOS Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24"
+ android:tint="?android:attr/colorControlNormal">
+
+ <path
+ android:fillColor="@android:color/black"
+ android:pathData="M10,21H14A2,2 0 0,1 12,23A2,2 0 0,1 10,21M21,19V20H3V19L5,17V11C5,7.9 7.03,5.17 10,4.29C10,4.19 10,4.1 10,4A2,2 0 0,1 12,2A2,2 0 0,1 14,4C14,4.1 14,4.19 14,4.29C16.97,5.17 19,7.9 19,11V17L21,19M17,11A5,5 0 0,0 12,6A5,5 0 0,0 7,11V18H17V11M19.75,3.19L18.33,4.61C20.04,6.3 21,8.6 21,11H23C23,8.07 21.84,5.25 19.75,3.19M1,11H3C3,8.6 3.96,6.3 5.67,4.61L4.25,3.19C2.16,5.25 1,8.07 1,11Z" />
+</vector>
diff --git a/res/drawable/ic_bliss.xml b/res/drawable/ic_bliss.xml
new file mode 100644
index 0000000..d5e4191
--- /dev/null
+++ b/res/drawable/ic_bliss.xml
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2018 BlissRoms Project
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+ http://www.apache.org/licenses/LICENSE-2.0
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="1020dp"
+ android:height="228dp"
+ android:viewportWidth="1020"
+ android:viewportHeight="228">
+
+ <path
+ android:fillColor="?android:attr/colorAccent"
+ android:fillAlpha="1.00"
+ android:strokeAlpha="1.00"
+ android:strokeWidth="1"
+ android:pathData="M 503.74 97.02 C 505.30 82.03 509.07 66.82 517.92 54.36 C 525.18 63.58 529.76 74.68 531.84 86.19 C 532.55 90.46 534.08 95.09 532.11 99.23 C 528.92 106.74 525.14 114.04 523.14 121.99 C 520.21 130.06 519.09 138.59 517.43 146.98 C 515.27 134.45 512.65 121.89 507.60 110.17 C 505.96 105.92 503.21 101.77 503.74 97.02 Z" />
+ <path
+ android:fillColor="?android:attr/colorAccent"
+ android:fillAlpha="1.00"
+ android:strokeAlpha="1.00"
+ android:strokeWidth="1"
+ android:pathData="M 480.10 128.05 C 475.96 110.06 476.03 91.26 479.51 73.16 C 496.70 88.34 507.08 109.98 512.17 132.06 C 515.34 144.99 515.98 158.32 516.37 171.57 C 512.69 166.91 508.92 162.32 505.41 157.52 C 498.95 148.49 490.99 140.69 483.26 132.77 C 481.97 131.38 480.55 129.95 480.10 128.05 Z" />
+ <path
+ android:fillColor="?android:attr/colorAccent"
+ android:fillAlpha="1.00"
+ android:strokeAlpha="1.00"
+ android:strokeWidth="1"
+ android:pathData="M 537.98 93.99 C 543.03 86.51 548.21 78.97 555.26 73.19 C 558.51 90.53 559.09 108.62 555.23 125.91 C 554.56 131.09 549.84 134.03 546.65 137.65 C 536.14 147.81 527.86 159.93 518.96 171.45 C 519.00 163.25 518.60 154.99 519.81 146.84 C 522.48 128.31 528.17 110.02 537.98 93.99 Z" />
+ <path
+ android:fillColor="?android:attr/colorAccent"
+ android:fillAlpha="1.00"
+ android:strokeAlpha="1.00"
+ android:strokeWidth="1"
+ android:pathData="M 445.28 77.61 C 454.99 81.44 463.24 88.05 470.51 95.42 C 472.23 97.32 474.94 98.97 474.72 101.90 C 475.17 110.30 475.90 118.68 477.18 127.00 C 471.02 122.22 464.60 117.77 457.78 113.96 C 455.58 112.73 453.15 111.40 452.11 108.97 C 447.84 99.09 445.24 88.41 445.28 77.61 Z" />
+ <path
+ android:fillColor="?android:attr/colorAccent"
+ android:fillAlpha="1.00"
+ android:strokeAlpha="1.00"
+ android:strokeWidth="1"
+ android:pathData="M 561.34 98.41 C 569.18 89.53 578.78 82.17 589.63 77.36 C 589.44 89.05 586.76 100.88 581.19 111.19 C 573.23 116.30 565.00 121.06 557.61 127.03 C 558.74 119.40 559.66 111.73 559.87 104.01 C 559.95 102.08 559.84 99.88 561.34 98.41 Z" />
+ <path
+ android:fillColor="?android:attr/colorAccent"
+ android:fillAlpha="1.00"
+ android:strokeAlpha="1.00"
+ android:strokeWidth="1"
+ android:pathData="M 422.90 105.18 C 429.32 106.57 435.91 107.35 442.11 109.62 C 460.13 115.85 475.65 127.64 488.64 141.39 C 498.42 151.10 506.13 162.59 514.31 173.63 C 496.74 172.74 478.94 169.76 462.94 162.17 C 451.67 156.89 444.18 146.44 438.07 136.00 C 432.03 126.23 427.63 115.60 422.90 105.18 Z" />
+ <path
+ android:fillColor="?android:attr/colorAccent"
+ android:fillAlpha="1.00"
+ android:strokeAlpha="1.00"
+ android:strokeWidth="1"
+ android:pathData="M 595.01 108.81 C 600.52 107.06 606.27 106.33 611.93 105.21 C 604.56 122.44 596.29 139.63 583.84 153.82 C 574.55 162.67 561.97 166.83 549.75 169.74 C 540.15 171.90 530.37 173.01 520.56 173.63 C 531.26 157.70 543.62 142.80 558.00 130.06 C 568.85 120.73 581.35 113.18 595.01 108.81 Z" />
+ <path
+ android:fillColor="?android:attr/colorAccent"
+ android:fillAlpha="1.00"
+ android:strokeAlpha="1.00"
+ android:strokeWidth="1"
+ android:pathData="M 282.28 83.43 C 286.74 81.73 291.78 86.24 290.61 90.85 C 289.87 95.69 283.12 97.76 279.80 94.16 C 276.31 91.07 277.83 84.70 282.28 83.43 Z" />
+ <path
+ android:fillColor="?android:attr/colorAccent"
+ android:fillAlpha="1.00"
+ android:strokeAlpha="1.00"
+ android:strokeWidth="1"
+ android:pathData="M 201.37 83.94 C 204.46 83.81 207.55 83.81 210.65 83.95 C 210.44 93.82 210.94 103.70 210.20 113.55 C 214.48 107.67 221.75 104.27 229.03 105.00 C 237.95 105.46 245.34 112.37 248.57 120.37 C 253.19 131.78 249.66 146.25 239.30 153.31 C 230.32 159.74 216.53 157.52 210.22 148.36 C 210.21 150.72 210.19 153.09 210.19 155.45 C 207.26 155.46 204.34 155.46 201.41 155.46 C 201.36 131.62 201.45 107.78 201.37 83.94 M 222.43 113.65 C 208.50 116.80 206.10 137.92 217.03 145.86 C 222.08 149.57 229.60 149.56 234.58 145.72 C 243.86 138.75 243.66 122.58 234.16 115.88 C 230.82 113.46 226.42 112.82 222.43 113.65 Z" />
+ <path
+ android:fillColor="?android:attr/colorAccent"
+ android:fillAlpha="1.00"
+ android:strokeAlpha="1.00"
+ android:strokeWidth="1"
+ android:pathData="M 258.46 83.95 C 261.54 83.83 264.62 83.83 267.71 83.89 C 267.63 107.77 267.84 131.66 267.60 155.53 C 264.57 155.45 261.54 155.44 258.51 155.46 C 258.46 131.62 258.56 107.79 258.46 83.95 Z" />
+ <path
+ android:fillColor="?android:attr/colorAccent"
+ android:fillAlpha="1.00"
+ android:strokeAlpha="1.00"
+ android:strokeWidth="1"
+ android:pathData="M 303.65 109.69 C 313.75 101.43 331.87 103.87 337.60 116.25 C 334.90 117.38 332.20 118.50 329.50 119.63 C 325.81 112.72 315.07 110.68 309.59 116.50 C 307.53 118.83 308.91 122.41 311.60 123.50 C 318.87 126.83 327.72 126.71 334.03 132.13 C 337.40 134.60 338.37 139.04 338.30 142.99 C 337.89 148.97 332.92 153.56 327.57 155.53 C 321.39 157.72 314.28 157.60 308.33 154.72 C 303.52 152.25 299.91 147.95 297.71 143.06 C 300.42 141.88 303.14 140.72 305.86 139.58 C 307.79 143.54 310.94 147.21 315.38 148.32 C 319.85 149.41 325.51 148.60 328.32 144.60 C 330.18 141.33 327.45 137.78 324.40 136.61 C 317.51 133.73 309.33 133.66 303.39 128.67 C 297.64 124.02 297.88 114.24 303.65 109.69 Z" />
+ <path
+ android:fillColor="?android:attr/colorAccent"
+ android:fillAlpha="1.00"
+ android:strokeAlpha="1.00"
+ android:strokeWidth="1"
+ android:pathData="M 348.96 109.86 C 359.01 101.39 377.34 103.79 383.09 116.25 C 380.39 117.39 377.69 118.51 374.98 119.61 C 371.33 112.77 360.79 110.73 355.24 116.33 C 353.18 118.45 354.10 122.10 356.74 123.29 C 363.91 126.84 372.75 126.57 379.15 131.82 C 382.80 134.28 383.90 138.95 383.79 143.10 C 383.37 148.90 378.57 153.38 373.41 155.40 C 367.02 157.77 359.58 157.65 353.47 154.53 C 348.83 152.01 345.35 147.83 343.21 143.05 C 345.92 141.89 348.64 140.72 351.36 139.57 C 353.24 143.40 356.20 146.96 360.44 148.21 C 364.99 149.48 370.77 148.72 373.76 144.72 C 375.61 141.63 373.25 138.03 370.30 136.80 C 363.39 133.73 355.13 133.77 349.07 128.82 C 343.20 124.31 343.31 114.51 348.96 109.86 Z" />
+ <path
+ android:fillColor="?android:attr/colorAccent"
+ android:fillAlpha="1.00"
+ android:strokeAlpha="1.00"
+ android:strokeWidth="1"
+ android:pathData="M 664.75 114.70 C 668.51 106.96 678.14 103.07 686.21 106.17 C 685.11 109.08 684.74 112.44 683.09 115.03 C 680.10 114.88 676.99 113.96 674.09 115.16 C 668.93 117.12 665.27 122.42 665.15 127.93 C 665.01 137.10 665.15 146.28 665.10 155.45 C 662.03 155.46 658.96 155.46 655.90 155.45 C 655.90 139.12 655.87 122.78 655.92 106.45 C 658.84 106.45 661.76 106.45 664.69 106.45 C 664.69 109.20 664.70 111.95 664.75 114.70 Z" />
+ <path
+ android:fillColor="?android:attr/colorAccent"
+ android:fillAlpha="1.00"
+ android:strokeAlpha="1.00"
+ android:strokeWidth="1"
+ android:pathData="M 705.51 105.57 C 713.31 103.87 722.10 105.41 728.10 110.92 C 739.49 120.70 739.72 140.54 728.56 150.57 C 719.12 159.58 702.37 159.09 693.48 149.53 C 686.72 142.62 685.06 131.95 687.53 122.84 C 689.80 114.39 696.92 107.40 705.51 105.57 M 708.39 113.62 C 695.28 116.20 691.62 134.67 700.27 143.75 C 705.11 149.18 713.94 150.16 719.98 146.22 C 730.12 139.70 730.17 122.52 720.14 115.87 C 716.75 113.51 712.40 112.83 708.39 113.62 Z" />
+ <path
+ android:fillColor="?android:attr/colorAccent"
+ android:fillAlpha="1.00"
+ android:strokeAlpha="1.00"
+ android:strokeWidth="1"
+ android:pathData="M 753.01 113.55 C 757.05 107.88 764.04 104.00 771.13 105.12 C 776.67 105.63 781.51 109.28 784.06 114.15 C 789.82 104.58 804.40 101.59 812.95 109.07 C 818.96 114.61 818.70 123.45 818.61 130.98 C 818.59 139.14 818.62 147.30 818.59 155.46 C 815.52 155.46 812.47 155.46 809.41 155.46 C 809.36 146.32 809.42 137.18 809.39 128.04 C 809.26 123.80 809.22 119.07 806.26 115.71 C 803.83 113.46 800.21 113.35 797.10 113.38 C 790.19 114.23 786.34 121.58 786.11 127.95 C 785.83 137.11 786.09 146.29 786.00 155.46 C 782.93 155.46 779.86 155.46 776.80 155.45 C 776.78 146.31 776.82 137.17 776.79 128.02 C 776.67 123.92 776.60 119.43 773.97 116.03 C 771.74 113.55 768.07 113.44 764.98 113.34 C 759.60 113.59 755.90 118.32 754.32 123.05 C 753.16 127.28 753.39 131.70 753.40 136.04 C 753.40 142.51 753.40 148.98 753.39 155.45 C 750.32 155.47 747.25 155.46 744.18 155.42 C 744.21 139.10 744.19 122.79 744.19 106.47 C 747.12 106.45 750.05 106.45 752.99 106.46 C 752.99 108.82 753.00 111.19 753.01 113.55 Z" />
+ <path
+ android:fillColor="?android:attr/colorAccent"
+ android:fillAlpha="1.00"
+ android:strokeAlpha="1.00"
+ android:strokeWidth="1"
+ android:pathData="M 279.70 106.46 C 282.77 106.45 285.83 106.45 288.90 106.46 C 288.90 122.79 288.90 139.12 288.90 155.45 C 285.83 155.46 282.77 155.46 279.70 155.45 C 279.70 139.12 279.69 122.79 279.70 106.46 Z" />
+</vector>
\ No newline at end of file
diff --git a/res/drawable/ic_dashboard_blissify.xml b/res/drawable/ic_dashboard_blissify.xml
new file mode 100644
index 0000000..ee4b0fb
--- /dev/null
+++ b/res/drawable/ic_dashboard_blissify.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2018 The BlissRoms Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<vector
+ android:height="24dp"
+ android:viewportHeight="1000"
+ android:viewportWidth="1000"
+ android:width="24dp"
+ xmlns:android="http://schemas.android.com/apk/res/android">
+ <path
+ android:fillColor="#00A8EC"
+ android:pathData="M500,500m-424.4,0a424.4,424.4 0,1 1,848.79 0a424.4,424.4 0,1 1,-848.79 0"
+ />
+ <path
+ android:fillColor="#EDEDED"
+ android:pathData="M500,499.33m-396.56,0a396.56,396.56 0,1 1,793.12 0a396.56,396.56 0,1 1,-793.12 0"
+ />
+ <path
+ android:fillColor="#00A8EC"
+ android:fillType="nonZero"
+ android:pathData="M500.98,290.17C509.05,298.83 515.67,308.77 521.55,319.03C539.55,350.43 550.19,385.66 554.98,421.43C555.69,426.78 556.31,432.14 556.87,437.51C557.04,439.14 556.16,440.63 555.49,442.07C547.88,455.63 540.65,469.44 534.87,483.91C525.44,507.52 516.56,531.44 510.71,556.23C505.91,575.25 503.34,594.71 500.49,614.09C500.23,615.74 499.85,617.37 499.43,619C496.63,600.45 493.62,581.91 489.71,563.56C486.21,547.23 481.66,531.15 476.07,515.41C472.13,504.58 467.75,493.92 463.27,483.3C459.7,475.01 456.45,466.57 452.12,458.63C451.02,456.44 449.49,454.26 449.7,451.67C452.31,405.15 462.73,358.56 484.05,316.92C489.02,307.61 494.33,298.39 500.98,290.17Z"
+ />
+ <group>
+ <clip-path android:pathData="M499.68,290.17l57.21,0l0,328.83l-57.21,0z M 0,0"/>
+ <path
+ android:fillColor="#008DC6"
+ android:fillType="nonZero"
+ android:pathData="M1000.29,418.81C1023.29,443.49 1042.16,471.81 1058.91,501.06C1110.2,590.53 1140.53,690.93 1154.18,792.86C1156.18,808.1 1157.97,823.37 1159.54,838.67C1160.04,843.34 1157.54,847.57 1155.62,851.67C1133.93,890.32 1113.32,929.67 1096.85,970.91C1070,1038.19 1044.68,1106.36 1028,1177C1014.32,1231.18 1007,1286.65 998.88,1341.87C998.15,1346.58 997.06,1351.23 995.88,1355.87C987.88,1303 979.32,1250.16 968.16,1197.87C958.199,1151.35 945.222,1105.52 929.31,1060.68C918.07,1029.82 905.6,999.42 892.82,969.16C882.66,945.54 873.38,921.48 861.04,898.88C857.91,892.62 853.57,886.4 854.15,879.03C861.59,746.47 891.3,613.71 952.05,495.03C966.21,468.51 981.34,442.23 1000.29,418.81Z"
+ />
+ </group>
+ <path
+ android:fillColor="#00A8EC"
+ android:fillType="nonZero"
+ android:pathData="M362.74,356.4C368.93,360.62 374.24,365.97 379.55,371.21C391.29,382.62 401.81,395.25 411.4,408.5C436.74,443.11 456.16,481.92 469.55,522.64C481.45,558.26 488.83,595.31 492.58,632.66C494.67,653.79 495.5,675.02 495.65,696.25C495.71,697.96 495.45,699.66 494.88,701.28C490.81,697.86 488.02,693.31 484.79,689.17C474.07,674.97 463.53,660.64 452.66,646.55C441.67,631.98 429.11,618.7 416.66,605.36C409.69,597.94 402.76,590.49 395.56,583.3C389.05,576.01 381.63,569.61 374.43,563.02C371.95,560.6 368.91,558.65 367.11,555.62C365.66,552.21 365.06,548.53 364.06,544.98C357.35,518.16 354.07,490.52 353.49,462.89C352.8,434.99 354.48,407.09 358.5,379.48C359.74,371.76 360.99,364.03 362.74,356.4Z"
+ />
+ <path
+ android:fillColor="#008DC6"
+ android:fillType="nonZero"
+ android:pathData="M627.18,363.55C629.99,361.03 632.77,358.39 636.09,356.53C644.23,396.76 646.99,438.06 644.72,479.03C643.32,502.64 639.88,526.16 633.7,549C632.98,551.44 632.6,554.11 631.03,556.2C629.27,558.94 626.76,561.07 624.31,563.15C616.44,569.77 609.4,577.27 601.85,584.21C591.75,594.36 582.13,604.97 572.45,615.52C562.48,626.57 553.17,638.18 544.02,649.91C533.75,662.94 523.74,676.18 513.56,689.28C510.25,693.27 508.11,698.32 503.75,701.36C502.77,689.66 503.51,677.89 503.82,666.18C506.46,599 520.96,531.78 550.03,470.97C566.99,435.73 588.89,402.72 615.91,374.38C619.49,370.6 623.39,367.12 627.18,363.55Z"
+ />
+ <path android:fillColor="#008DC6" android:fillType="nonZero" android:pathData="M749.65,375.45C752.79,374.02 755.82,372.26 759.16,371.29C760.15,404.68 752.02,437.71 739.45,468.46C736.86,474.93 734.08,481.33 731.38,487.76C730.53,490.66 727.52,491.78 725.12,493.1C712.89,499.01 701.01,505.64 689.56,512.96C673.42,522.98 658.63,534.95 643.28,546.09C645.34,536.68 646.73,527.14 648.29,517.64C651.82,496.31 652.99,474.65 652.86,453.07C652.99,451.44 652.86,449.56 654.05,448.31C657.49,444.28 661.29,440.59 665.03,436.84C683.63,417.97 704.12,400.78 726.87,387.09C734.16,382.64 741.92,379.04 749.65,375.45Z"/>
+ <path android:fillColor="#00A8EC" android:fillType="nonZero" android:pathData="M239.49,371.47C248.99,374.38 257.8,379.14 266.48,383.91C295.06,400.71 320.31,422.66 342.98,446.73C343.98,447.95 345.38,449.09 345.57,450.76C346.07,456.9 345.49,463.09 345.98,469.24C346.79,481.34 347.04,493.5 348.71,505.52C350.28,519.17 353.62,532.55 355.27,546.16C348.82,541.49 342.77,536.3 336.3,531.67C324.32,522.77 311.98,514.33 299.1,506.8C290.09,501.45 280.68,496.84 271.38,492.06C269.82,491.28 268.18,490.34 267.35,488.73C264.3,482.6 261.74,476.23 259.16,469.89C249.8,446.86 243.24,422.66 240.5,397.97C239.28,389.19 239.34,380.3 239.49,371.47Z"/>
+ <path android:fillColor="#00A8EC" android:fillType="nonZero" android:pathData="M158.67,468.52C173.73,470.01 188.62,472.94 203.3,476.59C252.65,488.87 298.71,512.8 338.69,544.03C370.76,568.94 400.02,597.39 426.51,628.15C447.62,652.37 466.37,678.51 485.4,704.36C486.35,705.69 487.21,707.06 488.07,708.46C451,706.74 414,702.09 377.84,693.63C348.79,686.86 320.12,677.54 293.84,663.26C275.72,653.66 259.77,640.16 246.81,624.31C242.86,619.67 239.4,614.65 235.74,609.78C210.59,574.98 190,537.09 172.42,497.98C167.95,488.1 163.06,478.42 158.67,468.52Z"/>
+ <path android:fillColor="#008DC6" android:fillType="nonZero" android:pathData="M835.61,469.14C837.24,468.88 838.89,468.71 840.55,468.63C832.72,485.37 824.67,502.01 816.68,518.68C797.42,559.5 773.82,598.45 744.71,633.03C734.56,645.19 721.07,653.88 707.54,661.81C687.64,673.13 666.09,681.29 644.1,687.56C606.15,698.54 566.88,704.47 527.52,707.37C521.87,707.69 516.24,708.33 510.57,708.16C549.73,651.96 593.85,598.57 646.73,554.68C673.94,532.22 703.62,512.57 735.62,497.57C759.56,486.52 784.75,478.37 810.63,473.31C818.91,471.66 827.28,470.5 835.61,469.14Z"/>
+</vector>
diff --git a/res/drawable/ic_dns.xml b/res/drawable/ic_dns.xml
new file mode 100644
index 0000000..d0d5f84
--- /dev/null
+++ b/res/drawable/ic_dns.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2019 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24.0"
+ android:viewportHeight="24.0"
+ android:tint="?android:attr/colorControlNormal">
+
+ <path
+ android:fillColor="#FFFFFFFF"
+ android:pathData="M19 15v4H5v-4h14m1-2H4c-0.55 0-1 0.45-1 1v6c0 0.55 0.45 1 1 1h16c0.55 0 1-0.45 1-1v-6c0-0.55-0.45-1-1-1zM7 18.5c-0.82 0-1.5-0.67-1.5-1.5s0.68-1.5 1.5-1.5 1.5 0.67 1.5 1.5-0.67 1.5-1.5 1.5zM19 5v4H5V5h14m1-2H4c-0.55 0-1 0.45-1 1v6c0 0.55 0.45 1 1 1h16c0.55 0 1-0.45 1-1V4c0-0.55-0.45-1-1-1zM7 8.5c-0.82 0-1.5-0.67-1.5-1.5S6.18 5.5 7 5.5s1.5 0.68 1.5 1.5S7.83 8.5 7 8.5z" />
+</vector>
diff --git a/res/drawable/ic_homepage_blissify.xml b/res/drawable/ic_homepage_blissify.xml
new file mode 100644
index 0000000..edd6047
--- /dev/null
+++ b/res/drawable/ic_homepage_blissify.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2018 The Android Open Source Project
+ Copyright (C) 2014-2020 The BlissRoms Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <item>
+ <com.android.settingslib.widget.AdaptiveIconShapeDrawable
+ android:width="@dimen/dashboard_tile_image_size"
+ android:height="@dimen/dashboard_tile_image_size"
+ android:color="@color/homepage_blissify_background" />
+ </item>
+
+ <item
+ android:width="@dimen/dashboard_tile_foreground_image_size"
+ android:height="@dimen/dashboard_tile_foreground_image_size"
+ android:start="@dimen/dashboard_tile_foreground_image_inset"
+ android:top="@dimen/dashboard_tile_foreground_image_inset"
+ android:drawable="@drawable/ic_settings_blissify" />
+</layer-list>
diff --git a/res/drawable/ic_launcher_settings.xml b/res/drawable/ic_launcher_settings.xml
deleted file mode 100644
index 9ede59d..0000000
--- a/res/drawable/ic_launcher_settings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
- <background android:drawable="@color/icon_launcher_setting_color"/>
- <foreground android:drawable="@mipmap/ic_launcher_settings"/>
-</adaptive-icon>
diff --git a/res/drawable/ic_power_system_new.xml b/res/drawable/ic_power_system_new.xml
new file mode 100644
index 0000000..d8c462e
--- /dev/null
+++ b/res/drawable/ic_power_system_new.xml
@@ -0,0 +1,25 @@
+<!--
+Copyright (C) 2016 The Android Open Source Project
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24.0dp"
+ android:height="24.0dp"
+ android:viewportWidth="24.0"
+ android:viewportHeight="24.0"
+ android:tint="?android:attr/colorControlNormal">
+ <path
+ android:fillColor="#FFFFFFFF"
+ android:pathData="M15,5H14V4H15M10,5H9V4H10M15.53,2.16L16.84,0.85C17.03,0.66 17.03,0.34 16.84,0.14C16.64,-0.05 16.32,-0.05 16.13,0.14L14.65,1.62C13.85,1.23 12.95,1 12,1C11.04,1 10.14,1.23 9.34,1.63L7.85,0.14C7.66,-0.05 7.34,-0.05 7.15,0.14C6.95,0.34 6.95,0.66 7.15,0.85L8.46,2.16C6.97,3.26 6,5 6,7H18C18,5 17,3.25 15.53,2.16M20.5,8A1.5,1.5 0 0,0 19,9.5V16.5A1.5,1.5 0 0,0 20.5,18A1.5,1.5 0 0,0 22,16.5V9.5A1.5,1.5 0 0,0 20.5,8M3.5,8A1.5,1.5 0 0,0 2,9.5V16.5A1.5,1.5 0 0,0 3.5,18A1.5,1.5 0 0,0 5,16.5V9.5A1.5,1.5 0 0,0 3.5,8M6,18A1,1 0 0,0 7,19H8V22.5A1.5,1.5 0 0,0 9.5,24A1.5,1.5 0 0,0 11,22.5V19H13V22.5A1.5,1.5 0 0,0 14.5,24A1.5,1.5 0 0,0 16,22.5V19H17A1,1 0 0,0 18,18V8H6V18Z" />
+</vector>
diff --git a/res/drawable/ic_security_pattern_3x3.xml b/res/drawable/ic_security_pattern_3x3.xml
new file mode 100644
index 0000000..b8e4df4
--- /dev/null
+++ b/res/drawable/ic_security_pattern_3x3.xml
@@ -0,0 +1,26 @@
+<!--
+ Copyright (C) 2016 The CyanogenMod Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24.0"
+ android:viewportHeight="24.0">
+ <path
+ android:pathData="M4,17.268C3.402,17.613 3,18.26 3,19C3,20.105 3.895,21 5,21C5.74,21 6.387,20.598 6.732,20L9.268,20C9.613,20.598 10.26,21 11,21C12.105,21 13,20.105 13,19C13,17.895 12.105,17 11,17C10.26,17 9.613,17.402 9.268,18L6.732,18C6.557,17.696 6.304,17.443 6,17.268L6,14.732C6.598,14.387 7,13.74 7,13C7,11.895 6.105,11 5,11C3.895,11 3,11.895 3,13C3,13.74 3.402,14.387 4,14.732L4,17.268ZM21,11L21,9.5C21,8.67 20.33,8 19.5,8C20.33,8 21,7.33 21,6.5L21,5C21,3.89 20.1,3 19,3L15,3L15,5L19,5L19,7L17,7L17,9L19,9L19,11L15,11L15,13L19,13C20.1,13 21,12.11 21,11ZM5,9C6.105,9 7,8.105 7,7C7,5.895 6.105,5 5,5C3.895,5 3,5.895 3,7C3,8.105 3.895,9 5,9ZM11,9C12.105,9 13,8.105 13,7C13,5.895 12.105,5 11,5C9.895,5 9,5.895 9,7C9,8.105 9.895,9 11,9ZM11,15C12.105,15 13,14.105 13,13C13,11.895 12.105,11 11,11C9.895,11 9,11.895 9,13C9,14.105 9.895,15 11,15ZM17,21C18.105,21 19,20.105 19,19C19,17.895 18.105,17 17,17C15.895,17 15,17.895 15,19C15,20.105 15.895,21 17,21Z"
+ android:strokeColor="#00000000"
+ android:fillColor="#777777"
+ android:strokeWidth="1"/>
+</vector>
diff --git a/res/drawable/ic_security_pattern_4x4.xml b/res/drawable/ic_security_pattern_4x4.xml
new file mode 100644
index 0000000..92c580f
--- /dev/null
+++ b/res/drawable/ic_security_pattern_4x4.xml
@@ -0,0 +1,26 @@
+<!--
+ Copyright (C) 2016 The CyanogenMod Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24.0"
+ android:viewportHeight="24.0">
+ <path
+ android:pathData="M4,17.268C3.402,17.613 3,18.26 3,19C3,20.105 3.895,21 5,21C5.74,21 6.387,20.598 6.732,20L9.268,20C9.613,20.598 10.26,21 11,21C12.105,21 13,20.105 13,19C13,17.895 12.105,17 11,17C10.26,17 9.613,17.402 9.268,18L6.732,18C6.557,17.696 6.304,17.443 6,17.268L6,14.732C6.598,14.387 7,13.74 7,13C7,11.895 6.105,11 5,11C3.895,11 3,11.895 3,13C3,13.74 3.402,14.387 4,14.732L4,17.268ZM21,13L21,3L19,3L19,7L17,7L17,3L15,3L15,9L19,9L19,13L21,13ZM5,9C6.105,9 7,8.105 7,7C7,5.895 6.105,5 5,5C3.895,5 3,5.895 3,7C3,8.105 3.895,9 5,9ZM11,9C12.105,9 13,8.105 13,7C13,5.895 12.105,5 11,5C9.895,5 9,5.895 9,7C9,8.105 9.895,9 11,9ZM11,15C12.105,15 13,14.105 13,13C13,11.895 12.105,11 11,11C9.895,11 9,11.895 9,13C9,14.105 9.895,15 11,15ZM17,21C18.105,21 19,20.105 19,19C19,17.895 18.105,17 17,17C15.895,17 15,17.895 15,19C15,20.105 15.895,21 17,21Z"
+ android:strokeColor="#00000000"
+ android:fillColor="#777777"
+ android:strokeWidth="1"/>
+</vector>
diff --git a/res/drawable/ic_security_pattern_5x5.xml b/res/drawable/ic_security_pattern_5x5.xml
new file mode 100644
index 0000000..7b4daba
--- /dev/null
+++ b/res/drawable/ic_security_pattern_5x5.xml
@@ -0,0 +1,26 @@
+<!--
+ Copyright (C) 2016 The CyanogenMod Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24.0"
+ android:viewportHeight="24.0">
+ <path
+ android:pathData="M4,17.268C3.402,17.613 3,18.26 3,19C3,20.105 3.895,21 5,21C5.74,21 6.387,20.598 6.732,20L9.268,20C9.613,20.598 10.26,21 11,21C12.105,21 13,20.105 13,19C13,17.895 12.105,17 11,17C10.26,17 9.613,17.402 9.268,18L6.732,18C6.557,17.696 6.304,17.443 6,17.268L6,14.732C6.598,14.387 7,13.74 7,13C7,11.895 6.105,11 5,11C3.895,11 3,11.895 3,13C3,13.74 3.402,14.387 4,14.732L4,17.268ZM21,11L21,9C21,7.89 20.1,7 19,7L17,7L17,5L21,5L21,3L15,3L15,9L19,9L19,11L15,11L15,13L19,13C20.1,13 21,12.11 21,11ZM5,9C6.105,9 7,8.105 7,7C7,5.895 6.105,5 5,5C3.895,5 3,5.895 3,7C3,8.105 3.895,9 5,9ZM11,9C12.105,9 13,8.105 13,7C13,5.895 12.105,5 11,5C9.895,5 9,5.895 9,7C9,8.105 9.895,9 11,9ZM11,15C12.105,15 13,14.105 13,13C13,11.895 12.105,11 11,11C9.895,11 9,11.895 9,13C9,14.105 9.895,15 11,15ZM17,21C18.105,21 19,20.105 19,19C19,17.895 18.105,17 17,17C15.895,17 15,17.895 15,19C15,20.105 15.895,21 17,21Z"
+ android:strokeColor="#00000000"
+ android:fillColor="#777777"
+ android:strokeWidth="1"/>
+</vector>
diff --git a/res/drawable/ic_security_pattern_6x6.xml b/res/drawable/ic_security_pattern_6x6.xml
new file mode 100644
index 0000000..1861284
--- /dev/null
+++ b/res/drawable/ic_security_pattern_6x6.xml
@@ -0,0 +1,26 @@
+<!--
+ Copyright (C) 2016 The CyanogenMod Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24.0"
+ android:viewportHeight="24.0">
+ <path
+ android:pathData="M17,13L19,13C20.1,13 21,12.11 21,11L21,9C21,7.89 20.1,7 19,7L17,7L17,5L21,5L21,3L17,3C15.9,3 15,3.89 15,5L15,11C15,12.11 15.9,13 17,13L17,13ZM4,17.268C3.402,17.613 3,18.26 3,19C3,20.105 3.895,21 5,21C5.74,21 6.387,20.598 6.732,20L9.268,20C9.613,20.598 10.26,21 11,21C12.105,21 13,20.105 13,19C13,17.895 12.105,17 11,17C10.26,17 9.613,17.402 9.268,18L6.732,18C6.557,17.696 6.304,17.443 6,17.268L6,14.732C6.598,14.387 7,13.74 7,13C7,11.895 6.105,11 5,11C3.895,11 3,11.895 3,13C3,13.74 3.402,14.387 4,14.732L4,17.268ZM17,9L19,9L19,11L17,11L17,9ZM5,9C6.105,9 7,8.105 7,7C7,5.895 6.105,5 5,5C3.895,5 3,5.895 3,7C3,8.105 3.895,9 5,9ZM11,9C12.105,9 13,8.105 13,7C13,5.895 12.105,5 11,5C9.895,5 9,5.895 9,7C9,8.105 9.895,9 11,9ZM11,15C12.105,15 13,14.105 13,13C13,11.895 12.105,11 11,11C9.895,11 9,11.895 9,13C9,14.105 9.895,15 11,15ZM17,21C18.105,21 19,20.105 19,19C19,17.895 18.105,17 17,17C15.895,17 15,17.895 15,19C15,20.105 15.895,21 17,21Z"
+ android:strokeColor="#00000000"
+ android:fillColor="#777777"
+ android:strokeWidth="1"/>
+</vector>
diff --git a/res/drawable/ic_settings_blissify.xml b/res/drawable/ic_settings_blissify.xml
new file mode 100644
index 0000000..a44b365
--- /dev/null
+++ b/res/drawable/ic_settings_blissify.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2018 BlissRoms Project
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+ http://www.apache.org/licenses/LICENSE-2.0
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+ <path
+ android:pathData="M23.438,11.3562C23.4939,11.3494 23.5502,11.3455 23.6065,11.3445C23.3212,11.9047 23.0284,12.4609 22.7379,13.0185C22.0362,14.384 21.1894,15.6812 20.1601,16.8234C19.8014,17.225 19.3327,17.5049 18.8635,17.7589C18.1741,18.1211 17.4322,18.3738 16.6778,18.5617C15.3748,18.8914 14.0332,19.0479 12.6919,19.1015C12.4996,19.1059 12.3072,19.1212 12.1147,19.1091C13.5104,17.2432 15.0713,15.4789 16.9192,14.0475C17.8701,13.3153 18.9015,12.6812 20.0064,12.2082C20.833,11.8598 21.6985,11.6117 22.5842,11.4694C22.8673,11.4228 23.1533,11.3929 23.438,11.3562ZM0.562,11.3562C0.5061,11.3494 0.4499,11.3455 0.3936,11.3445C0.6788,11.9047 0.9716,12.4609 1.2621,13.0185C1.9638,14.384 2.8107,15.6812 3.8398,16.8234C4.1987,17.225 4.6674,17.5049 5.1365,17.7589C5.826,18.1211 6.5679,18.3738 7.3223,18.5617C8.6252,18.8914 9.9669,19.0479 11.3081,19.1015C11.5005,19.1059 11.6928,19.1212 11.8853,19.1091C10.4897,17.2432 8.9288,15.4789 7.0809,14.0475C6.1299,13.3153 5.0986,12.6812 3.9937,12.2082C3.167,11.8598 2.3015,11.6117 1.4158,11.4694C1.1326,11.4228 0.8468,11.3929 0.562,11.3562ZM7.5263,7.528C7.428,7.4456 7.3304,7.3591 7.2154,7.2996C6.9848,8.6766 6.9382,10.0837 7.0623,11.4738C7.1371,12.2745 7.2809,13.0703 7.5172,13.8397C7.5446,13.9218 7.5605,14.012 7.6164,14.0814C7.6791,14.1725 7.767,14.242 7.8528,14.3099C8.1276,14.5259 8.3756,14.7726 8.6404,14.9999C8.9951,15.3336 9.3344,15.6831 9.6757,16.0306C10.0271,16.3948 10.3568,16.779 10.6813,17.167C11.0455,17.5983 11.46,18.0424 11.8212,18.476C11.9381,18.608 11.845,16.3606 11.8212,15.9627C11.4496,13.9058 11.3089,13.6471 10.3218,11.091C9.8426,9.8503 8.8727,8.8155 7.9219,7.8832C7.7957,7.7587 7.6594,7.6451 7.5263,7.528ZM16.4737,7.528C16.572,7.4456 16.6696,7.3591 16.7847,7.2996C17.0152,8.6766 17.0618,10.0837 16.9377,11.4738C16.863,12.2745 16.7191,13.0703 16.4828,13.8397C16.4554,13.9218 16.4395,14.012 16.3837,14.0814C16.3209,14.1725 16.233,14.242 16.1473,14.3099C15.8725,14.5259 15.6245,14.7726 15.3597,14.9999C15.005,15.3336 14.6656,15.6831 14.3244,16.0306C13.9729,16.3948 13.6433,16.779 13.3188,17.167C12.9545,17.5983 12.5992,18.0368 12.238,18.4704C12.1211,18.6026 12.1954,16.3284 12.2192,15.9306C12.5193,13.8784 12.7051,13.3107 13.7632,11.0196C14.2503,9.9649 15.1273,8.8155 16.0781,7.8832C16.2043,7.7587 16.3406,7.6451 16.4737,7.528ZM12.0662,4.8864C12.3408,5.1809 12.566,5.5189 12.7658,5.8681C13.4727,7.1024 13.7716,8.7749 13.7629,10.3387C13.5041,10.8001 13.4154,10.9839 13.2187,11.4761C12.8983,12.2792 12.596,13.0929 12.397,13.936C12.2336,14.5827 12.1463,15.2448 12.0494,15.9039C12.0407,15.9601 12.0276,16.0156 12.0136,16.071C11.9181,15.4399 11.8159,14.8092 11.6827,14.1851C11.5638,13.6298 10.936,11.8164 10.7834,11.4553C10.6622,11.1733 10.315,10.4674 10.3219,10.3795C10.4107,8.7973 10.7269,7.0978 11.4904,5.7961C11.672,5.4866 11.84,5.1659 12.0662,4.8864ZM20.6235,8.073C20.7318,8.0278 20.8367,7.9715 20.9513,7.9424C20.9467,9.0786 20.6323,10.1921 20.1701,11.2229C20.0744,11.4399 19.9726,11.6542 19.8736,11.8698C19.8412,11.9674 19.7378,12.0021 19.6548,12.044C19.2321,12.2309 18.8208,12.4428 18.4232,12.6786C17.863,13.0007 17.3465,13.3904 16.8118,13.7516C16.8926,13.434 16.9509,13.1114 17.0149,12.7902C17.1593,12.0693 17.2238,11.3343 17.244,10.6005C17.2504,10.5452 17.248,10.4812 17.29,10.44C17.4114,10.307 17.5448,10.1858 17.6765,10.0629C18.3304,9.4426 19.0466,8.8816 19.8357,8.4424C20.0885,8.2995 20.3564,8.186 20.6235,8.073ZM3.3766,8.073C3.2683,8.0278 3.1633,7.9715 3.0488,7.9424C3.0533,9.0786 3.3676,10.1921 3.8299,11.2229C3.9256,11.4399 4.0274,11.6542 4.1264,11.8698C4.1589,11.9674 4.2623,12.0021 4.3452,12.044C4.768,12.2309 5.1793,12.4428 5.5769,12.6786C6.1371,13.0007 6.6535,13.3904 7.1882,13.7516C7.1075,13.434 7.0491,13.1114 6.9851,12.7902C6.8408,12.0693 6.7761,11.3343 6.756,10.6005C6.7496,10.5452 6.752,10.4812 6.71,10.44C6.5886,10.307 6.4552,10.1858 6.3236,10.0629C5.6696,9.4426 4.9534,8.8816 4.1643,8.4424C3.9115,8.2995 3.6437,8.186 3.3766,8.073Z"
+ android:fillColor="#ffffff"
+ android:fillType="nonZero"/>
+</vector>
+
diff --git a/res/drawable/ic_settings_phone_idle_new.xml b/res/drawable/ic_settings_phone_idle_new.xml
new file mode 100644
index 0000000..e1b9da1
--- /dev/null
+++ b/res/drawable/ic_settings_phone_idle_new.xml
@@ -0,0 +1,25 @@
+<!--
+Copyright (C) 2016 The Android Open Source Project
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24.0dp"
+ android:height="24.0dp"
+ android:viewportWidth="24.0"
+ android:viewportHeight="24.0"
+ android:tint="?android:attr/colorControlNormal">
+ <path
+ android:fillColor="#FFFFFFFF"
+ android:pathData="M15,24H17V22H15M16.56,4.44L15.11,5.89C16.84,6.94 18,8.83 18,11A6,6 0 0,1 12,17A6,6 0 0,1 6,11C6,8.83 7.16,6.94 8.88,5.88L7.44,4.44C5.36,5.88 4,8.28 4,11A8,8 0 0,0 12,19A8,8 0 0,0 20,11C20,8.28 18.64,5.88 16.56,4.44M13,2H11V12H13M11,24H13V22H11M7,24H9V22H7V24Z" />
+</vector>
diff --git a/res/drawable/ring_notif_increasing.xml b/res/drawable/ring_notif_increasing.xml
new file mode 100644
index 0000000..c534e30
--- /dev/null
+++ b/res/drawable/ring_notif_increasing.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2014 The CyanogenMod Project
+ Copyright (C) 2018 The LineageOS Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:tint="?android:attr/colorControlNormal"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:fillColor="#FFFFFFFF"
+ android:pathData="M12,22c1.105,0,2-0.898,2-2h-4C10,21.102,10.896,22,12,22Z M18.5,16v-5.5c0-3.075-2.135-5.643-5-6.321V3.5 C13.5,2.67,12.828,2,12,2s-1.5,0.67-1.5,1.5v0.679c-2.865,0.678-5,3.246-5,6.321V16l-2,2v1h17v-1L18.5,16z M16.504,14.558H7.561 V13.25l8.943-3.808V14.558z" />
+</vector>
+
diff --git a/res/layout-sw600dp/crypt_keeper_pattern_entry.xml b/res/layout-sw600dp/crypt_keeper_pattern_entry.xml
index 3937008..b83f5e2 100644
--- a/res/layout-sw600dp/crypt_keeper_pattern_entry.xml
+++ b/res/layout-sw600dp/crypt_keeper_pattern_entry.xml
@@ -36,6 +36,17 @@
</LinearLayout>
+ <LinearLayout
+ android:id="@+id/pattern_sizes"
+ android:layout_width="@dimen/crypt_keeper_pattern_size"
+ android:layout_height="@dimen/crypt_keeper_pattern_size"
+ android:orientation="horizontal"
+ android:layout_gravity="center_horizontal">
+
+ <include layout="@layout/crypt_keeper_pattern_sizes" />
+
+ </LinearLayout>
+
<include layout="@layout/crypt_keeper_emergency_button" />
</LinearLayout>
diff --git a/res/layout/about_bliss_animation.xml b/res/layout/about_bliss_animation.xml
new file mode 100644
index 0000000..143b8cd
--- /dev/null
+++ b/res/layout/about_bliss_animation.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2019-2020 The BlissRoms Project
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+ http://www.apache.org/licenses/LICENSE-2.0
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<LinearLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:gravity="center"
+ android:orientation="horizontal" >
+
+ <com.airbnb.lottie.LottieAnimationView
+ android:id="@+id/bliss_lottie"
+ android:layout_width="match_parent"
+ android:layout_height="120dp"
+ android:layout_gravity="center"
+ android:clickable="false"
+ app:lottie_rawRes="@raw/bliss"
+ app:lottie_loop="true"
+ app:lottie_autoPlay="true" />
+
+</LinearLayout>
diff --git a/res/layout/accessibility_animation.xml b/res/layout/accessibility_animation.xml
new file mode 100644
index 0000000..f45231d
--- /dev/null
+++ b/res/layout/accessibility_animation.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2019-2020 The BlissRoms Project
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+ http://www.apache.org/licenses/LICENSE-2.0
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<LinearLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:gravity="center"
+ android:orientation="horizontal" >
+
+ <com.airbnb.lottie.LottieAnimationView
+ android:id="@+id/accessibility_lottie"
+ android:layout_width="match_parent"
+ android:layout_height="120dp"
+ android:layout_gravity="center"
+ android:clickable="false"
+ app:lottie_rawRes="@raw/accessibility"
+ app:lottie_loop="true"
+ app:lottie_autoPlay="true" />
+
+</LinearLayout>
diff --git a/res/layout/account_animation.xml b/res/layout/account_animation.xml
new file mode 100644
index 0000000..3780f6c
--- /dev/null
+++ b/res/layout/account_animation.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2019-2020 The BlissRoms Project
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+ http://www.apache.org/licenses/LICENSE-2.0
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<LinearLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:gravity="center"
+ android:orientation="horizontal" >
+
+ <com.airbnb.lottie.LottieAnimationView
+ android:id="@+id/account_lottie"
+ android:layout_width="match_parent"
+ android:layout_height="120dp"
+ android:layout_gravity="center"
+ android:clickable="false"
+ app:lottie_rawRes="@raw/account"
+ app:lottie_loop="true"
+ app:lottie_autoPlay="true" />
+
+</LinearLayout>
diff --git a/res/layout/battery_header.xml b/res/layout/battery_header.xml
index dca0972..f4bb726 100644
--- a/res/layout/battery_header.xml
+++ b/res/layout/battery_header.xml
@@ -17,43 +17,48 @@
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/battery_entity_header"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center"
- android:orientation="horizontal"
+ android:orientation="vertical"
style="@style/EntityHeader">
- <LinearLayout
- android:layout_width="170dp"
+ <FrameLayout
+ android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginStart="72dp"
- android:layout_marginEnd="8dp"
- android:orientation="vertical">
+ android:layout_gravity="center_horizontal"
+ android:layout_margin="12dp"
+ android:background="@drawable/battery_metter_gauage"
+ android:padding="4dp">
- <TextView
- android:id="@+id/battery_percent"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginTop="12dp"
- android:textAppearance="@style/TextAppearance.EntityHeaderTitle"
- android:textSize="36sp" />
+ <com.android.settings.fuelgauge.BatteryMeterView
+ android:id="@+id/battery_header_icon"
+ android:layout_width="@dimen/battery_meter_width"
+ android:layout_height="@dimen/battery_meter_height"
+ android:layout_margin="8dp"
+ app:cardElevation="5dp" />
- <TextView
- android:id="@+id/summary1"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginTop="8dp"
- android:minLines="3"
- android:textAppearance="@android:style/TextAppearance.DeviceDefault.Small"/>
- android:textColor="?android:attr/textColorPrimary"/>
+ </FrameLayout>
- </LinearLayout>
-
- <com.android.settings.fuelgauge.BatteryMeterView
- android:id="@+id/battery_header_icon"
+ <TextView
+ android:id="@+id/battery_percent"
android:layout_width="match_parent"
- android:layout_height="@dimen/battery_meter_height"
- android:layout_gravity="center"/>
+ android:layout_height="wrap_content"
+ android:layout_marginTop="12dp"
+ android:textAppearance="@style/TextAppearance.EntityHeaderTitle"
+ android:visibility="gone"
+ android:textSize="36sp" />
+
+ <TextView
+ android:id="@+id/summary1"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="12dp"
+ android:textAlignment="center"
+ android:textSize="20sp"
+ android:minLines="3"
+ android:textColor="?android:attr/textColorPrimary"/>
</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/bliss_logo.xml b/res/layout/bliss_logo.xml
new file mode 100644
index 0000000..e136f3d
--- /dev/null
+++ b/res/layout/bliss_logo.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2016 Nitrogen Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:gravity="center"
+ android:orientation="horizontal" >
+
+ <ImageView
+ android:layout_width="match_parent"
+ android:layout_height="100dp"
+ android:adjustViewBounds="false"
+ android:scaleType="centerCrop"
+ android:src="@drawable/ic_bliss" />
+</LinearLayout>
diff --git a/res/layout/bliss_preference_category_material.xml b/res/layout/bliss_preference_category_material.xml
new file mode 100644
index 0000000..c6eb93a
--- /dev/null
+++ b/res/layout/bliss_preference_category_material.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2019-2020 The BlissRoms Project
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+ http://www.apache.org/licenses/LICENSE-2.0
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<LinearLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:gravity="center_vertical"
+ android:orientation="horizontal"
+ android:paddingTop="@dimen/bliss_preference_category_padding_top"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:minHeight="@dimen/bliss_preference_category_height"
+ android:paddingStart="?android:listPreferredItemPaddingStart"
+ android:paddingEnd="?android:listPreferredItemPaddingEnd">
+
+ <include layout="@layout/image_frame" />
+
+ <TextView
+ android:id="@android:id/title"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ style="@style/PreferenceCategoryTitleTextStyle" />
+
+ <View
+ android:background="?android:attr/colorAccent"
+ android:layout_width="fill_parent"
+ android:layout_height="1.0px"
+ android:layout_marginStart="@dimen/bliss_preference_category_line_margin_start" />
+
+</LinearLayout>
diff --git a/res/layout/bluetooth_animation.xml b/res/layout/bluetooth_animation.xml
new file mode 100644
index 0000000..302256b
--- /dev/null
+++ b/res/layout/bluetooth_animation.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2019-2020 The BlissRoms Project
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+ http://www.apache.org/licenses/LICENSE-2.0
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<LinearLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:gravity="center"
+ android:orientation="horizontal" >
+
+ <com.airbnb.lottie.LottieAnimationView
+ android:id="@+id/bt_connection"
+ android:layout_width="match_parent"
+ android:layout_height="120dp"
+ android:layout_gravity="center"
+ android:clickable="false"
+ app:lottie_rawRes="@raw/connected_devices"
+ app:lottie_loop="true"
+ app:lottie_autoPlay="true" />
+
+</LinearLayout>
diff --git a/res/layout/bluetooth_audio_codec_dialog.xml b/res/layout/bluetooth_audio_codec_dialog.xml
index 9636427..1fd9de8 100644
--- a/res/layout/bluetooth_audio_codec_dialog.xml
+++ b/res/layout/bluetooth_audio_codec_dialog.xml
@@ -52,8 +52,16 @@
layout="@layout/preference_widget_dialog_radiobutton"/>
<include
+ android:id="@+id/bluetooth_audio_codec_aptx_adaptive"
+ layout="@layout/preference_widget_dialog_radiobutton"/>
+
+ <include
android:id="@+id/bluetooth_audio_codec_ldac"
layout="@layout/preference_widget_dialog_radiobutton"/>
+
+ <include
+ android:id="@+id/bluetooth_audio_codec_aptx_twsp"
+ layout="@layout/preference_widget_dialog_radiobutton"/>
</RadioGroup>
<include
diff --git a/res/layout/choose_lock_pattern_size_header.xml b/res/layout/choose_lock_pattern_size_header.xml
new file mode 100644
index 0000000..a3a102b
--- /dev/null
+++ b/res/layout/choose_lock_pattern_size_header.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2016 The CyanogenMod Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:gravity="center_vertical"
+ android:minHeight="56dp"
+ android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+ android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+ android:text="@string/lock_settings_picker_pattern_size_message"
+ style="@style/LockPatternSizeHeaderStyle" />
diff --git a/res/layout/crypt_keeper_pattern_entry.xml b/res/layout/crypt_keeper_pattern_entry.xml
index 00d3d6e..b2172a4 100644
--- a/res/layout/crypt_keeper_pattern_entry.xml
+++ b/res/layout/crypt_keeper_pattern_entry.xml
@@ -36,6 +36,18 @@
</LinearLayout>
+ <LinearLayout
+ android:id="@+id/pattern_sizes"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginStart="@dimen/crypt_keeper_pattern_margin"
+ android:layout_marginEnd="@dimen/crypt_keeper_pattern_margin"
+ android:orientation="horizontal">
+
+ <include layout="@layout/crypt_keeper_pattern_sizes" />
+
+ </LinearLayout>
+
<include layout="@layout/crypt_keeper_emergency_button" />
</LinearLayout>
diff --git a/res/layout/crypt_keeper_pattern_sizes.xml b/res/layout/crypt_keeper_pattern_sizes.xml
new file mode 100644
index 0000000..020b688
--- /dev/null
+++ b/res/layout/crypt_keeper_pattern_sizes.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2015 The CyanogenMod Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<merge xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <Button
+ android:id="@+id/lock_pattern_size_3"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_horizontal"
+ android:textSize="14sp"
+ android:fontFamily="sans-serif"
+ android:text="@string/lock_pattern_size_3"
+ android:textColor="@android:color/white"
+ android:layout_weight="1"
+ style="?android:attr/borderlessButtonStyle"/>
+
+ <Button
+ android:id="@+id/lock_pattern_size_4"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_horizontal"
+ android:textSize="14sp"
+ android:fontFamily="sans-serif"
+ android:text="@string/lock_pattern_size_4"
+ android:textColor="@android:color/white"
+ android:layout_weight="1"
+ style="?android:attr/borderlessButtonStyle"/>
+
+ <Button
+ android:id="@+id/lock_pattern_size_5"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_horizontal"
+ android:textSize="14sp"
+ android:fontFamily="sans-serif"
+ android:text="@string/lock_pattern_size_5"
+ android:textColor="@android:color/white"
+ android:layout_weight="1"
+ style="?android:attr/borderlessButtonStyle"/>
+
+ <Button
+ android:id="@+id/lock_pattern_size_6"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_horizontal"
+ android:textSize="14sp"
+ android:fontFamily="sans-serif"
+ android:text="@string/lock_pattern_size_6"
+ android:textColor="@android:color/white"
+ android:layout_weight="1"
+ style="?android:attr/borderlessButtonStyle"/>
+
+
+</merge >
+
diff --git a/res/layout/display_animation.xml b/res/layout/display_animation.xml
new file mode 100644
index 0000000..c8c340e
--- /dev/null
+++ b/res/layout/display_animation.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2019-2020 The BlissRoms Project
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+ http://www.apache.org/licenses/LICENSE-2.0
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<LinearLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:gravity="center"
+ android:orientation="horizontal" >
+
+ <com.airbnb.lottie.LottieAnimationView
+ android:id="@+id/display_lottie"
+ android:layout_width="match_parent"
+ android:layout_height="120dp"
+ android:layout_gravity="center"
+ android:clickable="false"
+ app:lottie_rawRes="@raw/display"
+ app:lottie_loop="true"
+ app:lottie_autoPlay="true" />
+
+</LinearLayout>
diff --git a/res/layout/face_enroll_accessibility_toggle.xml b/res/layout/face_enroll_accessibility_toggle.xml
index bb3a7ff..7ca43cc 100644
--- a/res/layout/face_enroll_accessibility_toggle.xml
+++ b/res/layout/face_enroll_accessibility_toggle.xml
@@ -50,7 +50,7 @@
android:layout_below="@+id/title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="@string/security_settings_face_enroll_introduction_accessibility_expanded"/>
+ android:text="@string/aosp_security_settings_face_enroll_introduction_accessibility_expanded"/>
<!-- Vertical divider -->
<View
diff --git a/res/layout/face_enroll_education.xml b/res/layout/face_enroll_education.xml
index d7b95b6..63b2206 100644
--- a/res/layout/face_enroll_education.xml
+++ b/res/layout/face_enroll_education.xml
@@ -38,7 +38,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textAlignment="center"
- android:text="@string/security_settings_face_enroll_education_message"/>
+ android:text="@string/aosp_security_settings_face_enroll_education_message"/>
<Space android:layout_width="match_parent"
android:layout_height="0dp"
@@ -94,7 +94,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:visibility="gone"
- FaceEnrollAccessibilitySwitch:messageText="@string/security_settings_face_enroll_introduction_accessibility_diversity"/>
+ FaceEnrollAccessibilitySwitch:messageText="@string/aosp_security_settings_face_enroll_introduction_accessibility_diversity"/>
</FrameLayout>
diff --git a/res/layout/face_enroll_introduction.xml b/res/layout/face_enroll_introduction.xml
index 55ac6f9..b50adc4 100644
--- a/res/layout/face_enroll_introduction.xml
+++ b/res/layout/face_enroll_introduction.xml
@@ -84,7 +84,7 @@
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:text="@string/security_settings_face_enroll_introduction_footer_part_0"/>
+ android:text="@string/aosp_security_settings_face_enroll_introduction_footer_part_0"/>
</LinearLayout>
@@ -105,7 +105,7 @@
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:text="@string/security_settings_face_enroll_introduction_footer_part_1"/>
+ android:text="@string/aosp_security_settings_face_enroll_introduction_footer_part_1"/>
</LinearLayout>
@@ -147,7 +147,7 @@
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:text="@string/security_settings_face_enroll_introduction_footer_part_3"/>
+ android:text="@string/aosp_security_settings_face_enroll_introduction_footer_part_3"/>
</LinearLayout>
</LinearLayout>
diff --git a/res/layout/fingerprint_enroll_find_sensor_base.xml b/res/layout/fingerprint_enroll_find_sensor_base.xml
index ce3104f..9eabe79 100644
--- a/res/layout/fingerprint_enroll_find_sensor_base.xml
+++ b/res/layout/fingerprint_enroll_find_sensor_base.xml
@@ -46,11 +46,6 @@
android:text="@string/security_settings_fingerprint_enroll_find_sensor_message"/>
</LinearLayout>
- <Space
- android:layout_width="wrap_content"
- android:layout_height="0dp"
- android:layout_weight="1" />
-
<include
layout="@layout/fingerprint_enroll_find_sensor_graphic"
android:layout_width="match_parent"
diff --git a/res/layout/fingerprint_enroll_find_sensor_graphic.xml b/res/layout/fingerprint_enroll_find_sensor_graphic.xml
index 0690457..cd9b0a5 100644
--- a/res/layout/fingerprint_enroll_find_sensor_graphic.xml
+++ b/res/layout/fingerprint_enroll_find_sensor_graphic.xml
@@ -17,17 +17,27 @@
<FrameLayout
xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="@dimen/fingerprint_find_sensor_graphic_size"
- android:layout_height="@dimen/fingerprint_find_sensor_graphic_size">
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:paddingTop="@dimen/fingerprint_find_sensor_padding_top">
<ImageView
android:id="@+id/fingerprint_sensor_location"
android:layout_width="match_parent"
- android:layout_height="match_parent"
+ android:layout_height="wrap_content"
android:contentDescription="@string/security_settings_fingerprint_enroll_find_sensor_content_description"
android:src="@drawable/fingerprint_sensor_location"
android:scaleType="centerInside"/>
+ <ImageView
+ android:id="@+id/fingerprint_sensor_location_front_overlay"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:contentDescription="@string/security_settings_fingerprint_enroll_find_sensor_content_description"
+ android:src="@drawable/fingerprint_sensor_location_front_overlay"
+ android:scaleType="centerInside"
+ android:visibility="gone"/>
+
<com.android.settings.biometrics.fingerprint.FingerprintLocationAnimationView
android:id="@+id/fingerprint_sensor_location_animation"
android:layout_width="match_parent"
diff --git a/res/layout/image_frame.xml b/res/layout/image_frame.xml
new file mode 100644
index 0000000..57054d7
--- /dev/null
+++ b/res/layout/image_frame.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2019-2020 The BlissRoms Project
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+ http://www.apache.org/licenses/LICENSE-2.0
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<LinearLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ android:gravity="start|center"
+ android:orientation="horizontal"
+ android:id="@id/icon_frame"
+ android:paddingLeft="0.0dip"
+ android:paddingTop="4.0dip"
+ android:paddingRight="8.0dip"
+ android:paddingBottom="4.0dip"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:minWidth="56.0dip"
+ android:paddingStart="0.0dip"
+ android:paddingEnd="8.0dip">
+
+ <androidx.preference.internal.PreferenceImageView
+ android:id="@android:id/icon"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ app:maxHeight="48.0dip"
+ app:maxWidth="48.0dip" />
+
+</LinearLayout>
diff --git a/res/layout/location_animation.xml b/res/layout/location_animation.xml
new file mode 100644
index 0000000..8289cc9
--- /dev/null
+++ b/res/layout/location_animation.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2019-2020 The BlissRoms Project
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+ http://www.apache.org/licenses/LICENSE-2.0
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<LinearLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:gravity="center"
+ android:orientation="horizontal" >
+
+ <com.airbnb.lottie.LottieAnimationView
+ android:id="@+id/location_lottie"
+ android:layout_width="match_parent"
+ android:layout_height="120dp"
+ android:layout_gravity="center"
+ android:clickable="false"
+ app:lottie_rawRes="@raw/location"
+ app:lottie_loop="true"
+ app:lottie_autoPlay="true" />
+
+</LinearLayout>
diff --git a/res/layout/notification_animation.xml b/res/layout/notification_animation.xml
new file mode 100644
index 0000000..604b242
--- /dev/null
+++ b/res/layout/notification_animation.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2019-2020 The BlissRoms Project
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+ http://www.apache.org/licenses/LICENSE-2.0
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<LinearLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:gravity="center"
+ android:orientation="horizontal" >
+
+ <com.airbnb.lottie.LottieAnimationView
+ android:id="@+id/notification_lottie"
+ android:layout_width="match_parent"
+ android:layout_height="120dp"
+ android:layout_gravity="center"
+ android:clickable="false"
+ app:lottie_rawRes="@raw/notification"
+ app:lottie_loop="true"
+ app:lottie_autoPlay="true" />
+
+</LinearLayout>
diff --git a/res/layout/preference_increasing_ring.xml b/res/layout/preference_increasing_ring.xml
new file mode 100644
index 0000000..11795a2
--- /dev/null
+++ b/res/layout/preference_increasing_ring.xml
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2014 The CyanogenMod Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<LinearLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:minHeight="?android:attr/listPreferredItemHeightSmall"
+ android:gravity="center_vertical"
+ android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+ android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+ android:background="?android:attr/selectableItemBackground"
+ android:clipToPadding="false">
+
+ <LinearLayout
+ android:id="@+id/icon_container"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:minWidth="44dp"
+ android:gravity="start|center_vertical"
+ android:orientation="horizontal"
+ android:paddingEnd="12dp"
+ android:paddingTop="4dp"
+ android:paddingBottom="4dp">
+ <com.android.internal.widget.PreferenceImageView
+ android:id="@android:id/icon"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:maxWidth="48dp"
+ android:maxHeight="48dp"/>
+ </LinearLayout>
+
+ <RelativeLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:paddingTop="12dp"
+ android:paddingBottom="12dp">
+
+ <TextView android:id="@android:id/title"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:singleLine="true"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ android:ellipsize="marquee"
+ android:fadingEdge="horizontal" />
+
+ <TextView android:id="@+id/start_volume_label"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_below="@android:id/title"
+ android:layout_alignStart="@android:id/title"
+ android:paddingStart="18dp"
+ android:text="@string/increasing_ring_min_volume_title"
+ android:textAppearance="?android:attr/textAppearanceSmall"
+ android:textColor="?android:attr/textColorSecondary"
+ android:singleLine="true" />
+
+ <SeekBar android:id="@+id/start_volume"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_below="@id/start_volume_label"
+ android:layout_alignParentEnd="true"
+ android:max="1000" />
+
+ <TextView android:id="@+id/ramp_up_time_label"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_below="@id/start_volume"
+ android:layout_alignStart="@android:id/title"
+ android:paddingStart="18dp"
+ android:text="@string/increasing_ring_ramp_up_time_title"
+ android:textAppearance="?android:attr/textAppearanceSmall"
+ android:textColor="?android:attr/textColorSecondary"
+ android:singleLine="true" />
+
+ <TextView android:id="@+id/ramp_up_time_value"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_below="@id/start_volume"
+ android:layout_toEndOf="@id/ramp_up_time_label"
+ android:layout_alignBaseline="@id/ramp_up_time_label"
+ android:layout_alignParentEnd="true"
+ android:gravity="end"
+ android:textAppearance="?android:attr/textAppearanceSmall"
+ android:textColor="?android:attr/textColorSecondary"
+ android:singleLine="true" />
+
+ <SeekBar android:id="@+id/ramp_up_time"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_below="@id/ramp_up_time_label"
+ android:layout_alignParentEnd="true"
+ android:max="11" />
+
+ <TextView android:id="@android:id/summary"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_below="@id/ramp_up_time"
+ android:layout_alignStart="@android:id/title"
+ android:textAppearance="?android:attr/textAppearanceSmall"
+ android:textColor="?android:attr/textColorSecondary"
+ android:maxLines="4" />
+
+ </RelativeLayout>
+
+</LinearLayout>
diff --git a/res/layout/privacy_animation.xml b/res/layout/privacy_animation.xml
new file mode 100644
index 0000000..b847a3e
--- /dev/null
+++ b/res/layout/privacy_animation.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2019-2020 The BlissRoms Project
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+ http://www.apache.org/licenses/LICENSE-2.0
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<LinearLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:gravity="center"
+ android:orientation="horizontal" >
+
+ <com.airbnb.lottie.LottieAnimationView
+ android:id="@+id/privacy_lottie"
+ android:layout_width="match_parent"
+ android:layout_height="120dp"
+ android:layout_gravity="center"
+ android:clickable="false"
+ app:lottie_rawRes="@raw/privacy"
+ app:lottie_loop="true"
+ app:lottie_autoPlay="true" />
+
+</LinearLayout>
diff --git a/res/layout/security_animation.xml b/res/layout/security_animation.xml
new file mode 100644
index 0000000..179f6a4
--- /dev/null
+++ b/res/layout/security_animation.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2019-2020 The BlissRoms Project
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+ http://www.apache.org/licenses/LICENSE-2.0
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<LinearLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:gravity="center"
+ android:orientation="horizontal" >
+
+ <com.airbnb.lottie.LottieAnimationView
+ android:id="@+id/security_lottie"
+ android:layout_width="match_parent"
+ android:layout_height="120dp"
+ android:layout_gravity="center"
+ android:clickable="false"
+ app:lottie_rawRes="@raw/security"
+ app:lottie_loop="true"
+ app:lottie_autoPlay="true" />
+
+</LinearLayout>
diff --git a/res/layout/sound_animation.xml b/res/layout/sound_animation.xml
new file mode 100644
index 0000000..66e7760
--- /dev/null
+++ b/res/layout/sound_animation.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2019-2020 The BlissRoms Project
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+ http://www.apache.org/licenses/LICENSE-2.0
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<LinearLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:gravity="center"
+ android:orientation="horizontal" >
+
+ <com.airbnb.lottie.LottieAnimationView
+ android:id="@+id/sound_lottie"
+ android:layout_width="match_parent"
+ android:layout_height="120dp"
+ android:layout_gravity="center"
+ android:clickable="false"
+ app:lottie_rawRes="@raw/sound"
+ app:lottie_loop="true"
+ app:lottie_autoPlay="true" />
+
+</LinearLayout>
diff --git a/res/layout/storage_animation.xml b/res/layout/storage_animation.xml
new file mode 100644
index 0000000..6d1af38
--- /dev/null
+++ b/res/layout/storage_animation.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2019-2020 The BlissRoms Project
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+ http://www.apache.org/licenses/LICENSE-2.0
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<LinearLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:gravity="center"
+ android:orientation="horizontal" >
+
+ <com.airbnb.lottie.LottieAnimationView
+ android:id="@+id/storage_lottie"
+ android:layout_width="match_parent"
+ android:layout_height="150dp"
+ android:layout_gravity="center"
+ android:clickable="false"
+ app:lottie_rawRes="@raw/storage"
+ app:lottie_loop="true"
+ app:lottie_autoPlay="true" />
+
+</LinearLayout>
diff --git a/res/layout/system_animation.xml b/res/layout/system_animation.xml
new file mode 100644
index 0000000..80d4532
--- /dev/null
+++ b/res/layout/system_animation.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2019-2020 The BlissRoms Project
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+ http://www.apache.org/licenses/LICENSE-2.0
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<LinearLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:gravity="center"
+ android:orientation="horizontal" >
+
+ <com.airbnb.lottie.LottieAnimationView
+ android:id="@+id/system_lottie"
+ android:layout_width="match_parent"
+ android:layout_height="120dp"
+ android:layout_gravity="center"
+ android:clickable="false"
+ app:lottie_rawRes="@raw/system"
+ app:lottie_loop="true"
+ app:lottie_autoPlay="true" />
+
+</LinearLayout>
diff --git a/res/layout/wifi_animation.xml b/res/layout/wifi_animation.xml
new file mode 100644
index 0000000..367a337
--- /dev/null
+++ b/res/layout/wifi_animation.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2019-2020 The BlissRoms Project
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+ http://www.apache.org/licenses/LICENSE-2.0
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<LinearLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal" >
+
+ <com.airbnb.lottie.LottieAnimationView
+ android:id="@+id/wifi_connection"
+ android:layout_width="wrap_content"
+ android:layout_height="120dp"
+ android:clickable="false"
+ android:layout_alignParentLeft="true"
+ app:lottie_rawRes="@raw/wifi"
+ app:lottie_loop="true"
+ app:lottie_autoPlay="true" />
+
+</LinearLayout>
diff --git a/res/mipmap-anydpi/ic_launcher.xml b/res/mipmap-anydpi/ic_launcher.xml
new file mode 100644
index 0000000..d8649ba
--- /dev/null
+++ b/res/mipmap-anydpi/ic_launcher.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (c) 2018 The LineageOS Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+ <background android:drawable="@mipmap/ic_background"/>
+ <foreground android:drawable="@mipmap/ic_foreground"/>
+</adaptive-icon>
+
diff --git a/res/mipmap-hdpi/ic_background.png b/res/mipmap-hdpi/ic_background.png
new file mode 100644
index 0000000..f01deeb
--- /dev/null
+++ b/res/mipmap-hdpi/ic_background.png
Binary files differ
diff --git a/res/mipmap-hdpi/ic_foreground.png b/res/mipmap-hdpi/ic_foreground.png
new file mode 100644
index 0000000..97158bc
--- /dev/null
+++ b/res/mipmap-hdpi/ic_foreground.png
Binary files differ
diff --git a/res/mipmap-hdpi/ic_launcher_settings.png b/res/mipmap-hdpi/ic_launcher_settings.png
deleted file mode 100644
index ddce98e..0000000
--- a/res/mipmap-hdpi/ic_launcher_settings.png
+++ /dev/null
Binary files differ
diff --git a/res/mipmap-mdpi/ic_background.png b/res/mipmap-mdpi/ic_background.png
new file mode 100644
index 0000000..58bcf52
--- /dev/null
+++ b/res/mipmap-mdpi/ic_background.png
Binary files differ
diff --git a/res/mipmap-mdpi/ic_foreground.png b/res/mipmap-mdpi/ic_foreground.png
new file mode 100644
index 0000000..7b9bc07
--- /dev/null
+++ b/res/mipmap-mdpi/ic_foreground.png
Binary files differ
diff --git a/res/mipmap-mdpi/ic_launcher_settings.png b/res/mipmap-mdpi/ic_launcher_settings.png
deleted file mode 100644
index 86f3be8..0000000
--- a/res/mipmap-mdpi/ic_launcher_settings.png
+++ /dev/null
Binary files differ
diff --git a/res/mipmap-xhdpi/ic_background.png b/res/mipmap-xhdpi/ic_background.png
new file mode 100644
index 0000000..681a199
--- /dev/null
+++ b/res/mipmap-xhdpi/ic_background.png
Binary files differ
diff --git a/res/mipmap-xhdpi/ic_foreground.png b/res/mipmap-xhdpi/ic_foreground.png
new file mode 100644
index 0000000..c079116
--- /dev/null
+++ b/res/mipmap-xhdpi/ic_foreground.png
Binary files differ
diff --git a/res/mipmap-xhdpi/ic_launcher_settings.png b/res/mipmap-xhdpi/ic_launcher_settings.png
deleted file mode 100644
index 360aa69..0000000
--- a/res/mipmap-xhdpi/ic_launcher_settings.png
+++ /dev/null
Binary files differ
diff --git a/res/mipmap-xxhdpi/ic_background.png b/res/mipmap-xxhdpi/ic_background.png
new file mode 100644
index 0000000..1e707e8
--- /dev/null
+++ b/res/mipmap-xxhdpi/ic_background.png
Binary files differ
diff --git a/res/mipmap-xxhdpi/ic_foreground.png b/res/mipmap-xxhdpi/ic_foreground.png
new file mode 100644
index 0000000..ecc70af
--- /dev/null
+++ b/res/mipmap-xxhdpi/ic_foreground.png
Binary files differ
diff --git a/res/mipmap-xxhdpi/ic_launcher_settings.png b/res/mipmap-xxhdpi/ic_launcher_settings.png
deleted file mode 100644
index 7cb67a9..0000000
--- a/res/mipmap-xxhdpi/ic_launcher_settings.png
+++ /dev/null
Binary files differ
diff --git a/res/mipmap-xxxhdpi/ic_background.png b/res/mipmap-xxxhdpi/ic_background.png
new file mode 100644
index 0000000..b6e860b
--- /dev/null
+++ b/res/mipmap-xxxhdpi/ic_background.png
Binary files differ
diff --git a/res/mipmap-xxxhdpi/ic_foreground.png b/res/mipmap-xxxhdpi/ic_foreground.png
new file mode 100644
index 0000000..3133594
--- /dev/null
+++ b/res/mipmap-xxxhdpi/ic_foreground.png
Binary files differ
diff --git a/res/mipmap-xxxhdpi/ic_launcher_settings.png b/res/mipmap-xxxhdpi/ic_launcher_settings.png
deleted file mode 100644
index 3fec9c4..0000000
--- a/res/mipmap-xxxhdpi/ic_launcher_settings.png
+++ /dev/null
Binary files differ
diff --git a/res/raw/aab_brightness.mp4 b/res/raw/aab_brightness.mp4
index e69de29..2483a21 100644
--- a/res/raw/aab_brightness.mp4
+++ b/res/raw/aab_brightness.mp4
Binary files differ
diff --git a/res/raw/accessibility.json b/res/raw/accessibility.json
new file mode 100644
index 0000000..2ee3c6f
--- /dev/null
+++ b/res/raw/accessibility.json
@@ -0,0 +1 @@
+{"v":"5.5.7","meta":{"g":"LottieFiles AE 0.1.20","a":"Roger.T","k":"","d":"","tc":""},"fr":25,"ip":0,"op":75,"w":500,"h":500,"nm":"Accessibility","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"Shape Layer 1","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[246.5,247.5,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":[{"d":1,"ty":"el","s":{"a":0,"k":[389,389],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"tm","s":{"a":0,"k":0,"ix":1},"e":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":0,"s":[0]},{"t":15,"s":[100]}],"ix":2},"o":{"a":0,"k":0,"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1","mn":"ADBE Vector Filter - Trim","hd":false},{"ty":"st","c":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":9,"s":[0.145098039216,0.337254901961,0.686274509804,1]},{"t":15,"s":[0.501960813999,0.647058844566,0.866666734219,1]}],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":15,"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":[3.5,2.5],"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":4,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":75,"st":0,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"Ebene 1/Accessibility Outlines","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.167],"y":[0.167]},"t":0,"s":[0]},{"t":17,"s":[100]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[253,404,0],"ix":2},"a":{"a":0,"k":[252.727,401.818,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.167,0.167,0.167],"y":[0,0.167,1.667]},"t":0,"s":[110,-0.174,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":14,"s":[110,110,100]},{"t":18,"s":[100,100,100]}],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0.649,4.423],[3.586,2.669],[0,0],[4.441,-0.65],[2.68,-3.599],[0,-0.001],[-0.65,-4.441],[-3.599,-2.679],[-19.476,-14.499],[-4.424,0.649],[-2.67,3.586]],"o":[[2.669,-3.586],[-0.648,-4.424],[0,0],[-3.6,-2.68],[-4.44,0.651],[-0.001,0.001],[-2.68,3.599],[0.652,4.44],[19.506,14.521],[3.585,2.668],[4.424,-0.647],[0,0]],"v":[[50.937,37.835],[54.094,25.327],[47.482,14.25],[-27.246,-41.381],[-39.803,-44.551],[-50.922,-37.914],[-50.923,-37.912],[-54.093,-25.355],[-47.455,-14.236],[27.274,41.396],[39.782,44.552],[50.859,37.94]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.144999994016,0.337000020345,0.685999971278,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":[238.245,208.23],"ix":2},"a":{"a":0,"k":[50.5,37.5],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":30,"s":[0]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":35,"s":[-70]},{"t":40,"s":[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],[-0.649,4.423],[-3.585,2.668],[0,0],[-4.44,-0.649],[-2.679,-3.6],[0,0],[0.651,-4.44],[3.599,-2.679],[19.476,-14.498],[4.424,0.649],[2.67,3.586]],"o":[[-2.67,-3.586],[0.647,-4.424],[0,0],[3.599,-2.679],[4.441,0.652],[0,0],[2.679,3.599],[-0.651,4.441],[-19.505,14.52],[-3.586,2.669],[-4.423,-0.647],[0,0]],"v":[[-50.937,37.835],[-54.094,25.327],[-47.483,14.25],[27.246,-41.382],[39.802,-44.552],[50.921,-37.914],[50.923,-37.911],[54.092,-25.355],[47.454,-14.236],[-27.274,41.396],[-39.783,44.551],[-50.86,37.939]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.144999994016,0.337000020345,0.685999971278,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":[261.255,206.831],"ix":2},"a":{"a":0,"k":[-51,36.5],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":25,"s":[0]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":30,"s":[70]},{"t":35,"s":[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":[[-11.908,3.794],[-3.269,-19.328],[20.593,0.859],[-3.174,19.28]],"o":[[18.397,-7.54],[4.987,19.972],[-19.686,0.788],[1.312,-12.408]],"v":[[-11.119,-142.409],[33.048,-117.329],[-0.025,-76.931],[-33.43,-114.919]],"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":[[-5.651,2.883],[0,0],[-5.559,-7.466],[-0.028,-0.035],[-6.535,1.852],[0,0],[0,0],[1.542,-4.223],[4.078,-1.895],[0.975,-0.454],[4.224,1.544],[1.896,4.077],[10.167,21.865],[5.328,0],[2.247,-4.832],[0,0],[4.224,-1.543],[4.078,1.896],[0.976,0.453],[1.543,4.224],[-1.896,4.077],[0,0],[0,0],[-4.297,5.773],[-0.026,0.036],[7.467,5.559],[0,0],[-6.532,0.244]],"o":[[0,0],[-7.468,5.559],[0.026,0.036],[4.296,5.773],[0,0],[0,0],[1.896,4.077],[-1.543,4.223],[-0.975,0.455],[-4.079,1.896],[-4.224,-1.542],[0,0],[-2.246,-4.832],[-5.329,0],[-10.166,21.864],[-1.895,4.077],[-4.224,1.542],[-0.976,-0.454],[-4.078,-1.896],[-1.542,-4.224],[0,0],[0,0],[6.536,1.852],[0.027,-0.035],[5.559,-7.466],[0,0],[5.563,2.786],[6.672,0.26]],"v":[[18.635,-70.56],[17.984,-70.076],[14.529,-46.491],[14.608,-46.384],[32.728,-40.229],[32.728,13.754],[83.974,123.967],[84.526,136.931],[75.747,146.488],[72.814,147.853],[59.849,148.404],[50.292,139.628],[12.417,58.174],[-0.001,50.252],[-12.421,58.174],[-50.292,139.624],[-59.85,148.4],[-72.814,147.848],[-75.748,146.484],[-84.526,136.926],[-83.975,123.962],[-32.729,13.749],[-32.729,-40.229],[-14.609,-46.384],[-14.529,-46.491],[-17.984,-70.076],[-18.451,-70.422],[-0.083,-66.361]],"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":0,"k":[0.144999994016,0.337000020345,0.685999971278,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":[250,253.199],"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":3,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":75,"st":0,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":"Shape Layer 3","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[220,283.5,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[93.841,154,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[68,68],"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.144999994016,0.337000020345,0.685999971278,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":[15.25,-53],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[29.705,29.705],"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":18,"op":75,"st":0,"bm":0},{"ddd":0,"ind":4,"ty":4,"nm":"Shape Layer 2","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[251.25,283.75,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[93.841,154,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[68,68],"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.144999994016,0.337000020345,0.685999971278,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":[15.25,-53],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[29.705,29.705],"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":18,"op":75,"st":0,"bm":0}],"markers":[]}
\ No newline at end of file
diff --git a/res/raw/account.json b/res/raw/account.json
new file mode 100644
index 0000000..8a2394e
--- /dev/null
+++ b/res/raw/account.json
@@ -0,0 +1 @@
+{"v":"5.5.7","meta":{"g":"LottieFiles AE 0.1.20","a":"Roger.T","k":"","d":"","tc":""},"fr":25,"ip":0,"op":75,"w":500,"h":500,"nm":"Account","ddd":0,"assets":[{"id":"comp_0","layers":[{"ddd":0,"ind":1,"ty":4,"nm":"Arm Outlines","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":14,"s":[0]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":20,"s":[-13]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":27,"s":[9]},{"t":33,"s":[0]}],"ix":10},"p":{"a":1,"k":[{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"t":4,"s":[438.142,761.887,0],"to":[0,-45.667,0],"ti":[0,45.667,0]},{"t":14,"s":[438.142,487.887,0]}],"ix":2},"a":{"a":0,"k":[81.391,263.1,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":[[8.11,-10.101],[0.819,-1.395],[6.771,13.594],[2.052,2.062],[10.349,23.485],[1.609,1.401],[-21.228,-37.594],[-1.595,0.403],[-0.063,1.643],[1.384,21.602],[-3.77,-5.699],[-2.22,-5.461],[-0.365,-0.154],[-0.001,-0.001],[-1.148,0.738],[-0.042,1.363],[0,0],[-3.926,-4.844],[0,0],[-0.564,-0.269],[0,0],[-0.938,0.437],[-0.262,0.998],[0,0],[-2.963,-5.518],[2.185,-11.087],[-1.923,-0.503],[-0.783,1.211],[0,0],[0.303,-6.083],[2.556,-10.941]],"o":[[-1.007,1.267],[-6.684,11.203],[-1.307,-2.599],[-8.082,-8.185],[-0.853,-1.957],[-14.328,-12.111],[0.836,1.416],[1.594,-0.403],[-0.134,-23.38],[4.386,-6.029],[3.255,20.877],[0.159,0.363],[0.002,0],[1.257,0.527],[1.146,-0.736],[0.446,-14.198],[3.926,-5.649],[0,0],[0,0.626],[0,0],[0.932,0.446],[0.937,-0.434],[3.045,-11.617],[3.581,-3.123],[0,0],[-0.385,1.95],[1.395,0.365],[4.381,-6.778],[5.253,-2.558],[-7.483,10.546],[-5.487,23.485]],"v":[[37.806,55.158],[35.063,59.156],[-11.816,58.951],[-16.886,51.913],[-50.573,0.419],[-54.313,-4.68],[-25.036,12.684],[-20.937,14.395],[-18.141,10.943],[-25.567,-60.792],[-13.35,-61.01],[-2.375,-15.413],[-1.56,-14.608],[-1.557,-14.607],[2.285,-14.943],[4.184,-18.297],[5.709,-66.896],[17.487,-66.935],[17.487,-13.884],[18.411,-12.418],[18.414,-12.418],[21.366,-12.404],[23.259,-14.667],[34.848,-58.866],[44.694,-55.678],[35.841,-10.751],[38.579,-6.387],[42.229,-7.805],[60.456,-36.009],[68.338,-31.43],[49.016,9.122]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.976000019148,0.757000014361,0.532999973671,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":[68.891,72.795],"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],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[-21.333,-5.609],[21.333,-5.609],[21.333,5.609],[-21.333,5.609]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.885999971278,0.689999988032,0.490000017952,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":[81.063,139.126],"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":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[-21.333,-5.609],[21.333,-5.609],[21.333,5.609],[-21.333,5.609]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.277999997606,0.416000007181,0.588000009574,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":[81.063,148.341],"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},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[-21.333,-60.61],[21.333,-60.61],[21.333,60.609],[-21.333,60.609]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.490000017952,0.666999966491,0.885999971278,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":[81.063,203.341],"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 4","np":2,"cix":2,"bm":0,"ix":4,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":325,"st":0,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"Eye R Outlines","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"t":0,"s":[293.632,610.312,0],"to":[0,-25.333,0],"ti":[0,70.052,0]},{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"t":4,"s":[293.632,458.312,0],"to":[0,-70.052,0],"ti":[0,44.719,0]},{"t":9,"s":[293.632,190,0]}],"ix":2},"a":{"a":0,"k":[18.554,8.172,0],"ix":1},"s":{"a":1,"k":[{"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":40,"s":[100,100,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":45,"s":[100,10,100]},{"t":49,"s":[100,100,100]}],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-0.6,0],[0,-0.599],[0.599,0],[0,0.599]],"o":[[0.599,0],[0,0.599],[-0.6,0],[0,-0.599]],"v":[[0.001,-1.084],[1.085,0],[0.001,1.084],[-1.085,0]],"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":[20.216,7.087],"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":[[-1.518,0],[0,-1.518],[1.518,0],[0,1.517]],"o":[[1.518,0],[0,1.517],[-1.518,0],[0,-1.518]],"v":[[0.001,-2.748],[2.747,0.001],[0.001,2.748],[-2.747,0.001]],"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":[18.553,8.171],"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":[[-3.342,0],[0,-3.341],[3.342,0],[0,3.342]],"o":[[3.342,0],[0,3.342],[-3.342,0],[0,-3.341]],"v":[[0,-6.051],[6.051,0],[0,6.051],[-6.051,0]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0,0.635000011968,0.859000052658,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":[18.553,8.17],"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},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,4.375],[-10.11,0],[0,-4.375],[10.109,0]],"o":[[0,-4.375],[10.109,0],[0,4.375],[-10.11,0]],"v":[[-18.303,0],[0,-7.922],[18.303,0],[0,7.922]],"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":[18.553,8.172],"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 4","np":2,"cix":2,"bm":0,"ix":4,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":325,"st":0,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":"Eye L Outlines","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"t":0,"s":[206.368,610.312,0],"to":[0,-25.333,0],"ti":[0,70.052,0]},{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"t":4,"s":[206.368,458.312,0],"to":[0,-70.052,0],"ti":[0,44.719,0]},{"t":9,"s":[206.368,190,0]}],"ix":2},"a":{"a":0,"k":[18.554,8.172,0],"ix":1},"s":{"a":1,"k":[{"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":40,"s":[100,100,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":45,"s":[100,10,100]},{"t":49,"s":[100,100,100]}],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-0.599,0],[0,-0.599],[0.599,0],[0,0.599]],"o":[[0.599,0],[0,0.599],[-0.599,0],[0,-0.599]],"v":[[0,-1.084],[1.084,0],[0,1.084],[-1.084,0]],"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":[20.217,7.087],"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":[[-1.517,0],[0,-1.518],[1.518,0],[0,1.517]],"o":[[1.518,0],[0,1.517],[-1.517,0],[0,-1.518]],"v":[[0,-2.748],[2.747,0.001],[0,2.748],[-2.747,0.001]],"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":[18.554,8.171],"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":[[-3.341,0],[0,-3.341],[3.342,0],[0,3.342]],"o":[[3.342,0],[0,3.342],[-3.341,0],[0,-3.341]],"v":[[-0.001,-6.051],[6.051,0],[-0.001,6.051],[-6.051,0]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0,0.635000011968,0.859000052658,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":[18.554,8.17],"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},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,4.375],[-10.109,0],[0,-4.375],[10.109,0]],"o":[[0,-4.375],[10.109,0],[0,4.375],[-10.109,0]],"v":[[-18.304,0],[0,-7.922],[18.304,0],[0,7.922]],"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":[18.554,8.172],"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 4","np":2,"cix":2,"bm":0,"ix":4,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":325,"st":0,"bm":0},{"ddd":0,"ind":4,"ty":4,"nm":"Body Outlines","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"t":0,"s":[249.999,686.758,0],"to":[0,-25.333,0],"ti":[0,72,0]},{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"t":4,"s":[249.999,534.758,0],"to":[0,-72,0],"ti":[0,46.667,0]},{"t":9,"s":[249.999,254.758,0]}],"ix":2},"a":{"a":0,"k":[136.165,180.744,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":[[-3.402,-2.979],[11.265,0],[0,-5.958],[-9.031,0]],"o":[[0,-5.958],[-11.266,0],[3.402,-2.979],[9.031,0]],"v":[[20.408,5.397],[0,-5.397],[-20.408,5.397],[0,-0.001]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.275,0.238999998803,0.219999994016,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":[181.9,86.63],"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":[[-3.403,-2.979],[11.266,0],[0,-5.958],[-9.031,0]],"o":[[0,-5.958],[-11.265,0],[3.403,-2.979],[9.032,0]],"v":[[20.409,5.397],[-0.001,-5.397],[-20.409,5.397],[-0.001,-0.001]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.275,0.238999998803,0.219999994016,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":[94.64,86.63],"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":[[0,0],[0.001,0.027],[30.041,-0.416],[10.683,23.478],[0.063,0.026],[0,0],[-21.759,0],[-15.543,14.523]],"o":[[-0.067,0.026],[-11.346,23.629],[-32.949,0.457],[-0.002,0.028],[0,0],[15.646,14.42],[21.869,0],[0,0]],"v":[[55.135,-14.713],[54.77,-14.26],[0.475,20.065],[-55.032,-14.713],[-55.135,-14.713],[-51.84,-14.713],[0.892,9.27],[53.676,-15.918]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.277999997606,0.416000007181,0.588000009574,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":[136.114,257.216],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[96.842,82.936],"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},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-11.067,15.764],[0,-49.59],[0,0],[0,0],[0,0],[-45.941,1.207],[-22.365,0]],"o":[[45.941,1.207],[0,0],[0,0],[0,0],[0,-49.59],[11.068,15.764],[22.364,0]],"v":[[49.012,-59.368],[135.915,31.771],[135.915,59.367],[-135.915,59.367],[-135.915,31.771],[-58.148,-58.491],[-5.075,-41.587]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.490000017952,0.666999966491,0.885999971278,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":[141.165,344.871],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[98.519,171.048],"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 4","np":2,"cix":2,"bm":0,"ix":4,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[-18.87,5.024],[18.87,5.024],[18.87,-5.024],[-18.87,-5.024]],"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,-2.773],[0,0],[-2.773,0],[0,0],[0,2.773],[0,0],[2.776,0]],"o":[[-2.773,0],[0,0],[0,2.773],[0,0],[2.776,0],[0,0],[0,-2.773],[0,0]],"v":[[-13.848,-5.024],[-18.87,-0.001],[-18.87,0.002],[-13.848,5.024],[13.849,5.024],[18.871,0.002],[18.871,-0.001],[13.849,-5.024]],"c":true},"ix":2},"nm":"Path 2","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"mm","mm":4,"nm":"Merge Paths 1","mn":"ADBE Vector Filter - Merge","hd":false},{"ty":"fl","c":{"a":0,"k":[0.5,0.5,0.5,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":[136.165,157.869],"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 5","np":4,"cix":2,"bm":0,"ix":5,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[10.57,3.642],[-25.002,0],[0,12.139],[18.067,0]],"o":[[0,12.139],[24.999,0],[-10.571,3.642],[-18.07,0]],"v":[[-45.298,-10.997],[0.001,10.997],[45.298,-10.997],[0.001,-4.397]],"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":[136.166,195.037],"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 6","np":2,"cix":2,"bm":0,"ix":6,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-9.961,-3.568],[-2.343,0.115],[-11.044,8.689],[10.75,-10.299],[-0.057,-31.57],[13.345,9.027],[0.282,-0.075],[48.283,4.613],[0.084,0.036],[15.876,-46.037],[-9.634,16.501],[0.057,0.034],[-2.792,4.695],[-5.644,-3.357],[-0.121,-0.071],[-0.207,0.293],[0.085,0.135],[-3.409,2.108],[-3.617,-6.098],[-0.494,0.604],[-2.415,0.962],[-0.817,-3.48],[-26.683,0]],"o":[[2.206,0.798],[18.766,-1.071],[0,16.969],[15.458,18.025],[-8.613,-39.354],[-0.242,-0.164],[-43.221,11.536],[-0.092,-0.009],[-3.766,-0.758],[0,-24.349],[-0.056,-0.033],[-8.028,-4.775],[2.938,3.338],[0.121,0.073],[0.206,-0.294],[-0.085,-0.134],[-4.914,-7.944],[-0.211,3.304],[0.484,-0.623],[-1.305,-5.485],[-0.416,1.818],[17.082,-19.299],[11.196,0]],"v":[[31.897,-41.856],[38.79,-40.819],[86.352,-58.905],[68.796,-16.417],[93.783,58.623],[52.455,-4.713],[51.631,-4.852],[-52.036,1.733],[-52.301,1.666],[-93.784,58.905],[-78.549,-2.668],[-78.721,-2.77],[-88.206,-19.929],[-74.924,-9.15],[-74.56,-8.934],[-73.941,-9.813],[-74.196,-10.218],[-76.923,-28.431],[-71.609,-12.955],[-70.14,-14.798],[-68.458,-25.782],[-67.859,-17.478],[0,-47.27]],"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]],"o":[[0,0],[0,0],[0,0]],"v":[[93.783,58.905],[93.783,59.005],[93.783,58.804]],"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":0,"k":[0.275,0.238999998803,0.219999994016,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":[136.165,59.155],"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 7","np":4,"cix":2,"bm":0,"ix":7,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-51.761,0],[0,-66.692],[51.761,0],[0,66.692]],"o":[[51.761,0],[0,66.692],[-51.761,0],[0,-66.692]],"v":[[0.001,-113.506],[93.783,-7.331],[0.001,113.506],[-93.783,-7.331]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.976000019148,0.757000014361,0.532999973671,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":[136.166,125.391],"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 8","np":2,"cix":2,"bm":0,"ix":8,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-15.692,0],[0,-20.218],[15.692,0],[0,20.218]],"o":[[15.692,0],[0,20.218],[-15.692,0],[0,-20.218]],"v":[[0.001,-36.608],[28.413,0],[0.001,36.608],[-28.413,0]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.885999971278,0.689999988032,0.490000017952,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":[57.814,147.432],"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 9","np":2,"cix":2,"bm":0,"ix":9,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-15.691,0],[0,-20.218],[15.692,0],[0,20.218]],"o":[[15.692,0],[0,20.218],[-15.691,0],[0,-20.218]],"v":[[0,-36.608],[28.413,0],[0,36.608],[-28.413,0]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.885999971278,0.689999988032,0.490000017952,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":[214.517,147.432],"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 10","np":2,"cix":2,"bm":0,"ix":10,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[-52.074,-35.697],[52.074,-35.697],[52.074,35.698],[-52.074,35.698]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.885999971278,0.689999988032,0.490000017952,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":[136.164,238.896],"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 11","np":2,"cix":2,"bm":0,"ix":11,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":325,"st":0,"bm":0}]}],"layers":[{"ddd":0,"ind":1,"ty":0,"nm":"Avatar","refId":"comp_0","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":14,"s":[0]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":21,"s":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":69,"s":[100]},{"t":72,"s":[0]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[203.429,249.315,0],"ix":2},"a":{"a":0,"k":[250,250,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.833,0.833,0.833],"y":[0.833,0.833,0.833]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,0.167]},"t":69,"s":[96,96,100]},{"t":73,"s":[0,0,100]}],"ix":6}},"ao":0,"hasMask":true,"masksProperties":[{"inv":false,"mode":"a","pt":{"a":0,"k":{"i":[[114.186,0],[0,-105.197],[-121.28,0],[0,105.197]],"o":[[-129.613,0],[0,105.197],[118.303,0],[0,-105.197]],"v":[[296.875,42.292],[93.899,256.726],[301.042,456.578],[511.309,247.351]],"c":true},"ix":1},"o":{"a":0,"k":100,"ix":3},"x":{"a":0,"k":0,"ix":4},"nm":"Mask 1"}],"w":500,"h":500,"ip":12,"op":337,"st":12,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"Shape Layer 2","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[254,238,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":1,"k":[{"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":0,"s":[0,0,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":6,"s":[85,85,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":8,"s":[95,95,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":11,"s":[80,80,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":14,"s":[85,85,100]},{"i":{"x":[0.833,0.833,0.833],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":16,"s":[90,90,100]},{"i":{"x":[0.833,0.833,0.833],"y":[1,1,1]},"o":{"x":[0.167,0.167,0.167],"y":[0,0,0]},"t":70,"s":[90,90,100]},{"t":74,"s":[0,0,100]}],"ix":6}},"ao":0,"hasMask":true,"masksProperties":[{"inv":false,"mode":"a","pt":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[-225,-209],[-225,233],[217,233],[217,-209]],"c":true},"ix":1},"o":{"a":0,"k":100,"ix":3},"x":{"a":0,"k":0,"ix":4},"nm":"Mask 1"}],"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[442,442],"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.145098039216,0.337254901961,0.686274509804,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":[-4,12],"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":75,"st":0,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":"Shape Layer 1","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":4,"s":[100]},{"t":6,"s":[0]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[254,238,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":1,"k":[{"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":0,"s":[0,0,100]},{"i":{"x":[0.833,0.833,0.833],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":6,"s":[95,95,100]},{"i":{"x":[0.833,0.833,0.833],"y":[1,1,1]},"o":{"x":[0.167,0.167,0.167],"y":[0,0,0]},"t":70,"s":[95,95,100]},{"t":74,"s":[0,0,100]}],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[442,442],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"st","c":{"a":0,"k":[0.4,0.4,0.4,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":8,"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":[-4,12],"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":75,"st":0,"bm":0}],"markers":[]}
\ No newline at end of file
diff --git a/res/raw/adaptive_sleep.mp4 b/res/raw/adaptive_sleep.mp4
index e69de29..75502cb 100644
--- a/res/raw/adaptive_sleep.mp4
+++ b/res/raw/adaptive_sleep.mp4
Binary files differ
diff --git a/res/raw/assist_gesture_settings_animation.mp4 b/res/raw/assist_gesture_settings_animation.mp4
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/res/raw/assist_gesture_settings_animation.mp4
diff --git a/res/raw/assist_gesture_settings_animation_silence.mp4 b/res/raw/assist_gesture_settings_animation_silence.mp4
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/res/raw/assist_gesture_settings_animation_silence.mp4
diff --git a/res/raw/auto_reverse_charging.mp4 b/res/raw/auto_reverse_charging.mp4
new file mode 100644
index 0000000..076aa0f
--- /dev/null
+++ b/res/raw/auto_reverse_charging.mp4
Binary files differ
diff --git a/res/raw/aware_display.mp4 b/res/raw/aware_display.mp4
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/res/raw/aware_display.mp4
diff --git a/res/raw/aware_settings.mp4 b/res/raw/aware_settings.mp4
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/res/raw/aware_settings.mp4
diff --git a/res/raw/bliss.json b/res/raw/bliss.json
new file mode 100644
index 0000000..42829c0
--- /dev/null
+++ b/res/raw/bliss.json
@@ -0,0 +1 @@
+{"v":"5.5.7","meta":{"g":"LottieFiles AE 0.1.20","a":"Roger.T","k":"","d":"Bliss About Animation","tc":""},"fr":25,"ip":0,"op":99,"w":1080,"h":450,"nm":"Bliss About Final","ddd":0,"assets":[],"fonts":{"list":[{"fName":"ProductSans-Regular","fFamily":"Product Sans","fStyle":"Regular","ascent":72.5988159179688}]},"layers":[{"ddd":0,"ind":1,"ty":5,"nm":"BLISS","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":59,"s":[0]},{"t":65,"s":[100]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[724,246.48,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"t":{"d":{"k":[{"s":{"s":60,"f":"ProductSans-Regular","t":"BLISS","j":0,"tr":98,"lh":72,"ls":0,"fc":[0.4,0.4,0.4],"sc":[0,0,0],"sw":1,"of":false},"t":0}]},"p":{},"m":{"g":1,"a":{"a":0,"k":[0,0],"ix":2}},"a":[]},"ip":59,"op":99,"st":0,"bm":0},{"ddd":0,"ind":2,"ty":5,"nm":"TEAM","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":44,"s":[0]},{"t":54,"s":[100]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[184,246.48,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"t":{"d":{"k":[{"s":{"s":60,"f":"ProductSans-Regular","t":"TEAM","j":0,"tr":98,"lh":72,"ls":0,"fc":[0.4,0.4,0.4],"sc":[0,0,0],"sw":1,"of":false},"t":0}]},"p":{},"m":{"g":1,"a":{"a":0,"k":[0,0],"ix":2}},"a":[]},"ip":44,"op":99,"st":0,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":"Layer 1/Artboard blue [Konvertiert] Outlines","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[540,225,0],"ix":2},"a":{"a":0,"k":[500,307,0],"ix":1},"s":{"a":1,"k":[{"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":4,"s":[0,0,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":10,"s":[35,35,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":12,"s":[25,25,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":15,"s":[32,32,100]},{"t":19,"s":[30,30,100]}],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-22.75,9.31],[-48.08,5.74],[14.83,-30.3],[39.06,-46.08],[13.64,-9],[31.38,-10.12],[39.91,-5.85],[24.41,-2.27],[7.72,-0.12],[-73.43,62.65],[-30.96,18.92]],"o":[[44.52,-19.23],[-14.57,30.42],[-26.93,54],[-10.78,12.39],[-27.83,17.77],[-38.41,12.38],[-24.23,3.79],[-7.7,0.65],[55.18,-78.87],[27.34,-23.87],[21.11,-12.54]],"v":[[101.655,-138.94],[241.845,-175.56],[198.135,-84.29],[99.745,67.25],[61.945,98.41],[-27.725,139.67],[-145.595,166.58],[-218.705,174.52],[-241.845,175.56],[-51.705,-41.22],[36.155,-105.31]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0,0.658999992819,0.925,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":[757.695,437.16],"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":[[10.21,21.93],[-67.19,-44.36],[-28.79,-26.24],[-26.75,-32.38],[-23.43,-31.46],[-2.53,-4.07],[13.64,0.98],[20.09,3.54],[24.79,6.61],[34.42,18.81],[15.76,16.31],[13.13,18.92],[19.8,42.69]],"o":[[80.19,8.81],[32.6,21.38],[30.87,28.48],[25.41,29.93],[2.91,3.81],[-13.65,-0.92],[-20.27,-2.25],[-25.39,-3.7],[-38.03,-9.38],[-19.93,-10.85],[-16.07,-16.59],[-26.27,-39.04],[-10.4,-21.83]],"v":[[-241.425,-175.855],[-16.685,-93.085],[74.975,-20.715],[161.625,70.645],[233.225,164.055],[241.425,175.855],[200.475,173.105],[139.785,165.525],[64.415,150.135],[-45.225,108.525],[-99.035,67.295],[-141.385,12.705],[-210.615,-110.165]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0,0.658999992819,0.925,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":[241.435,437.295],"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":[[-5.65,2.55],[-7.94,2.84],[6.36,-26.22],[12.79,-29.6],[2.7,-1.45],[9.39,-4.99],[15.64,-11.32],[14.93,-11],[-2.72,22.51],[0.06,22.04],[-2.62,2.83],[-12.14,11.85],[-7.34,6.37],[-20.14,10.69]],"o":[[7.64,-3.51],[0.56,26.98],[-7.15,31.55],[-1.19,3.02],[-9.37,5.02],[-16.62,9.79],[-15.12,10.75],[4.41,-22.24],[2.26,-21.92],[0.25,-3.51],[11.25,-12.72],[7.26,-6.45],[17.92,-13.99],[5.4,-3.04]],"v":[[61.66,-117.705],[84.65,-128.105],[75.84,-47.885],[43.59,43.285],[36.73,49.365],[8.47,64.145],[-40.42,95.095],[-85.21,128.105],[-74.44,60.955],[-71.22,-5.025],[-69.1,-15.535],[-33.11,-51.535],[-11.09,-70.635],[45.13,-109.225]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0,0.658999992819,0.925,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":[795.59,247.025],"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},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0.05,11.31],[-20.96,-14.48],[-25.38,-26.73],[0.24,-3.74],[-2.09,-22.94],[-3.08,-23.21],[33.83,18.03],[9.42,4.94],[1.28,2.35],[5.54,15.32],[2.86,9.21],[1.89,7.97],[1.53,13.78]],"o":[[24.25,8.2],[30.24,21.16],[2.24,2.52],[0.32,23.03],[2.18,23.34],[-30.3,-23.33],[-9.26,-5.26],[-2.34,-1.18],[-7.18,-14.63],[-3.58,-8.96],[-2.53,-7.8],[-3.27,-13.49],[-1.32,-11.26]],"v":[[-84.675,-128.035],[-17.395,-91.895],[65.695,-19.105],[70.865,-10.365],[74.315,58.635],[85.045,128.035],[-9.765,63.465],[-38.045,48.655],[-43.905,43.525],[-62.475,-1.655],[-71.255,-29.205],[-77.095,-53.065],[-83.725,-94.115]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0,0.658999992819,0.925,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":[203.145,247.205],"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 4","np":2,"cix":2,"bm":0,"ix":4,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-14.3,13.06],[-5.93,3.79],[0.87,-50.53],[10.27,-40.47],[2.11,-5.03],[4.13,-3.56],[13.41,-14.31],[12.03,-13.57],[26.75,-34.19],[6.98,-5.49],[-1.67,27.58],[-9.24,39.34],[-2.83,10.55],[-7.49,18.76],[-38.34,47.31]],"o":[[5.08,-4.83],[9.87,49.56],[-0.59,41.7],[-1.36,5.25],[-2.65,4.81],[-14.46,13.22],[-12.59,13.06],[-28.68,32.63],[-5.52,6.77],[-1.75,-27.64],[3.17,-40.29],[2.77,-10.56],[6.07,-19.25],[21.82,-56.8],[12.32,-14.91]],"v":[[74.345,-239.445],[90.625,-252.735],[104.235,-102.035],[88.915,21.925],[84.535,37.625],[73.695,49.855],[31.285,90.555],[-5.715,130.455],[-86.895,232.315],[-103.355,252.735],[-101.345,169.835],[-82.795,50.155],[-74.555,18.455],[-55.295,-38.955],[34.955,-196.855]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0,0.658999992819,0.925,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":[609.215,350.015],"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 5","np":2,"cix":2,"bm":0,"ix":5,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-8.49,39.75],[-6.7,-6.6],[-21.13,-33.6],[-13.71,-87.03],[-1.48,-27.21],[-0.53,-16.23],[1.65,-5.42],[4.66,6.13],[13.91,18.46],[11.74,12.97],[14.03,14.67],[11.59,10.41],[5.84,5.13],[0.99,3.61],[2.94,12.58],[-0.95,43.93]],"o":[[7.75,5.38],[28.75,27.5],[46.73,74.96],[4.26,26.92],[1.09,16.21],[0.06,5.55],[-5.86,-5.09],[-13.91,-18.46],[-10.48,-14.01],[-13.77,-14.92],[-11.01,-11.01],[-5.76,-5.23],[-2.65,-2.46],[-4.07,-12.29],[-8.55,-43.15],[1.19,-40.58]],"v":[[-90.47,-252.78],[-69.17,-234.31],[4.63,-141.1],[93.88,106.16],[102.51,187.43],[104.12,236.12],[103.27,252.78],[88.46,235.05],[46.71,179.68],[13.42,139.14],[-28.05,94.55],[-60.94,61.41],[-78.24,45.75],[-84.78,37.11],[-93.81,-0.59],[-103.97,-131.82]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0,0.658999992819,0.925,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":[389.62,349.87],"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 6","np":2,"cix":2,"bm":0,"ix":6,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-28.74,57.66],[-10.41,13.05],[-9.35,-17.67],[-5.31,-57.85],[1.42,-2.71],[7.64,-18.93],[9.13,-41.34],[3.89,-24.76],[0.59,-2.7],[4.21,20.57],[6.48,21.1],[9.31,22.35],[7.65,14.16],[-0.25,5.18]],"o":[[7.73,-14.74],[13.49,14.8],[28.01,51.17],[0.07,3.16],[-9.63,17.95],[-15.98,39.12],[-5.76,24.43],[-0.46,2.73],[-3.34,-20.72],[-3.88,-21.73],[-6.83,-23.26],[-6.21,-14.82],[-2.89,-4.74],[4.42,-64.09]],"v":[[-29.155,-198.6],[-2.825,-241],[31.095,-191.69],[79.005,-25.04],[76.035,-16.36],[48.835,38.36],[9.255,158.75],[-3.415,232.89],[-5.095,241],[-15.685,178.93],[-31.065,114.57],[-56.295,46.46],[-76.185,2.55],[-77.315,-13.01]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0,0.658999992819,0.925,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":[504.605,241.01],"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 7","np":2,"cix":2,"bm":0,"ix":7,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":99,"st":0,"bm":0},{"ddd":0,"ind":4,"ty":4,"nm":"Shape Layer 4","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[540,212.417,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[98.226,91.954,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-690.232,12.425],[-193,14]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0,0.658823529412,0.925490255917,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":3,"ix":5},"lc":1,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"fl","c":{"a":0,"k":[0,0.658823529412,0.925490255917,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":[79.248,103.571],"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":"Shape 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tm","s":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":0,"s":[0]},{"t":5,"s":[100]}],"ix":1},"e":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":0,"s":[0]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":5,"s":[24.538]},{"t":10,"s":[100]}],"ix":2},"o":{"a":0,"k":0,"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1","mn":"ADBE Vector Filter - Trim","hd":false}],"ip":0,"op":99,"st":0,"bm":0},{"ddd":0,"ind":5,"ty":4,"nm":"Shape Layer 2","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[540,212.417,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[98.226,255.14,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-690.232,12.425],[-193,14]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0,0.658823529412,0.925490255917,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":3,"ix":5},"lc":1,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"fl","c":{"a":0,"k":[0,0.658823529412,0.925490255917,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":[79.248,103.571],"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":"Shape 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tm","s":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":3,"s":[0]},{"t":8,"s":[100]}],"ix":1},"e":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":3,"s":[0]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":8,"s":[24.538]},{"t":13,"s":[100]}],"ix":2},"o":{"a":0,"k":0,"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1","mn":"ADBE Vector Filter - Trim","hd":false}],"ip":0,"op":99,"st":0,"bm":0},{"ddd":0,"ind":6,"ty":4,"nm":"Shape Layer 3","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[540,212.417,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[98.226,402.785,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-690.232,12.425],[-193,14]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0,0.658823529412,0.925490255917,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":0.5,"ix":5},"lc":1,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"fl","c":{"a":0,"k":[0,0.658823529412,0.925490255917,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":[79.248,103.571],"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":"Shape 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tm","s":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":2,"s":[0]},{"t":7,"s":[100]}],"ix":1},"e":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":2,"s":[0]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":7,"s":[24.538]},{"t":12,"s":[100]}],"ix":2},"o":{"a":0,"k":0,"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1","mn":"ADBE Vector Filter - Trim","hd":false}],"ip":0,"op":99,"st":0,"bm":0},{"ddd":0,"ind":7,"ty":4,"nm":"Shape Layer 7","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[1227,212.417,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[98.226,91.954,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-690.232,12.425],[-193,14]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0,0.658823529412,0.925490255917,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":3,"ix":5},"lc":1,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"fl","c":{"a":0,"k":[0,0.658823529412,0.925490255917,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":[79.248,103.571],"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":"Shape 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tm","s":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":13,"s":[0]},{"t":18,"s":[100]}],"ix":1},"e":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":13,"s":[0]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":18,"s":[24.538]},{"t":23,"s":[100]}],"ix":2},"o":{"a":0,"k":0,"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1","mn":"ADBE Vector Filter - Trim","hd":false}],"ip":0,"op":99,"st":0,"bm":0},{"ddd":0,"ind":8,"ty":4,"nm":"Shape Layer 6","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[1227,212.417,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[98.226,255.14,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-690.232,12.425],[-193,14]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0,0.658823529412,0.925490255917,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":3,"ix":5},"lc":1,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"fl","c":{"a":0,"k":[0,0.658823529412,0.925490255917,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":[79.248,103.571],"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":"Shape 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tm","s":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":16,"s":[0]},{"t":21,"s":[100]}],"ix":1},"e":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":16,"s":[0]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":21,"s":[24.538]},{"t":26,"s":[100]}],"ix":2},"o":{"a":0,"k":0,"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1","mn":"ADBE Vector Filter - Trim","hd":false}],"ip":0,"op":99,"st":0,"bm":0},{"ddd":0,"ind":9,"ty":4,"nm":"Shape Layer 5","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[1227,212.417,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[98.226,402.785,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-690.232,12.425],[-193,14]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0,0.658823529412,0.925490255917,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":0.5,"ix":5},"lc":1,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"fl","c":{"a":0,"k":[0,0.658823529412,0.925490255917,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":[79.248,103.571],"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":"Shape 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tm","s":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":15,"s":[0]},{"t":20,"s":[100]}],"ix":1},"e":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":15,"s":[0]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":20,"s":[24.538]},{"t":25,"s":[100]}],"ix":2},"o":{"a":0,"k":0,"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1","mn":"ADBE Vector Filter - Trim","hd":false}],"ip":0,"op":99,"st":0,"bm":0},{"ddd":0,"ind":10,"ty":4,"nm":"Shape Layer 13","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[540,212.417,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[98.226,91.954,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-690.232,12.425],[-193,14]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0,0.658823529412,0.925490255917,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":3,"ix":5},"lc":1,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"fl","c":{"a":0,"k":[0,0.658823529412,0.925490255917,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":[79.248,103.571],"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":"Shape 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tm","s":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":41,"s":[0]},{"t":46,"s":[100]}],"ix":1},"e":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":41,"s":[0]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":46,"s":[24.538]},{"t":51,"s":[100]}],"ix":2},"o":{"a":0,"k":0,"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1","mn":"ADBE Vector Filter - Trim","hd":false}],"ip":41,"op":99,"st":41,"bm":0},{"ddd":0,"ind":11,"ty":4,"nm":"Shape Layer 12","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[540,212.417,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[98.226,255.14,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-690.232,12.425],[-193,14]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0,0.658823529412,0.925490255917,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":3,"ix":5},"lc":1,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"fl","c":{"a":0,"k":[0,0.658823529412,0.925490255917,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":[79.248,103.571],"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":"Shape 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tm","s":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":44,"s":[0]},{"t":49,"s":[100]}],"ix":1},"e":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":44,"s":[0]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":49,"s":[24.538]},{"t":54,"s":[100]}],"ix":2},"o":{"a":0,"k":0,"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1","mn":"ADBE Vector Filter - Trim","hd":false}],"ip":41,"op":99,"st":41,"bm":0},{"ddd":0,"ind":12,"ty":4,"nm":"Shape Layer 11","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[540,212.417,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[98.226,402.785,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-690.232,12.425],[-193,14]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0,0.658823529412,0.925490255917,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":0.5,"ix":5},"lc":1,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"fl","c":{"a":0,"k":[0,0.658823529412,0.925490255917,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":[79.248,103.571],"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":"Shape 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tm","s":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":43,"s":[0]},{"t":48,"s":[100]}],"ix":1},"e":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":43,"s":[0]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":48,"s":[24.538]},{"t":53,"s":[100]}],"ix":2},"o":{"a":0,"k":0,"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1","mn":"ADBE Vector Filter - Trim","hd":false}],"ip":41,"op":99,"st":41,"bm":0},{"ddd":0,"ind":13,"ty":4,"nm":"Shape Layer 10","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[1227,212.417,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[98.226,91.954,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-690.232,12.425],[-193,14]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0,0.658823529412,0.925490255917,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":3,"ix":5},"lc":1,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"fl","c":{"a":0,"k":[0,0.658823529412,0.925490255917,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":[79.248,103.571],"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":"Shape 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tm","s":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":54,"s":[0]},{"t":59,"s":[100]}],"ix":1},"e":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":54,"s":[0]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":59,"s":[24.538]},{"t":64,"s":[100]}],"ix":2},"o":{"a":0,"k":0,"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1","mn":"ADBE Vector Filter - Trim","hd":false}],"ip":41,"op":99,"st":41,"bm":0},{"ddd":0,"ind":14,"ty":4,"nm":"Shape Layer 9","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[1227,212.417,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[98.226,255.14,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-690.232,12.425],[-193,14]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0,0.658823529412,0.925490255917,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":3,"ix":5},"lc":1,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"fl","c":{"a":0,"k":[0,0.658823529412,0.925490255917,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":[79.248,103.571],"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":"Shape 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tm","s":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":57,"s":[0]},{"t":62,"s":[100]}],"ix":1},"e":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":57,"s":[0]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":62,"s":[24.538]},{"t":67,"s":[100]}],"ix":2},"o":{"a":0,"k":0,"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1","mn":"ADBE Vector Filter - Trim","hd":false}],"ip":41,"op":99,"st":41,"bm":0},{"ddd":0,"ind":15,"ty":4,"nm":"Shape Layer 8","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[1227,212.417,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[98.226,402.785,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-690.232,12.425],[-193,14]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0,0.658823529412,0.925490255917,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":0.5,"ix":5},"lc":1,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"fl","c":{"a":0,"k":[0,0.658823529412,0.925490255917,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":[79.248,103.571],"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":"Shape 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tm","s":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":56,"s":[0]},{"t":61,"s":[100]}],"ix":1},"e":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":56,"s":[0]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":61,"s":[24.538]},{"t":66,"s":[100]}],"ix":2},"o":{"a":0,"k":0,"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1","mn":"ADBE Vector Filter - Trim","hd":false}],"ip":41,"op":99,"st":41,"bm":0}],"markers":[],"chars":[{"ch":"T","size":60,"style":"Regular","w":54,"data":{"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],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]],"v":[[51.6,-62.8],[51.6,-71.6],[2.4,-71.6],[2.4,-62.8],[22.4,-62.8],[22.4,0],[31.6,0],[31.6,-62.8]],"c":true},"ix":2},"nm":"T","mn":"ADBE Vector Shape - Group","hd":false}],"nm":"T","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}]},"fFamily":"Product Sans"},{"ch":"E","size":60,"style":"Regular","w":54.2,"data":{"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],[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],[0,0],[0,0],[0,0],[0,0]],"v":[[7.2,-71.6],[7.2,0],[49,0],[49,-8.8],[16.4,-8.8],[16.4,-31.5],[45.8,-31.5],[45.8,-40.1],[16.4,-40.1],[16.4,-62.8],[49,-62.8],[49,-71.6]],"c":true},"ix":2},"nm":"E","mn":"ADBE Vector Shape - Group","hd":false}],"nm":"E","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}]},"fFamily":"Product Sans"},{"ch":"A","size":60,"style":"Regular","w":66.8,"data":{"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[33.6,-60.3],[45.3,-28],[21.5,-28],[33.2,-60.3]],"c":true},"ix":2},"nm":"A","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":[[18.4,-19.4],[48.5,-19.4],[55.4,0],[65.6,0],[38.6,-71.6],[28.2,-71.6],[1.2,0],[11.4,0]],"c":true},"ix":2},"nm":"A","mn":"ADBE Vector Shape - Group","hd":false}],"nm":"A","np":5,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}]},"fFamily":"Product Sans"},{"ch":"M","size":60,"style":"Regular","w":83,"data":{"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],[0,0],[0,0],[0,0],[0,0],[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],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]],"v":[[16.4,-42.5],[16,-54.5],[16.4,-54.5],[38.8,-15.2],[44.2,-15.2],[66.6,-54.5],[67,-54.5],[66.6,-42.5],[66.6,0],[75.8,0],[75.8,-71.6],[66.6,-71.6],[41.7,-28],[41.3,-28],[16.4,-71.6],[7.2,-71.6],[7.2,0],[16.4,0]],"c":true},"ix":2},"nm":"M","mn":"ADBE Vector Shape - Group","hd":false}],"nm":"M","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}]},"fFamily":"Product Sans"},{"ch":"B","size":60,"style":"Regular","w":59.4,"data":{"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[-4.134,3.867],[0,5.867],[2.2,2.967],[3.666,1.2],[0,0],[0,7.067],[4.066,3.667],[5.666,0],[0,0],[0,0]],"o":[[6.066,0],[4.266,-3.866],[0,-3.8],[-2.2,-2.966],[0,0],[6.466,-2.866],[0,-5.6],[-4.067,-3.733],[0,0],[0,0],[0,0]],"v":[[34.5,0],[49.8,-5.8],[56.2,-20.4],[52.9,-30.55],[44.1,-36.8],[44.1,-37.2],[53.8,-52.1],[47.7,-66],[33.1,-71.6],[7.2,-71.6],[7.2,0]],"c":true},"ix":2},"nm":"B","mn":"ADBE Vector Shape - Group","hd":false},{"ind":1,"ty":"sh","ix":2,"ks":{"a":0,"k":{"i":[[0,0],[-2.134,-2.2],[0,-2.8],[2.2,-2.266],[3.266,0],[0,0],[0,0]],"o":[[3.133,0],[2.133,2.267],[0,2.867],[-2.2,2.2],[0,0],[0,0],[0,0]],"v":[[33.5,-62.8],[41.4,-59.5],[44.6,-51.9],[41.3,-44.2],[33.1,-40.9],[16.4,-40.9],[16.4,-62.8]],"c":true},"ix":2},"nm":"B","mn":"ADBE Vector Shape - Group","hd":false},{"ind":2,"ty":"sh","ix":3,"ks":{"a":0,"k":{"i":[[0,0],[-2.334,-2.333],[0,-3.133],[2.266,-2.333],[3.333,0],[0,0],[0,0]],"o":[[3.533,0],[2.333,2.334],[0,3.2],[-2.334,2.334],[0,0],[0,0],[0,0]],"v":[[34.5,-32.3],[43.3,-28.8],[46.8,-20.6],[43.4,-12.3],[34.9,-8.8],[16.4,-8.8],[16.4,-32.3]],"c":true},"ix":2},"nm":"B","mn":"ADBE Vector Shape - Group","hd":false}],"nm":"B","np":6,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}]},"fFamily":"Product Sans"},{"ch":"L","size":60,"style":"Regular","w":49.8,"data":{"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":[[47.4,-8.8],[16.4,-8.8],[16.4,-71.6],[7.2,-71.6],[7.2,0],[47.4,0]],"c":true},"ix":2},"nm":"L","mn":"ADBE Vector Shape - Group","hd":false}],"nm":"L","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}]},"fFamily":"Product Sans"},{"ch":"I","size":60,"style":"Regular","w":23.6,"data":{"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[16.4,-71.6],[7.2,-71.6],[7.2,0],[16.4,0]],"c":true},"ix":2},"nm":"I","mn":"ADBE Vector Shape - Group","hd":false}],"nm":"I","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}]},"fFamily":"Product Sans"},{"ch":"S","size":60,"style":"Regular","w":55.3,"data":{"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[3.1,3.567],[7.266,2.467],[2.133,1.8],[0,2.467],[-2.467,1.867],[-3.6,0],[-2.367,-1.766],[-0.8,-2.666],[0,0],[4,2.734],[5.466,0],[4.266,-3.733],[0,-5.266],[-7.6,-3.866],[-5.734,-2.066],[-2.067,-2.066],[0,-3],[2.666,-2.166],[4.2,0],[1.733,0.7],[1.433,1.234],[1.066,1.734],[0.6,2.134],[0,0],[-4.534,-3.466],[-5.934,0],[-4.667,3.734],[0,6.267]],"o":[[-3.1,-3.566],[-7.134,-2.466],[-1.934,-1.8],[0,-3],[2.466,-2],[3.4,0],[2.366,1.767],[0,0],[-1.334,-4.133],[-4,-2.8],[-6.2,0],[-4.2,3.734],[0,7.534],[1.4,0.734],[5.666,1.934],[2.2,2.134],[0,3.6],[-2.667,2.167],[-1.934,0],[-1.734,-0.7],[-1.434,-1.233],[-1.067,-1.733],[0,0],[1.733,6],[4.533,3.467],[6.666,0],[4.6,-3.8],[0,-5.2]],"v":[[46.75,-32.25],[31.2,-41.3],[17.3,-47.7],[14.4,-54.1],[18.1,-61.4],[27.2,-64.4],[35.85,-61.75],[40.6,-55.1],[49.2,-58.7],[41.2,-69],[27,-73.2],[11.3,-67.6],[5,-54.1],[16.4,-37],[27.1,-32.8],[38.7,-26.8],[42,-19.1],[38,-10.45],[27.7,-7.2],[22.2,-8.25],[17.45,-11.15],[13.7,-15.6],[11.2,-21.4],[2.4,-17.8],[11.8,-3.6],[27.5,1.6],[44.5,-4],[51.4,-19.1]],"c":true},"ix":2},"nm":"S","mn":"ADBE Vector Shape - Group","hd":false}],"nm":"S","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}]},"fFamily":"Product Sans"}]}
\ No newline at end of file
diff --git a/res/raw/bluetooth.json b/res/raw/bluetooth.json
new file mode 100644
index 0000000..0a297d7
--- /dev/null
+++ b/res/raw/bluetooth.json
@@ -0,0 +1 @@
+{"v":"4.6.9","fr":29.9700012207031,"ip":0,"op":240.0000097754,"w":800,"h":600,"nm":"With Battery","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"Battery Level","parent":3,"ks":{"o":{"a":0,"k":100},"r":{"a":0,"k":0},"p":{"a":0,"k":[-30.5,0,0]},"a":{"a":0,"k":[0,0,0]},"s":{"a":0,"k":[100,100,100]}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[106.5,40],[106.5,-40]],"c":false}},"nm":"Path 1","mn":"ADBE Vector Shape - Group"},{"ty":"st","c":{"a":0,"k":[0.49411764705882355,0.8274509803921568,0.12941176470588237,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":15},"lc":1,"lj":1,"ml":4,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke"},{"ty":"tr","p":{"a":0,"k":[25,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":"Shape 1","np":3,"cix":2,"ix":1,"mn":"ADBE Vector Group"},{"ty":"tm","s":{"a":0,"k":0,"ix":1},"e":{"a":1,"k":[{"i":{"x":[0],"y":[1]},"o":{"x":[0.167],"y":[0.167]},"n":["0_1_0p167_0p167"],"t":134,"s":[0],"e":[60]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":150,"s":[60],"e":[60]},{"i":{"x":[0],"y":[1]},"o":{"x":[0.167],"y":[0.167]},"n":["0_1_0p167_0p167"],"t":225,"s":[60],"e":[0]},{"t":233.000009490285}],"ix":2},"o":{"a":0,"k":0,"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1","mn":"ADBE Vector Filter - Trim"}],"ip":0,"op":240.0000097754,"st":0,"bm":0,"sr":1},{"ddd":0,"ind":2,"ty":4,"nm":"Battery Bar","parent":3,"ks":{"o":{"a":0,"k":25},"r":{"a":0,"k":0},"p":{"a":0,"k":[-30.5,0,0]},"a":{"a":0,"k":[0,0,0]},"s":{"a":0,"k":[100,100,100]}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[106.5,40],[106.5,-40]],"c":false}},"nm":"Path 1","mn":"ADBE Vector Shape - Group"},{"ty":"st","c":{"a":0,"k":[0.105882,0.105882,0.105882,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":15},"lc":1,"lj":1,"ml":4,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke"},{"ty":"tr","p":{"a":0,"k":[25,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":"Shape 1","np":3,"cix":2,"ix":1,"mn":"ADBE Vector Group"},{"ty":"tm","s":{"a":0,"k":0,"ix":1},"e":{"a":1,"k":[{"i":{"x":[0],"y":[1]},"o":{"x":[0.167],"y":[0.167]},"n":["0_1_0p167_0p167"],"t":125,"s":[0],"e":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":141,"s":[100],"e":[100]},{"i":{"x":[0],"y":[1]},"o":{"x":[0.167],"y":[0.167]},"n":["0_1_0p167_0p167"],"t":225,"s":[100],"e":[0]},{"t":233.000009490285}],"ix":2},"o":{"a":0,"k":0,"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1","mn":"ADBE Vector Filter - Trim"}],"ip":0,"op":240.0000097754,"st":0,"bm":0,"sr":1},{"ddd":0,"ind":3,"ty":4,"nm":"Bluetooth Device","ks":{"o":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"n":["0p667_1_0p333_0"],"t":0,"s":[100],"e":[25]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"n":["0p667_1_0p333_0"],"t":20,"s":[25],"e":[100]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"n":["0p667_1_0p333_0"],"t":40,"s":[100],"e":[25]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"n":["0p667_1_0p333_0"],"t":60,"s":[25],"e":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.333],"y":[0.333]},"n":["0p833_0p833_0p333_0p333"],"t":80,"s":[100],"e":[100]},{"i":{"x":[0.833],"y":[1]},"o":{"x":[0.167],"y":[0]},"n":["0p833_1_0p167_0"],"t":90,"s":[100],"e":[25]},{"i":{"x":[0.833],"y":[1]},"o":{"x":[0.167],"y":[0]},"n":["0p833_1_0p167_0"],"t":95,"s":[25],"e":[100]},{"i":{"x":[0.833],"y":[1]},"o":{"x":[0.167],"y":[0]},"n":["0p833_1_0p167_0"],"t":100,"s":[100],"e":[25]},{"i":{"x":[0.833],"y":[1]},"o":{"x":[0.167],"y":[0]},"n":["0p833_1_0p167_0"],"t":105,"s":[25],"e":[100]},{"t":110.000004480392}]},"r":{"a":0,"k":0},"p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.167,"y":0.167},"n":"0_1_0p167_0p167","t":110,"s":[356,300,0],"e":[410.5,300,0],"to":[9.08333301544189,0,0],"ti":[-9.08333301544189,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"n":"0p833_0p833_0p167_0p167","t":141,"s":[410.5,300,0],"e":[410.5,300,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0,"y":1},"o":{"x":0.167,"y":0.167},"n":"0_1_0p167_0p167","t":225,"s":[410.5,300,0],"e":[356,300,0],"to":[-9.08333301544189,0,0],"ti":[9.08333301544189,0,0]},{"t":240.0000097754}]},"a":{"a":0,"k":[0,0,0]},"s":{"a":0,"k":[100,100,100]}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,14.667],[12.333,0],[0,-10],[-8.75,0],[0,45.375],[37.938,0],[0,0],[0,-37.333],[-20.125,0],[0,8.625],[16.833,0],[0,-14.667],[-18.375,0],[-10.5,10.125],[0,0],[0,0],[0,0],[0,0],[0,0]],"o":[[16.604,0],[0,-14.667],[-16.833,0],[0,8.625],[19.438,0],[0,-32.5],[0,0],[-31.812,0],[0,43.812],[8.75,0],[0,-10],[-12.333,0],[0,12.083],[16.08,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]],"v":[[17.594,58.646],[44.719,32.375],[26.135,7.333],[6.844,35.5],[17.594,58.625],[51.344,-1.375],[-9.781,-59],[-9.406,-59],[-70.094,-1.438],[-36.781,58.625],[-26.031,35.5],[-45.323,7.333],[-63.906,32.375],[-36.781,58.604],[6.344,36.25],[70.094,-27.5],[40.969,-55.75],[40.969,59],[70.094,30.75],[6.344,-33]],"c":false}},"nm":"Path 1","mn":"ADBE Vector Shape - Group"},{"ty":"st","c":{"a":0,"k":[0.2901960784313726,0.5647058823529412,0.8862745098039215,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":15},"lc":1,"lj":1,"ml":4,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke"},{"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":"Shape 1","np":3,"cix":2,"ix":1,"mn":"ADBE Vector Group"},{"ty":"tm","s":{"a":1,"k":[{"i":{"x":[0],"y":[1]},"o":{"x":[0.167],"y":[0.167]},"n":["0_1_0p167_0p167"],"t":110,"s":[64.4],"e":[45.4]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":141,"s":[45.4],"e":[45.4]},{"i":{"x":[0],"y":[1]},"o":{"x":[0.167],"y":[0.167]},"n":["0_1_0p167_0p167"],"t":225,"s":[45.4],"e":[64.4]},{"t":240.0000097754}],"ix":1},"e":{"a":0,"k":100,"ix":2},"o":{"a":1,"k":[{"i":{"x":[0],"y":[1]},"o":{"x":[0.167],"y":[0.167]},"n":["0_1_0p167_0p167"],"t":110,"s":[0],"e":[-155]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":141,"s":[-155],"e":[-155]},{"i":{"x":[0],"y":[1]},"o":{"x":[0.167],"y":[0.167]},"n":["0_1_0p167_0p167"],"t":225,"s":[-155],"e":[0]},{"t":240.0000097754}],"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1","mn":"ADBE Vector Filter - Trim"}],"ip":0,"op":240.0000097754,"st":0,"bm":0,"sr":1}]}
\ No newline at end of file
diff --git a/res/raw/bluetooth_connection.json b/res/raw/bluetooth_connection.json
new file mode 100644
index 0000000..0a297d7
--- /dev/null
+++ b/res/raw/bluetooth_connection.json
@@ -0,0 +1 @@
+{"v":"4.6.9","fr":29.9700012207031,"ip":0,"op":240.0000097754,"w":800,"h":600,"nm":"With Battery","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"Battery Level","parent":3,"ks":{"o":{"a":0,"k":100},"r":{"a":0,"k":0},"p":{"a":0,"k":[-30.5,0,0]},"a":{"a":0,"k":[0,0,0]},"s":{"a":0,"k":[100,100,100]}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[106.5,40],[106.5,-40]],"c":false}},"nm":"Path 1","mn":"ADBE Vector Shape - Group"},{"ty":"st","c":{"a":0,"k":[0.49411764705882355,0.8274509803921568,0.12941176470588237,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":15},"lc":1,"lj":1,"ml":4,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke"},{"ty":"tr","p":{"a":0,"k":[25,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":"Shape 1","np":3,"cix":2,"ix":1,"mn":"ADBE Vector Group"},{"ty":"tm","s":{"a":0,"k":0,"ix":1},"e":{"a":1,"k":[{"i":{"x":[0],"y":[1]},"o":{"x":[0.167],"y":[0.167]},"n":["0_1_0p167_0p167"],"t":134,"s":[0],"e":[60]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":150,"s":[60],"e":[60]},{"i":{"x":[0],"y":[1]},"o":{"x":[0.167],"y":[0.167]},"n":["0_1_0p167_0p167"],"t":225,"s":[60],"e":[0]},{"t":233.000009490285}],"ix":2},"o":{"a":0,"k":0,"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1","mn":"ADBE Vector Filter - Trim"}],"ip":0,"op":240.0000097754,"st":0,"bm":0,"sr":1},{"ddd":0,"ind":2,"ty":4,"nm":"Battery Bar","parent":3,"ks":{"o":{"a":0,"k":25},"r":{"a":0,"k":0},"p":{"a":0,"k":[-30.5,0,0]},"a":{"a":0,"k":[0,0,0]},"s":{"a":0,"k":[100,100,100]}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[106.5,40],[106.5,-40]],"c":false}},"nm":"Path 1","mn":"ADBE Vector Shape - Group"},{"ty":"st","c":{"a":0,"k":[0.105882,0.105882,0.105882,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":15},"lc":1,"lj":1,"ml":4,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke"},{"ty":"tr","p":{"a":0,"k":[25,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":"Shape 1","np":3,"cix":2,"ix":1,"mn":"ADBE Vector Group"},{"ty":"tm","s":{"a":0,"k":0,"ix":1},"e":{"a":1,"k":[{"i":{"x":[0],"y":[1]},"o":{"x":[0.167],"y":[0.167]},"n":["0_1_0p167_0p167"],"t":125,"s":[0],"e":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":141,"s":[100],"e":[100]},{"i":{"x":[0],"y":[1]},"o":{"x":[0.167],"y":[0.167]},"n":["0_1_0p167_0p167"],"t":225,"s":[100],"e":[0]},{"t":233.000009490285}],"ix":2},"o":{"a":0,"k":0,"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1","mn":"ADBE Vector Filter - Trim"}],"ip":0,"op":240.0000097754,"st":0,"bm":0,"sr":1},{"ddd":0,"ind":3,"ty":4,"nm":"Bluetooth Device","ks":{"o":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"n":["0p667_1_0p333_0"],"t":0,"s":[100],"e":[25]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"n":["0p667_1_0p333_0"],"t":20,"s":[25],"e":[100]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"n":["0p667_1_0p333_0"],"t":40,"s":[100],"e":[25]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"n":["0p667_1_0p333_0"],"t":60,"s":[25],"e":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.333],"y":[0.333]},"n":["0p833_0p833_0p333_0p333"],"t":80,"s":[100],"e":[100]},{"i":{"x":[0.833],"y":[1]},"o":{"x":[0.167],"y":[0]},"n":["0p833_1_0p167_0"],"t":90,"s":[100],"e":[25]},{"i":{"x":[0.833],"y":[1]},"o":{"x":[0.167],"y":[0]},"n":["0p833_1_0p167_0"],"t":95,"s":[25],"e":[100]},{"i":{"x":[0.833],"y":[1]},"o":{"x":[0.167],"y":[0]},"n":["0p833_1_0p167_0"],"t":100,"s":[100],"e":[25]},{"i":{"x":[0.833],"y":[1]},"o":{"x":[0.167],"y":[0]},"n":["0p833_1_0p167_0"],"t":105,"s":[25],"e":[100]},{"t":110.000004480392}]},"r":{"a":0,"k":0},"p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.167,"y":0.167},"n":"0_1_0p167_0p167","t":110,"s":[356,300,0],"e":[410.5,300,0],"to":[9.08333301544189,0,0],"ti":[-9.08333301544189,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"n":"0p833_0p833_0p167_0p167","t":141,"s":[410.5,300,0],"e":[410.5,300,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0,"y":1},"o":{"x":0.167,"y":0.167},"n":"0_1_0p167_0p167","t":225,"s":[410.5,300,0],"e":[356,300,0],"to":[-9.08333301544189,0,0],"ti":[9.08333301544189,0,0]},{"t":240.0000097754}]},"a":{"a":0,"k":[0,0,0]},"s":{"a":0,"k":[100,100,100]}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,14.667],[12.333,0],[0,-10],[-8.75,0],[0,45.375],[37.938,0],[0,0],[0,-37.333],[-20.125,0],[0,8.625],[16.833,0],[0,-14.667],[-18.375,0],[-10.5,10.125],[0,0],[0,0],[0,0],[0,0],[0,0]],"o":[[16.604,0],[0,-14.667],[-16.833,0],[0,8.625],[19.438,0],[0,-32.5],[0,0],[-31.812,0],[0,43.812],[8.75,0],[0,-10],[-12.333,0],[0,12.083],[16.08,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]],"v":[[17.594,58.646],[44.719,32.375],[26.135,7.333],[6.844,35.5],[17.594,58.625],[51.344,-1.375],[-9.781,-59],[-9.406,-59],[-70.094,-1.438],[-36.781,58.625],[-26.031,35.5],[-45.323,7.333],[-63.906,32.375],[-36.781,58.604],[6.344,36.25],[70.094,-27.5],[40.969,-55.75],[40.969,59],[70.094,30.75],[6.344,-33]],"c":false}},"nm":"Path 1","mn":"ADBE Vector Shape - Group"},{"ty":"st","c":{"a":0,"k":[0.2901960784313726,0.5647058823529412,0.8862745098039215,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":15},"lc":1,"lj":1,"ml":4,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke"},{"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":"Shape 1","np":3,"cix":2,"ix":1,"mn":"ADBE Vector Group"},{"ty":"tm","s":{"a":1,"k":[{"i":{"x":[0],"y":[1]},"o":{"x":[0.167],"y":[0.167]},"n":["0_1_0p167_0p167"],"t":110,"s":[64.4],"e":[45.4]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":141,"s":[45.4],"e":[45.4]},{"i":{"x":[0],"y":[1]},"o":{"x":[0.167],"y":[0.167]},"n":["0_1_0p167_0p167"],"t":225,"s":[45.4],"e":[64.4]},{"t":240.0000097754}],"ix":1},"e":{"a":0,"k":100,"ix":2},"o":{"a":1,"k":[{"i":{"x":[0],"y":[1]},"o":{"x":[0.167],"y":[0.167]},"n":["0_1_0p167_0p167"],"t":110,"s":[0],"e":[-155]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":141,"s":[-155],"e":[-155]},{"i":{"x":[0],"y":[1]},"o":{"x":[0.167],"y":[0.167]},"n":["0_1_0p167_0p167"],"t":225,"s":[-155],"e":[0]},{"t":240.0000097754}],"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1","mn":"ADBE Vector Filter - Trim"}],"ip":0,"op":240.0000097754,"st":0,"bm":0,"sr":1}]}
\ No newline at end of file
diff --git a/res/raw/connected_devices.json b/res/raw/connected_devices.json
new file mode 100644
index 0000000..c1814c9
--- /dev/null
+++ b/res/raw/connected_devices.json
@@ -0,0 +1 @@
+{"v":"5.2.1","fr":60,"ip":0,"op":960,"w":550,"h":550,"nm":"Comp 1","ddd":1,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"gopro Outlines","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":897,"s":[292,306,0],"e":[292,-204,0],"to":[0,-85,0],"ti":[0,85,0]},{"t":960}],"ix":2},"a":{"a":0,"k":[224.5,222.5,0],"ix":1},"s":{"a":0,"k":[154.343,154.343,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,-3.421],[2.98,-1.722],[0,3.42],[-2.981,1.721]],"o":[[0,3.421],[-2.981,1.72],[0,-3.42],[2.98,-1.721]],"v":[[5.398,-3.116],[0.001,6.195],[-5.398,3.117],[0.001,-6.193]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.870999983245,0.216000007181,0.231000010173,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":803.904,"s":[487.843,364.527],"e":[204.843,274.527],"to":[-47.1666679382324,-15],"ti":[47.1666679382324,15]},{"t":860}],"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,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,-4.119],[3.59,-2.072],[0,4.12],[-3.59,2.073]],"o":[[0,4.12],[-3.59,2.073],[0,-4.119],[3.59,-2.072]],"v":[[6.5,-3.754],[0,7.458],[-6.5,3.753],[0,-7.46]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.736999990426,0.705999995213,0.728999956916,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":792.496,"s":[487.843,364.527],"e":[204.843,274.527],"to":[-47.1665649414063,-14.9999589920044],"ti":[47.1665649414063,14.9999589920044]},{"t":848.591796875}],"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,"ix":2,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,-4.854],[4.231,-2.443],[0,4.855],[-4.231,2.442]],"o":[[0,4.855],[-4.231,2.442],[0,-4.855],[4.231,-2.443]],"v":[[7.661,-4.423],[0,8.791],[-7.661,4.423],[0,-8.79]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.536999990426,0.505999995213,0.556999954523,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":783.566,"s":[487.843,364.527],"e":[203.682,273.522],"to":[-47.3600654602051,-15.1675157546997],"ti":[47.3600654602051,15.1675157546997]},{"t":839.662109375}],"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,"ix":3,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,-5.759],[5.018,-2.898],[0,5.759],[-5.019,2.898]],"o":[[0,5.759],[-5.019,2.896],[0,-5.758],[5.018,-2.897]],"v":[[9.087,-5.246],[0,10.428],[-9.087,5.246],[0,-10.427]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.372999991623,0.340999977261,0.380000005984,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":773.15,"s":[487.843,364.527],"e":[202.537,272.715],"to":[-47.5508689880371,-15.3019762039185],"ti":[47.5508689880371,15.3019762039185]},{"t":829.24609375}],"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 4","np":2,"cix":2,"ix":4,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[2.798,-1.615],[0,0],[0.125,-4.982],[0,0],[-0.98,3.463],[0,0],[0,0],[-0.354,-2.325],[0,0],[0,0]],"o":[[0,0],[-1.739,1.004],[-0.125,4.98],[0,0],[0.98,-3.464],[0,0],[0,0],[0.391,2.581],[0,0],[0,0]],"v":[[17.276,-21.02],[-14.938,-2.421],[-19.949,7.069],[-19.643,22.635],[-18.794,4.284],[-14.938,-1.144],[17.276,-19.743],[19.325,-18.763],[20.044,-6.673],[20.044,-18.043]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.541000007181,0.513999968884,0.46699999641,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":823.871,"s":[467.319,219.035],"e":[273.319,195.035],"to":[-32.3333320617676,-4],"ti":[32.3333320617676,4]},{"t":858.06640625}],"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 5","np":2,"cix":2,"ix":5,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,-2.347],[2.046,-1.181],[0,2.347],[-2.045,1.18]],"o":[[0,2.347],[-2.045,1.18],[0,-2.347],[2.046,-1.181]],"v":[[3.704,-2.139],[0,4.251],[-3.703,2.139],[0,-4.249]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.505999995213,0.475,0.423999980852,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":816.193,"s":[467.319,219.035],"e":[266.57,201.855],"to":[-33.4581298828125,-2.86346435546875],"ti":[33.4581298828125,2.86346435546875]},{"t":850.390625}],"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 6","np":2,"cix":2,"ix":6,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,-3.206],[2.794,-1.613],[0,3.206],[-2.793,1.613]],"o":[[0,3.206],[-2.793,1.613],[0,-3.205],[2.794,-1.613]],"v":[[5.058,-2.92],[-0.001,5.804],[-5.058,2.92],[-0.001,-5.804]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.322000002394,0.294000004787,0.250999989229,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":809.914,"s":[467.319,219.035],"e":[266.954,202.104],"to":[-33.3941650390625,-2.82191205024719],"ti":[33.3941650390625,2.82191205024719]},{"t":844.109375}],"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 7","np":2,"cix":2,"ix":7,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,-8.049],[7.014,-4.05],[0,8.05],[-7.015,4.05]],"o":[[0,8.049],[-7.015,4.05],[0,-8.049],[7.014,-4.051]],"v":[[12.701,-7.333],[0,14.575],[-12.701,7.333],[0,-14.574]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.447000002394,0.411999990426,0.352999997606,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":802.236,"s":[467.319,219.035],"e":[269.172,203.839],"to":[-33.0244445800781,-2.53269696235657],"ti":[33.0244445800781,2.53269696235657]},{"t":836.43359375}],"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 8","np":2,"cix":2,"ix":8,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,-10.37],[9.037,-5.218],[0,10.37],[-9.038,5.218]],"o":[[0,10.371],[-9.038,5.217],[0,-10.371],[9.037,-5.217]],"v":[[16.364,-9.448],[0.001,18.777],[-16.364,9.449],[0.001,-18.777]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.286000001197,0.258999992819,0.211999990426,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":795.955,"s":[467.319,219.035],"e":[270.039,204.795],"to":[-32.8798980712891,-2.37347912788391],"ti":[32.8798980712891,2.37347912788391]},{"t":830.15234375}],"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 9","np":2,"cix":2,"ix":9,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[1.951,0.742],[0,-2.074],[0,0],[4.266,-2.463],[0,0],[1.267,0.481],[-2.71,1.565],[0,0],[0,5.688],[0,0]],"o":[[0.791,1.16],[0,0],[0,5.687],[0,0],[-1.678,0.97],[1.378,2.019],[0,0],[4.266,-2.463],[0,0],[0,-3.449]],"v":[[18.639,-33.339],[21.048,-28.349],[21.115,-1.957],[12.171,13.114],[-17.371,30.17],[-21.866,30.829],[-15.398,31.773],[14.143,14.719],[21.867,-0.039],[21.867,-26.839]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.195999998205,0.165000002992,0.141000007181,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":788.977,"s":[467.319,219.035],"e":[272.64,205.896],"to":[-32.4464836120605,-2.18983197212219],"ti":[32.4464836120605,2.18983197212219]},{"t":823.173828125}],"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 10","np":2,"cix":2,"ix":10,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,4.333],[0,0],[-4.266,2.463],[0,0],[-0.173,0.085],[1.016,-0.587],[0,0],[0,-5.688],[0,0],[-4.023,1.964]],"o":[[0,0],[0,-5.688],[0,0],[0.174,-0.101],[-0.888,0.038],[0,0],[-4.266,2.463],[0,0],[0,5.455],[-2.842,0.12]],"v":[[-17.715,25.08],[-17.715,-1.719],[-9.991,-16.478],[19.55,-33.534],[20.069,-33.798],[17.197,-32.883],[-12.344,-15.829],[-20.068,-1.07],[-20.068,25.729],[-12.863,31.835]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.035000000748,0.035000000748,0.043000000598,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":781.996,"s":[467.319,219.035],"e":[269.586,206.102],"to":[-32.9555168151855,-2.15564727783203],"ti":[32.9555168151855,2.15564727783203]},{"t":816.193359375}],"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 11","np":2,"cix":2,"ix":11,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[4.266,-2.462],[0,0],[0,-5.688],[0,0],[-4.266,2.463],[0,0],[0,5.688],[0,0]],"o":[[0,0],[-4.266,2.463],[0,0],[0,5.687],[0,0],[4.266,-2.462],[0,0],[0,-5.688]],"v":[[14.771,-32.227],[-14.771,-15.171],[-22.494,-0.414],[-22.494,26.387],[-14.771,32.226],[14.771,15.17],[22.495,0.413],[22.495,-26.388]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.282000014361,0.250999989229,0.226999993418,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":775.018,"s":[467.319,219.035],"e":[272.012,205.445],"to":[-32.5511627197266,-2.26512908935547],"ti":[32.5511627197266,2.26512908935547]},{"t":809.21484375}],"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 12","np":2,"cix":2,"ix":12,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[4.267,-2.463],[0,0],[0,-5.687],[0,0],[-4.266,2.463],[0,0],[0,5.688],[0,0]],"o":[[0,0],[-4.266,2.463],[0,0],[0,5.689],[0,0],[4.267,-2.463],[0,0],[0,-5.688]],"v":[[16.517,-35.076],[-16.518,-16.003],[-24.242,-1.245],[-24.242,29.236],[-16.518,35.076],[16.517,16.003],[24.241,1.245],[24.241,-29.236]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.426999978458,0.395999983245,0.40800000359,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":768.041,"s":[467.319,219.035],"e":[272.012,205.444],"to":[-32.5511474609375,-2.26514935493469],"ti":[32.5511474609375,2.26514935493469]},{"t":802.236328125}],"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 13","np":2,"cix":2,"ix":13,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,-2.808],[0,0],[4.276,-2.466],[0,0],[1.18,0.289],[0.473,0.393],[0,2.73],[0,0],[-2.439,3.148],[0,0],[0,0],[0,0],[0,0],[0,0],[-0.604,-0.261],[-0.237,-0.183]],"o":[[0,0],[0,5.668],[0,0],[-1.469,0.866],[-0.577,-0.131],[-1.312,-1.077],[0,0],[0,-3.936],[0,0],[0,0],[0,0],[0,0],[0,0],[0.29,0.026],[0.262,0.132],[1.364,1.076]],"v":[[23.3,-30.712],[23.3,-0.223],[15.56,14.523],[-17.474,33.598],[-18.025,36.982],[-25.031,36.616],[-27.13,30.764],[-27.13,-2.374],[-23.037,-13.867],[-17.344,-10.666],[20.911,-30.397],[16.714,-37.166],[16.766,-37.166],[17.238,-37.271],[18.393,-36.773],[25.766,-33.388]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.349000010771,0.317999985639,0.328999986836,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":761.061,"s":[467.319,219.035],"e":[268.736,204.075],"to":[-33.097095489502,-2.49346423149109],"ti":[33.097095489502,2.49346423149109]},{"t":795.2578125}],"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 14","np":2,"cix":2,"ix":14,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,-2.808],[0,0],[4.276,-2.466],[0,0],[1.18,0.289],[0.473,0.393],[0,2.73],[0,0],[-2.439,3.148],[-1.311,0.761],[0,0],[-0.263,0.105],[0,0],[0,0],[-0.604,-0.261],[-0.237,-0.183]],"o":[[0,0],[0,5.668],[0,0],[-1.469,0.866],[-0.577,-0.131],[-1.312,-1.077],[0,0],[0,-3.936],[1.076,-1.391],[0,0],[0.551,-0.289],[0,0],[0,0],[0.29,0.026],[0.262,0.132],[1.364,1.076]],"v":[[23.3,-30.712],[23.3,-0.223],[15.56,14.523],[-17.474,33.598],[-18.025,36.982],[-25.031,36.616],[-27.13,30.764],[-27.13,-2.374],[-23.037,-13.867],[-19.416,-17.146],[15.56,-36.562],[16.714,-37.166],[16.766,-37.166],[17.238,-37.271],[18.393,-36.773],[25.766,-33.388]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.536999990426,0.505999995213,0.556999954523,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":753.385,"s":[467.319,219.035],"e":[268.736,204.075],"to":[-33.097095489502,-2.49346423149109],"ti":[33.097095489502,2.49346423149109]},{"t":787.580078125}],"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 15","np":2,"cix":2,"ix":15,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[4.266,-2.463],[0,0],[0,-5.688],[0,0],[-4.266,2.463],[0,0],[0,5.687],[0,0]],"o":[[0,0],[-4.266,2.463],[0,0],[0,5.688],[0,0],[4.266,-2.463],[0,0],[0,-5.687]],"v":[[15.543,-37.291],[-17.492,-18.217],[-25.216,-3.46],[-25.216,31.451],[-17.492,37.29],[15.543,18.218],[25.216,-1.312],[25.216,-31.794]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.430999995213,0.4,0.46699999641,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":746.404,"s":[467.319,219.035],"e":[264.529,208.869],"to":[-33.7982292175293,-1.69441223144531],"ti":[33.7982292175293,1.69441223144531]},{"t":780.6015625}],"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 16","np":2,"cix":2,"ix":16,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[1.6,-0.924],[0,0],[0,-2.134],[-1.6,0.923],[0,0],[0,2.132]],"o":[[0,0],[-1.6,0.924],[0,2.133],[0,0],[1.6,-0.924],[0,-2.133]],"v":[[9.784,-9.342],[-9.783,1.956],[-12.68,7.152],[-9.783,9.342],[9.784,-1.956],[12.68,-7.49]],"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,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":731.006,"s":[479.372,286.97],"e":[210.372,218.97],"to":[-44.8333320617676,-11.3333330154419],"ti":[44.8333320617676,11.3333330154419]},{"t":772.33984375}],"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 17","np":2,"cix":2,"ix":17,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[1.338,-0.735],[0,0],[0.683,0],[0,0],[0,0],[0,0]],"o":[[-0.945,1.548],[0,0],[-0.787,0.471],[0,0],[0,0],[0,0],[0,0]],"v":[[14.261,-5.772],[10.771,-2.151],[-11.217,10.549],[-13.447,11.23],[-14.26,4.304],[9.984,-11.23],[9.275,-7.923]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.713999968884,0.681999954523,0.689999988032,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":731.006,"s":[479.372,286.97],"e":[212.889,224.107],"to":[-44.4139022827148,-10.477147102356],"ti":[44.4139022827148,10.477147102356]},{"t":772.33984375}],"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 18","np":2,"cix":2,"ix":18,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,-4.224],[0,0],[1.391,-2.203],[1.338,-0.735],[0,0],[0.682,0],[0,3.202],[0,0],[-3.149,1.837],[0,0]],"o":[[0,0],[0,2.466],[-0.945,1.548],[0,0],[-0.788,0.472],[-2.047,0.051],[0,0],[0,-4.225],[0,0],[3.175,-1.836]],"v":[[16.74,-11.256],[16.74,-8.92],[14.483,-1.574],[10.993,2.047],[-10.993,14.747],[-13.224,15.429],[-16.74,10.39],[-16.74,8.082],[-10.993,-0.623],[10.993,-13.296]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.375999989229,0.344999994016,0.356999984442,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":731.006,"s":[479.372,286.97],"e":[212.666,219.909],"to":[-44.4510841369629,-11.1768341064453],"ti":[44.4510841369629,11.1768341064453]},{"t":772.33984375}],"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 19","np":2,"cix":2,"ix":19,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[6.182,-3.569],[0,0],[0,8.243],[0,0],[-6.182,3.569],[0,0],[0,-8.242],[0,0]],"o":[[0,0],[-6.182,3.569],[0,0],[0,-8.242],[0,0],[6.182,-3.57],[0,0],[0,8.243]],"v":[[41.613,22.419],[-40.115,69.604],[-52.805,61.142],[-52.805,-1.031],[-40.115,-22.418],[41.613,-69.603],[52.805,-61.142],[52.805,1.031]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.626999978458,0.596000043084,0.635000011968,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":731.006,"s":[237.35,-50.309],"e":[237.35,229.691],"to":[0,46.6666679382324],"ti":[0,-46.6666679382324]},{"t":772.33984375}],"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 20","np":2,"cix":2,"ix":20,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-8.172,4.718],[0,0],[-1.157,1.057],[0,7.418],[0,0],[8.172,-4.718],[0,0],[1.158,-1.056],[0,-7.418],[0,0]],"o":[[0,0],[1.247,-0.72],[4.539,-5.99],[0,0],[0,-10.897],[0,0],[-1.247,0.72],[-4.538,5.99],[0,0],[0,10.897]],"v":[[-38.923,71.418],[42.497,24.41],[46.106,21.709],[53.719,0.073],[53.719,-60.231],[38.923,-71.419],[-42.499,-24.41],[-46.109,-21.71],[-53.719,-0.074],[-53.719,60.231]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.808000033509,0.788000009574,0.791999966491,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":719.66,"s":[532.959,337.204],"e":[238.959,226.204],"to":[-49,-18.5],"ti":[49,18.5]},{"t":760.994140625}],"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 21","np":2,"cix":2,"ix":21,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[8.172,-4.719],[0,0],[0,10.897],[0,0],[-8.173,4.718],[0,0],[0,-10.896],[0,0]],"o":[[0,0],[-8.173,4.719],[0,0],[0,-10.896],[0,0],[8.172,-4.718],[0,0],[0,10.896]],"v":[[40.71,26.377],[-40.71,73.385],[-55.507,62.198],[-55.507,1.893],[-40.71,-26.379],[40.71,-73.387],[55.507,-62.201],[55.507,-1.895]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.517999985639,0.486000001197,0.541000007181,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":706.693,"s":[518.171,115.173],"e":[237.171,228.173],"to":[-46.8333320617676,18.8333339691162],"ti":[46.8333320617676,-18.8333339691162]},{"t":757.751953125}],"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 22","np":2,"cix":2,"ix":22,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-0.741,-0.428],[0,0],[0,0.989],[0,0],[0.741,0.428],[0,0],[0,-0.988],[0,0]],"o":[[0,0],[0.741,0.428],[0,0],[0,-0.988],[0,0],[-0.741,-0.428],[0,0],[0,0.988]],"v":[[-3.137,7.017],[3.138,10.64],[4.48,9.625],[4.48,-4.453],[3.138,-7.017],[-3.137,-10.64],[-4.479,-9.626],[-4.479,4.453]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.238999998803,0.204000001795,0.216000007181,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0.025,"y":1},"o":{"x":0.333,"y":0},"n":"0p025_1_0p333_0","t":709.125,"s":[-55.042,336.147],"e":[165.958,237.147],"to":[36.8333320617676,-16.5],"ti":[-36.8333320617676,16.5]},{"t":772.33984375}],"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 23","np":2,"cix":2,"ix":23,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[-0.055,0.022],[0,0],[-0.299,-0.173],[0,0],[0,-0.99],[0,0],[0.268,-0.173],[0,0],[0.02,-0.009],[0,0],[0,0],[0,0],[0,0.988],[0,0]],"o":[[0,0],[0.047,-0.036],[0,0],[0.223,-0.092],[0,0],[0.741,0.428],[0,0],[0,0.521],[0,0],[-0.018,0.012],[0,0],[0,0],[0,0],[-0.741,-0.427],[0,0],[0,0]],"v":[[-5.21,-10.119],[-3.36,-11.187],[-3.206,-11.275],[-3.206,-11.276],[-2.408,-11.166],[3.867,-7.543],[5.209,-4.978],[5.209,9.1],[4.774,10.167],[4.773,10.168],[4.716,10.2],[2.692,11.368],[1.093,8.512],[-2.408,6.491],[-3.75,3.927],[-3.75,-7.512]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.536999990426,0.505999995213,0.556999954523,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0.025,"y":1},"o":{"x":0.333,"y":0},"n":"0p025_1_0p333_0","t":719.66,"s":[-55.042,336.147],"e":[167.237,236.514],"to":[37.0465049743652,-16.6056003570557],"ti":[-37.0465049743652,16.6056003570557]},{"t":782.875}],"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 24","np":2,"cix":2,"ix":24,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0.88,0.757],[0,5.169],[0,0],[-0.334,1.827]],"o":[[0,0],[-4.534,-2.596],[-2.428,-2.106],[0,0],[0,-1.772],[0,0]],"v":[[18.576,-26.842],[18.576,48.211],[-14.655,28.637],[-18.576,17.518],[-18.576,-42.784],[-18.064,-48.21]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.349000010771,0.317999985639,0.328999986836,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0.049,"y":1},"o":{"x":0.333,"y":0},"n":"0p049_1_0p333_0","t":706.693,"s":[167.317,490.604],"e":[167.317,253.604],"to":[0,-39.5],"ti":[0,39.5]},{"t":772.33984375}],"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 25","np":2,"cix":2,"ix":25,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0.491,0.29],[0.881,0.758],[0,5.169],[0,0],[-0.335,1.827],[-4.478,4.779]],"o":[[0,0],[-3.364,4.879],[0,0],[-4.534,-2.596],[-2.428,-2.106],[0,0],[0,-1.771],[1.247,-6.941],[0,0]],"v":[[23.115,-36.496],[23.115,42.546],[14.804,57.796],[14.035,57.351],[-19.195,37.777],[-23.116,26.659],[-23.116,-33.644],[-22.603,-39.069],[-13.402,-57.796]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.438999998803,0.40800000359,0.438999998803,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0.135,"y":1},"o":{"x":0.333,"y":0},"n":"0p135_1_0p333_0","t":684,"s":[-53.144,322.464],"e":[171.856,244.464],"to":[37.5,-13],"ti":[-37.5,13]},{"t":760.18359375}],"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 26","np":2,"cix":2,"ix":26,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0.635,-1.526],[0,0],[-1.771,-0.98]],"o":[[0,0],[0,0],[2.35,-0.646],[0.647,0.357]],"v":[[19.639,9.034],[18.604,11.474],[-19.64,-10.828],[-13.368,-10.272]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.438999998803,0.40800000359,0.438999998803,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":718.039,"s":[-118.125,5.958],"e":[267.875,144.958],"to":[64.3333358764648,23.1666660308838],"ti":[-64.3333358764648,-23.1666660308838]},{"t":772.33984375}],"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 27","np":2,"cix":2,"ix":27,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[1.569,0.521],[6.375,-5.23],[0,0],[1.793,-8.806],[0,0],[0.813,-1.181],[0,0],[0.981,0.836],[0,5.169],[0,0],[-5.659,6.038],[-1.783,1.025],[0,0],[-1.058,0.289],[-1.771,-0.98]],"o":[[0,0],[-1.886,-0.626],[0,0],[-13.001,8.779],[0,0],[-0.535,0.312],[-3.364,4.879],[0,0],[-2.428,-2.105],[0,0],[0,-8.522],[1.582,-1.694],[0,0],[1.126,-0.646],[2.35,-0.646],[0.647,0.357]],"v":[[69.387,-63.88],[66.692,-64.841],[45.675,-53.961],[-18.529,-17.271],[-35.429,8.25],[-35.5,66.625],[-34.98,72.539],[-31.467,84.388],[-65.466,64.368],[-69.387,53.25],[-69.387,-7.053],[-59.673,-31.204],[-54.592,-35.327],[26.832,-82.34],[30.108,-83.742],[36.38,-83.186]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.536999990426,0.505999995213,0.556999954523,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":718.039,"s":[-118.125,5.958],"e":[218.128,217.872],"to":[56.0420837402344,35.3190002441406],"ti":[-56.0420837402344,-35.3190002441406]},{"t":772.33984375}],"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 28","np":2,"cix":2,"ix":28,"mn":"ADBE Vector Group","hd":false}],"ip":682,"op":960,"st":394,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"airdots Outlines","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":706,"s":[261,295,0],"e":[-190,140,0],"to":[-75.1666641235352,-25.8333339691162,0],"ti":[75.1666641235352,25.8333339691162,0]},{"t":770}],"ix":2},"a":{"a":0,"k":[224.5,222.5,0],"ix":1},"s":{"a":0,"k":[108.018,108.018,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,-3.678],[3.205,-1.85],[0,3.678],[-3.205,1.851]],"o":[[0,3.677],[-3.205,1.85],[0,-3.677],[3.205,-1.85]],"v":[[5.803,-3.35],[0,6.659],[-5.802,3.35],[0,-6.659]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.752999997606,0.791999966491,0.898000021542,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0.167,"y":1},"o":{"x":0.333,"y":0},"n":"0p167_1_0p333_0","t":589.488,"s":[317.234,-182.926],"e":[317.234,167.074],"to":[0,58.3333320617676],"ti":[0,-58.3333320617676]},{"t":636}],"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,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,-3.677],[3.205,-1.85],[0,3.677],[-3.204,1.85]],"o":[[0,3.678],[-3.204,1.85],[0,-3.678],[3.205,-1.85]],"v":[[5.803,-3.351],[-0.001,6.658],[-5.803,3.351],[-0.001,-6.658]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.752999997606,0.791999966491,0.898000021542,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0.294,"y":1},"o":{"x":0.333,"y":0},"n":"0p294_1_0p333_0","t":553.877,"s":[201.402,-232.857],"e":[227.969,164.725],"to":[4.42778253555298,66.263786315918],"ti":[-4.42778253555298,-66.263786315918]},{"t":605.4765625}],"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,"ix":2,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-2.6,-3.35],[5.053,2.483],[0,0.029],[0.029,0.029],[1.184,0.491],[0,0.029],[1.156,0.404],[0.029,0],[1.761,0.26],[2.195,-0.577],[0.202,-0.059],[0.492,-0.203],[3.754,-3.956],[0,-32.253],[0.03,-2.224],[0,0],[0,-0.867],[-0.03,-8.143],[1.675,0.751],[0,0],[-3.552,5.603],[-0.028,0.057],[-9.326,6.641],[-0.317,0.202],[-0.548,0.347],[-0.26,0.173],[-0.26,0.144],[-1.646,0.867],[-1.79,0.318],[-0.03,0],[-0.78,0.028],[-0.26,0],[-0.779,-0.029],[-2.108,-0.924]],"o":[[-1.357,-1.011],[0,0],[-0.029,0],[-1.184,-0.578],[-0.029,0],[-1.154,-0.491],[0,-0.029],[-1.848,-0.635],[-2.426,-0.376],[-0.231,0.029],[-0.491,0.144],[-4.85,2.079],[-9.125,9.586],[0,1.126],[0,0],[-0.029,6.179],[0,0],[-2.137,-0.347],[0,0],[0,-21.598],[0.028,-0.057],[1.704,-2.801],[0.318,-0.23],[0.55,-0.404],[0.26,-0.173],[0.289,-0.231],[1.588,-1.069],[1.675,-0.865],[0,0],[0.548,-0.173],[0.375,-0.029],[0.692,-0.058],[2.628,0.173],[5.833,2.021]],"v":[[31.69,-34.722],[23.893,-40.351],[23.865,-40.381],[23.807,-40.41],[20.255,-42.027],[20.226,-42.055],[16.761,-43.383],[16.704,-43.412],[12.681,-44.521],[6.296,-43.835],[5.661,-43.661],[4.217,-43.141],[-9.359,-33.847],[-25.886,16.068],[-25.944,21.15],[-25.944,23.46],[-25.973,33.046],[-25.914,45.318],[-31.69,43.7],[-31.69,14.22],[-24.731,-21.325],[-24.616,-21.497],[-9.774,-37.262],[-8.822,-37.955],[-7.205,-39.11],[-6.396,-39.658],[-5.558,-40.208],[-0.679,-43.096],[4.547,-44.885],[4.577,-44.915],[6.829,-45.202],[7.782,-45.26],[10.004,-45.26],[17.252,-43.557]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.728999956916,0.764999988032,0.885999971278,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0.167,"y":1},"o":{"x":0.333,"y":0},"n":"0p167_1_0p333_0","t":589.488,"s":[317.234,-182.926],"e":[300.704,175.341],"to":[-2.75499987602234,59.7112503051758],"ti":[2.75499987602234,-59.7112503051758]},{"t":636}],"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,"ix":3,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0.202,-1.271],[0.921,1.443],[8.431,-4.418],[0.172,-27.488],[0,4.159],[-12.012,6.294],[0.057,-5.053]],"o":[[-0.115,0.664],[-2.956,-4.638],[-10.568,5.544],[-2.166,-2.455],[0,-21.367],[9.528,-4.995],[-0.03,1.097]],"v":[[24.178,-1.506],[22.251,-13.986],[2.964,-13.413],[-20.886,26.376],[-24.381,16.414],[1.058,-21.382],[23.443,-19.04]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.972999961703,0.976000019148,0.984000052658,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0.167,"y":1},"o":{"x":0.333,"y":0},"n":"0p167_1_0p333_0","t":589.488,"s":[317.234,-182.926],"e":[309.679,162.608],"to":[-1.25911462306976,57.5890007019043],"ti":[1.25911462306976,-57.5890007019043]},{"t":636}],"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 4","np":2,"cix":2,"ix":4,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[1.53,-0.202],[0,0]],"o":[[0,0],[-1.588,0.404],[0,0],[0,0]],"v":[[2.353,-25.756],[2.353,24.89],[-2.353,25.756],[-2.353,-19.173]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.972999961703,0.976000019148,0.984000052658,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0.167,"y":1},"o":{"x":0.333,"y":0},"n":"0p167_1_0p333_0","t":589.488,"s":[317.234,-182.926],"e":[287.768,194.904],"to":[-4.91091918945313,62.9716491699219],"ti":[4.91091918945313,-62.9716491699219]},{"t":636}],"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 5","np":2,"cix":2,"ix":5,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0.26,-5.428],[0.029,-0.144],[0,-0.29],[0.145,-0.462],[4.331,-3.58],[2.598,-0.867],[3.205,0.405],[0.78,-0.52],[0.116,-0.116],[0,0],[0,0],[0.376,-0.087],[0.375,-0.058],[1.53,-0.202],[3.176,0.491],[1.675,0.751],[0,0],[-3.552,5.602],[-0.028,0.058],[-9.326,6.641],[-0.317,0.203],[-0.549,0.346],[-0.26,0.173],[-0.26,0.144],[-1.473,0.635],[0,0],[-1.126,0.404],[-0.577,0.174],[-0.232,0.029],[-2.398,-0.145],[-0.52,-0.029],[-2.454,-1.155],[0,-0.029],[-0.347,-0.172],[-1.01,-0.288],[-0.029,0],[-0.289,-0.173],[-0.549,-0.318],[-0.029,0],[0,0],[0,0],[-0.521,-0.52],[-0.376,-1.588],[0,0],[0.087,-0.953]],"o":[[0,0.145],[0,0.289],[-0.057,0.346],[-3.147,10.741],[-1.906,1.588],[-2.715,0.952],[-1.415,-0.173],[-0.174,0.087],[-2.309,2.021],[0,0],[-0.376,0.116],[-0.405,0.116],[-1.588,0.404],[-3.841,0.491],[-2.137,-0.346],[0,0],[0,-21.597],[0.028,-0.058],[1.704,-2.801],[0.317,-0.23],[0.55,-0.404],[0.26,-0.174],[0.289,-0.231],[1.154,-0.692],[0.057,-0.029],[1.039,-0.461],[0.491,-0.173],[0.202,-0.058],[1.356,-0.317],[0.605,0.057],[1.588,0.058],[0.03,0],[0.318,0.145],[0.404,0.203],[0,0.029],[0.779,0.232],[0.636,0.347],[0.028,0.029],[0,0.029],[2.31,1.328],[0.548,0.577],[0.779,0.779],[0,0],[0.116,0.578],[-0.173,2.282]],"v":[[32.281,-13.239],[32.252,-12.806],[32.223,-11.939],[31.934,-10.698],[13.628,14.538],[6.814,18.379],[-2.137,19.331],[-6.44,20.284],[-6.902,20.602],[-9.124,26.926],[-9.124,43.47],[-10.251,43.788],[-11.435,44.048],[-16.141,44.914],[-26.767,44.914],[-32.542,43.297],[-32.542,13.816],[-25.583,-21.728],[-25.468,-21.901],[-10.626,-37.667],[-9.674,-38.36],[-8.057,-39.514],[-7.248,-40.063],[-6.41,-40.612],[-2.541,-42.633],[-2.137,-42.778],[1.01,-44.163],[2.829,-44.77],[3.465,-44.943],[8.749,-45.26],[10.423,-45.174],[15.851,-43.817],[15.909,-43.788],[16.891,-43.298],[19.374,-42.46],[19.403,-42.431],[21.193,-41.796],[22.955,-40.814],[23.012,-40.785],[23.041,-40.756],[26.766,-38.532],[29.914,-35.847],[32.223,-31.69],[32.223,-31.661],[32.309,-29.38]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.913999968884,0.925,0.952999997606,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0.167,"y":1},"o":{"x":0.333,"y":0},"n":"0p167_1_0p333_0","t":589.488,"s":[317.234,-182.926],"e":[301.555,175.746],"to":[-2.6130268573761,59.7786293029785],"ti":[2.6130268573761,-59.7786293029785]},{"t":636}],"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 6","np":2,"cix":2,"ix":6,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0.104,-4.137],[0.008,-0.136],[0.023,-0.144],[0.12,-0.424],[11.803,-6.81],[5.041,1.521],[3.656,6.09],[0,3.657],[-12.738,7.882],[-0.007,0],[-1.793,0.625],[-0.015,0],[-0.776,0.048],[-0.248,0.016],[-0.792,-0.055],[-2.553,-0.881],[-2.608,-3.337],[0.015,-1.016],[0,0],[0,0]],"o":[[0,0.144],[-0.007,0.424],[-0.065,0.4],[-2.176,8.874],[-4.417,2.552],[-6.721,-2.04],[-1.977,-3.296],[0,-12.843],[0.009,-0.008],[1.817,-1.12],[0.008,0],[0.545,-0.184],[0.368,-0.024],[0.696,-0.048],[2.184,0.193],[5.833,2.016],[0.872,1.104],[0,0],[0,0],[0,2.16]],"v":[[29.503,-1.432],[29.486,-1.016],[29.431,-0.144],[29.158,1.096],[5.001,31.256],[-9.683,32.407],[-26.446,19.3],[-29.607,8.714],[-4.538,-30.847],[-4.514,-30.863],[0.912,-33.504],[0.943,-33.512],[3.2,-33.824],[4.145,-33.88],[6.385,-33.856],[13.635,-32.175],[28.078,-23.333],[29.431,-20.117],[29.431,-19.876],[29.431,-19.86]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.894000004787,0.898000021542,0.913999968884,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0.167,"y":1},"o":{"x":0.333,"y":0},"n":"0p167_1_0p333_0","t":589.488,"s":[317.234,-182.926],"e":[304.332,163.949],"to":[-2.1502685546875,57.8125],"ti":[2.1502685546875,-57.8125]},{"t":636}],"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 7","np":2,"cix":2,"ix":7,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0.248,-1.457],[12.371,-7.137],[4.618,8.465],[0.568,3.288],[0,1.728],[-9.442,7.314],[-3.144,1.641],[-1.776,0.345],[-0.015,0],[-0.752,0.064],[-0.249,0.016],[-0.737,-0.04],[-2.12,-0.904],[-1.112,-1.553],[-0.104,-0.176],[0.008,-0.792]],"o":[[-1.473,8.706],[-9.034,5.218],[-1.512,-2.761],[-0.296,-1.689],[0,-11.867],[2.874,-2.224],[1.681,-0.88],[0.008,0],[0.753,-0.144],[0.368,-0.024],[0.751,-0.024],[2.633,0.168],[2.432,1.032],[0.12,0.168],[0.448,0.768],[-0.016,1.297]],"v":[[24.966,-4.029],[0.536,27.37],[-21.597,19.217],[-24.765,10.031],[-25.214,4.893],[-8.554,-24.562],[0.536,-30.379],[5.754,-32.188],[5.785,-32.196],[8.042,-32.508],[8.987,-32.564],[11.227,-32.54],[18.477,-30.859],[23.958,-26.866],[24.294,-26.346],[24.966,-24.002]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.894000004787,0.898000021542,0.913999968884,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0.167,"y":1},"o":{"x":0.333,"y":0},"n":"0p167_1_0p333_0","t":589.488,"s":[317.234,-182.926],"e":[299.49,162.633],"to":[-2.95725512504578,57.593147277832],"ti":[2.95725512504578,-57.593147277832]},{"t":636}],"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 8","np":2,"cix":2,"ix":8,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-0.064,-1.84],[0,0],[0.016,6.994],[0.848,1.088],[-0.152,-0.073],[-0.712,-1.024],[0,0]],"o":[[-2.617,-0.16],[0,0],[-0.008,-3.632],[0.152,0.056],[2.649,1.192],[1.264,1.833],[-0.272,8.907]],"v":[[2.273,11.262],[-0.848,9.879],[-0.848,-4.525],[-2.585,-11.262],[-2.128,-11.078],[1.32,-8.646],[2.033,-2.861]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.282000014361,0.275,0.426999978458,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0.216,"y":1},"o":{"x":0.333,"y":0},"n":"0p216_1_0p333_0","t":553.877,"s":[201.402,-232.857],"e":[201.402,170.143],"to":[0,67.1666641235352],"ti":[0,-67.1666641235352]},{"t":605.4765625}],"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 9","np":2,"cix":2,"ix":9,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-0.224,4.936],[-9.513,6.002],[-2.993,-3.978],[10.201,-6.435],[0.47,-10.346],[-4.138,-4.281]],"o":[[0.47,-10.347],[6.713,-4.234],[-1.573,-9.904],[-9.513,6.002],[-0.411,9.052],[-0.399,-4.192]],"v":[[-17.385,15.99],[7.117,-15.301],[21.688,-14.584],[3.99,-23.643],[-20.514,7.649],[-17.549,30.077]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.972999961703,0.976000019148,0.984000052658,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0.216,"y":1},"o":{"x":0.333,"y":0},"n":"0p216_1_0p333_0","t":553.877,"s":[201.402,-232.857],"e":[227.388,155.063],"to":[4.3309326171875,64.6533203125],"ti":[-4.3309326171875,-64.6533203125]},{"t":605.4765625}],"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 10","np":2,"cix":2,"ix":10,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-0.058,-20.414],[1.79,1.039],[-0.086,1.818],[0,0],[0,0],[-2.483,4.186],[0.058,-3.292]],"o":[[-2.31,-0.23],[-2.397,-1.387],[0,0],[0,0],[3.235,-3.206],[0.722,1.819],[-0.202,14.697]],"v":[[4.879,34.721],[-1.415,32.845],[-4.851,27.821],[-4.881,27.821],[-4.881,-23.431],[3.782,-34.721],[4.879,-27.127]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.728999956916,0.764999988032,0.885999971278,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0.216,"y":1},"o":{"x":0.333,"y":0},"n":"0p216_1_0p333_0","t":553.877,"s":[201.402,-232.857],"e":[237.57,203.869],"to":[6.02798223495483,72.7877655029297],"ti":[-6.02798223495483,-72.7877655029297]},{"t":605.4765625}],"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 11","np":2,"cix":2,"ix":11,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0.577,-0.347],[1.155,-0.318],[0.058,16.747],[0,0],[-4.244,1.3]],"o":[[0,0],[-0.434,0.405],[-0.953,0.549],[0.029,-17.845],[-0.058,-21.713],[0,0],[5.139,4.649]],"v":[[5.847,-29.092],[5.847,50.313],[4.317,51.41],[1.14,52.71],[1.14,-22.623],[-3.191,-47.83],[-1.603,-52.71]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.972999961703,0.976000019148,0.984000052658,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0.216,"y":1},"o":{"x":0.333,"y":0},"n":"0p216_1_0p333_0","t":553.877,"s":[201.402,-232.857],"e":[248.383,185.332],"to":[7.8302001953125,69.6982345581055],"ti":[-7.8302001953125,-69.6982345581055]},{"t":605.4765625}],"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 12","np":2,"cix":2,"ix":12,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,-21.598],[0,0],[1.241,-1.126],[0.577,-0.347],[1.155,-0.317],[2.368,0.261],[1.79,1.039],[-0.086,1.818],[0,0],[0,0],[3.464,1.53],[1.415,-0.116],[0,0],[-2.281,-3.609]],"o":[[0,0],[0,1.298],[-0.434,0.404],[-0.953,0.548],[-2.194,0.607],[-2.31,-0.23],[-2.398,-1.386],[0,0],[0,0],[0,0],[-0.867,-0.405],[-6.353,0.548],[10.915,0],[3.523,5.602]],"v":[[18.104,-17.945],[18.104,50.863],[16.228,54.559],[14.698,55.656],[11.521,56.955],[4.447,57.503],[-1.847,55.627],[-5.284,50.603],[-5.313,50.603],[-5.313,-6.395],[-8.373,-12.574],[-11.751,-13.065],[-9.846,-57.763],[11.088,-48.09]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.913999968884,0.925,0.952999997606,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0.216,"y":1},"o":{"x":0.333,"y":0},"n":"0p216_1_0p333_0","t":553.877,"s":[201.402,-232.857],"e":[238.002,181.087],"to":[6.1000189781189,68.9907989501953],"ti":[-6.1000189781189,-68.9907989501953]},{"t":605.4765625}],"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 13","np":2,"cix":2,"ix":13,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0.008,-0.216],[0.48,-0.336],[0.776,0.208],[0.64,1.072],[0,0],[-0.937,4.009],[-0.793,-0.032],[-0.616,-0.232],[-0.152,-0.072],[-0.712,-1.024],[0,0],[-0.064,-1.84]],"o":[[-0.024,0.592],[-0.392,0.272],[-2.817,-0.736],[-0.4,-0.673],[-0.816,-4.489],[0.175,-0.776],[0.432,0.015],[0.152,0.056],[2.649,1.192],[1.264,1.833],[-0.272,8.906],[0.008,0.264]],"v":[[4.365,10.874],[3.613,12.379],[1.965,12.522],[-3.1,9.514],[-3.677,7.474],[-3.74,-11.427],[-2.084,-12.699],[-0.492,-12.363],[-0.036,-12.178],[3.413,-9.746],[4.125,-3.961],[4.365,10.163]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.583999992819,0.635000011968,0.842999985639,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0.216,"y":1},"o":{"x":0.333,"y":0},"n":"0p216_1_0p333_0","t":553.877,"s":[201.402,-232.857],"e":[199.31,171.243],"to":[-0.34874978661537,67.3499908447266],"ti":[0.34874978661537,-67.3499908447266]},{"t":605.4765625}],"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 14","np":2,"cix":2,"ix":14,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,-15.505],[5.025,-8.489],[3.234,-3.205],[2.657,-1.53],[1.473,6.988],[0.116,5.803],[-0.144,0.491],[-10.655,6.727]],"o":[[0,8.316],[-2.483,4.187],[-2.395,2.397],[-12.386,7.161],[-0.145,-0.722],[-0.115,-4.735],[2.339,-8.113],[13.455,-8.547]],"v":[[28.109,-13.239],[19.938,13.354],[11.275,24.644],[3.681,30.563],[-27.156,24.933],[-27.936,12.806],[-27.965,-0.881],[-4.634,-29.177]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.913999968884,0.925,0.952999997606,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0.216,"y":1},"o":{"x":0.333,"y":0},"n":"0p216_1_0p333_0","t":553.877,"s":[201.402,-232.857],"e":[221.414,155.794],"to":[3.33535003662109,64.7751541137695],"ti":[-3.33535003662109,-64.7751541137695]},{"t":605.4765625}],"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 15","np":2,"cix":2,"ix":15,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,-15.48],[13.49,-7.789],[12.899,0.848],[2.49,1.478],[0.537,2.554],[-1.353,13.488],[-11.439,5.311]],"o":[[0,15.481],[-6.329,3.654],[-7.893,-0.518],[-2.485,-1.475],[-0.247,-1.175],[0.58,-5.788],[19.197,-8.913]],"v":[[31.633,-1.8],[-5.751,29.639],[-12.036,36.177],[-25.286,32.314],[-30.179,26.447],[-30.28,2.501],[-5.751,-28.112]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.894000004787,0.898000021542,0.913999968884,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0.216,"y":1},"o":{"x":0.333,"y":0},"n":"0p216_1_0p333_0","t":553.877,"s":[201.402,-232.857],"e":[222.599,153.26],"to":[3.53284955024719,64.3528747558594],"ti":[-3.53284955024719,-64.3528747558594]},{"t":605.4765625}],"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 16","np":2,"cix":2,"ix":16,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[13.281,-3.725],[0.376,-0.087],[4.765,0.722],[1.675,0.751],[0.721,2.8],[-4.822,3.84],[-2.166,1.098],[-3.552,0.924],[-5.342,-3.061],[-0.578,-2.31]],"o":[[-0.376,0.116],[-5.977,1.53],[-2.136,-0.346],[-3.32,-1.415],[-1.039,-4.071],[1.647,-1.328],[2.859,-1.502],[9.558,-2.454],[2.397,1.415],[1.819,7.161]],"v":[[4.187,13.339],[3.06,13.658],[-13.456,14.783],[-19.231,13.167],[-25.554,6.757],[-19.231,-5.717],[-13.485,-9.385],[-3.812,-13.051],[20.125,-11.751],[24.774,-6.15]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.564999988032,0.603999956916,0.670999983245,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0.216,"y":1},"o":{"x":0.333,"y":0},"n":"0p216_1_0p333_0","t":553.877,"s":[288.245,209.876],"e":[288.245,205.876],"to":[0,-0.66666668653488],"ti":[0,0.66666668653488]},{"t":605.4765625}],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.216,0.216],"y":[1,1]},"o":{"x":[0.333,0.333],"y":[0,0]},"n":["0p216_1_0p333_0","0p216_1_0p333_0"],"t":579.314,"s":[0,0],"e":[100,100]},{"t":630.912109375}],"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 17","np":2,"cix":2,"ix":17,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-1.896,-7.379],[13.893,-3.569],[1.896,7.379],[-13.892,3.569]],"o":[[1.896,7.379],[-13.892,3.57],[-1.895,-7.379],[13.892,-3.569]],"v":[[25.155,-6.463],[3.432,13.359],[-25.156,6.462],[-3.432,-13.361]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.564999988032,0.603999956916,0.670999983245,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[219.024,231.81],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.216,0.216],"y":[1,1]},"o":{"x":[0.333,0.333],"y":[0,0]},"n":["0p216_1_0p333_0","0p216_1_0p333_0"],"t":579.314,"s":[0,0],"e":[100,100]},{"t":630.912109375}],"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 18","np":2,"cix":2,"ix":18,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[7.912,-4.562],[0,0],[6.583,0.578],[0,0],[-29.568,10.048],[-21.512,1.328],[0,0]],"o":[[0,0],[-4.649,2.686],[3.926,-4.764],[0,0],[29.567,-10.049],[21.511,-1.328],[8.259,5.515]],"v":[[52.551,-19.519],[-39.818,33.812],[-57.633,36.901],[-51.368,27.489],[-30.895,13.051],[19.173,-14.322],[51.685,-37.479]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.694000004787,0.74900004069,0.779999976065,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0.326,"y":1},"o":{"x":0.333,"y":0},"n":"0p326_1_0p333_0","t":511,"s":[633.126,324.177],"e":[285.126,218.177],"to":[-58,-17.6666660308838],"ti":[58,17.6666660308838]},{"t":579.314453125}],"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 19","np":2,"cix":2,"ix":19,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[7.912,-4.562],[0,0],[6.583,0.578],[4.302,2.483],[0,0],[-8.373,4.822],[0,0],[-9.644,-5.544],[0,0],[-0.462,-0.318]],"o":[[0,0],[-4.649,2.686],[-5.313,-0.462],[0,0],[-9.644,-5.573],[0,0],[8.344,-4.822],[0,0],[0.52,0.289],[8.259,5.515]],"v":[[71.68,-11.492],[-20.689,41.839],[-38.504,44.928],[-53.403,40.482],[-68.88,31.56],[-71.219,12.675],[21.15,-40.684],[53.865,-39.327],[69.342,-30.376],[70.814,-29.452]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.795999983245,0.838999968884,0.851000019148,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0.547,"y":1},"o":{"x":0.374,"y":0.184},"n":"0p547_1_0p374_0p184","t":511,"s":[697.213,63.722],"e":[265.997,210.15],"to":[-73.6217422485352,-35.6799430847168],"ti":[14.0817947387695,4.37368011474609]},{"t":579.314453125}],"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 20","np":2,"cix":2,"ix":20,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-8.718,5.033],[0,0],[10.066,5.811],[0,0],[8.716,-5.033],[0,0],[-10.066,-5.812],[0,0]],"o":[[0,0],[8.717,-5.032],[0,0],[-10.066,-5.811],[0,0],[-8.717,5.032],[0,0],[10.066,5.811]],"v":[[-19.34,44.504],[77.074,-11.161],[72.141,-32.309],[56.007,-41.625],[19.341,-44.504],[-77.073,11.161],[-72.106,32.341],[-53.49,43.089]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.972999961703,0.976000019148,0.984000052658,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0.326,"y":1},"o":{"x":0.333,"y":0},"n":"0p326_1_0p333_0","t":511,"s":[-145.791,54.716],"e":[266.209,210.716],"to":[68.6666641235352,26],"ti":[-68.6666641235352,-26]},{"t":579.314453125}],"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 21","np":2,"cix":2,"ix":21,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0],[0,0],[-6.547,4.314],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0],[0.252,4.554],[0,0],[6.345,-3.85]],"v":[[53.859,-5.76],[53.859,-64.479],[-54.329,-26.455],[-54.329,49.525],[-54.287,49.532],[-47.505,60.165],[47.984,5.034]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.913999968884,0.925,0.952999997606,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0.326,"y":1},"o":{"x":0.333,"y":0},"n":"0p326_1_0p333_0","t":511,"s":[722.902,505.015],"e":[293.902,257.015],"to":[-71.5,-41.3333320617676],"ti":[71.5,41.3333320617676]},{"t":579.314453125}],"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 22","np":2,"cix":2,"ix":22,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-1.081,0.259],[8.736,5.039],[0,0],[0.243,4.551],[0,0],[0,0],[0,0],[0,0],[0,0]],"o":[[-8.905,3.074],[0,0],[-5.921,-3.425],[0,0],[0,0],[0,0],[0,0],[0,0],[0,9.982]],"v":[[29.415,45.982],[-0.921,42.861],[-19.537,32.115],[-29.37,19.147],[-29.416,19.147],[-29.416,-45.204],[-13.403,-49.055],[13.219,-25.447],[13.219,37.691]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.607999973671,0.647000002394,0.722000002394,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":527.715,"s":[-131.367,327.326],"e":[213.633,276.326],"to":[34.2981948852539,-5.07016754150391],"ti":[-23.2018070220947,3.42983222007751]},{"t":579.314453125}],"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 23","np":2,"cix":2,"ix":23,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[4.08,-2.344],[0,0],[1.356,-0.472],[0.045,-0.016],[8.737,5.039],[0,0],[0.243,4.55],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0.122,3.319],[0,0],[-1.142,0.655],[0,0],[-8.905,3.074],[0,0],[-5.921,-3.424],[0,0],[0,0],[0,0],[0,0]],"v":[[81.952,-66.85],[81.952,-1.935],[81.935,-1.921],[76.076,6.939],[-19.406,62.07],[-23.152,63.759],[-23.227,63.776],[-53.563,60.654],[-72.179,49.908],[-82.012,36.94],[-82.057,36.94],[-82.057,-27.41],[-66.045,-31.262]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.728999956916,0.764999988032,0.885999971278,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0.326,"y":1},"o":{"x":0.333,"y":0},"n":"0p326_1_0p333_0","t":511,"s":[722.902,505.015],"e":[266.276,258.533],"to":[-76.104362487793,-41.0803833007813],"ti":[76.104362487793,41.0803833007813]},{"t":579.314453125}],"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 24","np":2,"cix":2,"ix":24,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[8.356,-4.825],[0,0],[8.569,2.268],[-11.934,7.641],[0.7,8.356],[-3.713,-2.146],[0,0]],"o":[[0,0],[-6.241,3.593],[21.218,-12.375],[13.577,-8.706],[4.567,0.654],[0,0],[9.635,5.571]],"v":[[54.318,-12.733],[-38.061,40.602],[-62.673,42.49],[11.865,-1.728],[23.768,-44.758],[36.507,-40.557],[51.973,-31.637]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.694000004787,0.74900004069,0.779999976065,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0.311,"y":1},"o":{"x":0.333,"y":0},"n":"0p311_1_0p333_0","t":527.715,"s":[223.01,-160.632],"e":[223.01,177.368],"to":[0,56.3333320617676],"ti":[0,-56.3333320617676]},{"t":593.123046875}],"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 25","np":2,"cix":2,"ix":25,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[8.356,-4.825],[0,0],[8.569,2.268],[2.436,1.4],[0,0],[-8.357,4.824],[0,0],[-7.291,-1.036],[-3.713,-2.146],[0,0]],"o":[[0,0],[-6.241,3.593],[-2.907,-0.761],[0,0],[-9.635,-5.571],[0,0],[5.144,-2.968],[4.567,0.654],[0,0],[9.635,5.571]],"v":[[71.457,-12.215],[-20.921,41.12],[-45.534,43.008],[-53.647,39.751],[-69.112,30.831],[-71.456,11.942],[20.922,-41.394],[40.907,-44.24],[53.647,-40.039],[69.112,-31.119]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.795999983245,0.838999968884,0.851000019148,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0.311,"y":1},"o":{"x":0.333,"y":0},"n":"0p311_1_0p333_0","t":527.715,"s":[205.87,-141.15],"e":[205.87,176.85],"to":[0,53],"ti":[0,-53]},{"t":593.123046875}],"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 26","np":2,"cix":2,"ix":26,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-8.717,5.033],[0,0],[10.065,5.811],[0,0],[8.717,-5.033],[0,0],[-10.065,-5.811],[0,0]],"o":[[0,0],[8.716,-5.032],[0,0],[-10.066,-5.811],[0,0],[-8.717,5.032],[0,0],[10.066,5.812]],"v":[[-19.34,44.504],[77.074,-11.161],[72.141,-32.309],[56.007,-41.625],[19.341,-44.504],[-77.074,11.161],[-72.107,32.34],[-53.491,43.088]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.972999961703,0.976000019148,0.984000052658,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0.311,"y":1},"o":{"x":0.333,"y":0},"n":"0p311_1_0p333_0","t":527.715,"s":[205.854,-141.306],"e":[205.854,176.694],"to":[0,53],"ti":[0,-53]},{"t":593.123046875}],"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 27","np":2,"cix":2,"ix":27,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[4.064,-2.343],[0,0],[10.076,5.815],[0,0],[0.259,4.551],[0,0],[0,0],[0,0],[-2.208,-4.581],[-14.46,-5.586],[0,0],[-28.098,23.714],[-1.766,-0.807]],"o":[[0,0],[0,0],[0.121,3.334],[0,0],[-8.722,5.038],[0,0],[-5.921,-3.425],[0,0],[0,0],[0,0],[0.274,10.245],[3.409,7.109],[14.461,5.571],[0,0],[2.01,0.609],[0,0]],"v":[[82.424,-49.873],[82.424,-19.688],[82.393,-19.688],[76.548,-10.831],[-19.863,44.834],[-54.02,43.418],[-72.635,32.672],[-82.484,19.719],[-82.514,19.703],[-82.514,-9.902],[-82.362,-9.933],[-79.104,20.16],[-46.721,40.554],[-25.069,16.34],[47.034,-44.788],[52.727,-42.673]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.607999973671,0.647000002394,0.722000002394,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0.311,"y":1},"o":{"x":0.333,"y":0},"n":"0p311_1_0p333_0","t":527.715,"s":[708.38,362.004],"e":[206.38,207.004],"to":[-83.6666641235352,-25.8333339691162],"ti":[83.6666641235352,25.8333339691162]},{"t":593.123046875}],"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 28","np":2,"cix":2,"ix":28,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[4.064,-2.343],[0,0],[10.076,5.815],[0,0],[0.259,4.551],[0,0],[0,0],[0,0],[0,0],[0,0],[-9.741,-2.907],[-1.766,-0.807]],"o":[[0,0],[0,0],[0.121,3.334],[0,0],[-8.722,5.038],[0,0],[-5.921,-3.425],[0,0],[0,0],[0,0],[0,0],[0,0],[6.605,-3.82],[2.01,0.609],[0,0]],"v":[[82.424,-49.873],[82.424,-19.688],[82.393,-19.688],[76.548,-10.831],[-19.863,44.834],[-54.02,43.418],[-72.635,32.672],[-82.484,19.719],[-82.514,19.703],[-82.514,-9.902],[-82.362,-9.933],[-10.167,-27.437],[18.815,-44.165],[47.034,-44.788],[52.727,-42.673]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.728999956916,0.764999988032,0.885999971278,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0.311,"y":1},"o":{"x":0.333,"y":0},"n":"0p311_1_0p333_0","t":527.715,"s":[205.87,-141.15],"e":[206.38,207.004],"to":[0.0850168839097,58.0255966186523],"ti":[-0.0850168839097,-58.0255966186523]},{"t":593.123046875}],"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 29","np":2,"cix":2,"ix":29,"mn":"ADBE Vector Group","hd":false}],"ip":523,"op":771,"st":39,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":"speaker Outlines","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":513,"s":[278,292,0],"e":[722,77,0],"to":[74,-35.8333320617676,0],"ti":[-74,35.8333320617676,0]},{"t":563}],"ix":2},"a":{"a":0,"k":[225,225,0],"ix":1},"s":{"a":0,"k":[149.778,149.778,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0]],"v":[[-1.312,0.561],[1.312,0.756],[0.971,-0.756]],"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,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":419.418,"s":[232.639,17.582],"e":[232.639,216.582],"to":[0,33.1666679382324],"ti":[0,-33.1666679382324]},{"t":456.318359375}],"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,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[1.312,0.756],[0.971,-0.757],[-0.167,-0.098],[-1.312,0.561]],"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,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":413.27,"s":[232.639,17.582],"e":[234.119,217.436],"to":[0.24659729003906,33.308967590332],"ti":[-0.24659729003906,-33.308967590332]},{"t":450.16796875}],"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,"ix":2,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-0.72,-0.419],[0,0],[-0.72,0.417],[0,0],[0.723,0.419],[0,0],[0.721,-0.413],[0,0]],"o":[[0,0],[0.72,0.417],[0,0],[0.723,-0.413],[0,0],[-0.72,-0.413],[0,0],[-0.72,0.413]],"v":[[-5.163,-0.707],[1.221,2.977],[3.842,2.977],[5.159,2.215],[5.159,0.702],[-1.227,-2.982],[-3.846,-2.982],[-5.163,-2.219]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.141000007181,0.823999980852,0.757000014361,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":404.043,"s":[232.639,17.582],"e":[233.774,217.319],"to":[0.18911743164063,33.2895317077637],"ti":[-0.18911743164063,-33.2895317077637]},{"t":440.943359375}],"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,"ix":3,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[-0.719,-0.416],[0,0],[0,0],[0,0],[0.362,-0.21],[0,0],[0.72,0.416],[0,0],[0,0.277],[0,0]],"o":[[0,0],[0.721,-0.416],[0,0],[0,0],[0,0],[0.002,0.276],[0,0],[-0.72,0.416],[0,0],[-0.36,-0.206],[0,0],[0,0]],"v":[[-5.092,-2.857],[-3.846,-3.577],[-1.228,-3.577],[5.097,0.074],[5.699,0.074],[5.699,2.056],[5.16,2.818],[3.842,3.577],[1.22,3.577],[-5.163,-0.108],[-5.701,-0.867],[-5.701,-2.857]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.086000001197,0.658999992819,0.62400004069,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":397.125,"s":[232.639,17.582],"e":[233.774,218.702],"to":[0.18916575610638,33.5200157165527],"ti":[-0.18916575610638,-33.5200157165527]},{"t":434.025390625}],"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 4","np":2,"cix":2,"ix":4,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0]],"v":[[1.309,-0.561],[-1.309,-0.756],[-0.971,0.756]],"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,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":390.975,"s":[224.88,14.102],"e":[224.88,212.102],"to":[0,33],"ti":[0,-33]},{"t":427.875}],"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 5","np":2,"cix":2,"ix":5,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[-1.311,-0.755],[-0.976,0.755],[0.168,0.099],[1.31,-0.563]],"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,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":385.594,"s":[224.88,14.102],"e":[223.402,211.247],"to":[-0.24628448486328,32.8574485778809],"ti":[0.24628448486328,-32.8574485778809]},{"t":422.494140625}],"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 6","np":2,"cix":2,"ix":6,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-0.72,-0.416],[0,0],[-0.72,0.415],[0,0],[0.717,0.413],[0,0],[0.72,-0.413],[0,0]],"o":[[0,0],[0.72,0.415],[0,0],[0.717,-0.416],[0,0],[-0.723,-0.413],[0,0],[-0.72,0.416]],"v":[[-5.161,-0.709],[1.226,2.979],[3.844,2.979],[5.164,2.216],[5.164,0.706],[-1.222,-2.981],[-3.84,-2.981],[-5.161,-2.219]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.141000007181,0.823999980852,0.757000014361,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":377.137,"s":[224.88,14.102],"e":[223.71,211.51],"to":[-0.19495137035847,32.9013862609863],"ti":[0.19495137035847,-32.9013862609863]},{"t":414.037109375}],"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 7","np":2,"cix":2,"ix":7,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[-0.723,-0.413],[0,0],[0,0],[0,0],[0.362,-0.21],[0,0],[0.721,0.416],[0,0],[0,0.274],[0,0]],"o":[[0,0],[0.72,-0.413],[0,0],[0,0],[0,0],[0.005,0.276],[0,0],[-0.72,0.416],[0,0],[-0.36,-0.206],[0,0],[0,0]],"v":[[-5.093,-2.854],[-3.843,-3.58],[-1.225,-3.58],[5.094,0.071],[5.698,0.071],[5.698,2.056],[5.161,2.818],[3.842,3.577],[1.223,3.577],[-5.163,-0.108],[-5.702,-0.864],[-5.702,-2.854]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.086000001197,0.658999992819,0.62400004069,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":368.682,"s":[224.88,14.102],"e":[223.713,212.894],"to":[-0.19448597729206,33.1319313049316],"ti":[0.19448597729206,-33.1319313049316]},{"t":405.58203125}],"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 8","np":2,"cix":2,"ix":8,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0.589,0],[0.424,0.249],[0,0],[0,0.475],[-0.508,0.293],[0,0],[-0.851,-0.489],[0,0],[0,-0.474],[0.507,-0.293],[0,0]],"o":[[-0.584,0],[0,0],[-0.508,-0.296],[0,-0.474],[0,0],[0.852,-0.494],[0,0],[0.507,0.296],[0,0.47],[0,0],[-0.425,0.249]],"v":[[7.579,6.781],[6.01,6.396],[-10.467,-3.113],[-11.266,-4.322],[-10.467,-5.531],[-9.15,-6.288],[-6.012,-6.292],[10.467,3.223],[11.266,4.43],[10.467,5.635],[9.15,6.396]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.071000005685,0.071000005685,0.078000005086,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":360.225,"s":[228.726,-19.668],"e":[228.726,216.332],"to":[0,39.3333320617676],"ti":[0,-39.3333320617676]},{"t":397.125}],"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 9","np":2,"cix":2,"ix":9,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[-1.398,-0.51],[-0.883,-0.806],[1.398,0.511],[0.882,0.807]],"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,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":395.588,"s":[228.726,-19.668],"e":[212.718,204.945],"to":[-2.66798400878906,37.4354667663574],"ti":[2.66798400878906,-37.4354667663574]},{"t":433.255859375}],"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 10","np":2,"cix":2,"ix":10,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-0.72,-0.413],[0,0],[-0.719,0.419],[0,0],[0.723,0.425],[0,0],[0.718,-0.413],[0,0]],"o":[[0,0],[0.723,0.419],[0,0],[0.723,-0.419],[0,0],[-0.723,-0.413],[0,0],[-0.72,0.419]],"v":[[-5.161,-0.708],[1.222,2.976],[3.843,2.976],[5.158,2.22],[5.158,0.701],[-1.225,-2.983],[-3.844,-2.983],[-5.161,-2.221]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.141000007181,0.823999980852,0.757000014361,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":0},"o":{"x":0.333,"y":0.333},"n":"0_0_0p333_0p333","t":395.588,"s":[212.718,-4.838],"e":[212.718,-4.838],"to":[0,0],"ti":[0,0]},{"t":433.255859375}],"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 11","np":2,"cix":2,"ix":11,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[-0.723,-0.413],[0,0],[0,0],[0,0],[0.365,-0.207],[0,0],[0.724,0.419],[0,0],[0,0.271],[0,0]],"o":[[0,0],[0.717,-0.413],[0,0],[0,0],[0,0],[0.002,0.276],[0,0],[-0.72,0.419],[0,0],[-0.36,-0.212],[0,0],[0,0]],"v":[[-5.092,-2.854],[-3.845,-3.58],[-1.227,-3.58],[5.098,0.068],[5.699,0.068],[5.699,2.056],[5.158,2.818],[3.842,3.574],[1.22,3.574],[-5.163,-0.104],[-5.701,-0.864],[-5.701,-2.854]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.086000001197,0.658999992819,0.62400004069,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":395.588,"s":[212.719,-36.454],"e":[212.719,206.546],"to":[0,40.5],"ti":[0,-40.5]},{"t":433.255859375}],"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 12","np":2,"cix":2,"ix":12,"mn":"ADBE Vector Group","hd":false},{"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],[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],[0,0],[0,0],[0,0],[0,0]],"v":[[-0.524,-0.004],[-1.398,-0.506],[-0.884,-0.805],[-0.007,-0.299],[0.904,-0.831],[1.438,-0.518],[0.529,0.005],[1.402,0.512],[0.883,0.811],[0.012,0.309],[-0.9,0.831],[-1.438,0.523]],"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,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":395.588,"s":[202.655,-5.865],"e":[202.655,199.135],"to":[0,34.1666679382324],"ti":[0,-34.1666679382324]},{"t":433.255859375}],"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 13","np":2,"cix":2,"ix":13,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-0.72,-0.418],[0,0],[-0.719,0.418],[0,0],[0.721,0.413],[0,0],[0.721,-0.418],[0,0]],"o":[[0,0],[0.72,0.418],[0,0],[0.721,-0.416],[0,0],[-0.724,-0.413],[0,0],[-0.72,0.419]],"v":[[-5.16,-0.708],[1.221,2.978],[3.841,2.978],[5.159,2.217],[5.159,0.708],[-1.224,-2.982],[-3.843,-2.977],[-5.16,-2.22]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.141000007181,0.823999980852,0.757000014361,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":395.588,"s":[202.658,-4.647],"e":[202.658,199.353],"to":[0,34],"ti":[0,-34]},{"t":433.255859375}],"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 14","np":2,"cix":2,"ix":14,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[-0.723,-0.413],[0,0],[0,0],[0,0],[0.366,-0.21],[0,0],[0.72,0.413],[0,0],[0,0.271],[0,0]],"o":[[0,0],[0.721,-0.413],[0,0],[0,0],[0,0],[0,0.276],[0,0],[-0.72,0.413],[0,0],[-0.363,-0.207],[0,0],[0,0]],"v":[[-5.093,-2.854],[-3.843,-3.58],[-1.224,-3.58],[5.098,0.071],[5.701,0.071],[5.701,2.059],[5.159,2.821],[3.842,3.58],[1.221,3.58],[-5.16,-0.11],[-5.701,-0.864],[-5.701,-2.854]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.086000001197,0.658999992819,0.62400004069,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":395.588,"s":[202.658,-1.263],"e":[202.658,200.737],"to":[0,33.6666679382324],"ti":[0,-33.6666679382324]},{"t":433.255859375}],"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 15","np":2,"cix":2,"ix":15,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0.586,0],[0.426,0.251],[0,0],[0,0.475],[-0.508,0.296],[0,0],[-0.851,-0.494],[0,0],[0,-0.469],[0.508,-0.296],[0,0]],"o":[[-0.586,0],[0,0],[-0.511,-0.296],[0,-0.474],[0,0],[0.856,-0.489],[0,0],[0.508,0.293],[0,0.475],[0,0],[-0.427,0.248]],"v":[[7.578,6.782],[6.01,6.397],[-10.464,-3.113],[-11.268,-4.322],[-10.467,-5.53],[-9.152,-6.289],[-6.012,-6.289],[10.47,3.226],[11.268,4.429],[10.47,5.638],[9.15,6.4]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.071000005685,0.071000005685,0.078000005086,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":395.588,"s":[207.671,-0.825],"e":[207.671,204.175],"to":[0,34.1666679382324],"ti":[0,-34.1666679382324]},{"t":433.255859375}],"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 16","np":2,"cix":2,"ix":16,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-0.723,-0.416],[0,0],[-0.72,0.421],[0,0],[0.721,0.413],[0,0],[0.724,-0.419],[0,0]],"o":[[0,0],[0.72,0.421],[0,0],[0.721,-0.413],[0,0],[-0.723,-0.413],[0,0],[-0.723,0.419]],"v":[[-5.158,-0.706],[1.225,2.976],[3.844,2.976],[5.161,2.216],[5.161,0.706],[-1.223,-2.984],[-3.844,-2.978],[-5.158,-2.222]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[1,0.246999987434,0.289999988032,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":395.588,"s":[188.764,-2.667],"e":[188.764,191.333],"to":[0,32.3333320617676],"ti":[0,-32.3333320617676]},{"t":433.255859375}],"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 17","np":2,"cix":2,"ix":17,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[-0.723,-0.416],[0,0],[0,0],[0,0],[0.363,-0.21],[0,0],[0.72,0.413],[0,0],[0,0.277],[0,0]],"o":[[0,0],[0.723,-0.416],[0,0],[0,0],[0,0],[0.005,0.274],[0,0],[-0.72,0.413],[0,0],[-0.363,-0.207],[0,0],[0,0]],"v":[[-5.094,-2.854],[-3.846,-3.577],[-1.225,-3.577],[5.097,0.071],[5.697,0.071],[5.697,2.056],[5.158,2.818],[3.841,3.58],[1.223,3.58],[-5.161,-0.107],[-5.702,-0.864],[-5.702,-2.854]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.611999990426,0.144999994016,0.122000002394,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":395.588,"s":[188.764,-2.667],"e":[188.766,192.715],"to":[0.00039927163743,32.5637969970703],"ti":[-0.00039927163743,-32.5637969970703]},{"t":433.255859375}],"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 18","np":2,"cix":2,"ix":18,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0.589,0],[0.427,0.252],[0,0],[0,0.474],[-0.508,0.296],[0,0],[-0.854,-0.496],[0,0],[0,-0.472],[0.505,-0.296],[0,0]],"o":[[-0.586,0],[0,0],[-0.508,-0.296],[0,-0.475],[0,0],[0.854,-0.496],[0,0],[0.505,0.293],[0,0.475],[0,0],[-0.423,0.246]],"v":[[2.74,3.987],[1.168,3.602],[-5.626,-0.317],[-6.427,-1.525],[-5.626,-2.734],[-4.311,-3.491],[-1.171,-3.491],[5.629,0.431],[6.427,1.637],[5.629,2.846],[4.308,3.608]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.071000005685,0.071000005685,0.078000005086,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":395.588,"s":[188.764,-2.667],"e":[188.737,193.243],"to":[-0.00448354100809,32.6517486572266],"ti":[0.00448354100809,-32.6517486572266]},{"t":433.255859375}],"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 19","np":2,"cix":2,"ix":19,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[2.428,1.398],[0,0],[0,2.803],[0,0],[-2.429,-1.404],[0,0],[0,-2.799]],"o":[[0,2.806],[0,0],[-2.429,-1.401],[0,0],[0,-2.803],[0,0],[2.428,1.401],[0,0]],"v":[[19.586,18.441],[15.179,20.99],[-15.173,3.464],[-19.586,-4.175],[-19.586,-18.438],[-15.173,-20.984],[15.179,-3.464],[19.586,4.176]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.352999997606,0.352999997606,0.380000005984,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":436.332,"s":[-1.337,317.097],"e":[195.663,242.097],"to":[32.8333320617676,-12.5],"ti":[-32.8333320617676,12.5]},{"t":474}],"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 20","np":2,"cix":2,"ix":20,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[2.426,1.401],[0,0],[0.793,-0.422],[0,0],[0,0],[0,-0.829],[0,0],[-2.425,-1.405],[0,0],[-0.603,0.014],[0,0],[0,0],[0,1.36],[0,0]],"o":[[0,0],[-1.172,-0.678],[0,0],[0,0],[-0.307,0.517],[0,0],[0,2.803],[0,0],[0.729,0.419],[0,0],[0,0],[0.759,-0.478],[0,0],[0,-2.797]],"v":[[15.173,-3.51],[-15.179,-21.034],[-18.219,-21.371],[-19.273,-20.771],[-19.106,-20.509],[-19.589,-18.488],[-19.589,-4.225],[-15.179,3.418],[15.173,20.941],[17.189,21.533],[17.334,21.793],[18.355,21.201],[19.589,18.395],[19.589,4.127]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.187999994615,0.187999994615,0.2,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":425.568,"s":[-1.337,317.097],"e":[196.613,241.599],"to":[32.9915161132813,-12.5829496383667],"ti":[-32.9915161132813,12.5829496383667]},{"t":463.23828125}],"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 21","np":2,"cix":2,"ix":21,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[4.466,2.58],[0,0],[0,5.155],[0,0],[-4.471,-2.573],[0,0],[0,-5.156]],"o":[[0,5.155],[0,0],[-4.471,-2.576],[0,0],[0,-5.158],[0,0],[4.466,2.576],[0,0]],"v":[[56.545,45.773],[48.423,50.462],[-48.422,-5.452],[-56.545,-19.517],[-56.545,-45.777],[-48.422,-50.469],[48.423,5.451],[56.545,19.516]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.325,0.325,0.349000010771,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":413.27,"s":[-32.337,317.097],"e":[196.612,241.553],"to":[38.1581192016602,-12.5905656814575],"ti":[-38.1581192016602,12.5905656814575]},{"t":450.9375}],"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 22","np":2,"cix":2,"ix":22,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[4.463,2.582],[0,0],[1.457,-0.765],[0,0],[0,0],[0,-0.478],[0,0],[-4.466,-2.585],[0,0],[-0.91,-0.115],[0,0],[0,0],[0,2.555],[0,0]],"o":[[0,0],[-2.172,-1.253],[0,0],[0,0],[-0.067,0.427],[0,0],[0,5.155],[0,0],[1.032,0.6],[0,0],[0,0],[1.451,-0.86],[0,0],[0,-5.155]],"v":[[48.573,5.158],[-48.275,-50.756],[-53.871,-51.381],[-56.693,-49.762],[-56.291,-47.42],[-56.397,-46.069],[-56.397,-19.809],[-48.275,-5.741],[48.573,50.17],[51.504,51.217],[51.85,52.146],[54.34,50.706],[56.693,45.483],[56.693,19.223]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.187999994615,0.187999994615,0.2,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":395.588,"s":[-32.337,317.097],"e":[199.005,240.377],"to":[38.5569343566895,-12.7865676879883],"ti":[-38.5569343566895,12.7865676879883]},{"t":433.255859375}],"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 23","np":2,"cix":2,"ix":23,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[4.954,2.858],[0,0],[0,5.723],[0,0],[-4.957,-2.859],[0,0],[0,-5.722]],"o":[[0,5.725],[0,0],[-4.957,-2.864],[0,0],[0,-5.719],[0,0],[4.954,2.863],[0,0]],"v":[[66.972,53.235],[57.959,58.44],[-57.956,-8.485],[-66.972,-24.097],[-66.972,-53.237],[-57.956,-58.44],[57.959,8.486],[66.972,24.097]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.141000007181,0.823999980852,0.757000014361,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":381.75,"s":[-32.337,317.097],"e":[199.04,240.019],"to":[38.5627021789551,-12.8461990356445],"ti":[-38.5627021789551,12.8461990356445]},{"t":419.41796875}],"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 24","np":2,"cix":2,"ix":24,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[5.716,3.3],[0,0],[0,6.596],[0,0],[-5.719,-3.296],[0,0],[0,-6.599],[0,0]],"o":[[0,0],[-5.719,-3.299],[0,0],[0,-6.595],[0,0],[5.716,3.296],[0,0],[0,6.601]],"v":[[57.958,59.997],[-57.958,-6.926],[-68.321,-24.876],[-68.321,-54.02],[-57.958,-60.001],[57.958,6.925],[68.321,24.875],[68.321,54.013]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.071000005685,0.071000005685,0.078000005086,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":351,"s":[-276.959,158.021],"e":[199.041,240.021],"to":[79.3333358764648,13.6666669845581],"ti":[-79.3333358764648,-13.6666669845581]},{"t":395.587890625}],"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 25","np":2,"cix":2,"ix":25,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[5.714,3.299],[0,0],[1.873,-1.046],[0,0],[0.028,-0.025],[0,0],[0,0],[0,0],[0,0],[0,3.442],[0,0]],"o":[[0,0],[-2.825,-1.633],[0,0],[-0.033,0.017],[0,0],[0,0],[0,0],[0,0],[2.019,-1.022],[0,0],[0,-6.599]],"v":[[83.883,-8.376],[-32.035,-75.299],[-39.301,-76.053],[-39.312,-76.044],[-39.404,-75.989],[-94.246,-44.325],[36.328,77.099],[90.967,45.548],[90.964,45.548],[94.246,38.712],[94.246,9.575]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.187999994615,0.187999994615,0.2,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":351,"s":[-276.959,158.021],"e":[227.866,223.711],"to":[84.1374969482422,10.9483995437622],"ti":[-84.1374969482422,-10.9483995437622]},{"t":395.587890625}],"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 26","np":2,"cix":2,"ix":26,"mn":"ADBE Vector Group","hd":false}],"ip":341,"op":685,"st":85,"bm":0},{"ddd":0,"ind":4,"ty":4,"nm":"apple watch Outlines","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":349,"s":[293,285,0],"e":[785,547,0],"to":[82,43.6666679382324,0],"ti":[-82,-43.6666679382324,0]},{"t":409}],"ix":2},"a":{"a":0,"k":[89.907,94.565,0],"ix":1},"s":{"a":0,"k":[214.667,214.667,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-0.826,0.478],[0,0],[0,0],[0,0],[0,-0.95]],"o":[[0,0],[0,0],[0,0],[-0.826,0.476],[0,0.954]],"v":[[0.153,1.828],[1.341,1.14],[1.341,-2.307],[0.153,-1.62],[-1.341,0.965]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.654999976065,0.663000009574,0.675,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":200,"s":[-85.023,180.011],"e":[78.977,85.011],"to":[27.3333339691162,-15.8333330154419],"ti":[-27.3333339691162,15.8333330154419]},{"t":268}],"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,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,-0.952],[-0.239,-0.167],[0,0],[0,0]],"o":[[0,0],[0,0],[-0.821,0.478],[0,0.443],[0,0],[0,0],[0,0]],"v":[[2.265,-1.581],[0.419,-2.645],[-0.773,-1.962],[-2.265,0.626],[-1.878,1.551],[0.002,2.645],[0.18,1.406]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.736999990426,0.745000023935,0.752999997606,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":200,"s":[-85.023,180.011],"e":[78.054,84.285],"to":[27.1794834136963,-15.9542999267578],"ti":[-27.1794834136963,15.9542999267578]},{"t":268}],"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,"ix":2,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,10.116],[-15.558,16.913],[0,0],[0,0],[-0.002,-15.429],[-6.071,-3.705],[0,0]],"o":[[-6.358,-3.823],[0,-16.025],[0,0],[0,0],[-15.092,16.402],[0,9.674],[0,0],[0,0]],"v":[[-2.736,37.499],[-12.872,16.4],[12.355,-36.996],[12.872,-37.499],[12.87,-35.944],[-11.596,15.664],[-1.93,35.905],[-1.686,37.196]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.039000002543,0.501999978458,0.455000005984,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":200,"s":[270.632,230.011],"e":[64.632,120.011],"to":[-34.3333320617676,-18.3333339691162],"ti":[34.3333320617676,18.3333339691162]},{"t":268}],"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,"ix":3,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[2.034,-5.603],[0,0],[-3.354,5.481]],"o":[[-3.49,5.654],[0,0],[2.038,-5.795],[0,0]],"v":[[-8.258,-15.708],[-16.596,1.29],[8.372,15.708],[16.596,-1.356]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.086000001197,0.658999992819,0.62400004069,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":212,"s":[-87.373,119.918],"e":[47.627,101.918],"to":[22.5,-3],"ti":[-22.5,3]},{"t":280}],"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 4","np":2,"cix":2,"ix":4,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-13.566,14.336],[0,0],[0,0],[0,-15.884],[-6.363,-3.822],[0,0],[0,0],[0,0],[0,0],[-0.171,5.701]],"o":[[0,0],[0,0],[-15.325,16.827],[0,10.125],[0.005,0.004],[0,0],[0,0],[-4.72,-3.708],[0,0],[-0.292,-17.508]],"v":[[24.785,-29.535],[24.859,-29.714],[-0.033,-44.086],[-24.859,8.862],[-14.712,29.966],[-14.702,29.974],[9.741,44.086],[9.566,42.702],[2.713,35.223],[0.345,23.405]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.141000007181,0.823999980852,0.757000014361,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":200,"s":[-87.373,119.918],"e":[52.154,113.424],"to":[23.2544841766357,-1.08231604099274],"ti":[-23.2544841766357,1.08231604099274]},{"t":268}],"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 5","np":2,"cix":2,"ix":5,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,-0.881],[0.762,-0.437],[0,0.881],[-0.761,0.44]],"o":[[0,0.88],[-0.761,0.443],[0,-0.88],[0.762,-0.441]],"v":[[1.381,-0.796],[-0.002,1.592],[-1.381,0.795],[-0.002,-1.594]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.039000002543,0.501999978458,0.455000005984,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":200,"s":[258.444,128.941],"e":[77.444,83.941],"to":[-30.1666660308838,-7.5],"ti":[30.1666660308838,7.5]},{"t":268}],"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 6","np":2,"cix":2,"ix":6,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0],[0.413,-0.237],[0,-0.88],[-0.209,-0.159]],"o":[[0,0],[0,0],[0,0],[-0.253,-0.184],[-0.76,0.44],[0,0.4],[0,0]],"v":[[11.346,8.778],[13.363,5.44],[-10.947,-8.597],[-10.951,-8.594],[-11.985,-8.541],[-13.363,-6.151],[-13.025,-5.31]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.086000001197,0.658999992819,0.62400004069,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":200,"s":[-64.907,79.835],"e":[65.093,76.835],"to":[21.6666660308838,-0.5],"ti":[-21.6666660308838,0.5]},{"t":268}],"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 7","np":2,"cix":2,"ix":7,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[5.057,-1.455],[0,0],[-5.053,2.917]],"o":[[-5.368,3.097],[0,0],[4.754,-1.37],[0,0]],"v":[[7.855,-1.222],[-7.855,5.635],[-6.923,0.82],[7.855,-5.635]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.57599995931,0.583999992819,0.596000043084,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":200,"s":[290.777,232.152],"e":[93.777,154.152],"to":[-32.8333320617676,-13],"ti":[32.8333320617676,13]},{"t":268}],"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 8","np":2,"cix":2,"ix":8,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[1.321,-0.533],[0,0],[-1.456,0.732]],"o":[[-1.61,0.781],[0,0],[1.432,-0.603],[0,0]],"v":[[10.581,3.875],[6.151,5.836],[-10.581,-3.827],[-6.24,-5.836]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.039000002543,0.501999978458,0.455000005984,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":200,"s":[82.79,-64.758],"e":[82.79,145.242],"to":[0,35],"ti":[0,-35]},{"t":268}],"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 9","np":2,"cix":2,"ix":9,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0.26,-0.126],[0,0],[1.432,-0.603],[0,0],[-1.746,0.876]],"o":[[-0.265,0.133],[0,0],[-1.456,0.733],[0,0],[1.715,-0.688],[0,0]],"v":[[11.4,4.888],[10.617,5.273],[-6.205,-4.439],[-10.545,-2.428],[-11.4,-2.921],[-6.205,-5.273]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.57599995931,0.583999992819,0.596000043084,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":200,"s":[82.79,-69.758],"e":[82.754,143.844],"to":[-0.00605010986328,35.600284576416],"ti":[0.00605010986328,-35.600284576416]},{"t":268}],"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 10","np":2,"cix":2,"ix":10,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[-7.886,4.667],[0,0],[5.012,-1.931]],"o":[[0,0],[0,0],[0,0],[0,0],[-5.008,1.928]],"v":[[4.842,9.478],[-19.62,-4.648],[-4.845,-11.099],[19.62,3.023],[12.016,9.171]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.239215686275,0.239215686275,0.239215686275,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":200,"s":[82.011,-73.506],"e":[82.011,145.494],"to":[0,36.5],"ti":[0,-36.5]},{"t":268}],"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 11","np":2,"cix":2,"ix":11,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[11.909,7.882],[-12.553,-6.243],[-11.911,-7.882],[12.553,6.24]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.039000002543,0.501999978458,0.455000005984,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":200,"s":[-98.366,150.83],"e":[59.634,150.83],"to":[26.3333339691162,0],"ti":[-26.3333339691162,0]},{"t":268}],"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 12","np":2,"cix":2,"ix":12,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[8.959,0.889],[0,0],[0,0],[-10.036,5.795]],"o":[[-10.264,5.929],[0,0],[0,0],[8.764,0.877],[0,0]],"v":[[14.851,-3.559],[-14.532,4.139],[-14.851,2.937],[-13.888,2.497],[14.851,-5.028]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.039000002543,0.501999978458,0.455000005984,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":200,"s":[254.075,224.574],"e":[86.075,154.574],"to":[-28,-11.6666669845581],"ti":[28,11.6666669845581]},{"t":268}],"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 13","np":2,"cix":2,"ix":13,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0],[0,0]],"v":[[-12.707,-6.935],[-11.85,-7.184],[-9.459,-7.184],[12.707,5.769],[11.764,7.184]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.039000002543,0.501999978458,0.455000005984,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":200,"s":[74.968,-71.553],"e":[74.968,148.447],"to":[0,36.6666679382324],"ti":[0,-36.6666679382324]},{"t":268}],"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 14","np":2,"cix":2,"ix":14,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[13.111,-0.325],[0,0],[-10.038,5.798]],"o":[[-1.67,3.412],[0,0],[8.764,0.869],[0,0]],"v":[[26.601,2.48],[-2.781,11.646],[-26.601,-4.119],[2.139,-11.646]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.086000001197,0.658999992819,0.62400004069,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":200,"s":[74.324,-69.933],"e":[74.324,147.067],"to":[0,36.1666679382324],"ti":[0,-36.1666679382324]},{"t":268}],"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 15","np":2,"cix":2,"ix":15,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-0.823,0.478],[0,0],[0,0],[0,0],[0,-0.951]],"o":[[0,0],[0,0],[0,0],[-0.823,0.474],[0,0.951]],"v":[[0.15,1.827],[1.34,1.143],[1.34,-2.306],[0.15,-1.617],[-1.34,0.965]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.654999976065,0.663000009574,0.675,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":200,"s":[-87.455,81.749],"e":[52.545,69.749],"to":[23.3333339691162,-2],"ti":[-23.3333339691162,2]},{"t":268}],"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 16","np":2,"cix":2,"ix":16,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,-0.952],[-0.238,-0.17],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[-0.823,0.477],[0,0.443],[0,0],[0,0],[0,0],[0,0]],"v":[[2.264,-1.581],[0.419,-2.646],[-0.771,-1.962],[-2.265,0.626],[-1.877,1.553],[-1.882,1.557],[0.001,2.646],[0.18,1.411]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.736999990426,0.745000023935,0.752999997606,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":200,"s":[-87.455,81.749],"e":[51.621,69.023],"to":[23.1793174743652,-2.1208827495575],"ti":[-23.1793174743652,2.1208827495575]},{"t":268}],"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 17","np":2,"cix":2,"ix":17,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-0.777,0.074],[0,0],[0,0],[0,0],[0,0],[0.673,-0.355],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0],[-0.89,0.062],[0,0],[0.65,-0.342]],"v":[[0.762,-0.059],[-0.058,-0.533],[0.125,-0.639],[1.185,-0.026],[1.053,0.051],[-0.963,0.639],[-1.185,0.512]],"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,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":226,"s":[-132.046,-22.51],"e":[71.112,56.766],"to":[33.8596000671387,13.2126817703247],"ti":[-33.8596000671387,-13.2126817703247]},{"t":294}],"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 18","np":2,"cix":2,"ix":18,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0.132],[0,0],[-0.197,-0.112],[-0.229,0.132],[0.211,0.123],[0.162,0.019],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[-0.102,-0.059],[0.356,-0.207],[0.289,0.165]],"o":[[0,0],[0.001,0.114],[0.198,0.114],[0.228,-0.132],[-0.115,-0.066],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0.117,0.02],[0.282,0.163],[-0.357,0.206],[-0.262,-0.151]],"v":[[-1.236,0.042],[-0.993,0.021],[-0.764,0.372],[-0.025,0.362],[-0.015,-0.05],[-0.398,-0.154],[-0.441,-0.263],[0.41,-0.689],[1.237,-0.213],[1.053,-0.107],[0.41,-0.477],[-0.122,-0.219],[0.2,-0.112],[0.195,0.483],[-0.923,0.484]],"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,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":226,"s":[-132.046,-22.51],"e":[69.674,56.152],"to":[33.6200180053711,13.1103105545044],"ti":[-33.6200180053711,-13.1103105545044]},{"t":294}],"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 19","np":2,"cix":2,"ix":19,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-0.093,0.055],[-0.084,-0.049],[0.098,-0.056],[0.084,0.048]],"o":[[0.098,-0.056],[0.084,0.048],[-0.093,0.054],[-0.084,-0.049]],"v":[[0.311,-0.358],[0.63,-0.363],[0.618,-0.178],[0.305,-0.174]],"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.093,0.053],[-0.084,-0.048],[0.097,-0.056],[0.084,0.048]],"o":[[0.097,-0.057],[0.084,0.049],[-0.093,0.053],[-0.084,-0.049]],"v":[[-0.624,0.182],[-0.303,0.177],[-0.316,0.361],[-0.629,0.365]],"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":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":226,"s":[-132.046,-22.51],"e":[68.454,55.735],"to":[33.4165496826172,13.0409135818481],"ti":[-33.4165496826172,-13.0409135818481]},{"t":294}],"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 20","np":4,"cix":2,"ix":20,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-0.484,0.279],[0.191,0.109],[0.485,-0.279],[-0.196,-0.112]],"o":[[0.484,-0.279],[-0.196,-0.112],[-0.484,0.279],[0.191,0.111]],"v":[[0.325,0.183],[0.687,-0.394],[-0.32,-0.189],[-0.684,0.397]],"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.552,0.319],[-0.331,-0.191],[0.553,-0.32],[0.329,0.19]],"o":[[0.554,-0.32],[0.328,0.19],[-0.553,0.319],[-0.331,-0.191]],"v":[[-0.524,-0.308],[0.858,-0.494],[0.534,0.303],[-0.855,0.495]],"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":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":226,"s":[-132.046,-22.51],"e":[67.711,55.045],"to":[33.2927856445313,12.9258470535278],"ti":[-33.2927856445313,-12.9258470535278]},{"t":294}],"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 21","np":4,"cix":2,"ix":21,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[-0.268,0.154],[0.209,0.121],[0.208,-0.009],[0,0],[-0.213,-0.124],[0.292,-0.169],[0.797,-0.01],[-0.087,-0.05],[0,0],[0,0],[0,0]],"o":[[0.99,0.001],[0.189,-0.109],[-0.137,-0.079],[0,0],[0.288,-0.008],[0.307,0.177],[-0.311,0.179],[0.099,0.05],[0,0],[0,0],[0,0],[0,0]],"v":[[-1.111,0.038],[0.721,-0.125],[0.734,-0.492],[0.182,-0.579],[0.181,-0.72],[0.932,-0.577],[0.939,-0.01],[-0.76,0.193],[-0.467,0.345],[0.012,0.621],[-0.172,0.728],[-1.239,0.112]],"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,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":226,"s":[-132.046,-22.51],"e":[78.898,57.452],"to":[35.1571998596191,13.3270463943481],"ti":[-35.1571998596191,-13.3270463943481]},{"t":294}],"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 22","np":2,"cix":2,"ix":22,"mn":"ADBE Vector Group","hd":false},{"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.147,-0.022],[0,0],[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0],[0.176,0.071],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]],"v":[[-0.945,0.049],[-0.566,0.268],[0.65,-0.434],[0.35,-0.607],[0.488,-0.687],[0.958,-0.555],[1.12,-0.462],[-0.354,0.39],[-0.015,0.587],[-0.191,0.687],[-1.12,0.152]],"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,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":226,"s":[-132.046,-22.51],"e":[77.589,56.726],"to":[34.9391021728516,13.2060823440552],"ti":[-34.9391021728516,-13.2060823440552]},{"t":294}],"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 23","np":2,"cix":2,"ix":23,"mn":"ADBE Vector Group","hd":false},{"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],[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],[0,0],[0,0],[0,0],[0,0],[0,0]],"v":[[0.72,-0.834],[0.929,-0.713],[-0.319,0.007],[-0.311,0.012],[0.886,-0.062],[1.122,0.074],[0.195,0.123],[-0.078,0.834],[-0.312,0.699],[-0.074,0.137],[-0.582,0.159],[-0.913,0.35],[-1.122,0.23]],"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,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":226,"s":[-132.046,-22.51],"e":[75.797,55.611],"to":[34.6404495239258,13.0201616287231],"ti":[-34.6404495239258,-13.0201616287231]},{"t":294}],"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 24","np":2,"cix":2,"ix":24,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-0.417,0.239],[-0.321,-0.186],[-0.009,-0.097],[0,0],[0.099,0.056],[0.289,-0.167],[-0.229,-0.133],[-0.147,-0.005],[0,0],[0.15,0.087]],"o":[[0.422,-0.244],[0.166,0.095],[0,0],[-0.008,-0.077],[-0.227,-0.133],[-0.287,0.166],[0.117,0.067],[0,0],[-0.217,-0.007],[-0.334,-0.191]],"v":[[-0.536,-0.309],[0.73,-0.342],[0.952,-0.044],[0.704,-0.028],[0.566,-0.235],[-0.314,-0.182],[-0.41,0.32],[0.012,0.417],[-0.035,0.553],[-0.603,0.41]],"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,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":226,"s":[-132.046,-22.51],"e":[74.559,55.051],"to":[34.4340858459473,12.9268827438354],"ti":[-34.4340858459473,-12.9268827438354]},{"t":294}],"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 25","np":2,"cix":2,"ix":25,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-0.232,-0.008],[0,0],[0.16,-0.093],[-0.123,-0.071]],"o":[[0,0],[-0.473,-0.212],[-0.143,0.081],[0.125,0.072]],"v":[[-0.042,0.291],[0.308,0.089],[-0.572,-0.053],[-0.553,0.19]],"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.225,0.13],[-0.596,-0.275],[0.209,0.12],[0.165,0.019],[0,0],[-0.201,-0.117],[0.312,-0.181],[0,0],[0,0],[0,0],[0,0],[0.162,0.092]],"o":[[0.274,-0.158],[0.159,-0.093],[-0.146,-0.084],[0,0],[0.189,0.023],[0.308,0.178],[0,0],[0,0],[0,0],[0,0],[-0.217,-0.012],[-0.208,-0.122]],"v":[[-0.796,-0.164],[0.448,0.009],[0.503,-0.322],[-0.006,-0.462],[0.06,-0.593],[0.713,-0.403],[0.635,0.147],[-0.135,0.593],[-0.313,0.491],[-0.18,0.394],[-0.188,0.389],[-0.786,0.254]],"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":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":226,"s":[-132.046,-22.51],"e":[73.226,54.333],"to":[34.2118682861328,12.8071794509888],"ti":[-34.2118682861328,-12.8071794509888]},{"t":294}],"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 26","np":4,"cix":2,"ix":26,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0],[-0.142,-0.081],[-0.027,-0.033],[0,0],[0.05,0.03],[0.299,-0.072],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0.242,-0.044],[0.054,0.032],[0,0],[-0.026,-0.03],[-0.108,-0.062],[0,0],[0,0],[0,0]],"v":[[0.279,-0.424],[0.455,-0.321],[0.246,-0.18],[0.253,-0.174],[0.867,-0.119],[0.978,-0.027],[0.748,0.057],[0.65,-0.024],[0.041,-0.041],[-0.766,0.424],[-0.978,0.301]],"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,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":226,"s":[-132.046,-22.51],"e":[72.322,53.615],"to":[34.0611991882324,12.6875791549683],"ti":[-34.0611991882324,-12.6875791549683]},{"t":294}],"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 27","np":2,"cix":2,"ix":27,"mn":"ADBE Vector Group","hd":false},{"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],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]],"v":[[0.304,-0.3],[-0.208,-0.596],[-0.029,-0.7],[1.214,0.016],[1.033,0.12],[0.52,-0.175],[-0.997,0.7],[-1.214,0.575]],"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,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":226,"s":[-132.046,-22.51],"e":[71.657,52.824],"to":[33.9505004882813,12.5557479858398],"ti":[-33.9505004882813,-12.5557479858398]},{"t":294}],"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 28","np":2,"cix":2,"ix":28,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0.195,0.115],[0,0],[0.331,0.193],[0.415,-0.088],[0,0],[0.586,0.341],[0.708,-0.407],[-0.709,-0.411],[-0.691,0.222],[0,0],[-0.328,-0.193],[-0.412,0.084],[0,0],[-0.197,0.111]],"o":[[0,0],[0.147,-0.242],[-0.331,-0.188],[0,0],[0.385,-0.398],[-0.709,-0.407],[-0.709,0.411],[0.585,0.341],[0,0],[-0.148,0.236],[0.334,0.192],[0,0],[0.196,0.111],[0.195,-0.115]],"v":[[14.353,7.878],[-0.457,-0.671],[-0.729,-1.383],[-1.956,-1.534],[-10.971,-6.742],[-11.271,-7.992],[-13.839,-7.992],[-13.839,-6.508],[-11.676,-6.334],[-2.664,-1.126],[-2.393,-0.419],[-1.166,-0.264],[13.641,8.288],[14.353,8.288]],"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,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":226,"s":[-132.046,-22.51],"e":[76.066,65.387],"to":[34.6853332519531,14.6494474411011],"ti":[-34.6853332519531,-14.6494474411011]},{"t":294}],"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 29","np":2,"cix":2,"ix":29,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[-2.044,0.187],[-1.76,0.024],[-0.038,1.02],[-0.32,1.183]],"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]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[-0.469,-0.719],[-0.04,-0.971],[1.684,0.024],[1.252,0.272]],"c":true},"ix":2},"nm":"Path 2","mn":"ADBE Vector Shape - Group","hd":false},{"ind":2,"ty":"sh","ix":3,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[0.535,0.687],[0.105,0.935],[-1.618,-0.057],[-1.186,-0.305]],"c":true},"ix":2},"nm":"Path 3","mn":"ADBE Vector Shape - Group","hd":false},{"ind":3,"ty":"sh","ix":4,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[-1.042,-0.39],[-0.615,-0.638],[1.107,0.354],[0.678,0.606]],"c":true},"ix":2},"nm":"Path 4","mn":"ADBE Vector Shape - Group","hd":false},{"ind":4,"ty":"sh","ix":5,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[2.045,-0.183],[1.826,-0.057],[0.105,-1.053],[0.323,-1.179]],"c":true},"ix":2},"nm":"Path 5","mn":"ADBE Vector Shape - Group","hd":false},{"ind":5,"ty":"sh","ix":6,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[0.323,-1.345],[-2.331,0.187],[-0.32,1.345],[2.331,-0.183]],"c":true},"ix":2},"nm":"Path 6","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":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":226,"s":[-132.046,-22.51],"e":[75.054,45.816],"to":[34.5166320800781,11.3877458572388],"ti":[-34.5166320800781,-11.3877458572388]},{"t":294}],"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 30","np":8,"cix":2,"ix":30,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0.35,0.202],[0,0],[-0.349,0.204],[0,0],[-0.349,-0.203],[0,0],[0.348,-0.204]],"o":[[-0.352,0.202],[0,0],[-0.349,-0.204],[0,0],[0.351,-0.203],[0,0],[0.348,0.204],[0,0]],"v":[[1.204,2.38],[-0.07,2.38],[-4.125,0.041],[-4.125,-0.696],[-1.204,-2.38],[0.069,-2.38],[4.126,-0.041],[4.126,0.695]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.141000007181,0.823999980852,0.757000014361,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":226,"s":[-132.046,-22.51],"e":[75.054,45.818],"to":[34.5166511535645,11.3880491256714],"ti":[-34.5166511535645,-11.3880491256714]},{"t":294}],"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 31","np":2,"cix":2,"ix":31,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0.037,-0.26],[-0.152,-0.06],[-0.294,0.177],[0,0]],"o":[[0.066,0.018],[0.125,-0.2],[0,0],[-0.32,0.204]],"v":[[-0.481,0.302],[-0.148,0.409],[0.481,-0.168],[0.06,-0.409]],"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,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":226,"s":[-132.046,-22.51],"e":[108.868,65.865],"to":[40.1522178649902,14.7290983200073],"ti":[-40.1522178649902,-14.7290983200073]},{"t":294}],"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 32","np":2,"cix":2,"ix":32,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0.354,-0.189],[0,0],[-0.345,0.075],[0.031,0.04]],"o":[[0,0],[0.316,-0.171],[-0.095,-0.085],[-0.45,0.023]],"v":[[-0.713,0.033],[-0.296,0.278],[0.713,-0.09],[0.532,-0.278]],"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,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":226,"s":[-132.046,-22.51],"e":[109.778,65.341],"to":[40.3039169311523,14.6418485641479],"ti":[-40.3039169311523,-14.6418485641479]},{"t":294}],"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 33","np":2,"cix":2,"ix":33,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-0.073,0.159],[0.068,0.018],[-0.156,-0.169]],"o":[[-0.116,-0.044],[0.005,0.185],[-0.049,-0.136]],"v":[[0.139,-0.18],[-0.139,-0.271],[0.103,0.271]],"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,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":226,"s":[-132.046,-22.51],"e":[108.521,66.56],"to":[40.0943832397461,14.8449983596802],"ti":[-40.0943832397461,-14.8449983596802]},{"t":294}],"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 34","np":2,"cix":2,"ix":34,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-0.012,-0.011],[-0.237,-0.03],[0.32,0.008],[-0.055,-0.048]],"o":[[0.272,-0.041],[-0.29,-0.089],[0.027,0.033],[0.013,0.012]],"v":[[-0.309,0.079],[0.465,0.062],[-0.465,-0.079],[-0.346,0.043]],"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,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":226,"s":[-132.046,-22.51],"e":[110.986,65.139],"to":[40.5052337646484,14.6081438064575],"ti":[-40.5052337646484,-14.6081438064575]},{"t":294}],"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 35","np":2,"cix":2,"ix":35,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0.387,-0.053],[-0.234,-0.125]],"o":[[-0.256,-0.111],[0.129,0.114],[0,0]],"v":[[0.502,-0.069],[-0.502,-0.152],[0.032,0.206]],"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,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":226,"s":[-132.046,-22.51],"e":[111.283,65.468],"to":[40.554801940918,14.6629991531372],"ti":[-40.554801940918,-14.6629991531372]},{"t":294}],"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 36","np":2,"cix":2,"ix":36,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0.111,-0.189],[-0.27,-0.153]],"o":[[0,0],[-0.285,0.178],[0.192,0.077],[0,0]],"v":[[0.714,0.027],[-0.114,-0.45],[-0.714,0.109],[-0.015,0.45]],"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,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":226,"s":[-132.046,-22.51],"e":[109.596,66.223],"to":[40.2736854553223,14.7889280319214],"ti":[-40.2736854553223,-14.7889280319214]},{"t":294}],"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 37","np":2,"cix":2,"ix":37,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0.174,0.074],[-0.193,-0.149]],"o":[[-0.239,-0.133],[-0.09,0.222],[0,0]],"v":[[0.356,0.015],[-0.266,-0.289],[-0.121,0.289]],"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,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":226,"s":[-132.046,-22.51],"e":[109.093,66.736],"to":[40.1898002624512,14.8743486404419],"ti":[-40.1898002624512,-14.8743486404419]},{"t":294}],"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 38","np":2,"cix":2,"ix":38,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0.135,0.111],[0.307,-0.167],[0,0]],"o":[[-0.261,-0.155],[-0.332,0.063],[0,0],[0,0]],"v":[[0.783,-0.014],[0.198,-0.413],[-0.783,-0.065],[0.044,0.413]],"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,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":226,"s":[-132.046,-22.51],"e":[110.402,65.761],"to":[40.4079513549805,14.71178150177],"ti":[-40.4079513549805,-14.71178150177]},{"t":294}],"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 39","np":2,"cix":2,"ix":39,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[-0.111,0.192],[0.282,0.163]],"o":[[0,0],[0.287,-0.178],[-0.203,-0.078],[0,0]],"v":[[-0.732,-0.038],[0.128,0.462],[0.732,-0.103],[0.004,-0.462]],"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,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":226,"s":[-132.046,-22.51],"e":[111.316,66.288],"to":[40.5601844787598,14.7996778488159],"ti":[-40.5601844787598,-14.7996778488159]},{"t":294}],"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 40","np":2,"cix":2,"ix":40,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0.074,-0.162],[-0.069,-0.019],[0.164,0.174]],"o":[[0.126,0.048],[-0.007,-0.193],[0.051,0.141]],"v":[[-0.147,0.178],[0.147,0.279],[-0.111,-0.279]],"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,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":226,"s":[-132.046,-22.51],"e":[112.416,65.961],"to":[40.7436027526855,14.7451963424683],"ti":[-40.7436027526855,-14.7451963424683]},{"t":294}],"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 41","np":2,"cix":2,"ix":41,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[-0.183,-0.077],[0.217,0.149]],"o":[[0.248,0.142],[0.093,-0.233],[0,0]],"v":[[-0.371,-0.028],[0.278,0.298],[0.099,-0.298]],"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,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":226,"s":[-132.046,-22.51],"e":[111.826,65.775],"to":[40.6452827453613,14.7141981124878],"ti":[-40.6452827453613,-14.7141981124878]},{"t":294}],"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 42","np":2,"cix":2,"ix":42,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[-0.405,0.054],[0.249,0.148]],"o":[[0.26,0.126],[-0.132,-0.105],[0,0]],"v":[[-0.52,0.061],[0.521,0.162],[-0.044,-0.216]],"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,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":226,"s":[-132.046,-22.51],"e":[109.626,67.045],"to":[40.2785987854004,14.9257659912109],"ti":[-40.2785987854004,-14.9257659912109]},{"t":294}],"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 43","np":2,"cix":2,"ix":43,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-0.355,0.181],[0,0],[0.339,-0.07],[-0.029,-0.041]],"o":[[0,0],[-0.307,0.17],[0.102,0.093],[0.446,-0.022]],"v":[[0.714,-0.028],[0.273,-0.283],[-0.714,0.079],[-0.523,0.283]],"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,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":226,"s":[-132.046,-22.51],"e":[111.171,67.19],"to":[40.5360679626465,14.9499464035034],"ti":[-40.5360679626465,-14.9499464035034]},{"t":294}],"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 44","np":2,"cix":2,"ix":44,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-0.036,0.259],[0.157,0.06],[0.295,-0.178],[0,0]],"o":[[-0.07,-0.019],[-0.123,0.196],[0,0],[0.326,-0.208]],"v":[[0.49,-0.303],[0.141,-0.415],[-0.49,0.163],[-0.054,0.415]],"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,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":226,"s":[-132.046,-22.51],"e":[112.07,66.665],"to":[40.6859512329102,14.8625640869141],"ti":[-40.6859512329102,-14.8625640869141]},{"t":294}],"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 45","np":2,"cix":2,"ix":45,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0.018,0.019],[0.245,0.029],[-0.342,-0.004],[0.053,0.049]],"o":[[-0.283,0.044],[0.305,0.095],[-0.031,-0.033],[-0.017,-0.018]],"v":[[0.314,-0.087],[-0.491,-0.064],[0.49,0.087],[0.369,-0.035]],"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,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":226,"s":[-132.046,-22.51],"e":[109.949,67.389],"to":[40.3324699401855,14.9831438064575],"ti":[-40.3324699401855,-14.9831438064575]},{"t":294}],"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 46","np":2,"cix":2,"ix":46,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[-0.145,-0.115],[-0.3,0.162],[0,0]],"o":[[0.277,0.162],[0.328,-0.064],[0,0],[0,0]],"v":[[-0.794,0],[-0.17,0.423],[0.794,0.078],[-0.068,-0.423]],"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,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":226,"s":[-132.046,-22.51],"e":[110.515,66.751],"to":[40.4267158508301,14.8767671585083],"ti":[-40.4267158508301,-14.8767671585083]},{"t":294}],"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 47","np":2,"cix":2,"ix":47,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0.352,0.198],[0,0],[-0.352,0.2],[0,0],[-0.352,-0.203],[0,0],[0.351,-0.204]],"o":[[-0.349,0.198],[0,0],[-0.352,-0.2],[0,0],[0.352,-0.203],[0,0],[0.348,0.204],[0,0]],"v":[[1.204,2.384],[-0.069,2.384],[-4.123,0.041],[-4.123,-0.692],[-1.206,-2.38],[0.07,-2.38],[4.124,-0.041],[4.124,0.696]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.141000007181,0.823999980852,0.757000014361,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":226,"s":[-132.046,-22.51],"e":[110.473,66.265],"to":[40.419734954834,14.795916557312],"ti":[-40.419734954834,-14.795916557312]},{"t":294}],"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 48","np":2,"cix":2,"ix":48,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[-1.768,0.001],[0.001,1.02],[1.768,0.001],[0.001,-1.02]],"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,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":226,"s":[-132.046,-22.51],"e":[102.879,63.093],"to":[39.1541519165039,14.2671308517456],"ti":[-39.1541519165039,-14.2671308517456]},{"t":294}],"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 49","np":2,"cix":2,"ix":49,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[-0.002,-1.022],[-1.769,0],[-0.002,1.022],[1.769,0]],"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,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":226,"s":[-132.046,-22.51],"e":[104.973,61.884],"to":[39.5030517578125,14.0656480789185],"ti":[-39.5030517578125,-14.0656480789185]},{"t":294}],"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 50","np":2,"cix":2,"ix":50,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[-1.768,0],[-0.003,1.022],[1.768,0],[-0.003,-1.022]],"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,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":226,"s":[-132.046,-22.51],"e":[100.847,61.917],"to":[38.8153686523438,14.0711793899536],"ti":[-38.8153686523438,-14.0711793899536]},{"t":294}],"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 51","np":2,"cix":2,"ix":51,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[-1.768,0.001],[-0.001,1.02],[1.768,0.001],[-0.001,-1.02]],"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,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":226,"s":[-132.046,-22.51],"e":[102.938,60.709],"to":[39.1640014648438,13.8698272705078],"ti":[-39.1640014648438,-13.8698272705078]},{"t":294}],"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 52","np":2,"cix":2,"ix":52,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0.519,0.299],[0,0],[-0.516,0.3],[0,0],[-0.52,-0.301],[0,0],[0.52,-0.299]],"o":[[-0.522,0.299],[0,0],[-0.519,-0.296],[0,0],[0.516,-0.301],[0,0],[0.52,0.295],[0,0]],"v":[[1.787,3.531],[-0.103,3.531],[-6.116,0.06],[-6.116,-1.029],[-1.783,-3.529],[0.102,-3.529],[6.115,-0.055],[6.115,1.033]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.141000007181,0.823999980852,0.757000014361,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":226,"s":[-132.046,-22.51],"e":[102.909,61.898],"to":[39.1590690612793,14.0680437088013],"ti":[-39.1590690612793,-14.0680437088013]},{"t":294}],"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 53","np":2,"cix":2,"ix":53,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0.212,0.119],[0.292,-0.171],[-0.378,-0.221],[-0.295,0.171],[0,0],[0,0],[0,0],[0.21,0.123],[0.293,-0.17],[-0.378,-0.219],[-0.292,0.171]],"o":[[0,0],[0,0],[-0.012,-0.142],[-0.379,-0.218],[-0.294,0.166],[0.378,0.215],[0,0],[0,0],[0,0],[-0.011,-0.142],[-0.378,-0.218],[-0.295,0.17],[0.379,0.218],[0,0]],"v":[[5.286,-0.602],[0.052,-1.919],[-3.445,0.102],[-3.777,-0.31],[-4.992,-0.398],[-4.839,0.304],[-3.622,0.389],[-0.619,-1.342],[4.16,-0.14],[1.394,1.46],[1.06,1.044],[-0.155,0.956],[-0.001,1.659],[1.216,1.748]],"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,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":226,"s":[-132.046,-22.51],"e":[92.432,56.132],"to":[37.4129829406738,13.1069793701172],"ti":[-37.4129829406738,-13.1069793701172]},{"t":294}],"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 54","np":2,"cix":2,"ix":54,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0.673,0.389],[0,0],[-0.675,0.389],[0,0],[-0.675,-0.388],[0,0],[0.675,-0.389]],"o":[[-0.672,0.389],[0,0],[-0.675,-0.389],[0,0],[0.674,-0.388],[0,0],[0.675,0.389],[0,0]],"v":[[2.317,4.577],[-0.133,4.577],[-7.93,0.077],[-7.93,-1.336],[-2.314,-4.578],[0.135,-4.578],[7.931,-0.078],[7.931,1.336]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.889999988032,0.105999995213,0.144999994016,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":226,"s":[-132.046,-22.51],"e":[92.77,56.048],"to":[37.4692497253418,13.0929307937622],"ti":[-37.4692497253418,-13.0929307937622]},{"t":294}],"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 55","np":2,"cix":2,"ix":55,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0]],"v":[[2.342,1.353],[-2.342,0.617],[1.065,-1.353]],"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,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":226,"s":[-132.046,-22.51],"e":[81.938,49.791],"to":[35.6638984680176,12.050181388855],"ti":[-35.6638984680176,-12.050181388855]},{"t":294}],"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 56","np":2,"cix":2,"ix":56,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0.518,0.301],[0,0],[-0.517,0.296],[0,0],[-0.516,-0.299],[0,0],[0.518,-0.299]],"o":[[-0.52,0.301],[0,0],[-0.517,-0.3],[0,0],[0.519,-0.299],[0,0],[0.518,0.299],[0,0]],"v":[[1.786,3.529],[-0.103,3.529],[-6.117,0.06],[-6.117,-1.03],[-1.785,-3.531],[0.1,-3.531],[6.115,-0.06],[6.115,1.033]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.141000007181,0.823999980852,0.757000014361,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":226,"s":[-132.046,-22.51],"e":[82.618,50.186],"to":[35.7773170471191,12.1159820556641],"ti":[-35.7773170471191,-12.1159820556641]},{"t":294}],"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 57","np":2,"cix":2,"ix":57,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0.001,0.179],[0,0],[-0.267,-0.155],[-0.316,0.183],[0.291,0.168],[0.224,0.026],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[-0.138,-0.08],[0.492,-0.283],[0.392,0.227]],"o":[[0,0],[0.001,0.155],[0.276,0.158],[0.313,-0.181],[-0.158,-0.091],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0.166,0.029],[0.387,0.223],[-0.489,0.283],[-0.365,-0.21]],"v":[[-1.697,0.058],[-1.363,0.03],[-1.049,0.51],[-0.034,0.497],[-0.019,-0.069],[-0.546,-0.212],[-0.602,-0.36],[0.563,-0.946],[1.697,-0.293],[1.445,-0.147],[0.568,-0.653],[-0.167,-0.301],[0.275,-0.154],[0.27,0.663],[-1.262,0.665]],"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,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":226,"s":[-132.046,-22.51],"e":[94.19,41.756],"to":[37.705883026123,10.7110109329224],"ti":[-37.705883026123,-10.7110109329224]},{"t":294}],"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 58","np":2,"cix":2,"ix":58,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[-0.129,0.066],[0,0],[0.174,-0.027],[0,0]],"o":[[0,0],[0.121,-0.069],[0,0],[-0.169,0.031],[0,0],[0,0]],"v":[[-0.215,0.091],[0.442,-0.288],[0.897,-0.53],[0.884,-0.538],[0.378,-0.46],[-0.926,-0.319]],"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],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]],"v":[[-0.45,0.227],[-1.469,-0.362],[-1.277,-0.473],[1.143,-0.749],[1.469,-0.559],[0.062,0.251],[0.371,0.43],[0.137,0.566],[-0.172,0.387],[-0.796,0.749],[-1.074,0.589]],"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":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":226,"s":[-132.046,-22.51],"e":[92.529,40.934],"to":[37.4291000366211,10.5739946365356],"ti":[-37.4291000366211,-10.5739946365356]},{"t":294}],"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 59","np":4,"cix":2,"ix":59,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[-0.295,-0.3],[0.52,0.172],[0.296,0.3],[-0.52,-0.172]],"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,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":226,"s":[-132.046,-22.51],"e":[90.715,40.068],"to":[37.1268348693848,10.4296140670776],"ti":[-37.1268348693848,-10.4296140670776]},{"t":294}],"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 60","np":2,"cix":2,"ix":60,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[-0.128,0.066],[0,0],[0.173,-0.027],[0,0]],"o":[[0,0],[0.121,-0.07],[0,0],[-0.17,0.03],[0,0],[0,0]],"v":[[-0.216,0.092],[0.442,-0.288],[0.896,-0.53],[0.884,-0.537],[0.378,-0.46],[-0.927,-0.319]],"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],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]],"v":[[-0.45,0.227],[-1.469,-0.362],[-1.277,-0.472],[1.142,-0.748],[1.469,-0.559],[0.062,0.253],[0.37,0.431],[0.136,0.566],[-0.173,0.388],[-0.797,0.748],[-1.075,0.588]],"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":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":226,"s":[-132.046,-22.51],"e":[89.663,39.278],"to":[36.9514007568359,10.2980270385742],"ti":[-36.9514007568359,-10.2980270385742]},{"t":294}],"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 61","np":4,"cix":2,"ix":61,"mn":"ADBE Vector Group","hd":false},{"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.198,-0.029],[0,0],[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0],[0.241,0.1],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]],"v":[[-1.294,0.066],[-0.777,0.365],[0.893,-0.597],[0.479,-0.835],[0.668,-0.946],[1.314,-0.764],[1.536,-0.635],[-0.486,0.535],[-0.016,0.805],[-0.258,0.946],[-1.536,0.206]],"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,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":226,"s":[-132.046,-22.51],"e":[87.563,38.181],"to":[36.6015167236328,10.1151962280273],"ti":[-36.6015167236328,-10.1151962280273]},{"t":294}],"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 62","np":2,"cix":2,"ix":62,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0.319,0.222],[-0.023,0.012],[0.27,0.211],[0.533,0.308],[0.428,-0.029],[0.081,0.048],[0.358,-0.208],[0.027,-0.107],[0.324,-0.188],[-0.64,-0.369],[-0.113,-0.048],[-0.598,-0.348],[-0.255,0],[-0.15,-0.085],[-0.257,0.148]],"o":[[0.026,-0.011],[0.379,-0.222],[0.46,-0.333],[-0.327,-0.193],[-0.046,-0.056],[-0.356,-0.208],[-0.145,0.081],[-0.636,-0.363],[-0.326,0.185],[0.108,0.064],[-0.063,0.126],[0.561,0.319],[0.064,0.097],[0.395,0.229],[0.231,-0.134]],"v":[[2.008,0.877],[2.076,0.844],[2.256,0.085],[2.147,-1.04],[0.942,-1.284],[0.753,-1.439],[-0.546,-1.439],[-0.803,-1.144],[-2.389,-1.377],[-1.969,-0.456],[-1.637,-0.289],[-0.712,0.537],[0.663,1.073],[0.989,1.351],[2.171,1.499]],"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,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":226,"s":[-132.046,-22.51],"e":[117.858,56.892],"to":[41.6505508422852,13.2336120605469],"ti":[-41.6505508422852,-13.2336120605469]},{"t":294}],"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 63","np":2,"cix":2,"ix":63,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0.449,-0.256],[0.446,0.259],[-0.446,0.255],[-0.447,-0.255]],"o":[[-0.447,0.259],[-0.446,-0.256],[0.446,-0.255],[0.449,0.255]],"v":[[0.807,0.464],[-0.81,0.464],[-0.81,-0.468],[0.807,-0.468]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[1,0.616000007181,0.149000010771,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":226,"s":[-132.046,-22.51],"e":[120.586,56.501],"to":[42.105281829834,13.1685609817505],"ti":[-42.105281829834,-13.1685609817505]},{"t":294}],"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 64","np":2,"cix":2,"ix":64,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[-0.063,-0.215],[0.063,-0.215],[0.063,0.215],[-0.063,0.215]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[1,0.616000007181,0.149000010771,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":226,"s":[-132.046,-22.51],"e":[120.584,57.432],"to":[42.1049346923828,13.3236799240112],"ti":[-42.1049346923828,-13.3236799240112]},{"t":294}],"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 65","np":2,"cix":2,"ix":65,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[-0.311,-0.128],[-0.222,-0.179],[0.311,0.124],[0.217,0.179]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[1,0.616000007181,0.149000010771,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":226,"s":[-132.046,-22.51],"e":[121.715,57.152],"to":[42.2934837341309,13.277081489563],"ti":[-42.2934837341309,-13.277081489563]},{"t":294}],"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 66","np":2,"cix":2,"ix":66,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[-0.065,0.214],[0.065,0.214],[0.065,-0.214],[-0.065,-0.214]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[1,0.616000007181,0.149000010771,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":226,"s":[-132.046,-22.51],"e":[120.586,55.567],"to":[42.1052665710449,13.0127639770508],"ti":[-42.1052665710449,-13.0127639770508]},{"t":294}],"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 67","np":2,"cix":2,"ix":67,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[-0.373,-0.037],[0.372,-0.037],[0.372,0.037],[-0.373,0.037]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[1,0.616000007181,0.149000010771,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":226,"s":[-132.046,-22.51],"e":[122.202,56.499],"to":[42.3745193481445,13.1681795120239],"ti":[-42.3745193481445,-13.1681795120239]},{"t":294}],"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 68","np":2,"cix":2,"ix":68,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[-0.219,0.179],[-0.311,0.128],[0.217,-0.179],[0.311,-0.127]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[1,0.616000007181,0.149000010771,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":226,"s":[-132.046,-22.51],"e":[121.703,55.854],"to":[42.2915000915527,13.0606307983398],"ti":[-42.2915000915527,-13.0606307983398]},{"t":294}],"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 69","np":2,"cix":2,"ix":69,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[-0.844,1.229],[-2.129,0.488],[0.844,-1.229],[2.129,-0.489]],"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,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":226,"s":[-132.046,-22.51],"e":[102.189,46.552],"to":[39.039134979248,11.5103120803833],"ti":[-39.039134979248,-11.5103120803833]},{"t":294}],"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 70","np":2,"cix":2,"ix":70,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[0.45,1.978],[-3.426,-0.26],[-0.451,-1.978],[3.427,0.262]],"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,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":226,"s":[-132.046,-22.51],"e":[99.162,44.802],"to":[38.5346488952637,11.2187299728394],"ti":[-38.5346488952637,-11.2187299728394]},{"t":294}],"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 71","np":2,"cix":2,"ix":71,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[1.351,0.78],[0,0],[1.349,-0.781],[0,0]],"o":[[0,0],[1.351,-0.781],[0,0],[-1.353,-0.781],[0,0],[0,0]],"v":[[19.658,13.999],[22.911,12.122],[22.911,9.284],[-16.124,-13.218],[-21.039,-13.218],[-24.262,-11.356]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.071000005685,0.071000005685,0.078000005086,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":226,"s":[-132.046,-22.51],"e":[105.318,49.051],"to":[39.560619354248,11.9268140792847],"ti":[-39.560619354248,-11.9268140792847]},{"t":294}],"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 72","np":2,"cix":2,"ix":72,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[1.352,0.781],[0,0],[-1.351,0.781],[0,0]],"o":[[0,0],[-1.353,0.781],[0,0],[-1.351,-0.778],[0,0],[0,0]],"v":[[39.943,2.296],[5.357,22.263],[0.442,22.263],[-38.593,-0.238],[-38.593,-3.073],[-4.007,-23.044]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.090000002992,0.275,0.4,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":226,"s":[-132.046,-22.51],"e":[88.286,58.877],"to":[36.721851348877,13.5644989013672],"ti":[-36.721851348877,-13.5644989013672]},{"t":294}],"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 73","np":2,"cix":2,"ix":73,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[1.752,-1.01],[0,0],[1.751,1.014],[0,0],[-1.754,1.011],[0,0],[-1.754,-1.011]],"o":[[1.752,1.01],[0,0],[-1.752,1.014],[0,0],[-1.754,-1.01],[0,0],[1.751,-1.011],[0,0]],"v":[[44.906,-0.57],[44.906,3.104],[5.413,25.906],[-0.954,25.906],[-44.904,0.566],[-44.904,-3.108],[-5.412,-25.91],[0.96,-25.91]],"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,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":223,"s":[275.097,165.689],"e":[88.954,58.49],"to":[-31.0238094329834,-17.8664588928223],"ti":[31.0238094329834,17.8664588928223]},{"t":291}],"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 74","np":2,"cix":2,"ix":74,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[1.751,-1.01],[0,0],[0,0],[0,0],[0,0],[-0.888,-0.513],[0,0],[-1.752,1.011],[0,0],[0,0.666],[0,0]],"o":[[0,0],[-1.754,-1.01],[0,0],[0,0],[0,0],[0,0],[-0.01,0.673],[0,0],[1.751,1.011],[0,0],[0.874,-0.507],[0,0],[0,0]],"v":[[38.635,-5.225],[0.962,-25.91],[-5.41,-25.91],[-39.587,-7.654],[-46.215,-7.679],[-46.215,-1.295],[-46.214,-1.295],[-44.902,0.569],[-0.952,25.909],[5.415,25.909],[44.908,3.109],[46.223,1.269],[46.223,-5.136]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.717647058824,0.717647058824,0.717647058824,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":177,"s":[-97.048,145.904],"e":[88.952,64.904],"to":[31,-13.5],"ti":[-31,13.5]},{"t":245}],"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 75","np":2,"cix":2,"ix":75,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0.824,-0.474],[0,0],[0,0],[0,0],[0,0.956]],"o":[[0,0],[0,0],[0,0],[0.824,-0.477],[0,-0.95]],"v":[[-0.152,-1.832],[-1.341,-1.143],[-1.341,2.306],[-0.152,1.617],[1.341,-0.97]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.654999976065,0.663000009574,0.675,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":201,"s":[256.461,11.41],"e":[127.461,57.41],"to":[-21.5,7.66666650772095],"ti":[21.5,-7.66666650772095]},{"t":268}],"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 76","np":2,"cix":2,"ix":76,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0.429,-0.253],[0,0],[0,0],[0,0]],"o":[[0,0],[-0.275,-0.177],[0,0],[0,0],[0,0],[0,0]],"v":[[2.045,-1.512],[0.234,-2.552],[-0.855,-2.47],[-2.045,-1.786],[-2.045,1.659],[-0.198,2.729]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.57599995931,0.583999992819,0.596000043084,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":201,"s":[256.461,11.41],"e":[126.318,56.986],"to":[-21.6905498504639,7.59608459472656],"ti":[21.6905498504639,-7.59608459472656]},{"t":268}],"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 77","np":2,"cix":2,"ix":77,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[5.627,-0.426],[0,0],[-3.926,-2.188],[0,0]],"o":[[-3.839,-2.18],[0,0],[5.705,-0.429],[0,0],[0,0]],"v":[[6.501,2.267],[-7.793,-0.457],[-7.286,-2.1],[7.257,0.624],[7.792,2.53]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.039000002543,0.501999978458,0.455000005984,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":201,"s":[262.283,19.186],"e":[132.283,57.186],"to":[-21.6666660308838,6.33333349227905],"ti":[21.6666660308838,-6.33333349227905]},{"t":268}],"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 78","np":2,"cix":2,"ix":78,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[7.299,-1.451],[0,0],[-8.676,-3.231]],"v":[[-19.756,-6.647],[4.706,7.479],[19.755,8.56],[-4.304,-5.329]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.141000007181,0.823999980852,0.757000014361,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":201,"s":[119.784,-165.751],"e":[119.784,49.249],"to":[0,35.8333320617676],"ti":[0,-35.8333320617676]},{"t":268}],"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 79","np":2,"cix":2,"ix":79,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[8.744,-0.658],[0,0],[-4.22,-6.177]],"o":[[-4.166,-5.388],[0,0],[9.474,-0.71],[0,0]],"v":[[8.983,4.892],[-10.74,-2.539],[-10.235,-4.182],[10.74,4.423]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.141000007181,0.823999980852,0.757000014361,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":201,"s":[-109.232,-28.859],"e":[110.768,45.141],"to":[36.6666679382324,12.3333330154419],"ti":[-36.6666679382324,-12.3333330154419]},{"t":268}],"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 80","np":2,"cix":2,"ix":80,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[5.06,-1.451],[0,0],[-5.051,2.912]],"o":[[-5.367,3.101],[0,0],[4.753,-1.365],[0,0]],"v":[[7.855,-1.225],[-7.855,5.633],[-6.922,0.818],[7.855,-5.633]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.654999976065,0.663000009574,0.675,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":201,"s":[-91.688,97.028],"e":[69.313,140.028],"to":[26.8333339691162,7.16666650772095],"ti":[-26.8333339691162,-7.16666650772095]},{"t":268}],"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 81","np":2,"cix":2,"ix":81,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,-10.007],[9.045,-13.365],[13.545,-7.816],[0,0],[-8.894,13.142],[0,11.398],[6.395,3.633]],"o":[[6.72,3.744],[0,11.865],[-9.116,13.464],[0,0],[13.262,-7.657],[8.728,-12.894],[0,-9.533],[0,0]],"v":[[14.03,-46.603],[24.585,-25.527],[10.558,13.596],[-24.585,46.603],[-24.585,45.134],[9.775,12.884],[23.31,-24.79],[13.273,-44.959]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.039000002543,0.501999978458,0.455000005984,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":213,"s":[293.51,190.413],"e":[125.51,104.413],"to":[-28,-14.3333330154419],"ti":[28,14.3333330154419]},{"t":280}],"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 82","np":2,"cix":2,"ix":82,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[3.126,-21.943],[20.129,-15.603],[0,0],[0,0],[0,0],[0,0],[-8.894,13.138],[0,11.402],[2.98,3.861]],"o":[[0,0],[0,0],[-1.655,14.639],[0,0],[0,0],[0,0],[0,0],[13.262,-7.654],[8.727,-12.894],[0,-6.366],[0,0]],"v":[[7.148,-49.991],[24.423,-40.102],[34.77,-14.222],[0.855,40.472],[-11.555,49.84],[-13.436,49.991],[-37.896,37.334],[-37.896,35.865],[-3.54,3.619],[9.996,-34.059],[5.391,-49.522]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.086000001197,0.658999992819,0.62400004069,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":201,"s":[281.36,85.556],"e":[114.36,99.556],"to":[-27.8333339691162,2.33333325386047],"ti":[27.8333339691162,-2.33333325386047]},{"t":268}],"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 83","np":2,"cix":2,"ix":83,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[-15.914,9.187],[-3.348,2.572],[0,0],[3.526,-2.032],[9.116,5.485]],"o":[[8.869,5.406],[3.456,-1.993],[0,0],[-3.413,2.623],[-16.202,9.355],[0,0]],"v":[[-24.29,2.461],[14.641,-2.659],[24.893,-9.54],[25.098,-8.207],[14.641,-1.188],[-25.098,4.056]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.039000002543,0.501999978458,0.455000005984,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":201,"s":[254.992,221.454],"e":[86.992,153.454],"to":[-28,-11.3333330154419],"ti":[28,11.3333330154419]},{"t":268}],"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 84","np":2,"cix":2,"ix":84,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[-10.911,6.3],[-3.347,2.572],[0,0],[3.524,-2.036],[0,0]],"o":[[8.12,0.725],[3.456,-1.994],[0,0],[-0.45,1.832],[-21.386,11.272],[0,0]],"v":[[-31.915,-2.485],[-2.803,-10.669],[7.451,-17.551],[31.915,-3.429],[18.148,6.279],[-18.074,10.167]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.086000001197,0.658999992819,0.62400004069,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":201,"s":[79.97,270.343],"e":[79.97,147.343],"to":[0,-20.5],"ti":[0,20.5]},{"t":268}],"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 85","np":2,"cix":2,"ix":85,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[1.131,3.732],[-4.822,0.295],[0.756,-3.732],[4.822,-0.117]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.325,0.325,0.349000010771,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":201,"s":[286.791,194.054],"e":[84.791,156.054],"to":[-33.6666679382324,-6.33333349227905],"ti":[33.6666679382324,6.33333349227905]},{"t":268}],"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 86","np":2,"cix":2,"ix":86,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0.824,-0.478],[0,0],[0,0],[0,0],[0,0.954]],"o":[[0,0],[0,0],[0,0],[0.824,-0.478],[0,-0.948]],"v":[[-0.15,-1.828],[-1.342,-1.143],[-1.342,2.306],[-0.15,1.621],[1.342,-0.969]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.654999976065,0.663000009574,0.675,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":201,"s":[242.882,17.72],"e":[101.025,42.143],"to":[-23.6428680419922,4.07056665420532],"ti":[23.6428680419922,-4.07056665420532]},{"t":268}],"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 87","np":2,"cix":2,"ix":87,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0.43,-0.247],[0,0],[0,0],[0,0]],"o":[[0,0],[-0.274,-0.177],[0,0],[0,0],[0,0],[0,0]],"v":[[2.046,-1.511],[0.232,-2.552],[-0.856,-2.474],[-2.046,-1.785],[-2.046,1.664],[-0.2,2.729]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.57599995931,0.583999992819,0.596000043084,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":201,"s":[242.882,17.72],"e":[99.882,41.72],"to":[-23.8333339691162,4],"ti":[23.8333339691162,-4]},{"t":268}],"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 88","np":2,"cix":2,"ix":88,"mn":"ADBE Vector Group","hd":false}],"ip":177,"op":410,"st":147,"bm":0},{"ddd":1,"ind":5,"ty":4,"nm":"headset Outlines","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"rx":{"a":0,"k":0,"ix":8},"ry":{"a":0,"k":0,"ix":9},"rz":{"a":0,"k":0,"ix":10},"or":{"a":0,"k":[0,0,0],"ix":7},"p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":180,"s":[288,290,0],"e":[-140,685,0],"to":[-71.3333358764648,65.8333358764648,0],"ti":[71.3333358764648,-65.8333358764648,0]},{"t":241}],"ix":2},"a":{"a":0,"k":[93.903,102.005,0],"ix":1},"s":{"a":0,"k":[271.556,271.556,271.556],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,-2.882],[5.825,-3.364],[1.809,0.652],[0,2.881],[-5.815,3.358],[-1.808,-0.661]],"o":[[0,6.724],[-2.514,1.448],[-1.449,-1.251],[0,-6.719],[2.52,-1.458],[1.447,1.251]],"v":[[9.747,-6.546],[-0.799,11.714],[-7.43,12.83],[-9.747,6.553],[0.792,-11.705],[7.43,-12.821]],"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,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":0,"s":[234.342,179.4],"e":[68.342,109.4],"to":[-27.6666660308838,-11.6666669845581],"ti":[27.6666660308838,11.6666669845581]},{"t":34.021484375}],"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,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,-3.82],[5.829,-3.366],[1.925,1.666],[-2.513,1.449],[0,6.723],[1.448,1.251]],"o":[[0,6.723],[-3.33,1.916],[1.81,0.652],[5.826,-3.363],[0,-2.883],[2.39,0.852]],"v":[[9.385,-6.489],[-1.163,11.774],[-9.385,11.961],[-2.754,10.844],[7.792,-7.415],[5.475,-13.69]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.187999994615,0.187999994615,0.2,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":20.979,"s":[234.342,179.4],"e":[70.297,110.269],"to":[-27.340950012207,-11.5217847824097],"ti":[27.340950012207,11.5217847824097]},{"t":55}],"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,"ix":2,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,-8.724],[7.561,-4.368],[0,8.73],[-7.553,4.363]],"o":[[0,8.729],[-7.553,4.361],[0,-8.723],[7.561,-4.362]],"v":[[13.683,-7.903],[-0.001,15.804],[-13.683,7.898],[-0.001,-15.803]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.071000005685,0.071000005685,0.078000005086,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":20.979,"s":[234.342,179.4],"e":[69.036,109.801],"to":[-27.5510997772217,-11.5997648239136],"ti":[27.5510997772217,11.5997648239136]},{"t":55}],"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,"ix":3,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[3.787,-2.187],[0,-8.726],[-2.584,-1.385],[0,0],[0,0]],"o":[[0,0],[-2.477,-1.441],[-7.557,4.365],[0,4.471],[0,0],[0,0],[0,0]],"v":[[13.138,-15.197],[10.24,-16.871],[0.546,-15.925],[-13.138,7.777],[-8.944,16.737],[-8.946,16.739],[-6.215,18.313]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.187999994615,0.187999994615,0.2,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":24,"s":[234.342,179.4],"e":[65.735,108.333],"to":[-28.1013011932373,-11.8444671630859],"ti":[28.1013011932373,11.8444671630859]},{"t":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 4","np":2,"cix":2,"ix":4,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,-11.521],[9.979,-5.76],[0,11.522],[-9.975,5.759]],"o":[[0,11.523],[-9.975,5.757],[0,-11.519],[9.979,-5.761]],"v":[[18.066,-10.431],[0.001,20.863],[-18.066,10.43],[0.001,-20.86]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.611999990426,0.144999994016,0.122000002394,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":26,"s":[-66.722,48.208],"e":[66.278,108.208],"to":[22.1666660308838,10],"ti":[-22.1666660308838,-10]},{"t":70}],"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 5","np":2,"cix":2,"ix":5,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[5,-2.886],[0,-11.521],[-3.411,-1.823],[0,0],[0,0],[0,0],[-0.931,0.54],[0,11.52],[0.141,0.958]],"o":[[0,0],[-3.27,-1.905],[-9.977,5.763],[0,5.9],[0,0],[0,0],[0,0],[0.891,-0.363],[9.976,-5.758],[0,-1.085],[0,0]],"v":[[19.191,-18.993],[11.669,-23.344],[-1.128,-22.094],[-19.191,9.198],[-13.655,21.022],[-13.661,21.024],[-6.332,25.249],[-3.863,20.97],[-1.128,19.625],[16.936,-11.66],[16.729,-14.723]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.889999988032,0.105999995213,0.144999994016,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":26,"s":[-66.722,48.208],"e":[60.108,105.227],"to":[21.138334274292,9.50326251983643],"ti":[-21.138334274292,-9.50326251983643]},{"t":70}],"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 6","np":2,"cix":2,"ix":6,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[11.692,13.144],[0,0],[0,-15.783]],"o":[[0,0],[0,0],[0,-14.933],[0,0],[12.355,13.894],[0,0]],"v":[[10.583,36.95],[8.662,35.84],[8.662,10.797],[-10.583,-35.421],[-9.757,-36.95],[10.583,11.906]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.902000038297,0.905999995213,0.910000011968,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":63,"s":[-54.35,155.246],"e":[111.65,93.246],"to":[27.6666660308838,-10.3333330154419],"ti":[-27.6666660308838,10.3333330154419]},{"t":114}],"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 7","np":2,"cix":2,"ix":7,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[-1.348,0.779],[-1.243,0.404],[0,0],[12.357,13.894],[0,0],[0,-14.93]],"o":[[0,0],[1.266,-1.058],[1.327,-0.763],[0,0],[0,-15.784],[0,0],[9.731,13.955],[0,0]],"v":[[6.238,39.219],[6.316,39.177],[10.245,36.401],[14.102,34.659],[14.102,9.637],[-6.242,-39.219],[-14.102,-34.681],[5.149,9.474]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.654999976065,0.663000009574,0.675,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":51,"s":[-54.35,155.246],"e":[115.995,90.977],"to":[28.3908309936523,-10.7114992141724],"ti":[-28.3908309936523,10.7114992141724]},{"t":102}],"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 8","np":2,"cix":2,"ix":8,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[4.422,0.133],[0,0],[-5.415,-3.126],[-4.858,-5.465],[0,0],[4.935,2.852]],"o":[[0,0],[4.859,0.143],[5.413,3.128],[0,0],[-4.426,-4.976],[-4.937,-2.848]],"v":[[-14.107,-6.079],[-15.48,-10.211],[0.001,-5.283],[15.48,7.661],[14.11,10.211],[0.001,-1.586]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.187999994615,0.187999994615,0.2,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":46,"s":[-45.368,106.733],"e":[85.632,48.733],"to":[21.8333339691162,-9.66666698455811],"ti":[-21.8333339691162,9.66666698455811]},{"t":97}],"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 9","np":2,"cix":2,"ix":9,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[4.251,-1.577],[-5.624,4.126],[-4.254,1.577],[5.624,-4.126]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.071000005685,0.071000005685,0.078000005086,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":22,"s":[220.365,127.818],"e":[105.365,54.818],"to":[-19.1666660308838,-12.1666669845581],"ti":[19.1666660308838,12.1666669845581]},{"t":78}],"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 10","np":2,"cix":2,"ix":10,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[-5.415,-3.129],[-4.859,-5.463],[0,0],[0,0],[0,0],[4.624,2.04]],"o":[[0,0],[4.859,0.145],[5.413,3.126],[0,0],[0,0],[0,0],[0,0],[-15.593,-6.886]],"v":[[-20.418,-7.359],[-10.542,-13.063],[4.94,-8.13],[20.418,4.811],[19.045,7.361],[11.568,11.161],[9.172,13.063],[-0.949,1.385]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.325,0.325,0.349000010771,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":21,"s":[-53.43,115.881],"e":[90.57,45.881],"to":[24,-11.6666669845581],"ti":[-24,11.6666669845581]},{"t":77}],"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 11","np":2,"cix":2,"ix":11,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[-12.359,-0.37],[0,0],[0,-14.928]],"o":[[0,0],[0,0],[0,-15.78],[0,0],[-11.689,-0.353],[0,0]],"v":[[-8.658,25.947],[-10.581,24.837],[-10.581,-0.208],[9.762,-25.577],[10.581,-23.094],[-8.658,0.902]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.902000038297,0.905999995213,0.910000011968,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":22,"s":[-77.28,26.312],"e":[61.72,64.312],"to":[23.1666660308838,6.33333349227905],"ti":[-23.1666660308838,-6.33333349227905]},{"t":77}],"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 12","np":2,"cix":2,"ix":12,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[2.809,-1.602],[0,0],[0,0],[0,0]],"o":[[-3.682,-0.11],[0,0],[0,0],[0,0],[0,0]],"v":[[8.525,-3.063],[1.499,-2.352],[-9.349,3.907],[1.485,3.955],[9.349,-0.584]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.819999964097,0.827000038297,0.830999995213,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":21,"s":[-77.28,26.312],"e":[70.817,37.263],"to":[24.6827163696289,1.82523858547211],"ti":[-24.6827163696289,-1.82523858547211]},{"t":77}],"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 13","np":2,"cix":2,"ix":13,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[-1.35,0.777],[-1.246,0.408],[0,0],[-3.869,4.18],[0,0],[2.046,-12.512],[0,0]],"o":[[1.263,-1.054],[1.328,-0.768],[0,0],[0,-8.068],[0,0],[0,0],[-2.05,12.511],[0,0]],"v":[[-7.261,24.903],[-3.334,22.135],[0.537,20.382],[0.537,-4.641],[9.372,-24.939],[4.825,-24.309],[-7.322,-8.687],[-7.322,24.939]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.654999976065,0.663000009574,0.675,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":22,"s":[-76.616,33.319],"e":[60.384,65.319],"to":[22.8333339691162,5.33333349227905],"ti":[-22.8333339691162,-5.33333349227905]},{"t":77}],"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 14","np":2,"cix":2,"ix":14,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,-8.54],[7.393,-4.272],[0,8.541],[-7.398,4.27]],"o":[[0,8.536],[-7.398,4.267],[0,-8.54],[7.393,-4.268]],"v":[[13.389,-7.73],[-0.002,15.463],[-13.389,7.729],[-0.002,-15.462]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.902000038297,0.905999995213,0.910000011968,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":22,"s":[-55.018,60.996],"e":[58.982,103.996],"to":[19,7.16666650772095],"ti":[-19,-7.16666650772095]},{"t":77}],"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 15","np":2,"cix":2,"ix":15,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[3.75,-2.167],[0,-8.54],[-2.516,-1.357],[0,0],[0,0],[-0.155,0.088],[0,8.536],[0.051,0.519]],"o":[[0,0],[0,0],[-2.432,-1.468],[-7.395,4.27],[0,4.364],[0,0],[0,0],[0.148,-0.078],[7.395,-4.27],[0,-0.565],[0,0]],"v":[[14.352,-14.189],[8.613,-17.517],[8.609,-17.515],[-0.962,-16.643],[-14.352,6.549],[-10.266,15.304],[-3.865,18.983],[-1.417,14.527],[-0.962,14.28],[12.43,-8.912],[12.35,-10.542]],"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,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":35,"s":[-67.21,59.627],"e":[53.79,101.627],"to":[20.1666660308838,7],"ti":[-20.1666660308838,-7]},{"t":88}],"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 16","np":2,"cix":2,"ix":16,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,-0.663],[2.061,-1.194],[0.471,-0.021],[0,0.652],[-2.063,1.195],[-0.479,0.021]],"o":[[0,2.38],[-0.568,0.325],[-0.226,-0.426],[0,-2.391],[0.566,-0.333],[0.229,0.43]],"v":[[2.836,-2.677],[-0.902,3.8],[-2.48,4.311],[-2.836,2.691],[0.907,-3.793],[2.484,-4.311]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.654999976065,0.663000009574,0.675,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":50,"s":[219.158,177.291],"e":[127.158,143.291],"to":[-15.3333330154419,-5.66666650772095],"ti":[15.3333330154419,5.66666650772095]},{"t":105}],"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 17","np":2,"cix":2,"ix":17,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,-1.739],[2.063,-1.191],[0.592,1.127],[-0.568,0.324],[0,2.379],[0.229,0.43]],"o":[[0,2.382],[-1.496,0.862],[0.471,-0.021],[2.061,-1.194],[0,-0.663],[1.279,-0.047]],"v":[[3.564,-2.305],[-0.178,4.17],[-3.565,3.636],[-1.986,3.127],[1.751,-3.351],[1.399,-4.985]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.736999990426,0.745000023935,0.752999997606,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":61,"s":[219.158,177.291],"e":[128.242,143.965],"to":[-15.1526651382446,-5.55428075790405],"ti":[15.1526651382446,5.55428075790405]},{"t":125}],"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 18","np":2,"cix":2,"ix":18,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,-8.541],[7.396,-4.271],[0,8.541],[-7.395,4.268]],"o":[[0,8.542],[-7.395,4.265],[0,-8.54],[7.396,-4.271]],"v":[[13.387,-7.729],[-0.001,15.464],[-13.388,7.733],[-0.001,-15.458]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.902000038297,0.905999995213,0.910000011968,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0.129,"y":1},"o":{"x":0.333,"y":0},"n":"0p129_1_0p333_0","t":53,"s":[219.158,177.291],"e":[128.064,143.815],"to":[-15.1822471618652,-5.57931756973267],"ti":[15.1822471618652,5.57931756973267]},{"t":112}],"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 19","np":2,"cix":2,"ix":19,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[3.753,-2.163],[0,-8.539],[-2.518,-1.359],[0,0],[0,0],[-0.156,0.092],[0,8.538],[0.052,0.523]],"o":[[0,0],[-2.431,-1.467],[-7.395,4.268],[0,4.365],[0,0],[0,0],[0.154,-0.083],[7.394,-4.271],[0,-0.563],[0,0]],"v":[[14.351,-14.191],[8.613,-17.516],[-0.961,-16.646],[-14.351,6.545],[-10.263,15.301],[-3.863,18.984],[-1.418,14.527],[-0.961,14.278],[12.43,-8.915],[12.349,-10.546]],"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,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":36,"s":[219.158,177.291],"e":[122.873,141.45],"to":[-16.047513961792,-5.97350072860718],"ti":[16.047513961792,5.97350072860718]},{"t":96}],"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 20","np":2,"cix":2,"ix":20,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,-11.523],[9.977,-5.761],[0,11.518],[-9.977,5.763]],"o":[[0,11.522],[-9.977,5.76],[0,-11.522],[9.977,-5.759]],"v":[[18.064,-10.429],[-0.001,20.861],[-18.065,10.43],[-0.001,-20.862]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.611999990426,0.144999994016,0.122000002394,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":21,"s":[260.913,189.266],"e":[121.913,140.266],"to":[-23.1666660308838,-8.16666698455811],"ti":[23.1666660308838,8.16666698455811]},{"t":97}],"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 21","np":2,"cix":2,"ix":21,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[5.003,-2.883],[0,-11.521],[-3.413,-1.827],[0,0],[0,0],[0,0],[-0.928,0.531],[0,11.522],[0.136,0.957]],"o":[[0,0],[-3.267,-1.902],[-9.975,5.761],[0,5.905],[0,0],[0,0],[0,0],[0.896,-0.357],[9.979,-5.763],[0,-1.079],[0,0]],"v":[[19.193,-18.993],[11.667,-23.346],[-1.13,-22.096],[-19.193,9.194],[-13.654,21.023],[-13.66,21.026],[-6.331,25.248],[-3.868,20.966],[-1.13,19.628],[16.936,-11.665],[16.729,-14.724]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.889999988032,0.105999995213,0.144999994016,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":21,"s":[260.913,189.266],"e":[115.743,137.285],"to":[-24.1949996948242,-8.66348552703857],"ti":[24.1949996948242,8.66348552703857]},{"t":97}],"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 22","np":2,"cix":2,"ix":22,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,-8.727],[7.559,-4.365],[0,8.728],[-7.557,4.361]],"o":[[0,8.725],[-7.557,4.361],[0,-8.723],[7.559,-4.365]],"v":[[13.684,-7.899],[0.001,15.802],[-13.684,7.899],[0.001,-15.798]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.071000005685,0.071000005685,0.078000005086,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":16,"s":[220.939,177.795],"e":[114.612,136.05],"to":[-17.7212009429932,-6.95746612548828],"ti":[17.7212009429932,6.95746612548828]},{"t":77}],"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 23","np":2,"cix":2,"ix":23,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[3.789,-2.188],[0,-8.73],[-2.584,-1.386],[0,0],[0,0],[0,0],[-0.701,0.404],[0,8.727],[0.101,0.723]],"o":[[0,0],[-2.477,-1.443],[-7.553,4.362],[0,4.466],[0,0],[0,0],[0,0],[0.675,-0.273],[7.561,-4.367],[0,-0.818],[0,0]],"v":[[14.538,-14.388],[8.839,-17.681],[-0.857,-16.734],[-14.538,6.965],[-10.343,15.924],[-10.345,15.924],[-4.796,19.124],[-2.926,15.883],[-0.857,14.868],[12.829,-8.837],[12.673,-11.155]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.187999994615,0.187999994615,0.2,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"n":"0_1_0p333_0","t":0,"s":[220.939,177.795],"e":[109.939,133.795],"to":[-18.5,-7.33333349227905],"ti":[18.5,7.33333349227905]},{"t":61}],"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 24","np":2,"cix":2,"ix":24,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":241,"st":0,"bm":0},{"ddd":0,"ind":6,"ty":1,"nm":"Light Gray Solid 1","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[275,275,0],"ix":2},"a":{"a":0,"k":[275,275,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"sw":550,"sh":550,"sc":"#d7d7d7","ip":960,"op":960,"st":0,"bm":0,"hidden":0}],"markers":[]}
\ No newline at end of file
diff --git a/res/raw/display.json b/res/raw/display.json
new file mode 100644
index 0000000..eeff260
--- /dev/null
+++ b/res/raw/display.json
@@ -0,0 +1 @@
+{"v":"5.5.7","meta":{"g":"LottieFiles AE 0.1.20","a":"Roger.T","k":"","d":"","tc":""},"fr":25,"ip":0,"op":75,"w":500,"h":500,"nm":"Display","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"12:00 Outlines","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":47,"s":[0]},{"t":50,"s":[100]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[190.801,193,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],[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]],"v":[[13.6,0],[13.6,-27.36],[9.64,-27.36],[1.6,-23.6],[3.52,-19.16],[8.36,-21.2],[8.36,0]],"c":true},"ix":2},"nm":"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":"st","c":{"a":0,"k":[0,0,0,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":1,"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":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":"1","np":3,"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],[0,0],[0,0],[0,0],[-0.907,0.907],[0,0],[-0.84,1.427],[0,1.707],[0.426,0.974],[0.773,0.72],[1.12,0.414],[1.386,0],[1.026,-0.386],[0.746,-0.6],[0.48,-0.76],[0.213,-0.72],[0,0],[-0.667,0.68],[-1.2,0],[-0.694,-0.653],[0,-0.88],[0.106,-0.386],[0.2,-0.386],[0.333,-0.4],[0.426,-0.506],[0.4,-0.413],[0.506,-0.506],[0.586,-0.586],[0.56,-0.56],[1.573,-1.546],[0,0]],"o":[[0,0],[0,0],[0,0],[1.146,-1.12],[0,0],[1.2,-1.226],[0.84,-1.426],[0,-1.12],[-0.427,-0.973],[-0.774,-0.72],[-1.12,-0.413],[-1.28,0],[-1.027,0.387],[-0.747,0.6],[-0.48,0.76],[0,0],[0.24,-0.853],[0.666,-0.68],[1.2,0],[0.693,0.654],[0,0.454],[-0.107,0.387],[-0.2,0.387],[-0.334,0.4],[-0.214,0.24],[-0.4,0.414],[-0.507,0.507],[-0.587,0.587],[-1.334,1.334],[0,0],[0,0]],"v":[[41.32,0],[41.32,-4.6],[30.24,-4.6],[30.08,-4.84],[33.16,-7.88],[36.6,-11.32],[39.66,-15.3],[40.92,-20],[40.28,-23.14],[38.48,-25.68],[35.64,-27.38],[31.88,-28],[28.42,-27.42],[25.76,-25.94],[23.92,-23.9],[22.88,-21.68],[27.64,-19.72],[29,-22.02],[31.8,-23.04],[34.64,-22.06],[35.68,-19.76],[35.52,-18.5],[35.06,-17.34],[34.26,-16.16],[33.12,-14.8],[32.2,-13.82],[30.84,-12.44],[29.2,-10.8],[27.48,-9.08],[23.12,-4.76],[23.12,0]],"c":true},"ix":2},"nm":"2","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":"st","c":{"a":0,"k":[0,0,0,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":1,"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":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":"2","np":3,"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":[[-0.667,0.68],[0,0.96],[0.666,0.667],[0.96,0],[0.68,-0.666],[0,-0.96],[-0.68,-0.68],[-0.96,0]],"o":[[0.666,-0.68],[0,-0.96],[-0.667,-0.666],[-0.96,0],[-0.68,0.667],[0,0.96],[0.68,0.68],[0.96,0]],"v":[[54.84,-1.02],[55.84,-3.48],[54.84,-5.92],[52.4,-6.92],[49.94,-5.92],[48.92,-3.48],[49.94,-1.02],[52.4,0]],"c":true},"ix":2},"nm":":","mn":"ADBE Vector Shape - Group","hd":false},{"ind":1,"ty":"sh","ix":2,"ks":{"a":0,"k":{"i":[[-0.667,0.68],[0,0.96],[0.666,0.68],[0.96,0],[0.68,-0.68],[0,-0.96],[-0.68,-0.68],[-0.96,0]],"o":[[0.666,-0.68],[0,-0.96],[-0.667,-0.68],[-0.96,0],[-0.68,0.68],[0,0.96],[0.68,0.68],[0.96,0]],"v":[[54.84,-14.18],[55.84,-16.64],[54.84,-19.1],[52.4,-20.12],[49.94,-19.1],[48.92,-16.64],[49.94,-14.18],[52.4,-13.16]],"c":true},"ix":2},"nm":":","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":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":"st","c":{"a":0,"k":[0,0,0,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":1,"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":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":":","np":5,"cix":2,"bm":0,"ix":3,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-1.414,0.733],[-1,1.28],[-0.534,1.747],[0,2.027],[0.533,1.747],[1,1.28],[1.413,0.734],[1.76,0],[1.413,-0.733],[1,-1.28],[0.533,-1.746],[0,-2.026],[-0.534,-1.746],[-1,-1.28],[-1.414,-0.733],[-1.76,0]],"o":[[1.413,-0.733],[1,-1.28],[0.533,-1.746],[0,-2.026],[-0.534,-1.746],[-1,-1.28],[-1.414,-0.733],[-1.76,0],[-1.414,0.734],[-1,1.28],[-0.534,1.747],[0,2.027],[0.533,1.747],[1,1.28],[1.413,0.733],[1.76,0]],"v":[[79.679,-0.46],[83.299,-3.48],[85.599,-8.02],[86.399,-13.68],[85.599,-19.34],[83.299,-23.88],[79.679,-26.9],[74.919,-28],[70.159,-26.9],[66.539,-23.88],[64.239,-19.34],[63.439,-13.68],[64.239,-8.02],[66.539,-3.48],[70.159,-0.46],[74.919,0.64]],"c":true},"ix":2},"nm":"0","mn":"ADBE Vector Shape - Group","hd":false},{"ind":1,"ty":"sh","ix":2,"ks":{"a":0,"k":{"i":[[0.773,0.467],[0.533,0.84],[0.28,1.147],[0,1.334],[-0.28,1.134],[-0.534,0.84],[-0.774,0.467],[-0.987,0],[-0.774,-0.466],[-0.547,-0.84],[-0.28,-1.133],[0,-1.36],[0.28,-1.146],[0.546,-0.84],[0.773,-0.466],[0.96,0]],"o":[[-0.774,-0.466],[-0.534,-0.84],[-0.28,-1.146],[0,-1.36],[0.28,-1.133],[0.533,-0.84],[0.773,-0.466],[0.96,0],[0.773,0.467],[0.546,0.84],[0.28,1.134],[0,1.334],[-0.28,1.147],[-0.547,0.84],[-0.774,0.467],[-0.987,0]],"v":[[72.279,-5.02],[70.319,-6.98],[69.099,-9.96],[68.679,-13.68],[69.099,-17.42],[70.319,-20.38],[72.279,-22.34],[74.919,-23.04],[77.519,-22.34],[79.499,-20.38],[80.739,-17.42],[81.159,-13.68],[80.739,-9.96],[79.499,-6.98],[77.519,-5.02],[74.919,-4.32]],"c":true},"ix":2},"nm":"0","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":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":"st","c":{"a":0,"k":[0,0,0,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":1,"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":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":"0","np":5,"cix":2,"bm":0,"ix":4,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-1.414,0.733],[-1,1.28],[-0.534,1.747],[0,2.027],[0.533,1.747],[1,1.28],[1.413,0.734],[1.76,0],[1.413,-0.733],[1,-1.28],[0.533,-1.746],[0,-2.026],[-0.534,-1.746],[-1,-1.28],[-1.414,-0.733],[-1.76,0]],"o":[[1.413,-0.733],[1,-1.28],[0.533,-1.746],[0,-2.026],[-0.534,-1.746],[-1,-1.28],[-1.414,-0.733],[-1.76,0],[-1.414,0.734],[-1,1.28],[-0.534,1.747],[0,2.027],[0.533,1.747],[1,1.28],[1.413,0.733],[1.76,0]],"v":[[110.079,-0.46],[113.699,-3.48],[115.999,-8.02],[116.799,-13.68],[115.999,-19.34],[113.699,-23.88],[110.079,-26.9],[105.319,-28],[100.559,-26.9],[96.939,-23.88],[94.639,-19.34],[93.839,-13.68],[94.639,-8.02],[96.939,-3.48],[100.559,-0.46],[105.319,0.64]],"c":true},"ix":2},"nm":"0","mn":"ADBE Vector Shape - Group","hd":false},{"ind":1,"ty":"sh","ix":2,"ks":{"a":0,"k":{"i":[[0.773,0.467],[0.533,0.84],[0.28,1.147],[0,1.334],[-0.28,1.134],[-0.534,0.84],[-0.774,0.467],[-0.987,0],[-0.774,-0.466],[-0.547,-0.84],[-0.28,-1.133],[0,-1.36],[0.28,-1.146],[0.546,-0.84],[0.773,-0.466],[0.96,0]],"o":[[-0.774,-0.466],[-0.534,-0.84],[-0.28,-1.146],[0,-1.36],[0.28,-1.133],[0.533,-0.84],[0.773,-0.466],[0.96,0],[0.773,0.467],[0.546,0.84],[0.28,1.134],[0,1.334],[-0.28,1.147],[-0.547,0.84],[-0.774,0.467],[-0.987,0]],"v":[[102.679,-5.02],[100.719,-6.98],[99.499,-9.96],[99.079,-13.68],[99.499,-17.42],[100.719,-20.38],[102.679,-22.34],[105.319,-23.04],[107.919,-22.34],[109.899,-20.38],[111.139,-17.42],[111.559,-13.68],[111.139,-9.96],[109.899,-6.98],[107.919,-5.02],[105.319,-4.32]],"c":true},"ix":2},"nm":"0","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":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":"st","c":{"a":0,"k":[0,0,0,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":1,"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":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":"0","np":5,"cix":2,"bm":0,"ix":5,"mn":"ADBE Vector Group","hd":false}],"ip":47,"op":75,"st":0,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"Shape Layer 3","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[239,394,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":[{"ty":"rc","d":1,"s":{"a":0,"k":[148,51],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":9,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","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":1,"k":[{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"t":42,"s":[86,-112.5],"to":[-12.5,26],"ti":[12.5,-26]},{"t":49,"s":[11,43.5]}],"ix":2},"a":{"a":0,"k":[75,-2],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667],"y":[1,1]},"o":{"x":[0.333,0.333],"y":[0,0]},"t":18,"s":[0,100]},{"i":{"x":[0.833,0.833],"y":[1,1]},"o":{"x":[0.333,0.333],"y":[0,0]},"t":25,"s":[100,100]},{"i":{"x":[0.833,0.833],"y":[1,1]},"o":{"x":[0.167,0.167],"y":[0,0]},"t":42,"s":[100,100]},{"t":49,"s":[0,0]}],"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 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":18,"op":70,"st":-5,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":"Shape Layer 2","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[248,433,0],"ix":2},"a":{"a":0,"k":[9,110,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[148,51],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":9,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","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":1,"k":[{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"t":42,"s":[86,-112.5],"to":[-12.5,37.667],"ti":[12.5,-37.667]},{"t":49,"s":[11,113.5]}],"ix":2},"a":{"a":0,"k":[75,-2],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667],"y":[1,1]},"o":{"x":[0.333,0.333],"y":[0,0]},"t":16,"s":[0,100]},{"i":{"x":[0.833,0.833],"y":[1,1]},"o":{"x":[0.333,0.333],"y":[0,0]},"t":23,"s":[100,100]},{"i":{"x":[0.833,0.833],"y":[1,1]},"o":{"x":[0.167,0.167],"y":[0,0]},"t":42,"s":[100,100]},{"t":49,"s":[0,0]}],"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 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":16,"op":68,"st":-7,"bm":0},{"ddd":0,"ind":4,"ty":4,"nm":"Shape Layer 1","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[239,250,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":[{"ty":"rc","d":1,"s":{"a":0,"k":[148,51],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":9,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","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":1,"k":[{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"t":42,"s":[86,-112.5],"to":[-12.5,49.833],"ti":[12.5,-49.833]},{"t":49,"s":[11,186.5]}],"ix":2},"a":{"a":0,"k":[75,-2],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667],"y":[1,1]},"o":{"x":[0.333,0.333],"y":[0,0]},"t":14,"s":[0,100]},{"i":{"x":[0.833,0.833],"y":[1,1]},"o":{"x":[0.333,0.333],"y":[0,0]},"t":21,"s":[100,100]},{"i":{"x":[0.833,0.833],"y":[1,1]},"o":{"x":[0.167,0.167],"y":[0,0]},"t":42,"s":[100,100]},{"t":49,"s":[0,0]}],"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 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":14,"op":66,"st":-9,"bm":0},{"ddd":0,"ind":5,"ty":4,"nm":"Frame","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[242.5,249.529,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":1,"k":[{"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":12,"s":[100,94.286,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":14,"s":[105,99,100]},{"t":25,"s":[100,94.286,100]}],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[195,421],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":20,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"st","c":{"a":0,"k":[0.686274988511,0.796078969918,0.909803981407,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":15,"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":[7.5,0.5],"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 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tm","s":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":0,"s":[0]},{"t":14,"s":[100]}],"ix":1},"e":{"a":0,"k":0,"ix":2},"o":{"a":0,"k":0,"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1","mn":"ADBE Vector Filter - Trim","hd":false}],"ip":0,"op":75,"st":0,"bm":0},{"ddd":0,"ind":6,"ty":4,"nm":"Ebene 1/fingerprint Outlines","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":48,"s":[0]},{"t":59,"s":[100]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[250,336,0],"ix":2},"a":{"a":0,"k":[250,250,0],"ix":1},"s":{"a":0,"k":[9,9,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[4.375,0],[0.833,0.208],[22.709,22.292],[0,41.25],[-35.416,0],[0,-33.75],[-23.958,0],[0,22.292],[83.333,0],[24.375,-51.042],[0,-21.666],[-12.5,-33.333],[5.417,-1.875],[1.875,5.208],[0,28.125],[-9.375,19.792],[-67.292,0],[0,-90],[35.417,0],[0,33.75],[23.959,0],[0,-22.292],[-25.208,-25],[-29.374,-8.125],[1.458,-5.417]],"o":[[-0.833,0],[-33.125,-9.167],[-29.167,-28.958],[0,-33.75],[35.417,0],[0,22.292],[23.959,0],[0,-78.541],[-59.167,0],[-8.125,16.875],[0,16.25],[2.083,5.417],[-5.417,2.083],[-10.209,-27.292],[0,-25],[27.708,-58.125],[94.792,0],[0,33.75],[-35.416,0],[0,-22.292],[-23.958,0],[0,35.625],[19.792,19.583],[5.625,1.458],[-1.042,4.792]],"v":[[60.729,208.333],[58.021,207.917],[-19.479,164.167],[-64.687,55.417],[-0.521,-5.834],[63.646,55.417],[106.979,95.833],[150.313,55.417],[-0.729,-86.875],[-138.437,-2.917],[-150.729,55.417],[-136.77,130.624],[-142.812,143.958],[-156.145,137.917],[-171.354,55.417],[-157.187,-12.083],[-0.729,-107.917],[171.146,55.208],[106.979,116.458],[42.813,55.208],[-0.521,14.792],[-43.854,55.208],[-4.896,149.167],[63.229,187.708],[70.521,200.417]],"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":[[2.917,0],[17.917,12.292],[0,36.25],[-5.833,0],[0,-5.833],[-25.417,-17.084],[-20.833,0],[-8.333,1.458],[-1.041,-5.834],[5.833,-1.042]],"o":[[-24.791,0],[-31.041,-21.041],[0,-5.833],[5.834,0],[0,29.375],[14.791,10],[5,0],[5.625,-1.042],[1.042,5.625],[-11.875,2.292]],"v":[[102.604,165.417],[38.021,146.874],[-11.562,55.417],[-1.146,45],[9.271,55.417],[49.688,129.583],[102.604,144.374],[124.271,142.292],[136.354,150.833],[127.813,162.917]],"c":true},"ix":2},"nm":"Path 2","mn":"ADBE Vector Shape - Group","hd":false},{"ind":2,"ty":"sh","ix":3,"ks":{"a":0,"k":{"i":[[2.709,0],[1.875,2.083],[13.958,25.208],[0,33.542],[-65,0],[0,-61.875],[5.834,0],[0,5.833],[53.542,0],[0,-50.416],[-12.708,-22.5],[-16.042,-16.25],[3.958,-4.167]],"o":[[-2.708,0],[-18.125,-18.125],[-14.375,-25.625],[0,-61.875],[65,0],[0,5.833],[-5.833,0],[0,-50.416],[-53.541,0],[0,30],[13.333,23.959],[3.958,4.167],[-2.292,2.083]],"v":[[-46.771,203.958],[-54.062,200.833],[-95.937,145.833],[-117.812,55.417],[0.104,-56.875],[118.021,55.417],[107.604,65.833],[97.188,55.417],[0.104,-36.042],[-96.979,55.417],[-77.604,135.624],[-39.062,186.042],[-39.062,200.833]],"c":true},"ix":2},"nm":"Path 3","mn":"ADBE Vector Shape - Group","hd":false},{"ind":3,"ty":"sh","ix":4,"ks":{"a":0,"k":{"i":[[3.334,0],[1.875,1.25],[-3.334,4.792],[-31.25,16.042],[-65.625,-33.75],[-20.625,-28.958],[4.792,-3.334],[3.333,4.791],[28.125,14.375],[59.584,-30.833],[18.75,-26.25]],"o":[[-2.083,0],[-4.792,-3.334],[20.625,-29.166],[65.416,-33.75],[31.25,16.042],[3.333,4.584],[-4.792,3.333],[-18.75,-26.25],[-59.792,-30.625],[-28.333,14.583],[-1.666,2.916]],"v":[[-176.979,-47.499],[-183.02,-49.375],[-185.52,-63.958],[-107.395,-132.083],[107.396,-132.292],[185.521,-64.583],[183.021,-50],[168.438,-52.5],[97.813,-113.75],[-98.021,-113.542],[-168.854,-51.875]],"c":true},"ix":2},"nm":"Path 4","mn":"ADBE Vector Shape - Group","hd":false},{"ind":4,"ty":"sh","ix":5,"ks":{"a":0,"k":{"i":[[3.75,0],[1.459,0.833],[41.458,0],[35.625,-19.584],[2.916,5],[-5,2.709],[-44.792,0],[-42.5,-21.875],[2.708,-5]],"o":[[-1.667,0],[-40,-20.625],[-41.25,0],[-5,2.708],[-2.709,-5],[38.75,-21.041],[44.375,0],[5.208,2.708],[-1.875,3.75]],"v":[[121.146,-156.875],[116.354,-158.125],[0.313,-187.5],[-115.729,-158.125],[-129.895,-162.292],[-125.729,-176.458],[0.313,-208.333],[125.938,-176.667],[130.313,-162.708]],"c":true},"ix":2},"nm":"Path 5","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":0,"k":[0.27450978756,0.933333337307,0.398523569107,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":[249.895,250],"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":7,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":47,"op":75,"st":0,"bm":0},{"ddd":0,"ind":7,"ty":4,"nm":"Back 2","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[242.5,249.529,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,94.286,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[195,421],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":20,"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":[7.5,199.894],"ix":2},"a":{"a":0,"k":[0,199.394],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667],"y":[1,1]},"o":{"x":[0.333,0.333],"y":[0,0]},"t":41,"s":[100,0]},{"t":49,"s":[100,100]}],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":41,"s":[0]},{"t":49,"s":[100]}],"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":75,"st":0,"bm":0},{"ddd":0,"ind":8,"ty":4,"nm":"Back","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":9,"s":[0]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":12,"s":[20]},{"i":{"x":[0.833],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":17,"s":[100]},{"i":{"x":[0.833],"y":[1]},"o":{"x":[0.167],"y":[0]},"t":46,"s":[100]},{"t":49,"s":[0]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[242.5,249.529,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":1,"k":[{"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":12,"s":[100,94.286,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":14,"s":[105,99,100]},{"t":20,"s":[100,94.286,100]}],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[195,421],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":20,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.145098045468,0.337254911661,0.686274528503,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":[7.5,0.5],"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 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":75,"st":0,"bm":0}],"markers":[]}
\ No newline at end of file
diff --git a/res/raw/fingerprint_location_animation.mp4 b/res/raw/fingerprint_location_animation.mp4
index e69de29..076aa0f 100644
--- a/res/raw/fingerprint_location_animation.mp4
+++ b/res/raw/fingerprint_location_animation.mp4
Binary files differ
diff --git a/res/raw/gesture_ambient_lift.mp4 b/res/raw/gesture_ambient_lift.mp4
index e69de29..8f9cc91 100644
--- a/res/raw/gesture_ambient_lift.mp4
+++ b/res/raw/gesture_ambient_lift.mp4
Binary files differ
diff --git a/res/raw/gesture_ambient_tap.mp4 b/res/raw/gesture_ambient_tap.mp4
index e69de29..156988f 100644
--- a/res/raw/gesture_ambient_tap.mp4
+++ b/res/raw/gesture_ambient_tap.mp4
Binary files differ
diff --git a/res/raw/gesture_assist_animation.mp4 b/res/raw/gesture_assist_animation.mp4
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/res/raw/gesture_assist_animation.mp4
diff --git a/res/raw/gesture_device_controls.mp4 b/res/raw/gesture_device_controls.mp4
index e69de29..975b08b 100644
--- a/res/raw/gesture_device_controls.mp4
+++ b/res/raw/gesture_device_controls.mp4
Binary files differ
diff --git a/res/raw/gesture_double_tap.mp4 b/res/raw/gesture_double_tap.mp4
index e69de29..518be1a 100644
--- a/res/raw/gesture_double_tap.mp4
+++ b/res/raw/gesture_double_tap.mp4
Binary files differ
diff --git a/res/raw/gesture_fingerprint_swipe.mp4 b/res/raw/gesture_fingerprint_swipe.mp4
index e69de29..0457ae8 100644
--- a/res/raw/gesture_fingerprint_swipe.mp4
+++ b/res/raw/gesture_fingerprint_swipe.mp4
Binary files differ
diff --git a/res/raw/gesture_global_actions_panel.mp4 b/res/raw/gesture_global_actions_panel.mp4
index e69de29..9d73c87 100644
--- a/res/raw/gesture_global_actions_panel.mp4
+++ b/res/raw/gesture_global_actions_panel.mp4
Binary files differ
diff --git a/res/raw/gesture_prevent_ringing.mp4 b/res/raw/gesture_prevent_ringing.mp4
index e69de29..774d7f0 100644
--- a/res/raw/gesture_prevent_ringing.mp4
+++ b/res/raw/gesture_prevent_ringing.mp4
Binary files differ
diff --git a/res/raw/gesture_silence.mp4 b/res/raw/gesture_silence.mp4
new file mode 100644
index 0000000..518be1a
--- /dev/null
+++ b/res/raw/gesture_silence.mp4
Binary files differ
diff --git a/res/raw/gesture_skip.mp4 b/res/raw/gesture_skip.mp4
new file mode 100644
index 0000000..518be1a
--- /dev/null
+++ b/res/raw/gesture_skip.mp4
Binary files differ
diff --git a/res/raw/gesture_tap.mp4 b/res/raw/gesture_tap.mp4
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/res/raw/gesture_tap.mp4
diff --git a/res/raw/gesture_twist.mp4 b/res/raw/gesture_twist.mp4
index e69de29..f1b0c55 100644
--- a/res/raw/gesture_twist.mp4
+++ b/res/raw/gesture_twist.mp4
Binary files differ
diff --git a/res/raw/location.json b/res/raw/location.json
new file mode 100644
index 0000000..d0fdcd8
--- /dev/null
+++ b/res/raw/location.json
@@ -0,0 +1 @@
+{"v":"5.1.1","fr":30,"ip":0,"op":90,"w":368,"h":240,"nm":"02-B","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"pin Outlines","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[183.71,143.456,0],"ix":2},"a":{"a":0,"k":[42.579,115.457,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.833,0.833,0.833],"y":[1.444,1.289,1]},"o":{"x":[0.167,0.167,0.167],"y":[0,0,0]},"n":["0p833_1p444_0p167_0","0p833_1p289_0p167_0","0p833_1_0p167_0"],"t":22,"s":[100,100,100],"e":[92.917,112.992,100]},{"i":{"x":[0.833,0.833,0.833],"y":[0.99,0.967,1]},"o":{"x":[0.167,0.167,0.167],"y":[0.073,0.135,0]},"n":["0p833_0p99_0p167_0p073","0p833_0p967_0p167_0p135","0p833_1_0p167_0"],"t":26,"s":[92.917,112.992,100],"e":[125.208,92.205,100]},{"i":{"x":[0.833,0.833,0.833],"y":[0.949,0.962,1]},"o":{"x":[0.167,0.167,0.167],"y":[-0.016,-0.081,0]},"n":["0p833_0p949_0p167_-0p016","0p833_0p962_0p167_-0p081","0p833_1_0p167_0"],"t":29,"s":[125.208,92.205,100],"e":[97.643,103.464,100]},{"i":{"x":[0.833,0.833,0.833],"y":[0.967,0.925,1]},"o":{"x":[0.167,0.167,0.167],"y":[-0.209,-0.098,0]},"n":["0p833_0p967_0p167_-0p209","0p833_0p925_0p167_-0p098","0p833_1_0p167_0"],"t":33,"s":[97.643,103.464,100],"e":[106.102,98,100]},{"i":{"x":[0.811,0.811,0.811],"y":[1.021,1,1]},"o":{"x":[0.167,0.167,0.167],"y":[-0.018,-0.082,0]},"n":["0p811_1p021_0p167_-0p018","0p811_1_0p167_-0p082","0p811_1_0p167_0"],"t":38,"s":[106.102,98,100],"e":[100,100,100]},{"t":40}],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,7.781],[7.78,0],[0,-7.78],[-7.781,0]],"o":[[0,-7.78],[-7.781,0],[0,7.781],[7.78,0]],"v":[[14.089,0],[0,-14.088],[-14.089,0],[0,14.088]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.647000002394,0.184000007779,0.125,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[42.624,42.283],"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,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,37.343],[23.454,0],[0,-23.455],[-1.368,0]],"o":[[0,-23.455],[-23.455,0],[0,37.343],[1.367,0]],"v":[[42.468,-14.644],[0,-57.113],[-42.469,-14.644],[0,57.113]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.917999985639,0.337000020345,0.238999998803,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[42.468,57.113],"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,"ix":2,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":90,"st":0,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"line Outlines","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[183.6,144.956,0],"ix":2},"a":{"a":0,"k":[17.389,6,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.833,0.833,0.833],"y":[1.733,1,1]},"o":{"x":[0.167,0.167,0.167],"y":[0,0,0]},"n":["0p833_1p733_0p167_0","0p833_1_0p167_0","0p833_1_0p167_0"],"t":22,"s":[100,100,100],"e":[60,100,100]},{"i":{"x":[0.833,0.833,0.833],"y":[0.987,1,1]},"o":{"x":[0.167,0.167,0.167],"y":[0.195,0,0]},"n":["0p833_0p987_0p167_0p195","0p833_1_0p167_0","0p833_1_0p167_0"],"t":26,"s":[60,100,100],"e":[173,100,100]},{"i":{"x":[0.833,0.833,0.833],"y":[0.987,1,1]},"o":{"x":[0.167,0.167,0.167],"y":[-0.022,0,0]},"n":["0p833_0p987_0p167_-0p022","0p833_1_0p167_0","0p833_1_0p167_0"],"t":29,"s":[173,100,100],"e":[81,100,100]},{"i":{"x":[0.635,0.635,0.635],"y":[0.714,1,1]},"o":{"x":[0.158,0.158,0.158],"y":[-0.067,0,0]},"n":["0p635_0p714_0p158_-0p067","0p635_1_0p158_0","0p635_1_0p158_0"],"t":33,"s":[81,100,100],"e":[102.444,100,100]},{"i":{"x":[0.811,0.811,0.811],"y":[1.42,1,1]},"o":{"x":[0.438,0.438,0.438],"y":[-1.206,0,0]},"n":["0p811_1p42_0p438_-1p206","0p811_1_0p438_0","0p811_1_0p438_0"],"t":38,"s":[102.444,100,100],"e":[100,100,100]},{"t":40}],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[6,6],[28.779,6]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0.969000004787,0.74900004069,0.709999952129,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":8,"ix":5},"lc":2,"lj":2,"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":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,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":90,"st":0,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":"horizontaal","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[183.5,120,0],"ix":2},"a":{"a":0,"k":[183.5,120,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],[0,0]],"o":[[0,0],[0,0]],"v":[[99.736,145.12],[265.745,145.12]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[1,1,1,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":8,"ix":5},"lc":1,"lj":1,"ml":10,"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":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,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tm","s":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"n":["0p667_1_0p333_0"],"t":21,"s":[0],"e":[0]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"n":["0p667_1_0p333_0"],"t":33,"s":[0],"e":[0]},{"i":{"x":[0.518],"y":[1]},"o":{"x":[0.426],"y":[0]},"n":["0p518_1_0p426_0"],"t":73,"s":[0],"e":[100]},{"t":84}],"ix":1},"e":{"a":1,"k":[{"i":{"x":[0.521],"y":[1]},"o":{"x":[0.496],"y":[0]},"n":["0p521_1_0p496_0"],"t":21,"s":[0],"e":[100]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"n":["0p667_1_0p333_0"],"t":33,"s":[100],"e":[100]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"n":["0p667_1_0p333_0"],"t":73,"s":[100],"e":[100]},{"t":84}],"ix":2},"o":{"a":0,"k":0,"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1","mn":"ADBE Vector Filter - Trim","hd":false}],"ip":10,"op":100,"st":10,"bm":0},{"ddd":0,"ind":4,"ty":4,"nm":"verticaal","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[183.5,120,0],"ix":2},"a":{"a":0,"k":[183.5,120,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],[0,0]],"o":[[0,0],[0,0]],"v":[[209.609,41.667],[209.609,200.667]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[1,1,1,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":8,"ix":5},"lc":1,"lj":1,"ml":10,"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":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,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tm","s":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":11,"s":[100],"e":[100]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.167],"y":[0]},"n":["0p667_1_0p167_0"],"t":23,"s":[100],"e":[100]},{"i":{"x":[0.412],"y":[1]},"o":{"x":[0.333],"y":[0]},"n":["0p412_1_0p333_0"],"t":63,"s":[100],"e":[0]},{"t":75}],"ix":1},"e":{"a":1,"k":[{"i":{"x":[0.437],"y":[1]},"o":{"x":[0.427],"y":[0]},"n":["0p437_1_0p427_0"],"t":11,"s":[100],"e":[0]},{"i":{"x":[0.833],"y":[1]},"o":{"x":[0.333],"y":[0]},"n":["0p833_1_0p333_0"],"t":23,"s":[0],"e":[0]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":63,"s":[0],"e":[0]},{"t":75}],"ix":2},"o":{"a":0,"k":0,"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1","mn":"ADBE Vector Filter - Trim","hd":false}],"ip":0,"op":90,"st":0,"bm":0},{"ddd":0,"ind":5,"ty":4,"nm":"bocht","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[183.5,120,0],"ix":2},"a":{"a":0,"k":[183.5,120,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],[0,0],[0,-20.781],[0,0],[1.889,-4.513]],"o":[[0,0],[-20.568,0],[0,0],[0,5.208],[0,0]],"v":[[62.182,-47.966],[-22.005,-47.966],[-59.249,-10.339],[-59.249,33.285],[-62.182,47.967]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[1,1,1,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":8,"ix":5},"lc":1,"lj":1,"ml":10,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[204.09,147.818],"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,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tm","s":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"n":["0p667_1_0p333_0"],"t":11,"s":[100],"e":[100]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"n":["0p667_1_0p333_0"],"t":23,"s":[100],"e":[100]},{"i":{"x":[0.514],"y":[1]},"o":{"x":[0.435],"y":[0]},"n":["0p514_1_0p435_0"],"t":72,"s":[100],"e":[0]},{"t":84}],"ix":1},"e":{"a":1,"k":[{"i":{"x":[0.429],"y":[1]},"o":{"x":[0.444],"y":[0]},"n":["0p429_1_0p444_0"],"t":11,"s":[100],"e":[0]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"n":["0p667_1_0p333_0"],"t":23,"s":[0],"e":[0]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"n":["0p667_1_0p333_0"],"t":72,"s":[0],"e":[0]},{"t":84}],"ix":2},"o":{"a":0,"k":0,"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1","mn":"ADBE Vector Filter - Trim","hd":false}],"ip":0,"op":90,"st":0,"bm":0},{"ddd":0,"ind":6,"ty":4,"nm":"blauw","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":20,"s":[0],"e":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":32,"s":[100],"e":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":63,"s":[100],"e":[0]},{"t":75}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[183.5,117,0],"ix":2},"a":{"a":0,"k":[183.5,120,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":[[12.741,-1.208],[-4.334,-45.689],[-1.422,-4.92],[0,0],[0,0],[-20.569,0],[0,0],[0,0]],"o":[[-45.689,4.334],[0.502,5.285],[0,0],[0,0],[0,-20.781],[0,0],[0,0],[-11.268,-4.122]],"v":[[21.165,-52.344],[-53.715,38.232],[-50.785,53.551],[-9.253,53.551],[-9.253,47.764],[27.99,10.136],[58.049,10.136],[57.512,-47.688]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.26699999641,0.344999994016,0.866999966491,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[154.094,89.716],"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 5","np":2,"cix":2,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tm","s":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":20,"s":[0],"e":[0]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":32,"s":[0],"e":[0]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":63,"s":[0],"e":[100]},{"t":75}],"ix":1},"e":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":20,"s":[0],"e":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":32,"s":[100],"e":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":63,"s":[100],"e":[100]},{"t":75}],"ix":2},"o":{"a":0,"k":0,"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1","mn":"ADBE Vector Filter - Trim","hd":false}],"ip":9,"op":99,"st":9,"bm":0},{"ddd":0,"ind":7,"ty":4,"nm":"groen","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":21,"s":[1],"e":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":33,"s":[100],"e":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":64,"s":[100],"e":[0]},{"t":76}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[183.5,117,0],"ix":2},"a":{"a":0,"k":[183.5,120,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":[[25.349,9.192],[0,0],[0,0]],"o":[[0,0],[0,0],[-6.91,-27.008]],"v":[[-26.104,-28.726],[-26.104,28.726],[26.104,28.726]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.301999978458,0.889999988032,0.728999956916,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[237.488,70.677],"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 4","np":2,"cix":2,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tm","s":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":21,"s":[0],"e":[0]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":33,"s":[0],"e":[0]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":64,"s":[0],"e":[100]},{"t":76}],"ix":1},"e":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":21,"s":[0],"e":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":33,"s":[100],"e":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":64,"s":[100],"e":[100]},{"t":76}],"ix":2},"o":{"a":0,"k":0,"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1","mn":"ADBE Vector Filter - Trim","hd":false}],"ip":10,"op":100,"st":10,"bm":0},{"ddd":0,"ind":8,"ty":4,"nm":"circle Outlines","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[183.355,117.117,0],"ix":2},"a":{"a":0,"k":[83.1,83.099,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.794,45.889],[45.886,0.794],[0.794,-45.888],[-45.888,-0.794]],"o":[[0.794,-45.888],[-45.889,-0.794],[-0.794,45.889],[45.887,0.794]],"v":[[83.087,1.437],[1.439,-83.087],[-83.087,-1.438],[-1.437,83.086]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.948999980852,0.948999980852,0.948999980852,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[83.1,83.099],"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,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":90,"st":0,"bm":0}],"markers":[]}
\ No newline at end of file
diff --git a/res/raw/network.json b/res/raw/network.json
new file mode 100644
index 0000000..938bd53
--- /dev/null
+++ b/res/raw/network.json
@@ -0,0 +1 @@
+{"v":"5.1.7","fr":25,"ip":0,"op":52,"w":200,"h":200,"nm":"Comp 1","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"Shape Layer 7","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[100,100,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]],"o":[[0,0]],"v":[[145.5,44]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[1,0,0,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":3,"ix":5},"lc":1,"lj":1,"ml":4,"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":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":"Shape 1","np":3,"cix":2,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":102,"st":0,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"Shape Layer 6","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[105.5,95.75,0],"ix":2},"a":{"a":0,"k":[-25.25,5.75,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],[0,0]],"o":[[0,0],[0,0]],"v":[[-25,14.25],[-25,20]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[1,0,0,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":3,"ix":5},"lc":1,"lj":1,"ml":4,"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":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":"Shape 1","np":3,"cix":2,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tm","s":{"a":0,"k":0,"ix":1},"e":{"a":1,"k":[{"i":{"x":[0],"y":[1]},"o":{"x":[1],"y":[0]},"n":["0_1_1_0"],"t":14,"s":[0],"e":[100]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"n":["0p667_1_0p333_0"],"t":31,"s":[100],"e":[0]},{"t":51}],"ix":2},"o":{"a":0,"k":0,"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1","mn":"ADBE Vector Filter - Trim","hd":false}],"ip":14,"op":53,"st":14,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":"Shape Layer 5","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[111.75,95.75,0],"ix":2},"a":{"a":0,"k":[-25.25,5.75,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],[0,0]],"o":[[0,0],[0,0]],"v":[[-25,14.5],[-25,20]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[1,0,0,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":3,"ix":5},"lc":1,"lj":1,"ml":4,"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":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":"Shape 1","np":3,"cix":2,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tm","s":{"a":1,"k":[{"i":{"x":[0],"y":[1]},"o":{"x":[1],"y":[-0.05]},"n":["0_1_1_-0p05"],"t":11,"s":[100],"e":[0]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.167],"y":[0]},"n":["0p667_1_0p167_0"],"t":32,"s":[0],"e":[100]},{"t":51}],"ix":1},"e":{"a":0,"k":100,"ix":2},"o":{"a":0,"k":0,"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1","mn":"ADBE Vector Filter - Trim","hd":false}],"ip":11,"op":53,"st":11,"bm":0},{"ddd":0,"ind":4,"ty":4,"nm":"Shape Layer 4","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[93,95.75,0],"ix":2},"a":{"a":0,"k":[-25.25,5.75,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],[0,0]],"o":[[0,0],[0,0]],"v":[[-25,6.75],[-25,20]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[1,0,0,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":3,"ix":5},"lc":1,"lj":1,"ml":4,"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":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":"Shape 1","np":3,"cix":2,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tm","s":{"a":0,"k":0,"ix":1},"e":{"a":1,"k":[{"i":{"x":[0],"y":[1]},"o":{"x":[1],"y":[0]},"n":["0_1_1_0"],"t":7,"s":[0],"e":[100]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.167],"y":[0]},"n":["0p667_1_0p167_0"],"t":32,"s":[100],"e":[0]},{"t":51}],"ix":2},"o":{"a":0,"k":0,"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1","mn":"ADBE Vector Filter - Trim","hd":false}],"ip":7,"op":53,"st":7,"bm":0},{"ddd":0,"ind":5,"ty":4,"nm":"Shape Layer 3","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[99.25,95.75,0],"ix":2},"a":{"a":0,"k":[-25.25,5.75,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],[0,0]],"o":[[0,0],[0,0]],"v":[[-25,10],[-25,20]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[1,0,0,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":3,"ix":5},"lc":1,"lj":1,"ml":4,"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":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":"Shape 1","np":3,"cix":2,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tm","s":{"a":1,"k":[{"i":{"x":[0],"y":[1]},"o":{"x":[1],"y":[0]},"n":["0_1_1_0"],"t":4,"s":[100],"e":[0]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.167],"y":[0]},"n":["0p667_1_0p167_0"],"t":32,"s":[0],"e":[100]},{"t":51}],"ix":1},"e":{"a":0,"k":100,"ix":2},"o":{"a":0,"k":0,"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1","mn":"ADBE Vector Filter - Trim","hd":false}],"ip":4,"op":53,"st":4,"bm":0},{"ddd":0,"ind":6,"ty":4,"nm":"Shape Layer 2","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[86.75,95.75,0],"ix":2},"a":{"a":0,"k":[-25.25,5.75,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],[0,0]],"o":[[0,0],[0,0]],"v":[[-25,2.5],[-25,20]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[1,0,0,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":3,"ix":5},"lc":1,"lj":1,"ml":4,"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":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":"Shape 1","np":3,"cix":2,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tm","s":{"a":1,"k":[{"i":{"x":[0],"y":[1.026]},"o":{"x":[1],"y":[0.08]},"n":["0_1p026_1_0p08"],"t":2,"s":[100],"e":[0]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.167],"y":[0]},"n":["0p667_1_0p167_0"],"t":32,"s":[0],"e":[100]},{"t":51}],"ix":1},"e":{"a":0,"k":100,"ix":2},"o":{"a":0,"k":0,"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1","mn":"ADBE Vector Filter - Trim","hd":false}],"ip":2,"op":53,"st":2,"bm":0},{"ddd":0,"ind":7,"ty":4,"nm":"Shape Layer 1","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[80,95.75,0],"ix":2},"a":{"a":0,"k":[-25.25,5.75,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],[0,0]],"o":[[0,0],[0,0]],"v":[[-25,-2],[-25,20]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[1,0,0,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":3,"ix":5},"lc":1,"lj":1,"ml":4,"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":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":"Shape 1","np":3,"cix":2,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tm","s":{"a":0,"k":0,"ix":1},"e":{"a":1,"k":[{"i":{"x":[0.145],"y":[1]},"o":{"x":[0.889],"y":[0]},"n":["0p145_1_0p889_0"],"t":0,"s":[0],"e":[100]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.167],"y":[0]},"n":["0p667_1_0p167_0"],"t":32,"s":[100],"e":[0]},{"t":51}],"ix":2},"o":{"a":0,"k":0,"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1","mn":"ADBE Vector Filter - Trim","hd":false}],"ip":0,"op":53,"st":0,"bm":0}],"markers":[]}
\ No newline at end of file
diff --git a/res/raw/notification.json b/res/raw/notification.json
new file mode 100644
index 0000000..72a609f
--- /dev/null
+++ b/res/raw/notification.json
@@ -0,0 +1 @@
+{"v":"5.5.7","meta":{"g":"LottieFiles AE 0.1.20","a":"Roger.T","k":"","d":"","tc":""},"fr":25,"ip":0,"op":75,"w":500,"h":500,"nm":"Bell","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"Shape Layer 2","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":19,"s":[100]},{"t":21,"s":[0]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[361,125,0],"ix":2},"a":{"a":0,"k":[111,-125,0],"ix":1},"s":{"a":1,"k":[{"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":16,"s":[0,0,100]},{"t":21,"s":[100,100,100]}],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[150,150],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"st","c":{"a":0,"k":[0,0,0,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":false},{"ty":"tr","p":{"a":0,"k":[108,-125],"ix":2},"a":{"a":0,"k":[-1,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":75,"st":0,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"1 Outlines","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[364,122,0],"ix":2},"a":{"a":0,"k":[34,-40,0],"ix":1},"s":{"a":1,"k":[{"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":18,"s":[0,0,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":24,"s":[100,100,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":27,"s":[95,95,100]},{"t":30,"s":[100,100,100]}],"ix":6}},"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],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]],"v":[[40.8,0],[40.8,-82.08],[28.92,-82.08],[4.8,-70.8],[10.56,-57.48],[25.08,-63.6],[25.08,0]],"c":true},"ix":2},"nm":"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":"st","c":{"a":0,"k":[0,0,0,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":1,"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":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":"1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":75,"st":0,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":"Shape Layer 1","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[357,126,0],"ix":2},"a":{"a":0,"k":[107,-124,0],"ix":1},"s":{"a":1,"k":[{"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":10,"s":[0,0,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":16,"s":[120,120,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":18,"s":[90,90,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":21,"s":[110,110,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":24,"s":[98,98,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":27,"s":[105,105,100]},{"t":30,"s":[100,100,100]}],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[140,140],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"st","c":{"a":0,"k":[0.145098039216,0.337254901961,0.686274509804,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":10,"ix":5},"lc":1,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"fl","c":{"a":0,"k":[1,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":[108,-124],"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":75,"st":0,"bm":0},{"ddd":0,"ind":4,"ty":4,"nm":"Ebene 1/Bell Outlines","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[250,250,0],"ix":2},"a":{"a":0,"k":[250,250,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.531,7.481],[-1.3,-16.391],[-7.182,-1.87],[-4.386,-51.697],[0,0],[-12.561,-12.561],[-5.126,-5.126],[0,-3.949],[0,0],[8.22,0],[0,0],[0,8.22],[0,0],[-2.794,2.794],[-8.243,8.243],[0,17.778],[0,0],[-49.088,13.807]],"o":[[1.085,-16.602],[0.532,7.388],[49.018,14.015],[0,0],[0,17.778],[8.243,8.243],[2.795,2.794],[0,0],[0,8.22],[0,0],[-8.22,0],[0,0],[0,-3.949],[5.125,-5.126],[12.56,-12.561],[0,0],[4.387,-51.697],[7.274,-1.871]],"v":[[-35.72,-157.816],[35.95,-157.839],[48.858,-142.346],[138.537,-33.387],[138.537,77.396],[158.163,124.776],[180.352,146.965],[184.716,157.495],[184.716,159.526],[169.823,174.418],[-169.824,174.418],[-184.716,159.526],[-184.716,157.495],[-180.352,146.965],[-158.163,124.776],[-138.537,77.396],[-138.537,-33.387],[-48.789,-142.138]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.144999994016,0.337000020345,0.685999971278,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":[250,42.118],"ix":2},"a":{"a":0,"k":[0,-172],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":1,"s":[0]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":5,"s":[10]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":10,"s":[-10]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":14,"s":[7]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":18,"s":[-5]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":21,"s":[3]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":24,"s":[-2]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":27,"s":[1]},{"t":30,"s":[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":[[-19.671,0],[0,-19.671],[19.672,0],[0,19.672]],"o":[[19.672,0],[0,19.672],[-19.671,0],[0,-19.671]],"v":[[0,-35.618],[35.618,0],[0,35.618],[-35.618,0]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.144999994016,0.337000020345,0.685999971278,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":[250,54.722],"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":[[0,0],[0,0],[38,0],[0,38],[0,0],[0,0],[0,0]],"o":[[0,0],[0,38],[-38,0],[0,0],[0,0],[0,0],[0,0]],"v":[[8.15,-2.963],[69.275,-2.963],[0,66.312],[-69.275,-2.963],[-8.15,-2.963],[-8.15,-66.313],[8.15,-66.313]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.144999994016,0.337000020345,0.685999971278,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":[250,19.588],"ix":2},"a":{"a":0,"k":[0,-395],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":1,"s":[0]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":5,"s":[23]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":10,"s":[-23]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":14,"s":[18]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":18,"s":[-18]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":21,"s":[10]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":24,"s":[-5]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":27,"s":[3]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":30,"s":[-1]},{"t":33,"s":[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":75,"st":0,"bm":0}],"markers":[]}
\ No newline at end of file
diff --git a/res/raw/privacy.json b/res/raw/privacy.json
new file mode 100644
index 0000000..e520c0b
--- /dev/null
+++ b/res/raw/privacy.json
@@ -0,0 +1 @@
+{"v":"5.5.7","meta":{"g":"LottieFiles AE 0.1.20","a":"Roger.T","k":"","d":"","tc":""},"fr":25,"ip":0,"op":75,"w":500,"h":500,"nm":"Privacy","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"Privacy Outlines","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[250,281,0],"ix":2},"a":{"a":0,"k":[250,250,0],"ix":1},"s":{"a":1,"k":[{"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":0,"s":[70,70,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":10,"s":[101,101,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":14,"s":[70,70,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":16,"s":[75,75,100]},{"t":18,"s":[70,70,100]}],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0.005,21.266],[-21.269,0],[0,-21.269],[21.268,0]],"o":[[0,-21.269],[21.268,0],[0,21.269],[-21.267,-0.006]],"v":[[-38.77,-0.001],[0.001,-38.771],[38.771,-0.001],[0.001,38.771]],"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":[250,201.537],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.833,0.833],"y":[0.833,0.833]},"o":{"x":[0.167,0.167],"y":[0.167,0.167]},"t":0,"s":[100,100]},{"i":{"x":[0.833,0.833],"y":[0.833,0.833]},"o":{"x":[0.167,0.167],"y":[0.167,0.167]},"t":10,"s":[120,120]},{"t":14,"s":[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],[40.196,0.733],[0,-20.18],[0,0],[-29.109,0],[-18.395,22.561]],"o":[[0,-20.18],[-40.204,0.733],[0,0],[18.394,22.561],[29.111,0],[0,0]],"v":[[75.113,-0.227],[-0.002,-37.557],[-75.117,-0.227],[-75.117,1.884],[-0.002,37.558],[75.116,1.884]],"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":[250.002,295.636],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.833,0.833],"y":[0.833,0.833]},"o":{"x":[0.167,0.167],"y":[0.167,0.167]},"t":0,"s":[100,100]},{"i":{"x":[0.833,0.833],"y":[0.833,0.833]},"o":{"x":[0.167,0.167],"y":[0.167,0.167]},"t":10,"s":[120,120]},{"t":14,"s":[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":[[0,0],[-40.196,0.733],[0,-20.18],[0,0],[0,22.316],[53.173,0],[0,-53.171],[-14.103,-17.293]],"o":[[0,-20.18],[40.203,0.733],[0,0],[14.103,-17.293],[0,-53.171],[-53.171,0],[0,22.316],[0,0]],"v":[[-75.113,76.979],[0.003,39.648],[75.118,76.979],[75.118,79.089],[96.925,17.836],[0,-79.089],[-96.925,17.836],[-75.115,79.089]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.093999997307,0.352999997606,0.736999990426,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":[249.995,218.43],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.833,0.833],"y":[0.833,0.833]},"o":{"x":[0.167,0.167],"y":[0.167,0.167]},"t":0,"s":[100,100]},{"i":{"x":[0.833,0.833],"y":[0.833,0.833]},"o":{"x":[0.167,0.167],"y":[0.167,0.167]},"t":10,"s":[114,114]},{"t":14,"s":[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},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-98.763,-46.576],[-9.025,60.912],[-0.277,13.776],[0,0],[0,0],[0,0],[0,0],[-1.827,-13.658]],"o":[[98.763,-46.576],[1.827,-13.655],[0,0],[0,0],[0,0],[0,0],[0.277,13.776],[9.028,60.909]],"v":[[0,189.811],[143.039,-1.956],[146.195,-43.138],[146.195,-146.289],[0,-189.811],[-146.195,-146.289],[-146.195,-43.138],[-143.039,-1.953]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.258999992819,0.522000002394,0.957000014361,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":[250,250.001],"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 4","np":2,"cix":2,"bm":0,"ix":4,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":75,"st":0,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"call Outlines","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":4,"s":[0]},{"t":14,"s":[100]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"t":4,"s":[250,250,0],"to":[-32.333,-12.333,0],"ti":[32.333,12.333,0]},{"i":{"x":0.667,"y":0.667},"o":{"x":0.333,"y":0.333},"t":14,"s":[56,176,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"t":53,"s":[56,176,0],"to":[-0.5,0,0],"ti":[-32.333,-12.333,0]},{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"t":56,"s":[53,176,0],"to":[32.333,12.333,0],"ti":[-32.833,-12.333,0]},{"t":63,"s":[250,250,0]}],"ix":2},"a":{"a":0,"k":[250,250,0],"ix":1},"s":{"a":1,"k":[{"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":14,"s":[20,20,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":16,"s":[22,22,100]},{"t":18,"s":[20,20,100]}],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[-38.437,-19.694],[0,0],[-4.754,-1.63],[-16.841,0],[0,-7.471],[0,0],[7.471,0],[0,127.535],[-7.47,0],[0,0],[0,-7.47],[-5.025,-15.212],[3.803,-3.804]],"o":[[19.558,38.437],[0,0],[3.667,-3.667],[15.212,5.025],[7.471,0],[0,0],[0,7.471],[-127.534,0],[0,-7.47],[0,0],[7.47,0],[0,16.978],[1.495,4.754],[0,0]],"v":[[-73.07,-16.434],[16.434,73.072],[46.314,43.191],[60.168,39.932],[108.655,47.674],[122.237,61.255],[122.237,108.656],[108.655,122.237],[-122.238,-108.655],[-108.656,-122.237],[-61.118,-122.237],[-47.536,-108.655],[-39.796,-60.167],[-43.191,-46.313]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.685999971278,0.795999983245,0.910000011968,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":[250,249.999],"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":[[-138.071,0],[0,-138.071],[138.071,0],[0,138.071]],"o":[[138.071,0],[0,138.071],[-138.071,0],[0,-138.071]],"v":[[0,-250],[250,0],[0,250],[-250,0]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.144999994016,0.337000020345,0.685999971278,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":[250,250],"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}],"ip":4,"op":79,"st":4,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":"chat Outlines","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":6,"s":[0]},{"t":16,"s":[100]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"t":6,"s":[250,250,0],"to":[-25.5,21,0],"ti":[25.5,-21,0]},{"i":{"x":0.667,"y":0.667},"o":{"x":0.333,"y":0.333},"t":16,"s":[97,376,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"t":49,"s":[97,376,0],"to":[-2.167,3.5,0],"ti":[-25.5,21,0]},{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"t":52,"s":[84,397,0],"to":[25.5,-21,0],"ti":[-27.667,24.5,0]},{"t":59,"s":[250,250,0]}],"ix":2},"a":{"a":0,"k":[250,250,0],"ix":1},"s":{"a":1,"k":[{"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":16,"s":[20,20,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":18,"s":[22,22,100]},{"t":20,"s":[20,20,100]}],"ix":6}},"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]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[73.343,-48.894],[-73.343,-48.894],[-73.343,-73.342],[73.343,-73.342]],"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]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[24.447,24.448],[-73.343,24.448],[-73.343,0.001],[24.447,0.001]],"c":true},"ix":2},"nm":"Path 2","mn":"ADBE Vector Shape - Group","hd":false},{"ind":2,"ty":"sh","ix":3,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[-73.342,-36.67],[73.344,-36.67],[73.344,-12.222],[-73.342,-12.222]],"c":true},"ix":2},"nm":"Path 3","mn":"ADBE Vector Shape - Group","hd":false},{"ind":3,"ty":"sh","ix":4,"ks":{"a":0,"k":{"i":[[13.446,0],[0,0],[0,-13.446],[0,0],[0,0],[0,0],[0,13.445],[0,0]],"o":[[0,0],[-13.446,0],[0,0],[0,0],[0,0],[13.446,0],[0,0],[0,-13.446]],"v":[[97.791,-122.238],[-97.789,-122.238],[-122.115,-97.79],[-122.238,122.238],[-73.342,73.344],[97.791,73.344],[122.238,48.896],[122.238,-97.79]],"c":true},"ix":2},"nm":"Path 4","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":0,"k":[0.685999971278,0.795999983245,0.910000011968,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":[249.999,249.999],"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":6,"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":[[-138.071,0],[0,-138.071],[138.071,0],[0,138.071]],"o":[[138.071,0],[0,138.071],[-138.071,0],[0,-138.071]],"v":[[0,-250],[250,0],[0,250],[-250,0]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.144999994016,0.337000020345,0.685999971278,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":[250,250],"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}],"ip":6,"op":81,"st":6,"bm":0},{"ddd":0,"ind":4,"ty":4,"nm":"Ebene 1/Mail Outlines","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":8,"s":[0]},{"t":18,"s":[100]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"t":8,"s":[250,250,0],"to":[32.833,-12.333,0],"ti":[-32.833,12.333,0]},{"i":{"x":0.667,"y":0.667},"o":{"x":0.333,"y":0.333},"t":18,"s":[447,176,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"t":45,"s":[447,176,0],"to":[1.167,0,0],"ti":[32.833,-12.333,0]},{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"t":48,"s":[454,176,0],"to":[-32.833,12.333,0],"ti":[34,-12.333,0]},{"t":55,"s":[250,250,0]}],"ix":2},"a":{"a":0,"k":[250,250,0],"ix":1},"s":{"a":1,"k":[{"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":18,"s":[20,20,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":20,"s":[22,22,100]},{"t":22,"s":[20,20,100]}],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,-3.153],[-1.729,-1.933],[-2.441,0],[-1.628,0.916],[-1.22,1.424],[-1.322,3.866],[0,3.356],[1.729,2.034],[2.644,0],[2.34,-2.237],[1.221,-4.069]],"o":[[0,4.17],[1.729,2.034],[1.933,0],[1.322,-0.712],[1.729,-2.035],[1.221,-3.865],[0,-3.765],[-1.729,-2.035],[-2.848,0],[-2.441,2.238],[-1.221,4.069]],"v":[[-16.377,5.035],[-13.834,14.292],[-7.527,17.344],[-2.237,15.919],[1.526,12.766],[6.104,3.916],[8.036,-6.866],[5.392,-15.513],[-1.22,-18.463],[-9.053,-15.208],[-14.546,-5.748]],"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":[[-3.56,4.374],[0,0],[6.815,-3.764],[11.291,0],[7.934,3.663],[3.866,7.222],[0,8.443],[-4.476,7.934],[-7.629,3.966],[-9.766,0],[-6.511,-3.256],[-3.357,-5.9],[0,-7.12],[5.189,-6.816],[10.171,0],[1.322,0.916],[0.509,1.933],[5.086,0],[3.561,3.764],[0,6.306],[-4.374,6.408],[-8.24,0],[-2.746,-4.475],[0,0],[0,0],[0,0],[0,-0.712],[-0.408,-0.407],[-0.509,0],[-2.543,1.933],[-2.035,4.272],[0,4.578],[5.901,5.493],[10.579,0],[6.205,-3.662],[3.153,-6.612],[0,-7.222],[-3.56,-5.696],[-6.408,-2.645],[-8.24,0],[-5.696,2.238]],"o":[[0,0],[-3.357,6.714],[-7.832,4.374],[-10.986,0],[-7.934,-3.662],[-3.865,-7.121],[0,-9.256],[4.374,-8.036],[7.731,-4.07],[8.34,0],[6.51,3.255],[3.459,6.001],[0,8.444],[-6.51,8.646],[-2.747,0],[-1.424,-1.017],[-3.865,3.764],[-5.493,0],[-3.662,-3.764],[0,-7.731],[5.29,-7.833],[5.9,0],[0,0],[0,0],[0,0],[-0.509,2.238],[0,0.814],[0.305,0.407],[1.628,0],[3.357,-2.543],[2.136,-4.17],[0,-8.138],[-5.899,-5.494],[-8.952,0],[-6.205,3.662],[-3.154,6.612],[0,7.019],[3.459,5.799],[6.307,2.645],[7.934,0],[5.697,-2.238]],"v":[[37.332,25.481],[47.911,25.481],[32.652,41.248],[3.967,47.759],[-24.413,42.265],[-42.113,25.888],[-47.911,2.39],[-41.299,-23.549],[-23.294,-41.655],[2.951,-47.759],[25.228,-42.876],[40.078,-29.042],[45.267,-9.41],[37.434,13.478],[12.41,26.397],[6.206,24.972],[3.357,20.7],[-10.173,26.397],[-23.803,20.7],[-29.296,5.544],[-22.684,-15.716],[-2.339,-27.415],[10.681,-20.701],[12.003,-26.194],[25.125,-26.194],[17.598,9.409],[16.885,13.783],[17.496,15.614],[18.819,16.224],[25.023,13.376],[33.161,3.204],[36.315,-9.918],[27.465,-30.364],[2.747,-38.604],[-20.039,-33.111],[-34.178,-17.649],[-38.857,3.102],[-33.568,22.124],[-18.717,34.738],[3.154,38.705],[23.497,35.348]],"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":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":[248.413,202.195],"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":4,"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":[[4.789,0],[0,0],[0,-4.789],[0,0],[0,0],[-10.849,9.946],[0,0],[0,0]],"o":[[0,0],[-4.788,0],[0,0],[0,0],[10.849,9.946],[0,0],[0,0],[0,-4.789]],"v":[[82.947,-82.718],[-82.947,-82.718],[-91.678,-73.987],[-91.678,6.415],[-19.274,72.772],[19.275,72.772],[91.678,6.415],[91.678,-73.987]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.501999978458,0.647000002394,0.866999966491,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":[249.997,210.481],"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":[[0,0],[10.849,9.945],[0,0],[0,0],[0,0],[0,0]],"o":[[-10.849,9.945],[0,0],[0,0],[0,0],[0,0],[0,0]],"v":[[19.275,-43.133],[-19.275,-43.133],[-22.225,-45.839],[-122.237,45.839],[122.237,45.839],[22.225,-45.839]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.741000007181,0.757000014361,0.776000019148,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":[249.998,326.399],"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},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[10.848,9.941],[0,0],[0,0],[0,0],[0,0]],"o":[[-10.849,9.941],[0,0],[0,0],[0,0],[0,0],[0,0]],"v":[[19.275,2.706],[-19.27,2.706],[-122.237,-91.678],[-122.237,91.678],[122.237,91.678],[122.237,-91.678]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.976000019148,0.984000052658,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":[249.998,280.56],"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 4","np":2,"cix":2,"bm":0,"ix":4,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[-10.848,9.942],[0,0]],"o":[[0,0],[10.849,9.942],[0,0],[0,0]],"v":[[-122.238,-52.163],[-19.275,42.221],[19.27,42.221],[122.237,-52.163]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.741000007181,0.757000014361,0.776000019148,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":[249.998,241.044],"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 5","np":2,"cix":2,"bm":0,"ix":5,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-138.071,0],[0,-138.071],[138.071,0],[0,138.071]],"o":[[138.071,0],[0,138.071],[-138.071,0],[0,-138.071]],"v":[[0,-250],[250,0],[0,250],[-250,0]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.144999994016,0.337000020345,0.685999971278,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":[250,250],"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 6","np":2,"cix":2,"bm":0,"ix":6,"mn":"ADBE Vector Group","hd":false}],"ip":8,"op":83,"st":8,"bm":0},{"ddd":0,"ind":5,"ty":4,"nm":"SECURITY Outlines","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":10,"s":[0]},{"t":20,"s":[100]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"t":10,"s":[250,250,0],"to":[24.5,21,0],"ti":[-24.5,-21,0]},{"i":{"x":0.667,"y":0.667},"o":{"x":0.333,"y":0.333},"t":20,"s":[397,376,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"t":41,"s":[397,376,0],"to":[1.833,2,0],"ti":[24.5,21,0]},{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"t":44,"s":[408,388,0],"to":[-24.5,-21,0],"ti":[26.333,23,0]},{"t":51,"s":[250,250,0]}],"ix":2},"a":{"a":0,"k":[250,250,0],"ix":1},"s":{"a":1,"k":[{"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":20,"s":[20,20,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":22,"s":[22,22,100]},{"t":24,"s":[20,20,100]}],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,11.257],[16.112,0],[0,-16.118],[-10.14,-4.894],[0,0],[0,0],[0,0]],"o":[[-0.006,-16.112],[-16.119,0],[0,11.258],[0,0],[0,0],[0,0],[10.14,-4.894]],"v":[[29.38,-13.414],[0,-42.789],[-29.38,-13.409],[-12.773,13.049],[-12.773,42.789],[12.773,42.789],[12.773,13.049]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.093999997307,0.352999997606,0.736999990426,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":[249.987,302.933],"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],[-23.825,0],[0,-23.825],[0,0],[0,0]],"o":[[0,-23.825],[23.818,0],[0,0],[0,0],[0,0]],"v":[[-43.438,-80.395],[-0.007,-123.826],[43.417,-80.395],[43.417,-49.037],[-43.438,-49.037]],"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":[[14.712,0.058],[0,0],[0,0],[38.538,0],[0,-38.538],[0,0],[0,0],[0.026,-14.706],[0,0],[-14.713,-0.058],[0,0],[-0.027,14.712],[0,0]],"o":[[0,0],[0,0],[0,-38.538],[-38.537,0],[0,0],[0,0],[-14.706,0.071],[0,0],[0.026,14.712],[0,0],[14.712,-0.058],[0,0],[-0.032,-14.712]],"v":[[84.286,-49.03],[70.235,-49.03],[70.235,-80.395],[-0.014,-150.643],[-70.262,-80.395],[-70.262,-49.037],[-84.313,-49.037],[-111.111,-22.155],[-111.111,123.762],[-84.286,150.643],[84.286,150.643],[111.111,123.762],[111.111,-22.155]],"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":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":[250,249.999],"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":2,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-138.071,0],[0,-138.071],[138.071,0],[0,138.071]],"o":[[138.071,0],[0,138.071],[-138.071,0],[0,-138.071]],"v":[[0,-250],[250,0],[0,250],[-250,0]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.093999997307,0.352999997606,0.736999990426,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":[250,250],"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":10,"op":85,"st":10,"bm":0},{"ddd":0,"ind":6,"ty":4,"nm":"Ebene 1/Telegram_logo Outlines","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":12,"s":[0]},{"t":22,"s":[100]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"t":12,"s":[250.569,249.351,0],"to":[0,-32.333,0],"ti":[0,32.333,0]},{"i":{"x":0.667,"y":0.667},"o":{"x":0.333,"y":0.333},"t":22,"s":[250.569,55.351,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"t":37,"s":[250.569,55.351,0],"to":[0,-0.225,0],"ti":[0,-32.441,0]},{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"t":40,"s":[250.569,54,0],"to":[0,32.441,0],"ti":[0,-32.667,0]},{"t":47,"s":[250.569,250,0]}],"ix":2},"a":{"a":0,"k":[250,250,0],"ix":1},"s":{"a":1,"k":[{"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":22,"s":[20,20,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":24,"s":[22,22,100]},{"t":26,"s":[20,20,100]}],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0.503,0.157],[0.07,-0.214],[0.204,-0.438],[0.365,-0.638],[0.134,-0.419],[0.195,-0.555],[0.192,-0.556],[0.189,-0.56],[0.192,-0.556],[0.193,-0.56],[0.518,-0.7],[0.13,-0.417],[0.192,-0.556],[0.48,-0.718],[0.324,-0.496],[0.363,-0.481],[0.148,-0.53],[0.094,-0.501],[-7.265,6.819],[0.572,0.484],[0.169,0.053],[0.493,0.425],[0.169,0.05],[0.285,0.27],[0.169,0.05],[0.493,0.425],[0.169,0.051],[0.289,0.263],[0.16,0.067]],"o":[[-0.069,0.215],[-0.254,0.407],[-0.297,0.664],[-0.136,0.409],[-0.346,0.484],[-0.314,0.5],[-0.314,0.5],[-0.314,0.497],[-0.311,0.498],[-0.489,0.712],[-0.135,0.409],[-0.349,0.483],[-0.483,0.717],[-0.197,0.546],[-0.198,0.55],[-0.154,0.521],[-0.299,0.401],[7.602,-6.445],[-0.571,-0.493],[-0.169,-0.053],[-0.495,-0.429],[-0.173,-0.051],[-0.29,-0.274],[-0.172,-0.051],[-0.499,-0.43],[-0.168,-0.053],[-0.292,-0.27],[-0.156,-0.065],[-0.441,-0.309]],"v":[[-26.44,61.836],[-26.714,62.688],[-27.372,63.966],[-28.252,65.974],[-28.651,67.215],[-29.337,68.836],[-30.003,70.461],[-30.666,72.089],[-31.335,73.713],[-32.001,75.338],[-32.979,77.684],[-33.374,78.926],[-34.06,80.547],[-35.021,82.896],[-35.686,84.521],[-36.383,86.143],[-36.819,87.724],[-37.408,89.076],[-15.175,69.096],[-16.901,67.648],[-17.572,67.435],[-19.07,66.172],[-19.751,65.974],[-20.614,65.161],[-21.294,64.963],[-22.796,63.7],[-23.475,63.493],[-24.345,62.698],[-24.976,62.441]],"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":[[2.55,-1.684],[43.425,-29.266],[-0.091,-0.509],[-0.058,-0.369],[0,-0.164],[-0.107,-0.498],[0.005,-0.168],[-0.107,-0.498],[0.001,-0.169],[-0.061,-0.37],[-0.045,-0.366],[-0.035,-0.364],[-0.098,-0.492],[0.001,-0.168],[-0.082,-0.496],[-0.062,-0.37],[-0.008,-0.163],[-0.058,-0.369],[-0.042,-0.362],[-0.042,-0.362],[-0.042,-0.362],[-0.041,-0.365],[-0.046,-0.363],[-0.034,-0.364],[-0.097,-0.492],[-0.002,-0.166],[-0.047,-0.372],[-0.094,-0.491],[-0.003,-0.165],[-0.063,-0.366],[-0.034,-0.364],[-0.098,-0.492],[-0.003,-0.166],[-0.059,-0.365],[-0.041,-0.362],[-0.042,-0.366],[-0.08,-0.492],[-0.053,-0.36],[-0.05,-0.36],[-0.068,-0.367],[0.005,-0.167],[-0.117,-0.37],[-0.053,-0.379],[-0.007,-0.166],[-0.104,-0.497],[0.001,-0.168],[-0.079,-0.496],[-0.065,-0.37],[0.005,-0.171],[-0.142,-0.371],[0.012,-0.174],[-0.11,-0.498],[0.004,-0.167],[-0.053,-0.234],[0,0],[-0.136,0.194],[-0.113,0.308],[-0.353,0.643],[-0.121,0.296],[-0.194,0.548],[-0.197,0.547],[-0.35,0.644],[-0.318,0.496],[-0.262,0.521],[-0.232,0.415],[-0.331,0.494],[-0.357,0.482],[-0.135,0.409],[-0.198,0.551],[-0.196,0.544],[-0.198,0.551],[-0.197,0.548],[-0.197,0.548],[-0.194,0.548],[-0.194,0.549],[-0.197,0.548],[-0.389,0.627],[-0.136,0.411],[-0.206,0.431],[-0.284,0.667],[-0.246,0.415],[-0.099,0.31],[-2.269,2.204],[-27.572,26.188],[-7.924,7.386]],"o":[[-43.405,29.29],[0.114,0.499],[0.044,0.366],[0.003,0.165],[0.104,0.494],[-0.001,0.168],[0.105,0.49],[0.003,0.165],[0.066,0.364],[0.047,0.355],[0.043,0.356],[0.088,0.49],[0.002,0.169],[0.095,0.488],[0.049,0.364],[0.006,0.166],[0.062,0.362],[0.047,0.356],[0.049,0.357],[0.053,0.357],[0.049,0.357],[0.054,0.355],[0.043,0.356],[0.088,0.49],[0.003,0.166],[0.06,0.362],[0.081,0.489],[0.007,0.166],[0.063,0.359],[0.039,0.358],[0.084,0.49],[0.003,0.166],[0.063,0.362],[0.046,0.36],[0.051,0.357],[0.077,0.485],[0.036,0.359],[0.039,0.359],[0.058,0.367],[-0.004,0.171],[0.12,0.363],[0.037,0.372],[0.006,0.166],[0.1,0.494],[-0.001,0.168],[0.092,0.488],[0.052,0.367],[-0.005,0.171],[0.136,0.367],[-0.012,0.173],[0.108,0.49],[-0.004,0.168],[0.053,0.232],[0,0],[0.136,-0.194],[0.103,-0.316],[0.369,-0.64],[0.119,-0.307],[0.322,-0.502],[0.314,-0.504],[0.347,-0.652],[0.192,-0.556],[0.187,-0.554],[0.204,-0.434],[0.189,-0.559],[0.192,-0.559],[0.13,-0.416],[0.344,-0.491],[0.318,-0.499],[0.319,-0.503],[0.318,-0.499],[0.322,-0.499],[0.318,-0.499],[0.325,-0.498],[0.321,-0.499],[0.348,-0.651],[0.13,-0.42],[0.255,-0.41],[0.291,-0.666],[0.203,-0.434],[0.095,-0.314],[2.273,-2.205],[27.4,-26.359],[7.903,-7.407],[-2.609,1.589]],"v":[[69.581,-55.995],[-60.628,31.893],[-60.343,33.409],[-60.185,34.51],[-60.177,35.174],[-59.883,36.663],[-59.898,37.333],[-59.604,38.822],[-59.6,39.488],[-59.413,40.585],[-59.275,41.667],[-59.155,42.745],[-58.901,44.223],[-58.897,44.889],[-58.651,46.367],[-58.488,47.466],[-58.461,48.124],[-58.281,49.217],[-58.15,50.299],[-58.009,51.379],[-57.864,52.458],[-57.727,53.54],[-57.578,54.618],[-57.459,55.701],[-57.205,57.177],[-57.19,57.841],[-57.027,58.939],[-56.784,60.415],[-56.769,61.081],[-56.581,62.174],[-56.469,63.258],[-56.215,64.734],[-56.203,65.398],[-56.019,66.492],[-55.889,67.573],[-55.754,68.654],[-55.541,70.12],[-55.41,71.201],[-55.275,72.279],[-55.086,73.379],[-55.105,74.055],[-54.749,75.151],[-54.613,76.279],[-54.594,76.943],[-54.304,78.43],[-54.308,79.099],[-54.065,80.578],[-53.893,81.68],[-53.917,82.363],[-53.5,83.469],[-53.549,84.161],[-53.246,85.65],[-53.263,86.32],[-53.048,87.253],[-52.905,87.276],[-52.357,86.495],[-52.035,85.559],[-51.124,83.555],[-50.763,82.651],[-50.087,81.029],[-49.421,79.401],[-48.533,77.393],[-47.867,75.768],[-47.233,74.141],[-46.595,72.861],[-45.932,71.232],[-45.242,69.609],[-44.851,68.37],[-44.16,66.742],[-43.499,65.122],[-42.829,63.493],[-42.164,61.872],[-41.501,60.243],[-40.835,58.62],[-40.169,56.995],[-39.5,55.37],[-38.588,53.366],[-38.192,52.118],[-37.54,50.833],[-36.711,48.823],[-36.052,47.542],[-35.755,46.604],[-28.963,39.977],[53.64,-38.702],[77.214,-61.066]],"c":true},"ix":2},"nm":"Path 2","mn":"ADBE Vector Shape - Group","hd":false},{"ind":2,"ty":"sh","ix":3,"ks":{"a":0,"k":{"i":[[-0.542,0.049],[0,0],[-0.49,-0.221],[-0.571,-0.616],[-0.348,-0.825],[0,0],[0.397,-0.926],[0.201,-0.73],[0.321,-0.808],[0.273,-0.652],[0.167,-0.501],[0.541,-1.413],[0.225,-0.651],[0.937,-1.94],[0.165,-0.505],[0.235,-0.656],[0.226,-0.664],[0.343,-0.793],[0.159,-0.509],[0.228,-0.538],[0.228,-0.657],[0.23,-0.66],[0.317,-0.797],[0.249,-0.541],[0.156,-0.499],[0.632,-1.438],[0.159,-0.509],[0.227,-0.538],[0.218,-0.656],[0.336,-0.794],[0.143,-0.4],[0.323,-0.797],[0.266,-0.65],[0.148,-0.388],[0.236,-0.656],[0.221,-0.666],[0.311,-0.68],[0.266,-0.647],[0.541,-1.164],[0.39,-1.177],[0.309,-0.673],[0.263,-0.654],[0.259,-0.648],[0.269,-0.646],[0.142,-0.39],[0.352,-0.798],[0.155,-0.507],[0.315,-0.678],[0.395,-1.172],[0.219,-0.547],[0.33,-0.799],[0.252,-0.649],[0.247,-0.535],[0.161,-0.506],[0.33,-0.799],[0.344,-1.073],[0.333,-0.795],[0.147,-0.393],[0.233,-0.66],[0.635,-1.88],[0.478,-1.195],[0.324,-0.801],[0.266,-0.647],[0.148,-0.388],[0.231,-0.668],[0.22,-0.543],[0.226,-0.662],[0.334,-0.799],[0.147,-0.393],[0.239,-0.656],[0.221,-0.666],[0.309,-0.684],[0.262,-0.651],[0.251,-0.643],[0.242,-0.542],[0.252,-0.649],[0.251,-0.534],[0.163,-0.512],[0.333,-0.795],[0.146,-0.395],[0.233,-0.659],[0.554,-1.338],[0.159,-0.512],[0.228,-0.541],[0.219,-0.659],[0.222,-0.55],[0.605,-1.437],[0.151,-0.395],[0.226,-0.664],[0.405,-1.219],[0.223,-0.661],[0.226,-0.549],[0.223,-0.658],[0.216,-0.544],[0.333,-0.798],[0.143,-0.397],[0.32,-0.801],[0.235,-0.54],[0.269,-0.65],[0.146,-0.396],[0.334,-0.798],[0.49,-1.189],[0.144,-0.4],[0.324,-0.804],[0.232,-0.541],[0.277,-0.645],[0.159,-0.513],[0.304,-0.681],[0.244,-0.535],[0.161,-0.517],[0.309,-0.684],[0.233,-0.533],[0.212,-0.547],[1.665,-0.739],[0.162,-0.017],[1.937,1.116],[0.306,0.234],[0.529,0.257],[0.308,0.255],[0.153,0.044],[0.304,0.273],[0.159,0.049],[0.514,0.426],[0.155,0.048],[0.308,0.274],[0.159,0.045],[0.308,0.274],[0.157,0.041],[0.308,0.274],[0.156,0.044],[0.305,0.274],[0.157,0.048],[0.514,0.423],[0.155,0.051],[0.513,0.423],[0.152,0.049],[0.516,0.427],[0.153,0.047],[0.514,0.425],[0.155,0.048],[0.309,0.274],[0.156,0.044],[0.512,0.422],[0.154,0.051],[0.515,0.423],[0.152,0.05],[0.517,0.426],[0.157,0.044],[0.304,0.273],[0.156,0.044],[0.514,0.426],[0.154,0.052],[0.514,0.425],[0.155,0.048],[0.309,0.274],[0.156,0.044],[0.514,0.426],[0.156,0.048],[0.304,0.273],[0.155,0.047],[0.517,0.426],[0.155,0.048],[0.309,0.273],[0.156,0.045],[0.514,0.426],[0.159,0.049],[0.304,0.274],[0.156,0.044],[0.308,0.274],[0.157,0.041],[0.306,0.274],[0.156,0.044],[0.307,0.277],[0.159,0.045],[0.305,0.272],[0.157,0.041],[0.319,0.293],[2.951,-2.503],[5.689,-5.195],[8.353,-7.1],[1.166,-0.152],[0.988,0.279],[0.459,0.198],[0.404,0.555],[0.31,1.004],[-0.007,0.16],[0.124,0.374],[0.047,0.592],[0.111,0.372],[0.048,0.584],[0.106,0.378],[0.167,1.673],[0.102,0.377],[0.202,2.031],[0.102,0.381],[0.754,6.348],[0.102,0.382],[2.035,14.698],[4.38,2.519],[13.304,7.43],[0.312,0.236],[3.048,1.699],[1.811,1.007],[0,0],[1.169,0.609],[0.308,0.252],[0.156,0.045],[0.307,0.28],[0.176,0.031],[0.373,1.076],[-0.006,0.157],[-0.344,1.252],[-0.183,0.343],[-0.786,0.328],[-5.624,2.07],[-5.679,2.069],[-46.151,16.033],[-37.939,12.926],[-2.99,0.736],[-0.371,0.037]],"o":[[0,0],[0.458,0.261],[0.621,0.563],[0.335,0.826],[0,0],[-0.529,0.866],[-0.217,0.723],[-0.354,0.79],[-0.241,0.662],[-0.173,0.496],[-0.564,1.405],[-0.271,0.638],[-0.83,1.985],[-0.171,0.504],[-0.283,0.64],[-0.264,0.65],[-0.331,0.798],[-0.169,0.508],[-0.252,0.527],[-0.258,0.648],[-0.27,0.646],[-0.33,0.796],[-0.235,0.544],[-0.162,0.495],[-0.63,1.439],[-0.168,0.507],[-0.25,0.531],[-0.254,0.641],[-0.334,0.798],[-0.154,0.398],[-0.34,0.79],[-0.237,0.659],[-0.163,0.386],[-0.269,0.643],[-0.266,0.646],[-0.314,0.679],[-0.229,0.66],[-0.418,1.213],[-0.395,1.172],[-0.319,0.671],[-0.231,0.667],[-0.243,0.651],[-0.242,0.651],[-0.155,0.384],[-0.339,0.804],[-0.164,0.505],[-0.33,0.672],[-0.382,1.175],[-0.244,0.535],[-0.322,0.796],[-0.232,0.653],[-0.238,0.54],[-0.164,0.501],[-0.345,0.789],[-0.423,1.04],[-0.336,0.791],[-0.156,0.386],[-0.275,0.644],[-0.681,1.864],[-0.481,1.193],[-0.338,0.79],[-0.239,0.654],[-0.161,0.382],[-0.27,0.65],[-0.24,0.532],[-0.263,0.646],[-0.333,0.795],[-0.155,0.387],[-0.271,0.641],[-0.263,0.65],[-0.313,0.68],[-0.23,0.664],[-0.238,0.645],[-0.236,0.543],[-0.229,0.658],[-0.237,0.536],[-0.164,0.504],[-0.346,0.789],[-0.152,0.388],[-0.276,0.645],[-0.597,1.322],[-0.168,0.504],[-0.253,0.527],[-0.255,0.641],[-0.241,0.539],[-0.579,1.445],[-0.159,0.386],[-0.271,0.642],[-0.533,1.17],[-0.271,0.639],[-0.244,0.538],[-0.257,0.644],[-0.24,0.535],[-0.325,0.8],[-0.152,0.389],[-0.34,0.79],[-0.224,0.538],[-0.239,0.655],[-0.158,0.383],[-0.339,0.79],[-0.47,1.193],[-0.156,0.387],[-0.339,0.79],[-0.223,0.539],[-0.238,0.652],[-0.171,0.502],[-0.326,0.67],[-0.224,0.543],[-0.169,0.508],[-0.326,0.67],[-0.216,0.537],[-0.214,0.541],[-0.614,1.884],[-0.165,0.018],[-2.35,0.239],[-0.311,-0.243],[-0.533,-0.269],[-0.313,-0.265],[-0.156,-0.045],[-0.311,-0.277],[-0.16,-0.049],[-0.516,-0.429],[-0.156,-0.045],[-0.312,-0.277],[-0.157,-0.041],[-0.31,-0.281],[-0.157,-0.044],[-0.31,-0.281],[-0.157,-0.041],[-0.314,-0.278],[-0.158,-0.047],[-0.515,-0.43],[-0.156,-0.05],[-0.517,-0.426],[-0.156,-0.051],[-0.523,-0.432],[-0.152,-0.047],[-0.519,-0.431],[-0.156,-0.044],[-0.312,-0.277],[-0.155,-0.047],[-0.516,-0.429],[-0.158,-0.052],[-0.517,-0.427],[-0.152,-0.046],[-0.519,-0.431],[-0.156,-0.045],[-0.307,-0.277],[-0.157,-0.044],[-0.521,-0.43],[-0.156,-0.048],[-0.521,-0.427],[-0.156,-0.045],[-0.312,-0.277],[-0.155,-0.048],[-0.516,-0.429],[-0.155,-0.048],[-0.311,-0.277],[-0.161,-0.045],[-0.52,-0.431],[-0.153,-0.043],[-0.312,-0.277],[-0.155,-0.048],[-0.519,-0.433],[-0.159,-0.045],[-0.308,-0.276],[-0.158,-0.041],[-0.314,-0.282],[-0.156,-0.045],[-0.31,-0.28],[-0.156,-0.041],[-0.314,-0.282],[-0.16,-0.044],[-0.31,-0.282],[-0.16,-0.042],[-0.324,-0.301],[-3.088,2.34],[-5.67,5.218],[-8.228,7.247],[-0.926,0.816],[-1.031,-0.017],[-0.452,-0.235],[-0.52,-0.448],[-0.429,-0.97],[0.009,-0.159],[-0.125,-0.386],[-0.048,-0.603],[-0.112,-0.379],[-0.05,-0.592],[-0.108,-0.383],[-0.163,-1.673],[-0.105,-0.382],[-0.198,-2.034],[-0.108,-0.386],[-0.757,-6.347],[-0.107,-0.386],[-1.912,-14.719],[-4.329,-2.6],[-13.282,-7.472],[-0.311,-0.24],[-3.069,-1.661],[-1.702,-1.19],[0,0],[-1.166,-0.623],[-0.311,-0.257],[-0.157,-0.044],[-0.31,-0.284],[-0.177,-0.028],[-0.848,-0.802],[0.006,-0.157],[-0.524,-1.259],[0.192,-0.338],[0.537,-0.654],[5.432,-2.549],[5.67,-2.092],[46.109,-16.154],[37.884,-13.08],[2.92,-0.952],[0.362,-0.035],[0.533,-0.051]],"v":[[147.364,-123.607],[149.071,-123.276],[150.501,-122.564],[152.252,-120.758],[153.311,-118.297],[152.31,-113.137],[151.165,-110.342],[150.557,-108.163],[149.593,-105.743],[148.845,-103.767],[148.341,-102.271],[146.797,-98.001],[146.076,-96.057],[143.72,-90.055],[143.226,-88.536],[142.472,-86.582],[141.752,-84.607],[140.797,-82.197],[140.311,-80.671],[139.603,-79.064],[138.887,-77.103],[138.157,-75.133],[137.241,-72.725],[136.531,-71.091],[136.057,-69.599],[134.346,-65.208],[133.856,-63.68],[133.145,-62.074],[132.451,-60.122],[131.499,-57.708],[131.05,-56.512],[130.11,-54.108],[129.377,-52.137],[128.913,-50.974],[128.172,-49.016],[127.462,-47.039],[126.571,-44.978],[125.859,-43.004],[124.443,-39.428],[123.206,-35.926],[122.316,-33.885],[121.6,-31.891],[120.869,-29.932],[120.128,-27.975],[119.683,-26.816],[118.707,-24.392],[118.237,-22.874],[117.32,-20.822],[116.082,-17.329],[115.398,-15.704],[114.475,-13.292],[113.768,-11.331],[113.055,-9.712],[112.571,-8.197],[111.618,-5.792],[110.428,-2.639],[109.481,-0.238],[109.029,0.934],[108.29,2.902],[106.168,8.456],[104.772,12.052],[103.835,14.461],[103.104,16.421],[102.642,17.578],[101.911,19.557],[101.226,21.174],[100.514,23.143],[99.569,25.552],[99.118,26.724],[98.37,28.68],[97.663,30.661],[96.772,32.723],[96.06,34.703],[95.346,36.645],[94.647,38.276],[93.95,40.242],[93.234,41.854],[92.748,43.383],[91.785,45.781],[91.336,46.96],[90.6,48.928],[88.982,52.965],[88.493,54.492],[87.782,56.099],[87.087,58.055],[86.398,59.689],[84.74,64.06],[84.28,65.237],[83.556,67.203],[82.148,70.789],[81.428,72.747],[80.732,74.38],[80.03,76.338],[79.352,77.96],[78.416,80.376],[77.971,81.553],[77.037,83.958],[76.364,85.583],[75.632,87.553],[75.177,88.724],[74.226,91.132],[72.828,94.723],[72.382,95.901],[71.444,98.313],[70.774,99.94],[70.03,101.896],[69.542,103.422],[68.646,105.471],[67.963,107.096],[67.478,108.633],[66.579,110.687],[65.926,112.302],[65.292,113.94],[61.127,117.408],[60.477,117.482],[54.176,115.323],[53.249,114.604],[51.657,113.805],[50.729,113.021],[50.108,112.841],[49.185,112.016],[48.551,111.827],[47.003,110.549],[46.38,110.363],[45.453,109.536],[44.82,109.363],[43.891,108.531],[43.261,108.359],[42.335,107.527],[41.705,107.357],[40.778,106.527],[40.148,106.34],[38.6,105.066],[37.98,104.862],[36.428,103.591],[35.816,103.396],[34.252,102.112],[33.643,101.922],[32.086,100.641],[31.466,100.456],[30.538,99.632],[29.914,99.448],[28.369,98.174],[27.743,97.967],[26.19,96.695],[25.579,96.5],[24.018,95.219],[23.394,95.034],[22.474,94.21],[21.851,94.026],[20.296,92.745],[19.676,92.544],[18.123,91.27],[17.5,91.085],[16.572,90.26],[15.949,90.076],[14.397,88.797],[13.771,88.607],[12.848,87.784],[12.218,87.596],[10.663,86.315],[10.043,86.132],[9.115,85.307],[8.492,85.122],[6.937,83.839],[6.305,83.648],[5.388,82.826],[4.758,82.654],[3.825,81.822],[3.195,81.65],[2.272,80.818],[1.64,80.648],[0.711,79.815],[0.071,79.638],[-0.849,78.812],[-1.482,78.643],[-2.447,77.758],[-11.244,85.339],[-28.419,100.801],[-53.08,122.56],[-56.458,123.607],[-59.496,123.125],[-60.87,122.49],[-62.342,121.053],[-63.274,118.031],[-63.242,117.393],[-63.613,116.251],[-63.761,114.461],[-64.097,113.337],[-64.253,111.574],[-64.576,110.435],[-65.18,105.43],[-65.489,104.292],[-66.232,98.214],[-66.543,97.065],[-68.984,78.039],[-69.294,76.888],[-75.104,32.732],[-88.291,25.24],[-128.131,2.813],[-129.066,2.098],[-138.199,-3.02],[-143.576,-6.15],[-144.512,-6.857],[-147.992,-8.753],[-148.923,-9.518],[-149.551,-9.701],[-150.475,-10.546],[-151.178,-10.661],[-152.81,-13.639],[-152.787,-14.266],[-152.628,-18.107],[-152.068,-19.128],[-150.093,-20.667],[-133.344,-27.206],[-116.268,-33.297],[22.19,-81.392],[135.876,-120.539],[144.655,-123.348],[145.756,-123.452]],"c":true},"ix":2},"nm":"Path 3","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":0,"k":[0.847000002394,0.910000011968,0.961000031116,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":[249.873,250],"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":5,"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":[[-138.071,0],[0,-138.071],[138.071,0],[0,138.071]],"o":[[138.071,0],[0,138.071],[-138.071,0],[0,-138.071]],"v":[[0,-250],[250,0],[0,250],[-250,0]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.144999994016,0.337000020345,0.685999971278,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":[250,250],"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}],"ip":12,"op":87,"st":12,"bm":0}],"markers":[]}
\ No newline at end of file
diff --git a/res/raw/security.json b/res/raw/security.json
new file mode 100644
index 0000000..1803bf3
--- /dev/null
+++ b/res/raw/security.json
@@ -0,0 +1 @@
+{"v":"4.10.2","fr":24,"ip":0,"op":152,"w":216,"h":106,"nm":"Lotti","ddd":0,"assets":[{"id":"comp_30","layers":[{"ddd":0,"ind":1,"ty":0,"nm":"Scan_Secu","refId":"comp_31","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":8,"s":[0],"e":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":13,"s":[100],"e":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":123,"s":[100],"e":[0]},{"t":127}],"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"n":["0p667_1_0p333_0"],"t":8,"s":[-39],"e":[-97]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":25,"s":[-97],"e":[-97]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"n":["0p667_1_0p333_0"],"t":39,"s":[-97],"e":[0]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":57.261,"s":[0],"e":[0]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"n":["0p667_1_0p333_0"],"t":70,"s":[0],"e":[-103]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":91.913,"s":[-103],"e":[-103]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"n":["0p667_1_0p333_0"],"t":108,"s":[-103],"e":[-39]},{"t":127}],"ix":10},"p":{"a":1,"k":[{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"n":"0p667_1_0p333_0","t":8,"s":[318,161,0],"e":[274,86,0],"to":[-7.33333349227905,-12.5,0],"ti":[7.33333349227905,12.5,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"n":"0p833_0p833_0p167_0p167","t":25,"s":[274,86,0],"e":[274,86,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"n":"0p667_1_0p333_0","t":39,"s":[274,86,0],"e":[147,127,0],"to":[-21.1666660308838,6.83333349227905,0],"ti":[21.1666660308838,-6.83333349227905,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"n":"0p833_0p833_0p167_0p167","t":57.261,"s":[147,127,0],"e":[147,127,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"n":"0p667_1_0p333_0","t":70,"s":[147,127,0],"e":[253,172,0],"to":[17.6666660308838,7.5,0],"ti":[-17.6666660308838,-7.5,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"n":"0p833_0p833_0p167_0p167","t":91.913,"s":[253,172,0],"e":[253,172,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"n":"0p667_1_0p333_0","t":108,"s":[253,172,0],"e":[325,161,0],"to":[12,-1.83333337306976,0],"ti":[-12,1.83333337306976,0]},{"t":127}],"ix":2},"a":{"a":0,"k":[104.838,198.235,0],"ix":1},"s":{"a":0,"k":[52.308,52.308,100],"ix":6}},"ao":0,"w":311,"h":320,"ip":0,"op":360,"st":0,"bm":0},{"ddd":0,"ind":2,"ty":0,"nm":"Ombre","parent":1,"refId":"comp_32","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":8,"s":[0],"e":[10]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":22,"s":[10],"e":[10]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":116,"s":[10],"e":[0]},{"t":127}],"ix":11},"r":{"a":0,"k":38,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"n":"0p833_0p833_0p167_0p167","t":25,"s":[-31.014,-45.588,0],"e":[-31.014,-45.588,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"n":"0p667_1_0p333_0","t":39,"s":[-31.014,-45.588,0],"e":[19.986,9.412,0],"to":[8.5,9.16666698455811,0],"ti":[-8.5,-9.16666698455811,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"n":"0p833_0p833_0p167_0p167","t":57,"s":[19.986,9.412,0],"e":[19.986,9.412,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"n":"0p667_1_0p333_0","t":70,"s":[19.986,9.412,0],"e":[-13.014,-24.588,0],"to":[-5.5,-5.66666650772095,0],"ti":[5.5,5.66666650772095,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"n":"0p833_0p833_0p167_0p167","t":91,"s":[-13.014,-24.588,0],"e":[-13.014,-24.588,0],"to":[0,0,0],"ti":[0,0,0]},{"t":108}],"ix":2},"a":{"a":0,"k":[216,106,0],"ix":1},"s":{"a":0,"k":[191.176,191.176,100],"ix":6}},"ao":0,"w":432,"h":212,"ip":0,"op":360,"st":0,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":"Calque de forme 2","parent":1,"td":1,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[236.75,177.206,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[191.176,191.176,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[61.277,61.277],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"Tracé d'ellipse 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"fl","c":{"a":0,"k":[0.464383981742,0.098353995529,0.098353995529,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fond 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[-43.861,-11.861],"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":"Transformer "}],"nm":"Ellipse 1","np":3,"cix":2,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":360,"st":0,"bm":0},{"ddd":0,"ind":4,"ty":0,"nm":"ShieldRougeCheck","tt":1,"refId":"comp_33","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[216,106,0],"ix":2},"a":{"a":0,"k":[216,106,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"w":432,"h":212,"ip":0,"op":360,"st":0,"bm":0},{"ddd":0,"ind":5,"ty":0,"nm":"ShieldBleuCheck","refId":"comp_35","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[216,106,0],"ix":2},"a":{"a":0,"k":[216,106,0],"ix":1},"s":{"a":0,"k":[97.906,97.906,100],"ix":6}},"ao":0,"w":432,"h":212,"ip":0,"op":360,"st":0,"bm":0},{"ddd":0,"ind":6,"ty":0,"nm":"forme","refId":"comp_37","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[216,119,0],"ix":2},"a":{"a":0,"k":[349.5,384,0],"ix":1},"s":{"a":0,"k":[36,36,100],"ix":6}},"ao":0,"w":699,"h":768,"ip":0,"op":360,"st":0,"bm":0}]},{"id":"comp_31","layers":[{"ddd":0,"ind":1,"ty":4,"nm":"reflet_01 Silhouettes","sr":1,"ks":{"o":{"a":0,"k":61,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[184.209,138.922,0],"ix":2},"a":{"a":0,"k":[6.425,6.793,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":[[1.048,0],[1.047,1.537],[0.627,0.794],[-2.343,1.853],[-1.854,-2.345],[-0.712,-1.046],[2.469,-1.681]],"o":[[-1.73,0],[-0.568,-0.835],[-1.853,-2.343],[2.343,-1.854],[0.786,0.994],[1.682,2.47],[-0.932,0.635]],"v":[[1.02,6.792],[-3.456,4.427],[-5.258,1.973],[-4.371,-5.625],[3.228,-4.738],[5.486,-1.663],[4.06,5.853]],"c":true},"ix":2},"nm":"Tracé 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,"nm":"Fond 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[6.425,6.792],"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":"Transformer "}],"nm":"Groupe 1","np":2,"cix":2,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":360,"st":0,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"reflet_02 Silhouettes","sr":1,"ks":{"o":{"a":0,"k":61,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[162.67,122.767,0],"ix":2},"a":{"a":0,"k":[10.161,7.228,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":[[1.967,0],[0.789,0.403],[2.909,0.767],[-0.762,2.888],[-2.888,-0.762],[-3.365,-1.721],[1.36,-2.66]],"o":[[-0.829,0],[-2.677,-1.369],[-2.889,-0.763],[0.762,-2.889],[3.656,0.964],[2.66,1.36],[-0.957,1.871]],"v":[[4.745,7.227],[2.287,6.633],[-6.131,3.414],[-9.981,-3.197],[-3.37,-7.047],[7.212,-3],[9.566,4.279]],"c":true},"ix":2},"nm":"Tracé 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,"nm":"Fond 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[10.161,7.227],"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":"Transformer "}],"nm":"Groupe 1","np":2,"cix":2,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":360,"st":0,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":"contour Silhouettes","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[160.595,156.994,0],"ix":2},"a":{"a":0,"k":[74.11,75.038,0],"ix":1},"s":{"a":0,"k":[86.079,86.079,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-0.225,4.667],[-8.081,11.063],[-18.261,2.844],[-14.923,-10.9],[22.503,-30.807],[30.806,22.502],[2.844,18.261]],"o":[[0.644,-13.376],[10.901,-14.924],[18.26,-2.843],[30.804,22.503],[-22.503,30.804],[-14.924,-10.901],[-0.737,-4.722]],"v":[[-73.634,-7.05],[-60.382,-44.393],[-15.16,-71.945],[36.299,-59.452],[51.357,37.229],[-45.322,52.286],[-72.874,7.064]],"c":true},"ix":2},"nm":"Tracé 2","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"tr","p":{"a":0,"k":[74.109,75.038],"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":"Transformer "}],"nm":"Groupe 1","np":1,"cix":2,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"st","c":{"a":0,"k":[0,0.874509811401,0.678431391716,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":26,"ix":5},"lc":1,"lj":1,"ml":4,"nm":"Contour 1","mn":"ADBE Vector Graphic - Stroke","hd":false}],"ip":0,"op":360,"st":0,"bm":0},{"ddd":0,"ind":4,"ty":4,"nm":"verre Silhouettes","sr":1,"ks":{"o":{"a":0,"k":10,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[156.082,153.411,0],"ix":2},"a":{"a":0,"k":[58.433,58.432,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":[[31.888,4.932],[-4.931,31.888],[-31.888,-4.931],[4.932,-31.887]],"o":[[-31.888,-4.932],[4.932,-31.888],[31.888,4.932],[-4.932,31.888]],"v":[[-8.93,57.738],[-57.739,-8.929],[8.929,-57.738],[57.737,8.929]],"c":true},"ix":2},"nm":"Tracé 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,"nm":"Fond 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[58.433,58.432],"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":"Transformer "}],"nm":"Groupe 1","np":2,"cix":2,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":360,"st":0,"bm":0},{"ddd":0,"ind":5,"ty":4,"nm":"manche Silhouettes","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[88.011,215.279,0],"ix":2},"a":{"a":0,"k":[34.452,31.803,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":[[3.353,0],[2.777,3.086],[-5.774,5.197],[0,0],[-5.196,-5.775],[5.774,-5.196],[0,0]],"o":[[-3.849,0],[-5.196,-5.775],[0,0],[5.774,-5.196],[5.197,5.774],[0,0],[-2.688,2.419]],"v":[[-18.548,31.553],[-29.007,26.898],[-27.961,7.033],[9.143,-26.357],[29.006,-25.311],[27.96,-5.448],[-9.144,27.944]],"c":true},"ix":2},"nm":"Tracé 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0,0.666999966491,0.569000004787,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fond 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[34.453,31.803],"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":"Transformer "}],"nm":"Groupe 1","np":2,"cix":2,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":360,"st":0,"bm":0}]},{"id":"comp_32","layers":[{"ddd":0,"ind":1,"ty":4,"nm":"contour Silhouettes","parent":2,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[107.036,-26.481,0],"ix":2},"a":{"a":0,"k":[74.11,75.038,0],"ix":1},"s":{"a":0,"k":[86.079,86.079,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-0.225,4.667],[-8.081,11.063],[-18.261,2.844],[-14.923,-10.9],[22.503,-30.807],[30.806,22.502],[2.844,18.261]],"o":[[0.644,-13.376],[10.901,-14.924],[18.26,-2.843],[30.804,22.503],[-22.503,30.804],[-14.924,-10.901],[-0.737,-4.722]],"v":[[-73.634,-7.05],[-60.382,-44.393],[-15.16,-71.945],[36.299,-59.452],[51.357,37.229],[-45.322,52.286],[-72.874,7.064]],"c":true},"ix":2},"nm":"Tracé 2","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"tr","p":{"a":0,"k":[74.109,75.038],"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":"Transformer "}],"nm":"Groupe 1","np":1,"cix":2,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"st","c":{"a":0,"k":[0.087469361722,0.087469361722,0.087469361722,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":26,"ix":5},"lc":1,"lj":1,"ml":4,"nm":"Contour 1","mn":"ADBE Vector Graphic - Stroke","hd":false}],"ip":0,"op":360,"st":0,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"manche Silhouettes","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":-39,"ix":10},"p":{"a":0,"k":[328.258,165.998,0],"ix":2},"a":{"a":0,"k":[34.452,31.803,0],"ix":1},"s":{"a":0,"k":[48.983,48.983,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[3.353,0],[2.777,3.086],[-5.774,5.197],[0,0],[-5.196,-5.775],[5.774,-5.196],[0,0]],"o":[[-3.849,0],[-5.196,-5.775],[0,0],[5.774,-5.196],[5.197,5.774],[0,0],[-2.688,2.419]],"v":[[-18.548,31.553],[-29.007,26.898],[-27.961,7.033],[9.143,-26.357],[29.006,-25.311],[27.96,-5.448],[-9.144,27.944]],"c":true},"ix":2},"nm":"Tracé 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.011443014257,0.011443014257,0.011443014257,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fond 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[34.453,31.803],"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":"Transformer "}],"nm":"Groupe 1","np":2,"cix":2,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":360,"st":0,"bm":0}]},{"id":"comp_33","layers":[{"ddd":0,"ind":1,"ty":4,"nm":"croix01/Scan_secu Silhouettes","parent":3,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[109.635,108.539,0],"ix":2},"a":{"a":0,"k":[16,16,0],"ix":1},"s":{"a":0,"k":[106.371,106.371,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-12.652,-12.674],[12.652,12.674]],"c":false},"ix":2},"nm":"Tracé 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[1,0.426999978458,0.313999998803,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":6.291,"ix":5},"lc":2,"lj":1,"ml":10,"nm":"Contour 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[15.798,15.819],"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":"Transformer "}],"nm":"Groupe 1","np":2,"cix":2,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":360,"st":0,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"croix02/Scan_secu Silhouettes","parent":3,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[109.635,108.539,0],"ix":2},"a":{"a":0,"k":[16,16,0],"ix":1},"s":{"a":0,"k":[106.371,106.371,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[12.652,-12.674],[-12.652,12.674]],"c":false},"ix":2},"nm":"Tracé 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[1,0.426999978458,0.313999998803,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":6.291,"ix":5},"lc":2,"lj":1,"ml":10,"nm":"Contour 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[15.798,15.819],"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":"Transformer "}],"nm":"Groupe 1","np":2,"cix":2,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":360,"st":0,"bm":0},{"ddd":0,"ind":3,"ty":0,"nm":"Shield_Rouge","refId":"comp_34","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[213,105,0],"ix":2},"a":{"a":0,"k":[110,110,0],"ix":1},"s":{"a":0,"k":[136.888,136.888,100],"ix":6}},"ao":0,"w":220,"h":220,"ip":0,"op":360,"st":0,"bm":0}]},{"id":"comp_34","layers":[{"ddd":0,"ind":1,"ty":4,"nm":"Shield05 Silhouettes","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[89.919,112.127,0],"ix":2},"a":{"a":0,"k":[20,44.748,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],[0,18.094],[0,0],[-5.943,2.301],[0,0],[17.054,-0.63],[0,-0.926],[0,0],[-18.806,-11.462],[0,0],[0,0]],"o":[[-16.856,-10.273],[0,0],[12.981,-1.426],[0,0],[0,0],[-1.04,0.038],[0,0],[0,20.188],[0,0],[0,0],[0,0]],"v":[[14.38,33.485],[-12.539,-11.818],[-12.539,-29.052],[19.75,-37.499],[19.75,-44.498],[-17.888,-34.969],[-19.75,-33.252],[-19.75,-11.818],[10.286,38.73],[19.75,44.498],[19.75,36.757]],"c":true},"ix":2},"nm":"Tracé 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.877999997606,0.356999984442,0.255000005984,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fond 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[20,44.748],"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":"Transformer "}],"nm":"Groupe 1","np":2,"cix":2,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":360,"st":0,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"ShieldB03 Silhouettes","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[109.669,112.049,0],"ix":2},"a":{"a":0,"k":[39.75,44.674,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],[17.054,-0.624],[0,-0.918],[0,0],[-18.807,-11.443],[0,0],[0,0],[0,20.154],[0,0],[0.183,-0.009]],"o":[[0,0],[-1.04,0.038],[0,0],[0,20.154],[0,0],[0,0],[18.808,-11.443],[0,0],[0.041,-0.363],[-17.054,-0.624]],"v":[[0,-44.424],[-37.638,-34.979],[-39.5,-33.276],[-39.5,-11.797],[-9.464,38.667],[0,44.424],[9.463,38.667],[39.5,-11.797],[39.5,-34.49],[39.358,-34.979]],"c":true},"ix":2},"nm":"Tracé 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[1,0.439215689898,0.301960796118,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":6.5,"ix":5},"lc":1,"lj":2,"nm":"Contour 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[39.75,44.674],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[92.673,92.673],"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":"Transformer "}],"nm":"Groupe 1","np":2,"cix":2,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":360,"st":0,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":"Shield04 Silhouettes","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[90.949,112.352,0],"ix":2},"a":{"a":0,"k":[18.969,43.611,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.919],[0,0],[-18.807,-11.462],[0,0],[0,0],[17.055,-0.626]],"o":[[0,0],[0,20.188],[0,0],[0,0],[0,0],[-1.039,0.038]],"v":[[-18.719,-32.195],[-18.719,-12.044],[9.256,37.594],[18.719,43.361],[18.719,-43.361],[-16.858,-33.899]],"c":true},"ix":2},"nm":"Tracé 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.663000009574,0.289999988032,0.2,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fond 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[18.969,43.611],"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":"Transformer "}],"nm":"Groupe 1","np":2,"cix":2,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":360,"st":0,"bm":0},{"ddd":0,"ind":4,"ty":4,"nm":"Shield03 Silhouettes","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[109.669,111.948,0],"ix":2},"a":{"a":0,"k":[36.145,41.058,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],[0,19.142],[0,0],[-5.067,2.037],[-14.63,-0.921],[0,0],[17.832,-10.868],[0,0]],"o":[[-17.832,-10.867],[0,0],[14.63,-0.921],[5.067,2.037],[0,0],[0,19.142],[0,0],[0,0]],"v":[[-7.417,36.286],[-35.895,-11.639],[-35.895,-31.758],[0,-40.808],[35.895,-31.758],[35.895,-11.639],[7.417,36.288],[0,40.808]],"c":true},"ix":2},"nm":"Tracé 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.732999973671,0.313999998803,0.211999990426,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fond 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[36.145,41.058],"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":"Transformer "}],"nm":"Groupe 1","np":2,"cix":2,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":360,"st":0,"bm":0},{"ddd":0,"ind":5,"ty":4,"nm":"Shield02 Silhouettes","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[109.669,112.125,0],"ix":2},"a":{"a":0,"k":[39.75,44.75,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],[17.054,-0.625],[0,-0.919],[0,0],[-18.807,-11.461],[0,0],[0,0],[0,20.188],[0,0],[1.04,0.039]],"o":[[0,0],[-1.04,0.039],[0,0],[0,20.188],[0,0],[0,0],[18.808,-11.461],[0,0],[0,-0.919],[-17.054,-0.625]],"v":[[0,-44.5],[-37.638,-35.039],[-39.5,-33.333],[-39.5,-11.816],[-9.464,38.732],[0,44.5],[9.463,38.732],[39.5,-11.816],[39.5,-33.333],[37.638,-35.039]],"c":true},"ix":2},"nm":"Tracé 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.732999973671,0.313999998803,0.211999990426,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fond 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[39.75,44.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":"Transformer "}],"nm":"Groupe 1","np":2,"cix":2,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":360,"st":0,"bm":0},{"ddd":0,"ind":6,"ty":4,"nm":"Shield01 Silhouettes","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[89.919,112.125,0],"ix":2},"a":{"a":0,"k":[20,44.75,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],[0,0],[0,20.188],[0,0],[-1.04,0.039],[0,0]],"o":[[0,0],[-18.807,-11.461],[0,0],[0,-0.919],[17.054,-0.625],[0,0]],"v":[[19.75,44.5],[10.286,38.732],[-19.75,-11.816],[-19.75,-33.333],[-17.888,-35.039],[19.75,-44.5]],"c":false},"ix":2},"nm":"Tracé 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.732999973671,0.313999998803,0.211999990426,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fond 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[20,44.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":"Transformer "}],"nm":"Groupe 1","np":2,"cix":2,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":360,"st":0,"bm":0}]},{"id":"comp_35","layers":[{"ddd":0,"ind":1,"ty":4,"nm":"check/Scan_secu Silhouettes","parent":2,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[112.922,107.808,0],"ix":2},"a":{"a":0,"k":[32.5,29.5,0],"ix":1},"s":{"a":0,"k":[106.371,106.371,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0]],"v":[[-16.359,-1.692],[-3.271,13.689],[16.359,-13.689]],"c":false},"ix":2},"nm":"Tracé 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0.136999990426,0.187999994615,0.536999990426,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":6.286,"ix":5},"lc":2,"lj":1,"ml":10,"nm":"Contour 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[32.073,29.403],"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":"Transformer "}],"nm":"Groupe 1","np":2,"cix":2,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":360,"st":0,"bm":0},{"ddd":0,"ind":2,"ty":0,"nm":"Shield_Bleu","refId":"comp_36","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[213,105,0],"ix":2},"a":{"a":0,"k":[110,110,0],"ix":1},"s":{"a":0,"k":[136.888,136.888,100],"ix":6}},"ao":0,"w":220,"h":220,"ip":0,"op":360,"st":0,"bm":0}]},{"id":"comp_36","layers":[{"ddd":0,"ind":1,"ty":4,"nm":"ShieldB04 Silhouettes","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[89.919,112.051,0],"ix":2},"a":{"a":0,"k":[20,44.672,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],[0,18.064],[0,0],[-5.943,2.298],[0,0],[17.054,-0.629],[0,-0.924],[0,0],[-18.806,-11.442],[0,0],[0,0]],"o":[[-16.856,-10.256],[0,0],[12.981,-1.423],[0,0],[0,0],[-1.04,0.038],[0,0],[0,20.154],[0,0],[0,0],[0,0]],"v":[[14.38,33.428],[-12.539,-11.798],[-12.539,-29.003],[19.75,-37.436],[19.75,-44.422],[-17.888,-34.909],[-19.75,-33.195],[-19.75,-11.798],[10.286,38.664],[19.75,44.422],[19.75,36.696]],"c":true},"ix":2},"nm":"Tracé 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.090000002992,0.122000002394,0.349000010771,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fond 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[20,44.672],"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":"Transformer "}],"nm":"Groupe 1","np":2,"cix":2,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":360,"st":0,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"ShieldB03 Silhouettes","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[109.669,112.049,0],"ix":2},"a":{"a":0,"k":[39.75,44.674,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],[17.054,-0.624],[0,-0.918],[0,0],[-18.807,-11.443],[0,0],[0,0],[0,20.154],[0,0],[1.04,0.038]],"o":[[0,0],[-1.04,0.038],[0,0],[0,20.154],[0,0],[0,0],[18.808,-11.443],[0,0],[0,-0.918],[-17.054,-0.624]],"v":[[0,-44.424],[-37.638,-34.979],[-39.5,-33.276],[-39.5,-11.797],[-9.464,38.667],[0,44.424],[9.463,38.667],[39.5,-11.797],[39.5,-33.276],[37.638,-34.979]],"c":true},"ix":2},"nm":"Tracé 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0.137254908681,0.188235297799,0.537254929543,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":7,"ix":5},"lc":1,"lj":1,"ml":4,"nm":"Contour 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[39.75,44.674],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[92.673,92.673],"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":"Transformer "}],"nm":"Groupe 1","np":2,"cix":2,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":360,"st":0,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":"ShieldB02 Silhouettes","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[90.949,112.277,0],"ix":2},"a":{"a":0,"k":[18.969,43.538,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.918],[0,0],[-18.807,-11.442],[0,0],[0,0],[17.054,-0.624]],"o":[[0,0],[0,20.154],[0,0],[0,0],[0,0],[-1.04,0.038]],"v":[[-18.719,-32.14],[-18.719,-12.023],[9.256,37.53],[18.719,43.288],[18.719,-43.288],[-16.857,-33.843]],"c":true},"ix":2},"nm":"Tracé 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.016000001571,0.416000007181,0.925,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fond 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[18.969,43.538],"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":"Transformer "}],"nm":"Groupe 1","np":2,"cix":2,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":360,"st":0,"bm":0},{"ddd":0,"ind":4,"ty":4,"nm":"ShieldB01 Silhouettes","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[109.669,111.873,0],"ix":2},"a":{"a":0,"k":[36.145,40.988,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],[0,19.109],[0,0],[-5.067,2.033],[-14.631,-0.92],[0,0],[17.832,-10.85],[0,0]],"o":[[-17.832,-10.85],[0,0],[14.63,-0.92],[5.067,2.033],[0,0],[0,19.109],[0,0],[0,0]],"v":[[-7.417,36.225],[-35.895,-11.619],[-35.895,-31.704],[0,-40.738],[35.895,-31.704],[35.895,-11.619],[7.417,36.225],[0,40.738]],"c":true},"ix":2},"nm":"Tracé 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0,0.430999995213,0.976000019148,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fond 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[36.145,40.988],"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":"Transformer "}],"nm":"Groupe 1","np":2,"cix":2,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":360,"st":0,"bm":0}]},{"id":"comp_37","layers":[{"ddd":0,"ind":1,"ty":4,"nm":"Forme Silhouettes - Groupe 1","parent":7,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":0,"s":[0],"e":[-360]},{"t":151.68}],"ix":10},"p":{"a":0,"k":[306.246,367.376,0],"ix":2},"a":{"a":0,"k":[306.246,367.376,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":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"n":"0p833_0p833_0p167_0p167","t":0,"s":[{"i":[[-15.884,-86.323],[66.274,-12.195],[15.884,86.323],[-66.275,12.196]],"o":[[15.884,86.323],[-66.275,12.195],[-15.884,-86.324],[66.274,-12.195]],"v":[[120.001,-22.081],[28.761,156.302],[-120.001,22.082],[-28.76,-156.302]],"c":true}],"e":[{"i":[[-15.884,-86.323],[66.274,-12.195],[15.884,86.323],[-66.275,12.196]],"o":[[15.884,86.323],[-66.275,12.195],[-15.884,-86.324],[66.274,-12.195]],"v":[[180.622,106.8],[67.432,226.342],[-107.305,58.575],[-14.921,-131.962]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"n":"0p833_0p833_0p167_0p167","t":12.48,"s":[{"i":[[-15.884,-86.323],[66.274,-12.195],[15.884,86.323],[-66.275,12.196]],"o":[[15.884,86.323],[-66.275,12.195],[-15.884,-86.324],[66.274,-12.195]],"v":[[180.622,106.8],[67.432,226.342],[-107.305,58.575],[-14.921,-131.962]],"c":true}],"e":[{"i":[[-3.955,-86.633],[66.274,-12.195],[15.884,86.323],[-66.275,12.196]],"o":[[3.758,88.135],[-66.275,12.195],[-15.884,-86.324],[66.274,-12.195]],"v":[[195.967,3.609],[58.585,162.383],[-137.67,57.193],[-41.019,-108.267]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"n":"0p833_0p833_0p167_0p167","t":32.64,"s":[{"i":[[-3.955,-86.633],[66.274,-12.195],[15.884,86.323],[-66.275,12.196]],"o":[[3.758,88.135],[-66.275,12.195],[-15.884,-86.324],[66.274,-12.195]],"v":[[195.967,3.609],[58.585,162.383],[-137.67,57.193],[-41.019,-108.267]],"c":true}],"e":[{"i":[[11.382,-87.031],[66.274,-12.195],[15.884,86.323],[-66.275,12.196]],"o":[[-11.831,90.465],[-66.275,12.195],[-15.884,-86.324],[66.274,-12.195]],"v":[[178.998,-27.17],[54.395,184.773],[-111.508,46.495],[-12.59,-124.904]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"n":"0p833_0p833_0p167_0p167","t":58.56,"s":[{"i":[[11.382,-87.031],[66.274,-12.195],[15.884,86.323],[-66.275,12.196]],"o":[[-11.831,90.465],[-66.275,12.195],[-15.884,-86.324],[66.274,-12.195]],"v":[[178.998,-27.17],[54.395,184.773],[-111.508,46.495],[-12.59,-124.904]],"c":true}],"e":[{"i":[[-15.884,-86.323],[66.274,-12.195],[15.884,86.323],[-66.275,12.196]],"o":[[15.884,86.323],[-66.275,12.195],[-15.884,-86.324],[66.274,-12.195]],"v":[[140.487,21.472],[41.358,143.205],[-115.711,34.414],[-10.26,-117.846]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"n":"0p833_0p833_0p167_0p167","t":104.64,"s":[{"i":[[-15.884,-86.323],[66.274,-12.195],[15.884,86.323],[-66.275,12.196]],"o":[[15.884,86.323],[-66.275,12.195],[-15.884,-86.324],[66.274,-12.195]],"v":[[140.487,21.472],[41.358,143.205],[-115.711,34.414],[-10.26,-117.846]],"c":true}],"e":[{"i":[[-15.884,-86.323],[66.274,-12.195],[15.884,86.323],[-66.275,12.196]],"o":[[15.884,86.323],[-66.275,12.195],[-15.884,-86.324],[66.274,-12.195]],"v":[[120.001,-22.081],[28.761,156.302],[-120.001,22.082],[-28.76,-156.302]],"c":true}]},{"t":151.68}],"ix":2},"nm":"Tracé 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0,0.705999995213,0.6,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fond 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[321.472,381.97],"ix":2},"a":{"a":0,"k":[15.227,14.594],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":0,"s":[0],"e":[720]},{"t":151.68}],"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transformer "}],"nm":"Groupe 1","np":2,"cix":2,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-83.52,"op":276.48,"st":-83.52,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"Forme Silhouettes - Groupe 2","parent":7,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":0,"s":[0],"e":[-360]},{"t":151.68}],"ix":10},"p":{"a":0,"k":[322.054,426.903,0],"ix":2},"a":{"a":0,"k":[322.054,426.903,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":[[-4.792,-0.754],[0.748,-4.755],[4.791,0.754],[-0.748,4.755]],"o":[[4.792,0.754],[-0.748,4.754],[-4.792,-0.754],[0.748,-4.755]],"v":[[1.354,-8.61],[8.676,1.365],[-1.354,8.61],[-8.676,-1.365]],"c":true},"ix":2},"nm":"Tracé 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.224000010771,1,0.337000020345,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fond 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[321.472,381.97],"ix":2},"a":{"a":0,"k":[-92.582,175.067],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":0,"s":[720],"e":[360]},{"t":151.68}],"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transformer "}],"nm":"Groupe 2","np":2,"cix":2,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-83.52,"op":276.48,"st":-83.52,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":"Forme Silhouettes - Groupe 3","parent":7,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":0,"s":[0],"e":[-360]},{"t":151.68}],"ix":10},"p":{"a":0,"k":[326.56,400.451,0],"ix":2},"a":{"a":0,"k":[326.56,400.451,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":[[-19.304,-3.036],[3.014,-19.158],[19.304,3.036],[-3.013,19.157]],"o":[[19.304,3.036],[-3.013,19.157],[-19.304,-3.036],[3.013,-19.157]],"v":[[5.456,-34.687],[34.952,5.498],[-5.456,34.687],[-34.954,-5.498]],"c":true},"ix":2},"nm":"Tracé 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0,0.430999995213,0.976000019148,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fond 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[314.813,395.595],"ix":2},"a":{"a":0,"k":[178.252,-110.855],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":0,"s":[0],"e":[-360]},{"t":151.68}],"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transformer "}],"nm":"Groupe 3","np":2,"cix":2,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-83.52,"op":276.48,"st":-83.52,"bm":0},{"ddd":0,"ind":4,"ty":4,"nm":"Forme Silhouettes - Groupe 4","parent":7,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":0,"s":[0],"e":[-360]},{"t":151.68}],"ix":10},"p":{"a":0,"k":[328.538,390.521,0],"ix":2},"a":{"a":0,"k":[328.538,390.521,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":[[-14.054,-2.211],[2.193,-13.947],[14.054,2.21],[-2.194,13.946]],"o":[[14.054,2.211],[-2.194,13.947],[-14.055,-2.211],[2.193,-13.947]],"v":[[3.973,-25.253],[25.448,4.003],[-3.971,25.254],[-25.446,-4.002]],"c":true},"ix":2},"nm":"Tracé 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0,0.430999995213,0.976000019148,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fond 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[314.333,387.945],"ix":2},"a":{"a":0,"k":[211.877,-151.982],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":319.417,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transformer "}],"nm":"Groupe 4","np":2,"cix":2,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-83.52,"op":276.48,"st":-83.52,"bm":0},{"ddd":0,"ind":5,"ty":4,"nm":"Forme Silhouettes - Groupe 5","parent":7,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":0,"s":[0],"e":[-360]},{"t":151.68}],"ix":10},"p":{"a":0,"k":[322.85,392.409,0],"ix":2},"a":{"a":0,"k":[322.85,392.409,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":[[-7.515,-1.182],[1.173,-7.458],[7.515,1.182],[-1.173,7.458]],"o":[[7.515,1.182],[-1.173,7.457],[-7.515,-1.181],[1.173,-7.458]],"v":[[2.124,-13.503],[13.607,2.141],[-2.124,13.503],[-13.607,-2.14]],"c":true},"ix":2},"nm":"Tracé 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0,0.917999985639,0.732999973671,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fond 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[460.85,174.409],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":0,"s":[0],"e":[-360]},{"t":151.68}],"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transformer "}],"nm":"Groupe 5","np":2,"cix":2,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-83.52,"op":276.48,"st":-83.52,"bm":0},{"ddd":0,"ind":6,"ty":4,"nm":"Forme Silhouettes - Groupe 6","parent":7,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":0,"s":[0],"e":[-360]},{"t":151.68}],"ix":10},"p":{"a":0,"k":[329.838,401.84,0],"ix":2},"a":{"a":0,"k":[329.838,401.84,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":[[-86.707,-13.639],[10.515,-66.846],[86.706,13.639],[-10.514,66.845]],"o":[[86.707,13.638],[-10.515,66.846],[-86.707,-13.637],[10.514,-66.847]],"v":[[19.038,-121.036],[156.995,24.694],[-19.039,121.035],[-156.996,-24.694]],"c":true},"ix":2},"nm":"Tracé 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.211999990426,0.779999976065,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fond 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[329.839,401.84],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":0,"s":[-720],"e":[-720]},{"t":151.68}],"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transformer "}],"nm":"Groupe 6","np":2,"cix":2,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-83.52,"op":276.48,"st":-83.52,"bm":0},{"ddd":0,"ind":7,"ty":4,"nm":"Forme Silhouettes","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":0,"s":[0],"e":[-360]},{"t":151.68}],"ix":10},"p":{"a":0,"k":[328,359,0],"ix":2},"a":{"a":0,"k":[313.46,391.641,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":[[43.887,-76.013],[58.602,33.834],[-43.886,76.013],[-58.602,-33.834]],"o":[[-43.886,76.014],[-58.602,-33.834],[43.886,-76.013],[58.603,33.834]],"v":[[106.109,61.262],[-79.463,137.634],[-106.109,-61.262],[79.462,-137.634]],"c":true},"ix":2},"nm":"Tracé 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0,0.875,0.677999997606,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fond 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[332.502,397.401],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":0,"s":[0],"e":[-360]},{"t":151.68}],"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transformer "}],"nm":"Groupe 7","np":2,"cix":2,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-83.52,"op":276.48,"st":-83.52,"bm":0}]}],"layers":[{"ddd":0,"ind":1,"ty":0,"nm":"Lotti_HQ","refId":"comp_30","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[108,53,0],"ix":2},"a":{"a":0,"k":[216,106,0],"ix":1},"s":{"a":0,"k":[50.107,50.107,100],"ix":6}},"ao":0,"w":432,"h":212,"ip":0,"op":360,"st":0,"bm":0}]}
\ No newline at end of file
diff --git a/res/raw/sound.json b/res/raw/sound.json
new file mode 100644
index 0000000..788fc65
--- /dev/null
+++ b/res/raw/sound.json
@@ -0,0 +1 @@
+{"v":"5.5.7","meta":{"g":"LottieFiles AE 0.1.20","a":"Roger.T","k":"","d":"","tc":""},"fr":25,"ip":0,"op":75,"w":500,"h":500,"nm":"Sound","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"Shape Layer 3","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[250,250,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":[{"d":1,"ty":"el","s":{"a":0,"k":[75.5,75.5],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"st","c":{"a":0,"k":[0.686274509804,0.796078491211,0.909803981407,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":2,"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.25,-92.75],"ix":2},"a":{"a":0,"k":[0,-1],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.833,0.833],"y":[0.833,0.833]},"o":{"x":[0.167,0.167],"y":[0.167,0.167]},"t":20,"s":[0,0]},{"t":31,"s":[100,100]}],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":28,"s":[100]},{"t":32,"s":[0]}],"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":20,"op":81,"st":3,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"Shape Layer 2","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[250,250,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":[{"d":1,"ty":"el","s":{"a":0,"k":[75.5,75.5],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"st","c":{"a":0,"k":[0.686274509804,0.796078491211,0.909803981407,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":2,"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.25,-92.75],"ix":2},"a":{"a":0,"k":[0,-1],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.833,0.833],"y":[0.833,0.833]},"o":{"x":[0.167,0.167],"y":[0.167,0.167]},"t":17,"s":[0,0]},{"t":28,"s":[90,90]}],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":25,"s":[100]},{"t":29,"s":[0]}],"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":17,"op":78,"st":0,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":"Shape Layer 1","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[250,250,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":[{"d":1,"ty":"el","s":{"a":0,"k":[75.5,75.5],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"st","c":{"a":0,"k":[0.686274509804,0.796078491211,0.909803981407,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":2,"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.25,-92.75],"ix":2},"a":{"a":0,"k":[0,-1],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.833,0.833],"y":[0.833,0.833]},"o":{"x":[0.167,0.167],"y":[0.167,0.167]},"t":15,"s":[0,0]},{"t":26,"s":[80,80]}],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":23,"s":[100]},{"t":27,"s":[0]}],"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":15,"op":76,"st":-2,"bm":0},{"ddd":0,"ind":4,"ty":4,"nm":"Ebene 1/Music Note Outlines 3","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[250,250,0],"ix":2},"a":{"a":0,"k":[250,250,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],[0,0],[18.729,0],[0,-56.698],[-56.698,0],[0,56.699],[0,0],[0,0],[0,0]],"o":[[0,0],[-15.137,-8.723],[-56.698,0],[0,56.699],[56.699,0],[0,0],[0,0],[0,0],[0,0]],"v":[[0,-230.898],[0,39.766],[-51.311,25.656],[-153.932,128.277],[-51.311,230.898],[51.311,128.277],[51.311,-128.277],[153.932,-128.277],[153.932,-230.898]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.362076103687,0.555026173592,0.847058832645,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":1,"k":[{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"t":17,"s":[246.999,322],"to":[-35,-10.667],"ti":[35,10.667]},{"t":36,"s":[36.999,258]}],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667],"y":[1,1]},"o":{"x":[0.333,0.333],"y":[0,0]},"t":17,"s":[11,11]},{"t":36,"s":[18,18]}],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":17,"s":[0]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":22,"s":[100]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":31,"s":[100]},{"t":37,"s":[0]}],"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":17,"op":84,"st":6,"bm":0},{"ddd":0,"ind":5,"ty":4,"nm":"Ebene 1/Music Note Outlines 2","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[250,250,0],"ix":2},"a":{"a":0,"k":[250,250,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],[0,0],[18.729,0],[0,-56.698],[-56.698,0],[0,56.699],[0,0],[0,0],[0,0]],"o":[[0,0],[-15.137,-8.723],[-56.698,0],[0,56.699],[56.699,0],[0,0],[0,0],[0,0],[0,0]],"v":[[0,-230.898],[0,39.766],[-51.311,25.656],[-153.932,128.277],[-51.311,230.898],[51.311,128.277],[51.311,-128.277],[153.932,-128.277],[153.932,-230.898]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.835294127464,0.288258343935,0.288258343935,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":1,"k":[{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"t":14,"s":[246.999,322],"to":[-35,-22.167],"ti":[35,22.167]},{"t":33,"s":[36.999,189]}],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667],"y":[1,1]},"o":{"x":[0.333,0.333],"y":[0,0]},"t":14,"s":[11,11]},{"t":33,"s":[18,18]}],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":14,"s":[0]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":19,"s":[100]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":28,"s":[100]},{"t":34,"s":[0]}],"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":14,"op":81,"st":3,"bm":0},{"ddd":0,"ind":6,"ty":4,"nm":"Ebene 1/Music Note Outlines","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[250,250,0],"ix":2},"a":{"a":0,"k":[250,250,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],[0,0],[18.729,0],[0,-56.698],[-56.698,0],[0,56.699],[0,0],[0,0],[0,0]],"o":[[0,0],[-15.137,-8.723],[-56.698,0],[0,56.699],[56.699,0],[0,0],[0,0],[0,0],[0,0]],"v":[[0,-230.898],[0,39.766],[-51.311,25.656],[-153.932,128.277],[-51.311,230.898],[51.311,128.277],[51.311,-128.277],[153.932,-128.277],[153.932,-230.898]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.379054188728,0.929411768913,0.443802207708,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":1,"k":[{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"t":11,"s":[246.999,322],"to":[-35,-28.5],"ti":[35,28.5]},{"t":30,"s":[36.999,151]}],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667],"y":[1,1]},"o":{"x":[0.333,0.333],"y":[0,0]},"t":11,"s":[11,11]},{"t":30,"s":[18,18]}],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":11,"s":[0]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":16,"s":[100]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":25,"s":[100]},{"t":31,"s":[0]}],"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":11,"op":78,"st":0,"bm":0},{"ddd":0,"ind":7,"ty":4,"nm":"Ebene 1/box Outlines","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[250,250,0],"ix":2},"a":{"a":0,"k":[250,250,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":[[-20.651,0],[0,-20.651],[20.65,0],[0,20.651]],"o":[[20.65,0],[0,20.651],[-20.651,0],[0,-20.651]],"v":[[0,-37.391],[37.391,0],[0,37.391],[-37.391,0]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.144999994016,0.337000020345,0.685999971278,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":[250,157.99],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667],"y":[1,1]},"o":{"x":[0.333,0.333],"y":[0,0]},"t":3,"s":[100,100]},{"i":{"x":[0.667,0.667],"y":[1,1]},"o":{"x":[0.333,0.333],"y":[0,0]},"t":12,"s":[120,120]},{"i":{"x":[0.667,0.667],"y":[1,1]},"o":{"x":[0.333,0.333],"y":[0,0]},"t":16,"s":[120,120]},{"t":25,"s":[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":4,"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":[[-31.769,0],[0,-31.77],[31.77,0],[0,31.769]],"o":[[31.77,0],[0,31.769],[-31.769,0],[0,-31.77]],"v":[[0,-57.523],[57.523,0.001],[0,57.523],[-57.523,0.001]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.685999971278,0.795999983245,0.910000011968,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":[249.999,157.989],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667],"y":[1,1]},"o":{"x":[0.333,0.333],"y":[0,0]},"t":3,"s":[100,100]},{"i":{"x":[0.667,0.667],"y":[1,1]},"o":{"x":[0.333,0.333],"y":[0,0]},"t":12,"s":[110,110]},{"i":{"x":[0.667,0.667],"y":[1,1]},"o":{"x":[0.333,0.333],"y":[0,0]},"t":16,"s":[120,120]},{"t":25,"s":[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":2,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-5.891,5.847],[-4.538,-4.572],[5.89,-5.847],[4.539,4.572]],"o":[[5.891,-5.848],[4.538,4.573],[-5.891,5.846],[-4.538,-4.572]],"v":[[-8.217,-8.278],[10.666,-10.587],[8.218,8.279],[-10.666,10.587]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.501999978458,0.647000002394,0.866999966491,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":[227.347,301.769],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667],"y":[1,1]},"o":{"x":[0.333,0.333],"y":[0,0]},"t":0,"s":[100,100]},{"i":{"x":[0.667,0.667],"y":[1,1]},"o":{"x":[0.333,0.333],"y":[0,0]},"t":9,"s":[130,130]},{"i":{"x":[0.667,0.667],"y":[1,1]},"o":{"x":[0.333,0.333],"y":[0,0]},"t":13,"s":[130,130]},{"t":22,"s":[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":3,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-31.769,0],[0,-31.769],[31.77,0],[0,31.77]],"o":[[31.77,0],[0,31.77],[-31.769,0],[0,-31.769]],"v":[[0,-57.523],[57.523,0],[0,57.523],[-57.523,0]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.144999994016,0.337000020345,0.685999971278,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":[250,327.957],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667],"y":[1,1]},"o":{"x":[0.333,0.333],"y":[0,0]},"t":0,"s":[100,100]},{"i":{"x":[0.667,0.667],"y":[1,1]},"o":{"x":[0.333,0.333],"y":[0,0]},"t":9,"s":[130,130]},{"i":{"x":[0.667,0.667],"y":[1,1]},"o":{"x":[0.333,0.333],"y":[0,0]},"t":13,"s":[130,130]},{"t":22,"s":[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 4","np":4,"cix":2,"bm":0,"ix":4,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-48.875,0],[0,-48.875],[48.875,0],[0,48.876]],"o":[[48.875,0],[0,48.876],[-48.875,0],[0,-48.875]],"v":[[0,-88.496],[88.497,0],[0,88.497],[-88.497,0]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.685999971278,0.795999983245,0.910000011968,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":[249.999,327.956],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667],"y":[1,1]},"o":{"x":[0.333,0.333],"y":[0,0]},"t":0,"s":[100,100]},{"i":{"x":[0.667,0.667],"y":[1,1]},"o":{"x":[0.333,0.333],"y":[0,0]},"t":9,"s":[110,110]},{"i":{"x":[0.667,0.667],"y":[1,1]},"o":{"x":[0.333,0.333],"y":[0,0]},"t":13,"s":[118,118]},{"t":22,"s":[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 5","np":4,"cix":2,"bm":0,"ix":5,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[32.235,0],[0,0],[0,-32.233],[0,0],[-32.236,0],[0,0],[0,32.234]],"o":[[0,-32.233],[0,0],[-32.236,0],[0,0],[0,32.234],[0,0],[32.235,0],[0,0]],"v":[[127.366,-134.001],[69,-192.367],[-69,-192.367],[-127.365,-134.001],[-127.365,134.003],[-69,192.367],[69,192.367],[127.366,134.003]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.501999978458,0.647000002394,0.866999966491,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":[250.001,250.001],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667],"y":[1,1]},"o":{"x":[0.333,0.333],"y":[0,0]},"t":0,"s":[100,100]},{"i":{"x":[0.667,0.667],"y":[1,1]},"o":{"x":[0.333,0.333],"y":[0,0]},"t":13,"s":[100,108]},{"t":22,"s":[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 6","np":4,"cix":2,"bm":0,"ix":6,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":78,"st":0,"bm":0}],"markers":[]}
\ No newline at end of file
diff --git a/res/raw/storage.json b/res/raw/storage.json
new file mode 100644
index 0000000..fb9c1a7
--- /dev/null
+++ b/res/raw/storage.json
@@ -0,0 +1 @@
+{"v":"5.5.10","fr":29.9700012207031,"ip":0,"op":121.000004928431,"w":1080,"h":1080,"nm":"storage","ddd":0,"assets":[{"id":"comp_0","layers":[{"ddd":0,"ind":1,"ty":3,"nm":"Color_Control","sr":1,"ks":{"o":{"a":0,"k":0,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[960,540,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"ef":[{"ty":5,"nm":"Text","np":3,"mn":"ADBE Color Control","ix":1,"en":1,"ef":[{"ty":2,"nm":"Color","mn":"ADBE Color Control-0001","ix":1,"v":{"a":0,"k":[0.521568655968,0.600000023842,0.68235296011,1],"ix":1}}]},{"ty":5,"nm":"Background","np":3,"mn":"ADBE Color Control","ix":2,"en":1,"ef":[{"ty":2,"nm":"Color","mn":"ADBE Color Control-0001","ix":1,"v":{"a":0,"k":[0.976470589638,0.96862745285,0.960784316063,1],"ix":1}}]},{"ty":5,"nm":"Background ON/OFF","np":3,"mn":"ADBE Checkbox Control","ix":3,"en":1,"ef":[{"ty":7,"nm":"Checkbox","mn":"ADBE Checkbox Control-0001","ix":1,"v":{"a":0,"k":1,"ix":1}}]}],"ip":0,"op":450.000018328876,"st":0,"bm":0},{"ddd":0,"ind":2,"ty":3,"nm":"Position_Control","sr":1,"ks":{"o":{"a":0,"k":0,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[960,540,0],"ix":2},"a":{"a":0,"k":[60,60,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"ip":0,"op":450.000018328876,"st":0,"bm":0},{"ddd":0,"ind":3,"ty":0,"nm":"Storekeeper_Warehouse","parent":2,"refId":"comp_1","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[-143.666,219.241,0],"ix":2},"a":{"a":0,"k":[600,600,0],"ix":1},"s":{"a":0,"k":[-43,43,100],"ix":6}},"ao":0,"w":1200,"h":1200,"ip":23.0000009368092,"op":473.000019265685,"st":23.0000009368092,"bm":0},{"ddd":0,"ind":4,"ty":0,"nm":"Box_Package","parent":2,"refId":"comp_7","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[36.996,144.65,0],"ix":2},"a":{"a":0,"k":[300,350,0],"ix":1},"s":{"a":0,"k":[24,24,100],"ix":6}},"ao":0,"w":600,"h":700,"ip":8.00000032584668,"op":458.000018654722,"st":8.00000032584668,"bm":0},{"ddd":0,"ind":5,"ty":0,"nm":"Box_Package","parent":2,"refId":"comp_7","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[60.996,220.65,0],"ix":2},"a":{"a":0,"k":[300,350,0],"ix":1},"s":{"a":0,"k":[30,30,100],"ix":6}},"ao":0,"w":600,"h":700,"ip":5.00000020365417,"op":455.00001853253,"st":5.00000020365417,"bm":0},{"ddd":0,"ind":6,"ty":0,"nm":"Box_Package","parent":2,"refId":"comp_7","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[-4.004,187.65,0],"ix":2},"a":{"a":0,"k":[300,350,0],"ix":1},"s":{"a":0,"k":[30,30,100],"ix":6}},"ao":0,"w":600,"h":700,"ip":2.00000008146167,"op":452.000018410337,"st":2.00000008146167,"bm":0},{"ddd":0,"ind":7,"ty":0,"nm":"Box_Package","parent":2,"refId":"comp_7","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[204.996,161.65,0],"ix":2},"a":{"a":0,"k":[300,350,0],"ix":1},"s":{"a":0,"k":[21,21,100],"ix":6}},"ao":0,"w":600,"h":700,"ip":11.0000004480392,"op":461.000018776915,"st":11.0000004480392,"bm":0},{"ddd":0,"ind":8,"ty":0,"nm":"Box_Package","parent":2,"refId":"comp_7","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[195.996,216.65,0],"ix":2},"a":{"a":0,"k":[300,350,0],"ix":1},"s":{"a":0,"k":[30,30,100],"ix":6}},"ao":0,"w":600,"h":700,"ip":9.00000036657752,"op":459.000018695453,"st":9.00000036657752,"bm":0},{"ddd":0,"ind":9,"ty":0,"nm":"Worker_Warehouse_01","parent":2,"refId":"comp_8","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[223.919,63.421,0],"ix":2},"a":{"a":0,"k":[484,732,0],"ix":1},"s":{"a":0,"k":[52,52,100],"ix":6}},"ao":0,"w":1000,"h":1000,"ip":10.0000004073083,"op":460.000018736184,"st":10.0000004073083,"bm":0}]},{"id":"comp_1","layers":[{"ddd":0,"ind":1,"ty":0,"nm":"Man_Build_Warehouse_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":[638,998,0],"ix":2},"a":{"a":0,"k":[538,898,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[1,1,0.667],"y":[1,1,1]},"o":{"x":[0,0,0.333],"y":[0,0,0]},"t":0,"s":[0,0,100]},{"t":10.0000004073083,"s":[100,100,100]}],"ix":6,"x":"var $bm_rt;\nvar n, n, t, t, v, amp, freq, decay;\n$bm_rt = n = 0;\nif (numKeys > 0) {\n $bm_rt = n = nearestKey(time).index;\n if (key(n).time > time) {\n n--;\n }\n}\nif (n == 0) {\n $bm_rt = t = 0;\n} else {\n $bm_rt = t = $bm_sub(time, key(n).time);\n}\nif (n > 0) {\n v = velocityAtTime($bm_sub(key(n).time, $bm_div(thisComp.frameDuration, 10)));\n amp = 0.055;\n freq = 2;\n decay = 7;\n $bm_rt = $bm_sum(value, $bm_div($bm_mul($bm_mul(v, amp), Math.sin($bm_mul($bm_mul($bm_mul(freq, t), 2), Math.PI))), Math.exp($bm_mul(decay, t))));\n} else {\n $bm_rt = value;\n}"}},"ao":0,"tm":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":0,"s":[0]},{"t":120.0000048877,"s":[4.004]}],"ix":2,"x":"var $bm_rt;\n$bm_rt = loopOut('cycle');"},"w":1000,"h":1000,"ip":0,"op":566.000023053653,"st":0,"bm":0}]},{"id":"comp_2","layers":[{"ddd":0,"ind":1,"ty":3,"nm":"Color_Control","sr":1,"ks":{"o":{"a":0,"k":0,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[500,500,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"ef":[{"ty":5,"nm":"Overalls","np":3,"mn":"ADBE Color Control","ix":1,"en":1,"ef":[{"ty":2,"nm":"Color","mn":"ADBE Color Control-0001","ix":1,"v":{"a":0,"k":[0.372549027205,0.090196080506,0.639215707779,1],"ix":1}}]},{"ty":5,"nm":"Pait","np":3,"mn":"ADBE Color Control","ix":2,"en":1,"ef":[{"ty":2,"nm":"Color","mn":"ADBE Color Control-0001","ix":1,"v":{"a":0,"k":[0.870588243008,0.874509811401,0.870588243008,1],"ix":1}}]},{"ty":5,"nm":"Body","np":3,"mn":"ADBE Color Control","ix":3,"en":1,"ef":[{"ty":2,"nm":"Color","mn":"ADBE Color Control-0001","ix":1,"v":{"a":0,"k":[0.913725495338,0.792156875134,0.674509823322,1],"ix":1}}]},{"ty":5,"nm":"Hair","np":3,"mn":"ADBE Color Control","ix":4,"en":1,"ef":[{"ty":2,"nm":"Color","mn":"ADBE Color Control-0001","ix":1,"v":{"a":0,"k":[0.329411774874,0.345098048449,0.368627458811,1],"ix":1}}]},{"ty":5,"nm":"Helmet","np":3,"mn":"ADBE Color Control","ix":5,"en":1,"ef":[{"ty":2,"nm":"Color","mn":"ADBE Color Control-0001","ix":1,"v":{"a":0,"k":[0.850980401039,0.603921592236,0.337254911661,1],"ix":1}}]},{"ty":5,"nm":"Cap","np":3,"mn":"ADBE Color Control","ix":6,"en":1,"ef":[{"ty":2,"nm":"Color","mn":"ADBE Color Control-0001","ix":1,"v":{"a":0,"k":[0.733333349228,0.501960813999,0.486274510622,1],"ix":1}}]},{"ty":5,"nm":"Boot","np":3,"mn":"ADBE Color Control","ix":7,"en":1,"ef":[{"ty":2,"nm":"Color","mn":"ADBE Color Control-0001","ix":1,"v":{"a":0,"k":[0.309803932905,0.305882364511,0.305882364511,1],"ix":1}}]}],"ip":0,"op":450.000018328876,"st":0,"bm":0},{"ddd":0,"ind":4,"ty":4,"nm":"Hair Outlines","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[542.83,147.121,0],"ix":2},"a":{"a":0,"k":[57.537,62.416,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"ef":[{"ty":21,"nm":"Fill","np":9,"mn":"ADBE Fill","ix":1,"en":1,"ef":[{"ty":10,"nm":"Fill Mask","mn":"ADBE Fill-0001","ix":1,"v":{"a":0,"k":0,"ix":1}},{"ty":7,"nm":"All Masks","mn":"ADBE Fill-0007","ix":2,"v":{"a":0,"k":0,"ix":2}},{"ty":2,"nm":"Color","mn":"ADBE Fill-0002","ix":3,"v":{"a":0,"k":[1,0,0,1],"ix":3,"x":"var $bm_rt;\n$bm_rt = comp('Man_Build_Warehouse_1').layer('Color_Control').effect('Hair')('ADBE Color Control-0001');"}},{"ty":7,"nm":"Invert","mn":"ADBE Fill-0006","ix":4,"v":{"a":0,"k":0,"ix":4}},{"ty":0,"nm":"Horizontal Feather","mn":"ADBE Fill-0003","ix":5,"v":{"a":0,"k":0,"ix":5}},{"ty":0,"nm":"Vertical Feather","mn":"ADBE Fill-0004","ix":6,"v":{"a":0,"k":0,"ix":6}},{"ty":0,"nm":"Opacity","mn":"ADBE Fill-0005","ix":7,"v":{"a":0,"k":1,"ix":7}}]}],"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[10.251,5.704],[25.012,-11.719],[0,0],[-13.961,1.464],[0,0],[-5.251,-5.29],[0,0],[-1.267,1.916],[0.224,-6.54],[2.583,-0.094],[-6.1,-1.707],[-1.45,1.509],[-1.626,36.269]],"o":[[-11.676,-6.497],[-21.286,9.974],[0,0],[0,0],[0,0],[0,0],[0,0],[3.242,-2.959],[-0.267,7.801],[7.495,5.756],[11.905,3.333],[0,0],[1.364,-30.436]],"v":[[33.85,-49.603],[-36.001,-50.447],[-54.887,-14.827],[-35.857,-15.699],[-36.197,28.588],[-25.918,39.601],[-25.749,36.176],[-20.332,26.845],[-10.616,32.459],[-18.355,46.536],[3.164,58.833],[33.015,53.891],[55.923,0.055]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.842999985639,0.74900004069,0.419999994016,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":[57.537,62.416],"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":450.000018328876,"st":0,"bm":0},{"ddd":0,"ind":5,"ty":4,"nm":"Head Outlines","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.25],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":0,"s":[0]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.75],"y":[0]},"t":30,"s":[-12]},{"t":59.0000024031193,"s":[0]}],"ix":10},"p":{"a":1,"k":[{"i":{"x":0.25,"y":1},"o":{"x":0.333,"y":0},"t":0,"s":[531.764,205.312,0],"to":[0.5,0,0],"ti":[0,0,0]},{"i":{"x":0.667,"y":1},"o":{"x":0.75,"y":0},"t":30,"s":[534.764,205.312,0],"to":[0,0,0],"ti":[0.5,0,0]},{"t":59.0000024031193,"s":[531.764,205.312,0]}],"ix":2},"a":{"a":0,"k":[47.416,118.399,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"ef":[{"ty":21,"nm":"Fill","np":9,"mn":"ADBE Fill","ix":1,"en":1,"ef":[{"ty":10,"nm":"Fill Mask","mn":"ADBE Fill-0001","ix":1,"v":{"a":0,"k":0,"ix":1}},{"ty":7,"nm":"All Masks","mn":"ADBE Fill-0007","ix":2,"v":{"a":0,"k":0,"ix":2}},{"ty":2,"nm":"Color","mn":"ADBE Fill-0002","ix":3,"v":{"a":0,"k":[1,0,0,1],"ix":3,"x":"var $bm_rt;\n$bm_rt = comp('Man_Build_Warehouse_1').layer('Color_Control').effect('Body')('ADBE Color Control-0001');"}},{"ty":7,"nm":"Invert","mn":"ADBE Fill-0006","ix":4,"v":{"a":0,"k":0,"ix":4}},{"ty":0,"nm":"Horizontal Feather","mn":"ADBE Fill-0003","ix":5,"v":{"a":0,"k":0,"ix":5}},{"ty":0,"nm":"Vertical Feather","mn":"ADBE Fill-0004","ix":6,"v":{"a":0,"k":0,"ix":6}},{"ty":0,"nm":"Opacity","mn":"ADBE Fill-0005","ix":7,"v":{"a":0,"k":1,"ix":7}}]}],"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-1.761,6.341],[0.304,3.453],[-0.362,4.671],[0,0],[-22.387,10.052],[-5.347,-8.035],[0,0],[2.589,-13.373],[0,0],[0,0],[0,0],[3.585,5.585]],"o":[[1.762,-6.341],[-0.304,-3.453],[0.362,-4.671],[0,0],[26.893,-12.074],[5.346,8.034],[0,0],[-2.589,13.372],[0,0],[-19.124,9.728],[0,0],[-3.584,-5.585]],"v":[[-55.404,19.754],[-52.118,4.387],[-55.341,-14.659],[-49.922,-32.147],[-31.619,-54.575],[36.883,-51.774],[42.357,-37.565],[54.576,-8.872],[37.113,38.671],[34.081,47.2],[-19.575,64.139],[-45.144,61.064]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.913999968884,0.791999966491,0.675,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":[57.415,66.899],"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":450.000018328876,"st":0,"bm":0},{"ddd":0,"ind":6,"ty":0,"nm":"Man_Build_Warehouse_Left_Arm","refId":"comp_3","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[445,346,0],"ix":2},"a":{"a":0,"k":[125,125,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"ef":[{"ty":34,"nm":"Puppet","np":6,"mn":"ADBE FreePin3","ix":1,"en":1,"ef":[{"ty":7,"nm":"Puppet Engine","mn":"ADBE FreePin3 Puppet Engine","ix":1,"v":{"a":0,"k":1,"ix":1}},{"ty":0,"nm":"Mesh Rotation Refinement","mn":"ADBE FreePin3 Auto Rotate Pins","ix":2,"v":{"a":0,"k":20,"ix":2}},{"ty":7,"nm":"On Transparent","mn":"ADBE FreePin3 On Transparent","ix":3,"v":{"a":0,"k":0,"ix":3}},{"ty":29.9700012207031,"nm":"arap","np":3,"mn":"ADBE FreePin3 ARAP Group","ix":4,"en":1,"ef":[{"ty":6,"nm":"Auto-traced Shapes","mn":"ADBE FreePin3 Outlines","ix":1,"v":0},{"ty":1,"nm":"Mesh","np":2,"mn":"ADBE FreePin3 Mesh Group","ix":2,"en":1,"ef":[{"nm":"Mesh 1","np":8,"mn":"ADBE FreePin3 Mesh Atom","ix":1,"en":1,"ef":[{"ty":6,"nm":"Mesh","mn":"ADBE FreePin3 Mesh","ix":1,"v":0},{"ty":0,"nm":"Triangles","mn":"ADBE FreePin3 Mesh Tri Count","ix":2,"v":{"a":0,"k":350,"ix":2}},{"ty":0,"nm":"Density","mn":"ADBE FreePin3 Mesh Tri Density","ix":3,"v":{"a":0,"k":10,"ix":3}},{"ty":0,"nm":"Expansion","mn":"ADBE FreePin3 Mesh Expansion","ix":4,"v":{"a":0,"k":3,"ix":4}},{"nm":"Deform","np":4,"mn":"ADBE FreePin3 PosPins","ix":5,"en":1,"ef":[{"nm":"Left_Arm_Hand","np":7,"mn":"ADBE FreePin3 PosPin Atom","ix":1,"en":1,"ef":[{"ty":3,"nm":"Vertex Offset","mn":"ADBE FreePin3 PosPin Vtx Offset","ix":1,"v":{"a":0,"k":[6.286,-0.947],"ix":1}},{"ty":0,"nm":"Vertex Index","mn":"ADBE FreePin3 PosPin Vtx Index","ix":2,"v":{"a":0,"k":97,"ix":2}},{"ty":7,"nm":"Pin Type","mn":"ADBE FreePin3 PosPin Type","ix":3,"v":{"a":0,"k":1,"ix":3}},{"ty":3,"nm":"Position","mn":"ADBE FreePin3 PosPin Position","ix":4,"v":{"a":0,"k":[52,128.5],"ix":4}},{"ty":0,"nm":"Scale","mn":"ADBE FreePin3 PosPin Scale","ix":5,"v":{"a":0,"k":100,"ix":5}},{"ty":0,"nm":"Rotation","mn":"ADBE FreePin3 PosPin Rotation","ix":6,"v":{"a":0,"k":0,"ix":6}}]},{"nm":"Left_Arm_Elbow","np":7,"mn":"ADBE FreePin3 PosPin Atom","ix":2,"en":1,"ef":[{"ty":3,"nm":"Vertex Offset","mn":"ADBE FreePin3 PosPin Vtx Offset","ix":1,"v":{"a":0,"k":[3.066,2.862],"ix":1}},{"ty":0,"nm":"Vertex Index","mn":"ADBE FreePin3 PosPin Vtx Index","ix":2,"v":{"a":0,"k":198,"ix":2}},{"ty":7,"nm":"Pin Type","mn":"ADBE FreePin3 PosPin Type","ix":3,"v":{"a":0,"k":1,"ix":3}},{"ty":3,"nm":"Position","mn":"ADBE FreePin3 PosPin Position","ix":4,"v":{"a":0,"k":[137.5,193.5],"ix":4}},{"ty":0,"nm":"Scale","mn":"ADBE FreePin3 PosPin Scale","ix":5,"v":{"a":0,"k":100,"ix":5}},{"ty":0,"nm":"Rotation","mn":"ADBE FreePin3 PosPin Rotation","ix":6,"v":{"a":0,"k":0,"ix":6}}]},{"nm":"Left_Arm_Shoulder","np":7,"mn":"ADBE FreePin3 PosPin Atom","ix":3,"en":1,"ef":[{"ty":3,"nm":"Vertex Offset","mn":"ADBE FreePin3 PosPin Vtx Offset","ix":1,"v":{"a":0,"k":[0.397,-0.497],"ix":1}},{"ty":0,"nm":"Vertex Index","mn":"ADBE FreePin3 PosPin Vtx Index","ix":2,"v":{"a":0,"k":157,"ix":2}},{"ty":7,"nm":"Pin Type","mn":"ADBE FreePin3 PosPin Type","ix":3,"v":{"a":0,"k":1,"ix":3}},{"ty":3,"nm":"Position","mn":"ADBE FreePin3 PosPin Position","ix":4,"v":{"a":0,"k":[167,71],"ix":4}},{"ty":0,"nm":"Scale","mn":"ADBE FreePin3 PosPin Scale","ix":5,"v":{"a":0,"k":100,"ix":5}},{"ty":0,"nm":"Rotation","mn":"ADBE FreePin3 PosPin Rotation","ix":6,"v":{"a":0,"k":0,"ix":6}}]}]},{"nm":"Overlap","np":1,"mn":"ADBE FreePin3 HghtPins","ix":6,"en":1,"ef":[]},{"nm":"Stiffness","np":1,"mn":"ADBE FreePin3 StarchPins","ix":7,"en":1,"ef":[]}]}]}]}]}],"w":250,"h":250,"ip":0,"op":450.000018328876,"st":0,"bm":0},{"ddd":0,"ind":7,"ty":4,"nm":"Arm_L_03 Outlines","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[349.725,324.05,0],"ix":2},"a":{"a":0,"k":[27.41,31.802,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"ef":[{"ty":21,"nm":"Fill","np":9,"mn":"ADBE Fill","ix":1,"en":1,"ef":[{"ty":10,"nm":"Fill Mask","mn":"ADBE Fill-0001","ix":1,"v":{"a":0,"k":0,"ix":1}},{"ty":7,"nm":"All Masks","mn":"ADBE Fill-0007","ix":2,"v":{"a":0,"k":0,"ix":2}},{"ty":2,"nm":"Color","mn":"ADBE Fill-0002","ix":3,"v":{"a":0,"k":[1,0,0,1],"ix":3,"x":"var $bm_rt;\n$bm_rt = comp('Man_Build_Warehouse_1').layer('Color_Control').effect('Body')('ADBE Color Control-0001');"}},{"ty":7,"nm":"Invert","mn":"ADBE Fill-0006","ix":4,"v":{"a":0,"k":0,"ix":4}},{"ty":0,"nm":"Horizontal Feather","mn":"ADBE Fill-0003","ix":5,"v":{"a":0,"k":0,"ix":5}},{"ty":0,"nm":"Vertical Feather","mn":"ADBE Fill-0004","ix":6,"v":{"a":0,"k":0,"ix":6}},{"ty":0,"nm":"Opacity","mn":"ADBE Fill-0005","ix":7,"v":{"a":0,"k":1,"ix":7}}]}],"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[1.425,3.628],[3.866,3.866],[2.925,3.956],[1.393,-0.607],[1.58,-0.482],[0,0],[-3.081,-10.482],[-5.881,-5.478],[-7.319,-3.416],[0,0]],"o":[[-2.684,-6.831],[-3.416,-3.416],[-1.212,-1.638],[-3.408,1.486],[-4.095,1.25],[-0.61,4.635],[1.579,5.37],[4.411,4.108],[0,0],[0,0]],"v":[[22.158,3.982],[7.519,-10.291],[0.2,-26.394],[-4.192,-27.614],[-2.461,-5.305],[-21.376,-31.552],[-24.079,-3.44],[-9.194,17.376],[9.959,31.552],[27.16,15.205]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.913999968884,0.791999966491,0.677999997606,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":[27.41,31.802],"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":450.000018328876,"st":0,"bm":0},{"ddd":0,"ind":8,"ty":4,"nm":"Body_01 Outlines","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[545.02,379.611,0],"ix":2},"a":{"a":0,"k":[85.125,164.559,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"ef":[{"ty":21,"nm":"Fill","np":9,"mn":"ADBE Fill","ix":1,"en":1,"ef":[{"ty":10,"nm":"Fill Mask","mn":"ADBE Fill-0001","ix":1,"v":{"a":0,"k":0,"ix":1}},{"ty":7,"nm":"All Masks","mn":"ADBE Fill-0007","ix":2,"v":{"a":0,"k":0,"ix":2}},{"ty":2,"nm":"Color","mn":"ADBE Fill-0002","ix":3,"v":{"a":0,"k":[1,0,0,1],"ix":3,"x":"var $bm_rt;\n$bm_rt = comp('Man_Build_Warehouse_1').layer('Color_Control').effect('Overalls')('ADBE Color Control-0001');"}},{"ty":7,"nm":"Invert","mn":"ADBE Fill-0006","ix":4,"v":{"a":0,"k":0,"ix":4}},{"ty":0,"nm":"Horizontal Feather","mn":"ADBE Fill-0003","ix":5,"v":{"a":0,"k":0,"ix":5}},{"ty":0,"nm":"Vertical Feather","mn":"ADBE Fill-0004","ix":6,"v":{"a":0,"k":0,"ix":6}},{"ty":0,"nm":"Opacity","mn":"ADBE Fill-0005","ix":7,"v":{"a":0,"k":1,"ix":7}}]}],"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0.369,7.046],[28.521,-9.514],[0.18,-2.24],[3.782,-31.665],[23.454,37.84],[-0.419,-2.344],[-60.524,0.341],[-2.103,15.439],[0.186,43.673]],"o":[[0,0],[-35.239,11.754],[-0.232,2.884],[-1.066,8.93],[0,0],[2.361,13.216],[31.649,-0.178],[1.969,-14.454],[-0.196,-45.842]],"v":[[83.793,-123.894],[44.862,-109.939],[-26.099,-88.881],[-28.157,45.277],[-81.865,33.475],[-83.743,91.232],[13.052,123.553],[71.375,85.209],[72.737,-14.579]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.475,0.497999991623,0.545000023935,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":[84.412,204.974],"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],[-9.179,-4.232],[-5.216,-14.124],[0,0],[0.163,4.62],[11.721,23.297]],"o":[[0,0],[0,0],[9.848,26.665],[-1.084,4.878],[-0.366,-10.336],[-6.598,-13.115]],"v":[[-22.542,-44.929],[-2.358,-41.221],[12.694,-22.669],[20.748,35.378],[7.184,40.833],[-5.126,-21.394]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.438999998803,0.463000009574,0.497999991623,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":[147.457,45.703],"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":[[0,0],[-8.444,4.025],[-7.722,-19.415],[0,0],[-0.004,2.151],[10.744,21.93]],"o":[[0,0],[0,0],[7.479,18.802],[-0.161,1.419],[0.024,-12.943],[-6.459,-13.183]],"v":[[-22.245,-43.326],[-6.215,-53.033],[14.292,-23.603],[22.245,47.239],[4.63,50.882],[-5.872,-22.72]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.438999998803,0.463000009574,0.497999991623,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":[53.683,80.059],"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":450.000018328876,"st":0,"bm":0},{"ddd":0,"ind":9,"ty":4,"nm":"Body_02 Outlines","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":0,"s":[0]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":30,"s":[-2]},{"t":59.0000024031193,"s":[0]}],"ix":10},"p":{"a":0,"k":[550.574,541.578,0],"ix":2},"a":{"a":0,"k":[95.614,327.648,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"ef":[{"ty":21,"nm":"Fill","np":9,"mn":"ADBE Fill","ix":1,"en":1,"ef":[{"ty":10,"nm":"Fill Mask","mn":"ADBE Fill-0001","ix":1,"v":{"a":0,"k":0,"ix":1}},{"ty":7,"nm":"All Masks","mn":"ADBE Fill-0007","ix":2,"v":{"a":0,"k":0,"ix":2}},{"ty":2,"nm":"Color","mn":"ADBE Fill-0002","ix":3,"v":{"a":0,"k":[1,0,0,1],"ix":3,"x":"var $bm_rt;\n$bm_rt = comp('Man_Build_Warehouse_1').layer('Color_Control').effect('Pait')('ADBE Color Control-0001');"}},{"ty":7,"nm":"Invert","mn":"ADBE Fill-0006","ix":4,"v":{"a":0,"k":0,"ix":4}},{"ty":0,"nm":"Horizontal Feather","mn":"ADBE Fill-0003","ix":5,"v":{"a":0,"k":0,"ix":5}},{"ty":0,"nm":"Vertical Feather","mn":"ADBE Fill-0004","ix":6,"v":{"a":0,"k":0,"ix":6}},{"ty":0,"nm":"Opacity","mn":"ADBE Fill-0005","ix":7,"v":{"a":0,"k":1,"ix":7}}]}],"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[24.251,35.926],[18.128,-2.401],[0.836,-1.356],[14.476,-3.05],[0,0],[0.059,1.021],[1.481,-0.868],[-3.301,-35.899],[1.242,-33.201],[0,0],[-68.577,2.784],[0,0],[1.676,46.91]],"o":[[-9.943,-14.73],[0.1,5.141],[-1.554,2.519],[-16.392,3.453],[-0.084,-0.818],[-2.282,1.22],[-39.19,22.974],[6.641,72.214],[-0.372,9.946],[0,0],[54.914,-2.23],[0,0],[-1.675,-46.91]],"v":[[70.113,-146.799],[24.705,-161.997],[24.009,-151.274],[-1.771,-138.298],[-33.008,-138.839],[-33.22,-141.612],[-38.904,-138.443],[-91.062,-68.801],[-88.371,116.955],[-88.662,132.617],[2.424,161.614],[66.108,125.485],[66.421,21.439]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.870999983245,0.875,0.870999983245,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":[94.613,164.648],"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":450.000018328876,"st":0,"bm":0},{"ddd":0,"ind":10,"ty":4,"nm":"Neck Outlines","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[545.994,241.976,0],"ix":2},"a":{"a":0,"k":[30.305,49.719,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"ef":[{"ty":21,"nm":"Fill","np":9,"mn":"ADBE Fill","ix":1,"en":1,"ef":[{"ty":10,"nm":"Fill Mask","mn":"ADBE Fill-0001","ix":1,"v":{"a":0,"k":0,"ix":1}},{"ty":7,"nm":"All Masks","mn":"ADBE Fill-0007","ix":2,"v":{"a":0,"k":0,"ix":2}},{"ty":2,"nm":"Color","mn":"ADBE Fill-0002","ix":3,"v":{"a":0,"k":[1,0,0,1],"ix":3,"x":"var $bm_rt;\n$bm_rt = comp('Man_Build_Warehouse_1').layer('Color_Control').effect('Body')('ADBE Color Control-0001');"}},{"ty":7,"nm":"Invert","mn":"ADBE Fill-0006","ix":4,"v":{"a":0,"k":0,"ix":4}},{"ty":0,"nm":"Horizontal Feather","mn":"ADBE Fill-0003","ix":5,"v":{"a":0,"k":0,"ix":5}},{"ty":0,"nm":"Vertical Feather","mn":"ADBE Fill-0004","ix":6,"v":{"a":0,"k":0,"ix":6}},{"ty":0,"nm":"Opacity","mn":"ADBE Fill-0005","ix":7,"v":{"a":0,"k":1,"ix":7}}]}],"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[29.108,21.879],[-29.108,21.879],[-29.108,-19.535],[29.108,-21.879]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.913999968884,0.791999966491,0.675,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":[29.674,50.349],"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,-16.076],[16.076,0],[0,16.076],[-16.076,0]],"o":[[0,16.076],[-16.076,0],[0,-16.076],[16.076,0]],"v":[[29.108,0],[0,29.108],[-29.108,0],[0,-29.108]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.913999968884,0.791999966491,0.675,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":[29.674,70.079],"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":[[0,0],[2.066,-3.35],[14.476,-3.049],[0,0],[-0.007,8.725]],"o":[[-3.684,8.916],[-1.554,2.52],[-16.392,3.454],[-0.628,-6.156],[0.016,-20.174]],"v":[[30.056,-23.765],[27.695,9.442],[1.809,22.354],[-29.428,21.814],[-29.909,-5.635]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.913999968884,0.791999966491,0.675,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":[30.305,26.059],"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":450.000018328876,"st":0,"bm":0},{"ddd":0,"ind":11,"ty":4,"nm":"Body_03 Outlines","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[548.8,371.664,0],"ix":2},"a":{"a":0,"k":[93.434,174.976,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"ef":[{"ty":21,"nm":"Fill","np":9,"mn":"ADBE Fill","ix":1,"en":1,"ef":[{"ty":10,"nm":"Fill Mask","mn":"ADBE Fill-0001","ix":1,"v":{"a":0,"k":0,"ix":1}},{"ty":7,"nm":"All Masks","mn":"ADBE Fill-0007","ix":2,"v":{"a":0,"k":0,"ix":2}},{"ty":2,"nm":"Color","mn":"ADBE Fill-0002","ix":3,"v":{"a":0,"k":[1,0,0,1],"ix":3,"x":"var $bm_rt;\n$bm_rt = comp('Man_Build_Warehouse_1').layer('Color_Control').effect('Body')('ADBE Color Control-0001');"}},{"ty":7,"nm":"Invert","mn":"ADBE Fill-0006","ix":4,"v":{"a":0,"k":0,"ix":4}},{"ty":0,"nm":"Horizontal Feather","mn":"ADBE Fill-0003","ix":5,"v":{"a":0,"k":0,"ix":5}},{"ty":0,"nm":"Vertical Feather","mn":"ADBE Fill-0004","ix":6,"v":{"a":0,"k":0,"ix":6}},{"ty":0,"nm":"Opacity","mn":"ADBE Fill-0005","ix":7,"v":{"a":0,"k":1,"ix":7}}]}],"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[4.419,38.905],[-39.191,22.974],[-24.309,-36.014],[-1.675,-46.91],[0,0],[54.728,-5.026],[0,0],[-1.006,54.98]],"o":[[-4.068,-35.82],[16.195,-9.494],[24.251,35.926],[1.675,46.911],[0,0],[-54.729,5.026],[0,0],[0.712,-38.86]],"v":[[-89.116,-60.715],[-38.91,-130.356],[68.933,-138.712],[67.196,29.525],[66.883,132.4],[2.418,169.7],[-87.498,139.531],[-85.503,61.611]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.917999985639,0.764999988032,0.663000009574,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":[93.434,174.976],"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":450.000018328876,"st":0,"bm":0},{"ddd":0,"ind":12,"ty":0,"nm":"Leg_L","refId":"comp_4","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[509.883,672.942,0],"ix":2},"a":{"a":0,"k":[49.06,215.71,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"ef":[{"ty":21,"nm":"Fill","np":9,"mn":"ADBE Fill","ix":1,"en":1,"ef":[{"ty":10,"nm":"Fill Mask","mn":"ADBE Fill-0001","ix":1,"v":{"a":0,"k":0,"ix":1}},{"ty":7,"nm":"All Masks","mn":"ADBE Fill-0007","ix":2,"v":{"a":0,"k":0,"ix":2}},{"ty":2,"nm":"Color","mn":"ADBE Fill-0002","ix":3,"v":{"a":0,"k":[1,0,0,1],"ix":3,"x":"var $bm_rt;\n$bm_rt = comp('Man_Build_Warehouse_1').layer('Color_Control').effect('Overalls')('ADBE Color Control-0001');"}},{"ty":7,"nm":"Invert","mn":"ADBE Fill-0006","ix":4,"v":{"a":0,"k":0,"ix":4}},{"ty":0,"nm":"Horizontal Feather","mn":"ADBE Fill-0003","ix":5,"v":{"a":0,"k":0,"ix":5}},{"ty":0,"nm":"Vertical Feather","mn":"ADBE Fill-0004","ix":6,"v":{"a":0,"k":0,"ix":6}},{"ty":0,"nm":"Opacity","mn":"ADBE Fill-0005","ix":7,"v":{"a":0,"k":1,"ix":7}}]}],"w":99,"h":432,"ip":0,"op":450.000018328876,"st":0,"bm":0},{"ddd":0,"ind":13,"ty":0,"nm":"Leg_R","refId":"comp_5","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[566.556,624.43,0],"ix":2},"a":{"a":0,"k":[49.377,215.935,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"ef":[{"ty":21,"nm":"Fill","np":9,"mn":"ADBE Fill","ix":1,"en":1,"ef":[{"ty":10,"nm":"Fill Mask","mn":"ADBE Fill-0001","ix":1,"v":{"a":0,"k":0,"ix":1}},{"ty":7,"nm":"All Masks","mn":"ADBE Fill-0007","ix":2,"v":{"a":0,"k":0,"ix":2}},{"ty":2,"nm":"Color","mn":"ADBE Fill-0002","ix":3,"v":{"a":0,"k":[1,0,0,1],"ix":3,"x":"var $bm_rt;\n$bm_rt = comp('Man_Build_Warehouse_1').layer('Color_Control').effect('Overalls')('ADBE Color Control-0001');"}},{"ty":7,"nm":"Invert","mn":"ADBE Fill-0006","ix":4,"v":{"a":0,"k":0,"ix":4}},{"ty":0,"nm":"Horizontal Feather","mn":"ADBE Fill-0003","ix":5,"v":{"a":0,"k":0,"ix":5}},{"ty":0,"nm":"Vertical Feather","mn":"ADBE Fill-0004","ix":6,"v":{"a":0,"k":0,"ix":6}},{"ty":0,"nm":"Opacity","mn":"ADBE Fill-0005","ix":7,"v":{"a":0,"k":1,"ix":7}}]},{"ty":5,"nm":"Hue/Saturation","np":11,"mn":"ADBE HUE SATURATION","ix":2,"en":1,"ef":[{"ty":7,"nm":"Channel Control","mn":"ADBE HUE SATURATION-0002","ix":1,"v":{"a":0,"k":1,"ix":1}},{},{"ty":0,"nm":"Master Hue","mn":"ADBE HUE SATURATION-0004","ix":3,"v":{"a":0,"k":0,"ix":3}},{"ty":0,"nm":"Master Saturation","mn":"ADBE HUE SATURATION-0005","ix":4,"v":{"a":0,"k":0,"ix":4}},{"ty":0,"nm":"Master Lightness","mn":"ADBE HUE SATURATION-0006","ix":5,"v":{"a":0,"k":-5,"ix":5}},{"ty":7,"nm":"Colorize","mn":"ADBE HUE SATURATION-0007","ix":6,"v":{"a":0,"k":0,"ix":6}},{"ty":0,"nm":"Colorize Hue","mn":"ADBE HUE SATURATION-0008","ix":7,"v":{"a":0,"k":0,"ix":7}},{"ty":0,"nm":"Colorize Saturation","mn":"ADBE HUE SATURATION-0009","ix":8,"v":{"a":0,"k":25,"ix":8}},{"ty":0,"nm":"Colorize Lightness","mn":"ADBE HUE SATURATION-0010","ix":9,"v":{"a":0,"k":0,"ix":9}}]}],"w":99,"h":432,"ip":0,"op":450.000018328876,"st":0,"bm":0},{"ddd":0,"ind":14,"ty":0,"nm":"Man_Build_Warehouse_Right_Arm","refId":"comp_6","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[538,294,0],"ix":2},"a":{"a":0,"k":[125,125,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"ef":[{"ty":34,"nm":"Puppet","np":6,"mn":"ADBE FreePin3","ix":1,"en":1,"ef":[{"ty":7,"nm":"Puppet Engine","mn":"ADBE FreePin3 Puppet Engine","ix":1,"v":{"a":0,"k":1,"ix":1}},{"ty":0,"nm":"Mesh Rotation Refinement","mn":"ADBE FreePin3 Auto Rotate Pins","ix":2,"v":{"a":0,"k":20,"ix":2}},{"ty":7,"nm":"On Transparent","mn":"ADBE FreePin3 On Transparent","ix":3,"v":{"a":0,"k":0,"ix":3}},{"ty":29.9700012207031,"nm":"arap","np":3,"mn":"ADBE FreePin3 ARAP Group","ix":4,"en":1,"ef":[{"ty":6,"nm":"Auto-traced Shapes","mn":"ADBE FreePin3 Outlines","ix":1,"v":0},{"ty":1,"nm":"Mesh","np":2,"mn":"ADBE FreePin3 Mesh Group","ix":2,"en":1,"ef":[{"nm":"Mesh 1","np":8,"mn":"ADBE FreePin3 Mesh Atom","ix":1,"en":1,"ef":[{"ty":6,"nm":"Mesh","mn":"ADBE FreePin3 Mesh","ix":1,"v":0},{"ty":0,"nm":"Triangles","mn":"ADBE FreePin3 Mesh Tri Count","ix":2,"v":{"a":0,"k":350,"ix":2}},{"ty":0,"nm":"Density","mn":"ADBE FreePin3 Mesh Tri Density","ix":3,"v":{"a":0,"k":10,"ix":3}},{"ty":0,"nm":"Expansion","mn":"ADBE FreePin3 Mesh Expansion","ix":4,"v":{"a":0,"k":3,"ix":4}},{"nm":"Deform","np":4,"mn":"ADBE FreePin3 PosPins","ix":5,"en":1,"ef":[{"nm":"Right_Arm_Hand","np":7,"mn":"ADBE FreePin3 PosPin Atom","ix":1,"en":1,"ef":[{"ty":3,"nm":"Vertex Offset","mn":"ADBE FreePin3 PosPin Vtx Offset","ix":1,"v":{"a":0,"k":[-4.89,-1.944],"ix":1}},{"ty":0,"nm":"Vertex Index","mn":"ADBE FreePin3 PosPin Vtx Index","ix":2,"v":{"a":0,"k":128,"ix":2}},{"ty":7,"nm":"Pin Type","mn":"ADBE FreePin3 PosPin Type","ix":3,"v":{"a":0,"k":1,"ix":3}},{"ty":3,"nm":"Position","mn":"ADBE FreePin3 PosPin Position","ix":4,"v":{"a":0,"k":[48,112],"ix":4}},{"ty":0,"nm":"Scale","mn":"ADBE FreePin3 PosPin Scale","ix":5,"v":{"a":0,"k":100,"ix":5}},{"ty":0,"nm":"Rotation","mn":"ADBE FreePin3 PosPin Rotation","ix":6,"v":{"a":0,"k":0,"ix":6}}]},{"nm":"Right_Arm_Elbow","np":7,"mn":"ADBE FreePin3 PosPin Atom","ix":2,"en":1,"ef":[{"ty":3,"nm":"Vertex Offset","mn":"ADBE FreePin3 PosPin Vtx Offset","ix":1,"v":{"a":0,"k":[2.972,1.842],"ix":1}},{"ty":0,"nm":"Vertex Index","mn":"ADBE FreePin3 PosPin Vtx Index","ix":2,"v":{"a":0,"k":209,"ix":2}},{"ty":7,"nm":"Pin Type","mn":"ADBE FreePin3 PosPin Type","ix":3,"v":{"a":0,"k":1,"ix":3}},{"ty":3,"nm":"Position","mn":"ADBE FreePin3 PosPin Position","ix":4,"v":{"a":0,"k":[133,185],"ix":4}},{"ty":0,"nm":"Scale","mn":"ADBE FreePin3 PosPin Scale","ix":5,"v":{"a":0,"k":100,"ix":5}},{"ty":0,"nm":"Rotation","mn":"ADBE FreePin3 PosPin Rotation","ix":6,"v":{"a":0,"k":0,"ix":6}}]},{"nm":"Right_Arm_Shoulder","np":7,"mn":"ADBE FreePin3 PosPin Atom","ix":3,"en":1,"ef":[{"ty":3,"nm":"Vertex Offset","mn":"ADBE FreePin3 PosPin Vtx Offset","ix":1,"v":{"a":0,"k":[4.04,-0.49],"ix":1}},{"ty":0,"nm":"Vertex Index","mn":"ADBE FreePin3 PosPin Vtx Index","ix":2,"v":{"a":0,"k":167,"ix":2}},{"ty":7,"nm":"Pin Type","mn":"ADBE FreePin3 PosPin Type","ix":3,"v":{"a":0,"k":1,"ix":3}},{"ty":3,"nm":"Position","mn":"ADBE FreePin3 PosPin Position","ix":4,"v":{"a":0,"k":[174,71],"ix":4}},{"ty":0,"nm":"Scale","mn":"ADBE FreePin3 PosPin Scale","ix":5,"v":{"a":0,"k":100,"ix":5}},{"ty":0,"nm":"Rotation","mn":"ADBE FreePin3 PosPin Rotation","ix":6,"v":{"a":0,"k":0,"ix":6}}]}]},{"nm":"Overlap","np":1,"mn":"ADBE FreePin3 HghtPins","ix":6,"en":1,"ef":[]},{"nm":"Stiffness","np":1,"mn":"ADBE FreePin3 StarchPins","ix":7,"en":1,"ef":[]}]}]}]}]}],"w":250,"h":250,"ip":0,"op":450.000018328876,"st":0,"bm":0},{"ddd":0,"ind":15,"ty":4,"nm":"Arm_R_03 Outlines","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[433.672,267.971,0],"ix":2},"a":{"a":0,"k":[30.205,24.269,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"ef":[{"ty":21,"nm":"Fill","np":9,"mn":"ADBE Fill","ix":1,"en":1,"ef":[{"ty":10,"nm":"Fill Mask","mn":"ADBE Fill-0001","ix":1,"v":{"a":0,"k":0,"ix":1}},{"ty":7,"nm":"All Masks","mn":"ADBE Fill-0007","ix":2,"v":{"a":0,"k":0,"ix":2}},{"ty":2,"nm":"Color","mn":"ADBE Fill-0002","ix":3,"v":{"a":0,"k":[1,0,0,1],"ix":3,"x":"var $bm_rt;\n$bm_rt = comp('Man_Build_Warehouse_1').layer('Color_Control').effect('Body')('ADBE Color Control-0001');"}},{"ty":7,"nm":"Invert","mn":"ADBE Fill-0006","ix":4,"v":{"a":0,"k":0,"ix":4}},{"ty":0,"nm":"Horizontal Feather","mn":"ADBE Fill-0003","ix":5,"v":{"a":0,"k":0,"ix":5}},{"ty":0,"nm":"Vertical Feather","mn":"ADBE Fill-0004","ix":6,"v":{"a":0,"k":0,"ix":6}},{"ty":0,"nm":"Opacity","mn":"ADBE Fill-0005","ix":7,"v":{"a":0,"k":1,"ix":7}}]}],"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[3.875,0.419],[4.749,2.711],[4.587,1.78],[-0.279,1.494],[0.608,1.535],[0,0],[-10.659,-2.296],[-6.835,-4.23],[-5.223,-6.161],[0,0]],"o":[[-7.297,-0.789],[-4.195,-2.395],[-1.899,-0.737],[0.834,-4.464],[-0.622,-1.569],[1.983,-0.551],[5.472,1.179],[5.125,3.172],[0,0],[0,0]],"v":[[6.574,21.369],[-11.052,8.665],[-27.342,-0.014],[-29.676,-4.71],[-10.455,-1.415],[-21.88,-23.467],[-7.504,-20.822],[12.016,-13.575],[29.955,2.337],[18.718,24.019]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.913999968884,0.791999966491,0.677999997606,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":[30.205,24.269],"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":450.000018328876,"st":0,"bm":0},{"ddd":0,"ind":16,"ty":4,"nm":"Clipboard_02 Outlines","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[377.709,283.197,0],"ix":2},"a":{"a":0,"k":[75.672,85.271,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"ef":[{"ty":21,"nm":"Fill","np":9,"mn":"ADBE Fill","ix":1,"en":1,"ef":[{"ty":10,"nm":"Fill Mask","mn":"ADBE Fill-0001","ix":1,"v":{"a":0,"k":0,"ix":1}},{"ty":7,"nm":"All Masks","mn":"ADBE Fill-0007","ix":2,"v":{"a":0,"k":0,"ix":2}},{"ty":2,"nm":"Color","mn":"ADBE Fill-0002","ix":3,"v":{"a":0,"k":[0.733333349228,0.501960813999,0.486274510622,1],"ix":3}},{"ty":7,"nm":"Invert","mn":"ADBE Fill-0006","ix":4,"v":{"a":0,"k":0,"ix":4}},{"ty":0,"nm":"Horizontal Feather","mn":"ADBE Fill-0003","ix":5,"v":{"a":0,"k":0,"ix":5}},{"ty":0,"nm":"Vertical Feather","mn":"ADBE Fill-0004","ix":6,"v":{"a":0,"k":0,"ix":6}},{"ty":0,"nm":"Opacity","mn":"ADBE Fill-0005","ix":7,"v":{"a":0,"k":1,"ix":7}}]}],"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],[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],[0,0],[0,0]],"v":[[3.484,-6.684],[5.359,-6.007],[4.544,-3.161],[4.059,-1.475],[1.721,6.684],[-5.359,4.108],[-4.817,2.217],[0.389,4.111],[2.346,-2.716],[2.794,-4.281]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.819999964097,0.438999998803,0.430999995213,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":[47.336,84.771],"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.884,1.707],[0,0],[-1.392,0.886],[0,0],[-0.83,-1.603],[0,0],[-1.6,0.801],[0,0]],"o":[[0,0],[-0.83,-1.604],[0,0],[-1.391,0.887],[0,0],[0.883,1.706],[0,0],[-1.599,0.801]],"v":[[30.168,61.711],[-33.005,-60.297],[-31.971,-64.695],[-32.818,-64.157],[-33.849,-59.759],[29.323,62.25],[33.835,63.894],[34.68,63.355]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.745000023935,0.435000011968,0.435000011968,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":[34.929,105.597],"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":[[0,0],[-0.882,-1.704],[0,0],[1.6,-0.801],[0,0],[0.883,1.707],[0,0],[-1.599,0.8],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]],"o":[[1.6,-0.801],[0,0],[0.884,1.707],[0,0],[-1.599,0.801],[0,0],[-0.882,-1.704],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]],"v":[[6.457,-83.951],[10.97,-82.311],[74.142,39.697],[72.836,44.254],[-6.46,83.95],[-10.971,82.306],[-74.143,-39.702],[-72.84,-44.254],[-47.171,-57.105],[-45.072,-53.051],[-44.796,-52.517],[-43.401,-49.826],[-67.147,-37.938],[-8.305,75.708],[67.145,37.939],[8.301,-75.709],[-14.112,-64.488],[-15.507,-67.179],[-15.783,-67.714],[-17.882,-71.767]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.819999964097,0.438999998803,0.430999995213,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":[76.069,85.002],"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":450.000018328876,"st":0,"bm":0},{"ddd":0,"ind":17,"ty":4,"nm":"Clipboard_01 Outlines","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[378.104,282.927,0],"ix":2},"a":{"a":0,"k":[67.396,75.959,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],[0.514,0.992],[1.328,-0.665],[0,0],[-0.513,-0.992],[-1.329,0.666]],"o":[[1.328,-0.665],[-0.513,-0.991],[0,0],[-1.329,0.665],[0.513,0.991],[0,0]],"v":[[34.572,1.002],[36.046,-1.996],[32.714,-2.587],[-0.441,14.01],[-1.919,17.01],[1.417,17.599]],"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.513,0.992],[1.328,-0.665],[0,0],[-0.513,-0.991],[-1.328,0.665]],"o":[[1.329,-0.665],[-0.514,-0.991],[0,0],[-1.329,0.665],[0.514,0.991],[0,0]],"v":[[11.537,-43.487],[13.011,-46.485],[9.679,-47.076],[-23.476,-30.478],[-24.954,-27.479],[-21.618,-26.889]],"c":true},"ix":2},"nm":"Path 2","mn":"ADBE Vector Shape - Group","hd":false},{"ind":2,"ty":"sh","ix":3,"ks":{"a":0,"k":{"i":[[0,0],[0.513,0.991],[1.328,-0.665],[0,0],[-0.513,-0.991],[-1.329,0.665]],"o":[[1.328,-0.665],[-0.514,-0.992],[0,0],[-1.329,0.665],[0.513,0.992],[0,0]],"v":[[22.498,-22.315],[23.973,-25.313],[20.641,-25.905],[-12.514,-9.307],[-13.992,-6.308],[-10.656,-5.718]],"c":true},"ix":2},"nm":"Path 3","mn":"ADBE Vector Shape - Group","hd":false},{"ind":3,"ty":"sh","ix":4,"ks":{"a":0,"k":{"i":[[0,0],[0.514,0.992],[1.329,-0.665],[0,0],[-0.513,-0.992],[-1.329,0.666]],"o":[[1.328,-0.665],[-0.513,-0.991],[0,0],[-1.328,0.665],[0.513,0.991],[0,0]],"v":[[46.416,23.877],[47.89,20.879],[44.557,20.288],[11.403,36.885],[9.925,39.885],[13.261,40.474]],"c":true},"ix":2},"nm":"Path 4","mn":"ADBE Vector Shape - Group","hd":false},{"ind":4,"ty":"sh","ix":5,"ks":{"a":0,"k":{"i":[[-3.882,1.944],[2.139,4.132],[3.879,-1.943],[-2.141,-4.135]],"o":[[3.88,-1.942],[-2.141,-4.135],[-3.883,1.943],[2.139,4.132]],"v":[[-13.006,33.752],[-9.848,22.734],[-20.766,18.762],[-23.924,29.78]],"c":true},"ix":2},"nm":"Path 5","mn":"ADBE Vector Shape - Group","hd":false},{"ind":5,"ty":"sh","ix":6,"ks":{"a":0,"k":{"i":[[3.879,-1.942],[-2.139,-4.132],[-3.882,1.943],[2.141,4.135]],"o":[[-3.883,1.944],[2.141,4.135],[3.88,-1.942],[-2.14,-4.132]],"v":[[-43.937,-27.414],[-47.093,-16.395],[-36.175,-12.423],[-33.018,-23.441]],"c":true},"ix":2},"nm":"Path 6","mn":"ADBE Vector Shape - Group","hd":false},{"ind":6,"ty":"sh","ix":7,"ks":{"a":0,"k":{"i":[[-3.882,1.944],[2.141,4.135],[3.879,-1.942],[-2.139,-4.132]],"o":[[3.88,-1.942],[-2.14,-4.132],[-3.883,1.944],[2.141,4.135]],"v":[[-1.161,56.627],[1.994,45.606],[-8.924,41.633],[-12.081,52.652]],"c":true},"ix":2},"nm":"Path 7","mn":"ADBE Vector Shape - Group","hd":false},{"ind":7,"ty":"sh","ix":8,"ks":{"a":0,"k":{"i":[[2.139,4.133],[0.908,0.747],[0,0],[0,0],[0,0],[2.203,-1.103],[-2.139,-4.132],[-3.882,1.943]],"o":[[-0.579,-1.117],[0,0],[0,0],[0,0],[-2.169,-1.047],[-3.883,1.944],[2.14,4.132],[3.88,-1.942]],"v":[[-21.921,-0.584],[-24.188,-3.393],[-23.372,-6.237],[-25.247,-6.915],[-25.937,-4.513],[-32.839,-4.556],[-35.997,6.462],[-25.079,10.435]],"c":true},"ix":2},"nm":"Path 8","mn":"ADBE Vector Shape - Group","hd":false},{"ind":8,"ty":"sh","ix":9,"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":[[-14.111,-64.488],[8.303,-75.709],[67.145,37.938],[-8.303,75.709],[-67.145,-37.938],[-43.4,-49.826],[-41.581,-46.312],[-12.291,-60.974]],"c":true},"ix":2},"nm":"Path 9","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":0,"k":[0.959999952129,0.959999952129,0.959999952129,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":[67.395,75.959],"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":11,"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":[[-3.108,1.556],[1.714,3.31],[3.104,-1.555],[-1.711,-3.304]],"o":[[3.105,-1.554],[-1.71,-3.304],[-3.108,1.555],[1.714,3.31]],"v":[[3.106,5.996],[5.631,-2.822],[-3.105,-5.997],[-5.632,2.818]],"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":[[-3.882,1.944],[-2.139,-4.132],[3.88,-1.942],[2.141,4.135]],"o":[[3.88,-1.942],[2.141,4.135],[-3.882,1.943],[-2.14,-4.132]],"v":[[-3.882,-7.497],[7.037,-3.526],[3.881,7.496],[-7.037,3.521]],"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":0,"k":[0.773000021542,0.8,0.842999985639,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":[62.352,125.09],"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":2,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-3.108,1.556],[-1.71,-3.304],[3.105,-1.554],[1.714,3.31]],"o":[[3.105,-1.554],[1.714,3.31],[-3.107,1.556],[-1.71,-3.303]],"v":[[-3.106,-5.998],[5.63,-2.822],[3.104,5.996],[-5.634,2.817]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.959999952129,0.959999952129,0.959999952129,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":[62.353,125.09],"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},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-3.108,1.556],[1.712,3.307],[3.104,-1.555],[-1.712,-3.307]],"o":[[3.105,-1.554],[-1.712,-3.307],[-3.108,1.555],[1.713,3.307]],"v":[[3.106,5.995],[5.633,-2.82],[-3.105,-5.999],[-5.632,2.819]],"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":[[-3.883,1.944],[-2.141,-4.135],[3.88,-1.942],[2.14,4.132]],"o":[[3.879,-1.942],[2.139,4.132],[-3.882,1.943],[-2.141,-4.135]],"v":[[-3.88,-7.496],[7.038,-3.524],[3.881,7.495],[-7.037,3.522]],"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":0,"k":[0.773000021542,0.8,0.842999985639,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":[50.508,102.216],"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 4","np":4,"cix":2,"bm":0,"ix":4,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-3.108,1.556],[-1.712,-3.306],[3.105,-1.554],[1.712,3.307]],"o":[[3.105,-1.554],[1.712,3.307],[-3.107,1.556],[-1.712,-3.306]],"v":[[-3.106,-5.998],[5.632,-2.819],[3.104,5.996],[-5.632,2.82]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.959999952129,0.959999952129,0.959999952129,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":[50.509,102.215],"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 5","np":2,"cix":2,"bm":0,"ix":5,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-3.882,1.944],[-2.168,-1.048],[0,0],[1.816,-0.909],[-1.713,-3.307],[-3.108,1.556],[1.712,3.307],[0.527,0.519],[0,0],[-0.578,-1.117],[3.879,-1.943],[2.14,4.132]],"o":[[2.203,-1.103],[0,0],[-1.769,-0.91],[-3.108,1.555],[1.712,3.307],[3.105,-1.554],[-0.36,-0.696],[0,0],[0.907,0.746],[2.14,4.132],[-3.883,1.943],[-2.139,-4.132]],"v":[[-3.881,-7.916],[3.022,-7.872],[2.574,-6.307],[-3.106,-6.419],[-5.632,2.399],[3.106,5.578],[5.632,-3.24],[4.287,-5.066],[4.771,-6.753],[7.037,-3.943],[3.881,7.076],[-7.038,3.102]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.773000021542,0.8,0.842999985639,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":[38.437,79.319],"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 6","np":2,"cix":2,"bm":0,"ix":6,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[-0.36,-0.695],[3.104,-1.554],[1.712,3.307],[-3.108,1.555],[-1.769,-0.91],[0,0],[0,0],[0,0]],"o":[[0,0],[0.527,0.518],[1.712,3.307],[-3.108,1.556],[-1.712,-3.307],[1.815,-0.909],[0,0],[0,0],[0,0],[0,0]],"v":[[1.949,3.189],[4.288,-4.969],[5.633,-3.143],[3.107,5.675],[-5.633,2.496],[-3.105,-6.322],[2.574,-6.211],[0.617,0.616],[-4.589,-1.278],[-5.13,0.613]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.959999952129,0.959999952129,0.959999952129,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":[38.436,79.222],"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 7","np":2,"cix":2,"bm":0,"ix":7,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-3.108,1.556],[1.712,3.306],[3.104,-1.555],[-1.712,-3.307]],"o":[[3.105,-1.554],[-1.712,-3.307],[-3.108,1.555],[1.712,3.307]],"v":[[3.106,5.998],[5.631,-2.82],[-3.105,-5.996],[-5.632,2.819]],"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":[[-3.882,1.944],[-2.139,-4.132],[3.879,-1.942],[2.141,4.135]],"o":[[3.88,-1.942],[2.141,4.135],[-3.883,1.944],[-2.14,-4.132]],"v":[[-3.882,-7.496],[7.037,-3.524],[3.881,7.494],[-7.037,3.522]],"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":0,"k":[0.773000021542,0.8,0.842999985639,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":[27.34,56.041],"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 8","np":4,"cix":2,"bm":0,"ix":8,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[3.105,-1.554],[1.712,3.307],[-3.108,1.555],[-1.712,-3.307]],"o":[[-3.108,1.556],[-1.712,-3.307],[3.104,-1.555],[1.712,3.306]],"v":[[3.106,5.996],[-5.632,2.818],[-3.104,-5.997],[5.632,-2.822]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.959999952129,0.959999952129,0.959999952129,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":[27.34,56.043],"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 9","np":2,"cix":2,"bm":0,"ix":9,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[-0.513,-0.991],[1.329,-0.665],[0,0],[0.514,0.991],[-1.329,0.666]],"o":[[1.329,-0.665],[0.513,0.992],[0,0],[-1.328,0.665],[-0.513,-0.992],[0,0]],"v":[[15.65,-10.094],[18.982,-9.503],[17.507,-6.504],[-15.646,10.093],[-18.982,9.504],[-17.505,6.504]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.773000021542,0.8,0.842999985639,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":[96.303,106.34],"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 10","np":2,"cix":2,"bm":0,"ix":10,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[-0.513,-0.991],[1.329,-0.665],[0,0],[0.514,0.991],[-1.329,0.666]],"o":[[1.329,-0.665],[0.513,0.992],[0,0],[-1.328,0.665],[-0.513,-0.992],[0,0]],"v":[[15.65,-10.094],[18.982,-9.503],[17.507,-6.504],[-15.646,10.093],[-18.982,9.504],[-17.505,6.504]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.773000021542,0.8,0.842999985639,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":[84.459,83.465],"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 11","np":2,"cix":2,"bm":0,"ix":11,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-1.214,0.608],[0.667,1.286],[1.21,-0.606],[-0.671,-1.296]],"o":[[1.211,-0.606],[-0.67,-1.296],[-1.214,0.608],[0.666,1.286]],"v":[[-2.231,-3.629],[-1.235,-7.063],[-4.651,-8.304],[-5.635,-4.86]],"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":[[-1.971,-3.806],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[-3.571,1.787]],"o":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[-1.97,-3.806],[3.573,-1.789]],"v":[[3.028,-9.197],[11.208,-13.292],[12.493,-10.81],[14.592,-6.757],[14.868,-6.224],[16.262,-3.532],[18.081,-0.018],[-11.208,14.645],[-13.027,11.131],[-14.421,8.439],[-14.697,7.906],[-16.796,3.852],[-18.081,1.371],[-9.898,-2.726],[-7.008,-12.856]],"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":0,"k":[0.705999995213,0.728999956916,0.764999988032,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":[37.023,15.002],"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 12","np":4,"cix":2,"bm":0,"ix":12,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[-0.22,-1.51],[-1.065,-0.971],[0.22,1.51],[1.065,0.972]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.592000026329,0.630999995213,0.666999966491,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":[19.161,17.883],"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 13","np":2,"cix":2,"bm":0,"ix":13,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[-0.513,-0.991],[1.329,-0.665],[0,0],[0.514,0.991],[-1.329,0.666]],"o":[[1.329,-0.665],[0.513,0.992],[0,0],[-1.328,0.665],[-0.513,-0.992],[0,0]],"v":[[15.65,-10.094],[18.982,-9.503],[17.507,-6.504],[-15.646,10.093],[-18.982,9.504],[-17.505,6.504]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.773000021542,0.8,0.842999985639,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":[72.386,60.148],"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 14","np":2,"cix":2,"bm":0,"ix":14,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[-0.513,-0.991],[1.329,-0.665],[0,0],[0.514,0.991],[-1.329,0.666]],"o":[[1.329,-0.665],[0.513,0.992],[0,0],[-1.328,0.665],[-0.513,-0.992],[0,0]],"v":[[15.65,-10.094],[18.982,-9.503],[17.507,-6.504],[-15.646,10.093],[-18.982,9.504],[-17.505,6.504]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.773000021542,0.8,0.842999985639,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":[61.424,38.977],"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 15","np":2,"cix":2,"bm":0,"ix":15,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-3.102,1.976],[0,0],[-1.854,-3.58],[0,0]],"o":[[0,0],[-3.102,1.976],[0,0],[-1.854,-3.581]],"v":[[2.49,-5.162],[1.645,-4.623],[-0.635,5.161],[0.209,4.623]],"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],[-1.854,-3.58],[0,0],[-3.103,1.976]],"o":[[-3.102,1.976],[0,0],[-1.854,-3.581],[0,0]],"v":[[1.644,-4.623],[-0.636,5.162],[0.209,4.624],[2.49,-5.161]],"c":true},"ix":2},"nm":"Path 2","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"mm","mm":4,"nm":"Merge Paths 1","mn":"ADBE Vector Filter - Merge","hd":false},{"ty":"fl","c":{"a":0,"k":[0.592000026329,0.630999995213,0.666999966491,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":[26.915,7.653],"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 16","np":4,"cix":2,"bm":0,"ix":16,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0.626,1.21],[1.211,-0.606],[0.067,-0.042],[0,0],[-0.072,0.036],[-0.671,-1.296],[1.053,-0.671],[0,0]],"o":[[-0.671,-1.296],[-0.072,0.036],[0,0],[0.067,-0.043],[1.21,-0.606],[0.626,1.209],[0,0],[1.053,-0.67]],"v":[[1.922,-1.184],[-1.495,-2.425],[-1.703,-2.307],[-2.548,-1.768],[-2.34,-1.886],[1.077,-0.645],[0.288,2.671],[1.133,2.132]],"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.334,-0.167],[0.067,-0.042],[0,0],[-0.072,0.036],[-0.67,-1.296],[1.053,-0.671],[0,0],[0.627,1.21],[0.941,0]],"o":[[-0.072,0.036],[0,0],[0.067,-0.042],[1.211,-0.606],[0.627,1.209],[0,0],[1.053,-0.67],[-0.485,-0.939],[-0.358,0]],"v":[[-1.495,-2.425],[-1.703,-2.308],[-2.548,-1.769],[-2.341,-1.886],[1.076,-0.645],[0.287,2.671],[1.133,2.132],[1.921,-1.184],[-0.445,-2.671]],"c":true},"ix":2},"nm":"Path 2","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"mm","mm":4,"nm":"Merge Paths 1","mn":"ADBE Vector Filter - Merge","hd":false},{"ty":"fl","c":{"a":0,"k":[0.592000026329,0.630999995213,0.666999966491,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":[33.866,9.123],"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 17","np":4,"cix":2,"bm":0,"ix":17,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":450.000018328876,"st":0,"bm":0},{"ddd":0,"ind":18,"ty":4,"nm":"Boot_L Outlines","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[497.784,862.004,0],"ix":2},"a":{"a":0,"k":[54.468,46.478,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"ef":[{"ty":21,"nm":"Fill","np":9,"mn":"ADBE Fill","ix":1,"en":1,"ef":[{"ty":10,"nm":"Fill Mask","mn":"ADBE Fill-0001","ix":1,"v":{"a":0,"k":0,"ix":1}},{"ty":7,"nm":"All Masks","mn":"ADBE Fill-0007","ix":2,"v":{"a":0,"k":0,"ix":2}},{"ty":2,"nm":"Color","mn":"ADBE Fill-0002","ix":3,"v":{"a":0,"k":[1,0,0,1],"ix":3,"x":"var $bm_rt;\n$bm_rt = comp('Man_Build_Warehouse_1').layer('Color_Control').effect('Boot')('ADBE Color Control-0001');"}},{"ty":7,"nm":"Invert","mn":"ADBE Fill-0006","ix":4,"v":{"a":0,"k":0,"ix":4}},{"ty":0,"nm":"Horizontal Feather","mn":"ADBE Fill-0003","ix":5,"v":{"a":0,"k":0,"ix":5}},{"ty":0,"nm":"Vertical Feather","mn":"ADBE Fill-0004","ix":6,"v":{"a":0,"k":0,"ix":6}},{"ty":0,"nm":"Opacity","mn":"ADBE Fill-0005","ix":7,"v":{"a":0,"k":1,"ix":7}}]}],"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[16.284,-2.349],[0.764,-4.103],[-14.921,-3.01],[-7.863,-2.586],[-9.735,0.395],[-2.197,6.465],[0,0]],"o":[[0,0],[-5.466,0.789],[-2.082,11.172],[10.594,2.136],[9.265,3.047],[8.171,-0.331],[1.808,-5.321],[0,0]],"v":[[-0.596,-22.828],[-42.194,-27.365],[-52.136,-17.199],[-26.032,13.681],[2.986,18.206],[34.78,29.319],[52.41,19.704],[50.213,-4.217]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.310000011968,0.305999995213,0.305999995213,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":[54.468,62.991],"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,-12.839],[12.839,0],[0,12.839],[-12.839,0]],"o":[[0,12.839],[-12.839,0],[0,-12.839],[12.839,0]],"v":[[23.247,0],[0,23.247],[-23.247,0],[0,-23.247]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.310000011968,0.305999995213,0.305999995213,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":[81.731,55.014],"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":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[22.661,-29.986],[-22.661,-29.986],[-22.271,14.165],[22.661,29.986]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.310000011968,0.305999995213,0.305999995213,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":[82.317,30.236],"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":450.000018328876,"st":0,"bm":0},{"ddd":0,"ind":19,"ty":4,"nm":"Boot_R Outlines","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[556.496,820.339,0],"ix":2},"a":{"a":0,"k":[54.468,46.227,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"ef":[{"ty":21,"nm":"Fill","np":9,"mn":"ADBE Fill","ix":1,"en":1,"ef":[{"ty":10,"nm":"Fill Mask","mn":"ADBE Fill-0001","ix":1,"v":{"a":0,"k":0,"ix":1}},{"ty":7,"nm":"All Masks","mn":"ADBE Fill-0007","ix":2,"v":{"a":0,"k":0,"ix":2}},{"ty":2,"nm":"Color","mn":"ADBE Fill-0002","ix":3,"v":{"a":0,"k":[1,0,0,1],"ix":3,"x":"var $bm_rt;\n$bm_rt = comp('Man_Build_Warehouse_1').layer('Color_Control').effect('Boot')('ADBE Color Control-0001');"}},{"ty":7,"nm":"Invert","mn":"ADBE Fill-0006","ix":4,"v":{"a":0,"k":0,"ix":4}},{"ty":0,"nm":"Horizontal Feather","mn":"ADBE Fill-0003","ix":5,"v":{"a":0,"k":0,"ix":5}},{"ty":0,"nm":"Vertical Feather","mn":"ADBE Fill-0004","ix":6,"v":{"a":0,"k":0,"ix":6}},{"ty":0,"nm":"Opacity","mn":"ADBE Fill-0005","ix":7,"v":{"a":0,"k":1,"ix":7}}]}],"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[16.284,-2.349],[0.764,-4.103],[-14.921,-3.01],[-7.863,-2.586],[-9.735,0.395],[-2.197,6.465],[0,0]],"o":[[0,0],[-5.466,0.789],[-2.082,11.172],[10.593,2.136],[9.265,3.047],[8.171,-0.331],[1.808,-5.321],[0,0]],"v":[[-0.596,-22.828],[-42.194,-27.365],[-52.136,-17.199],[-26.032,13.681],[2.986,18.206],[34.78,29.319],[52.41,19.704],[50.213,-4.217]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.310000011968,0.305999995213,0.305999995213,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":[54.468,62.491],"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,-12.839],[12.839,0],[0,12.839],[-12.839,0]],"o":[[0,12.839],[-12.839,0],[0,-12.839],[12.839,0]],"v":[[23.125,0],[0.122,23.247],[-23.125,0],[0.122,-23.247]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.310000011968,0.305999995213,0.305999995213,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":[81.698,55.015],"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":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[22.661,-29.303],[-22.661,-29.303],[-22.271,14.847],[22.661,29.303]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.310000011968,0.305999995213,0.305999995213,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":[82.162,29.553],"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":450.000018328876,"st":0,"bm":0}]},{"id":"comp_3","layers":[{"ddd":0,"ind":1,"ty":4,"nm":"Arm_L_05 Outlines","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[100.106,166.745,0],"ix":2},"a":{"a":0,"k":[62.573,54.531,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"ef":[{"ty":21,"nm":"Fill","np":9,"mn":"ADBE Fill","ix":1,"en":1,"ef":[{"ty":10,"nm":"Fill Mask","mn":"ADBE Fill-0001","ix":1,"v":{"a":0,"k":0,"ix":1}},{"ty":7,"nm":"All Masks","mn":"ADBE Fill-0007","ix":2,"v":{"a":0,"k":0,"ix":2}},{"ty":2,"nm":"Color","mn":"ADBE Fill-0002","ix":3,"v":{"a":0,"k":[1,0,0,1],"ix":3,"x":"var $bm_rt;\n$bm_rt = comp('Man_Build_Warehouse_1').layer('Color_Control').effect('Pait')('ADBE Color Control-0001');"}},{"ty":7,"nm":"Invert","mn":"ADBE Fill-0006","ix":4,"v":{"a":0,"k":0,"ix":4}},{"ty":0,"nm":"Horizontal Feather","mn":"ADBE Fill-0003","ix":5,"v":{"a":0,"k":0,"ix":5}},{"ty":0,"nm":"Vertical Feather","mn":"ADBE Fill-0004","ix":6,"v":{"a":0,"k":0,"ix":6}},{"ty":0,"nm":"Opacity","mn":"ADBE Fill-0005","ix":7,"v":{"a":0,"k":1,"ix":7}}]},{"ty":5,"nm":"Hue/Saturation","np":11,"mn":"ADBE HUE SATURATION","ix":2,"en":1,"ef":[{"ty":7,"nm":"Channel Control","mn":"ADBE HUE SATURATION-0002","ix":1,"v":{"a":0,"k":1,"ix":1}},{},{"ty":0,"nm":"Master Hue","mn":"ADBE HUE SATURATION-0004","ix":3,"v":{"a":0,"k":0,"ix":3}},{"ty":0,"nm":"Master Saturation","mn":"ADBE HUE SATURATION-0005","ix":4,"v":{"a":0,"k":0,"ix":4}},{"ty":0,"nm":"Master Lightness","mn":"ADBE HUE SATURATION-0006","ix":5,"v":{"a":0,"k":-5,"ix":5}},{"ty":7,"nm":"Colorize","mn":"ADBE HUE SATURATION-0007","ix":6,"v":{"a":0,"k":0,"ix":6}},{"ty":0,"nm":"Colorize Hue","mn":"ADBE HUE SATURATION-0008","ix":7,"v":{"a":0,"k":0,"ix":7}},{"ty":0,"nm":"Colorize Saturation","mn":"ADBE HUE SATURATION-0009","ix":8,"v":{"a":0,"k":25,"ix":8}},{"ty":0,"nm":"Colorize Lightness","mn":"ADBE HUE SATURATION-0010","ix":9,"v":{"a":0,"k":0,"ix":9}}]}],"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-13.153,1.423],[1.423,13.154],[13.153,-1.423],[-1.422,-13.154]],"o":[[13.153,-1.423],[-1.422,-13.153],[-13.154,1.423],[1.423,13.153]],"v":[[2.576,23.816],[23.816,-2.576],[-2.576,-23.817],[-23.817,2.576]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.8,0.8,0.795999983245,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":[99.657,83.573],"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],[-29.483,-20.573],[0,0],[0,0]],"o":[[0,0],[0,0],[-27.865,-22.36],[5.525,-18.248]],"v":[[-36.791,-51.189],[55.567,11.12],[29.269,51.189],[-55.567,-29.551]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.8,0.8,0.795999983245,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":[55.817,51.438],"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}],"ip":0,"op":450.000018328876,"st":0,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"Arm_L_04 Outlines","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[156.172,120.72,0],"ix":2},"a":{"a":0,"k":[39.869,83.979,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"ef":[{"ty":21,"nm":"Fill","np":9,"mn":"ADBE Fill","ix":1,"en":1,"ef":[{"ty":10,"nm":"Fill Mask","mn":"ADBE Fill-0001","ix":1,"v":{"a":0,"k":0,"ix":1}},{"ty":7,"nm":"All Masks","mn":"ADBE Fill-0007","ix":2,"v":{"a":0,"k":0,"ix":2}},{"ty":2,"nm":"Color","mn":"ADBE Fill-0002","ix":3,"v":{"a":0,"k":[1,0,0,1],"ix":3,"x":"var $bm_rt;\n$bm_rt = comp('Man_Build_Warehouse_1').layer('Color_Control').effect('Pait')('ADBE Color Control-0001');"}},{"ty":7,"nm":"Invert","mn":"ADBE Fill-0006","ix":4,"v":{"a":0,"k":0,"ix":4}},{"ty":0,"nm":"Horizontal Feather","mn":"ADBE Fill-0003","ix":5,"v":{"a":0,"k":0,"ix":5}},{"ty":0,"nm":"Vertical Feather","mn":"ADBE Fill-0004","ix":6,"v":{"a":0,"k":0,"ix":6}},{"ty":0,"nm":"Opacity","mn":"ADBE Fill-0005","ix":7,"v":{"a":0,"k":1,"ix":7}}]},{"ty":5,"nm":"Hue/Saturation","np":11,"mn":"ADBE HUE SATURATION","ix":2,"en":1,"ef":[{"ty":7,"nm":"Channel Control","mn":"ADBE HUE SATURATION-0002","ix":1,"v":{"a":0,"k":1,"ix":1}},{},{"ty":0,"nm":"Master Hue","mn":"ADBE HUE SATURATION-0004","ix":3,"v":{"a":0,"k":0,"ix":3}},{"ty":0,"nm":"Master Saturation","mn":"ADBE HUE SATURATION-0005","ix":4,"v":{"a":0,"k":0,"ix":4}},{"ty":0,"nm":"Master Lightness","mn":"ADBE HUE SATURATION-0006","ix":5,"v":{"a":0,"k":-5,"ix":5}},{"ty":7,"nm":"Colorize","mn":"ADBE HUE SATURATION-0007","ix":6,"v":{"a":0,"k":0,"ix":6}},{"ty":0,"nm":"Colorize Hue","mn":"ADBE HUE SATURATION-0008","ix":7,"v":{"a":0,"k":0,"ix":7}},{"ty":0,"nm":"Colorize Saturation","mn":"ADBE HUE SATURATION-0009","ix":8,"v":{"a":0,"k":25,"ix":8}},{"ty":0,"nm":"Colorize Lightness","mn":"ADBE HUE SATURATION-0010","ix":9,"v":{"a":0,"k":0,"ix":9}}]}],"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[-0.992,2.337],[0,0],[0,0],[-0.981,1.714],[-13.428,-9.241],[3.695,-12.894],[0,0],[13.599,-24.925],[0,0]],"o":[[0.5,-2.314],[0,0],[0,0],[0.735,-1.729],[7.77,-13.563],[10.469,7.204],[0,0],[0,0],[0,0],[9.819,-33.96]],"v":[[-17.163,-52.152],[-14.914,-59.142],[-14.909,-59.158],[-14.907,-59.158],[-12.331,-64.327],[26.443,-74.488],[35.924,-38.777],[35.922,-38.772],[3.392,83.728],[-39.619,66.037]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.8,0.8,0.795999983245,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":[39.869,83.979],"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":450.000018328876,"st":0,"bm":0}]},{"id":"comp_4","layers":[{"ddd":0,"ind":1,"ty":4,"nm":"Leg_L/Man_Build_Warehouse Outlines","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[49.5,216,0],"ix":2},"a":{"a":0,"k":[49.5,216,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],[0,0],[9.778,33.18],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[48.715,-191.316],[42.035,183.154],[-16.975,158.137],[-48.715,-187.612]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.475,0.497999991623,0.545000023935,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":[49.155,239.853],"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,-26.916],[-26.916,0],[0,26.916],[26.917,0]],"o":[[0,26.916],[26.917,0],[0,-26.916],[-26.916,0]],"v":[[-48.736,0],[0,48.736],[48.736,0],[0,-48.736]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.475,0.497999991623,0.545000023935,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":[48.986,48.986],"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}],"ip":0,"op":450.000018328876,"st":0,"bm":0}]},{"id":"comp_5","layers":[{"ddd":0,"ind":1,"ty":4,"nm":"Leg_R/Man_Build_Warehouse Outlines","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[49.5,216,0],"ix":2},"a":{"a":0,"k":[49.5,216,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],[0,0],[9.778,33.18],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[48.737,-191.316],[42.057,183.154],[-16.953,158.137],[-48.737,-187.205]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.438999998803,0.463000009574,0.497999991623,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":[49.768,240.302],"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,-26.916],[-26.916,0],[0,26.916],[26.917,0]],"o":[[0,26.916],[26.917,0],[0,-26.916],[-26.916,0]],"v":[[-48.736,0],[-0.001,48.736],[48.736,0],[-0.001,-48.736]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.438999998803,0.463000009574,0.497999991623,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":[48.987,48.986],"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}],"ip":0,"op":450.000018328876,"st":0,"bm":0}]},{"id":"comp_6","layers":[{"ddd":0,"ind":1,"ty":4,"nm":"Arm_R_05 Outlines","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[95.088,153.132,0],"ix":2},"a":{"a":0,"k":[63.16,60.067,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"ef":[{"ty":21,"nm":"Fill","np":9,"mn":"ADBE Fill","ix":1,"en":1,"ef":[{"ty":10,"nm":"Fill Mask","mn":"ADBE Fill-0001","ix":1,"v":{"a":0,"k":0,"ix":1}},{"ty":7,"nm":"All Masks","mn":"ADBE Fill-0007","ix":2,"v":{"a":0,"k":0,"ix":2}},{"ty":2,"nm":"Color","mn":"ADBE Fill-0002","ix":3,"v":{"a":0,"k":[1,0,0,1],"ix":3,"x":"var $bm_rt;\n$bm_rt = comp('Man_Build_Warehouse_1').layer('Color_Control').effect('Pait')('ADBE Color Control-0001');"}},{"ty":7,"nm":"Invert","mn":"ADBE Fill-0006","ix":4,"v":{"a":0,"k":0,"ix":4}},{"ty":0,"nm":"Horizontal Feather","mn":"ADBE Fill-0003","ix":5,"v":{"a":0,"k":0,"ix":5}},{"ty":0,"nm":"Vertical Feather","mn":"ADBE Fill-0004","ix":6,"v":{"a":0,"k":0,"ix":6}},{"ty":0,"nm":"Opacity","mn":"ADBE Fill-0005","ix":7,"v":{"a":0,"k":1,"ix":7}}]},{"ty":5,"nm":"Hue/Saturation","np":11,"mn":"ADBE HUE SATURATION","ix":2,"en":1,"ef":[{"ty":7,"nm":"Channel Control","mn":"ADBE HUE SATURATION-0002","ix":1,"v":{"a":0,"k":1,"ix":1}},{},{"ty":0,"nm":"Master Hue","mn":"ADBE HUE SATURATION-0004","ix":3,"v":{"a":0,"k":0,"ix":3}},{"ty":0,"nm":"Master Saturation","mn":"ADBE HUE SATURATION-0005","ix":4,"v":{"a":0,"k":0,"ix":4}},{"ty":0,"nm":"Master Lightness","mn":"ADBE HUE SATURATION-0006","ix":5,"v":{"a":0,"k":-5,"ix":5}},{"ty":7,"nm":"Colorize","mn":"ADBE HUE SATURATION-0007","ix":6,"v":{"a":0,"k":0,"ix":6}},{"ty":0,"nm":"Colorize Hue","mn":"ADBE HUE SATURATION-0008","ix":7,"v":{"a":0,"k":0,"ix":7}},{"ty":0,"nm":"Colorize Saturation","mn":"ADBE HUE SATURATION-0009","ix":8,"v":{"a":0,"k":25,"ix":8}},{"ty":0,"nm":"Colorize Lightness","mn":"ADBE HUE SATURATION-0010","ix":9,"v":{"a":0,"k":0,"ix":9}}]}],"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-13.198,0.927],[0.927,13.198],[13.198,-0.927],[-0.927,-13.198]],"o":[[13.198,-0.927],[-0.927,-13.198],[-13.197,0.927],[0.927,13.197]],"v":[[1.679,23.896],[23.896,-1.678],[-1.679,-23.896],[-23.896,1.679]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.8,0.8,0.795999983245,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":[101.247,95.061],"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],[-28.688,-21.668],[0,0],[0,0]],"o":[[0,0],[0,0],[-27.003,-23.394],[1.737,-19.321]],"v":[[-42.696,-56.653],[56.753,17.601],[28.966,56.653],[-56.753,-30.956]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.8,0.8,0.795999983245,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":[57.003,56.903],"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}],"ip":0,"op":450.000018328876,"st":0,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"Arm_R_04 Outlines","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[158.05,121.956,0],"ix":2},"a":{"a":0,"k":[47.661,82.498,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"ef":[{"ty":21,"nm":"Fill","np":9,"mn":"ADBE Fill","ix":1,"en":1,"ef":[{"ty":10,"nm":"Fill Mask","mn":"ADBE Fill-0001","ix":1,"v":{"a":0,"k":0,"ix":1}},{"ty":7,"nm":"All Masks","mn":"ADBE Fill-0007","ix":2,"v":{"a":0,"k":0,"ix":2}},{"ty":2,"nm":"Color","mn":"ADBE Fill-0002","ix":3,"v":{"a":0,"k":[1,0,0,1],"ix":3,"x":"var $bm_rt;\n$bm_rt = comp('Man_Build_Warehouse_1').layer('Color_Control').effect('Pait')('ADBE Color Control-0001');"}},{"ty":7,"nm":"Invert","mn":"ADBE Fill-0006","ix":4,"v":{"a":0,"k":0,"ix":4}},{"ty":0,"nm":"Horizontal Feather","mn":"ADBE Fill-0003","ix":5,"v":{"a":0,"k":0,"ix":5}},{"ty":0,"nm":"Vertical Feather","mn":"ADBE Fill-0004","ix":6,"v":{"a":0,"k":0,"ix":6}},{"ty":0,"nm":"Opacity","mn":"ADBE Fill-0005","ix":7,"v":{"a":0,"k":1,"ix":7}}]},{"ty":5,"nm":"Hue/Saturation","np":11,"mn":"ADBE HUE SATURATION","ix":2,"en":1,"ef":[{"ty":7,"nm":"Channel Control","mn":"ADBE HUE SATURATION-0002","ix":1,"v":{"a":0,"k":1,"ix":1}},{},{"ty":0,"nm":"Master Hue","mn":"ADBE HUE SATURATION-0004","ix":3,"v":{"a":0,"k":0,"ix":3}},{"ty":0,"nm":"Master Saturation","mn":"ADBE HUE SATURATION-0005","ix":4,"v":{"a":0,"k":0,"ix":4}},{"ty":0,"nm":"Master Lightness","mn":"ADBE HUE SATURATION-0006","ix":5,"v":{"a":0,"k":-5,"ix":5}},{"ty":7,"nm":"Colorize","mn":"ADBE HUE SATURATION-0007","ix":6,"v":{"a":0,"k":0,"ix":6}},{"ty":0,"nm":"Colorize Hue","mn":"ADBE HUE SATURATION-0008","ix":7,"v":{"a":0,"k":0,"ix":7}},{"ty":0,"nm":"Colorize Saturation","mn":"ADBE HUE SATURATION-0009","ix":8,"v":{"a":0,"k":25,"ix":8}},{"ty":0,"nm":"Colorize Lightness","mn":"ADBE HUE SATURATION-0010","ix":9,"v":{"a":0,"k":0,"ix":9}}]}],"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[-1.307,2.177],[0,0],[0,0],[-1.21,1.56],[-12.013,-11.016],[5.45,-12.256],[0,0],[16.929,-22.794],[0,0]],"o":[[0.816,-2.222],[0,0],[0,0],[0.968,-1.61],[9.579,-12.352],[9.367,8.589],[0,0],[0,0],[0,0],[14.442,-32.266]],"v":[[-8.753,-55.17],[-5.555,-61.781],[-5.547,-61.796],[-5.546,-61.795],[-2.276,-66.556],[37.533,-71.232],[41.961,-34.55],[41.959,-34.545],[-7.274,82.248],[-47.411,58.752]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.8,0.8,0.795999983245,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":[47.661,82.498],"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":450.000018328876,"st":0,"bm":0}]},{"id":"comp_7","layers":[{"ddd":0,"ind":1,"ty":3,"nm":"Color_Control","sr":1,"ks":{"o":{"a":0,"k":0,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[300,350,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"ef":[{"ty":5,"nm":"Color","np":3,"mn":"ADBE Color Control","ix":1,"en":1,"ef":[{"ty":2,"nm":"Color","mn":"ADBE Color Control-0001","ix":1,"v":{"a":0,"k":[0.866666674614,0.803921580315,0.705882370472,1],"ix":1}}]}],"ip":0,"op":450.000018328876,"st":0,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"Sticker Outlines","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[453.151,439.632,0],"ix":2},"a":{"a":0,"k":[25.685,38.473,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"ef":[{"ty":21,"nm":"Fill","np":9,"mn":"ADBE Fill","ix":1,"en":1,"ef":[{"ty":10,"nm":"Fill Mask","mn":"ADBE Fill-0001","ix":1,"v":{"a":0,"k":0,"ix":1}},{"ty":7,"nm":"All Masks","mn":"ADBE Fill-0007","ix":2,"v":{"a":0,"k":0,"ix":2}},{"ty":2,"nm":"Color","mn":"ADBE Fill-0002","ix":3,"v":{"a":0,"k":[1,0,0,1],"ix":3,"x":"var $bm_rt;\n$bm_rt = thisComp.layer('Color_Control').effect('Color')('ADBE Color Control-0001');"}},{"ty":7,"nm":"Invert","mn":"ADBE Fill-0006","ix":4,"v":{"a":0,"k":0,"ix":4}},{"ty":0,"nm":"Horizontal Feather","mn":"ADBE Fill-0003","ix":5,"v":{"a":0,"k":0,"ix":5}},{"ty":0,"nm":"Vertical Feather","mn":"ADBE Fill-0004","ix":6,"v":{"a":0,"k":0,"ix":6}},{"ty":0,"nm":"Opacity","mn":"ADBE Fill-0005","ix":7,"v":{"a":0,"k":1,"ix":7}}]},{"ty":5,"nm":"Hue/Saturation","np":11,"mn":"ADBE HUE SATURATION","ix":2,"en":1,"ef":[{"ty":7,"nm":"Channel Control","mn":"ADBE HUE SATURATION-0002","ix":1,"v":{"a":0,"k":1,"ix":1}},{},{"ty":0,"nm":"Master Hue","mn":"ADBE HUE SATURATION-0004","ix":3,"v":{"a":0,"k":0,"ix":3}},{"ty":0,"nm":"Master Saturation","mn":"ADBE HUE SATURATION-0005","ix":4,"v":{"a":0,"k":0,"ix":4}},{"ty":0,"nm":"Master Lightness","mn":"ADBE HUE SATURATION-0006","ix":5,"v":{"a":0,"k":25,"ix":5}},{"ty":7,"nm":"Colorize","mn":"ADBE HUE SATURATION-0007","ix":6,"v":{"a":0,"k":0,"ix":6}},{"ty":0,"nm":"Colorize Hue","mn":"ADBE HUE SATURATION-0008","ix":7,"v":{"a":0,"k":0,"ix":7}},{"ty":0,"nm":"Colorize Saturation","mn":"ADBE HUE SATURATION-0009","ix":8,"v":{"a":0,"k":25,"ix":8}},{"ty":0,"nm":"Colorize Lightness","mn":"ADBE HUE SATURATION-0010","ix":9,"v":{"a":0,"k":0,"ix":9}}]}],"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[25.685,-38.473],[25.685,8.731],[-25.685,38.473],[-25.685,-8.726]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.925,0.925,0.925,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.685,38.473],"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":4,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":450.000018328876,"st":0,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":"Box_Side_01 Outlines","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[203.736,404.452,0],"ix":2},"a":{"a":0,"k":[97.29,167.996,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"ef":[{"ty":21,"nm":"Fill","np":9,"mn":"ADBE Fill","ix":1,"en":1,"ef":[{"ty":10,"nm":"Fill Mask","mn":"ADBE Fill-0001","ix":1,"v":{"a":0,"k":0,"ix":1}},{"ty":7,"nm":"All Masks","mn":"ADBE Fill-0007","ix":2,"v":{"a":0,"k":0,"ix":2}},{"ty":2,"nm":"Color","mn":"ADBE Fill-0002","ix":3,"v":{"a":0,"k":[1,0,0,1],"ix":3,"x":"var $bm_rt;\n$bm_rt = thisComp.layer('Color_Control').effect('Color')('ADBE Color Control-0001');"}},{"ty":7,"nm":"Invert","mn":"ADBE Fill-0006","ix":4,"v":{"a":0,"k":0,"ix":4}},{"ty":0,"nm":"Horizontal Feather","mn":"ADBE Fill-0003","ix":5,"v":{"a":0,"k":0,"ix":5}},{"ty":0,"nm":"Vertical Feather","mn":"ADBE Fill-0004","ix":6,"v":{"a":0,"k":0,"ix":6}},{"ty":0,"nm":"Opacity","mn":"ADBE Fill-0005","ix":7,"v":{"a":0,"k":1,"ix":7}}]},{"ty":5,"nm":"Hue/Saturation","np":11,"mn":"ADBE HUE SATURATION","ix":2,"en":1,"ef":[{"ty":7,"nm":"Channel Control","mn":"ADBE HUE SATURATION-0002","ix":1,"v":{"a":0,"k":1,"ix":1}},{},{"ty":0,"nm":"Master Hue","mn":"ADBE HUE SATURATION-0004","ix":3,"v":{"a":0,"k":0,"ix":3}},{"ty":0,"nm":"Master Saturation","mn":"ADBE HUE SATURATION-0005","ix":4,"v":{"a":0,"k":0,"ix":4}},{"ty":0,"nm":"Master Lightness","mn":"ADBE HUE SATURATION-0006","ix":5,"v":{"a":0,"k":25,"ix":5}},{"ty":7,"nm":"Colorize","mn":"ADBE HUE SATURATION-0007","ix":6,"v":{"a":0,"k":0,"ix":6}},{"ty":0,"nm":"Colorize Hue","mn":"ADBE HUE SATURATION-0008","ix":7,"v":{"a":0,"k":0,"ix":7}},{"ty":0,"nm":"Colorize Saturation","mn":"ADBE HUE SATURATION-0009","ix":8,"v":{"a":0,"k":25,"ix":8}},{"ty":0,"nm":"Colorize Lightness","mn":"ADBE HUE SATURATION-0010","ix":9,"v":{"a":0,"k":0,"ix":9}}]}],"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[-97.008,-167.746],[97.041,-55.712],[97.041,167.746],[-97.04,55.692]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.745000023935,0.675,0.596000043084,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":[97.29,167.996],"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":450.000018328876,"st":0,"bm":0},{"ddd":0,"ind":4,"ty":4,"nm":"Box_Side_03 Outlines","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[300.364,236.709,0],"ix":2},"a":{"a":0,"k":[193.886,112.281,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"ef":[{"ty":21,"nm":"Fill","np":9,"mn":"ADBE Fill","ix":1,"en":1,"ef":[{"ty":10,"nm":"Fill Mask","mn":"ADBE Fill-0001","ix":1,"v":{"a":0,"k":0,"ix":1}},{"ty":7,"nm":"All Masks","mn":"ADBE Fill-0007","ix":2,"v":{"a":0,"k":0,"ix":2}},{"ty":2,"nm":"Color","mn":"ADBE Fill-0002","ix":3,"v":{"a":0,"k":[1,0,0,1],"ix":3,"x":"var $bm_rt;\n$bm_rt = thisComp.layer('Color_Control').effect('Color')('ADBE Color Control-0001');"}},{"ty":7,"nm":"Invert","mn":"ADBE Fill-0006","ix":4,"v":{"a":0,"k":0,"ix":4}},{"ty":0,"nm":"Horizontal Feather","mn":"ADBE Fill-0003","ix":5,"v":{"a":0,"k":0,"ix":5}},{"ty":0,"nm":"Vertical Feather","mn":"ADBE Fill-0004","ix":6,"v":{"a":0,"k":0,"ix":6}},{"ty":0,"nm":"Opacity","mn":"ADBE Fill-0005","ix":7,"v":{"a":0,"k":1,"ix":7}}]}],"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[0.301,-112.031],[193.636,-0.261],[0.412,112.031],[-193.636,-0.004]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.866999966491,0.804000016755,0.705999995213,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":[193.886,112.281],"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":450.000018328876,"st":0,"bm":0},{"ddd":0,"ind":5,"ty":4,"nm":"Box_Side_02 Outlines","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[397.388,404.323,0],"ix":2},"a":{"a":0,"k":[96.863,168.125,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"ef":[{"ty":21,"nm":"Fill","np":9,"mn":"ADBE Fill","ix":1,"en":1,"ef":[{"ty":10,"nm":"Fill Mask","mn":"ADBE Fill-0001","ix":1,"v":{"a":0,"k":0,"ix":1}},{"ty":7,"nm":"All Masks","mn":"ADBE Fill-0007","ix":2,"v":{"a":0,"k":0,"ix":2}},{"ty":2,"nm":"Color","mn":"ADBE Fill-0002","ix":3,"v":{"a":0,"k":[1,0,0,1],"ix":3,"x":"var $bm_rt;\n$bm_rt = thisComp.layer('Color_Control').effect('Color')('ADBE Color Control-0001');"}},{"ty":7,"nm":"Invert","mn":"ADBE Fill-0006","ix":4,"v":{"a":0,"k":0,"ix":4}},{"ty":0,"nm":"Horizontal Feather","mn":"ADBE Fill-0003","ix":5,"v":{"a":0,"k":0,"ix":5}},{"ty":0,"nm":"Vertical Feather","mn":"ADBE Fill-0004","ix":6,"v":{"a":0,"k":0,"ix":6}},{"ty":0,"nm":"Opacity","mn":"ADBE Fill-0005","ix":7,"v":{"a":0,"k":1,"ix":7}}]},{"ty":5,"nm":"Hue/Saturation","np":11,"mn":"ADBE HUE SATURATION","ix":2,"en":1,"ef":[{"ty":7,"nm":"Channel Control","mn":"ADBE HUE SATURATION-0002","ix":1,"v":{"a":0,"k":1,"ix":1}},{},{"ty":0,"nm":"Master Hue","mn":"ADBE HUE SATURATION-0004","ix":3,"v":{"a":0,"k":0,"ix":3}},{"ty":0,"nm":"Master Saturation","mn":"ADBE HUE SATURATION-0005","ix":4,"v":{"a":0,"k":0,"ix":4}},{"ty":0,"nm":"Master Lightness","mn":"ADBE HUE SATURATION-0006","ix":5,"v":{"a":0,"k":-5,"ix":5}},{"ty":7,"nm":"Colorize","mn":"ADBE HUE SATURATION-0007","ix":6,"v":{"a":0,"k":0,"ix":6}},{"ty":0,"nm":"Colorize Hue","mn":"ADBE HUE SATURATION-0008","ix":7,"v":{"a":0,"k":0,"ix":7}},{"ty":0,"nm":"Colorize Saturation","mn":"ADBE HUE SATURATION-0009","ix":8,"v":{"a":0,"k":25,"ix":8}},{"ty":0,"nm":"Colorize Lightness","mn":"ADBE HUE SATURATION-0010","ix":9,"v":{"a":0,"k":0,"ix":9}}]}],"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[-96.613,-55.583],[96.613,-167.875],[96.613,56.317],[-96.613,167.875]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.823999980852,0.752999997606,0.620000023935,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":[96.863,168.125],"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":450.000018328876,"st":0,"bm":0}]},{"id":"comp_8","layers":[{"ddd":0,"ind":1,"ty":0,"nm":"Worker_Warehouse","refId":"comp_9","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[482,838,0],"ix":2},"a":{"a":0,"k":[491.304,760.87,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.833,0.833,0.833],"y":[0.833,0.833,0.833]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,0.167]},"t":0,"s":[0,0,100]},{"t":10.0000004073083,"s":[115,115,100]}],"ix":6,"x":"var $bm_rt;\nvar n, n, t, t, v, amp, freq, decay;\n$bm_rt = n = 0;\nif (numKeys > 0) {\n $bm_rt = n = nearestKey(time).index;\n if (key(n).time > time) {\n n--;\n }\n}\nif (n == 0) {\n $bm_rt = t = 0;\n} else {\n $bm_rt = t = $bm_sub(time, key(n).time);\n}\nif (n > 0) {\n v = velocityAtTime($bm_sub(key(n).time, $bm_div(thisComp.frameDuration, 10)));\n amp = 0.055;\n freq = 2;\n decay = 7;\n $bm_rt = $bm_sum(value, $bm_div($bm_mul($bm_mul(v, amp), Math.sin($bm_mul($bm_mul($bm_mul(freq, t), 2), Math.PI))), Math.exp($bm_mul(decay, t))));\n} else {\n $bm_rt = value;\n}"}},"ao":0,"w":1000,"h":1000,"ip":0,"op":450.000018328876,"st":0,"bm":0}]},{"id":"comp_9","layers":[{"ddd":0,"ind":1,"ty":3,"nm":"Color_Control","sr":1,"ks":{"o":{"a":0,"k":0,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[500,500,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"ef":[{"ty":5,"nm":"Helmet","np":3,"mn":"ADBE Color Control","ix":1,"en":1,"ef":[{"ty":2,"nm":"Color","mn":"ADBE Color Control-0001","ix":1,"v":{"a":0,"k":[0.850980401039,0.603921592236,0.337254911661,1],"ix":1}}]},{"ty":5,"nm":"Cap","np":3,"mn":"ADBE Color Control","ix":2,"en":1,"ef":[{"ty":2,"nm":"Color","mn":"ADBE Color Control-0001","ix":1,"v":{"a":0,"k":[0.733333349228,0.486274510622,0.486274510622,1],"ix":1}}]},{"ty":5,"nm":"Hair","np":3,"mn":"ADBE Color Control","ix":3,"en":1,"ef":[{"ty":2,"nm":"Color","mn":"ADBE Color Control-0001","ix":1,"v":{"a":0,"k":[0.447058826685,0.298039227724,0.180392161012,1],"ix":1}}]},{"ty":5,"nm":"Body","np":3,"mn":"ADBE Color Control","ix":4,"en":1,"ef":[{"ty":2,"nm":"Color","mn":"ADBE Color Control-0001","ix":1,"v":{"a":0,"k":[0.913725495338,0.792156875134,0.674509823322,1],"ix":1}}]},{"ty":5,"nm":"Robe","np":3,"mn":"ADBE Color Control","ix":5,"en":1,"ef":[{"ty":2,"nm":"Color","mn":"ADBE Color Control-0001","ix":1,"v":{"a":0,"k":[0.372549027205,0.090196080506,0.639215707779,1],"ix":1}}]},{"ty":5,"nm":"Shirt","np":3,"mn":"ADBE Color Control","ix":6,"en":1,"ef":[{"ty":2,"nm":"Color","mn":"ADBE Color Control-0001","ix":1,"v":{"a":0,"k":[0.878431379795,0.882352948189,0.878431379795,1],"ix":1}}]},{"ty":5,"nm":"Boots","np":3,"mn":"ADBE Color Control","ix":7,"en":1,"ef":[{"ty":2,"nm":"Color","mn":"ADBE Color Control-0001","ix":1,"v":{"a":0,"k":[0.309803932905,0.305882364511,0.305882364511,1],"ix":1}}]}],"ip":0,"op":450.000018328876,"st":0,"bm":0},{"ddd":0,"ind":2,"ty":0,"nm":"Box_Package","refId":"comp_7","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[430.95,400.946,0],"ix":2},"a":{"a":0,"k":[300,350,0],"ix":1},"s":{"a":0,"k":[40,40,100],"ix":6}},"ao":0,"w":600,"h":700,"ip":-38.0000015477717,"op":412.000016781104,"st":-38.0000015477717,"bm":0},{"ddd":0,"ind":5,"ty":4,"nm":"Hand_L_04 Outlines","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[476.197,459.92,0],"ix":2},"a":{"a":0,"k":[26.54,14.83,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"ef":[{"ty":21,"nm":"Fill","np":9,"mn":"ADBE Fill","ix":1,"en":1,"ef":[{"ty":10,"nm":"Fill Mask","mn":"ADBE Fill-0001","ix":1,"v":{"a":0,"k":0,"ix":1}},{"ty":7,"nm":"All Masks","mn":"ADBE Fill-0007","ix":2,"v":{"a":0,"k":0,"ix":2}},{"ty":2,"nm":"Color","mn":"ADBE Fill-0002","ix":3,"v":{"a":0,"k":[1,0,0,1],"ix":3,"x":"var $bm_rt;\n$bm_rt = thisComp.layer('Color_Control').effect('Body')('ADBE Color Control-0001');"}},{"ty":7,"nm":"Invert","mn":"ADBE Fill-0006","ix":4,"v":{"a":0,"k":0,"ix":4}},{"ty":0,"nm":"Horizontal Feather","mn":"ADBE Fill-0003","ix":5,"v":{"a":0,"k":0,"ix":5}},{"ty":0,"nm":"Vertical Feather","mn":"ADBE Fill-0004","ix":6,"v":{"a":0,"k":0,"ix":6}},{"ty":0,"nm":"Opacity","mn":"ADBE Fill-0005","ix":7,"v":{"a":0,"k":1,"ix":7}}]}],"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[7.944,1.487],[5,-2.094],[2.833,0.667],[-1.843,3.153],[-5.405,1.188],[0,0],[0,0]],"o":[[-4.179,-0.782],[-4.334,1.815],[-2.014,-0.473],[2.027,-3.468],[5.405,-1.188],[0,0],[0,0]],"v":[[11.866,6.719],[0.803,9.705],[-17.864,13.913],[-24.447,3.268],[-7.15,-10.795],[18.721,-14.58],[26.29,5.025]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.964999988032,0.8,0.681999954523,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":[26.54,14.83],"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":450.000018328876,"st":0,"bm":0},{"ddd":0,"ind":12,"ty":4,"nm":"Hair Outlines","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[498.793,230.551,0],"ix":2},"a":{"a":0,"k":[39.473,43.139,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"ef":[{"ty":21,"nm":"Fill","np":9,"mn":"ADBE Fill","ix":1,"en":1,"ef":[{"ty":10,"nm":"Fill Mask","mn":"ADBE Fill-0001","ix":1,"v":{"a":0,"k":0,"ix":1}},{"ty":7,"nm":"All Masks","mn":"ADBE Fill-0007","ix":2,"v":{"a":0,"k":0,"ix":2}},{"ty":2,"nm":"Color","mn":"ADBE Fill-0002","ix":3,"v":{"a":0,"k":[1,0,0,1],"ix":3,"x":"var $bm_rt;\n$bm_rt = thisComp.layer('Color_Control').effect('Hair')('ADBE Color Control-0001');"}},{"ty":7,"nm":"Invert","mn":"ADBE Fill-0006","ix":4,"v":{"a":0,"k":0,"ix":4}},{"ty":0,"nm":"Horizontal Feather","mn":"ADBE Fill-0003","ix":5,"v":{"a":0,"k":0,"ix":5}},{"ty":0,"nm":"Vertical Feather","mn":"ADBE Fill-0004","ix":6,"v":{"a":0,"k":0,"ix":6}},{"ty":0,"nm":"Opacity","mn":"ADBE Fill-0005","ix":7,"v":{"a":0,"k":1,"ix":7}}]}],"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0.317,-2.482],[0,0],[0,0]],"o":[[-0.919,-1.968],[0,0],[-1.018,2.29]],"v":[[-0.564,3.77],[-1.307,-3.77],[1.483,-3.428]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.447000002394,0.298000021542,0.180000005984,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":[2.944,39.963],"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":[[-29.471,-15.038],[0,-21.703],[0,0],[0,0],[0,0],[0.056,5.22],[2.078,-2.074],[0,0],[0,0],[0,0],[15.713,3.243],[0,0]],"o":[[6.178,3.153],[0,19.641],[0,0],[0,0],[1.723,-0.14],[-0.047,-4.377],[-0.789,1.318],[0,0],[0,0],[0,0],[-14.414,-3.178],[-0.014,-19.148]],"v":[[24.218,-27.851],[39.222,7.959],[25.893,38.425],[18.881,42.889],[19.049,35.608],[23.799,25.971],[17.138,22.511],[13.742,28.927],[9.18,30.021],[7.948,-1.049],[-24.808,1.481],[-37.835,-6.946]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.447000002394,0.298000021542,0.180000005984,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":[39.472,43.139],"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}],"ip":0,"op":450.000018328876,"st":0,"bm":0},{"ddd":0,"ind":13,"ty":4,"nm":"Head Outlines","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[496.955,246.791,0],"ix":2},"a":{"a":0,"k":[37.977,47.117,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"ef":[{"ty":21,"nm":"Fill","np":9,"mn":"ADBE Fill","ix":1,"en":1,"ef":[{"ty":10,"nm":"Fill Mask","mn":"ADBE Fill-0001","ix":1,"v":{"a":0,"k":0,"ix":1}},{"ty":7,"nm":"All Masks","mn":"ADBE Fill-0007","ix":2,"v":{"a":0,"k":0,"ix":2}},{"ty":2,"nm":"Color","mn":"ADBE Fill-0002","ix":3,"v":{"a":0,"k":[1,0,0,1],"ix":3,"x":"var $bm_rt;\n$bm_rt = thisComp.layer('Color_Control').effect('Body')('ADBE Color Control-0001');"}},{"ty":7,"nm":"Invert","mn":"ADBE Fill-0006","ix":4,"v":{"a":0,"k":0,"ix":4}},{"ty":0,"nm":"Horizontal Feather","mn":"ADBE Fill-0003","ix":5,"v":{"a":0,"k":0,"ix":5}},{"ty":0,"nm":"Vertical Feather","mn":"ADBE Fill-0004","ix":6,"v":{"a":0,"k":0,"ix":6}},{"ty":0,"nm":"Opacity","mn":"ADBE Fill-0005","ix":7,"v":{"a":0,"k":1,"ix":7}}]}],"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[7.667,-11.282],[0.267,-0.426],[0.466,-3.89],[0.138,-3.991],[0.366,-5.722],[-16.151,-2.326],[-4.506,3.853],[0,0],[-2.217,9.2],[2.045,6.485],[2.193,2.013],[3.588,1.569],[2.929,1.199],[3.801,-0.656]],"o":[[-0.282,0.415],[-2.069,3.315],[-0.477,3.977],[-0.091,2.643],[-0.366,5.72],[16.152,2.327],[4.506,-3.852],[0,0],[1.612,-6.688],[-0.871,-2.761],[-3.001,-2.755],[-2.675,-1.17],[-3.674,-1.503],[-13.169,2.273]],"v":[[-30.363,-27.697],[-31.186,-26.435],[-35.162,-15.468],[-34.855,-3.57],[-37.361,7.386],[-17.882,44.539],[13.546,33.583],[28.982,15.904],[36.115,-9.36],[35.261,-30.356],[30.168,-37.515],[26.569,-42.495],[17.535,-45.287],[3.825,-46.211]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.964999988032,0.8,0.681999954523,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":[37.977,47.117],"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":450.000018328876,"st":0,"bm":0},{"ddd":0,"ind":14,"ty":4,"nm":"Hand_L_01 Outlines","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[548.58,341.071,0],"ix":2},"a":{"a":0,"k":[26.672,31.753,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"ef":[{"ty":21,"nm":"Fill","np":9,"mn":"ADBE Fill","ix":1,"en":1,"ef":[{"ty":10,"nm":"Fill Mask","mn":"ADBE Fill-0001","ix":1,"v":{"a":0,"k":0,"ix":1}},{"ty":7,"nm":"All Masks","mn":"ADBE Fill-0007","ix":2,"v":{"a":0,"k":0,"ix":2}},{"ty":2,"nm":"Color","mn":"ADBE Fill-0002","ix":3,"v":{"a":0,"k":[1,0,0,1],"ix":3,"x":"var $bm_rt;\n$bm_rt = thisComp.layer('Color_Control').effect('Shirt')('ADBE Color Control-0001');"}},{"ty":7,"nm":"Invert","mn":"ADBE Fill-0006","ix":4,"v":{"a":0,"k":0,"ix":4}},{"ty":0,"nm":"Horizontal Feather","mn":"ADBE Fill-0003","ix":5,"v":{"a":0,"k":0,"ix":5}},{"ty":0,"nm":"Vertical Feather","mn":"ADBE Fill-0004","ix":6,"v":{"a":0,"k":0,"ix":6}},{"ty":0,"nm":"Opacity","mn":"ADBE Fill-0005","ix":7,"v":{"a":0,"k":1,"ix":7}}]},{"ty":5,"nm":"Hue/Saturation","np":11,"mn":"ADBE HUE SATURATION","ix":2,"en":1,"ef":[{"ty":7,"nm":"Channel Control","mn":"ADBE HUE SATURATION-0002","ix":1,"v":{"a":0,"k":1,"ix":1}},{},{"ty":0,"nm":"Master Hue","mn":"ADBE HUE SATURATION-0004","ix":3,"v":{"a":0,"k":0,"ix":3}},{"ty":0,"nm":"Master Saturation","mn":"ADBE HUE SATURATION-0005","ix":4,"v":{"a":0,"k":0,"ix":4}},{"ty":0,"nm":"Master Lightness","mn":"ADBE HUE SATURATION-0006","ix":5,"v":{"a":0,"k":-5,"ix":5}},{"ty":7,"nm":"Colorize","mn":"ADBE HUE SATURATION-0007","ix":6,"v":{"a":0,"k":0,"ix":6}},{"ty":0,"nm":"Colorize Hue","mn":"ADBE HUE SATURATION-0008","ix":7,"v":{"a":0,"k":0,"ix":7}},{"ty":0,"nm":"Colorize Saturation","mn":"ADBE HUE SATURATION-0009","ix":8,"v":{"a":0,"k":25,"ix":8}},{"ty":0,"nm":"Colorize Lightness","mn":"ADBE HUE SATURATION-0010","ix":9,"v":{"a":0,"k":0,"ix":9}}]}],"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[9.084,0.193],[-0.683,-11.155],[-0.095,-0.907],[0,0],[0,0],[-0.61,-1.578],[0,0],[0,0],[0,0]],"o":[[-3.483,-9.34],[-11.651,-0.248],[0.087,1.409],[0,0],[0,0],[0.592,1.693],[0,0],[13.943,1.083],[-6.367,-17.091],[0,0]],"v":[[13.924,-14.05],[-6.147,-31.254],[-25.739,-10.004],[-25.065,-5.772],[-25.302,-5.689],[-25.257,-5.559],[-23.318,0.4],[-9.843,30.42],[26.422,17.072],[13.91,-14.04]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.859000052658,0.859000052658,0.859000052658,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":[26.672,31.753],"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":450.000018328876,"st":0,"bm":0},{"ddd":0,"ind":15,"ty":4,"nm":"Hand_L_Joint_01 Outlines","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.45],"y":[1]},"o":{"x":[0.55],"y":[0]},"t":20,"s":[-17]},{"t":36.0000014663101,"s":[0]}],"ix":10},"p":{"a":0,"k":[576.661,421.227,0],"ix":2},"a":{"a":0,"k":[18.001,18.001,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"ef":[{"ty":21,"nm":"Fill","np":9,"mn":"ADBE Fill","ix":1,"en":1,"ef":[{"ty":10,"nm":"Fill Mask","mn":"ADBE Fill-0001","ix":1,"v":{"a":0,"k":0,"ix":1}},{"ty":7,"nm":"All Masks","mn":"ADBE Fill-0007","ix":2,"v":{"a":0,"k":0,"ix":2}},{"ty":2,"nm":"Color","mn":"ADBE Fill-0002","ix":3,"v":{"a":0,"k":[1,0,0,1],"ix":3,"x":"var $bm_rt;\n$bm_rt = thisComp.layer('Color_Control').effect('Body')('ADBE Color Control-0001');"}},{"ty":7,"nm":"Invert","mn":"ADBE Fill-0006","ix":4,"v":{"a":0,"k":0,"ix":4}},{"ty":0,"nm":"Horizontal Feather","mn":"ADBE Fill-0003","ix":5,"v":{"a":0,"k":0,"ix":5}},{"ty":0,"nm":"Vertical Feather","mn":"ADBE Fill-0004","ix":6,"v":{"a":0,"k":0,"ix":6}},{"ty":0,"nm":"Opacity","mn":"ADBE Fill-0005","ix":7,"v":{"a":0,"k":1,"ix":7}}]}],"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-3.229,8.021],[8.02,3.229],[3.229,-8.02],[-8.02,-3.229]],"o":[[3.229,-8.02],[-8.02,-3.229],[-3.229,8.021],[8.021,3.229]],"v":[[14.523,5.846],[5.847,-14.522],[-14.522,-5.847],[-5.846,14.522]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.964999988032,0.8,0.681999954523,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":[18.001,18.002],"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":450.000018328876,"st":0,"bm":0},{"ddd":0,"ind":16,"ty":4,"nm":"Hand_L_03 Outlines","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[539.97,437.37,0],"ix":2},"a":{"a":0,"k":[46.205,28.039,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"ef":[{"ty":21,"nm":"Fill","np":9,"mn":"ADBE Fill","ix":1,"en":1,"ef":[{"ty":10,"nm":"Fill Mask","mn":"ADBE Fill-0001","ix":1,"v":{"a":0,"k":0,"ix":1}},{"ty":7,"nm":"All Masks","mn":"ADBE Fill-0007","ix":2,"v":{"a":0,"k":0,"ix":2}},{"ty":2,"nm":"Color","mn":"ADBE Fill-0002","ix":3,"v":{"a":0,"k":[1,0,0,1],"ix":3,"x":"var $bm_rt;\n$bm_rt = thisComp.layer('Color_Control').effect('Body')('ADBE Color Control-0001');"}},{"ty":7,"nm":"Invert","mn":"ADBE Fill-0006","ix":4,"v":{"a":0,"k":0,"ix":4}},{"ty":0,"nm":"Horizontal Feather","mn":"ADBE Fill-0003","ix":5,"v":{"a":0,"k":0,"ix":5}},{"ty":0,"nm":"Vertical Feather","mn":"ADBE Fill-0004","ix":6,"v":{"a":0,"k":0,"ix":6}},{"ty":0,"nm":"Opacity","mn":"ADBE Fill-0005","ix":7,"v":{"a":0,"k":1,"ix":7}}]}],"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[-22.904,11.666],[0,0],[0,0]],"o":[[0,0],[0,0],[-17.063,10.128],[0,0]],"v":[[-45.955,8.418],[26.312,-27.789],[45.955,-3.453],[-38,27.789]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.964999988032,0.8,0.681999954523,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":[46.205,28.039],"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":450.000018328876,"st":0,"bm":0},{"ddd":0,"ind":17,"ty":4,"nm":"Hand_L_02 Outlines","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[557.542,367.233,0],"ix":2},"a":{"a":0,"k":[35.029,56.948,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"ef":[{"ty":21,"nm":"Fill","np":9,"mn":"ADBE Fill","ix":1,"en":1,"ef":[{"ty":10,"nm":"Fill Mask","mn":"ADBE Fill-0001","ix":1,"v":{"a":0,"k":0,"ix":1}},{"ty":7,"nm":"All Masks","mn":"ADBE Fill-0007","ix":2,"v":{"a":0,"k":0,"ix":2}},{"ty":2,"nm":"Color","mn":"ADBE Fill-0002","ix":3,"v":{"a":0,"k":[1,0,0,1],"ix":3,"x":"var $bm_rt;\n$bm_rt = thisComp.layer('Color_Control').effect('Body')('ADBE Color Control-0001');"}},{"ty":7,"nm":"Invert","mn":"ADBE Fill-0006","ix":4,"v":{"a":0,"k":0,"ix":4}},{"ty":0,"nm":"Horizontal Feather","mn":"ADBE Fill-0003","ix":5,"v":{"a":0,"k":0,"ix":5}},{"ty":0,"nm":"Vertical Feather","mn":"ADBE Fill-0004","ix":6,"v":{"a":0,"k":0,"ix":6}},{"ty":0,"nm":"Opacity","mn":"ADBE Fill-0005","ix":7,"v":{"a":0,"k":1,"ix":7}}]}],"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[-0.247,1.987],[0,0],[0,0],[0.093,1.409],[-11.652,-0.192],[-2.901,-9.141],[0,0],[0,0],[-1.761,-20.224],[0,0]],"o":[[-0.618,-1.576],[0,0],[0,0],[-0.394,-1.744],[-0.738,-11.152],[9.086,0.149],[0,0],[0,0],[0,0],[0,0],[-7.586,-24.11]],"v":[[-31.606,-26.912],[-33.241,-31.616],[-33.133,-31.305],[-33.473,-31.186],[-34.04,-35.445],[-15.376,-56.506],[4.004,-38.62],[4.377,-39.049],[3.994,-38.646],[34.779,52.985],[3.815,56.698]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.964999988032,0.8,0.681999954523,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":[35.028,56.948],"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":450.000018328876,"st":0,"bm":0},{"ddd":0,"ind":18,"ty":4,"nm":"Suspender_02 Outlines","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[521.663,340.338,0],"ix":2},"a":{"a":0,"k":[17.005,44.246,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"ef":[{"ty":21,"nm":"Fill","np":9,"mn":"ADBE Fill","ix":1,"en":1,"ef":[{"ty":10,"nm":"Fill Mask","mn":"ADBE Fill-0001","ix":1,"v":{"a":0,"k":0,"ix":1}},{"ty":7,"nm":"All Masks","mn":"ADBE Fill-0007","ix":2,"v":{"a":0,"k":0,"ix":2}},{"ty":2,"nm":"Color","mn":"ADBE Fill-0002","ix":3,"v":{"a":0,"k":[1,0,0,1],"ix":3,"x":"var $bm_rt;\n$bm_rt = thisComp.layer('Color_Control').effect('Robe')('ADBE Color Control-0001');"}},{"ty":7,"nm":"Invert","mn":"ADBE Fill-0006","ix":4,"v":{"a":0,"k":0,"ix":4}},{"ty":0,"nm":"Horizontal Feather","mn":"ADBE Fill-0003","ix":5,"v":{"a":0,"k":0,"ix":5}},{"ty":0,"nm":"Vertical Feather","mn":"ADBE Fill-0004","ix":6,"v":{"a":0,"k":0,"ix":6}},{"ty":0,"nm":"Opacity","mn":"ADBE Fill-0005","ix":7,"v":{"a":0,"k":1,"ix":7}}]},{"ty":5,"nm":"Hue/Saturation","np":11,"mn":"ADBE HUE SATURATION","ix":2,"en":1,"ef":[{"ty":7,"nm":"Channel Control","mn":"ADBE HUE SATURATION-0002","ix":1,"v":{"a":0,"k":1,"ix":1}},{},{"ty":0,"nm":"Master Hue","mn":"ADBE HUE SATURATION-0004","ix":3,"v":{"a":0,"k":0,"ix":3}},{"ty":0,"nm":"Master Saturation","mn":"ADBE HUE SATURATION-0005","ix":4,"v":{"a":0,"k":0,"ix":4}},{"ty":0,"nm":"Master Lightness","mn":"ADBE HUE SATURATION-0006","ix":5,"v":{"a":0,"k":-5,"ix":5}},{"ty":7,"nm":"Colorize","mn":"ADBE HUE SATURATION-0007","ix":6,"v":{"a":0,"k":0,"ix":6}},{"ty":0,"nm":"Colorize Hue","mn":"ADBE HUE SATURATION-0008","ix":7,"v":{"a":0,"k":0,"ix":7}},{"ty":0,"nm":"Colorize Saturation","mn":"ADBE HUE SATURATION-0009","ix":8,"v":{"a":0,"k":25,"ix":8}},{"ty":0,"nm":"Colorize Lightness","mn":"ADBE HUE SATURATION-0010","ix":9,"v":{"a":0,"k":0,"ix":9}}]}],"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[1.509,-1.235],[-1.564,-1.911],[-1.509,1.235],[1.564,1.911]],"o":[[-1.509,1.235],[1.564,1.912],[1.509,-1.235],[-1.564,-1.912]],"v":[[-2.832,-3.461],[-2.733,2.236],[2.832,3.461],[2.733,-2.236]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.404000016755,0.404000016755,0.404000016755,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":[6.861,77.808],"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],[8.176,2.864],[5.47,-12.408],[0,0],[0.096,8.446],[-7.682,15.68]],"o":[[0,0],[0,0],[-5.835,13.238],[-0.031,6.042],[-0.105,-9.253],[4.618,-9.426]],"v":[[16.755,-37.978],[4.307,-43.996],[-10.919,-23.222],[-16.023,34.526],[-3.346,35.55],[2.38,-22.591]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.430999995213,0.46699999641,0.501999978458,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":[17.004,44.246],"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}],"ip":0,"op":450.000018328876,"st":0,"bm":0},{"ddd":0,"ind":19,"ty":4,"nm":"Suspender_01 Outlines","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[457.022,322.061,0],"ix":2},"a":{"a":0,"k":[16.011,42.205,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"ef":[{"ty":21,"nm":"Fill","np":9,"mn":"ADBE Fill","ix":1,"en":1,"ef":[{"ty":10,"nm":"Fill Mask","mn":"ADBE Fill-0001","ix":1,"v":{"a":0,"k":0,"ix":1}},{"ty":7,"nm":"All Masks","mn":"ADBE Fill-0007","ix":2,"v":{"a":0,"k":0,"ix":2}},{"ty":2,"nm":"Color","mn":"ADBE Fill-0002","ix":3,"v":{"a":0,"k":[1,0,0,1],"ix":3,"x":"var $bm_rt;\n$bm_rt = thisComp.layer('Color_Control').effect('Robe')('ADBE Color Control-0001');"}},{"ty":7,"nm":"Invert","mn":"ADBE Fill-0006","ix":4,"v":{"a":0,"k":0,"ix":4}},{"ty":0,"nm":"Horizontal Feather","mn":"ADBE Fill-0003","ix":5,"v":{"a":0,"k":0,"ix":5}},{"ty":0,"nm":"Vertical Feather","mn":"ADBE Fill-0004","ix":6,"v":{"a":0,"k":0,"ix":6}},{"ty":0,"nm":"Opacity","mn":"ADBE Fill-0005","ix":7,"v":{"a":0,"k":1,"ix":7}}]},{"ty":5,"nm":"Hue/Saturation","np":11,"mn":"ADBE HUE SATURATION","ix":2,"en":1,"ef":[{"ty":7,"nm":"Channel Control","mn":"ADBE HUE SATURATION-0002","ix":1,"v":{"a":0,"k":1,"ix":1}},{},{"ty":0,"nm":"Master Hue","mn":"ADBE HUE SATURATION-0004","ix":3,"v":{"a":0,"k":0,"ix":3}},{"ty":0,"nm":"Master Saturation","mn":"ADBE HUE SATURATION-0005","ix":4,"v":{"a":0,"k":0,"ix":4}},{"ty":0,"nm":"Master Lightness","mn":"ADBE HUE SATURATION-0006","ix":5,"v":{"a":0,"k":-5,"ix":5}},{"ty":7,"nm":"Colorize","mn":"ADBE HUE SATURATION-0007","ix":6,"v":{"a":0,"k":0,"ix":6}},{"ty":0,"nm":"Colorize Hue","mn":"ADBE HUE SATURATION-0008","ix":7,"v":{"a":0,"k":0,"ix":7}},{"ty":0,"nm":"Colorize Saturation","mn":"ADBE HUE SATURATION-0009","ix":8,"v":{"a":0,"k":25,"ix":8}},{"ty":0,"nm":"Colorize Lightness","mn":"ADBE HUE SATURATION-0010","ix":9,"v":{"a":0,"k":0,"ix":9}}]}],"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[1.509,-1.235],[-1.564,-1.911],[-1.509,1.235],[1.564,1.911]],"o":[[-1.509,1.235],[1.564,1.912],[1.509,-1.235],[-1.564,-1.912]],"v":[[-2.832,-3.461],[-2.733,2.236],[2.832,3.461],[2.733,-2.236]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.404000016755,0.404000016755,0.404000016755,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":[5.198,73.958],"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],[6.135,-0.954],[4.589,-12.759],[0,0],[-0.372,6.629],[-8.381,16.657]],"o":[[0,0],[0,0],[-5.113,14.216],[0.775,3.488],[0.415,-7.383],[4.717,-9.376]],"v":[[15.762,-39.895],[0.675,-41.001],[-10.648,-22.824],[-15.535,35.645],[-5.098,35.326],[2.092,-21.913]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.430999995213,0.46699999641,0.501999978458,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":[16.011,42.205],"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}],"ip":0,"op":450.000018328876,"st":0,"bm":0},{"ddd":0,"ind":20,"ty":4,"nm":"Body_01 Outlines","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[499.17,433.855,0],"ix":2},"a":{"a":0,"k":[58.651,89.326,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"ef":[{"ty":21,"nm":"Fill","np":9,"mn":"ADBE Fill","ix":1,"en":1,"ef":[{"ty":10,"nm":"Fill Mask","mn":"ADBE Fill-0001","ix":1,"v":{"a":0,"k":0,"ix":1}},{"ty":7,"nm":"All Masks","mn":"ADBE Fill-0007","ix":2,"v":{"a":0,"k":0,"ix":2}},{"ty":2,"nm":"Color","mn":"ADBE Fill-0002","ix":3,"v":{"a":0,"k":[1,0,0,1],"ix":3,"x":"var $bm_rt;\n$bm_rt = thisComp.layer('Color_Control').effect('Robe')('ADBE Color Control-0001');"}},{"ty":7,"nm":"Invert","mn":"ADBE Fill-0006","ix":4,"v":{"a":0,"k":0,"ix":4}},{"ty":0,"nm":"Horizontal Feather","mn":"ADBE Fill-0003","ix":5,"v":{"a":0,"k":0,"ix":5}},{"ty":0,"nm":"Vertical Feather","mn":"ADBE Fill-0004","ix":6,"v":{"a":0,"k":0,"ix":6}},{"ty":0,"nm":"Opacity","mn":"ADBE Fill-0005","ix":7,"v":{"a":0,"k":1,"ix":7}}]}],"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-0.698,5.68],[-20.393,-6.802],[-0.129,-1.601],[-0.342,-22.799],[0,0],[0.299,-1.675],[50.526,2.35],[1.374,21.699],[1.13,31.205]],"o":[[0,0],[25.195,8.404],[0.166,2.062],[0.497,33.173],[-0.035,1.516],[-1.688,9.45],[-22.604,-1.052],[-1.036,-16.364],[-1.084,-29.919]],"v":[[-57.1,-89.077],[-30.577,-75.747],[19.005,-64.27],[19.953,4.781],[58.401,43.764],[57.883,62.177],[-8.672,86.727],[-54.439,51.49],[-57.317,-19.044]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.46699999641,0.501999978458,0.556999954523,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":[58.651,89.326],"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":450.000018328876,"st":0,"bm":0},{"ddd":0,"ind":21,"ty":4,"nm":"Body_02 Outlines","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[500.037,394.349,0],"ix":2},"a":{"a":0,"k":[60.55,115.479,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"ef":[{"ty":21,"nm":"Fill","np":9,"mn":"ADBE Fill","ix":1,"en":1,"ef":[{"ty":10,"nm":"Fill Mask","mn":"ADBE Fill-0001","ix":1,"v":{"a":0,"k":0,"ix":1}},{"ty":7,"nm":"All Masks","mn":"ADBE Fill-0007","ix":2,"v":{"a":0,"k":0,"ix":2}},{"ty":2,"nm":"Color","mn":"ADBE Fill-0002","ix":3,"v":{"a":0,"k":[1,0,0,1],"ix":3,"x":"var $bm_rt;\n$bm_rt = thisComp.layer('Color_Control').effect('Shirt')('ADBE Color Control-0001');"}},{"ty":7,"nm":"Invert","mn":"ADBE Fill-0006","ix":4,"v":{"a":0,"k":0,"ix":4}},{"ty":0,"nm":"Horizontal Feather","mn":"ADBE Fill-0003","ix":5,"v":{"a":0,"k":0,"ix":5}},{"ty":0,"nm":"Vertical Feather","mn":"ADBE Fill-0004","ix":6,"v":{"a":0,"k":0,"ix":6}},{"ty":0,"nm":"Opacity","mn":"ADBE Fill-0005","ix":7,"v":{"a":0,"k":1,"ix":7}}]}],"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-6.609,29.191],[-17.573,-3.649],[-8.076,-2.111],[-1.729,5.898],[0.035,2.097],[-4.522,-10.334],[0.089,-12.306],[0,-0.859],[54.385,2.674],[0,8.438]],"o":[[2.804,-12.383],[0.132,9.953],[16.647,4.351],[0.233,-0.792],[18.639,6.296],[2.892,6.607],[-0.33,45.561],[0,4.751],[-46.206,-2.272],[-1.796,-18.182]],"v":[[-53.691,-102.165],[-24.074,-111.579],[-18.288,-81.095],[17.667,-96.507],[17.911,-101.012],[57.408,-74.28],[59.635,-0.46],[56.827,99.847],[-7.699,112.554],[-55.126,63.947]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.877999997606,0.882000014361,0.877999997606,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":[60.55,115.479],"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":450.000018328876,"st":0,"bm":0},{"ddd":0,"ind":22,"ty":4,"nm":"Neck_02 Outlines","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[496.957,327.295,0],"ix":2},"a":{"a":0,"k":[21.558,32.079,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"ef":[{"ty":21,"nm":"Fill","np":9,"mn":"ADBE Fill","ix":1,"en":1,"ef":[{"ty":10,"nm":"Fill Mask","mn":"ADBE Fill-0001","ix":1,"v":{"a":0,"k":0,"ix":1}},{"ty":7,"nm":"All Masks","mn":"ADBE Fill-0007","ix":2,"v":{"a":0,"k":0,"ix":2}},{"ty":2,"nm":"Color","mn":"ADBE Fill-0002","ix":3,"v":{"a":0,"k":[1,0,0,1],"ix":3,"x":"var $bm_rt;\n$bm_rt = thisComp.layer('Color_Control').effect('Body')('ADBE Color Control-0001');"}},{"ty":7,"nm":"Invert","mn":"ADBE Fill-0006","ix":4,"v":{"a":0,"k":0,"ix":4}},{"ty":0,"nm":"Horizontal Feather","mn":"ADBE Fill-0003","ix":5,"v":{"a":0,"k":0,"ix":5}},{"ty":0,"nm":"Vertical Feather","mn":"ADBE Fill-0004","ix":6,"v":{"a":0,"k":0,"ix":6}},{"ty":0,"nm":"Opacity","mn":"ADBE Fill-0005","ix":7,"v":{"a":0,"k":1,"ix":7}}]},{"ty":5,"nm":"Hue/Saturation","np":11,"mn":"ADBE HUE SATURATION","ix":2,"en":1,"ef":[{"ty":7,"nm":"Channel Control","mn":"ADBE HUE SATURATION-0002","ix":1,"v":{"a":0,"k":1,"ix":1}},{},{"ty":0,"nm":"Master Hue","mn":"ADBE HUE SATURATION-0004","ix":3,"v":{"a":0,"k":0,"ix":3}},{"ty":0,"nm":"Master Saturation","mn":"ADBE HUE SATURATION-0005","ix":4,"v":{"a":0,"k":0,"ix":4}},{"ty":0,"nm":"Master Lightness","mn":"ADBE HUE SATURATION-0006","ix":5,"v":{"a":0,"k":-5,"ix":5}},{"ty":7,"nm":"Colorize","mn":"ADBE HUE SATURATION-0007","ix":6,"v":{"a":0,"k":0,"ix":6}},{"ty":0,"nm":"Colorize Hue","mn":"ADBE HUE SATURATION-0008","ix":7,"v":{"a":0,"k":0,"ix":7}},{"ty":0,"nm":"Colorize Saturation","mn":"ADBE HUE SATURATION-0009","ix":8,"v":{"a":0,"k":25,"ix":8}},{"ty":0,"nm":"Colorize Lightness","mn":"ADBE HUE SATURATION-0010","ix":9,"v":{"a":0,"k":0,"ix":9}}]}],"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,-11.658],[-11.658,0],[0,11.658],[11.658,0]],"o":[[0,11.658],[11.658,0],[0,-11.658],[-11.658,0]],"v":[[-21.108,0],[0,21.108],[21.108,0],[0,-21.108]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.889999988032,0.74900004069,0.654999976065,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":[21.431,42.801],"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],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[-21.308,21.308],[21.308,21.308],[21.308,-21.308],[-21.308,-21.308]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.889999988032,0.74900004069,0.654999976065,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":[21.558,21.558],"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}],"ip":0,"op":450.000018328876,"st":0,"bm":0},{"ddd":0,"ind":23,"ty":4,"nm":"Neck_01 Outlines","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[496.09,292.436,0],"ix":2},"a":{"a":0,"k":[22.971,25.419,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"ef":[{"ty":21,"nm":"Fill","np":9,"mn":"ADBE Fill","ix":1,"en":1,"ef":[{"ty":10,"nm":"Fill Mask","mn":"ADBE Fill-0001","ix":1,"v":{"a":0,"k":0,"ix":1}},{"ty":7,"nm":"All Masks","mn":"ADBE Fill-0007","ix":2,"v":{"a":0,"k":0,"ix":2}},{"ty":2,"nm":"Color","mn":"ADBE Fill-0002","ix":3,"v":{"a":0,"k":[1,0,0,1],"ix":3,"x":"var $bm_rt;\n$bm_rt = thisComp.layer('Color_Control').effect('Body')('ADBE Color Control-0001');"}},{"ty":7,"nm":"Invert","mn":"ADBE Fill-0006","ix":4,"v":{"a":0,"k":0,"ix":4}},{"ty":0,"nm":"Horizontal Feather","mn":"ADBE Fill-0003","ix":5,"v":{"a":0,"k":0,"ix":5}},{"ty":0,"nm":"Vertical Feather","mn":"ADBE Fill-0004","ix":6,"v":{"a":0,"k":0,"ix":6}},{"ty":0,"nm":"Opacity","mn":"ADBE Fill-0005","ix":7,"v":{"a":0,"k":1,"ix":7}}]},{"ty":5,"nm":"Hue/Saturation","np":11,"mn":"ADBE HUE SATURATION","ix":2,"en":1,"ef":[{"ty":7,"nm":"Channel Control","mn":"ADBE HUE SATURATION-0002","ix":1,"v":{"a":0,"k":1,"ix":1}},{},{"ty":0,"nm":"Master Hue","mn":"ADBE HUE SATURATION-0004","ix":3,"v":{"a":0,"k":0,"ix":3}},{"ty":0,"nm":"Master Saturation","mn":"ADBE HUE SATURATION-0005","ix":4,"v":{"a":0,"k":0,"ix":4}},{"ty":0,"nm":"Master Lightness","mn":"ADBE HUE SATURATION-0006","ix":5,"v":{"a":0,"k":-5,"ix":5}},{"ty":7,"nm":"Colorize","mn":"ADBE HUE SATURATION-0007","ix":6,"v":{"a":0,"k":0,"ix":6}},{"ty":0,"nm":"Colorize Hue","mn":"ADBE HUE SATURATION-0008","ix":7,"v":{"a":0,"k":0,"ix":7}},{"ty":0,"nm":"Colorize Saturation","mn":"ADBE HUE SATURATION-0009","ix":8,"v":{"a":0,"k":25,"ix":8}},{"ty":0,"nm":"Colorize Lightness","mn":"ADBE HUE SATURATION-0010","ix":9,"v":{"a":0,"k":0,"ix":9}}]}],"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[1.018,-3.472],[16.646,4.35],[0.356,9.628]],"o":[[-2.634,6.375],[-1.729,5.897],[-8.38,-2.191],[-0.532,-14.414]],"v":[[22.721,-23.718],[21.615,5.406],[-14.341,20.818],[-20.153,-10.755]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.889999988032,0.74900004069,0.654999976065,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":[22.971,25.419],"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":450.000018328876,"st":0,"bm":0},{"ddd":0,"ind":24,"ty":4,"nm":"Body_03 Outlines","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[500.799,373.801,0],"ix":2},"a":{"a":0,"k":[60.513,100.219,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"ef":[{"ty":21,"nm":"Fill","np":9,"mn":"ADBE Fill","ix":1,"en":1,"ef":[{"ty":10,"nm":"Fill Mask","mn":"ADBE Fill-0001","ix":1,"v":{"a":0,"k":0,"ix":1}},{"ty":7,"nm":"All Masks","mn":"ADBE Fill-0007","ix":2,"v":{"a":0,"k":0,"ix":2}},{"ty":2,"nm":"Color","mn":"ADBE Fill-0002","ix":3,"v":{"a":0,"k":[1,0,0,1],"ix":3,"x":"var $bm_rt;\n$bm_rt = thisComp.layer('Color_Control').effect('Body')('ADBE Color Control-0001');"}},{"ty":7,"nm":"Invert","mn":"ADBE Fill-0006","ix":4,"v":{"a":0,"k":0,"ix":4}},{"ty":0,"nm":"Horizontal Feather","mn":"ADBE Fill-0003","ix":5,"v":{"a":0,"k":0,"ix":5}},{"ty":0,"nm":"Vertical Feather","mn":"ADBE Fill-0004","ix":6,"v":{"a":0,"k":0,"ix":6}},{"ty":0,"nm":"Opacity","mn":"ADBE Fill-0005","ix":7,"v":{"a":0,"k":1,"ix":7}}]}],"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-37.703,-8.646],[-5.472,-12.505],[-0.689,-12.287],[0,-0.859],[54.386,2.674],[0,8.439],[-6.443,29.229]],"o":[[25.115,5.76],[2.892,6.608],[2.155,38.398],[0,4.75],[-46.205,-2.271],[-1.795,-18.181],[4.108,-18.639]],"v":[[4.979,-83.888],[55.323,-52.888],[58.108,-25.719],[56.628,77.963],[-8.008,97.296],[-56.987,68.487],[-53.82,-81.331]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.889999988032,0.74900004069,0.654999976065,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":[60.513,100.219],"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":450.000018328876,"st":0,"bm":0},{"ddd":0,"ind":25,"ty":4,"nm":"Leg_L_01 Outlines","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[522.322,621.499,0],"ix":2},"a":{"a":0,"k":[35.221,135.986,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"ef":[{"ty":21,"nm":"Fill","np":9,"mn":"ADBE Fill","ix":1,"en":1,"ef":[{"ty":10,"nm":"Fill Mask","mn":"ADBE Fill-0001","ix":1,"v":{"a":0,"k":0,"ix":1}},{"ty":7,"nm":"All Masks","mn":"ADBE Fill-0007","ix":2,"v":{"a":0,"k":0,"ix":2}},{"ty":2,"nm":"Color","mn":"ADBE Fill-0002","ix":3,"v":{"a":0,"k":[1,0,0,1],"ix":3,"x":"var $bm_rt;\n$bm_rt = thisComp.layer('Color_Control').effect('Robe')('ADBE Color Control-0001');"}},{"ty":7,"nm":"Invert","mn":"ADBE Fill-0006","ix":4,"v":{"a":0,"k":0,"ix":4}},{"ty":0,"nm":"Horizontal Feather","mn":"ADBE Fill-0003","ix":5,"v":{"a":0,"k":0,"ix":5}},{"ty":0,"nm":"Vertical Feather","mn":"ADBE Fill-0004","ix":6,"v":{"a":0,"k":0,"ix":6}},{"ty":0,"nm":"Opacity","mn":"ADBE Fill-0005","ix":7,"v":{"a":0,"k":1,"ix":7}}]}],"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[24.015,13.404],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[34.971,-135.221],[30.071,126.305],[-11.642,122.333],[-34.971,-135.736]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.46699999641,0.501999978458,0.556999954523,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":[35.221,135.987],"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":450.000018328876,"st":0,"bm":0},{"ddd":0,"ind":26,"ty":4,"nm":"Leg_L_02 Outlines","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[522.197,482.823,0],"ix":2},"a":{"a":0,"k":[35.096,35.096,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"ef":[{"ty":21,"nm":"Fill","np":9,"mn":"ADBE Fill","ix":1,"en":1,"ef":[{"ty":10,"nm":"Fill Mask","mn":"ADBE Fill-0001","ix":1,"v":{"a":0,"k":0,"ix":1}},{"ty":7,"nm":"All Masks","mn":"ADBE Fill-0007","ix":2,"v":{"a":0,"k":0,"ix":2}},{"ty":2,"nm":"Color","mn":"ADBE Fill-0002","ix":3,"v":{"a":0,"k":[1,0,0,1],"ix":3,"x":"var $bm_rt;\n$bm_rt = thisComp.layer('Color_Control').effect('Robe')('ADBE Color Control-0001');"}},{"ty":7,"nm":"Invert","mn":"ADBE Fill-0006","ix":4,"v":{"a":0,"k":0,"ix":4}},{"ty":0,"nm":"Horizontal Feather","mn":"ADBE Fill-0003","ix":5,"v":{"a":0,"k":0,"ix":5}},{"ty":0,"nm":"Vertical Feather","mn":"ADBE Fill-0004","ix":6,"v":{"a":0,"k":0,"ix":6}},{"ty":0,"nm":"Opacity","mn":"ADBE Fill-0005","ix":7,"v":{"a":0,"k":1,"ix":7}}]}],"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,-19.245],[-19.245,0],[0,19.245],[19.245,0]],"o":[[0,19.245],[19.245,0],[0,-19.245],[-19.245,0]],"v":[[-34.846,0],[0,34.846],[34.846,0],[0,-34.846]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.46699999641,0.501999978458,0.556999954523,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":[35.096,35.096],"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":450.000018328876,"st":0,"bm":0},{"ddd":0,"ind":27,"ty":4,"nm":"Leg_R_01 Outlines","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[474.635,597.517,0],"ix":2},"a":{"a":0,"k":[30.716,132.822,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"ef":[{"ty":21,"nm":"Fill","np":9,"mn":"ADBE Fill","ix":1,"en":1,"ef":[{"ty":10,"nm":"Fill Mask","mn":"ADBE Fill-0001","ix":1,"v":{"a":0,"k":0,"ix":1}},{"ty":7,"nm":"All Masks","mn":"ADBE Fill-0007","ix":2,"v":{"a":0,"k":0,"ix":2}},{"ty":2,"nm":"Color","mn":"ADBE Fill-0002","ix":3,"v":{"a":0,"k":[1,0,0,1],"ix":3,"x":"var $bm_rt;\n$bm_rt = thisComp.layer('Color_Control').effect('Robe')('ADBE Color Control-0001');"}},{"ty":7,"nm":"Invert","mn":"ADBE Fill-0006","ix":4,"v":{"a":0,"k":0,"ix":4}},{"ty":0,"nm":"Horizontal Feather","mn":"ADBE Fill-0003","ix":5,"v":{"a":0,"k":0,"ix":5}},{"ty":0,"nm":"Vertical Feather","mn":"ADBE Fill-0004","ix":6,"v":{"a":0,"k":0,"ix":6}},{"ty":0,"nm":"Opacity","mn":"ADBE Fill-0005","ix":7,"v":{"a":0,"k":1,"ix":7}}]},{"ty":5,"nm":"Hue/Saturation","np":11,"mn":"ADBE HUE SATURATION","ix":2,"en":1,"ef":[{"ty":7,"nm":"Channel Control","mn":"ADBE HUE SATURATION-0002","ix":1,"v":{"a":0,"k":1,"ix":1}},{},{"ty":0,"nm":"Master Hue","mn":"ADBE HUE SATURATION-0004","ix":3,"v":{"a":0,"k":0,"ix":3}},{"ty":0,"nm":"Master Saturation","mn":"ADBE HUE SATURATION-0005","ix":4,"v":{"a":0,"k":0,"ix":4}},{"ty":0,"nm":"Master Lightness","mn":"ADBE HUE SATURATION-0006","ix":5,"v":{"a":0,"k":-5,"ix":5}},{"ty":7,"nm":"Colorize","mn":"ADBE HUE SATURATION-0007","ix":6,"v":{"a":0,"k":0,"ix":6}},{"ty":0,"nm":"Colorize Hue","mn":"ADBE HUE SATURATION-0008","ix":7,"v":{"a":0,"k":0,"ix":7}},{"ty":0,"nm":"Colorize Saturation","mn":"ADBE HUE SATURATION-0009","ix":8,"v":{"a":0,"k":25,"ix":8}},{"ty":0,"nm":"Colorize Lightness","mn":"ADBE HUE SATURATION-0010","ix":9,"v":{"a":0,"k":0,"ix":9}}]}],"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[24.015,13.404],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[30.467,-132.572],[24.18,122.005],[-16.589,119.168],[-30.467,-130.684]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.430999995213,0.46699999641,0.501999978458,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":[30.716,132.822],"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":450.000018328876,"st":0,"bm":0},{"ddd":0,"ind":28,"ty":4,"nm":"Leg_R_02 Outlines","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[475.006,464.947,0],"ix":2},"a":{"a":0,"k":[30.346,30.283,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"ef":[{"ty":21,"nm":"Fill","np":9,"mn":"ADBE Fill","ix":1,"en":1,"ef":[{"ty":10,"nm":"Fill Mask","mn":"ADBE Fill-0001","ix":1,"v":{"a":0,"k":0,"ix":1}},{"ty":7,"nm":"All Masks","mn":"ADBE Fill-0007","ix":2,"v":{"a":0,"k":0,"ix":2}},{"ty":2,"nm":"Color","mn":"ADBE Fill-0002","ix":3,"v":{"a":0,"k":[1,0,0,1],"ix":3,"x":"var $bm_rt;\n$bm_rt = thisComp.layer('Color_Control').effect('Robe')('ADBE Color Control-0001');"}},{"ty":7,"nm":"Invert","mn":"ADBE Fill-0006","ix":4,"v":{"a":0,"k":0,"ix":4}},{"ty":0,"nm":"Horizontal Feather","mn":"ADBE Fill-0003","ix":5,"v":{"a":0,"k":0,"ix":5}},{"ty":0,"nm":"Vertical Feather","mn":"ADBE Fill-0004","ix":6,"v":{"a":0,"k":0,"ix":6}},{"ty":0,"nm":"Opacity","mn":"ADBE Fill-0005","ix":7,"v":{"a":0,"k":1,"ix":7}}]},{"ty":5,"nm":"Hue/Saturation","np":11,"mn":"ADBE HUE SATURATION","ix":2,"en":1,"ef":[{"ty":7,"nm":"Channel Control","mn":"ADBE HUE SATURATION-0002","ix":1,"v":{"a":0,"k":1,"ix":1}},{},{"ty":0,"nm":"Master Hue","mn":"ADBE HUE SATURATION-0004","ix":3,"v":{"a":0,"k":0,"ix":3}},{"ty":0,"nm":"Master Saturation","mn":"ADBE HUE SATURATION-0005","ix":4,"v":{"a":0,"k":0,"ix":4}},{"ty":0,"nm":"Master Lightness","mn":"ADBE HUE SATURATION-0006","ix":5,"v":{"a":0,"k":-5,"ix":5}},{"ty":7,"nm":"Colorize","mn":"ADBE HUE SATURATION-0007","ix":6,"v":{"a":0,"k":0,"ix":6}},{"ty":0,"nm":"Colorize Hue","mn":"ADBE HUE SATURATION-0008","ix":7,"v":{"a":0,"k":0,"ix":7}},{"ty":0,"nm":"Colorize Saturation","mn":"ADBE HUE SATURATION-0009","ix":8,"v":{"a":0,"k":25,"ix":8}},{"ty":0,"nm":"Colorize Lightness","mn":"ADBE HUE SATURATION-0010","ix":9,"v":{"a":0,"k":0,"ix":9}}]}],"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,-16.587],[-16.587,0],[0,16.587],[16.586,0]],"o":[[0,16.587],[16.586,0],[0,-16.586],[-16.587,0]],"v":[[-30.095,0],[-0.062,30.033],[30.095,-0.003],[-0.062,-30.033]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.430999995213,0.46699999641,0.501999978458,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":[30.345,30.283],"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":450.000018328876,"st":0,"bm":0},{"ddd":0,"ind":29,"ty":4,"nm":"Hand_R_01 Outlines","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[454.709,310.882,0],"ix":2},"a":{"a":0,"k":[25.876,33.089,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"ef":[{"ty":21,"nm":"Fill","np":9,"mn":"ADBE Fill","ix":1,"en":1,"ef":[{"ty":10,"nm":"Fill Mask","mn":"ADBE Fill-0001","ix":1,"v":{"a":0,"k":0,"ix":1}},{"ty":7,"nm":"All Masks","mn":"ADBE Fill-0007","ix":2,"v":{"a":0,"k":0,"ix":2}},{"ty":2,"nm":"Color","mn":"ADBE Fill-0002","ix":3,"v":{"a":0,"k":[1,0,0,1],"ix":3,"x":"var $bm_rt;\n$bm_rt = thisComp.layer('Color_Control').effect('Shirt')('ADBE Color Control-0001');"}},{"ty":7,"nm":"Invert","mn":"ADBE Fill-0006","ix":4,"v":{"a":0,"k":0,"ix":4}},{"ty":0,"nm":"Horizontal Feather","mn":"ADBE Fill-0003","ix":5,"v":{"a":0,"k":0,"ix":5}},{"ty":0,"nm":"Vertical Feather","mn":"ADBE Fill-0004","ix":6,"v":{"a":0,"k":0,"ix":6}},{"ty":0,"nm":"Opacity","mn":"ADBE Fill-0005","ix":7,"v":{"a":0,"k":1,"ix":7}}]},{"ty":5,"nm":"Hue/Saturation","np":11,"mn":"ADBE HUE SATURATION","ix":2,"en":1,"ef":[{"ty":7,"nm":"Channel Control","mn":"ADBE HUE SATURATION-0002","ix":1,"v":{"a":0,"k":1,"ix":1}},{},{"ty":0,"nm":"Master Hue","mn":"ADBE HUE SATURATION-0004","ix":3,"v":{"a":0,"k":0,"ix":3}},{"ty":0,"nm":"Master Saturation","mn":"ADBE HUE SATURATION-0005","ix":4,"v":{"a":0,"k":0,"ix":4}},{"ty":0,"nm":"Master Lightness","mn":"ADBE HUE SATURATION-0006","ix":5,"v":{"a":0,"k":-5,"ix":5}},{"ty":7,"nm":"Colorize","mn":"ADBE HUE SATURATION-0007","ix":6,"v":{"a":0,"k":0,"ix":6}},{"ty":0,"nm":"Colorize Hue","mn":"ADBE HUE SATURATION-0008","ix":7,"v":{"a":0,"k":0,"ix":7}},{"ty":0,"nm":"Colorize Saturation","mn":"ADBE HUE SATURATION-0009","ix":8,"v":{"a":0,"k":25,"ix":8}},{"ty":0,"nm":"Colorize Lightness","mn":"ADBE HUE SATURATION-0010","ix":9,"v":{"a":0,"k":0,"ix":9}}]}],"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[6.562,6.284],[7.039,-8.681],[0.555,-0.734],[0,0],[0,0],[0.618,-1.576],[0,0],[0,0],[0,0]],"o":[[3.749,-9.236],[-8.417,-8.061],[-0.889,1.096],[0,0],[0,0],[-0.968,1.536],[0,0],[9.541,10.224],[6.865,-16.897],[0,0]],"v":[[21.877,1.469],[18.723,-24.777],[-10.031,-22.495],[-12.346,-19.05],[-12.347,-19.052],[-12.427,-18.854],[-15.179,-13.109],[-25.626,18.142],[10.08,32.839],[21.88,1.461]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.859000052658,0.859000052658,0.859000052658,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.876,33.089],"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":450.000018328876,"st":0,"bm":0},{"ddd":0,"ind":30,"ty":4,"nm":"Hand_R_Joint_01 Outlines","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[426.181,389.326,0],"ix":2},"a":{"a":0,"k":[18.372,18.371,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"ef":[{"ty":21,"nm":"Fill","np":9,"mn":"ADBE Fill","ix":1,"en":1,"ef":[{"ty":10,"nm":"Fill Mask","mn":"ADBE Fill-0001","ix":1,"v":{"a":0,"k":0,"ix":1}},{"ty":7,"nm":"All Masks","mn":"ADBE Fill-0007","ix":2,"v":{"a":0,"k":0,"ix":2}},{"ty":2,"nm":"Color","mn":"ADBE Fill-0002","ix":3,"v":{"a":0,"k":[1,0,0,1],"ix":3,"x":"var $bm_rt;\n$bm_rt = thisComp.layer('Color_Control').effect('Body')('ADBE Color Control-0001');"}},{"ty":7,"nm":"Invert","mn":"ADBE Fill-0006","ix":4,"v":{"a":0,"k":0,"ix":4}},{"ty":0,"nm":"Horizontal Feather","mn":"ADBE Fill-0003","ix":5,"v":{"a":0,"k":0,"ix":5}},{"ty":0,"nm":"Vertical Feather","mn":"ADBE Fill-0004","ix":6,"v":{"a":0,"k":0,"ix":6}},{"ty":0,"nm":"Opacity","mn":"ADBE Fill-0005","ix":7,"v":{"a":0,"k":1,"ix":7}}]}],"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-6.721,5.951],[5.952,6.721],[6.721,-5.951],[-5.952,-6.722]],"o":[[6.721,-5.951],[-5.951,-6.722],[-6.722,5.952],[5.951,6.721]],"v":[[10.776,12.17],[12.17,-10.776],[-10.776,-12.17],[-12.17,10.776]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.933000033509,0.773000021542,0.666999966491,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":[18.372,18.372],"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":450.000018328876,"st":0,"bm":0},{"ddd":0,"ind":32,"ty":4,"nm":"Hand_R_02 Outlines","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[446.084,338.27,0],"ix":2},"a":{"a":0,"k":[33.134,60.324,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"ef":[{"ty":21,"nm":"Fill","np":9,"mn":"ADBE Fill","ix":1,"en":1,"ef":[{"ty":10,"nm":"Fill Mask","mn":"ADBE Fill-0001","ix":1,"v":{"a":0,"k":0,"ix":1}},{"ty":7,"nm":"All Masks","mn":"ADBE Fill-0007","ix":2,"v":{"a":0,"k":0,"ix":2}},{"ty":2,"nm":"Color","mn":"ADBE Fill-0002","ix":3,"v":{"a":0,"k":[1,0,0,1],"ix":3,"x":"var $bm_rt;\n$bm_rt = thisComp.layer('Color_Control').effect('Body')('ADBE Color Control-0001');"}},{"ty":7,"nm":"Invert","mn":"ADBE Fill-0006","ix":4,"v":{"a":0,"k":0,"ix":4}},{"ty":0,"nm":"Horizontal Feather","mn":"ADBE Fill-0003","ix":5,"v":{"a":0,"k":0,"ix":5}},{"ty":0,"nm":"Vertical Feather","mn":"ADBE Fill-0004","ix":6,"v":{"a":0,"k":0,"ix":6}},{"ty":0,"nm":"Opacity","mn":"ADBE Fill-0005","ix":7,"v":{"a":0,"k":1,"ix":7}}]}],"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[-0.667,1.664],[0,0],[0,0],[-0.866,1.114],[-8.58,-7.888],[3.908,-8.757],[0,0],[0,0],[13.063,-16.853],[0,0]],"o":[[0.586,-1.588],[0,0],[0,0],[0.53,-0.744],[6.86,-8.823],[6.689,6.149],[0,0],[0,0],[0,0],[0,0],[10.355,-23.056]],"v":[[-5.753,-40.804],[-3.96,-45.452],[-3.917,-45.56],[-4.029,-45.605],[-1.706,-48.957],[26.195,-52.186],[28.767,-25.891],[29.32,-25.937],[28.762,-25.878],[-6.339,60.074],[-32.884,41.552]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.933000033509,0.773000021542,0.666999966491,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":[33.134,60.324],"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":450.000018328876,"st":0,"bm":0},{"ddd":0,"ind":33,"ty":4,"nm":"Boot_L Outlines","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[515.385,764.832,0],"ix":2},"a":{"a":0,"k":[36.214,24.836,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"ef":[{"ty":21,"nm":"Fill","np":9,"mn":"ADBE Fill","ix":1,"en":1,"ef":[{"ty":10,"nm":"Fill Mask","mn":"ADBE Fill-0001","ix":1,"v":{"a":0,"k":0,"ix":1}},{"ty":7,"nm":"All Masks","mn":"ADBE Fill-0007","ix":2,"v":{"a":0,"k":0,"ix":2}},{"ty":2,"nm":"Color","mn":"ADBE Fill-0002","ix":3,"v":{"a":0,"k":[1,0,0,1],"ix":3,"x":"var $bm_rt;\n$bm_rt = thisComp.layer('Color_Control').effect('Boots')('ADBE Color Control-0001');"}},{"ty":7,"nm":"Invert","mn":"ADBE Fill-0006","ix":4,"v":{"a":0,"k":0,"ix":4}},{"ty":0,"nm":"Horizontal Feather","mn":"ADBE Fill-0003","ix":5,"v":{"a":0,"k":0,"ix":5}},{"ty":0,"nm":"Vertical Feather","mn":"ADBE Fill-0004","ix":6,"v":{"a":0,"k":0,"ix":6}},{"ty":0,"nm":"Opacity","mn":"ADBE Fill-0005","ix":7,"v":{"a":0,"k":1,"ix":7}}]}],"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0.978,-3.521],[1.93,-0.638],[5.945,-3.655],[6.223,1.379],[-1.656,4.087],[-1.288,5.519],[0,0]],"o":[[0,0],[-1.307,4.702],[-1.532,0.506],[-6.444,3.963],[-6.222,-1.379],[1.791,-4.417],[0.659,-2.822],[0,0]],"v":[[33.758,-21.054],[34.985,-6.183],[27.939,0.949],[0.484,20.386],[-25.964,23.207],[-34.307,10.288],[-1.591,-21.764],[20.697,-21.613]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.447000002394,0.294000004787,0.180000005984,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":[36.214,24.836],"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":450.000018328876,"st":0,"bm":0},{"ddd":0,"ind":34,"ty":4,"nm":"Boot_R Outlines","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[462.575,734.411,0],"ix":2},"a":{"a":0,"k":[36.214,24.836,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"ef":[{"ty":21,"nm":"Fill","np":9,"mn":"ADBE Fill","ix":1,"en":1,"ef":[{"ty":10,"nm":"Fill Mask","mn":"ADBE Fill-0001","ix":1,"v":{"a":0,"k":0,"ix":1}},{"ty":7,"nm":"All Masks","mn":"ADBE Fill-0007","ix":2,"v":{"a":0,"k":0,"ix":2}},{"ty":2,"nm":"Color","mn":"ADBE Fill-0002","ix":3,"v":{"a":0,"k":[1,0,0,1],"ix":3,"x":"var $bm_rt;\n$bm_rt = thisComp.layer('Color_Control').effect('Boots')('ADBE Color Control-0001');"}},{"ty":7,"nm":"Invert","mn":"ADBE Fill-0006","ix":4,"v":{"a":0,"k":0,"ix":4}},{"ty":0,"nm":"Horizontal Feather","mn":"ADBE Fill-0003","ix":5,"v":{"a":0,"k":0,"ix":5}},{"ty":0,"nm":"Vertical Feather","mn":"ADBE Fill-0004","ix":6,"v":{"a":0,"k":0,"ix":6}},{"ty":0,"nm":"Opacity","mn":"ADBE Fill-0005","ix":7,"v":{"a":0,"k":1,"ix":7}}]}],"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0.978,-3.521],[1.93,-0.638],[5.945,-3.655],[6.223,1.379],[-1.657,4.087],[-1.289,5.519],[0,0]],"o":[[0,0],[-1.307,4.702],[-1.532,0.506],[-6.444,3.963],[-6.222,-1.379],[1.79,-4.417],[0.658,-2.822],[0,0]],"v":[[33.758,-21.054],[34.985,-6.183],[27.939,0.949],[0.484,20.386],[-25.964,23.207],[-34.307,10.288],[-1.591,-21.764],[20.697,-21.613]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.447000002394,0.294000004787,0.180000005984,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":[36.213,24.836],"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":450.000018328876,"st":0,"bm":0}]}],"layers":[{"ddd":0,"ind":1,"ty":0,"nm":"Parcel_Distribution","refId":"comp_0","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[540,488,0],"ix":2},"a":{"a":0,"k":[960,540,0],"ix":1},"s":{"a":0,"k":[168.056,168.056,100],"ix":6}},"ao":0,"w":1920,"h":1080,"ip":0,"op":124.000005050624,"st":0,"bm":0}],"markers":[]}
\ No newline at end of file
diff --git a/res/raw/system.json b/res/raw/system.json
new file mode 100644
index 0000000..4771a2a
--- /dev/null
+++ b/res/raw/system.json
@@ -0,0 +1 @@
+{"v":"5.5.7","meta":{"g":"LottieFiles AE 0.1.20","a":"Roger.T","k":"","d":"","tc":""},"fr":25,"ip":0,"op":75,"w":500,"h":500,"nm":"Settings","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"Round 5","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":35,"s":[0]},{"t":37,"s":[100]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[253,450,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":[{"d":1,"ty":"el","s":{"a":0,"k":[17,17],"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":[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":[-70.25,-150.25],"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":30,"op":73,"st":-2,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"Line 5","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[253,450,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],[0,0]],"o":[[0,0],[0,0]],"v":[[-47.5,-150],[70.5,-149]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[1,1,1,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":3,"ix":5},"lc":1,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","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":"Shape 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tm","s":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":30,"s":[100]},{"t":37,"s":[0]}],"ix":1},"e":{"a":0,"k":100,"ix":2},"o":{"a":0,"k":0,"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1","mn":"ADBE Vector Filter - Trim","hd":false}],"ip":30,"op":73,"st":-2,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":"Round 4","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":34,"s":[0]},{"t":36,"s":[100]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[253,400,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":[{"d":1,"ty":"el","s":{"a":0,"k":[17,17],"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":[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":[-70.25,-150.25],"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":29,"op":72,"st":-3,"bm":0},{"ddd":0,"ind":4,"ty":4,"nm":"Line 4","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[253,400,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],[0,0]],"o":[[0,0],[0,0]],"v":[[-47.5,-150],[70.5,-149]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[1,1,1,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":3,"ix":5},"lc":1,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","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":"Shape 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tm","s":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":29,"s":[100]},{"t":36,"s":[0]}],"ix":1},"e":{"a":0,"k":100,"ix":2},"o":{"a":0,"k":0,"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1","mn":"ADBE Vector Filter - Trim","hd":false}],"ip":29,"op":72,"st":-3,"bm":0},{"ddd":0,"ind":5,"ty":4,"nm":"Round 3","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":33,"s":[0]},{"t":35,"s":[100]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[253,350,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":[{"d":1,"ty":"el","s":{"a":0,"k":[17,17],"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":[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":[-70.25,-150.25],"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":28,"op":71,"st":-4,"bm":0},{"ddd":0,"ind":6,"ty":4,"nm":"Line 3","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[253,350,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],[0,0]],"o":[[0,0],[0,0]],"v":[[-47.5,-150],[70.5,-149]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[1,1,1,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":3,"ix":5},"lc":1,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","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":"Shape 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tm","s":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":28,"s":[100]},{"t":35,"s":[0]}],"ix":1},"e":{"a":0,"k":100,"ix":2},"o":{"a":0,"k":0,"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1","mn":"ADBE Vector Filter - Trim","hd":false}],"ip":28,"op":71,"st":-4,"bm":0},{"ddd":0,"ind":7,"ty":4,"nm":"Round 2","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":32,"s":[0]},{"t":34,"s":[100]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[253,300,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":[{"d":1,"ty":"el","s":{"a":0,"k":[17,17],"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":[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":[-70.25,-150.25],"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":27,"op":70,"st":-5,"bm":0},{"ddd":0,"ind":8,"ty":4,"nm":"Line 2","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[253,300,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],[0,0]],"o":[[0,0],[0,0]],"v":[[-47.5,-150],[70.5,-149]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[1,1,1,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":3,"ix":5},"lc":1,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","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":"Shape 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tm","s":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":27,"s":[100]},{"t":34,"s":[0]}],"ix":1},"e":{"a":0,"k":100,"ix":2},"o":{"a":0,"k":0,"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1","mn":"ADBE Vector Filter - Trim","hd":false}],"ip":27,"op":70,"st":-5,"bm":0},{"ddd":0,"ind":9,"ty":4,"nm":"Round","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":36,"s":[0]},{"t":38,"s":[100]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[253,500,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":[{"d":1,"ty":"el","s":{"a":0,"k":[17,17],"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":[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":[-70.25,-150.25],"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":31,"op":74,"st":-1,"bm":0},{"ddd":0,"ind":10,"ty":4,"nm":"Line","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[253,500,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],[0,0]],"o":[[0,0],[0,0]],"v":[[-47.5,-150],[70.5,-149]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[1,1,1,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":3,"ix":5},"lc":1,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","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":"Shape 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tm","s":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":31,"s":[100]},{"t":38,"s":[0]}],"ix":1},"e":{"a":0,"k":100,"ix":2},"o":{"a":0,"k":0,"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1","mn":"ADBE Vector Filter - Trim","hd":false}],"ip":31,"op":74,"st":-1,"bm":0},{"ddd":0,"ind":11,"ty":4,"nm":"Frame","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":72,"s":[100]},{"t":74,"s":[0]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[242.5,249.529,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":1,"k":[{"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":19,"s":[0,0,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":24,"s":[115,108.429,100]},{"i":{"x":[0.833,0.833,0.833],"y":[1,1,1]},"o":{"x":[0.167,0.167,0.167],"y":[0,0,0]},"t":28,"s":[100,94.286,100]},{"i":{"x":[0.833,0.833,0.833],"y":[1,1,1]},"o":{"x":[0.167,0.167,0.167],"y":[0,0,0]},"t":30,"s":[105,99,100]},{"t":32,"s":[100,94.286,100]}],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[195,421],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":20,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"st","c":{"a":0,"k":[0.686274988511,0.796078969918,0.909803981407,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":15,"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":[7.5,0.5],"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 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":19,"op":75,"st":0,"bm":0},{"ddd":0,"ind":12,"ty":4,"nm":"Back","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":72,"s":[100]},{"t":74,"s":[0]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[242.5,249.529,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":1,"k":[{"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":19,"s":[0,0,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":24,"s":[115,108.429,100]},{"i":{"x":[0.833,0.833,0.833],"y":[1,1,1]},"o":{"x":[0.167,0.167,0.167],"y":[0,0,0]},"t":28,"s":[100,94.286,100]},{"i":{"x":[0.833,0.833,0.833],"y":[1,1,1]},"o":{"x":[0.167,0.167,0.167],"y":[0,0,0]},"t":30,"s":[105,99,100]},{"t":32,"s":[100,94.286,100]}],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[195,421],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":20,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.145098045468,0.337254911661,0.686274528503,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":[7.5,0.5],"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 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":19,"op":75,"st":0,"bm":0},{"ddd":0,"ind":13,"ty":4,"nm":"Ebene 1/Zahnrad Outlines","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":0,"s":[0]},{"t":4,"s":[100]}],"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":2,"s":[0]},{"t":19,"s":[180]}],"ix":10},"p":{"a":0,"k":[250,250,0],"ix":2},"a":{"a":0,"k":[250,250,0],"ix":1},"s":{"a":1,"k":[{"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":19,"s":[100,100,100]},{"t":26,"s":[0,0,100]}],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-44.385,0],[0,-44.385],[44.385,0],[0,44.385]],"o":[[44.385,0],[0,44.385],[-44.385,0],[0,-44.385]],"v":[[-0.001,-80.42],[80.419,0],[-0.001,80.42],[-80.42,0]],"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.372,-4.781],[0,0],[14.457,-12.611],[0,0],[8.045,-23.497],[0,0],[-3.694,-18.825],[0,0],[-16.327,-18.716],[0,0],[-18.15,-6.214],[0,0],[-24.37,4.782],[0,0],[-14.456,12.612],[0,0],[-8.045,23.497],[0,0],[3.694,18.826],[0,0],[16.326,18.716],[0,0],[18.15,6.214]],"o":[[-24.37,-4.781],[0,0],[-18.15,6.214],[0,0],[-16.327,18.716],[0,0],[-3.694,18.826],[0,0],[8.045,23.497],[0,0],[14.457,12.612],[0,0],[24.372,4.782],[0,0],[18.15,-6.214],[0,0],[16.326,-18.716],[0,0],[3.694,-18.825],[0,0],[-8.045,-23.497],[0,0],[-14.456,-12.611],[0,0]],"v":[[36.906,-188.111],[-36.907,-188.111],[-47.965,-140.092],[-97.342,-111.585],[-144.456,-126.017],[-181.361,-62.094],[-145.305,-28.508],[-145.305,28.508],[-181.361,62.094],[-144.456,126.017],[-97.342,111.584],[-47.965,140.092],[-36.907,188.11],[36.906,188.11],[47.964,140.092],[97.34,111.584],[144.456,126.017],[181.361,62.094],[145.305,28.508],[145.305,-28.508],[181.361,-62.094],[144.456,-126.017],[97.34,-111.585],[47.964,-140.092]],"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":0,"k":[0.144999994016,0.337000020345,0.685999971278,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":[250,250],"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":4,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":75,"st":0,"bm":0}],"markers":[]}
\ No newline at end of file
diff --git a/res/raw/wifi.json b/res/raw/wifi.json
new file mode 100644
index 0000000..b6f79a4
--- /dev/null
+++ b/res/raw/wifi.json
@@ -0,0 +1 @@
+{"v":"5.5.7","meta":{"g":"LottieFiles AE 0.1.20","a":"Roger.T","k":"","d":"","tc":""},"fr":25,"ip":0,"op":75,"w":500,"h":500,"nm":"Network and Internet","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"Ebene 1/Wifi Outlines","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[250,250,0],"ix":2},"a":{"a":0,"k":[250,250,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[50,50],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"st","c":{"a":0,"k":[1,1,1,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":2,"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":[250,404],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667],"y":[1,1]},"o":{"x":[0.333,0.333],"y":[0,0]},"t":0,"s":[84,84]},{"i":{"x":[0.667,0.667],"y":[1,1]},"o":{"x":[0.333,0.333],"y":[0,0]},"t":12,"s":[90,90]},{"t":21,"s":[172,172]}],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.167],"y":[0]},"t":11,"s":[0]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":18,"s":[100]},{"t":21,"s":[0]}],"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},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-12.109,2.539],[-8.984,-4.688],[-3.125,-12.012],[6.054,-10.156],[9.766,-3.516],[11.035,6.25],[3.711,9.765],[-6.835,11.524]],"o":[[9.961,-2.051],[11.036,5.566],[3.027,11.328],[-5.176,9.082],[-11.914,4.394],[-9.277,-4.981],[-4.785,-12.5],[6.25,-10.839]],"v":[[-8.984,-44.091],[20.703,-40.087],[43.359,-11.962],[38.867,22.12],[15.43,41.749],[-21.289,38.917],[-41.601,15.674],[-38.379,-22.9]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":27,"s":[1,1,1,1]},{"t":51,"s":[0,0.811764776707,0.152941182256,0.960784375668]}],"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":[249.707,404.345],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667],"y":[1,1]},"o":{"x":[0.333,0.333],"y":[0,0]},"t":27,"s":[50,50]},{"t":51,"s":[103,103]}],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":0,"s":[0]},{"t":15,"s":[100]}],"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 5","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":[[-12.109,2.539],[-8.984,-4.688],[-3.125,-12.012],[6.054,-10.156],[9.766,-3.516],[11.035,6.25],[3.711,9.765],[-6.835,11.524]],"o":[[9.961,-2.051],[11.036,5.566],[3.027,11.328],[-5.176,9.082],[-11.914,4.394],[-9.277,-4.981],[-4.785,-12.5],[6.25,-10.839]],"v":[[-8.984,-44.091],[20.703,-40.087],[43.359,-11.962],[38.867,22.12],[15.43,41.749],[-21.289,38.917],[-41.601,15.674],[-38.379,-22.9]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.145098045468,0.337254911661,0.686274528503,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":[249.707,404.345],"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":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":0,"s":[0]},{"t":15,"s":[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":3,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-23.297,2.637],[-20.396,-25.586],[-0.272,-5.566],[8.613,-0.976],[3.626,5.078],[15.864,2.441],[14.232,-13.964],[3.355,-3.516],[6.074,5.176],[-2.357,7.031],[-2.991,3.711]],"o":[[31.094,-3.711],[3.446,3.809],[1.088,9.278],[-6.073,0.977],[-10.062,-13.379],[-18.946,-3.223],[-3.626,3.223],[-5.62,5.664],[-5.529,-4.492],[1.45,-4.786],[15.683,-18.75]],"v":[[-10.198,-33.203],[73.743,1.953],[80.905,15.82],[66.492,35.156],[50.81,27.735],[10.108,2.735],[-43.285,19.824],[-53.076,30.86],[-74.107,31.738],[-79.636,11.817],[-71.569,0]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":0,"s":[0.145098045468,0.337254911661,0.686274528503,1]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":39,"s":[0.145098045468,0.337254911661,0.686274528503,1]},{"t":44,"s":[0,0.811764717102,0.152802705765,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":[249.81,292.773],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667],"y":[1,1]},"o":{"x":[0.333,0.333],"y":[0,0]},"t":8,"s":[0,0]},{"i":{"x":[0.667,0.667],"y":[1,1]},"o":{"x":[0.333,0.333],"y":[0,0]},"t":14,"s":[100,100]},{"i":{"x":[0.667,0.667],"y":[1,1]},"o":{"x":[0.333,0.333],"y":[0,0]},"t":20,"s":[0,0]},{"i":{"x":[0.667,0.667],"y":[1,1]},"o":{"x":[0.333,0.333],"y":[0,0]},"t":26,"s":[100,100]},{"i":{"x":[0.667,0.667],"y":[1,1]},"o":{"x":[0.333,0.333],"y":[0,0]},"t":32,"s":[0,0]},{"t":50,"s":[100,100]}],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":8,"s":[0]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":14,"s":[100]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":20,"s":[0]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":26,"s":[100]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":32,"s":[0]},{"t":50,"s":[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":4,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-28.283,2.832],[-29.733,-13.672],[-19.763,-25.977],[-0.815,-3.809],[5.348,-4.2],[5.439,2.734],[2.72,3.515],[29.1,9.766],[31.183,-10.449],[19.852,-26.367],[2.9,-1.563],[4.714,5.86],[-2.085,6.054],[-1.994,2.539],[-19.4,12.305]],"o":[[32.181,-3.32],[28.737,13.086],[2.265,2.832],[1.814,6.836],[-4.714,4.003],[-3.989,-1.953],[-19.581,-25.196],[-31.184,-10.644],[-30.187,9.961],[-2.085,2.637],[-6.437,3.613],[-4.079,-4.687],[0.997,-3.125],[14.324,-18.75],[24.566,-15.82]],"v":[[-18.583,-53.028],[76.236,-37.304],[150.3,22.558],[155.738,32.226],[149.756,51.074],[132.803,53.027],[123.467,43.652],[48.497,-10.255],[-48.045,-10.45],[-125.279,45.8],[-132.44,52.735],[-152.203,48.827],[-155.466,30.86],[-150.391,22.558],[-99.262,-24.708]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.167],"y":[0]},"t":0,"s":[0.145098045468,0.337254911661,0.686274528503,1]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":39,"s":[0.145098045468,0.337254911661,0.686274528503,1]},{"t":44,"s":[0,0.811764717102,0.152941182256,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":[249.946,209.082],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667],"y":[1,1]},"o":{"x":[0.333,0.333],"y":[0,0]},"t":11,"s":[0,0]},{"i":{"x":[0.667,0.667],"y":[1,1]},"o":{"x":[0.333,0.333],"y":[0,0]},"t":17,"s":[100,100]},{"i":{"x":[0.667,0.667],"y":[1,1]},"o":{"x":[0.333,0.333],"y":[0,0]},"t":23,"s":[0,0]},{"i":{"x":[0.667,0.667],"y":[1,1]},"o":{"x":[0.333,0.333],"y":[0,0]},"t":29,"s":[100,100]},{"i":{"x":[0.667,0.667],"y":[1,1]},"o":{"x":[0.333,0.333],"y":[0,0]},"t":35,"s":[0,0]},{"t":53,"s":[100,100]}],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":11,"s":[0]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":17,"s":[100]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":23,"s":[0]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":29,"s":[100]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":35,"s":[0]},{"t":53,"s":[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":5,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-32.997,0.879],[-53.484,-48.34],[-12.782,-17.285],[3.173,-6.055],[7.525,4.101],[2.447,3.125],[28.01,16.992],[33.179,4.297],[38.074,-14.941],[29.28,-38.965],[4.441,-1.367],[4.08,5.762],[-3.898,6.152],[-49.042,20.117]],"o":[[69.711,-2.344],[15.864,14.063],[3.988,5.469],[-3.898,8.105],[-3.535,-1.856],[-20.306,-26.855],[-29.19,-17.774],[-40.248,-5.371],[-43.784,16.895],[-2.72,3.711],[-6.437,2.344],[-4.26,-5.761],[32.181,-44.629],[30.731,-12.793]],"v":[[-7.796,-73.926],[185.653,-2.051],[228.622,45.41],[229.981,64.845],[208.315,72.168],[199.886,63.77],[126.64,-2.831],[31.818,-36.327],[-88.022,-21.777],[-200.157,64.355],[-210.4,73.145],[-228.44,67.188],[-229.256,46.583],[-104.43,-53.223]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.167],"y":[0]},"t":0,"s":[0.145098045468,0.337254911661,0.686274528503,1]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":38,"s":[0.145098045468,0.337254911661,0.686274528503,1]},{"t":46,"s":[0,0.811764717102,0.152941182256,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":[249.945,125.293],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667],"y":[1,1]},"o":{"x":[0.333,0.333],"y":[0,0]},"t":14,"s":[0,0]},{"i":{"x":[0.667,0.667],"y":[1,1]},"o":{"x":[0.333,0.333],"y":[0,0]},"t":20,"s":[100,100]},{"i":{"x":[0.667,0.667],"y":[1,1]},"o":{"x":[0.333,0.333],"y":[0,0]},"t":26,"s":[0,0]},{"i":{"x":[0.667,0.667],"y":[1,1]},"o":{"x":[0.333,0.333],"y":[0,0]},"t":32,"s":[100,100]},{"i":{"x":[0.667,0.667],"y":[1,1]},"o":{"x":[0.333,0.333],"y":[0,0]},"t":38,"s":[0,0]},{"t":51,"s":[100,100]}],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":14,"s":[0]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":20,"s":[100]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":26,"s":[0]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":32,"s":[100]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":38,"s":[0]},{"t":51,"s":[100]}],"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 4","np":2,"cix":2,"bm":0,"ix":6,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":76,"st":0,"bm":0}],"markers":[]}
\ No newline at end of file
diff --git a/res/raw/wifi_viper.json b/res/raw/wifi_viper.json
new file mode 100644
index 0000000..cbb0e77
--- /dev/null
+++ b/res/raw/wifi_viper.json
@@ -0,0 +1 @@
+{"v":"4.6.3","fr":30,"ip":0,"op":61,"w":800,"h":600,"nm":"wifi wiper 2","ddd":0,"assets":[{"id":"comp_41","layers":[{"ddd":0,"ind":1,"ty":4,"nm":"Dial","ks":{"o":{"a":0,"k":100},"r":{"a":1,"k":[{"i":{"x":[0.12],"y":[1]},"o":{"x":[0.88],"y":[0]},"n":["0p12_1_0p88_0"],"t":0,"s":[3],"e":[-71]},{"i":{"x":[0.12],"y":[1]},"o":{"x":[0.88],"y":[0]},"n":["0p12_1_0p88_0"],"t":30,"s":[-71],"e":[3]},{"t":60}]},"p":{"a":0,"k":[400.863,351.029,0]},"a":{"a":0,"k":[2.863,49.029,0]},"s":{"a":0,"k":[100,100,100]}},"ao":0,"shapes":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[83.006,-69.165],[2.863,48.529]],"c":false}},"nm":"Path 1","mn":"ADBE Vector Shape - Group"},{"ty":"tm","s":{"a":0,"k":0,"ix":1},"e":{"a":0,"k":74,"ix":2},"o":{"a":0,"k":0,"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1","mn":"ADBE Vector Filter - Trim"},{"ty":"st","c":{"a":0,"k":[0.9294118,0.9294118,0.9294118,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":10},"lc":2,"lj":1,"ml":10,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke"}],"ip":0,"op":61,"st":0,"bm":0,"sr":1},{"ddd":0,"ind":3,"ty":4,"nm":"bars - Group 2","ks":{"o":{"a":0,"k":100},"r":{"a":0,"k":0},"p":{"a":0,"k":[400.5,266,0]},"a":{"a":0,"k":[400,223.26,0]},"s":{"a":0,"k":[100,100,100]}},"ao":0,"shapes":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[-27.15,0],[-20.79,-14.34]],"o":[[20.79,-14.34],[27.15,0],[0,0]],"v":[[326.86,203.73],[400,181],[473.14,203.73]],"c":false}},"nm":"Path 1","mn":"ADBE Vector Shape - Group"},{"ty":"tm","s":{"a":1,"k":[{"i":{"x":[0.13],"y":[1]},"o":{"x":[0.87],"y":[0]},"n":["0p13_1_0p87_0"],"t":0,"s":[100],"e":[0]},{"i":{"x":[0.11],"y":[0.11]},"o":{"x":[0.87],"y":[0.87]},"n":["0p11_0p11_0p87_0p87"],"t":30,"s":[0],"e":[0]},{"i":{"x":[0.833],"y":[1]},"o":{"x":[0.89],"y":[0]},"n":["0p833_1_0p89_0"],"t":45,"s":[0],"e":[100]},{"t":60}],"ix":1},"e":{"a":1,"k":[{"i":{"x":[0.13],"y":[1]},"o":{"x":[0.89],"y":[0]},"n":["0p13_1_0p89_0"],"t":15,"s":[100],"e":[0]},{"i":{"x":[0.13],"y":[1]},"o":{"x":[0.87],"y":[0]},"n":["0p13_1_0p87_0"],"t":30,"s":[0],"e":[100]},{"t":60}],"ix":2},"o":{"a":0,"k":0,"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1","mn":"ADBE Vector Filter - Trim"},{"ty":"st","c":{"a":0,"k":[0.9294118,0.9294118,0.9294118,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":16},"lc":1,"lj":1,"ml":10,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke"}],"ip":0,"op":61,"st":0,"bm":0,"sr":1},{"ddd":0,"ind":4,"ty":4,"nm":"bars - Group 3","ks":{"o":{"a":0,"k":100},"r":{"a":0,"k":0},"p":{"a":0,"k":[400.5,266,0]},"a":{"a":0,"k":[400,223.26,0]},"s":{"a":0,"k":[100,100,100]}},"ao":0,"shapes":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[-21.9,0],[-16.76,-11.56]],"o":[[16.76,-11.56],[21.9,0],[0,0]],"v":[[341.03,224.33],[400,206],[458.97,224.33]],"c":false}},"nm":"Path 1","mn":"ADBE Vector Shape - Group"},{"ty":"st","c":{"a":0,"k":[0.9294118,0.9294118,0.9294118,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":16},"lc":1,"lj":1,"ml":10,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke"},{"ty":"tm","s":{"a":1,"k":[{"i":{"x":[0.13],"y":[1]},"o":{"x":[0.87],"y":[0]},"n":["0p13_1_0p87_0"],"t":0,"s":[100],"e":[0]},{"i":{"x":[0.11],"y":[0.11]},"o":{"x":[0.87],"y":[0.87]},"n":["0p11_0p11_0p87_0p87"],"t":30,"s":[0],"e":[0]},{"i":{"x":[0.833],"y":[1]},"o":{"x":[0.89],"y":[0]},"n":["0p833_1_0p89_0"],"t":45,"s":[0],"e":[100]},{"t":60}],"ix":1},"e":{"a":1,"k":[{"i":{"x":[0.13],"y":[1]},"o":{"x":[0.89],"y":[0]},"n":["0p13_1_0p89_0"],"t":15,"s":[100],"e":[0]},{"i":{"x":[0.13],"y":[1]},"o":{"x":[0.87],"y":[0]},"n":["0p13_1_0p87_0"],"t":30,"s":[0],"e":[100]},{"t":60}],"ix":2},"o":{"a":0,"k":0,"ix":3},"m":1,"ix":3,"nm":"Trim Paths 1","mn":"ADBE Vector Filter - Trim"}],"ip":0,"op":61,"st":1,"bm":0,"sr":1},{"ddd":0,"ind":5,"ty":4,"nm":"bars - Group 4","ks":{"o":{"a":0,"k":100},"r":{"a":0,"k":0},"p":{"a":0,"k":[400.5,266,0]},"a":{"a":0,"k":[400,223.26,0]},"s":{"a":0,"k":[100,100,100]}},"ao":0,"shapes":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[-16.64,0],[-12.73,-8.78]],"o":[[12.73,-8.78],[16.64,0],[0,0]],"v":[[355.21,244.92],[400,231],[444.79,244.92]],"c":false}},"nm":"Path 1","mn":"ADBE Vector Shape - Group"},{"ty":"st","c":{"a":0,"k":[0.9294118,0.9294118,0.9294118,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":16},"lc":1,"lj":1,"ml":10,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke"},{"ty":"tm","s":{"a":1,"k":[{"i":{"x":[0.13],"y":[1]},"o":{"x":[0.87],"y":[0]},"n":["0p13_1_0p87_0"],"t":0,"s":[100],"e":[0]},{"i":{"x":[0.11],"y":[0.11]},"o":{"x":[0.87],"y":[0.87]},"n":["0p11_0p11_0p87_0p87"],"t":30,"s":[0],"e":[0]},{"i":{"x":[0.833],"y":[1]},"o":{"x":[0.89],"y":[0]},"n":["0p833_1_0p89_0"],"t":45,"s":[0],"e":[100]},{"t":60}],"ix":1},"e":{"a":1,"k":[{"i":{"x":[0.13],"y":[1]},"o":{"x":[0.89],"y":[0]},"n":["0p13_1_0p89_0"],"t":15,"s":[100],"e":[0]},{"i":{"x":[0.13],"y":[1]},"o":{"x":[0.87],"y":[0]},"n":["0p13_1_0p87_0"],"t":30,"s":[0],"e":[100]},{"t":60}],"ix":2},"o":{"a":0,"k":0,"ix":3},"m":1,"ix":3,"nm":"Trim Paths 1","mn":"ADBE Vector Filter - Trim"}],"ip":0,"op":61,"st":2,"bm":0,"sr":1},{"ddd":0,"ind":6,"ty":4,"nm":"bars - Group 5","ks":{"o":{"a":0,"k":100},"r":{"a":0,"k":0},"p":{"a":0,"k":[400.5,266,0]},"a":{"a":0,"k":[400,223.26,0]},"s":{"a":0,"k":[100,100,100]}},"ao":0,"shapes":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[-11.37,0],[-8.7,-6.01]],"o":[[8.7,-6.01],[11.37,0],[0,0]],"v":[[369.38,265.52],[400,256],[430.62,265.52]],"c":false}},"nm":"Path 1","mn":"ADBE Vector Shape - Group"},{"ty":"st","c":{"a":0,"k":[0.9294118,0.9294118,0.9294118,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":16},"lc":1,"lj":1,"ml":10,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke"},{"ty":"tm","s":{"a":1,"k":[{"i":{"x":[0.13],"y":[1]},"o":{"x":[0.87],"y":[0]},"n":["0p13_1_0p87_0"],"t":0,"s":[100],"e":[0]},{"i":{"x":[0.11],"y":[0.11]},"o":{"x":[0.87],"y":[0.87]},"n":["0p11_0p11_0p87_0p87"],"t":30,"s":[0],"e":[0]},{"i":{"x":[0.833],"y":[1]},"o":{"x":[0.89],"y":[0]},"n":["0p833_1_0p89_0"],"t":45,"s":[0],"e":[100]},{"t":60}],"ix":1},"e":{"a":1,"k":[{"i":{"x":[0.13],"y":[1]},"o":{"x":[0.89],"y":[0]},"n":["0p13_1_0p89_0"],"t":15,"s":[100],"e":[0]},{"i":{"x":[0.13],"y":[1]},"o":{"x":[0.87],"y":[0]},"n":["0p13_1_0p87_0"],"t":30,"s":[0],"e":[100]},{"t":60}],"ix":2},"o":{"a":0,"k":0,"ix":3},"m":1,"ix":3,"nm":"Trim Paths 1","mn":"ADBE Vector Filter - Trim"}],"ip":0,"op":61,"st":3,"bm":0,"sr":1},{"ddd":0,"ind":7,"ty":4,"nm":"center","ks":{"o":{"a":0,"k":100},"r":{"a":0,"k":0},"p":{"a":0,"k":[400,300,0]},"a":{"a":0,"k":[400,300,0]},"s":{"a":0,"k":[100,100,100]}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,9.389],[9.389,0],[0,-9.389],[-9.389,0]],"o":[[0,-9.389],[-9.389,0],[0,9.389],[9.389,0]],"v":[[17,0],[0,-17],[-17,0],[0,17]],"c":true}},"nm":"Path 1","mn":"ADBE Vector Shape - Group"},{"ty":"fl","c":{"a":0,"k":[0.9294118,0.9294118,0.9294118,1]},"o":{"a":0,"k":100},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill"},{"ty":"tr","p":{"a":0,"k":[400,350],"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 6","np":2,"cix":2,"ix":1,"mn":"ADBE Vector Group"}],"ip":0,"op":61,"st":0,"bm":0,"sr":1}]}],"layers":[{"ddd":0,"ind":1,"ty":0,"nm":"wifi wiper","refId":"comp_41","ks":{"o":{"a":0,"k":100},"r":{"a":0,"k":0},"p":{"a":0,"k":[400,300,0]},"a":{"a":0,"k":[400,300,0]},"s":{"a":0,"k":[195,195,100]}},"ao":0,"w":800,"h":600,"ip":0,"op":61,"st":0,"bm":0,"sr":1}]}
\ No newline at end of file
diff --git a/res/values-af/aosp_strings.xml b/res/values-af/aosp_strings.xml
new file mode 100644
index 0000000..1673eb4
--- /dev/null
+++ b/res/values-af/aosp_strings.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <!-- Strings for face unlock enrollment, missing from AOSP-->
+ <string name="aosp_security_settings_face_enroll_education_message">Draai op die volgende skerm jou kop om alle hoeke van jou gesig vas te vang</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_expanded">"As jy beperkte visie of kopbeweging het, is hierdie opsie 'n makliker manier om gesigslot op te stel. Wanneer jy gesigslot gebruik, sal jou kop dalk meer direk voor jou foon moet wees."</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_diversity">Gebruik toeganklikheidgesigslot</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_vision">Vereis oop oë</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_0">"'n Bril of sonbril met ligte tint is nie 'n probleem nie."</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_1">"Die data wat deur gesigslot opgeneem word, word veilig geberg en bly altyd net op jou foon. Jy kan jou data enige tyd in instellings uitvee.\n\nJou foon sal jou onlangse gesigslotprente soms gebruik om verbeterde gesigmodelle te skep."</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_2">"As jy na die foon kyk, kan dit ontsluit selfs al het jy nie bedoel om dit te doen nie. Iemand anders kan jou foon ontsluit as dit voor jou gesig gehou word.\n\nJy kan vereis dat jou oë oop moet wees om Instellings te ontsluit."</string>
+<string name="aosp_security_settings_face_enroll_introduction_footer_part_2_attention_not_supported">"As jy na die foon kyk, sal dit dalk ontsluit wanneer jy nie bedoel om dit te doen nie.\n\nIemand anders kan jou foon ontsluit as dit voor jou gesig gehou word, selfs al is jou oë toe."</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_3">"Jou foon kan ontsluit word deur iemand wat baie soos jy lyk, byvoorbeeld 'n identiese broer of suster."</string>
+</resources>
diff --git a/res/values-af/google_strings.xml b/res/values-af/google_strings.xml
new file mode 100644
index 0000000..1db1f8b
--- /dev/null
+++ b/res/values-af/google_strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="battery_tip_smart_battery_summary_custom">Skakel Aanpasbare Battery aan</string>
+ <string name="smart_battery_footer_custom">"Om die batterylewe te verleng, beperk Aanpasbare Battery die batterygebruik van programme wat selde gebruik word. Jou foon sal mettertyd leer hoe jy programme gebruik.
+
+Kennisgewings sal dalk vir hierdie programme vertraag word."</string>
+ <string name="smart_battery_manager_title_custom">Aanpasbare Battery</string>
+ <string name="smart_battery_title_custom">Gebruik Aanpasbare Battery</string>
+ </resources>
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index bc8c14e..951b6ae 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -2677,9 +2677,6 @@
<string name="user_credentials" msgid="4044405430790970775">"Gebruikereiebewyse"</string>
<string name="user_credentials_summary" msgid="686471637627271856">"Bekyk en wysig gebergde eiebewyse"</string>
<string name="advanced_security_title" msgid="7117581975877192652">"Gevorderd"</string>
- <string name="credential_storage_type" msgid="930861336971619888">"Bergingtipe"</string>
- <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Hardeware-geondersteun"</string>
- <string name="credential_storage_type_software" msgid="4786996040468294626">"Net sagteware"</string>
<string name="credentials_settings_not_available" msgid="7433088409177429600">"Eiebewyse is nie vir hierdie gebruiker beskikbaar nie"</string>
<string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Geïnstalleer vir VPN en programme"</string>
<string name="credential_for_wifi" msgid="1963335263280604998">"Geïnstalleer vir Wi-Fi"</string>
diff --git a/res/values-af/wellbeing_strings.xml b/res/values-af/wellbeing_strings.xml
new file mode 100644
index 0000000..010987e
--- /dev/null
+++ b/res/values-af/wellbeing_strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="duration_less_than_one_minute">Minder as 1 minuut</string>
+ <string name="screen_time_summary_usage_today">%1$s vandag</string>
+ </resources>
diff --git a/res/values-am/aosp_strings.xml b/res/values-am/aosp_strings.xml
new file mode 100644
index 0000000..f0f0a5c
--- /dev/null
+++ b/res/values-am/aosp_strings.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <!-- Strings for face unlock enrollment, missing from AOSP-->
+ <string name="aosp_security_settings_face_enroll_education_message">በሚቀጥለው ማያ ገጽ ላይ ሁሉንም የመልክዎ ማዕዘኖች ለማግኘት ጭንቅላትዎን ያሽከርክሩት</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_expanded">የተገደበ እይታ ወይም የጭንቅላት እንቅስቃሴ ካለዎት ይህ አማራጭ በመልክ መክፈቻን የሚያቀናብሩበት የቀለለ መንገድ ነው። በመልክ መክፈቻን ሲጠቀሙ የእርስዎ ጭንቅላት ይበልጥ ከስልክዎ ፊት ለፊት መሆን ሊያስፈልገው ይችላል።</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_diversity">የተደራሽነት መልክ መክፈቻን ይጠቀሙ</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_vision">በዓይኖች መክፈትን ጠይቅ</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_0">መነጽሮች ወይም ትንሽ ቅልም ያላቸው የጸሐይ መነጽሮች ችግር የላቸውም።</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_1">"በመልክ መከፈቻ የተመዘገበው ውሂብ ደህንነቱ በተጠበቀ ሁኔታ የሚከማች ሲሆን በጭራሽ ከስልክዎ አይወጣም። የእርስዎን ውሂብ በማናቸውም ጊዜ በቅንብሮች ውስጥ መሰረዝ ይችላሉ።\n\nስልክዎ አንዳንድ ጊዜ የተሻሻሉ የመልክ ሞዴሎችን ለመፍጠር የቅርብ ጊዜ የመልክ መክፈቻ ምስሎችዎን ይጠቀማል።"</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_2">"እርስዎ በማይፈልጉበት ጊዜም ስልኩን መመልከት ስልኩን ሊከፍተው ይችላል። የሆነ ስልክዎ ስልክዎን ፊትዎ ላይ ቢይዘው ሊከፈት ይችላል።\n\nበቅንብሮች ውስጥ ስልክዎ ለመከፈት አይኖችዎ ክፍት እንዲሆን መጠየቅ ይችላሉ።"</string>
+<string name="aosp_security_settings_face_enroll_introduction_footer_part_2_attention_not_supported">"ስልኩ ላይ መመልከት እርስዎ ሳያስቡት ሊከፍተው ይችላል።\n\nዓይኖችዎ ዝግ ሆነውም እንኳ የሆነ ሰው ስልክዎ ፊትዎ ላይ ቢይዘው ሊከፈት ይችላል።"</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_3">የእርስዎ ስልክ እንደ ተመሳሳይ ወንድም/እህትት ባለ እርስዎን በጣም በሚመስል ሰው ሊከፈት ይችላል።</string>
+</resources>
diff --git a/res/values-am/google_strings.xml b/res/values-am/google_strings.xml
new file mode 100644
index 0000000..81a4b4c
--- /dev/null
+++ b/res/values-am/google_strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="battery_tip_smart_battery_summary_custom">ተለማማጅ ባትሪን ያብሩ</string>
+ <string name="smart_battery_footer_custom">"የባትሪ ዕድሜን ለማራዘም ተለማማጅ ባትሪ በተደጋጋሚ ጥቅም ላይ ለማይውሉ መተግበሪያዎች ባትሪን ይገድባል። የእርስዎ ስልክ መተግበሪያዎችዎን እንዴት እንደሚጠቀሙ በጊዜ ሂደት ላይ ይማራል።
+
+ማሳወቂያዎች ለእነዚህ መተግበሪያዎች ሊዘገዩ ይችካሉ።"</string>
+ <string name="smart_battery_manager_title_custom">ተለማማጅ ባትሪ</string>
+ <string name="smart_battery_title_custom">ተለማማጅ ባትሪን ይጠቀሙ</string>
+ </resources>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 7be164e..a0a2744 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -2677,9 +2677,6 @@
<string name="user_credentials" msgid="4044405430790970775">"የተጠቃሚ ምስክርነቶች"</string>
<string name="user_credentials_summary" msgid="686471637627271856">"የተከማቹ ምስክርነቶችን ይመልከቱ እና ያሻሽሉ"</string>
<string name="advanced_security_title" msgid="7117581975877192652">"ከፍተኛ"</string>
- <string name="credential_storage_type" msgid="930861336971619888">"የማከማቻ አይነት"</string>
- <string name="credential_storage_type_hardware" msgid="2630040425119817220">"በሃርድዌር የተደገፈ"</string>
- <string name="credential_storage_type_software" msgid="4786996040468294626">"ሶፍትዌር ብቻ"</string>
<string name="credentials_settings_not_available" msgid="7433088409177429600">"ምስክርነቶች ለዚህ ተጠቃሚ አይገኙም"</string>
<string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"ለVPN እና መተግበሪያዎች ተጭኗል"</string>
<string name="credential_for_wifi" msgid="1963335263280604998">"ለWi-Fi ተጭኗል"</string>
diff --git a/res/values-am/wellbeing_strings.xml b/res/values-am/wellbeing_strings.xml
new file mode 100644
index 0000000..676986c
--- /dev/null
+++ b/res/values-am/wellbeing_strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="duration_less_than_one_minute">ከ1 ደቂቃ ያነሰ</string>
+ <string name="screen_time_summary_usage_today">%1$s ዛሬ</string>
+ </resources>
diff --git a/res/values-ar-rXB/google_strings.xml b/res/values-ar-rXB/google_strings.xml
new file mode 100644
index 0000000..3c551c0
--- /dev/null
+++ b/res/values-ar-rXB/google_strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="battery_tip_smart_battery_summary_custom">Turn on Battery Manager</string>
+ <string name="smart_battery_footer_custom">When Battery Manager detects that apps are draining battery, you’ll have the option to restrict these apps. Restricted apps may not work properly and notifications may be delayed.</string>
+ <string name="smart_battery_manager_title_custom">Battery Manager</string>
+ <string name="smart_battery_title_custom">Manage apps automatically</string>
+ </resources>
diff --git a/res/values-ar-rXB/wellbeing_strings.xml b/res/values-ar-rXB/wellbeing_strings.xml
new file mode 100644
index 0000000..58274ea
--- /dev/null
+++ b/res/values-ar-rXB/wellbeing_strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="duration_less_than_one_minute">Less than 1 minute</string>
+ <string name="screen_time_summary_usage_today">%1$s today</string>
+ </resources>
diff --git a/res/values-ar/aosp_strings.xml b/res/values-ar/aosp_strings.xml
new file mode 100644
index 0000000..6ac216e
--- /dev/null
+++ b/res/values-ar/aosp_strings.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <!-- Strings for face unlock enrollment, missing from AOSP-->
+ <string name="aosp_security_settings_face_enroll_education_message">على الشاشة التالية، حرّك رأسك بشكل دائري ليتسنى التقاط جميع زوايا وجهك.</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_expanded">يسهّل عليك هذا الخيار إعداد ميزة \"فتح القفل بالوجه\" إذا كان لديك صعوبة في الرؤية أو تحريك الرأس. عندما تستخدم ميزة \"فتح القفل بالوجه\"، قد تحتاج إلى تثبيت رأسك أمام الهاتف مباشرةً.</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_diversity">استخدام ميزة \"فتح القفل بالوجه\" ضمن خاصية \"سهولة الاستخدام\"</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_vision">يتطلب فتح العينين.</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_0">مسموح بالنظارات العادية أو النظارات الشمسية الغامقة قليلاً.</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_1">"يتم تخزين البيانات التي يسجِّلها \"فتح القفل بالوجه\" بشكل آمن وتظل على هاتفك. يمكنك حذف بياناتك في أي وقت من خلال الإعدادات.\n\nسيستخدم هاتفك أحيانًا أحدث صور \"فتح القفل بالوجه\" لإنشاء نماذج وجه محسّنة."</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_2">"يمكن أن يؤدي النظر للهاتف إلى فتح قفله حتى إذا كنت لا تقصد ذلك. يستطيع شخص آخر أن يلغي قفل هاتفك إذا تم تقريبه من وجهك.\n\nيمكنك ضبط \"الإعدادات\" كي لا يتم فتح قفل الهاتف إلا إذا كانت عيناك مفتوحتين."</string>
+<string name="aosp_security_settings_face_enroll_introduction_footer_part_2_attention_not_supported">"قد يتم فتح قفل الهاتف عند النظر إليه حتى إذا كنت لا تريد فتحه.\n\nويمكن لشخص آخر فتح قفل هاتفك عند تقريبه من وجهك حتى وأنت مغلق عينيك."</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_3">يستطيع شخص آخر فتح قفل هاتفك إذا كان يشبهك كثيرًا، مثل شقيقك التوأم.</string>
+</resources>
diff --git a/res/values-ar/google_strings.xml b/res/values-ar/google_strings.xml
new file mode 100644
index 0000000..cda0ea3
--- /dev/null
+++ b/res/values-ar/google_strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="battery_tip_smart_battery_summary_custom">تفعيل البطارية التكيُّفية</string>
+ <string name="smart_battery_footer_custom">"لإطالة عمر البطارية، يعمل خيار \"البطارية التكيُّفية\" على تقييد استخدام البطارية للتطبيقات التي لا تستخدمها إلا نادرًا. وسيتعلم هاتفك كيفية استخدام التطبيقات مع مرور الوقت.
+
+قد تتأخر إشعارات هذه التطبيقات."</string>
+ <string name="smart_battery_manager_title_custom">البطارية التكيُّفية</string>
+ <string name="smart_battery_title_custom">استخدام البطارية التكيُّفية</string>
+ </resources>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index ccb17f7..0d97d2b 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -2829,9 +2829,6 @@
<string name="user_credentials" msgid="4044405430790970775">"بيانات اعتماد المستخدم"</string>
<string name="user_credentials_summary" msgid="686471637627271856">"عرض بيانات الاعتماد المخزَّنة وتعديلها"</string>
<string name="advanced_security_title" msgid="7117581975877192652">"إعدادات متقدمة"</string>
- <string name="credential_storage_type" msgid="930861336971619888">"نوع وحدة التخزين"</string>
- <string name="credential_storage_type_hardware" msgid="2630040425119817220">"وحدة تخزين صلبة"</string>
- <string name="credential_storage_type_software" msgid="4786996040468294626">"وحدة تخزين برمجية فقط"</string>
<string name="credentials_settings_not_available" msgid="7433088409177429600">"لا تتوفر بيانات الاعتماد لهذا المستخدم"</string>
<string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"تم التثبيت للاستخدام بواسطة الشبكة الافتراضية الخاصة (VPN) والتطبيقات"</string>
<string name="credential_for_wifi" msgid="1963335263280604998">"تم التثبيت للاستخدام بواسطة Wi-Fi"</string>
diff --git a/res/values-ar/wellbeing_strings.xml b/res/values-ar/wellbeing_strings.xml
new file mode 100644
index 0000000..098af33
--- /dev/null
+++ b/res/values-ar/wellbeing_strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="duration_less_than_one_minute">أقل من دقيقة واحدة</string>
+ <string name="screen_time_summary_usage_today">%1$s اليوم</string>
+ </resources>
diff --git a/res/values-as/aosp_strings.xml b/res/values-as/aosp_strings.xml
new file mode 100644
index 0000000..0325d09
--- /dev/null
+++ b/res/values-as/aosp_strings.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <!-- Strings for face unlock enrollment, missing from AOSP-->
+ <string name="aosp_security_settings_face_enroll_education_message">পৰৱর্তী স্ক্ৰীণখনত আপোনাৰ মুখাৱয়বৰ সকলো দিশ কেপচাৰ কৰিবলৈ আপোনাৰ মূৰটো ঘূৰাওক</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_expanded">আপোনাৰ যদি দৃষ্টিশক্তি কম বা মূৰ ঘূৰায়, তেন্তে মুখাৱয়বৰদ্বাৰা আনলক কৰাৰ সুবিধাটো ছেট আপ কৰাৰ এইটো এটা সহজ পদ্ধতি। মুখাৱয়বৰদ্বাৰা আনলক কৰা সুবিধাটো ব্যৱহাৰ কৰোঁতে আপোনাৰ মূৰটো পোনপটীয়াকৈ আপোনাৰ ফ’নটোৰ সন্মুখত থাকিব লাগিব।</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_diversity">মুখাৱয়বৰদ্বাৰা আনলক কৰা সাধ্য সুবিধাযুক্ত সুবিধা ব্যৱহাৰ কৰক</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_vision">চকু মেলি ৰখাৰ প্ৰয়োজন</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_0">চশমা বা পাতল ৰঙীন ছানগ্লাছ ব্যৱহাৰ কৰাত অসুবিধা নাই।</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_1">"মুখাৱয়বৰদ্বাৰা আনলক কৰা সুবিধাটোৱে ৰেকর্ড কৰা ডেটা সুৰক্ষিতভাৱে ষ্ট'ৰ কৰা হয় আৰু সেয়া অন্য কোনো ডিভাইচলৈ পঠিওৱা নহয়। আপুনি আপোনাৰ ডেটা যিকোনো সময়তে ছেটিংসমূহত মচিব পাৰে।\n\nউন্নত মুখাৱয়বৰ ম’ডেলসমূহ সৃষ্টি কৰিবলৈ আপোনাৰ ফ’নটোৱে মাজে-সময়ে মুখাৱয়বৰ দ্বাৰা আনলক কৰা সুবিধাটোৱে লোৱা আপোনাৰ শেহতীয়া প্ৰতিচ্ছবিসমূহ ব্যৱহাৰ কৰিব।"</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_2">"আপুনি ফ’নটো আনলক কৰিবলৈ ইচ্ছা নকৰিলেও ফ’নটোলৈ চালে ই আনলক হ’ব পাৰে। অন্য কোনোবাই আপোনাৰ ফ’নটো আপোনাৰ মুখৰ আগত দাঙি ধৰি আনলক কৰিব পাৰে।\n\nআনলক কৰিবলৈ আপোনাৰ দুচকু খোল খাই থকাটো আপুনি ছেটিংসমূহত আৱশ্যকীয় কৰিব পাৰে।"</string>
+<string name="aosp_security_settings_face_enroll_introduction_footer_part_2_attention_not_supported">"আপুনি নিবিচাৰিলেও ফ’নটোলৈ চোৱাৰ ফলত সেইটো আনলক হ’ব পাৰে।\n\nআপোনাৰ চকু বন্ধ হৈ থাকিলেও আন কোনোবাই ফ’নটো আপোনাৰ মুখৰ আগত দাঙি ধৰি সেইটো আনলক কৰিব পাৰে।"</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_3">আপোনাৰ ফ’নটো এনে কোনো লোকেও আনলক কৰিব পাৰে যি দেখাত প্ৰায় আপোনাৰ দৰে, যেনে আপোনাৰ যমজ ভাতৃ-ভগ্নী।</string>
+</resources>
diff --git a/res/values-as/google_strings.xml b/res/values-as/google_strings.xml
new file mode 100644
index 0000000..dbb02a8
--- /dev/null
+++ b/res/values-as/google_strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="battery_tip_smart_battery_summary_custom">অভিযোজিত বেটাৰি অন কৰক</string>
+ <string name="smart_battery_footer_custom">"বেটাৰিৰ অৱস্থা উন্নত কৰিবলৈ অভিযোজিত বেটাৰিয়ে সঘনাই ব্য়ৱহাৰ নোহোৱা এপসমূহৰ বেটাৰিৰ ব্য়ৱহাৰ সীমিত কৰে। সময়ৰ লগত সংগতি ৰাখি আপোনাৰ ফ'নে আপুনি কেনেকৈ এপসমূহ ব্য়ৱহাৰ কৰে সেয়া অনুমান কৰিব।
+
+এই এপসমূহৰ বাবে জাননীসমূহ পলম হ'ব পাৰে।"</string>
+ <string name="smart_battery_manager_title_custom">অভিযোজিত বেটাৰি</string>
+ <string name="smart_battery_title_custom">অভিযোজিত বেটাৰি ব্যৱহাৰ কৰক</string>
+ </resources>
diff --git a/res/values-as/strings.xml b/res/values-as/strings.xml
index ba6692a..ddd783d 100644
--- a/res/values-as/strings.xml
+++ b/res/values-as/strings.xml
@@ -2677,9 +2677,6 @@
<string name="user_credentials" msgid="4044405430790970775">"ব্যৱহাৰকাৰীৰ ক্ৰেডেনশ্বিয়েল"</string>
<string name="user_credentials_summary" msgid="686471637627271856">"সঞ্চয় কৰা প্ৰমাণপত্ৰসমূহ চাওক আৰু সংশোধন কৰক"</string>
<string name="advanced_security_title" msgid="7117581975877192652">"উচ্চখাপৰ ছেটিংসমূহ"</string>
- <string name="credential_storage_type" msgid="930861336971619888">"সঞ্চয়াগাৰৰ প্ৰকাৰ"</string>
- <string name="credential_storage_type_hardware" msgid="2630040425119817220">"হাৰ্ডৱেৰ-সমৰ্থিত"</string>
- <string name="credential_storage_type_software" msgid="4786996040468294626">"কেৱল ছফ্টৱেৰ"</string>
<string name="credentials_settings_not_available" msgid="7433088409177429600">"এই ব্যৱহাৰকাৰীৰ বাবে ক্ৰেডেনশ্বিয়েলসমূহ উপলব্ধ নহয়"</string>
<string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"ভিপিএন আৰু এপ্সমূহৰ বাবে ইনষ্টল কৰা হৈছে"</string>
<string name="credential_for_wifi" msgid="1963335263280604998">"ৱাই-ফাইৰ বাবে ইনষ্টল কৰা হৈছে"</string>
diff --git a/res/values-as/wellbeing_strings.xml b/res/values-as/wellbeing_strings.xml
new file mode 100644
index 0000000..ddd70ba
--- /dev/null
+++ b/res/values-as/wellbeing_strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="duration_less_than_one_minute">১ মিনিটতকৈ কম</string>
+ <string name="screen_time_summary_usage_today">আজি %1$s</string>
+ </resources>
diff --git a/res/values-az/aosp_strings.xml b/res/values-az/aosp_strings.xml
new file mode 100644
index 0000000..b4db464
--- /dev/null
+++ b/res/values-az/aosp_strings.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <!-- Strings for face unlock enrollment, missing from AOSP-->
+ <string name="aosp_security_settings_face_enroll_education_message">Növbəti ekranda üzünüzün bütün tərəflərini çəkmək üçün başınızı fırladın</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_expanded">Məhdud görmə və ya baş hərəkətiniz olarsa, bu seçim üz kilidi ayarlamaq üçün asan yoldur. Üz kilidindən istifadə etdikdə başınızı telefonun qarşısında sabit saxlamalısınız.</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_diversity">Əlçatan üz kilidindən istifadə edin</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_vision">Gözlərinizi açıq saxlayın</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_0">Eynək və ya solğun rəngli gün eynəyi taxa bilərsiniz.</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_1">"Üz kilidi ilə yazılmış data təhlükəsiz saxlanılır və heç vaxt telefondan silinmir. Datanı istənilən vaxt ayarlarda silə bilərsiniz.\n\nDaha təkmilləşdirilmiş üz modeli yaratmaq üçün telefonunuz arabir ən son \"üz ilə kiliddən çıxarma\" şəkillərinizdən istifadə edəcək."</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_2">"Telefona baxmaqla istəmədiyiniz halda belə onu kiliddən çıxara bilərsiniz. Telefon üzünüzə tutularsa, başqası tərəfindən açıla bilər.\n\nAyarlarda kiliddən çıxarmaq üçün gözlərinizin açıq olması tələbini ayarlaya bilərsiniz."</string>
+<string name="aosp_security_settings_face_enroll_introduction_footer_part_2_attention_not_supported">"Açmaq istəmədiyiniz vaxt telefona baxmaqla onu kiliddən çıxara bilərsiniz.\n\nHətta gözləriniz bağlı halda telefon üzünüzə tərəf tutularsa, başqası tərəfindən açıla bilər."</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_3">Telefonunuz, məsələn, oxşar bacı/qardaşınız tərəfindən kiliddən çıxarıla bilər.</string>
+</resources>
diff --git a/res/values-az/google_strings.xml b/res/values-az/google_strings.xml
new file mode 100644
index 0000000..46fc16c
--- /dev/null
+++ b/res/values-az/google_strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="battery_tip_smart_battery_summary_custom">Adaptiv Batareyanı aktiv edin</string>
+ <string name="smart_battery_footer_custom">"Batareya ömrünü uzatmaq üçün Adaptiv Batareya, daima istifadə edilən tətbiqlərin batareyadan istifadəsini məhdudlaşdırır. Telefon vaxt keçdikcə tətbiqlərdən istifadə etməyi öyrənəcək.
+
+Həmin tətbiqlərin bildirişləri gecikə bilər."</string>
+ <string name="smart_battery_manager_title_custom">Adaptiv Batareya</string>
+ <string name="smart_battery_title_custom">Adaptiv Batareyadan istifadə edin</string>
+ </resources>
diff --git a/res/values-az/strings.xml b/res/values-az/strings.xml
index b02d417..d447b01 100644
--- a/res/values-az/strings.xml
+++ b/res/values-az/strings.xml
@@ -2677,9 +2677,6 @@
<string name="user_credentials" msgid="4044405430790970775">"İstifadəçi məlumatı"</string>
<string name="user_credentials_summary" msgid="686471637627271856">"Saxlanılan məlumatlara baxın və dəyişin"</string>
<string name="advanced_security_title" msgid="7117581975877192652">"Qabaqcıl ayarlar"</string>
- <string name="credential_storage_type" msgid="930861336971619888">"Saxlama növü"</string>
- <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Avadanlıq təminatı"</string>
- <string name="credential_storage_type_software" msgid="4786996040468294626">"Yalnız proqram"</string>
<string name="credentials_settings_not_available" msgid="7433088409177429600">"Kredensiallar bu istifadəçi üçün əlçatan deyil"</string>
<string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"VPN və tətbiq üçün quraşdırılıb"</string>
<string name="credential_for_wifi" msgid="1963335263280604998">"Wi-Fi üçün quraşdırılıb"</string>
diff --git a/res/values-az/wellbeing_strings.xml b/res/values-az/wellbeing_strings.xml
new file mode 100644
index 0000000..52a899e
--- /dev/null
+++ b/res/values-az/wellbeing_strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="duration_less_than_one_minute">1 dəqiqədən az</string>
+ <string name="screen_time_summary_usage_today">Bu gün %1$s</string>
+ </resources>
diff --git a/res/values-b+sr+Latn/aosp_strings.xml b/res/values-b+sr+Latn/aosp_strings.xml
new file mode 100644
index 0000000..271a537
--- /dev/null
+++ b/res/values-b+sr+Latn/aosp_strings.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <!-- Strings for face unlock enrollment, missing from AOSP-->
+ <string name="aosp_security_settings_face_enroll_education_message">Na sledećem ekranu rotirajte glavu da biste snimili sve uglove lica</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_expanded">Ako imate ograničen vid ili pokrete glavom, ova opcija predstavlja jednostavniji način da podesite otključavanje licem. Kada koristite otključavanje licem, glava treba da bude direktno ispred telefona.</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_diversity">Koristite otključavanje licem sa funkcijom pristupačnosti</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_vision">Oči treba da budu otvorene</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_0">Naočare za vid ili sunce sa blagom nijansom su u redu.</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_1">"Podaci koje zabeleži otključavanje licem bezbedno se čuvaju i ostaju samo na telefonu. Možete da izbrišete podatke u bilo kom trenutku.\n\nTelefon će povremeno koristiti nedavne slike za otključavanje licem radi pravljenja poboljšanih modela lica."</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_2">"Ako pogledate telefon, možete i nehotice da ga otključate. Telefon može da otključa neko drugi ako ga približi vašem licu.\n\nU podešavanjima možete da zahtevate da vam oči budu otvorene radi otključavanja."</string>
+<string name="aosp_security_settings_face_enroll_introduction_footer_part_2_attention_not_supported">"Ako pogledate telefon, možete i nehotice da ga otključate.\n\nTelefon može da otključa neko drugi ako ga približi vašem licu, čak i ako su vam oči zatvorene."</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_3">Telefon može da otključa neko ko mnogo liči na vas, na primer, identični blizanac.</string>
+</resources>
diff --git a/res/values-b+sr+Latn/google_strings.xml b/res/values-b+sr+Latn/google_strings.xml
new file mode 100644
index 0000000..454a0a6
--- /dev/null
+++ b/res/values-b+sr+Latn/google_strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="battery_tip_smart_battery_summary_custom">Uključite prilagodljivu bateriju</string>
+ <string name="smart_battery_footer_custom">"Da biste produžili trajanje baterije, prilagodljiva baterija ograničava potrošnju baterije za aplikacije koje se ne koriste često. Telefon će vremenom naučiti kako da koristi aplikacije.
+
+Obaveštenja o ovim aplikacijama mogu da kasne."</string>
+ <string name="smart_battery_manager_title_custom">Prilagodljiva baterija</string>
+ <string name="smart_battery_title_custom">Koristi prilagodljivu bateriju</string>
+ </resources>
diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml
index bed1326..56bc717 100644
--- a/res/values-b+sr+Latn/strings.xml
+++ b/res/values-b+sr+Latn/strings.xml
@@ -2715,9 +2715,6 @@
<string name="user_credentials" msgid="4044405430790970775">"Korisnički akreditivi"</string>
<string name="user_credentials_summary" msgid="686471637627271856">"Pregledajte i menjajte sačuvane akreditive"</string>
<string name="advanced_security_title" msgid="7117581975877192652">"Napredna"</string>
- <string name="credential_storage_type" msgid="930861336971619888">"Tip memorijskog prostora"</string>
- <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Podržan hardverom"</string>
- <string name="credential_storage_type_software" msgid="4786996040468294626">"Samo softverski"</string>
<string name="credentials_settings_not_available" msgid="7433088409177429600">"Akreditivi nisu dostupni za ovog korisnika"</string>
<string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Instalirano za VPN i aplikacije"</string>
<string name="credential_for_wifi" msgid="1963335263280604998">"Instalirano za Wi-Fi"</string>
diff --git a/res/values-b+sr+Latn/wellbeing_strings.xml b/res/values-b+sr+Latn/wellbeing_strings.xml
new file mode 100644
index 0000000..b229361
--- /dev/null
+++ b/res/values-b+sr+Latn/wellbeing_strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="duration_less_than_one_minute">Manje od 1 minuta</string>
+ <string name="screen_time_summary_usage_today">%1$s danas</string>
+ </resources>
diff --git a/res/values-be/aosp_strings.xml b/res/values-be/aosp_strings.xml
new file mode 100644
index 0000000..33a51de
--- /dev/null
+++ b/res/values-be/aosp_strings.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <!-- Strings for face unlock enrollment, missing from AOSP-->
+ <string name="aosp_security_settings_face_enroll_education_message">Скончыўшы прагляд, паварочвайце галаву, каб зрабіць здымкі твару ва ўсіх ракурсах</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_expanded">Калі ў вас слабы зрок ці абмежаваны рух галавы, з гэтай функцыяй будзе прасцей наладзіць распазнаванне твару. Падчас выкарыстання функцыі распазнавання твару трымайце галаву непасрэдна перад экранам тэлефона.</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_diversity">Выкарыстоўваць спецыяльныя магчымасці функцыі распазнавання твару</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_vision">Трэба адкрыць вочы</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_0">Акуляры з празрыстымі лінзамі ці крыху зацемненым шклом не перашкодзяць распазнаванню твару.</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_1">"Даныя, запісаныя функцыяй распазнавання твару, будуць захоўвацца толькі на вашым тэлефоне. Вы можаце выдаліць іх у наладах у любы час.\n\nТэлефон будзе перыядычна выкарыстоўваць новыя відарысы, запісаныя функцыяй, каб ствараць палепшаныя мадэлі твару."</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_2">"Гледзячы на тэлефон, вы можаце разблакіраваць яго, нават не маючы такога намеру. Ваш тэлефон можа быць разблакіраваны кімсьці яшчэ, хто трымае яго на ўзроўні вашага твару.\n\nУ Наладах можна задаць умову, што для разблакіроўкі неабходна, каб вочы карыстальніка былі расплюшчаны."</string>
+<string name="aosp_security_settings_face_enroll_introduction_footer_part_2_attention_not_supported">"Вы можаце ненаўмысна разблакіраваць тэлефон, проста гледзячы на экран.\n\nВаш тэлефон можа быць разблакіраваны кімсьці яшчэ, хто трымае яго на ўзроўні вашага твару, нават калі ў вас заплюшчаны вочы."</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_3">Ваш тэлефон можа быць разблакіраваны кімсьці, хто падобны на вас – напрыклад, гэта можа быць ваш брат ці сястра.</string>
+</resources>
diff --git a/res/values-be/google_strings.xml b/res/values-be/google_strings.xml
new file mode 100644
index 0000000..d84ff99
--- /dev/null
+++ b/res/values-be/google_strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="battery_tip_smart_battery_summary_custom">Уключыць адаптацыю акумулятара</string>
+ <string name="smart_battery_footer_custom">"Каб падоўжыць тэрмін службы акумулятара, адаптацыя акумулятара абмяжоўвае яго выкарыстанне праграмамі, якія запускаюцца рэдка. Ваш тэлефон з часам прыстасуецца да таго, як вы карыстаецеся праграмамі.
+
+Апавяшчэнні для гэтых праграм могуць прыходзіць з затрымкай."</string>
+ <string name="smart_battery_manager_title_custom">Адаптацыя акумулятара</string>
+ <string name="smart_battery_title_custom">Выкарыстоўваць адаптацыю акумулятара</string>
+ </resources>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index 7f05fb7..a723c96 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -2753,9 +2753,6 @@
<string name="user_credentials" msgid="4044405430790970775">"Уліковыя даныя карыстальніка"</string>
<string name="user_credentials_summary" msgid="686471637627271856">"Прагляд і рэдагаванне захаваных уліковых даных"</string>
<string name="advanced_security_title" msgid="7117581975877192652">"Пашыраныя налады"</string>
- <string name="credential_storage_type" msgid="930861336971619888">"Тып сховішча"</string>
- <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Апаратнае"</string>
- <string name="credential_storage_type_software" msgid="4786996040468294626">"Толькі праграмнае забеспячэнне"</string>
<string name="credentials_settings_not_available" msgid="7433088409177429600">"Сертыфікаты недаступныя для гэтага карыстальніка"</string>
<string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Усталявана для VPN і праграм"</string>
<string name="credential_for_wifi" msgid="1963335263280604998">"Усталявана для Wi-Fi"</string>
diff --git a/res/values-be/wellbeing_strings.xml b/res/values-be/wellbeing_strings.xml
new file mode 100644
index 0000000..0298ba6
--- /dev/null
+++ b/res/values-be/wellbeing_strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="duration_less_than_one_minute">Менш за 1 хвіліну</string>
+ <string name="screen_time_summary_usage_today">Сёння %1$s</string>
+ </resources>
diff --git a/res/values-bg/aosp_strings.xml b/res/values-bg/aosp_strings.xml
new file mode 100644
index 0000000..9846301
--- /dev/null
+++ b/res/values-bg/aosp_strings.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <!-- Strings for face unlock enrollment, missing from AOSP-->
+ <string name="aosp_security_settings_face_enroll_education_message">На следващия екран завъртете главата си, за да уловите всички ъгли на лицето си</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_expanded">При зрителни увреждания или ограничения в движението на главата тази опция е по-лесен начин за настройване на отключването с лице. Когато използвате функцията, може да се наложи да поставите телефона точно пред главата си.</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_diversity">По-лесно настройване на отключването с лице</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_vision">Изискване очите да са отворени</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_0">Може да носите очила или леко затъмнени слънчеви очила.</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_1">"Данните, записани от „Отключване с лице“, се съхраняват надеждно и остават на телефона ви. Можете да ги изтриете по всяко време от настройките.\n\nТелефонът ви периодично ще използва скорошните ви изображения за функцията за отключване с лице, за да създаде подобрени модели на лицето."</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_2">"Дори и да не възнамерявате да отключите телефона, това може да стане, когато гледате в него. Телефонът ви може да бъде отключен от друг човек, ако бъде приближен до лицето ви.\n\nОт настройките можете да зададете за отключването му да се изисква очите ви да са отворени."</string>
+<string name="aosp_security_settings_face_enroll_introduction_footer_part_2_attention_not_supported">"Можете да отключите телефона неволно, като го погледнете.\n\nТой може да бъде отключен от друг човек, ако бъде приближен до лицето ви, дори очите ви да са затворени."</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_3">Телефонът ви може да бъде отключен от някого, който много прилича на вас, например от ваши брат или сестра близнак.</string>
+</resources>
diff --git a/res/values-bg/google_strings.xml b/res/values-bg/google_strings.xml
new file mode 100644
index 0000000..bebb2ee
--- /dev/null
+++ b/res/values-bg/google_strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="battery_tip_smart_battery_summary_custom">Включете режима за адаптивна батерия</string>
+ <string name="smart_battery_footer_custom">"За да удължи живота на батерията, режимът за адаптивна батерия ограничава изразходването й от рядко използваните приложения. С течение на времето телефонът ви ще научи как използвате приложенията.
+
+Може да има забавяне на известията от тези приложения."</string>
+ <string name="smart_battery_manager_title_custom">Адаптивна батерия</string>
+ <string name="smart_battery_title_custom">Използване на режима за адаптивна батерия</string>
+ </resources>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 40bb3c2..d789b00 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -2677,9 +2677,6 @@
<string name="user_credentials" msgid="4044405430790970775">"Идентиф. данни на потребителя"</string>
<string name="user_credentials_summary" msgid="686471637627271856">"Преглед и промяна на съхранените идентификационни данни"</string>
<string name="advanced_security_title" msgid="7117581975877192652">"Разширени"</string>
- <string name="credential_storage_type" msgid="930861336971619888">"Тип на хранилището"</string>
- <string name="credential_storage_type_hardware" msgid="2630040425119817220">"С хардуерна поддръжка"</string>
- <string name="credential_storage_type_software" msgid="4786996040468294626">"Само софтуерно"</string>
<string name="credentials_settings_not_available" msgid="7433088409177429600">"Идентификационните данни не са налице за този потребител"</string>
<string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Инсталирани за виртуалната частна мрежа (VPN) и приложения"</string>
<string name="credential_for_wifi" msgid="1963335263280604998">"Инсталирани за Wi-Fi"</string>
diff --git a/res/values-bg/wellbeing_strings.xml b/res/values-bg/wellbeing_strings.xml
new file mode 100644
index 0000000..d1c3319
--- /dev/null
+++ b/res/values-bg/wellbeing_strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="duration_less_than_one_minute">По-малко от 1 минута</string>
+ <string name="screen_time_summary_usage_today">Днес: %1$s</string>
+ </resources>
diff --git a/res/values-bn/aosp_strings.xml b/res/values-bn/aosp_strings.xml
new file mode 100644
index 0000000..c47f331
--- /dev/null
+++ b/res/values-bn/aosp_strings.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <!-- Strings for face unlock enrollment, missing from AOSP-->
+ <string name="aosp_security_settings_face_enroll_education_message">পরের স্ক্রিনে, সবদিক থেকে আপনার ফেসের ছবি তুলতে আপনার মাথাটি ঘোরান</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_expanded">স্পষ্ট দেখা যাচ্ছে না অথবা মাথা স্থির রাখা যাচ্ছে না, এই রকম পরিস্থিতি হলে এই পদ্ধতির সাহায্যে সহজেই মুখের সাহায্যে আনলক ফিচারটি সেট-আপ করা যায়। মুখের সাহায্য আনলক ফিচারটি ব্যবহার করার সময়ে আপনার মুখ সরাসরি ফোনের সামনে রাখার প্রয়োজন হতে পারে।</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_diversity">মুখের সাহায্যে আনলকের সুবিধা ব্যবহার করুন</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_vision">চোখ খোলা থাকা জরুরী</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_0">চশমা বা রঙের হালকা আভা আছে এমন সানগ্লাস ব্যবহার করা যেতে পারে।</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_1">"মুখের সাহায্যে আনলক করার মাধ্যমে রেকর্ড করা ডেটা নিরাপদে সেভ করা থাকে এবং কখনও মুছে যায় না। সেটিংস থেকে আপনি যেকোনও সময় আপনার ডেটা মুছে ফেলতে পারেন।\n\nআরও ভাল ফেস মডেল তৈরি করার জন্য সম্প্রতি মুখের সহায়তায় আনলক করার সুবিধাটি যেসব ছবি সেভ করেছে, আপনার ফোন সেই ছবি মাঝে মাঝে ব্যবহার করবে।"</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_2">"আপনি না চাইলেও ফোনের দিকে তাকালে সেটি আনলক হয়ে যেতে পারে। আপনার চোখ খোলা থাকলে এবং ফোনটি আপনার মুখের সামনে ধরে অন্য কেউ আপনার ফোন আনলক করতে পারেন।\n\nসেটিংসে গিয়ে আনলক করতে আপনার দু'টি চোখই খোলা রাখতে হবে।"</string>
+<string name="aosp_security_settings_face_enroll_introduction_footer_part_2_attention_not_supported">"আপনি না চাইলেও, ফোনের দিকে তাকালে তা আনলক হয়ে যেতে পারে।\n\nআপনার চোখ বন্ধ করা থাকলেও, অন্য কেউ আপনার মুখের সামনে ফোনটি ধরে আনলক করতে পারেন।"</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_3">আপনার মতো দেখতে এমন যে কেউ, যেমন আপনার যমজ ভাই বা বোন, আপনার ফোন আনলক করতে পারবেন।</string>
+</resources>
diff --git a/res/values-bn/google_strings.xml b/res/values-bn/google_strings.xml
new file mode 100644
index 0000000..ab4fe52
--- /dev/null
+++ b/res/values-bn/google_strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="battery_tip_smart_battery_summary_custom">অ্যাডাপটিভ ব্যাটারি চালু করুন</string>
+ <string name="smart_battery_footer_custom">"ব্যাটারি যাতে আরও বেশিক্ষণ চলে তার জন্য অ্যাডাপটিভ ব্যাটারি বৈশিষ্ট্যটি অনিয়মিত ব্যবহৃত অ্যাপের ব্যাটারি ব্যবহারে সীমা নির্দিষ্ট করে। আপনি কোন অ্যাপ কত নিয়মিত ব্যবহার করেন তা আপনার ফোন ধীরে ধীরে শিখে নেবে।
+
+এই অ্যাপগুলির বিজ্ঞপ্তি আসতে দেরি হতে পারে।"</string>
+ <string name="smart_battery_manager_title_custom">অ্যাডাপটিভ ব্যাটারি</string>
+ <string name="smart_battery_title_custom">অ্যাডাপটিভ ব্যাটারি ব্যবহার করুন</string>
+ </resources>
diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml
index 5d4e4df..2a9c795 100644
--- a/res/values-bn/strings.xml
+++ b/res/values-bn/strings.xml
@@ -2677,9 +2677,6 @@
<string name="user_credentials" msgid="4044405430790970775">"ব্যবহারকারীর সার্টিফিকেট"</string>
<string name="user_credentials_summary" msgid="686471637627271856">"সংরক্ষিত সার্টিফিকেট দেখুন এবং সংশোধন করুন"</string>
<string name="advanced_security_title" msgid="7117581975877192652">"উন্নত"</string>
- <string name="credential_storage_type" msgid="930861336971619888">"স্টোরেজের প্রকার"</string>
- <string name="credential_storage_type_hardware" msgid="2630040425119817220">"হার্ডওয়্যার-ব্যাকড"</string>
- <string name="credential_storage_type_software" msgid="4786996040468294626">"শুধুমাত্র সফ্টওয়্যার"</string>
<string name="credentials_settings_not_available" msgid="7433088409177429600">"এই ব্যবহারকারীর জন্য প্রমাণপ্রত্রাদি উপলব্ধ নয়"</string>
<string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"VPN এবং অ্যাপ্সের জন্য ইনস্টল করা হয়েছে"</string>
<string name="credential_for_wifi" msgid="1963335263280604998">"ওয়াই-ফাই এর জন্য ইনস্টল করা হয়েছে"</string>
diff --git a/res/values-bn/wellbeing_strings.xml b/res/values-bn/wellbeing_strings.xml
new file mode 100644
index 0000000..2e130b4
--- /dev/null
+++ b/res/values-bn/wellbeing_strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="duration_less_than_one_minute">১ মিনিটেরও কম</string>
+ <string name="screen_time_summary_usage_today">আজ %1$s</string>
+ </resources>
diff --git a/res/values-bs/aosp_strings.xml b/res/values-bs/aosp_strings.xml
new file mode 100644
index 0000000..4b2e1ca
--- /dev/null
+++ b/res/values-bs/aosp_strings.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <!-- Strings for face unlock enrollment, missing from AOSP-->
+ <string name="aosp_security_settings_face_enroll_education_message">Na sljedećem ekranu okrećite glavu da snimite sve uglove lica.</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_expanded">Ako imate ograničen vid ili pokrete glavom, ova opcija predstavlja lakši način da postavite otključavanje licem. Moguće je da ćete pri korištenju otključavanja licem glavu morati postaviti direktno ispred telefona.</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_diversity">Korištenje otključavanja licem za pristupačnost</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_vision">Zahtijeva da oči budu otvorene</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_0">Možete nositi naočale ili blago zatamnjene sunčane naočale.</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_1">"Podaci koje snimi otključavanje licem pohranjuju se sigurno i ostaju samo na telefonu. Podatke možete izbrisati bilo kada u postavkama.\n\nTelefon će povremeno koristiti nedavno snimljene slike za otključavanje licem radi kreiranja poboljšanih modela lica."</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_2">"Telefon možete otključati ako pogledate u njega čak i kada vam to nije namjera. Vaš telefon je moguće otključati ako ga neko prinese vašem licu.\n\nU Postavkama možete podesiti da vam oči moraju biti otvorene da bi se telefon otključao."</string>
+<string name="aosp_security_settings_face_enroll_introduction_footer_part_2_attention_not_supported">"Telefon možete otključati ako pogledate u njega čak i kada to ne namjeravate. \n\nTelefon je moguće otključati ako ga neko prinese vašem licu čak i kada su vam oči zatvorene."</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_3">Vaš telefon može otključati osoba koja mnogo liči na vas, kao što je identični blizanac.</string>
+</resources>
diff --git a/res/values-bs/google_strings.xml b/res/values-bs/google_strings.xml
new file mode 100644
index 0000000..95d22b3
--- /dev/null
+++ b/res/values-bs/google_strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="battery_tip_smart_battery_summary_custom">Uključite prilagodljivu bateriju</string>
+ <string name="smart_battery_footer_custom">"Da bi se produžio vijek trajanja baterije, prilagodljiva baterija ograničava upotrebu baterije za aplikacije koje se ne koriste često. Telefon će vremenom učiti na koji način koristite aplikacije.
+
+Moguće je da će obavještenja za te aplikacije kasniti."</string>
+ <string name="smart_battery_manager_title_custom">Prilagodljiva baterija</string>
+ <string name="smart_battery_title_custom">Koristi prilagodljivu bateriju</string>
+ </resources>
diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml
index 243f9c7..dccdf83 100644
--- a/res/values-bs/strings.xml
+++ b/res/values-bs/strings.xml
@@ -2715,9 +2715,6 @@
<string name="user_credentials" msgid="4044405430790970775">"Korisnički akreditivi"</string>
<string name="user_credentials_summary" msgid="686471637627271856">"Prikaz i izmjena pohranjenih akreditiva"</string>
<string name="advanced_security_title" msgid="7117581975877192652">"Napredno"</string>
- <string name="credential_storage_type" msgid="930861336971619888">"Vrsta pohrane"</string>
- <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Sa hardverskom podlogom"</string>
- <string name="credential_storage_type_software" msgid="4786996040468294626">"Samo softverski"</string>
<string name="credentials_settings_not_available" msgid="7433088409177429600">"Akreditivi nisu dostupni za ovog korisnika"</string>
<string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Instalirani za VPN i aplikacije"</string>
<string name="credential_for_wifi" msgid="1963335263280604998">"Instalirani za WiFi mrežu"</string>
diff --git a/res/values-bs/wellbeing_strings.xml b/res/values-bs/wellbeing_strings.xml
new file mode 100644
index 0000000..985233d
--- /dev/null
+++ b/res/values-bs/wellbeing_strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="duration_less_than_one_minute">Manje od 1 minute</string>
+ <string name="screen_time_summary_usage_today">Danas: %1$s</string>
+ </resources>
diff --git a/res/values-ca/aosp_strings.xml b/res/values-ca/aosp_strings.xml
new file mode 100644
index 0000000..9b04e6d
--- /dev/null
+++ b/res/values-ca/aosp_strings.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <!-- Strings for face unlock enrollment, missing from AOSP-->
+ <string name="aosp_security_settings_face_enroll_education_message">A la pantalla següent, gira el cap perquè es capturin tots els angles de la cara.</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_expanded">Si tens problemes visuals o una mobilitat del cap reduïda, aquesta opció pot ajudar-te a configurar el desbloqueig facial. Quan utilitzis aquesta funció, és possible que hagis de col·locar el cap més directament en front del telèfon.</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_diversity">"Utilitza el desbloqueig facial amb l'opció d'accessibilitat"</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_vision">"Els ulls han d'estar oberts"</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_0">Pots portar ulleres o ulleres de sol amb els vidres clars.</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_1">"Les dades que hagi gravat el desbloqueig facial s'emmagatzemen de manera segura i no surten mai del telèfon. Pots suprimir les teves dades en qualsevol moment a la configuració.\n\nDe tant en tant, el telèfon utilitzarà les imatges recents del desbloqueig facial per crear models facials millorats."</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_2">"Si mires el telèfon, es pot desbloquejar sense voler. Una altra persona pot desbloquejar el telèfon si te'l posa davant de la cara.\n\nA Configuració, pots configurar aquesta funció perquè el telèfon només es desbloquegi quan tinguis els ulls oberts."</string>
+<string name="aosp_security_settings_face_enroll_introduction_footer_part_2_attention_not_supported">"Si mires el telèfon, es pot desbloquejar sense voler.\n\nUna altra persona pot desbloquejar el telèfon si te'l posa davant de la cara, encara que tinguis els ulls tancats."</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_3">"És possible que algú que s'assembli molt a tu, com ara un bessó idèntic, pugui desbloquejar el telèfon."</string>
+</resources>
diff --git a/res/values-ca/google_strings.xml b/res/values-ca/google_strings.xml
new file mode 100644
index 0000000..1c73695
--- /dev/null
+++ b/res/values-ca/google_strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="battery_tip_smart_battery_summary_custom">Activa la bateria intel·ligent</string>
+ <string name="smart_battery_footer_custom">"Per augmentar la durada de la bateria, la bateria intel·ligent en limita l'ús a les aplicacions que utilitzes amb poca freqüència. El teu telèfon aprendrà com fas servir les aplicacions al llarg del temps.
+
+És possible que rebis les notificacions d'aquestes aplicacions amb retard."</string>
+ <string name="smart_battery_manager_title_custom">Bateria intel·ligent</string>
+ <string name="smart_battery_title_custom">Fes servir la bateria intel·ligent</string>
+ </resources>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 0f2a723..4130cf9 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -2677,9 +2677,6 @@
<string name="user_credentials" msgid="4044405430790970775">"Credencials d\'usuari"</string>
<string name="user_credentials_summary" msgid="686471637627271856">"Mostra i modifica les credencials emmagatzemades"</string>
<string name="advanced_security_title" msgid="7117581975877192652">"Configuració avançada"</string>
- <string name="credential_storage_type" msgid="930861336971619888">"Tipus d\'emmagatzematge"</string>
- <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Emmagatzemat en maquinari"</string>
- <string name="credential_storage_type_software" msgid="4786996040468294626">"Només programari"</string>
<string name="credentials_settings_not_available" msgid="7433088409177429600">"Les credencials no estan disponibles per a aquest usuari."</string>
<string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Instal·lada per a xarxes VPN i aplicacions"</string>
<string name="credential_for_wifi" msgid="1963335263280604998">"Instal·lada per a xarxes Wi-Fi"</string>
diff --git a/res/values-ca/wellbeing_strings.xml b/res/values-ca/wellbeing_strings.xml
new file mode 100644
index 0000000..90ea205
--- /dev/null
+++ b/res/values-ca/wellbeing_strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="duration_less_than_one_minute">Menys d\'1 minut</string>
+ <string name="screen_time_summary_usage_today">%1$s avui</string>
+ </resources>
diff --git a/res/values-cs/aosp_strings.xml b/res/values-cs/aosp_strings.xml
new file mode 100644
index 0000000..555966b
--- /dev/null
+++ b/res/values-cs/aosp_strings.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <!-- Strings for face unlock enrollment, missing from AOSP-->
+ <string name="aosp_security_settings_face_enroll_education_message">Na další obrazovce otáčejte hlavu a nechte obličej zachytit ze všech úhlů</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_expanded">Pokud špatně vidíte nebo moc nemůžete hýbat hlavou, pomocí této možnosti lze odemknutí obličejem nastavit snáze. Je možné, že při odemykání obličejem bude potřeba umístit hlavu přesněji před telefon.</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_diversity">Použít odemknutí obličejem s usnadněním</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_vision">Musíte mít otevřené oči</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_0">Brýle nebo lehce zabarvené sluneční brýle jsou v pořádku.</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_1">"Data zaznamenaná funkcí odemknutí obličejem se ukládají zabezpečeným způsobem a nikdy telefon neopouštějí. Data můžete kdykoli smazat v nastavení.\n\nTelefon bude vaše poslední fotky pro odemknutí obličejem příležitostně používat k vytváření vylepšených modelů obličeje."</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_2">"Telefon můžete odemknout pohledem, i když zrovna nechcete. Telefon může odemknout i někdo jiný, když ho namíří na váš obličej.\n\nV Nastavení lze určit, že k odemknutí budou vyžadovány otevřené oči."</string>
+<string name="aosp_security_settings_face_enroll_introduction_footer_part_2_attention_not_supported">"Telefon můžete odemknout pohledem, i když zrovna nechcete.\n\nTelefon může odemknout i někdo jiný, když jej namíří na váš obličej (i když budete mít zavřené oči)."</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_3">Váš telefon bude moci odemknout někdo, kdo je vám hodně podobný, například vaše identické dvojče.</string>
+</resources>
diff --git a/res/values-cs/google_strings.xml b/res/values-cs/google_strings.xml
new file mode 100644
index 0000000..d85e909
--- /dev/null
+++ b/res/values-cs/google_strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="battery_tip_smart_battery_summary_custom">Zapněte adaptivní baterii</string>
+ <string name="smart_battery_footer_custom">"Adaptivní baterie prodlužuje výdrž baterie tím, že omezuje využití baterie aplikacemi, které nepoužíváte tak často. Telefon postupem času sám zjistí, jak aplikace využíváte.
+
+Oznámení z těchto aplikací se mohou zobrazovat se zpožděním."</string>
+ <string name="smart_battery_manager_title_custom">Adaptivní baterie</string>
+ <string name="smart_battery_title_custom">Použít adaptivní baterii</string>
+ </resources>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 17842d9..765145d 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -2753,9 +2753,6 @@
<string name="user_credentials" msgid="4044405430790970775">"Identifikační údaje uživatele"</string>
<string name="user_credentials_summary" msgid="686471637627271856">"Zobrazení a úprava uložených identifikačních údajů"</string>
<string name="advanced_security_title" msgid="7117581975877192652">"Rozšířené nastavení"</string>
- <string name="credential_storage_type" msgid="930861336971619888">"Typ úložiště"</string>
- <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Hardwarové"</string>
- <string name="credential_storage_type_software" msgid="4786996040468294626">"Pouze software"</string>
<string name="credentials_settings_not_available" msgid="7433088409177429600">"Pro tohoto uživatele jsou identifikační údaje nedostupné."</string>
<string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Nainstalováno pro síť VPN a aplikace"</string>
<string name="credential_for_wifi" msgid="1963335263280604998">"Nainstalování pro síť Wi-Fi"</string>
diff --git a/res/values-cs/wellbeing_strings.xml b/res/values-cs/wellbeing_strings.xml
new file mode 100644
index 0000000..588f7cf
--- /dev/null
+++ b/res/values-cs/wellbeing_strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="duration_less_than_one_minute">Méně než 1 minuta</string>
+ <string name="screen_time_summary_usage_today">Dnes %1$s</string>
+ </resources>
diff --git a/res/values-da/aosp_strings.xml b/res/values-da/aosp_strings.xml
new file mode 100644
index 0000000..256a5c7
--- /dev/null
+++ b/res/values-da/aosp_strings.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <!-- Strings for face unlock enrollment, missing from AOSP-->
+ <string name="aosp_security_settings_face_enroll_education_message">På den næste skærm skal du dreje hovedet, så dit ansigt scannes fra alle vinkler</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_expanded">Hvis du er synshæmmet, eller dit hoved er bevægelseshæmmet, er dette den nemmeste måde at konfigurere ansigtslås på. Når du bruger ansigtslås, skal dit hoved muligvis være mere lige ud for din telefon.</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_diversity">Brug hjælpefunktionen til ansigtslås</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_vision">Kræver, at du holder øjnene åbne</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_0">Briller eller solbriller med lyse glas accepteres.</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_1">"De data, der registreres af ansigtslås, gemmes sikkert på din telefon og ingen andre steder. Du kan til enhver tid slette dataene i indstillingerne.\n\nDin telefon vil af og til bruge dine seneste billeder fra ansigtslås til at forbedre ansigtsmodeller."</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_2">"Du kan komme til at låse telefonen op, hvis du kigger på den. Din telefon kan låses op af en anden, hvis den holdes op foran dit ansigt.\n\nUnder Indstillinger kan du angive, at dine øjne skal være åbne for at låse telefonen op."</string>
+<string name="aosp_security_settings_face_enroll_introduction_footer_part_2_attention_not_supported">"Du kan komme til at låse telefonen op, hvis du kigger på den.\n\nDin telefon kan blive låst op af en anden, hvis den holdes op foran dit ansigt, også selvom dine øjne er lukkede."</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_3">Din telefon kan låses op af en anden, der ligner dig meget, f.eks. en identisk bror eller søster.</string>
+</resources>
diff --git a/res/values-da/google_strings.xml b/res/values-da/google_strings.xml
new file mode 100644
index 0000000..1fe1de2
--- /dev/null
+++ b/res/values-da/google_strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="battery_tip_smart_battery_summary_custom">Aktivér Selvjusterende batteri</string>
+ <string name="smart_battery_footer_custom">"Selvjusterende batteri begrænser batteriforbruget for sjældent brugte app, så batteritiden forlænges. Din telefon lærer løbende, hvordan du bruger apps.
+
+Notifikationer fra disse apps kan være forsinkede."</string>
+ <string name="smart_battery_manager_title_custom">Selvjusterende batteri</string>
+ <string name="smart_battery_title_custom">Brug Selvjusterende batteri</string>
+ </resources>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 04bdd5b..4a42beb 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -2677,9 +2677,6 @@
<string name="user_credentials" msgid="4044405430790970775">"Brugerloginoplysninger"</string>
<string name="user_credentials_summary" msgid="686471637627271856">"Se og rediger gemte loginoplysninger"</string>
<string name="advanced_security_title" msgid="7117581975877192652">"Avanceret"</string>
- <string name="credential_storage_type" msgid="930861336971619888">"Lagertype"</string>
- <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Hardwarebaseret"</string>
- <string name="credential_storage_type_software" msgid="4786996040468294626">"Kun software"</string>
<string name="credentials_settings_not_available" msgid="7433088409177429600">"Loginoplysningerne for denne bruger er ikke tilgængelige"</string>
<string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Installeret til VPN og apps"</string>
<string name="credential_for_wifi" msgid="1963335263280604998">"Installeret til Wi-Fi"</string>
diff --git a/res/values-da/wellbeing_strings.xml b/res/values-da/wellbeing_strings.xml
new file mode 100644
index 0000000..619d52b
--- /dev/null
+++ b/res/values-da/wellbeing_strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="duration_less_than_one_minute">Mindre end 1 minut</string>
+ <string name="screen_time_summary_usage_today">%1$s i dag</string>
+ </resources>
diff --git a/res/values-de/aosp_strings.xml b/res/values-de/aosp_strings.xml
new file mode 100644
index 0000000..c4dc6c7
--- /dev/null
+++ b/res/values-de/aosp_strings.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <!-- Strings for face unlock enrollment, missing from AOSP-->
+ <string name="aosp_security_settings_face_enroll_education_message">Auf dem nächsten Bildschirm wirst du aufgefordert, deinen Kopf zu drehen, um dein Gesicht aus allen Blickwinkeln aufzunehmen</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_expanded">Sollte dein Sehvermögen oder deine Kopfbeweglichkeit eingeschränkt sein, lässt sich Face Unlock mit dieser Option leichter einrichten. Wenn du Face Unlock verwendest, muss sich dein Kopf möglicherweise noch direkter vor dem Smartphone befinden.</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_diversity">Vereinfachte Methode für Face Unlock-Einrichtung verwenden</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_vision">Augen müssen geöffnet sein</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_0">Eine Korrekturbrille oder eine leicht getönte Sonnenbrille sind in Ordnung.</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_1">"Die von Face Unlock aufgezeichneten Daten werden sicher und ausschließlich auf deinem Smartphone gespeichert. Du kannst deine Daten jederzeit in den Einstellungen löschen.\n\nDein Smartphone verwendet gelegentlich deine neuesten Face Unlock-Bilder, um die Erstellung von Gesichtsmodellen zu verbessern."</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_2">"Es kann passieren, dass das Smartphone unbeabsichtigt entsperrt wird, wenn du auf das Gerät blickst. Eine andere Person kann dein Smartphone dadurch entsperren, dass sie es vor dein Gesicht hält.\n\nDu kannst in den Einstellungen festlegen, dass deine Augen zum Entsperren geöffnet sein müssen."</string>
+<string name="aosp_security_settings_face_enroll_introduction_footer_part_2_attention_not_supported">"Es kann passieren, dass das Smartphone unbeabsichtigt entsperrt wird, wenn du auf das Gerät blickst.\n\nEine andere Person kann dein Smartphone dadurch entsperren, dass sie es vor dein Gesicht hält, auch wenn deine Augen geschlossen sind."</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_3">Dein Smartphone kann eventuell auch von jemandem entsperrt werden, der dir sehr ähnlich sieht, beispielsweise einem eineiigen Zwilling.</string>
+</resources>
diff --git a/res/values-de/config.xml b/res/values-de/config.xml
index 6b1e0fb..e0ba348 100644
--- a/res/values-de/config.xml
+++ b/res/values-de/config.xml
@@ -17,4 +17,5 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="config_backup_settings_label" msgid="1623475653989899715"></string>
+ <bool name="language_capitalizes_nouns">true</bool>
</resources>
diff --git a/res/values-de/google_strings.xml b/res/values-de/google_strings.xml
new file mode 100644
index 0000000..8ed63ce
--- /dev/null
+++ b/res/values-de/google_strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="battery_tip_smart_battery_summary_custom">Funktion \"Intelligenter Akku\" aktivieren</string>
+ <string name="smart_battery_footer_custom">"Um die Akkulaufzeit zu verlängern, schränkt die Funktion \"Intelligenter Akku\" die Akkunutzung für selten verwendete Apps ein. Dein Smartphone lernt mit der Zeit, wie du deine Apps nutzt.
+
+Benachrichtigungen werden für die entsprechenden Apps eventuell verzögert angezeigt."</string>
+ <string name="smart_battery_manager_title_custom">Intelligenter Akku</string>
+ <string name="smart_battery_title_custom">Funktion \"Intelligenter Akku\" verwenden</string>
+ </resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index a0ae971..e647cfb 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -2678,9 +2678,6 @@
<string name="user_credentials" msgid="4044405430790970775">"Nutzeranmeldedaten"</string>
<string name="user_credentials_summary" msgid="686471637627271856">"Gespeicherte Anmeldedaten anzeigen und ändern"</string>
<string name="advanced_security_title" msgid="7117581975877192652">"Erweitert"</string>
- <string name="credential_storage_type" msgid="930861336971619888">"Speichertyp"</string>
- <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Hardware-gestützt"</string>
- <string name="credential_storage_type_software" msgid="4786996040468294626">"Nur Software"</string>
<string name="credentials_settings_not_available" msgid="7433088409177429600">"Anmeldedaten sind für diesen Nutzer nicht verfügbar."</string>
<string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Installiert für VPN und Apps"</string>
<string name="credential_for_wifi" msgid="1963335263280604998">"Installiert für WLAN"</string>
diff --git a/res/values-de/wellbeing_strings.xml b/res/values-de/wellbeing_strings.xml
new file mode 100644
index 0000000..756941f
--- /dev/null
+++ b/res/values-de/wellbeing_strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="duration_less_than_one_minute">Weniger als 1 Minute</string>
+ <string name="screen_time_summary_usage_today">%1$s heute</string>
+ </resources>
diff --git a/res/values-el/aosp_strings.xml b/res/values-el/aosp_strings.xml
new file mode 100644
index 0000000..17a8930
--- /dev/null
+++ b/res/values-el/aosp_strings.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <!-- Strings for face unlock enrollment, missing from AOSP-->
+ <string name="aosp_security_settings_face_enroll_education_message">Στην επόμενη οθόνη, περιστρέψτε το κεφάλι σας για να καταγράψετε όλες τις γωνίες του προσώπου.</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_expanded">Εάν έχετε περιορισμένη όραση ή περιορισμένη κινητικότητα κεφαλής, αυτή η επιλογή μπορεί να διευκολύνει τη ρύθμιση του Face Unlock. Όταν χρησιμοποιείτε το Face Unlock, ίσως χρειαστεί το πρόσωπό σας να είναι ακριβώς μπροστά στο τηλέφωνό σας.</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_diversity">Χρήση προσβασιμότητας Face Unlock</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_vision">Να είναι απαραίτητο να έχετε τα μάτια ανοικτά</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_0">Η χρήση γυαλιών όρασης και γυαλιών ηλίου με ελαφριά απόχρωση είναι αποδεκτή.</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_1">"Τα δεδομένα που καταγράφονται από το Face Unlock αποθηκεύονται με ασφάλεια και δεν αποστέλλονται ποτέ εκτός του τηλεφώνου σας. Μπορείτε να διαγράψετε τα δεδομένα σας ανά πάσα στιγμή στις ρυθμίσεις.\n\nΤο τηλέφωνό σας θα χρησιμοποιεί περιστασιακά τις πρόσφατες εικόνες του Face Unlock για τη δημιουργία βελτιωμένων μοντέλων προσώπου."</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_2">"Το τηλέφωνο μπορεί να ξεκλειδώσει όταν το κοιτάτε ακόμη και αν δεν σκοπεύετε να το ξεκλειδώσετε. Κάποιο άλλο άτομο μπορεί να ξεκλειδώσει το τηλέφωνό σας εάν το τηλέφωνο βρίσκεται μπροστά στο πρόσωπό σας.\n\nΜπορείτε να επιλέξετε να απαιτείται τα μάτια σας να είναι ανοιχτά για το ξεκλείδωμα από τις Ρυθμίσεις."</string>
+<string name="aosp_security_settings_face_enroll_introduction_footer_part_2_attention_not_supported">"Το τηλέφωνο μπορεί να ξεκλειδώσει όταν το κοιτάτε ακόμη και αν δεν σκοπεύετε να το ξεκλειδώσετε.\n\nΤο τηλέφωνο μπορεί να ξεκλειδωθεί από κάποιο άλλο άτομο εάν είναι στραμμένο προς το πρόσωπό σας ακόμη και αν τα μάτια σας είναι κλειστά."</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_3">Το τηλέφωνο μπορεί να ξεκλειδωθεί από κάποιο άτομο που σας μοιάζει πολύ, όπως για παράδειγμα, το παιδί σας ή τον δίδυμο αδελφό σας.</string>
+</resources>
diff --git a/res/values-el/google_strings.xml b/res/values-el/google_strings.xml
new file mode 100644
index 0000000..3f27023
--- /dev/null
+++ b/res/values-el/google_strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="battery_tip_smart_battery_summary_custom">Ενεργοποίηση της λειτουργίας \"Προσαρμοστική μπαταρία\"</string>
+ <string name="smart_battery_footer_custom">"Για να επεκτείνει τη διάρκεια ζωής της μπαταρίας, η λειτουργία \"Προσαρμοστική μπαταρία\" περιορίζει την μπαταρία για εφαρμογές που δεν χρησιμοποιούνται συχνά. Το τηλέφωνό σας θα μάθει πώς χρησιμοποιείτε τις εφαρμογές με την πάροδο του χρόνου.
+
+Οι ειδοποιήσεις για αυτές τις εφαρμογές ενδέχεται να εμφανίζονται με καθυστέρηση."</string>
+ <string name="smart_battery_manager_title_custom">Προσαρμοστική μπαταρία</string>
+ <string name="smart_battery_title_custom">Χρήση της λειτουργίας \"Προσαρμοστική μπαταρία\"</string>
+ </resources>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 4880a66..ace503e 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -2677,9 +2677,6 @@
<string name="user_credentials" msgid="4044405430790970775">"Διαπιστευτήρια χρήστη"</string>
<string name="user_credentials_summary" msgid="686471637627271856">"Προβολή και τροποποίηση αποθηκευμένων διαπιστευτηρίων"</string>
<string name="advanced_security_title" msgid="7117581975877192652">"Για προχωρημένους"</string>
- <string name="credential_storage_type" msgid="930861336971619888">"Τύπος αποθήκευσης"</string>
- <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Με υποστήριξη εξοπλισμού"</string>
- <string name="credential_storage_type_software" msgid="4786996040468294626">"Μόνο λογισμικό"</string>
<string name="credentials_settings_not_available" msgid="7433088409177429600">"Τα διαπιστευτήρια δεν είναι διαθέσιμα γι\' αυτόν το χρήστη"</string>
<string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Εγκαταστάθηκε για VPN και εφαρμογές"</string>
<string name="credential_for_wifi" msgid="1963335263280604998">"Εγκαταστάθηκε για Wi-Fi"</string>
diff --git a/res/values-el/wellbeing_strings.xml b/res/values-el/wellbeing_strings.xml
new file mode 100644
index 0000000..4de080e
--- /dev/null
+++ b/res/values-el/wellbeing_strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="duration_less_than_one_minute">Λιγότερο από 1 λεπτό</string>
+ <string name="screen_time_summary_usage_today">%1$s σήμερα</string>
+ </resources>
diff --git a/res/values-en-rAU/aosp_strings.xml b/res/values-en-rAU/aosp_strings.xml
new file mode 100644
index 0000000..29e31d5
--- /dev/null
+++ b/res/values-en-rAU/aosp_strings.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <!-- Strings for face unlock enrollment, missing from AOSP-->
+ <string name="aosp_security_settings_face_enroll_education_message">On the next screen, rotate your head to capture all angles of your face</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_expanded">If you have limited vision or head motion, this option is an easier way to set up face unlock. When using face unlock, your head may need to be more directly in front of your phone.</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_diversity">Use Accessible face unlock</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_vision">Require eyes open</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_0">Glasses or lightly tinted sunglasses are OK.</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_1">"The data recorded by face unlock is stored securely and never leaves your phone. You can delete your data at any time in settings.\n\nYour phone will occasionally use your recent face unlock images to create improved face models."</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_2">"Looking at the phone can unlock it even when you don’t intend to. Your phone can be unlocked by someone else if it’s held up to your face.\n\nYou can require your eyes to be open for unlocking in Settings."</string>
+<string name="aosp_security_settings_face_enroll_introduction_footer_part_2_attention_not_supported">"Looking at the phone can unlock it when you don’t intend to.\n\nYour phone can be unlocked by someone else if it’s held up to your face, even if your eyes are closed."</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_3">Your phone can be unlocked by someone who looks a lot like you, such as an identical sibling.</string>
+</resources>
diff --git a/res/values-en-rAU/google_strings.xml b/res/values-en-rAU/google_strings.xml
new file mode 100644
index 0000000..08e3db6
--- /dev/null
+++ b/res/values-en-rAU/google_strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="battery_tip_smart_battery_summary_custom">Turn on Adaptive Battery</string>
+ <string name="smart_battery_footer_custom">"To extend battery life, Adaptive Battery limits battery for infrequently used apps. Your phone will learn how you use apps over time.
+
+Notifications may be delayed for these apps."</string>
+ <string name="smart_battery_manager_title_custom">Adaptive Battery</string>
+ <string name="smart_battery_title_custom">Use Adaptive Battery</string>
+ </resources>
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index 86b55b1..764d5ce 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -2677,9 +2677,6 @@
<string name="user_credentials" msgid="4044405430790970775">"User credentials"</string>
<string name="user_credentials_summary" msgid="686471637627271856">"View and modify stored credentials"</string>
<string name="advanced_security_title" msgid="7117581975877192652">"Advanced"</string>
- <string name="credential_storage_type" msgid="930861336971619888">"Storage type"</string>
- <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Hardware-backed"</string>
- <string name="credential_storage_type_software" msgid="4786996040468294626">"Software only"</string>
<string name="credentials_settings_not_available" msgid="7433088409177429600">"Credentials are not available for this user"</string>
<string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Installed for VPN and apps"</string>
<string name="credential_for_wifi" msgid="1963335263280604998">"Installed for Wi-Fi"</string>
diff --git a/res/values-en-rAU/wellbeing_strings.xml b/res/values-en-rAU/wellbeing_strings.xml
new file mode 100644
index 0000000..3e522dd
--- /dev/null
+++ b/res/values-en-rAU/wellbeing_strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="duration_less_than_one_minute">Less than 1 minute</string>
+ <string name="screen_time_summary_usage_today">%1$s today</string>
+ </resources>
diff --git a/res/values-en-rCA/aosp_strings.xml b/res/values-en-rCA/aosp_strings.xml
new file mode 100644
index 0000000..29e31d5
--- /dev/null
+++ b/res/values-en-rCA/aosp_strings.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <!-- Strings for face unlock enrollment, missing from AOSP-->
+ <string name="aosp_security_settings_face_enroll_education_message">On the next screen, rotate your head to capture all angles of your face</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_expanded">If you have limited vision or head motion, this option is an easier way to set up face unlock. When using face unlock, your head may need to be more directly in front of your phone.</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_diversity">Use Accessible face unlock</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_vision">Require eyes open</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_0">Glasses or lightly tinted sunglasses are OK.</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_1">"The data recorded by face unlock is stored securely and never leaves your phone. You can delete your data at any time in settings.\n\nYour phone will occasionally use your recent face unlock images to create improved face models."</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_2">"Looking at the phone can unlock it even when you don’t intend to. Your phone can be unlocked by someone else if it’s held up to your face.\n\nYou can require your eyes to be open for unlocking in Settings."</string>
+<string name="aosp_security_settings_face_enroll_introduction_footer_part_2_attention_not_supported">"Looking at the phone can unlock it when you don’t intend to.\n\nYour phone can be unlocked by someone else if it’s held up to your face, even if your eyes are closed."</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_3">Your phone can be unlocked by someone who looks a lot like you, such as an identical sibling.</string>
+</resources>
diff --git a/res/values-en-rCA/google_strings.xml b/res/values-en-rCA/google_strings.xml
new file mode 100644
index 0000000..08e3db6
--- /dev/null
+++ b/res/values-en-rCA/google_strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="battery_tip_smart_battery_summary_custom">Turn on Adaptive Battery</string>
+ <string name="smart_battery_footer_custom">"To extend battery life, Adaptive Battery limits battery for infrequently used apps. Your phone will learn how you use apps over time.
+
+Notifications may be delayed for these apps."</string>
+ <string name="smart_battery_manager_title_custom">Adaptive Battery</string>
+ <string name="smart_battery_title_custom">Use Adaptive Battery</string>
+ </resources>
diff --git a/res/values-en-rCA/strings.xml b/res/values-en-rCA/strings.xml
index a54b73d..6881668 100644
--- a/res/values-en-rCA/strings.xml
+++ b/res/values-en-rCA/strings.xml
@@ -2677,9 +2677,6 @@
<string name="user_credentials" msgid="4044405430790970775">"User credentials"</string>
<string name="user_credentials_summary" msgid="686471637627271856">"View and modify stored credentials"</string>
<string name="advanced_security_title" msgid="7117581975877192652">"Advanced"</string>
- <string name="credential_storage_type" msgid="930861336971619888">"Storage type"</string>
- <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Hardware-backed"</string>
- <string name="credential_storage_type_software" msgid="4786996040468294626">"Software only"</string>
<string name="credentials_settings_not_available" msgid="7433088409177429600">"Credentials are not available for this user"</string>
<string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Installed for VPN and apps"</string>
<string name="credential_for_wifi" msgid="1963335263280604998">"Installed for Wi-Fi"</string>
diff --git a/res/values-en-rCA/wellbeing_strings.xml b/res/values-en-rCA/wellbeing_strings.xml
new file mode 100644
index 0000000..3e522dd
--- /dev/null
+++ b/res/values-en-rCA/wellbeing_strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="duration_less_than_one_minute">Less than 1 minute</string>
+ <string name="screen_time_summary_usage_today">%1$s today</string>
+ </resources>
diff --git a/res/values-en-rGB/aosp_strings.xml b/res/values-en-rGB/aosp_strings.xml
new file mode 100644
index 0000000..29e31d5
--- /dev/null
+++ b/res/values-en-rGB/aosp_strings.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <!-- Strings for face unlock enrollment, missing from AOSP-->
+ <string name="aosp_security_settings_face_enroll_education_message">On the next screen, rotate your head to capture all angles of your face</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_expanded">If you have limited vision or head motion, this option is an easier way to set up face unlock. When using face unlock, your head may need to be more directly in front of your phone.</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_diversity">Use Accessible face unlock</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_vision">Require eyes open</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_0">Glasses or lightly tinted sunglasses are OK.</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_1">"The data recorded by face unlock is stored securely and never leaves your phone. You can delete your data at any time in settings.\n\nYour phone will occasionally use your recent face unlock images to create improved face models."</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_2">"Looking at the phone can unlock it even when you don’t intend to. Your phone can be unlocked by someone else if it’s held up to your face.\n\nYou can require your eyes to be open for unlocking in Settings."</string>
+<string name="aosp_security_settings_face_enroll_introduction_footer_part_2_attention_not_supported">"Looking at the phone can unlock it when you don’t intend to.\n\nYour phone can be unlocked by someone else if it’s held up to your face, even if your eyes are closed."</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_3">Your phone can be unlocked by someone who looks a lot like you, such as an identical sibling.</string>
+</resources>
diff --git a/res/values-en-rGB/google_strings.xml b/res/values-en-rGB/google_strings.xml
new file mode 100644
index 0000000..08e3db6
--- /dev/null
+++ b/res/values-en-rGB/google_strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="battery_tip_smart_battery_summary_custom">Turn on Adaptive Battery</string>
+ <string name="smart_battery_footer_custom">"To extend battery life, Adaptive Battery limits battery for infrequently used apps. Your phone will learn how you use apps over time.
+
+Notifications may be delayed for these apps."</string>
+ <string name="smart_battery_manager_title_custom">Adaptive Battery</string>
+ <string name="smart_battery_title_custom">Use Adaptive Battery</string>
+ </resources>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 6e72958..8bd44f8 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -2677,9 +2677,6 @@
<string name="user_credentials" msgid="4044405430790970775">"User credentials"</string>
<string name="user_credentials_summary" msgid="686471637627271856">"View and modify stored credentials"</string>
<string name="advanced_security_title" msgid="7117581975877192652">"Advanced"</string>
- <string name="credential_storage_type" msgid="930861336971619888">"Storage type"</string>
- <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Hardware-backed"</string>
- <string name="credential_storage_type_software" msgid="4786996040468294626">"Software only"</string>
<string name="credentials_settings_not_available" msgid="7433088409177429600">"Credentials are not available for this user"</string>
<string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Installed for VPN and apps"</string>
<string name="credential_for_wifi" msgid="1963335263280604998">"Installed for Wi-Fi"</string>
diff --git a/res/values-en-rGB/wellbeing_strings.xml b/res/values-en-rGB/wellbeing_strings.xml
new file mode 100644
index 0000000..3e522dd
--- /dev/null
+++ b/res/values-en-rGB/wellbeing_strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="duration_less_than_one_minute">Less than 1 minute</string>
+ <string name="screen_time_summary_usage_today">%1$s today</string>
+ </resources>
diff --git a/res/values-en-rIN/aosp_strings.xml b/res/values-en-rIN/aosp_strings.xml
new file mode 100644
index 0000000..29e31d5
--- /dev/null
+++ b/res/values-en-rIN/aosp_strings.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <!-- Strings for face unlock enrollment, missing from AOSP-->
+ <string name="aosp_security_settings_face_enroll_education_message">On the next screen, rotate your head to capture all angles of your face</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_expanded">If you have limited vision or head motion, this option is an easier way to set up face unlock. When using face unlock, your head may need to be more directly in front of your phone.</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_diversity">Use Accessible face unlock</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_vision">Require eyes open</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_0">Glasses or lightly tinted sunglasses are OK.</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_1">"The data recorded by face unlock is stored securely and never leaves your phone. You can delete your data at any time in settings.\n\nYour phone will occasionally use your recent face unlock images to create improved face models."</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_2">"Looking at the phone can unlock it even when you don’t intend to. Your phone can be unlocked by someone else if it’s held up to your face.\n\nYou can require your eyes to be open for unlocking in Settings."</string>
+<string name="aosp_security_settings_face_enroll_introduction_footer_part_2_attention_not_supported">"Looking at the phone can unlock it when you don’t intend to.\n\nYour phone can be unlocked by someone else if it’s held up to your face, even if your eyes are closed."</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_3">Your phone can be unlocked by someone who looks a lot like you, such as an identical sibling.</string>
+</resources>
diff --git a/res/values-en-rIN/google_strings.xml b/res/values-en-rIN/google_strings.xml
new file mode 100644
index 0000000..08e3db6
--- /dev/null
+++ b/res/values-en-rIN/google_strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="battery_tip_smart_battery_summary_custom">Turn on Adaptive Battery</string>
+ <string name="smart_battery_footer_custom">"To extend battery life, Adaptive Battery limits battery for infrequently used apps. Your phone will learn how you use apps over time.
+
+Notifications may be delayed for these apps."</string>
+ <string name="smart_battery_manager_title_custom">Adaptive Battery</string>
+ <string name="smart_battery_title_custom">Use Adaptive Battery</string>
+ </resources>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index 749dee5..ae968d7 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -2677,9 +2677,6 @@
<string name="user_credentials" msgid="4044405430790970775">"User credentials"</string>
<string name="user_credentials_summary" msgid="686471637627271856">"View and modify stored credentials"</string>
<string name="advanced_security_title" msgid="7117581975877192652">"Advanced"</string>
- <string name="credential_storage_type" msgid="930861336971619888">"Storage type"</string>
- <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Hardware-backed"</string>
- <string name="credential_storage_type_software" msgid="4786996040468294626">"Software only"</string>
<string name="credentials_settings_not_available" msgid="7433088409177429600">"Credentials are not available for this user"</string>
<string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Installed for VPN and apps"</string>
<string name="credential_for_wifi" msgid="1963335263280604998">"Installed for Wi-Fi"</string>
diff --git a/res/values-en-rIN/wellbeing_strings.xml b/res/values-en-rIN/wellbeing_strings.xml
new file mode 100644
index 0000000..3e522dd
--- /dev/null
+++ b/res/values-en-rIN/wellbeing_strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="duration_less_than_one_minute">Less than 1 minute</string>
+ <string name="screen_time_summary_usage_today">%1$s today</string>
+ </resources>
diff --git a/res/values-en-rXA/google_strings.xml b/res/values-en-rXA/google_strings.xml
new file mode 100644
index 0000000..3f6b70a
--- /dev/null
+++ b/res/values-en-rXA/google_strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="battery_tip_smart_battery_summary_custom">[Ţûŕñ öñ βåţţéŕý Ḿåñåĝéŕ one two three]</string>
+ <string name="smart_battery_footer_custom">[Ŵĥéñ βåţţéŕý Ḿåñåĝéŕ ðéţéçţš ţĥåţ åþþš åŕé ðŕåîñîñĝ ɓåţţéŕý, ýöû’ļļ ĥåVé ţĥé öþţîöñ ţö ŕéšţŕîçţ ţĥéšé åþþš. Ŕéšţŕîçţéð åþþš ḿåý ñöţ ŵöŕķ þŕöþéŕļý åñð ñöţîƒîçåţîöñš ḿåý ɓé ðéļåýéð. one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen sixteen seventeen nineteen twenty one two three four five six seven eight nine ten eleven twelve]</string>
+ <string name="smart_battery_manager_title_custom">[βåţţéŕý Ḿåñåĝéŕ one two three]</string>
+ <string name="smart_battery_title_custom">[Ḿåñåĝé åþþš åûţöḿåţîçåļļý one two three]</string>
+ </resources>
diff --git a/res/values-en-rXA/wellbeing_strings.xml b/res/values-en-rXA/wellbeing_strings.xml
new file mode 100644
index 0000000..95b9db2
--- /dev/null
+++ b/res/values-en-rXA/wellbeing_strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="duration_less_than_one_minute">[Ļéšš ţĥåñ 1 ḿîñûţé one two three]</string>
+ <string name="screen_time_summary_usage_today">[%1$s ţöðåý one two]</string>
+ </resources>
diff --git a/res/values-en-rXC/strings.xml b/res/values-en-rXC/strings.xml
index e70a5cf..e51f2e9 100644
--- a/res/values-en-rXC/strings.xml
+++ b/res/values-en-rXC/strings.xml
@@ -2677,9 +2677,6 @@
<string name="user_credentials" msgid="4044405430790970775">"User credentials"</string>
<string name="user_credentials_summary" msgid="686471637627271856">"View and modify stored credentials"</string>
<string name="advanced_security_title" msgid="7117581975877192652">"Advanced"</string>
- <string name="credential_storage_type" msgid="930861336971619888">"Storage type"</string>
- <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Hardware-backed"</string>
- <string name="credential_storage_type_software" msgid="4786996040468294626">"Software only"</string>
<string name="credentials_settings_not_available" msgid="7433088409177429600">"Credentials are not available for this user"</string>
<string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Installed for VPN and apps"</string>
<string name="credential_for_wifi" msgid="1963335263280604998">"Installed for Wi-Fi"</string>
diff --git a/res/values-es-rUS/aosp_strings.xml b/res/values-es-rUS/aosp_strings.xml
new file mode 100644
index 0000000..97d8782
--- /dev/null
+++ b/res/values-es-rUS/aosp_strings.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <!-- Strings for face unlock enrollment, missing from AOSP-->
+ <string name="aosp_security_settings_face_enroll_education_message">En la pantalla siguiente, gira la cabeza para que se capturen todos los ángulos de tu rostro</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_expanded">Si tu visión es limitada o tienes poca movilidad en la cabeza, esta opción es una forma más sencilla de configurar el desbloqueo facial. Si utilizas esa función, es posible que debas colocar la cabeza enfrente del teléfono de forma más directa.</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_diversity">Usar desbloqueo facial con accesibilidad</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_vision">Es necesario mantener los ojos abiertos</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_0">Funciona aunque uses lentes o lentes de sol claros.</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_1">"Los datos que registra el desbloqueo facial se guardan en un lugar seguro de tu teléfono. Puedes borrarlos cuando quieras en la configuración.\n\nA veces, tu teléfono usará las imágenes recientes del desbloqueo facial para crear mejores modelos de rostro."</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_2">"Mirar el teléfono puede desbloquearlo aunque no lo desees. Un tercero puede desbloquear el teléfono si lo sostiene frente a tu rostro.\n\nPuedes configurar el bloqueo con los ojos abiertos en Configuración."</string>
+<string name="aosp_security_settings_face_enroll_introduction_footer_part_2_attention_not_supported">"Mirar el teléfono puede desbloquearlo aunque no lo desees.\n\nUn tercero puede desbloquear el teléfono si lo sostiene frente a tu rostro, incluso aunque tengas los ojos cerrados."</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_3">Es posible que una persona que se parezca mucho a ti, como un hermano gemelo, pueda desbloquear el teléfono.</string>
+</resources>
diff --git a/res/values-es-rUS/google_strings.xml b/res/values-es-rUS/google_strings.xml
new file mode 100644
index 0000000..f10e5f0
--- /dev/null
+++ b/res/values-es-rUS/google_strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="battery_tip_smart_battery_summary_custom">Activar Batería adaptable</string>
+ <string name="smart_battery_footer_custom">"Para extender la duración de la batería, la función Batería adaptable limita el consumo por parte de las apps que no se usan con frecuencia. Con el tiempo, tu teléfono reconocerá cómo usas las apps.
+
+Es posible que se retrasen las notificaciones de esas apps."</string>
+ <string name="smart_battery_manager_title_custom">Batería adaptable</string>
+ <string name="smart_battery_title_custom">Usar Batería adaptable</string>
+ </resources>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index f11d561..ed96865 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -2677,9 +2677,6 @@
<string name="user_credentials" msgid="4044405430790970775">"Credenciales de usuario"</string>
<string name="user_credentials_summary" msgid="686471637627271856">"Ver y modificar las credenciales guardadas"</string>
<string name="advanced_security_title" msgid="7117581975877192652">"Configuración avanzada"</string>
- <string name="credential_storage_type" msgid="930861336971619888">"Tipo de almacenamiento"</string>
- <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Copia de seguridad en hardware"</string>
- <string name="credential_storage_type_software" msgid="4786996040468294626">"Solo software"</string>
<string name="credentials_settings_not_available" msgid="7433088409177429600">"Las credenciales no están disponibles para este usuario."</string>
<string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Se instaló para redes VPN y apps"</string>
<string name="credential_for_wifi" msgid="1963335263280604998">"Se instaló para redes Wi-Fi"</string>
diff --git a/res/values-es-rUS/wellbeing_strings.xml b/res/values-es-rUS/wellbeing_strings.xml
new file mode 100644
index 0000000..3783ec4
--- /dev/null
+++ b/res/values-es-rUS/wellbeing_strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="duration_less_than_one_minute">Menos de 1 minuto</string>
+ <string name="screen_time_summary_usage_today">%1$s hoy</string>
+ </resources>
diff --git a/res/values-es/aosp_strings.xml b/res/values-es/aosp_strings.xml
new file mode 100644
index 0000000..5dc4a66
--- /dev/null
+++ b/res/values-es/aosp_strings.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <!-- Strings for face unlock enrollment, missing from AOSP-->
+ <string name="aosp_security_settings_face_enroll_education_message">En la siguiente pantalla, gira la cabeza para que se pueda capturar tu cara desde todos los ángulos</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_expanded">Si tu visión es limitada o tienes poca movilidad en la cabeza, esta opción es una forma más sencilla para configurar el desbloqueo facial. Al usar el desbloqueo facial, es posible que debas colocar la cabeza enfrente del teléfono más directamente.</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_diversity">Usar desbloqueo facial con accesibilidad</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_vision">Debes tener los ojos abiertos</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_0">Puedes usar gafas y gafas de sol claras.</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_1">"Los datos registrados por el desbloqueo facial se almacenan de forma segura y únicamente en el teléfono. Puedes borrarlos cuando quieras en Ajustes.\n\nEl teléfono utilizará de vez en cuando imágenes recientes de tu desbloqueo facial para crear mejores modelos faciales."</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_2">"Es posible que el teléfono se desbloquee si lo miras aunque no sea tu intención. Otra persona puede desbloquear el teléfono si lo pone frente a tu cara.\n\nEn Ajustes, puedes configurar esta función para que el teléfono solo se desbloquee cuando tengas los ojos abiertos."</string>
+<string name="aosp_security_settings_face_enroll_introduction_footer_part_2_attention_not_supported">"Es posible que el teléfono se desbloquee si lo miras, aunque no sea tu intención.\n\nOtra persona puede desbloquear el teléfono si lo pone frente a tu cara, incluso si tienes los ojos cerrados."</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_3">Es posible que una persona que se parezca mucho a ti, como un gemelo, pueda desbloquear el teléfono.</string>
+</resources>
diff --git a/res/values-es/google_strings.xml b/res/values-es/google_strings.xml
new file mode 100644
index 0000000..6f27ff1
--- /dev/null
+++ b/res/values-es/google_strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="battery_tip_smart_battery_summary_custom">Activar batería inteligente</string>
+ <string name="smart_battery_footer_custom">"Para aumentar la duración de la batería, el gestor de batería inteligente limita el consumo por parte de aplicaciones que se utilizan con poca frecuencia. Con el tiempo, el teléfono sabrá cómo utilizas las aplicaciones.
+
+Es posible que las notificaciones de estas aplicaciones te lleguen con retraso."</string>
+ <string name="smart_battery_manager_title_custom">Batería inteligente</string>
+ <string name="smart_battery_title_custom">Usar batería inteligente</string>
+ </resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index a660d1b..12d45ed 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -2677,9 +2677,6 @@
<string name="user_credentials" msgid="4044405430790970775">"Credenciales de usuario"</string>
<string name="user_credentials_summary" msgid="686471637627271856">"Consulta y modifica credenciales almacenadas"</string>
<string name="advanced_security_title" msgid="7117581975877192652">"Avanzado"</string>
- <string name="credential_storage_type" msgid="930861336971619888">"Tipo de almacenamiento"</string>
- <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Almacenado en hardware"</string>
- <string name="credential_storage_type_software" msgid="4786996040468294626">"Solo software"</string>
<string name="credentials_settings_not_available" msgid="7433088409177429600">"Las credenciales no están disponibles para este usuario"</string>
<string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Instalada para redes VPN y aplicaciones"</string>
<string name="credential_for_wifi" msgid="1963335263280604998">"Instalada para redes Wi-Fi"</string>
diff --git a/res/values-es/wellbeing_strings.xml b/res/values-es/wellbeing_strings.xml
new file mode 100644
index 0000000..3783ec4
--- /dev/null
+++ b/res/values-es/wellbeing_strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="duration_less_than_one_minute">Menos de 1 minuto</string>
+ <string name="screen_time_summary_usage_today">%1$s hoy</string>
+ </resources>
diff --git a/res/values-et/aosp_strings.xml b/res/values-et/aosp_strings.xml
new file mode 100644
index 0000000..6675609
--- /dev/null
+++ b/res/values-et/aosp_strings.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <!-- Strings for face unlock enrollment, missing from AOSP-->
+ <string name="aosp_security_settings_face_enroll_education_message">Pöörake järgmisel ekraanikuval oma pead, et nägu jäädvustada iga nurga alt</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_expanded">Kui teie nägemine või pea liigutamine on piiratud, on see valik lihtsaim viis Face Unlocki seadistamiseks. Kui kasutate Face Unlocki, peate võib-olla oma pead rohkem otse telefoni ees hoidma.</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_diversity">Kasuta juurdepääsetavuse Face Unlocki</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_vision">Silmad peavad avatud olema</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_0">Prille ja heledama klaasiga päikeseprille tohib kasutada.</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_1">"Face Unlocki salvestatud andmed talletatakse turvaliselt ja neid ei edastata telefonist väljapoole. Seadetes võite oma andmed alati kustutada.\n\nTelefon kasutab aeg-ajalt teie Face Unlocki hiljutisi pilte, et luua paremaid näomudeleid."</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_2">"Telefoni vaatamisel võib see avaneda ka siis, kui te seda ei soovi. Keegi teine võib teie telefoni avada, kui seda hoitakse teie näo ees.\n\nSeadetes saate määrata, et telefoni avamiseks peavad silmad avatud olema."</string>
+<string name="aosp_security_settings_face_enroll_introduction_footer_part_2_attention_not_supported">"Telefoni vaatamisel võib see soovimatult avaneda.\n\nKeegi teine võib teie telefoni avada, kui seda hoitakse teie näo ees. Seda isegi siis, kui teie silmad on suletud."</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_3">Võib juhtuda, et teiega sarnane inimene, näiteks teie identne vend või õde, saab teie telefoni avada.</string>
+</resources>
diff --git a/res/values-et/google_strings.xml b/res/values-et/google_strings.xml
new file mode 100644
index 0000000..f798905
--- /dev/null
+++ b/res/values-et/google_strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="battery_tip_smart_battery_summary_custom">Kohanduva akuhalduri sisselülitamine</string>
+ <string name="smart_battery_footer_custom">"Aku tööea pikendamiseks piirab kohanduv akuhaldur akukasutust harva kasutatavate rakenduste jaoks. Teie telefon õpib aja jooksul, kuidas rakendusi kasutada.
+
+Nende rakenduste märguanded võivad viibida."</string>
+ <string name="smart_battery_manager_title_custom">Kohanduv akuhaldur</string>
+ <string name="smart_battery_title_custom">Kohanduva akuhalduri kasutamine</string>
+ </resources>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index 33d9401..f00bfd1 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -2677,9 +2677,6 @@
<string name="user_credentials" msgid="4044405430790970775">"Kasutaja mandaadid"</string>
<string name="user_credentials_summary" msgid="686471637627271856">"Salvestatud mandaatide vaatamine ja muutmine"</string>
<string name="advanced_security_title" msgid="7117581975877192652">"Täpsemad"</string>
- <string name="credential_storage_type" msgid="930861336971619888">"Salvestusruumi tüüp"</string>
- <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Riistvaratoega"</string>
- <string name="credential_storage_type_software" msgid="4786996040468294626">"Ainult tarkvara"</string>
<string name="credentials_settings_not_available" msgid="7433088409177429600">"Mandaadid pole selle kasutaja jaoks saadaval"</string>
<string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Installitud VPN-i ja rakenduste jaoks"</string>
<string name="credential_for_wifi" msgid="1963335263280604998">"Installitud WiFi jaoks"</string>
diff --git a/res/values-et/wellbeing_strings.xml b/res/values-et/wellbeing_strings.xml
new file mode 100644
index 0000000..5f24faa
--- /dev/null
+++ b/res/values-et/wellbeing_strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="duration_less_than_one_minute">Alla ühe minuti</string>
+ <string name="screen_time_summary_usage_today">Täna: %1$s</string>
+ </resources>
diff --git a/res/values-eu/aosp_strings.xml b/res/values-eu/aosp_strings.xml
new file mode 100644
index 0000000..348ae86
--- /dev/null
+++ b/res/values-eu/aosp_strings.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <!-- Strings for face unlock enrollment, missing from AOSP-->
+ <string name="aosp_security_settings_face_enroll_education_message">Hurrengo pantailan, biratu burua aurpegiaren angelu guztiak hauteman daitezen</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_expanded">Ikusmena mugatuta edo buruaren mugimendua murriztuta badaukazu, badago modu errazago bat aurpegiaren bidez desblokeatzeko eginbidea konfiguratzeko. Izan ere, aukera hori erabiltzeko, aurrez aurre ipini behar dira aurpegia eta telefonoa.</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_diversity">Erabili aurpegiaren bidez desblokeatzeko erabilerraztasun-aukera</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_vision">Begiak irekita eduki behar dituzu</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_0">Betaurrekoak jantzita utz daitezke, baita kristalak leunki tindatuta badituzte ere.</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_1">"Aurpegiaren bidez desblokeatzeko eginbideak grabatzen dituen datuak modu seguruan gordetzen dira telefonoan, eta haiek nahi duzunean ezaba ditzakezu ezarpenetan.\n\nNoizean behin, aurpegiaren bidez desblokeatzeko eginbidearen azkenaldiko irudiak erabiliko ditu telefonoak, aurpegi-eredu hobetuak sortzeko."</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_2">"Telefonoari begiratuz gero, baliteke hura desblokeatzea, halako asmorik ez baduzu ere. Beste norbaitek ere desblokea dezake telefonoa, zuri begira jartzen badu.\n\nTelefonoa desblokeatu ahal izateko begiak irekita edukitzeko eskakizuna konfigura dezakezu ezarpenetan."</string>
+<string name="aosp_security_settings_face_enroll_introduction_footer_part_2_attention_not_supported">"Telefonoari begiratuz gero, agian desblokeatu egingo da, halako asmorik ez baduzu ere.\n\nBeste norbaitek ere desblokea dezake telefonoa zuri begira jartzen badu, baita begiak itxita badituzu ere."</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_3">Zure antz handia dutenek ere desblokea dezakete telefonoa; esate baterako, bikiek.</string>
+</resources>
diff --git a/res/values-eu/google_strings.xml b/res/values-eu/google_strings.xml
new file mode 100644
index 0000000..d91cd5c
--- /dev/null
+++ b/res/values-eu/google_strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="battery_tip_smart_battery_summary_custom">Aktibatu bateria doigarria</string>
+ <string name="smart_battery_footer_custom">"Bateriak gehiago iraun dezan, bateria doigarriak mugatu egiten du gutxitan erabiltzen dituzun aplikazioek erabiltzen duten bateria. Denborarekin, aplikazioak nola erabiltzen dituzun ikasiko du telefonoak.
+
+Baliteke aplikazio horietan jakinarazpenak atzeratzea."</string>
+ <string name="smart_battery_manager_title_custom">Bateria doigarria</string>
+ <string name="smart_battery_title_custom">Erabili bateria doigarria</string>
+ </resources>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index 9ace836..132a81d 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -2677,9 +2677,6 @@
<string name="user_credentials" msgid="4044405430790970775">"Erabiltzaile-kredentzialak"</string>
<string name="user_credentials_summary" msgid="686471637627271856">"Ikusi eta aldatu gordetako kredentzialak"</string>
<string name="advanced_security_title" msgid="7117581975877192652">"Aurreratuak"</string>
- <string name="credential_storage_type" msgid="930861336971619888">"Biltegiratze mota"</string>
- <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Hardwarean gordetakoa"</string>
- <string name="credential_storage_type_software" msgid="4786996040468294626">"Softwarean soilik"</string>
<string name="credentials_settings_not_available" msgid="7433088409177429600">"Erabiltzaile honek ez dauka kredentzialik"</string>
<string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"VPN konexioarekin eta aplikazioekin erabiltzeko instalatuta"</string>
<string name="credential_for_wifi" msgid="1963335263280604998">"Wi-Fi konexioarekin erabiltzeko instalatuta"</string>
diff --git a/res/values-eu/wellbeing_strings.xml b/res/values-eu/wellbeing_strings.xml
new file mode 100644
index 0000000..03ab796
--- /dev/null
+++ b/res/values-eu/wellbeing_strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="duration_less_than_one_minute">1 minutu baino gutxiago</string>
+ <string name="screen_time_summary_usage_today">%1$s gaur</string>
+ </resources>
diff --git a/res/values-fa/aosp_strings.xml b/res/values-fa/aosp_strings.xml
new file mode 100644
index 0000000..52cd577
--- /dev/null
+++ b/res/values-fa/aosp_strings.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <!-- Strings for face unlock enrollment, missing from AOSP-->
+ <string name="aosp_security_settings_face_enroll_education_message">در صفحه بعدی، سرتان را بچرخانید تا همه زوایای صورتتان را ثبت کند</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_expanded">اگر دید محدود یا حرکت سر دارید، این گزینه روشی آسانتر برای راهاندازی «بازگشایی با چهره» است. هنگام استفاده از «بازگشایی با چهره»، ممکن است لازم باشد سرتان مستقیم روبروی تلفن قرار گیرد.</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_diversity">استفاده از «بازگشایی با چهره» با خدمات دسترسپذیری</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_vision">به چشمان باز نیاز دارد</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_0">عینک یا عینک دودی با کمی سایهروشن قابل قبول است.</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_1">"دادههایی که «بازگشایی با چهره» ضبط کرده است، بهطور ایمن ذخیره میشود و هرگز از تلفن شما خارج نمیشود. هرزمان خواستید میتوانید دادههایتان را در تنظیمات حذف کنید.\n\nتلفنتان گاهیاوقات از تصاویر جدید «بازگشایی با چهره» برای ایجاد مدلهای چهره بهبودیافته استفاده میکند."</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_2">"نگاه کردن به تلفن میتواند قفل آن را باز کند، حتی اگر چنین قصدی نداشته باشید. هر کسی میتواند با نگه داشتن تلفن در جلوی صورت شما، قفل آن را باز کند.\n\nمیتوانید باز بودن چشم برای باز شدن قفل را در «تنظیمات» الزامی کنید."</string>
+<string name="aosp_security_settings_face_enroll_introduction_footer_part_2_attention_not_supported">"با نگاه کردن به تلفن (حتی اگر نخواهید) ممکن است قفل آن باز شود.\n\nاگر فردی تلفن را جلوی صورت شما بگیرد، ممکن است قفل آن باز شود، حتی اگر چشمانتان بسته باشد."</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_3">فرد دیگری که شباهت زیادی به شما دارد (مثلاً فرزندتان یا خواهر و برادر دوقلویتان) میتواند قفل تلفنتان را باز کند.</string>
+</resources>
diff --git a/res/values-fa/google_strings.xml b/res/values-fa/google_strings.xml
new file mode 100644
index 0000000..bb24043
--- /dev/null
+++ b/res/values-fa/google_strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="battery_tip_smart_battery_summary_custom">«باتری وفقپذیر» را روشن کنید</string>
+ <string name="smart_battery_footer_custom">"برای افزایش ماندگاری شارژ باتری، «باتری وفقپذیر» مصرف باتری برنامههایی را که زیاد استفاده نمیشود محدود میکند. تلفنتان با گذشت زمان نحوه استفاده شما از برنامهها را یاد میگیرد.
+
+ممکن است اعلانهای این برنامهها با تأخیر همراه باشد."</string>
+ <string name="smart_battery_manager_title_custom">باتری وفقپذیر</string>
+ <string name="smart_battery_title_custom">استفاده از باتری وفقپذیر</string>
+ </resources>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 0eef55d..f9e3ed0 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -2677,9 +2677,6 @@
<string name="user_credentials" msgid="4044405430790970775">"اطلاعات کاربری"</string>
<string name="user_credentials_summary" msgid="686471637627271856">"مشاهده و تغییر اطلاعات کاربری ذخیرهشده"</string>
<string name="advanced_security_title" msgid="7117581975877192652">"پیشرفته"</string>
- <string name="credential_storage_type" msgid="930861336971619888">"نوع فضای ذخیرهسازی"</string>
- <string name="credential_storage_type_hardware" msgid="2630040425119817220">"سختافزاری"</string>
- <string name="credential_storage_type_software" msgid="4786996040468294626">"فقط نرمافزاری"</string>
<string name="credentials_settings_not_available" msgid="7433088409177429600">"اطلاعات کاربری این کاربر در دسترس نیست"</string>
<string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"نصبشده برای VPN و برنامهها"</string>
<string name="credential_for_wifi" msgid="1963335263280604998">"نصبشده برای Wi-Fi"</string>
diff --git a/res/values-fa/wellbeing_strings.xml b/res/values-fa/wellbeing_strings.xml
new file mode 100644
index 0000000..b6e8fe8
--- /dev/null
+++ b/res/values-fa/wellbeing_strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="duration_less_than_one_minute">کمتر از ۱ دقیقه</string>
+ <string name="screen_time_summary_usage_today">امروز: %1$s</string>
+ </resources>
diff --git a/res/values-fi/aosp_strings.xml b/res/values-fi/aosp_strings.xml
new file mode 100644
index 0000000..568bb75
--- /dev/null
+++ b/res/values-fi/aosp_strings.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <!-- Strings for face unlock enrollment, missing from AOSP-->
+ <string name="aosp_security_settings_face_enroll_education_message">Seuraavassa kohdassa käännä päätäsi, jotta kasvosi tallentuvat kaikista kuvakulmista.</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_expanded">Jos olet heikkonäköinen tai pääsi liikkuu rajallisesti, tämä on helpompi tapa määrittää Face Unlock. Se voi edellyttää pään sijoittamista suoremmin puhelimen eteen Face Unlockin käytön yhteydessä.</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_diversity">Käytä esteetöntä Face Unlockia</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_vision">Silmien on oltava auki</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_0">Silmälasit tai kevyesti sävytetyt aurinkolasit eivät haittaa.</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_1">"Face Unlockin tallentama data tallennetaan turvallisesti eikä se koskaan poistu puhelimeltasi. Voit poistaa datan milloin tahansa asetuksista.\n\nPuhelin käyttää viimeaikaisia Face Unlock ‑kuvia ajoittain parempien kasvomallien luomiseen."</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_2">"Puhelimen katsominen voi avata sen lukituksen haluamattasi. Joku muu voi avata puhelimesi lukituksen pitämällä sitä kasvojesi edessä.\n\nVoit valita asetuksista, että silmien on oltava auki lukituksen avaamista varten."</string>
+<string name="aosp_security_settings_face_enroll_introduction_footer_part_2_attention_not_supported">"Puhelimen katsominen voi avata sen haluamattasi.\n\nJoku muu voi avata puhelimesi lukituksen pitämällä sitä kasvojesi edessä, vaikka silmäsi ovat kiinni."</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_3">Joku muu voi avata puhelimesi lukituksen, jos hän näyttää sinulta (esim. lapsi tai identtinen kaksonen).</string>
+</resources>
diff --git a/res/values-fi/google_strings.xml b/res/values-fi/google_strings.xml
new file mode 100644
index 0000000..c960e03
--- /dev/null
+++ b/res/values-fi/google_strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="battery_tip_smart_battery_summary_custom">Ota käyttöön mukautuva virta</string>
+ <string name="smart_battery_footer_custom">"Mukautuva virta pidentää akun kestoa rajoittamalla harvoin käytettyjen sovellusten akunkäyttöä. Puhelin oppii, miten käytät sovelluksia.
+
+Rajoitettujen sovellusten ilmoitukset voidaan näyttää viiveellä."</string>
+ <string name="smart_battery_manager_title_custom">Mukautuva virta</string>
+ <string name="smart_battery_title_custom">Käytä mukautuvaa virtaa</string>
+ </resources>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index fe081d4..f8dc226 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -2677,9 +2677,6 @@
<string name="user_credentials" msgid="4044405430790970775">"Käyttäjän kirjautumistiedot"</string>
<string name="user_credentials_summary" msgid="686471637627271856">"Tarkastele ja muokkaa tallennettuja kirjautumistietoja."</string>
<string name="advanced_security_title" msgid="7117581975877192652">"Lisäasetukset"</string>
- <string name="credential_storage_type" msgid="930861336971619888">"Tallennustilan tyyppi"</string>
- <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Laitteiston tukema"</string>
- <string name="credential_storage_type_software" msgid="4786996040468294626">"Vain ohjelmisto"</string>
<string name="credentials_settings_not_available" msgid="7433088409177429600">"Kirjautumistunnukset eivät ole tämän käyttäjän käytettävissä"</string>
<string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Asennettu VPN:ää ja sovelluksia varten"</string>
<string name="credential_for_wifi" msgid="1963335263280604998">"Asennettu Wi-Fiä varten"</string>
diff --git a/res/values-fi/wellbeing_strings.xml b/res/values-fi/wellbeing_strings.xml
new file mode 100644
index 0000000..b68a17a
--- /dev/null
+++ b/res/values-fi/wellbeing_strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="duration_less_than_one_minute">Alle 1 minuutti</string>
+ <string name="screen_time_summary_usage_today">%1$s tänään</string>
+ </resources>
diff --git a/res/values-fr-rCA/aosp_strings.xml b/res/values-fr-rCA/aosp_strings.xml
new file mode 100644
index 0000000..99ab595
--- /dev/null
+++ b/res/values-fr-rCA/aosp_strings.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <!-- Strings for face unlock enrollment, missing from AOSP-->
+ <string name="aosp_security_settings_face_enroll_education_message">"À l'écran suivant, faites pivoter votre tête pour capturer tous les angles de votre visage"</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_expanded">Si vous avez une vision limitée ou que vous ne pouvez pas bouger votre tête facilement, cette option simplifie la configuration du déverrouillage par reconnaissance faciale. Lorsque vous utilisez cette fonction, il se peut que votre tête doive être placée plus directement devant votre téléphone.</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_diversity">"Utiliser les fonctionnalités d'accessibilité pour le déverrouillage par reconnaissance faciale"</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_vision">Les yeux doivent être ouverts</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_0">Le port de lunettes de vue ou de lunettes de soleil légèrement teintées est acceptable.</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_1">"Les données enregistrées pour le déverrouillage par reconnaissance faciale sont stockées en sécurité et ne quittent jamais votre téléphone. Vous pouvez supprimer vos données en tout temps dans les paramètres.\n\nVotre téléphone utilisera à l'occasion vos images récentes de déverrouillage par reconnaissance faciale pour créer des modèles faciaux améliorés."</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_2">"Le téléphone peut être déverrouillé en le regardant, même si ce n'est pas votre intention. Une autre personne pourrait déverrouiller votre téléphone en le tenant devant votre visage.\n\nDans les paramètres, vous pouvez indiquer que vos yeux doivent être ouverts pour déverrouiller l'appareil."</string>
+<string name="aosp_security_settings_face_enroll_introduction_footer_part_2_attention_not_supported">"Le fait de regarder le téléphone pourrait le déverrouiller même si vous ne cherchiez pas à le faire.\n\nUne autre personne pourrait déverrouiller votre téléphone en le tenant devant votre visage, même si vos yeux sont fermés."</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_3">Votre téléphone pourrait être déverrouillé par une personne qui vous ressemble beaucoup, par exemple un jumeau identique.</string>
+</resources>
diff --git a/res/values-fr-rCA/google_strings.xml b/res/values-fr-rCA/google_strings.xml
new file mode 100644
index 0000000..d7e888d
--- /dev/null
+++ b/res/values-fr-rCA/google_strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="battery_tip_smart_battery_summary_custom">Activer le gestionnaire de pile adaptatif</string>
+ <string name="smart_battery_footer_custom">"Pour prolonger l’autonomie de la pile, le gestionnaire de pile adaptatif limite l'utilisation de la pile pour les applications peu utilisées. Votre téléphone apprendra comment vous utilisez les applications au fil du temps.
+
+Il se peut que les notifications soient retardées pour ces applications."</string>
+ <string name="smart_battery_manager_title_custom">Gestionnaire de pile adaptatif</string>
+ <string name="smart_battery_title_custom">Utiliser le gestionnaire de pile adaptatif</string>
+ </resources>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index e211bb2..e3aaf9c 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -2677,9 +2677,6 @@
<string name="user_credentials" msgid="4044405430790970775">"Authentifiants d\'utilisateur"</string>
<string name="user_credentials_summary" msgid="686471637627271856">"Afficher et modifier les authentifiants stockés"</string>
<string name="advanced_security_title" msgid="7117581975877192652">"Avancés"</string>
- <string name="credential_storage_type" msgid="930861336971619888">"Type de stockage"</string>
- <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Intégré au matériel"</string>
- <string name="credential_storage_type_software" msgid="4786996040468294626">"Uniquement logiciel"</string>
<string name="credentials_settings_not_available" msgid="7433088409177429600">"Les identifiants ne sont pas accessibles pour cet utilisateur"</string>
<string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Installé pour le RPV et les applications"</string>
<string name="credential_for_wifi" msgid="1963335263280604998">"Installé pour le Wi-Fi"</string>
diff --git a/res/values-fr-rCA/wellbeing_strings.xml b/res/values-fr-rCA/wellbeing_strings.xml
new file mode 100644
index 0000000..c385e63
--- /dev/null
+++ b/res/values-fr-rCA/wellbeing_strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="duration_less_than_one_minute">Moins d\'une minute</string>
+ <string name="screen_time_summary_usage_today">%1$s aujourd\'hui</string>
+ </resources>
diff --git a/res/values-fr/aosp_strings.xml b/res/values-fr/aosp_strings.xml
new file mode 100644
index 0000000..66dbe20
--- /dev/null
+++ b/res/values-fr/aosp_strings.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <!-- Strings for face unlock enrollment, missing from AOSP-->
+ <string name="aosp_security_settings_face_enroll_education_message">"À l'écran suivant, tournez votre tête pour enregistrer votre visage sous tous les angles"</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_expanded">Si votre vision ou la mobilité de votre tête sont réduites, cette option vous permet de configurer plus facilement Face Unlock. Lorsque vous utiliserez Face Unlock, vous devrez peut-être placer votre visage plus en face de votre téléphone.</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_diversity">"Utiliser Face Unlock avec l'option Accessibilité"</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_vision">Les yeux doivent rester ouverts</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_0">Le port de lunettes de vue ou de lunettes de soleil légèrement teintées ne pose pas de problème.</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_1">"Les données enregistrées par Face Unlock sont stockées en permanence et en toute sécurité sur votre téléphone. Vous pouvez les supprimer à tout moment dans les paramètres.\n\nVotre téléphone utilisera à l'occasion vos images Face Unlock récentes pour créer des empreintes faciales améliorées."</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_2">"Vous pouvez déverrouiller votre téléphone sans le vouloir, simplement en le regardant. Quelqu'un d'autre peut également le déverrouiller en le tenant devant votre visage.\n\nDans les paramètres, vous pouvez indiquer que vos yeux doivent être ouverts pour déverrouiller l'appareil."</string>
+<string name="aosp_security_settings_face_enroll_introduction_footer_part_2_attention_not_supported">"Vous pouvez déverrouiller votre téléphone sans le vouloir, simplement en le regardant.\n\nQuelqu'un d'autre peut également le déverrouiller en le tenant devant votre visage, même si vous avez les yeux fermés."</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_3">Toute personne qui vous ressemble beaucoup, par exemple un frère ou une sœur ayant les mêmes traits que vous, peut déverrouiller votre téléphone.</string>
+</resources>
diff --git a/res/values-fr/google_strings.xml b/res/values-fr/google_strings.xml
new file mode 100644
index 0000000..7b975da
--- /dev/null
+++ b/res/values-fr/google_strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="battery_tip_smart_battery_summary_custom">Activer la batterie intelligente</string>
+ <string name="smart_battery_footer_custom">"Afin de prolonger l'autonomie de la batterie, la fonctionnalité Batterie intelligente limite l'utilisation de la batterie pour les applications peu utilisées. Au fil du temps, votre téléphone mémorisera vos habitudes d'utilisation.
+
+Vous ne recevrez peut-être pas immédiatement les notifications de ces applications."</string>
+ <string name="smart_battery_manager_title_custom">Batterie intelligente</string>
+ <string name="smart_battery_title_custom">Utiliser la batterie intelligente</string>
+ </resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index b3815f6..93d75b2 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -2677,9 +2677,6 @@
<string name="user_credentials" msgid="4044405430790970775">"Identifiants de l\'utilisateur"</string>
<string name="user_credentials_summary" msgid="686471637627271856">"Afficher et modifier les identifiants enregistrés"</string>
<string name="advanced_security_title" msgid="7117581975877192652">"Paramètres avancés"</string>
- <string name="credential_storage_type" msgid="930861336971619888">"Type de stockage"</string>
- <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Intégré au matériel"</string>
- <string name="credential_storage_type_software" msgid="4786996040468294626">"Uniquement logiciel"</string>
<string name="credentials_settings_not_available" msgid="7433088409177429600">"Les identifiants ne sont pas disponibles pour cet utilisateur."</string>
<string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Installé pour le VPN et les applications"</string>
<string name="credential_for_wifi" msgid="1963335263280604998">"Installé pour le Wi-Fi"</string>
diff --git a/res/values-fr/wellbeing_strings.xml b/res/values-fr/wellbeing_strings.xml
new file mode 100644
index 0000000..c385e63
--- /dev/null
+++ b/res/values-fr/wellbeing_strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="duration_less_than_one_minute">Moins d\'une minute</string>
+ <string name="screen_time_summary_usage_today">%1$s aujourd\'hui</string>
+ </resources>
diff --git a/res/values-gl/aosp_strings.xml b/res/values-gl/aosp_strings.xml
new file mode 100644
index 0000000..bcdbd8f
--- /dev/null
+++ b/res/values-gl/aosp_strings.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <!-- Strings for face unlock enrollment, missing from AOSP-->
+ <string name="aosp_security_settings_face_enroll_education_message">Na seguinte pantalla, xira a cabeza para capturar todos os ángulos da túa cara</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_expanded">Se a túa visión é limitada ou tes pouca mobilidade na cabeza, esta opción permite configurar o desbloqueo facial de forma máis fácil. Ao utilizar o desbloqueo facial, é posible que teñas que colocar a cabeza máis directamente en fronte do teléfono.</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_diversity">Usar desbloqueo facial accesible</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_vision">É necesario abrir os ollos</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_0">As lentes e as lentes de sol que non sexan moi escuras non supoñen ningún problema.</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_1">"Os datos gravados polo desbloqueo facial almacénanse de forma segura e nunca saen do teu teléfono. Podes eliminalos en calquera momento na configuración.\n\nO teu teléfono utilizará ocasionalmente as túas imaxes recentes do desbloqueo facial para crear modelos faciais mellorados."</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_2">"Ao mirar o teléfono, podes desbloquealo sen querer. Outra persoa pode desbloquealo se che pon o teléfono diante da cara.\n\nEn Configuración podes axustalo para que só se desbloquee se tes os ollos abertos."</string>
+<string name="aosp_security_settings_face_enroll_introduction_footer_part_2_attention_not_supported">"Ao mirar o teléfono, podes desbloquealo sen querer.\n\nOutra persoa pode desbloquealo se che pon o teléfono diante da cara, aínda que teñas os ollos pechados."</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_3">Alguén que se pareza moito a ti, como un xemelgo, pode desbloquear o teu teléfono.</string>
+</resources>
diff --git a/res/values-gl/google_strings.xml b/res/values-gl/google_strings.xml
new file mode 100644
index 0000000..cddf093
--- /dev/null
+++ b/res/values-gl/google_strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="battery_tip_smart_battery_summary_custom">Activa a batería automática</string>
+ <string name="smart_battery_footer_custom">"Para aumentar a duración da batería, a batería automática limita o consumo das aplicacións que se utilizan con pouca frecuencia. Co paso do tempo, o teléfono saberá como utilizas as aplicacións.
+
+É posible que as notificacións destas aplicacións se atrasen."</string>
+ <string name="smart_battery_manager_title_custom">Batería automática</string>
+ <string name="smart_battery_title_custom">Usar batería automática</string>
+ </resources>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index 7d990d2..71b81a1 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -2677,9 +2677,6 @@
<string name="user_credentials" msgid="4044405430790970775">"Credenciais do usuario"</string>
<string name="user_credentials_summary" msgid="686471637627271856">"Mostra e modifica as credenciais almacenadas"</string>
<string name="advanced_security_title" msgid="7117581975877192652">"Configuración avanzada"</string>
- <string name="credential_storage_type" msgid="930861336971619888">"Tipo de almacenamento"</string>
- <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Almacenado en hardware"</string>
- <string name="credential_storage_type_software" msgid="4786996040468294626">"Só software"</string>
<string name="credentials_settings_not_available" msgid="7433088409177429600">"As credenciais non están dispoñibles para este usuario"</string>
<string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Instalada para a VPN e as aplicacións"</string>
<string name="credential_for_wifi" msgid="1963335263280604998">"Instalada para a wifi"</string>
diff --git a/res/values-gl/wellbeing_strings.xml b/res/values-gl/wellbeing_strings.xml
new file mode 100644
index 0000000..521cfd5
--- /dev/null
+++ b/res/values-gl/wellbeing_strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="duration_less_than_one_minute">Menos de 1 minuto</string>
+ <string name="screen_time_summary_usage_today">%1$s hoxe</string>
+ </resources>
diff --git a/res/values-gu/aosp_strings.xml b/res/values-gu/aosp_strings.xml
new file mode 100644
index 0000000..66ff4ce
--- /dev/null
+++ b/res/values-gu/aosp_strings.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <!-- Strings for face unlock enrollment, missing from AOSP-->
+ <string name="aosp_security_settings_face_enroll_education_message">આગલી સ્ક્રીનમાં, તમારા ચહેરાને બધા ખૂણેથી કૅપ્ચર કરવા માટે તમારું માથું ફેરવો</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_expanded">જો તમારી પાસે મર્યાદિત દૃષ્ટિ અથવા માથાની હિલચાલ હોય, તો આ વિકલ્પ એ ફેસ અનલૉકનું સેટઅપ કરવા માટેની વધુ સરળ રીત છે. ફેસ અનલૉકનો ઉપયોગ કરતી વખતે, તમારું માથું સીધું જ તમારા ફોનની બિલકુલ સામે રાખવાની જરૂર પડી શકે છે.</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_diversity">ઍક્સેસિબિલિટી ફેસ અનલૉકનો ઉપયોગ કરો</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_vision">આંખો ખુલ્લી હોવી જરૂરી છે</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_0">ચશ્મા અથવા હળવા ટિન્ટેડ સનગ્લાસ યોગ્ય છે.</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_1">"ફેસ અનલૉક વડે રેકૉર્ડ થયેલો ડેટા સુરક્ષિત રીતે સ્ટોર કરવામાં આવે છે અને હંમેશાં તમારા ફોનમાં જ રહે છે. તમે સેટિંગમાં જઈને ડેટાને કોઈપણ સમયે ડિલીટ કરી શકો છો.\n\nચહેરાનાં વધુ સારા મૉડલ બનાવવા માટે તમારો ફોન સમય-સમય પર તમારી તાજેતરની ફેસ અનલૉક છબીઓનો ઉપયોગ કરશે."</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_2">"જ્યારે તમે તમારો ફોન અનલૉક કરવાનો ઇરાદો ધરાવતા ન હો ત્યારે પણ ફોનની સામે જોવાથી તે અનલૉક થઈ શકે છે. જો તમારા ફોનને તમારા ચહેરાની સામે રાખવામાં આવે તો અન્ય કોઈ વ્યક્તિ પણ તમારો ફોન અનલૉક કરી શકે છે.\n\nઅનલૉક કરવા માટે, તમે સેટિંગમાં તમારી આંખ ખુલ્લી હોવી જોઈએની આવશ્યકતા ઉમેરી શકો છો."</string>
+<string name="aosp_security_settings_face_enroll_introduction_footer_part_2_attention_not_supported">"તમારે તમારો ફોન અનલૉક ન કરવો હોય, તો પણ ફોનની સામે જોવાથી તે અનલૉક થઈ શકે છે.\n\nતમારી આંખો બંધ હોય, તો પણ જો તમારા ફોનને તમારા ચહેરાની સામે રાખવામાં આવે તો અન્ય કોઈ વ્યક્તિ પણ તમારો ફોન અનલૉક કરી શકે છે."</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_3">તમારો ફોન તમારા જેવી દેખાતી વ્યક્તિ જેમ કે તમારા જેવા જ દેખાતા તમારા ભાઈ કે બહેન દ્વારા પણ અનલૉક થઈ શકે છે.</string>
+</resources>
diff --git a/res/values-gu/google_strings.xml b/res/values-gu/google_strings.xml
new file mode 100644
index 0000000..b922dc7
--- /dev/null
+++ b/res/values-gu/google_strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="battery_tip_smart_battery_summary_custom">સુવિધાજનક બૅટરી ચાલુ કરો</string>
+ <string name="smart_battery_footer_custom">"બૅટરી આવરદાને વધારવા માટે, સુવિધાજનક બૅટરી વારંવાર ઉપયોગમાં ન લેવાતી ઍપ માટે બૅટરી મર્યાદિત કરે છે. સમય જતાં તમારો ફોન જાણી લેશે કે તમે ઍપનો કેવી રીતે ઉપયોગ કરો છો.
+
+આ ઍપ માટે નોટિફિકેશન વિલંબિત થઈ શકે છે."</string>
+ <string name="smart_battery_manager_title_custom">સુવિધાજનક બૅટરી</string>
+ <string name="smart_battery_title_custom">સુવિધાજનક બૅટરીનો ઉપયોગ કરો</string>
+ </resources>
diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml
index b2e61ce..2000820 100644
--- a/res/values-gu/strings.xml
+++ b/res/values-gu/strings.xml
@@ -2677,9 +2677,6 @@
<string name="user_credentials" msgid="4044405430790970775">"વપરાશકર્તા ઓળખપત્ર"</string>
<string name="user_credentials_summary" msgid="686471637627271856">"સંગ્રહિત ઓળખપત્ર જુઓ અને સંશોધિત કરો"</string>
<string name="advanced_security_title" msgid="7117581975877192652">"વિગતવાર"</string>
- <string name="credential_storage_type" msgid="930861336971619888">"સંગ્રહ પ્રકાર"</string>
- <string name="credential_storage_type_hardware" msgid="2630040425119817220">"હાર્ડવેર-બેક્ડ"</string>
- <string name="credential_storage_type_software" msgid="4786996040468294626">"ફક્ત સોફ્ટવેર"</string>
<string name="credentials_settings_not_available" msgid="7433088409177429600">"આ વપરાશકર્તા માટે ઓળખપત્રો ઉપલબ્ધ નથી"</string>
<string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"VPN અને ઍપ્લિકેશનો માટે ઇન્સ્ટૉલ કરેલ"</string>
<string name="credential_for_wifi" msgid="1963335263280604998">"વાઇ-ફાઇ માટે ઇન્સ્ટૉલ કરેલ"</string>
diff --git a/res/values-gu/wellbeing_strings.xml b/res/values-gu/wellbeing_strings.xml
new file mode 100644
index 0000000..f6fa5c3
--- /dev/null
+++ b/res/values-gu/wellbeing_strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="duration_less_than_one_minute">1 મિનિટ કરતાં પણ ઓછો સમય</string>
+ <string name="screen_time_summary_usage_today">આજે %1$s</string>
+ </resources>
diff --git a/res/values-hi/aosp_strings.xml b/res/values-hi/aosp_strings.xml
new file mode 100644
index 0000000..d6a2dd2
--- /dev/null
+++ b/res/values-hi/aosp_strings.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <!-- Strings for face unlock enrollment, missing from AOSP-->
+ <string name="aosp_security_settings_face_enroll_education_message">अगली स्क्रीन पर, अपने चेहरे को हर तरफ़ से कैप्चर करने के लिए सिर घुमाएं</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_expanded">"अगर आपकी नज़र कमज़ोर है या सिर हिलने की समस्या है, तो इस तरीके से आप आसानी से 'मालिक का चेहरा पहचानकर अनलॉक करना' सेट अप कर सकते हैं. 'मालिक का चेहरा पहचानकर अनलॉक करना' का इस्तेमाल करते समय, आपका सिर आपके फ़ोन के ठीक सामने होना चाहिए."</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_diversity">"'मालिक का चेहरा पहचानकर अनलॉक करना' की सुलभता सुविधा इस्तेमाल करें"</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_vision">आंखें खुली रखना ज़रूरी है</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_0">चश्में या हल्की रंगत वाले धूप के चश्में ठीक रहते हैं.</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_1">"मालिक का चेहरा पहचानकर अनलॉक करने की सुविधा से रिकॉर्ड किया गया डेटा सुरक्षित रखा जाता है. साथ ही, वह आपके फ़ोन से कभी नहीं हटता. आप सेटिंग में जाकर जब चाहें डेटा मिटा सकते हैं.\n\nआपका फ़ोन समय-समय पर मालिक का चेहरा पहचानकर अनलॉक करने वाली सुविधा में सेव हुई हाल ही की इमेज का इस्तेमाल करेगा. इन इमेज के इस्तेमाल से चेहरे के बेहतर मॉडल बनाने में मदद मिलती है."</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_2">"फ़ोन को सामने से देखने पर, आपके न चाहते हुए भी फ़ोन अनलॉक हो सकता है. आपका फ़ोन, आपके चेहरे के सामने लाकर कोई भी व्यक्ति उसे अनलॉक कर सकता है.\n\nआप सेटिंग में यह बदलाव कर सकते हैं कि फ़ोन अनलॉक करने के लिए आपकी आंखें खुली होनी चाहिए."</string>
+<string name="aosp_security_settings_face_enroll_introduction_footer_part_2_attention_not_supported">"फ़ोन को सामने से देखने पर आपके न चाहते हुए भी आपका फ़ोन अनलॉक हो सकता है.\n\nआपका फ़ोन आपके चेहरे के सामने लाकर कोई भी व्यक्ति उसे अनलॉक कर सकता है, भले ही आपकी आंखें बंद क्यों न हों."</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_3">आपका फ़ोन कोई ऐसा व्यक्ति भी अनलॉक कर सकता है जिसका चेहरा आपसे काफ़ी मिलता हो, जैसे जुड़वां भाई या बहन.</string>
+</resources>
diff --git a/res/values-hi/google_strings.xml b/res/values-hi/google_strings.xml
new file mode 100644
index 0000000..88db353
--- /dev/null
+++ b/res/values-hi/google_strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="battery_tip_smart_battery_summary_custom">ज़रूरत के हिसाब से बैटरी के इस्तेमाल की सुविधा चालू करें</string>
+ <string name="smart_battery_footer_custom">"बैटरी लाइफ़ बढ़ाने के लिए, ज़रूरत के हिसाब से बैटरी का इस्तेमाल करने की सुविधा, कभी-कभार इस्तेमाल होने वाले ऐप्लिकेशन पर बैटरी के इस्तेमाल से जुड़ी रोक लगाती है. समय के साथ आपके फ़ोन को यह पता चल जाएगा कि आप किस तरह से ऐप्लिकेशन इस्तेमाल करते हैं.
+
+इन ऐप्लिकेशन से जुड़ी सूचनाएं दिखने में देर हो सकती है."</string>
+ <string name="smart_battery_manager_title_custom">ज़रूरत के हिसाब से बैटरी का इस्तेमाल</string>
+ <string name="smart_battery_title_custom">ज़रूरत के हिसाब से बैटरी का इस्तेमाल करने की सुविधा आज़माएं</string>
+ </resources>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index b3718fd..4760f6c 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -2677,9 +2677,6 @@
<string name="user_credentials" msgid="4044405430790970775">"यूज़र क्रेडेंशियल"</string>
<string name="user_credentials_summary" msgid="686471637627271856">"स्टोर किए गए क्रेडेंशियल देखें और उनमें बदलाव करें"</string>
<string name="advanced_security_title" msgid="7117581975877192652">"बेहतर सेटिंग"</string>
- <string name="credential_storage_type" msgid="930861336971619888">"मेमोरी का प्रकार"</string>
- <string name="credential_storage_type_hardware" msgid="2630040425119817220">"हार्डवेयर-समर्थित"</string>
- <string name="credential_storage_type_software" msgid="4786996040468294626">"केवल सॉफ़्टवेयर"</string>
<string name="credentials_settings_not_available" msgid="7433088409177429600">"इस उपयोगकर्ता के लिए क्रेडेंशियल मौजूद नहीं हैं"</string>
<string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"VPN और ऐप्लिकेशन के लिए इंस्टॉल किया गया"</string>
<string name="credential_for_wifi" msgid="1963335263280604998">"वाई-फ़ाई के लिए इंस्टॉल किया गया"</string>
diff --git a/res/values-hi/wellbeing_strings.xml b/res/values-hi/wellbeing_strings.xml
new file mode 100644
index 0000000..0a81025
--- /dev/null
+++ b/res/values-hi/wellbeing_strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="duration_less_than_one_minute">1 मिनट से कम</string>
+ <string name="screen_time_summary_usage_today">आज %1$s</string>
+ </resources>
diff --git a/res/values-hr/aosp_strings.xml b/res/values-hr/aosp_strings.xml
new file mode 100644
index 0000000..fbf1c2c
--- /dev/null
+++ b/res/values-hr/aosp_strings.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <!-- Strings for face unlock enrollment, missing from AOSP-->
+ <string name="aosp_security_settings_face_enroll_education_message">Na sljedećem zaslonu zaokrećite glavu da biste snimili lice iz svih kutova</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_expanded">Ako imate poteškoća s vidom ili kretanjem glave, ova je opcija lakši način za postavljanje otključavanja licem. Kad telefon otključavate licem, vaša bi glava trebala biti točno ispred telefona.</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_diversity">Koristite otključavanje licem za pristupačnost</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_vision">Oči trebaju biti otvorene</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_0">Možete imati dioptrijske ili lagano zatamnjene sunčane naočale.</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_1">"Podaci koje snimi otključavanje licem pohranjuju se sigurno i nikamo se ne šalju s telefona. Svoje podatke možete izbrisati kad god želite u postavkama.\n\nVaš će telefon povremeno upotrijebiti vaše nedavne slike otključavanja licem kako bi izradio poboljšane modele lica."</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_2">"Gledajući telefon možete ga otključati i kad to ne namjeravate. Vaš telefon može otključati i netko drugi ako ga prinese vašem licu.\n\nU Postavkama možete podesiti da vam oči moraju biti otvorene da bi se telefon otključao."</string>
+<string name="aosp_security_settings_face_enroll_introduction_footer_part_2_attention_not_supported">"Gledajući telefon možete ga nehotice otključati.\n\nVaš telefon može otključati i netko drugi ako ga prinese vašem licu, čak i ako su vam oči zatvorene."</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_3">Vaš telefon može otključati i netko tko vam je vrlo sličan, na primjer vaš jednojajčani blizanac.</string>
+</resources>
diff --git a/res/values-hr/google_strings.xml b/res/values-hr/google_strings.xml
new file mode 100644
index 0000000..8a6b068
--- /dev/null
+++ b/res/values-hr/google_strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="battery_tip_smart_battery_summary_custom">Uključite Adaptive Battery</string>
+ <string name="smart_battery_footer_custom">"Da bi se produljilo trajanje baterije, Adaptive Battery ograničava potrošnju baterije za aplikacije koje se upotrebljavaju rjeđe. Telefon će s vremenom saznati kako upotrebljavate aplikacije.
+
+Obavijesti za te aplikacije mogu kasniti."</string>
+ <string name="smart_battery_manager_title_custom">Prilagodljiva baterija</string>
+ <string name="smart_battery_title_custom">Koristi Adaptive Battery</string>
+ </resources>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 37bfde3..574cec3 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -2715,9 +2715,6 @@
<string name="user_credentials" msgid="4044405430790970775">"Korisničke vjerodajnice"</string>
<string name="user_credentials_summary" msgid="686471637627271856">"Prikaz i izmjena pohranjenih vjerodajnica"</string>
<string name="advanced_security_title" msgid="7117581975877192652">"Dodatne postavke"</string>
- <string name="credential_storage_type" msgid="930861336971619888">"Vrsta pohrane"</string>
- <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Hardverska"</string>
- <string name="credential_storage_type_software" msgid="4786996040468294626">"Samo softverska"</string>
<string name="credentials_settings_not_available" msgid="7433088409177429600">"Za ovog korisnika nisu dostupne vjerodajnice"</string>
<string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Instalirano za VPN i aplikacije"</string>
<string name="credential_for_wifi" msgid="1963335263280604998">"Instalirano za Wi-Fi"</string>
diff --git a/res/values-hr/wellbeing_strings.xml b/res/values-hr/wellbeing_strings.xml
new file mode 100644
index 0000000..bafd28f
--- /dev/null
+++ b/res/values-hr/wellbeing_strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="duration_less_than_one_minute">Manje od jedne minute</string>
+ <string name="screen_time_summary_usage_today">%1$s danas</string>
+ </resources>
diff --git a/res/values-hu/aosp_strings.xml b/res/values-hu/aosp_strings.xml
new file mode 100644
index 0000000..1180788
--- /dev/null
+++ b/res/values-hu/aosp_strings.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <!-- Strings for face unlock enrollment, missing from AOSP-->
+ <string name="aosp_security_settings_face_enroll_education_message">A következő képernyőnél forgassa körbe a fejét, hogy arcát minden szögből rögzítse az eszköz</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_expanded">Ha látása korlátozott, vagy a fejmozgatás nehézséget jelent, ezzel a lehetőséggel egyszerűbben beállíthatja az arcalapú feloldást. Az arcalapú feloldás használatához szükséges lehet, hogy a telefon közvetlenül az arca előtt legyen.</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_diversity">Kisegítő arcalapú feloldás használata</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_vision">Használatához nyitva kell lennie a szemeinek</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_0">A szemüvegek és az enyhén színezett napszemüvegek nem jelentenek problémát.</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_1">"Az arcalapú feloldás által rögzített adatokat biztonságosan, mindig csak az Ön telefonján tárolja a rendszer. Az adatokat bármikor törölheti a beállításokban.\n\nTelefonja időnként felhasználja az arcalapú feloldásra használt legutóbbi képeit továbbfejlesztett arcmodellek létrehozásához."</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_2">"A telefonjára nézve akkor is feloldhatja az eszközt, ha nem áll szándékában. Telefonját más is feloldhatja, ha az Ön arca elé tartja.\n\nA Beállításokban megadhatja, hogy telefonja csak akkor oldjon fel, ha az Ön szemei nyitva vannak."</string>
+<string name="aosp_security_settings_face_enroll_introduction_footer_part_2_attention_not_supported">"Akaratlanul is feloldhatja a telefont, amikor ránéz.\n\nA telefont mások is feloldhatják, ha az Ön arca elé tartják, még akkor is, ha csukva van a szeme."</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_3">A telefont olyasvalaki is feloldhatja, aki nagyon hasonlít Önre, például az egypetéjű ikertestvére.</string>
+</resources>
diff --git a/res/values-hu/google_strings.xml b/res/values-hu/google_strings.xml
new file mode 100644
index 0000000..73d2fa2
--- /dev/null
+++ b/res/values-hu/google_strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="battery_tip_smart_battery_summary_custom">Az Alkalmazkodó akkumulátor bekapcsolása</string>
+ <string name="smart_battery_footer_custom">"Az akkumulátor üzemidejének növelése érdekében az Alkalmazkodó akkumulátor korlátozza a ritkán használt alkalmazások akkumulátorhasználatát. A telefon idővel megtanulja, hogy Ön hogyan használja az alkalmazásokat.
+
+Előfordulhat, hogy az érintett alkalmazások értesítései késnek majd."</string>
+ <string name="smart_battery_manager_title_custom">Alkalmazkodó akkumulátor</string>
+ <string name="smart_battery_title_custom">Alkalmazkodó akkumulátor használata</string>
+ </resources>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index e3c581f..e1b5e1e 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -2677,9 +2677,6 @@
<string name="user_credentials" msgid="4044405430790970775">"Felhasználó hitelesítési adatai"</string>
<string name="user_credentials_summary" msgid="686471637627271856">"A tárolt hitelesítési adatok megtekintése és módosítása"</string>
<string name="advanced_security_title" msgid="7117581975877192652">"Speciális"</string>
- <string name="credential_storage_type" msgid="930861336971619888">"Tárhelytípus"</string>
- <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Hardveresen támogatott"</string>
- <string name="credential_storage_type_software" msgid="4786996040468294626">"Kizárólag szoftveres"</string>
<string name="credentials_settings_not_available" msgid="7433088409177429600">"A hitelesítési adatok nem érhetők el ennél a felhasználónál"</string>
<string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"VPN-hez és alkalmazásokhoz telepítve"</string>
<string name="credential_for_wifi" msgid="1963335263280604998">"Wi-Fi-hez telepítve"</string>
diff --git a/res/values-hu/wellbeing_strings.xml b/res/values-hu/wellbeing_strings.xml
new file mode 100644
index 0000000..229f873
--- /dev/null
+++ b/res/values-hu/wellbeing_strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="duration_less_than_one_minute">Kevesebb mint 1 perc</string>
+ <string name="screen_time_summary_usage_today">Ma: %1$s</string>
+ </resources>
diff --git a/res/values-hy/aosp_strings.xml b/res/values-hy/aosp_strings.xml
new file mode 100644
index 0000000..4cc8316
--- /dev/null
+++ b/res/values-hy/aosp_strings.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <!-- Strings for face unlock enrollment, missing from AOSP-->
+ <string name="aosp_security_settings_face_enroll_education_message">Հաջորդ էկրանին պտտեք գլուխը՝ ձեր դեմքը բոլոր անկյուններից նկարելու համար</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_expanded">Եթե տեսողության կամ գլխի շարժման հետ խնդիրներ ունեք, այս տարբերակի միջոցով կարող եք ավելի հեշտ կարգավորել դեմքով ապակողպումը: Դեմքով ապակողպման համար կարող է պահանջվել ավելի ուղիղ պահել գլուխը հեռախոսի առջև:</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_diversity">Դեմքով ապակողպում հատուկ կարիքներով մարդկանց համար</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_vision">Աչքերը պետք է բաց լինեն</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_0">Օպտիկական կամ թույլ մգեցված արևային ակնոցը չի խանգարի:</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_1">"«Դեմքով ապակողպում» գործառույթի գրանցած տվյալները պահվում են միայն ձեր հեռախոսում։ Ձեր տվյալները կարող եք ցանկացած պահի ջնջել կարգավորումներում:\n\nԴեմքի ավելի լավ նմուշ ստեղծելու համար երբեմն կարող են օգտագործվել ձեր դեմքի վերջին լուսանկարները՝ արված դեմքով ապակողպման ժամանակ։"</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_2">"Հեռախոսը կարող է ապակողպվել նաև այն դեպքում, երբ մտադիր չեք դա անել, սակայն էկրանը ձեր դեմքին է ուղղված։ Ձեր հեռախոսը կարող է ապակողպել մեկ ուրիշը, եթե էկրանը ձեր դեմքին է ուղղված։\n\nԿարգավորումներում դուք կարող եք թույլատրել հեռախոսի ապակողպումը, միայն եթե ձեր աչքերը բաց են։"</string>
+<string name="aosp_security_settings_face_enroll_introduction_footer_part_2_attention_not_supported">"Հեռախոսին նայելու դեպքում դուք կարող եք ապակողպել էկրանը, նույնիսկ եթե մտադրված չեք դա անել:\n\nՀեռախոսը կարող է ապակողպել այլ անձ, եթե էկրանը ձեր դեմքին է ոuղղված, նույնիսկ երբ ձեր աչքերը փակ են:"</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_3">Ձեր հեռախոսը կարող է ապակողպել ձեզ շատ նման մեկ ուրիշը, օրինակ՝ ձեր հարազատ եղբայրը կամ քույրը:</string>
+</resources>
diff --git a/res/values-hy/google_strings.xml b/res/values-hy/google_strings.xml
new file mode 100644
index 0000000..99676c4
--- /dev/null
+++ b/res/values-hy/google_strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="battery_tip_smart_battery_summary_custom">Միացրեք Adaptive Battery-ն</string>
+ <string name="smart_battery_footer_custom">"Մարտկոցի աշխատաժամանակը երկարացնելու համար Adaptive Battery-ն սահմանափակում է հազվադեպ օգտագործվող հավելվածների ֆոնային աշխատանքը: Ժամանակի ընթացքում ձեր հեռախոսը հիշում է, թե որ հավելվածներն եք հաճախ օգտագործում, որոնք՝ ոչ:
+
+Սահմանափակված հավելվածների ծանուցումները կարող են ուշացումով ստացվել:"</string>
+ <string name="smart_battery_manager_title_custom">Adaptive Battery</string>
+ <string name="smart_battery_title_custom">Միացնել Adaptive Battery-ն</string>
+ </resources>
diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml
index e3884b3..c8b60e1 100644
--- a/res/values-hy/strings.xml
+++ b/res/values-hy/strings.xml
@@ -2677,9 +2677,6 @@
<string name="user_credentials" msgid="4044405430790970775">"Օգտատիրոջ մուտքի տվյալներ"</string>
<string name="user_credentials_summary" msgid="686471637627271856">"Դիտել և փոփոխել պահված մուտքի տվյալները"</string>
<string name="advanced_security_title" msgid="7117581975877192652">"Ընդլայնված"</string>
- <string name="credential_storage_type" msgid="930861336971619888">"Պահոցի տեսակը"</string>
- <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Սարքակազմ"</string>
- <string name="credential_storage_type_software" msgid="4786996040468294626">"Միայն ծրագրային"</string>
<string name="credentials_settings_not_available" msgid="7433088409177429600">"Հավատարմագրերը հասանելի չեն այս օգտատիրոջ"</string>
<string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Տեղադրվել է VPN-ի և հավելվածների համար"</string>
<string name="credential_for_wifi" msgid="1963335263280604998">"Տեղադրվել է Wi-Fi-ի համար"</string>
diff --git a/res/values-hy/wellbeing_strings.xml b/res/values-hy/wellbeing_strings.xml
new file mode 100644
index 0000000..ed634ec
--- /dev/null
+++ b/res/values-hy/wellbeing_strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="duration_less_than_one_minute">1 րոպեից պակաս</string>
+ <string name="screen_time_summary_usage_today">Այսօր՝ %1$s</string>
+ </resources>
diff --git a/res/values-in/aosp_strings.xml b/res/values-in/aosp_strings.xml
new file mode 100644
index 0000000..d043cbd
--- /dev/null
+++ b/res/values-in/aosp_strings.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <!-- Strings for face unlock enrollment, missing from AOSP-->
+ <string name="aosp_security_settings_face_enroll_education_message">Di layar berikutnya, putar kepala agar dapat mengambil foto semua sudut wajah Anda</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_expanded">Jika Anda memiliki pandangan atau gerakan kepala yang terbatas, opsi ini adalah cara yang lebih mudah untuk menyiapkan face unlock. Saat menggunakan face unlock, kepala Anda mungkin harus lebih dekat di depan ponsel.</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_diversity">Gunakan face unlock aksesibilitas</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_vision">Mata harus terbuka</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_0">Kacamata resep atau kacamata berlensa warna transparan bisa digunakan.</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_1">"Data yang direkam oleh face unlock disimpan dengan aman di ponsel Anda dan tidak akan hilang. Anda dapat menghapus data tersebut kapan saja di setelan.\n\nKadang ponsel Anda akan menggunakan foto face unlock terkini untuk membuat penyempurnaan model wajah."</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_2">"Dengan melihat ponsel, Anda dapat membuka kuncinya meski tidak bermaksud untuk membukanya. Orang lain dapat membuka kunci ponsel Anda jika orang itu mendekatkan ponsel ke wajah Anda.\n\nDi Setelan, Anda dapat mengatur agar mata Anda harus dalam keadaan terbuka untuk membuka kunci ponsel."</string>
+<string name="aosp_security_settings_face_enroll_introduction_footer_part_2_attention_not_supported">"Ponsel dapat dibuka kuncinya jika Anda melihat ponsel, meski Anda tidak bermaksud untuk membukanya.\n\nPonsel dapat dibuka kuncinya oleh orang lain jika orang itu mendekatkan ponsel ke wajah Anda, meski mata Anda tertutup."</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_3">Ponsel dapat dibuka kuncinya oleh orang lain yang terlihat sangat mirip dengan Anda, misalnya saudara kembar identik.</string>
+</resources>
diff --git a/res/values-in/google_strings.xml b/res/values-in/google_strings.xml
new file mode 100644
index 0000000..9db25e0
--- /dev/null
+++ b/res/values-in/google_strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="battery_tip_smart_battery_summary_custom">Aktifkan Baterai Adaptif</string>
+ <string name="smart_battery_footer_custom">"Untuk memperpanjang masa pakai baterai, Baterai Adaptif membatasi baterai untuk aplikasi yang jarang dipakai. Ponsel akan mempelajari cara Anda menggunakan aplikasi seiring waktu.
+
+Notifikasi dapat tertunda untuk aplikasi ini."</string>
+ <string name="smart_battery_manager_title_custom">Baterai Adaptif</string>
+ <string name="smart_battery_title_custom">Gunakan Baterai Adaptif</string>
+ </resources>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 62e05ca..5d91e48 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -2677,9 +2677,6 @@
<string name="user_credentials" msgid="4044405430790970775">"Kredensial pengguna"</string>
<string name="user_credentials_summary" msgid="686471637627271856">"Lihat dan ubah kredensial yang tersimpan"</string>
<string name="advanced_security_title" msgid="7117581975877192652">"Lanjutan"</string>
- <string name="credential_storage_type" msgid="930861336971619888">"Jenis penyimpanan"</string>
- <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Menggunakan hardware"</string>
- <string name="credential_storage_type_software" msgid="4786996040468294626">"Khusus software"</string>
<string name="credentials_settings_not_available" msgid="7433088409177429600">"Kredensial tidak tersedia untuk pengguna ini"</string>
<string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Dipasang untuk VPN dan aplikasi"</string>
<string name="credential_for_wifi" msgid="1963335263280604998">"Dipasang untuk Wi-Fi"</string>
diff --git a/res/values-in/wellbeing_strings.xml b/res/values-in/wellbeing_strings.xml
new file mode 100644
index 0000000..25f98bf
--- /dev/null
+++ b/res/values-in/wellbeing_strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="duration_less_than_one_minute">Kurang dari 1 menit</string>
+ <string name="screen_time_summary_usage_today">%1$s hari ini</string>
+ </resources>
diff --git a/res/values-is/aosp_strings.xml b/res/values-is/aosp_strings.xml
new file mode 100644
index 0000000..f12030e
--- /dev/null
+++ b/res/values-is/aosp_strings.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <!-- Strings for face unlock enrollment, missing from AOSP-->
+ <string name="aosp_security_settings_face_enroll_education_message">Á næsta skjá skaltu snúa höfðinu til að fanga andlit þitt frá öllum hliðum</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_expanded">Ef þú ert með skerta sjón eða hreyfigetu er þessi valkostur auðveldari leið til að setja upp andlitsopnun. Þegar andlitsopnun er notuð gæti höfuð þitt þurft að vera beint fyrir framan símann.</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_diversity">Nota andlitsopnun fyrir aðgengi</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_vision">Augun verða að vera opin</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_0">Gleraugu eða lítið dekkt sólgleraugu trufla ekki.</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_1">"Gögnin sem skráð eru við andlitsopnun eru geymd á öruggan hátt og fara aldrei úr símanum þínum. Þú getur eytt gögnunum þínum hvenær sem er.\n\nSíminn notar einstöku sinnum nýlegar myndir úr andlitsopnun til að búa til betri andlitslíkön."</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_2">"Síminn gæti opnast óvart þegar þú lítur á hann. Aðrir geta opnað símann með því að halda honum upp að andlitinu þínu.\n\nÍ stillingum getur þú valið að síminn opnist aðeins þegar þú ert með augun opin."</string>
+<string name="aosp_security_settings_face_enroll_introduction_footer_part_2_attention_not_supported">"Síminn gæti opnast óvart þegar þú lítur á hann.\n\nAðrir geta opnað símann með því að halda honum upp að andlitinu þínu, jafnvel þegar þú ert með augun lokuð."</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_3">Einhver sem er mjög lík(ur) þér getur opnað símann þinn, til dæmis eineggja tvíburi.</string>
+</resources>
diff --git a/res/values-is/google_strings.xml b/res/values-is/google_strings.xml
new file mode 100644
index 0000000..6825fa7
--- /dev/null
+++ b/res/values-is/google_strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="battery_tip_smart_battery_summary_custom">Kveikja á breytilegri rafhlöðustjórnun</string>
+ <string name="smart_battery_footer_custom">"Til að lengja endingu rafhlöðunnar takmarkar breytileg rafhlöðustjórnun rafhlöðunotkun forrita sem eru notuð sjaldan. Síminn lærir inn á forritanotkun þína með tímanum.
+
+Tafir geta orðið á tilkynningum frá þessum forritum."</string>
+ <string name="smart_battery_manager_title_custom">Breytileg rafhlöðustjórnun</string>
+ <string name="smart_battery_title_custom">Nota breytilega rafhlöðustjórnun</string>
+ </resources>
diff --git a/res/values-is/strings.xml b/res/values-is/strings.xml
index e3b16c9..2674a1c 100644
--- a/res/values-is/strings.xml
+++ b/res/values-is/strings.xml
@@ -2677,9 +2677,6 @@
<string name="user_credentials" msgid="4044405430790970775">"Notandaskilríki"</string>
<string name="user_credentials_summary" msgid="686471637627271856">"Skoða og breyta vistuðum skilríkjum"</string>
<string name="advanced_security_title" msgid="7117581975877192652">"Ítarlegt"</string>
- <string name="credential_storage_type" msgid="930861336971619888">"Gerð geymslu"</string>
- <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Byggist á vélbúnaði"</string>
- <string name="credential_storage_type_software" msgid="4786996040468294626">"Hugbúnaður eingöngu"</string>
<string name="credentials_settings_not_available" msgid="7433088409177429600">"Skilríki eru ekki í boði fyrir þennan notanda"</string>
<string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Sett upp fyrir VPN og forrit"</string>
<string name="credential_for_wifi" msgid="1963335263280604998">"Sett upp fyrir Wi-Fi"</string>
diff --git a/res/values-is/wellbeing_strings.xml b/res/values-is/wellbeing_strings.xml
new file mode 100644
index 0000000..afe2023
--- /dev/null
+++ b/res/values-is/wellbeing_strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="duration_less_than_one_minute">Innan við 1 mínúta</string>
+ <string name="screen_time_summary_usage_today">%1$s í dag</string>
+ </resources>
diff --git a/res/values-it/aosp_strings.xml b/res/values-it/aosp_strings.xml
new file mode 100644
index 0000000..3d62a20
--- /dev/null
+++ b/res/values-it/aosp_strings.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <!-- Strings for face unlock enrollment, missing from AOSP-->
+ <string name="aosp_security_settings_face_enroll_education_message">Nella prossima schermata, ruota la testa per acquisire tutte le angolazioni del tuo volto</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_expanded">Se hai vista o mobilità della testa limitate, questa opzione ti consente di impostare più facilmente Sblocco con il volto. Se usi Sblocco con il volto, la testa deve essere più frontale rispetto al telefono.</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_diversity">Usa Sblocco con il volto (accessibilità)</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_vision">Gli occhi devono essere aperti</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_0">Sono consentiti occhiali da vista e occhiali da sole chiari.</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_1">"I dati registrati da Sblocco con il volto vengono memorizzati in modo sicuro sul tuo telefono e non possono essere trasferiti. Puoi eliminare i dati in qualsiasi momento nelle impostazioni.\n\nIl tuo telefono userà occasionalmente le tue immagini recenti di Sblocco con il volto per ottimizzare la creazione dei modelli del volto."</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_2">"Se guardi direttamente il telefono, potresti sbloccarlo anche senza volerlo. Il tuo telefono può essere sbloccato da un'altra persona se viene rivolto verso il tuo viso.\n\nNelle Impostazioni puoi stabilire che il telefono si sblocchi solo se hai gli occhi aperti."</string>
+<string name="aosp_security_settings_face_enroll_introduction_footer_part_2_attention_not_supported">"Se guardi il telefono puoi sbloccarlo anche quando non hai intenzione di farlo.\n\nIl tuo telefono può essere sbloccato da un'altra persona se viene rivolto verso il tuo viso, anche se hai gli occhi chiusi."</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_3">Il tuo telefono può essere sbloccato da qualcuno che ti assomiglia molto, ad esempio un gemello.</string>
+</resources>
diff --git a/res/values-it/google_strings.xml b/res/values-it/google_strings.xml
new file mode 100644
index 0000000..919c01f
--- /dev/null
+++ b/res/values-it/google_strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="battery_tip_smart_battery_summary_custom">Attiva Batteria adattiva</string>
+ <string name="smart_battery_footer_custom">"Per prolungare la durata della batteria, la funzione Batteria adattiva limita l'utilizzo della batteria per le app usate di rado. Il telefono capirà come usi le app nel corso del tempo.
+
+Potresti ricevere in ritardo le notifiche relative a queste app."</string>
+ <string name="smart_battery_manager_title_custom">Batteria adattiva</string>
+ <string name="smart_battery_title_custom">Usa Batteria adattiva</string>
+ </resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index e52ceb4..6b069a0 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -2677,9 +2677,6 @@
<string name="user_credentials" msgid="4044405430790970775">"Credenziali utente"</string>
<string name="user_credentials_summary" msgid="686471637627271856">"Visualizza e modifica credenziali archiviate"</string>
<string name="advanced_security_title" msgid="7117581975877192652">"Avanzate"</string>
- <string name="credential_storage_type" msgid="930861336971619888">"Tipo di archivio"</string>
- <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Basato sull\'hardware"</string>
- <string name="credential_storage_type_software" msgid="4786996040468294626">"Solo software"</string>
<string name="credentials_settings_not_available" msgid="7433088409177429600">"Le credenziali non sono disponibili per questo utente"</string>
<string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Installata per VPN e app"</string>
<string name="credential_for_wifi" msgid="1963335263280604998">"Installata per Wi-Fi"</string>
diff --git a/res/values-it/wellbeing_strings.xml b/res/values-it/wellbeing_strings.xml
new file mode 100644
index 0000000..535e1ca
--- /dev/null
+++ b/res/values-it/wellbeing_strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="duration_less_than_one_minute">Meno di un minuto</string>
+ <string name="screen_time_summary_usage_today">Oggi: %1$s</string>
+ </resources>
diff --git a/res/values-iw/aosp_strings.xml b/res/values-iw/aosp_strings.xml
new file mode 100644
index 0000000..41b3375
--- /dev/null
+++ b/res/values-iw/aosp_strings.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <!-- Strings for face unlock enrollment, missing from AOSP-->
+ <string name="aosp_security_settings_face_enroll_education_message">במסך הבא, עליך לסובב את הראש כדי לצלם את הפנים מכל הזוויות</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_expanded">אם יש לך מגבלה בראייה או בתנועת הראש, אפשרות זו היא דרך קלה יותר להגדרת שחרור נעילה על ידי זיהוי פנים. לצורך השימוש בשחרור נעילה על ידי זיהוי פנים, ייתכן שיהיה עליך לייצב את ראשך ישירות מול הטלפון.</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_diversity">שימוש בהגדרות נגישות של שחרור נעילה על ידי זיהוי פנים</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_vision">העיניים צריכות להיות פתוחות</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_0">אין בעיה אם מרכיבים משקפיים או משקפי שמש בגוון בהיר.</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_1">"הנתונים שמתועדים ב'שחרור נעילה על-ידי זיהוי פנים' מאוחסנים באופן מאובטח ואף פעם לא יוצאים מהטלפון. בכל שלב אפשר למחוק את הנתונים שלך.\n\nמדי פעם הטלפון ישתמש בתמונות מ'שחרור נעילה על ידי זיהוי פנים' כדי ליצור תבניות משופרות לזיהוי פנים."</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_2">"מבט לטלפון עשוי לבטל נעילה בלי כוונה. נעילת הטלפון עלולה להתבטל על ידי מישהו אחר, אם הטלפון מופנה אל הפנים שלך.\n\nאפשר להגדיר דרישה לעיניים פקוחות לצורך שחרור נעילה בהגדרות."</string>
+<string name="aosp_security_settings_face_enroll_introduction_footer_part_2_attention_not_supported">"מבט לטלפון עשוי לבטל נעילה בלי כוונה.\n\nנעילת הטלפון עשויה להתבטל על ידי מישהו אחר אם הוא יפנה את הטלפון לפנים שלך, גם אם עיניך עצומות."</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_3">נעילת הטלפון עשויה להתבטל על ידי מישהו שדומה לך מאוד, כמו אח/ות זהה.</string>
+</resources>
diff --git a/res/values-iw/google_strings.xml b/res/values-iw/google_strings.xml
new file mode 100644
index 0000000..895116c
--- /dev/null
+++ b/res/values-iw/google_strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="battery_tip_smart_battery_summary_custom">הפעלת Adaptive Battery</string>
+ <string name="smart_battery_footer_custom">"כדי להאריך את חיי הסוללה, התכונה Adaptive Battery מגבילה את השימוש בסוללה לאפליקציות שנעשה בהן שימוש לעיתים רחוקות. לאורך זמן, הטלפון ילמד את אופן השימוש שלך באפליקציות.
+
+ייתכן עיכוב בקבלת התראות מאפליקציות אלה."</string>
+ <string name="smart_battery_manager_title_custom">Adaptive Battery</string>
+ <string name="smart_battery_title_custom">שימוש ב-Adaptive Battery</string>
+ </resources>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 3642102..1203edf 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -2753,9 +2753,6 @@
<string name="user_credentials" msgid="4044405430790970775">"פרטי משתמש"</string>
<string name="user_credentials_summary" msgid="686471637627271856">"הצגה ועריכה של פרטי כניסה מאוחסנים"</string>
<string name="advanced_security_title" msgid="7117581975877192652">"אפשרויות מתקדמות"</string>
- <string name="credential_storage_type" msgid="930861336971619888">"סוג אחסון"</string>
- <string name="credential_storage_type_hardware" msgid="2630040425119817220">"מגובה באמצעות חומרה"</string>
- <string name="credential_storage_type_software" msgid="4786996040468294626">"תוכנה בלבד"</string>
<string name="credentials_settings_not_available" msgid="7433088409177429600">"פרטי כניסה אינם זמינים עבור המשתמש הזה"</string>
<string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"מותקן עבור VPN ואפליקציות"</string>
<string name="credential_for_wifi" msgid="1963335263280604998">"מותקן עבור Wi-Fi"</string>
diff --git a/res/values-iw/wellbeing_strings.xml b/res/values-iw/wellbeing_strings.xml
new file mode 100644
index 0000000..90753b8
--- /dev/null
+++ b/res/values-iw/wellbeing_strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="duration_less_than_one_minute">פחות מדקה</string>
+ <string name="screen_time_summary_usage_today">%1$s היום</string>
+ </resources>
diff --git a/res/values-ja/aosp_strings.xml b/res/values-ja/aosp_strings.xml
new file mode 100644
index 0000000..a8085d0
--- /dev/null
+++ b/res/values-ja/aosp_strings.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <!-- Strings for face unlock enrollment, missing from AOSP-->
+ <string name="aosp_security_settings_face_enroll_education_message">次の画面で、首を振ってさまざまな角度から顔を撮影してください</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_expanded">視覚や頭の動きに制限がある場合、この方法を使用すると顔認証を簡単に設定できます。顔認証を使用する場合は、顔をスマートフォンの真正面に向けてください。</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_diversity">ユーザー補助の顔認証を使用する</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_vision">目を開けてください</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_0">メガネやサングラス（薄い色）をかけていても大丈夫です。</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_1">"顔認証によって記録されたデータはスマートフォンにのみ、安全に保存されます。データは設定でいつでも削除できます。\n\nスマートフォンに保存された顔認証の最近の画像は、顔モデルの改善のために使用されることがあります。"</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_2">"スマートフォンに無意識に顔を向けても、ロックが解除されることがあります。スマートフォンを顔に近づけられた場合、他のユーザーによってスマートフォンのロックが解除されることがあります。\n\n目を開かなければスマートフォンがロック解除されないように [設定] で設定できます。"</string>
+<string name="aosp_security_settings_face_enroll_introduction_footer_part_2_attention_not_supported">"スマートフォンに無意識に顔を向けても、ロックが解除されることがあります。\n\n目を閉じているときでもスマートフォンを顔に近づけられた場合、他のユーザーによってスマートフォンのロックが解除されることがあります。"</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_3">双子など、あなたによく似た人であればスマートフォンのロックを解除できます。</string>
+</resources>
diff --git a/res/values-ja/google_strings.xml b/res/values-ja/google_strings.xml
new file mode 100644
index 0000000..25948fb
--- /dev/null
+++ b/res/values-ja/google_strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="battery_tip_smart_battery_summary_custom">自動調整バッテリーを ON にしてください</string>
+ <string name="smart_battery_footer_custom">"自動調整バッテリーで使用頻度の低いアプリの電池使用を制限すると、電池が長持ちします。時間の経過とともに、スマートフォンがアプリの使用状況を学習します。
+
+このアプリの通知は遅れることがあります。"</string>
+ <string name="smart_battery_manager_title_custom">自動調整バッテリー</string>
+ <string name="smart_battery_title_custom">自動調整バッテリーの使用</string>
+ </resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 9805dfe..c8593f1 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -2677,9 +2677,6 @@
<string name="user_credentials" msgid="4044405430790970775">"ユーザー認証情報"</string>
<string name="user_credentials_summary" msgid="686471637627271856">"保存されている認証情報の表示と変更"</string>
<string name="advanced_security_title" msgid="7117581975877192652">"詳細設定"</string>
- <string name="credential_storage_type" msgid="930861336971619888">"ストレージのタイプ"</string>
- <string name="credential_storage_type_hardware" msgid="2630040425119817220">"ハードウェア式"</string>
- <string name="credential_storage_type_software" msgid="4786996040468294626">"ソフトウェアのみ"</string>
<string name="credentials_settings_not_available" msgid="7433088409177429600">"認証情報はこのユーザーには表示されません"</string>
<string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"VPN とアプリ用にインストール済み"</string>
<string name="credential_for_wifi" msgid="1963335263280604998">"Wi-Fi 用にインストール済み"</string>
diff --git a/res/values-ja/wellbeing_strings.xml b/res/values-ja/wellbeing_strings.xml
new file mode 100644
index 0000000..2570ad4
--- /dev/null
+++ b/res/values-ja/wellbeing_strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="duration_less_than_one_minute">1 分未満</string>
+ <string name="screen_time_summary_usage_today">今日: %1$s</string>
+ </resources>
diff --git a/res/values-ka/aosp_strings.xml b/res/values-ka/aosp_strings.xml
new file mode 100644
index 0000000..ec77ace
--- /dev/null
+++ b/res/values-ka/aosp_strings.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <!-- Strings for face unlock enrollment, missing from AOSP-->
+ <string name="aosp_security_settings_face_enroll_education_message">შემდეგ ეკრანზე შეატრიალეთ თავი, რომ სახე ყველა კუთხიდან გადაიღოთ</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_expanded">თუ მხედველობა ან თავის მოძრაობა შეზღუდული გაქვთ, ეს ვარიანტი სახით განბლოკვის დაყენებას გაგიმარტივებთ. როდესაც სახით განბლოკვას იყენებთ, შეიძლება დაგჭირდეთ, თავი უფრო ზუსტად ტელეფონის პირისპირ დაიჭიროთ.</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_diversity">მარტივი წვდომისთვის სახით განბლოკვის გამოყენება</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_vision">მოითხოვს გახელილ თვალებს</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_0">სათვალე ან მკრთალად შეფერილი მზის სათვალე დასაშვებია.</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_1">"სახით განბლოკვის მიერ ჩაწერილი მონაცემები უსაფრთხოდ ინახება და არასოდეს ტოვებს თქვენს ტელეფონს. თქვენი მონაცემების წაშლა ნებისმიერ დროს შეგიძლიათ პარამეტრებიდან.\n\nთქვენი ტელეფონი ხანდახან გამოიყენებს თქვენს ბოლოდროინდელ სურათებს სახით განბლოკვიდან, რომ შექმნას სახის გაუმჯობესებული მოდელები."</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_2">"ტელეფონზე შეხედვას შეუძლია განბლოკოს ის, თუნდაც ამის განზრახვა არ გქონდეთ. თქვენი ტელეფონი შეიძლება განბლოკოს სხვა პირმა, თუ მას თქვენი სახის პირისპირ დაიჭერს.\n\nშეგიძლიათ, პარამეტრებში მოითხოვოთ, რომ განსაბლოკად თვალები გახელილი გქონდეთ."</string>
+<string name="aosp_security_settings_face_enroll_introduction_footer_part_2_attention_not_supported">"ტელეფონზე შეხედვამ შეიძლება განბლოკოს ის, როდესაც ამის განზრახვა არ გაქვთ.\n\nთქვენი ტელეფონი შეიძლება განბლოკოს სხვა პირმა, თუ მას თქვენი სახის პირისპირ დაიჭერს, თუნდაც თვალები დახუჭული გქონდეთ."</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_3">თქვენი ტელეფონი შეიძლება განბლოკოს ისეთმა პირმა, რომელიც ძალიან გგავთ, მაგალითად, თქვენმა იდენტურმა დამ ან ძმამ.</string>
+</resources>
diff --git a/res/values-ka/google_strings.xml b/res/values-ka/google_strings.xml
new file mode 100644
index 0000000..147571d
--- /dev/null
+++ b/res/values-ka/google_strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="battery_tip_smart_battery_summary_custom">Adaptive Battery-ს ჩართვა</string>
+ <string name="smart_battery_footer_custom">"ბატარეის მუშაობის გასახანგრძლივებლად, Adaptive Battery ზღუდავს ბატარეის მოხმარებას იშვიათად გამოყენებული აპების მიერ. თქვენი ტელეფონი დროთა განმავლობაში ისწავლის თქვენ მიერ აპების გამოყენების სპეციფიკა.
+
+ასეთი აპებიდან შეტყობინებები შესაძლოა დაგვიანდეს."</string>
+ <string name="smart_battery_manager_title_custom">Adaptive Battery</string>
+ <string name="smart_battery_title_custom">Adaptive Battery-ს გამოყენება</string>
+ </resources>
diff --git a/res/values-ka/strings.xml b/res/values-ka/strings.xml
index 2f8f848..f581b40 100644
--- a/res/values-ka/strings.xml
+++ b/res/values-ka/strings.xml
@@ -2677,9 +2677,6 @@
<string name="user_credentials" msgid="4044405430790970775">"მომხმ. ავტორიზაციის მონაცემები"</string>
<string name="user_credentials_summary" msgid="686471637627271856">"შენახული ავტორიზაციის მონაცემების ნახვა და შეცვლა"</string>
<string name="advanced_security_title" msgid="7117581975877192652">"გაფართოებული"</string>
- <string name="credential_storage_type" msgid="930861336971619888">"საცავის ტიპი"</string>
- <string name="credential_storage_type_hardware" msgid="2630040425119817220">"აპარატურული"</string>
- <string name="credential_storage_type_software" msgid="4786996040468294626">"მხოლოდ პროგრამული"</string>
<string name="credentials_settings_not_available" msgid="7433088409177429600">"ამ მომხმარებლისთვის ავტორიზაციის მონაცემები ხელმისაწვდომი არ არის"</string>
<string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"დაინსტალირებულია VPN-ისა და აპებისთვის"</string>
<string name="credential_for_wifi" msgid="1963335263280604998">"დაინსტალირებულია Wi-Fi-სთვის"</string>
diff --git a/res/values-ka/wellbeing_strings.xml b/res/values-ka/wellbeing_strings.xml
new file mode 100644
index 0000000..569380b
--- /dev/null
+++ b/res/values-ka/wellbeing_strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="duration_less_than_one_minute">1 წუთზე ნაკლები</string>
+ <string name="screen_time_summary_usage_today">%1$s დღეს</string>
+ </resources>
diff --git a/res/values-kk/aosp_strings.xml b/res/values-kk/aosp_strings.xml
new file mode 100644
index 0000000..fb38cd0
--- /dev/null
+++ b/res/values-kk/aosp_strings.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <!-- Strings for face unlock enrollment, missing from AOSP-->
+ <string name="aosp_security_settings_face_enroll_education_message">Келесі экранда бетіңізді барлық жағынан түсіріп алу үшін басыңызды бұрыңыз.</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_expanded">Көру қабілетіңіз немесе басты қозғалту мүмкіндігіңіз шектеулі болса, осы опция арқылы Face Unlock функциясын оңай реттей аласыз. Face Unlock функциясын пайдалану кезінде басты телефонның алдында тік ұстау қажет.</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_diversity">Face Unlock функциясының арнайы мүмкіндіктерін пайдалану</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_vision">Көзді ашып тұру керек.</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_0">Мөлдір және аса күңгірт емес көзілдірікті шешпеуге болады.</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_1">"Face Unlock арқылы жазылған деректер қорғалады және ешкімге жіберілмейді. Деректерді кез келген уақытта параметрлерден жоя аласыз. \n\nТелефоныңыз бет үлгілерін жақсарту үшін Face Unlock арқылы түсірілген соңғы суреттерді пайдаланады."</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_2">"Ашқыңыз келмесе де, құрылғыға қараған кезде, оның құлпы ашылып кетуі мүмкін. Басқа біреу телефоныңызды бетіңізге жақындатып ұстап тұрып та оның құлпын аша алады.\n\nПараметрлерде құлыпты тек көз арқылы ашуға болатын етіп реттеуге болады."</string>
+<string name="aosp_security_settings_face_enroll_introduction_footer_part_2_attention_not_supported">"Әдейі істемесеңіз де, телефонға қараған кезде, оның құлпы ашылады.\n\nБасқа біреу телефоныңызды бетіңізге жақындатып ұстап тұрып та оның құлпын аша алады (көзіңізді жұмып тұрсаңыз да)."</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_3">Телефонның құлпын өзіңізге ұқсайтын біреу, мысалы, егіз бауырыңыз ашып алуы мүмкін.</string>
+</resources>
diff --git a/res/values-kk/google_strings.xml b/res/values-kk/google_strings.xml
new file mode 100644
index 0000000..a5ffd1b
--- /dev/null
+++ b/res/values-kk/google_strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="battery_tip_smart_battery_summary_custom">Adaptive Battery функциясын қосу</string>
+ <string name="smart_battery_footer_custom">"Батарея ұзағырақ жұмыс істеуі үшін, Adaptive Battery функциясы сирек пайдаланылатын қолданбалардың батареяны қолдануын шектейді. Телефоныңыз қолданбалардың қалай пайдаланылатынын есіне сақтайды.
+
+Бұл қолданбаларға хабарландырулар кешігіп келуі мүмкін."</string>
+ <string name="smart_battery_manager_title_custom">Adaptive Battery</string>
+ <string name="smart_battery_title_custom">Adaptive Battery функциясын пайдалану</string>
+ </resources>
diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml
index c080b1c..ea5df69 100644
--- a/res/values-kk/strings.xml
+++ b/res/values-kk/strings.xml
@@ -2677,9 +2677,6 @@
<string name="user_credentials" msgid="4044405430790970775">"Пайдаланушының тіркелу деректері"</string>
<string name="user_credentials_summary" msgid="686471637627271856">"Сақталған тіркелу деректерін көру және өзгерту"</string>
<string name="advanced_security_title" msgid="7117581975877192652">"Қосымша"</string>
- <string name="credential_storage_type" msgid="930861336971619888">"Жад түрі"</string>
- <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Аппараттық"</string>
- <string name="credential_storage_type_software" msgid="4786996040468294626">"Компьютерлік бағдарлама ғана"</string>
<string name="credentials_settings_not_available" msgid="7433088409177429600">"Осы пайдаланушы үшін тіркелгі деректері қол жетімді емес"</string>
<string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"VPN желілері мен қолданбалар үшін орнатылған"</string>
<string name="credential_for_wifi" msgid="1963335263280604998">"Wi-Fi үшін орнатылған"</string>
diff --git a/res/values-kk/wellbeing_strings.xml b/res/values-kk/wellbeing_strings.xml
new file mode 100644
index 0000000..8e04abb
--- /dev/null
+++ b/res/values-kk/wellbeing_strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="duration_less_than_one_minute">1 минутқа жетпейді</string>
+ <string name="screen_time_summary_usage_today">Бүгін %1$s</string>
+ </resources>
diff --git a/res/values-km/aosp_strings.xml b/res/values-km/aosp_strings.xml
new file mode 100644
index 0000000..c059c07
--- /dev/null
+++ b/res/values-km/aosp_strings.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <!-- Strings for face unlock enrollment, missing from AOSP-->
+ <string name="aosp_security_settings_face_enroll_education_message">នៅលើអេក្រង់បន្ទាប់ សូមបង្វិលក្បាលរបស់អ្នក ដើម្បីថតមុខរបស់អ្នកឱ្យបានគ្រប់ជ្រុង</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_expanded">ប្រសិនបើអ្នកមើលមិនសូវច្បាស់ ឬធ្វើចលនាក្បាលបានតិចតួច ជម្រើសនេះគឺជាវិធីកាន់តែងាយស្រួលក្នុងការរៀបចំការដោះសោតាមទម្រង់មុខ។ នៅពេលប្រើការដោះសោតាមទម្រង់មុខ ក្បាលរបស់អ្នកប្រហែលជាត្រូវស្ថិតនៅចំពីមុខទូរសព្ទរបស់អ្នកជាងមុន។</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_diversity">ប្រើការដោះសោតាមទម្រង់មុខសម្រាប់ភាពងាយស្រួល</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_vision">តម្រូវឱ្យបើកភ្នែក</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_0">អាចពាក់វ៉ែនតា ឬវ៉ែនតាការពារពន្លឺថ្ងៃពណ៌ព្រឿងៗស្រាលបាន។</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_1">"ទិន្នន័យដែលបានថតដោយការដោះសោតាមទម្រង់មុខត្រូវបានរក្សាទុកដោយសុវត្ថិភាព និងមិនបែកធ្លាយចេញពីទូរសព្ទរបស់អ្នកឡើយ។ អ្នកអាចលុបទិន្នន័យរបស់អ្នកគ្រប់ពេលនៅក្នុងការកំណត់។\n\nទូរសព្ទរបស់អ្នកនឹងប្រើរូបភាពសម្រាប់ដោះសោតាមទម្រង់មុខថ្មីៗរបស់អ្នកម្ដងម្កាល ដើម្បីបង្កើតគំរូមុខដែលប្រសើរជាងមុន។"</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_2">"ការមើលទូរសព្ទអាចដោះសោទូរសព្ទបាន ទោះបីជាអ្នកមិនមានបំណងដោះសោក៏ដោយ។ អ្នកផ្សេងអាចដោះសោទូរសព្ទរបស់អ្នក ប្រសិនបើទូរសព្ទនេះស្ថិតនៅចំពីមុខរបស់អ្នក។\n\nអ្នកអាចតម្រូវឱ្យបើកភ្នែករបស់អ្នក ដើម្បីដោះសោនៅក្នុងការកំណត់។"</string>
+<string name="aosp_security_settings_face_enroll_introduction_footer_part_2_attention_not_supported">"ការមើលទៅទូរសព្ទអាចដោះសោទូរសព្ទបាន ទោះបីជាអ្នកមិនចង់ដោះសោក៏ដោយ។\n\nអ្នកផ្សេងអាចដោះសោទូរសព្ទរបស់អ្នក ប្រសិនបើវាស្ថិតនៅចំពីមុខរបស់អ្នក ទោះបីជាអ្នកបិទភ្នែកក៏ដោយ។"</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_3">អ្នកដែលមានមុខមាត់ស្រដៀងអ្នកខ្លាំង ដូចជាបងប្អូនបង្កើតដែលមានមុខមាត់ដូចអ្នកអាចដោះសោទូរសព្ទរបស់អ្នកបាន។</string>
+</resources>
diff --git a/res/values-km/google_strings.xml b/res/values-km/google_strings.xml
new file mode 100644
index 0000000..aefa2ed
--- /dev/null
+++ b/res/values-km/google_strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="battery_tip_smart_battery_summary_custom">បើកកម្មវិធីថ្មមានភាពបត់បែន</string>
+ <string name="smart_battery_footer_custom">"ដើម្បីបង្កើនរយៈពេលប្រើប្រាស់ថាមពលថ្ម កម្មវិធីថ្មមានភាពបត់បែនដាក់កម្រិតលើការប្រើប្រាស់ថ្មចំពោះកម្មវិធីដែលមិនសូវប្រើ។ ទូរសព្ទរបស់អ្នកនឹងស្វែងយល់ពីរបៀបដែលអ្នកប្រើកម្មវិធីជាបន្តបន្ទាប់។
+
+ការជូនដំណឹងអាចមានការពន្យារពេលសម្រាប់កម្មវិធីទាំងនេះ។"</string>
+ <string name="smart_battery_manager_title_custom">កម្មវិធីថ្មមានភាពបត់បែន</string>
+ <string name="smart_battery_title_custom">ប្រើកម្មវិធីថ្មមានភាពបត់បែន</string>
+ </resources>
diff --git a/res/values-km/strings.xml b/res/values-km/strings.xml
index a76b7c9..8819248 100644
--- a/res/values-km/strings.xml
+++ b/res/values-km/strings.xml
@@ -2677,9 +2677,6 @@
<string name="user_credentials" msgid="4044405430790970775">"ព័ត៌មានសម្គាល់ខ្លួនអ្នកប្រើ"</string>
<string name="user_credentials_summary" msgid="686471637627271856">"មើល និងកែប្រែព័ត៌មានសម្គាល់ខ្លួនដែលបានផ្ទុក"</string>
<string name="advanced_security_title" msgid="7117581975877192652">"កម្រិតខ្ពស់"</string>
- <string name="credential_storage_type" msgid="930861336971619888">"ប្រភេទឧបករណ៍ផ្ទុក"</string>
- <string name="credential_storage_type_hardware" msgid="2630040425119817220">"កន្លែងផ្ទុករបស់ផ្នែករឹង"</string>
- <string name="credential_storage_type_software" msgid="4786996040468294626">"កន្លែងផ្ទុករបស់កម្មវិធី"</string>
<string name="credentials_settings_not_available" msgid="7433088409177429600">"ព័ត៌មានសម្ងាត់មិនមានសម្រាប់អ្នកប្រើនេះទេ"</string>
<string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"បានដំឡើេងសម្រាប់ VPN និងកម្មវិធី"</string>
<string name="credential_for_wifi" msgid="1963335263280604998">"បានដំឡើងសម្រាប់ Wi-Fi"</string>
diff --git a/res/values-km/wellbeing_strings.xml b/res/values-km/wellbeing_strings.xml
new file mode 100644
index 0000000..b728903
--- /dev/null
+++ b/res/values-km/wellbeing_strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="duration_less_than_one_minute">តិចជាង 1 នាទី</string>
+ <string name="screen_time_summary_usage_today">%1$s ថ្ងៃនេះ</string>
+ </resources>
diff --git a/res/values-kn/aosp_strings.xml b/res/values-kn/aosp_strings.xml
new file mode 100644
index 0000000..0e190b1
--- /dev/null
+++ b/res/values-kn/aosp_strings.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <!-- Strings for face unlock enrollment, missing from AOSP-->
+ <string name="aosp_security_settings_face_enroll_education_message">ಮುಂದಿನ ಸ್ಕ್ರೀನ್ನಲ್ಲಿ, ನಿಮ್ಮ ಮುಖವನ್ನು ಎಲ್ಲಾ ಕೋನಗಳಲ್ಲಿ ಕ್ಯಾಪ್ಚರ್ ಮಾಡಲು ನಿಮ್ಮ ತಲೆಯನ್ನು ತಿರುಗಿಸಿ.</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_expanded">ನಿಮಗೆ ಸೀಮಿತ ದೃಷ್ಟಿ ಅಥವಾ ತಲೆ ಚಲನೆ ಇದ್ದರೆ, ಫೇಸ್ ಅನ್ಲಾಕ್ ಅನ್ನು ಸುಲಭವಾಗಿ ಹೊಂದಿಸಲು ನೀವು ಈ ವಿಧಾನವನ್ನು ಬಳಸಬಹುದು. ಫೇಸ್ ಅನ್ಲಾಕ್ ಬಳಸುವಾಗ, ನಿಮ್ಮ ತಲೆಯು ನಿಮ್ಮ ಸ್ಪಾರ್ಟ್ ಫೋನ್ಗೆ ನೇರವಾಗಿ ಇರಬೇಕಾಗುತ್ತದೆ.</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_diversity">ಫೇಸ್ ಅನ್ಲಾಕ್ ಪ್ರವೇಶಿಸುವಿಕೆಯನ್ನು ಬಳಸಿ</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_vision">ಕಣ್ಣುಗಳನ್ನು ತೆರೆದಿರಬೇಕು</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_0">ಕನ್ನಡಕಗಳು ಅಥವಾ ತಿಳಿಬಣ್ಣದ ಸನ್ ಗ್ಲಾಸ್ಗಳನ್ನು ಧರಿಸಬಹುದು.</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_1">"ಫೇಸ್ ಅನ್ಲಾಕ್ ಮೂಲಕ ದಾಖಲಿಸಿದ ಡೇಟಾವನ್ನು ಸುರಕ್ಷಿತವಾಗಿ ಸಂಗ್ರಹಿಸಲಾಗುತ್ತದೆ ಮತ್ತು ಅದನ್ನು ಎಂದಿಗೂ ಬಹಿರಂಗಪಡಿಸಲಾಗುವುದಿಲ್ಲ. ನೀವು ಯಾವ ಸಮಯದಲ್ಲಾದರೂ ನಿಮ್ಮ ಡೇಟಾವನ್ನು ಅಳಿಸಬಹುದು.\n\nಸುಧಾರಿತ ಫೇಸ್ ಮಾಡೆಲ್ಗಳನ್ನು ರಚಿಸಲು ನಿಮ್ಮ ಫೋನ್ ಇತ್ತೀಚಿನ ಫೇಸ್ ಅನ್ಲಾಕ್ ಚಿತ್ರಗಳನ್ನು ಸಾಂದರ್ಭಿಕವಾಗಿ ಬಳಸುತ್ತದೆ."</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_2">"ಫೋನ್ ಕಡೆ ನೋಡಿದಾಗ, ನಿಮಗೆ ಅಗತ್ಯವಿಲ್ಲದಿದ್ದರೂ ಫೋನ್ ಆನ್ ಆಗಬಹುದು. ಫೋನ್ ಅನ್ನು ನಿಮ್ಮ ಮುಖದ ಎದುರು ಹಿಡಿಯುವ ಮೂಲಕ, ಯಾರು ಬೇಕದಾರೂ ನಿಮ್ಮ ಫೋನ್ ಅನ್ನು ಅನ್ಲಾಕ್ ಮಾಡಬಹುದು.\n\nಸೆಟ್ಟಿಂಗ್ಗಳಲ್ಲಿ ಅನ್ಲಾಕ್ ಮಾಡಲು, ನಿಮ್ಮ ಕಣ್ಣುಗಳನ್ನು ತೆರೆದಿರಬೇಕಾಗಬಹುದು."</string>
+<string name="aosp_security_settings_face_enroll_introduction_footer_part_2_attention_not_supported">"ಫೋನ್ ಕಡೆ ನೋಡಿದರೆ, ನಿಮಗೆ ಬೇಡದಿದ್ದಾಗಲೂ ಫೋನ್ ಅನ್ಲಾಕ್ ಆಗಬಹುದು.\n\nನಿಮ್ಮ ಕಣ್ಣುಗಳು ಮುಚ್ಚಿದ್ದರೂ, ಫೋನ್ ಅನ್ನು ನಿಮ್ಮ ಮುಖದ ಎದುರು ಹಿಡಿಯುವ ಮೂಲಕ, ಬೇರೆ ಯಾರೂ ಕೂಡಾ ನಿಮ್ಮ ಫೋನ್ ಅನ್ನು ಅನ್ಲಾಕ್ ಮಾಡಬಹುದು."</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_3">ನಿಮ್ಮನ್ನು ತುಂಬಾ ಹೋಲುವ ವ್ಯಕ್ತಿ, ಉದಾಹರಣೆಗೆ ತದ್ರೂಪಿ ಸಹೋದರ/ಸಹೋದರಿಯೂ ಕೂಡಾ ನಿಮ್ಮ ಫೋನ್ ಅನ್ನು ಅನ್ಲಾಕ್ ಮಾಡಬಹುದು.</string>
+</resources>
diff --git a/res/values-kn/google_strings.xml b/res/values-kn/google_strings.xml
new file mode 100644
index 0000000..a1724c8
--- /dev/null
+++ b/res/values-kn/google_strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="battery_tip_smart_battery_summary_custom">ಅಡಾಪ್ಟಿವ್ ಬ್ಯಾಟರಿಯನ್ನು ಆನ್ ಮಾಡಿ</string>
+ <string name="smart_battery_footer_custom">"ಬ್ಯಾಟರಿ ಬಾಳಿಕೆಯನ್ನು ಹೆಚ್ಚಿಸಲು, ಅಡಾಪ್ಟಿವ್ ಬ್ಯಾಟರಿ ಮ್ಯಾನೇಜರ್ ಅಪರೂಪವಾಗಿ ಬಳಸುವ ಅಪ್ಲಿಕೇಶನ್ಗಳ ಬ್ಯಾಟರಿಯನ್ನು ಸೀಮಿತಗೊಳಿಸುತ್ತದೆ. ಕಾಲಾಂತರದಲ್ಲಿ ನಿಮ್ಮ ಫೋನ್ ನೀವು ಹೇಗೆ ಅಪ್ಲಿಕೇಶನ್ಗಳನ್ನು ಉಪಯೋಗಿಸುತ್ತೀರಿ ಎಂಬುದನ್ನು ಕಲಿಯುತ್ತದೆ.
+
+ಈ ಅಪ್ಲಿಕೇಶನ್ಗಳಿಗೆ ಅಧಿಸೂಚನೆಗಳು ವಿಳಂಬವಾಗಬಹುದು."</string>
+ <string name="smart_battery_manager_title_custom">ಅಡಾಪ್ಟಿವ್ ಬ್ಯಾಟರಿ</string>
+ <string name="smart_battery_title_custom">ಅಡಾಪ್ಟಿವ್ ಬ್ಯಾಟರಿಯನ್ನು ಉಪಯೋಗಿಸಿ</string>
+ </resources>
diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml
index fae490c..0da1231 100644
--- a/res/values-kn/strings.xml
+++ b/res/values-kn/strings.xml
@@ -2677,9 +2677,6 @@
<string name="user_credentials" msgid="4044405430790970775">"ಬಳಕೆದಾರ ರುಜುವಾತುಗಳು"</string>
<string name="user_credentials_summary" msgid="686471637627271856">"ಸಂಗ್ರಹಿಸಲಾದ ರುಜುವಾತುಗಳನ್ನು ವೀಕ್ಷಿಸಿ ಮತ್ತು ಮಾರ್ಪಡಿಸಿ"</string>
<string name="advanced_security_title" msgid="7117581975877192652">"ಸುಧಾರಿತ"</string>
- <string name="credential_storage_type" msgid="930861336971619888">"ಸಂಗ್ರಹಣೆಯ ಪ್ರಕಾರ"</string>
- <string name="credential_storage_type_hardware" msgid="2630040425119817220">"ಹಾರ್ಡ್ವೇರ್ ಬೆಂಬಲಿತ"</string>
- <string name="credential_storage_type_software" msgid="4786996040468294626">"ಸಾಫ್ಟ್ವೇರ್ ಮಾತ್ರ"</string>
<string name="credentials_settings_not_available" msgid="7433088409177429600">"ಈ ಬಳಕೆದಾರರಿಗೆ ರುಜುವಾತುಗಳು ಲಭ್ಯವಿಲ್ಲ"</string>
<string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"VPN ಮತ್ತು ಅಪ್ಲಿಕೇಶನ್ಗಳಿಗಾಗಿ ಸ್ಥಾಪಿಸಲಾಗಿದೆ"</string>
<string name="credential_for_wifi" msgid="1963335263280604998">"ವೈ-ಫೈಗೆ ಸ್ಥಾಪಿಸಲಾಗಿದೆ"</string>
diff --git a/res/values-kn/wellbeing_strings.xml b/res/values-kn/wellbeing_strings.xml
new file mode 100644
index 0000000..e6c9c96
--- /dev/null
+++ b/res/values-kn/wellbeing_strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="duration_less_than_one_minute">1 ನಿಮಿಷಕ್ಕಿಂತ ಕಡಿಮೆ</string>
+ <string name="screen_time_summary_usage_today">ಇಂದಿನ ಬಳಕೆ %1$s</string>
+ </resources>
diff --git a/res/values-ko/aosp_strings.xml b/res/values-ko/aosp_strings.xml
new file mode 100644
index 0000000..7502937
--- /dev/null
+++ b/res/values-ko/aosp_strings.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <!-- Strings for face unlock enrollment, missing from AOSP-->
+ <string name="aosp_security_settings_face_enroll_education_message">다음 화면이 표시되면 모든 각도에서 얼굴을 촬영할 수 있도록 고개를 돌리세요.</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_expanded">시력이 약하거나 고개를 움직이는 데 제약이 있는 경우 이 옵션을 사용하면 얼굴인식 잠금해제를 더 쉽게 설정할 수 있습니다. 얼굴인식 잠금해제를 사용할 때 휴대전화가 더욱 확실하게 얼굴 정면을 향하도록 해야 할 수 있습니다.</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_diversity">접근성 얼굴인식 잠금해제 사용</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_vision">눈을 뜨고 있어야 설정 가능</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_0">안경이나 옅은 색의 선글라스는 괜찮습니다.</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_1">"얼굴인식 잠금해제로 기록된 데이터는 안전하게 저장되며 휴대전화 외부로 전송되지 않습니다. 데이터는 설정에서 언제든지 삭제할 수 있습니다.\n\n휴대전화에서 얼굴 모델을 개선하기 위해 최근 얼굴인식 잠금해제 이미지를 사용하기도 합니다."</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_2">"휴대전화를 바라보면 의도치 않게 잠금이 해제될 수 있습니다. 다른 사람이 내 얼굴에 휴대전화를 가져다 대면 잠금이 해제될 수 있습니다.\n\n눈을 뜬 상태로만 잠금을 해제할 수 있도록 설정할 수 있습니다."</string>
+<string name="aosp_security_settings_face_enroll_introduction_footer_part_2_attention_not_supported">"휴대전화를 바라보면 의도치 않게 잠금이 해제될 수 있습니다.\n\n다른 사람이 내 얼굴에 휴대전화를 가져다 대면 눈을 감고 있더라도 잠금이 해제될 수 있습니다."</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_3">일란성 쌍둥이와 같이 나와 많이 닮은 사람이 휴대전화의 잠금을 해제할 수도 있습니다.</string>
+</resources>
diff --git a/res/values-ko/google_strings.xml b/res/values-ko/google_strings.xml
new file mode 100644
index 0000000..72bffb0
--- /dev/null
+++ b/res/values-ko/google_strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="battery_tip_smart_battery_summary_custom">배터리 자동 조절 사용 설정</string>
+ <string name="smart_battery_footer_custom">"배터리 자동 조절에서는 자주 사용하지 않는 앱의 배터리 사용량을 제한하여 배터리 수명을 늘립니다. 시간이 지남에 따라 휴대전화에서 사용자의 앱 사용 방식을 학습합니다.
+
+제한된 앱의 알림이 지연될 수 있습니다."</string>
+ <string name="smart_battery_manager_title_custom">배터리 자동 조절</string>
+ <string name="smart_battery_title_custom">배터리 자동 조절 사용</string>
+ </resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index d6c2a5f..04d28d7 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -2677,9 +2677,6 @@
<string name="user_credentials" msgid="4044405430790970775">"사용자 인증 정보"</string>
<string name="user_credentials_summary" msgid="686471637627271856">"저장된 사용자 인증 정보를 확인하고 수정"</string>
<string name="advanced_security_title" msgid="7117581975877192652">"고급"</string>
- <string name="credential_storage_type" msgid="930861336971619888">"저장공간 유형"</string>
- <string name="credential_storage_type_hardware" msgid="2630040425119817220">"하드웨어 지원"</string>
- <string name="credential_storage_type_software" msgid="4786996040468294626">"소프트웨어 전용"</string>
<string name="credentials_settings_not_available" msgid="7433088409177429600">"이 사용자는 자격증명을 확인하거나 수정할 수 없습니다."</string>
<string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"VPN 및 앱에 사용하도록 설치됨"</string>
<string name="credential_for_wifi" msgid="1963335263280604998">"Wi-Fi에 사용하도록 설치됨"</string>
diff --git a/res/values-ko/wellbeing_strings.xml b/res/values-ko/wellbeing_strings.xml
new file mode 100644
index 0000000..545a799
--- /dev/null
+++ b/res/values-ko/wellbeing_strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="duration_less_than_one_minute">1분 미만</string>
+ <string name="screen_time_summary_usage_today">%1$s(오늘)</string>
+ </resources>
diff --git a/res/values-ky/aosp_strings.xml b/res/values-ky/aosp_strings.xml
new file mode 100644
index 0000000..2490553
--- /dev/null
+++ b/res/values-ky/aosp_strings.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <!-- Strings for face unlock enrollment, missing from AOSP-->
+ <string name="aosp_security_settings_face_enroll_education_message">Кийинки экран ачылганда башыңызды буруп, жүзүңүздү ар кайсы тараптан тартыңыз</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_expanded">Эгер көздөрүңүз жакшы көрбөсө же башыңызды кыймылдата албасаңыз, ушул параметрди колдонсоңуз болот. Жүзүнөн таануу функциясы колдонулганда, жүзүңүз телефондун так маңдайында болушу керек.</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_diversity">Жүзүнөн таануу функциясын жөндөөнү жеңилдетүү</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_vision">Көзүңүз ачык болушу керек</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_0">Көз айнегиңизди чечпей эле койсоңуз болот (күндөн коргогон көз айнегиңизди да, эгер өтө капкара болбосо).</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_1">"Жүзүнөн таануу функциясы жаздырган нерселер телефонуңузда коопсуз сакталат. Аларды каалаган убакта өчүрүп салсаңыз болот.\n\nЖүзүнөн таануу функциясы менен тартылган жаңы сүрөттөр кез-кезде жүздүн жакшыртылган үлгүлөрүн түзүү үчүн колдонулат."</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_2">"Телефонуңузду карап койсоңуз эле, экраны ачылып калышы мүмкүн. Ошондой эле телефонуңузду ачкысы келген адам, аны жүзүңүзгө жакындатып койсо эле болду.\n\nЖөндөөлөргө өтүп, кошумча параметрлерди коюп койсоңуз болот. Мисалы, телефонум көздөрүм ачык болгондо гана ачылсын деген сыяктуу.."</string>
+<string name="aosp_security_settings_face_enroll_introduction_footer_part_2_attention_not_supported">"Телефонуңузду карап койсоңуз эле, кулпусу ачылып калышы мүмкүн.\n\nОшондой эле кимдир бирөө, көзүңүз жумулуп турганда да, телефонду жүзүңүзгө жакын алып келсе, кулпусу ачылат."</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_3">Телефонуңуздун кулпусун сизге абдан окшош адам, мисалы, бир тууганыңыз ачып алышы мүмкүн.</string>
+</resources>
diff --git a/res/values-ky/google_strings.xml b/res/values-ky/google_strings.xml
new file mode 100644
index 0000000..18930cc
--- /dev/null
+++ b/res/values-ky/google_strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="battery_tip_smart_battery_summary_custom">"Ыңгайлаштырылуучу Battery'ни күйгүзүңүз"</string>
+ <string name="smart_battery_footer_custom">"Батареяны узакка жеткирүү үчүн, Adaptive Battery функциясы сейрек колдонулуучу колдонмолордун ишин чектеп коет. Телефонуңуз акырындык менен кайсы колдонмолор көбүрөөк, кайсылары азыраак колдонулуп жаткандыгын аныктайт.
+
+Чектелген колдонмолордун билдирмелери кечигип көрүнүшү мүмкүн."</string>
+ <string name="smart_battery_manager_title_custom">Ыңгайлаштырылуучу Battery</string>
+ <string name="smart_battery_title_custom">Adaptive Battery функциясын иштетүү</string>
+ </resources>
diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
index e599246..c05d3a9 100644
--- a/res/values-ky/strings.xml
+++ b/res/values-ky/strings.xml
@@ -2677,9 +2677,6 @@
<string name="user_credentials" msgid="4044405430790970775">"Колдонуучунун каттоо маалыматы"</string>
<string name="user_credentials_summary" msgid="686471637627271856">"Сакталган эсептик дайын-даректерди көрүп/өзгөртө аласыз"</string>
<string name="advanced_security_title" msgid="7117581975877192652">"Өркүндөтүлгөн"</string>
- <string name="credential_storage_type" msgid="930861336971619888">"Сактагычтын түрү"</string>
- <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Аппараттык негизде"</string>
- <string name="credential_storage_type_software" msgid="4786996040468294626">"Програмдык гана"</string>
<string name="credentials_settings_not_available" msgid="7433088409177429600">"Бул колдонуучу далдаштырма дайындарын колдоно албайт"</string>
<string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"VPN жана колдонмолор үчүн орнотулган"</string>
<string name="credential_for_wifi" msgid="1963335263280604998">"Wi-Fi үчүн орнотулган"</string>
diff --git a/res/values-ky/wellbeing_strings.xml b/res/values-ky/wellbeing_strings.xml
new file mode 100644
index 0000000..35826e2
--- /dev/null
+++ b/res/values-ky/wellbeing_strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="duration_less_than_one_minute">1 мүнөткө жеткен жок</string>
+ <string name="screen_time_summary_usage_today">Бүгүн %1$s колдонулду</string>
+ </resources>
diff --git a/res/values-lo/aosp_strings.xml b/res/values-lo/aosp_strings.xml
new file mode 100644
index 0000000..f3e8695
--- /dev/null
+++ b/res/values-lo/aosp_strings.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <!-- Strings for face unlock enrollment, missing from AOSP-->
+ <string name="aosp_security_settings_face_enroll_education_message">ຢູ່ໜ້າຈໍຕໍ່ໄປ, ໃຫ້ປິ່ນຫົວຂອງທ່ານເພື່ອບັນທຶກໃບໜ້າທ່ານທຸກອົງສາ</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_expanded">ຫາກທ່ານເບິ່ງເຫັນ ຫຼື ເຄື່ອນໄຫວຫົວໄດ້ຈຳກັດ, ຕົວເລືອກນີ້ເປັນວິທີທີ່ງ່າຍກວ່າໃນການຕັ້ງຄ່າການປົດລັອກດ້ວຍໜ້າ. ເມື່ອໃຊ້ການປົດລັອກດ້ວຍໜ້າ, ຫົວຂອງທ່ານອາດຕ້ອງຢູ່ໜ້າໂທລະສັບຂອງທ່ານໃຫ້ຊື່ໆຫຼາຍຂຶ້ນ.</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_diversity">ໃຊ້ການປົດລັອກດ້ວຍໜ້າແບບຊ່ວຍເຂົ້າເຖິງ</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_vision">ຕ້ອງເປີດຕາເບິ່ງ</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_0">ແວ່ນຕາ ຫຼື ແວ່ນກັນແດດທີ່ມີສີເລັກນ້ອຍແມ່ນໃຊ້ໄດ້.</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_1">"ຂໍ້ມູນທີ່ບັນທຶກໄວ້ໂດຍການປົດລັອກດ້ວຍໜ້າຈະຖືກຈັດເກັບໄວ້ຢ່າງປອດໄພ ແລະ ບໍ່ຖືກສົ່ງອອກໄປຈາກໂທລະສັບຂອງທ່ານ. ທ່ານສາມາດລຶບຂໍ້ມູນຂອງທ່ານອອກໄດ້ຕະຫຼອດເວລາ.\n\nໂທລະສັບຂອງທ່ານຈະໃຊ້ຮູບການປົດລັອກດ້ວຍໜ້າຫຼ້າສຸດຂອງທ່ານເພື່ອປັບປຸງໂມເດວໃບໜ້າເປັນບາງໂອກາດ."</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_2">"ການເບິ່ງໂທລະສັບຈະສາມາດປົດລັອກມັນໄດ້ເຖິງແມ່ນວ່າທ່ານຈະບໍ່ຕັ້ງໃຈກໍຕາມ. ໂທລະສັບຂອງທ່ານສາມາດຖືກປົດລັອກໄດ້ໂດຍຄົນອື່ນຫາກມັນຖືກນຳໄປຍື່ນໃສ່ໜ້າທ່ານ.\n\nທ່ານສາມາດຕັ້ງໃຫ້ຕ້ອງມືນຕາກ່ອນຈຶ່ງຈະປົດລັອກໄດ້ໃນການຕັ້ງຄ່າ."</string>
+<string name="aosp_security_settings_face_enroll_introduction_footer_part_2_attention_not_supported">"ການເບິ່ງໂທລະສັບຈະສາມາດປົດລັອກມັນໄດ້ຕອນທີ່ທ່ານບໍ່ໄດ້ຕັ້ງໃຈປົດລັອກ.\n\nຄົນອື່ນສາມາດປົດລັອກໂທລະສັບຂອງທ່ານໄດ້ຫາກຖືມັນໄປໃສ່ໜ້າຂອງທ່ານ, ເຖິງແມ່ນວ່າທ່ານຈະກຳລັງຫຼັບຕາຢູ່ກໍຕາມ."</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_3">ຄົນອື່ນມີໜ້າຕາຄ້າຍທ່ານຫຼາຍ ເຊັ່ນ: ອ້າຍນ້ອງຝາແຝດ ຈະສາມາດປົດລັອກໂທລະສັບຂອງທ່ານໄດ້.</string>
+</resources>
diff --git a/res/values-lo/google_strings.xml b/res/values-lo/google_strings.xml
new file mode 100644
index 0000000..4fe126c
--- /dev/null
+++ b/res/values-lo/google_strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="battery_tip_smart_battery_summary_custom">ເປີດໃຊ້ແບັດເຕີຣີແບບປັບຕົວໄດ້</string>
+ <string name="smart_battery_footer_custom">"ເພື່ອເພີ່ມອາຍຸແບັດເຕີຣີ, ແບັດເຕີຣີແບບປັບຕົວໄດ້ຈະຈຳກັດແບັດເຕີຣີສຳລັບແອັບທີ່ບໍ່ຄ່ອຍໄດ້ໃຊ້. ໂທລະສັບຂອງທ່ານຈະຮຽນຮູ້ວິທີທີ່ທ່ານໃຊ້ແອັບຕ່າງໆເມື່ອເວລາຜ່ານໄປ.
+
+ການແຈ້ງເຕືອນອາດຊັກຊ້າສຳລັບແອັບເຫຼົ່ານີ້."</string>
+ <string name="smart_battery_manager_title_custom">ແບັດເຕີຣີແບບປັບຕົວໄດ້</string>
+ <string name="smart_battery_title_custom">ແບັດເຕີຣີແບບປັບຕົວໄດ້</string>
+ </resources>
diff --git a/res/values-lo/strings.xml b/res/values-lo/strings.xml
index 1a8e39d..a3eaa1e 100644
--- a/res/values-lo/strings.xml
+++ b/res/values-lo/strings.xml
@@ -2677,9 +2677,6 @@
<string name="user_credentials" msgid="4044405430790970775">"ຂໍ້ມູນປະຈໍາຕົວຜູ້ໃຊ້"</string>
<string name="user_credentials_summary" msgid="686471637627271856">"ເບິ່ງ ແລະ ດັດແປງຂໍ້ມູນປະຈໍາຕົວທີ່ເກັບໄວ້"</string>
<string name="advanced_security_title" msgid="7117581975877192652">"ຂັ້ນສູງ"</string>
- <string name="credential_storage_type" msgid="930861336971619888">"ປະເພດພື້ນທີ່ຈັດເກັບຂໍ້ມູນ"</string>
- <string name="credential_storage_type_hardware" msgid="2630040425119817220">"ໃຊ້ຮາດແວ"</string>
- <string name="credential_storage_type_software" msgid="4786996040468294626">"ຊອບແວເທົ່ານັ້ນ"</string>
<string name="credentials_settings_not_available" msgid="7433088409177429600">"ບໍ່ມີຂໍ້ມູນຮັບຮອງໂຕສຳລັບຜູ່ໃຊ້ນີ້"</string>
<string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"ຕິດຕັ້ງສຳລັບ VPN ແລະ ແອັບຕ່າງໆແລ້ວ"</string>
<string name="credential_for_wifi" msgid="1963335263280604998">"ຕິດຕັ້ງສຳລັບ Wi-Fi ແລ້ວ"</string>
diff --git a/res/values-lo/wellbeing_strings.xml b/res/values-lo/wellbeing_strings.xml
new file mode 100644
index 0000000..2dd8650
--- /dev/null
+++ b/res/values-lo/wellbeing_strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="duration_less_than_one_minute">ໜ້ອຍກວ່າ 1 ນາທີ</string>
+ <string name="screen_time_summary_usage_today">%1$s ມື້ນີ້</string>
+ </resources>
diff --git a/res/values-lt/aosp_strings.xml b/res/values-lt/aosp_strings.xml
new file mode 100644
index 0000000..8b45b72
--- /dev/null
+++ b/res/values-lt/aosp_strings.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <!-- Strings for face unlock enrollment, missing from AOSP-->
+ <string name="aosp_security_settings_face_enroll_education_message">Kitame ekrane pasukite galvą, kad užfiksuotumėte veidą visais kampais</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_expanded">Jei jūsų regėjimas arba galvos judesiai riboti, naudojant šią parinktį galima lengviau nustatyti Atrakinimą pagal veidą. Naudojant Atrakinimą pagal veidą, galva turi būti laikoma tiesiai priešais telefoną.</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_diversity">Naudokite neįgaliesiems pritaikytą Atrakinimą pagal veidą</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_vision">Akys turi būti atmerktos</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_0">Akiniai arba neryškaus atspalvio akiniai nuo saulės netrukdys.</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_1">"Naudojant Atrakinimą pagal veidą įrašyti duomenys saugiai saugomi ir visada lieka tik jūsų telefone. Savo duomenis galite bet kada ištrinti skiltyje „Nustatymai“.\n\nTelefonas retkarčiais naudos naujausius Atrakinimo pagal veidą vaizdus, kad galėtų sukurti patobulintus veido modelius."</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_2">"Žiūrėdami į telefoną galite jį atrakinti net neketindami to daryti. Telefoną gali atrakinti kitas asmuo, laikydamas jį priešais jūsų veidą.\n\nNustatymų skiltyje galite pasirinkti, kad būtų leidžiama atrakinti, tik kai esate atsimerkę."</string>
+<string name="aosp_security_settings_face_enroll_introduction_footer_part_2_attention_not_supported">"Žiūrint į telefoną jis gali būti atrakintas, kai to neketinate atlikti.\n\nTelefoną gali atrakinti kitas asmuo, laikydamas jį prieš jus, net kai esate užsimerkę."</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_3">Telefoną gali atrakinti į jus labai panašus asmuo, pvz., identiškas dvynys.</string>
+</resources>
diff --git a/res/values-lt/google_strings.xml b/res/values-lt/google_strings.xml
new file mode 100644
index 0000000..7b3a820
--- /dev/null
+++ b/res/values-lt/google_strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="battery_tip_smart_battery_summary_custom">Įjunkite prisitaikantį akumuliatorių</string>
+ <string name="smart_battery_footer_custom">"Kad akumuliatorius veiktų ilgiau, prisitaikantis akumuliatorius apriboja retai naudojamų programų akumuliatoriaus energijos naudojimą. Telefonas laikui bėgant sužinos, kaip naudojate programas.
+
+Šių programų pranešimai gali vėluoti."</string>
+ <string name="smart_battery_manager_title_custom">Prisitaikantis akumuliatorius</string>
+ <string name="smart_battery_title_custom">Naudoti prisitaikantį akumuliatorių</string>
+ </resources>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 692c477..4b14274 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -2753,9 +2753,6 @@
<string name="user_credentials" msgid="4044405430790970775">"Naudotojo prisijungimo duom."</string>
<string name="user_credentials_summary" msgid="686471637627271856">"Peržiūrėkite ir keiskite išsaugotus prisijungimo duomenis"</string>
<string name="advanced_security_title" msgid="7117581975877192652">"Išplėstiniai"</string>
- <string name="credential_storage_type" msgid="930861336971619888">"Saugyklos tipas"</string>
- <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Atsarginė kopija saugoma įrenginio vidinėje atmintyje"</string>
- <string name="credential_storage_type_software" msgid="4786996040468294626">"Saugoma tik programinėje įrangoje"</string>
<string name="credentials_settings_not_available" msgid="7433088409177429600">"Prisijungimo duomenys nepasiekiami šiam naudotojui"</string>
<string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Įdiegta VPN ir programoms"</string>
<string name="credential_for_wifi" msgid="1963335263280604998">"Įdiegta „Wi-Fi“"</string>
diff --git a/res/values-lt/wellbeing_strings.xml b/res/values-lt/wellbeing_strings.xml
new file mode 100644
index 0000000..9a8d5af
--- /dev/null
+++ b/res/values-lt/wellbeing_strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="duration_less_than_one_minute">Mažiau nei 1 min.</string>
+ <string name="screen_time_summary_usage_today">%1$s šiandien</string>
+ </resources>
diff --git a/res/values-lv/aosp_strings.xml b/res/values-lv/aosp_strings.xml
new file mode 100644
index 0000000..e18cb5b
--- /dev/null
+++ b/res/values-lv/aosp_strings.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <!-- Strings for face unlock enrollment, missing from AOSP-->
+ <string name="aosp_security_settings_face_enroll_education_message">Pēc pāriešanas uz nākamo ekrānu groziet galvu, lai tvertu seju no visiem leņķiem.</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_expanded">Ja jums ir vāja redze vai galvas kustību ierobežojumi, šī iespēja ir ērtāks veids, kā iestatīt autorizāciju pēc sejas. Izmantojot autorizāciju pēc sejas, jūsu galvai būs jābūt tieši pretī tālrunim.</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_diversity">Izmantot pieejamības autorizāciju pēc sejas</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_vision">Jābūt atvērtām acīm</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_0">Brilles vai viegli tonētas saulesbrilles netraucēs.</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_1">"Veicot autorizāciju pēc sejas, ierakstītie dati tiek droši glabāti un vienmēr atrodas tikai jūsu tālrunī. Iestatījumos varat jebkurā laikā dzēst šos datus.\n\nJūsu tālrunī laiku pa laikam tiks izmantoti nesenie autorizācijai pēc sejas lietotie attēli, lai uzlabotu sejas modeļus."</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_2">"Paskatoties uz tālruni, tas var tikt nejauši atbloķēts. Jūsu tālruni var atbloķēt kāds cits, ja tālrunis tiek turēts pret jūsu seju.\n\nIestatījumos varat norādīt, ka acīm ir jābūt atvērtām, lai atbloķētu tālruni."</string>
+<string name="aosp_security_settings_face_enroll_introduction_footer_part_2_attention_not_supported">"Skatoties uz tālruni, tas var tikt nejauši atbloķēts.\n\nJūsu tālruni var atbloķēt kāds cits, turot tālruni pret jūsu seju, pat ja jūsu acis ir aizvērtas."</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_3">Jūsu tālruni var atbloķēt jums līdzīga persona, piemēram, identiska izskata brālis vai māsa.</string>
+</resources>
diff --git a/res/values-lv/google_strings.xml b/res/values-lv/google_strings.xml
new file mode 100644
index 0000000..3fa82f4
--- /dev/null
+++ b/res/values-lv/google_strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="battery_tip_smart_battery_summary_custom">Ieslēgt režīmu Adaptīvais akumulators</string>
+ <string name="smart_battery_footer_custom">"Lai palielinātu akumulatora darbības ilgumu, režīms Adaptīvais akumulators ierobežo akumulatora enerģijas patēriņu reti izmantotām lietotnēm. Laika gaitā tālrunis apgūs lietotņu izmantošanas principus.
+
+Šo lietotņu paziņojumi var tikt parādīti aizkavēti."</string>
+ <string name="smart_battery_manager_title_custom">Adaptīvais akumulators</string>
+ <string name="smart_battery_title_custom">Izmantot režīmu Adaptīvais akumulators</string>
+ </resources>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index bf795b5..2fbfe92 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -2715,9 +2715,6 @@
<string name="user_credentials" msgid="4044405430790970775">"Lietotāja akreditācijas dati"</string>
<string name="user_credentials_summary" msgid="686471637627271856">"Saglabāto akreditācijas datu skatīšana un pārvaldīšana"</string>
<string name="advanced_security_title" msgid="7117581975877192652">"Papildu"</string>
- <string name="credential_storage_type" msgid="930861336971619888">"Krātuves tips"</string>
- <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Krātuve aparatūrā"</string>
- <string name="credential_storage_type_software" msgid="4786996040468294626">"Tikai programmatūrā"</string>
<string name="credentials_settings_not_available" msgid="7433088409177429600">"Šim lietotājam nav pieejami akreditācijas dati."</string>
<string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Instalēts VPN konfigurācijai un lietotnēm"</string>
<string name="credential_for_wifi" msgid="1963335263280604998">"Instalēts Wi-Fi konfigurācijai"</string>
diff --git a/res/values-lv/wellbeing_strings.xml b/res/values-lv/wellbeing_strings.xml
new file mode 100644
index 0000000..d3245d6
--- /dev/null
+++ b/res/values-lv/wellbeing_strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="duration_less_than_one_minute">Mazāk par 1 minūti</string>
+ <string name="screen_time_summary_usage_today">%1$s šodien</string>
+ </resources>
diff --git a/res/values-mk/aosp_strings.xml b/res/values-mk/aosp_strings.xml
new file mode 100644
index 0000000..9088ebc
--- /dev/null
+++ b/res/values-mk/aosp_strings.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <!-- Strings for face unlock enrollment, missing from AOSP-->
+ <string name="aosp_security_settings_face_enroll_education_message">На следниот екран, ротирајте ја главата за да се снимат сите агли на вашето лице</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_expanded">Ако имате ограничен вид или движење на главата, оваа опција е полесен начин да поставите „Отклучување со лик“. При користењето „Отклучување со лик“, вашата глава можеби ќе треба да ја поставите подиректно пред телефонот.</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_diversity">Користете „Отклучување со лик“ за пристапност</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_vision">Потребни се отворени очи</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_0">Очила и малку затемнети очила за сонце се во ред.</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_1">"Податоците снимени со „Отклучување со лик“ се складираат на безбедно и никогаш не го напуштаат вашиот телефон. Може да ги избришете во секое време во поставки.\n\nТелефонот понекогаш ќе ги користи вашите неодамнешни слики за „Отклучување со лик“ за да создаде подобрени модели на лице."</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_2">"Ако гледате во телефонот, тој може да се отклучи дури и ако немате таква намера. Некој друг може да го отклучи вашиот телефон ако го подигне до вашиот лик.\n\nМоже да одредите вашите очи да бидат отворени за отклучување во „Поставки“."</string>
+<string name="aosp_security_settings_face_enroll_introduction_footer_part_2_attention_not_supported">"Поглед кон телефонот може да го отклучи и кога немате таква намера.\n\nНекој друг може да го отклучи вашиот телефон ако го подигне до вашиот лик, дури и ако очите ви се затворени."</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_3">Телефонот може да го отклучи некој што многу наликува на вас, на пример, идентичен близнак.</string>
+</resources>
diff --git a/res/values-mk/google_strings.xml b/res/values-mk/google_strings.xml
new file mode 100644
index 0000000..5b9998c
--- /dev/null
+++ b/res/values-mk/google_strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="battery_tip_smart_battery_summary_custom">Вклучете „Адаптивна батерија“</string>
+ <string name="smart_battery_footer_custom">"За да го продолжи траењето на батеријата, „Адаптивната батерија“ ја ограничува батеријата за ретко користените апликации. Со тек на време, телефонот ќе научи како ги користите апликациите.
+
+Известувањата може да бидат одложени за овие апликации."</string>
+ <string name="smart_battery_manager_title_custom">Адаптивна батерија</string>
+ <string name="smart_battery_title_custom">Користи „Адаптивна батерија“</string>
+ </resources>
diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml
index 4c6d522..fcb8d95 100644
--- a/res/values-mk/strings.xml
+++ b/res/values-mk/strings.xml
@@ -2677,9 +2677,6 @@
<string name="user_credentials" msgid="4044405430790970775">"Кориснички акредитиви"</string>
<string name="user_credentials_summary" msgid="686471637627271856">"Прегледајте и изменете ги зачуваните акредитиви"</string>
<string name="advanced_security_title" msgid="7117581975877192652">"Напредни"</string>
- <string name="credential_storage_type" msgid="930861336971619888">"Тип меморија"</string>
- <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Хардверска"</string>
- <string name="credential_storage_type_software" msgid="4786996040468294626">"Само софтвер"</string>
<string name="credentials_settings_not_available" msgid="7433088409177429600">"Акредитивите не се достапни за овој корисник"</string>
<string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Инсталиран за VPN и апликации"</string>
<string name="credential_for_wifi" msgid="1963335263280604998">"Инсталиран за Wi-Fi"</string>
diff --git a/res/values-mk/wellbeing_strings.xml b/res/values-mk/wellbeing_strings.xml
new file mode 100644
index 0000000..fb76489
--- /dev/null
+++ b/res/values-mk/wellbeing_strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="duration_less_than_one_minute">Помалку од 1 минута</string>
+ <string name="screen_time_summary_usage_today">%1$s денес</string>
+ </resources>
diff --git a/res/values-ml/aosp_strings.xml b/res/values-ml/aosp_strings.xml
new file mode 100644
index 0000000..9ec234a
--- /dev/null
+++ b/res/values-ml/aosp_strings.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <!-- Strings for face unlock enrollment, missing from AOSP-->
+ <string name="aosp_security_settings_face_enroll_education_message">അടുത്ത സ്ക്രീനിൽ, നിങ്ങളുടെ മുഖത്തിന്റെ എല്ലാ ആംഗിളുകളും പകർത്താൻ തല റൊട്ടേറ്റ് ചെയ്യുക</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_expanded">നിങ്ങൾക്ക് പരിമിതമായ കാഴ്ചയും തലയനക്കവുമാണ് ഉള്ളതെങ്കിൽ, ഈ ഓപ്ഷൻ മുഖം തിരിച്ചറിഞ്ഞുള്ള അൺലോക്ക് സജ്ജീകരിക്കാനുള്ള എളുപ്പമാർഗ്ഗമാണ്. മുഖം തിരിച്ചറിഞ്ഞുള്ള അൺലോക്ക് ഉപയോഗിക്കുമ്പോൾ നിങ്ങളുടെ മുഖം ക്യാമറയ്ക്ക് നേരെയായിരിക്കണം.</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_diversity">ഉപയോഗസഹായി മുഖം തിരിച്ചറിഞ്ഞുള്ള അൺലോക്ക് ഉപയോഗിക്കുക</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_vision">ശ്രദ്ധിക്കേണ്ടത് ആവശ്യമാണ്</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_0">ഗ്ലാസുകളോ ഇളം നിറമുള്ള സൺ ഗ്ലാസുകളോ കുഴപ്പമില്ല.</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_1">"മുഖം തിരിച്ചറിഞ്ഞുള്ള അൺലോക്ക് റെക്കോർഡ് ചെയ്യുന്ന ഡാറ്റ സുരക്ഷിതമായി സംഭരിക്കുന്നു, അത് നിങ്ങളുടെ ഫോണിൽ നിന്ന് പുറത്തുപോവുകയില്ല. ഏതുസമയത്തും ക്രമീകരണത്തിൽ നിങ്ങളുടെ ഡാറ്റ ഇല്ലാതാക്കാനാകും.\n\nമെച്ചപ്പെട്ട മുഖ മോഡലുകൾ സൃഷ്ടിക്കാൻ ഫോൺ നിങ്ങളുടെ അടുത്ത കാലത്തെ മുഖം തിരിച്ചറിഞ്ഞുള്ള അൺലോക്ക് ചിത്രങ്ങൾ ഇടയ്ക്കിടെ ഉപയോഗിക്കും."</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_2">"നിങ്ങൾ തുറക്കാൻ ഉദ്ദേശിക്കാതെ വെറുതെ ഫോണിലേക്ക് നോക്കിയാലും അത് അൺലോക്കാകും. ഫോൺ നിങ്ങളുടെ മുഖത്തിനു നേരെ നീട്ടി ആർക്കും അത് അൺലോക്ക് ചെയ്യാം.\n\nഫോൺ അൺലോക്ക് ചെയ്യാൻ നിങ്ങളുടെ കണ്ണുകൾ തുറക്കണമെന്ന് ക്രമീകരണത്തിൽ ആവശ്യപ്പെടാം."</string>
+<string name="aosp_security_settings_face_enroll_introduction_footer_part_2_attention_not_supported">"വെറുതെ ഫോണിലേക്ക് നോക്കിയാൽ, നിങ്ങൾ ഉദ്ദേശിക്കാത്തപ്പോഴും അത് അൺലോക്കാകും.\n\nകണ്ണുകൾ അടച്ചിരിക്കുമ്പോൾ പോലും മറ്റാർക്കെങ്കിലും ഫോൺ നിങ്ങളുടെ മുഖത്തിനു നേരെ നീട്ടി അൺലോക്ക് ചെയ്യാം."</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_3">സാരൂപ്യമുള്ള കൂടപ്പിറപ്പിനെപ്പോലെ നിങ്ങളുമായി വളരെയധികം രൂപസാദൃശ്യമുള്ള ഒരാൾക്ക് നിങ്ങളുടെ ഫോൺ അൺലോക്ക് ചെയ്യാനാവും.</string>
+</resources>
diff --git a/res/values-ml/google_strings.xml b/res/values-ml/google_strings.xml
new file mode 100644
index 0000000..a91ada9
--- /dev/null
+++ b/res/values-ml/google_strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="battery_tip_smart_battery_summary_custom">അഡാപ്റ്റീവ് ബാറ്ററി ഓണാക്കുക</string>
+ <string name="smart_battery_footer_custom">"ബാറ്ററി ലൈഫ് വർദ്ധിപ്പിക്കാൻ, അപൂര്വ്വമായി ഉപയോഗിക്കുന്ന ആപ്പുകൾക്കായുള്ള ബാറ്ററി ഉപഭോഗം അഡാപ്റ്റീവ് ബാറ്ററി പരിമിതപ്പെടുത്തുന്നു. കാലക്രമത്തിൽ നിങ്ങൾ എങ്ങനെയാണ് ആപ്പുകൾ ഉപയോഗിക്കുന്നതെന്ന് ഫോൺ മനസിലാക്കും.
+
+ഈ ആപ്പുകളുടെ അറിയിപ്പുകൾ വൈകിയേക്കാം."</string>
+ <string name="smart_battery_manager_title_custom">അഡാപ്റ്റീവ് ബാറ്ററി</string>
+ <string name="smart_battery_title_custom">അഡാപ്റ്റീവ് ബാറ്ററി ഉപയോഗിക്കുക</string>
+ </resources>
diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml
index a84503e..8fc34cc 100644
--- a/res/values-ml/strings.xml
+++ b/res/values-ml/strings.xml
@@ -2677,9 +2677,6 @@
<string name="user_credentials" msgid="4044405430790970775">"ഉപയോക്തൃ ക്രെഡന്ഷ്യലുകൾ"</string>
<string name="user_credentials_summary" msgid="686471637627271856">"സംഭരിച്ച ക്രെഡന്ഷ്യലുകൾ കാണുക, പരിഷ്ക്കരിക്കുക"</string>
<string name="advanced_security_title" msgid="7117581975877192652">"വിപുലമായത്"</string>
- <string name="credential_storage_type" msgid="930861336971619888">"സ്റ്റോറേജ് തരം"</string>
- <string name="credential_storage_type_hardware" msgid="2630040425119817220">"ഹാർഡ്വെയറിൽ സംഭരിച്ചത്"</string>
- <string name="credential_storage_type_software" msgid="4786996040468294626">"സോഫ്റ്റ്വെയറിൽ മാത്രം"</string>
<string name="credentials_settings_not_available" msgid="7433088409177429600">"ഈ ഉപയോക്താവിന് ക്രെഡൻഷ്യലുകളൊന്നും ലഭ്യമല്ല"</string>
<string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"VPN, ആപ്സ് എന്നിവയ്ക്കായി ഇൻസ്റ്റാൾ ചെയ്തു"</string>
<string name="credential_for_wifi" msgid="1963335263280604998">"വൈഫൈ ഇൻസ്റ്റാൾ ചെയ്തു"</string>
diff --git a/res/values-ml/wellbeing_strings.xml b/res/values-ml/wellbeing_strings.xml
new file mode 100644
index 0000000..08597c3
--- /dev/null
+++ b/res/values-ml/wellbeing_strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="duration_less_than_one_minute">ഒരു മിനിറ്റിൽ താഴെ</string>
+ <string name="screen_time_summary_usage_today">ഇന്ന് %1$s</string>
+ </resources>
diff --git a/res/values-mn/aosp_strings.xml b/res/values-mn/aosp_strings.xml
new file mode 100644
index 0000000..ad9cf30
--- /dev/null
+++ b/res/values-mn/aosp_strings.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <!-- Strings for face unlock enrollment, missing from AOSP-->
+ <string name="aosp_security_settings_face_enroll_education_message">Дараагийн дэлгэц дээр царайныхаа бүхий л өнцгийн зургийг авахын тулд толгойгоо эргүүлнэ үү</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_expanded">Ta харааны бэрхшээлтэй эсвэл толгойгоо хөдөлгөх боломжгүй бол энэ сонголт нь царайгаар тайлах онцлогийг тохируулах хялбар арга юм. Царайгаар тайлах онцлогийг ашиглах үед таны толгой таны утасны урд талд аль болох эгц байх шаардлагатай.</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_diversity">Царайгаар тайлах хандалтын онцлогийг ашиглах</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_vision">Нүд нээлттэй байх шаардлагатай</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_0">Нүдний шил эсвэл үл ялиг өнгө оруулсан нарны шилнүүд зүгээр байна.</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_1">"Царайгаар тайлах онцлогоор бичсэн өгөгдлийг таны утсанд аюулгүйгээр бүрмөсөн хадгална. Та өгөгдлөө хүссэн үедээ тохиргооноос устгах боломжтой.\n\nТаны утас сайжруулсан нүүрний загвар үүсгэхийн тулд царайгаар тайлах онцлогийн таны сүүлийн үеийн зургуудыг үе үе ашиглах болно."</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_2">"Та утас руу санамсаргүй харснаар түгжээг нь тайлах боломжтой. Хэн нэгэн таны утсыг таны нүүр лүү харуулсан тохиолдолд түгжээг нь тайлах боломжтой.\n\nТа түгжээг тайлахад таны нүд нээлттэй байх шаардлагатай болгож Тохиргоо хэсэгт тохируулах боломжтой."</string>
+<string name="aosp_security_settings_face_enroll_introduction_footer_part_2_attention_not_supported">"Та утас руугаа санаандгүй харснаар түгжээг нь тайлах боломжтой.\n\nХэрэв хэн нэгэн таны утсыг нүүрний тань урд барьсан тохиолдолд та нүдээ аньсан байсан ч түгжээг нь тайлах боломжтой."</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_3">Таны ихэр зэрэг тантай маш адилхан харагддаг хүн таны утасны түгжээг тайлах боломжтой.</string>
+</resources>
diff --git a/res/values-mn/google_strings.xml b/res/values-mn/google_strings.xml
new file mode 100644
index 0000000..a53c9f9
--- /dev/null
+++ b/res/values-mn/google_strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="battery_tip_smart_battery_summary_custom">Дасан зохицох батарейг асаах</string>
+ <string name="smart_battery_footer_custom">"Дасан зохицох батарей нь батарейны ажиллах хугацааг уртасгахын тулд тогтмол ашигладаггүй аппуудын батарей ашиглалтыг хязгаарладаг. Таны утас таныг аппуудаа хэр тогтмол ашиглаж байгааг ашиглалтын явцад сурах болно.
+
+Эдгээр аппын мэдэгдэл хоцорч болзошгүй."</string>
+ <string name="smart_battery_manager_title_custom">Дасан зохицох батарей</string>
+ <string name="smart_battery_title_custom">Дасан зохицох батарейг ашиглах</string>
+ </resources>
diff --git a/res/values-mn/strings.xml b/res/values-mn/strings.xml
index 97d4b71..d289cfb 100644
--- a/res/values-mn/strings.xml
+++ b/res/values-mn/strings.xml
@@ -2677,9 +2677,6 @@
<string name="user_credentials" msgid="4044405430790970775">"Хэрэглэгчийн итгэмжлэл"</string>
<string name="user_credentials_summary" msgid="686471637627271856">"Хадгалсан өгөгдлийг харах, өөрчлөх"</string>
<string name="advanced_security_title" msgid="7117581975877192652">"Дэлгэрэнгүй"</string>
- <string name="credential_storage_type" msgid="930861336971619888">"Хадгалах сангийн төрөл"</string>
- <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Техник хангамжаар дэмжигдсэн"</string>
- <string name="credential_storage_type_software" msgid="4786996040468294626">"Зөвхөн программ"</string>
<string name="credentials_settings_not_available" msgid="7433088409177429600">"Энэ хэрэглэгчид итгэмжлэл байхгүй байна"</string>
<string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"VPN, апп-д суулгасан"</string>
<string name="credential_for_wifi" msgid="1963335263280604998">"Wi-Fi-д суулгасан"</string>
diff --git a/res/values-mn/wellbeing_strings.xml b/res/values-mn/wellbeing_strings.xml
new file mode 100644
index 0000000..e209fee
--- /dev/null
+++ b/res/values-mn/wellbeing_strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="duration_less_than_one_minute">1 минутаас бага</string>
+ <string name="screen_time_summary_usage_today">Өнөөдөр %1$s</string>
+ </resources>
diff --git a/res/values-mr/aosp_strings.xml b/res/values-mr/aosp_strings.xml
new file mode 100644
index 0000000..e08321f
--- /dev/null
+++ b/res/values-mr/aosp_strings.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <!-- Strings for face unlock enrollment, missing from AOSP-->
+ <string name="aosp_security_settings_face_enroll_education_message">स्क्रीन पुढे, तुमच्या चेहऱ्यावरील सर्व कोन कॅप्चर करण्यासाठी तुमचे डोके फिरवा</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_expanded">तुमची दृष्टी किंवा डोक्याच्या हालचाली मर्यादित असल्यास, हा पर्याय म्हणजे फेस अनलॉक सेट करण्याचा सर्वात सोपा मार्ग आहे. फेस अनलॉक वापरताना, तुमचा चेहरा तुमच्या फोनच्या थेट समोर असणे आवश्यक आहे.</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_diversity">अॅक्सेसिबिलिटी फेस अनलॉक वापरा</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_vision">सावध राहण्याची आवश्यकता आहे</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_0">चष्मा किंवा हलक्या रंगाचा सनग्लास ठीक आहे.</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_1">"फेस अनलॉकद्वारे रेकॉर्ड केलेला डेटा सुरक्षितपणे स्टोअर केला जातो आणि तो तुमच्या फोनमध्येच राहतो. तुम्ही तुमचा डेटा सेटिंग्जमधून कधीही हटवू शकता.\n\n सुधारित फेस मॉडेल तयार करण्यासाठी, तुमचा फोन अधूनमधून तुमच्या अलीकडील फेस अनलॉक इमेज वापरतो."</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_2">"फोन अनलॉक करायचा नसतानाही तुम्ही त्याकडे पाहिल्यास तो अनलॉक होऊ शकतो. एखाद्या व्यक्तीने तुमचा फोन तुमच्या चेहऱ्याकडे धरल्यास तुमचा फोन अनलॉक केला जाऊ शकतो.\n\n सेटिंग्ज मध्ये अनलॉक करण्यासाठी तुम्ही तुमचे डोळे उघडे ठेवणे आवश्यक आहे."</string>
+<string name="aosp_security_settings_face_enroll_introduction_footer_part_2_attention_not_supported">"तुम्हाला फोन अनलॉक करायचा नसतानादेखील तुम्ही फोनकडे पाहिल्यामुळे तो अनलॉक होऊ शकतो.\n\nदुसऱ्या कोणीतरी तुमचा फोन तुमच्या चेहऱ्यासमोर धरल्यास, तुमचे डोळे बंद असतानादेखील ताे अनलॉक केला जाऊ शकतो."</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_3">तुमच्यासारखी दिसणारी व्यक्ती, जसे की भावंडं - तुमचा फोन अनलॉक करू शकते.</string>
+</resources>
diff --git a/res/values-mr/google_strings.xml b/res/values-mr/google_strings.xml
new file mode 100644
index 0000000..ef963da
--- /dev/null
+++ b/res/values-mr/google_strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="battery_tip_smart_battery_summary_custom">अॅडॅप्टिव्ह बॅटरी सुरू करा</string>
+ <string name="smart_battery_footer_custom">"बॅटरी दीर्घकाळ टिकावी म्हणून, अॅडाप्टिव्ह बॅटरी व्यवस्थापकाद्वारे क्वचित वापरल्या जाणाऱ्या अॅप्ससाठी बॅटरीचा वापर मर्यादित केला जातो. काळानुसार तुमचा फोन तुम्ही अॅप्स कसे वापरता हे शिकेल.
+
+या अॅप्ससाठी सूचना येण्यास उशीर होऊ शकतो."</string>
+ <string name="smart_battery_manager_title_custom">अॅडॅप्टिव्ह बॅटरी</string>
+ <string name="smart_battery_title_custom">अॅडॅप्टिव्ह बॅटरी वापरा</string>
+ </resources>
diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index da4881c..41f0a26 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -2678,9 +2678,6 @@
<string name="user_credentials" msgid="4044405430790970775">"वापरकर्ता क्रेडेंशियल"</string>
<string name="user_credentials_summary" msgid="686471637627271856">"स्टोअर केलेली क्रेडेंशियल पाहा आणि त्यांत सुधारणा करा"</string>
<string name="advanced_security_title" msgid="7117581975877192652">"प्रगत"</string>
- <string name="credential_storage_type" msgid="930861336971619888">"स्टोरेज प्रकार"</string>
- <string name="credential_storage_type_hardware" msgid="2630040425119817220">"हार्डवेअर बॅकअप घेतला"</string>
- <string name="credential_storage_type_software" msgid="4786996040468294626">"केवळ सॉफ्टवेअर"</string>
<string name="credentials_settings_not_available" msgid="7433088409177429600">"या वापरकर्त्यासाठी क्रेडेंशियल उपलब्ध नाहीत"</string>
<string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"VPN आणि ॲप्ससाठी इंस्टॉल केले"</string>
<string name="credential_for_wifi" msgid="1963335263280604998">"वाय-फाय साठी इंस्टॉल केले"</string>
diff --git a/res/values-mr/wellbeing_strings.xml b/res/values-mr/wellbeing_strings.xml
new file mode 100644
index 0000000..698f89f
--- /dev/null
+++ b/res/values-mr/wellbeing_strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="duration_less_than_one_minute">एका मिनिटापेक्षा कमी</string>
+ <string name="screen_time_summary_usage_today">आज %1$s</string>
+ </resources>
diff --git a/res/values-ms/aosp_strings.xml b/res/values-ms/aosp_strings.xml
new file mode 100644
index 0000000..b0d2246
--- /dev/null
+++ b/res/values-ms/aosp_strings.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <!-- Strings for face unlock enrollment, missing from AOSP-->
+ <string name="aosp_security_settings_face_enroll_education_message">Pada skrin seterusnya, pusingkan kepala anda agar semua sudut wajah anda dapat dirakam.</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_expanded">Jika penglihatan atau gerakan kepala anda terhad, pilihan ini ialah cara yang lebih mudah untuk menyediakan wajah buka kunci. Apabila menggunakan wajah buka kunci, kepala anda mungkin perlu berada betul-betul di hadapan telefon.</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_diversity">Gunakan wajah buka kunci kebolehaksesan</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_vision">Mata perlu dibuka</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_0">Cermin mata atau cermin mata hitam yang cair warna hitamnya boleh digunakan.</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_1">"Data yang dirakam oleh wajah buka kunci disimpan dengan selamat dan tidak sekali-kali dihantar keluar daripada telefon anda. Anda boleh memadamkan data pada bila-bila masa dalam tetapan.\n\nSekali-sekala, telefon anda akan menggunakan imej wajah buka kunci anda yang terbaharu untuk membuat model wajah yang dipertingkat."</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_2">"Tindakan melihat telefon boleh membuka kunci telefon itu meskipun anda tidak bermaksud untuk berbuat demikian. Telefon anda boleh dibuka kuncinya oleh orang lain jika dihalakan rapat ke wajah anda.\n\nDalam Tetapan, anda boleh menghendaki mata anda dibuka untuk membuka kunci telefon."</string>
+<string name="aosp_security_settings_face_enroll_introduction_footer_part_2_attention_not_supported">"Tindakan melihat telefon boleh membuka kunci telefon itu walaupun anda tidak bermaksud untuk berbuat demikian.\n\nTelefon anda boleh dibuka kunci oleh orang lain jika dihalakan rapat ke wajah anda meskipun mata anda tertutup."</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_3">Telefon anda boleh dibuka kuncinya oleh seseorang yang berwajah iras anda, seperti adik beradik seiras.</string>
+</resources>
diff --git a/res/values-ms/google_strings.xml b/res/values-ms/google_strings.xml
new file mode 100644
index 0000000..3c92098
--- /dev/null
+++ b/res/values-ms/google_strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="battery_tip_smart_battery_summary_custom">Hidupkan Bateri Mudah Suai</string>
+ <string name="smart_battery_footer_custom">"Untuk melanjutkan hayat bateri, Bateri Mudah Suai mengehadkan bateri untuk apl yang jarang digunakan. Telefon anda akan mempelajari cara anda menggunakan apl dari semasa ke semasa.
+
+Pemberitahuan mungkin ditangguhkan untuk apl ini."</string>
+ <string name="smart_battery_manager_title_custom">Bateri Mudah Suai</string>
+ <string name="smart_battery_title_custom">Gunakan Bateri Mudah Suai</string>
+ </resources>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index 936f755..7e88192 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -2677,9 +2677,6 @@
<string name="user_credentials" msgid="4044405430790970775">"Bukti kelayakan pengguna"</string>
<string name="user_credentials_summary" msgid="686471637627271856">"Lihat dan ubah suai bukti kelayakan yang disimpan"</string>
<string name="advanced_security_title" msgid="7117581975877192652">"Lanjutan"</string>
- <string name="credential_storage_type" msgid="930861336971619888">"Jenis storan"</string>
- <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Bersandarkan perkakasan"</string>
- <string name="credential_storage_type_software" msgid="4786996040468294626">"Perisian sahaja"</string>
<string name="credentials_settings_not_available" msgid="7433088409177429600">"Bukti kelayakan tidak tersedia untuk pengguna ini"</string>
<string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Dipasang untuk VPN dan apl"</string>
<string name="credential_for_wifi" msgid="1963335263280604998">"Dipasang untuk Wi-Fi"</string>
diff --git a/res/values-ms/wellbeing_strings.xml b/res/values-ms/wellbeing_strings.xml
new file mode 100644
index 0000000..0f22fa2
--- /dev/null
+++ b/res/values-ms/wellbeing_strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="duration_less_than_one_minute">Kurang daripada seminit</string>
+ <string name="screen_time_summary_usage_today">%1$s hari ini</string>
+ </resources>
diff --git a/res/values-my/aosp_strings.xml b/res/values-my/aosp_strings.xml
new file mode 100644
index 0000000..e45eab5
--- /dev/null
+++ b/res/values-my/aosp_strings.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <!-- Strings for face unlock enrollment, missing from AOSP-->
+ <string name="aosp_security_settings_face_enroll_education_message">နောက်စာမျက်နှာတွင် သင့်မျက်နှာ၏ ရှုထောင့်ပေါင်းစုံကို ရိုက်ယူရန် သင့်ဦးခေါင်းကို လှည့်ပါ</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_expanded">မျက်လုံးအားနည်းပြီး ခေါင်းသိပ်လှုပ်၍မရလျှင် မျက်နှာမှတ် သော့ဖွင့်ခြင်း ထည့်သွင်းရာတွင် ပိုလွယ်ကူစေရန် ဤနည်းကို အသုံးပြုပါ။ မျက်နှာမှတ် သော့ဖွင့်ခြင်း အသုံးပြုသည့်အခါ သင့်မျက်နှာကို ဖုန်းရှေ့တွင် တည့်အောင်ထားပေးရမည်။</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_diversity">အသုံးလွယ်သော မျက်နှာမှတ် သော့ဖွင့်ခြင်း အသုံးပြုရန်</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_vision">မျက်လုံးများ ဖွင့်ထားရန် လိုအပ်သည်</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_0">မျက်မှန်များ သို့မဟုတ် အရောင်အနည်းငယ်ပါသည့် နေကာမျက်မှန်များကို သုံးနိုင်သည်။</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_1">"မျက်နှာမှတ် သော့ဖွင့်ခြင်းဖြင့် မှတ်တမ်းတင်ထားသည့် ဒေတာကို သင့်ဖုန်းအတွင်း၌သာ လုံခြုံစွာ သိမ်းဆည်းထားပါသည်။ သင်၏ ဒေတာကို ဆက်တင်များတွင် အချိန်မရွေး ဖျက်နိုင်ပါသည်။\n\nပိုမိုကောင်းမွန်သည့် မျက်နှာနမူနာများပြုလုပ်ရန် သင့်ဖုန်းသည် သင်၏ မျက်နှာမှတ် သော့ဖွင့်ခြင်း လတ်တလောပုံများကို အခါအားလျော်စွာ အသုံးပြုပါမည်။"</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_2">"မတော်တဆ သင့်ဖုန်းကို ကြည့်မိရုံမျှဖြင့် ဖုန်းပွင့်သွားနိုင်ပါသည်။ တစ်စုံတစ်ယောက်က သင့်မျက်နှာအနီး သင့်ဖုန်းကိုကိုင်၍လည်း ဖွင့်နိုင်သည်။\n\nသင့်မျက်လုံးများ ဖွင့်ထားမှသာ စက်ပွင့်စေရန် 'ဆက်တင်' တွင် ပြောင်းလဲထားနိုင်သည်။"</string>
+<string name="aosp_security_settings_face_enroll_introduction_footer_part_2_attention_not_supported">"သင့်ဖုန်းကို မတော်တဆကြည့်မိရုံဖြင့် ဖုန်းပွင့်သွားနိုင်သည်။\n\nမျက်လုံးများပိတ်ထားသော်လည်း တစ်စုံတစ်ယောက်က သင်၏မျက်နှာအနီးတွင် သင့်ဖုန်းကို ကိုင်ထားခြင်းဖြင့် လော့ခ်ဖွင့်နိုင်သည်။"</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_3">အမြွှာကဲ့သို့ သင်နှင့် အလွန်တူသူများသည်လည်း သင့်ဖုန်းကို ဖွင့်နိုင်သည်။</string>
+</resources>
diff --git a/res/values-my/google_strings.xml b/res/values-my/google_strings.xml
new file mode 100644
index 0000000..71594a2
--- /dev/null
+++ b/res/values-my/google_strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="battery_tip_smart_battery_summary_custom">"'အလိုက်အထိုက် ဘက်ထရီအားထိန်း' ကို ဖွင့်ပါ"</string>
+ <string name="smart_battery_footer_custom">"ဘက်ထရီသက်တမ်း တိုးလာစေရန် 'အလိုက်သင့် ဘက်ထရီအားထိန်း' သည် အသုံးနည်းသည့် အက်ပ်များအတွက် ဘက်ထရီကို ကန့်သတ်ပေးပါသည်။ သင်၏ဖုန်းသည် အချိန်ကြာလာသည်နှင့် အမျှ အက်ပ်များကို မည်ကဲ့သို့ အသုံးပြုသင့်ကြောင်း လေ့လာသွားပါမည်။
+
+ဤအက်ပ်များအတွက် အကြောင်းကြားချက်များသည် ကြန့်ကြာမှု ရှိနိုင်ပါသည်။"</string>
+ <string name="smart_battery_manager_title_custom">အလိုက်အထိုက် ဘက်ထရီအားထိန်း</string>
+ <string name="smart_battery_title_custom">"'အလိုက်အထိုက် ဘက်ထရီအားထိန်း' ကို သုံးပါ"</string>
+ </resources>
diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
index 15544ee..79cd1a1 100644
--- a/res/values-my/strings.xml
+++ b/res/values-my/strings.xml
@@ -2677,9 +2677,6 @@
<string name="user_credentials" msgid="4044405430790970775">"အသုံးပြုသူ၏ အထောက်အထားများ"</string>
<string name="user_credentials_summary" msgid="686471637627271856">"သိမ်းဆည်းထားသည့် အထောက်အထားများကို ကြည့်ပြီး မွမ်းမံရန်"</string>
<string name="advanced_security_title" msgid="7117581975877192652">"အဆင့်မြင့်"</string>
- <string name="credential_storage_type" msgid="930861336971619888">"သိုလှောင်ခန်း အမျိုးအစား"</string>
- <string name="credential_storage_type_hardware" msgid="2630040425119817220">"ဟာ့ဒ်ဝဲနှင့် ချိတ်ဆက်ထားသော"</string>
- <string name="credential_storage_type_software" msgid="4786996040468294626">"ဆော့ဖ်ဝဲသပ်သပ်"</string>
<string name="credentials_settings_not_available" msgid="7433088409177429600">"ဒီအသုံးပြုသူ အတွက် စိတ်ချရ အချက်များ မရှိ"</string>
<string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"VPN နှင့် အက်ပ်များအတွက် ထည့်သွင်းထားပါသည်"</string>
<string name="credential_for_wifi" msgid="1963335263280604998">"Wi-Fi အတွက် ထည့်သွင်းထားပါသည်"</string>
diff --git a/res/values-my/wellbeing_strings.xml b/res/values-my/wellbeing_strings.xml
new file mode 100644
index 0000000..3812eef
--- /dev/null
+++ b/res/values-my/wellbeing_strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="duration_less_than_one_minute">၁ မိနစ်အောက်</string>
+ <string name="screen_time_summary_usage_today">ယနေ့ %1$s</string>
+ </resources>
diff --git a/res/values-nb/aosp_strings.xml b/res/values-nb/aosp_strings.xml
new file mode 100644
index 0000000..8c4049f
--- /dev/null
+++ b/res/values-nb/aosp_strings.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <!-- Strings for face unlock enrollment, missing from AOSP-->
+ <string name="aosp_security_settings_face_enroll_education_message">På neste skjerm roterer du hodet for å fange inn alle vinkler av ansiktet ditt</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_expanded">Hvis du har begrenset syn eller hodebevegelse, er dette alternativet en enklere måte å konfigurere Ansiktslås på. Når du bruker Ansiktslås, må du muligens ha hodet mer rett foran telefonen.</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_diversity">Bruk Ansiktslås med tilgjengelighet</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_vision">Krever at øynene er åpne</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_0">Briller eller lyse solbriller går bra.</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_1">"Dataene som registreres av Ansiktslås, lagres på en sikker måte og sendes aldri fra telefonen din. Du kan når som helst slette dataene dine i innstillingene.\n\nTelefonen din bruker av og til nylige bilder fra ansiktslåsen til å lage bedre ansiktsmodeller."</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_2">"Hvis du ser på telefonen, kan den låses opp selv om det ikke er meningen. Telefonen din kan låses opp av noen andre hvis den holdes mot ansiktet ditt.\n\nI innstillingene kan du kreve at øynene dine er åpne for å låse opp."</string>
+<string name="aosp_security_settings_face_enroll_introduction_footer_part_2_attention_not_supported">"Hvis du ser på telefonen, kan den låses opp, selv om det ikke er meningen.\n\nTelefonen din kan låses opp av andre hvis den holdes mot ansiktet ditt, selv om øynene dine er lukket."</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_3">Telefonen kan låses opp av noen som ligner veldig på deg, for eksempel en tvilling.</string>
+</resources>
diff --git a/res/values-nb/google_strings.xml b/res/values-nb/google_strings.xml
new file mode 100644
index 0000000..856d66f
--- /dev/null
+++ b/res/values-nb/google_strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="battery_tip_smart_battery_summary_custom">Slå på Tilpasset batteri</string>
+ <string name="smart_battery_footer_custom">"Tilpasset batteri begrenser batteribruken for apper du bruker sjelden, for å forlenge batterilevetiden. Telefonen lærer hvordan du bruker apper over tid.
+
+Varsler kan bli forsinket for disse appene."</string>
+ <string name="smart_battery_manager_title_custom">Tilpasset batteri</string>
+ <string name="smart_battery_title_custom">Bruk Tilpasset batteri</string>
+ </resources>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 528cd25..9586a63 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -2677,9 +2677,6 @@
<string name="user_credentials" msgid="4044405430790970775">"Brukerlegitimasjon"</string>
<string name="user_credentials_summary" msgid="686471637627271856">"Se og endre lagret legitimasjon"</string>
<string name="advanced_security_title" msgid="7117581975877192652">"Avansert"</string>
- <string name="credential_storage_type" msgid="930861336971619888">"Lagringstype"</string>
- <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Maskinvarebasert"</string>
- <string name="credential_storage_type_software" msgid="4786996040468294626">"Bare programvare"</string>
<string name="credentials_settings_not_available" msgid="7433088409177429600">"Legitimasjon er ikke tilgjengelig for denne brukeren"</string>
<string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Installert for VPN og apper"</string>
<string name="credential_for_wifi" msgid="1963335263280604998">"Installert for Wi-Fi"</string>
diff --git a/res/values-nb/wellbeing_strings.xml b/res/values-nb/wellbeing_strings.xml
new file mode 100644
index 0000000..e72f23a
--- /dev/null
+++ b/res/values-nb/wellbeing_strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="duration_less_than_one_minute">Under ett minutt</string>
+ <string name="screen_time_summary_usage_today">%1$s i dag</string>
+ </resources>
diff --git a/res/values-ne/aosp_strings.xml b/res/values-ne/aosp_strings.xml
new file mode 100644
index 0000000..be66ce4
--- /dev/null
+++ b/res/values-ne/aosp_strings.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <!-- Strings for face unlock enrollment, missing from AOSP-->
+ <string name="aosp_security_settings_face_enroll_education_message">अब आउने स्क्रिनमा, सबै कोणहरूबाट आफ्नो अनुहार खिच्न टाउको घुमाउनुहोस्</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_expanded">तपाईंको दृष्टि क्षमता वा टाउको हलचल गर्ने क्षमता कम छ भने फेस अनलक सेटअप गर्ने अझ सरल तरिका भनेकै यो विकल्प हो। फेस अनलक सुविधा प्रयोग गर्दा तपाईंको टाउको तपाईंको फोनको अझ सीधा हुनु पर्ने हुन्छ।</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_diversity">पहुँचसम्बन्धी फेस अनलक प्रयोग गर्नुहोस्</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_vision">आँखा खुला राख्नु पर्छ</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_0">चश्मा र हल्का रंगीन सनग्लासहरू प्रयोग गर्दा हुन्छ।</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_1">"फेस अनलकले रेकर्ड गरेको डेटा सुरक्षित रूपमा भण्डारण गरिन्छ र उक्त डेटा तपाईंको फोनमै रहिरहन्छ। तपाईं जुनसुकै बेला सेटिङमा गई आफ्नो डेटा मेट्न सक्नुहुन्छ।\n\nअनुहारसम्बन्धी सुधारिएको मोडेल सिर्जना गर्न तपाईंको फोनले आवधिक रूपमा तपाईंका हालसालैका फेस अनलकका छविहरू प्रयोग गर्ने छ।"</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_2">"तपाईंले खोल्न नचाहे पनि फोनमा हेर्नुभयो भने त्यो खुल्न सक्छ। अरू कसैले तपाईंको अनुहारका अगाडि फोन लगे भने तपाईंको फोन अनलक हुन सक्छ।\n\nतपाईं सेटिङमा गई अनलक गर्नका निम्ति आफ्ना आँखा खुला हुनै पर्ने बनाउन सक्नुहुन्छ।"</string>
+<string name="aosp_security_settings_face_enroll_introduction_footer_part_2_attention_not_supported">"फोनमा हेर्नुभयो भने तपाईंले अनलक गर्न नचाहेका बेला पनि फोन अनलक हुन सक्छ।\n\nतपाईंका आँखा बन्द नै छन् भने पनि कसैले तपाईंको अनुहारका अगाडि फोन लगे भने तपाईंको फोन अनलक हुन सक्छ।"</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_3">तपाईंकै जस्तो अनुहार हुने दाजुभाइ/दिदीबहिनीले पनि तपाईंको फोन खोल्न सक्छन्।</string>
+</resources>
diff --git a/res/values-ne/google_strings.xml b/res/values-ne/google_strings.xml
new file mode 100644
index 0000000..23437a3
--- /dev/null
+++ b/res/values-ne/google_strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="battery_tip_smart_battery_summary_custom">अनुकूलनीय ब्याट्री सक्रिय गर्नुहोस्</string>
+ <string name="smart_battery_footer_custom">"ब्याट्रीको आयु बढाउन, अनुकूलनीय ब्याट्रीले ब्याट्रीलाई कहिलेकाहीँ मात्र प्रयोग गरिने अनुप्रयोगहरूमा सीमित गर्दछ। तपाईंको ट्याब्लेटले अनुप्रयोहरूलाई समयअनुसार कसरी प्रयोग गर्ने भन्ने सिक्ने छ।
+
+यी अनुप्रयोगहरूसम्बन्धी सूचनाहरू आइपुग्न ढिलाइ हुन सक्छ।"</string>
+ <string name="smart_battery_manager_title_custom">अनुकूलनीय ब्याट्री</string>
+ <string name="smart_battery_title_custom">अनुकूलनीय ब्याट्री प्रयोग गर्नुहोस्</string>
+ </resources>
diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index 36b7760..be36e96 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml
@@ -2677,9 +2677,6 @@
<string name="user_credentials" msgid="4044405430790970775">"प्रयोगकर्ताका प्रमाणपत्रहरू"</string>
<string name="user_credentials_summary" msgid="686471637627271856">"भण्डारमा भएका प्रमाणपत्रहरू हेर्नुहोस् र परिमार्जन गर्नुहोस्"</string>
<string name="advanced_security_title" msgid="7117581975877192652">"उन्नत"</string>
- <string name="credential_storage_type" msgid="930861336971619888">"भण्डारण प्रकार"</string>
- <string name="credential_storage_type_hardware" msgid="2630040425119817220">"हार्डवेयर-ब्याक गरिएको"</string>
- <string name="credential_storage_type_software" msgid="4786996040468294626">"सफ्टवेयर मात्र"</string>
<string name="credentials_settings_not_available" msgid="7433088409177429600">"साखकर्ताहरू यस प्रयोगकर्ताका लागि उपलव्ध छैन"</string>
<string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"VPN र अनुप्रयोगहरूका लागि स्थापना गरिएको"</string>
<string name="credential_for_wifi" msgid="1963335263280604998">"Wi-Fi का लागि स्थापना गरिएको"</string>
diff --git a/res/values-ne/wellbeing_strings.xml b/res/values-ne/wellbeing_strings.xml
new file mode 100644
index 0000000..814e516
--- /dev/null
+++ b/res/values-ne/wellbeing_strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="duration_less_than_one_minute">१ मिनेटभन्दा कम</string>
+ <string name="screen_time_summary_usage_today">आज %1$s</string>
+ </resources>
diff --git a/res/values-nl/aosp_strings.xml b/res/values-nl/aosp_strings.xml
new file mode 100644
index 0000000..b8f816f
--- /dev/null
+++ b/res/values-nl/aosp_strings.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <!-- Strings for face unlock enrollment, missing from AOSP-->
+ <string name="aosp_security_settings_face_enroll_education_message">Draai je hoofd op het volgende scherm om je gezicht onder alle hoeken vast te leggen</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_expanded">Als je een visuele beperking hebt of je hoofd maar beperkt kunt bewegen, kun je ontgrendelen via gezichtsherkenning gemakkelijker instellen via deze optie. Wanneer je ontgrendelen via gezichtsherkenning gebruikt, moet je je hoofd mogelijk recht voor je telefoon houden.</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_diversity">Toegankelijkheid ontgrendelen via gezichtsherkenning gebruiken</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_vision">Vereisen dat ogen open zijn</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_0">Brillen of lichte zonnebrillen zijn geen probleem.</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_1">"De gegevens die door 'Ontgrendelen via gezichtsherkenning' worden opgenomen, worden veilig opgeslagen en nooit doorgestuurd vanaf je telefoon. Je kunt je gegevens op elk gewenst moment verwijderen via de instellingen.\n\nJe telefoon gebruikt je recente afbeeldingen voor 'Ontgrendelen via gezichtsherkenning' af en toe om betere gezichtsmodellen te maken."</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_2">"Als je naar de telefoon kijkt, kan deze worden ontgrendeld, ook als dat niet je bedoeling was. Je telefoon kan door iemand anders worden ontgrendeld als de telefoon voor je gezicht wordt gehouden.\n\nJe kunt via Instellingen vereisen dat je ogen open moeten zijn om te ontgrendelen."</string>
+<string name="aosp_security_settings_face_enroll_introduction_footer_part_2_attention_not_supported">"Als je naar de telefoon kijkt, kun je deze onbedoeld ontgrendelen.\n\nJe telefoon kan door iemand anders worden ontgrendeld als de telefoon voor je gezicht wordt gehouden, zelfs als je je ogen dicht hebt."</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_3">Je telefoon kan worden ontgrendeld door iemand die veel op je lijkt, zoals een broer of zus.</string>
+</resources>
diff --git a/res/values-nl/google_strings.xml b/res/values-nl/google_strings.xml
new file mode 100644
index 0000000..6356a94
--- /dev/null
+++ b/res/values-nl/google_strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="battery_tip_smart_battery_summary_custom">"'Aanpasbaar batterijbeheer' inschakelen"</string>
+ <string name="smart_battery_footer_custom">"'Aanpasbaar batterijbeheer' beperkt het batterijgebruik van weinig gebruikte apps om de levensduur van de batterij te verlengen. Je telefoon leert in de loop van de tijd hoe je apps gebruikt.
+
+Meldingen kunnen worden vertraagd voor deze apps."</string>
+ <string name="smart_battery_manager_title_custom">Aanpasbaar batterijbeheer</string>
+ <string name="smart_battery_title_custom">"'Aanpasbaar batterijbeheer' gebruiken"</string>
+ </resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index be71e5c..28f7d8d 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -2677,9 +2677,6 @@
<string name="user_credentials" msgid="4044405430790970775">"Inloggegevens van gebruiker"</string>
<string name="user_credentials_summary" msgid="686471637627271856">"Opgeslagen inloggegevens bekijken en aanpassen"</string>
<string name="advanced_security_title" msgid="7117581975877192652">"Geavanceerd"</string>
- <string name="credential_storage_type" msgid="930861336971619888">"Opslagtype"</string>
- <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Ondersteund door hardware"</string>
- <string name="credential_storage_type_software" msgid="4786996040468294626">"Alleen software"</string>
<string name="credentials_settings_not_available" msgid="7433088409177429600">"Er zijn geen inloggegevens beschikbaar voor deze gebruiker"</string>
<string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Geïnstalleerd voor VPN en apps"</string>
<string name="credential_for_wifi" msgid="1963335263280604998">"Geïnstalleerd voor wifi"</string>
diff --git a/res/values-nl/wellbeing_strings.xml b/res/values-nl/wellbeing_strings.xml
new file mode 100644
index 0000000..1181f87
--- /dev/null
+++ b/res/values-nl/wellbeing_strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="duration_less_than_one_minute">Minder dan een minuut</string>
+ <string name="screen_time_summary_usage_today">%1$s vandaag</string>
+ </resources>
diff --git a/res/values-or/aosp_strings.xml b/res/values-or/aosp_strings.xml
new file mode 100644
index 0000000..7fa26db
--- /dev/null
+++ b/res/values-or/aosp_strings.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <!-- Strings for face unlock enrollment, missing from AOSP-->
+ <string name="aosp_security_settings_face_enroll_education_message">ପରବର୍ତ୍ତୀ ସ୍କ୍ରିନ୍ରେ, ଆପଣଙ୍କ ମୁହଁକୁ ସବୁ ଦିଗରୁ କ୍ୟାପ୍ଚର୍ କରିବା ପାଇଁ ଆପଣଙ୍କ ମୁଣ୍ଡ ବୁଲାନ୍ତୁ</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_expanded">ଯଦି ଆପଣଙ୍କର ସୀମିତ ଭିଜନ୍ ବା ହେଡ୍ ମୋସନ୍ ଅଛି, ତେବେ ଫେସ୍ ଅନ୍ଲକ୍ ସେଟ୍ ଅପ୍ କରିବା ପାଇଁ ଏହି ବିକଳ୍ପ ଏକ ସହଜ ଉପାୟ ଅଟେ। ଯେତେବେଳେ ଫେସ୍ ଅନ୍ଲକ୍ ବ୍ୟବହାର କରୁଛନ୍ତି, ଆପଣଙ୍କର ମୁଣ୍ଡ ଆପଣଙ୍କ ଫୋନ୍ ସମ୍ମୁଖରେ ସିଧା ରହିବା ଆବଶ୍ୟକ।</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_diversity">ଆକ୍ସେସିବିଲିଟୀ ଫେସ୍ ଅନ୍ଲକ୍ ବ୍ୟବହାର କରନ୍ତୁ</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_vision">ଆଖି ଖୋଲା ରଖିବା ଆବଶ୍ୟକ</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_0">ଚଷମା ବା ହାଲୁକା ରଙ୍ଗର ସନ୍ଗ୍ଲାସ୍ ଠିକ୍ ଅଟେ।</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_1">"ଫେସ୍ ଅନ୍ଲକ୍ ମାଧ୍ୟମରେ ରେକର୍ଡ କରାଯାଇଥିବା ଡାଟା ସୁରକ୍ଷିତ ଭାବେ ଷ୍ଟୋର୍ କରାଯାଇଥାଏ ଏବଂ କେବେ ବି ଆପଣଙ୍କ ଫୋନ୍ରୁ କାଢ଼ି ଦିଆଯାଏ ନାହିଁ। ଆପଣ ସେଟିଂସ୍ରେ ଯାଇ ଯେ କୌଣସି ସମୟରେ ଡାଟା ଡିଲିଟ୍ କରିପାରିବେ।\n\nଉନ୍ନତ ଫେସ୍ ମଡେଲ୍ଗୁଡ଼ିକୁ ତିଆରି କରିବା ପାଇଁ ଆପଣଙ୍କ ଫୋନ୍ ବେଳେବେଳେ ଆପଣଙ୍କର ବର୍ତ୍ତମାନର ଫେସ୍ ଅନ୍ଲକ୍ ଛବିଗୁଡ଼ିକୁ ବ୍ୟବହାର କରିବ।"</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_2">"ଆପଣ ଅଜାଣତରେ ମଧ୍ୟ ଆପଣଙ୍କର ଫୋନକୁ ଦେଖିଲେ ଏହା ଅନଲକ୍ ହୋଇପାରିବ। କେହିବି ଆପଣଙ୍କର ଫୋନକୁୁ ଆପଣଙ୍କ ମୁହଁ ପାଖରେ ରଖି ଏହାକୁ ଅନଲକ୍ କରିପାରିବେ।\n\n ଅନଲକ୍ କରିବା ପାଇଁ ସେଟିଂସରେ ଆପଣ ଆପଣଙ୍କର ଆଖି ଖୋଲା ରଖିବା ଆବଶ୍ୟକ।"</string>
+<string name="aosp_security_settings_face_enroll_introduction_footer_part_2_attention_not_supported">"ଆପଣ ଅଜାଣତରେ ମଧ୍ୟ ଆପଣଙ୍କ ଫୋନ୍କୁ ଦେଖିଲେ ଏହା ଅନ୍ଲକ୍ ହୋଇଯିବ।\n\nଆପଣଙ୍କର ଆଖି ବନ୍ଦ ଥିବା ବେଳେ ମଧ୍ୟ ଆପଣଙ୍କର ମୁହଁ ପାଖରେ ରଖି କେହିବି ଆପଣଙ୍କର ଫୋନ୍କୁ ଅନ୍ଲକ୍ କରିପାରିବେ।"</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_3">ଆପଣଙ୍କ ଭଳି ଦେଖାଯାଉଥିବା ବ୍ୟକ୍ତି ଯେମିତି ଯାଆଁଳା ଭାଇ/ଭଉଣୀ ଆପଣଙ୍କ ଫୋନ୍କୁ ଅନ୍ଲକ୍ କରିପାରିବେ।</string>
+</resources>
diff --git a/res/values-or/google_strings.xml b/res/values-or/google_strings.xml
new file mode 100644
index 0000000..511ffa9
--- /dev/null
+++ b/res/values-or/google_strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="battery_tip_smart_battery_summary_custom">ଆବଶ୍ୟକତା ଅନୁସାରେ ବ୍ୟାଟେରୀ ବ୍ୟବହାରର ସୁବିଧା ଚାଲୁ କରନ୍ତୁ</string>
+ <string name="smart_battery_footer_custom">"ବ୍ୟାଟେରୀ ଖର୍ଚ୍ଚକୁ କମ୍ କରିବା ପାଇଁ, ଆବଶ୍ୟକତା ଅନୁସାରେ ବ୍ୟାଟେରୀର ନିୟମିତ ବ୍ୟବହାର କରୁନଥିବା ଆପ୍କୁ ସୀମିତ କରିଦେଇଥାଏ। ସମୟାନୁସାରେ ଆପଣ ଆପ୍କୁ କିପରି ବ୍ୟବହାର କରୁଛନ୍ତି, ତାହା ଆପଣଙ୍କ ଫୋନ୍ ଜାଣିପାରେ।
+
+ଏହି ଆପ୍ ପାଇଁ ବିଜ୍ଞପ୍ତି ମିଳିବାରେ ବିଳମ୍ୱ ହୋଇପାରେ।"</string>
+ <string name="smart_battery_manager_title_custom">ଆବଶ୍ୟକତା ଅନୁସାରେ ବ୍ୟାଟେରୀର ବ୍ୟବହାର</string>
+ <string name="smart_battery_title_custom">ଆବଶ୍ୟକତା ଅନୁସାରେ ବ୍ୟାଟେରୀର ବ୍ୟବହାର କରନ୍ତୁ</string>
+ </resources>
diff --git a/res/values-or/strings.xml b/res/values-or/strings.xml
index f4ed406..20ca5df 100644
--- a/res/values-or/strings.xml
+++ b/res/values-or/strings.xml
@@ -2677,9 +2677,6 @@
<string name="user_credentials" msgid="4044405430790970775">"ଉପଯୋଗକର୍ତ୍ତା କ୍ରେଡେନସିଆଲ୍"</string>
<string name="user_credentials_summary" msgid="686471637627271856">"ସେଭ୍ ହୋଇଥିବା କ୍ରେଡେନସିଆଲ୍ ଦେଖନ୍ତୁ ଓ ବଦଳାନ୍ତୁ"</string>
<string name="advanced_security_title" msgid="7117581975877192652">"ଉନ୍ନତ"</string>
- <string name="credential_storage_type" msgid="930861336971619888">"ଷ୍ଟୋରେଜ୍ ପ୍ରକାର"</string>
- <string name="credential_storage_type_hardware" msgid="2630040425119817220">"ହାର୍ଡୱେର୍-ସମର୍ଥିତ"</string>
- <string name="credential_storage_type_software" msgid="4786996040468294626">"ସଫ୍ଟୱେୟାର କେବଳ"</string>
<string name="credentials_settings_not_available" msgid="7433088409177429600">"ଏହି ଉପଯୋଗକର୍ତ୍ତାଙ୍କର ତଥ୍ୟ ଉପଲବ୍ଧ ନାହିଁ"</string>
<string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"VPN ଏବଂ ଆପସ୍ ପାଇଁ ସଂସ୍ଥାପିତ"</string>
<string name="credential_for_wifi" msgid="1963335263280604998">"ୱାଇ-ଫାଇ ପାଇଁ ଇନ୍ଷ୍ଟଲ୍ ହୋଇଛି"</string>
diff --git a/res/values-or/wellbeing_strings.xml b/res/values-or/wellbeing_strings.xml
new file mode 100644
index 0000000..ef000b9
--- /dev/null
+++ b/res/values-or/wellbeing_strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="duration_less_than_one_minute">1 ମିନିଟରୁ କମ୍</string>
+ <string name="screen_time_summary_usage_today">ଆଜି %1$s</string>
+ </resources>
diff --git a/res/values-pa/aosp_strings.xml b/res/values-pa/aosp_strings.xml
new file mode 100644
index 0000000..cc83cfb
--- /dev/null
+++ b/res/values-pa/aosp_strings.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <!-- Strings for face unlock enrollment, missing from AOSP-->
+ <string name="aosp_security_settings_face_enroll_education_message">"ਅਗਲੀ ਸਕ੍ਰੀਨ 'ਤੇ, ਆਪਣੇ ਚਿਹਰੇ ਨੂੰ ਸਾਰੇ ਪਾਸਿਆਂ ਤੋਂ ਕੈਪਚਰ ਕਰਨ ਲਈ ਆਪਣਾ ਸਿਰ ਘੁਮਾਓ"</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_expanded">ਜੇ ਤੁਹਾਡੀ ਨਜ਼ਰ ਘੱਟ ਹੈ ਜਾਂ ਤੁਸੀਂ ਆਪਣਾ ਸਿਰ ਜ਼ਿਆਦਾ ਨਹੀਂ ਹਿਲਾ ਸਕਦੇ, ਤਾਂ ਚਿਹਰਾ ਅਣਲਾਕ ਸੈੱਟਅੱਪ ਕਰਨ ਲਈ ਇਹ ਵਿਕਲਪ ਵਧੇਰੇ ਆਸਾਨ ਹੈ। ਚਿਹਰਾ ਅਣਲਾਕ ਵਰਤਣ ਵੇਲੇ, ਸ਼ਾਇਦ ਤੁਹਾਡੇ ਸਿਰ ਨੂੰ ਤੁਹਾਡੇ ਫ਼ੋਨ ਦੇ ਸਾਹਮਣੇ ਵਧੇਰੇ ਸਿੱਧਾ ਰੱਖਣ ਦੀ ਲੋੜ ਹੋਵੇ।</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_diversity">ਪਹੁੰਚਯੋਗਤਾ ਵਾਲਾ ਚਿਹਰਾ ਅਣਲਾਕ ਵਰਤੋ</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_vision">ਅੱਖਾਂ ਖੁੱਲ੍ਹੀਆਂ ਰੱਖਣ ਦੀ ਲੋੜ ਹੈ</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_0">ਐਨਕਾਂ ਜਾਂ ਹਲਕੀ ਜਿਹੀ ਭਾਹ ਦੀਆਂ ਧੁੱਪ ਵਾਲੀਆਂ ਐਨਕਾਂ ਠੀਕ ਰਹਿਣਗੀਆਂ।</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_1">"ਚਿਹਰਾ ਅਣਲਾਕ ਰਾਹੀਂ ਰਿਕਾਰਡ ਕੀਤਾ ਡਾਟਾ ਸੁਰੱਖਿਅਤ ਤਰੀਕੇ ਨਾਲ ਸਟੋਰ ਕੀਤਾ ਜਾਂਦਾ ਹੈ ਅਤੇ ਕਦੇ ਵੀ ਤੁਹਾਡੇ ਫ਼ੋਨ ਤੋਂ ਬਾਹਰ ਨਹੀਂ ਜਾਂਦਾ। ਤੁਸੀਂ ਕਿਸੇ ਵੇਲੇ ਵੀ ਸੈਟਿੰਗਾਂ ਵਿੱਚ ਆਪਣਾ ਡਾਟਾ ਮਿਟਾ ਸਕਦੇ ਹੋ।\n\nਤੁਹਾਡਾ ਫ਼ੋਨ ਕਦੇ-ਕਦੇ ਸੁਧਰੇ ਹੋਏ ਚਿਹਰੇ ਦੇ ਮਾਡਲ ਬਣਾਉਣ ਲਈ ਤੁਹਾਡੇ ਹਾਲੀਆ ਚਿਹਰਾ ਅਣਲਾਕ ਚਿੱਤਰਾਂ ਨੂੰ ਵਰਤੇਗਾ।"</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_2">"ਫ਼ੋਨ ਵੱਲ ਦੇਖਦੇ ਸਾਰ ਹੀ ਇਹ ਅਣਲਾਕ ਹੋ ਸਕਦਾ ਹੈ ਭਾਵੇਂ ਇੰਝ ਕਰਨ ਦਾ ਤੁਹਾਡਾ ਇਰਾਦਾ ਵੀ ਨਾ ਹੋਵੇ। ਕਿਸੇ ਵੱਲੋਂ ਤੁਹਾਡਾ ਫ਼ੋਨ ਤੁਹਾਡੇ ਮੂਹਰੇ ਕਰਨ 'ਤੇ ਫ਼ੋਨ ਅਣਲਾਕ ਹੋ ਸਕਦਾ ਹੈ।\n\nਤੁਸੀਂ ਸੈਟਿੰਗਾਂ ਵਿੱਚ ਜਾ ਕੇ ਫ਼ੋਨ ਅਣਲਾਕ ਕਰਨ ਲਈ ਆਪਣੀਆਂ ਅੱਖਾਂ ਦਾ ਖੁੱਲ੍ਹਾ ਹੋਣਾ ਲਾਜ਼ਮੀ ਕਰ ਸਕਦੇ ਹੋ।"</string>
+<string name="aosp_security_settings_face_enroll_introduction_footer_part_2_attention_not_supported">"ਫ਼ੋਨ ਨੂੰ ਦੇਖਣ ਸਾਰ ਹੀ ਫ਼ੋਨ ਅਣਲਾਕ ਹੋ ਸਕਦਾ ਹੈ, ਭਾਵੇਂ ਇੰਝ ਕਰਨ ਦਾ ਤੁਹਾਡਾ ਇਰਾਦਾ ਨਾ ਹੋਵੇ।\n\nਕਿਸੇ ਵੱਲੋਂ ਤੁਹਾਡਾ ਫ਼ੋਨ ਤੁਹਾਡੇ ਮੂਹਰੇ ਕਰਨ 'ਤੇ ਫ਼ੋਨ ਅਣਲਾਕ ਹੋ ਸਕਦਾ ਹੈ, ਭਾਵੇਂ ਤੁਹਾਡੀਆਂ ਅੱਖਾਂ ਬੰਦ ਹੋਣ।"</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_3">ਤੁਹਾਡੇ ਨਾਲ ਬਹੁਤ ਜ਼ਿਆਦਾ ਮਿਲਦੇ-ਜੁਲਦੇ ਚਿਹਰੇ ਵਾਲੇ ਕਿਸੇ ਵਿਅਕਤੀ ਵੱਲੋਂ ਤੁਹਾਡਾ ਫ਼ੋਨ ਅਣਲਾਕ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ, ਜਿਵੇਂ ਕਿ ਤੁਹਾਡੇ ਵਰਗੇ ਦਿਸਣ ਵਾਲੇ ਭੈਣ-ਭਰਾ।</string>
+</resources>
diff --git a/res/values-pa/google_strings.xml b/res/values-pa/google_strings.xml
new file mode 100644
index 0000000..f2e0a74
--- /dev/null
+++ b/res/values-pa/google_strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="battery_tip_smart_battery_summary_custom">ਅਨੁਕੂਲਨਯੋਗ ਬੈਟਰੀ ਚਾਲੂ ਕਰੋ</string>
+ <string name="smart_battery_footer_custom">"ਬੈਟਰੀ ਲਾਈਫ਼ ਨੂੰ ਵਧਾਉਣ ਲਈ, ਅਨੁਕੂਲਨਯੋਗ ਬੈਟਰੀ ਕਦੇ-ਕਦੇ ਵਰਤੀਆਂ ਗਈਆਂ ਐਪਾਂ ਲਈ ਬੈਟਰੀ ਦੀ ਵਰਤੋਂ ਨੂੰ ਸੀਮਤ ਕਰਦਾ ਹੈ। ਸਮੇਂ ਦੇ ਨਾਲ ਤੁਹਾਡਾ ਫ਼ੋਨ ਇਹ ਜਾਣ ਜਾਵੇਗਾ ਕਿ ਤੁਸੀਂ ਕਿਵੇਂ ਐਪਾਂ ਦੀ ਵਰਤੋਂ ਕਰਦੇ ਹੋ।
+
+ਇਹਨਾਂ ਐਪਾਂ ਦੀਆਂ ਸੂਚਨਾਵਾਂ ਦਿਖਾਉਣ ਵਿੱਚ ਦੇਰੀ ਹੋ ਸਕਦੀ ਹੈ।"</string>
+ <string name="smart_battery_manager_title_custom">ਅਨੁਕੂਲਨਯੋਗ ਬੈਟਰੀ</string>
+ <string name="smart_battery_title_custom">ਅਨੁਕੂਲਨਯੋਗ ਬੈਟਰੀ ਦੀ ਵਰਤੋਂ ਕਰੋ</string>
+ </resources>
diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml
index 832ee93..a896d52 100644
--- a/res/values-pa/strings.xml
+++ b/res/values-pa/strings.xml
@@ -2677,9 +2677,6 @@
<string name="user_credentials" msgid="4044405430790970775">"ਵਰਤੋਂਕਾਰ ਕ੍ਰੀਡੈਂਸ਼ੀਅਲ"</string>
<string name="user_credentials_summary" msgid="686471637627271856">"ਸਟੋਰ ਕੀਤੇ ਕ੍ਰੀਡੈਂਸ਼ੀਅਲ ਦੇਖੋ ਅਤੇ ਸੋਧੋ"</string>
<string name="advanced_security_title" msgid="7117581975877192652">"ਵਿਕਸਿਤ"</string>
- <string name="credential_storage_type" msgid="930861336971619888">"ਸਟੋਰੇਜ ਦੀ ਕਿਸਮ"</string>
- <string name="credential_storage_type_hardware" msgid="2630040425119817220">"ਹਾਰਡਵੇਅਰ-ਸਮਰਥਿਤ"</string>
- <string name="credential_storage_type_software" msgid="4786996040468294626">"ਕੇਵਲ ਸਾਫਟਵੇਅਰ"</string>
<string name="credentials_settings_not_available" msgid="7433088409177429600">"ਇਸ ਵਰਤੋਂਕਾਰ ਲਈ ਕ੍ਰੀਡੈਂਸ਼ੀਅਲ ਉਪਲਬਧ ਨਹੀਂ ਹਨ"</string>
<string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"VPN ਅਤੇ ਐਪਾਂ ਲਈ ਸਥਾਪਤ ਕੀਤਾ ਗਿਆ"</string>
<string name="credential_for_wifi" msgid="1963335263280604998">"ਵਾਈ-ਫਾਈ ਲਈ ਸਥਾਪਤ ਕੀਤਾ ਗਿਆ"</string>
diff --git a/res/values-pa/wellbeing_strings.xml b/res/values-pa/wellbeing_strings.xml
new file mode 100644
index 0000000..3e3f2ed
--- /dev/null
+++ b/res/values-pa/wellbeing_strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="duration_less_than_one_minute">1 ਮਿੰਟ ਤੋਂ ਘੱਟ</string>
+ <string name="screen_time_summary_usage_today">%1$s ਅੱਜ</string>
+ </resources>
diff --git a/res/values-pl/aosp_strings.xml b/res/values-pl/aosp_strings.xml
new file mode 100644
index 0000000..df5a40a
--- /dev/null
+++ b/res/values-pl/aosp_strings.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <!-- Strings for face unlock enrollment, missing from AOSP-->
+ <string name="aosp_security_settings_face_enroll_education_message">Na następnym ekranie obracaj głowę tak, by zarejestrować obraz twarzy pod wszystkimi kątami</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_expanded">Ta opcja pozwala łatwiej skonfigurować rozpoznawanie twarzy przy ograniczeniach widzenia lub ruchomości głowy. Aby użyć rozpoznawania twarzy, może być konieczne ustawienie głowy bardziej na wprost telefonu.</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_diversity">Używaj rozpoznawania twarzy w ramach ułatwień dostępu</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_vision">Wymaga otwartych oczu</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_0">Możesz mieć okulary, nawet niezbyt ciemne okulary przeciwsłoneczne.</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_1">"Dane zarejestrowane przez rozpoznawanie twarzy są przechowywane w bezpieczny sposób i dostępne tylko na Twoim telefonie. Możesz je usunąć w dowolnym momencie w ustawieniach.\n\nTelefon będzie co jakiś czas używał ostatnich obrazów twarzy do poprawiania jej modeli."</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_2">"Patrząc na telefon, możesz go niechcący odblokować. Inna osoba może odblokować Twój telefon, zbliżając go do Twojej twarzy.\n\nW Ustawieniach możesz włączyć wymaganie otwartych oczu przy rozpoznawaniu."</string>
+<string name="aosp_security_settings_face_enroll_introduction_footer_part_2_attention_not_supported">"Patrząc na telefon, możesz go mimowolnie odblokować.\n\nInna osoba może odblokować Twój telefon, zbliżając go do Twojej twarzy – nawet wtedy, gdy masz zamknięte oczy."</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_3">Istnieje możliwość, że ktoś bardzo podobny do Ciebie (np. Twoje rodzeństwo) odblokuje Twój telefon.</string>
+</resources>
diff --git a/res/values-pl/google_strings.xml b/res/values-pl/google_strings.xml
new file mode 100644
index 0000000..8f45d15
--- /dev/null
+++ b/res/values-pl/google_strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="battery_tip_smart_battery_summary_custom">Włącz Baterię adaptacyjną</string>
+ <string name="smart_battery_footer_custom">"Aby wydłużyć czas pracy na baterii, Bateria adaptacyjna ogranicza wykorzystanie baterii przez rzadko używane aplikacje. Z biegiem czasu telefon zacznie uwzględniać, jak używasz aplikacji.
+
+Powiadomienia z takich aplikacji mogą być opóźnione."</string>
+ <string name="smart_battery_manager_title_custom">Bateria adaptacyjna</string>
+ <string name="smart_battery_title_custom">Użyj Baterii adaptacyjnej</string>
+ </resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 00ce31c..7d56435 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -2753,9 +2753,6 @@
<string name="user_credentials" msgid="4044405430790970775">"Dane logowania użytkownika"</string>
<string name="user_credentials_summary" msgid="686471637627271856">"Wyświetl i zmień zapisane dane logowania"</string>
<string name="advanced_security_title" msgid="7117581975877192652">"Zaawansowane"</string>
- <string name="credential_storage_type" msgid="930861336971619888">"Typ pamięci"</string>
- <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Wspomagana sprzętowo"</string>
- <string name="credential_storage_type_software" msgid="4786996040468294626">"Tylko programowa"</string>
<string name="credentials_settings_not_available" msgid="7433088409177429600">"Ten użytkownik nie ma dostępu do poświadczeń"</string>
<string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Zainstalowane dla VPN i aplikacji"</string>
<string name="credential_for_wifi" msgid="1963335263280604998">"Zainstalowane dla Wi-Fi"</string>
diff --git a/res/values-pl/wellbeing_strings.xml b/res/values-pl/wellbeing_strings.xml
new file mode 100644
index 0000000..4d40567
--- /dev/null
+++ b/res/values-pl/wellbeing_strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="duration_less_than_one_minute">Poniżej minuty</string>
+ <string name="screen_time_summary_usage_today">%1$s dzisiaj</string>
+ </resources>
diff --git a/res/values-pt-rBR/aosp_strings.xml b/res/values-pt-rBR/aosp_strings.xml
new file mode 100644
index 0000000..5ca5ded
--- /dev/null
+++ b/res/values-pt-rBR/aosp_strings.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <!-- Strings for face unlock enrollment, missing from AOSP-->
+ <string name="aosp_security_settings_face_enroll_education_message">Na próxima tela, vire a cabeça para capturar todos os ângulos do seu rosto</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_expanded">Se você tiver alguma limitação de visão ou de movimento da cabeça, essa opção é uma maneira mais fácil de configurar o desbloqueio facial. Quando você estiver usando o desbloqueio facial, pode ser necessário que sua cabeça fique mais diretamente na frente do smartphone.</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_diversity">Usar desbloqueio facial de acessibilidade</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_vision">Exigir olhos abertos</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_0">Óculos de grau ou óculos de sol com lentes claras são permitidos.</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_1">"Os dados gravados pelo \"Desbloqueio facial\" são armazenados de forma segura e nunca saem do seu smartphone. Você pode excluí-los a qualquer momento nas configurações.\n\nSeu smartphone usará ocasionalmente suas imagens recentes do \"Desbloqueio facial\" para criar modelos de rosto melhores."</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_2">"Olhar para o smartphone pode desbloqueá-lo mesmo que essa não seja sua intenção. O smartphone poderá ser desbloqueado por outra pessoa se for direcionado para seu rosto.\n\nÉ possível configurar a necessidade de olhos abertos para o desbloqueio em Configurações."</string>
+<string name="aosp_security_settings_face_enroll_introduction_footer_part_2_attention_not_supported">"Olhar para o smartphone poderá desbloqueá-lo mesmo que essa não seja sua intenção.\n\nO smartphone poderá ser desbloqueado por outra pessoa se for direcionado para seu rosto, mesmo com os olhos fechados."</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_3">Pode acontecer de o smartphone ser desbloqueado por alguém que se pareça muito com você, por exemplo, seu filho ou um gêmeo idêntico.</string>
+</resources>
diff --git a/res/values-pt-rBR/google_strings.xml b/res/values-pt-rBR/google_strings.xml
new file mode 100644
index 0000000..881c4b8
--- /dev/null
+++ b/res/values-pt-rBR/google_strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="battery_tip_smart_battery_summary_custom">Ative a Bateria adaptável</string>
+ <string name="smart_battery_footer_custom">"Para aumentar a duração da bateria, a Bateria adaptável limita a bateria para apps pouco utilizados. Com o tempo, seu smartphone aprenderá como você usa os apps.
+
+É possível que as notificações desses apps sejam entregues com atraso."</string>
+ <string name="smart_battery_manager_title_custom">Bateria adaptável</string>
+ <string name="smart_battery_title_custom">Usar Bateria adaptável</string>
+ </resources>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index 052bca2..aa1b599 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -2677,9 +2677,6 @@
<string name="user_credentials" msgid="4044405430790970775">"Credenciais do usuário"</string>
<string name="user_credentials_summary" msgid="686471637627271856">"Ver e modificar as credenciais armazenadas"</string>
<string name="advanced_security_title" msgid="7117581975877192652">"Avançado"</string>
- <string name="credential_storage_type" msgid="930861336971619888">"Tipo de armazenamento"</string>
- <string name="credential_storage_type_hardware" msgid="2630040425119817220">"No hardware"</string>
- <string name="credential_storage_type_software" msgid="4786996040468294626">"Somente software"</string>
<string name="credentials_settings_not_available" msgid="7433088409177429600">"As credenciais não estão disponíveis para este usuário"</string>
<string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Instalada para VPN e apps"</string>
<string name="credential_for_wifi" msgid="1963335263280604998">"Instalada para Wi-Fi"</string>
diff --git a/res/values-pt-rBR/wellbeing_strings.xml b/res/values-pt-rBR/wellbeing_strings.xml
new file mode 100644
index 0000000..ea82ec4
--- /dev/null
+++ b/res/values-pt-rBR/wellbeing_strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="duration_less_than_one_minute">Menos de um minuto</string>
+ <string name="screen_time_summary_usage_today">%1$s hoje</string>
+ </resources>
diff --git a/res/values-pt-rPT/aosp_strings.xml b/res/values-pt-rPT/aosp_strings.xml
new file mode 100644
index 0000000..281723a
--- /dev/null
+++ b/res/values-pt-rPT/aosp_strings.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <!-- Strings for face unlock enrollment, missing from AOSP-->
+ <string name="aosp_security_settings_face_enroll_education_message">No ecrã seguinte, rode a cabeça para capturar todos os ângulos do seu rosto.</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_expanded">Se a sua visão ou os movimentos da cabeça forem limitados, esta opção é uma forma mais fácil de configurar o Desbloqueio facial. Ao utilizar o Desbloqueio facial, a sua cabeça pode ter de estar mais diretamente em frente ao telemóvel.</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_diversity">Utilizar o Desbloqueio facial com acessibilidade</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_vision">Exigir olhos abertos</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_0">É possível usar óculos ou óculos de sol ligeiramente matizados.</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_1">"Os dados registados pelo Desbloqueio facial são armazenados de forma segura e nunca saem do seu telemóvel. Pode eliminar os dados em qualquer altura nas definições.\n\nO seu telemóvel irá utilizar ocasionalmente as suas imagens do Desbloqueio facial recentes para criar modelos de rosto melhorados."</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_2">"Pode desbloquear o telemóvel ao olhar para o mesmo, mesmo inadvertidamente. Alguém pode desbloquear o telemóvel se o segurar junto ao seu rosto.\n\nNas Definições, pode requerer que os seus olhos estejam abertos para o desbloqueio."</string>
+<string name="aosp_security_settings_face_enroll_introduction_footer_part_2_attention_not_supported">"Pode desbloquear o telemóvel involuntariamente ao olhar para o mesmo.\n\nAlguém pode desbloquear o telemóvel se o segurar junto ao seu rosto, mesmo com os olhos fechados."</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_3">Alguém muito parecido consigo, como um irmão com traços semelhantes, pode desbloquear o telemóvel.</string>
+</resources>
diff --git a/res/values-pt-rPT/google_strings.xml b/res/values-pt-rPT/google_strings.xml
new file mode 100644
index 0000000..d131c3d
--- /dev/null
+++ b/res/values-pt-rPT/google_strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="battery_tip_smart_battery_summary_custom">Ative a funcionalidade Bateria adaptável.</string>
+ <string name="smart_battery_footer_custom">"Para aumentar a autonomia da bateria, a funcionalidade Bateria adaptável limita a bateria para aplicações utilizadas poucas vezes. O telemóvel vai perceber de que forma utiliza as aplicações ao longo do tempo.
+
+As notificações destas aplicações poderão sofrer atrasos."</string>
+ <string name="smart_battery_manager_title_custom">Bateria adaptável</string>
+ <string name="smart_battery_title_custom">Utilizar a funcionalidade Bateria adaptável</string>
+ </resources>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 82afc7a..c8fb686 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -2677,9 +2677,6 @@
<string name="user_credentials" msgid="4044405430790970775">"Credenciais de utilizador"</string>
<string name="user_credentials_summary" msgid="686471637627271856">"Ver e modificar credenciais de utilizador"</string>
<string name="advanced_security_title" msgid="7117581975877192652">"Avançadas"</string>
- <string name="credential_storage_type" msgid="930861336971619888">"Tipo de armazenamento"</string>
- <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Suportado por hardware"</string>
- <string name="credential_storage_type_software" msgid="4786996040468294626">"Apenas software"</string>
<string name="credentials_settings_not_available" msgid="7433088409177429600">"As credenciais não estão disponíveis para este utilizador"</string>
<string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Instalada para VPN e aplicações"</string>
<string name="credential_for_wifi" msgid="1963335263280604998">"Instalada para Wi-Fi"</string>
diff --git a/res/values-pt-rPT/wellbeing_strings.xml b/res/values-pt-rPT/wellbeing_strings.xml
new file mode 100644
index 0000000..1b903fe
--- /dev/null
+++ b/res/values-pt-rPT/wellbeing_strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="duration_less_than_one_minute">Menos de 1 minuto</string>
+ <string name="screen_time_summary_usage_today">%1$s hoje</string>
+ </resources>
diff --git a/res/values-pt/aosp_strings.xml b/res/values-pt/aosp_strings.xml
new file mode 100644
index 0000000..5ca5ded
--- /dev/null
+++ b/res/values-pt/aosp_strings.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <!-- Strings for face unlock enrollment, missing from AOSP-->
+ <string name="aosp_security_settings_face_enroll_education_message">Na próxima tela, vire a cabeça para capturar todos os ângulos do seu rosto</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_expanded">Se você tiver alguma limitação de visão ou de movimento da cabeça, essa opção é uma maneira mais fácil de configurar o desbloqueio facial. Quando você estiver usando o desbloqueio facial, pode ser necessário que sua cabeça fique mais diretamente na frente do smartphone.</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_diversity">Usar desbloqueio facial de acessibilidade</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_vision">Exigir olhos abertos</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_0">Óculos de grau ou óculos de sol com lentes claras são permitidos.</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_1">"Os dados gravados pelo \"Desbloqueio facial\" são armazenados de forma segura e nunca saem do seu smartphone. Você pode excluí-los a qualquer momento nas configurações.\n\nSeu smartphone usará ocasionalmente suas imagens recentes do \"Desbloqueio facial\" para criar modelos de rosto melhores."</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_2">"Olhar para o smartphone pode desbloqueá-lo mesmo que essa não seja sua intenção. O smartphone poderá ser desbloqueado por outra pessoa se for direcionado para seu rosto.\n\nÉ possível configurar a necessidade de olhos abertos para o desbloqueio em Configurações."</string>
+<string name="aosp_security_settings_face_enroll_introduction_footer_part_2_attention_not_supported">"Olhar para o smartphone poderá desbloqueá-lo mesmo que essa não seja sua intenção.\n\nO smartphone poderá ser desbloqueado por outra pessoa se for direcionado para seu rosto, mesmo com os olhos fechados."</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_3">Pode acontecer de o smartphone ser desbloqueado por alguém que se pareça muito com você, por exemplo, seu filho ou um gêmeo idêntico.</string>
+</resources>
diff --git a/res/values-pt/google_strings.xml b/res/values-pt/google_strings.xml
new file mode 100644
index 0000000..881c4b8
--- /dev/null
+++ b/res/values-pt/google_strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="battery_tip_smart_battery_summary_custom">Ative a Bateria adaptável</string>
+ <string name="smart_battery_footer_custom">"Para aumentar a duração da bateria, a Bateria adaptável limita a bateria para apps pouco utilizados. Com o tempo, seu smartphone aprenderá como você usa os apps.
+
+É possível que as notificações desses apps sejam entregues com atraso."</string>
+ <string name="smart_battery_manager_title_custom">Bateria adaptável</string>
+ <string name="smart_battery_title_custom">Usar Bateria adaptável</string>
+ </resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 052bca2..aa1b599 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -2677,9 +2677,6 @@
<string name="user_credentials" msgid="4044405430790970775">"Credenciais do usuário"</string>
<string name="user_credentials_summary" msgid="686471637627271856">"Ver e modificar as credenciais armazenadas"</string>
<string name="advanced_security_title" msgid="7117581975877192652">"Avançado"</string>
- <string name="credential_storage_type" msgid="930861336971619888">"Tipo de armazenamento"</string>
- <string name="credential_storage_type_hardware" msgid="2630040425119817220">"No hardware"</string>
- <string name="credential_storage_type_software" msgid="4786996040468294626">"Somente software"</string>
<string name="credentials_settings_not_available" msgid="7433088409177429600">"As credenciais não estão disponíveis para este usuário"</string>
<string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Instalada para VPN e apps"</string>
<string name="credential_for_wifi" msgid="1963335263280604998">"Instalada para Wi-Fi"</string>
diff --git a/res/values-pt/wellbeing_strings.xml b/res/values-pt/wellbeing_strings.xml
new file mode 100644
index 0000000..ea82ec4
--- /dev/null
+++ b/res/values-pt/wellbeing_strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="duration_less_than_one_minute">Menos de um minuto</string>
+ <string name="screen_time_summary_usage_today">%1$s hoje</string>
+ </resources>
diff --git a/res/values-ro/aosp_strings.xml b/res/values-ro/aosp_strings.xml
new file mode 100644
index 0000000..d1e66c4
--- /dev/null
+++ b/res/values-ro/aosp_strings.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <!-- Strings for face unlock enrollment, missing from AOSP-->
+ <string name="aosp_security_settings_face_enroll_education_message">În ecranul următor, rotiți-vă capul pentru a captura chipul din toate unghiurile</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_expanded">Dacă aveți probleme de vedere sau nu puteți să mișcați capul, folosind această opțiune puteți configura deblocarea facială mai ușor. Când folosiți deblocarea facială, capul dvs. trebuie să fie mai mult în fața telefonului.</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_diversity">Folosiți deblocarea facială cu accesibilitate</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_vision">Trebuie să aveți ochii deschiși</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_0">Ochelarii de vedere sau ochelarii de soare ușor nuanțați sunt buni.</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_1">"Datele înregistrate de deblocarea facială sunt stocate în siguranță și nu părăsesc niciodată telefonul dvs. Puteți să ștergeți aceste date oricând din setări.\n\nTelefonul va folosi ocazional imaginile de deblocare facială recente pentru a crea modele faciale îmbunătățite."</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_2">"Dacă priviți spre telefon, îl puteți debloca și când nu doriți. Telefonul poate fi deblocat de altcineva dacă este ținut în dreptul feței dvs.\n\nPuteți alege ca ochii să fie deschiși pentru deblocare din Setări."</string>
+<string name="aosp_security_settings_face_enroll_introduction_footer_part_2_attention_not_supported">"Dacă vă uitați la telefon, îl puteți debloca și atunci când nu doriți.\n\nTelefonul poate fi deblocat de altcineva dacă este ținut în dreptul feței dvs., chiar dacă aveți ochii închiși."</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_3">Telefonul dvs. poate fi deblocat de cineva care seamănă mult cu dvs., cum ar fi un frate sau o soră geamănă.</string>
+</resources>
diff --git a/res/values-ro/google_strings.xml b/res/values-ro/google_strings.xml
new file mode 100644
index 0000000..a700bc6
--- /dev/null
+++ b/res/values-ro/google_strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="battery_tip_smart_battery_summary_custom">Activați Adaptive Battery</string>
+ <string name="smart_battery_footer_custom">"Pentru a prelungi autonomia bateriei, Adaptive Battery limitează bateria pentru aplicațiile utilizate rar. Telefonul va afla cum folosiți aplicațiile în timp.
+
+Notificările de la aceste aplicații se pot primi cu întârziere."</string>
+ <string name="smart_battery_manager_title_custom">Baterie adaptabilă</string>
+ <string name="smart_battery_title_custom">Folosiți Adaptive Battery</string>
+ </resources>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 87adb06..0f6a4ba 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -2715,9 +2715,6 @@
<string name="user_credentials" msgid="4044405430790970775">"Date de conectare utilizator"</string>
<string name="user_credentials_summary" msgid="686471637627271856">"Vedeți și modificați datele de conectare stocate"</string>
<string name="advanced_security_title" msgid="7117581975877192652">"Avansate"</string>
- <string name="credential_storage_type" msgid="930861336971619888">"Tip de stocare"</string>
- <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Stocare hardware"</string>
- <string name="credential_storage_type_software" msgid="4786996040468294626">"Stocare software"</string>
<string name="credentials_settings_not_available" msgid="7433088409177429600">"Datele de conectare nu sunt disponibile pentru acest utilizator"</string>
<string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Instalate pentru VPN și aplicații"</string>
<string name="credential_for_wifi" msgid="1963335263280604998">"Instalate pentru Wi-Fi"</string>
diff --git a/res/values-ro/wellbeing_strings.xml b/res/values-ro/wellbeing_strings.xml
new file mode 100644
index 0000000..159432a
--- /dev/null
+++ b/res/values-ro/wellbeing_strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="duration_less_than_one_minute">Mai puțin de 1 minut</string>
+ <string name="screen_time_summary_usage_today">%1$s astăzi</string>
+ </resources>
diff --git a/res/values-ru/aosp_strings.xml b/res/values-ru/aosp_strings.xml
new file mode 100644
index 0000000..821a6e3
--- /dev/null
+++ b/res/values-ru/aosp_strings.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <!-- Strings for face unlock enrollment, missing from AOSP-->
+ <string name="aosp_security_settings_face_enroll_education_message">Когда откроется следующий экран, поверните голову из стороны в сторону, чтобы сделать снимки лица со всех ракурсов.</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_expanded">Если у вас есть нарушения зрения или ограничена подвижность головы, используйте этот вариант настройки. При использовании фейсконтроля ваше лицо должно будет находиться прямо перед телефоном.</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_diversity">Упрощенная настройка фейсконтроля</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_vision">Глаза должны быть открыты</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_0">Очки и не очень темные солнцезащитные очки можно не снимать.</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_1">"Данные, записанные при использовании функции \"Фейсконтроль\", защищены и хранятся только на вашем телефоне. Вы можете удалить их в любое время.\n\nНовые фотографии, сделанные с помощью функции \"Фейсконтроль\", время от времени могут использоваться для создания улучшенных моделей лица."</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_2">"Вы можете случайно разблокировать телефон, посмотрев на него. Телефон может быть разблокирован, если кто-то поднесет его к вашему лицу.\n\nВ настройках вы можете задать дополнительные параметры для фейсконтроля. Например, разрешить разблокировку устройства, только когда ваши глаза открыты."</string>
+<string name="aosp_security_settings_face_enroll_introduction_footer_part_2_attention_not_supported">"Вы можете случайно разблокировать телефон, посмотрев на него.\n\nТелефон может быть разблокирован, если кто-то поднесет его к вашему лицу, даже когда у вас закрыты глаза."</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_3">Телефон сможет разблокировать человек, очень похожий на вас, например ваш близнец.</string>
+</resources>
diff --git a/res/values-ru/google_strings.xml b/res/values-ru/google_strings.xml
new file mode 100644
index 0000000..9a3079a
--- /dev/null
+++ b/res/values-ru/google_strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="battery_tip_smart_battery_summary_custom">Включите Adaptive Battery</string>
+ <string name="smart_battery_footer_custom">"Чтобы продлить время работы от батареи, функция Adaptive Battery ограничивает фоновые процессы редко используемых приложений. Со временем ваш телефон запоминает, какие приложения вы используете чаще, а какие реже.
+
+Уведомления от приложений, работу которых вы ограничиваете, могут приходить с задержкой."</string>
+ <string name="smart_battery_manager_title_custom">Адаптивное энергопотребление</string>
+ <string name="smart_battery_title_custom">Включить Adaptive Battery</string>
+ </resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 61809c4..49227d1 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -2753,9 +2753,6 @@
<string name="user_credentials" msgid="4044405430790970775">"Учетные данные пользователя"</string>
<string name="user_credentials_summary" msgid="686471637627271856">"Посмотреть/изменить сохраненные учетные данные"</string>
<string name="advanced_security_title" msgid="7117581975877192652">"Дополнительные настройки"</string>
- <string name="credential_storage_type" msgid="930861336971619888">"Тип хранилища"</string>
- <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Аппаратное"</string>
- <string name="credential_storage_type_software" msgid="4786996040468294626">"Только программное"</string>
<string name="credentials_settings_not_available" msgid="7433088409177429600">"Этот пользователь не может изменять учетные данные"</string>
<string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Установлено для VPN и приложений"</string>
<string name="credential_for_wifi" msgid="1963335263280604998">"Установлено для Wi-Fi"</string>
diff --git a/res/values-ru/wellbeing_strings.xml b/res/values-ru/wellbeing_strings.xml
new file mode 100644
index 0000000..2219286
--- /dev/null
+++ b/res/values-ru/wellbeing_strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="duration_less_than_one_minute">меньше 1 минуты</string>
+ <string name="screen_time_summary_usage_today">Сегодня: %1$s</string>
+ </resources>
diff --git a/res/values-si/aosp_strings.xml b/res/values-si/aosp_strings.xml
new file mode 100644
index 0000000..bfb7dec
--- /dev/null
+++ b/res/values-si/aosp_strings.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <!-- Strings for face unlock enrollment, missing from AOSP-->
+ <string name="aosp_security_settings_face_enroll_education_message">ඊළඟ තිරයේ, ඔබේ මුහුණේ සියලු කෝණ ග්රහණය කිරීමට ඔබේ හිස කරකවන්න</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_expanded">ඔබේ දෘෂ්ටිය හෝ හිසේ චලනය සීමිත නම්, මෙම අදහස මුහුණු අඟුලු ඇරීම සැකසීමට වඩා පහසු මාර්ගයකි. මුහුණු අඟුලු ඇරීම භාවිත කරන විට, ඔබේ හිස ඔබේ දුරකථනය ඉදිරියේ තවත් ඍජුව තිබීමට අවශ්ය විය හැක.</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_diversity">ප්රවේශ්යතා මුහුණු අඟුලු ඇරීම භාවිත කරන්න</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_vision">ඇස් ඇර තබා ගැනීම අවශ්ය කරයි</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_0">කණ්ණාඩි හෝ සුළු වශයෙන් වර්ණ ගැන්වූ අවු කණ්ණාඩි කමක් නැත.</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_1">"මුහුණෙන් අගුලු ඇරීම මගින් සටහන් කෙරෙන දත්ත සුරක්ෂිතව ගබඩා කෙරෙන අතර, කිසි විටෙක ඔබේ දුරකථනය හැර නොයයි. ඔබට ඕනෑම අවස්ථාවක ඔබගේ දත්ත මැකිය හැකිය.\n\nවැඩිදියුණු කළ මුහුණු ආකෘති තැනීමට ඔබේ දුරකථනය ඉඳහිට ඔබේ මෑතකාලීන මුහුණෙන් අගුලු ඇරීමේ රූප භාවිත කරනු ඇත."</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_2">"දුරකථනය දෙස බැලීම ඔබ එය අදහස් නොකරන විට පවා අගුලු ඇරිය හැකිය. ඔබේ දුරකථනය එය ඔබේ මුහුණ දක්වා ඔසවන්නේ නම් වෙනයම් කෙනෙකු විසින් අගුලු ඇරිය හැකිය.\n\nසැකසීම් තුළ අගුලු ඇරීම සඳහා ඔබ ඇස් විවෘත කර තබා ගැනීමට අවශ්ය විය හැකිය."</string>
+<string name="aosp_security_settings_face_enroll_introduction_footer_part_2_attention_not_supported">"දුරකථනය දෙස බැලීම ඔබ එය අගුලු හැරීමට අදහස් නොකරන විට අගුලු හැරිය හැකිය.\n\nඔබේ දුරකථනය ඔබේ ඇස් වසා තිබියදී පවා ඔබේ මුහුණට අල්ලා ගනු ලබන්නේ නම් වෙනත් කෙනෙකු විසින් අගුලු හරිනු ලැබිය හැකිය."</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_3">බොහෝ දුරට ඔබට සමානව පෙනෙන, සර්වසම සහෝදර සහෝදරියක් වැනි කෙනෙකුගෙන් අඟුලු අරිනු ලැබිය හැක.</string>
+</resources>
diff --git a/res/values-si/google_strings.xml b/res/values-si/google_strings.xml
new file mode 100644
index 0000000..e73d1b1
--- /dev/null
+++ b/res/values-si/google_strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="battery_tip_smart_battery_summary_custom">අනුවර්තනීය බැටරිය ක්රියාත්මක කරන්න</string>
+ <string name="smart_battery_footer_custom">"බැටරි ආයු කාලය දිගු කිරීමට, අනුවර්තනීය බැටරිය නිතර භාවිත කරන යෙදුම් සඳහා බැටරිය සීමා කරයි. ඔබගේ දුරකථනය කාලයත් සමඟ යෙදුම් භාවිත කරන ආකාරය දැන ගනු ඇත.
+
+මෙම යෙදුම් සඳහා දැනුම්දීම් ප්රමාද විය හැකිය."</string>
+ <string name="smart_battery_manager_title_custom">අනුවර්තනීය බැටරිය</string>
+ <string name="smart_battery_title_custom">අනුවර්තනීය බැටරිය භාවිත කරන්න</string>
+ </resources>
diff --git a/res/values-si/strings.xml b/res/values-si/strings.xml
index 027aeb6..7b99404 100644
--- a/res/values-si/strings.xml
+++ b/res/values-si/strings.xml
@@ -2677,9 +2677,6 @@
<string name="user_credentials" msgid="4044405430790970775">"පරිශීලක අක්තපත්ර"</string>
<string name="user_credentials_summary" msgid="686471637627271856">"ගබඩා කළ අක්තපත්ර බලන්න සහ විකරණය කරන්න"</string>
<string name="advanced_security_title" msgid="7117581975877192652">"උසස්"</string>
- <string name="credential_storage_type" msgid="930861336971619888">"ආචයන වර්ගය"</string>
- <string name="credential_storage_type_hardware" msgid="2630040425119817220">"දෘඩාංග රක්ෂිත"</string>
- <string name="credential_storage_type_software" msgid="4786996040468294626">"මෘදුකාංග පමණි"</string>
<string name="credentials_settings_not_available" msgid="7433088409177429600">"මෙම පරිශීලකයාට අක්තපත්ර නොතිබේ"</string>
<string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"VPN සහ යෙදුම් සඳහා ස්ථාපිත"</string>
<string name="credential_for_wifi" msgid="1963335263280604998">"Wi-Fi සඳහා ස්ථාපිත"</string>
diff --git a/res/values-si/wellbeing_strings.xml b/res/values-si/wellbeing_strings.xml
new file mode 100644
index 0000000..2408178
--- /dev/null
+++ b/res/values-si/wellbeing_strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="duration_less_than_one_minute">1 විනාඩියකට වඩා අඩු</string>
+ <string name="screen_time_summary_usage_today">අද %1$s</string>
+ </resources>
diff --git a/res/values-sk/aosp_strings.xml b/res/values-sk/aosp_strings.xml
new file mode 100644
index 0000000..8012f0a
--- /dev/null
+++ b/res/values-sk/aosp_strings.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <!-- Strings for face unlock enrollment, missing from AOSP-->
+ <string name="aosp_security_settings_face_enroll_education_message">Na ďalšej obrazovke otáčajte hlavou, aby sa vaša tvár nasnímala z rôznych uhlov.</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_expanded">Ak máte obmedzené videnie alebo pohyb hlavou, dá sa odomknutie tvárou nastaviť jednoduchšie pomocou tejto možnosti. Je možné, že pri odomykaní tvárou bude potrebné umiestniť hlavu pred telefón presnejšie.</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_diversity">Použiť zjednodušené odomknutie tvárou</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_vision">Vyžadovať otvorené oči</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_0">Okuliare alebo slabo tónované slnečné okuliare sú v poriadku.</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_1">"Údaje zaznamenané odomknutím tvárou sú bezpečne uložené a nikdy neopustia váš telefón. Svoje údaje môžete kedykoľvek odstrániť.\n\nTelefón bude pomocou vašich nedávnych fotiek odomknutia tvárou príležitostne vytvárať zlepšené modely tváre."</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_2">"Telefón môžete náhodne odomknúť pohľadom, aj keď ste to nechceli urobiť. Telefón môže odomknúť aj niekto iný, keď ho namieri na vašu tvár.\n\nAk chcete, aby sa pri odomykaní vyžadovali otvorené oči, môžete to nastaviť v Nastaveniach."</string>
+<string name="aosp_security_settings_face_enroll_introduction_footer_part_2_attention_not_supported">"Telefón môžete odomknúť pohľadom, aj keď ste to nechceli urobiť.\n\nTelefón môže odomknúť aj niekto iný, keď ho namieri na vašu tvár, a to dokonca aj vtedy, keď budete mať zatvorené oči."</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_3">Telefón môže odomknúť osoba, ktorá sa na vás veľmi podobá, napríklad vaše dvojča.</string>
+</resources>
diff --git a/res/values-sk/google_strings.xml b/res/values-sk/google_strings.xml
new file mode 100644
index 0000000..c3eb5ec
--- /dev/null
+++ b/res/values-sk/google_strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="battery_tip_smart_battery_summary_custom">Zapnite adaptáciu batérie</string>
+ <string name="smart_battery_footer_custom">"Adaptácia batérie predĺži výdrž batérie tým, že obmedzí využívanie batérie zriedka používanými aplikáciami. Váš telefón sa časom naučí, ako využívate aplikácie.
+
+Upozornenia z týchto aplikácií môžu byť oneskorené."</string>
+ <string name="smart_battery_manager_title_custom">Adaptácia batérie</string>
+ <string name="smart_battery_title_custom">Používať adaptáciu batérie</string>
+ </resources>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 980a53e..e256013 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -2753,9 +2753,6 @@
<string name="user_credentials" msgid="4044405430790970775">"Poverenia používateľa"</string>
<string name="user_credentials_summary" msgid="686471637627271856">"Zobraziť a zmeniť uložené poverenia"</string>
<string name="advanced_security_title" msgid="7117581975877192652">"Rozšírené"</string>
- <string name="credential_storage_type" msgid="930861336971619888">"Typ úložiska"</string>
- <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Hardvérové"</string>
- <string name="credential_storage_type_software" msgid="4786996040468294626">"Iba softvérové"</string>
<string name="credentials_settings_not_available" msgid="7433088409177429600">"Poverenia nie sú pre tohto používateľa k dispozícii"</string>
<string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Nainštalované pre sieť VPN a aplikácie"</string>
<string name="credential_for_wifi" msgid="1963335263280604998">"Nainštalované pre sieť Wi‑Fi"</string>
diff --git a/res/values-sk/wellbeing_strings.xml b/res/values-sk/wellbeing_strings.xml
new file mode 100644
index 0000000..f74a633
--- /dev/null
+++ b/res/values-sk/wellbeing_strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="duration_less_than_one_minute">menej ako 1 minúta</string>
+ <string name="screen_time_summary_usage_today">Dnes %1$s</string>
+ </resources>
diff --git a/res/values-sl/aosp_strings.xml b/res/values-sl/aosp_strings.xml
new file mode 100644
index 0000000..37653cf
--- /dev/null
+++ b/res/values-sl/aosp_strings.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <!-- Strings for face unlock enrollment, missing from AOSP-->
+ <string name="aosp_security_settings_face_enroll_education_message">Na naslednjem zaslonu zasukajte glavo, da posnamete obraz z vseh možnih kotov</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_expanded">Če ste slabovidni ali imate omejeno gibanje glave, ta možnost predstavlja lažji način za nastavitev odklepanja z obrazom. Ko uporabljate odklepanje z obrazom, boste morda morali glavo nastaviti naravnost pred telefon.</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_diversity">Uporaba odklepanja z obrazom za ljudi s posebnimi potrebami</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_vision">Oči morajo biti odprte</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_0">Lahko nosite očala ali rahlo zatemnjena sončna očala.</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_1">"Podatki, ki jih zabeleži odklepanje z obrazom, so varno shranjeni in nikoli ne zapustijo telefona. Podatke lahko kadar koli izbrišete v nastavitvah.\n\nTelefon bo nedavne slike za odklepanje z obrazom občasno uporabil za ustvarjanje izboljšanih modelov obraza."</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_2">"Če pogledate proti telefonu, ga boste morda nenamerno odklenili. Vaš telefon lahko odklene tudi kdo drug, če ga podrži pred vašim obrazom.\n\nV nastavitvah lahko nastavite, da se telefon odklene samo, če imate oči odprte."</string>
+<string name="aosp_security_settings_face_enroll_introduction_footer_part_2_attention_not_supported">"Telefon se lahko nenamerno odklene, če ga pogledate.\n\nTelefon lahko odklene tudi nekdo drug, če ga podrži pred vašim obrazom – celo kadar imate oči zaprte."</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_3">Telefon lahko odklene nekdo, ki vam je zelo podoben, na primer enojajčni dvojček.</string>
+</resources>
diff --git a/res/values-sl/google_strings.xml b/res/values-sl/google_strings.xml
new file mode 100644
index 0000000..3bb86a6
--- /dev/null
+++ b/res/values-sl/google_strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="battery_tip_smart_battery_summary_custom">Vklopi prilagodljivo varčevanje z energijo akumulatorja</string>
+ <string name="smart_battery_footer_custom">"Prilagodljivo varčevanje z energijo akumulatorja omeji porabo energije akumulatorja za redko uporabljene aplikacije, da podaljša čas delovanja akumulatorja. Telefon se bo sčasoma naučil, kako uporabljate aplikacije.
+
+Obvestila za te aplikacije bodo morda zakasnjena."</string>
+ <string name="smart_battery_manager_title_custom">Prilagodljivo varčevanje z energijo akumulatorja</string>
+ <string name="smart_battery_title_custom">Uporaba prilagodljivega varčevanja z energijo akumulatorja</string>
+ </resources>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 072d4a4..a88ccba 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -2753,9 +2753,6 @@
<string name="user_credentials" msgid="4044405430790970775">"Uporabniške poverilnice"</string>
<string name="user_credentials_summary" msgid="686471637627271856">"Ogled in spreminjanje shranjenih poverilnic"</string>
<string name="advanced_security_title" msgid="7117581975877192652">"Dodatno"</string>
- <string name="credential_storage_type" msgid="930861336971619888">"Vrsta shrambe"</string>
- <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Strojna"</string>
- <string name="credential_storage_type_software" msgid="4786996040468294626">"Samo programska"</string>
<string name="credentials_settings_not_available" msgid="7433088409177429600">"Za tega uporabnika niso na voljo poverilnice"</string>
<string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Nameščeno za VPN in aplikacije"</string>
<string name="credential_for_wifi" msgid="1963335263280604998">"Nameščeno za Wi-Fi"</string>
diff --git a/res/values-sl/wellbeing_strings.xml b/res/values-sl/wellbeing_strings.xml
new file mode 100644
index 0000000..6286dda
--- /dev/null
+++ b/res/values-sl/wellbeing_strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="duration_less_than_one_minute">Manj kot ena minuta</string>
+ <string name="screen_time_summary_usage_today">Danes: %1$s</string>
+ </resources>
diff --git a/res/values-sq/aosp_strings.xml b/res/values-sq/aosp_strings.xml
new file mode 100644
index 0000000..65f53e1
--- /dev/null
+++ b/res/values-sq/aosp_strings.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <!-- Strings for face unlock enrollment, missing from AOSP-->
+ <string name="aosp_security_settings_face_enroll_education_message">Në ekranin tjetër, rrotullo kokën për të regjistruar të gjitha këndet e fytyrës sate</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_expanded">Nëse ke kufizime me shikimin ose lëvizjen e kokës, ky opsion është mënyra më e thjeshtë për të konfiguruar shkyçjen me fytyrë. Kur përdor shkyçjen me fytyrë, mund të jetë e nevojshme që koka jote të jetë më direkt përpara telefonit tënd.</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_diversity">Përdor shkyçjen e fytyrës me qasshmëri</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_vision">Kërko sy të hapur</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_0">Syzet dhe syzet e diellit me nuancë të lehtë janë të pranueshme.</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_1">"Të dhënat e regjistruara me \"Shkyçjen me fytyrë\" ruhen në mënyrë të sigurt dhe nuk largohen asnjëherë nga telefoni yt. Të dhënat e tua mund t'i fshish në çdo moment te cilësimet.\n\nTelefoni yt do të përdorë herë pas here imazhet e fundit të \"Shkyçjes me fytyrë\" për të krijuar modele të përmirësuara të fytyrës."</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_2">"Shikimi te telefoni mund ta shkyçë atë edhe nëse nuk ke për qëllim ta bësh. Telefoni yt mund të shkyçet nga dikush tjetër nëse ai mbahet te fytyra jote.\n\nMund të kërkosh që t'i kesh sytë të hapur për shkyçjen te \"Cilësimet\"."</string>
+<string name="aosp_security_settings_face_enroll_introduction_footer_part_2_attention_not_supported">"Shikimi te telefoni mund ta shkyçë atë kur nuk planifikon këtë.\n\nTelefoni yt mund të shkyçet nga dikush tjetër nëse ai mbahet te fytyra jote, edhe nëse sytë i ke të mbyllur."</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_3">Telefoni yt mund të shkyçet nga dikush që ngjan shumë me ty, p.sh. nga një binjak.</string>
+</resources>
diff --git a/res/values-sq/google_strings.xml b/res/values-sq/google_strings.xml
new file mode 100644
index 0000000..109e1e5
--- /dev/null
+++ b/res/values-sq/google_strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="battery_tip_smart_battery_summary_custom">Aktivizo \"Baterinë me përshtatje\"</string>
+ <string name="smart_battery_footer_custom">"Për të zgjatur kohëzgjatjen e baterisë, \"Bateria me përshtatje\" kufizon baterinë për aplikacionet që nuk përdoren shpesh. Telefoni yt do të mësojë se si i përdor ti aplikacionet me kalimin e kohës.
+
+Njoftimet mund të vonohen për këto aplikacione."</string>
+ <string name="smart_battery_manager_title_custom">Bateria me përshtatje</string>
+ <string name="smart_battery_title_custom">Përdor \"Baterinë me përshtatje\"</string>
+ </resources>
diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml
index 2e514b6..01b2f88 100644
--- a/res/values-sq/strings.xml
+++ b/res/values-sq/strings.xml
@@ -2677,9 +2677,6 @@
<string name="user_credentials" msgid="4044405430790970775">"Kredencialet e përdoruesit"</string>
<string name="user_credentials_summary" msgid="686471637627271856">"Shiko dhe modifiko kredencialet e ruajtura"</string>
<string name="advanced_security_title" msgid="7117581975877192652">"Të përparuara"</string>
- <string name="credential_storage_type" msgid="930861336971619888">"Lloji i hapësirës ruajtëse"</string>
- <string name="credential_storage_type_hardware" msgid="2630040425119817220">"E mbështetur nga hardueri"</string>
- <string name="credential_storage_type_software" msgid="4786996040468294626">"Vetëm ajo e softuerit"</string>
<string name="credentials_settings_not_available" msgid="7433088409177429600">"Kredencialet nuk ofrohen për këtë përdorues"</string>
<string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Instaluar për VPN dhe aplikacione"</string>
<string name="credential_for_wifi" msgid="1963335263280604998">"Instaluar për Wi-Fi"</string>
diff --git a/res/values-sq/wellbeing_strings.xml b/res/values-sq/wellbeing_strings.xml
new file mode 100644
index 0000000..4d4ae74
--- /dev/null
+++ b/res/values-sq/wellbeing_strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="duration_less_than_one_minute">Më pak se 1 minutë</string>
+ <string name="screen_time_summary_usage_today">%1$s sot</string>
+ </resources>
diff --git a/res/values-sr/aosp_strings.xml b/res/values-sr/aosp_strings.xml
new file mode 100644
index 0000000..d24c22d
--- /dev/null
+++ b/res/values-sr/aosp_strings.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <!-- Strings for face unlock enrollment, missing from AOSP-->
+ <string name="aosp_security_settings_face_enroll_education_message">На следећем екрану ротирајте главу да бисте снимили све углове лица</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_expanded">Ако имате ограничен вид или покрете главом, ова опција представља једноставнији начин да подесите откључавање лицем. Када користите откључавање лицем, глава треба да буде директно испред телефона.</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_diversity">Користите откључавање лицем са функцијом приступачности</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_vision">Очи треба да буду отворене</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_0">Наочаре за вид или сунце са благом нијансом су у реду.</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_1">"Подаци које забележи откључавање лицем безбедно се чувају и остају само на телефону. Можете да избришете податке у било ком тренутку.\n\nТелефон ће повремено користити недавне слике за откључавање лицем ради прављења побољшаних модела лица."</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_2">"Ако погледате телефон, можете и нехотице да га откључате. Телефон може да откључа неко други ако га приближи вашем лицу.\n\nУ подешавањима можете да захтевате да вам очи буду отворене ради откључавања."</string>
+<string name="aosp_security_settings_face_enroll_introduction_footer_part_2_attention_not_supported">"Ако погледате телефон, можете и нехотице да га откључате.\n\nТелефон може да откључа неко други ако га приближи вашем лицу, чак и ако су вам очи затворене."</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_3">Телефон може да откључа неко ко много личи на вас, на пример, идентични близанац.</string>
+</resources>
diff --git a/res/values-sr/google_strings.xml b/res/values-sr/google_strings.xml
new file mode 100644
index 0000000..235b5b4
--- /dev/null
+++ b/res/values-sr/google_strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="battery_tip_smart_battery_summary_custom">Укључите прилагодљиву батерију</string>
+ <string name="smart_battery_footer_custom">"Да бисте продужили трајање батерије, прилагодљива батерија ограничава потрошњу батерије за апликације које се не користе често. Телефон ће временом научити како да користи апликације.
+
+Обавештења о овим апликацијама могу да касне."</string>
+ <string name="smart_battery_manager_title_custom">Прилагодљива батерија</string>
+ <string name="smart_battery_title_custom">Користи прилагодљиву батерију</string>
+ </resources>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 591ae1b..079ca20 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -2715,9 +2715,6 @@
<string name="user_credentials" msgid="4044405430790970775">"Кориснички акредитиви"</string>
<string name="user_credentials_summary" msgid="686471637627271856">"Прегледајте и мењајте сачуване акредитиве"</string>
<string name="advanced_security_title" msgid="7117581975877192652">"Напредна"</string>
- <string name="credential_storage_type" msgid="930861336971619888">"Тип меморијског простора"</string>
- <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Подржан хардвером"</string>
- <string name="credential_storage_type_software" msgid="4786996040468294626">"Само софтверски"</string>
<string name="credentials_settings_not_available" msgid="7433088409177429600">"Акредитиви нису доступни за овог корисника"</string>
<string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Инсталирано за VPN и апликације"</string>
<string name="credential_for_wifi" msgid="1963335263280604998">"Инсталирано за Wi-Fi"</string>
diff --git a/res/values-sr/wellbeing_strings.xml b/res/values-sr/wellbeing_strings.xml
new file mode 100644
index 0000000..1c752de
--- /dev/null
+++ b/res/values-sr/wellbeing_strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="duration_less_than_one_minute">Mање од 1 минута</string>
+ <string name="screen_time_summary_usage_today">%1$s данас</string>
+ </resources>
diff --git a/res/values-sv/aosp_strings.xml b/res/values-sv/aosp_strings.xml
new file mode 100644
index 0000000..9b4568f
--- /dev/null
+++ b/res/values-sv/aosp_strings.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <!-- Strings for face unlock enrollment, missing from AOSP-->
+ <string name="aosp_security_settings_face_enroll_education_message">Vrid på huvudet på nästa skärm så att ditt ansikte kan registreras ur olika vinklar</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_expanded">Om du har nedsatt syn eller problem med att röra på huvudet är detta alternativ ett enklare sätt att konfigurera ansiktslås. När du använder ansiktslås kan du behöva ha huvudet mer direkt framför mobilen.</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_diversity">Använd ansiktslås med tillgänglighetsfunktioner</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_vision">Du måste ha ögonen öppna</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_0">Glasögon eller solglasögon i en ljus ton är okej.</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_1">"Den data som registreras med ansiktslåset sparas säkert och lämnar aldrig din telefon. Du kan när som helst radera din data i inställningarna.\n\nDina senaste bilder från ansiktslåset används regelbundet till att förbättra ansiktsmodeller på telefonen."</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_2">"Om du tittar på telefonen kan du oavsiktligt låsa upp den. Andra kan låsa upp din telefon om de håller upp den mot ditt ansikte.\n\nI inställningarna kan du kräva att dina ögon ska vara öppna för att telefonen ska låsas upp."</string>
+<string name="aosp_security_settings_face_enroll_introduction_footer_part_2_attention_not_supported">"Om du tittar på telefonen kan den oavsiktligt låsas upp.\n\nAndra kan låsa upp telefonen om de håller upp den mot ditt ansikte, även om du inte har ögonen öppna."</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_3">Mobilen kanske kan låsas upp av någon som är mycket lik dig, till exempel ett syskon.</string>
+</resources>
diff --git a/res/values-sv/google_strings.xml b/res/values-sv/google_strings.xml
new file mode 100644
index 0000000..6fd4f7a
--- /dev/null
+++ b/res/values-sv/google_strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="battery_tip_smart_battery_summary_custom">Aktivera Smart batteri</string>
+ <string name="smart_battery_footer_custom">"Med Smart batteri förlängs batteritiden genom att batterianvändningen begränsas för appar som används sällan. Mobilen lär sig hur du använder appar med tiden.
+
+Aviseringar från dessa appar kan fördröjas."</string>
+ <string name="smart_battery_manager_title_custom">Smart batteri</string>
+ <string name="smart_battery_title_custom">Använd Smart batteri</string>
+ </resources>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index f81f5e8..d700e5c 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -2677,9 +2677,6 @@
<string name="user_credentials" msgid="4044405430790970775">"Användaruppgifter"</string>
<string name="user_credentials_summary" msgid="686471637627271856">"Visa och hantera lagrade användaruppgifter"</string>
<string name="advanced_security_title" msgid="7117581975877192652">"Avancerat"</string>
- <string name="credential_storage_type" msgid="930861336971619888">"Lagringstyp"</string>
- <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Maskinvarustöd"</string>
- <string name="credential_storage_type_software" msgid="4786996040468294626">"Endast programvara"</string>
<string name="credentials_settings_not_available" msgid="7433088409177429600">"Användaruppgifter är inte tillgängliga för den här användaren"</string>
<string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Har installerats för VPN och appar"</string>
<string name="credential_for_wifi" msgid="1963335263280604998">"Har installerats för Wi-Fi"</string>
diff --git a/res/values-sv/wellbeing_strings.xml b/res/values-sv/wellbeing_strings.xml
new file mode 100644
index 0000000..4f16f5a
--- /dev/null
+++ b/res/values-sv/wellbeing_strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="duration_less_than_one_minute">Mindre än 1 minut</string>
+ <string name="screen_time_summary_usage_today">%1$s i dag</string>
+ </resources>
diff --git a/res/values-sw/aosp_strings.xml b/res/values-sw/aosp_strings.xml
new file mode 100644
index 0000000..fbae0a0
--- /dev/null
+++ b/res/values-sw/aosp_strings.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <!-- Strings for face unlock enrollment, missing from AOSP-->
+ <string name="aosp_security_settings_face_enroll_education_message">Kwenye skrini inayofuata, zungusha kichwa chako ili upige picha ya pande zote za uso wako</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_expanded">Ikiwa huoni vizuri au huwezi kuzungusha kichwa vizuri, chaguo hili ni njia rahisi ya kuweka mipangilio ya kufungua kwa uso. Unapotumia kipengele cha kufungua kwa uso, huenda ukahitajika kuweka kichwa chako moja kwa moja mbele ya simu yako.</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_diversity">Tumia kipengele cha ufikivu cha kufungua kwa uso</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_vision">Inahitaji ufungue macho</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_0">Miwani ya kawaida au ya jua iliyotiwa rangi kidogo ni sawa.</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_1">"Data iliyorekodiwa na kipengele cha kufungua kwa uso huhifadhiwa kwa usalama na haiondoki kwenye simu yako. Unaweza kufuta data yako wakati wowote katika mipangilio.\n\nMara chache, simu yako itatumia picha za hivi majuzi za kufungua kwa uso ili kuunda miundo ya uso iliyoboreshwa."</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_2">"Kuangalia simu kunaweza kuifungua hata ikiwa huna lengo la kufanya hivyo. Simu yako inaweza kufunguliwa na mtu mwingine akiiweka mbele ya uso wako.\n\nUnaweza kuweka mipangilio ya kuhitaji macho yako yawe yamefunguliwa kwa ajili ya kufungua katika Mipangilio."</string>
+<string name="aosp_security_settings_face_enroll_introduction_footer_part_2_attention_not_supported">"Kuangalia simu kunaweza kuifungua wakati hujakusudia.\n\nSimu yako inaweza kufunguliwa na mtu mwingine akiiweka mbele ya uso wako, hata ukiwa umefunga macho."</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_3">Simu yako inaweza kufunguliwa na mtu ambaye anakufanana, kama vile ndugu anayekufanana sana.</string>
+</resources>
diff --git a/res/values-sw/google_strings.xml b/res/values-sw/google_strings.xml
new file mode 100644
index 0000000..fe372eb
--- /dev/null
+++ b/res/values-sw/google_strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="battery_tip_smart_battery_summary_custom">Washa Betri Inayojirekebisha</string>
+ <string name="smart_battery_footer_custom">"Ili uongeze muda wa matumizi ya betri, Betri Inayojirekebisha hudhibiti matumizi ya betri katika programu ambazo huzitumii zaidi. Simu yako itajifunza unavyotumia programu hizi baada ya muda fulani.
+
+Huenda arifa zikachelewa katika programu hizi."</string>
+ <string name="smart_battery_manager_title_custom">Betri Inayojirekebisha</string>
+ <string name="smart_battery_title_custom">Tumia Betri Inayojirekebisha</string>
+ </resources>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 7d1567c..469e243 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -2677,9 +2677,6 @@
<string name="user_credentials" msgid="4044405430790970775">"Kitambulisho cha mtumiaji"</string>
<string name="user_credentials_summary" msgid="686471637627271856">"Angalia na urekebishe vitambulisho vilivyohifadhiwa"</string>
<string name="advanced_security_title" msgid="7117581975877192652">"Mipangilio Ya Kina"</string>
- <string name="credential_storage_type" msgid="930861336971619888">"Aina ya hifadhi"</string>
- <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Inaweza kutumiwa na maunzi"</string>
- <string name="credential_storage_type_software" msgid="4786996040468294626">"Programu pekee"</string>
<string name="credentials_settings_not_available" msgid="7433088409177429600">"Kitambulisho hakipatikani kwa mtumiaji huyu"</string>
<string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Imesakinishwa kwa ajili ya VPN na programu"</string>
<string name="credential_for_wifi" msgid="1963335263280604998">"Imesakinishwa kwa ajili ya Wi-Fi"</string>
diff --git a/res/values-sw/wellbeing_strings.xml b/res/values-sw/wellbeing_strings.xml
new file mode 100644
index 0000000..63cb539
--- /dev/null
+++ b/res/values-sw/wellbeing_strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="duration_less_than_one_minute">Chini ya dakika 1</string>
+ <string name="screen_time_summary_usage_today">%1$s leo</string>
+ </resources>
diff --git a/res/values-ta/aosp_strings.xml b/res/values-ta/aosp_strings.xml
new file mode 100644
index 0000000..a7d483e
--- /dev/null
+++ b/res/values-ta/aosp_strings.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <!-- Strings for face unlock enrollment, missing from AOSP-->
+ <string name="aosp_security_settings_face_enroll_education_message">அடுத்த திரையில் உங்கள் முகத்தை அனைத்துக் கோணங்களிலும் படமெடுக்க தலையை மெதுவாகத் திருப்பவும்</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_expanded">"பார்வைக் குறைபாடோ தலையை அசைக்க இயலாமையோ இருந்தால் 'முகம் காட்டித் திறத்தல்' அம்சத்தை இந்த முறையில் எளிதாக அமைக்கலாம். 'முகம் காட்டித் திறத்தல்' அம்சத்தைப் பயன்படுத்தும்போது உங்கள் முகம் மொபைலுக்கு நேராக இருக்க வேண்டும்."</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_diversity">"மாற்றுத்திறனாளிகளுக்கான 'முகம் காட்டித் திறத்தலைப்' பயன்படுத்து"</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_vision">கண்கள் திறந்திருக்க வேண்டும்</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_0">மூக்குக் கண்ணாடிகளையும் மென்னிறமான கூலிங் கிளாஸ்களையும் பயன்படுத்தலாம்.</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_1">"’முகம் காட்டித் திறத்தல்’ அம்சத்தால் ரெக்கார்டு செய்யப்படும் உங்கள் முகத்தின் தரவு மொபைலில் பாதுகாப்பாகச் சேமிக்கப்படுகிறது, அது யாருடனும் பகிரப்படாது. அமைப்புகளுக்குச் சென்று இந்தத் தரவை நீங்கள் எப்போது வேண்டுமானாலும் நீக்கலாம்.\n\nமேம்பட்ட முக மாதிரிகளை உருவாக்கும் பொருட்டு ’முகம் காட்டித் திறத்தல்’ அம்சத்திலுள்ள உங்களின் சமீபத்திய படங்களை மொபைல் அவ்வப்போது பயன்படுத்தும்."</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_2">"மொபைலைத் திறக்கும் எண்ணம் இல்லாதபோதும் தற்செயலாகத் திரையைப் பார்ப்பதால் அது திறக்கக்கூடும். உங்கள் முகத்திற்கு முன் மொபைலைக் காட்டி வேறொருவர் அதைத் திறக்கலாம்.\n\nஅமைப்புகளுக்குச் சென்று உங்கள் கண்கள் திறந்திருக்கும்போது மட்டுமே அன்லாக் ஆகும்படி அமைக்கலாம்."</string>
+<string name="aosp_security_settings_face_enroll_introduction_footer_part_2_attention_not_supported">"நீங்கள் தற்செயலாக மொபைலைப் பார்க்கும்போதும் அது திறக்கக்கூடும்.\n\nஉங்கள் கண்கள் மூடியிருந்தாலும்கூட முகத்திற்கு முன் மொபைலைக் காட்டி வேறொருவர் அதைத் திறக்க முடியும்."</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_3">உங்கள் சாயலில் இருப்பவர்களால் மொபைலைத் திறக்க இயலும். எ.கா., உடன்பிறப்புகள்.</string>
+</resources>
diff --git a/res/values-ta/google_strings.xml b/res/values-ta/google_strings.xml
new file mode 100644
index 0000000..bda2513
--- /dev/null
+++ b/res/values-ta/google_strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="battery_tip_smart_battery_summary_custom">அடாப்டிவ் பேட்டரியை ஆன் செய்க</string>
+ <string name="smart_battery_footer_custom">"பேட்டரி நிலையை நீட்டிக்க, அடாப்டிவ் பேட்டரியானது அடிக்கடி பயன்படுத்தாத ஆப்ஸிற்கு பேட்டரியைக் கட்டுப்படுத்தும். நீங்கள் ஆப்ஸை எப்படிப் பயன்படுத்துகிறீர்கள் என்பதைக் காலப்போக்கில் உங்கள் மொபைல் அறிந்துகொள்ளும்.
+
+இந்த ஆப்ஸிற்கான அறிவிப்புகள் தாமதமாக வரலாம்."</string>
+ <string name="smart_battery_manager_title_custom">அடாப்டிவ் பேட்டரி</string>
+ <string name="smart_battery_title_custom">அடாப்டிவ் பேட்டரியைப் பயன்படுத்து</string>
+ </resources>
diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml
index 18432e6..be6ef6e 100644
--- a/res/values-ta/strings.xml
+++ b/res/values-ta/strings.xml
@@ -2677,9 +2677,6 @@
<string name="user_credentials" msgid="4044405430790970775">"பயனரின் அனுமதிச் சான்றுகள்"</string>
<string name="user_credentials_summary" msgid="686471637627271856">"சேமித்த அனுமதிச் சான்றுகளைப் பார்க்கும், திருத்தும்"</string>
<string name="advanced_security_title" msgid="7117581975877192652">"மேம்பட்டது"</string>
- <string name="credential_storage_type" msgid="930861336971619888">"சேமிப்பிடத்தின் வகை"</string>
- <string name="credential_storage_type_hardware" msgid="2630040425119817220">"வன்பொருள்-காப்புப் பிரதியெடுக்கப்பட்டது"</string>
- <string name="credential_storage_type_software" msgid="4786996040468294626">"மென்பொருள் மட்டும்"</string>
<string name="credentials_settings_not_available" msgid="7433088409177429600">"இவருக்கு நற்சான்றுகளை அணுக அனுமதியில்லை"</string>
<string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"VPN மற்றும் பயன்பாடுகளுக்காக நிறுவியது"</string>
<string name="credential_for_wifi" msgid="1963335263280604998">"வைஃபைக்காக நிறுவியது"</string>
diff --git a/res/values-ta/wellbeing_strings.xml b/res/values-ta/wellbeing_strings.xml
new file mode 100644
index 0000000..a4f9465
--- /dev/null
+++ b/res/values-ta/wellbeing_strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="duration_less_than_one_minute">ஒரு நிமிடத்திற்கும் குறைவு</string>
+ <string name="screen_time_summary_usage_today">இன்று %1$s</string>
+ </resources>
diff --git a/res/values-te/aosp_strings.xml b/res/values-te/aosp_strings.xml
new file mode 100644
index 0000000..134cc74
--- /dev/null
+++ b/res/values-te/aosp_strings.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <!-- Strings for face unlock enrollment, missing from AOSP-->
+ <string name="aosp_security_settings_face_enroll_education_message">తర్వాతి స్క్రీన్లో, మీ ముఖం యొక్క అన్ని కోణాలను క్యాప్చర్ చేయడానికి మీ తలను తిప్పండి</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_expanded">"మీకు పరిమిత కంటిచూపు ఉన్నా లేదా తల ఎక్కువగా తిప్పలేకున్నా, 'ఫేస్ అన్లాక్'ను సెటప్ చేయడానికి ఈ ఎంపిక ఒక సులభమైన మార్గం. 'ముఖంతో అన్లాక్'ను ఉపయోగిస్తున్నప్పుడు, మీ తల భాగం నేరుగా మీ ఫోన్ వైపు చూసేలా ఉండాలి."</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_diversity">"యాక్సెస్ సామర్థ్యం ఉండే 'ముఖంతో అన్లాక్'ను ఉపయోగించండి"</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_vision">కళ్లు తెరిచి ఉంచాలి</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_0">కళ్లద్దాలు లేదా కొద్దిగా లేత రంగులో చలువ కళ్లద్దాలు పెట్టుకుని ఉన్నా ఫర్వాలేదు.</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_1">"ఫేస్ అన్లాక్ ద్వారా రికార్డ్ చేయబడిన డేటా సురక్షితంగా నిల్వ చేయబడుతుంది, అది మీ ఫోన్ నుండి ఎప్పటికీ తీసివేయబడదు. మీరు సెట్టింగ్లలో మీ డేటాను ఎప్పుడైనా తొలగించవచ్చు.\n\nమెరుగైన ఫేస్ మోడల్లను సృష్టించడానికి మీ ఫోన్ అప్పుడప్పుడు ఇటీవలి మీ ఫేస్ అన్లాక్ చిత్రాలను ఉపయోగిస్తుంది."</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_2">"మీకు అన్లాక్ చేసే ఉద్దేశ్యం లేనప్పటికీ, కేవలం ఫోన్ వైపు చూసినా కూడా అది అన్లాక్ అవుతుంది. మీ ముఖాన్ని స్క్రీన్ వైపు చూపితే, ఇతరులు కూడా మీ ఫోన్ను అన్లాక్ చేయగలుగుతారు.\n\nఅన్లాక్ చేయడానికి సెట్టింగ్లలో మీరు మీ కళ్ళను తెరిచి ఉండాలని సూచించవచ్చు."</string>
+<string name="aosp_security_settings_face_enroll_introduction_footer_part_2_attention_not_supported">"మీరు అనుకోకుండా ఫోన్ వైపు చూసినా కూడా అన్లాక్ అయ్యే అవకాశం ఉంది.\n\nమీ కళ్లు మూసి ఉన్నా కూడా, మీ ముఖాన్ని స్క్రీన్ వైపు చూపితే, ఇతరులు కూడా మీ ఫోన్ను అన్లాక్ చేయగలుగుతారు."</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_3">మీలాంటి రూపం ఉన్న వ్యక్తులు, అంటే మీలా ఉండే తోబుట్టువు మీ ఫోన్ను అన్లాక్ చేయగలిగే అవకాశం ఉంటుంది.</string>
+</resources>
diff --git a/res/values-te/google_strings.xml b/res/values-te/google_strings.xml
new file mode 100644
index 0000000..1fac3fb
--- /dev/null
+++ b/res/values-te/google_strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="battery_tip_smart_battery_summary_custom">అనుకూల బ్యాటరీని ఆన్ చేయండి</string>
+ <string name="smart_battery_footer_custom">"బ్యాటరీ జీవితకాలాన్ని పొడిగించడానికి, అనుకూల బ్యాటరీ అరుదుగా ఉపయోగించే యాప్ల కోసం బ్యాటరీని పరిమితం చేస్తుంది. మీరు యాప్లను ఎలా వినియోగిస్తారో అన్నది కాలక్రమేణా మీ ఫోన్ అర్థం చేసుకుంటుంది.
+
+ ఈ యాప్ల కోసం నోటిఫికేషన్లు రావడానికి ఆలస్యం కావచ్చు."</string>
+ <string name="smart_battery_manager_title_custom">అనుకూల బ్యాటరీ</string>
+ <string name="smart_battery_title_custom">అనుకూల బ్యాటరీని ఉపయోగించండి</string>
+ </resources>
diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index 5f46ff3..2529b9e 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml
@@ -2677,9 +2677,6 @@
<string name="user_credentials" msgid="4044405430790970775">"యూజర్ ఆధారాలు"</string>
<string name="user_credentials_summary" msgid="686471637627271856">"నిల్వ ఉన్న ఆధారాలను చూడండి, వాటిని సవరించండి"</string>
<string name="advanced_security_title" msgid="7117581975877192652">"అధునాతన సెట్టింగ్లు"</string>
- <string name="credential_storage_type" msgid="930861336971619888">"నిల్వ రకం"</string>
- <string name="credential_storage_type_hardware" msgid="2630040425119817220">"హార్డ్వేర్ మద్దతు"</string>
- <string name="credential_storage_type_software" msgid="4786996040468294626">"సాప్ట్వేర్ మాత్రమే"</string>
<string name="credentials_settings_not_available" msgid="7433088409177429600">"ఈ వినియోగదారు కోసం ఆధారాలు అందుబాటులో లేవు"</string>
<string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"VPN మరియు అనువర్తనాల కోసం ఇన్స్టాల్ చేయబడింది"</string>
<string name="credential_for_wifi" msgid="1963335263280604998">"Wi-Fi కోసం ఇన్స్టాల్ చేయబడింది"</string>
diff --git a/res/values-te/wellbeing_strings.xml b/res/values-te/wellbeing_strings.xml
new file mode 100644
index 0000000..ddc9ecc
--- /dev/null
+++ b/res/values-te/wellbeing_strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="duration_less_than_one_minute">1 నిమిషం కంటే తక్కువ</string>
+ <string name="screen_time_summary_usage_today">ఈ రోజు %1$s</string>
+ </resources>
diff --git a/res/values-th/aosp_strings.xml b/res/values-th/aosp_strings.xml
new file mode 100644
index 0000000..e2010db
--- /dev/null
+++ b/res/values-th/aosp_strings.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <!-- Strings for face unlock enrollment, missing from AOSP-->
+ <string name="aosp_security_settings_face_enroll_education_message">ในหน้าจอถัดไป ให้หมุนศีรษะเพื่อจับภาพใบหน้าทุกมุม</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_expanded">หากคุณมองเห็นหรือขยับศีรษะได้จำกัด ตัวเลือกนี้จะช่วยให้ตั้งค่าการปลดล็อกด้วยใบหน้าได้ง่ายขึ้น เมื่อใช้การปลดล็อกด้วยใบหน้า คุณอาจต้องหันหน้าให้ตรงกับโทรศัพท์มากขึ้น</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_diversity">ใช้การปลดล็อกด้วยใบหน้าสำหรับการช่วยเหลือพิเศษ</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_vision">ต้องลืมตา</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_0">สวมแว่นตาหรือแว่นกันแดดที่มีเลนส์สีอ่อนได้</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_1">"ระบบจะเก็บข้อมูลที่บันทึกโดยฟีเจอร์ปลดล็อกด้วยใบหน้าไว้อย่างปลอดภัยและจะไม่มีการส่งออกไปจากโทรศัพท์ของคุณ คุณลบข้อมูลของคุณได้ทุกเมื่อในการตั้งค่า\n\nโทรศัพท์จะใช้รูปภาพล่าสุดจากการปลดล็อกด้วยใบหน้าเพื่อสร้างรูปแบบใบหน้าที่ปรับปรุงให้ดียิ่งขึ้นเป็นระยะๆ"</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_2">"การมองโทรศัพท์จะปลดล็อกโทรศัพท์ได้แม้ว่าคุณไม่ได้ตั้งใจก็ตาม คนอื่นอาจปลดล็อกโทรศัพท์ได้หากถือโทรศัพท์ไว้ตรงหน้าของคุณ\n\nคุณกำหนดในการตั้งค่าได้ว่าต้องลืมตาถึงจะปลดล็อกได้"</string>
+<string name="aosp_security_settings_face_enroll_introduction_footer_part_2_attention_not_supported">"การดูโทรศัพท์อาจปลดล็อกเครื่องโดยไม่ได้ตั้งใจ\n\nคนอื่นอาจปลดล็อกโทรศัพท์ได้หากถือโทรศัพท์ไว้ที่หน้าของคุณ แม้ว่าคุณจะหลับตาอยู่ก็ตาม"</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_3">คนที่หน้าคล้ายคุณมากๆ เช่น แฝดของคุณอาจปลดล็อกโทรศัพท์ได้</string>
+</resources>
diff --git a/res/values-th/google_strings.xml b/res/values-th/google_strings.xml
new file mode 100644
index 0000000..af47a40
--- /dev/null
+++ b/res/values-th/google_strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="battery_tip_smart_battery_summary_custom">เปิดแบตเตอรี่แบบปรับอัตโนมัติ</string>
+ <string name="smart_battery_footer_custom">"แบตเตอรี่แบบปรับอัตโนมัติจะจำกัดแบตเตอรี่ของแอปที่ใช้ไม่บ่อยเพื่อยืดอายุการใช้งานแบตเตอรี่ โทรศัพท์จะเรียนรู้วิธีที่คุณใช้แอปเมื่อเวลาผ่านไป
+
+การแจ้งเตือนของแอปเหล่านี้อาจล่าช้า"</string>
+ <string name="smart_battery_manager_title_custom">แบตเตอรี่แบบปรับอัตโนมัติ</string>
+ <string name="smart_battery_title_custom">ใช้แบตเตอรี่แบบปรับอัตโนมัติ</string>
+ </resources>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 07e56f1..9aade5b 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -2677,9 +2677,6 @@
<string name="user_credentials" msgid="4044405430790970775">"ข้อมูลเข้าสู่ระบบของผู้ใช้"</string>
<string name="user_credentials_summary" msgid="686471637627271856">"ดูและแก้ไขข้อมูลเข้าสู่ระบบที่เก็บไว้"</string>
<string name="advanced_security_title" msgid="7117581975877192652">"ขั้นสูง"</string>
- <string name="credential_storage_type" msgid="930861336971619888">"ประเภทพื้นที่เก็บข้อมูล"</string>
- <string name="credential_storage_type_hardware" msgid="2630040425119817220">"ใช้ฮาร์ดแวร์"</string>
- <string name="credential_storage_type_software" msgid="4786996040468294626">"ซอฟต์แวร์เท่านั้น"</string>
<string name="credentials_settings_not_available" msgid="7433088409177429600">"ข้อมูลรับรองไม่พร้อมใช้งานสำหรับผู้ใช้รายนี้"</string>
<string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"ติดตั้งแล้วสำหรับ VPN และแอป"</string>
<string name="credential_for_wifi" msgid="1963335263280604998">"ติดตั้งแล้วสำหรับ Wi-Fi"</string>
diff --git a/res/values-th/wellbeing_strings.xml b/res/values-th/wellbeing_strings.xml
new file mode 100644
index 0000000..da6f816
--- /dev/null
+++ b/res/values-th/wellbeing_strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="duration_less_than_one_minute">น้อยกว่า 1 นาที</string>
+ <string name="screen_time_summary_usage_today">%1$s วันนี้</string>
+ </resources>
diff --git a/res/values-tl/aosp_strings.xml b/res/values-tl/aosp_strings.xml
new file mode 100644
index 0000000..da87660
--- /dev/null
+++ b/res/values-tl/aosp_strings.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <!-- Strings for face unlock enrollment, missing from AOSP-->
+ <string name="aosp_security_settings_face_enroll_education_message">Sa susunod na screen, i-rotate ang iyong ulo para ma-capture ang lahat ng angle ng mukha mo</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_expanded">Kung may problema ka sa paningin o sa paggalaw ng iyong ulo, mas madaling gawin ang opsyong ito para i-set up ang face unlock. Kapag gumagamit ng face unlock, baka kailanganin mong mas direktang humarap sa telepono mo.</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_diversity">Gamitin ang face unlock para sa accessibility</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_vision">Kailangang nakadilat ang mga mata</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_0">Ayos lang ang mga salamin o hindi madilim na shades.</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_1">"Ligtas na naka-store at hinding-hindi lalabas sa iyong telepono ang data na itatala ng face unlock. Puwede mong i-delete ang iyong data anumang oras sa mga setting.\n\nPaminsan-minsang gagamitin ng iyong telepono ang mga kamakailan mong larawan sa face unlock para makagawa ng mga pinahusay na face model."</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_2">"Kapag tumingin ka sa telepono, puwede itong ma-unlock nang hindi sinasadya. Puwedeng ma-unlock ng ibang tao ang iyong telepono kung itatapat ito sa mukha mo.\n\nPuwede mong hilinging nakadilat ang iyong mga mata para sa pag-unlock sa Mga Setting."</string>
+<string name="aosp_security_settings_face_enroll_introduction_footer_part_2_attention_not_supported">"Kapag tiningnan ang telepono, puwedeng ma-unlock ito kahit hindi mo sinasadya.\n\nPuwedeng ma-unlock ng ibang tao ang iyong telepono kung itatapat ito sa mukha mo, kahit na nakapikit ka."</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_3">Ang iyong telepono ay puwedeng ma-unlock ng isang taong kamukha mo, halimbawa, ng iyong kapatid na kamukhang kamukha mo.</string>
+</resources>
diff --git a/res/values-tl/google_strings.xml b/res/values-tl/google_strings.xml
new file mode 100644
index 0000000..06296ae
--- /dev/null
+++ b/res/values-tl/google_strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="battery_tip_smart_battery_summary_custom">I-on ang Adaptive Battery</string>
+ <string name="smart_battery_footer_custom">"Para mapatagal ang baterya, nililimitahan ng Adaptive Battery ang baterya para sa mga app na hindi madalas na ginagamit. Matututunan ng iyong telepono kung paano mo ginagamit ang mga app sa paglipas ng panahon.
+
+Maaaring maantala ang mga notification para sa mga app na ito."</string>
+ <string name="smart_battery_manager_title_custom">Adaptive Battery</string>
+ <string name="smart_battery_title_custom">Gamitin ang Adaptive Battery</string>
+ </resources>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index c0bafa4..acc6112 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -2677,9 +2677,6 @@
<string name="user_credentials" msgid="4044405430790970775">"Mga kredensyal ng user"</string>
<string name="user_credentials_summary" msgid="686471637627271856">"Tingnan at baguhin ang mga naka-store na kredensyal"</string>
<string name="advanced_security_title" msgid="7117581975877192652">"Advanced"</string>
- <string name="credential_storage_type" msgid="930861336971619888">"Uri ng storage"</string>
- <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Hardware-backed"</string>
- <string name="credential_storage_type_software" msgid="4786996040468294626">"Software lang"</string>
<string name="credentials_settings_not_available" msgid="7433088409177429600">"Hindi available ang mga kredensyal para sa user na ito"</string>
<string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Na-install para sa VPN at mga app"</string>
<string name="credential_for_wifi" msgid="1963335263280604998">"Na-install para sa Wi-Fi"</string>
diff --git a/res/values-tl/wellbeing_strings.xml b/res/values-tl/wellbeing_strings.xml
new file mode 100644
index 0000000..e66d4d3
--- /dev/null
+++ b/res/values-tl/wellbeing_strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="duration_less_than_one_minute">Wala pang 1 minuto</string>
+ <string name="screen_time_summary_usage_today">%1$s ngayong araw</string>
+ </resources>
diff --git a/res/values-tr/aosp_strings.xml b/res/values-tr/aosp_strings.xml
new file mode 100644
index 0000000..cea5db4
--- /dev/null
+++ b/res/values-tr/aosp_strings.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <!-- Strings for face unlock enrollment, missing from AOSP-->
+ <string name="aosp_security_settings_face_enroll_education_message">Bir sonraki ekranda, yüzünüzün tüm açılardan fotoğrafını çekmek için başınızı çevirin</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_expanded">İyi göremiyor veya başınızı hareket ettiremiyorsanız, yüz tanıma kilidini ayarlamak için bu seçenek daha kolay bir yöntem sağlar. Yüz tanıma kilidini kullanırken başınızı daha doğrudan bir şekilde telefonunuzun karşısında olması gerekir.</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_diversity">Erişilebilirlik için tasarlanmış yüz tanıma kilidini kullan</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_vision">Gözlerin açık olması gerekli</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_0">Gözlük veya camı açık renkli olan güneş gözlüğü kullanılabilir.</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_1">"Yüz tanıma kilidi tarafından kaydedilen veriler güvenli şekilde depolanır ve her zaman telefonunuzda tutulur. Verilerinizi istediğiniz zaman ayarlara girerek silebilirsiniz.\n\nTelefonunuz, iyileştirilmiş yüz modelleri oluşturmak için ara sıra son yüz tanıma kilidi resimlerinizi kullanacaktır."</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_2">"Telefona baktığınızda istemeseniz bile kilidi açılabilir. Başka birisi tarafından yüzünüze tutulduğunda telefonunuzun kilidi açılabilir.\n\nKilidin açılması için Ayarlar'da gözlerinizin açık olmasını zorunlu kılabilirsiniz."</string>
+<string name="aosp_security_settings_face_enroll_introduction_footer_part_2_attention_not_supported">"Telefonunuza baktığınızda, istemeseniz de kilidi açılabilir.\n\nGözleriniz kapalıyken bile yüzünüzün hizasına tutulduğunda, telefonunuzun kilidi başka biri tarafından açılabilir."</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_3">Size çok benzeyen (örneğin ikiz kardeşiniz gibi) birisi telefonun kilidini açabilir.</string>
+</resources>
diff --git a/res/values-tr/google_strings.xml b/res/values-tr/google_strings.xml
new file mode 100644
index 0000000..522feea
--- /dev/null
+++ b/res/values-tr/google_strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="battery_tip_smart_battery_summary_custom">"Uyarlamalı Pil'i aç"</string>
+ <string name="smart_battery_footer_custom">"Uyarlamalı Pil özelliği pil ömrünü uzatmak için, sık kullanılmayan uygulamaların pil tüketimini sınırlar. Telefonunuz, zamanla uygulamaları nasıl kullandığınızı öğrenir.
+
+Bu uygulamalara ait bildirimlerde gecikme olabilir."</string>
+ <string name="smart_battery_manager_title_custom">Uyarlamalı Pil</string>
+ <string name="smart_battery_title_custom">Uyarlamalı Pil özelliğini kullan</string>
+ </resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 4472d70..9e055df 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -2677,9 +2677,6 @@
<string name="user_credentials" msgid="4044405430790970775">"Kullanıcı kimlik bilgileri"</string>
<string name="user_credentials_summary" msgid="686471637627271856">"Depolanmış kimlik bilgilerini görüntüleyin ve değiştirin"</string>
<string name="advanced_security_title" msgid="7117581975877192652">"Gelişmiş"</string>
- <string name="credential_storage_type" msgid="930861336971619888">"Depolama türü"</string>
- <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Donanım destekli"</string>
- <string name="credential_storage_type_software" msgid="4786996040468294626">"Yalnızca yazılım"</string>
<string name="credentials_settings_not_available" msgid="7433088409177429600">"Bu kullanıcı için kimlik bilgileri kullanılamıyor"</string>
<string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"VPN ve uygulamalar için yüklendi"</string>
<string name="credential_for_wifi" msgid="1963335263280604998">"Kablosuz bağlantı için yüklendi"</string>
diff --git a/res/values-tr/wellbeing_strings.xml b/res/values-tr/wellbeing_strings.xml
new file mode 100644
index 0000000..c4e82db
--- /dev/null
+++ b/res/values-tr/wellbeing_strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="duration_less_than_one_minute">1 dakikadan az</string>
+ <string name="screen_time_summary_usage_today">Bugün %1$s</string>
+ </resources>
diff --git a/res/values-uk/aosp_strings.xml b/res/values-uk/aosp_strings.xml
new file mode 100644
index 0000000..daaa92f
--- /dev/null
+++ b/res/values-uk/aosp_strings.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <!-- Strings for face unlock enrollment, missing from AOSP-->
+ <string name="aosp_security_settings_face_enroll_education_message">На наступному екрані повертайте голову, щоб зняти обличчя з усіх боків</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_expanded">Якщо у вас порушення зору або вам важко рухати головою, ця опція полегшить налаштування Фейсконтролю. Під час застосування Фейсконтролю тримайте телефон просто перед обличчям.</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_diversity">Використовувати спеціальні можливості Фейсконтролю</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_vision">Відкриті очі</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_0">Можна використовувати слабозатінені сонцезахисні або звичайні окуляри.</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_1">"Дані, записані функцією \"Фейсконтроль\", захищені та зберігаються лише на вашому телефоні. Ви можете будь-коли видалити їх у налаштуваннях.\n\nВаш телефон час від часу буде використовувати останні фотографії, зняті за допомогою функції \"Фейсконтроль\", щоб створювати кращі моделі обличчя."</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_2">"Ви можете випадково розблокувати телефон у недоречний момент, ненароком поглянувши на нього. Будь-хто може розблокувати телефон, якщо піднесе його до вашого обличчя.\n\nВи можете налаштувати пристрій так, щоб він розблоковувався, лише коли у вас розплющені очі."</string>
+<string name="aosp_security_settings_face_enroll_introduction_footer_part_2_attention_not_supported">"Поглянувши на телефон, ви можете випадково розблокувати його в недоречний момент.\n\nБудь-хто може розблокувати телефон, якщо піднесе його до вашого обличчя, навіть коли у вас закриті очі."</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_3">Телефон може розблокувати людина, схожа на вас, зокрема ваш близнюк.</string>
+</resources>
diff --git a/res/values-uk/google_strings.xml b/res/values-uk/google_strings.xml
new file mode 100644
index 0000000..22e0512
--- /dev/null
+++ b/res/values-uk/google_strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="battery_tip_smart_battery_summary_custom">Увімкнути адаптивний акумулятор</string>
+ <string name="smart_battery_footer_custom">"Щоб пристрій працював довше, адаптивний акумулятор обмежує споживання заряду для додатків, які рідко використовуються. Телефон із часом визначить, як ви ними користуєтесь.
+
+Сповіщення з цих додатків можуть надходити із затримкою."</string>
+ <string name="smart_battery_manager_title_custom">Адаптивний акумулятор</string>
+ <string name="smart_battery_title_custom">Використовувати адаптивний акумулятор</string>
+ </resources>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 56cc6ce..99964a6 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -2753,9 +2753,6 @@
<string name="user_credentials" msgid="4044405430790970775">"Облікові дані користувача"</string>
<string name="user_credentials_summary" msgid="686471637627271856">"Переглянути та змінити збережені облікові дані"</string>
<string name="advanced_security_title" msgid="7117581975877192652">"Додатково"</string>
- <string name="credential_storage_type" msgid="930861336971619888">"Тип сховища"</string>
- <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Апаратне забезпечення"</string>
- <string name="credential_storage_type_software" msgid="4786996040468294626">"Лише програмне забезпечення"</string>
<string name="credentials_settings_not_available" msgid="7433088409177429600">"Облікові дані недоступні для цього користувача"</string>
<string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Установлено для мережі VPN і додатків"</string>
<string name="credential_for_wifi" msgid="1963335263280604998">"Установлено для мережі Wi-Fi"</string>
diff --git a/res/values-uk/wellbeing_strings.xml b/res/values-uk/wellbeing_strings.xml
new file mode 100644
index 0000000..65c03a2
--- /dev/null
+++ b/res/values-uk/wellbeing_strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="duration_less_than_one_minute">Менше 1 хвилини</string>
+ <string name="screen_time_summary_usage_today">%1$s сьогодні</string>
+ </resources>
diff --git a/res/values-ur/aosp_strings.xml b/res/values-ur/aosp_strings.xml
new file mode 100644
index 0000000..ad21131
--- /dev/null
+++ b/res/values-ur/aosp_strings.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <!-- Strings for face unlock enrollment, missing from AOSP-->
+ <string name="aosp_security_settings_face_enroll_education_message">اگلی اسکرین پر، اپنے چہرے کے تمام زاویے کیپچر کرنے کے ليے اپنے سر کو گھمائیں</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_expanded">اگر آپ کے پاس محدود بصارت ہے یا سر کو ٹھیک طرح حرکت نہیں دے سکتے ہیں تو یہ اختیار چہرے کے ذریعے غیر مقفل کرنے کو سیٹ اپ کرنے کا آسان طریقہ ہے۔ چہرے کے ذریعے غیر مقفل کرنے کی خصوصیت کا استعمال کرتے وقت، آپ کے سر کو فون کے براہ راست سامنے ہونے کی ضرورت ہو سکتی ہے۔</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_diversity">ایکسیسبیلٹی چہرے کے ذریعے غیر مقفل کرنے کا استعمال کریں</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_vision">آنکھوں کو کھولنا ہوگا</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_0">چشمے یا ہلکے رنگدار دھوپ چشمے ٹھیک ہیں۔</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_1">"چہرے کے ذریعے غیر مقفل کریں خصوصیت کے ذریعے ریکارڈ کردہ ڈیٹا کو محفوظ طریقے سے اسٹور کیا جاتا ہے اور یہ کبھی بھی آپ کے فون سے باہر نہیں جاتا۔ آپ کسی بھی وقت ترتیبات میں اپنا ڈیٹا حذف کرسکتے ہیں۔\n\nچہرے کے بہتر ماڈلز تخلیق کرنے کیلئے آپ کا فون کبھی کبھار آپ کی چہرے کے ذریعے غیر مقفل کردہ حالیہ تصاویر کا استعمال کرے گا۔"</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_2">"جب آپ کا ارادہ نہ بھی ہو تب بھی فون کو دیکھنا اس کو غیر فعال کر سکتا ہے۔ کوئی اور شخص آپ کے فون کو آپ کے چہرے کے سامنے رکھ کر غیر مقفل کر سکتا ہے۔\n\nترتیبات میں غیر مقفل کرنے کے لیے آپ کو اپنی آنکھیں کھلی رکھنا پڑ سکتی ہیں۔"</string>
+<string name="aosp_security_settings_face_enroll_introduction_footer_part_2_attention_not_supported">"جب آپ کا ارادہ نہ بھی ہو تب بھی فون پر دیکھنے سے وہ غیر مقفل ہو سکتا ہے۔\n\nآپ کی آنکھیں بند ہونے پر بھی، کوئی اور شخص فون کو آپ کے چہرے کے سامنے رکھ کر آپ کے فون کو غیر مقفل کر سکتا ہے۔"</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_3">آپ کی طرح بہت زيادہ نظر آنے والا کوئی بھی شخص، جیسے ملتی جلتی صورت والا بھائی یا بہن آپ کے فون کو ممکنہ طور پر غیر مقفل کر سکتے ہیں۔</string>
+</resources>
diff --git a/res/values-ur/google_strings.xml b/res/values-ur/google_strings.xml
new file mode 100644
index 0000000..69013b1
--- /dev/null
+++ b/res/values-ur/google_strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="battery_tip_smart_battery_summary_custom">تغیر پذیر بیٹری آن کریں</string>
+ <string name="smart_battery_footer_custom">"بیٹری لائف بڑھانے کے لیے، تغیر پذیر بیٹری کبھی کبھار استعمال کی جانے والی ایپس کے لیے بیٹری کو محدود کرتی ہے۔ وقت گزرنے پر، آپ کا فون ایپس استعمال کرنے کا طریقہ سیکھے گا۔
+
+ان ایپس کے لیے اطلاعات میں تاخیر ہو سکتی ہے۔"</string>
+ <string name="smart_battery_manager_title_custom">تغیر پذیر بیٹری</string>
+ <string name="smart_battery_title_custom">تغیر پذیر بیٹری استعمال کریں</string>
+ </resources>
diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml
index 2fd7d1e..009445b 100644
--- a/res/values-ur/strings.xml
+++ b/res/values-ur/strings.xml
@@ -2677,9 +2677,6 @@
<string name="user_credentials" msgid="4044405430790970775">"صارف کی اسناد"</string>
<string name="user_credentials_summary" msgid="686471637627271856">"اسٹور کردہ اسناد دیکھیں اور ان میں ترمیم کریں"</string>
<string name="advanced_security_title" msgid="7117581975877192652">"جدید ترین"</string>
- <string name="credential_storage_type" msgid="930861336971619888">"اسٹوریج کی قسم"</string>
- <string name="credential_storage_type_hardware" msgid="2630040425119817220">"ہارڈ ویئر کے ذریعے تعاون یافتہ"</string>
- <string name="credential_storage_type_software" msgid="4786996040468294626">"صرف سافٹ ویئر"</string>
<string name="credentials_settings_not_available" msgid="7433088409177429600">"اس صارف کیلئے اسنادات دستیاب نہیں ہیں"</string>
<string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"VPN اور ایپس کیلئے انسٹال کردہ"</string>
<string name="credential_for_wifi" msgid="1963335263280604998">"Wi-Fi کیلئے انسٹال کردہ"</string>
diff --git a/res/values-ur/wellbeing_strings.xml b/res/values-ur/wellbeing_strings.xml
new file mode 100644
index 0000000..216be1e
--- /dev/null
+++ b/res/values-ur/wellbeing_strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="duration_less_than_one_minute">1 منٹ سے کم</string>
+ <string name="screen_time_summary_usage_today">%1$s آج</string>
+ </resources>
diff --git a/res/values-uz/aosp_strings.xml b/res/values-uz/aosp_strings.xml
new file mode 100644
index 0000000..cbeaeb6
--- /dev/null
+++ b/res/values-uz/aosp_strings.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <!-- Strings for face unlock enrollment, missing from AOSP-->
+ <string name="aosp_security_settings_face_enroll_education_message">Keyingi ekranda yuzingizning barcha burchaklarini suratga olish uchun boshingizni buring</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_expanded">Koʻrish qobiliyatingiz yoki boshingiz harakati cheklangan boʻlsa, bu parametr orqali yuz bilan ochishni sozlash osonlashadi. Yuz bilan ochishda telefon ekraniga tikroq qarashingiz kerak boʻladi.</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_diversity">Harakati cheklanganlar uchun yuz bilan ochish</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_vision">Koʻz yumilmasligi kerak</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_0">Koʻzoynakni olish shart emas ( quyoshdan himoya qiluvchi koʻzoynak och rangda boʻlsa ham ruxsat beriladi)</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_1">"Yuz bilan ochish funksiyasi tomonidan yozib olingan axborot xavfsiz va faqat telefonda saqlanadi. Axborotni istalgan vaqtda oʻchirib tashlash mumkin.\n\nYuz bilan ochish funksiyasi orqali olingan oxirgi rasmlar vaqti-vaqti bilan yuz modellarini yaxshilash maqsadida ishlatadi."</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_2">"Telefonga tasodifan qaraganingizda ham qulfi ochilishi mumkin. Begonalar telefoningizni yuzingizga qaratib ham qulfdan chiqarishi mumkin.\n\nSozlamalar orqali qulfdan chiqarishda koʻzlaringiz ochiq turishi kerakligini sozlashingiz mumkin."</string>
+<string name="aosp_security_settings_face_enroll_introduction_footer_part_2_attention_not_supported">"Telefon qulfi unga tasodifan qaralganda yechilishi mumkin.\n\nKoʻzlaringiz yumilganda ham begonalar telefoningizni yuzingizga qaratish orqali qulfdan chiqarishi mumkin."</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_3">Telefoningiz begonalar tomonidan ham qulfdan chiqarilishi mumkin, masalan sizga oʻxshagan yaqinlaringiz tomonidan.</string>
+</resources>
diff --git a/res/values-uz/google_strings.xml b/res/values-uz/google_strings.xml
new file mode 100644
index 0000000..6f03340
--- /dev/null
+++ b/res/values-uz/google_strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="battery_tip_smart_battery_summary_custom">Adaptive Battery funksiyasini yoqing</string>
+ <string name="smart_battery_footer_custom">"Batareya quvvatini uzaytirish uchun Adaptive Battery kam ishlatiladigan ilovalar uchun batareyani cheklaydi. Telefoningiz ilovalardan qancha muddatda foydalanishingizni o‘rganib boradi.
+
+Mazkur ilovalar uchun bildirishnomalar kechikishi mumkin."</string>
+ <string name="smart_battery_manager_title_custom">Adaptive Battery</string>
+ <string name="smart_battery_title_custom">Adaptive Battery funksiyasidan foydalanish</string>
+ </resources>
diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml
index 3489220..ede69cb 100644
--- a/res/values-uz/strings.xml
+++ b/res/values-uz/strings.xml
@@ -2677,9 +2677,6 @@
<string name="user_credentials" msgid="4044405430790970775">"Foydalanuvchining hisob axboroti"</string>
<string name="user_credentials_summary" msgid="686471637627271856">"Saqlab olingan hisob ma’lumotlarini ko‘rish va o‘zgartirish"</string>
<string name="advanced_security_title" msgid="7117581975877192652">"Kengaytirilgan sozlamalar"</string>
- <string name="credential_storage_type" msgid="930861336971619888">"Ombor turi"</string>
- <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Apparatli"</string>
- <string name="credential_storage_type_software" msgid="4786996040468294626">"Faqat dasturiy"</string>
<string name="credentials_settings_not_available" msgid="7433088409177429600">"Ushbu foydalanuvchi uchun hisob ma’lumotlari mavjud emas"</string>
<string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"VPN va ilovalar uchun o‘rnatilgan"</string>
<string name="credential_for_wifi" msgid="1963335263280604998">"Wi-Fi uchun o‘rnatilgan"</string>
diff --git a/res/values-uz/wellbeing_strings.xml b/res/values-uz/wellbeing_strings.xml
new file mode 100644
index 0000000..7590e79
--- /dev/null
+++ b/res/values-uz/wellbeing_strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="duration_less_than_one_minute">1 daqiqadan kamroq</string>
+ <string name="screen_time_summary_usage_today">Bugun: %1$s</string>
+ </resources>
diff --git a/res/values-vi/aosp_strings.xml b/res/values-vi/aosp_strings.xml
new file mode 100644
index 0000000..f110bee
--- /dev/null
+++ b/res/values-vi/aosp_strings.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <!-- Strings for face unlock enrollment, missing from AOSP-->
+ <string name="aosp_security_settings_face_enroll_education_message">Trên màn hình tiếp theo, hãy xoay đầu để chụp mọi góc cạnh khuôn mặt bạn</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_expanded">Nếu thị lực hoặc hoạt động đầu của bạn bị hạn chế, bạn có thể dùng tùy chọn này để dễ dàng thiết lập tính năng mở khóa bằng khuôn mặt. Khi dùng tính năng mở khóa bằng khuôn mặt, bạn cần hướng điện thoại ở phía trước đầu.</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_diversity">Dùng tính năng mở khóa bằng khuôn mặt qua dịch vụ hỗ trợ tiếp cận</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_vision">Bạn phải mở mắt</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_0">Đeo kính hoặc kính râm gam màu nhẹ sẽ không bị ảnh hưởng.</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_1">"Dữ liệu do tính năng mở khóa bằng khuôn mặt ghi lại sẽ được lưu trữ an toàn và không bao giờ bị thất lạc. Bạn có thể xóa dữ liệu của mình bất cứ lúc nào trong phần cài đặt.\n\nĐôi khi, điện thoại sẽ dùng hình ảnh mở khóa bằng khuôn mặt gần đây để tạo mẫu khuôn mặt có chất lượng cao hơn."</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_2">"Việc nhìn vào điện thoại có thể khiến điện thoại mở khóa ngay cả khi bạn không định làm vậy. Người khác có thể mở khóa điện thoại khi họ giơ điện thoại lên trước mặt bạn.\n\nBạn có thể thiết lập để điện thoại chỉ mở khóa khi bạn mở mắt trong phần Cài đặt."</string>
+<string name="aosp_security_settings_face_enroll_introduction_footer_part_2_attention_not_supported">"Điện thoại có thể mở khóa khi bạn nhìn vào, ngay cả khi bạn không định làm vậy.\n\nNgười khác có thể mở khóa bằng cách giơ điện thoại lên trước mặt bạn, kể cả khi bạn đang nhắm mắt."</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_3">Người khác trông giống bạn, chẳng hạn như anh chị em ruột giống hệt bạn, có thể mở khóa điện thoại của bạn.</string>
+</resources>
diff --git a/res/values-vi/google_strings.xml b/res/values-vi/google_strings.xml
new file mode 100644
index 0000000..2f1eabe
--- /dev/null
+++ b/res/values-vi/google_strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="battery_tip_smart_battery_summary_custom">Bật tùy chọn Pin thích ứng</string>
+ <string name="smart_battery_footer_custom">"Để kéo dài thời lượng pin, tùy chọn Pin thích ứng sẽ giới hạn mức sử dụng pin đối với các ứng dụng ít dùng. Điện thoại sẽ tìm hiểu cách bạn sử dụng ứng dụng theo thời gian.
+
+Thông báo có thể bị chậm trễ đối với những ứng dụng này."</string>
+ <string name="smart_battery_manager_title_custom">Pin thích ứng</string>
+ <string name="smart_battery_title_custom">Sử dụng Pin thích ứng</string>
+ </resources>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index d97056f..bf2adc1 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -2677,9 +2677,6 @@
<string name="user_credentials" msgid="4044405430790970775">"Thông tin xác thực người dùng"</string>
<string name="user_credentials_summary" msgid="686471637627271856">"Xem và sửa đổi thông tin xác thực đã lưu trữ"</string>
<string name="advanced_security_title" msgid="7117581975877192652">"Nâng cao"</string>
- <string name="credential_storage_type" msgid="930861336971619888">"Loại lưu trữ"</string>
- <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Dựa trên phần cứng"</string>
- <string name="credential_storage_type_software" msgid="4786996040468294626">"Chỉ phần mềm"</string>
<string name="credentials_settings_not_available" msgid="7433088409177429600">"Không có thông tin đăng nhập cho người dùng này"</string>
<string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Đã cài đặt cho VPN và ứng dụng"</string>
<string name="credential_for_wifi" msgid="1963335263280604998">"Đã cài đặt cho Wi-Fi"</string>
diff --git a/res/values-vi/wellbeing_strings.xml b/res/values-vi/wellbeing_strings.xml
new file mode 100644
index 0000000..da226f5
--- /dev/null
+++ b/res/values-vi/wellbeing_strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="duration_less_than_one_minute">Dưới 1 phút</string>
+ <string name="screen_time_summary_usage_today">%1$s hôm nay</string>
+ </resources>
diff --git a/res/values-zh-rCN/aosp_strings.xml b/res/values-zh-rCN/aosp_strings.xml
new file mode 100644
index 0000000..31472ec
--- /dev/null
+++ b/res/values-zh-rCN/aosp_strings.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <!-- Strings for face unlock enrollment, missing from AOSP-->
+ <string name="aosp_security_settings_face_enroll_education_message">在下一个屏幕上，请转动头部，让系统从各个角度拍摄您的脸部</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_expanded">如果您的视觉不佳或头部无法正常转动，启用此选项可以更轻松地设置人脸解锁。使用人脸解锁时，您的头部可能需要正对着手机。</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_diversity">使用无障碍人脸解锁</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_vision">需要睁眼</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_0">可以戴眼镜或浅色太阳镜。</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_1">"人脸解锁功能所记录的数据会安全地存储在您的手机上，绝不会外泄。您可以随时在设置中删除您的数据。\n\n您的手机将不时使用您最近的人脸解锁图片来创建改进的脸部模型。"</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_2">"目视手机可能会让手机意外解锁。如果有人将手机对着您的脸，手机可能会因此解锁。\n\n您可以在“设置”中设置必须睁开双眼才能解锁手机。"</string>
+<string name="aosp_security_settings_face_enroll_introduction_footer_part_2_attention_not_supported">"目视手机可能会让手机意外解锁。\n\n如果有人将手机对着您的脸，也可能会解锁您的手机（即使您闭着眼睛）。"</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_3">长相与您相似的人（例如您的同貌兄弟姐妹）也能够解锁您的手机。</string>
+</resources>
diff --git a/res/values-zh-rCN/google_strings.xml b/res/values-zh-rCN/google_strings.xml
new file mode 100644
index 0000000..09ac599
--- /dev/null
+++ b/res/values-zh-rCN/google_strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="battery_tip_smart_battery_summary_custom">开启自适应电池</string>
+ <string name="smart_battery_footer_custom">"为了延长电池续航时间，“自适应电池”功能会针对不常用的应用限制用电量。久而久之，您的手机就会逐渐了解应用的使用情况。
+
+这些应用的通知可能会有所延迟。"</string>
+ <string name="smart_battery_manager_title_custom">自适应电池</string>
+ <string name="smart_battery_title_custom">使用自适应电池</string>
+ </resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 5887aa7..202387a 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -2677,9 +2677,6 @@
<string name="user_credentials" msgid="4044405430790970775">"用户凭据"</string>
<string name="user_credentials_summary" msgid="686471637627271856">"查看和修改存储的凭据"</string>
<string name="advanced_security_title" msgid="7117581975877192652">"高级"</string>
- <string name="credential_storage_type" msgid="930861336971619888">"存储类型"</string>
- <string name="credential_storage_type_hardware" msgid="2630040425119817220">"硬件支持"</string>
- <string name="credential_storage_type_software" msgid="4786996040468294626">"仅限软件"</string>
<string name="credentials_settings_not_available" msgid="7433088409177429600">"此用户无法查看或修改凭据"</string>
<string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"已安装（用于 VPN 和应用）"</string>
<string name="credential_for_wifi" msgid="1963335263280604998">"已安装（用于 WLAN）"</string>
diff --git a/res/values-zh-rCN/wellbeing_strings.xml b/res/values-zh-rCN/wellbeing_strings.xml
new file mode 100644
index 0000000..ae62660
--- /dev/null
+++ b/res/values-zh-rCN/wellbeing_strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="duration_less_than_one_minute">不到 1 分钟</string>
+ <string name="screen_time_summary_usage_today">今天使用了 %1$s</string>
+ </resources>
diff --git a/res/values-zh-rHK/aosp_strings.xml b/res/values-zh-rHK/aosp_strings.xml
new file mode 100644
index 0000000..aab9e30
--- /dev/null
+++ b/res/values-zh-rHK/aosp_strings.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <!-- Strings for face unlock enrollment, missing from AOSP-->
+ <string name="aosp_security_settings_face_enroll_education_message">到下一個畫面時，轉動頭部以拍攝臉孔的所有角度</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_expanded">如果您的視力或頭部活動能力有限，可以使用此選項更輕鬆地設定「臉孔解鎖」。使用「臉孔解鎖」時，需要將手機對準您的頭部正面。</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_diversity">使用無障礙功能設定「臉孔解鎖」</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_vision">需要睜眼</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_0">可佩戴眼鏡或淺色太陽眼鏡。</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_1">"系統會妥善地將「臉孔解鎖」功能記錄的資料儲存在您的手機中，確保不會外洩。您可以隨時在設定中刪除您的資料。\n\n手機將不時使用您最近的「臉孔解鎖」圖像，以改善面部模型。"</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_2">"即使您不想解鎖手機，但查看手機仍會解鎖。如果其他人將手機舉到您面前，將可解鎖您的手機。\n\n您可在「設定」中要求解鎖時必須張開雙眼。"</string>
+<string name="aosp_security_settings_face_enroll_introduction_footer_part_2_attention_not_supported">"即使您不想解鎖，看著手機亦會解鎖。\n\n如果其他人將手機舉到您面前，即使您閉上雙眼，手機亦會解鎖。"</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_3">跟您樣貌很相似的人 (例如您的孿生兄弟姊妹) 或許能夠解鎖您的手機。</string>
+</resources>
diff --git a/res/values-zh-rHK/google_strings.xml b/res/values-zh-rHK/google_strings.xml
new file mode 100644
index 0000000..29a7aba2
--- /dev/null
+++ b/res/values-zh-rHK/google_strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="battery_tip_smart_battery_summary_custom">開啟「自動調節電池用量」</string>
+ <string name="smart_battery_footer_custom">"為延長電池壽命，「自動調節電池用量」會為不常用的應用程式限制用電量。您的手機會瞭解應用程式在不同時間的使用情況。
+
+這些應用程式通知可能會延遲。"</string>
+ <string name="smart_battery_manager_title_custom">自動調節電池用量</string>
+ <string name="smart_battery_title_custom">使用自動調節電池用量</string>
+ </resources>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 3396dcf..71e054c 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -2678,9 +2678,6 @@
<string name="user_credentials" msgid="4044405430790970775">"使用者憑證"</string>
<string name="user_credentials_summary" msgid="686471637627271856">"查看和修改已儲存的憑證"</string>
<string name="advanced_security_title" msgid="7117581975877192652">"進階"</string>
- <string name="credential_storage_type" msgid="930861336971619888">"儲存空間類型"</string>
- <string name="credential_storage_type_hardware" msgid="2630040425119817220">"硬件支援"</string>
- <string name="credential_storage_type_software" msgid="4786996040468294626">"只限軟件"</string>
<string name="credentials_settings_not_available" msgid="7433088409177429600">"這位使用者無法存取憑證"</string>
<string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"已針對 VPN 和應用程式安裝憑證"</string>
<string name="credential_for_wifi" msgid="1963335263280604998">"已針對 Wi-Fi 安裝憑證"</string>
diff --git a/res/values-zh-rHK/wellbeing_strings.xml b/res/values-zh-rHK/wellbeing_strings.xml
new file mode 100644
index 0000000..d4666ae
--- /dev/null
+++ b/res/values-zh-rHK/wellbeing_strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="duration_less_than_one_minute">少於 1 分鐘</string>
+ <string name="screen_time_summary_usage_today">今天使用了 %1$s</string>
+ </resources>
diff --git a/res/values-zh-rTW/aosp_strings.xml b/res/values-zh-rTW/aosp_strings.xml
new file mode 100644
index 0000000..89ccc33
--- /dev/null
+++ b/res/values-zh-rTW/aosp_strings.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <!-- Strings for face unlock enrollment, missing from AOSP-->
+ <string name="aosp_security_settings_face_enroll_education_message">在下一個畫面中，請轉動頭部，讓系統從各種角度拍攝你的臉</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_expanded">如果你的視力或頭部活動能力有限，就可以透過這個選項輕鬆設定人臉解鎖功能。使用人臉解鎖功能時，請盡量將頭部正對手機。</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_diversity">使用人臉解鎖無障礙功能</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_vision">必須張開眼睛</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_0">配戴眼鏡或淺色太陽眼鏡不會造成影響。</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_1">"人臉解鎖記錄的資料會安全地儲存在你的手機上，絕不會外洩。你隨時可以前往「設定」刪除這項資料。\n\n你的手機會不定期使用你的近期人臉解鎖圖片，建立更加精準的臉部模型。"</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_2">"只要看著手機，就可能會讓手機意外解鎖。如果有人將手機對著你的臉，手機可能就會解鎖。\n\n你可以設定手機在你雙眼睜開時才能解鎖，請前往「設定」調整。"</string>
+<string name="aosp_security_settings_face_enroll_introduction_footer_part_2_attention_not_supported">"只要看著手機，就可能造成意外解鎖。\n\n如果有人將手機對著你的臉 (無論你是否睜開雙眼)，手機可能會因此解鎖。"</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_3">長相與你十分相似的人（例如你的孿生兄弟姐妹）或許可以解鎖你的手機。</string>
+</resources>
diff --git a/res/values-zh-rTW/google_strings.xml b/res/values-zh-rTW/google_strings.xml
new file mode 100644
index 0000000..529ff2d
--- /dev/null
+++ b/res/values-zh-rTW/google_strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="battery_tip_smart_battery_summary_custom">開啟自動調節電池用量功能</string>
+ <string name="smart_battery_footer_custom">"為了延長電池續航力，「自動調節電池用量」功能會針對不常使用的應用程式限制電池用量。一段時間後，你的手機會記住應用程式的使用情形。
+
+這些應用程式的通知可能會延遲。"</string>
+ <string name="smart_battery_manager_title_custom">自動調節電池用量</string>
+ <string name="smart_battery_title_custom">使用自動調節電池用量功能</string>
+ </resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index ee0ba05..a82955d 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -2677,9 +2677,6 @@
<string name="user_credentials" msgid="4044405430790970775">"使用者憑證"</string>
<string name="user_credentials_summary" msgid="686471637627271856">"查看及修改已儲存的憑證"</string>
<string name="advanced_security_title" msgid="7117581975877192652">"進階"</string>
- <string name="credential_storage_type" msgid="930861336971619888">"儲存空間類型"</string>
- <string name="credential_storage_type_hardware" msgid="2630040425119817220">"硬體備份"</string>
- <string name="credential_storage_type_software" msgid="4786996040468294626">"僅限軟體"</string>
<string name="credentials_settings_not_available" msgid="7433088409177429600">"這位使用者無法存取憑證"</string>
<string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"已為 VPN 和應用程式安裝"</string>
<string name="credential_for_wifi" msgid="1963335263280604998">"已為 Wi-Fi 安裝"</string>
diff --git a/res/values-zh-rTW/wellbeing_strings.xml b/res/values-zh-rTW/wellbeing_strings.xml
new file mode 100644
index 0000000..f09034a
--- /dev/null
+++ b/res/values-zh-rTW/wellbeing_strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="duration_less_than_one_minute">不到 1 分鐘</string>
+ <string name="screen_time_summary_usage_today">今天使用了 %1$s</string>
+ </resources>
diff --git a/res/values-zu/aosp_strings.xml b/res/values-zu/aosp_strings.xml
new file mode 100644
index 0000000..318ae0c
--- /dev/null
+++ b/res/values-zu/aosp_strings.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <!-- Strings for face unlock enrollment, missing from AOSP-->
+ <string name="aosp_security_settings_face_enroll_education_message">Esikrinini esilandelayo, phendukisa ikhanda lakho ukuze uthwebule onke ama-engeli ebusweni bakho</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_expanded">Uma unokubona okukhawulelwe noma ukunyakaza kwekhanda, le nketho iyindlela elula yokusetha i-face unlock. Uma usebenzisa i-face unlock, ikhanda lakho kungenzeka kumele liqonde kakhulu phambi kwefoni yakho.</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_diversity">Sebenzisa ukufinyelela ku-face unlock</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_vision">Idinga ukuvuleka kwamehlo</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_0">Izibuko noma izibuko zelanga ezenziwe mnyama kancane ZILUNGILE.</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_1">"Idatha erekhodwe i-face unlock igcinwa ngokuphephile futhi ayilokothi ishiye ifoni yakho. Ungasusa idatha yakho noma kunini kuzilungiselelo.\n\nIfoni yakho ngezikhathi ezithile izosebenzisa izithombe zakho zakamuva ze-face unlock ukuze idale amamodeli athuthukisiwe obuso."</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_2">"Ukubheka efonini kungayivula ngisho noma ungahlosile. Ifoni yakho ingavulwa omunye umuntu uma iphakanyiselwa ebusweni bakho.\n\nUngadinga ukuthi kuvulwe amehlo akho ukuze kuvulwe kokuthi Izilungiselelo."</string>
+<string name="aosp_security_settings_face_enroll_introduction_footer_part_2_attention_not_supported">"Ukubheka ifoni kungayivula uma ungahlosile ukwenza lokho.\n\nIfoni yakho ingavulwa omunye umuntu uma iphakanyiselwe ebusweni bakho, nanoma uma amehlo akho avaliwe."</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_3">Ifoni yakho ingavulwa omunye umuntu obukeka kakhulu njengawe, asithi, isihlobo esifana nawe</string>
+</resources>
diff --git a/res/values-zu/google_strings.xml b/res/values-zu/google_strings.xml
new file mode 100644
index 0000000..c53c953
--- /dev/null
+++ b/res/values-zu/google_strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="battery_tip_smart_battery_summary_custom">Vula ibhethri le-Adaptive</string>
+ <string name="smart_battery_footer_custom">"Ukuze kunwetshwe impilo yebhethri, i-Adaptive Battery ikhawulela ibhethri kuzinhlelo zokusebenza ezingasetshenziswa kakhulu. Ifoni yakho izofunda ukuthi uzisebenzisa kanjani izinhlelo zokusebenza ngesikhathi.
+
+Izaziso zingabambezeleka kulezi zinhlelo zokusebenza."</string>
+ <string name="smart_battery_manager_title_custom">I-Adaptive Battery</string>
+ <string name="smart_battery_title_custom">Sebenzisa i-Adaptive Battery</string>
+ </resources>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 8bcf92c..74d0858 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -2678,9 +2678,6 @@
<string name="user_credentials" msgid="4044405430790970775">"Ukuqinisekisa komsebenzisi"</string>
<string name="user_credentials_summary" msgid="686471637627271856">"Buka uphinde ulungise ukuqinisekisa okugciniwe"</string>
<string name="advanced_security_title" msgid="7117581975877192652">"Ithuthukisiwe"</string>
- <string name="credential_storage_type" msgid="930861336971619888">"Uhlobo lwesitoreji"</string>
- <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Izingxenyekazi zekhompyutha zisekelwe ngokulondoloza"</string>
- <string name="credential_storage_type_software" msgid="4786996040468294626">"Isofthiwe kuphela"</string>
<string name="credentials_settings_not_available" msgid="7433088409177429600">"Izifakazo azitholakaleli lo msebenzisi"</string>
<string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Kufakelwe i-VPN nezinhlelo zokusebenza"</string>
<string name="credential_for_wifi" msgid="1963335263280604998">"Kufakelwe i-Wi-Fi"</string>
diff --git a/res/values-zu/wellbeing_strings.xml b/res/values-zu/wellbeing_strings.xml
new file mode 100644
index 0000000..23f1c83
--- /dev/null
+++ b/res/values-zu/wellbeing_strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="duration_less_than_one_minute">Ngaphansi kweminithi elingu-1</string>
+ <string name="screen_time_summary_usage_today">%1$s namuhla</string>
+ </resources>
diff --git a/res/values/aosp_strings.xml b/res/values/aosp_strings.xml
new file mode 100644
index 0000000..bdf87bd
--- /dev/null
+++ b/res/values/aosp_strings.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <!-- Strings for face unlock enrollment, missing from AOSP-->
+ <string name="aosp_security_settings_face_enroll_education_message">On the next screen, rotate your head to capture all angles of your face</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_expanded">If you have limited vision or head motion, this option is an easier way to set up face unlock. When using face unlock, your head may need to be more directly in front of your phone.</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_diversity">Use accessibility face unlock</string>
+ <string name="aosp_security_settings_face_enroll_introduction_accessibility_vision">Require eyes open</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_0">Glasses or lightly tinted sunglasses are OK.</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_1">"The images and face models are processed securely and never leave your phone. You can delete face data anytime in settings.\n\nYour phone will occasionally use your recent face unlock images to create improved face models."</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_2">"Looking at the phone can unlock it even when you don’t intend to. Your phone can be unlocked by someone else if it’s held up to your face.\n\nYou can require your eyes to be open for unlocking in Settings."</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_2_attention_not_supported">"Looking at the phone can unlock it when you don’t intend to.\n\nYour phone can be unlocked by someone else if it’s held up to your face, even if your eyes are closed."</string>
+ <string name="aosp_security_settings_face_enroll_introduction_footer_part_3">Your phone can be unlocked by someone who looks a lot like you, say, an identical sibling.</string>
+</resources>
\ No newline at end of file
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 1ad3cc3..34ba122 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -1352,7 +1352,7 @@
<item>CDMA/EvDo/GSM/WCDMA</item>
<item>CDMA + LTE/EvDo</item>
<item>GSM/WCDMA/LTE</item>
- <item>Global</item>
+ <item>LTE/CDMA/EvDo/GSM/WCDMA</item>
<item>LTE</item>
<item>LTE / WCDMA</item>
<item>TDSCDMA only</item>
@@ -1369,7 +1369,8 @@
<item>NR/LTE</item>
<item>NR/LTE/CDMA/EvDo</item>
<item>NR/LTE/GSM/WCDMA</item>
- <item>NR/LTE/CDMA/EvDo/GSM/WCDMA</item>
+ <!-- Global includes NR/LTE/CDMA/EvDo/GSM/WCDMA -->
+ <item>Global</item>
<item>NR/LTE/WCDMA</item>
<item>NR/LTE/TDSCDMA</item>
<item>NR/LTE/TDSCDMA/GSM</item>
diff --git a/res/values/bliss_arrays.xml b/res/values/bliss_arrays.xml
new file mode 100644
index 0000000..a133b48
--- /dev/null
+++ b/res/values/bliss_arrays.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2014-2020 BlissRoms Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<resources>
+ <!-- Per-app notification settings: Timeout period in which the app notifications are muted. These are shown in a list dialog. -->
+ <string-array name="app_notification_sound_timeout_entries" translatable="false">
+ <item>@string/app_notification_sound_timeout_value_none</item>
+ <item>@string/app_notification_sound_timeout_value_10_seconds</item>
+ <item>@string/app_notification_sound_timeout_value_30_seconds</item>
+ <item>@string/app_notification_sound_timeout_value_1_minute</item>
+ <item>@string/app_notification_sound_timeout_value_5_minutes</item>
+ <item>@string/app_notification_sound_timeout_value_15_minutes</item>
+ <item>@string/app_notification_sound_timeout_value_30_minutes</item>
+ </string-array>
+
+ <!-- Do not translate. -->
+ <string-array name="app_notification_sound_timeout_values" translatable="false">
+ <item>0</item>
+ <item>10000</item>
+ <item>30000</item>
+ <item>60000</item>
+ <item>300000</item>
+ <item>900000</item>
+ <item>1800000</item>
+ </string-array>
+
+ <!-- Fingerprint sensor locations. Devices should configure their sensor location using
+ config_fingerprintSensorLocation -->
+ <string-array name="security_settings_fingerprint_sensor_locations" translatable="false">
+ <item>@string/security_settings_fingerprint_sensor_location_back</item>
+ <item>@string/security_settings_fingerprint_sensor_location_front</item>
+ <item>@string/security_settings_fingerprint_sensor_location_left</item>
+ <item>@string/security_settings_fingerprint_sensor_location_right</item>
+ </string-array>
+</resources>
diff --git a/res/values/bliss_colors.xml b/res/values/bliss_colors.xml
new file mode 100644
index 0000000..3e0052f
--- /dev/null
+++ b/res/values/bliss_colors.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2014-2019 BlissRoms Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+
+ <!-- Settings HomePage Blissify -->
+ <color name="homepage_blissify_background">#78A0D0</color>
+
+</resources>
diff --git a/res/values/bliss_config.xml b/res/values/bliss_config.xml
new file mode 100644
index 0000000..916ad83
--- /dev/null
+++ b/res/values/bliss_config.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2014-2020 BlissRoms Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <!-- Defines the location of the fingerprint sensor on the device
+ 0 = back
+ 1 = front
+ 2 = left side
+ 3 = right side
+ -->
+ <integer name="config_fingerprintSensorLocation">0</integer>
+
+ <string-array name="config_ignored_backup_transports" translatable="false">
+ <item>com.android.localtransport/.LocalTransport</item>
+ </string-array>
+
+ <!-- Whether to show min refresh rate in display settings -->
+ <bool name="config_show_min_refresh_rate_switch">false</bool>
+
+ <!-- Whether to show or hide sensitive info (like IMEI and Phone Number) on About phone -->
+ <bool name="configShowDeviceSensitiveInfo">false</bool>
+</resources>
diff --git a/res/values/bliss_dimens.xml b/res/values/bliss_dimens.xml
new file mode 100644
index 0000000..2ca59a6
--- /dev/null
+++ b/res/values/bliss_dimens.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2014-2020 BlissRoms Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<resources>
+ <!-- Fingerprint -->
+ <dimen name="fingerprint_find_sensor_padding_top">16dp</dimen>
+
+ <!-- PreferenceCategory -->
+ <dimen name="bliss_preference_category_padding_top">0.0dip</dimen>
+ <dimen name="bliss_preference_category_line_margin_start">10.0dip</dimen>
+ <dimen name="bliss_preference_category_height">40.0dip</dimen>
+</resources>
diff --git a/res/values/bliss_strings.xml b/res/values/bliss_strings.xml
new file mode 100644
index 0000000..bca9284
--- /dev/null
+++ b/res/values/bliss_strings.xml
@@ -0,0 +1,194 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2014-2020 BlissRoms Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+
+ <!-- Hostname setting -->
+ <string name="device_hostname">Device hostname</string>
+
+ <!-- Android debugging as root -->
+ <string name="adb_enable_root">Rooted debugging</string>
+ <string name="adb_enable_summary_root">Allow running Android debugging as root</string>
+
+ <!-- Black theme for dark mode -->
+ <string name="berry_black_theme_title">Pure black</string>
+ <string name="berry_black_theme_summary">Pure black background for dark theme</string>
+
+ <!-- Proximity wake -->
+ <string name="proximity_wake_title">Prevent accidental wake-up</string>
+ <string name="proximity_wake_summary">Check the proximity sensor prior to waking up screen</string>
+
+ <!-- Double tap to sleep on status bar or lockscreen -->
+ <string name="status_bar_double_tap_to_sleep_title">Tap to sleep</string>
+ <string name="status_bar_double_tap_to_sleep_summary">Double-tap on the status bar or lockscreen to turn off the display</string>
+
+ <!-- Touchscreen gesture settings -->
+ <string name="touchscreen_gesture_settings_title">Touchscreen gestures</string>
+ <string name="touchscreen_gesture_settings_summary">Perform various touchscreen gestures for quick actions</string>
+
+ <!-- Format string for fingerprint location message -->
+ <string name="security_settings_fingerprint_enroll_find_sensor_message_cm" product="tablet">Locate the fingerprint sensor on the <xliff:g id="sensor_location">%1$s</xliff:g> of your tablet.</string>
+ <string name="security_settings_fingerprint_enroll_find_sensor_message_cm" product="device">Locate the fingerprint sensor on the <xliff:g id="sensor_location">%1$s</xliff:g> of your device.</string>
+ <string name="security_settings_fingerprint_enroll_find_sensor_message_cm" product="default">Locate the fingerprint sensor on the <xliff:g id="sensor_location">%1$s</xliff:g> of your phone.</string>
+
+ <!-- Fingerprint sensor locations -->
+ <string name="security_settings_fingerprint_sensor_location_back">back</string>
+ <string name="security_settings_fingerprint_sensor_location_front">front</string>
+ <string name="security_settings_fingerprint_sensor_location_left">left side</string>
+ <string name="security_settings_fingerprint_sensor_location_right">right side</string>
+
+ <!-- Wake on plug -->
+ <string name="wake_when_plugged_or_unplugged_title">Wake on plug</string>
+ <string name="wake_when_plugged_or_unplugged_summary">Turn the screen on when connecting or disconnecting a power source</string>
+
+ <!-- High touch sensitivity -->
+ <string name="high_touch_sensitivity_title">High touch sensitivity</string>
+ <string name="high_touch_sensitivity_summary">Increase touchscreen sensitivity so it can be used while wearing gloves</string>
+
+ <!-- Touchscreen hovering -->
+ <string name="touchscreen_hovering_title">Touchscreen hovering</string>
+ <string name="touchscreen_hovering_summary">Allows you to hover the screen like a mouse in web browsers, remote desktops, etc</string>
+
+ <!-- Increasing ring tone volume -->
+ <string name="increasing_ring_volume_option_title">Increasing ring volume</string>
+ <string name="increasing_ring_min_volume_title">Start volume</string>
+ <string name="increasing_ring_ramp_up_time_title">Ramp-up time</string>
+
+ <!-- Hotspot lineage extras -->
+ <string name="tethering_allow_vpn_upstreams_title">Allow clients to use VPNs</string>
+ <string name="tethering_allow_vpn_upstreams_summary">Permit hotspot clients to use this device\u2019s VPN connections for upstream connectivity</string>
+
+ <!-- Lock screen pattern size -->
+ <string name="lock_pattern_size_3" translatable="false">3 \u00d7 3</string>
+ <string name="lock_pattern_size_4" translatable="false">4 \u00d7 4</string>
+ <string name="lock_pattern_size_5" translatable="false">5 \u00d7 5</string>
+ <string name="lock_pattern_size_6" translatable="false">6 \u00d7 6</string>
+ <string name="lock_settings_picker_pattern_size_message">Choose a pattern size</string>
+ <!-- Whether a visible red line will be drawn after the user has drawn the unlock pattern incorrectly -->
+ <string name="lockpattern_settings_enable_error_path_title">Show pattern error</string>
+ <!-- Whether the dots will be drawn when using the lockscreen pattern -->
+ <string name="lockpattern_settings_enable_dots_title">Show pattern dots</string>
+
+ <!-- Lock screen cover art -->
+ <string name="lockscreen_media_art_title">Display media cover art</string>
+
+ <!-- Lock screen visualizer -->
+ <string name="lockscreen_visualizer_title">Display music visualizer</string>
+
+ <!-- Min refresh rate -->
+ <string name="min_refresh_rate_title">Minimum refresh rate</string>
+
+ <!-- Navigation bar hint -->
+ <string name="show_navbar_hint_title">Navigation hint</string>
+ <string name="show_navbar_hint_summary">Show navigation hint bar at the bottom of the screen</string>
+
+ <!-- Notification sound timeout -->
+ <string name="app_notification_sound_timeout_title">Minimum time between notification sounds</string>
+ <string name="app_notification_sound_timeout_summary_template">Allow sounds or vibration no more than once every <xliff:g id="duration">%1$s</xliff:g></string>
+ <string name="app_notification_sound_timeout_value_none">No restriction</string>
+ <string name="app_notification_sound_timeout_value_10_seconds">10 seconds</string>
+ <string name="app_notification_sound_timeout_value_30_seconds">30 seconds</string>
+ <string name="app_notification_sound_timeout_value_1_minute">1 minute</string>
+ <string name="app_notification_sound_timeout_value_5_minutes">5 minutes</string>
+ <string name="app_notification_sound_timeout_value_15_minutes">10 minutes</string>
+ <string name="app_notification_sound_timeout_value_30_minutes">30 minutes</string>
+
+ <!-- Per-app data restrictions -->
+ <string name="data_usage_app_restrict_all">Allow network access</string>
+ <string name="data_usage_app_restrict_all_summary">Enable network usage</string>
+ <string name="data_usage_app_restrict_mobile">Mobile data</string>
+ <string name="data_usage_app_restrict_mobile_summary">Enable usage of mobile data</string>
+ <string name="data_usage_app_restrict_vpn">VPN data</string>
+ <string name="data_usage_app_restrict_vpn_summary">Enable usage of VPN data</string>
+ <string name="data_usage_app_restrict_wifi">Wi\u2011Fi data</string>
+ <string name="data_usage_app_restrict_wifi_summary">Enable usage of Wi\u2011Fi data</string>
+
+ <!-- PIN scramble -->
+ <string name="unlock_scramble_pin_layout_title">Scramble layout</string>
+ <string name="unlock_scramble_pin_layout_summary">Scramble PIN layout when unlocking device</string>
+
+ <!-- Volume link notification -->
+ <string name="volume_link_notification_title">Link ring & notification volumes</string>
+
+ <!-- Heads-up -->
+ <string name="heads_up_notifications_enabled_title">Heads-up</string>
+ <string name="heads_up_notifications_enabled_summary">Display priority notifications in a small floating window</string>
+
+ <!-- Backup Transport selection settings menu and activity title -->
+ <string name="backup_transport_setting_label">Change backup provider</string>
+ <string name="backup_transport_title">Select backup provider</string>
+
+ <!-- Advanced restart options -->
+ <string name="advanced_reboot_title">Advanced restart</string>
+ <string name="advanced_reboot_summary">When unlocked, include options in the power menu for restarting into recovery or bootloader</string>
+
+ <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
+ <plurals name="show_dev_countdown_cm">
+ <item quantity="one">You are now <xliff:g id="step_count">%1$d</xliff:g> step away from enabling development settings.</item>
+ <item quantity="other">You are now <xliff:g id="step_count">%1$d</xliff:g> steps away from enabling development settings.</item>
+ </plurals>
+ <!-- [CHAR LIMIT=NONE] Device Info screen. Confirmation that developer settings are enabled -->
+ <string name="show_dev_on_cm">You have enabled development settings!</string>
+ <!-- [CHAR LIMIT=NONE] Device Info screen. Okay we get it, stop pressing, you already have it on -->
+ <string name="show_dev_already_cm">No need, you have already enabled development settings.</string>
+
+ <!-- Mobile network setting screen, summary of Mobile data switch preference when the network
+ is unavailable, the preference selection will be disabled. [CHAR LIMIT=NONE] -->
+ <string name="mobile_data_settings_summary_unavailable">No SIM card available</string>
+
+ <!-- BlissRoms Version -->
+ <string name="bliss_version">Bliss version</string>
+ <string name="bliss_version_default">Unknown</string>
+ <string name="keywords_bliss_version">Bliss version, bliss</string>
+ <string name="bliss_build_date">Build date</string>
+ <string name="bliss_build_default">Unknown</string>
+ <string name="bliss_build_type">Build status</string>
+ <string name="bliss_device">Bliss device</string>
+ <string name="bliss_variant">Bliss variant</string>
+ <string name="bliss_build_variant_default">Unknown</string>
+
+ <!-- Bliss maintainer -->
+ <string name="maintainer">Maintainer</string>
+ <string name="bliss_maintainer" translatable="false">Unofficial Maintainer</string>
+
+ <!-- String for removal of sensitive info on about, depending on tap -->
+ <string name="device_info_protected_single_press">Tap to show info</string>
+
+ <!-- Categories -->
+ <string name="display_screen_category">Screen</string>
+ <string name="display_customisation_title">Display Customisation</string>
+ <string name="wake_options_category_title">Wake Options</string>
+ <string name="volume_adjustment_category_title">Volume Adjustments</string>
+ <string name="sound_effects_category_title">Effects</string>
+ <string name="do_not_disturb_category_title">Do Not Disturb</string>
+ <string name="ringtone_category_title">Ringtone</string>
+ <string name="vibrations_category_title">Vibrations</string>
+ <string name="apps_category">Apps</string>
+ <string name="connected_devices_category_title">Connected Devices</string>
+ <string name="theme_customization_category">Theming</string>
+
+ <!-- Changelog -->
+ <string name="changelog_title">Changelog</string>
+ <string name="changelog_summary">Since the last update</string>
+ <string name="changelog_error">Unable to load changelog</string>
+
+ <!-- Blissify -->
+ <string name="blissify_settings_title">Blissify</string>
+ <string name="blissify_settings_summary">Blissify your device!</string>
+
+ <!-- Title for connected TWS device group [CHAR LIMIT=none]-->
+ <string name="connected_tws_device_saved_title">Saved Earbuds</string>
+</resources>
diff --git a/res/values/bliss_styles.xml b/res/values/bliss_styles.xml
new file mode 100644
index 0000000..5df218f
--- /dev/null
+++ b/res/values/bliss_styles.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2014-2020 BlissRoms Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<resources>
+ <declare-styleable name="Themes">
+ <attr name="waveViewStyle" format="reference"/>
+ </declare-styleable>
+</resources>
diff --git a/res/values/config.xml b/res/values/config.xml
index de0dcfb..587b763 100755
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -42,7 +42,7 @@
<bool name="config_show_camera_laser_sensor">false</bool>
<!-- Fully-qualified class name for the implementation of the FeatureFactory to be instantiated. -->
- <string name="config_featureFactory" translatable="false">com.android.settings.overlay.FeatureFactoryImpl</string>
+ <string name="config_featureFactory" translatable="false">com.google.android.settings.overlay.FeatureFactoryImpl</string>
<!-- Package name and fully-qualified class name for the wallpaper picker activity. -->
<string name="config_wallpaper_picker_package" translatable="false">com.android.settings</string>
@@ -394,7 +394,7 @@
<bool name="config_show_reset_dashboard">true</bool>
<!-- Whether system_update_settings should be shown or not. -->
- <bool name="config_show_system_update_settings">true</bool>
+ <bool name="config_show_system_update_settings">false</bool>
<!-- Whether device_model should be shown or not. -->
<bool name="config_show_device_model">true</bool>
@@ -462,4 +462,7 @@
<!-- Whether to show the Preference for Adaptive connectivity -->
<bool name="config_show_adaptive_connectivity">false</bool>
+
+ <!-- Whether the given language capitalizes nouns -->
+ <bool name="language_capitalizes_nouns">false</bool>
</resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 28ab8f8..2816dbb 100755
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -320,8 +320,8 @@
<dimen name="storage_donut_thickness">4dp</dimen>
<!-- Battery meter view size -->
- <dimen name="battery_meter_width">66dp</dimen>
- <dimen name="battery_meter_height">100dp</dimen>
+ <dimen name="battery_meter_width">232dp</dimen>
+ <dimen name="battery_meter_height">232dp</dimen>
<!-- Margin for the reset screens -->
<dimen name="reset_network_margin_start">72dp</dimen>
diff --git a/res/values/google_strings.xml b/res/values/google_strings.xml
new file mode 100644
index 0000000..08e3db6
--- /dev/null
+++ b/res/values/google_strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources>
+ <string name="battery_tip_smart_battery_summary_custom">Turn on Adaptive Battery</string>
+ <string name="smart_battery_footer_custom">"To extend battery life, Adaptive Battery limits battery for infrequently used apps. Your phone will learn how you use apps over time.
+
+Notifications may be delayed for these apps."</string>
+ <string name="smart_battery_manager_title_custom">Adaptive Battery</string>
+ <string name="smart_battery_title_custom">Use Adaptive Battery</string>
+ </resources>
diff --git a/res/values/lineage_attrs.xml b/res/values/lineage_attrs.xml
new file mode 100644
index 0000000..f531162
--- /dev/null
+++ b/res/values/lineage_attrs.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2017 The LineageOS Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<resources>
+ <attr name="customPreferenceStyle" format="reference" />
+</resources>
diff --git a/res/values/lineage_styles.xml b/res/values/lineage_styles.xml
new file mode 100644
index 0000000..1ce2e23
--- /dev/null
+++ b/res/values/lineage_styles.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2018 The LineageOS Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<resources>
+ <style name="LockPatternSizeHeaderStyle" parent="android:style/TextAppearance.Material.Subhead">
+ <item name="android:paddingTop">16dp</item>
+ <item name="android:textColor">@color/primary_dark_material_light</item>
+ <item name="android:lineSpacingMultiplier">1.2</item>
+ </style>
+</resources>
diff --git a/res/values/lineage_styles_preference.xml b/res/values/lineage_styles_preference.xml
new file mode 100644
index 0000000..ae9463c
--- /dev/null
+++ b/res/values/lineage_styles_preference.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2017 The LineageOS Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<!-- This file only contains custom attribute and style definition for preferences -->
+<!-- Things unrelated to preference framework UI customization should go to other styles files -->
+<resources>
+ <style name="PreferenceTheme" parent="@style/PreferenceThemeOverlay.SettingsBase">
+ <item name="customPreferenceStyle">@style/CustomPreference</item>
+ </style>
+
+ <style name="CustomPreference" parent="Preference.Material">
+ <item name="allowDividerAbove">false</item>
+ </style>
+</resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 2e52996..8fd2869 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -3719,23 +3719,23 @@
<!-- Button title to factory data reset the entire device. The "(factory reset)" part is optional for translation. [CHAR LIMIT=30 BACKUP_MESSAGE_ID=3531267871084279512]-->
<string name="master_clear_short_title">Erase all data (factory reset)</string>
<!-- SD card & phone storage settings screen, message on screen after user selects Factory data reset [CHAR LIMIT=NONE] -->
- <string name="master_clear_desc" product="tablet">"This will erase all data from your tablet\u2019s <b>internal storage</b>, including:\n\n<li>Your Google Account</li>\n<li>System and app data and settings</li>\n<li>Downloaded apps</li>"</string>
+ <string name="master_clear_desc" product="tablet">This will erase all data from your tablet\u2019s <b>internal storage</b>, including:\n\n<li>Your Google Account</li>\n<li>System and app data and settings</li>\n<li>Downloaded apps</li></string>
<!-- SD card & phone storage settings screen, message on screen after user selects Factory data reset [CHAR LIMIT=NONE] -->
- <string name="master_clear_desc" product="default">"This will erase all data from your phone\u2019s <b>internal storage</b>, including:\n\n<li>Your Google Account</li>\n<li>System and app data and settings</li>\n<li>Downloaded apps</li>"</string>
+ <string name="master_clear_desc" product="default">This will erase all data from your phone\u2019s <b>internal storage</b>, including:\n\n<li>Your Google Account</li>\n<li>System and app data and settings</li>\n<li>Downloaded apps</li></string>
<!-- SD card & phone storage settings screen, instructions and list of current accounts. The list of accounts follows this text[CHAR LIMIT=NONE] -->
- <string name="master_clear_accounts" product="default">"\n\nYou are currently signed into the following accounts:\n"</string>
+ <string name="master_clear_accounts" product="default">\n\nYou are currently signed into the following accounts:\n</string>
<!-- SD card & phone storage settings screen, notification if other users are present on the device [CHAR LIMIT=NONE] -->
- <string name="master_clear_other_users_present" product="default">"\n\nThere are other users present on this device.\n"</string>
+ <string name="master_clear_other_users_present" product="default">\n\nThere are other users present on this device.\n</string>
<!-- SD card & phone storage settings screen, list of items in user data storage (USB storage or SD card) that will be erased during this operation [CHAR LIMIT=NONE] -->
- <string name="master_clear_desc_also_erases_external">"<li>Music</li>\n<li>Photos</li>\n<li>Other user data</li>"</string>
+ <string name="master_clear_desc_also_erases_external"><li>Music</li>\n<li>Photos</li>\n<li>Other user data</li></string>
<!-- SD card & phone storage settings screen, list of items on an eSIM (embedded SIM) that will be erased during this operation [CHAR LIMIT=NONE] -->
- <string name="master_clear_desc_also_erases_esim">"<li>eSIMs</li>"</string>
+ <string name="master_clear_desc_also_erases_esim"><li>eSIMs</li></string>
<!-- SD card & phone storage settings screen, notification if there are eSIM (embedded SIM) profiles present that the user's mobile service plan will not be canceled [CHAR LIMIT=NONE] -->
- <string name="master_clear_desc_no_cancel_mobile_plan">"\n\nThis will not cancel your mobile service plan.</string>
+ <string name="master_clear_desc_no_cancel_mobile_plan">\n\nThis will not cancel your mobile service plan.</string>
<!-- SD card & phone storage settings screen, instructions about whether to also erase the external storage (SD card) when erasing the internal storage [CHAR LIMIT=NONE] -->
- <string name="master_clear_desc_erase_external_storage" product="nosdcard">"\n\nTo clear music, pictures, and other user data, the <b>USB storage</b> needs to be erased."</string>
+ <string name="master_clear_desc_erase_external_storage" product="nosdcard">\n\nTo clear music, pictures, and other user data, the <b>USB storage</b> needs to be erased.</string>
<!-- SD card & phone storage settings screen, instructions about whether to also erase the external storage (SD card) when erasing the internal storage [CHAR LIMIT=NONE] -->
- <string name="master_clear_desc_erase_external_storage" product="default">"\n\nTo clear music, pictures, and other user data, the <b>SD card</b> needs to be erased."</string>
+ <string name="master_clear_desc_erase_external_storage" product="default">\n\nTo clear music, pictures, and other user data, the <b>SD card</b> needs to be erased.</string>
<!-- SD card & phone storage settings screen, label for check box to erase USB storage [CHAR LIMIT=30] -->
<string name="erase_external_storage" product="nosdcard">Erase USB storage</string>
<!-- SD card & phone storage settings screen, label for check box to erase SD card [CHAR LIMIT=30] -->
@@ -6219,12 +6219,6 @@
<string name="user_credentials_summary">View and modify stored credentials</string>
<!-- Title of preference group for advance security settings [CHAR LIMIT=30] -->
<string name="advanced_security_title">Advanced</string>
- <!-- Title of preference of what type of credential storage this device has: hardware or software [CHAR LIMIT=30] -->
- <string name="credential_storage_type">Storage type</string>
- <!-- Summary text for preference showing what type of credential storage this device has when it is stored in a hardware-backed storage (as opposed to "software only") [CHAR LIMIT=NONE] -->
- <string name="credential_storage_type_hardware">Hardware-backed</string>
- <!-- Summary text for preference showing what type of credential storage this device has when it is stored in software only (as opposed to "hardware-backed") [CHAR LIMIT=NONE] -->
- <string name="credential_storage_type_software">Software only</string>
<!-- Error message for users that aren't allowed to see or modify credentials [CHAR LIMIT=none] -->
<string name="credentials_settings_not_available">Credentials are not available for this user</string>
<!-- Sub-heading for a user credential installed to be used by apps and as part of VPN configurations. [CHAR LIMIT=NONE] -->
diff --git a/res/values/styles_preference.xml b/res/values/styles_preference.xml
index b88a9fb..d2ec1f2 100644
--- a/res/values/styles_preference.xml
+++ b/res/values/styles_preference.xml
@@ -25,16 +25,28 @@
<item name="slicePreferenceStyle">@style/SlicePreference</item>
<item name="seekBarPreferenceStyle">@style/SettingsSeekBarPreference</item>
<item name="twoStateButtonPreferenceStyle">@style/TwoStateButtonPreference</item>
+ <item name="preferenceCategoryStyle">@style/Preference.Bliss.Category</item>
<item name="preferenceCategoryTitleTextAppearance">@style/TextAppearance.CategoryTitle
</item>
<item name="preferenceCategoryStyle">@style/SettingsCategoryPreference</item>
<!-- For preference category color -->
<item name="preferenceCategoryTitleTextColor">?android:attr/textColorSecondary</item>
- <item name="preferenceFragmentCompatStyle">@style/SettingsPreferenceFragmentStyle</item>
</style>
<style name="SettingsCategoryPreference" parent="Preference.Category.Material" />
+ <style name="Preference.Bliss.Category" parent="@style/Preference.Category">
+ <item name="android:layout">@layout/bliss_preference_category_material</item>
+ <item name="android:selectable">false</item>
+ <item name="allowDividerBelow">false</item>
+ <item name="android:shouldDisableView">false</item>
+ </style>
+
+ <style name="PreferenceCategoryTitleTextStyle">
+ <item name="android:textAppearance">?preferenceCategoryTitleTextAppearance</item>
+ <item name="android:textColor">?android:colorAccent</item>
+ </style>
+
<style name="PreferenceTheme.SetupWizard">
<item name="preferenceFragmentCompatStyle">@style/SetupWizardPreferenceFragmentStyle</item>
<item name="preferenceStyle">@style/Preference.Material</item>
@@ -69,12 +81,8 @@
<item name="android:negativeButtonText">@android:string/cancel</item>
</style>
- <style name="SettingsPreferenceFragmentStyle" parent="@style/PreferenceFragment.Material">
- <item name="android:divider">@*android:drawable/list_divider_material</item>
- </style>
-
<style name="SetupWizardPreferenceFragmentStyle" parent="PreferenceFragment.Material">
<item name="android:layout">@layout/setup_preference</item>
</style>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/res/values/wellbeing_strings.xml b/res/values/wellbeing_strings.xml
new file mode 100644
index 0000000..776d900
--- /dev/null
+++ b/res/values/wellbeing_strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+ <string name="duration_less_than_one_minute">Less than 1 minute</string>
+ <string name="screen_time_summary_usage_today">%1$s today</string>
+</resources>
diff --git a/res/xml/accessibility_settings.xml b/res/xml/accessibility_settings.xml
index cea8eb3..a7b07bf 100644
--- a/res/xml/accessibility_settings.xml
+++ b/res/xml/accessibility_settings.xml
@@ -21,6 +21,10 @@
android:persistent="false"
android:title="@string/accessibility_settings">
+ <Preference
+ android:key="accesibility_animation"
+ android:layout="@layout/accessibility_animation" />
+
<PreferenceCategory
android:key="user_installed_services_category"
android:persistent="false"
@@ -44,7 +48,7 @@
android:persistent="false"
android:title="@string/display_category_title">
- <Preference
+ <!-- <Preference
android:fragment="com.android.settings.display.ToggleFontSizePreferenceFragment"
android:key="font_size_preference_screen"
android:persistent="false"
@@ -64,7 +68,7 @@
android:persistent="false"
android:title="@string/dark_ui_mode"
settings:controller="com.android.settings.display.DarkUIPreferenceController"
- settings:searchable="false"/>
+ settings:searchable="false"/> -->
<Preference
android:fragment="com.android.settings.accessibility.MagnificationPreferenceFragment"
@@ -134,13 +138,13 @@
android:title="@string/accessibility_vibration_settings_title"
settings:controller="com.android.settings.accessibility.VibrationPreferenceController"/>
- <Preference
+ <!-- <Preference
android:fragment="com.android.settings.gestures.SystemNavigationGestureSettings"
android:key="gesture_system_navigation_input_summary_accessibility"
android:persistent="false"
android:title="@string/system_navigation_title"
settings:searchable="false"
- settings:controller="com.android.settings.gestures.SystemNavigationPreferenceController"/>
+ settings:controller="com.android.settings.gestures.SystemNavigationPreferenceController"/>-->
</PreferenceCategory>
diff --git a/res/xml/accounts_dashboard_settings.xml b/res/xml/accounts_dashboard_settings.xml
index d2affc7..e48aeaf 100644
--- a/res/xml/accounts_dashboard_settings.xml
+++ b/res/xml/accounts_dashboard_settings.xml
@@ -21,6 +21,10 @@
android:title="@string/account_dashboard_title"
settings:keywords="@string/keywords_accounts">
+ <Preference
+ android:key="account_animation"
+ android:layout="@layout/account_animation" />
+
<PreferenceCategory
android:key="dashboard_tile_placeholder"
android:order="30"/>
diff --git a/res/xml/app_and_notification.xml b/res/xml/app_and_notification.xml
index bd2e85c..65a0b24 100644
--- a/res/xml/app_and_notification.xml
+++ b/res/xml/app_and_notification.xml
@@ -23,20 +23,31 @@
settings:initialExpandedChildrenCount="4">
<!-- the initial count should include the dynamic tiles -->
+ <Preference
+ android:key="notification_animation"
+ android:layout="@layout/notification_animation"
+ android:order="-999"/>
+
+ <PreferenceCategory
+ android:title="@string/recent_app_category_title"
+ android:key="recent_apps_category"
+ android:order="-998">
+
<Preference
android:key="all_app_info"
android:title="@string/applications_settings"
- android:order="-999"
+ android:order="-997"
android:fragment="com.android.settings.applications.manageapplications.ManageApplications"
settings:controller="com.android.settings.applications.AllAppsInfoPreferenceController"
settings:keywords="@string/keywords_applications_settings"/>
+ </PreferenceCategory>
<com.android.settingslib.widget.LayoutPreference
android:key="recent_open_apps"
android:title="@string/recent_app_category_title"
android:layout="@layout/app_entities_header"
android:selectable="false"
- android:order="-998"
+ android:order="-996"
settings:allowDividerBelow="true"
settings:controller="com.android.settings.applications.RecentAppsPreferenceController"/>
@@ -44,7 +55,12 @@
<PreferenceCategory
android:key="recent_apps_divider"
android:layout="@layout/preference_category_no_label"
- android:order="-997"/>
+ android:order="-995"/>
+
+ <PreferenceCategory
+ android:title="@string/apps_category"
+ android:key="recent_apps_category"
+ android:order="-994">
<Preference
android:key="conversations"
@@ -61,11 +77,6 @@
android:order="-440"
android:fragment="com.android.settings.notification.ConfigureNotificationSettings"/>
- <!-- Notifications (appears before manage_perms), default apps (appears after) -->
- <PreferenceCategory
- android:key="dashboard_tile_placeholder"
- android:order="10"/>
-
<Preference
android:key="default_apps"
android:title="@string/app_default_dashboard_title"
@@ -100,5 +111,6 @@
android:title="@string/special_access"
android:order="20"
settings:controller="com.android.settings.applications.SpecialAppAccessPreferenceController"/>
+ </PreferenceCategory>
</PreferenceScreen>
diff --git a/res/xml/app_data_usage.xml b/res/xml/app_data_usage.xml
index e64a1c5..a864b88 100644
--- a/res/xml/app_data_usage.xml
+++ b/res/xml/app_data_usage.xml
@@ -56,6 +56,21 @@
android:title="@string/data_usage_app_settings" />
<com.android.settingslib.RestrictedSwitchPreference
+ android:key="restrict_all"
+ android:title="@string/data_usage_app_restrict_all"
+ android:summary="@string/data_usage_app_restrict_all_summary" />
+
+ <com.android.settingslib.RestrictedSwitchPreference
+ android:key="restrict_wifi"
+ android:title="@string/data_usage_app_restrict_wifi"
+ android:summary="@string/data_usage_app_restrict_wifi_summary" />
+
+ <com.android.settingslib.RestrictedSwitchPreference
+ android:key="restrict_cellular"
+ android:title="@string/data_usage_app_restrict_mobile"
+ android:summary="@string/data_usage_app_restrict_mobile_summary" />
+
+ <com.android.settingslib.RestrictedSwitchPreference
android:key="restrict_background"
android:title="@string/data_usage_app_restrict_background"
android:summary="@string/data_usage_app_restrict_background_summary"
@@ -63,6 +78,11 @@
settings:restrictedSwitchSummary="@string/disabled_by_admin" />
<com.android.settingslib.RestrictedSwitchPreference
+ android:key="restrict_vpn"
+ android:title="@string/data_usage_app_restrict_vpn"
+ android:summary="@string/data_usage_app_restrict_vpn_summary" />
+
+ <com.android.settingslib.RestrictedSwitchPreference
android:key="unrestricted_data_saver"
android:title="@string/unrestricted_app_title"
android:summary="@string/unrestricted_app_summary"
diff --git a/res/xml/app_info_settings.xml b/res/xml/app_info_settings.xml
index a76f0d9..fa25ad1 100644
--- a/res/xml/app_info_settings.xml
+++ b/res/xml/app_info_settings.xml
@@ -180,9 +180,16 @@
<Preference
android:key="app_version"
android:selectable="false"
- android:order="9999"
+ android:order="9998"
settings:controller="com.android.settings.applications.appinfo.AppVersionPreferenceController"
settings:allowDividerAbove="true"
settings:enableCopying="true"/>
+ <Preference
+ android:key="app_package_name"
+ android:selectable="false"
+ android:order="9999"
+ settings:controller="com.android.settings.applications.appinfo.AppPackageNamePreferenceController"
+ settings:enableCopying="true"/>
+
</PreferenceScreen>
diff --git a/res/xml/app_notification_settings.xml b/res/xml/app_notification_settings.xml
index b3a1117..7251b4c 100644
--- a/res/xml/app_notification_settings.xml
+++ b/res/xml/app_notification_settings.xml
@@ -89,9 +89,16 @@
settings:useAdditionalSummary="true"
android:order="1001"
settings:restrictedSwitchSummary="@string/enabled_by_admin" />
+ <com.android.settings.RestrictedListPreference
+ android:key="sound_timeout"
+ android:title="@string/app_notification_sound_timeout_title"
+ android:entries="@array/app_notification_sound_timeout_entries"
+ android:entryValues="@array/app_notification_sound_timeout_values"
+ android:order="1003"
+ android:persistent="false" />
<Preference
android:key="app_link"
- android:order="1003"
+ android:order="1004"
android:title="@string/app_settings_link" />
</PreferenceCategory>
diff --git a/res/xml/assist_gesture_settings.xml b/res/xml/assist_gesture_settings.xml
index 5f7918f..2426516 100644
--- a/res/xml/assist_gesture_settings.xml
+++ b/res/xml/assist_gesture_settings.xml
@@ -23,7 +23,8 @@
<com.android.settings.widget.VideoPreference
android:key="gesture_assist_video"
app:animation="@raw/gesture_assist"
- app:preview="@drawable/gesture_assist" />
+ app:preview="@drawable/gesture_assist"
+ app:controller="com.android.settings.widget.VideoPreferenceController" />
<SwitchPreference
android:key="gesture_assist"
diff --git a/res/xml/backup_transport_settings.xml b/res/xml/backup_transport_settings.xml
new file mode 100644
index 0000000..cc8cc9a
--- /dev/null
+++ b/res/xml/backup_transport_settings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ ~ Copyright (C) 2020 The Calyx Institute
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License
+ -->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:settings="http://schemas.android.com/apk/res-auto"
+ android:title="@string/backup_transport_title">
+
+ <!-- content gets filled programmatically -->
+
+</PreferenceScreen>
diff --git a/res/xml/bliss_version.xml b/res/xml/bliss_version.xml
new file mode 100644
index 0000000..5cfc78e
--- /dev/null
+++ b/res/xml/bliss_version.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2019 The BlissRoms Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<PreferenceScreen
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:settings="http://schemas.android.com/apk/res-auto"
+ android:key="bliss_version_screen"
+ android:title="@string/bliss_version"
+ settings:keywords="@string/keywords_bliss_version">
+
+ <!-- Bliss Logo Header -->
+ <Preference
+ android:key="bliss_logo"
+ android:order="-500"
+ android:layout="@layout/bliss_logo" />
+
+ <!-- Bliss version -->
+ <Preference
+ android:key="bliss_version"
+ android:title="@string/bliss_version"
+ android:summary="@string/summary_placeholder"
+ settings:enableCopying="true"
+ settings:controller="com.android.settings.deviceinfo.bliss.BlissVersionPreferenceController"/>
+
+ <!-- Changelog -->
+ <Preference
+ android:key="changelog"
+ android:title="@string/changelog_title"
+ android:summary="@string/changelog_summary"
+ android:fragment="com.android.settings.bliss.Changelog" />
+
+ <!-- Bliss maintainer -->
+ <Preference
+ android:key="maintainer"
+ android:title="@string/maintainer"
+ android:summary="@string/summary_placeholder"
+ settings:enableCopying="true"
+ settings:controller="com.android.settings.deviceinfo.bliss.BlissMaintainerPreferenceController"/>
+
+ <!-- Bliss Device -->
+ <Preference
+ android:key="bliss_device"
+ android:title="@string/bliss_device"
+ android:summary="@string/summary_placeholder"
+ settings:enableCopying="true"
+ settings:controller="com.android.settings.deviceinfo.bliss.BlissDevicePreferenceController"/>
+
+ <!-- Bliss build type -->
+ <Preference
+ android:key="bliss_build_type"
+ android:title="@string/bliss_build_type"
+ android:summary="@string/summary_placeholder"
+ settings:enableCopying="true"
+ settings:controller="com.android.settings.deviceinfo.bliss.BlissBuildTypePreferenceController"/>
+
+ <!-- Bliss build variant -->
+ <Preference
+ android:key="bliss_build_variant"
+ android:title="@string/bliss_variant"
+ android:summary="@string/summary_placeholder"
+ settings:enableCopying="true"
+ settings:controller="com.android.settings.deviceinfo.bliss.BlissBuildVariantPreferenceController"/>
+
+ <!-- Bliss build date -->
+ <Preference
+ android:key="bliss_build_date"
+ android:title="@string/bliss_build_date"
+ android:summary="@string/summary_placeholder"
+ settings:enableCopying="true"
+ settings:controller="com.android.settings.deviceinfo.bliss.BlissBuildDatePreferenceController"/>
+
+</PreferenceScreen>
diff --git a/res/xml/configure_notification_settings.xml b/res/xml/configure_notification_settings.xml
index 95c7f56..2bb080b 100644
--- a/res/xml/configure_notification_settings.xml
+++ b/res/xml/configure_notification_settings.xml
@@ -15,6 +15,7 @@
-->
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:lineage="http://schemas.android.com/apk/res/lineageos.platform"
xmlns:settings="http://schemas.android.com/apk/res-auto"
android:title="@string/configure_notification_settings">
@@ -133,20 +134,32 @@
android:title="@string/notification_pulse_title"
settings:controller="com.android.settings.notification.PulseNotificationPreferenceController"/>
- <!-- Default notification ringtone -->
+ <!-- Notification lights -->
+ <org.lineageos.internal.lineageparts.LineagePartsPreference
+ android:key="notification_lights"
+ lineage:requiresConfig="@*android:bool/config_intrusiveNotificationLed"
+ lineage:replacesKey="notification_pulse" />
+
+ <!-- Heads up -->
+ <lineageos.preference.GlobalSettingSwitchPreference
+ android:key="heads_up_notifications_enabled"
+ android:title="@string/heads_up_notifications_enabled_title"
+ android:summary="@string/heads_up_notifications_enabled_summary" />
+
+ <!-- Default notification ringtone
<com.android.settings.DefaultRingtonePreference
android:key="notification_default_ringtone"
android:title="@string/notification_ringtone_title"
android:dialogTitle="@string/notification_ringtone_title"
android:summary="@string/summary_placeholder"
android:ringtoneType="notification"
- settings:searchable="false"/>
+ settings:searchable="false"/> -->
- <Preference
+ <!--Preference
android:key="gesture_swipe_down_fingerprint_notifications"
android:title="@string/fingerprint_swipe_for_notifications_title"
android:fragment="com.android.settings.gestures.SwipeToNotificationSettings"
- settings:controller="com.android.settings.gestures.SwipeToNotificationPreferenceController"/>
+ settings:controller="com.android.settings.gestures.SwipeToNotificationPreferenceController"/-->
<com.android.settingslib.RestrictedPreference
android:key="zen_mode_notifications"
diff --git a/res/xml/connected_devices.xml b/res/xml/connected_devices.xml
index e7e3c2c..5edddc3 100644
--- a/res/xml/connected_devices.xml
+++ b/res/xml/connected_devices.xml
@@ -20,6 +20,14 @@
android:key="connected_devices_screen"
android:title="@string/connected_devices_dashboard_title">
+ <Preference
+ android:key="bluetooth_animation"
+ android:layout="@layout/bluetooth_animation" />
+
+ <PreferenceCategory
+ android:key="connected_devices_category"
+ android:title="@string/connected_devices_category_title" />
+
<com.android.settings.slices.SlicePreference
android:key="bt_nearby_slice"
android:title="@string/summary_placeholder"
@@ -36,6 +44,11 @@
android:title="@string/connected_device_other_device_title"
settings:controller="com.android.settings.connecteddevice.ConnectedDeviceGroupController"/>
+ <PreferenceCategory
+ android:key="saved_tws_device_list"
+ android:title="@string/connected_tws_device_saved_title"
+ settings:controller="com.android.settings.connecteddevice.SavedTwsDeviceGroupController"/>
+
<com.android.settingslib.RestrictedPreference
android:key="add_bt_devices"
android:title="@string/bluetooth_pairing_pref_title"
diff --git a/res/xml/dark_mode_settings.xml b/res/xml/dark_mode_settings.xml
index 0ebc044..5483795 100644
--- a/res/xml/dark_mode_settings.xml
+++ b/res/xml/dark_mode_settings.xml
@@ -55,6 +55,12 @@
settings:allowDividerBelow="true"
settings:controller="com.android.settings.display.darkmode.DarkModeActivationPreferenceController"/>
+ <lineageos.preference.LineageSystemSettingSwitchPreference
+ android:key="berry_black_theme"
+ android:title="@string/berry_black_theme_title"
+ android:summary="@string/berry_black_theme_summary"
+ android:defaultValue="false" />
+
<com.android.settingslib.widget.FooterPreference
android:key="dark_ui_footer"
android:title="@string/dark_ui_text"
diff --git a/res/xml/development_settings.xml b/res/xml/development_settings.xml
index 6f9405e..d7015b5 100644
--- a/res/xml/development_settings.xml
+++ b/res/xml/development_settings.xml
@@ -30,10 +30,10 @@
android:summary="@string/summary_placeholder"
android:fragment="com.android.settings.applications.ProcessStatsSummary" />
- <com.android.settings.BugreportPreference
+ <!--<com.android.settings.BugreportPreference
android:key="bugreport"
android:title="@*android:string/bugreport_title"
- android:dialogTitle="@*android:string/bugreport_title" />
+ android:dialogTitle="@*android:string/bugreport_title" />-->
<Preference
android:key="bug_report_handler"
@@ -135,11 +135,29 @@
android:title="@string/debug_debugging_category"
android:order="200">
+ <org.lineageos.internal.preference.HostnamePreference
+ android:key="device_hostname"
+ android:title="@string/device_hostname"
+ android:dialogTitle="@string/device_hostname"
+ android:positiveButtonText="@string/wifi_save"
+ android:negativeButtonText="@string/wifi_cancel"
+ android:selectAllOnFocus="true"
+ android:imeOptions="actionDone"
+ android:inputType="textNoSuggestions"
+ android:persistent="false" />
+
<SwitchPreference
android:key="enable_adb"
android:title="@string/enable_adb"
android:summary="@string/enable_adb_summary" />
+ <SwitchPreference
+ android:key="enable_adb_root"
+ android:title="@string/adb_enable_root"
+ android:summary="@string/adb_enable_summary_root"
+ android:dependency="enable_adb"
+ android:persistent="false" />
+
<Preference android:key="clear_adb_keys"
android:title="@string/clear_adb_keys" />
@@ -160,10 +178,10 @@
android:title="@string/enable_terminal_title"
android:summary="@string/enable_terminal_summary" />
- <SwitchPreference
+ <!--<SwitchPreference
android:key="bugreport_in_power"
android:title="@string/bugreport_in_power"
- android:summary="@string/bugreport_in_power_summary" />
+ android:summary="@string/bugreport_in_power_summary" />-->
<SwitchPreference
android:key="enable_verbose_vendor_logging"
diff --git a/res/xml/device_controls_settings.xml b/res/xml/device_controls_settings.xml
index da6cdc0..c22cd4a 100644
--- a/res/xml/device_controls_settings.xml
+++ b/res/xml/device_controls_settings.xml
@@ -22,7 +22,8 @@
<com.android.settings.widget.VideoPreference
android:key="device_controls_video"
- app:animation="@raw/gesture_device_controls"/>
+ app:animation="@raw/gesture_device_controls"
+ app:controller="com.android.settings.widget.VideoPreferenceController"/>
<SwitchPreference
android:key="gesture_device_controls_switch"
diff --git a/res/xml/display_settings.xml b/res/xml/display_settings.xml
index 30dad01..c40f66a 100644
--- a/res/xml/display_settings.xml
+++ b/res/xml/display_settings.xml
@@ -16,12 +16,21 @@
<PreferenceScreen
xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:lineage="http://schemas.android.com/apk/res/lineageos.platform"
xmlns:settings="http://schemas.android.com/apk/res-auto"
android:key="display_settings_screen"
android:title="@string/display_settings"
settings:keywords="@string/keywords_display"
settings:initialExpandedChildrenCount="5">
+ <Preference
+ android:key="display_animation"
+ android:layout="@layout/display_animation" />
+
+ <PreferenceCategory
+ android:key="screen_category"
+ android:title="@string/display_screen_category">
+
<com.android.settingslib.RestrictedPreference
android:key="brightness"
android:title="@string/brightness"
@@ -31,15 +40,6 @@
<intent android:action="com.android.intent.action.SHOW_BRIGHTNESS_DIALOG" />
</com.android.settingslib.RestrictedPreference>
- <com.android.settings.display.darkmode.DarkModePreference
- android:key="dark_ui_mode"
- android:title="@string/dark_ui_mode"
- android:fragment="com.android.settings.display.darkmode.DarkModeSettingsFragment"
- android:widgetLayout="@null"
- settings:widgetLayout="@null"
- settings:controller="com.android.settings.display.DarkUIPreferenceController"
- settings:keywords="@string/keywords_dark_ui_mode"/>
-
<com.android.settings.display.NightDisplayPreference
android:key="night_display"
android:title="@string/night_display_title"
@@ -54,6 +54,10 @@
android:fragment="com.android.settings.display.AutoBrightnessSettings"
settings:controller="com.android.settings.display.AutoBrightnessPreferenceController"/>
+ <org.lineageos.internal.lineageparts.LineagePartsPreference
+ android:key="livedisplay"
+ lineage:requiresConfig="@*lineageos.platform:bool/config_enableLiveDisplay" />
+
<com.android.settingslib.RestrictedPreference
android:key="wallpaper"
android:title="@string/wallpaper_settings_title"
@@ -84,6 +88,11 @@
settings:keywords="@string/keywords_auto_rotate"
settings:controller="com.android.settings.display.AutoRotatePreferenceController" />
+ <org.lineageos.internal.lineageparts.LineagePartsPreference
+ android:key="rotation"
+ lineage:replacesKey="auto_rotate"
+ lineage:requiresFeature="android.hardware.sensor.accelerometer" />
+
<Preference
android:key="color_mode"
android:title="@string/color_mode_title"
@@ -91,12 +100,29 @@
settings:controller="com.android.settings.display.ColorModePreferenceController"
settings:keywords="@string/keywords_color_mode" />
+ <Preference
+ android:key="screensaver"
+ android:title="@string/screensaver_settings_title"
+ android:fragment="com.android.settings.dream.DreamSettings" />
+
+ </PreferenceCategory>
+
+ <PreferenceCategory
+ android:key="display_customisation_category"
+ android:title="@string/display_customisation_title">
+
<SwitchPreference
android:key="display_white_balance"
android:title="@string/display_white_balance_title"
android:summary="@string/display_white_balance_summary"
settings:controller="com.android.settings.display.DisplayWhiteBalancePreferenceController" />
+ <ListPreference
+ android:key="min_refresh_rate"
+ android:title="@string/min_refresh_rate_title"
+ android:summary="@string/summary_placeholder"
+ settings:controller="com.android.settings.display.MinRefreshRatePreferenceController" />
+
<SwitchPreference
android:key="peak_refresh_rate"
android:title="@string/peak_refresh_rate_title"
@@ -119,10 +145,9 @@
android:title="@string/show_operator_name_title"
android:summary="@string/show_operator_name_summary" />
- <Preference
- android:key="screensaver"
- android:title="@string/screensaver_settings_title"
- android:fragment="com.android.settings.dream.DreamSettings" />
+ <org.lineageos.internal.lineageparts.LineagePartsPreference
+ android:key="long_screen_settings"
+ lineage:requiresConfig="@*lineageos.platform:bool/config_haveHigherAspectRatioScreen" />
<Preference
android:key="lockscreen_from_display_settings"
@@ -131,6 +156,12 @@
settings:keywords="@string/keywords_ambient_display_screen"
settings:controller="com.android.settings.security.screenlock.LockScreenPreferenceController" />
+ </PreferenceCategory>
+
+ <PreferenceCategory
+ android:key="wake_options_category"
+ android:title="@string/wake_options_category_title">
+
<SwitchPreference
android:key="camera_gesture"
android:title="@string/camera_gesture_title"
@@ -145,14 +176,55 @@
android:title="@string/tap_to_wake"
android:summary="@string/tap_to_wake_summary" />
- <ListPreference
- android:key="theme"
- android:title="@string/device_theme"
- android:summary="@string/summary_placeholder" />
+ <!-- Prevent accidental wake-up -->
+ <lineageos.preference.LineageSystemSettingSwitchPreference
+ android:key="proximity_on_wake"
+ android:title="@string/proximity_wake_title"
+ android:summary="@string/proximity_wake_summary"
+ android:defaultValue="@*lineageos.platform:bool/config_proximityCheckOnWakeEnabledByDefault"
+ lineage:requiresConfig="@*lineageos.platform:bool/config_proximityCheckOnWake" />
+
+ <!-- Double tap to sleep -->
+ <lineageos.preference.LineageSystemSettingSwitchPreference
+ android:key="double_tap_sleep_gesture"
+ android:title="@string/status_bar_double_tap_to_sleep_title"
+ android:summary="@string/status_bar_double_tap_to_sleep_summary"
+ android:defaultValue="true" />
+
+ <lineageos.preference.LineageGlobalSettingSwitchPreference
+ android:key="wake_when_plugged_or_unplugged"
+ android:title="@string/wake_when_plugged_or_unplugged_title"
+ android:summary="@string/wake_when_plugged_or_unplugged_summary"
+ android:defaultValue="@*android:bool/config_unplugTurnsOnScreen" />
+
+ <lineageos.preference.LineageSystemSettingSwitchPreference
+ android:key="high_touch_sensitivity_enable"
+ android:title="@string/high_touch_sensitivity_title"
+ android:summary="@string/high_touch_sensitivity_summary"
+ android:defaultValue="false"
+ lineage:requiresFeature="lineagehardware:FEATURE_HIGH_TOUCH_SENSITIVITY" />
<Preference
android:key="vr_display_pref"
android:title="@string/display_vr_pref_title"
android:fragment="com.android.settings.display.VrDisplayPreferencePicker" />
+ </PreferenceCategory>
+
+ <PreferenceCategory
+ android:key="theme_customization_category"
+ android:title="@string/theme_customization_category"
+ android:order="1200"> <!-- Incremented by 100 from last order (i.e. 1100) -->
+
+ <com.android.settings.display.darkmode.DarkModePreference
+ android:key="dark_ui_mode"
+ android:title="@string/dark_ui_mode"
+ android:fragment="com.android.settings.display.darkmode.DarkModeSettingsFragment"
+ android:widgetLayout="@null"
+ settings:widgetLayout="@null"
+ settings:controller="com.android.settings.display.DarkUIPreferenceController"
+ settings:keywords="@string/keywords_dark_ui_mode"/>
+
+ </PreferenceCategory>
+
</PreferenceScreen>
diff --git a/res/xml/double_tap_power_settings.xml b/res/xml/double_tap_power_settings.xml
index cb7bcbe..6dba86f 100644
--- a/res/xml/double_tap_power_settings.xml
+++ b/res/xml/double_tap_power_settings.xml
@@ -23,7 +23,8 @@
<com.android.settings.widget.VideoPreference
android:key="gesture_double_tap_power_video"
app:animation="@raw/gesture_double_tap"
- app:preview="@drawable/gesture_double_tap" />
+ app:preview="@drawable/gesture_double_tap"
+ app:controller="com.android.settings.widget.VideoPreferenceController" />
<SwitchPreference
android:key="gesture_double_tap_power"
diff --git a/res/xml/double_tap_screen_settings.xml b/res/xml/double_tap_screen_settings.xml
index e9eeb3a..1a277c3 100644
--- a/res/xml/double_tap_screen_settings.xml
+++ b/res/xml/double_tap_screen_settings.xml
@@ -23,7 +23,8 @@
<com.android.settings.widget.VideoPreference
android:key="gesture_double_tap_screen_video"
app:animation="@raw/gesture_ambient_tap"
- app:preview="@drawable/gesture_ambient_tap" />
+ app:preview="@drawable/gesture_ambient_tap"
+ app:controller="com.android.settings.widget.VideoPreferenceController" />
<SwitchPreference
android:key="gesture_double_tap_screen"
diff --git a/res/xml/double_twist_gesture_settings.xml b/res/xml/double_twist_gesture_settings.xml
index ad82df3..cbe7f38 100644
--- a/res/xml/double_twist_gesture_settings.xml
+++ b/res/xml/double_twist_gesture_settings.xml
@@ -23,7 +23,8 @@
<com.android.settings.widget.VideoPreference
android:key="gesture_double_twist_video"
app:animation="@raw/gesture_twist"
- app:preview="@drawable/gesture_twist" />
+ app:preview="@drawable/gesture_twist"
+ app:controller="com.android.settings.widget.VideoPreferenceController" />
<SwitchPreference
android:key="gesture_double_twist"
diff --git a/res/xml/encryption_and_credential.xml b/res/xml/encryption_and_credential.xml
index b0906c1..fe0498d 100644
--- a/res/xml/encryption_and_credential.xml
+++ b/res/xml/encryption_and_credential.xml
@@ -37,12 +37,6 @@
android:persistent="false"
android:order="100">
- <com.android.settingslib.RestrictedPreference
- android:key="credential_storage_type"
- android:title="@string/credential_storage_type"
- android:summary="@string/summary_placeholder"
- settings:userRestriction="no_config_credentials" />
-
<Preference
android:key="trusted_credentials"
android:title="@string/trusted_credentials"
diff --git a/res/xml/gesture_navigation_settings.xml b/res/xml/gesture_navigation_settings.xml
index 6230054..d44f28d 100644
--- a/res/xml/gesture_navigation_settings.xml
+++ b/res/xml/gesture_navigation_settings.xml
@@ -23,6 +23,12 @@
android:title="@string/gesture_settings_activity_title"
settings:keywords="@string/keywords_gesture_navigation_settings">
+ <lineageos.preference.LineageSystemSettingSwitchPreference
+ android:key="navigation_bar_hint"
+ android:title="@string/show_navbar_hint_title"
+ android:summary="@string/show_navbar_hint_summary"
+ android:defaultValue="true" />
+
<PreferenceCategory
android:key="back_sensitivity_category"
android:persistent="false"
diff --git a/res/xml/gestures.xml b/res/xml/gestures.xml
index 0f407f4..e0d9138 100644
--- a/res/xml/gestures.xml
+++ b/res/xml/gestures.xml
@@ -17,9 +17,23 @@
<PreferenceScreen
xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:lineage="http://schemas.android.com/apk/res/lineageos.platform"
xmlns:settings="http://schemas.android.com/apk/res-auto"
android:title="@string/gesture_preference_title">
+ <org.lineageos.internal.lineageparts.LineagePartsPreference
+ android:key="touchscreen_gesture_settings"
+ lineage:requiresFeature="lineagehardware:FEATURE_TOUCHSCREEN_GESTURES" />
+
+ <lineageos.preference.RemotePreference
+ android:key="device_touchscreen_gesture_settings"
+ android:title="@string/touchscreen_gesture_settings_title"
+ android:summary="@string/touchscreen_gesture_settings_summary"
+ lineage:replacesKey="touchscreen_gesture_settings"
+ lineage:requiresFeature="lineagehardware:FEATURE_TOUCHSCREEN_GESTURES">
+ <intent android:action="org.lineageos.settings.device.GESTURE_SETTINGS" />
+ </lineageos.preference.RemotePreference>
+
<Preference
android:key="gesture_assist_input_summary"
android:title="@string/assist_gesture_title"
diff --git a/res/xml/global_actions_panel_settings.xml b/res/xml/global_actions_panel_settings.xml
index 980c756..e49c0d2 100644
--- a/res/xml/global_actions_panel_settings.xml
+++ b/res/xml/global_actions_panel_settings.xml
@@ -22,7 +22,8 @@
<com.android.settings.widget.VideoPreference
android:key="global_actions_panel_video"
- app:animation="@raw/gesture_global_actions_panel" />
+ app:animation="@raw/gesture_global_actions_panel"
+ app:controller="com.android.settings.widget.VideoPreferenceController" />
<SwitchPreference
android:key="gesture_global_actions_panel_switch"
diff --git a/res/xml/language_and_input.xml b/res/xml/language_and_input.xml
index 50968d9..5aaf39b 100644
--- a/res/xml/language_and_input.xml
+++ b/res/xml/language_and_input.xml
@@ -18,6 +18,7 @@
<PreferenceScreen
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:settings="http://schemas.android.com/apk/res-auto"
+ xmlns:lineage="http://schemas.android.com/apk/res/lineageos.platform"
android:title="@string/language_settings"
settings:initialExpandedChildrenCount="3">
@@ -83,6 +84,13 @@
android:fragment="com.android.settings.tts.TextToSpeechSettings"
settings:searchable="false"/>
+ <lineageos.preference.LineageSecureSettingSwitchPreference
+ android:key="feature_touch_hovering"
+ android:title="@string/touchscreen_hovering_title"
+ android:summary="@string/touchscreen_hovering_summary"
+ android:defaultValue="false"
+ lineage:requiresFeature="lineagehardware:FEATURE_TOUCH_HOVERING" />
+
</PreferenceCategory>
<SwitchPreference
diff --git a/res/xml/location_settings.xml b/res/xml/location_settings.xml
index fb03f4c..1ed6001 100644
--- a/res/xml/location_settings.xml
+++ b/res/xml/location_settings.xml
@@ -21,6 +21,10 @@
android:title="@string/location_settings_title"
settings:keywords="@string/keywords_location">
+ <Preference
+ android:key="location_animation"
+ android:layout="@layout/location_animation" />
+
<PreferenceCategory
android:key="recent_location_requests"
android:title="@string/location_category_recent_location_requests"
diff --git a/res/xml/my_device_info.xml b/res/xml/my_device_info.xml
index 5db2123..9cd1de8 100644
--- a/res/xml/my_device_info.xml
+++ b/res/xml/my_device_info.xml
@@ -21,12 +21,16 @@
android:key="my_device_info_pref_screen"
android:title="@string/about_settings">
- <com.android.settingslib.widget.LayoutPreference
+ <Preference
+ android:key="about_bliss_animation"
+ android:layout="@layout/about_bliss_animation" />
+
+ <!--<com.android.settingslib.widget.LayoutPreference
android:key="my_device_info_header"
android:order="0"
android:layout="@layout/settings_entity_header"
android:selectable="false"
- settings:isPreferenceVisible="false"/>
+ settings:isPreferenceVisible="false"/> -->
<!-- Device name -->
<com.android.settings.widget.ValidatedEditTextPreference
@@ -63,12 +67,12 @@
settings:controller="com.android.settings.accounts.EmergencyInfoPreferenceController"/>
<!-- Legal information -->
- <Preference
+ <!--Preference
android:key="legal_container"
android:order="15"
android:title="@string/legal_information"
android:fragment="com.android.settings.LegalSettings"
- settings:allowDividerAbove="true"/>
+ settings:allowDividerAbove="true"/> -->
<!-- Regulatory labels -->
<Preference
@@ -126,6 +130,15 @@
android:fragment="com.android.settings.deviceinfo.firmwareversion.FirmwareVersionSettings"
settings:controller="com.android.settings.deviceinfo.firmwareversion.FirmwareVersionPreferenceController"/>
+ <!-- Bliss version -->
+ <Preference
+ android:key="bliss_version"
+ android:order="43"
+ android:title="@string/bliss_version"
+ android:summary="@string/summary_placeholder"
+ android:fragment="com.android.settings.deviceinfo.bliss.BlissVersionSettings"
+ settings:controller="com.android.settings.deviceinfo.bliss.BlissVersionPreferenceController"/>
+
<!--IP address -->
<Preference
android:key="wifi_ip_address"
diff --git a/res/xml/network_and_internet.xml b/res/xml/network_and_internet.xml
index 6bf6dba..8e4f128 100644
--- a/res/xml/network_and_internet.xml
+++ b/res/xml/network_and_internet.xml
@@ -29,6 +29,15 @@
android:order="-40"
settings:controller="com.android.settings.network.MultiNetworkHeaderController"/>
+ <Preference
+ android:key="wifi_anim"
+ android:layout="@layout/wifi_animation"
+ android:order="-999"/>
+
+ <PreferenceCategory
+ android:key="storage_divider"
+ android:order="-998"/>
+
<com.android.settings.widget.MasterSwitchPreference
android:fragment="com.android.settings.wifi.WifiSettings"
android:key="main_toggle_wifi"
@@ -113,6 +122,7 @@
android:key="private_dns_settings"
android:title="@string/select_private_dns_configuration_title"
android:order="20"
+ android:icon="@drawable/ic_dns"
android:dialogTitle="@string/select_private_dns_configuration_dialog_title"
android:dialogLayout="@layout/private_dns_mode_dialog"
android:positiveButtonText="@string/save"
diff --git a/res/xml/pick_up_gesture_settings.xml b/res/xml/pick_up_gesture_settings.xml
index 178ddf5..f19824f 100644
--- a/res/xml/pick_up_gesture_settings.xml
+++ b/res/xml/pick_up_gesture_settings.xml
@@ -23,7 +23,8 @@
<com.android.settings.widget.VideoPreference
android:key="gesture_pick_up_video"
app:animation="@raw/gesture_ambient_lift"
- app:preview="@drawable/gesture_ambient_lift" />
+ app:preview="@drawable/gesture_ambient_lift"
+ app:controller="com.android.settings.widget.VideoPreferenceController" />
<SwitchPreference
android:key="gesture_pick_up"
diff --git a/res/xml/power_menu_settings.xml b/res/xml/power_menu_settings.xml
index c7fba71..f6ae733 100644
--- a/res/xml/power_menu_settings.xml
+++ b/res/xml/power_menu_settings.xml
@@ -20,6 +20,12 @@
xmlns:settings="http://schemas.android.com/apk/res-auto"
android:title="@string/power_menu_setting_name">
+ <lineageos.preference.LineageSecureSettingSwitchPreference
+ android:key="advanced_reboot"
+ android:title="@string/advanced_reboot_title"
+ android:summary="@string/advanced_reboot_summary"
+ android:defaultValue="false" />
+
<Preference
android:key="gesture_global_actions_panel_summary"
android:title="@string/cards_passes_sentence"
diff --git a/res/xml/power_usage_summary.xml b/res/xml/power_usage_summary.xml
index 005ce17..571b6e5 100644
--- a/res/xml/power_usage_summary.xml
+++ b/res/xml/power_usage_summary.xml
@@ -16,6 +16,7 @@
<PreferenceScreen
xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:lineage="http://schemas.android.com/apk/res/lineageos.platform"
xmlns:settings="http://schemas.android.com/apk/res-auto"
android:key="power_usage_summary_screen"
android:title="@string/power_usage_summary_title"
@@ -25,8 +26,7 @@
android:key="battery_header"
android:title="@string/summary_placeholder"
android:selectable="false"
- android:layout="@layout/battery_header"
- settings:controller="com.android.settings.fuelgauge.BatteryHeaderPreferenceController" />
+ android:layout="@layout/battery_header" />
<com.android.settings.widget.CardPreference
android:key="battery_tip"
@@ -42,9 +42,20 @@
<Preference
android:fragment="com.android.settings.fuelgauge.SmartBatterySettings"
android:key="smart_battery_manager"
- android:title="@string/smart_battery_manager_title"
+ android:title="@string/smart_battery_manager_title_custom"
settings:controller="com.android.settings.fuelgauge.batterytip.BatteryManagerPreferenceController" />
+ <!-- Battery light -->
+ <org.lineageos.internal.lineageparts.LineagePartsPreference
+ android:key="battery_lights"
+ lineage:requiresConfig="@*lineageos.platform:integer/config_deviceLightCapabilities"
+ lineage:requiresConfigMask="64" />
+
+ <!-- Custom perf profiles settings -->
+ <org.lineageos.internal.lineageparts.LineagePartsPreference
+ android:key="perf_profile_settings"
+ lineage:replacesKey="battery_saver_summary" />
+
<SwitchPreference
android:key="battery_percentage"
android:title="@string/battery_percentage"
diff --git a/res/xml/prevent_ringing_gesture_settings.xml b/res/xml/prevent_ringing_gesture_settings.xml
index cc2f234..67a9c9b 100644
--- a/res/xml/prevent_ringing_gesture_settings.xml
+++ b/res/xml/prevent_ringing_gesture_settings.xml
@@ -23,7 +23,8 @@
<com.android.settings.widget.VideoPreference
android:key="gesture_prevent_ringing_video"
app:animation="@raw/gesture_prevent_ringing"
- app:preview="@drawable/gesture_prevent_ringing" />
+ app:preview="@drawable/gesture_prevent_ringing"
+ app:controller="com.android.settings.widget.VideoPreferenceController" />
<com.android.settingslib.widget.LayoutPreference
android:key="gesture_prevent_ringing_switch"
diff --git a/res/xml/privacy_dashboard_settings.xml b/res/xml/privacy_dashboard_settings.xml
index c18a236..d47fd9a 100644
--- a/res/xml/privacy_dashboard_settings.xml
+++ b/res/xml/privacy_dashboard_settings.xml
@@ -20,8 +20,18 @@
xmlns:settings="http://schemas.android.com/apk/res-auto"
android:key="privacy_dashboard_page"
android:title="@string/privacy_dashboard_title"
- settings:initialExpandedChildrenCount="4">
+ settings:initialExpandedChildrenCount="10">
+ <Preference
+ android:key="privacy_animation"
+ android:layout="@layout/privacy_animation" />
+
+ <!-- This preference isn't searchable, and user won't see title in this preference.
+ So, we just set empty text for title. -->
+ <com.android.settingslib.widget.BarChartPreference
+ android:key="permission_bar_chart"
+ android:title="@string/summary_placeholder"
+ settings:controller="com.android.settings.privacy.PermissionBarChartPreferenceController"/>
<!-- Work Policy info -->
<Preference
diff --git a/res/xml/screen_lock_settings.xml b/res/xml/screen_lock_settings.xml
index dd4ac34..7feea02 100644
--- a/res/xml/screen_lock_settings.xml
+++ b/res/xml/screen_lock_settings.xml
@@ -27,6 +27,14 @@
android:key="visiblepattern"
android:title="@string/lockpattern_settings_enable_visible_pattern_title" />
+ <SwitchPreference
+ android:key="visible_error_pattern"
+ android:title="@string/lockpattern_settings_enable_error_path_title"/>
+
+ <SwitchPreference
+ android:key="visibledots"
+ android:title="@string/lockpattern_settings_enable_dots_title"/>
+
<!-- available in pin/pattern/password -->
<com.android.settings.display.TimeoutListPreference
android:key="lock_after_timeout"
@@ -40,4 +48,10 @@
android:key="power_button_instantly_locks"
android:title="@string/lockpattern_settings_enable_power_button_instantly_locks" />
+ <!-- Lineage additions, available in pin/pattern/password/slide -->
+ <SwitchPreference
+ android:key="lockscreen_scramble_pin_layout"
+ android:title="@string/unlock_scramble_pin_layout_title"
+ android:summary="@string/unlock_scramble_pin_layout_summary" />
+
</PreferenceScreen>
diff --git a/res/xml/security_dashboard_settings.xml b/res/xml/security_dashboard_settings.xml
index b5dcebf..1d7ba72 100644
--- a/res/xml/security_dashboard_settings.xml
+++ b/res/xml/security_dashboard_settings.xml
@@ -22,6 +22,11 @@
android:title="@string/security_settings_title"
settings:initialExpandedChildrenCount="9">
+ <Preference
+ android:key="security_animation"
+ android:layout="@layout/security_animation"
+ android:order="-20" />
+
<!-- security_settings_status.xml -->
<PreferenceCategory
android:order="-10"
@@ -114,6 +119,11 @@
</PreferenceCategory>
+ <PreferenceCategory
+ android:title="@string/security_passwords_title"
+ android:key="security_settings_misc_category"
+ android:order="30">
+
<Preference
android:order="50"
android:key="sim_lock_settings"
@@ -155,4 +165,6 @@
android:summary="@string/confirm_sim_deletion_description"
settings:controller="com.android.settings.security.ConfirmSimDeletionPreferenceController"/>
-</PreferenceScreen>
\ No newline at end of file
+ </PreferenceCategory>
+
+</PreferenceScreen>
diff --git a/res/xml/security_lockscreen_settings.xml b/res/xml/security_lockscreen_settings.xml
index 8962fc2..7cc097e 100644
--- a/res/xml/security_lockscreen_settings.xml
+++ b/res/xml/security_lockscreen_settings.xml
@@ -16,6 +16,7 @@
<PreferenceScreen
xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:lineage="http://schemas.android.com/apk/res/lineageos.platform"
xmlns:settings="http://schemas.android.com/apk/res-auto"
android:title="@string/lockscreen_settings_title">
@@ -45,11 +46,21 @@
android:title="@string/owner_info_settings_title"
android:summary="@string/owner_info_settings_summary" />
- <SwitchPreference
+ <lineageos.preference.LineageSecureSettingSwitchPreference
+ android:key="lockscreen_media_metadata"
+ android:title="@string/lockscreen_media_art_title"
+ android:defaultValue="false" />
+
+ <lineageos.preference.LineageSecureSettingSwitchPreference
+ android:key="lockscreen_visualizer"
+ android:title="@string/lockscreen_visualizer_title"
+ android:defaultValue="false" />
+
+ <!--SwitchPreference
android:key="security_setting_lockdown_enabled"
android:title="@string/lockdown_settings_title"
android:summary="@string/lockdown_settings_summary"
- settings:controller="com.android.settings.security.LockdownButtonPreferenceController" />
+ settings:controller="com.android.settings.security.LockdownButtonPreferenceController" /-->
</PreferenceCategory>
@@ -92,6 +103,13 @@
android:summary="@string/doze_summary"
settings:controller="com.android.settings.display.AmbientDisplayNotificationsPreferenceController" />
+ <lineageos.preference.RemotePreference
+ android:key="doze_device_settings"
+ android:title="@string/ambient_display_screen_title"
+ lineage:replacesKey="ambient_display_always_on|ambient_display_notification">
+ <intent android:action="org.lineageos.settings.device.DOZE_SETTINGS" />
+ </lineageos.preference.RemotePreference>
+
</PreferenceCategory>
<!-- Work profile settings are at the bottom with high order value to avoid users thinking that
diff --git a/res/xml/security_settings_pattern_size.xml b/res/xml/security_settings_pattern_size.xml
new file mode 100644
index 0000000..bb0cb23
--- /dev/null
+++ b/res/xml/security_settings_pattern_size.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2012-2013 The CyanogenMod Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<PreferenceScreen
+ xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <Preference
+ android:icon="@drawable/ic_security_pattern_3x3"
+ android:key="lock_pattern_size_3"
+ android:title="@string/lock_pattern_size_3"
+ android:persistent="false"/>
+
+ <Preference
+ android:icon="@drawable/ic_security_pattern_4x4"
+ android:key="lock_pattern_size_4"
+ android:title="@string/lock_pattern_size_4"
+ android:persistent="false"/>
+
+ <Preference
+ android:icon="@drawable/ic_security_pattern_5x5"
+ android:key="lock_pattern_size_5"
+ android:title="@string/lock_pattern_size_5"
+ android:persistent="false"/>
+
+ <Preference
+ android:icon="@drawable/ic_security_pattern_6x6"
+ android:key="lock_pattern_size_6"
+ android:title="@string/lock_pattern_size_6"
+ android:persistent="false"/>
+
+</PreferenceScreen>
diff --git a/res/xml/smart_battery_detail.xml b/res/xml/smart_battery_detail.xml
index 87eeb86..7fd4102 100644
--- a/res/xml/smart_battery_detail.xml
+++ b/res/xml/smart_battery_detail.xml
@@ -19,7 +19,7 @@
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:settings="http://schemas.android.com/apk/res-auto"
android:key="smart_battery_detail"
- android:title="@string/smart_battery_manager_title"
+ android:title="@string/smart_battery_manager_title_custom"
settings:searchable="false">
<com.android.settings.widget.VideoPreference
@@ -31,7 +31,7 @@
<SwitchPreference
android:key="smart_battery"
- android:title="@string/smart_battery_title"
+ android:title="@string/smart_battery_title_custom"
android:summary="@string/smart_battery_summary"
settings:controller="com.android.settings.fuelgauge.SmartBatteryPreferenceController"
settings:allowDividerAbove="true"/>
diff --git a/res/xml/sound_settings.xml b/res/xml/sound_settings.xml
index fc5c3e2..07a12af 100644
--- a/res/xml/sound_settings.xml
+++ b/res/xml/sound_settings.xml
@@ -20,7 +20,17 @@
android:title="@string/sound_settings"
android:key="sound_settings"
settings:keywords="@string/keywords_sounds"
- settings:initialExpandedChildrenCount="9">
+ settings:initialExpandedChildrenCount="18">
+
+ <Preference
+ android:key="sound_animation"
+ android:layout="@layout/sound_animation"
+ android:order="-999"/>
+
+ <PreferenceCategory
+ android:key="volume_adjustment_category"
+ android:title="@string/volume_adjustment_category_title"
+ android:order="100">
<!-- Remote volume group -->
<PreferenceCategory
@@ -68,7 +78,7 @@
<!-- Ring volume -->
<com.android.settings.notification.VolumeSeekBarPreference
android:key="ring_volume"
- android:icon="@drawable/ic_notifications"
+ android:icon="@drawable/ic_audio_ring"
android:title="@string/ring_volume_option_title"
android:order="-160"
settings:controller="com.android.settings.notification.RingVolumePreferenceController"/>
@@ -90,16 +100,14 @@
android:order="-140"
settings:controller="com.android.settings.notification.NotificationVolumePreferenceController"/>
- <!-- Also vibrate for calls -->
- <Preference
- android:fragment="com.android.settings.sound.VibrateForCallsPreferenceFragment"
- android:key="vibrate_for_calls"
- android:title="@string/vibrate_when_ringing_title"
- android:order="-130"
- settings:controller="com.android.settings.sound.VibrateForCallsPreferenceController"
- settings:keywords="@string/keywords_vibrate_for_calls"/>
+ </PreferenceCategory>
<!-- Interruptions -->
+ <PreferenceCategory
+ android:key="do_not_disturb_category_title"
+ android:title="@string/do_not_disturb_category_title"
+ android:order="200">
+
<com.android.settingslib.RestrictedPreference
android:key="zen_mode"
android:title="@string/zen_mode_settings_title"
@@ -111,6 +119,52 @@
settings:controller="com.android.settings.notification.zen.ZenModePreferenceController"/>
<Preference
+ android:key="gesture_prevent_ringing_sound"
+ android:title="@string/gesture_prevent_ringing_sound_title"
+ android:order="-107"
+ android:fragment="com.android.settings.gestures.PreventRingingGestureSettings"
+ settings:controller="com.android.settings.gestures.PreventRingingParentPreferenceController"/>
+
+ </PreferenceCategory>
+
+ <PreferenceCategory
+ android:key="sound_effects_category"
+ android:title="@string/sound_effects_category_title"
+ android:order="300">
+
+ <!-- Link ringtone and notification volumes -->
+ <lineageos.preference.SecureSettingSwitchPreference
+ android:key="volume_link_notification"
+ android:title="@string/volume_link_notification_title"
+ android:defaultValue="true"
+ android:order="-138"
+ settings:controller="com.android.settings.notification.LinkedVolumesPreferenceController"/>
+
+ <!-- Increasing ring -->
+ <lineageos.preference.LineageSystemSettingSwitchPreference
+ android:key="increasing_ring"
+ android:title="@string/increasing_ring_volume_option_title"
+ android:order="-136"
+ settings:controller="com.android.settings.notification.IncreasingRingPreferenceController" />
+
+ <!-- Increasing ring volume -->
+ <com.android.settings.notification.IncreasingRingVolumePreference
+ android:key="increasing_ring_volume"
+ android:icon="@drawable/ring_notif_increasing"
+ android:dependency="increasing_ring"
+ android:order="-135"
+ settings:controller="com.android.settings.notification.IncreasingRingVolumePreferenceController" />
+
+ <!-- Also vibrate for calls -->
+ <Preference
+ android:fragment="com.android.settings.sound.VibrateForCallsPreferenceFragment"
+ android:key="vibrate_for_calls"
+ android:title="@string/vibrate_when_ringing_title"
+ android:order="-130"
+ settings:controller="com.android.settings.sound.VibrateForCallsPreferenceController"
+ settings:keywords="@string/keywords_vibrate_for_calls"/>
+
+ <Preference
android:key="media_controls_summary"
android:title="@string/media_controls_title"
android:fragment="com.android.settings.sound.MediaControlsSettings"
@@ -118,12 +172,12 @@
settings:controller="com.android.settings.sound.MediaControlsParentPreferenceController"
settings:keywords="@string/keywords_media_controls"/>
- <Preference
- android:key="gesture_prevent_ringing_sound"
- android:title="@string/gesture_prevent_ringing_sound_title"
- android:order="-107"
- android:fragment="com.android.settings.gestures.PreventRingingGestureSettings"
- settings:controller="com.android.settings.gestures.PreventRingingParentPreferenceController"/>
+ </PreferenceCategory>
+
+ <PreferenceCategory
+ android:key="ringtone_category"
+ android:title="@string/ringtone_category_title"
+ android:order="400">
<!-- Phone ringtone -->
<com.android.settings.DefaultRingtonePreference
@@ -154,11 +208,13 @@
android:ringtoneType="alarm"
android:order="-80"/>
+ </PreferenceCategory>
+
<!-- Other sounds -->
<PreferenceCategory
android:key="other_sounds_and_vibrations_category"
android:title="@string/other_sound_category_preference_title"
- android:order="-50">
+ android:order="500">
<!-- Dial pad tones -->
<SwitchPreference
diff --git a/res/xml/storage_dashboard_fragment.xml b/res/xml/storage_dashboard_fragment.xml
index 91634fc..9f80a91 100644
--- a/res/xml/storage_dashboard_fragment.xml
+++ b/res/xml/storage_dashboard_fragment.xml
@@ -19,6 +19,7 @@
xmlns:settings="http://schemas.android.com/apk/res-auto"
android:title="@string/storage_settings"
android:orderingFromXml="false">
+
<com.android.settings.deviceinfo.storage.StorageSummaryDonutPreference
android:key="storage_summary"
android:order="0"
@@ -74,4 +75,4 @@
android:key="pref_secondary_users"
android:title="@string/storage_other_users"
android:order="200" />
-</PreferenceScreen>
\ No newline at end of file
+</PreferenceScreen>
diff --git a/res/xml/swipe_to_notification_settings.xml b/res/xml/swipe_to_notification_settings.xml
index b126170..15d9eaf 100644
--- a/res/xml/swipe_to_notification_settings.xml
+++ b/res/xml/swipe_to_notification_settings.xml
@@ -23,7 +23,8 @@
<com.android.settings.widget.VideoPreference
android:key="gesture_swipe_down_fingerprint_video"
app:animation="@raw/gesture_fingerprint_swipe"
- app:preview="@drawable/gesture_fingerprint_swipe" />
+ app:preview="@drawable/gesture_fingerprint_swipe"
+ app:controller="com.android.settings.widget.VideoPreferenceController" />
<SwitchPreference
android:key="gesture_swipe_down_fingerprint"
diff --git a/res/xml/system_dashboard_fragment.xml b/res/xml/system_dashboard_fragment.xml
index 88b8d2f..a5f2a26 100644
--- a/res/xml/system_dashboard_fragment.xml
+++ b/res/xml/system_dashboard_fragment.xml
@@ -21,6 +21,12 @@
android:title="@string/header_category_system"
settings:initialExpandedChildrenCount="4">
+ <!-- bliss Logo Header -->
+ <Preference
+ android:key="bliss_logo"
+ android:order="-500"
+ android:layout="@layout/system_animation" />
+
<Preference
android:key="language_input_settings"
android:title="@string/language_settings"
@@ -76,4 +82,4 @@
android:targetClass="@string/additional_system_update_menu"/>
</Preference>
-</PreferenceScreen>
\ No newline at end of file
+</PreferenceScreen>
diff --git a/res/xml/tap_screen_gesture_settings.xml b/res/xml/tap_screen_gesture_settings.xml
index fe31225..3d78b03 100644
--- a/res/xml/tap_screen_gesture_settings.xml
+++ b/res/xml/tap_screen_gesture_settings.xml
@@ -23,7 +23,8 @@
<com.android.settings.widget.VideoPreference
android:key="gesture_tap_screen_video"
app:animation="@raw/gesture_ambient_tap_screen"
- app:preview="@drawable/gesture_ambient_tap_screen" />
+ app:preview="@drawable/gesture_ambient_tap_screen"
+ app:controller="com.android.settings.widget.VideoPreferenceController" />
<SwitchPreference
android:key="gesture_tap"
diff --git a/res/xml/tether_prefs.xml b/res/xml/tether_prefs.xml
index 9367a9b..aebc9d0 100644
--- a/res/xml/tether_prefs.xml
+++ b/res/xml/tether_prefs.xml
@@ -44,6 +44,12 @@
android:summary="@string/ethernet_tethering_subtext"
settings:keywords="@string/keywords_hotspot_tethering" />
+ <lineageos.preference.LineageSecureSettingSwitchPreference
+ android:key="tethering_allow_vpn_upstreams"
+ android:title="@string/tethering_allow_vpn_upstreams_title"
+ android:summary="@string/tethering_allow_vpn_upstreams_summary"
+ android:defaultValue="false" />
+
<Preference
android:key="disabled_on_data_saver"
android:summary="@string/tether_settings_disabled_on_data_saver"
diff --git a/res/xml/top_level_settings.xml b/res/xml/top_level_settings.xml
index 367f426..52a334e 100644
--- a/res/xml/top_level_settings.xml
+++ b/res/xml/top_level_settings.xml
@@ -39,6 +39,14 @@
settings:controller="com.android.settings.connecteddevice.TopLevelConnectedDevicesPreferenceController"/>
<Preference
+ android:key="top_level_blissify_settings"
+ android:title="@string/blissify_settings_title"
+ android:summary="@string/blissify_settings_summary"
+ android:icon="@drawable/ic_homepage_blissify"
+ android:order="-105"
+ android:fragment="com.blissroms.blissify.Blissify"/>
+
+ <Preference
android:key="top_level_apps_and_notifs"
android:title="@string/app_and_notification_dashboard_title"
android:summary="@string/app_and_notification_dashboard_summary"
diff --git a/src/com/android/settings/CryptKeeper.java b/src/com/android/settings/CryptKeeper.java
index 7e75ee2..839e3de 100644
--- a/src/com/android/settings/CryptKeeper.java
+++ b/src/com/android/settings/CryptKeeper.java
@@ -66,6 +66,7 @@
import com.android.internal.widget.LockPatternView.Cell;
import com.android.internal.widget.LockPatternView.DisplayMode;
+import java.util.ArrayList;
import java.util.List;
/**
@@ -82,7 +83,7 @@
* </pre>
*/
public class CryptKeeper extends Activity implements TextView.OnEditorActionListener,
- OnKeyListener, OnTouchListener, TextWatcher {
+ OnKeyListener, OnTouchListener, TextWatcher, OnClickListener {
private static final String TAG = "CryptKeeper";
private static final String DECRYPT_STATE = "trigger_restart_framework";
@@ -123,6 +124,15 @@
PowerManager.WakeLock mWakeLock;
private ImeAwareEditText mPasswordEntry;
private LockPatternView mLockPatternView;
+ private TextView mStatusText;
+ private List<Button> mLockPatternButtons = new ArrayList<>();
+ private static final int[] LOCK_BUTTON_IDS = new int[] {
+ R.id.lock_pattern_size_3,
+ R.id.lock_pattern_size_4,
+ R.id.lock_pattern_size_5,
+ R.id.lock_pattern_size_6
+ };
+
/** Number of calls to {@link #notifyUser()} to ignore before notifying. */
private int mNotificationCountdown = 0;
/** Number of calls to {@link #notifyUser()} before we release the wakelock */
@@ -176,6 +186,9 @@
@Override
protected void onPreExecute() {
super.onPreExecute();
+ if (mLockPatternView != null) {
+ mLockPatternView.removeCallbacks(mFakeUnlockAttemptRunnable);
+ }
beginAttempt();
}
@@ -199,13 +212,13 @@
mLockPatternView.removeCallbacks(mClearPatternRunnable);
mLockPatternView.postDelayed(mClearPatternRunnable, RIGHT_PATTERN_CLEAR_TIMEOUT_MS);
}
- final TextView status = (TextView) findViewById(R.id.status);
- status.setText(R.string.starting_android);
+ mStatusText.setText(R.string.starting_android);
hide(R.id.passwordEntry);
hide(R.id.switch_ime_button);
hide(R.id.lockPattern);
hide(R.id.owner_info);
hide(R.id.emergencyCallButton);
+ hide(R.id.pattern_sizes);
} else if (failedAttempts == MAX_FAILED_ATTEMPTS) {
// Factory reset the device.
Intent intent = new Intent(Intent.ACTION_FACTORY_RESET);
@@ -225,8 +238,7 @@
}
private void beginAttempt() {
- final TextView status = (TextView) findViewById(R.id.status);
- status.setText(R.string.checking_decryption);
+ mStatusText.setText(R.string.checking_decryption);
}
private void handleBadAttempt(Integer failedAttempts) {
@@ -242,14 +254,12 @@
// at this point.
cooldown();
} else {
- final TextView status = (TextView) findViewById(R.id.status);
-
int remainingAttempts = MAX_FAILED_ATTEMPTS - failedAttempts;
if (remainingAttempts < COOL_DOWN_ATTEMPTS) {
CharSequence warningTemplate = getText(R.string.crypt_keeper_warn_wipe);
CharSequence warning = TextUtils.expandTemplate(warningTemplate,
Integer.toString(remainingAttempts));
- status.setText(warning);
+ mStatusText.setText(warning);
} else {
int passwordType = StorageManager.CRYPT_TYPE_PASSWORD;
try {
@@ -260,17 +270,18 @@
}
if (passwordType == StorageManager.CRYPT_TYPE_PIN) {
- status.setText(R.string.cryptkeeper_wrong_pin);
+ mStatusText.setText(R.string.cryptkeeper_wrong_pin);
} else if (passwordType == StorageManager.CRYPT_TYPE_PATTERN) {
- status.setText(R.string.cryptkeeper_wrong_pattern);
+ mStatusText.setText(R.string.cryptkeeper_wrong_pattern);
} else {
- status.setText(R.string.cryptkeeper_wrong_password);
+ mStatusText.setText(R.string.cryptkeeper_wrong_password);
}
}
if (mLockPatternView != null) {
mLockPatternView.setDisplayMode(DisplayMode.Wrong);
mLockPatternView.setEnabled(true);
+ setPatternButtonsEnabled(true);
}
// Reenable the password entry
@@ -398,6 +409,13 @@
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
+ getWindow().getDecorView().setSystemUiVisibility(
+ View.SYSTEM_UI_FLAG_LAYOUT_STABLE
+ | View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
+ | View.SYSTEM_UI_FLAG_HIDE_NAVIGATION // hide nav bar
+ | View.SYSTEM_UI_FLAG_FULLSCREEN // hide status bar
+ | View.SYSTEM_UI_FLAG_IMMERSIVE);
+
// If we are not encrypted or encrypting, get out quickly.
final String state = VoldProperties.decrypt().orElse("");
if (!isDebugView() && ("".equals(state) || DECRYPT_STATE.equals(state))) {
@@ -509,8 +527,7 @@
setContentView(R.layout.crypt_keeper_password_entry);
mStatusString = R.string.enter_password;
}
- final TextView status = (TextView) findViewById(R.id.status);
- status.setText(mStatusString);
+ mStatusText.setText(mStatusString);
final TextView ownerInfo = (TextView) findViewById(R.id.owner_info);
ownerInfo.setText(owner_info);
@@ -569,6 +586,12 @@
}
}
+ @Override
+ public void setContentView(int layoutResID) {
+ super.setContentView(layoutResID);
+ mStatusText = (TextView) findViewById(R.id.status);
+ }
+
/**
* Start encrypting the device.
*/
@@ -667,9 +690,8 @@
// Will happen if no time etc - show percentage
}
- final TextView tv = (TextView) findViewById(R.id.status);
- if (tv != null) {
- tv.setText(TextUtils.expandTemplate(status, progress));
+ if (mStatusText != null) {
+ mStatusText.setText(TextUtils.expandTemplate(status, progress));
}
// Check the progress every 1 seconds
@@ -687,10 +709,10 @@
}
if (mLockPatternView != null) {
mLockPatternView.setEnabled(false);
+ setPatternButtonsEnabled(false);
}
- final TextView status = (TextView) findViewById(R.id.status);
- status.setText(R.string.crypt_keeper_force_power_cycle);
+ mStatusText.setText(R.string.crypt_keeper_force_power_cycle);
}
/**
@@ -715,18 +737,22 @@
@Override
public void onPatternStart() {
+ setPatternButtonsEnabled(false);
mLockPatternView.removeCallbacks(mClearPatternRunnable);
}
@Override
public void onPatternCleared() {
+ setPatternButtonsEnabled(true);
}
@Override
public void onPatternDetected(List<LockPatternView.Cell> pattern) {
mLockPatternView.setEnabled(false);
if (pattern.size() >= MIN_LENGTH_BEFORE_REPORT) {
- new DecryptTask().execute(new String(LockPatternUtils.patternToByteArray(pattern)));
+ byte patternSize = mLockPatternView.getLockPatternSize();
+ new DecryptTask().execute(new String(
+ LockPatternUtils.patternToByteArray(pattern, patternSize)));
} else {
// Allow user to make as many of these as they want.
fakeUnlockAttempt(mLockPatternView);
@@ -751,9 +777,17 @@
}
// Pattern case
+ mLockPatternButtons.clear();
mLockPatternView = (LockPatternView) findViewById(R.id.lockPattern);
if (mLockPatternView != null) {
mLockPatternView.setOnPatternListener(mChooseNewLockPatternListener);
+ for (int id : LOCK_BUTTON_IDS) {
+ Button btn = (Button) findViewById(id);
+ if (btn != null) {
+ btn.setOnClickListener(this);
+ mLockPatternButtons.add(btn);
+ }
+ }
}
// Disable the Emergency call button if the device has no voice telephone capability
@@ -1024,6 +1058,29 @@
return;
}
+ @Override
+ public void onClick(View v) {
+ if (mLockPatternView == null || !mLockPatternView.isEnabled()) {
+ return;
+ }
+ setContentView(R.layout.crypt_keeper_pattern_entry);
+ passwordEntryInit();
+
+ mStatusText.setText(mStatusString = R.string.enter_pattern);
+ mLockPatternView.setLockPatternSize(
+ v.getId() == R.id.lock_pattern_size_6 ? (byte) 6 :
+ v.getId() == R.id.lock_pattern_size_5 ? (byte) 5 :
+ v.getId() == R.id.lock_pattern_size_4 ? (byte) 4 :
+ (byte) 3);
+ mLockPatternView.postInvalidate();
+ }
+
+ private void setPatternButtonsEnabled(boolean enabled) {
+ for (Button btn : mLockPatternButtons) {
+ btn.setEnabled(enabled);
+ }
+ }
+
private static void disableCryptKeeperComponent(Context context) {
PackageManager pm = context.getPackageManager();
ComponentName name = new ComponentName(context, CryptKeeper.class);
diff --git a/src/com/android/settings/DisplaySettings.java b/src/com/android/settings/DisplaySettings.java
index 6b23b29..20a33f0 100644
--- a/src/com/android/settings/DisplaySettings.java
+++ b/src/com/android/settings/DisplaySettings.java
@@ -37,6 +37,8 @@
import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.search.SearchIndexable;
+import lineageos.hardware.LineageHardwareManager;
+
import java.util.ArrayList;
import java.util.List;
@@ -44,7 +46,10 @@
public class DisplaySettings extends DashboardFragment {
private static final String TAG = "DisplaySettings";
+ public static final String KEY_PROXIMITY_ON_WAKE = "proximity_on_wake";
+
private static final String KEY_SCREEN_TIMEOUT = "screen_timeout";
+ private static final String KEY_HIGH_TOUCH_SENSITIVITY = "high_touch_sensitivity_enable";
@Override
public int getMetricsCategory() {
@@ -97,6 +102,21 @@
new BaseSearchIndexProvider(R.xml.display_settings) {
@Override
+ public List<String> getNonIndexableKeys(Context context) {
+ List<String> keys = super.getNonIndexableKeys(context);
+ LineageHardwareManager hardware = LineageHardwareManager.getInstance(context);
+ if (!context.getResources().getBoolean(
+ org.lineageos.platform.internal.R.bool.config_proximityCheckOnWake)) {
+ keys.add(KEY_PROXIMITY_ON_WAKE);
+ }
+ if (!hardware.isSupported(
+ LineageHardwareManager.FEATURE_HIGH_TOUCH_SENSITIVITY)) {
+ keys.add(KEY_HIGH_TOUCH_SENSITIVITY);
+ }
+ return keys;
+ }
+
+ @Override
public List<AbstractPreferenceController> createPreferenceControllers(
Context context) {
return buildPreferenceControllers(context, null);
diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java
index 2f23c84..c544e30 100644
--- a/src/com/android/settings/Settings.java
+++ b/src/com/android/settings/Settings.java
@@ -234,6 +234,7 @@
public static class StorageDashboardActivity extends SettingsActivity {}
public static class AccountDashboardActivity extends SettingsActivity {}
public static class SystemDashboardActivity extends SettingsActivity {}
+ public static class BlissifySettingsActivity extends SettingsActivity {}
/**
* Activity for MediaControlsSettings
diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java
index 1c2952a..47bb2f8 100644
--- a/src/com/android/settings/SettingsActivity.java
+++ b/src/com/android/settings/SettingsActivity.java
@@ -492,7 +492,7 @@
@Override
public void setTaskDescription(ActivityManager.TaskDescription taskDescription) {
- taskDescription.setIcon(Icon.createWithResource(this, R.drawable.ic_launcher_settings));
+ taskDescription.setIcon(Icon.createWithResource(this, R.mipmap.ic_launcher));
super.setTaskDescription(taskDescription);
}
diff --git a/src/com/android/settings/Utils.java b/src/com/android/settings/Utils.java
index 11a5825..a7503e4 100644
--- a/src/com/android/settings/Utils.java
+++ b/src/com/android/settings/Utils.java
@@ -1170,4 +1170,11 @@
}
return isMediaOutputDisabled;
}
+
+ public static String normalizeTitleCaseIfRequired(Context context, String input) {
+ if (!context.getResources().getBoolean(R.bool.language_capitalizes_nouns)) {
+ return input.toLowerCase();
+ }
+ return input;
+ }
}
diff --git a/src/com/android/settings/accessibility/AccessibilitySettings.java b/src/com/android/settings/accessibility/AccessibilitySettings.java
index f918046..181839a 100644
--- a/src/com/android/settings/accessibility/AccessibilitySettings.java
+++ b/src/com/android/settings/accessibility/AccessibilitySettings.java
@@ -51,7 +51,6 @@
import com.android.settings.Utils;
import com.android.settings.accessibility.AccessibilityUtil.AccessibilityServiceFragmentType;
import com.android.settings.dashboard.DashboardFragment;
-import com.android.settings.display.DarkUIPreferenceController;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
import com.android.settingslib.RestrictedLockUtilsInternal;
@@ -221,7 +220,6 @@
@Override
public void onAttach(Context context) {
super.onAttach(context);
- use(DarkUIPreferenceController.class).setParentFragment(this);
use(AccessibilityHearingAidPreferenceController.class)
.setFragmentManager(getFragmentManager());
}
diff --git a/src/com/android/settings/applications/AppPermissionsPreferenceController.java b/src/com/android/settings/applications/AppPermissionsPreferenceController.java
index 4458ea4..68a97d7 100644
--- a/src/com/android/settings/applications/AppPermissionsPreferenceController.java
+++ b/src/com/android/settings/applications/AppPermissionsPreferenceController.java
@@ -23,6 +23,7 @@
import androidx.preference.Preference;
import com.android.settings.R;
+import com.android.settings.Utils;
import com.android.settings.core.BasePreferenceController;
import com.android.settingslib.applications.PermissionsSummaryHelper;
@@ -106,12 +107,12 @@
CharSequence summary;
if (!permissionsToShow.isEmpty()) {
+ final String formatted = Utils.normalizeTitleCaseIfRequired(mContext,
+ ListFormatter.getInstance().format(permissionsToShow));
if (isMoreShowed) {
- summary = mContext.getString(R.string.app_permissions_summary_more,
- ListFormatter.getInstance().format(permissionsToShow).toLowerCase());
+ summary = mContext.getString(R.string.app_permissions_summary_more, formatted);
} else {
- summary = mContext.getString(R.string.app_permissions_summary,
- ListFormatter.getInstance().format(permissionsToShow).toLowerCase());
+ summary = mContext.getString(R.string.app_permissions_summary, formatted);
}
} else {
summary = mContext.getString(
diff --git a/src/com/android/settings/applications/AppStorageSettings.java b/src/com/android/settings/applications/AppStorageSettings.java
index 8a54c73..d095e37 100644
--- a/src/com/android/settings/applications/AppStorageSettings.java
+++ b/src/com/android/settings/applications/AppStorageSettings.java
@@ -312,13 +312,9 @@
if (appHasSpaceManagementUI) {
mButtonsPref.setButton1Text(R.string.manage_space_text);
} else {
- mButtonsPref
- .setButton1Text(R.string.clear_user_data_text)
- .setButton1Icon(R.drawable.ic_settings_delete);
+ mButtonsPref.setButton1Text(R.string.clear_user_data_text);
}
- mButtonsPref
- .setButton1Text(R.string.clear_user_data_text)
- .setButton1Icon(R.drawable.ic_settings_delete)
+ mButtonsPref.setButton1Icon(R.drawable.ic_settings_delete)
.setButton1OnClickListener(v -> handleClearDataClick());
}
diff --git a/src/com/android/settings/applications/RecentAppsPreferenceController.java b/src/com/android/settings/applications/RecentAppsPreferenceController.java
index 20f9806..cbc8208 100644
--- a/src/com/android/settings/applications/RecentAppsPreferenceController.java
+++ b/src/com/android/settings/applications/RecentAppsPreferenceController.java
@@ -94,7 +94,6 @@
mRecentAppsPreference = screen.findPreference(getPreferenceKey());
final View view = mRecentAppsPreference.findViewById(R.id.app_entities_header);
mAppEntitiesController = AppEntitiesHeaderController.newInstance(mContext, view)
- .setHeaderTitleRes(R.string.recent_app_category_title)
.setHeaderDetailsClickListener((View v) -> {
mMetricsFeatureProvider.logClickedPreference(mRecentAppsPreference,
getMetricsCategory());
diff --git a/src/com/android/settings/applications/appinfo/AppInfoDashboardFragment.java b/src/com/android/settings/applications/appinfo/AppInfoDashboardFragment.java
index 7aad245..2813bd2 100755
--- a/src/com/android/settings/applications/appinfo/AppInfoDashboardFragment.java
+++ b/src/com/android/settings/applications/appinfo/AppInfoDashboardFragment.java
@@ -162,6 +162,7 @@
.setParentFragment(this);
use(AppStoragePreferenceController.class).setParentFragment(this);
use(AppVersionPreferenceController.class).setParentFragment(this);
+ use(AppPackageNamePreferenceController.class).setParentFragment(this);
use(InstantAppDomainsPreferenceController.class).setParentFragment(this);
final WriteSystemSettingsPreferenceController writeSystemSettings =
diff --git a/src/com/android/settings/applications/appinfo/AppPackageNamePreferenceController.java b/src/com/android/settings/applications/appinfo/AppPackageNamePreferenceController.java
new file mode 100644
index 0000000..bd4f12f
--- /dev/null
+++ b/src/com/android/settings/applications/appinfo/AppPackageNamePreferenceController.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 2018 The LineageOS Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.applications.appinfo;
+
+import android.content.Context;
+
+public class AppPackageNamePreferenceController extends AppInfoPreferenceControllerBase {
+
+ public AppPackageNamePreferenceController(Context context, String key) {
+ super(context, key);
+ }
+
+ @Override
+ public CharSequence getSummary() {
+ return mParent.getPackageInfo().packageName;
+ }
+}
diff --git a/src/com/android/settings/applications/manageapplications/ManageApplications.java b/src/com/android/settings/applications/manageapplications/ManageApplications.java
index b46e11c..8bac11a 100644
--- a/src/com/android/settings/applications/manageapplications/ManageApplications.java
+++ b/src/com/android/settings/applications/manageapplications/ManageApplications.java
@@ -747,9 +747,11 @@
}
mOptionsMenu.findItem(R.id.advanced).setVisible(false);
- mOptionsMenu.findItem(R.id.sort_order_alpha).setVisible(mListType == LIST_TYPE_STORAGE
+ mOptionsMenu.findItem(R.id.sort_order_alpha).setVisible(
+ (mListType == LIST_TYPE_STORAGE || mListType == LIST_TYPE_MAIN)
&& mSortOrder != R.id.sort_order_alpha);
- mOptionsMenu.findItem(R.id.sort_order_size).setVisible(mListType == LIST_TYPE_STORAGE
+ mOptionsMenu.findItem(R.id.sort_order_size).setVisible(
+ (mListType == LIST_TYPE_STORAGE || mListType == LIST_TYPE_MAIN)
&& mSortOrder != R.id.sort_order_size);
mOptionsMenu.findItem(R.id.show_system).setVisible(!mShowSystem
diff --git a/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminAdd.java b/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminAdd.java
index 9afb2b4..7c8b96f 100644
--- a/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminAdd.java
+++ b/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminAdd.java
@@ -288,7 +288,7 @@
// setup.
final String supervisor = getString(
com.android.internal.R.string.config_defaultSupervisionProfileOwnerComponent);
- if (supervisor == null) {
+ if (TextUtils.isEmpty(supervisor)) {
Log.w(TAG, "Unable to set profile owner post-setup, no default supervisor"
+ "profile owner defined");
finish();
@@ -297,7 +297,7 @@
final ComponentName supervisorComponent = ComponentName.unflattenFromString(
supervisor);
- if (who.compareTo(supervisorComponent) != 0) {
+ if (supervisorComponent == null || who.compareTo(supervisorComponent) != 0) {
Log.w(TAG, "Unable to set non-default profile owner post-setup " + who);
finish();
return;
diff --git a/src/com/android/settings/backup/BackupSettingsFragment.java b/src/com/android/settings/backup/BackupSettingsFragment.java
index 7df19f5..7fcbd63 100644
--- a/src/com/android/settings/backup/BackupSettingsFragment.java
+++ b/src/com/android/settings/backup/BackupSettingsFragment.java
@@ -42,6 +42,13 @@
super.onCreate(savedInstanceState);
}
+ @Override
+ public void onStart() {
+ super.onStart();
+ // update information when we navigate back from TransportActivity
+ displayResourceTilesToScreen(getPreferenceScreen());
+ }
+
/**
* Get the tag string for logging.
*/
diff --git a/src/com/android/settings/backup/BackupSettingsPreferenceController.java b/src/com/android/settings/backup/BackupSettingsPreferenceController.java
index 4e0e3b4..3208ae4 100644
--- a/src/com/android/settings/backup/BackupSettingsPreferenceController.java
+++ b/src/com/android/settings/backup/BackupSettingsPreferenceController.java
@@ -30,24 +30,24 @@
implements PreferenceControllerMixin {
private static final String BACKUP_SETTINGS = "backup_settings";
private static final String MANUFACTURER_SETTINGS = "manufacturer_backup";
- private Intent mBackupSettingsIntent;
- private CharSequence mBackupSettingsTitle;
- private String mBackupSettingsSummary;
+ private final BackupSettingsHelper settingsHelper;
private Intent mManufacturerIntent;
private String mManufacturerLabel;
public BackupSettingsPreferenceController(Context context) {
super(context);
- BackupSettingsHelper settingsHelper = new BackupSettingsHelper(context);
- mBackupSettingsIntent = settingsHelper.getIntentForBackupSettings();
- mBackupSettingsTitle = settingsHelper.getLabelForBackupSettings();
- mBackupSettingsSummary = settingsHelper.getSummaryForBackupSettings();
+ settingsHelper = new BackupSettingsHelper(context);
mManufacturerIntent = settingsHelper.getIntentProvidedByManufacturer();
mManufacturerLabel = settingsHelper.getLabelProvidedByManufacturer();
}
@Override
public void displayPreference(PreferenceScreen screen) {
+ // we don't get these in the constructor, so we can get updates for them later
+ Intent mBackupSettingsIntent = settingsHelper.getIntentForBackupSettings();
+ CharSequence mBackupSettingsTitle = settingsHelper.getLabelForBackupSettings();
+ String mBackupSettingsSummary = settingsHelper.getSummaryForBackupSettings();
+
Preference backupSettings = screen.findPreference(BACKUP_SETTINGS);
Preference manufacturerSettings = screen.findPreference(MANUFACTURER_SETTINGS);
backupSettings.setIntent(mBackupSettingsIntent);
diff --git a/src/com/android/settings/backup/transport/Transport.java b/src/com/android/settings/backup/transport/Transport.java
new file mode 100644
index 0000000..d2fd6e0
--- /dev/null
+++ b/src/com/android/settings/backup/transport/Transport.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C) 2020 The Calyx Institute
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.settings.backup.transport;
+
+class Transport {
+ final String name;
+ final CharSequence dataManagementLabel;
+ final CharSequence destinationString;
+
+ Transport(String name, CharSequence dataManagementLabel, CharSequence destinationString) {
+ this.name = name;
+ this.dataManagementLabel = dataManagementLabel;
+ this.destinationString = destinationString;
+ }
+}
diff --git a/src/com/android/settings/backup/transport/TransportActivity.java b/src/com/android/settings/backup/transport/TransportActivity.java
new file mode 100644
index 0000000..1adcb90
--- /dev/null
+++ b/src/com/android/settings/backup/transport/TransportActivity.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2020 The Calyx Institute
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.settings.backup.transport;
+
+import android.os.Bundle;
+import androidx.fragment.app.FragmentActivity;
+
+/**
+ * Activity to allow the user to choose the {@link android.app.backup.BackupTransport}.
+ *
+ * Set {@code config_backup_settings_intent} to {@code settings://com.android.settings.backup.transport} to activate.
+ * Don't forget to also set {@code config_backup_settings_label} or else it won't be shown.
+ */
+public class TransportActivity extends FragmentActivity {
+
+ @Override
+ public void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+
+ getSupportFragmentManager().beginTransaction()
+ .replace(android.R.id.content, new TransportFragment())
+ .commit();
+ }
+
+}
diff --git a/src/com/android/settings/backup/transport/TransportFragment.java b/src/com/android/settings/backup/transport/TransportFragment.java
new file mode 100644
index 0000000..6c6a8ce
--- /dev/null
+++ b/src/com/android/settings/backup/transport/TransportFragment.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright (C) 2020 The Calyx Institute
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.settings.backup.transport;
+
+import android.app.settings.SettingsEnums;
+import android.content.Context;
+import com.android.settings.R;
+import com.android.settings.backup.transport.TransportPreferenceController.OnTransportChangedListener;
+import com.android.settings.dashboard.DashboardFragment;
+import com.android.settingslib.core.AbstractPreferenceController;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class TransportFragment extends DashboardFragment implements OnTransportChangedListener {
+
+ private static final String TAG = "TransportFragment";
+
+ /**
+ * Get the tag string for logging.
+ */
+ @Override
+ protected String getLogTag() {
+ return TAG;
+ }
+
+ /**
+ * Get the res id for static preference xml for this fragment.
+ */
+ @Override
+ protected int getPreferenceScreenResId() {
+ return R.xml.backup_transport_settings;
+ }
+
+ /**
+ * Get a list of {@link AbstractPreferenceController} for this fragment.
+ */
+ @Override
+ protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
+ final List<AbstractPreferenceController> controllers = new ArrayList<>();
+ controllers.add(new TransportPreferenceController(context, this));
+ return controllers;
+ }
+
+ @Override
+ public int getMetricsCategory() {
+ return SettingsEnums.BACKUP_SETTINGS;
+ }
+
+ @Override
+ public void onTransportChanged(String transportName) {
+ requireActivity().finish();
+ }
+
+}
diff --git a/src/com/android/settings/backup/transport/TransportHelper.java b/src/com/android/settings/backup/transport/TransportHelper.java
new file mode 100644
index 0000000..1ab5a59
--- /dev/null
+++ b/src/com/android/settings/backup/transport/TransportHelper.java
@@ -0,0 +1,116 @@
+/*
+ * Copyright (C) 2020 The Calyx Institute
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.settings.backup.transport;
+
+import android.app.backup.IBackupManager;
+import android.content.Context;
+import android.os.RemoteException;
+import android.os.ServiceManager;
+import android.os.UserHandle;
+import android.util.Log;
+import androidx.annotation.Nullable;
+
+import com.android.settings.R;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * Helper class for {@link TransportActivity} that interacts with {@link IBackupManager}.
+ */
+class TransportHelper {
+ private static final String TAG = "TransportHelper";
+
+ private final IBackupManager mBackupManager = IBackupManager.Stub.asInterface(
+ ServiceManager.getService(Context.BACKUP_SERVICE));
+
+ private Context mContext;
+
+ TransportHelper(Context context) {
+ mContext = context;
+ }
+
+ List<Transport> getTransports() {
+ String[] backupTransports = getBackupTransports();
+ if (backupTransports == null) return Collections.emptyList();
+ ArrayList<Transport> transports = new ArrayList<>(backupTransports.length);
+ String[] ignoredTransports = mContext.getResources().getStringArray(
+ R.array.config_ignored_backup_transports);
+ for (String name : getBackupTransports()) {
+ boolean ignored = false;
+ for (String ignoredTransport : ignoredTransports) {
+ if (name.equals(ignoredTransport)) ignored = true;
+ }
+ if (ignored) continue;
+ CharSequence label = getLabelFromBackupTransport(name);
+ if (label == null || label.length() == 0) label = name;
+ Transport transport = new Transport(name, label, getSummaryFromBackupTransport(name));
+ transports.add(transport);
+ }
+ return transports;
+ }
+
+ void selectTransport(String name) {
+ try {
+ mBackupManager.selectBackupTransport(name);
+ } catch (RemoteException e) {
+ Log.e(TAG, "Error selecting transport: " + name, e);
+ }
+ }
+
+ @Nullable
+ private String[] getBackupTransports() {
+ try {
+ String[] transports = mBackupManager.listAllTransports();
+ if (Log.isLoggable(TAG, Log.DEBUG)) {
+ Log.d(TAG, "Received all backup transports: " + Arrays.toString(transports));
+ }
+ return transports;
+ } catch (RemoteException e) {
+ Log.e(TAG, "Error getting all backup transports", e);
+ }
+ return null;
+ }
+
+ private CharSequence getLabelFromBackupTransport(String transport) {
+ try {
+ CharSequence label = mBackupManager.getDataManagementLabelForUser(UserHandle.myUserId(), transport);
+ if (Log.isLoggable(TAG, Log.DEBUG)) {
+ Log.d(TAG, "Received the backup settings label from " + transport + ": " + label);
+ }
+ return label;
+ } catch (RemoteException e) {
+ Log.e(TAG, "Error getting data management label for " + transport, e);
+ }
+ return null;
+ }
+
+ private String getSummaryFromBackupTransport(String transport) {
+ try {
+ String summary = mBackupManager.getDestinationString(transport);
+ if (Log.isLoggable(TAG, Log.DEBUG)) {
+ Log.d(TAG, "Received the backup settings summary from " + transport + ": " + summary);
+ }
+ return summary;
+ } catch (RemoteException e) {
+ Log.e(TAG, "Error getting data management summary", e);
+ }
+ return null;
+ }
+}
diff --git a/src/com/android/settings/backup/transport/TransportPreferenceController.java b/src/com/android/settings/backup/transport/TransportPreferenceController.java
new file mode 100644
index 0000000..1dc5a51
--- /dev/null
+++ b/src/com/android/settings/backup/transport/TransportPreferenceController.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright (C) 2020 The Calyx Institute
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.settings.backup.transport;
+
+import android.content.Context;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+import com.android.settingslib.core.AbstractPreferenceController;
+
+public class TransportPreferenceController extends AbstractPreferenceController {
+
+ interface OnTransportChangedListener {
+ void onTransportChanged(String transportName);
+ }
+
+ private final OnTransportChangedListener listener;
+ private final TransportHelper transportHelper;
+
+ public TransportPreferenceController(Context context, OnTransportChangedListener listener) {
+ super(context);
+ this.listener = listener;
+ transportHelper = new TransportHelper(context);
+ }
+
+ @Override
+ public void displayPreference(PreferenceScreen screen) {
+ for (Transport transport : transportHelper.getTransports()) {
+ screen.addPreference(getPreferenceForTransport(transport));
+ }
+ }
+
+ private Preference getPreferenceForTransport(Transport transport) {
+ Preference p = new Preference(mContext);
+ p.setTitle(transport.dataManagementLabel);
+ p.setSummary(transport.destinationString);
+ p.setIconSpaceReserved(false);
+ p.setOnPreferenceClickListener(preference -> {
+ transportHelper.selectTransport(transport.name);
+ listener.onTransportChanged(transport.name);
+ return true;
+ });
+ return p;
+ }
+
+ /**
+ * Returns true if preference is available (should be displayed)
+ */
+ @Override
+ public boolean isAvailable() {
+ return true;
+ }
+
+ /**
+ * Returns the key for this preference.
+ */
+ @Override
+ public String getPreferenceKey() {
+ return null;
+ }
+}
diff --git a/src/com/android/settings/biometrics/face/FaceEnrollIntroduction.java b/src/com/android/settings/biometrics/face/FaceEnrollIntroduction.java
index 6709a6a..f876bb4 100644
--- a/src/com/android/settings/biometrics/face/FaceEnrollIntroduction.java
+++ b/src/com/android/settings/biometrics/face/FaceEnrollIntroduction.java
@@ -94,7 +94,7 @@
final TextView footer2 = findViewById(R.id.face_enroll_introduction_footer_part_2);
final int footer2TextResource =
mFaceFeatureProvider.isAttentionSupported(getApplicationContext())
- ? R.string.security_settings_face_enroll_introduction_footer_part_2
+ ? R.string.aosp_security_settings_face_enroll_introduction_footer_part_2
: R.string.security_settings_face_settings_footer_attention_not_supported;
footer2.setText(footer2TextResource);
}
diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java
index dbedb4a..36a3e41 100644
--- a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java
@@ -21,6 +21,7 @@
import android.hardware.fingerprint.FingerprintManager;
import android.os.Bundle;
import android.view.View;
+import android.widget.TextView;
import androidx.annotation.Nullable;
@@ -38,6 +39,11 @@
*/
public class FingerprintEnrollFindSensor extends BiometricEnrollBase {
+ private static final int SENSOR_LOCATION_BACK = 0;
+ private static final int SENSOR_LOCATION_FRONT = 1;
+ private static final int SENSOR_LOCATION_LEFT = 2;
+ private static final int SENSOR_LOCATION_RIGHT = 3;
+
@Nullable
private FingerprintFindSensorAnimation mAnimation;
@@ -69,6 +75,20 @@
} else {
mAnimation = null;
}
+
+ int sensorLocation = getResources().getInteger(R.integer.config_fingerprintSensorLocation);
+ if (sensorLocation < SENSOR_LOCATION_BACK || sensorLocation > SENSOR_LOCATION_RIGHT) {
+ sensorLocation = SENSOR_LOCATION_BACK;
+ }
+ final String location = getResources().getStringArray(
+ R.array.security_settings_fingerprint_sensor_locations)[sensorLocation];
+ TextView message = (TextView) findViewById(R.id.sud_layout_description);
+ message.setText(getString(
+ R.string.security_settings_fingerprint_enroll_find_sensor_message_cm, location));
+ if (sensorLocation == SENSOR_LOCATION_FRONT) {
+ findViewById(R.id.fingerprint_sensor_location_front_overlay)
+ .setVisibility(View.VISIBLE);
+ }
}
protected int getContentView() {
diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintLocationAnimationView.java b/src/com/android/settings/biometrics/fingerprint/FingerprintLocationAnimationView.java
index 99d4ff9..4d7e2d2 100644
--- a/src/com/android/settings/biometrics/fingerprint/FingerprintLocationAnimationView.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintLocationAnimationView.java
@@ -28,6 +28,7 @@
import android.view.View;
import android.view.animation.AnimationUtils;
import android.view.animation.Interpolator;
+import android.widget.ImageView;
import com.android.settings.R;
import com.android.settings.Utils;
@@ -53,6 +54,7 @@
private float mPulseRadius;
private ValueAnimator mRadiusAnimator;
private ValueAnimator mAlphaAnimator;
+ private ImageView mOverlayImage;
public FingerprintLocationAnimationView(Context context, @Nullable AttributeSet attrs) {
super(context, attrs);
@@ -92,7 +94,11 @@
}
private float getCenterY() {
- return getHeight() * mFractionCenterY;
+ if (mOverlayImage == null) {
+ mOverlayImage = (ImageView) getRootView().findViewById(
+ R.id.fingerprint_sensor_location);
+ }
+ return mOverlayImage.getHeight() * mFractionCenterY;
}
@Override
diff --git a/src/com/android/settings/bliss/Changelog.java b/src/com/android/settings/bliss/Changelog.java
new file mode 100644
index 0000000..35f4a3e
--- /dev/null
+++ b/src/com/android/settings/bliss/Changelog.java
@@ -0,0 +1,127 @@
+/*
+ Copyright (C) 2017-2019 The PixelDust Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ */
+
+package com.android.settings.bliss;
+
+import android.app.Fragment;
+import android.content.res.Resources;
+import android.os.Bundle;
+import android.graphics.Color;
+import android.graphics.Typeface;
+import android.text.Spannable;
+import android.text.SpannableStringBuilder;
+import android.text.style.ForegroundColorSpan;
+import android.text.style.StyleSpan;
+import android.util.Log;
+import android.util.TypedValue;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.LinearLayout;
+import android.widget.LinearLayout.LayoutParams;
+import android.widget.ScrollView;
+import android.widget.TextView;
+
+import com.android.settings.R;
+import com.android.settings.SettingsPreferenceFragment;
+
+import java.io.FileReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.util.regex.Pattern;
+import java.util.regex.Matcher;
+
+import com.android.internal.logging.nano.MetricsProto;
+
+public class Changelog extends SettingsPreferenceFragment {
+
+ @Override
+ public int getMetricsCategory() {
+ return MetricsProto.MetricsEvent.BLISSIFY;
+ }
+
+ private static final String CHANGELOG_PATH = "/system/etc/Changelog.txt";
+
+ @Override
+ public View onCreateView(LayoutInflater inflater, ViewGroup container,
+ Bundle savedInstanceState) {
+ InputStreamReader inputReader = null;
+ String text = null;
+ StringBuilder data = new StringBuilder();
+
+ Pattern date = Pattern.compile("(={20}|\\d{4}-\\d{2}-\\d{2})");
+ Pattern commit = Pattern.compile("([a-f0-9]{7})");
+ Pattern committer = Pattern.compile("\\[(\\D.*?)]");
+ Pattern title = Pattern.compile("(\\R\\s+[\\*]\\s.*)");
+
+ try {
+ char tmp[] = new char[2048];
+ int numRead;
+
+ inputReader = new FileReader(CHANGELOG_PATH);
+ while ((numRead = inputReader.read(tmp)) >= 0) {
+ data.append(tmp, 0, numRead);
+ }
+// text = data.toString();
+ } catch (IOException e) {
+// text = getString(R.string.changelog_error);
+ } finally {
+ try {
+ if (inputReader != null) {
+ inputReader.close();
+ }
+ } catch (IOException e) {
+ }
+ }
+
+ SpannableStringBuilder sb = new SpannableStringBuilder(data);
+ Resources.Theme theme = getContext().getTheme();
+ TypedValue typedValue = new TypedValue();
+ theme.resolveAttribute(android.R.attr.colorAccent, typedValue, true);
+ final int color = getContext().getColor(typedValue.resourceId);
+
+ Matcher m = date.matcher(data);
+ while (m.find()){
+ sb.setSpan(new ForegroundColorSpan(color), m.start(1), m.end(1), Spannable.SPAN_INCLUSIVE_INCLUSIVE);
+ sb.setSpan(new StyleSpan(Typeface.BOLD), m.start(1), m.end(1), Spannable.SPAN_INCLUSIVE_INCLUSIVE);
+ }
+ m = commit.matcher(data);
+ while (m.find()){
+ sb.setSpan(new StyleSpan(Typeface.NORMAL), m.start(1), m.end(1), Spannable.SPAN_INCLUSIVE_INCLUSIVE);
+ }
+ m = committer.matcher(data);
+ while (m.find()){
+ sb.setSpan(new ForegroundColorSpan(color), m.start(1), m.end(1), Spannable.SPAN_INCLUSIVE_INCLUSIVE);
+ sb.setSpan(new StyleSpan(Typeface.NORMAL), m.start(1), m.end(1), Spannable.SPAN_INCLUSIVE_INCLUSIVE);
+ }
+ m = title.matcher(data);
+ while (m.find()){
+ sb.setSpan(new ForegroundColorSpan(color), m.start(1), m.end(1), Spannable.SPAN_INCLUSIVE_INCLUSIVE);
+ sb.setSpan(new StyleSpan(Typeface.BOLD), m.start(1), m.end(1), Spannable.SPAN_INCLUSIVE_INCLUSIVE);
+ }
+
+ final TextView textView = new TextView(getActivity());
+ LinearLayout.LayoutParams llp = new LinearLayout.LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT);
+ llp.setMargins(20, 0, 0, 0); // llp.setMargins(left, top, right, bottom);
+ textView.setLayoutParams(llp);
+ textView.setText(sb);
+
+ final ScrollView scrollView = new ScrollView(getActivity());
+ scrollView.addView(textView);
+
+ return scrollView;
+ }
+}
diff --git a/src/com/android/settings/bluetooth/SavedBluetoothDeviceUpdater.java b/src/com/android/settings/bluetooth/SavedBluetoothDeviceUpdater.java
index dab4f23..573e393 100644
--- a/src/com/android/settings/bluetooth/SavedBluetoothDeviceUpdater.java
+++ b/src/com/android/settings/bluetooth/SavedBluetoothDeviceUpdater.java
@@ -1,4 +1,37 @@
/*
+ *Copyright (c) 2018, The Linux Foundation. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted (subject to the limitations in the
+ * disclaimer below) provided that the following conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided
+ * with the distribution.
+ *
+ * * Neither the name of The Linux Foundation nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+
+ * NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+ * GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+ * HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+ * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+ * IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+ * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+/*
* Copyright (C) 2017 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -102,10 +135,12 @@
if (DBG) {
Log.d(TAG, "isFilterMatched() device name : " + cachedDevice.getName() +
", is connected : " + device.isConnected() + ", is profile connected : "
- + cachedDevice.isConnected());
+ + cachedDevice.isConnected() +
+ ", is twsplusdevice : " + device.isTwsPlusDevice());
}
return device.getBondState() == BluetoothDevice.BOND_BONDED
- && (mDisplayConnected || !device.isConnected());
+ && (mDisplayConnected || !device.isConnected())
+ && !device.isTwsPlusDevice();
}
@Override
diff --git a/src/com/android/settings/bluetooth/SavedBluetoothTwsDeviceUpdater.java b/src/com/android/settings/bluetooth/SavedBluetoothTwsDeviceUpdater.java
new file mode 100644
index 0000000..f4a5638
--- /dev/null
+++ b/src/com/android/settings/bluetooth/SavedBluetoothTwsDeviceUpdater.java
@@ -0,0 +1,90 @@
+/*
+ *Copyright (c) 2018, The Linux Foundation. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted (subject to the limitations in the
+ * disclaimer below) provided that the following conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided
+ * with the distribution.
+ *
+ * * Neither the name of The Linux Foundation nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+
+ * NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+ * GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+ * HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+ * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+ * IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+ * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.settings.bluetooth;
+
+import android.bluetooth.BluetoothAdapter;
+import android.bluetooth.BluetoothDevice;
+import android.bluetooth.BluetoothProfile;
+import android.content.Context;
+
+import com.android.settings.connecteddevice.DevicePreferenceCallback;
+import com.android.settings.dashboard.DashboardFragment;
+import com.android.settingslib.bluetooth.CachedBluetoothDevice;
+import com.android.settingslib.bluetooth.LocalBluetoothManager;
+
+/**
+ * Maintain and update saved TWS+ bluetooth devices(bonded but not connected)
+ */
+public class SavedBluetoothTwsDeviceUpdater extends BluetoothDeviceUpdater {
+
+ private static final String PREF_KEY = "saved_bt_tws";
+
+ public SavedBluetoothTwsDeviceUpdater(Context context, DashboardFragment fragment,
+ DevicePreferenceCallback devicePreferenceCallback) {
+ super(context, fragment, devicePreferenceCallback);
+ }
+
+ SavedBluetoothTwsDeviceUpdater(Context context, DashboardFragment fragment,
+ DevicePreferenceCallback devicePreferenceCallback,
+ LocalBluetoothManager localBluetoothManager) {
+ super(context, fragment, devicePreferenceCallback, localBluetoothManager);
+ }
+
+ @Override
+ public boolean isFilterMatched(CachedBluetoothDevice cachedDevice) {
+ final BluetoothDevice device = cachedDevice.getDevice();
+ return device.getBondState() == BluetoothDevice.BOND_BONDED &&
+ !device.isConnected() && device.isTwsPlusDevice();
+ }
+
+ @Override
+ protected String getPreferenceKey() {
+ return PREF_KEY;
+ }
+}
diff --git a/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java b/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java
index 5dd769d..f857be3 100644
--- a/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java
+++ b/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java
@@ -1,4 +1,37 @@
/*
+ *Copyright (c) 2018, The Linux Foundation. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted (subject to the limitations in the
+ * disclaimer below) provided that the following conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided
+ * with the distribution.
+ *
+ * * Neither the name of The Linux Foundation nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+
+ * NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+ * GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+ * HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+ * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+ * IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+ * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+/*
* Copyright (C) 2016 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -71,6 +104,7 @@
SettingsUIDeviceConfig.BT_NEAR_BY_SUGGESTION_ENABLED, true);
use(AvailableMediaDeviceGroupController.class).init(this);
use(ConnectedDeviceGroupController.class).init(this);
+ use(SavedTwsDeviceGroupController.class).init(this);
use(PreviouslyConnectedDevicePreferenceController.class).init(this);
use(SlicePreferenceController.class).setSliceUri(nearbyEnabled
? Uri.parse(getString(R.string.config_nearby_devices_slice_uri))
diff --git a/src/com/android/settings/connecteddevice/NfcAndPaymentFragmentController.java b/src/com/android/settings/connecteddevice/NfcAndPaymentFragmentController.java
index 17958c9..65fafee 100644
--- a/src/com/android/settings/connecteddevice/NfcAndPaymentFragmentController.java
+++ b/src/com/android/settings/connecteddevice/NfcAndPaymentFragmentController.java
@@ -16,21 +16,47 @@
package com.android.settings.connecteddevice;
+import android.content.BroadcastReceiver;
import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
import android.content.pm.PackageManager;
import android.nfc.NfcAdapter;
import android.os.UserManager;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.R;
import com.android.settings.core.BasePreferenceController;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnResume;
+import com.android.settingslib.core.lifecycle.events.OnStop;
/**
* Controller that used to show NFC and payment features
*/
-public class NfcAndPaymentFragmentController extends BasePreferenceController {
+public class NfcAndPaymentFragmentController extends BasePreferenceController
+ implements LifecycleObserver, OnResume, OnStop {
private final NfcAdapter mNfcAdapter;
private final PackageManager mPackageManager;
private final UserManager mUserManager;
+ private final IntentFilter mIntentFilter;
+ private Preference mPreference;
+
+ private final BroadcastReceiver mReceiver = new BroadcastReceiver() {
+ @Override
+ public void onReceive(Context context, Intent intent) {
+ if (mPreference == null) {
+ return;
+ }
+
+ final String action = intent.getAction();
+ if (NfcAdapter.ACTION_ADAPTER_STATE_CHANGED.equals(action)) {
+ refreshSummary(mPreference);
+ }
+ }
+ };
public NfcAndPaymentFragmentController(Context context, String preferenceKey) {
super(context, preferenceKey);
@@ -38,6 +64,15 @@
mPackageManager = context.getPackageManager();
mUserManager = context.getSystemService(UserManager.class);
mNfcAdapter = NfcAdapter.getDefaultAdapter(context);
+
+ mIntentFilter = isNfcAvailable()
+ ? new IntentFilter(NfcAdapter.ACTION_ADAPTER_STATE_CHANGED) : null;
+ }
+
+ @Override
+ public void displayPreference(PreferenceScreen screen) {
+ super.displayPreference(screen);
+ mPreference = screen.findPreference(getPreferenceKey());
}
@Override
@@ -61,4 +96,26 @@
}
return null;
}
+
+ @Override
+ public void onStop() {
+ if (!isNfcAvailable()) {
+ return;
+ }
+
+ mContext.unregisterReceiver(mReceiver);
+ }
+
+ @Override
+ public void onResume() {
+ if (!isNfcAvailable()) {
+ return;
+ }
+
+ mContext.registerReceiver(mReceiver, mIntentFilter);
+ }
+
+ private boolean isNfcAvailable() {
+ return mNfcAdapter != null;
+ }
}
diff --git a/src/com/android/settings/connecteddevice/SavedTwsDeviceGroupController.java b/src/com/android/settings/connecteddevice/SavedTwsDeviceGroupController.java
new file mode 100644
index 0000000..1e1f0ac
--- /dev/null
+++ b/src/com/android/settings/connecteddevice/SavedTwsDeviceGroupController.java
@@ -0,0 +1,157 @@
+/*
+ *Copyright (c) 2018, The Linux Foundation. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted (subject to the limitations in the
+ * disclaimer below) provided that the following conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided
+ * with the distribution.
+ *
+ * * Neither the name of The Linux Foundation nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+
+ * NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+ * GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+ * HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+ * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+ * IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+ * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.settings.connecteddevice;
+
+import android.content.pm.PackageManager;
+import android.content.Context;
+
+import androidx.preference.Preference;
+import androidx.preference.PreferenceGroup;
+import androidx.preference.PreferenceScreen;
+
+import com.android.settings.bluetooth.BluetoothDeviceUpdater;
+import com.android.settings.bluetooth.SavedBluetoothTwsDeviceUpdater;
+import com.android.settings.connecteddevice.dock.DockUpdater;
+import com.android.settings.core.BasePreferenceController;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settings.dashboard.DashboardFragment;
+import com.android.settings.overlay.DockUpdaterFeatureProvider;
+import com.android.settings.overlay.FeatureFactory;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnStart;
+import com.android.settingslib.core.lifecycle.events.OnStop;
+
+/**
+ * Controller to maintain the {@link PreferenceGroup} for all
+ * saved TWS+ devices. It uses {@link DevicePreferenceCallback} to add/remove {@link Preference}
+ */
+public class SavedTwsDeviceGroupController extends BasePreferenceController
+ implements PreferenceControllerMixin, LifecycleObserver, OnStart, OnStop,
+ DevicePreferenceCallback {
+
+ private static final String KEY = "saved_tws_device_list";
+
+ PreferenceGroup mPreferenceGroup;
+ private BluetoothDeviceUpdater mBluetoothDeviceUpdater;
+ private DockUpdater mSavedDockUpdater;
+
+ public SavedTwsDeviceGroupController(Context context) {
+ super(context, KEY);
+
+ DockUpdaterFeatureProvider dockUpdaterFeatureProvider =
+ FeatureFactory.getFactory(context).getDockUpdaterFeatureProvider();
+ mSavedDockUpdater =
+ dockUpdaterFeatureProvider.getSavedDockUpdater(context, this);
+ }
+
+ @Override
+ public void onStart() {
+ mBluetoothDeviceUpdater.registerCallback();
+ mSavedDockUpdater.registerCallback();
+ }
+
+ @Override
+ public void onStop() {
+ mBluetoothDeviceUpdater.unregisterCallback();
+ mSavedDockUpdater.unregisterCallback();
+ }
+
+ @Override
+ public void displayPreference(PreferenceScreen screen) {
+ if (isAvailable()) {
+ mPreferenceGroup = (PreferenceGroup) screen.findPreference(KEY);
+ mPreferenceGroup.setVisible(false);
+ mBluetoothDeviceUpdater.setPrefContext(screen.getContext());
+ mBluetoothDeviceUpdater.forceUpdate();
+ mSavedDockUpdater.forceUpdate();
+ }
+ }
+
+ @Override
+ public int getAvailabilityStatus() {
+ return mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_BLUETOOTH)
+ ? AVAILABLE
+ : UNSUPPORTED_ON_DEVICE;
+ }
+
+ @Override
+ public String getPreferenceKey() {
+ return KEY;
+ }
+
+ @Override
+ public void onDeviceAdded(Preference preference) {
+ if (mPreferenceGroup.getPreferenceCount() == 0) {
+ mPreferenceGroup.setVisible(true);
+ }
+ mPreferenceGroup.addPreference(preference);
+ }
+
+ @Override
+ public void onDeviceRemoved(Preference preference) {
+ mPreferenceGroup.removePreference(preference);
+ if (mPreferenceGroup.getPreferenceCount() == 0) {
+ mPreferenceGroup.setVisible(false);
+ }
+ }
+
+ public void init(DashboardFragment fragment) {
+ mBluetoothDeviceUpdater = new SavedBluetoothTwsDeviceUpdater(fragment.getContext(),
+ fragment, SavedTwsDeviceGroupController.this);
+ }
+
+ public void setBluetoothDeviceUpdater(BluetoothDeviceUpdater bluetoothDeviceUpdater) {
+ mBluetoothDeviceUpdater = bluetoothDeviceUpdater;
+ }
+
+ public void setSavedDockUpdater(DockUpdater savedDockUpdater) {
+ mSavedDockUpdater = savedDockUpdater;
+ }
+}
diff --git a/src/com/android/settings/connecteddevice/usb/ConnectedUsbDeviceUpdater.java b/src/com/android/settings/connecteddevice/usb/ConnectedUsbDeviceUpdater.java
index 1078a21..6a13a96 100644
--- a/src/com/android/settings/connecteddevice/usb/ConnectedUsbDeviceUpdater.java
+++ b/src/com/android/settings/connecteddevice/usb/ConnectedUsbDeviceUpdater.java
@@ -97,7 +97,7 @@
// New version - uses a separate screen.
new SubSettingLauncher(mFragment.getContext())
.setDestination(UsbDetailsFragment.class.getName())
- .setTitleRes(R.string.device_details_title)
+ .setTitleRes(R.string.usb_preference)
.setSourceMetricsCategory(mFragment.getMetricsCategory())
.launch();
return true;
diff --git a/src/com/android/settings/connecteddevice/usb/UsbBackend.java b/src/com/android/settings/connecteddevice/usb/UsbBackend.java
index 4773aca..a8018a1 100644
--- a/src/com/android/settings/connecteddevice/usb/UsbBackend.java
+++ b/src/com/android/settings/connecteddevice/usb/UsbBackend.java
@@ -162,6 +162,30 @@
&& mPortStatus.isRoleCombinationSupported(POWER_ROLE_SOURCE, DATA_ROLE_HOST);
}
+ public boolean isSingleDataRoleSupported() {
+ return mPort != null && mPortStatus != null
+ && ((!mPortStatus
+ .isRoleCombinationSupported(POWER_ROLE_SINK, DATA_ROLE_HOST)
+ && !mPortStatus
+ .isRoleCombinationSupported(POWER_ROLE_SOURCE, DATA_ROLE_HOST))
+ || (!mPortStatus
+ .isRoleCombinationSupported(POWER_ROLE_SINK, DATA_ROLE_DEVICE)
+ && !mPortStatus
+ .isRoleCombinationSupported(POWER_ROLE_SOURCE, DATA_ROLE_DEVICE)));
+ }
+
+ public boolean isSinglePowerRoleSupported() {
+ return mPort != null && mPortStatus != null
+ && ((!mPortStatus
+ .isRoleCombinationSupported(POWER_ROLE_SINK, DATA_ROLE_DEVICE)
+ && !mPortStatus
+ .isRoleCombinationSupported(POWER_ROLE_SINK, DATA_ROLE_HOST))
+ || (!mPortStatus
+ .isRoleCombinationSupported(POWER_ROLE_SOURCE, DATA_ROLE_DEVICE)
+ && !mPortStatus
+ .isRoleCombinationSupported(POWER_ROLE_SOURCE, DATA_ROLE_HOST)));
+ }
+
public static String usbFunctionsToString(long functions) {
// TODO replace with UsbManager.usbFunctionsToString once supported by Roboelectric
return Long.toBinaryString(functions);
diff --git a/src/com/android/settings/connecteddevice/usb/UsbDetailsDataRoleController.java b/src/com/android/settings/connecteddevice/usb/UsbDetailsDataRoleController.java
index 411bc1d..4f024a7 100644
--- a/src/com/android/settings/connecteddevice/usb/UsbDetailsDataRoleController.java
+++ b/src/com/android/settings/connecteddevice/usb/UsbDetailsDataRoleController.java
@@ -113,7 +113,8 @@
@Override
public boolean isAvailable() {
- return !Utils.isMonkeyRunning();
+ return !Utils.isMonkeyRunning()
+ && !mUsbBackend.isSingleDataRoleSupported();
}
@Override
diff --git a/src/com/android/settings/connecteddevice/usb/UsbDetailsPowerRoleController.java b/src/com/android/settings/connecteddevice/usb/UsbDetailsPowerRoleController.java
index 13b3076..e8ff684 100644
--- a/src/com/android/settings/connecteddevice/usb/UsbDetailsPowerRoleController.java
+++ b/src/com/android/settings/connecteddevice/usb/UsbDetailsPowerRoleController.java
@@ -123,7 +123,8 @@
@Override
public boolean isAvailable() {
- return !Utils.isMonkeyRunning();
+ return !Utils.isMonkeyRunning()
+ && !mUsbBackend.isSinglePowerRoleSupported();
}
@Override
diff --git a/src/com/android/settings/core/SettingsBaseActivity.java b/src/com/android/settings/core/SettingsBaseActivity.java
index 57697a6..8f1be75 100644
--- a/src/com/android/settings/core/SettingsBaseActivity.java
+++ b/src/com/android/settings/core/SettingsBaseActivity.java
@@ -63,7 +63,7 @@
@Override
protected void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
- if (isLockTaskModePinned() && !isSettingsRunOnTop()) {
+ if (isLockTaskModePinned() && !isSettingsRunOnTop() && !isLaunchableInTaskModePinned()) {
Log.w(TAG, "Devices lock task mode pinned.");
finish();
}
@@ -147,6 +147,13 @@
((ViewGroup) findViewById(R.id.content_frame)).addView(view, params);
}
+ /**
+ * @return whether or not the activity can be launched from other apps in the pinning screen.
+ */
+ public boolean isLaunchableInTaskModePinned() {
+ return false;
+ }
+
private void onCategoriesChanged() {
final int N = mCategoryListeners.size();
for (int i = 0; i < N; i++) {
diff --git a/src/com/android/settings/core/gateway/SettingsGateway.java b/src/com/android/settings/core/gateway/SettingsGateway.java
index ad4da08..5d71947 100644
--- a/src/com/android/settings/core/gateway/SettingsGateway.java
+++ b/src/com/android/settings/core/gateway/SettingsGateway.java
@@ -79,6 +79,7 @@
import com.android.settings.deviceinfo.aboutphone.MyDeviceInfoFragment;
import com.android.settings.deviceinfo.firmwareversion.FirmwareVersionSettings;
import com.android.settings.deviceinfo.legal.ModuleLicensesDashboard;
+import com.android.settings.deviceinfo.bliss.BlissVersionSettings;
import com.android.settings.display.NightDisplaySettings;
import com.android.settings.display.darkmode.DarkModeSettingsFragment;
import com.android.settings.dream.DreamSettings;
@@ -160,6 +161,8 @@
import com.android.settings.wifi.savedaccesspoints2.SavedAccessPointsWifiSettings2;
import com.android.settings.wifi.tether.WifiTetherSettings;
+import com.blissroms.blissify.Blissify;
+
public class SettingsGateway {
/**
@@ -193,6 +196,7 @@
ModuleLicensesDashboard.class.getName(),
ManageApplications.class.getName(),
FirmwareVersionSettings.class.getName(),
+ BlissVersionSettings.class.getName(),
ManageAssist.class.getName(),
ProcessStatsUi.class.getName(),
NotificationStation.class.getName(),
@@ -307,7 +311,8 @@
GestureNavigationSettingsFragment.class.getName(),
InteractAcrossProfilesSettings.class.getName(),
InteractAcrossProfilesDetails.class.getName(),
- MediaControlsSettings.class.getName()
+ MediaControlsSettings.class.getName(),
+ Blissify.class.getName()
};
public static final String[] SETTINGS_FOR_RESTRICTED = {
@@ -347,5 +352,6 @@
Settings.MyDeviceInfoActivity.class.getName(),
Settings.ModuleLicensesActivity.class.getName(),
UserBackupSettingsActivity.class.getName(),
+ Settings.BlissifySettingsActivity.class.getName(),
};
}
diff --git a/src/com/android/settings/dashboard/DashboardFragmentRegistry.java b/src/com/android/settings/dashboard/DashboardFragmentRegistry.java
index f8a4f39..d6bb417 100644
--- a/src/com/android/settings/dashboard/DashboardFragmentRegistry.java
+++ b/src/com/android/settings/dashboard/DashboardFragmentRegistry.java
@@ -46,6 +46,8 @@
import com.android.settings.system.SystemDashboardFragment;
import com.android.settingslib.drawer.CategoryKey;
+import com.blissroms.blissify.Blissify;
+
import java.util.Map;
/**
@@ -119,6 +121,8 @@
CategoryKey.CATEGORY_BATTERY_SAVER_SETTINGS);
PARENT_TO_CATEGORY_KEY_MAP.put(SmartBatterySettings.class.getName(),
CategoryKey.CATEGORY_SMART_BATTERY_SETTINGS);
+ PARENT_TO_CATEGORY_KEY_MAP.put(Blissify.class.getName(),
+ CategoryKey.CATEGORY_SYSTEM_DEVELOPMENT);
CATEGORY_KEY_TO_PARENT_MAP = new ArrayMap<>(PARENT_TO_CATEGORY_KEY_MAP.size());
diff --git a/src/com/android/settings/datausage/AppDataUsage.java b/src/com/android/settings/datausage/AppDataUsage.java
index a86459e..5fe8a16 100644
--- a/src/com/android/settings/datausage/AppDataUsage.java
+++ b/src/com/android/settings/datausage/AppDataUsage.java
@@ -14,7 +14,11 @@
package com.android.settings.datausage;
+import static android.net.NetworkPolicyManager.POLICY_REJECT_ALL;
import static android.net.NetworkPolicyManager.POLICY_REJECT_METERED_BACKGROUND;
+import static android.net.NetworkPolicyManager.POLICY_REJECT_CELLULAR;
+import static android.net.NetworkPolicyManager.POLICY_REJECT_VPN;
+import static android.net.NetworkPolicyManager.POLICY_REJECT_WIFI;
import android.app.Activity;
import android.app.settings.SettingsEnums;
@@ -23,6 +27,7 @@
import android.content.pm.ApplicationInfo;
import android.content.pm.PackageManager;
import android.graphics.drawable.Drawable;
+import android.net.NetworkPolicyManager;
import android.net.NetworkTemplate;
import android.os.Bundle;
import android.os.UserHandle;
@@ -69,7 +74,11 @@
private static final String KEY_FOREGROUND_USAGE = "foreground_usage";
private static final String KEY_BACKGROUND_USAGE = "background_usage";
private static final String KEY_APP_SETTINGS = "app_settings";
+ private static final String KEY_RESTRICT_ALL = "restrict_all";
private static final String KEY_RESTRICT_BACKGROUND = "restrict_background";
+ private static final String KEY_RESTRICT_CELLULAR = "restrict_cellular";
+ private static final String KEY_RESTRICT_VPN = "restrict_vpn";
+ private static final String KEY_RESTRICT_WIFI = "restrict_wifi";
private static final String KEY_APP_LIST = "app_list";
private static final String KEY_CYCLE = "cycle";
private static final String KEY_UNRESTRICTED_DATA = "unrestricted_data_saver";
@@ -83,7 +92,11 @@
private Preference mForegroundUsage;
private Preference mBackgroundUsage;
private Preference mAppSettings;
+ private RestrictedSwitchPreference mRestrictAll;
private RestrictedSwitchPreference mRestrictBackground;
+ private RestrictedSwitchPreference mRestrictCellular;
+ private RestrictedSwitchPreference mRestrictVpn;
+ private RestrictedSwitchPreference mRestrictWifi;
private PreferenceCategory mAppList;
private Drawable mIcon;
@@ -155,7 +168,11 @@
mIcon = uidDetail.icon;
mLabel = uidDetail.label;
removePreference(KEY_UNRESTRICTED_DATA);
+ removePreference(KEY_RESTRICT_ALL);
removePreference(KEY_RESTRICT_BACKGROUND);
+ removePreference(KEY_RESTRICT_CELLULAR);
+ removePreference(KEY_RESTRICT_VPN);
+ removePreference(KEY_RESTRICT_WIFI);
} else {
if (mPackages.size() != 0) {
try {
@@ -167,8 +184,16 @@
} catch (PackageManager.NameNotFoundException e) {
}
}
+ mRestrictAll = findPreference(KEY_RESTRICT_ALL);
+ mRestrictAll.setOnPreferenceChangeListener(this);
mRestrictBackground = findPreference(KEY_RESTRICT_BACKGROUND);
mRestrictBackground.setOnPreferenceChangeListener(this);
+ mRestrictCellular = findPreference(KEY_RESTRICT_CELLULAR);
+ mRestrictCellular.setOnPreferenceChangeListener(this);
+ mRestrictVpn = findPreference(KEY_RESTRICT_VPN);
+ mRestrictVpn.setOnPreferenceChangeListener(this);
+ mRestrictWifi = findPreference(KEY_RESTRICT_WIFI);
+ mRestrictWifi.setOnPreferenceChangeListener(this);
mUnrestrictedData = findPreference(KEY_UNRESTRICTED_DATA);
mUnrestrictedData.setOnPreferenceChangeListener(this);
}
@@ -208,7 +233,11 @@
removePreference(KEY_UNRESTRICTED_DATA);
removePreference(KEY_APP_SETTINGS);
+ removePreference(KEY_RESTRICT_ALL);
removePreference(KEY_RESTRICT_BACKGROUND);
+ removePreference(KEY_RESTRICT_CELLULAR);
+ removePreference(KEY_RESTRICT_VPN);
+ removePreference(KEY_RESTRICT_WIFI);
removePreference(KEY_APP_LIST);
}
}
@@ -238,6 +267,22 @@
mDataSaverBackend.setIsBlacklisted(mAppItem.key, mPackageName, !(Boolean) newValue);
updatePrefs();
return true;
+ } else if (preference == mRestrictAll) {
+ setAppRestrictAll(!(Boolean) newValue);
+ updatePrefs();
+ return true;
+ } else if (preference == mRestrictCellular) {
+ setAppRestrictCellular(!(Boolean) newValue);
+ updatePrefs();
+ return true;
+ } else if (preference == mRestrictVpn) {
+ setAppRestrictVpn(!(Boolean) newValue);
+ updatePrefs();
+ return true;
+ } else if (preference == mRestrictWifi) {
+ setAppRestrictWifi(!(Boolean) newValue);
+ updatePrefs();
+ return true;
} else if (preference == mUnrestrictedData) {
mDataSaverBackend.setIsWhitelisted(mAppItem.key, mPackageName, (Boolean) newValue);
return true;
@@ -268,7 +313,9 @@
@VisibleForTesting
void updatePrefs() {
- updatePrefs(getAppRestrictBackground(), getUnrestrictData());
+ updatePrefs(getAppRestrictBackground(), getUnrestrictData(),
+ getAppRestrictCellular(), getAppRestrictVpn(), getAppRestrictWifi(),
+ getAppRestrictAll());
}
@VisibleForTesting
@@ -276,18 +323,57 @@
return new UidDetailProvider(mContext);
}
- private void updatePrefs(boolean restrictBackground, boolean unrestrictData) {
+ private void updatePrefs(boolean restrictBackground, boolean unrestrictData,
+ boolean restrictCellular, boolean restrictVpn, boolean restrictWifi,
+ boolean restrictAll) {
final EnforcedAdmin admin = RestrictedLockUtilsInternal.checkIfMeteredDataRestricted(
mContext, mPackageName, UserHandle.getUserId(mAppItem.key));
if (mRestrictBackground != null) {
- mRestrictBackground.setChecked(!restrictBackground);
- mRestrictBackground.setDisabledByAdmin(admin);
+ if (restrictCellular || restrictAll) {
+ mRestrictBackground.setEnabled(false);
+ mRestrictBackground.setChecked(false);
+ } else {
+ mRestrictBackground.setEnabled(true);
+ mRestrictBackground.setChecked(!restrictBackground);
+ mRestrictBackground.setDisabledByAdmin(admin);
+ }
+ }
+ if (mRestrictAll != null) {
+ mRestrictAll.setChecked(!restrictAll);
+ }
+ if (mRestrictCellular != null) {
+ if (restrictAll) {
+ mRestrictCellular.setEnabled(false);
+ mRestrictCellular.setChecked(false);
+ } else {
+ mRestrictCellular.setEnabled(true);
+ mRestrictCellular.setChecked(!restrictCellular);
+ }
+ }
+ if (mRestrictVpn != null) {
+ if (restrictAll) {
+ mRestrictVpn.setEnabled(false);
+ mRestrictVpn.setChecked(false);
+ } else {
+ mRestrictVpn.setEnabled(true);
+ mRestrictVpn.setChecked(!restrictVpn);
+ }
+ }
+ if (mRestrictWifi != null) {
+ if (restrictAll) {
+ mRestrictWifi.setEnabled(false);
+ mRestrictWifi.setChecked(false);
+ } else {
+ mRestrictWifi.setEnabled(true);
+ mRestrictWifi.setChecked(!restrictWifi);
+ }
}
if (mUnrestrictedData != null) {
- if (restrictBackground) {
- mUnrestrictedData.setVisible(false);
+ if (restrictCellular || restrictBackground || restrictAll) {
+ mUnrestrictedData.setEnabled(false);
+ mUnrestrictedData.setChecked(false);
} else {
- mUnrestrictedData.setVisible(true);
+ mUnrestrictedData.setEnabled(true);
mUnrestrictedData.setChecked(unrestrictData);
mUnrestrictedData.setDisabledByAdmin(admin);
}
@@ -323,9 +409,23 @@
}
private boolean getAppRestrictBackground() {
- final int uid = mAppItem.key;
- final int uidPolicy = services.mPolicyManager.getUidPolicy(uid);
- return (uidPolicy & POLICY_REJECT_METERED_BACKGROUND) != 0;
+ return getAppRestriction(POLICY_REJECT_METERED_BACKGROUND);
+ }
+
+ private boolean getAppRestrictAll() {
+ return getAppRestriction(POLICY_REJECT_ALL);
+ }
+
+ private boolean getAppRestrictCellular() {
+ return getAppRestriction(POLICY_REJECT_CELLULAR);
+ }
+
+ private boolean getAppRestrictVpn() {
+ return getAppRestriction(POLICY_REJECT_VPN);
+ }
+
+ private boolean getAppRestrictWifi() {
+ return getAppRestriction(POLICY_REJECT_WIFI);
}
private boolean getUnrestrictData() {
@@ -335,6 +435,37 @@
return false;
}
+ private boolean getAppRestriction(int policy) {
+ final int uid = mAppItem.key;
+ final int uidPolicy = services.mPolicyManager.getUidPolicy(uid);
+ return (uidPolicy & policy) != 0;
+ }
+
+ private void setAppRestrictAll(boolean restrict) {
+ setAppRestriction(POLICY_REJECT_ALL, restrict);
+ }
+
+ private void setAppRestrictCellular(boolean restrict) {
+ setAppRestriction(POLICY_REJECT_CELLULAR, restrict);
+ }
+
+ private void setAppRestrictVpn(boolean restrict) {
+ setAppRestriction(POLICY_REJECT_VPN, restrict);
+ }
+
+ private void setAppRestrictWifi(boolean restrict) {
+ setAppRestriction(POLICY_REJECT_WIFI, restrict);
+ }
+
+ private void setAppRestriction(int policy, boolean restrict) {
+ final int uid = mAppItem.key;
+ if (restrict) {
+ services.mPolicyManager.addUidPolicy(uid, policy);
+ } else {
+ services.mPolicyManager.removeUidPolicy(uid, policy);
+ }
+ }
+
@Override
public void onViewCreated(View view, Bundle savedInstanceState) {
super.onViewCreated(view, savedInstanceState);
@@ -466,14 +597,18 @@
@Override
public void onWhitelistStatusChanged(int uid, boolean isWhitelisted) {
if (mAppItem.uids.get(uid, false)) {
- updatePrefs(getAppRestrictBackground(), isWhitelisted);
+ updatePrefs(getAppRestrictBackground(), isWhitelisted,
+ getAppRestrictCellular(), getAppRestrictVpn(), getAppRestrictWifi(),
+ getAppRestrictAll());
}
}
@Override
public void onBlacklistStatusChanged(int uid, boolean isBlacklisted) {
if (mAppItem.uids.get(uid, false)) {
- updatePrefs(isBlacklisted, getUnrestrictData());
+ updatePrefs(isBlacklisted, getUnrestrictData(),
+ getAppRestrictCellular(), getAppRestrictVpn(), getAppRestrictWifi(),
+ getAppRestrictAll());
}
}
}
diff --git a/src/com/android/settings/datausage/DataSaverBackend.java b/src/com/android/settings/datausage/DataSaverBackend.java
index 92b2ef9..64b1bd6 100644
--- a/src/com/android/settings/datausage/DataSaverBackend.java
+++ b/src/com/android/settings/datausage/DataSaverBackend.java
@@ -83,12 +83,15 @@
public void setIsWhitelisted(int uid, String packageName, boolean whitelisted) {
final int policy = whitelisted ? POLICY_ALLOW_METERED_BACKGROUND : POLICY_NONE;
- mPolicyManager.setUidPolicy(uid, policy);
mUidPolicies.put(uid, policy);
if (whitelisted) {
+ mPolicyManager.addUidPolicy(uid, POLICY_ALLOW_METERED_BACKGROUND);
mMetricsFeatureProvider.action(
mContext, SettingsEnums.ACTION_DATA_SAVER_WHITELIST, packageName);
+ } else {
+ mPolicyManager.removeUidPolicy(uid, POLICY_ALLOW_METERED_BACKGROUND);
}
+ mPolicyManager.removeUidPolicy(uid, POLICY_REJECT_METERED_BACKGROUND);
}
public boolean isWhitelisted(int uid) {
@@ -113,12 +116,15 @@
public void setIsBlacklisted(int uid, String packageName, boolean blacklisted) {
final int policy = blacklisted ? POLICY_REJECT_METERED_BACKGROUND : POLICY_NONE;
- mPolicyManager.setUidPolicy(uid, policy);
mUidPolicies.put(uid, policy);
if (blacklisted) {
+ mPolicyManager.addUidPolicy(uid, POLICY_REJECT_METERED_BACKGROUND);
mMetricsFeatureProvider.action(
mContext, SettingsEnums.ACTION_DATA_SAVER_BLACKLIST, packageName);
+ } else {
+ mPolicyManager.removeUidPolicy(uid, POLICY_REJECT_METERED_BACKGROUND);
}
+ mPolicyManager.removeUidPolicy(uid, POLICY_ALLOW_METERED_BACKGROUND);
}
public boolean isBlacklisted(int uid) {
@@ -158,6 +164,9 @@
loadWhitelist();
loadBlacklist();
+ // We only care about allow/reject metered background policy here.
+ newPolicy &= POLICY_ALLOW_METERED_BACKGROUND | POLICY_REJECT_METERED_BACKGROUND;
+
final int oldPolicy = mUidPolicies.get(uid, POLICY_NONE);
if (newPolicy == POLICY_NONE) {
mUidPolicies.delete(uid);
diff --git a/src/com/android/settings/development/AdbRootPreferenceController.java b/src/com/android/settings/development/AdbRootPreferenceController.java
new file mode 100644
index 0000000..5f7d65d
--- /dev/null
+++ b/src/com/android/settings/development/AdbRootPreferenceController.java
@@ -0,0 +1,87 @@
+/*
+ * Copyright (C) 2018 The LineageOS Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.development;
+
+import android.adb.ADBRootService;
+import android.content.Context;
+import android.os.Build;
+import android.os.UserManager;
+
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.SwitchPreference;
+
+import com.android.settings.R;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+
+import lineageos.providers.LineageSettings;
+
+public class AdbRootPreferenceController extends DeveloperOptionsPreferenceController
+ implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
+
+ private static final String TAG = "AdbRootPreferenceController";
+ private static final String PREF_KEY = "enable_adb_root";
+
+ private final ADBRootService mADBRootService;
+
+ public AdbRootPreferenceController(Context context,
+ DevelopmentSettingsDashboardFragment fragment) {
+ super(context);
+
+ mADBRootService = new ADBRootService();
+ }
+
+ @Override
+ public String getPreferenceKey() {
+ return PREF_KEY;
+ }
+
+ @Override
+ public boolean isAvailable() {
+ return Build.IS_DEBUGGABLE;
+ }
+
+ @Override
+ public void displayPreference(PreferenceScreen screen) {
+ super.displayPreference(screen);
+
+ ((SwitchPreference) mPreference).setChecked(mADBRootService.getEnabled());
+
+ if (!isAdminUser()) {
+ mPreference.setEnabled(false);
+ }
+ }
+
+ @Override
+ public boolean onPreferenceChange(Preference preference, Object newValue) {
+ final boolean rootEnabled = (Boolean) newValue;
+ mADBRootService.setEnabled(rootEnabled);
+ return true;
+ }
+
+ @Override
+ protected void onDeveloperOptionsSwitchEnabled() {
+ if (isAdminUser()) {
+ mPreference.setEnabled(true);
+ }
+ }
+
+ boolean isAdminUser() {
+ return ((UserManager) mContext.getSystemService(Context.USER_SERVICE)).isAdminUser();
+ }
+}
diff --git a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
index 8eb5c4f..001b596 100644
--- a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
+++ b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
@@ -470,8 +470,8 @@
BluetoothA2dpConfigStore bluetoothA2dpConfigStore) {
final List<AbstractPreferenceController> controllers = new ArrayList<>();
controllers.add(new MemoryUsagePreferenceController(context));
- controllers.add(new BugReportPreferenceController(context));
- controllers.add(new BugReportHandlerPreferenceController(context));
+ //controllers.add(new BugReportPreferenceController(context));
+ //controllers.add(new BugReportHandlerPreferenceController(context));
controllers.add(new SystemServerHeapDumpPreferenceController(context));
controllers.add(new LocalBackupPasswordPreferenceController(context));
controllers.add(new StayAwakePreferenceController(context, lifecycle));
@@ -485,11 +485,12 @@
controllers.add(new DisableAutomaticUpdatesPreferenceController(context));
controllers.add(new SelectDSUPreferenceController(context));
controllers.add(new AdbPreferenceController(context, fragment));
+ controllers.add(new AdbRootPreferenceController(context, fragment));
controllers.add(new ClearAdbKeysPreferenceController(context, fragment));
controllers.add(new WirelessDebuggingPreferenceController(context, lifecycle));
controllers.add(new AdbAuthorizationTimeoutPreferenceController(context));
controllers.add(new LocalTerminalPreferenceController(context));
- controllers.add(new BugReportInPowerPreferenceController(context));
+ //controllers.add(new BugReportInPowerPreferenceController(context));
controllers.add(new AutomaticSystemServerHeapDumpPreferenceController(context));
controllers.add(new MockLocationAppPreferenceController(context, fragment));
controllers.add(new DebugViewAttributesPreferenceController(context));
@@ -599,6 +600,7 @@
@Override
public void onBluetoothHDAudioEnabled(boolean enabled) {
+ Log.d(TAG, "onBluetoothHDAudioEnabled: " + enabled);
for (AbstractPreferenceController controller : mPreferenceControllers) {
if (controller instanceof AbstractBluetoothDialogPreferenceController) {
((AbstractBluetoothDialogPreferenceController) controller).onHDAudioEnabled(
diff --git a/src/com/android/settings/development/NotificationChannelWarningsPreferenceController.java b/src/com/android/settings/development/NotificationChannelWarningsPreferenceController.java
index 775b708..104fcde 100644
--- a/src/com/android/settings/development/NotificationChannelWarningsPreferenceController.java
+++ b/src/com/android/settings/development/NotificationChannelWarningsPreferenceController.java
@@ -80,6 +80,6 @@
@VisibleForTesting
boolean isDebuggable() {
- return Build.IS_DEBUGGABLE;
+ return Build.IS_ENG;
}
}
diff --git a/src/com/android/settings/development/bluetooth/AbstractBluetoothDialogPreferenceController.java b/src/com/android/settings/development/bluetooth/AbstractBluetoothDialogPreferenceController.java
index 6bc9175..c0143ba 100644
--- a/src/com/android/settings/development/bluetooth/AbstractBluetoothDialogPreferenceController.java
+++ b/src/com/android/settings/development/bluetooth/AbstractBluetoothDialogPreferenceController.java
@@ -16,6 +16,8 @@
package com.android.settings.development.bluetooth;
+import static android.bluetooth.BluetoothCodecConfig.CODEC_PRIORITY_HIGHEST;
+
import android.bluetooth.BluetoothA2dp;
import android.bluetooth.BluetoothCodecConfig;
import android.bluetooth.BluetoothCodecStatus;
@@ -36,7 +38,9 @@
private static final String TAG = "AbstractBtDlgCtr";
- protected static final int[] CODEC_TYPES = {BluetoothCodecConfig.SOURCE_CODEC_TYPE_LDAC,
+ protected static final int[] CODEC_TYPES = {BluetoothCodecConfig.SOURCE_CODEC_TYPE_APTX_TWSP,
+ BluetoothCodecConfig.SOURCE_CODEC_TYPE_LDAC,
+ BluetoothCodecConfig.SOURCE_CODEC_TYPE_APTX_ADAPTIVE,
BluetoothCodecConfig.SOURCE_CODEC_TYPE_APTX_HD,
BluetoothCodecConfig.SOURCE_CODEC_TYPE_APTX,
BluetoothCodecConfig.SOURCE_CODEC_TYPE_AAC,
@@ -113,7 +117,7 @@
mBluetoothA2dpConfigStore.setSampleRate(config.getSampleRate());
mBluetoothA2dpConfigStore.setBitsPerSample(config.getBitsPerSample());
mBluetoothA2dpConfigStore.setChannelMode(config.getChannelMode());
- mBluetoothA2dpConfigStore.setCodecPriority(config.getCodecPriority());
+ mBluetoothA2dpConfigStore.setCodecPriority(CODEC_PRIORITY_HIGHEST);
mBluetoothA2dpConfigStore.setCodecSpecific1Value(config.getCodecSpecific1());
}
@@ -222,6 +226,7 @@
Log.d(TAG, "Unable to get highest codec. Configs are empty");
return BluetoothCodecConfig.SOURCE_CODEC_TYPE_INVALID;
}
+ Log.d(TAG, "CODEC_TYPES len: " + CODEC_TYPES.length + " codec_config len: " + configs.length);
for (int i = 0; i < CODEC_TYPES.length; i++) {
for (int j = 0; j < configs.length; j++) {
if ((configs[j].getCodecType() == CODEC_TYPES[i])) {
diff --git a/src/com/android/settings/development/bluetooth/BluetoothCodecDialogPreference.java b/src/com/android/settings/development/bluetooth/BluetoothCodecDialogPreference.java
index 6a733f3..86c541f 100644
--- a/src/com/android/settings/development/bluetooth/BluetoothCodecDialogPreference.java
+++ b/src/com/android/settings/development/bluetooth/BluetoothCodecDialogPreference.java
@@ -22,12 +22,16 @@
import com.android.settings.R;
+import android.util.Log;
+
/**
* Dialog preference to set the Bluetooth A2DP config of codec
*/
public class BluetoothCodecDialogPreference extends BaseBluetoothDialogPreference implements
RadioGroup.OnCheckedChangeListener {
+ private static final String TAG = "BtCodecDlgPref";
+
public BluetoothCodecDialogPreference(Context context) {
super(context);
initialize(context);
@@ -60,13 +64,20 @@
mRadioButtonIds.add(R.id.bluetooth_audio_codec_aac);
mRadioButtonIds.add(R.id.bluetooth_audio_codec_aptx);
mRadioButtonIds.add(R.id.bluetooth_audio_codec_aptx_hd);
+ mRadioButtonIds.add(R.id.bluetooth_audio_codec_aptx_adaptive);
mRadioButtonIds.add(R.id.bluetooth_audio_codec_ldac);
+ mRadioButtonIds.add(R.id.bluetooth_audio_codec_aptx_twsp);
String[] stringArray = context.getResources().getStringArray(
- R.array.bluetooth_a2dp_codec_titles);
+ R.array.bluetooth_a2dp_codec_titles_cm);
+
+ Log.e(TAG, "a2dp_codec_titles array length: " + stringArray.length);
for (int i = 0; i < stringArray.length; i++) {
mRadioButtonStrings.add(stringArray[i]);
}
- stringArray = context.getResources().getStringArray(R.array.bluetooth_a2dp_codec_summaries);
+
+ stringArray = context.getResources().getStringArray(
+ R.array.bluetooth_a2dp_codec_summaries_cm);
+ Log.e(TAG, "a2dp_codec_summaries array length: " + stringArray.length);
for (int i = 0; i < stringArray.length; i++) {
mSummaryStrings.add(stringArray[i]);
}
diff --git a/src/com/android/settings/development/bluetooth/BluetoothCodecDialogPreferenceController.java b/src/com/android/settings/development/bluetooth/BluetoothCodecDialogPreferenceController.java
index a0af268..dc326fe 100644
--- a/src/com/android/settings/development/bluetooth/BluetoothCodecDialogPreferenceController.java
+++ b/src/com/android/settings/development/bluetooth/BluetoothCodecDialogPreferenceController.java
@@ -62,6 +62,7 @@
@Override
public void onHDAudioEnabled(boolean enabled) {
+ Log.d(TAG, " onHDAudioEnabled: " + enabled);
if (!enabled) {
// If option codec is disabled, SBC is the only only one available codec.
onIndexUpdated(convertCfgToBtnIndex(BluetoothCodecConfig.SOURCE_CODEC_TYPE_SBC));
@@ -125,6 +126,14 @@
codecTypeValue = BluetoothCodecConfig.SOURCE_CODEC_TYPE_LDAC;
codecPriorityValue = BluetoothCodecConfig.CODEC_PRIORITY_HIGHEST;
break;
+ case 6:
+ codecTypeValue = BluetoothCodecConfig.SOURCE_CODEC_TYPE_APTX_ADAPTIVE;
+ codecPriorityValue = BluetoothCodecConfig.CODEC_PRIORITY_HIGHEST;
+ break;
+ case 7:
+ codecTypeValue = BluetoothCodecConfig.SOURCE_CODEC_TYPE_APTX_TWSP;
+ codecPriorityValue = BluetoothCodecConfig.CODEC_PRIORITY_HIGHEST;
+ break;
default:
break;
}
@@ -179,9 +188,15 @@
case BluetoothCodecConfig.SOURCE_CODEC_TYPE_APTX_HD:
index = 4;
break;
+ case BluetoothCodecConfig.SOURCE_CODEC_TYPE_APTX_ADAPTIVE:
+ index = 6;
+ break;
case BluetoothCodecConfig.SOURCE_CODEC_TYPE_LDAC:
index = 5;
break;
+ case BluetoothCodecConfig.SOURCE_CODEC_TYPE_APTX_TWSP:
+ index = 7;
+ break;
default:
Log.e(TAG, "Unsupported config:" + config);
break;
diff --git a/src/com/android/settings/development/bluetooth/BluetoothHDAudioPreferenceController.java b/src/com/android/settings/development/bluetooth/BluetoothHDAudioPreferenceController.java
index d4ca4e5..6481c75 100644
--- a/src/com/android/settings/development/bluetooth/BluetoothHDAudioPreferenceController.java
+++ b/src/com/android/settings/development/bluetooth/BluetoothHDAudioPreferenceController.java
@@ -81,6 +81,7 @@
return true;
}
final boolean enabled = (Boolean) newValue;
+ Log.e(TAG, "onPreferenceChange: " + enabled);
final int prefValue = enabled
? BluetoothA2dp.OPTIONAL_CODECS_PREF_ENABLED
: BluetoothA2dp.OPTIONAL_CODECS_PREF_DISABLED;
diff --git a/src/com/android/settings/development/bluetooth/BluetoothQualityDialogPreferenceController.java b/src/com/android/settings/development/bluetooth/BluetoothQualityDialogPreferenceController.java
index 4b38e11..f4d6857 100644
--- a/src/com/android/settings/development/bluetooth/BluetoothQualityDialogPreferenceController.java
+++ b/src/com/android/settings/development/bluetooth/BluetoothQualityDialogPreferenceController.java
@@ -105,7 +105,8 @@
@Override
public void onHDAudioEnabled(boolean enabled) {
- mPreference.setEnabled(false);
+ Log.d(TAG, "onHDAudioEnabled: " + enabled);
+ mPreference.setEnabled(enabled);
}
@VisibleForTesting
diff --git a/src/com/android/settings/deviceinfo/BuildNumberPreferenceController.java b/src/com/android/settings/deviceinfo/BuildNumberPreferenceController.java
index 185c8ea..3754cc1 100644
--- a/src/com/android/settings/deviceinfo/BuildNumberPreferenceController.java
+++ b/src/com/android/settings/deviceinfo/BuildNumberPreferenceController.java
@@ -181,7 +181,7 @@
}
mDevHitToast = Toast.makeText(mContext,
mContext.getResources().getQuantityString(
- R.plurals.show_dev_countdown, mDevHitCountdown,
+ R.plurals.show_dev_countdown_cm, mDevHitCountdown,
mDevHitCountdown),
Toast.LENGTH_SHORT);
mDevHitToast.show();
@@ -197,7 +197,7 @@
if (mDevHitToast != null) {
mDevHitToast.cancel();
}
- mDevHitToast = Toast.makeText(mContext, R.string.show_dev_already,
+ mDevHitToast = Toast.makeText(mContext, R.string.show_dev_already_cm,
Toast.LENGTH_LONG);
mDevHitToast.show();
mMetricsFeatureProvider.action(
@@ -236,7 +236,7 @@
if (mDevHitToast != null) {
mDevHitToast.cancel();
}
- mDevHitToast = Toast.makeText(mContext, R.string.show_dev_on,
+ mDevHitToast = Toast.makeText(mContext, R.string.show_dev_on_cm,
Toast.LENGTH_LONG);
mDevHitToast.show();
}
diff --git a/src/com/android/settings/deviceinfo/PhoneNumberPreferenceController.java b/src/com/android/settings/deviceinfo/PhoneNumberPreferenceController.java
index abf58d8..db0ffe9 100644
--- a/src/com/android/settings/deviceinfo/PhoneNumberPreferenceController.java
+++ b/src/com/android/settings/deviceinfo/PhoneNumberPreferenceController.java
@@ -45,6 +45,7 @@
private final TelephonyManager mTelephonyManager;
private final SubscriptionManager mSubscriptionManager;
private final List<Preference> mPreferenceList = new ArrayList<>();
+ private boolean mTapped = false;
public PhoneNumberPreferenceController(Context context, String key) {
super(context, key);
@@ -59,7 +60,10 @@
@Override
public CharSequence getSummary() {
- return getFirstPhoneNumber();
+ if (mContext.getResources().getBoolean(R.bool.configShowDeviceSensitiveInfo) && mTapped) {
+ return getFirstPhoneNumber();
+ }
+ return mContext.getString(R.string.device_info_protected_single_press);
}
@Override
@@ -91,7 +95,29 @@
}
@Override
+ public boolean isSliceable() {
+ return mTapped;
+ }
+
+ @Override
+ public boolean isCopyableSlice() {
+ return mTapped;
+ }
+
+ @Override
public boolean useDynamicSliceSummary() {
+ return mTapped;
+ }
+
+ @Override
+ public boolean handlePreferenceTreeClick(Preference preference) {
+ final int simSlotNumber = mPreferenceList.indexOf(preference);
+ if (simSlotNumber == -1) {
+ return false;
+ }
+ mTapped = true;
+ final Preference simStatusPreference = mPreferenceList.get(simSlotNumber);
+ simStatusPreference.setSummary(getPhoneNumber(simSlotNumber));
return true;
}
@@ -123,7 +149,11 @@
return mContext.getText(R.string.device_info_default);
}
- return getFormattedPhoneNumber(subscriptionInfo);
+ if (mContext.getResources().getBoolean(R.bool.configShowDeviceSensitiveInfo) || mTapped) {
+ return getFormattedPhoneNumber(subscriptionInfo);
+ }
+ return mContext.getString(R.string.device_info_protected_single_press);
+
}
private CharSequence getPreferenceTitle(int simSlot) {
diff --git a/src/com/android/settings/deviceinfo/RegulatoryInfoPreferenceController.java b/src/com/android/settings/deviceinfo/RegulatoryInfoPreferenceController.java
index c925c27..0990ad2 100644
--- a/src/com/android/settings/deviceinfo/RegulatoryInfoPreferenceController.java
+++ b/src/com/android/settings/deviceinfo/RegulatoryInfoPreferenceController.java
@@ -34,7 +34,8 @@
@Override
public boolean isAvailable() {
- return !mContext.getPackageManager().queryIntentActivities(INTENT_PROBE, 0).isEmpty();
+ //return !mContext.getPackageManager().queryIntentActivities(INTENT_PROBE, 0).isEmpty();
+ return false;
}
@Override
diff --git a/src/com/android/settings/deviceinfo/aboutphone/MyDeviceInfoFragment.java b/src/com/android/settings/deviceinfo/aboutphone/MyDeviceInfoFragment.java
index 4af5d79..2ac875e 100644
--- a/src/com/android/settings/deviceinfo/aboutphone/MyDeviceInfoFragment.java
+++ b/src/com/android/settings/deviceinfo/aboutphone/MyDeviceInfoFragment.java
@@ -82,7 +82,7 @@
@Override
public void onStart() {
super.onStart();
- initHeader();
+ //initHeader();
}
@Override
diff --git a/src/com/android/settings/deviceinfo/bliss/BlissBuildDatePreferenceController.java b/src/com/android/settings/deviceinfo/bliss/BlissBuildDatePreferenceController.java
new file mode 100644
index 0000000..6134d50
--- /dev/null
+++ b/src/com/android/settings/deviceinfo/bliss/BlissBuildDatePreferenceController.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2019 The BlissRoms Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.deviceinfo.bliss;
+
+import android.content.Context;
+import android.os.SystemProperties;
+
+import com.android.settings.R;
+import com.android.settings.core.BasePreferenceController;
+
+public class BlissBuildDatePreferenceController extends BasePreferenceController {
+
+ private static final String TAG = "BlissBuildDate";
+
+ private static final String KEY_BLISS_BUILD_DATE = "ro.build.date";
+
+ public BlissBuildDatePreferenceController(Context context, String key) {
+ super(context, key);
+ }
+
+ @Override
+ public int getAvailabilityStatus() {
+ return AVAILABLE;
+ }
+
+ @Override
+ public CharSequence getSummary() {
+ return SystemProperties.get(KEY_BLISS_BUILD_DATE,
+ mContext.getString(R.string.bliss_build_default));
+ }
+}
diff --git a/src/com/android/settings/deviceinfo/bliss/BlissBuildTypePreferenceController.java b/src/com/android/settings/deviceinfo/bliss/BlissBuildTypePreferenceController.java
new file mode 100644
index 0000000..488b90a
--- /dev/null
+++ b/src/com/android/settings/deviceinfo/bliss/BlissBuildTypePreferenceController.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2019 The BlissRoms Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.deviceinfo.bliss;
+
+import android.content.Context;
+import android.os.SystemProperties;
+
+import com.android.settings.R;
+import com.android.settings.core.BasePreferenceController;
+
+public class BlissBuildTypePreferenceController extends BasePreferenceController {
+
+ private static final String TAG = "BlissBuildType";
+
+ private static final String KEY_BLISS_BUILD_TYPE = "ro.bliss.build.status";
+
+ public BlissBuildTypePreferenceController(Context context, String key) {
+ super(context, key);
+ }
+
+ @Override
+ public int getAvailabilityStatus() {
+ return AVAILABLE;
+ }
+
+ @Override
+ public CharSequence getSummary() {
+ return SystemProperties.get(KEY_BLISS_BUILD_TYPE,
+ mContext.getString(R.string.bliss_build_default));
+ }
+}
diff --git a/src/com/android/settings/deviceinfo/bliss/BlissBuildVariantPreferenceController.java b/src/com/android/settings/deviceinfo/bliss/BlissBuildVariantPreferenceController.java
new file mode 100644
index 0000000..f5154e6
--- /dev/null
+++ b/src/com/android/settings/deviceinfo/bliss/BlissBuildVariantPreferenceController.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2019 The BlissRoms Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.deviceinfo.bliss;
+
+import android.content.Context;
+import android.os.SystemProperties;
+
+import com.android.settings.R;
+import com.android.settings.core.BasePreferenceController;
+
+public class BlissBuildVariantPreferenceController extends BasePreferenceController {
+
+ private static final String TAG = "BlissBuildVariant";
+
+ private static final String KEY_BLISS_BUILD_VARIANT = "ro.bliss.build.variant";
+
+ public BlissBuildVariantPreferenceController(Context context, String key) {
+ super(context, key);
+ }
+
+ @Override
+ public int getAvailabilityStatus() {
+ return AVAILABLE;
+ }
+
+ @Override
+ public CharSequence getSummary() {
+ return SystemProperties.get(KEY_BLISS_BUILD_VARIANT,
+ mContext.getString(R.string.bliss_build_variant_default));
+ }
+}
diff --git a/src/com/android/settings/deviceinfo/bliss/BlissDevicePreferenceController.java b/src/com/android/settings/deviceinfo/bliss/BlissDevicePreferenceController.java
new file mode 100644
index 0000000..4714ba6
--- /dev/null
+++ b/src/com/android/settings/deviceinfo/bliss/BlissDevicePreferenceController.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2019 The BlissRoms Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.deviceinfo.bliss;
+
+import android.content.Context;
+import android.os.SystemProperties;
+
+import com.android.settings.R;
+import com.android.settings.core.BasePreferenceController;
+
+public class BlissDevicePreferenceController extends BasePreferenceController {
+
+ private static final String TAG = "BlissDevice";
+
+ private static final String KEY_BLISS_DEVICE = "ro.bliss.device";
+
+ public BlissDevicePreferenceController(Context context, String key) {
+ super(context, key);
+ }
+
+ @Override
+ public int getAvailabilityStatus() {
+ return AVAILABLE;
+ }
+
+ @Override
+ public CharSequence getSummary() {
+ return SystemProperties.get(KEY_BLISS_DEVICE,
+ mContext.getString(R.string.bliss_build_default));
+ }
+}
diff --git a/src/com/android/settings/deviceinfo/bliss/BlissMaintainerPreferenceController.java b/src/com/android/settings/deviceinfo/bliss/BlissMaintainerPreferenceController.java
new file mode 100644
index 0000000..73b297e
--- /dev/null
+++ b/src/com/android/settings/deviceinfo/bliss/BlissMaintainerPreferenceController.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright (C) 2019 The LineageOS Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.deviceinfo.bliss;
+
+import android.content.Context;
+import android.content.res.Resources;
+import android.text.TextUtils;
+
+import androidx.preference.Preference;
+
+import com.android.settings.R;
+import com.android.settings.core.BasePreferenceController;
+
+public class BlissMaintainerPreferenceController extends BasePreferenceController {
+
+ private static final String TAG = "BlissMaintainerPreferenceController";
+
+ public BlissMaintainerPreferenceController(Context context, String key) {
+ super(context, key);
+ }
+
+ public int getAvailabilityStatus() {
+ return AVAILABLE;
+ }
+
+ public CharSequence getSummary() {
+ String maintainer = mContext.getResources().getString(R.string.bliss_maintainer);
+ return maintainer;
+ }
+}
diff --git a/src/com/android/settings/deviceinfo/bliss/BlissVersionPreferenceController.java b/src/com/android/settings/deviceinfo/bliss/BlissVersionPreferenceController.java
new file mode 100644
index 0000000..6af27cc
--- /dev/null
+++ b/src/com/android/settings/deviceinfo/bliss/BlissVersionPreferenceController.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2019 The BlissRoms Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.deviceinfo.bliss;
+
+import android.content.Context;
+import android.os.SystemProperties;
+
+import com.android.settings.R;
+import com.android.settings.core.BasePreferenceController;
+
+public class BlissVersionPreferenceController extends BasePreferenceController {
+
+ private static final String TAG = "BlissVersion";
+
+ private static final String KEY_BLISS_VERSION = "ro.bliss.version";
+
+ public BlissVersionPreferenceController(Context context, String key) {
+ super(context, key);
+ }
+
+ @Override
+ public int getAvailabilityStatus() {
+ return AVAILABLE;
+ }
+
+ @Override
+ public CharSequence getSummary() {
+ return SystemProperties.get(KEY_BLISS_VERSION,
+ mContext.getString(R.string.bliss_version_default));
+ }
+}
diff --git a/src/com/android/settings/deviceinfo/bliss/BlissVersionSettings.java b/src/com/android/settings/deviceinfo/bliss/BlissVersionSettings.java
new file mode 100644
index 0000000..ea4c149
--- /dev/null
+++ b/src/com/android/settings/deviceinfo/bliss/BlissVersionSettings.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright (C) 2019 The BlissRoms Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.deviceinfo.bliss;
+
+import android.app.settings.SettingsEnums;
+import android.content.Context;
+import android.provider.SearchIndexableResource;
+
+import com.android.settings.R;
+import com.android.settings.dashboard.DashboardFragment;
+import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settingslib.search.Indexable;
+import com.android.settingslib.search.SearchIndexable;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@SearchIndexable
+public class BlissVersionSettings extends DashboardFragment {
+
+ @Override
+ protected int getPreferenceScreenResId() {
+ return R.xml.bliss_version;
+ }
+
+ @Override
+ protected String getLogTag() {
+ return "BlissVersionSettings";
+ }
+
+ @Override
+ public int getMetricsCategory() {
+ return SettingsEnums.DIALOG_FIRMWARE_VERSION;
+ }
+
+ public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
+ new BaseSearchIndexProvider() {
+ @Override
+ public List<SearchIndexableResource> getXmlResourcesToIndex(Context context,
+ boolean enabled) {
+ final ArrayList<SearchIndexableResource> result = new ArrayList<>();
+
+ final SearchIndexableResource sir = new SearchIndexableResource(context);
+ sir.xmlResId = R.xml.bliss_version;
+ result.add(sir);
+ return result;
+ }
+
+ };
+}
diff --git a/src/com/android/settings/deviceinfo/firmwareversion/BasebandVersionPreferenceController.java b/src/com/android/settings/deviceinfo/firmwareversion/BasebandVersionPreferenceController.java
index dd3d560..a81993b 100644
--- a/src/com/android/settings/deviceinfo/firmwareversion/BasebandVersionPreferenceController.java
+++ b/src/com/android/settings/deviceinfo/firmwareversion/BasebandVersionPreferenceController.java
@@ -18,6 +18,7 @@
import android.content.Context;
import android.os.SystemProperties;
+import android.text.TextUtils;
import androidx.annotation.VisibleForTesting;
@@ -41,7 +42,13 @@
@Override
public CharSequence getSummary() {
- return SystemProperties.get(BASEBAND_PROPERTY,
+ String baseband = SystemProperties.get(BASEBAND_PROPERTY,
mContext.getString(R.string.device_info_default));
+ for (String str : baseband.split(",")) {
+ if (!TextUtils.isEmpty(str)) {
+ return str;
+ }
+ }
+ return baseband;
}
}
diff --git a/src/com/android/settings/deviceinfo/hardwareinfo/HardwareRevisionPreferenceController.java b/src/com/android/settings/deviceinfo/hardwareinfo/HardwareRevisionPreferenceController.java
index 955c60c..e5fd3da 100644
--- a/src/com/android/settings/deviceinfo/hardwareinfo/HardwareRevisionPreferenceController.java
+++ b/src/com/android/settings/deviceinfo/hardwareinfo/HardwareRevisionPreferenceController.java
@@ -18,6 +18,7 @@
import android.content.Context;
import android.os.SystemProperties;
+import android.text.TextUtils;
import com.android.settings.R;
import com.android.settings.core.BasePreferenceController;
@@ -31,8 +32,8 @@
@Override
public int getAvailabilityStatus() {
- return mContext.getResources().getBoolean(R.bool.config_show_device_model)
- ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
+ return mContext.getResources().getBoolean(R.bool.config_show_device_model) &&
+ !TextUtils.isEmpty(getSummary()) ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
}
@Override
diff --git a/src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceController.java b/src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceController.java
index 967eea6..5b962fe 100644
--- a/src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceController.java
+++ b/src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceController.java
@@ -97,8 +97,11 @@
private CharSequence getSummary(int simSlot) {
final int phoneType = getPhoneType(simSlot);
- return phoneType == PHONE_TYPE_CDMA ? mTelephonyManager.getMeid(simSlot)
- : mTelephonyManager.getImei(simSlot);
+ if (mContext.getResources().getBoolean(R.bool.configShowDeviceSensitiveInfo)) {
+ return phoneType == PHONE_TYPE_CDMA ? mTelephonyManager.getMeid(simSlot)
+ : mTelephonyManager.getImei(simSlot);
+ }
+ return mContext.getString(R.string.device_info_protected_single_press);
}
@Override
diff --git a/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java b/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java
index 370bdfb..9858ad2 100644
--- a/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java
+++ b/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java
@@ -152,6 +152,7 @@
private final Context mContext;
private boolean mShowLatestAreaInfo;
+ private boolean mIsRegisteredListener = false;
private final BroadcastReceiver mAreaInfoReceiver = new BroadcastReceiver() {
@Override
@@ -282,11 +283,22 @@
mContext.registerReceiver(mAreaInfoReceiver,
new IntentFilter(CellBroadcastIntents.ACTION_AREA_INFO_UPDATED));
}
+
+ mIsRegisteredListener = true;
}
@Override
public void onPause() {
if (mSubscriptionInfo == null) {
+ if (mIsRegisteredListener) {
+ mSubscriptionManager.removeOnSubscriptionsChangedListener(
+ mOnSubscriptionsChangedListener);
+ mTelephonyManager.listen(mPhoneStateListener, PhoneStateListener.LISTEN_NONE);
+ if (mShowLatestAreaInfo) {
+ mContext.unregisterReceiver(mAreaInfoReceiver);
+ }
+ mIsRegisteredListener = false;
+ }
return;
}
diff --git a/src/com/android/settings/display/ColorModePreferenceController.java b/src/com/android/settings/display/ColorModePreferenceController.java
index 7a43e5c..5bc2c42 100644
--- a/src/com/android/settings/display/ColorModePreferenceController.java
+++ b/src/com/android/settings/display/ColorModePreferenceController.java
@@ -31,8 +31,11 @@
@Override
public int getAvailabilityStatus() {
+ final int[] availableColorModes = mContext.getResources().getIntArray(
+ com.android.internal.R.array.config_availableColorModes);
return mContext.getSystemService(ColorDisplayManager.class)
.isDeviceColorManaged()
+ && availableColorModes.length > 0
&& !ColorDisplayManager.areAccessibilityTransformsEnabled(mContext) ?
AVAILABLE : DISABLED_FOR_USER;
}
diff --git a/src/com/android/settings/display/MinRefreshRatePreferenceController.java b/src/com/android/settings/display/MinRefreshRatePreferenceController.java
new file mode 100644
index 0000000..bc0d491
--- /dev/null
+++ b/src/com/android/settings/display/MinRefreshRatePreferenceController.java
@@ -0,0 +1,99 @@
+/*
+ * Copyright (C) 2020 The LineageOS Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.display;
+
+import static android.provider.Settings.System.MIN_REFRESH_RATE;
+
+import android.content.Context;
+import android.provider.Settings;
+import android.view.Display;
+
+import androidx.preference.ListPreference;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
+import com.android.settings.R;
+import com.android.settings.core.BasePreferenceController;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Locale;
+
+public class MinRefreshRatePreferenceController extends BasePreferenceController implements
+ Preference.OnPreferenceChangeListener {
+
+ private static final String KEY_MIN_REFRESH_RATE = "min_refresh_rate";
+
+ private ListPreference mListPreference;
+
+ public MinRefreshRatePreferenceController(Context context) {
+ super(context, KEY_MIN_REFRESH_RATE);
+ }
+
+ @Override
+ public int getAvailabilityStatus() {
+ return mContext.getResources().getBoolean(R.bool.config_show_min_refresh_rate_switch) &&
+ mListPreference != null && mListPreference.getEntries().length > 1
+ ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
+ }
+
+ @Override
+ public String getPreferenceKey() {
+ return KEY_MIN_REFRESH_RATE;
+ }
+
+ @Override
+ public void displayPreference(PreferenceScreen screen) {
+ mListPreference = screen.findPreference(getPreferenceKey());
+
+ List<String> entries = new ArrayList<>(), values = new ArrayList<>();
+ Display.Mode mode = mContext.getDisplay().getMode();
+ Display.Mode[] modes = mContext.getDisplay().getSupportedModes();
+ for (Display.Mode m : modes) {
+ if (m.getPhysicalWidth() == mode.getPhysicalWidth() &&
+ m.getPhysicalHeight() == mode.getPhysicalHeight()) {
+ entries.add(String.format("%.02fHz", m.getRefreshRate())
+ .replaceAll("[\\.,]00", ""));
+ values.add(String.format(Locale.US, "%.02f", m.getRefreshRate()));
+ }
+ }
+ mListPreference.setEntries(entries.toArray(new String[entries.size()]));
+ mListPreference.setEntryValues(values.toArray(new String[values.size()]));
+
+ super.displayPreference(screen);
+ }
+
+ @Override
+ public void updateState(Preference preference) {
+ final float currentValue = Settings.System.getFloat(mContext.getContentResolver(),
+ MIN_REFRESH_RATE, 60.00f);
+ int index = mListPreference.findIndexOfValue(
+ String.format(Locale.US, "%.02f", currentValue));
+ if (index < 0) index = 0;
+ mListPreference.setValueIndex(index);
+ mListPreference.setSummary(mListPreference.getEntries()[index]);
+ }
+
+ @Override
+ public boolean onPreferenceChange(Preference preference, Object newValue) {
+ Settings.System.putFloat(mContext.getContentResolver(), MIN_REFRESH_RATE,
+ Float.valueOf((String) newValue));
+ updateState(preference);
+ return true;
+ }
+
+}
diff --git a/src/com/android/settings/fuelgauge/AutoRestrictionPreferenceController.java b/src/com/android/settings/fuelgauge/AutoRestrictionPreferenceController.java
index 26fd398..6ce17e0 100644
--- a/src/com/android/settings/fuelgauge/AutoRestrictionPreferenceController.java
+++ b/src/com/android/settings/fuelgauge/AutoRestrictionPreferenceController.java
@@ -43,8 +43,8 @@
@Override
public int getAvailabilityStatus() {
return mPowerUsageFeatureProvider.isSmartBatterySupported()
- ? UNSUPPORTED_ON_DEVICE
- : AVAILABLE;
+ ? AVAILABLE
+ : UNSUPPORTED_ON_DEVICE;
}
@Override
diff --git a/src/com/android/settings/fuelgauge/BatteryEntry.java b/src/com/android/settings/fuelgauge/BatteryEntry.java
index 38ae2b2..b0b4ea2 100644
--- a/src/com/android/settings/fuelgauge/BatteryEntry.java
+++ b/src/com/android/settings/fuelgauge/BatteryEntry.java
@@ -141,7 +141,7 @@
switch (sipper.drainType) {
case IDLE:
name = context.getResources().getString(R.string.power_idle);
- iconId = R.drawable.ic_settings_phone_idle;
+ iconId = R.drawable.ic_settings_phone_idle_new;
break;
case CELL:
name = context.getResources().getString(R.string.power_cell);
@@ -259,7 +259,7 @@
} else if ("dex2oat".equals(name)) {
name = context.getResources().getString(R.string.process_dex2oat_label);
}
- iconId = R.drawable.ic_power_system;
+ iconId = R.drawable.ic_power_system_new;
icon = context.getDrawable(iconId);
}
diff --git a/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceController.java b/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceController.java
deleted file mode 100644
index 468d8c5..0000000
--- a/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceController.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- *
- */
-
-package com.android.settings.fuelgauge;
-
-import android.app.Activity;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.icu.text.NumberFormat;
-import android.os.BatteryManager;
-import android.os.PowerManager;
-import android.text.TextUtils;
-import android.widget.TextView;
-
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.PreferenceFragmentCompat;
-import androidx.preference.PreferenceScreen;
-
-import com.android.settings.R;
-import com.android.settings.core.BasePreferenceController;
-import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settings.overlay.FeatureFactory;
-import com.android.settings.widget.EntityHeaderController;
-import com.android.settingslib.Utils;
-import com.android.settingslib.core.lifecycle.Lifecycle;
-import com.android.settingslib.core.lifecycle.LifecycleObserver;
-import com.android.settingslib.core.lifecycle.events.OnStart;
-import com.android.settingslib.widget.LayoutPreference;
-
-/**
- * Controller that update the battery header view
- */
-public class BatteryHeaderPreferenceController extends BasePreferenceController
- implements PreferenceControllerMixin, LifecycleObserver, OnStart {
- @VisibleForTesting
- static final String KEY_BATTERY_HEADER = "battery_header";
-
- @VisibleForTesting
- BatteryStatusFeatureProvider mBatteryStatusFeatureProvider;
- @VisibleForTesting
- BatteryMeterView mBatteryMeterView;
- @VisibleForTesting
- TextView mBatteryPercentText;
- @VisibleForTesting
- TextView mSummary1;
-
- private Activity mActivity;
- private PreferenceFragmentCompat mHost;
- private Lifecycle mLifecycle;
- private final PowerManager mPowerManager;
-
- private LayoutPreference mBatteryLayoutPref;
-
- public BatteryHeaderPreferenceController(Context context, String key) {
- super(context, key);
- mPowerManager = context.getSystemService(PowerManager.class);
- mBatteryStatusFeatureProvider = FeatureFactory.getFactory(context)
- .getBatteryStatusFeatureProvider(context);
- }
-
- public void setActivity(Activity activity) {
- mActivity = activity;
- }
-
- public void setFragment(PreferenceFragmentCompat fragment) {
- mHost = fragment;
- }
-
- public void setLifecycle(Lifecycle lifecycle) {
- mLifecycle = lifecycle;
- }
-
- @Override
- public void displayPreference(PreferenceScreen screen) {
- super.displayPreference(screen);
- mBatteryLayoutPref = screen.findPreference(getPreferenceKey());
- mBatteryMeterView = mBatteryLayoutPref
- .findViewById(R.id.battery_header_icon);
- mBatteryPercentText = mBatteryLayoutPref.findViewById(R.id.battery_percent);
- mSummary1 = mBatteryLayoutPref.findViewById(R.id.summary1);
-
- quickUpdateHeaderPreference();
- }
-
- @Override
- public int getAvailabilityStatus() {
- return AVAILABLE_UNSEARCHABLE;
- }
-
- @Override
- public void onStart() {
- EntityHeaderController.newInstance(mActivity, mHost,
- mBatteryLayoutPref.findViewById(R.id.battery_entity_header))
- .setRecyclerView(mHost.getListView(), mLifecycle)
- .styleActionBar(mActivity);
- }
-
- public void updateHeaderPreference(BatteryInfo info) {
- mBatteryPercentText.setText(formatBatteryPercentageText(info.batteryLevel));
- if (!mBatteryStatusFeatureProvider.triggerBatteryStatusUpdate(this, info)) {
- if (info.remainingLabel == null) {
- mSummary1.setText(info.statusLabel);
- } else {
- mSummary1.setText(info.remainingLabel);
- }
- }
-
- mBatteryMeterView.setBatteryLevel(info.batteryLevel);
- mBatteryMeterView.setCharging(!info.discharging);
- mBatteryMeterView.setPowerSave(mPowerManager.isPowerSaveMode());
- }
-
- /**
- * Callback which receives text for the summary line.
- */
- public void updateBatteryStatus(String statusLabel) {
- mSummary1.setText(statusLabel);
- }
-
- public void quickUpdateHeaderPreference() {
- Intent batteryBroadcast = mContext.registerReceiver(null,
- new IntentFilter(Intent.ACTION_BATTERY_CHANGED));
- final int batteryLevel = Utils.getBatteryLevel(batteryBroadcast);
- final boolean discharging =
- batteryBroadcast.getIntExtra(BatteryManager.EXTRA_PLUGGED, -1) == 0;
-
- // Set battery level and charging status
- mBatteryMeterView.setBatteryLevel(batteryLevel);
- mBatteryMeterView.setCharging(!discharging);
- mBatteryMeterView.setPowerSave(mPowerManager.isPowerSaveMode());
- mBatteryPercentText.setText(formatBatteryPercentageText(batteryLevel));
- }
-
- private CharSequence formatBatteryPercentageText(int batteryLevel) {
- return TextUtils.expandTemplate(mContext.getText(R.string.battery_header_title_alternate),
- NumberFormat.getIntegerInstance().format(batteryLevel));
- }
-}
diff --git a/src/com/android/settings/fuelgauge/BatteryMeterView.java b/src/com/android/settings/fuelgauge/BatteryMeterView.java
index d54f5a4..b24ad62 100644
--- a/src/com/android/settings/fuelgauge/BatteryMeterView.java
+++ b/src/com/android/settings/fuelgauge/BatteryMeterView.java
@@ -16,21 +16,42 @@
package com.android.settings.fuelgauge;
+import android.annotation.SuppressLint;
+import android.annotation.ColorInt;
+import android.annotation.NonNull;
import android.annotation.Nullable;
import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.content.res.TypedArray;
+import android.graphics.Canvas;
+import android.graphics.Color;
import android.graphics.ColorFilter;
import android.graphics.PorterDuff;
import android.graphics.PorterDuffColorFilter;
+import android.graphics.Paint;
+import android.graphics.Path;
+import android.os.BatteryManager;
+import android.os.Parcel;
+import android.os.Parcelable;
import android.util.AttributeSet;
-import android.widget.ImageView;
+import android.util.TypedValue;
+import android.view.Gravity;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.LinearLayout;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
import androidx.annotation.VisibleForTesting;
+import androidx.cardview.widget.CardView;
import com.android.settings.R;
import com.android.settings.Utils;
import com.android.settingslib.graph.ThemedBatteryDrawable;
-public class BatteryMeterView extends ImageView {
+public class BatteryMeterView extends CardView {
+
@VisibleForTesting
BatteryMeterDrawable mDrawable;
@VisibleForTesting
@@ -40,68 +61,110 @@
@VisibleForTesting
ColorFilter mForegroundColorFilter;
+ private WaveView waveView;
+ private TextView progress_Text;
+ private IntentFilter ifilter;
+ private Intent batteryStatus;
+ private int status;
+ private String extra_status = "";
+
+ private int mLevel;
+
public BatteryMeterView(Context context) {
this(context, null, 0);
+ init(context);
}
public BatteryMeterView(Context context, @Nullable AttributeSet attrs) {
this(context, attrs, 0);
+ init(context);
}
public BatteryMeterView(Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
super(context, attrs, defStyleAttr);
+ init(context);
+ }
+ @SuppressLint("DefaultLocale")
+ private void init(Context context) {
+ ifilter = new IntentFilter(Intent.ACTION_BATTERY_CHANGED);
+ batteryStatus = context.registerReceiver(null, ifilter);
+ status = batteryStatus.getIntExtra(BatteryManager.EXTRA_STATUS, -1);
+ setLayoutParams(new ViewGroup.LayoutParams((int) dpToPx(232), (int) dpToPx(232)));
+ waveView = new WaveView(context);
+ progress_Text = new TextView(context);
+ progress_Text.setTextSize(52);
+ progress_Text.setTextColor(Utils.getColorAttrDefaultColor(context, android.R.attr.textColorSecondary));
+ progress_Text.setGravity(Gravity.CENTER_HORIZONTAL);
+ progress_Text.setLayoutParams(new RelativeLayout.LayoutParams(RelativeLayout.LayoutParams.MATCH_PARENT, RelativeLayout.LayoutParams.WRAP_CONTENT));
+ progress_Text.setAlpha((float) 0.7);
+ LinearLayout linearLayout = new LinearLayout(context);
+ linearLayout.setOrientation(LinearLayout.VERTICAL);
+ linearLayout.setLayoutParams(new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.MATCH_PARENT));
+ linearLayout.setGravity(Gravity.CENTER);
+ linearLayout.addView(progress_Text);
+ RelativeLayout layout = new RelativeLayout(context);
+ layout.addView(waveView);
+ layout.addView(linearLayout);
+ addView(layout);
+ setRadius(getLayoutParams().height);
final int frameColor = context.getColor(R.color.meter_background_color);
mAccentColorFilter = new PorterDuffColorFilter(
Utils.getColorAttrDefaultColor(context, android.R.attr.colorAccent),
PorterDuff.Mode.SRC);
mErrorColorFilter = new PorterDuffColorFilter(
context.getColor(R.color.battery_icon_color_error), PorterDuff.Mode.SRC_IN);
- mForegroundColorFilter =new PorterDuffColorFilter(
+ mForegroundColorFilter = new PorterDuffColorFilter(
Utils.getColorAttrDefaultColor(context, android.R.attr.colorForeground),
PorterDuff.Mode.SRC);
mDrawable = new BatteryMeterDrawable(context, frameColor);
mDrawable.setColorFilter(mAccentColorFilter);
- setImageDrawable(mDrawable);
- }
-
- public void setBatteryLevel(int level) {
- mDrawable.setBatteryLevel(level);
- updateColorFilter();
}
public void setPowerSave(boolean powerSave) {
- mDrawable.setPowerSaveEnabled(powerSave);
- updateColorFilter();
+ extra_status = BatteryManager.EXTRA_BATTERY_LOW;
+ waveView.setBatteryPowerSave(powerSave);
+ reload();
}
public boolean getPowerSave() {
- return mDrawable.getPowerSaveEnabled();
+ return extra_status.equals(BatteryManager.EXTRA_BATTERY_LOW);
}
+ public void setText(CharSequence prog) {
+ progress_Text.setText(prog);
+ }
+
+ public void setBatteryLevel(int progress) {
+ waveView.setProgress(progress);
+ reload();
+ }
public int getBatteryLevel() {
- return mDrawable.getBatteryLevel();
+ return waveView.getProgress() <= 0 ? waveView.getProgress() : 1;
}
- public void setCharging(boolean charging) {
- mDrawable.setCharging(charging);
- postInvalidate();
+ protected void reload() {
+ waveView.postInvalidate();
+ progress_Text.postInvalidate();
+ waveView.setBatteryPowerSave(getPowerSave());
+ waveView.setBatteryLevelLow(getBatteryLevel() < getResources().getInteger(com.android.internal.R.integer.config_criticalBatteryWarningLevel));
+ }
+
+ public void setCharging(boolean status) {
+ if (status) {
+ this.status = BatteryManager.BATTERY_STATUS_CHARGING;
+ } else {
+ this.status = BatteryManager.BATTERY_STATUS_DISCHARGING;
+ }
}
public boolean getCharging() {
- return mDrawable.getCharging();
+ return status == BatteryManager.BATTERY_STATUS_CHARGING ||
+ status == BatteryManager.BATTERY_STATUS_FULL;
}
- private void updateColorFilter() {
- final boolean powerSaveEnabled = mDrawable.getPowerSaveEnabled();
- final int level = mDrawable.getBatteryLevel();
- if (powerSaveEnabled) {
- mDrawable.setColorFilter(mForegroundColorFilter);
- } else if (level < mDrawable.getCriticalLevel()) {
- mDrawable.setColorFilter(mErrorColorFilter);
- } else {
- mDrawable.setColorFilter(mAccentColorFilter);
- }
+ private float dpToPx(int dp) {
+ return TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, dp, getResources().getDisplayMetrics());
}
public static class BatteryMeterDrawable extends ThemedBatteryDrawable {
@@ -134,4 +197,338 @@
return mIntrinsicHeight;
}
}
+
+ class Wave extends View {
+ private final int WAVE_HEIGHT_HUGE = 36;
+ private final int WAVE_HEIGHT_LARGE = 16;
+ private final int WAVE_HEIGHT_MIDDLE = 8;
+ private final int WAVE_HEIGHT_LITTLE = 5;
+ private final float WAVE_LENGTH_MULTIPLE_LARGE = 1.5f;
+ private final float WAVE_LENGTH_MULTIPLE_MIDDLE = 1f;
+ private final float WAVE_LENGTH_MULTIPLE_LITTLE = 0.5f;
+ private final float WAVE_HZ_FAST = 0.13f;
+ private final float WAVE_HZ_NORMAL = 0.09f;
+ private final float WAVE_HZ_SLOW = 0.05f;
+ public final int DEFAULT_ABOVE_WAVE_ALPHA = 255;
+ public final int DEFAULT_BLOW_WAVE_ALPHA = 180;
+ private final float X_SPACE = 20;
+ private final double PI2 = 2 * Math.PI;
+ private Path mAboveWavePath = new Path();
+ private Path mBlowWavePath = new Path();
+ private Paint mAboveWavePaint = new Paint();
+ private Paint mBlowWavePaint = new Paint();
+ private int mAboveWaveColor;
+ private int mBlowWaveColor;
+ private float mWaveMultiple;
+ private float mWaveLength;
+ private int mWaveHeight;
+ private float mMaxRight;
+ private float mWaveHz;
+ private float mAboveOffset = 0.0f;
+ private float mBlowOffset;
+ private Wave.RefreshProgressRunnable mRefreshProgressRunnable;
+ private int left, right, bottom;
+ private double omega;
+ public Wave(Context context, AttributeSet attrs) {
+ this(context, attrs, R.attr.waveViewStyle);
+ }
+ public Wave(Context context, AttributeSet attrs, int defStyle) {
+ super(context, attrs, defStyle);
+ }
+ @Override
+ protected void onDraw(Canvas canvas) {
+ super.onDraw(canvas);
+ canvas.drawPath(mBlowWavePath, mBlowWavePaint);
+ canvas.drawPath(mAboveWavePath, mAboveWavePaint);
+ }
+ public void setAboveWaveColor(int aboveWaveColor) {
+ this.mAboveWaveColor = aboveWaveColor;
+ }
+ public void setBlowWaveColor(int blowWaveColor) {
+ this.mBlowWaveColor = blowWaveColor;
+ }
+ public Paint getAboveWavePaint() {
+ return mAboveWavePaint;
+ }
+ public Paint getBlowWavePaint() {
+ return mBlowWavePaint;
+ }
+ public void initializeWaveSize(int waveMultiple, int waveHeight, int waveHz) {
+ mWaveMultiple = getWaveMultiple(waveMultiple);
+ mWaveHeight = getWaveHeight(waveHeight);
+ mWaveHz = getWaveHz(waveHz);
+ mBlowOffset = mWaveHeight * 0.4f;
+ ViewGroup.LayoutParams params = new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT,
+ mWaveHeight * 2);
+ setLayoutParams(params);
+ }
+ public void initializePainters() {
+ mAboveWavePaint.setColor(mAboveWaveColor);
+ mAboveWavePaint.setAlpha(DEFAULT_ABOVE_WAVE_ALPHA);
+ mAboveWavePaint.setStyle(Paint.Style.FILL);
+ mAboveWavePaint.setAntiAlias(true);
+ mBlowWavePaint.setColor(mBlowWaveColor);
+ mBlowWavePaint.setAlpha(DEFAULT_BLOW_WAVE_ALPHA);
+ mBlowWavePaint.setStyle(Paint.Style.FILL);
+ mBlowWavePaint.setAntiAlias(true);
+ }
+ private float getWaveMultiple(int size) {
+ switch (size) {
+ case WaveView.LARGE:
+ return WAVE_LENGTH_MULTIPLE_LARGE;
+ case WaveView.MIDDLE:
+ return WAVE_LENGTH_MULTIPLE_MIDDLE;
+ case WaveView.LITTLE:
+ return WAVE_LENGTH_MULTIPLE_LITTLE;
+ }
+ return 0;
+ }
+ private int getWaveHeight(int size) {
+ switch (size) {
+ case WaveView.HUGE:
+ return WAVE_HEIGHT_HUGE;
+ case WaveView.LARGE:
+ return WAVE_HEIGHT_LARGE;
+ case WaveView.MIDDLE:
+ return WAVE_HEIGHT_MIDDLE;
+ case WaveView.LITTLE:
+ return WAVE_HEIGHT_LITTLE;
+ }
+ return 0;
+ }
+ private float getWaveHz(int size) {
+ switch (size) {
+ case WaveView.LARGE:
+ return WAVE_HZ_FAST;
+ case WaveView.MIDDLE:
+ return WAVE_HZ_NORMAL;
+ case WaveView.LITTLE:
+ return WAVE_HZ_SLOW;
+ }
+ return 0;
+ }
+ private void calculatePath() {
+ mAboveWavePath.reset();
+ mBlowWavePath.reset();
+ getWaveOffset();
+ float y;
+ mAboveWavePath.moveTo(left, bottom);
+ for (float x = 0; x <= mMaxRight; x += X_SPACE) {
+ y = (float) (mWaveHeight * Math.sin(omega * x + mAboveOffset) + mWaveHeight);
+ mAboveWavePath.lineTo(x, y);
+ }
+ mAboveWavePath.lineTo(right, bottom);
+ mBlowWavePath.moveTo(left, bottom);
+ for (float x = 0; x <= mMaxRight; x += X_SPACE) {
+ y = (float) (mWaveHeight * Math.sin(omega * x + mBlowOffset) + mWaveHeight);
+ mBlowWavePath.lineTo(x, y);
+ }
+ mBlowWavePath.lineTo(right, bottom);
+ }
+ @Override
+ protected void onWindowVisibilityChanged(int visibility) {
+ super.onWindowVisibilityChanged(visibility);
+ if (View.GONE == visibility) {
+ removeCallbacks(mRefreshProgressRunnable);
+ } else {
+ removeCallbacks(mRefreshProgressRunnable);
+ mRefreshProgressRunnable = new Wave.RefreshProgressRunnable();
+ post(mRefreshProgressRunnable);
+ }
+ }
+ @Override
+ protected void onDetachedFromWindow() {
+ super.onDetachedFromWindow();
+ }
+ @Override
+ public void onWindowFocusChanged(boolean hasWindowFocus) {
+ super.onWindowFocusChanged(hasWindowFocus);
+ if (hasWindowFocus) {
+ if (mWaveLength == 0) {
+ startWave();
+ }
+ }
+ }
+ @Override
+ protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
+ super.onLayout(changed, left, top, right, bottom);
+ if (mWaveLength==0){
+ startWave();
+ }
+ }
+ private void startWave() {
+ if (getWidth() != 0) {
+ int width = getWidth();
+ mWaveLength = width * mWaveMultiple;
+ left = getLeft();
+ right = getRight();
+ bottom = getBottom() + 2;
+ mMaxRight = right + X_SPACE;
+ omega = PI2 / mWaveLength;
+ }
+ }
+ private void getWaveOffset() {
+ if (mBlowOffset > Float.MAX_VALUE - 100) {
+ mBlowOffset = 0;
+ } else {
+ mBlowOffset += mWaveHz;
+ }
+ if (mAboveOffset > Float.MAX_VALUE - 100) {
+ mAboveOffset = 0;
+ } else {
+ mAboveOffset += mWaveHz;
+ }
+ }
+ private class RefreshProgressRunnable implements Runnable {
+ public void run() {
+ synchronized (this) {
+ long start = System.currentTimeMillis();
+ calculatePath();
+ invalidate();
+ long gap = 16 - (System.currentTimeMillis() - start);
+ postDelayed(this, gap < 0 ? 0 : gap);
+ }
+ }
+ }
+ }
+
+ class WaveView extends LinearLayout {
+ protected static final int HUGE = 0;
+ protected static final int LARGE = 1;
+ protected static final int MIDDLE = 2;
+ protected static final int LITTLE = 3;
+ private int mAboveWaveColor = Utils.getColorAttrDefaultColor(this.getContext(), android.R.attr.colorAccent);
+ private int mProgress;
+ private int mWaveHeight = 0;
+ private int mWaveMultiple = 3;
+ private int mWaveHz = 2;
+ private int mWaveToTop;
+ private Wave mWave;
+ private Solid mSolid;
+ public WaveView(Context context) {
+ super(context);
+ setOrientation(VERTICAL);
+ mWave = new Wave(context, null);
+ mWave.initializeWaveSize(mWaveMultiple, mWaveHeight, mWaveHz);
+ mWave.setAboveWaveColor(mAboveWaveColor);
+ mWave.setBlowWaveColor(mAboveWaveColor);
+ mWave.initializePainters();
+ mSolid = new Solid(context, null);
+ mSolid.setAboveWavePaint(mWave.getAboveWavePaint());
+ mSolid.setBlowWavePaint(mWave.getBlowWavePaint());
+ addView(mWave);
+ addView(mSolid);
+ setProgress(mProgress);
+ }
+
+ public void setBatteryPowerSave(boolean powerSave) {
+ if (powerSave) {
+ mAboveWaveColor = Utils.getColorAttrDefaultColor(this.getContext(), android.R.attr.colorForeground);
+ mWave.setAboveWaveColor(mAboveWaveColor);
+ mWave.setBlowWaveColor(mAboveWaveColor);
+ } else {
+ mAboveWaveColor = Utils.getColorAttrDefaultColor(this.getContext(), android.R.attr.colorAccent);
+ mWave.setAboveWaveColor(mAboveWaveColor);
+ mWave.setBlowWaveColor(mAboveWaveColor);
+ }
+ }
+
+ public void setBatteryLevelLow(boolean isLow) {
+ if (isLow) {
+ mAboveWaveColor = this.getContext().getColor(R.color.battery_icon_color_error);
+ mWave.setAboveWaveColor(mAboveWaveColor);
+ mWave.setBlowWaveColor(mAboveWaveColor);
+ } else {
+ mAboveWaveColor = Utils.getColorAttrDefaultColor(this.getContext(), android.R.attr.colorAccent);
+ mWave.setAboveWaveColor(mAboveWaveColor);
+ mWave.setBlowWaveColor(mAboveWaveColor);
+ }
+ }
+
+ public void setProgress(int progress) {
+ this.mProgress = progress > 100 ? 100 : progress;
+ computeWaveToTop();
+ }
+ public int getProgress() {
+ return this.mProgress;
+ }
+ @Override
+ public void onWindowFocusChanged(boolean hasWindowFocus) {
+ super.onWindowFocusChanged(hasWindowFocus);
+ if (hasWindowFocus) {
+ computeWaveToTop();
+ }
+ }
+ private void computeWaveToTop() {
+ mWaveToTop = (int) (getHeight() * (1f - mProgress / 100f));
+ ViewGroup.LayoutParams params = mWave.getLayoutParams();
+ if (params != null) {
+ ((LayoutParams) params).topMargin = mWaveToTop;
+ }
+ mWave.setLayoutParams(params);
+ }
+ @Override
+ public Parcelable onSaveInstanceState() {
+ Parcelable superState = super.onSaveInstanceState();
+ WaveView.SavedState ss = new WaveView.SavedState(superState);
+ ss.progress = mProgress;
+ return ss;
+ }
+ @Override
+ public void onRestoreInstanceState(Parcelable state) {
+ WaveView.SavedState ss = (WaveView.SavedState) state;
+ super.onRestoreInstanceState(ss.getSuperState());
+ setProgress(ss.progress);
+ }
+ private class SavedState extends BaseSavedState {
+ int progress;
+ SavedState(Parcelable superState) {
+ super(superState);
+ }
+ private SavedState(Parcel in) {
+ super(in);
+ progress = in.readInt();
+ }
+ @Override
+ public void writeToParcel(Parcel out, int flags) {
+ super.writeToParcel(out, flags);
+ out.writeInt(progress);
+ }
+ public final Creator<WaveView.SavedState> CREATOR = new Creator<WaveView.SavedState>() {
+ public SavedState createFromParcel(Parcel in) {
+ return new WaveView.SavedState(in);
+ }
+ public WaveView.SavedState[] newArray(int size) {
+ return new WaveView.SavedState[size];
+ }
+ };
+ }
+ }
+
+ class Solid extends View {
+ private Paint aboveWavePaint;
+ private Paint blowWavePaint;
+ public Solid(Context context, AttributeSet attrs) {
+ this(context, attrs, 0);
+ }
+ public Solid(Context context, AttributeSet attrs, int defStyleAttr) {
+ super(context, attrs, defStyleAttr);
+ LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT);
+ params.weight = 1;
+ setLayoutParams(params);
+ }
+ public void setAboveWavePaint(Paint aboveWavePaint) {
+ this.aboveWavePaint = aboveWavePaint;
+ }
+ public void setBlowWavePaint(Paint blowWavePaint) {
+ this.blowWavePaint = blowWavePaint;
+ }
+ @Override
+ protected void onDraw(Canvas canvas) {
+ super.onDraw(canvas);
+ canvas.drawRect(getLeft(), 0, getRight(), getBottom(), blowWavePaint);
+ canvas.drawRect(getLeft(), 0, getRight(), getBottom(), aboveWavePaint);
+ }
+ }
+
}
diff --git a/src/com/android/settings/fuelgauge/BatteryStatusFeatureProvider.java b/src/com/android/settings/fuelgauge/BatteryStatusFeatureProvider.java
deleted file mode 100644
index c3fc247..0000000
--- a/src/com/android/settings/fuelgauge/BatteryStatusFeatureProvider.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright (C) 2020 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.fuelgauge;
-
-/**
- * Feature Provider used to retrieve battery status
- */
-public interface BatteryStatusFeatureProvider {
-
- /**
- * Trigger a battery status update; return false if built-in status should be used.
- */
- boolean triggerBatteryStatusUpdate(
- BatteryHeaderPreferenceController batteryHeaderPreferenceController, BatteryInfo info);
-}
diff --git a/src/com/android/settings/fuelgauge/BatteryStatusFeatureProviderImpl.java b/src/com/android/settings/fuelgauge/BatteryStatusFeatureProviderImpl.java
deleted file mode 100644
index 47d376d..0000000
--- a/src/com/android/settings/fuelgauge/BatteryStatusFeatureProviderImpl.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (C) 2020 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.fuelgauge;
-
-import android.content.Context;
-
-/**
- * Used to override battery status string in Battery Header.
- */
-public class BatteryStatusFeatureProviderImpl implements BatteryStatusFeatureProvider {
-
- protected Context mContext;
-
- public BatteryStatusFeatureProviderImpl(Context context) {
- mContext = context.getApplicationContext();
- }
-
- @Override
- public boolean triggerBatteryStatusUpdate(
- BatteryHeaderPreferenceController batteryHeaderPreferenceController, BatteryInfo info) {
- return false;
- }
-}
diff --git a/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImpl.java b/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImpl.java
index ab71c97..039c23c 100644
--- a/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImpl.java
+++ b/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImpl.java
@@ -16,23 +16,47 @@
package com.android.settings.fuelgauge;
+import android.content.ContentResolver;
import android.content.Context;
import android.content.Intent;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageInfo;
import android.content.pm.PackageManager;
+import android.database.Cursor;
+import android.net.Uri;
import android.os.Process;
+import android.text.TextUtils;
import android.util.SparseIntArray;
import com.android.internal.os.BatterySipper;
import com.android.internal.util.ArrayUtils;
import com.android.settingslib.fuelgauge.Estimate;
+import com.android.settings.R;
+
+import com.android.settingslib.utils.PowerUtil;
+
+import java.time.Duration;
+
public class PowerUsageFeatureProviderImpl implements PowerUsageFeatureProvider {
private static final String PACKAGE_CALENDAR_PROVIDER = "com.android.providers.calendar";
private static final String PACKAGE_MEDIA_PROVIDER = "com.android.providers.media";
private static final String PACKAGE_SYSTEMUI = "com.android.systemui";
+ private static final String PACKAGE_GMS = "com.google.android.gms";
+ private static final String PACKAGE_GCS = "com.google.android.apps.gcs";
private static final String[] PACKAGES_SYSTEM = {PACKAGE_MEDIA_PROVIDER,
PACKAGE_CALENDAR_PROVIDER, PACKAGE_SYSTEMUI};
+ private static final String[] PACKAGES_SERVICE = {PACKAGE_GMS, PACKAGE_GCS};
+
+ static final String AVERAGE_BATTERY_LIFE_COL = "average_battery_life";
+ static final String BATTERY_ESTIMATE_BASED_ON_USAGE_COL = "is_based_on_usage";
+ static final String BATTERY_ESTIMATE_COL = "battery_estimate";
+ static final String BATTERY_LEVEL_COL = "battery_level";
+ static final String IS_EARLY_WARNING_COL = "is_early_warning";
+ static final String TIMESTAMP_COL = "timestamp_millis";
+ static final int CUSTOMIZED_TO_USER = 1;
+ static final int NEED_EARLY_WARNING = 1;
protected PackageManager mPackageManager;
protected Context mContext;
@@ -44,6 +68,16 @@
@Override
public boolean isTypeService(BatterySipper sipper) {
+ final int uid = sipper.uidObj == null ? -1 : sipper.getUid();
+ sipper.mPackages = mPackageManager.getPackagesForUid(uid);
+ if (sipper.mPackages != null) {
+ for (final String packageName : sipper.mPackages) {
+ if (ArrayUtils.contains(PACKAGES_SERVICE, packageName)) {
+ return true;
+ }
+ }
+ }
+
return false;
}
@@ -92,17 +126,113 @@
@Override
public Estimate getEnhancedBatteryPrediction(Context context) {
- return null;
+ long dischargeTime = -1L;
+ boolean basedOnUsage = false;
+ Uri uri = this.getEnhancedBatteryPredictionUri();
+ Cursor cursor = context.getContentResolver().query(uri, null, null, null, null);
+
+ // Return null if cursor is null or empty
+ if (cursor == null || !cursor.moveToFirst()) {
+ try {
+ cursor.close();
+ }
+ catch (NullPointerException nullPointerException) {
+ // cursor might be null
+ }
+ return null;
+ }
+
+ // Check if estimate is usage based
+ int colIndex = cursor.getColumnIndex(BATTERY_ESTIMATE_BASED_ON_USAGE_COL);
+ if (colIndex != -1)
+ basedOnUsage = cursor.getInt(colIndex) == 1;
+
+ // Calculate average discharge time based on average battery life
+ colIndex = cursor.getColumnIndex(AVERAGE_BATTERY_LIFE_COL);
+ if (colIndex != -1) {
+ long avgBattery = cursor.getLong(colIndex);
+ if (avgBattery != -1L) {
+ dischargeTime = Duration.ofMinutes(15L).toMillis();
+ if (Duration.ofMillis(avgBattery).compareTo(Duration.ofDays(1L)) >= 0)
+ dischargeTime = Duration.ofHours(1L).toMillis();
+ dischargeTime = PowerUtil.roundTimeToNearestThreshold(avgBattery, dischargeTime);
+ }
+ }
+
+ // Create estimate from data
+ colIndex = cursor.getColumnIndex(BATTERY_ESTIMATE_COL);
+ Estimate enhancedEstimate = new Estimate(cursor.getLong(colIndex),
+ basedOnUsage, dischargeTime);
+
+ // Cleanup
+ try {
+ cursor.close();
+ }
+ catch (NullPointerException nullPointerException) {
+ // We already checked if cursor is null, so it shouldn't be dereferenced yet.
+ }
+
+ return enhancedEstimate;
}
@Override
public SparseIntArray getEnhancedBatteryPredictionCurve(Context context, long zeroTime) {
- return null;
+ SparseIntArray curve = new SparseIntArray();
+ Uri uri = this.getEnhancedBatteryPredictionCurveUri();
+ Cursor cursor = context.getContentResolver().query(uri, null, null, null, null);
+
+ // Return null if cursor is null or empty
+ if (cursor == null || !cursor.moveToFirst()) {
+ try {
+ cursor.close();
+ }
+ catch (NullPointerException nullPointerException) {
+ // cursor might be null
+ }
+ return null;
+ }
+
+ // Get time/battery data indicies
+ int timestamp = cursor.getColumnIndex(TIMESTAMP_COL);
+ int batteryLevel = cursor.getColumnIndex(BATTERY_LEVEL_COL);
+
+ // Add time/battery data to a SparseIntArray and shift time data relative to starting time
+ while (cursor.moveToNext()) {
+ curve.append((int)(cursor.getLong(timestamp) - zeroTime), cursor.getInt(batteryLevel));
+ }
+
+ // Cleanup
+ try {
+ cursor.close();
+ }
+ catch (NullPointerException nullPointerException) {
+ // We already checked if cursor is null, so it shouldn't be dereferenced yet.
+ }
+ return curve;
+ }
+
+ private Uri getEnhancedBatteryPredictionCurveUri() {
+ return new Uri.Builder().scheme("content")
+ .authority("com.google.android.apps.turbo.estimated_time_remaining")
+ .appendPath("discharge_curve").build();
+ }
+
+ private Uri getEnhancedBatteryPredictionUri() {
+ return new Uri.Builder().scheme("content")
+ .authority("com.google.android.apps.turbo.estimated_time_remaining")
+ .appendPath("time_remaining").build();
}
@Override
public boolean isEnhancedBatteryPredictionEnabled(Context context) {
- return false;
+ try {
+ boolean turboEnabled = mPackageManager.getPackageInfo("com.google.android.apps.turbo",
+ PackageManager.MATCH_DISABLED_COMPONENTS).applicationInfo.enabled;
+ return turboEnabled;
+ }
+ catch (PackageManager.NameNotFoundException nameNotFoundException) {
+ return false;
+ }
}
@Override
@@ -122,12 +252,46 @@
@Override
public String getAdvancedUsageScreenInfoString() {
- return null;
+ return mContext.getString(R.string.advanced_battery_graph_subtext);
}
@Override
public boolean getEarlyWarningSignal(Context context, String id) {
- return false;
+ // Build early warning URI and create a cursor to read it
+ Uri.Builder builder = new Uri.Builder().scheme("content")
+ .authority("com.google.android.apps.turbo.estimated_time_remaining")
+ .appendPath("early_warning")
+ .appendPath("id");
+ if (TextUtils.isEmpty(id)) {
+ builder.appendPath(context.getPackageName());
+ } else {
+ builder.appendPath(id);
+ }
+ Cursor cursor = context.getContentResolver().query(builder.build(), null, null, null, null);
+
+ // Return null if cursor is null or empty
+ if (cursor == null || !cursor.moveToFirst()) {
+ try {
+ cursor.close();
+ }
+ catch (NullPointerException nullPointerException) {
+ // cursor might be null
+ }
+ return false;
+ }
+
+ // Check if early warning is available
+ boolean earlyWarningAvailable = cursor.getInt(cursor.getColumnIndex(IS_EARLY_WARNING_COL)) == 1;
+
+ // Cleanup
+ try {
+ cursor.close();
+ }
+ catch (NullPointerException nullPointerException) {
+ // We already checked if cursor is null, so it shouldn't be dereferenced yet.
+ }
+
+ return earlyWarningAvailable;
}
@Override
@@ -135,4 +299,5 @@
return mContext.getResources().getBoolean(
com.android.internal.R.bool.config_smart_battery_available);
}
+
}
diff --git a/src/com/android/settings/fuelgauge/PowerUsageSummary.java b/src/com/android/settings/fuelgauge/PowerUsageSummary.java
index 3a5f0ba..942a344 100644
--- a/src/com/android/settings/fuelgauge/PowerUsageSummary.java
+++ b/src/com/android/settings/fuelgauge/PowerUsageSummary.java
@@ -18,19 +18,28 @@
import static com.android.settings.fuelgauge.BatteryBroadcastReceiver.BatteryUpdateType;
+import android.animation.Animator;
+import android.animation.ValueAnimator;
import android.app.settings.SettingsEnums;
import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
import android.database.ContentObserver;
+import android.icu.text.NumberFormat;
import android.net.Uri;
import android.os.Bundle;
import android.os.Handler;
+import android.os.PowerManager;
+import android.os.SystemClock;
import android.provider.Settings.Global;
import android.text.format.Formatter;
+import android.text.TextUtils;
import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem;
import android.view.View;
import android.view.View.OnLongClickListener;
+import android.view.animation.AnimationUtils;
import android.widget.TextView;
import androidx.annotation.VisibleForTesting;
@@ -66,6 +75,10 @@
static final String TAG = "PowerUsageSummary";
private static final String KEY_BATTERY_HEADER = "battery_header";
+ private static final int BATTERY_ANIMATION_DURATION_MS_PER_LEVEL = 30;
+
+ @VisibleForTesting
+ static final String ARG_BATTERY_LEVEL = "key_battery_level";
private static final String KEY_SCREEN_USAGE = "screen_usage";
private static final String KEY_TIME_SINCE_LAST_FULL_CHARGE = "last_full_charge";
@@ -79,6 +92,8 @@
public static final int DEBUG_INFO_LOADER = 3;
@VisibleForTesting
+ int mBatteryLevel;
+ @VisibleForTesting
PowerGaugePreference mScreenUsagePref;
@VisibleForTesting
PowerGaugePreference mLastFullChargePref;
@@ -92,7 +107,7 @@
BatteryInfo mBatteryInfo;
@VisibleForTesting
- BatteryHeaderPreferenceController mBatteryHeaderPreferenceController;
+ PowerManager mPowerManager;
@VisibleForTesting
boolean mNeedUpdateBatteryTip;
@VisibleForTesting
@@ -117,7 +132,7 @@
@Override
public void onLoadFinished(Loader<BatteryInfo> loader, BatteryInfo batteryInfo) {
- mBatteryHeaderPreferenceController.updateHeaderPreference(batteryInfo);
+ updateHeaderPreference(batteryInfo);
mBatteryInfo = batteryInfo;
updateLastFullChargePreference();
}
@@ -149,12 +164,10 @@
protected void updateViews(List<BatteryInfo> batteryInfos) {
final BatteryMeterView batteryView = mBatteryLayoutPref
.findViewById(R.id.battery_header_icon);
- final TextView percentRemaining =
- mBatteryLayoutPref.findViewById(R.id.battery_percent);
final TextView summary1 = mBatteryLayoutPref.findViewById(R.id.summary1);
BatteryInfo oldInfo = batteryInfos.get(0);
BatteryInfo newInfo = batteryInfos.get(1);
- percentRemaining.setText(Utils.formatPercentage(oldInfo.batteryLevel));
+ batteryView.setText(Utils.formatPercentage(oldInfo.batteryLevel));
// set the text to the old estimate (copied from battery info). Note that this
// can sometimes say 0 time remaining because battery stats requires the phone
@@ -196,10 +209,7 @@
super.onAttach(context);
final SettingsActivity activity = (SettingsActivity) getActivity();
- mBatteryHeaderPreferenceController = use(BatteryHeaderPreferenceController.class);
- mBatteryHeaderPreferenceController.setActivity(activity);
- mBatteryHeaderPreferenceController.setFragment(this);
- mBatteryHeaderPreferenceController.setLifecycle(getSettingsLifecycle());
+ mPowerManager = context.getSystemService(PowerManager.class);
mBatteryTipPreferenceController = use(BatteryTipPreferenceController.class);
mBatteryTipPreferenceController.setActivity(activity);
@@ -215,6 +225,9 @@
initFeatureProvider();
mBatteryLayoutPref = (LayoutPreference) findPreference(KEY_BATTERY_HEADER);
+ mBatteryLevel = getContext().getResources().getInteger(
+ com.android.internal.R.integer.config_criticalBatteryWarningLevel) + 1;
+
mScreenUsagePref = (PowerGaugePreference) findPreference(KEY_SCREEN_USAGE);
mLastFullChargePref = (PowerGaugePreference) findPreference(
KEY_TIME_SINCE_LAST_FULL_CHARGE);
@@ -226,8 +239,17 @@
}
@Override
+ public void onActivityCreated(Bundle savedInstanceState) {
+ super.onActivityCreated(savedInstanceState);
+ if (savedInstanceState != null) {
+ mBatteryLevel = savedInstanceState.getInt(ARG_BATTERY_LEVEL);
+ }
+ }
+
+ @Override
public void onResume() {
super.onResume();
+ initHeaderPreference();
getContentResolver().registerContentObserver(
Global.getUriFor(Global.BATTERY_ESTIMATES_LAST_UPDATE_TIME),
false,
@@ -301,6 +323,13 @@
updateLastFullChargePreference();
mScreenUsagePref.setSubtitle(StringUtil.formatElapsedTime(getContext(),
mBatteryUtils.calculateScreenUsageTime(mStatsHelper), false));
+
+ final long elapsedRealtimeUs = SystemClock.elapsedRealtime() * 1000;
+ Intent batteryBroadcast = context.registerReceiver(null,
+ new IntentFilter(Intent.ACTION_BATTERY_CHANGED));
+ BatteryInfo batteryInfo = BatteryInfo.getBatteryInfoOld(context, batteryBroadcast,
+ mStatsHelper.getStats(), elapsedRealtimeUs, false);
+ updateHeaderPreference(batteryInfo);
}
@VisibleForTesting
@@ -343,6 +372,65 @@
}
@VisibleForTesting
+ void updateHeaderPreference(BatteryInfo info) {
+ final Context context = getContext();
+ if (context == null) {
+ return;
+ }
+ final BatteryMeterView batteryView = (BatteryMeterView) mBatteryLayoutPref
+ .findViewById(R.id.battery_header_icon);
+ final TextView timeText = (TextView) mBatteryLayoutPref.findViewById(R.id.battery_percent);
+ final TextView summary1 = (TextView) mBatteryLayoutPref.findViewById(R.id.summary1);
+ if (info.remainingLabel == null ) {
+ summary1.setText(info.statusLabel);
+ } else {
+ summary1.setText(info.remainingLabel);
+ }
+ batteryView.setCharging(!info.discharging);
+ batteryView.setPowerSave(mPowerManager.isPowerSaveMode());
+ startBatteryHeaderAnimationIfNecessary(batteryView, timeText, mBatteryLevel,
+ info.batteryLevel);
+ }
+
+ @VisibleForTesting
+ void initHeaderPreference() {
+ if (getContext() != null) {
+ final BatteryMeterView batteryView = (BatteryMeterView) mBatteryLayoutPref
+ .findViewById(R.id.battery_header_icon);
+ final TextView timeText = (TextView) mBatteryLayoutPref.findViewById(R.id.battery_percent);
+
+ batteryView.setBatteryLevel(mBatteryLevel);
+ batteryView.setPowerSave(mPowerManager.isPowerSaveMode());
+ batteryView.setText(formatBatteryPercentageText(mBatteryLevel));
+ }
+ }
+
+ @VisibleForTesting
+ void startBatteryHeaderAnimationIfNecessary(BatteryMeterView batteryView, TextView timeTextView,
+ int prevLevel, int currentLevel) {
+ if (getContext() != null) {
+ mBatteryLevel = currentLevel;
+ final int diff = Math.abs(prevLevel - currentLevel);
+ if (diff != 0) {
+ final ValueAnimator animator = ValueAnimator.ofInt(prevLevel, currentLevel);
+ animator.setDuration(BATTERY_ANIMATION_DURATION_MS_PER_LEVEL * diff);
+ animator.setInterpolator(AnimationUtils.loadInterpolator(getContext(),
+ android.R.interpolator.fast_out_slow_in));
+ animator.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() {
+ @Override
+ public void onAnimationUpdate(ValueAnimator animation) {
+ final Integer level = (Integer) animation.getAnimatedValue();
+ batteryView.setBatteryLevel(level);
+ batteryView.setPowerSave(mPowerManager.isPowerSaveMode());
+ batteryView.setText(formatBatteryPercentageText(level));
+ }
+ });
+ animator.start();
+ }
+ }
+ }
+
+ @VisibleForTesting
void initFeatureProvider() {
final Context context = getContext();
mPowerFeatureProvider = FeatureFactory.getFactory(context)
@@ -378,7 +466,6 @@
@Override
protected void restartBatteryStatsLoader(@BatteryUpdateType int refreshType) {
super.restartBatteryStatsLoader(refreshType);
- mBatteryHeaderPreferenceController.quickUpdateHeaderPreference();
}
@Override
@@ -392,6 +479,15 @@
restartBatteryTipLoader();
}
+ private CharSequence formatBatteryPercentageText(int batteryLevel) {
+ try {
+ return TextUtils.expandTemplate(getContext().getText(R.string.battery_header_title_alternate),
+ NumberFormat.getIntegerInstance().format(batteryLevel));
+ }
+ catch (Exception e) {
+ return null;
+ }
+ }
public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
new BaseSearchIndexProvider(R.xml.power_usage_summary);
diff --git a/src/com/android/settings/fuelgauge/batterytip/actions/SmartBatteryAction.java b/src/com/android/settings/fuelgauge/batterytip/actions/SmartBatteryAction.java
index f6b9c94..d63d1c1 100644
--- a/src/com/android/settings/fuelgauge/batterytip/actions/SmartBatteryAction.java
+++ b/src/com/android/settings/fuelgauge/batterytip/actions/SmartBatteryAction.java
@@ -48,7 +48,7 @@
? ((Instrumentable) mFragment).getMetricsCategory()
: Instrumentable.METRICS_CATEGORY_UNKNOWN)
.setDestination(SmartBatterySettings.class.getName())
- .setTitleRes(R.string.smart_battery_manager_title)
+ .setTitleRes(R.string.smart_battery_manager_title_custom)
.launch();
}
diff --git a/src/com/android/settings/fuelgauge/batterytip/tips/SmartBatteryTip.java b/src/com/android/settings/fuelgauge/batterytip/tips/SmartBatteryTip.java
index 106766f..48e3bdf 100644
--- a/src/com/android/settings/fuelgauge/batterytip/tips/SmartBatteryTip.java
+++ b/src/com/android/settings/fuelgauge/batterytip/tips/SmartBatteryTip.java
@@ -43,7 +43,7 @@
@Override
public CharSequence getSummary(Context context) {
- return context.getString(R.string.battery_tip_smart_battery_summary);
+ return context.getString(R.string.battery_tip_smart_battery_summary_custom);
}
@Override
diff --git a/src/com/android/settings/gestures/SystemNavigationPreferenceController.java b/src/com/android/settings/gestures/SystemNavigationPreferenceController.java
index ab83a9d..c50be5c 100644
--- a/src/com/android/settings/gestures/SystemNavigationPreferenceController.java
+++ b/src/com/android/settings/gestures/SystemNavigationPreferenceController.java
@@ -23,6 +23,10 @@
import android.content.Context;
import android.content.Intent;
import android.content.pm.PackageManager;
+import android.os.RemoteException;
+import android.view.Display;
+import android.view.IWindowManager;
+import android.view.WindowManagerGlobal;
import com.android.settings.R;
import com.android.settings.core.BasePreferenceController;
@@ -53,9 +57,19 @@
}
static boolean isGestureAvailable(Context context) {
+ boolean hasNavigationBar = false;
+ final boolean configEnabled = context.getResources().getBoolean(
+ com.android.internal.R.bool.config_swipe_up_gesture_setting_available);
+
+ try {
+ IWindowManager windowManager = WindowManagerGlobal.getWindowManagerService();
+ hasNavigationBar = windowManager.hasNavigationBar(Display.DEFAULT_DISPLAY);
+ } catch (RemoteException ex) {
+ // no window manager? good luck with that
+ }
// Skip if the swipe up settings are not available
- if (!context.getResources().getBoolean(
- com.android.internal.R.bool.config_swipe_up_gesture_setting_available)) {
+ // or if on-screen navbar is disabled (for devices with hardware keys)
+ if (!configEnabled || !hasNavigationBar) {
return false;
}
diff --git a/src/com/android/settings/language/LanguageAndInputSettings.java b/src/com/android/settings/language/LanguageAndInputSettings.java
index c896629..646120a 100644
--- a/src/com/android/settings/language/LanguageAndInputSettings.java
+++ b/src/com/android/settings/language/LanguageAndInputSettings.java
@@ -34,6 +34,8 @@
import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.search.SearchIndexable;
+import lineageos.hardware.LineageHardwareManager;
+
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@@ -46,6 +48,7 @@
private static final String KEY_KEYBOARDS_CATEGORY = "keyboards_category";
private static final String KEY_TEXT_TO_SPEECH = "tts_settings_summary";
private static final String KEY_POINTER_AND_TTS_CATEGORY = "pointer_and_tts_category";
+ private static final String KEY_TOUCH_HOVERING = "feature_touch_hovering";
@Override
public int getMetricsCategory() {
@@ -118,6 +121,16 @@
new BaseSearchIndexProvider(R.xml.language_and_input) {
@Override
+ public List<String> getNonIndexableKeys(Context context) {
+ List<String> keys = super.getNonIndexableKeys(context);
+ LineageHardwareManager hardware = LineageHardwareManager.getInstance(context);
+ if (!hardware.isSupported(LineageHardwareManager.FEATURE_TOUCH_HOVERING)) {
+ keys.add(KEY_TOUCH_HOVERING);
+ }
+ return keys;
+ }
+
+ @Override
public List<AbstractPreferenceController> createPreferenceControllers(
Context context) {
return buildPreferenceControllers(context, null);
diff --git a/src/com/android/settings/network/ApnEditor.java b/src/com/android/settings/network/ApnEditor.java
index f9eccfa..a852fd6 100644
--- a/src/com/android/settings/network/ApnEditor.java
+++ b/src/com/android/settings/network/ApnEditor.java
@@ -726,6 +726,9 @@
telephonyManager = telephonyManagerForSubId;
}
mMvnoMatchData.setText(telephonyManager.getGroupIdLevel1());
+ } else {
+ // mvno type 'none' case. At this time, mvnoIndex should be 0.
+ mMvnoMatchData.setText("");
}
}
@@ -784,6 +787,7 @@
}
mMvnoType.setValue((String) newValue);
mMvnoType.setSummary(mvno);
+ mMvnoMatchData.setSummary(checkNull(mMvnoMatchData.getText()));
} else if (KEY_PASSWORD.equals(key)) {
mPassword.setSummary(starify(newValue != null ? String.valueOf(newValue) : ""));
} else if (KEY_CARRIER_ENABLED.equals(key)) {
diff --git a/src/com/android/settings/network/telephony/CarrierSettingsVersionPreferenceController.java b/src/com/android/settings/network/telephony/CarrierSettingsVersionPreferenceController.java
index a6db773..aec3648 100644
--- a/src/com/android/settings/network/telephony/CarrierSettingsVersionPreferenceController.java
+++ b/src/com/android/settings/network/telephony/CarrierSettingsVersionPreferenceController.java
@@ -20,6 +20,7 @@
import android.os.PersistableBundle;
import android.telephony.CarrierConfigManager;
import android.telephony.SubscriptionManager;
+import android.text.TextUtils;
import com.android.settings.core.BasePreferenceController;
@@ -49,6 +50,6 @@
@Override
public int getAvailabilityStatus() {
- return AVAILABLE;
+ return TextUtils.isEmpty(getSummary()) ? UNSUPPORTED_ON_DEVICE : AVAILABLE;
}
}
diff --git a/src/com/android/settings/network/telephony/Enhanced4gBasePreferenceController.java b/src/com/android/settings/network/telephony/Enhanced4gBasePreferenceController.java
index d6aed67..dc915af 100644
--- a/src/com/android/settings/network/telephony/Enhanced4gBasePreferenceController.java
+++ b/src/com/android/settings/network/telephony/Enhanced4gBasePreferenceController.java
@@ -225,6 +225,9 @@
if (SubscriptionManager.isValidSubscriptionId(subId)) {
mTelephonyManager = mTelephonyManager.createForSubscriptionId(subId);
}
+ // assign current call state so that it helps to show correct preference state even
+ // before first onCallStateChanged() by initial registration.
+ mCallState = mTelephonyManager.getCallState(subId);
mTelephonyManager.listen(this, PhoneStateListener.LISTEN_CALL_STATE);
final long supportedRadioBitmask = mTelephonyManager.getSupportedRadioAccessFamily();
diff --git a/src/com/android/settings/network/telephony/Enhanced4gLteSliceHelper.java b/src/com/android/settings/network/telephony/Enhanced4gLteSliceHelper.java
index 9e46158..4291cde 100644
--- a/src/com/android/settings/network/telephony/Enhanced4gLteSliceHelper.java
+++ b/src/com/android/settings/network/telephony/Enhanced4gLteSliceHelper.java
@@ -139,7 +139,7 @@
*/
private Slice getEnhanced4gLteSlice(Uri sliceUri, boolean isEnhanced4gLteEnabled, int subId) {
final IconCompat icon = IconCompat.createWithResource(mContext,
- R.drawable.ic_launcher_settings);
+ R.mipmap.ic_launcher);
return new ListBuilder(mContext, sliceUri, ListBuilder.INFINITY)
.setAccentColor(Utils.getColorAccentDefaultColor(mContext))
diff --git a/src/com/android/settings/network/telephony/MobileDataPreferenceController.java b/src/com/android/settings/network/telephony/MobileDataPreferenceController.java
index c35eef6..91c46df 100644
--- a/src/com/android/settings/network/telephony/MobileDataPreferenceController.java
+++ b/src/com/android/settings/network/telephony/MobileDataPreferenceController.java
@@ -128,6 +128,13 @@
preference.setEnabled(true);
preference.setSummary(R.string.mobile_data_settings_summary);
}
+
+ if (mSubId == SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
+ preference.setSelectable(false);
+ preference.setSummary(R.string.mobile_data_settings_summary_unavailable);
+ } else {
+ preference.setSelectable(true);
+ }
}
private boolean isOpportunistic() {
diff --git a/src/com/android/settings/network/telephony/MobileNetworkActivity.java b/src/com/android/settings/network/telephony/MobileNetworkActivity.java
index 7f7dc3a..6513384 100644
--- a/src/com/android/settings/network/telephony/MobileNetworkActivity.java
+++ b/src/com/android/settings/network/telephony/MobileNetworkActivity.java
@@ -81,7 +81,7 @@
mCurSubscriptionId = updateSubscriptionIndex;
mFragmentForceReload = (mCurSubscriptionId == oldSubId);
final SubscriptionInfo info = getSubscription();
- updateSubscriptions(info);
+ updateSubscriptions(info, null);
// If the subscription has changed or the new intent doesnt contain the opt in action,
// remove the old discovery dialog. If the activity is being recreated, we will see
@@ -132,7 +132,7 @@
// perform registration after mCurSubscriptionId been configured.
registerActiveSubscriptionsListener();
- updateSubscriptions(subscription);
+ updateSubscriptions(subscription, savedInstanceState);
}
@VisibleForTesting
@@ -154,10 +154,15 @@
public void onChanged() {
SubscriptionInfo info = getSubscription();
int oldSubIndex = mCurSubscriptionId;
- updateSubscriptions(info);
+ updateSubscriptions(info, null);
// Remove the dialog if the subscription associated with this activity changes.
if (info == null) {
+ // Close the activity when subscription removed
+ if ((oldSubIndex != SUB_ID_NULL)
+ && (!isFinishing()) && (!isDestroyed())) {
+ finish();
+ }
return;
}
int subIndex = info.getSubscriptionId();
@@ -204,14 +209,16 @@
}
@VisibleForTesting
- void updateSubscriptions(SubscriptionInfo subscription) {
+ void updateSubscriptions(SubscriptionInfo subscription, Bundle savedInstanceState) {
if (subscription == null) {
return;
}
final int subscriptionIndex = subscription.getSubscriptionId();
updateTitleAndNavigation(subscription);
- switchFragment(subscription);
+ if (savedInstanceState == null) {
+ switchFragment(subscription);
+ }
mCurSubscriptionId = subscriptionIndex;
mFragmentForceReload = false;
diff --git a/src/com/android/settings/network/telephony/NetworkSelectSettings.java b/src/com/android/settings/network/telephony/NetworkSelectSettings.java
index bac4e7c..ff641e9 100644
--- a/src/com/android/settings/network/telephony/NetworkSelectSettings.java
+++ b/src/com/android/settings/network/telephony/NetworkSelectSettings.java
@@ -224,9 +224,13 @@
setProgressBarVisible(false);
getPreferenceScreen().setEnabled(true);
- mSelectedPreference.setSummary(isSucceed
- ? R.string.network_connected
- : R.string.network_could_not_connect);
+ if (mSelectedPreference != null) {
+ mSelectedPreference.setSummary(isSucceed
+ ? R.string.network_connected
+ : R.string.network_could_not_connect);
+ } else {
+ Log.e(TAG, "No preference to update!");
+ }
break;
case EVENT_NETWORK_SCAN_RESULTS:
final List<CellInfo> results = (List<CellInfo>) msg.obj;
diff --git a/src/com/android/settings/network/telephony/PreferredNetworkModePreferenceController.java b/src/com/android/settings/network/telephony/PreferredNetworkModePreferenceController.java
index 83fa208..ff6ff59 100644
--- a/src/com/android/settings/network/telephony/PreferredNetworkModePreferenceController.java
+++ b/src/com/android/settings/network/telephony/PreferredNetworkModePreferenceController.java
@@ -153,7 +153,7 @@
if (mTelephonyManager.getPhoneType() == TelephonyManager.PHONE_TYPE_CDMA
|| mIsGlobalCdma
|| MobileNetworkUtils.isWorldMode(mContext, mSubId)) {
- return R.string.preferred_network_mode_global_summary;
+ return R.string.preferred_network_mode_lte_cdma_evdo_gsm_wcdma_summary;
} else {
return R.string.preferred_network_mode_lte_summary;
}
@@ -174,7 +174,7 @@
case TelephonyManagerConstants.NETWORK_MODE_NR_LTE_GSM_WCDMA:
return R.string.preferred_network_mode_nr_lte_gsm_wcdma_summary;
case TelephonyManagerConstants.NETWORK_MODE_NR_LTE_CDMA_EVDO_GSM_WCDMA:
- return R.string.preferred_network_mode_nr_lte_cdma_evdo_gsm_wcdma_summary;
+ return R.string.preferred_network_mode_global_summary;
case TelephonyManagerConstants.NETWORK_MODE_NR_LTE_WCDMA:
return R.string.preferred_network_mode_nr_lte_wcdma_summary;
case TelephonyManagerConstants.NETWORK_MODE_NR_LTE_TDSCDMA:
diff --git a/src/com/android/settings/network/telephony/TelephonyStatusControlSession.java b/src/com/android/settings/network/telephony/TelephonyStatusControlSession.java
index 12c9bee..3716f1f 100644
--- a/src/com/android/settings/network/telephony/TelephonyStatusControlSession.java
+++ b/src/com/android/settings/network/telephony/TelephonyStatusControlSession.java
@@ -22,6 +22,7 @@
import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.utils.ThreadUtils;
+import java.util.ArrayList;
import java.util.Collection;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.Future;
@@ -37,7 +38,7 @@
private static final String LOG_TAG = "TelephonyStatusControlSS";
private Collection<AbstractPreferenceController> mControllers;
- private Future<Boolean> mResult;
+ private Collection<Future<Boolean>> mResult = new ArrayList<>();
/**
* Buider of session
@@ -67,9 +68,9 @@
private TelephonyStatusControlSession(Collection<AbstractPreferenceController> controllers) {
mControllers = controllers;
- mResult = ThreadUtils.postOnBackgroundThread(() ->
- setupAvailabilityStatus(controllers)
- );
+ controllers.forEach(prefCtrl -> mResult
+ .add(ThreadUtils.postOnBackgroundThread(() -> setupAvailabilityStatus(prefCtrl))));
+
}
/**
@@ -79,25 +80,24 @@
*/
public void close() {
//check the background thread is finished then unset the status of availability.
- try {
- mResult.get();
- } catch (ExecutionException | InterruptedException exception) {
- Log.e(LOG_TAG, "setup availability status failed!", exception);
+
+ for (Future<Boolean> result : mResult) {
+ try {
+ result.get();
+ } catch (ExecutionException | InterruptedException exception) {
+ Log.e(LOG_TAG, "setup availability status failed!", exception);
+ }
}
unsetAvailabilityStatus(mControllers);
}
- private Boolean setupAvailabilityStatus(
- Collection<AbstractPreferenceController> controllerLists) {
+ private Boolean setupAvailabilityStatus(AbstractPreferenceController controller) {
try {
- controllerLists.stream()
- .filter(controller -> controller instanceof TelephonyAvailabilityHandler)
- .map(TelephonyAvailabilityHandler.class::cast)
- .forEach(controller -> {
- int status = ((BasePreferenceController) controller)
- .getAvailabilityStatus();
- controller.setAvailabilityStatus(status);
- });
+ if (controller instanceof TelephonyAvailabilityHandler) {
+ int status = ((BasePreferenceController) controller)
+ .getAvailabilityStatus();
+ ((TelephonyAvailabilityHandler) controller).setAvailabilityStatus(status);
+ }
return true;
} catch (Exception exception) {
Log.e(LOG_TAG, "Setup availability status failed!", exception);
diff --git a/src/com/android/settings/network/telephony/VideoCallingPreferenceController.java b/src/com/android/settings/network/telephony/VideoCallingPreferenceController.java
index 3321fb3..fa8b47f 100644
--- a/src/com/android/settings/network/telephony/VideoCallingPreferenceController.java
+++ b/src/com/android/settings/network/telephony/VideoCallingPreferenceController.java
@@ -182,6 +182,9 @@
if (SubscriptionManager.isValidSubscriptionId(subId)) {
mTelephonyManager = mTelephonyManager.createForSubscriptionId(subId);
}
+ // assign current call state so that it helps to show correct preference state even
+ // before first onCallStateChanged() by initial registration.
+ mCallState = mTelephonyManager.getCallState(subId);
mTelephonyManager.listen(this, PhoneStateListener.LISTEN_CALL_STATE);
}
diff --git a/src/com/android/settings/network/telephony/WifiCallingPreferenceController.java b/src/com/android/settings/network/telephony/WifiCallingPreferenceController.java
index 32be36e..b38fe07 100644
--- a/src/com/android/settings/network/telephony/WifiCallingPreferenceController.java
+++ b/src/com/android/settings/network/telephony/WifiCallingPreferenceController.java
@@ -210,6 +210,9 @@
public void register(Context context, int subId) {
mTelephonyManager = getTelephonyManager(context, subId);
+ // assign current call state so that it helps to show correct preference state even
+ // before first onCallStateChanged() by initial registration.
+ mCallState = mTelephonyManager.getCallState(subId);
mTelephonyManager.listen(this, PhoneStateListener.LISTEN_CALL_STATE);
}
diff --git a/src/com/android/settings/notification/ConfigureNotificationSettings.java b/src/com/android/settings/notification/ConfigureNotificationSettings.java
index 6801a80..e72ab6c 100644
--- a/src/com/android/settings/notification/ConfigureNotificationSettings.java
+++ b/src/com/android/settings/notification/ConfigureNotificationSettings.java
@@ -53,7 +53,7 @@
private static final String TAG = "ConfigNotiSettings";
@VisibleForTesting
- static final String KEY_SWIPE_DOWN = "gesture_swipe_down_fingerprint_notifications";
+ //static final String KEY_SWIPE_DOWN = "gesture_swipe_down_fingerprint_notifications";
static final String KEY_LOCKSCREEN = "lock_screen_notifications";
private static final String KEY_NOTI_DEFAULT_RINGTONE = "notification_default_ringtone";
@@ -182,7 +182,7 @@
@Override
public List<String> getNonIndexableKeys(Context context) {
final List<String> keys = super.getNonIndexableKeys(context);
- keys.add(KEY_SWIPE_DOWN);
+ //keys.add(KEY_SWIPE_DOWN);
return keys;
}
};
diff --git a/src/com/android/settings/notification/IncreasingRingPreferenceController.java b/src/com/android/settings/notification/IncreasingRingPreferenceController.java
new file mode 100644
index 0000000..2152451
--- /dev/null
+++ b/src/com/android/settings/notification/IncreasingRingPreferenceController.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.notification;
+
+import android.content.Context;
+
+import com.android.settings.Utils;
+import com.android.settings.core.BasePreferenceController;
+
+public class IncreasingRingPreferenceController extends BasePreferenceController {
+ private static final String KEY_INCREASING_RING = "increasing_ring";
+
+ public IncreasingRingPreferenceController(Context context) {
+ super(context, KEY_INCREASING_RING);
+ }
+
+ @Override
+ public int getAvailabilityStatus() {
+ return Utils.isVoiceCapable(mContext) ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
+ }
+}
diff --git a/src/com/android/settings/notification/IncreasingRingVolumePreference.java b/src/com/android/settings/notification/IncreasingRingVolumePreference.java
new file mode 100644
index 0000000..ce12b00
--- /dev/null
+++ b/src/com/android/settings/notification/IncreasingRingVolumePreference.java
@@ -0,0 +1,256 @@
+/*
+ * Copyright (C) 2014 CyanogenMod Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.notification;
+
+import android.content.ContentResolver;
+import android.content.Context;
+import android.media.AudioAttributes;
+import android.media.AudioManager;
+import android.media.Ringtone;
+import android.media.RingtoneManager;
+import android.os.Handler;
+import android.os.HandlerThread;
+import android.os.Message;
+import android.provider.Settings;
+import android.text.format.Formatter;
+import android.util.AttributeSet;
+import android.util.Log;
+import android.widget.SeekBar;
+import android.widget.TextView;
+import androidx.core.content.res.TypedArrayUtils;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceViewHolder;
+
+import com.android.settings.R;
+
+import lineageos.providers.LineageSettings;
+
+public class IncreasingRingVolumePreference extends Preference implements
+ Handler.Callback, SeekBar.OnSeekBarChangeListener {
+ private static final String TAG = "IncreasingRingMinVolumePreference";
+
+ public interface Callback {
+ void onSampleStarting(IncreasingRingVolumePreference pref);
+ }
+
+ private SeekBar mStartVolumeSeekBar;
+ private SeekBar mRampUpTimeSeekBar;
+ private TextView mRampUpTimeValue;
+
+ private Ringtone mRingtone;
+ private Callback mCallback;
+
+ private Handler mHandler;
+ private final Handler mMainHandler = new Handler(this);
+
+ private static final int MSG_START_SAMPLE = 1;
+ private static final int MSG_STOP_SAMPLE = 2;
+ private static final int MSG_INIT_SAMPLE = 3;
+ private static final int MSG_SET_VOLUME = 4;
+ private static final int CHECK_RINGTONE_PLAYBACK_DELAY_MS = 1000;
+
+ public IncreasingRingVolumePreference(Context context) {
+ this(context, null);
+ }
+
+ public IncreasingRingVolumePreference(Context context, AttributeSet attrs) {
+ this(context, attrs, TypedArrayUtils.getAttr(
+ context, R.attr.customPreferenceStyle, android.R.attr.preferenceStyle));
+ }
+
+ public IncreasingRingVolumePreference(Context context, AttributeSet attrs,
+ int defStyleAttr) {
+ this(context, attrs, defStyleAttr, 0);
+ }
+
+ public IncreasingRingVolumePreference(Context context, AttributeSet attrs,
+ int defStyleAttr, int defStyleRes) {
+ super(context, attrs, defStyleAttr, defStyleRes);
+ setLayoutResource(R.layout.preference_increasing_ring);
+ initHandler();
+ }
+
+ public void setCallback(Callback callback) {
+ mCallback = callback;
+ }
+
+ public void onActivityResume() {
+ initHandler();
+ }
+
+ public void onActivityStop() {
+ if (mHandler != null) {
+ postStopSample();
+ mHandler.getLooper().quitSafely();
+ mHandler = null;
+ }
+ }
+
+ @Override
+ public boolean handleMessage(Message msg) {
+ switch (msg.what) {
+ case MSG_START_SAMPLE:
+ onStartSample((float) msg.arg1 / 1000F);
+ break;
+ case MSG_STOP_SAMPLE:
+ onStopSample();
+ break;
+ case MSG_INIT_SAMPLE:
+ onInitSample();
+ break;
+ case MSG_SET_VOLUME:
+ onSetVolume((float) msg.arg1 / 1000F);
+ break;
+ }
+ return true;
+ }
+
+ @Override
+ public void onBindViewHolder(PreferenceViewHolder holder) {
+ super.onBindViewHolder(holder);
+
+ initHandler();
+
+ final SeekBar seekBar = (SeekBar) holder.findViewById(R.id.start_volume);
+ if (seekBar == mStartVolumeSeekBar) return;
+
+ mStartVolumeSeekBar = seekBar;
+ mRampUpTimeSeekBar = (SeekBar) holder.findViewById(R.id.ramp_up_time);
+ mRampUpTimeValue = (TextView) holder.findViewById(R.id.ramp_up_time_value);
+
+ final ContentResolver cr = getContext().getContentResolver();
+ float startVolume = LineageSettings.System.getFloat(cr,
+ LineageSettings.System.INCREASING_RING_START_VOLUME, 0.1f);
+ int rampUpTime = LineageSettings.System.getInt(cr,
+ LineageSettings.System.INCREASING_RING_RAMP_UP_TIME, 10);
+
+ mStartVolumeSeekBar.setProgress(Math.round(startVolume * 1000F));
+ mStartVolumeSeekBar.setOnSeekBarChangeListener(this);
+ mRampUpTimeSeekBar.setOnSeekBarChangeListener(this);
+ mRampUpTimeSeekBar.setProgress((rampUpTime / 5) - 1);
+ mRampUpTimeValue.setText(
+ Formatter.formatShortElapsedTime(getContext(), rampUpTime * 1000));
+ }
+
+ @Override
+ public void onStartTrackingTouch(SeekBar seekBar) {
+ }
+
+ @Override
+ public void onStopTrackingTouch(SeekBar seekBar) {
+ if (seekBar == mStartVolumeSeekBar) {
+ postStartSample(seekBar.getProgress());
+ }
+ }
+
+ @Override
+ public void onProgressChanged(SeekBar seekBar, int progress, boolean fromTouch) {
+ ContentResolver cr = getContext().getContentResolver();
+ if (fromTouch && seekBar == mStartVolumeSeekBar) {
+ LineageSettings.System.putFloat(cr,
+ LineageSettings.System.INCREASING_RING_START_VOLUME, (float) progress / 1000F);
+ } else if (seekBar == mRampUpTimeSeekBar) {
+ int seconds = (progress + 1) * 5;
+ mRampUpTimeValue.setText(
+ Formatter.formatShortElapsedTime(getContext(), seconds * 1000));
+ if (fromTouch) {
+ LineageSettings.System.putInt(cr,
+ LineageSettings.System.INCREASING_RING_RAMP_UP_TIME, seconds);
+ }
+ }
+ }
+
+ private void initHandler() {
+ if (mHandler != null) return;
+
+ HandlerThread thread = new HandlerThread(TAG + ".CallbackHandler");
+ thread.start();
+
+ mHandler = new Handler(thread.getLooper(), this);
+ mHandler.sendEmptyMessage(MSG_INIT_SAMPLE);
+ }
+
+ private void onInitSample() {
+ mRingtone = RingtoneManager.getRingtone(getContext(),
+ Settings.System.DEFAULT_RINGTONE_URI);
+ if (mRingtone != null) {
+ mRingtone.setStreamType(AudioManager.STREAM_RING);
+ mRingtone.setAudioAttributes(
+ new AudioAttributes.Builder(mRingtone.getAudioAttributes())
+ .setFlags(AudioAttributes.FLAG_BYPASS_INTERRUPTION_POLICY |
+ AudioAttributes.FLAG_BYPASS_MUTE)
+ .build());
+ }
+ }
+
+ private void postStartSample(int progress) {
+ boolean playing = isSamplePlaying();
+ mHandler.removeMessages(MSG_START_SAMPLE);
+ mHandler.removeMessages(MSG_SET_VOLUME);
+ mHandler.sendMessageDelayed(mHandler.obtainMessage(MSG_START_SAMPLE, progress, 0),
+ playing ? CHECK_RINGTONE_PLAYBACK_DELAY_MS : 0);
+ if (playing) {
+ mHandler.sendMessage(mHandler.obtainMessage(MSG_SET_VOLUME, progress, 0));
+ }
+ }
+
+ private void onStartSample(float volume) {
+ if (mRingtone == null) {
+ return;
+ }
+ if (!isSamplePlaying()) {
+ if (mCallback != null) {
+ mCallback.onSampleStarting(this);
+ }
+ try {
+ mRingtone.play();
+ } catch (Throwable e) {
+ Log.w(TAG, "Error playing ringtone", e);
+ }
+ }
+ mRingtone.setVolume(volume);
+ }
+
+ private void onSetVolume(float volume) {
+ if (mRingtone != null) {
+ mRingtone.setVolume(volume);
+ }
+ }
+
+ private boolean isSamplePlaying() {
+ return mRingtone != null && mRingtone.isPlaying();
+ }
+
+ public void stopSample() {
+ if (mHandler != null) {
+ postStopSample();
+ }
+ }
+
+ private void postStopSample() {
+ // remove pending delayed start messages
+ mHandler.removeMessages(MSG_START_SAMPLE);
+ mHandler.removeMessages(MSG_STOP_SAMPLE);
+ mHandler.sendEmptyMessage(MSG_STOP_SAMPLE);
+ }
+
+ private void onStopSample() {
+ if (mRingtone != null) {
+ mRingtone.stop();
+ }
+ }
+}
diff --git a/src/com/android/settings/notification/IncreasingRingVolumePreferenceController.java b/src/com/android/settings/notification/IncreasingRingVolumePreferenceController.java
new file mode 100644
index 0000000..e1d6178
--- /dev/null
+++ b/src/com/android/settings/notification/IncreasingRingVolumePreferenceController.java
@@ -0,0 +1,109 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.notification;
+
+import android.content.Context;
+import androidx.preference.PreferenceScreen;
+
+import com.android.settings.Utils;
+import com.android.settings.slices.SliceData;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnResume;
+import com.android.settingslib.core.lifecycle.events.OnStop;
+
+/**
+ * Base class for preference controller that handles VolumeSeekBarPreference
+ */
+public class IncreasingRingVolumePreferenceController
+ extends AdjustVolumeRestrictedPreferenceController
+ implements LifecycleObserver, OnResume, OnStop {
+
+ private static final String KEY_INCREASING_RING_VOLUME = "increasing_ring_volume";
+
+ private IncreasingRingVolumePreference mPreference;
+ private IncreasingRingVolumePreference.Callback mCallback;
+ private AudioHelper mHelper;
+
+ public IncreasingRingVolumePreferenceController(Context context) {
+ super(context, KEY_INCREASING_RING_VOLUME);
+ mHelper = new AudioHelper(context);
+ }
+
+ public void setCallback(IncreasingRingVolumePreference.Callback callback) {
+ mCallback = callback;
+ }
+
+ @Override
+ public void displayPreference(PreferenceScreen screen) {
+ super.displayPreference(screen);
+ if (isAvailable()) {
+ final String key = getPreferenceKey();
+ mPreference = (IncreasingRingVolumePreference) screen.findPreference(key);
+ mPreference.setCallback(mCallback);
+ }
+ }
+
+ @Override
+ public void onResume() {
+ if (mPreference != null) {
+ mPreference.onActivityResume();
+ }
+ }
+
+ @Override
+ public void onStop() {
+ if (mPreference != null) {
+ mPreference.onActivityStop();
+ }
+ }
+
+ @Override
+ public String getPreferenceKey() {
+ return KEY_INCREASING_RING_VOLUME;
+ }
+
+ @Override
+ public int getSliderPosition() {
+ return 0;
+ }
+
+ @Override
+ public boolean setSliderPosition(int position) {
+ return false;
+ }
+
+ @Override
+ public int getMin() {
+ return 0;
+ }
+
+ @Override
+ public int getMax() {
+ return 0;
+ }
+
+ @Override
+ public int getAvailabilityStatus() {
+ boolean available = Utils.isVoiceCapable(mContext) && !mHelper.isSingleVolume();
+ return available ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
+ }
+
+ @Override
+ public int getSliceType() {
+ return SliceData.SliceType.INTENT;
+ }
+}
diff --git a/src/com/android/settings/notification/LinkedVolumesPreferenceController.java b/src/com/android/settings/notification/LinkedVolumesPreferenceController.java
new file mode 100644
index 0000000..aa56778
--- /dev/null
+++ b/src/com/android/settings/notification/LinkedVolumesPreferenceController.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2018 The LineageOS Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.notification;
+
+import android.content.Context;
+
+import com.android.settings.Utils;
+import com.android.settings.core.BasePreferenceController;
+
+public class LinkedVolumesPreferenceController extends BasePreferenceController {
+ public LinkedVolumesPreferenceController(Context context, String key) {
+ super(context, key);
+ }
+
+ @Override
+ public int getAvailabilityStatus() {
+ return Utils.isVoiceCapable(mContext) ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
+ }
+}
diff --git a/src/com/android/settings/notification/NotificationBackend.java b/src/com/android/settings/notification/NotificationBackend.java
index e23e4a5..3e7e99c 100644
--- a/src/com/android/settings/notification/NotificationBackend.java
+++ b/src/com/android/settings/notification/NotificationBackend.java
@@ -88,6 +88,7 @@
row.userId = UserHandle.getUserId(row.uid);
row.blockedChannelCount = getBlockedChannelCount(row.pkg, row.uid);
row.channelCount = getChannelCount(row.pkg, row.uid);
+ row.soundTimeout = getNotificationSoundTimeout(row.pkg, row.uid);
recordAggregatedUsageEvents(context, row);
return row;
}
@@ -576,6 +577,25 @@
sm.requestPinShortcut(shortcutInfo, null);
}
+ public long getNotificationSoundTimeout(String pkg, int uid) {
+ try {
+ return sINM.getNotificationSoundTimeout(pkg, uid);
+ } catch (Exception e) {
+ Log.w(TAG, "Error calling NoMan", e);
+ return 0;
+ }
+ }
+
+ public boolean setNotificationSoundTimeout(String pkg, int uid, long timeout) {
+ try {
+ sINM.setNotificationSoundTimeout(pkg, uid, timeout);
+ return true;
+ } catch (Exception e) {
+ Log.w(TAG, "Error calling NoMan", e);
+ return false;
+ }
+ }
+
/**
* NotificationsSentState contains how often an app sends notifications and how recently it sent
* one.
@@ -606,6 +626,7 @@
public int userId;
public int blockedChannelCount;
public int channelCount;
+ public long soundTimeout;
public Map<String, NotificationsSentState> sentByChannel;
public NotificationsSentState sentByApp;
}
diff --git a/src/com/android/settings/notification/NotificationVolumePreferenceController.java b/src/com/android/settings/notification/NotificationVolumePreferenceController.java
index 0fe0d62..820dc9b 100644
--- a/src/com/android/settings/notification/NotificationVolumePreferenceController.java
+++ b/src/com/android/settings/notification/NotificationVolumePreferenceController.java
@@ -35,8 +35,7 @@
@Override
public int getAvailabilityStatus() {
return mContext.getResources().getBoolean(R.bool.config_show_notification_volume)
- && !Utils.isVoiceCapable(mContext) && !mHelper.isSingleVolume()
- ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
+ && !mHelper.isSingleVolume() ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
}
@Override
@@ -64,4 +63,18 @@
return R.drawable.ic_notifications_off_24dp;
}
+ @Override
+ protected void updatePreferenceIcon() {
+ if (mPreference != null) {
+ if (mRingerMode == AudioManager.RINGER_MODE_VIBRATE) {
+ mMuteIcon = R.drawable.ic_volume_ringer_vibrate;
+ mPreference.showIcon(R.drawable.ic_volume_ringer_vibrate);
+ } else if (mRingerMode == AudioManager.RINGER_MODE_SILENT) {
+ mMuteIcon = R.drawable.ic_notifications_off_24dp;
+ mPreference.showIcon(R.drawable.ic_notifications_off_24dp);
+ } else {
+ mPreference.showIcon(R.drawable.ic_notifications);
+ }
+ }
+ }
}
diff --git a/src/com/android/settings/notification/RingVolumePreferenceController.java b/src/com/android/settings/notification/RingVolumePreferenceController.java
index 5e7d067..5e9d0fd 100644
--- a/src/com/android/settings/notification/RingVolumePreferenceController.java
+++ b/src/com/android/settings/notification/RingVolumePreferenceController.java
@@ -43,12 +43,12 @@
private static final String KEY_RING_VOLUME = "ring_volume";
private Vibrator mVibrator;
- private int mRingerMode = -1;
+ protected int mRingerMode = -1;
private ComponentName mSuppressor;
private final RingReceiver mReceiver = new RingReceiver();
private final H mHandler = new H();
- private int mMuteIcon;
+ protected int mMuteIcon;
public RingVolumePreferenceController(Context context) {
this(context, KEY_RING_VOLUME);
@@ -133,7 +133,7 @@
updatePreferenceIcon();
}
- private void updatePreferenceIcon() {
+ protected void updatePreferenceIcon() {
if (mPreference != null) {
if (mRingerMode == AudioManager.RINGER_MODE_VIBRATE) {
mMuteIcon = R.drawable.ic_volume_ringer_vibrate;
@@ -142,7 +142,7 @@
mMuteIcon = R.drawable.ic_notifications_off_24dp;
mPreference.showIcon(R.drawable.ic_notifications_off_24dp);
} else {
- mPreference.showIcon(R.drawable.ic_notifications);
+ mPreference.showIcon(R.drawable.ic_audio_ring);
}
}
}
diff --git a/src/com/android/settings/notification/SoundSettings.java b/src/com/android/settings/notification/SoundSettings.java
index b088fe3..ec2e31d 100644
--- a/src/com/android/settings/notification/SoundSettings.java
+++ b/src/com/android/settings/notification/SoundSettings.java
@@ -61,6 +61,8 @@
@VisibleForTesting
final VolumePreferenceCallback mVolumeCallback = new VolumePreferenceCallback();
+ private final IncreasingRingVolumePreferenceCallback mIncreasingRingVolumeCallback =
+ new IncreasingRingVolumePreferenceCallback();
@VisibleForTesting
final Handler mHandler = new Handler(Looper.getMainLooper()) {
@Override
@@ -68,6 +70,7 @@
switch (msg.what) {
case STOP_SAMPLE:
mVolumeCallback.stopSample();
+ mIncreasingRingVolumeCallback.stopSample();
break;
}
}
@@ -108,6 +111,7 @@
public void onPause() {
super.onPause();
mVolumeCallback.stopSample();
+ mIncreasingRingVolumeCallback.stopSample();
}
@Override
@@ -195,6 +199,11 @@
controller.setCallback(mVolumeCallback);
getSettingsLifecycle().addObserver(controller);
}
+
+ IncreasingRingVolumePreferenceController irvpc =
+ use(IncreasingRingVolumePreferenceController.class);
+ irvpc.setCallback(mIncreasingRingVolumeCallback);
+ getLifecycle().addObserver(irvpc);
}
// === Volumes ===
@@ -207,6 +216,7 @@
if (mCurrent != null && mCurrent != sbv) {
mCurrent.stopSample();
}
+ mIncreasingRingVolumeCallback.stopSample();
mCurrent = sbv;
if (mCurrent != null) {
mHandler.removeMessages(STOP_SAMPLE);
@@ -229,6 +239,26 @@
}
}
+ final class IncreasingRingVolumePreferenceCallback implements
+ IncreasingRingVolumePreference.Callback {
+ private IncreasingRingVolumePreference mPlayingPref;
+
+ @Override
+ public void onSampleStarting(IncreasingRingVolumePreference pref) {
+ mPlayingPref = pref;
+ mVolumeCallback.stopSample();
+ mHandler.removeMessages(STOP_SAMPLE);
+ mHandler.sendEmptyMessageDelayed(STOP_SAMPLE, SAMPLE_CUTOFF);
+ }
+
+ public void stopSample() {
+ if (mPlayingPref != null) {
+ mPlayingPref.stopSample();
+ mPlayingPref = null;
+ }
+ }
+ };
+
private static List<AbstractPreferenceController> buildPreferenceControllers(Context context,
SoundSettings fragment, Lifecycle lifecycle) {
final List<AbstractPreferenceController> controllers = new ArrayList<>();
@@ -239,6 +269,8 @@
controllers.add(new PhoneRingtonePreferenceController(context));
controllers.add(new AlarmRingtonePreferenceController(context));
controllers.add(new NotificationRingtonePreferenceController(context));
+ controllers.add(new IncreasingRingPreferenceController(context));
+ controllers.add(new IncreasingRingVolumePreferenceController(context));
// === Work Sound Settings ===
controllers.add(new WorkSoundPreferenceController(context, fragment, lifecycle));
diff --git a/src/com/android/settings/notification/app/AppNotificationSettings.java b/src/com/android/settings/notification/app/AppNotificationSettings.java
index 58c18ba..d277739 100644
--- a/src/com/android/settings/notification/app/AppNotificationSettings.java
+++ b/src/com/android/settings/notification/app/AppNotificationSettings.java
@@ -41,7 +41,9 @@
private static String KEY_ADVANCED_CATEGORY = "app_advanced";
private static String KEY_BADGE = "badge";
private static String KEY_APP_LINK = "app_link";
- private static String[] LEGACY_NON_ADVANCED_KEYS = {KEY_BADGE, KEY_APP_LINK};
+ private static String KEY_SOUND_TIMEOUT = "sound_timeout";
+ private static String[] LEGACY_NON_ADVANCED_KEYS =
+ {KEY_BADGE, KEY_APP_LINK, KEY_SOUND_TIMEOUT};
@Override
public int getMetricsCategory() {
@@ -101,6 +103,7 @@
mControllers.add(new HeaderPreferenceController(context, this));
mControllers.add(new BlockPreferenceController(context, mDependentFieldListener, mBackend));
mControllers.add(new BadgePreferenceController(context, mBackend));
+ mControllers.add(new SoundTimeoutPreferenceController(context, mBackend));
mControllers.add(new AllowSoundPreferenceController(
context, mDependentFieldListener, mBackend));
mControllers.add(new ImportancePreferenceController(
diff --git a/src/com/android/settings/notification/app/SoundTimeoutPreferenceController.java b/src/com/android/settings/notification/app/SoundTimeoutPreferenceController.java
new file mode 100644
index 0000000..347e4ef
--- /dev/null
+++ b/src/com/android/settings/notification/app/SoundTimeoutPreferenceController.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright (C) 2019 The LineageOS Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.notification.app;
+
+import android.content.Context;
+import android.provider.Settings;
+
+import androidx.preference.Preference;
+
+import com.android.settings.RestrictedListPreference;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settings.notification.NotificationBackend;
+
+public class SoundTimeoutPreferenceController extends NotificationPreferenceController
+ implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener {
+
+ private static final String TAG = "SoundTimeoutPreferenceController";
+ private static final String KEY_SOUND_TIMEOUT = "sound_timeout";
+
+ public SoundTimeoutPreferenceController(Context context,
+ NotificationBackend backend) {
+ super(context, backend);
+ }
+
+ @Override
+ public String getPreferenceKey() {
+ return KEY_SOUND_TIMEOUT;
+ }
+
+ @Override
+ public boolean isAvailable() {
+ if (!super.isAvailable()) {
+ return false;
+ }
+ if (mAppRow == null) {
+ return false;
+ }
+ return true;
+ }
+
+ public void updateState(Preference preference) {
+ if (mAppRow != null) {
+ RestrictedListPreference pref = (RestrictedListPreference) preference;
+ pref.setDisabledByAdmin(mAdmin);
+
+ pref.setSummary("%s");
+ pref.setValue(Long.toString(mAppRow.soundTimeout));
+ }
+ }
+
+ @Override
+ public boolean onPreferenceChange(Preference preference, Object newValue) {
+ if (mAppRow != null) {
+ mAppRow.soundTimeout = Long.valueOf((String) newValue);
+ mBackend.setNotificationSoundTimeout(mAppRow.pkg, mAppRow.uid, mAppRow.soundTimeout);
+ }
+ return true;
+ }
+
+}
diff --git a/src/com/android/settings/overlay/FeatureFactory.java b/src/com/android/settings/overlay/FeatureFactory.java
index b9aa68a..afbce09 100644
--- a/src/com/android/settings/overlay/FeatureFactory.java
+++ b/src/com/android/settings/overlay/FeatureFactory.java
@@ -31,7 +31,6 @@
import com.android.settings.dashboard.DashboardFeatureProvider;
import com.android.settings.dashboard.suggestions.SuggestionFeatureProvider;
import com.android.settings.enterprise.EnterprisePrivacyFeatureProvider;
-import com.android.settings.fuelgauge.BatteryStatusFeatureProvider;
import com.android.settings.fuelgauge.PowerUsageFeatureProvider;
import com.android.settings.gestures.AssistGestureFeatureProvider;
import com.android.settings.homepage.contextualcards.ContextualCardFeatureProvider;
@@ -104,12 +103,6 @@
public abstract PowerUsageFeatureProvider getPowerUsageFeatureProvider(Context context);
- /**
- * Retrieve implementation for Battery Status feature.
- */
- public abstract BatteryStatusFeatureProvider getBatteryStatusFeatureProvider(
- Context context);
-
public abstract DashboardFeatureProvider getDashboardFeatureProvider(Context context);
public abstract DockUpdaterFeatureProvider getDockUpdaterFeatureProvider();
diff --git a/src/com/android/settings/overlay/FeatureFactoryImpl.java b/src/com/android/settings/overlay/FeatureFactoryImpl.java
index d4d396f..29beb5b 100644
--- a/src/com/android/settings/overlay/FeatureFactoryImpl.java
+++ b/src/com/android/settings/overlay/FeatureFactoryImpl.java
@@ -42,8 +42,6 @@
import com.android.settings.dashboard.suggestions.SuggestionFeatureProviderImpl;
import com.android.settings.enterprise.EnterprisePrivacyFeatureProvider;
import com.android.settings.enterprise.EnterprisePrivacyFeatureProviderImpl;
-import com.android.settings.fuelgauge.BatteryStatusFeatureProvider;
-import com.android.settings.fuelgauge.BatteryStatusFeatureProviderImpl;
import com.android.settings.fuelgauge.PowerUsageFeatureProvider;
import com.android.settings.fuelgauge.PowerUsageFeatureProviderImpl;
import com.android.settings.gestures.AssistGestureFeatureProvider;
@@ -80,7 +78,6 @@
private SecurityFeatureProvider mSecurityFeatureProvider;
private SuggestionFeatureProvider mSuggestionFeatureProvider;
private PowerUsageFeatureProvider mPowerUsageFeatureProvider;
- private BatteryStatusFeatureProvider mBatteryStatusFeatureProvider;
private AssistGestureFeatureProvider mAssistGestureFeatureProvider;
private UserFeatureProvider mUserFeatureProvider;
private SlicesFeatureProvider mSlicesFeatureProvider;
@@ -114,15 +111,6 @@
}
@Override
- public BatteryStatusFeatureProvider getBatteryStatusFeatureProvider(Context context) {
- if (mBatteryStatusFeatureProvider == null) {
- mBatteryStatusFeatureProvider = new BatteryStatusFeatureProviderImpl(
- context.getApplicationContext());
- }
- return mBatteryStatusFeatureProvider;
- }
-
- @Override
public DashboardFeatureProvider getDashboardFeatureProvider(Context context) {
if (mDashboardFeatureProvider == null) {
mDashboardFeatureProvider = new DashboardFeatureProviderImpl(
diff --git a/src/com/android/settings/panel/PanelFragment.java b/src/com/android/settings/panel/PanelFragment.java
index 6f2d59b..7db312d 100644
--- a/src/com/android/settings/panel/PanelFragment.java
+++ b/src/com/android/settings/panel/PanelFragment.java
@@ -182,8 +182,13 @@
private void createPanelContent() {
final FragmentActivity activity = getActivity();
+ if (activity == null) {
+ return;
+ }
+
if (mLayoutView == null) {
activity.finish();
+ return;
}
final ViewGroup.LayoutParams params = mLayoutView.getLayoutParams();
@@ -215,6 +220,7 @@
if (mPanel == null) {
activity.finish();
+ return;
}
mPanel.registerCallback(new LocalPanelCallback());
diff --git a/src/com/android/settings/panel/VolumePanel.java b/src/com/android/settings/panel/VolumePanel.java
index d45bfd1..b11a2f8 100644
--- a/src/com/android/settings/panel/VolumePanel.java
+++ b/src/com/android/settings/panel/VolumePanel.java
@@ -21,6 +21,7 @@
import static com.android.settings.slices.CustomSliceRegistry.VOLUME_ALARM_URI;
import static com.android.settings.slices.CustomSliceRegistry.VOLUME_CALL_URI;
import static com.android.settings.slices.CustomSliceRegistry.VOLUME_MEDIA_URI;
+import static com.android.settings.slices.CustomSliceRegistry.VOLUME_NOTIFICATION_URI;
import static com.android.settings.slices.CustomSliceRegistry.VOLUME_RINGER_URI;
import android.app.settings.SettingsEnums;
@@ -30,6 +31,7 @@
import android.provider.Settings;
import com.android.settings.R;
+import com.android.settings.Utils;
import java.util.ArrayList;
import java.util.List;
@@ -60,6 +62,10 @@
uris.add(MEDIA_OUTPUT_INDICATOR_SLICE_URI);
uris.add(VOLUME_CALL_URI);
uris.add(VOLUME_RINGER_URI);
+ if (Utils.isVoiceCapable(mContext) && Settings.Secure.getInt(
+ mContext.getContentResolver(), Settings.Secure.VOLUME_LINK_NOTIFICATION, 1) == 0) {
+ uris.add(VOLUME_NOTIFICATION_URI);
+ }
uris.add(VOLUME_ALARM_URI);
return uris;
}
diff --git a/src/com/android/settings/password/ChooseLockPattern.java b/src/com/android/settings/password/ChooseLockPattern.java
index 27fc9f0..49ee547 100644
--- a/src/com/android/settings/password/ChooseLockPattern.java
+++ b/src/com/android/settings/password/ChooseLockPattern.java
@@ -103,7 +103,7 @@
private final Intent mIntent;
public IntentBuilder(Context context) {
- mIntent = new Intent(context, ChooseLockPattern.class);
+ mIntent = new Intent(context, ChooseLockPatternSize.class);
mIntent.putExtra(EncryptionInterstitial.EXTRA_REQUIRE_PASSWORD, false);
mIntent.putExtra(ChooseLockGeneric.CONFIRM_CREDENTIALS, false);
mIntent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_HAS_CHALLENGE, false);
@@ -216,6 +216,7 @@
protected FooterButton mSkipOrClearButton;
private FooterButton mNextButton;
@VisibleForTesting protected LockscreenCredential mChosenPattern;
+ private byte mPatternSize = LockPatternUtils.PATTERN_SIZE_DEFAULT;
private ColorStateList mDefaultHeaderColorList;
// ScrollView that contains title and header, only exist in land mode
@@ -224,13 +225,7 @@
/**
* The patten used during the help screen to show how to draw a pattern.
*/
- private final List<LockPatternView.Cell> mAnimatePattern =
- Collections.unmodifiableList(Lists.newArrayList(
- LockPatternView.Cell.of(0, 0),
- LockPatternView.Cell.of(0, 1),
- LockPatternView.Cell.of(1, 1),
- LockPatternView.Cell.of(2, 1)
- ));
+ private List<LockPatternView.Cell> mAnimatePattern;
@Override
public void onActivityResult(int requestCode, int resultCode,
@@ -280,7 +275,7 @@
if (mChosenPattern == null) throw new IllegalStateException(
"null chosen pattern in stage 'need to confirm");
try (LockscreenCredential confirmPattern =
- LockscreenCredential.createPattern(pattern)) {
+ LockscreenCredential.createPattern(pattern, mPatternSize)) {
if (mChosenPattern.equals(confirmPattern)) {
updateStage(Stage.ChoiceConfirmed);
} else {
@@ -291,7 +286,8 @@
if (pattern.size() < LockPatternUtils.MIN_LOCK_PATTERN_SIZE) {
updateStage(Stage.ChoiceTooShort);
} else {
- mChosenPattern = LockscreenCredential.createPattern(pattern);
+ mChosenPattern = LockscreenCredential.createPattern(
+ pattern, mPatternSize);
updateStage(Stage.FirstChoiceValid);
}
} else {
@@ -483,7 +479,7 @@
w.setBlocking(true);
w.setListener(this);
w.start(mChooseLockSettingsHelper.utils(), required,
- false, 0, current, current, mUserId);
+ false, 0, current, current, mUserId, mPatternSize);
}
mForFingerprint = intent.getBooleanExtra(
ChooseLockSettingsHelper.EXTRA_KEY_FOR_FINGERPRINT, false);
@@ -530,6 +526,16 @@
mSkipOrClearButton = mixin.getSecondaryButton();
mNextButton = mixin.getPrimaryButton();
+ mPatternSize = getActivity().getIntent().getByteExtra("pattern_size",
+ LockPatternUtils.PATTERN_SIZE_DEFAULT);
+ LockPatternView.Cell.updateSize(mPatternSize);
+ mAnimatePattern = Collections.unmodifiableList(Lists.newArrayList(
+ LockPatternView.Cell.of(0, 0, mPatternSize),
+ LockPatternView.Cell.of(0, 1, mPatternSize),
+ LockPatternView.Cell.of(1, 1, mPatternSize),
+ LockPatternView.Cell.of(2, 1, mPatternSize)
+ ));
+
return layout;
}
@@ -545,6 +551,8 @@
mLockPatternView.setTactileFeedbackEnabled(
mChooseLockSettingsHelper.utils().isTactileFeedbackEnabled());
mLockPatternView.setFadePattern(false);
+ mLockPatternView.setLockPatternUtils(mChooseLockSettingsHelper.utils());
+ mLockPatternView.setLockPatternSize(mPatternSize);
mFooterText = (TextView) view.findViewById(R.id.footerText);
@@ -586,6 +594,9 @@
} else {
// restore from previous state
mChosenPattern = savedInstanceState.getParcelable(KEY_PATTERN_CHOICE);
+ mLockPatternView.setPattern(DisplayMode.Correct,
+ LockPatternUtils.byteArrayToPattern(
+ mChosenPattern.getCredential(), mPatternSize));
if (mCurrentCredential == null) {
mCurrentCredential = savedInstanceState.getParcelable(KEY_CURRENT_PATTERN);
@@ -854,7 +865,8 @@
}
}
mSaveAndFinishWorker.start(mChooseLockSettingsHelper.utils(), required,
- mHasChallenge, mChallenge, mChosenPattern, mCurrentCredential, mUserId);
+ mHasChallenge, mChallenge, mChosenPattern, mCurrentCredential, mUserId,
+ mPatternSize);
}
@Override
@@ -883,16 +895,19 @@
private LockscreenCredential mChosenPattern;
private LockscreenCredential mCurrentCredential;
private boolean mLockVirgin;
+ private byte mPatternSize;
public void start(LockPatternUtils utils, boolean credentialRequired, boolean hasChallenge,
long challenge, LockscreenCredential chosenPattern,
- LockscreenCredential currentCredential, int userId) {
+ LockscreenCredential currentCredential, int userId,
+ byte patternSize) {
prepare(utils, credentialRequired, hasChallenge, challenge, userId);
mCurrentCredential = currentCredential != null ? currentCredential
: LockscreenCredential.createNone();
mChosenPattern = chosenPattern;
mUserId = userId;
+ mPatternSize = patternSize;
mLockVirgin = !mUtils.isPatternEverChosen(mUserId);
@@ -902,6 +917,7 @@
@Override
protected Pair<Boolean, Intent> saveAndVerifyInBackground() {
final int userId = mUserId;
+ mUtils.setLockPatternSize(mPatternSize, userId);
final boolean success = mUtils.setLockCredential(mChosenPattern, mCurrentCredential,
userId);
if (success) {
diff --git a/src/com/android/settings/password/ChooseLockPatternSize.java b/src/com/android/settings/password/ChooseLockPatternSize.java
new file mode 100644
index 0000000..6b81a65
--- /dev/null
+++ b/src/com/android/settings/password/ChooseLockPatternSize.java
@@ -0,0 +1,159 @@
+/*
+ * Copyright (C) 2012-2013 The CyanogenMod Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.password;
+
+import android.content.Intent;
+import android.content.res.Resources.Theme;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.preference.Preference;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.android.internal.widget.LockPatternUtils;
+import com.android.internal.widget.LockscreenCredential;
+import com.android.settings.EncryptionInterstitial;
+import com.android.settings.R;
+import com.android.settings.SettingsActivity;
+import com.android.settings.SetupWizardUtils;
+import com.android.settings.SettingsPreferenceFragment;
+import com.android.settings.utils.SettingsDividerItemDecoration;
+
+import com.google.android.setupdesign.GlifPreferenceLayout;
+
+import org.lineageos.internal.logging.LineageMetricsLogger;
+
+public class ChooseLockPatternSize extends SettingsActivity {
+
+ @Override
+ public Intent getIntent() {
+ Intent modIntent = new Intent(super.getIntent());
+ modIntent.putExtra(EXTRA_SHOW_FRAGMENT, ChooseLockPatternSizeFragment.class.getName());
+ return modIntent;
+ }
+
+ @Override
+ protected void onApplyThemeResource(Theme theme, int resid, boolean first) {
+ resid = SetupWizardUtils.getTheme(getIntent());
+ super.onApplyThemeResource(theme, resid, first);
+ }
+
+ @Override
+ protected boolean isValidFragment(String fragmentName) {
+ if (ChooseLockPatternSizeFragment.class.getName().equals(fragmentName)) return true;
+ return false;
+ }
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ findViewById(R.id.content_parent).setFitsSystemWindows(false);
+ }
+
+ public static class ChooseLockPatternSizeFragment extends SettingsPreferenceFragment {
+ private ChooseLockSettingsHelper mChooseLockSettingsHelper;
+
+ @Override
+ public void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ mChooseLockSettingsHelper = new ChooseLockSettingsHelper(this.getActivity());
+ if (!(getActivity() instanceof ChooseLockPatternSize)) {
+ throw new SecurityException("Fragment contained in wrong activity");
+ }
+ addPreferencesFromResource(R.xml.security_settings_pattern_size);
+ setHeaderView(R.layout.choose_lock_pattern_size_header);
+ }
+
+ @Override
+ public boolean onPreferenceTreeClick(Preference preference) {
+ final String key = preference.getKey();
+
+ byte patternSize;
+ if ("lock_pattern_size_4".equals(key)) {
+ patternSize = 4;
+ } else if ("lock_pattern_size_5".equals(key)) {
+ patternSize = 5;
+ } else if ("lock_pattern_size_6".equals(key)) {
+ patternSize = 6;
+ } else {
+ patternSize = 3;
+ }
+
+ final boolean isFallback = getActivity().getIntent()
+ .getBooleanExtra(LockPatternUtils.LOCKSCREEN_BIOMETRIC_WEAK_FALLBACK, false);
+
+ Intent intent = new Intent(getActivity(), ChooseLockPattern.class);
+ intent.putExtra("pattern_size", patternSize);
+ intent.putExtra("key_lock_method", "pattern");
+ intent.putExtra("confirm_credentials", false);
+ intent.putExtra(LockPatternUtils.LOCKSCREEN_BIOMETRIC_WEAK_FALLBACK,
+ isFallback);
+
+ Intent originatingIntent = getActivity().getIntent();
+ // Forward the challenge extras if available in originating intent.
+ if (originatingIntent.hasExtra(ChooseLockSettingsHelper.EXTRA_KEY_HAS_CHALLENGE)) {
+ intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_HAS_CHALLENGE,
+ originatingIntent.getBooleanExtra(
+ ChooseLockSettingsHelper.EXTRA_KEY_HAS_CHALLENGE, false));
+
+ intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE,
+ originatingIntent.getLongExtra(
+ ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE, 0));
+ }
+ // Forward the Encryption interstitial required password selection
+ if (originatingIntent.hasExtra(EncryptionInterstitial.EXTRA_REQUIRE_PASSWORD)) {
+ intent.putExtra(EncryptionInterstitial.EXTRA_REQUIRE_PASSWORD, originatingIntent
+ .getBooleanExtra(EncryptionInterstitial.EXTRA_REQUIRE_PASSWORD, true));
+ }
+ intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_PASSWORD,
+ (LockscreenCredential) originatingIntent.getParcelableExtra(
+ ChooseLockSettingsHelper.EXTRA_KEY_PASSWORD));
+ intent.addFlags(Intent.FLAG_ACTIVITY_FORWARD_RESULT);
+ startActivity(intent);
+
+ finish();
+ return true;
+ }
+
+ @Override
+ public void onViewCreated(View view, Bundle savedInstanceState) {
+ super.onViewCreated(view, savedInstanceState);
+ GlifPreferenceLayout layout = (GlifPreferenceLayout) view;
+ layout.setDividerItemDecoration(new SettingsDividerItemDecoration(getContext()));
+
+ layout.setIcon(getContext().getDrawable(R.drawable.ic_lock));
+
+ // Use the dividers in SetupWizardRecyclerLayout. Suppress the dividers in
+ // PreferenceFragment.
+ setDivider(null);
+ }
+
+ @Override
+ public RecyclerView onCreateRecyclerView(LayoutInflater inflater, ViewGroup parent,
+ Bundle savedInstanceState) {
+ GlifPreferenceLayout layout = (GlifPreferenceLayout) parent;
+ return layout.onCreateRecyclerView(inflater, parent, savedInstanceState);
+ }
+
+ @Override
+ public int getMetricsCategory() {
+ return LineageMetricsLogger.CHOOSE_LOCK_PATTERN_SIZE;
+ }
+ }
+}
diff --git a/src/com/android/settings/password/ConfirmDeviceCredentialBaseActivity.java b/src/com/android/settings/password/ConfirmDeviceCredentialBaseActivity.java
index 383ae4f..6d278c0 100644
--- a/src/com/android/settings/password/ConfirmDeviceCredentialBaseActivity.java
+++ b/src/com/android/settings/password/ConfirmDeviceCredentialBaseActivity.java
@@ -176,6 +176,11 @@
}
}
+ @Override
+ public boolean isLaunchableInTaskModePinned() {
+ return true;
+ }
+
public void prepareEnterAnimation() {
getFragment().prepareEnterAnimation();
}
diff --git a/src/com/android/settings/password/ConfirmLockPattern.java b/src/com/android/settings/password/ConfirmLockPattern.java
index 48014cb..b8ca6b5 100644
--- a/src/com/android/settings/password/ConfirmLockPattern.java
+++ b/src/com/android/settings/password/ConfirmLockPattern.java
@@ -145,6 +145,8 @@
mLockPatternUtils.isTactileFeedbackEnabled());
mLockPatternView.setInStealthMode(!mLockPatternUtils.isVisiblePatternEnabled(
mEffectiveUserId));
+ mLockPatternView.setLockPatternSize(
+ mLockPatternUtils.getLockPatternSize(mEffectiveUserId));
mLockPatternView.setOnPatternListener(mConfirmExistingLockPatternListener);
updateStage(Stage.NeedToUnlock);
@@ -424,7 +426,8 @@
final boolean verifyChallenge = getActivity().getIntent().getBooleanExtra(
ChooseLockSettingsHelper.EXTRA_KEY_HAS_CHALLENGE, false);
- final LockscreenCredential credential = LockscreenCredential.createPattern(pattern);
+ final LockscreenCredential credential = LockscreenCredential.createPattern(pattern,
+ mLockPatternUtils.getLockPatternSize(mEffectiveUserId));
//TODO: how to sanitize this?
Intent intent = new Intent();
if (verifyChallenge) {
diff --git a/src/com/android/settings/privacy/PermissionBarChartPreferenceController.java b/src/com/android/settings/privacy/PermissionBarChartPreferenceController.java
new file mode 100644
index 0000000..087fdf9
--- /dev/null
+++ b/src/com/android/settings/privacy/PermissionBarChartPreferenceController.java
@@ -0,0 +1,249 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.privacy;
+
+import static android.Manifest.permission_group.CAMERA;
+import static android.Manifest.permission_group.LOCATION;
+import static android.Manifest.permission_group.MICROPHONE;
+
+import static java.util.concurrent.TimeUnit.DAYS;
+
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.graphics.drawable.Drawable;
+import android.os.Bundle;
+import android.permission.PermissionControllerManager;
+import android.permission.RuntimePermissionUsageInfo;
+import android.provider.DeviceConfig;
+import android.util.Log;
+import android.view.View;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.PreferenceScreen;
+
+import com.android.settings.R;
+import com.android.settings.core.BasePreferenceController;
+import com.android.settingslib.Utils;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnCreate;
+import com.android.settingslib.core.lifecycle.events.OnSaveInstanceState;
+import com.android.settingslib.core.lifecycle.events.OnStart;
+import com.android.settingslib.widget.BarChartInfo;
+import com.android.settingslib.widget.BarChartPreference;
+import com.android.settingslib.widget.BarViewInfo;
+
+import java.util.ArrayList;
+import java.util.List;
+
+
+public class PermissionBarChartPreferenceController extends BasePreferenceController implements
+ PermissionControllerManager.OnPermissionUsageResultCallback, LifecycleObserver, OnCreate,
+ OnStart, OnSaveInstanceState {
+
+ private static final String TAG = "BarChartPreferenceCtl";
+ private static final String KEY_PERMISSION_USAGE = "usage_infos";
+
+ @VisibleForTesting
+ List<RuntimePermissionUsageInfo> mOldUsageInfos;
+ private PackageManager mPackageManager;
+ private PrivacyDashboardFragment mParent;
+ private BarChartPreference mBarChartPreference;
+
+ public PermissionBarChartPreferenceController(Context context, String preferenceKey) {
+ super(context, preferenceKey);
+ mOldUsageInfos = new ArrayList<>();
+ mPackageManager = context.getPackageManager();
+ }
+
+ public void setFragment(PrivacyDashboardFragment fragment) {
+ mParent = fragment;
+ }
+
+ @Override
+ public void onCreate(Bundle savedInstanceState) {
+ if (savedInstanceState != null) {
+ mOldUsageInfos = savedInstanceState.getParcelableArrayList(KEY_PERMISSION_USAGE);
+ }
+ }
+
+ @Override
+ public void onSaveInstanceState(Bundle outState) {
+ outState.putParcelableList(KEY_PERMISSION_USAGE, mOldUsageInfos);
+ }
+
+ @Override
+ public int getAvailabilityStatus() {
+ return Boolean.parseBoolean(
+ DeviceConfig.getProperty(DeviceConfig.NAMESPACE_PRIVACY,
+ com.android.settings.Utils.PROPERTY_PERMISSIONS_HUB_ENABLED)) ?
+ AVAILABLE_UNSEARCHABLE : UNSUPPORTED_ON_DEVICE;
+ }
+
+ @Override
+ public void displayPreference(PreferenceScreen screen) {
+ super.displayPreference(screen);
+ mBarChartPreference = screen.findPreference(getPreferenceKey());
+
+ final BarChartInfo info = new BarChartInfo.Builder()
+ .setTitle(R.string.permission_bar_chart_title)
+ .setDetails(R.string.permission_bar_chart_details)
+ .setEmptyText(R.string.permission_bar_chart_empty_text)
+ .setDetailsOnClickListener((View v) -> {
+ final Intent intent = new Intent(Intent.ACTION_REVIEW_PERMISSION_USAGE);
+ intent.putExtra(Intent.EXTRA_DURATION_MILLIS, DAYS.toMillis(1));
+ mContext.startActivity(intent);
+ })
+ .build();
+
+ mBarChartPreference.initializeBarChart(info);
+ if (!mOldUsageInfos.isEmpty()) {
+ mBarChartPreference.setBarViewInfos(createBarViews(mOldUsageInfos));
+ }
+ }
+
+ @Override
+ public void onStart() {
+ if (!isAvailable()) {
+ return;
+ }
+
+ // Add a shadow animation to action bar scroll only when the chart is available.
+ com.android.settings.Utils.setActionBarShadowAnimation(mParent.getActivity(),
+ mParent.getSettingsLifecycle(), mParent.getListView());
+ // We don't hide chart when we have existing data.
+ mBarChartPreference.updateLoadingState(mOldUsageInfos.isEmpty() /* isLoading */);
+ // But we still need to hint user with progress bar that we are updating new usage data.
+ mParent.showPinnedHeader(true);
+ retrievePermissionUsageData();
+ }
+
+ @Override
+ public void onPermissionUsageResult(@NonNull List<RuntimePermissionUsageInfo> usageInfos) {
+ usageInfos.sort((x, y) -> {
+ int usageDiff = y.getAppAccessCount() - x.getAppAccessCount();
+ if (usageDiff != 0) {
+ return usageDiff;
+ }
+ String xName = x.getName();
+ String yName = y.getName();
+ if (xName.equals(LOCATION)) {
+ return -1;
+ } else if (yName.equals(LOCATION)) {
+ return 1;
+ } else if (xName.equals(MICROPHONE)) {
+ return -1;
+ } else if (yName.equals(MICROPHONE)) {
+ return 1;
+ } else if (xName.equals(CAMERA)) {
+ return -1;
+ } else if (yName.equals(CAMERA)) {
+ return 1;
+ }
+ return x.getName().compareTo(y.getName());
+ });
+
+ // If the result is different, we need to update bar views.
+ if (!areSamePermissionGroups(usageInfos)) {
+ mBarChartPreference.setBarViewInfos(createBarViews(usageInfos));
+ mOldUsageInfos = usageInfos;
+ }
+
+ mBarChartPreference.updateLoadingState(false /* isLoading */);
+ mParent.showPinnedHeader(false);
+ }
+
+ private void retrievePermissionUsageData() {
+ mContext.getSystemService(PermissionControllerManager.class).getPermissionUsages(
+ false /* countSystem */, (int) DAYS.toMillis(1),
+ mContext.getMainExecutor() /* executor */, this /* callback */);
+ }
+
+ private BarViewInfo[] createBarViews(List<RuntimePermissionUsageInfo> usageInfos) {
+ if (usageInfos.isEmpty()) {
+ return null;
+ }
+
+ final BarViewInfo[] barViewInfos = new BarViewInfo[
+ Math.min(BarChartPreference.MAXIMUM_BAR_VIEWS, usageInfos.size())];
+
+ for (int index = 0; index < barViewInfos.length; index++) {
+ final RuntimePermissionUsageInfo permissionGroupInfo = usageInfos.get(index);
+ final int count = permissionGroupInfo.getAppAccessCount();
+ final CharSequence permLabel = getPermissionGroupLabel(permissionGroupInfo.getName());
+
+ barViewInfos[index] = new BarViewInfo(
+ getPermissionGroupIcon(permissionGroupInfo.getName()), count, permLabel,
+ mContext.getResources().getQuantityString(R.plurals.permission_bar_chart_label,
+ count, count), permLabel);
+
+ // Set the click listener for each bar view.
+ // The listener will navigate user to permission usage app.
+ barViewInfos[index].setClickListener((View v) -> {
+ final Intent intent = new Intent(Intent.ACTION_REVIEW_PERMISSION_USAGE);
+ intent.putExtra(Intent.EXTRA_PERMISSION_GROUP_NAME, permissionGroupInfo.getName());
+ intent.putExtra(Intent.EXTRA_DURATION_MILLIS, DAYS.toMillis(1));
+ mContext.startActivity(intent);
+ });
+ }
+
+ return barViewInfos;
+ }
+
+ private Drawable getPermissionGroupIcon(String permissionGroup) {
+ Drawable icon = null;
+ try {
+ icon = mPackageManager.getPermissionGroupInfo(permissionGroup, 0)
+ .loadIcon(mPackageManager);
+ icon.setTintList(Utils.getColorAttr(mContext, android.R.attr.textColorSecondary));
+ } catch (PackageManager.NameNotFoundException e) {
+ Log.w(TAG, "Cannot find group icon for " + permissionGroup, e);
+ }
+
+ return icon;
+ }
+
+ private CharSequence getPermissionGroupLabel(String permissionGroup) {
+ CharSequence label = null;
+ try {
+ label = mPackageManager.getPermissionGroupInfo(permissionGroup, 0)
+ .loadLabel(mPackageManager);
+ } catch (PackageManager.NameNotFoundException e) {
+ Log.w(TAG, "Cannot find group label for " + permissionGroup, e);
+ }
+
+ return label;
+ }
+
+ private boolean areSamePermissionGroups(List<RuntimePermissionUsageInfo> newUsageInfos) {
+ if (newUsageInfos.size() != mOldUsageInfos.size()) {
+ return false;
+ }
+
+ for (int index = 0; index < newUsageInfos.size(); index++) {
+ final RuntimePermissionUsageInfo newInfo = newUsageInfos.get(index);
+ final RuntimePermissionUsageInfo oldInfo = mOldUsageInfos.get(index);
+
+ if (!newInfo.getName().equals(oldInfo.getName()) ||
+ newInfo.getAppAccessCount() != oldInfo.getAppAccessCount()) {
+ return false;
+ }
+ }
+ return true;
+ }
+}
diff --git a/src/com/android/settings/privacy/PrivacyDashboardFragment.java b/src/com/android/settings/privacy/PrivacyDashboardFragment.java
index cc0e8a1..c7c564d 100644
--- a/src/com/android/settings/privacy/PrivacyDashboardFragment.java
+++ b/src/com/android/settings/privacy/PrivacyDashboardFragment.java
@@ -18,6 +18,10 @@
import android.app.settings.SettingsEnums;
import android.content.Context;
+import android.os.Bundle;
+import android.view.View;
+
+import androidx.annotation.VisibleForTesting;
import com.android.settings.R;
import com.android.settings.dashboard.DashboardFragment;
@@ -64,6 +68,24 @@
return buildPreferenceControllers(context, getSettingsLifecycle());
}
+ @Override
+ public void onAttach(Context context) {
+ super.onAttach(context);
+ use(PermissionBarChartPreferenceController.class).setFragment(this /* fragment */);
+ }
+
+ @Override
+ public void onViewCreated(View view, Bundle savedInstanceState) {
+ super.onViewCreated(view, savedInstanceState);
+ initLoadingBar();
+ }
+
+ @VisibleForTesting
+ void initLoadingBar() {
+ setPinnedHeaderView(R.layout.progress_header);
+ showPinnedHeader(false);
+ }
+
private static List<AbstractPreferenceController> buildPreferenceControllers(
Context context, Lifecycle lifecycle) {
final List<AbstractPreferenceController> controllers = new ArrayList<>();
diff --git a/src/com/android/settings/security/CredentialStoragePreferenceController.java b/src/com/android/settings/security/CredentialStoragePreferenceController.java
deleted file mode 100644
index 060d964..0000000
--- a/src/com/android/settings/security/CredentialStoragePreferenceController.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.security;
-
-import android.content.Context;
-import android.os.UserManager;
-import android.security.KeyStore;
-
-import androidx.preference.Preference;
-
-import com.android.settings.R;
-
-public class CredentialStoragePreferenceController extends
- RestrictedEncryptionPreferenceController {
-
- private static final String KEY_CREDENTIAL_STORAGE_TYPE = "credential_storage_type";
- private final KeyStore mKeyStore;
-
- public CredentialStoragePreferenceController(Context context) {
- super(context, UserManager.DISALLOW_CONFIG_CREDENTIALS);
- mKeyStore = KeyStore.getInstance();
- }
-
- @Override
- public String getPreferenceKey() {
- return KEY_CREDENTIAL_STORAGE_TYPE;
- }
-
- @Override
- public void updateState(Preference preference) {
- preference.setSummary(mKeyStore.isHardwareBacked()
- ? R.string.credential_storage_type_hardware
- : R.string.credential_storage_type_software);
- }
-}
diff --git a/src/com/android/settings/security/EncryptionAndCredential.java b/src/com/android/settings/security/EncryptionAndCredential.java
index d873271..5362ad0 100644
--- a/src/com/android/settings/security/EncryptionAndCredential.java
+++ b/src/com/android/settings/security/EncryptionAndCredential.java
@@ -72,7 +72,6 @@
controllers.add(new PreferenceCategoryController(context,
"encryption_and_credentials_status_category").setChildren(
Arrays.asList(encryptStatusController)));
- controllers.add(new CredentialStoragePreferenceController(context));
controllers.add(new UserCredentialsPreferenceController(context));
controllers.add(new ResetCredentialsPreferenceController(context, lifecycle));
controllers.add(new InstallCertificatePreferenceController(context));
diff --git a/src/com/android/settings/security/LockdownButtonPreferenceController.java b/src/com/android/settings/security/LockdownButtonPreferenceController.java
index 5b29868..7caf2ce 100644
--- a/src/com/android/settings/security/LockdownButtonPreferenceController.java
+++ b/src/com/android/settings/security/LockdownButtonPreferenceController.java
@@ -34,11 +34,11 @@
@Override
public int getAvailabilityStatus() {
- if (mLockPatternUtils.isSecure(UserHandle.myUserId())) {
+ /*if (mLockPatternUtils.isSecure(UserHandle.myUserId())) {
return AVAILABLE;
- } else {
+ } else {*/
return DISABLED_FOR_USER;
- }
+ //}
}
@Override
diff --git a/src/com/android/settings/security/screenlock/AbstractPatternSwitchPreferenceController.java b/src/com/android/settings/security/screenlock/AbstractPatternSwitchPreferenceController.java
new file mode 100644
index 0000000..5ec9e3c
--- /dev/null
+++ b/src/com/android/settings/security/screenlock/AbstractPatternSwitchPreferenceController.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.security.screenlock;
+
+import android.app.admin.DevicePolicyManager;
+import android.content.Context;
+
+import androidx.preference.Preference;
+import androidx.preference.TwoStatePreference;
+
+import com.android.internal.widget.LockPatternUtils;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.core.AbstractPreferenceController;
+
+public abstract class AbstractPatternSwitchPreferenceController
+ extends AbstractPreferenceController
+ implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener {
+
+ private final String mKey;
+ private final int mUserId;
+ private final LockPatternUtils mLockPatternUtils;
+
+ public AbstractPatternSwitchPreferenceController(Context context, String key,
+ int userId, LockPatternUtils lockPatternUtils) {
+ super(context);
+ mKey = key;
+ mUserId = userId;
+ mLockPatternUtils = lockPatternUtils;
+ }
+
+ @Override
+ public boolean isAvailable() {
+ return isPatternLock();
+ }
+
+ @Override
+ public String getPreferenceKey() {
+ return mKey;
+ }
+
+ @Override
+ public void updateState(Preference preference) {
+ ((TwoStatePreference) preference).setChecked(isEnabled(mLockPatternUtils, mUserId));
+ }
+
+ private boolean isPatternLock() {
+ return mLockPatternUtils.isSecure(mUserId)
+ && mLockPatternUtils.getKeyguardStoredPasswordQuality(mUserId)
+ == DevicePolicyManager.PASSWORD_QUALITY_SOMETHING;
+ }
+
+ @Override
+ public boolean onPreferenceChange(Preference preference, Object newValue) {
+ setEnabled(mLockPatternUtils, mUserId, (Boolean) newValue);
+ return true;
+ }
+
+ protected abstract boolean isEnabled(LockPatternUtils utils, int userId);
+ protected abstract void setEnabled(LockPatternUtils utils, int userId, boolean enabled);
+}
diff --git a/src/com/android/settings/security/screenlock/PatternDotsVisiblePreferenceController.java b/src/com/android/settings/security/screenlock/PatternDotsVisiblePreferenceController.java
new file mode 100644
index 0000000..8da044d
--- /dev/null
+++ b/src/com/android/settings/security/screenlock/PatternDotsVisiblePreferenceController.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.security.screenlock;
+
+import android.content.Context;
+
+import com.android.internal.widget.LockPatternUtils;
+
+public class PatternDotsVisiblePreferenceController
+ extends AbstractPatternSwitchPreferenceController {
+ private static final String PREF_KEY = "visibledots";
+
+ public PatternDotsVisiblePreferenceController(Context context, int userId,
+ LockPatternUtils lockPatternUtils) {
+ super(context, PREF_KEY, userId, lockPatternUtils);
+ }
+
+ @Override
+ protected boolean isEnabled(LockPatternUtils utils, int userId) {
+ return utils.isVisibleDotsEnabled(userId);
+ }
+
+ @Override
+ protected void setEnabled(LockPatternUtils utils, int userId, boolean enabled) {
+ utils.setVisibleDotsEnabled(enabled, userId);
+ }
+}
diff --git a/src/com/android/settings/security/screenlock/PatternErrorVisiblePreferenceController.java b/src/com/android/settings/security/screenlock/PatternErrorVisiblePreferenceController.java
new file mode 100644
index 0000000..b9a18c1
--- /dev/null
+++ b/src/com/android/settings/security/screenlock/PatternErrorVisiblePreferenceController.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.security.screenlock;
+
+import android.content.Context;
+
+import com.android.internal.widget.LockPatternUtils;
+
+public class PatternErrorVisiblePreferenceController
+ extends AbstractPatternSwitchPreferenceController {
+ private static final String PREF_KEY = "visible_error_pattern";
+
+ public PatternErrorVisiblePreferenceController(Context context, int userId,
+ LockPatternUtils lockPatternUtils) {
+ super(context, PREF_KEY, userId, lockPatternUtils);
+ }
+
+ @Override
+ protected boolean isEnabled(LockPatternUtils utils, int userId) {
+ return utils.isShowErrorPath(userId);
+ }
+
+ @Override
+ protected void setEnabled(LockPatternUtils utils, int userId, boolean enabled) {
+ utils.setShowErrorPath(enabled, userId);
+ }
+}
diff --git a/src/com/android/settings/security/screenlock/PatternVisiblePreferenceController.java b/src/com/android/settings/security/screenlock/PatternVisiblePreferenceController.java
index 133078c..2f8b641 100644
--- a/src/com/android/settings/security/screenlock/PatternVisiblePreferenceController.java
+++ b/src/com/android/settings/security/screenlock/PatternVisiblePreferenceController.java
@@ -16,56 +16,25 @@
package com.android.settings.security.screenlock;
-import android.app.admin.DevicePolicyManager;
import android.content.Context;
-import androidx.preference.Preference;
-import androidx.preference.TwoStatePreference;
-
import com.android.internal.widget.LockPatternUtils;
-import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settingslib.core.AbstractPreferenceController;
-public class PatternVisiblePreferenceController extends AbstractPreferenceController
- implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener {
-
+public class PatternVisiblePreferenceController extends AbstractPatternSwitchPreferenceController {
private static final String PREF_KEY = "visiblepattern";
- private final int mUserId;
- private final LockPatternUtils mLockPatternUtils;
-
public PatternVisiblePreferenceController(Context context, int userId,
LockPatternUtils lockPatternUtils) {
- super(context);
- mUserId = userId;
- mLockPatternUtils = lockPatternUtils;
+ super(context, PREF_KEY, userId, lockPatternUtils);
}
@Override
- public boolean isAvailable() {
- return isPatternLock();
+ protected boolean isEnabled(LockPatternUtils utils, int userId) {
+ return utils.isVisiblePatternEnabled(userId);
}
@Override
- public String getPreferenceKey() {
- return PREF_KEY;
- }
-
- @Override
- public void updateState(Preference preference) {
- ((TwoStatePreference) preference).setChecked(
- mLockPatternUtils.isVisiblePatternEnabled(mUserId));
- }
-
- private boolean isPatternLock() {
- return mLockPatternUtils.isSecure(mUserId)
- && mLockPatternUtils.getKeyguardStoredPasswordQuality(mUserId)
- == DevicePolicyManager.PASSWORD_QUALITY_SOMETHING;
- }
-
- @Override
- public boolean onPreferenceChange(Preference preference, Object newValue) {
- mLockPatternUtils.setVisiblePatternEnabled((Boolean) newValue, mUserId);
- return true;
+ protected void setEnabled(LockPatternUtils utils, int userId, boolean enabled) {
+ utils.setVisiblePatternEnabled(enabled, userId);
}
}
diff --git a/src/com/android/settings/security/screenlock/PinScramblePreferenceController.java b/src/com/android/settings/security/screenlock/PinScramblePreferenceController.java
new file mode 100644
index 0000000..6d7ae8a
--- /dev/null
+++ b/src/com/android/settings/security/screenlock/PinScramblePreferenceController.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright (C) 2018 The LineageOS Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.security.screenlock;
+
+import android.app.admin.DevicePolicyManager;
+import android.content.Context;
+import androidx.preference.Preference;
+import androidx.preference.TwoStatePreference;
+
+import com.android.internal.widget.LockPatternUtils;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.core.AbstractPreferenceController;
+
+import lineageos.providers.LineageSettings;
+
+public class PinScramblePreferenceController extends AbstractPreferenceController
+ implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener {
+
+ static final String KEY_LOCKSCREEN_SCRAMBLE_PIN_LAYOUT = "lockscreen_scramble_pin_layout";
+
+ private final int mUserId;
+ private final LockPatternUtils mLockPatternUtils;
+
+ public PinScramblePreferenceController(Context context, int userId,
+ LockPatternUtils lockPatternUtils) {
+ super(context);
+ mUserId = userId;
+ mLockPatternUtils = lockPatternUtils;
+ }
+
+ @Override
+ public boolean isAvailable() {
+ return isPinLock();
+ }
+
+ @Override
+ public String getPreferenceKey() {
+ return KEY_LOCKSCREEN_SCRAMBLE_PIN_LAYOUT;
+ }
+
+ @Override
+ public void updateState(Preference preference) {
+ ((TwoStatePreference) preference).setChecked(LineageSettings.System.getInt(
+ mContext.getContentResolver(),
+ LineageSettings.System.LOCKSCREEN_PIN_SCRAMBLE_LAYOUT,
+ 0) == 1);
+ }
+
+ private boolean isPinLock() {
+ int quality = mLockPatternUtils.getKeyguardStoredPasswordQuality(mUserId);
+ boolean hasPin = quality == DevicePolicyManager.PASSWORD_QUALITY_NUMERIC ||
+ quality == DevicePolicyManager.PASSWORD_QUALITY_NUMERIC_COMPLEX;
+ return mLockPatternUtils.isSecure(mUserId) && hasPin;
+ }
+
+ @Override
+ public boolean onPreferenceChange(Preference preference, Object newValue) {
+ LineageSettings.System.putInt(
+ mContext.getContentResolver(),
+ LineageSettings.System.LOCKSCREEN_PIN_SCRAMBLE_LAYOUT,
+ (Boolean) newValue ? 1 : 0);
+ return true;
+ }
+}
diff --git a/src/com/android/settings/security/screenlock/PowerButtonInstantLockPreferenceController.java b/src/com/android/settings/security/screenlock/PowerButtonInstantLockPreferenceController.java
index ffd0183..d3c10b0 100644
--- a/src/com/android/settings/security/screenlock/PowerButtonInstantLockPreferenceController.java
+++ b/src/com/android/settings/security/screenlock/PowerButtonInstantLockPreferenceController.java
@@ -78,7 +78,7 @@
R.string.lockpattern_settings_power_button_instantly_locks_summary,
trustAgentLabel));
} else {
- preference.setSummary(R.string.summary_placeholder);
+ preference.setSummary(R.string.summary_empty);
}
}
diff --git a/src/com/android/settings/security/screenlock/ScreenLockSettings.java b/src/com/android/settings/security/screenlock/ScreenLockSettings.java
index 082e333..a3e24af 100644
--- a/src/com/android/settings/security/screenlock/ScreenLockSettings.java
+++ b/src/com/android/settings/security/screenlock/ScreenLockSettings.java
@@ -71,10 +71,16 @@
final List<AbstractPreferenceController> controllers = new ArrayList<>();
controllers.add(new PatternVisiblePreferenceController(
context, MY_USER_ID, lockPatternUtils));
+ controllers.add(new PatternErrorVisiblePreferenceController(
+ context, MY_USER_ID, lockPatternUtils));
+ controllers.add(new PatternDotsVisiblePreferenceController(
+ context, MY_USER_ID, lockPatternUtils));
controllers.add(new PowerButtonInstantLockPreferenceController(
context, MY_USER_ID, lockPatternUtils));
controllers.add(new LockAfterTimeoutPreferenceController(
context, MY_USER_ID, lockPatternUtils));
+ controllers.add(new PinScramblePreferenceController(
+ context, MY_USER_ID, lockPatternUtils));
controllers.add(new OwnerInfoPreferenceController(context, parent));
return controllers;
}
diff --git a/src/com/android/settings/shortcut/CreateShortcutPreferenceController.java b/src/com/android/settings/shortcut/CreateShortcutPreferenceController.java
index 4843736..737faa0 100644
--- a/src/com/android/settings/shortcut/CreateShortcutPreferenceController.java
+++ b/src/com/android/settings/shortcut/CreateShortcutPreferenceController.java
@@ -152,7 +152,7 @@
intent = new Intent();
}
intent.putExtra(Intent.EXTRA_SHORTCUT_ICON_RESOURCE,
- Intent.ShortcutIconResource.fromContext(mContext, R.mipmap.ic_launcher_settings))
+ Intent.ShortcutIconResource.fromContext(mContext, R.mipmap.ic_launcher))
.putExtra(Intent.EXTRA_SHORTCUT_INTENT, shortcutIntent)
.putExtra(Intent.EXTRA_SHORTCUT_NAME, label);
@@ -232,7 +232,7 @@
R.layout.shortcut_badge_maskable,
context.getResources().getDimensionPixelSize(R.dimen.shortcut_size_maskable)));
} else {
- maskableIcon = Icon.createWithResource(context, R.drawable.ic_launcher_settings);
+ maskableIcon = Icon.createWithResource(context, R.mipmap.ic_launcher);
}
final String shortcutId = SHORTCUT_ID_PREFIX +
shortcutIntent.getComponent().flattenToShortString();
@@ -264,7 +264,7 @@
((ImageView) view.findViewById(android.R.id.icon)).setImageDrawable(iconDrawable);
} catch (PackageManager.NameNotFoundException e) {
Log.w(TAG, "Cannot load icon from app " + app + ", returning a default icon");
- Icon icon = Icon.createWithResource(context, R.drawable.ic_launcher_settings);
+ Icon icon = Icon.createWithResource(context, R.mipmap.ic_launcher);
((ImageView) view.findViewById(android.R.id.icon)).setImageIcon(icon);
}
diff --git a/src/com/android/settings/slices/CustomSliceRegistry.java b/src/com/android/settings/slices/CustomSliceRegistry.java
index bb7def6..01eaf3f 100644
--- a/src/com/android/settings/slices/CustomSliceRegistry.java
+++ b/src/com/android/settings/slices/CustomSliceRegistry.java
@@ -196,6 +196,17 @@
.appendPath(SettingsSlicesContract.PATH_SETTING_ACTION)
.appendPath("call_volume")
.build();
+
+ /**
+ * Full {@link Uri} for the Notification Volume Slice.
+ */
+ public static final Uri VOLUME_NOTIFICATION_URI = new Uri.Builder()
+ .scheme(ContentResolver.SCHEME_CONTENT)
+ .authority(SettingsSliceProvider.SLICE_AUTHORITY)
+ .appendPath(SettingsSlicesContract.PATH_SETTING_ACTION)
+ .appendPath("notification_volume")
+ .build();
+
/**
* Full {@link Uri} for the Media Volume Slice.
*/
diff --git a/src/com/android/settings/users/EditUserInfoController.java b/src/com/android/settings/users/EditUserInfoController.java
index d205968..6b5e670 100644
--- a/src/com/android/settings/users/EditUserInfoController.java
+++ b/src/com/android/settings/users/EditUserInfoController.java
@@ -99,8 +99,7 @@
}
public void onSaveInstanceState(Bundle outState) {
- if (mEditUserInfoDialog != null && mEditUserInfoDialog.isShowing()
- && mEditUserPhotoController != null) {
+ if (mEditUserInfoDialog != null && mEditUserPhotoController != null) {
// Bitmap cannot be stored into bundle because it may exceed parcel limit
// Store it in a temporary file instead
File file = mEditUserPhotoController.saveNewUserPhotoBitmap();
diff --git a/src/com/android/settings/wifi/WifiPickerActivity.java b/src/com/android/settings/wifi/WifiPickerActivity.java
index adfc7ec..da121fc 100644
--- a/src/com/android/settings/wifi/WifiPickerActivity.java
+++ b/src/com/android/settings/wifi/WifiPickerActivity.java
@@ -55,10 +55,17 @@
|| isSavedAccessPointsWifiSettings) {
return true;
}
+
+ if (FeatureFlagUtils.isEnabled(this, FeatureFlagUtils.SETTINGS_WIFITRACKER2)
+ && WifiSettings2.class.getName().equals(fragmentName)) {
+ return true;
+ }
+
return false;
}
/* package */ Class<? extends PreferenceFragmentCompat> getWifiSettingsClass() {
- return WifiSettings.class;
+ return FeatureFlagUtils.isEnabled(this, FeatureFlagUtils.SETTINGS_WIFITRACKER2)
+ ? WifiSettings2.class : WifiSettings.class;
}
}
diff --git a/src/com/google/android/settings/accounts/AccountFeatureProviderGoogleImpl.java b/src/com/google/android/settings/accounts/AccountFeatureProviderGoogleImpl.java
new file mode 100644
index 0000000..93280ce
--- /dev/null
+++ b/src/com/google/android/settings/accounts/AccountFeatureProviderGoogleImpl.java
@@ -0,0 +1,18 @@
+package com.google.android.settings.accounts;
+
+import android.accounts.Account;
+import android.accounts.AccountManager;
+import android.content.Context;
+import com.android.settings.accounts.AccountFeatureProvider;
+
+public class AccountFeatureProviderGoogleImpl implements AccountFeatureProvider {
+ @Override
+ public String getAccountType() {
+ return "com.google";
+ }
+
+ @Override
+ public Account[] getAccounts(Context context) {
+ return AccountManager.get(context).getAccountsByType("com.google");
+ }
+}
diff --git a/src/com/google/android/settings/applications/ApplicationFeatureProviderGoogleImpl.java b/src/com/google/android/settings/applications/ApplicationFeatureProviderGoogleImpl.java
new file mode 100644
index 0000000..25c14a8
--- /dev/null
+++ b/src/com/google/android/settings/applications/ApplicationFeatureProviderGoogleImpl.java
@@ -0,0 +1,123 @@
+package com.google.android.settings.applications;
+
+import android.app.admin.DevicePolicyManager;
+import android.content.Context;
+import android.content.pm.IPackageManager;
+import android.content.pm.PackageManager;
+import android.content.pm.ProviderInfo;
+import android.icu.text.MeasureFormat;
+import android.icu.util.Measure;
+import android.icu.util.MeasureUnit;
+import android.os.Bundle;
+import android.util.Log;
+import com.android.settings.R;
+import com.android.settings.applications.ApplicationFeatureProviderImpl;
+import java.util.Locale;
+import java.util.Set;
+
+public class ApplicationFeatureProviderGoogleImpl extends ApplicationFeatureProviderImpl {
+ private static final boolean DEBUG = Log.isLoggable("ApplicationFeatureProviderGoogleImpl", 3);
+ private final Context mContext;
+
+ public ApplicationFeatureProviderGoogleImpl(Context context, PackageManager packageManager, IPackageManager iPackageManager, DevicePolicyManager devicePolicyManager) {
+ super(context, packageManager, iPackageManager, devicePolicyManager);
+ mContext = context;
+ }
+
+ public Set<String> getKeepEnabledPackages() {
+ Set<String> keepEnabledPackages = super.getKeepEnabledPackages();
+ keepEnabledPackages.add("com.google.android.inputmethod.latin");
+ keepEnabledPackages.add("com.google.android.dialer");
+ keepEnabledPackages.add("com.google.android.apps.wellbeing");
+ keepEnabledPackages.add("com.google.android.settings.intelligence");
+ keepEnabledPackages.add("com.google.android.ims");
+ keepEnabledPackages.add("com.google.android.packageinstaller");
+ keepEnabledPackages.add("com.google.android.euicc");
+ keepEnabledPackages.add("com.google.android.apps.safetyhub");
+ return keepEnabledPackages;
+ }
+
+ public CharSequence getTimeSpentInApp(String str) {
+ try {
+ if (!isPrivilegedApp("com.google.android.apps.wellbeing.api")) {
+ if (DEBUG) {
+ Log.d("ApplicationFeatureProviderGoogleImpl", "Not a privileged app.");
+ }
+ return "";
+ }
+ Bundle bundle = new Bundle();
+ bundle.putString("packageName", str);
+ Bundle call = mContext.getContentResolver().call("com.google.android.apps.wellbeing.api", "get_app_usage_millis", (String) null, bundle);
+ if (call != null) {
+ if (call.getBoolean("success")) {
+ Bundle bundle2 = call.getBundle("data");
+ if (bundle2 == null) {
+ if (DEBUG) {
+ Log.d("ApplicationFeatureProviderGoogleImpl", "data bundle is null.");
+ }
+ return "";
+ }
+ String readableDuration = getReadableDuration(Long.valueOf(bundle2.getLong("total_time_millis")), MeasureFormat.FormatWidth.NARROW, R.string.duration_less_than_one_minute, false);
+ return mContext.getString(R.string.screen_time_summary_usage_today, new Object[]{readableDuration});
+ }
+ }
+ if (DEBUG) {
+ Log.d("ApplicationFeatureProviderGoogleImpl", "Provider call unsuccessful");
+ }
+ return "";
+ } catch (Exception e) {
+ Log.w("ApplicationFeatureProviderGoogleImpl", "Error getting time spent for app " + str, e);
+ return "";
+ }
+ }
+
+ private String getReadableDuration(Long l, MeasureFormat.FormatWidth formatWidth, int i, boolean z) {
+ long j;
+ long j2;
+ long longValue = l.longValue();
+ if (longValue >= 3600000) {
+ j = longValue / 3600000;
+ longValue -= 3600000 * j;
+ } else {
+ j = 0;
+ }
+ if (longValue >= 60000) {
+ j2 = longValue / 60000;
+ longValue -= 60000 * j2;
+ } else {
+ j2 = 0;
+ }
+ int i2 = (j > 0 ? 1 : (j == 0 ? 0 : -1));
+ if (i2 > 0 && j2 > 0) {
+ return MeasureFormat.getInstance(Locale.getDefault(), formatWidth).formatMeasures(new Measure[]{new Measure(Long.valueOf(j), MeasureUnit.HOUR), new Measure(Long.valueOf(j2), MeasureUnit.MINUTE)});
+ } else if (i2 > 0) {
+ Locale locale = Locale.getDefault();
+ if (!z) {
+ formatWidth = MeasureFormat.FormatWidth.WIDE;
+ }
+ return MeasureFormat.getInstance(locale, formatWidth).formatMeasures(new Measure[]{new Measure(Long.valueOf(j), MeasureUnit.HOUR)});
+ } else if (j2 > 0) {
+ Locale locale2 = Locale.getDefault();
+ if (!z) {
+ formatWidth = MeasureFormat.FormatWidth.WIDE;
+ }
+ return MeasureFormat.getInstance(locale2, formatWidth).formatMeasures(new Measure[]{new Measure(Long.valueOf(j2), MeasureUnit.MINUTE)});
+ } else if (longValue > 0) {
+ return mContext.getResources().getString(i);
+ } else {
+ Locale locale3 = Locale.getDefault();
+ if (!z) {
+ formatWidth = MeasureFormat.FormatWidth.WIDE;
+ }
+ return MeasureFormat.getInstance(locale3, formatWidth).formatMeasures(new Measure[]{new Measure(0, MeasureUnit.MINUTE)});
+ }
+ }
+
+ private boolean isPrivilegedApp(String str) {
+ ProviderInfo resolveContentProvider = mContext.getPackageManager().resolveContentProvider(str, 0);
+ if (resolveContentProvider == null) {
+ return false;
+ }
+ return resolveContentProvider.applicationInfo.isPrivilegedApp();
+ }
+}
diff --git a/src/com/google/android/settings/dashboard/suggestions/SuggestionFeatureProviderGoogleImpl.java b/src/com/google/android/settings/dashboard/suggestions/SuggestionFeatureProviderGoogleImpl.java
new file mode 100644
index 0000000..29efed7
--- /dev/null
+++ b/src/com/google/android/settings/dashboard/suggestions/SuggestionFeatureProviderGoogleImpl.java
@@ -0,0 +1,18 @@
+package com.google.android.settings.dashboard.suggestions;
+
+import android.content.ComponentName;
+import android.content.Context;
+import android.provider.Settings.Secure;
+import com.android.settings.dashboard.suggestions.SuggestionFeatureProviderImpl;
+import com.android.settings.overlay.FeatureFactory;
+
+public class SuggestionFeatureProviderGoogleImpl extends SuggestionFeatureProviderImpl {
+ public SuggestionFeatureProviderGoogleImpl(Context context) {
+ super(context);
+ }
+
+ @Override
+ public ComponentName getSuggestionServiceComponent() {
+ return new ComponentName("com.google.android.settings.intelligence", "com.google.android.settings.intelligence.modules.suggestions.SuggestionService");
+ }
+}
diff --git a/src/com/google/android/settings/external/SignatureVerifier.java b/src/com/google/android/settings/external/SignatureVerifier.java
new file mode 100644
index 0000000..ed63706
--- /dev/null
+++ b/src/com/google/android/settings/external/SignatureVerifier.java
@@ -0,0 +1,93 @@
+package com.google.android.settings.external;
+
+import android.content.Context;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager.NameNotFoundException;
+import android.content.pm.Signature;
+import android.text.TextUtils;
+import android.util.Log;
+import com.android.internal.util.ArrayUtils;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.util.Arrays;
+
+public class SignatureVerifier {
+ private static final byte[] RELEASE_DIGEST_GMSCORE = {-16, -3, 108, 91, 65, 15, 37, -53, 37, -61, -75, 51, 70, -56, -105, 47, -82, 48, -8, -18, 116, 17, -33, -111, 4, Byte.MIN_VALUE, -83, 107, 45, 96, -37, -125};
+ private static final byte[] RELEASE_DIGEST_TIPS = {14, 68, 121, -2, 25, 61, 1, -51, 70, 33, 95, -52, -48, -39, 35, 61, -20, 119, -2, -94, 89, -5, -52, -97, 9, 33, 25, -11, 10, -125, 114, -27};
+
+ public static String verifyCallerIsWhitelisted(Context context, int i) throws SecurityException {
+ String isUidWhitelisted = isUidWhitelisted(context, i);
+ if (!TextUtils.isEmpty(isUidWhitelisted)) {
+ return isUidWhitelisted;
+ }
+ throw new SecurityException("UID is not Google Signed");
+ }
+
+ private static String isUidWhitelisted(Context context, int i) {
+ String[] packagesForUid = context.getPackageManager().getPackagesForUid(i);
+ if (ArrayUtils.isEmpty(packagesForUid)) {
+ return null;
+ }
+ for (String str : packagesForUid) {
+ if (isPackageWhitelisted(context, str)) {
+ return str;
+ }
+ }
+ return null;
+ }
+
+ public static boolean isPackageWhitelisted(Context context, String str) {
+ String str2 = "SignatureVerifier";
+ try {
+ PackageInfo packageInfo = context.getPackageManager().getPackageInfo(str, 64);
+ String str3 = packageInfo.packageName;
+ if (verifyWhitelistedPackage(str3)) {
+ return isSignatureWhitelisted(packageInfo);
+ }
+ StringBuilder sb = new StringBuilder();
+ sb.append("Package name: ");
+ sb.append(str3);
+ sb.append(" is not whitelisted.");
+ Log.e(str2, sb.toString());
+ return false;
+ } catch (NameNotFoundException e) {
+ Log.e(str2, "Could not find package name.", e);
+ return false;
+ }
+ }
+
+ private static boolean isSignatureWhitelisted(PackageInfo packageInfo) {
+ Signature[] signatureArr = packageInfo.signatures;
+ if (signatureArr.length != 1) {
+ Log.w("SignatureVerifier", "Package has more than one signature.");
+ return false;
+ }
+ return isCertWhitelisted(packageInfo.packageName, signatureArr[0].toByteArray());
+ }
+
+ private static boolean isCertWhitelisted(String str, byte[] bArr) {
+ try {
+ byte[] digest = MessageDigest.getInstance("SHA-256").digest(bArr);
+ String str2 = "SignatureVerifier";
+ if (Log.isLoggable(str2, 3)) {
+ StringBuilder sb = new StringBuilder();
+ sb.append("Checking cert for ");
+ Log.d(str2, sb.toString());
+ }
+ return Arrays.equals(digest, getDigestBytes(str));
+ } catch (NoSuchAlgorithmException e) {
+ throw new SecurityException("Failed to obtain SHA-256 digest impl.", e);
+ }
+ }
+
+ private static boolean verifyWhitelistedPackage(String str) {
+ return "com.google.android.googlequicksearchbox".equals(str) || "com.google.android.gms".equals(str) || "com.google.android.apps.tips".equals(str);
+ }
+
+ private static byte[] getDigestBytes(String str) {
+ if (((str.hashCode() == 40935373 && str.equals("com.google.android.apps.tips")) ? (char) 0 : 65535) != 0) {
+ return RELEASE_DIGEST_GMSCORE;
+ }
+ return RELEASE_DIGEST_TIPS;
+ }
+}
diff --git a/src/com/google/android/settings/fuelgauge/PowerUsageFeatureProviderGoogleImpl.java b/src/com/google/android/settings/fuelgauge/PowerUsageFeatureProviderGoogleImpl.java
new file mode 100644
index 0000000..2a67614
--- /dev/null
+++ b/src/com/google/android/settings/fuelgauge/PowerUsageFeatureProviderGoogleImpl.java
@@ -0,0 +1,184 @@
+package com.google.android.settings.fuelgauge;
+
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.database.Cursor;
+import android.net.Uri;
+import android.text.TextUtils;
+import android.util.SparseIntArray;
+import com.android.internal.os.BatterySipper;
+import com.android.internal.util.ArrayUtils;
+import com.android.settings.R;
+import com.android.settings.fuelgauge.PowerUsageFeatureProviderImpl;
+import com.android.settingslib.fuelgauge.Estimate;
+import com.android.settingslib.utils.PowerUtil;
+import java.time.Duration;
+
+public class PowerUsageFeatureProviderGoogleImpl extends PowerUsageFeatureProviderImpl {
+ static final String AVERAGE_BATTERY_LIFE_COL = "average_battery_life";
+ static final String BATTERY_ESTIMATE_BASED_ON_USAGE_COL = "is_based_on_usage";
+ static final String BATTERY_ESTIMATE_COL = "battery_estimate";
+ static final String BATTERY_LEVEL_COL = "battery_level";
+ static final int CUSTOMIZED_TO_USER = 1;
+ static final String GFLAG_ADDITIONAL_BATTERY_INFO_ENABLED = "settingsgoogle:additional_battery_info_enabled";
+ static final String GFLAG_BATTERY_ADVANCED_UI_ENABLED = "settingsgoogle:battery_advanced_ui_enabled";
+ static final String GFLAG_POWER_ACCOUNTING_TOGGLE_ENABLED = "settingsgoogle:power_accounting_toggle_enabled";
+ static final String IS_EARLY_WARNING_COL = "is_early_warning";
+ static final int NEED_EARLY_WARNING = 1;
+ private static final String[] PACKAGES_SERVICE = {"com.google.android.gms", "com.google.android.apps.gcs"};
+ static final String TIMESTAMP_COL = "timestamp_millis";
+
+ public PowerUsageFeatureProviderGoogleImpl(Context context) {
+ super(context);
+ }
+
+ public boolean isTypeService(BatterySipper batterySipper) {
+ String[] packagesForUid = mPackageManager.getPackagesForUid(batterySipper.getUid());
+ if (packagesForUid == null) {
+ return false;
+ }
+ for (String contains : packagesForUid) {
+ if (ArrayUtils.contains(PACKAGES_SERVICE, contains)) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ private void setPackageManager(PackageManager packageManager) {
+ mPackageManager = packageManager;
+ }
+
+ public Estimate getEnhancedBatteryPrediction(Context context) {
+ long j;
+ Cursor query = context.getContentResolver().query(getEnhancedBatteryPredictionUri(), (String[]) null, (String) null, (String[]) null, (String) null);
+ if (query != null) {
+ try {
+ if (query.moveToFirst()) {
+ int columnIndex = query.getColumnIndex(BATTERY_ESTIMATE_BASED_ON_USAGE_COL);
+ boolean z = true;
+ if (columnIndex != -1) {
+ if (1 != query.getInt(columnIndex)) {
+ z = false;
+ }
+ }
+ boolean z2 = z;
+ int columnIndex2 = query.getColumnIndex(AVERAGE_BATTERY_LIFE_COL);
+ if (columnIndex2 != -1) {
+ long j2 = query.getLong(columnIndex2);
+ if (j2 != -1) {
+ long millis = Duration.ofMinutes(15).toMillis();
+ if (Duration.ofMillis(j2).compareTo(Duration.ofDays(1)) >= 0) {
+ millis = Duration.ofHours(1).toMillis();
+ }
+ j = PowerUtil.roundTimeToNearestThreshold(j2, millis);
+ Estimate estimate = new Estimate(query.getLong(query.getColumnIndex(BATTERY_ESTIMATE_COL)), z2, j);
+ if (query != null) {
+ query.close();
+ }
+ return estimate;
+ }
+ }
+ j = -1;
+ Estimate estimate2 = new Estimate(query.getLong(query.getColumnIndex(BATTERY_ESTIMATE_COL)), z2, j);
+ if (query != null) {
+ }
+ return estimate2;
+ }
+ } catch (Throwable th) {
+ th.addSuppressed(th);
+ }
+ }
+ if (query == null) {
+ return null;
+ }
+ query.close();
+ return null;
+ }
+
+ public SparseIntArray getEnhancedBatteryPredictionCurve(Context context, long j) {
+ Cursor query;
+ try {
+ query = context.getContentResolver().query(getEnhancedBatteryPredictionCurveUri(), (String[]) null, (String) null, (String[]) null, (String) null);
+ if (query == null) {
+ if (query != null) {
+ query.close();
+ }
+ return null;
+ }
+ int columnIndex = query.getColumnIndex(TIMESTAMP_COL);
+ int columnIndex2 = query.getColumnIndex(BATTERY_LEVEL_COL);
+ SparseIntArray sparseIntArray = new SparseIntArray(query.getCount());
+ while (query.moveToNext()) {
+ sparseIntArray.append((int) (query.getLong(columnIndex) - j), query.getInt(columnIndex2));
+ }
+ if (query != null) {
+ query.close();
+ }
+ return sparseIntArray;
+ } catch (NullPointerException unused) {
+ return null;
+ }
+ }
+
+ public boolean isEnhancedBatteryPredictionEnabled(Context context) {
+ try {
+ if (!mPackageManager.getPackageInfo("com.google.android.apps.turbo", 512).applicationInfo.enabled) {
+ return false;
+ }
+ return true;
+ } catch (PackageManager.NameNotFoundException unused) {
+ return false;
+ }
+ }
+
+ private Uri getEnhancedBatteryPredictionUri() {
+ return new Uri.Builder().scheme("content").authority("com.google.android.apps.turbo.estimated_time_remaining").appendPath("time_remaining").build();
+ }
+
+ private Uri getEnhancedBatteryPredictionCurveUri() {
+ return new Uri.Builder().scheme("content").authority("com.google.android.apps.turbo.estimated_time_remaining").appendPath("discharge_curve").build();
+ }
+
+ public String getEnhancedEstimateDebugString(String str) {
+ return mContext.getString(R.string.power_usage_enhanced_debug, new Object[]{str});
+ }
+
+ public String getOldEstimateDebugString(String str) {
+ return mContext.getString(R.string.power_usage_old_debug, new Object[]{str});
+ }
+
+ public String getAdvancedUsageScreenInfoString() {
+ return mContext.getString(R.string.advanced_battery_graph_subtext);
+ }
+
+ public boolean getEarlyWarningSignal(Context context, String str) {
+ Uri.Builder appendPath = new Uri.Builder().scheme("content").authority("com.google.android.apps.turbo.estimated_time_remaining").appendPath("early_warning").appendPath("id");
+ if (TextUtils.isEmpty(str)) {
+ appendPath.appendPath(context.getPackageName());
+ } else {
+ appendPath.appendPath(str);
+ }
+ Cursor query = context.getContentResolver().query(appendPath.build(), (String[]) null, (String) null, (String[]) null, (String) null);
+ boolean z = false;
+ if (query != null) {
+ try {
+ if (query.moveToFirst()) {
+ if (1 == query.getInt(query.getColumnIndex(IS_EARLY_WARNING_COL))) {
+ z = true;
+ }
+ if (query != null) {
+ query.close();
+ }
+ return z;
+ }
+ } catch (Throwable th) {
+ th.addSuppressed(th);
+ }
+ }
+ if (query != null) {
+ query.close();
+ }
+ return false;
+ }
+}
diff --git a/src/com/google/android/settings/overlay/FeatureFactoryImpl.java b/src/com/google/android/settings/overlay/FeatureFactoryImpl.java
new file mode 100644
index 0000000..f762c63
--- /dev/null
+++ b/src/com/google/android/settings/overlay/FeatureFactoryImpl.java
@@ -0,0 +1,68 @@
+package com.google.android.settings.overlay;
+
+import android.app.AppGlobals;
+import android.app.admin.DevicePolicyManager;
+import android.content.Context;
+
+import com.android.settings.accounts.AccountFeatureProvider;
+import com.android.settings.search.SearchFeatureProvider;
+import com.android.settings.dashboard.suggestions.SuggestionFeatureProvider;
+import com.android.settings.applications.ApplicationFeatureProvider;
+import com.android.settings.fuelgauge.PowerUsageFeatureProvider;
+import com.google.android.settings.accounts.AccountFeatureProviderGoogleImpl;
+import com.google.android.settings.applications.ApplicationFeatureProviderGoogleImpl;
+import com.google.android.settings.dashboard.suggestions.SuggestionFeatureProviderGoogleImpl;
+import com.google.android.settings.search.SearchFeatureProviderGoogleImpl;
+import com.google.android.settings.fuelgauge.PowerUsageFeatureProviderGoogleImpl;
+
+public final class FeatureFactoryImpl extends com.android.settings.overlay.FeatureFactoryImpl {
+ private AccountFeatureProvider mAccountFeatureProvider;
+ private ApplicationFeatureProvider mApplicationFeatureProvider;
+ private SearchFeatureProvider mSearchFeatureProvider;
+ private SuggestionFeatureProvider mSuggestionFeatureProvider;
+ private PowerUsageFeatureProvider mPowerUsageProvider;
+
+ @Override
+ public AccountFeatureProvider getAccountFeatureProvider() {
+ if (mAccountFeatureProvider == null) {
+ mAccountFeatureProvider = new AccountFeatureProviderGoogleImpl();
+ }
+ return mAccountFeatureProvider;
+ }
+
+ @Override
+ public SearchFeatureProvider getSearchFeatureProvider() {
+ if (mSearchFeatureProvider == null) {
+ mSearchFeatureProvider = new SearchFeatureProviderGoogleImpl();
+ }
+ return mSearchFeatureProvider;
+ }
+
+ @Override
+ public SuggestionFeatureProvider getSuggestionFeatureProvider(Context context) {
+ if (mSuggestionFeatureProvider == null) {
+ mSuggestionFeatureProvider = new SuggestionFeatureProviderGoogleImpl(context.getApplicationContext());
+ }
+ return mSuggestionFeatureProvider;
+ }
+
+ @Override
+ public ApplicationFeatureProvider getApplicationFeatureProvider(Context context) {
+ if (mApplicationFeatureProvider == null) {
+ Context applicationContext = context.getApplicationContext();
+ DevicePolicyManager dpManager =
+ (DevicePolicyManager) context.getSystemService(Context.DEVICE_POLICY_SERVICE);
+ mApplicationFeatureProvider = new ApplicationFeatureProviderGoogleImpl(applicationContext,
+ applicationContext.getPackageManager(), AppGlobals.getPackageManager(), dpManager);
+ }
+ return mApplicationFeatureProvider;
+ }
+
+ @Override
+ public PowerUsageFeatureProvider getPowerUsageFeatureProvider(Context context) {
+ if (mPowerUsageProvider == null) {
+ mPowerUsageProvider = new PowerUsageFeatureProviderGoogleImpl(context.getApplicationContext());
+ }
+ return mPowerUsageProvider;
+ }
+}
diff --git a/src/com/google/android/settings/search/SearchFeatureProviderGoogleImpl.java b/src/com/google/android/settings/search/SearchFeatureProviderGoogleImpl.java
new file mode 100644
index 0000000..24d4a84
--- /dev/null
+++ b/src/com/google/android/settings/search/SearchFeatureProviderGoogleImpl.java
@@ -0,0 +1,12 @@
+package com.google.android.settings.search;
+
+import android.content.Context;
+import com.android.settings.search.SearchFeatureProviderImpl;
+import com.google.android.settings.external.SignatureVerifier;
+
+public class SearchFeatureProviderGoogleImpl extends SearchFeatureProviderImpl {
+ @Override
+ public boolean isSignatureWhitelisted(Context context, String str) {
+ return SignatureVerifier.isPackageWhitelisted(context, str);
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/development/bluetooth/AbstractBluetoothDialogPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/bluetooth/AbstractBluetoothDialogPreferenceControllerTest.java
index afb1778..a12131d 100644
--- a/tests/robotests/src/com/android/settings/development/bluetooth/AbstractBluetoothDialogPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/bluetooth/AbstractBluetoothDialogPreferenceControllerTest.java
@@ -16,6 +16,8 @@
package com.android.settings.development.bluetooth;
+import static android.bluetooth.BluetoothCodecConfig.CODEC_PRIORITY_HIGHEST;
+
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.never;
@@ -199,7 +201,7 @@
verify(mBluetoothA2dpConfigStore).setSampleRate(mCodecConfigAAC.getSampleRate());
verify(mBluetoothA2dpConfigStore).setBitsPerSample(mCodecConfigAAC.getBitsPerSample());
verify(mBluetoothA2dpConfigStore).setChannelMode(mCodecConfigAAC.getChannelMode());
- verify(mBluetoothA2dpConfigStore).setCodecPriority(mCodecConfigAAC.getCodecPriority());
+ verify(mBluetoothA2dpConfigStore).setCodecPriority(CODEC_PRIORITY_HIGHEST);
verify(mBluetoothA2dpConfigStore).setCodecSpecific1Value(
mCodecConfigAAC.getCodecSpecific1());
}
diff --git a/tests/robotests/src/com/android/settings/privacy/PermissionBarChartPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/privacy/PermissionBarChartPreferenceControllerTest.java
new file mode 100644
index 0000000..5501aa4
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/privacy/PermissionBarChartPreferenceControllerTest.java
@@ -0,0 +1,262 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.privacy;
+
+import static android.Manifest.permission_group.CALENDAR;
+import static android.Manifest.permission_group.CAMERA;
+import static android.Manifest.permission_group.CONTACTS;
+import static android.Manifest.permission_group.LOCATION;
+import static android.Manifest.permission_group.MICROPHONE;
+import static android.Manifest.permission_group.PHONE;
+import static android.Manifest.permission_group.SMS;
+
+import static com.android.settings.core.BasePreferenceController.AVAILABLE_UNSEARCHABLE;
+import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.content.pm.UserInfo;
+import android.os.UserManager;
+import android.permission.RuntimePermissionUsageInfo;
+import android.provider.DeviceConfig;
+import android.view.accessibility.AccessibilityManager;
+
+import androidx.preference.PreferenceScreen;
+
+import com.android.internal.widget.LockPatternUtils;
+import com.android.settings.Utils;
+import com.android.settings.testutils.FakeFeatureFactory;
+import com.android.settings.testutils.shadow.ShadowDeviceConfig;
+import com.android.settings.testutils.shadow.ShadowPermissionControllerManager;
+import com.android.settings.testutils.shadow.ShadowUserManager;
+import com.android.settingslib.widget.BarChartInfo;
+import com.android.settingslib.widget.BarChartPreference;
+import com.android.settingslib.widget.BarViewInfo;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+import org.robolectric.shadow.api.Shadow;
+import org.robolectric.shadows.ShadowAccessibilityManager;
+import org.robolectric.shadows.androidx.fragment.FragmentController;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@RunWith(RobolectricTestRunner.class)
+@Config(shadows = {ShadowDeviceConfig.class, ShadowUserManager.class,
+ ShadowPermissionControllerManager.class})
+public class PermissionBarChartPreferenceControllerTest {
+
+ @Mock
+ private PreferenceScreen mScreen;
+ @Mock
+ private LockPatternUtils mLockPatternUtils;
+
+ private PermissionBarChartPreferenceController mController;
+ private BarChartPreference mPreference;
+ private PrivacyDashboardFragment mFragment;
+
+ @Before
+ public void setUp() {
+ MockitoAnnotations.initMocks(this);
+ final Context context = RuntimeEnvironment.application;
+ final UserManager userManager = context.getSystemService(UserManager.class);
+ final ShadowUserManager shadowUserManager = Shadow.extract(userManager);
+ final ShadowAccessibilityManager accessibilityManager = Shadow.extract(
+ AccessibilityManager.getInstance(context));
+ accessibilityManager.setEnabledAccessibilityServiceList(new ArrayList<>());
+ shadowUserManager.addProfile(new UserInfo(123, null, 0));
+ when(FakeFeatureFactory.setupForTest().securityFeatureProvider.getLockPatternUtils(
+ any(Context.class))).thenReturn(mLockPatternUtils);
+
+ mController = spy(new PermissionBarChartPreferenceController(context, "test_key"));
+ mFragment = spy(FragmentController.of(new PrivacyDashboardFragment())
+ .create().start().get());
+ mController.setFragment(mFragment);
+ mPreference = spy(new BarChartPreference(context));
+ when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
+ }
+
+ @After
+ public void tearDown() {
+ ShadowDeviceConfig.reset();
+ }
+
+ @Test
+ public void getAvailabilityStatus_permissionHubNotSet_shouldReturnUnsupported() {
+ // We have not yet set the property to show the Permissions Hub.
+ assertThat(mController.getAvailabilityStatus()).isEqualTo(UNSUPPORTED_ON_DEVICE);
+ }
+
+ @Test
+ public void getAvailabilityStatus_permissionHubEnabled_shouldReturnAvailableUnsearchable() {
+ DeviceConfig.setProperty(DeviceConfig.NAMESPACE_PRIVACY,
+ Utils.PROPERTY_PERMISSIONS_HUB_ENABLED,
+ "true", true);
+
+ assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE_UNSEARCHABLE);
+ }
+
+ @Test
+ public void displayPreference_shouldInitializeBarChart() {
+ mController.displayPreference(mScreen);
+
+ verify(mPreference).initializeBarChart(any(BarChartInfo.class));
+ }
+
+ @Test
+ public void displayPreference_usageInfosSet_shouldSetBarViewInfos() {
+ final RuntimePermissionUsageInfo info1 =
+ new RuntimePermissionUsageInfo("permission 1", 10);
+ mController.mOldUsageInfos.add(info1);
+
+ mController.displayPreference(mScreen);
+
+ verify(mPreference).setBarViewInfos(any(BarViewInfo[].class));
+ verify(mPreference).initializeBarChart(any(BarChartInfo.class));
+ }
+
+ @Test
+ public void onPermissionUsageResult_differentPermissionResultSet_shouldSetBarViewInfos() {
+ final List<RuntimePermissionUsageInfo> infos1 = new ArrayList<>();
+ final RuntimePermissionUsageInfo info1 =
+ new RuntimePermissionUsageInfo("permission 1", 10);
+ infos1.add(info1);
+ mController.displayPreference(mScreen);
+ mController.onPermissionUsageResult(infos1);
+
+ verify(mPreference).setBarViewInfos(any(BarViewInfo[].class));
+
+ final List<RuntimePermissionUsageInfo> infos2 = new ArrayList<>();
+ final RuntimePermissionUsageInfo info2 =
+ new RuntimePermissionUsageInfo("permission 2", 20);
+ infos2.add(info2);
+ mController.onPermissionUsageResult(infos2);
+
+ verify(mPreference, times(2)).setBarViewInfos(any(BarViewInfo[].class));
+ }
+
+ @Test
+ public void onPermissionUsageResult_samePermissionResultSet_shouldNotSetBarViewInfos() {
+ final List<RuntimePermissionUsageInfo> mInfos = new ArrayList<>();
+ final RuntimePermissionUsageInfo info1 =
+ new RuntimePermissionUsageInfo("permission 1", 10);
+ mInfos.add(info1);
+ mController.displayPreference(mScreen);
+ mController.onPermissionUsageResult(mInfos);
+
+ mController.onPermissionUsageResult(mInfos);
+
+ verify(mPreference, times(1)).setBarViewInfos(any(BarViewInfo[].class));
+ }
+
+ @Test
+ public void onStart_usageInfosNotSetAndPermissionHubEnabled_shouldShowProgressBar() {
+ DeviceConfig.setProperty(DeviceConfig.NAMESPACE_PRIVACY,
+ Utils.PROPERTY_PERMISSIONS_HUB_ENABLED,
+ "true", true);
+ mController.displayPreference(mScreen);
+
+ mController.onStart();
+
+ assertThat(mFragment.getActivity().getActionBar().getElevation()).isZero();
+ verify(mFragment).showPinnedHeader(true);
+ verify(mPreference).updateLoadingState(true /* isLoading */);
+ }
+
+ @Test
+ public void onStart_usageInfosSetAndPermissionHubEnabled_shouldNotUpdatePrefLoadingState() {
+ DeviceConfig.setProperty(DeviceConfig.NAMESPACE_PRIVACY,
+ Utils.PROPERTY_PERMISSIONS_HUB_ENABLED,
+ "true", true);
+ final RuntimePermissionUsageInfo info1 =
+ new RuntimePermissionUsageInfo("permission 1", 10);
+ mController.mOldUsageInfos.add(info1);
+ mController.displayPreference(mScreen);
+
+ mController.onStart();
+
+ assertThat(mFragment.getActivity().getActionBar().getElevation()).isZero();
+ verify(mFragment).showPinnedHeader(true);
+ verify(mPreference).updateLoadingState(false /* isLoading */);
+ }
+
+ @Test
+ public void onStart_permissionHubDisabled_shouldNotShowProgressBar() {
+ DeviceConfig.setProperty(DeviceConfig.NAMESPACE_PRIVACY,
+ Utils.PROPERTY_PERMISSIONS_HUB_ENABLED,
+ "false", true);
+
+ mController.onStart();
+
+ assertThat(mFragment.getActivity().getActionBar().getElevation()).isNonZero();
+ verify(mFragment, never()).showPinnedHeader(true);
+ verify(mPreference, never()).updateLoadingState(true /* isLoading */);
+ }
+
+ @Test
+ public void onPermissionUsageResult_shouldHideProgressBar() {
+ final List<RuntimePermissionUsageInfo> infos1 = new ArrayList<>();
+ final RuntimePermissionUsageInfo info1 =
+ new RuntimePermissionUsageInfo("permission 1", 10);
+ infos1.add(info1);
+ mController.displayPreference(mScreen);
+
+ mController.onPermissionUsageResult(infos1);
+
+ verify(mFragment).showPinnedHeader(false);
+ verify(mPreference).updateLoadingState(false /* isLoading */);
+ }
+
+ @Test
+ public void onPermissionUsageResult_shouldBeSorted() {
+ final List<RuntimePermissionUsageInfo> infos = new ArrayList<>();
+ infos.add(new RuntimePermissionUsageInfo(PHONE, 10));
+ infos.add(new RuntimePermissionUsageInfo(LOCATION, 10));
+ infos.add(new RuntimePermissionUsageInfo(CAMERA, 10));
+ infos.add(new RuntimePermissionUsageInfo(SMS, 1));
+ infos.add(new RuntimePermissionUsageInfo(MICROPHONE, 10));
+ infos.add(new RuntimePermissionUsageInfo(CONTACTS, 42));
+ infos.add(new RuntimePermissionUsageInfo(CALENDAR, 10));
+ mController.displayPreference(mScreen);
+
+ mController.onPermissionUsageResult(infos);
+
+ assertThat(infos.get(0).getName()).isEqualTo(CONTACTS);
+ assertThat(infos.get(1).getName()).isEqualTo(LOCATION);
+ assertThat(infos.get(2).getName()).isEqualTo(MICROPHONE);
+ assertThat(infos.get(3).getName()).isEqualTo(CAMERA);
+ assertThat(infos.get(4).getName()).isEqualTo(CALENDAR);
+ assertThat(infos.get(5).getName()).isEqualTo(PHONE);
+ assertThat(infos.get(6).getName()).isEqualTo(SMS);
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/privacy/PrivacyDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/privacy/PrivacyDashboardFragmentTest.java
new file mode 100644
index 0000000..256fcd4
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/privacy/PrivacyDashboardFragmentTest.java
@@ -0,0 +1,83 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.privacy;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.content.pm.UserInfo;
+import android.os.Bundle;
+import android.os.UserManager;
+import android.view.View;
+import android.view.accessibility.AccessibilityManager;
+
+import com.android.internal.widget.LockPatternUtils;
+import com.android.settings.testutils.FakeFeatureFactory;
+import com.android.settings.testutils.shadow.ShadowPermissionControllerManager;
+import com.android.settings.testutils.shadow.ShadowUserManager;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+import org.robolectric.shadow.api.Shadow;
+import org.robolectric.shadows.ShadowAccessibilityManager;
+import org.robolectric.shadows.androidx.fragment.FragmentController;
+
+import java.util.ArrayList;
+
+
+@RunWith(RobolectricTestRunner.class)
+@Config(shadows = {ShadowUserManager.class, ShadowPermissionControllerManager.class})
+public class PrivacyDashboardFragmentTest {
+
+ @Mock
+ private LockPatternUtils mLockPatternUtils;
+
+ private Context mContext;
+ private PrivacyDashboardFragment mFragment;
+
+ @Before
+ public void setUp() {
+ MockitoAnnotations.initMocks(this);
+ mContext = RuntimeEnvironment.application;
+ final UserManager userManager = mContext.getSystemService(UserManager.class);
+ final ShadowUserManager shadowUserManager = Shadow.extract(userManager);
+ final ShadowAccessibilityManager accessibilityManager = Shadow.extract(
+ AccessibilityManager.getInstance(mContext));
+ accessibilityManager.setEnabledAccessibilityServiceList(new ArrayList<>());
+ shadowUserManager.addProfile(new UserInfo(123, null, 0));
+ when(FakeFeatureFactory.setupForTest().securityFeatureProvider.getLockPatternUtils(
+ any(Context.class))).thenReturn(mLockPatternUtils);
+ mFragment = spy(FragmentController.of(new PrivacyDashboardFragment())
+ .create().start().get());
+ }
+
+ @Test
+ public void onViewCreated_shouldInitLinearProgressBar() {
+ mFragment.onViewCreated(new View(mContext), new Bundle());
+
+ verify(mFragment).initLoadingBar();
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/security/CredentialStoragePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/CredentialStoragePreferenceControllerTest.java
deleted file mode 100644
index 3eb21cf..0000000
--- a/tests/robotests/src/com/android/settings/security/CredentialStoragePreferenceControllerTest.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.security;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import android.content.Context;
-
-import androidx.preference.Preference;
-
-import com.android.settings.R;
-import com.android.settings.testutils.shadow.ShadowKeyStore;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-@RunWith(RobolectricTestRunner.class)
-@Config(shadows = ShadowKeyStore.class)
-public class CredentialStoragePreferenceControllerTest {
-
- private Context mContext;
- private CredentialStoragePreferenceController mController;
- private Preference mPreference;
-
- @Before
- public void setUp() {
- mContext = RuntimeEnvironment.application;
- mController = new CredentialStoragePreferenceController(mContext);
- mPreference = new Preference(mContext);
- }
-
- @Test
- public void updateState_hardwareBacked_showHardwareSummary() {
- ShadowKeyStore.setHardwareBacked(true);
-
- mController.updateState(mPreference);
-
- assertThat(mPreference.getSummary())
- .isEqualTo(mContext.getText(R.string.credential_storage_type_hardware));
- }
-
- @Test
- public void updateState_hardwareBacked_showSoftwareSummary() {
- ShadowKeyStore.setHardwareBacked(false);
-
- mController.updateState(mPreference);
-
- assertThat(mPreference.getSummary())
- .isEqualTo(mContext.getText(R.string.credential_storage_type_software));
- }
-}
diff --git a/tests/robotests/src/com/android/settings/security/RestrictedEncryptionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/RestrictedEncryptionPreferenceControllerTest.java
index 78ad5e5..c25700c 100644
--- a/tests/robotests/src/com/android/settings/security/RestrictedEncryptionPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/security/RestrictedEncryptionPreferenceControllerTest.java
@@ -39,7 +39,6 @@
private Context mContext;
private ShadowUserManager mUserManager;
- private CredentialStoragePreferenceController mCredentialStoragePreferenceController;
private InstallCertificatePreferenceController mInstallCertificatePreferenceController;
private ResetCredentialsPreferenceController mResetCredentialsPreferenceController;
private UserCredentialsPreferenceController mUserCredentialsPreferenceController;
@@ -54,8 +53,6 @@
mContext = RuntimeEnvironment.application;
mLifecycleOwner = () -> mLifecycle;
mLifecycle = new Lifecycle(mLifecycleOwner);
- mCredentialStoragePreferenceController =
- new CredentialStoragePreferenceController(mContext);
mInstallCertificatePreferenceController =
new InstallCertificatePreferenceController(mContext);
mResetCredentialsPreferenceController =
@@ -73,7 +70,6 @@
@Test
public void isAvailable_noRestriction_shouldReturnTrue() {
- assertThat(mCredentialStoragePreferenceController.isAvailable()).isTrue();
assertThat(mInstallCertificatePreferenceController.isAvailable()).isTrue();
assertThat(mResetCredentialsPreferenceController.isAvailable()).isTrue();
assertThat(mUserCredentialsPreferenceController.isAvailable()).isTrue();
@@ -86,7 +82,6 @@
public void isAvailable_hasRestriction_shouldReturnFalse() {
mUserManager.addBaseUserRestriction(UserManager.DISALLOW_CONFIG_CREDENTIALS);
- assertThat(mCredentialStoragePreferenceController.isAvailable()).isFalse();
assertThat(mInstallCertificatePreferenceController.isAvailable()).isFalse();
assertThat(mResetCredentialsPreferenceController.isAvailable()).isFalse();
assertThat(mUserCredentialsPreferenceController.isAvailable()).isFalse();
diff --git a/tests/robotests/src/com/android/settings/security/screenlock/PowerButtonInstantLockPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/screenlock/PowerButtonInstantLockPreferenceControllerTest.java
index 7c44561..8884ab8 100644
--- a/tests/robotests/src/com/android/settings/security/screenlock/PowerButtonInstantLockPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/security/screenlock/PowerButtonInstantLockPreferenceControllerTest.java
@@ -119,7 +119,7 @@
mController.updateState(mPreference);
assertThat(mPreference.isChecked()).isFalse();
assertThat(mPreference.getSummary()).isEqualTo(mContext.getString(
- R.string.summary_placeholder));
+ R.string.summary_empty));
}
@Test
diff --git a/tests/robotests/src/com/android/settings/testutils/FakeFeatureFactory.java b/tests/robotests/src/com/android/settings/testutils/FakeFeatureFactory.java
index 2c68269..b6c4fb7 100644
--- a/tests/robotests/src/com/android/settings/testutils/FakeFeatureFactory.java
+++ b/tests/robotests/src/com/android/settings/testutils/FakeFeatureFactory.java
@@ -29,7 +29,6 @@
import com.android.settings.dashboard.DashboardFeatureProvider;
import com.android.settings.dashboard.suggestions.SuggestionFeatureProvider;
import com.android.settings.enterprise.EnterprisePrivacyFeatureProvider;
-import com.android.settings.fuelgauge.BatteryStatusFeatureProvider;
import com.android.settings.fuelgauge.PowerUsageFeatureProvider;
import com.android.settings.gestures.AssistGestureFeatureProvider;
import com.android.settings.homepage.contextualcards.ContextualCardFeatureProvider;
@@ -55,7 +54,6 @@
public final SupportFeatureProvider supportFeatureProvider;
public final MetricsFeatureProvider metricsFeatureProvider;
- public final BatteryStatusFeatureProvider batteryStatusFeatureProvider;
public final PowerUsageFeatureProvider powerUsageFeatureProvider;
public final DashboardFeatureProvider dashboardFeatureProvider;
public final DockUpdaterFeatureProvider dockUpdaterFeatureProvider;
@@ -100,7 +98,6 @@
public FakeFeatureFactory() {
supportFeatureProvider = mock(SupportFeatureProvider.class);
metricsFeatureProvider = mock(MetricsFeatureProvider.class);
- batteryStatusFeatureProvider = mock(BatteryStatusFeatureProvider.class);
powerUsageFeatureProvider = mock(PowerUsageFeatureProvider.class);
dashboardFeatureProvider = mock(DashboardFeatureProvider.class);
dockUpdaterFeatureProvider = mock(DockUpdaterFeatureProvider.class);
@@ -138,11 +135,6 @@
}
@Override
- public BatteryStatusFeatureProvider getBatteryStatusFeatureProvider(Context context) {
- return batteryStatusFeatureProvider;
- }
-
- @Override
public PowerUsageFeatureProvider getPowerUsageFeatureProvider(Context context) {
return powerUsageFeatureProvider;
}
