Merge changes from topic "lockscreen-notif-settings-page" into main
* changes:
Replace the existing notifications on lock screen preferences with new page
Implement the preference switch for minimalism on ls settings page
Implement the Hide seen notifications toggle
Implement the hide silent notifications toggle
Implement the show sensitive content toggle
Implement the main switch of notifications on lock screen
Add the new settings page for lock screen notifs
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index fd9a50d..db2e0d4 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -852,10 +852,15 @@
</activity>
<activity android:name=".network.SimOnboardingActivity"
- android:exported="false"
+ android:exported="true"
android:configChanges="orientation|keyboard|keyboardHidden|screenSize|screenLayout|smallestScreenSize"
android:permission="android.permission.WRITE_EMBEDDED_SUBSCRIPTIONS"
- android:theme="@style/Theme.SpaLib.BottomSheetDialog"/>
+ android:theme="@style/Theme.SpaLib.BottomSheetDialog">
+ <intent-filter android:priority="1">
+ <action android:name="android.settings.SIM_PREFERENCE_SETTINGS" />
+ <category android:name="android.intent.category.DEFAULT" />
+ </intent-filter>
+ </activity>
<activity android:name=".network.telephony.ToggleSubscriptionDialogActivity"
android:exported="false"
diff --git a/OWNERS b/OWNERS
index 12cd4ea..5aa30d5 100644
--- a/OWNERS
+++ b/OWNERS
@@ -13,16 +13,10 @@
sunnyshao@google.com
# Android Settings extended
-chaohuiw@google.com
-songferngwang@google.com
-tomhsu@google.com
-wengsu@google.com
-ykhung@google.com
+zhibinliu@google.com
# Emergency only
cipson@google.com
-hanxu@google.com
-yangfan@google.com
# Exempt resource files (because they are in a flat directory and too hard to manage via OWNERS)
per-file res*/**=*
diff --git a/res/drawable-night/double_tap_power_for_wallet.xml b/res/drawable-night/double_tap_power_for_wallet.xml
new file mode 100644
index 0000000..9c3de36
--- /dev/null
+++ b/res/drawable-night/double_tap_power_for_wallet.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+ Copyright (C) 2024 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="412dp"
+ android:height="300dp"
+ android:viewportHeight="300"
+ android:viewportWidth="412">
+ <path
+ android:fillColor="#000000"
+ android:pathData="M384.2 300H27.8C12.5 300 0 287.2 0 271.5V28.5C0 12.8 12.5 0 27.8 0H384.3C399.5 0 412 12.8 412 28.5V271.7C412 287.2 399.5 300 384.2 300Z" />
+ <path
+ android:fillColor="#D2E3FC"
+ android:pathData="M272.5 77.2V82.9C277.9 82.9 282.3 87.3 282.3 92.7C282.3 98.1 277.9 102.5 272.5 102.5V108.2C281.1 108.2 288 101.2 288 92.7C288 84.2 281 77.2 272.5 77.2Z" />
+ <path
+ android:fillColor="#669DF6"
+ android:pathData="M282.3 92.7C282.3 87.3 277.9 82.9 272.5 82.9V102.6C277.9 102.6 282.3 98.2 282.3 92.7Z" />
+ <path
+ android:fillColor="#80868B"
+ android:pathData="M274.9 97.7V88.2C274.9 86.9 273.8 85.8 272.5 85.8V35.9C272.5 29.3 267.2 24 260.6 24H151.3C144.7 24 139.4 29.3 139.4 35.9V264.1C139.4 270.7 144.7 276 151.3 276H260.7C267.3 276 272.6 270.7 272.6 264.1V147.6C273.9 147.6 275 146.5 275 145.2V121.4C275 120.1 273.9 119 272.6 119V100C273.9 100.1 274.9 99 274.9 97.7ZM270.2 264.1C270.2 269.3 265.9 273.6 260.7 273.6H151.3C146.1 273.6 141.8 269.3 141.8 264.1V35.9C141.8 30.7 146.1 26.4 151.3 26.4H260.7C265.9 26.4 270.2 30.7 270.2 35.9V264.1Z" />
+ <path
+ android:fillColor="#E8EAED"
+ android:pathData="M270.2 264.1C270.2 269.3 265.9 273.6 260.7 273.6H151.3C146.1 273.6 141.8 269.3 141.8 264.1V35.9C141.8 30.7 146.1 26.4 151.3 26.4H260.7C265.9 26.4 270.2 30.7 270.2 35.9V264.1Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M194.64 151.3C192.292 151.3 190.281 150.464 188.609 148.791C186.936 147.119 186.1 145.109 186.1 142.76V125.68C186.1 123.332 186.936 121.321 188.609 119.649C190.281 117.976 192.292 117.14 194.64 117.14H220.26C222.608 117.14 224.619 117.976 226.291 119.649C227.964 121.321 228.8 123.332 228.8 125.68V142.76C228.8 145.109 227.964 147.119 226.291 148.791C224.619 150.464 222.608 151.3 220.26 151.3H194.64ZM194.64 126.214H220.26C221.292 126.214 222.253 126.374 223.142 126.694C224.067 127.014 224.886 127.477 225.597 128.082V125.68C225.597 124.186 225.082 122.922 224.05 121.89C223.018 120.858 221.754 120.343 220.26 120.343H194.64C193.145 120.343 191.882 120.858 190.85 121.89C189.818 122.922 189.303 124.186 189.303 125.68V128.082C190.014 127.477 190.815 127.014 191.704 126.694C192.63 126.374 193.608 126.214 194.64 126.214ZM189.463 133.473L214.922 139.611C215.172 139.682 215.421 139.7 215.67 139.664C215.954 139.593 216.186 139.469 216.364 139.291L224.904 132.138C224.441 131.32 223.801 130.662 222.982 130.164C222.164 129.665 221.256 129.416 220.26 129.416H194.64C193.395 129.416 192.292 129.808 191.331 130.591C190.37 131.338 189.747 132.298 189.463 133.473Z" />
+</vector>
\ No newline at end of file
diff --git a/res/drawable/double_tap_power_for_wallet.xml b/res/drawable/double_tap_power_for_wallet.xml
new file mode 100644
index 0000000..606c337
--- /dev/null
+++ b/res/drawable/double_tap_power_for_wallet.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+ Copyright (C) 2024 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="412dp"
+ android:height="300dp"
+ android:viewportHeight="300"
+ android:viewportWidth="412">
+ <path
+ android:fillColor="#FFFFFF"
+ android:pathData="M384.2 300H27.8C12.5 300 0 287.2 0 271.5V28.5C0 12.8 12.5 0 27.8 0H384.3C399.5 0 412 12.8 412 28.5V271.7C412 287.2 399.5 300 384.2 300Z" />
+ <path
+ android:fillColor="#8AB4F8"
+ android:pathData="M272.5 77.2V82.9C277.9 82.9 282.3 87.3 282.3 92.7C282.3 98.1 277.9 102.5 272.5 102.5V108.2C281.1 108.2 288 101.2 288 92.7C288 84.2 281 77.2 272.5 77.2Z" />
+ <path
+ android:fillColor="#669DF6"
+ android:pathData="M282.3 92.7C282.3 87.3 277.9 82.9 272.5 82.9V102.6C277.9 102.6 282.3 98.2 282.3 92.7Z" />
+ <path
+ android:fillColor="#DADCE0"
+ android:pathData="M274.9 97.7V88.2C274.9 86.9 273.8 85.8 272.5 85.8V35.9C272.5 29.3 267.2 24 260.6 24H151.3C144.7 24 139.4 29.3 139.4 35.9V264.1C139.4 270.7 144.7 276 151.3 276H260.7C267.3 276 272.6 270.7 272.6 264.1V147.6C273.9 147.6 275 146.5 275 145.2V121.4C275 120.1 273.9 119 272.6 119V100C273.9 100.1 274.9 99 274.9 97.7ZM270.2 264.1C270.2 269.3 265.9 273.6 260.7 273.6H151.3C146.1 273.6 141.8 269.3 141.8 264.1V35.9C141.8 30.7 146.1 26.4 151.3 26.4H260.7C265.9 26.4 270.2 30.7 270.2 35.9V264.1Z" />
+ <path
+ android:fillColor="#3C4043"
+ android:pathData="M270.2 264.1C270.2 269.3 265.9 273.6 260.7 273.6H151.3C146.1 273.6 141.8 269.3 141.8 264.1V35.9C141.8 30.7 146.1 26.4 151.3 26.4H260.7C265.9 26.4 270.2 30.7 270.2 35.9V264.1Z" />
+ <path
+ android:fillColor="#FFFFFF"
+ android:pathData="M194.64 151.3C192.292 151.3 190.281 150.464 188.609 148.791C186.936 147.119 186.1 145.109 186.1 142.76V125.68C186.1 123.332 186.936 121.321 188.609 119.649C190.281 117.976 192.292 117.14 194.64 117.14H220.26C222.608 117.14 224.619 117.976 226.291 119.649C227.964 121.321 228.8 123.332 228.8 125.68V142.76C228.8 145.109 227.964 147.119 226.291 148.791C224.619 150.464 222.608 151.3 220.26 151.3H194.64ZM194.64 126.214H220.26C221.292 126.214 222.253 126.374 223.142 126.694C224.067 127.014 224.886 127.477 225.597 128.082V125.68C225.597 124.186 225.082 122.922 224.05 121.89C223.018 120.858 221.754 120.343 220.26 120.343H194.64C193.145 120.343 191.882 120.858 190.85 121.89C189.818 122.922 189.303 124.186 189.303 125.68V128.082C190.014 127.477 190.815 127.014 191.704 126.694C192.63 126.374 193.608 126.214 194.64 126.214ZM189.463 133.473L214.922 139.611C215.172 139.682 215.421 139.7 215.67 139.664C215.954 139.593 216.186 139.469 216.364 139.291L224.904 132.138C224.441 131.32 223.801 130.662 222.982 130.164C222.164 129.665 221.256 129.416 220.26 129.416H194.64C193.395 129.416 192.292 129.808 191.331 130.591C190.37 131.338 189.747 132.298 189.463 133.473Z" />
+</vector>
diff --git a/res/raw/accessibility_shortcut_type_2finger_doubletap.json b/res/raw/accessibility_shortcut_type_2finger_doubletap.json
index 73299d5f..d9cdb08 100644
--- a/res/raw/accessibility_shortcut_type_2finger_doubletap.json
+++ b/res/raw/accessibility_shortcut_type_2finger_doubletap.json
@@ -2,10 +2,10 @@
"v": "5.12.1",
"fr": 60,
"ip": 0,
- "op": 120,
+ "op": 86,
"w": 412,
"h": 300,
- "nm": "Accessibility_Two_Tap_v5_export",
+ "nm": "Accessibility_Two_Tap_v5_export 2",
"ddd": 0,
"assets": [],
"layers": [
@@ -21,428 +21,184 @@
"a": 1,
"k": [
{
- "i": {
- "x": [
- 0.833
- ],
- "y": [
- 0.833
- ]
- },
- "o": {
- "x": [
- 0.167
- ],
- "y": [
- 0.167
- ]
- },
+ "i": { "x": [0.833], "y": [0.833] },
+ "o": { "x": [0.167], "y": [0.167] },
"t": 0,
- "s": [
- 0
- ]
+ "s": [0]
},
{
- "i": {
- "x": [
- 0.833
- ],
- "y": [
- 0.833
- ]
- },
- "o": {
- "x": [
- 0.167
- ],
- "y": [
- 0.167
- ]
- },
+ "i": { "x": [0.833], "y": [0.833] },
+ "o": { "x": [0.167], "y": [0.167] },
"t": 2.473,
- "s": [
- 50
- ]
+ "s": [50]
},
{
- "i": {
- "x": [
- 0.833
- ],
- "y": [
- 0.833
- ]
- },
- "o": {
- "x": [
- 0.167
- ],
- "y": [
- 0.167
- ]
- },
+ "i": { "x": [0.833], "y": [0.833] },
+ "o": { "x": [0.167], "y": [0.167] },
"t": 8.406,
- "s": [
- 50
- ]
+ "s": [50]
},
{
- "i": {
- "x": [
- 0.833
- ],
- "y": [
- 0.833
- ]
- },
- "o": {
- "x": [
- 0.167
- ],
- "y": [
- 0.167
- ]
- },
+ "i": { "x": [0.833], "y": [0.833] },
+ "o": { "x": [0.167], "y": [0.167] },
"t": 11.865,
- "s": [
- 0
- ]
+ "s": [0]
},
{
- "i": {
- "x": [
- 0.833
- ],
- "y": [
- 0.833
- ]
- },
- "o": {
- "x": [
- 0.167
- ],
- "y": [
- 0.167
- ]
- },
+ "i": { "x": [0.833], "y": [0.833] },
+ "o": { "x": [0.167], "y": [0.167] },
"t": 17.135,
- "s": [
- 0
- ]
+ "s": [0]
},
{
- "i": {
- "x": [
- 0.833
- ],
- "y": [
- 0.833
- ]
- },
- "o": {
- "x": [
- 0.167
- ],
- "y": [
- 0.167
- ]
- },
+ "i": { "x": [0.833], "y": [0.833] },
+ "o": { "x": [0.167], "y": [0.167] },
"t": 19.609,
- "s": [
- 50
- ]
+ "s": [50]
},
{
- "i": {
- "x": [
- 0.833
- ],
- "y": [
- 0.833
- ]
- },
- "o": {
- "x": [
- 0.167
- ],
- "y": [
- 0.167
- ]
- },
+ "i": { "x": [0.833], "y": [0.833] },
+ "o": { "x": [0.167], "y": [0.167] },
"t": 25.539,
- "s": [
- 50
- ]
+ "s": [50]
},
{
+ "i": { "x": [0.833], "y": [0.833] },
+ "o": { "x": [0.167], "y": [0.167] },
"t": 29,
- "s": [
- 0
- ]
- }
+ "s": [0]
+ },
+ {
+ "i": { "x": [0.833], "y": [0.833] },
+ "o": { "x": [0.167], "y": [0.167] },
+ "t": 59.727,
+ "s": [0]
+ },
+ {
+ "i": { "x": [0.833], "y": [0.833] },
+ "o": { "x": [0.167], "y": [0.167] },
+ "t": 62.199,
+ "s": [50]
+ },
+ {
+ "i": { "x": [0.833], "y": [0.833] },
+ "o": { "x": [0.167], "y": [0.167] },
+ "t": 68.133,
+ "s": [50]
+ },
+ {
+ "i": { "x": [0.833], "y": [0.833] },
+ "o": { "x": [0.167], "y": [0.167] },
+ "t": 71.592,
+ "s": [0]
+ },
+ {
+ "i": { "x": [0.833], "y": [0.833] },
+ "o": { "x": [0.167], "y": [0.167] },
+ "t": 76.861,
+ "s": [0]
+ },
+ {
+ "i": { "x": [0.833], "y": [0.833] },
+ "o": { "x": [0.167], "y": [0.167] },
+ "t": 79.336,
+ "s": [50]
+ },
+ { "t": 85.265625, "s": [50] }
],
"ix": 11
},
- "r": {
- "a": 0,
- "k": 0,
- "ix": 10
- },
- "p": {
- "a": 0,
- "k": [
- 290.932,
- 149.932,
- 0
- ],
- "ix": 2,
- "l": 2
- },
- "a": {
- "a": 0,
- "k": [
- 0,
- 0,
- 0
- ],
- "ix": 1,
- "l": 2
- },
+ "r": { "a": 0, "k": 0, "ix": 10 },
+ "p": { "a": 0, "k": [290.932, 149.932, 0], "ix": 2, "l": 2 },
+ "a": { "a": 0, "k": [0, 0, 0], "ix": 1, "l": 2 },
"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
- ]
- },
+ "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": [
- 150,
- 150,
- 100
- ]
+ "s": [150, 150, 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
- ]
- },
+ "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": 4.943,
- "s": [
- 100,
- 100,
- 100
- ]
+ "s": [100, 100, 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
- ]
- },
+ "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": 8.406,
- "s": [
- 100,
- 100,
- 100
- ]
+ "s": [100, 100, 100]
},
{
- "i": {
- "x": [
- 0.667,
- 0.667,
- 0.667
- ],
- "y": [
- 1,
- 1,
- 1
- ]
- },
- "o": {
- "x": [
- 0.167,
- 0.167,
- 0.167
- ],
- "y": [
- 0,
- 0,
- 0
- ]
- },
+ "i": { "x": [0.667, 0.667, 0.667], "y": [1, 1, 1] },
+ "o": { "x": [0.167, 0.167, 0.167], "y": [0, 0, 0] },
"t": 11.865,
- "s": [
- 150,
- 150,
- 100
- ]
+ "s": [150, 150, 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
- ]
- },
+ "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": 17.135,
- "s": [
- 150,
- 150,
- 100
- ]
+ "s": [150, 150, 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
- ]
- },
+ "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": 22.078,
- "s": [
- 100,
- 100,
- 100
- ]
+ "s": [100, 100, 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
- ]
- },
+ "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": 25.539,
- "s": [
- 100,
- 100,
- 100
- ]
+ "s": [100, 100, 100]
},
{
+ "i": { "x": [0.667, 0.667, 0.667], "y": [1, 1, 1] },
+ "o": { "x": [0.167, 0.167, 0.167], "y": [0, 0, 0] },
"t": 29,
- "s": [
- 150,
- 150,
- 100
- ]
- }
+ "s": [150, 150, 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": 59.727,
+ "s": [150, 150, 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": 64.67,
+ "s": [100, 100, 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": 68.133,
+ "s": [100, 100, 100]
+ },
+ {
+ "i": { "x": [0.667, 0.667, 0.667], "y": [1, 1, 1] },
+ "o": { "x": [0.167, 0.167, 0.167], "y": [0, 0, 0] },
+ "t": 71.592,
+ "s": [150, 150, 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": 76.861,
+ "s": [150, 150, 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": 81.805,
+ "s": [100, 100, 100]
+ },
+ { "t": 85.265625, "s": [100, 100, 100] }
],
"ix": 6,
"l": 2
@@ -461,58 +217,22 @@
"a": 0,
"k": {
"i": [
- [
- -20.621,
- 0
- ],
- [
- 0,
- 20.621
- ],
- [
- 20.621,
- 0
- ],
- [
- 0,
- -20.621
- ]
+ [-20.621, 0],
+ [0, 20.621],
+ [20.621, 0],
+ [0, -20.621]
],
"o": [
- [
- 20.621,
- 0
- ],
- [
- 0,
- -20.621
- ],
- [
- -20.621,
- 0
- ],
- [
- 0,
- 20.621
- ]
+ [20.621, 0],
+ [0, -20.621],
+ [-20.621, 0],
+ [0, 20.621]
],
"v": [
- [
- 0,
- 37.338
- ],
- [
- 37.338,
- 0
- ],
- [
- 0,
- -37.338
- ],
- [
- -37.338,
- 0
- ]
+ [0, 37.338],
+ [37.338, 0],
+ [0, -37.338],
+ [-37.338, 0]
],
"c": true
},
@@ -526,24 +246,11 @@
"ty": "st",
"c": {
"a": 0,
- "k": [
- 0.40000000596,
- 0.615686297417,
- 0.964705884457,
- 1
- ],
+ "k": [0.40000000596, 0.615686297417, 0.964705884457, 1],
"ix": 3
},
- "o": {
- "a": 0,
- "k": 100,
- "ix": 4
- },
- "w": {
- "a": 0,
- "k": 2.764,
- "ix": 5
- },
+ "o": { "a": 0, "k": 100, "ix": 4 },
+ "w": { "a": 0, "k": 2.764, "ix": 5 },
"lc": 1,
"lj": 1,
"ml": 4,
@@ -556,19 +263,10 @@
"ty": "fl",
"c": {
"a": 0,
- "k": [
- 0.40000000596,
- 0.615686297417,
- 0.964705884457,
- 1
- ],
+ "k": [0.40000000596, 0.615686297417, 0.964705884457, 1],
"ix": 4
},
- "o": {
- "a": 0,
- "k": 100,
- "ix": 5
- },
+ "o": { "a": 0, "k": 100, "ix": 5 },
"r": 1,
"bm": 0,
"nm": "Fill 1",
@@ -577,50 +275,13 @@
},
{
"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
- },
+ "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"
}
],
@@ -651,428 +312,184 @@
"a": 1,
"k": [
{
- "i": {
- "x": [
- 0.833
- ],
- "y": [
- 0.833
- ]
- },
- "o": {
- "x": [
- 0.167
- ],
- "y": [
- 0.167
- ]
- },
+ "i": { "x": [0.833], "y": [0.833] },
+ "o": { "x": [0.167], "y": [0.167] },
"t": 0,
- "s": [
- 0
- ]
+ "s": [0]
},
{
- "i": {
- "x": [
- 0.833
- ],
- "y": [
- 0.833
- ]
- },
- "o": {
- "x": [
- 0.167
- ],
- "y": [
- 0.167
- ]
- },
+ "i": { "x": [0.833], "y": [0.833] },
+ "o": { "x": [0.167], "y": [0.167] },
"t": 2.473,
- "s": [
- 50
- ]
+ "s": [50]
},
{
- "i": {
- "x": [
- 0.833
- ],
- "y": [
- 0.833
- ]
- },
- "o": {
- "x": [
- 0.167
- ],
- "y": [
- 0.167
- ]
- },
+ "i": { "x": [0.833], "y": [0.833] },
+ "o": { "x": [0.167], "y": [0.167] },
"t": 8.406,
- "s": [
- 50
- ]
+ "s": [50]
},
{
- "i": {
- "x": [
- 0.833
- ],
- "y": [
- 0.833
- ]
- },
- "o": {
- "x": [
- 0.167
- ],
- "y": [
- 0.167
- ]
- },
+ "i": { "x": [0.833], "y": [0.833] },
+ "o": { "x": [0.167], "y": [0.167] },
"t": 11.865,
- "s": [
- 0
- ]
+ "s": [0]
},
{
- "i": {
- "x": [
- 0.833
- ],
- "y": [
- 0.833
- ]
- },
- "o": {
- "x": [
- 0.167
- ],
- "y": [
- 0.167
- ]
- },
+ "i": { "x": [0.833], "y": [0.833] },
+ "o": { "x": [0.167], "y": [0.167] },
"t": 17.135,
- "s": [
- 0
- ]
+ "s": [0]
},
{
- "i": {
- "x": [
- 0.833
- ],
- "y": [
- 0.833
- ]
- },
- "o": {
- "x": [
- 0.167
- ],
- "y": [
- 0.167
- ]
- },
+ "i": { "x": [0.833], "y": [0.833] },
+ "o": { "x": [0.167], "y": [0.167] },
"t": 19.609,
- "s": [
- 50
- ]
+ "s": [50]
},
{
- "i": {
- "x": [
- 0.833
- ],
- "y": [
- 0.833
- ]
- },
- "o": {
- "x": [
- 0.167
- ],
- "y": [
- 0.167
- ]
- },
+ "i": { "x": [0.833], "y": [0.833] },
+ "o": { "x": [0.167], "y": [0.167] },
"t": 25.539,
- "s": [
- 50
- ]
+ "s": [50]
},
{
+ "i": { "x": [0.833], "y": [0.833] },
+ "o": { "x": [0.167], "y": [0.167] },
"t": 29,
- "s": [
- 0
- ]
- }
+ "s": [0]
+ },
+ {
+ "i": { "x": [0.833], "y": [0.833] },
+ "o": { "x": [0.167], "y": [0.167] },
+ "t": 59.727,
+ "s": [0]
+ },
+ {
+ "i": { "x": [0.833], "y": [0.833] },
+ "o": { "x": [0.167], "y": [0.167] },
+ "t": 62.199,
+ "s": [50]
+ },
+ {
+ "i": { "x": [0.833], "y": [0.833] },
+ "o": { "x": [0.167], "y": [0.167] },
+ "t": 68.133,
+ "s": [50]
+ },
+ {
+ "i": { "x": [0.833], "y": [0.833] },
+ "o": { "x": [0.167], "y": [0.167] },
+ "t": 71.592,
+ "s": [0]
+ },
+ {
+ "i": { "x": [0.833], "y": [0.833] },
+ "o": { "x": [0.167], "y": [0.167] },
+ "t": 76.861,
+ "s": [0]
+ },
+ {
+ "i": { "x": [0.833], "y": [0.833] },
+ "o": { "x": [0.167], "y": [0.167] },
+ "t": 79.336,
+ "s": [50]
+ },
+ { "t": 85.265625, "s": [50] }
],
"ix": 11
},
- "r": {
- "a": 0,
- "k": 0,
- "ix": 10
- },
- "p": {
- "a": 0,
- "k": [
- 290.934,
- 149.934,
- 0
- ],
- "ix": 2,
- "l": 2
- },
- "a": {
- "a": 0,
- "k": [
- 0,
- 0,
- 0
- ],
- "ix": 1,
- "l": 2
- },
+ "r": { "a": 0, "k": 0, "ix": 10 },
+ "p": { "a": 0, "k": [290.934, 149.934, 0], "ix": 2, "l": 2 },
+ "a": { "a": 0, "k": [0, 0, 0], "ix": 1, "l": 2 },
"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
- ]
- },
+ "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": [
- 90,
- 90,
- 100
- ]
+ "s": [90, 90, 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
- ]
- },
+ "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": 4.943,
- "s": [
- 100,
- 100,
- 100
- ]
+ "s": [100, 100, 100]
},
{
- "i": {
- "x": [
- 0.667,
- 0.667,
- 0.667
- ],
- "y": [
- 1,
- 1,
- 1
- ]
- },
- "o": {
- "x": [
- 0.167,
- 0.167,
- 0.167
- ],
- "y": [
- 0,
- 0,
- 0
- ]
- },
+ "i": { "x": [0.667, 0.667, 0.667], "y": [1, 1, 1] },
+ "o": { "x": [0.167, 0.167, 0.167], "y": [0, 0, 0] },
"t": 8.406,
- "s": [
- 100,
- 100,
- 100
- ]
+ "s": [100, 100, 100]
},
{
- "i": {
- "x": [
- 0.667,
- 0.667,
- 0.667
- ],
- "y": [
- 1,
- 1,
- 1
- ]
- },
- "o": {
- "x": [
- 0.167,
- 0.167,
- 0.167
- ],
- "y": [
- 0,
- 0,
- 0
- ]
- },
+ "i": { "x": [0.667, 0.667, 0.667], "y": [1, 1, 1] },
+ "o": { "x": [0.167, 0.167, 0.167], "y": [0, 0, 0] },
"t": 11.865,
- "s": [
- 90,
- 90,
- 100
- ]
+ "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
- ]
- },
+ "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": 17.135,
- "s": [
- 90,
- 90,
- 100
- ]
+ "s": [90, 90, 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
- ]
- },
+ "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": 22.078,
- "s": [
- 100,
- 100,
- 100
- ]
+ "s": [100, 100, 100]
},
{
- "i": {
- "x": [
- 0.667,
- 0.667,
- 0.667
- ],
- "y": [
- 1,
- 1,
- 1
- ]
- },
- "o": {
- "x": [
- 0.167,
- 0.167,
- 0.167
- ],
- "y": [
- 0,
- 0,
- 0
- ]
- },
+ "i": { "x": [0.667, 0.667, 0.667], "y": [1, 1, 1] },
+ "o": { "x": [0.167, 0.167, 0.167], "y": [0, 0, 0] },
"t": 25.539,
- "s": [
- 100,
- 100,
- 100
- ]
+ "s": [100, 100, 100]
},
{
+ "i": { "x": [0.667, 0.667, 0.667], "y": [1, 1, 1] },
+ "o": { "x": [0.167, 0.167, 0.167], "y": [0, 0, 0] },
"t": 29,
- "s": [
- 90,
- 90,
- 100
- ]
- }
+ "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": 59.727,
+ "s": [90, 90, 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": 64.67,
+ "s": [100, 100, 100]
+ },
+ {
+ "i": { "x": [0.667, 0.667, 0.667], "y": [1, 1, 1] },
+ "o": { "x": [0.167, 0.167, 0.167], "y": [0, 0, 0] },
+ "t": 68.133,
+ "s": [100, 100, 100]
+ },
+ {
+ "i": { "x": [0.667, 0.667, 0.667], "y": [1, 1, 1] },
+ "o": { "x": [0.167, 0.167, 0.167], "y": [0, 0, 0] },
+ "t": 71.592,
+ "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": 76.861,
+ "s": [90, 90, 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": 81.805,
+ "s": [100, 100, 100]
+ },
+ { "t": 85.265625, "s": [100, 100, 100] }
],
"ix": 6,
"l": 2
@@ -1091,58 +508,22 @@
"a": 0,
"k": {
"i": [
- [
- -31.444,
- 0
- ],
- [
- 0,
- 31.444
- ],
- [
- 31.444,
- 0
- ],
- [
- 0,
- -31.444
- ]
+ [-31.444, 0],
+ [0, 31.444],
+ [31.444, 0],
+ [0, -31.444]
],
"o": [
- [
- 31.444,
- 0
- ],
- [
- 0,
- -31.444
- ],
- [
- -31.444,
- 0
- ],
- [
- 0,
- 31.444
- ]
+ [31.444, 0],
+ [0, -31.444],
+ [-31.444, 0],
+ [0, 31.444]
],
"v": [
- [
- 0,
- 56.934
- ],
- [
- 56.934,
- 0
- ],
- [
- 0,
- -56.934
- ],
- [
- -56.934,
- 0
- ]
+ [0, 56.934],
+ [56.934, 0],
+ [0, -56.934],
+ [-56.934, 0]
],
"c": true
},
@@ -1156,24 +537,11 @@
"ty": "st",
"c": {
"a": 0,
- "k": [
- 0.40000000596,
- 0.615686297417,
- 0.964705884457,
- 1
- ],
+ "k": [0.40000000596, 0.615686297417, 0.964705884457, 1],
"ix": 3
},
- "o": {
- "a": 0,
- "k": 100,
- "ix": 4
- },
- "w": {
- "a": 0,
- "k": 2.764,
- "ix": 5
- },
+ "o": { "a": 0, "k": 100, "ix": 4 },
+ "w": { "a": 0, "k": 2.764, "ix": 5 },
"lc": 1,
"lj": 1,
"ml": 4,
@@ -1186,19 +554,10 @@
"ty": "fl",
"c": {
"a": 0,
- "k": [
- 0.40000000596,
- 0.615686297417,
- 0.964705884457,
- 1
- ],
+ "k": [0.40000000596, 0.615686297417, 0.964705884457, 1],
"ix": 4
},
- "o": {
- "a": 0,
- "k": 100,
- "ix": 5
- },
+ "o": { "a": 0, "k": 100, "ix": 5 },
"r": 1,
"bm": 0,
"nm": "Fill 1",
@@ -1207,50 +566,13 @@
},
{
"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
- },
+ "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"
}
],
@@ -1281,428 +603,184 @@
"a": 1,
"k": [
{
- "i": {
- "x": [
- 0.833
- ],
- "y": [
- 0.833
- ]
- },
- "o": {
- "x": [
- 0.167
- ],
- "y": [
- 0.167
- ]
- },
+ "i": { "x": [0.833], "y": [0.833] },
+ "o": { "x": [0.167], "y": [0.167] },
"t": 0.273,
- "s": [
- 0
- ]
+ "s": [0]
},
{
- "i": {
- "x": [
- 0.833
- ],
- "y": [
- 0.833
- ]
- },
- "o": {
- "x": [
- 0.167
- ],
- "y": [
- 0.167
- ]
- },
+ "i": { "x": [0.833], "y": [0.833] },
+ "o": { "x": [0.167], "y": [0.167] },
"t": 2.746,
- "s": [
- 50
- ]
+ "s": [50]
},
{
- "i": {
- "x": [
- 0.833
- ],
- "y": [
- 0.833
- ]
- },
- "o": {
- "x": [
- 0.167
- ],
- "y": [
- 0.167
- ]
- },
+ "i": { "x": [0.833], "y": [0.833] },
+ "o": { "x": [0.167], "y": [0.167] },
"t": 8.68,
- "s": [
- 50
- ]
+ "s": [50]
},
{
- "i": {
- "x": [
- 0.833
- ],
- "y": [
- 0.833
- ]
- },
- "o": {
- "x": [
- 0.167
- ],
- "y": [
- 0.167
- ]
- },
+ "i": { "x": [0.833], "y": [0.833] },
+ "o": { "x": [0.167], "y": [0.167] },
"t": 12.137,
- "s": [
- 0
- ]
+ "s": [0]
},
{
- "i": {
- "x": [
- 0.833
- ],
- "y": [
- 0.833
- ]
- },
- "o": {
- "x": [
- 0.167
- ],
- "y": [
- 0.167
- ]
- },
+ "i": { "x": [0.833], "y": [0.833] },
+ "o": { "x": [0.167], "y": [0.167] },
"t": 17.135,
- "s": [
- 0
- ]
+ "s": [0]
},
{
- "i": {
- "x": [
- 0.833
- ],
- "y": [
- 0.833
- ]
- },
- "o": {
- "x": [
- 0.167
- ],
- "y": [
- 0.167
- ]
- },
+ "i": { "x": [0.833], "y": [0.833] },
+ "o": { "x": [0.167], "y": [0.167] },
"t": 19.607,
- "s": [
- 50
- ]
+ "s": [50]
},
{
- "i": {
- "x": [
- 0.833
- ],
- "y": [
- 0.833
- ]
- },
- "o": {
- "x": [
- 0.167
- ],
- "y": [
- 0.167
- ]
- },
+ "i": { "x": [0.833], "y": [0.833] },
+ "o": { "x": [0.167], "y": [0.167] },
"t": 25.541,
- "s": [
- 50
- ]
+ "s": [50]
},
{
+ "i": { "x": [0.833], "y": [0.833] },
+ "o": { "x": [0.167], "y": [0.167] },
"t": 29,
- "s": [
- 0
- ]
- }
+ "s": [0]
+ },
+ {
+ "i": { "x": [0.833], "y": [0.833] },
+ "o": { "x": [0.167], "y": [0.167] },
+ "t": 60,
+ "s": [0]
+ },
+ {
+ "i": { "x": [0.833], "y": [0.833] },
+ "o": { "x": [0.167], "y": [0.167] },
+ "t": 62.473,
+ "s": [50]
+ },
+ {
+ "i": { "x": [0.833], "y": [0.833] },
+ "o": { "x": [0.167], "y": [0.167] },
+ "t": 68.406,
+ "s": [50]
+ },
+ {
+ "i": { "x": [0.833], "y": [0.833] },
+ "o": { "x": [0.167], "y": [0.167] },
+ "t": 71.863,
+ "s": [0]
+ },
+ {
+ "i": { "x": [0.833], "y": [0.833] },
+ "o": { "x": [0.167], "y": [0.167] },
+ "t": 76.861,
+ "s": [0]
+ },
+ {
+ "i": { "x": [0.833], "y": [0.833] },
+ "o": { "x": [0.167], "y": [0.167] },
+ "t": 79.334,
+ "s": [50]
+ },
+ { "t": 85.267578125, "s": [50] }
],
"ix": 11
},
- "r": {
- "a": 0,
- "k": 0,
- "ix": 10
- },
- "p": {
- "a": 0,
- "k": [
- 121.932,
- 149.932,
- 0
- ],
- "ix": 2,
- "l": 2
- },
- "a": {
- "a": 0,
- "k": [
- 0,
- 0,
- 0
- ],
- "ix": 1,
- "l": 2
- },
+ "r": { "a": 0, "k": 0, "ix": 10 },
+ "p": { "a": 0, "k": [121.932, 149.932, 0], "ix": 2, "l": 2 },
+ "a": { "a": 0, "k": [0, 0, 0], "ix": 1, "l": 2 },
"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
- ]
- },
+ "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.273,
- "s": [
- 150,
- 150,
- 100
- ]
+ "s": [150, 150, 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
- ]
- },
+ "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": 5.219,
- "s": [
- 100,
- 100,
- 100
- ]
+ "s": [100, 100, 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
- ]
- },
+ "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": 8.68,
- "s": [
- 100,
- 100,
- 100
- ]
+ "s": [100, 100, 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
- ]
- },
+ "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": 12.137,
- "s": [
- 150,
- 150,
- 100
- ]
+ "s": [150, 150, 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
- ]
- },
+ "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": 17.135,
- "s": [
- 150,
- 150,
- 100
- ]
+ "s": [150, 150, 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
- ]
- },
+ "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": 22.08,
- "s": [
- 100,
- 100,
- 100
- ]
+ "s": [100, 100, 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
- ]
- },
+ "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": 25.541,
- "s": [
- 100,
- 100,
- 100
- ]
+ "s": [100, 100, 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": 29,
- "s": [
- 150,
- 150,
- 100
- ]
- }
+ "s": [150, 150, 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": 60,
+ "s": [150, 150, 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": 64.945,
+ "s": [100, 100, 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": 68.406,
+ "s": [100, 100, 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": 71.863,
+ "s": [150, 150, 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": 76.861,
+ "s": [150, 150, 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": 81.807,
+ "s": [100, 100, 100]
+ },
+ { "t": 85.267578125, "s": [100, 100, 100] }
],
"ix": 6,
"l": 2
@@ -1721,58 +799,22 @@
"a": 0,
"k": {
"i": [
- [
- -20.621,
- 0
- ],
- [
- 0,
- 20.621
- ],
- [
- 20.621,
- 0
- ],
- [
- 0,
- -20.621
- ]
+ [-20.621, 0],
+ [0, 20.621],
+ [20.621, 0],
+ [0, -20.621]
],
"o": [
- [
- 20.621,
- 0
- ],
- [
- 0,
- -20.621
- ],
- [
- -20.621,
- 0
- ],
- [
- 0,
- 20.621
- ]
+ [20.621, 0],
+ [0, -20.621],
+ [-20.621, 0],
+ [0, 20.621]
],
"v": [
- [
- 0,
- 37.338
- ],
- [
- 37.338,
- 0
- ],
- [
- 0,
- -37.338
- ],
- [
- -37.338,
- 0
- ]
+ [0, 37.338],
+ [37.338, 0],
+ [0, -37.338],
+ [-37.338, 0]
],
"c": true
},
@@ -1786,24 +828,11 @@
"ty": "st",
"c": {
"a": 0,
- "k": [
- 0.40000000596,
- 0.615686297417,
- 0.964705884457,
- 1
- ],
+ "k": [0.40000000596, 0.615686297417, 0.964705884457, 1],
"ix": 3
},
- "o": {
- "a": 0,
- "k": 100,
- "ix": 4
- },
- "w": {
- "a": 0,
- "k": 2.764,
- "ix": 5
- },
+ "o": { "a": 0, "k": 100, "ix": 4 },
+ "w": { "a": 0, "k": 2.764, "ix": 5 },
"lc": 1,
"lj": 1,
"ml": 4,
@@ -1816,19 +845,10 @@
"ty": "fl",
"c": {
"a": 0,
- "k": [
- 0.40000000596,
- 0.615686297417,
- 0.964705884457,
- 1
- ],
+ "k": [0.40000000596, 0.615686297417, 0.964705884457, 1],
"ix": 4
},
- "o": {
- "a": 0,
- "k": 100,
- "ix": 5
- },
+ "o": { "a": 0, "k": 100, "ix": 5 },
"r": 1,
"bm": 0,
"nm": "Fill 1",
@@ -1837,50 +857,13 @@
},
{
"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
- },
+ "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"
}
],
@@ -1911,428 +894,184 @@
"a": 1,
"k": [
{
- "i": {
- "x": [
- 0.833
- ],
- "y": [
- 0.833
- ]
- },
- "o": {
- "x": [
- 0.167
- ],
- "y": [
- 0.167
- ]
- },
+ "i": { "x": [0.833], "y": [0.833] },
+ "o": { "x": [0.167], "y": [0.167] },
"t": 0.273,
- "s": [
- 0
- ]
+ "s": [0]
},
{
- "i": {
- "x": [
- 0.833
- ],
- "y": [
- 0.833
- ]
- },
- "o": {
- "x": [
- 0.167
- ],
- "y": [
- 0.167
- ]
- },
+ "i": { "x": [0.833], "y": [0.833] },
+ "o": { "x": [0.167], "y": [0.167] },
"t": 2.746,
- "s": [
- 50
- ]
+ "s": [50]
},
{
- "i": {
- "x": [
- 0.833
- ],
- "y": [
- 0.833
- ]
- },
- "o": {
- "x": [
- 0.167
- ],
- "y": [
- 0.167
- ]
- },
+ "i": { "x": [0.833], "y": [0.833] },
+ "o": { "x": [0.167], "y": [0.167] },
"t": 8.68,
- "s": [
- 50
- ]
+ "s": [50]
},
{
- "i": {
- "x": [
- 0.833
- ],
- "y": [
- 0.833
- ]
- },
- "o": {
- "x": [
- 0.167
- ],
- "y": [
- 0.167
- ]
- },
+ "i": { "x": [0.833], "y": [0.833] },
+ "o": { "x": [0.167], "y": [0.167] },
"t": 12.137,
- "s": [
- 0
- ]
+ "s": [0]
},
{
- "i": {
- "x": [
- 0.833
- ],
- "y": [
- 0.833
- ]
- },
- "o": {
- "x": [
- 0.167
- ],
- "y": [
- 0.167
- ]
- },
+ "i": { "x": [0.833], "y": [0.833] },
+ "o": { "x": [0.167], "y": [0.167] },
"t": 17.135,
- "s": [
- 0
- ]
+ "s": [0]
},
{
- "i": {
- "x": [
- 0.833
- ],
- "y": [
- 0.833
- ]
- },
- "o": {
- "x": [
- 0.167
- ],
- "y": [
- 0.167
- ]
- },
+ "i": { "x": [0.833], "y": [0.833] },
+ "o": { "x": [0.167], "y": [0.167] },
"t": 19.607,
- "s": [
- 50
- ]
+ "s": [50]
},
{
- "i": {
- "x": [
- 0.833
- ],
- "y": [
- 0.833
- ]
- },
- "o": {
- "x": [
- 0.167
- ],
- "y": [
- 0.167
- ]
- },
+ "i": { "x": [0.833], "y": [0.833] },
+ "o": { "x": [0.167], "y": [0.167] },
"t": 25.541,
- "s": [
- 50
- ]
+ "s": [50]
},
{
+ "i": { "x": [0.833], "y": [0.833] },
+ "o": { "x": [0.167], "y": [0.167] },
"t": 29,
- "s": [
- 0
- ]
- }
+ "s": [0]
+ },
+ {
+ "i": { "x": [0.833], "y": [0.833] },
+ "o": { "x": [0.167], "y": [0.167] },
+ "t": 60,
+ "s": [0]
+ },
+ {
+ "i": { "x": [0.833], "y": [0.833] },
+ "o": { "x": [0.167], "y": [0.167] },
+ "t": 62.473,
+ "s": [50]
+ },
+ {
+ "i": { "x": [0.833], "y": [0.833] },
+ "o": { "x": [0.167], "y": [0.167] },
+ "t": 68.406,
+ "s": [50]
+ },
+ {
+ "i": { "x": [0.833], "y": [0.833] },
+ "o": { "x": [0.167], "y": [0.167] },
+ "t": 71.863,
+ "s": [0]
+ },
+ {
+ "i": { "x": [0.833], "y": [0.833] },
+ "o": { "x": [0.167], "y": [0.167] },
+ "t": 76.861,
+ "s": [0]
+ },
+ {
+ "i": { "x": [0.833], "y": [0.833] },
+ "o": { "x": [0.167], "y": [0.167] },
+ "t": 79.334,
+ "s": [50]
+ },
+ { "t": 85.267578125, "s": [50] }
],
"ix": 11
},
- "r": {
- "a": 0,
- "k": 0,
- "ix": 10
- },
- "p": {
- "a": 0,
- "k": [
- 121.934,
- 149.934,
- 0
- ],
- "ix": 2,
- "l": 2
- },
- "a": {
- "a": 0,
- "k": [
- 0,
- 0,
- 0
- ],
- "ix": 1,
- "l": 2
- },
+ "r": { "a": 0, "k": 0, "ix": 10 },
+ "p": { "a": 0, "k": [121.934, 149.934, 0], "ix": 2, "l": 2 },
+ "a": { "a": 0, "k": [0, 0, 0], "ix": 1, "l": 2 },
"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
- ]
- },
+ "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.273,
- "s": [
- 90,
- 90,
- 100
- ]
+ "s": [90, 90, 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
- ]
- },
+ "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": 5.219,
- "s": [
- 100,
- 100,
- 100
- ]
+ "s": [100, 100, 100]
},
{
- "i": {
- "x": [
- 0.667,
- 0.667,
- 0.667
- ],
- "y": [
- 1,
- 1,
- 1
- ]
- },
- "o": {
- "x": [
- 0.167,
- 0.167,
- 0.167
- ],
- "y": [
- 0,
- 0,
- 0
- ]
- },
+ "i": { "x": [0.667, 0.667, 0.667], "y": [1, 1, 1] },
+ "o": { "x": [0.167, 0.167, 0.167], "y": [0, 0, 0] },
"t": 8.68,
- "s": [
- 100,
- 100,
- 100
- ]
+ "s": [100, 100, 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
- ]
- },
+ "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": 12.137,
- "s": [
- 90,
- 90,
- 100
- ]
+ "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
- ]
- },
+ "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": 17.135,
- "s": [
- 90,
- 90,
- 100
- ]
+ "s": [90, 90, 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
- ]
- },
+ "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": 22.08,
- "s": [
- 100,
- 100,
- 100
- ]
+ "s": [100, 100, 100]
},
{
- "i": {
- "x": [
- 0.667,
- 0.667,
- 0.667
- ],
- "y": [
- 1,
- 1,
- 1
- ]
- },
- "o": {
- "x": [
- 0.167,
- 0.167,
- 0.167
- ],
- "y": [
- 0,
- 0,
- 0
- ]
- },
+ "i": { "x": [0.667, 0.667, 0.667], "y": [1, 1, 1] },
+ "o": { "x": [0.167, 0.167, 0.167], "y": [0, 0, 0] },
"t": 25.541,
- "s": [
- 100,
- 100,
- 100
- ]
+ "s": [100, 100, 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": 29,
- "s": [
- 90,
- 90,
- 100
- ]
- }
+ "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": 60,
+ "s": [90, 90, 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": 64.945,
+ "s": [100, 100, 100]
+ },
+ {
+ "i": { "x": [0.667, 0.667, 0.667], "y": [1, 1, 1] },
+ "o": { "x": [0.167, 0.167, 0.167], "y": [0, 0, 0] },
+ "t": 68.406,
+ "s": [100, 100, 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": 71.863,
+ "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": 76.861,
+ "s": [90, 90, 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": 81.807,
+ "s": [100, 100, 100]
+ },
+ { "t": 85.267578125, "s": [100, 100, 100] }
],
"ix": 6,
"l": 2
@@ -2351,58 +1090,22 @@
"a": 0,
"k": {
"i": [
- [
- -31.444,
- 0
- ],
- [
- 0,
- 31.444
- ],
- [
- 31.444,
- 0
- ],
- [
- 0,
- -31.444
- ]
+ [-31.444, 0],
+ [0, 31.444],
+ [31.444, 0],
+ [0, -31.444]
],
"o": [
- [
- 31.444,
- 0
- ],
- [
- 0,
- -31.444
- ],
- [
- -31.444,
- 0
- ],
- [
- 0,
- 31.444
- ]
+ [31.444, 0],
+ [0, -31.444],
+ [-31.444, 0],
+ [0, 31.444]
],
"v": [
- [
- 0,
- 56.934
- ],
- [
- 56.934,
- 0
- ],
- [
- 0,
- -56.934
- ],
- [
- -56.934,
- 0
- ]
+ [0, 56.934],
+ [56.934, 0],
+ [0, -56.934],
+ [-56.934, 0]
],
"c": true
},
@@ -2416,24 +1119,11 @@
"ty": "st",
"c": {
"a": 0,
- "k": [
- 0.40000000596,
- 0.615686297417,
- 0.964705884457,
- 1
- ],
+ "k": [0.40000000596, 0.615686297417, 0.964705884457, 1],
"ix": 3
},
- "o": {
- "a": 0,
- "k": 100,
- "ix": 4
- },
- "w": {
- "a": 0,
- "k": 2.764,
- "ix": 5
- },
+ "o": { "a": 0, "k": 100, "ix": 4 },
+ "w": { "a": 0, "k": 2.764, "ix": 5 },
"lc": 1,
"lj": 1,
"ml": 4,
@@ -2446,19 +1136,10 @@
"ty": "fl",
"c": {
"a": 0,
- "k": [
- 0.40000000596,
- 0.615686297417,
- 0.964705884457,
- 1
- ],
+ "k": [0.40000000596, 0.615686297417, 0.964705884457, 1],
"ix": 4
},
- "o": {
- "a": 0,
- "k": 100,
- "ix": 5
- },
+ "o": { "a": 0, "k": 100, "ix": 5 },
"r": 1,
"bm": 0,
"nm": "Fill 1",
@@ -2467,50 +1148,13 @@
},
{
"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
- },
+ "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"
}
],
@@ -2537,46 +1181,11 @@
"cl": "black",
"sr": 1,
"ks": {
- "o": {
- "a": 0,
- "k": 100,
- "ix": 11
- },
- "r": {
- "a": 0,
- "k": 0,
- "ix": 10
- },
- "p": {
- "a": 0,
- "k": [
- 206,
- 150,
- 0
- ],
- "ix": 2,
- "l": 2
- },
- "a": {
- "a": 0,
- "k": [
- 0,
- 0,
- 0
- ],
- "ix": 1,
- "l": 2
- },
- "s": {
- "a": 0,
- "k": [
- 100,
- 100,
- 100
- ],
- "ix": 6,
- "l": 2
- }
+ "o": { "a": 0, "k": 100, "ix": 11 },
+ "r": { "a": 0, "k": 0, "ix": 10 },
+ "p": { "a": 0, "k": [206, 150, 0], "ix": 2, "l": 2 },
+ "a": { "a": 0, "k": [0, 0, 0], "ix": 1, "l": 2 },
+ "s": { "a": 0, "k": [100, 100, 100], "ix": 6, "l": 2 }
},
"ao": 0,
"shapes": [
@@ -2591,106 +1200,34 @@
"a": 0,
"k": {
"i": [
- [
- -15.3,
- 0
- ],
- [
- 0,
- 0
- ],
- [
- 0,
- 15.5
- ],
- [
- 0,
- 0
- ],
- [
- 15.2,
- 0
- ],
- [
- 0,
- 0
- ],
- [
- 0,
- -15.7
- ],
- [
- 0,
- 0
- ]
+ [-15.3, 0],
+ [0, 0],
+ [0, 15.5],
+ [0, 0],
+ [15.2, 0],
+ [0, 0],
+ [0, -15.7],
+ [0, 0]
],
"o": [
- [
- 0,
- 0
- ],
- [
- 15.3,
- 0
- ],
- [
- 0,
- 0
- ],
- [
- 0,
- -15.7
- ],
- [
- 0,
- 0
- ],
- [
- -15.3,
- 0
- ],
- [
- 0,
- 0
- ],
- [
- 0,
- 15.7
- ]
+ [0, 0],
+ [15.3, 0],
+ [0, 0],
+ [0, -15.7],
+ [0, 0],
+ [-15.3, 0],
+ [0, 0],
+ [0, 15.7]
],
"v": [
- [
- -178.2,
- 150
- ],
- [
- 178.2,
- 150
- ],
- [
- 206,
- 121.7
- ],
- [
- 206,
- -121.5
- ],
- [
- 178.3,
- -150
- ],
- [
- -178.2,
- -150
- ],
- [
- -206,
- -121.5
- ],
- [
- -206,
- 121.5
- ]
+ [-178.2, 150],
+ [178.2, 150],
+ [206, 121.7],
+ [206, -121.5],
+ [178.3, -150],
+ [-178.2, -150],
+ [-206, -121.5],
+ [-206, 121.5]
],
"c": true
},
@@ -2702,21 +1239,8 @@
},
{
"ty": "fl",
- "c": {
- "a": 0,
- "k": [
- 0,
- 0,
- 0,
- 1
- ],
- "ix": 4
- },
- "o": {
- "a": 0,
- "k": 100,
- "ix": 5
- },
+ "c": { "a": 0, "k": [0, 0, 0, 1], "ix": 4 },
+ "o": { "a": 0, "k": 100, "ix": 5 },
"r": 1,
"bm": 0,
"nm": "Fill 1",
@@ -2725,50 +1249,13 @@
},
{
"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
- },
+ "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"
}
],
@@ -2789,16 +1276,8 @@
}
],
"markers": [
- {
- "tm": 119,
- "cm": "2",
- "dr": 0
- },
- {
- "tm": 240,
- "cm": "1",
- "dr": 0
- }
+ { "tm": 119, "cm": "2", "dr": 0 },
+ { "tm": 240, "cm": "1", "dr": 0 }
],
"props": {}
-}
\ No newline at end of file
+}
diff --git a/res/raw/accessibility_shortcut_type_fab.json b/res/raw/accessibility_shortcut_type_fab.json
index 6029d91..8623ac0 100644
--- a/res/raw/accessibility_shortcut_type_fab.json
+++ b/res/raw/accessibility_shortcut_type_fab.json
@@ -2,10 +2,10 @@
"v": "5.12.1",
"fr": 60,
"ip": 0,
- "op": 181,
+ "op": 330,
"w": 412,
"h": 300,
- "nm": "Accessibility_Shortcut_export",
+ "nm": "Accessibility_Shortcut_v2_export 2",
"ddd": 0,
"assets": [],
"layers": [
@@ -16,342 +16,175 @@
"nm": "Null 1",
"sr": 1,
"ks": {
- "o": {
- "a": 0,
- "k": 0,
- "ix": 11
- },
- "r": {
- "a": 0,
- "k": 0,
- "ix": 10
- },
+ "o": { "a": 0, "k": 0, "ix": 11 },
+ "r": { "a": 0, "k": 0, "ix": 10 },
"p": {
"a": 1,
"k": [
{
- "i": {
- "x": 0.8,
- "y": 0.15
- },
- "o": {
- "x": 0.3,
- "y": 0
- },
+ "i": { "x": 0.8, "y": 0.15 },
+ "o": { "x": 0.3, "y": 0 },
"t": 30,
- "s": [
- 412,
- 154,
- 0
- ],
- "to": [
- 0,
- 0.609,
- 0
- ],
- "ti": [
- 0,
- 0,
- 0
- ]
+ "s": [412, 154, 0],
+ "to": [0, 0.609, 0],
+ "ti": [0, 0, 0]
},
{
- "i": {
- "x": 0.1,
- "y": 1
- },
- "o": {
- "x": 0.05,
- "y": 0.7
- },
+ "i": { "x": 0.1, "y": 1 },
+ "o": { "x": 0.05, "y": 0.7 },
"t": 35,
- "s": [
- 412,
- 178.4,
- 0
- ],
- "to": [
- 0,
- 0,
- 0
- ],
- "ti": [
- 0,
- -5.757,
- 0
- ]
+ "s": [412, 178.4, 0],
+ "to": [0, 0, 0],
+ "ti": [0, -5.757, 0]
},
{
- "i": {
- "x": 0.833,
- "y": 0.833
- },
- "o": {
- "x": 0.167,
- "y": 0.167
- },
+ "i": { "x": 0.833, "y": 0.833 },
+ "o": { "x": 0.167, "y": 0.167 },
"t": 60,
- "s": [
- 412,
- 215,
- 0
- ],
- "to": [
- 0,
- 0,
- 0
- ],
- "ti": [
- 0,
- 0,
- 0
- ]
+ "s": [412, 215, 0],
+ "to": [0, 0, 0],
+ "ti": [0, 0, 0]
},
{
- "i": {
- "x": 0.8,
- "y": 0.15
- },
- "o": {
- "x": 0.3,
- "y": 0
- },
+ "i": { "x": 0.8, "y": 0.15 },
+ "o": { "x": 0.3, "y": 0 },
"t": 120,
- "s": [
- 412,
- 215,
- 0
- ],
- "to": [
- 0,
- -0.609,
- 0
- ],
- "ti": [
- 0,
- 0,
- 0
- ]
+ "s": [412, 215, 0],
+ "to": [0, -0.609, 0],
+ "ti": [0, 0, 0]
},
{
- "i": {
- "x": 0.1,
- "y": 1
- },
- "o": {
- "x": 0.05,
- "y": 0.7
- },
+ "i": { "x": 0.1, "y": 1 },
+ "o": { "x": 0.05, "y": 0.7 },
"t": 125,
- "s": [
- 412,
- 190.6,
- 0
- ],
- "to": [
- 0,
- 0,
- 0
- ],
- "ti": [
- 0,
- 5.757,
- 0
- ]
+ "s": [412, 190.6, 0],
+ "to": [0, 0, 0],
+ "ti": [0, 5.757, 0]
},
{
+ "i": { "x": 0.99, "y": 0.99 },
+ "o": { "x": 0.01, "y": 0.01 },
"t": 150,
- "s": [
- 412,
- 154,
- 0
- ]
- }
+ "s": [412, 154, 0],
+ "to": [0, 0, 0],
+ "ti": [0, 0, 0]
+ },
+ {
+ "i": { "x": 0.8, "y": 0.15 },
+ "o": { "x": 0.3, "y": 0 },
+ "t": 210,
+ "s": [412, 154, 0],
+ "to": [0, 0.203, 0],
+ "ti": [0, 0, 0]
+ },
+ {
+ "i": { "x": 0.1, "y": 1 },
+ "o": { "x": 0.05, "y": 0.7 },
+ "t": 215,
+ "s": [412, 178.4, 0],
+ "to": [0, 0, 0],
+ "ti": [0, -0.588, 0]
+ },
+ {
+ "i": { "x": 0.833, "y": 0.833 },
+ "o": { "x": 0.167, "y": 0.167 },
+ "t": 240,
+ "s": [412, 215, 0],
+ "to": [0, 0, 0],
+ "ti": [0, 0, 0]
+ },
+ {
+ "i": { "x": 0.8, "y": 0.15 },
+ "o": { "x": 0.3, "y": 0 },
+ "t": 300,
+ "s": [412, 215, 0],
+ "to": [0, -0.609, 0],
+ "ti": [0, 0, 0]
+ },
+ {
+ "i": { "x": 0.1, "y": 1 },
+ "o": { "x": 0.05, "y": 0.7 },
+ "t": 305,
+ "s": [412, 190.6, 0],
+ "to": [0, 0, 0],
+ "ti": [0, 5.757, 0]
+ },
+ { "t": 330, "s": [412, 154, 0] }
],
"ix": 2,
"l": 2
},
- "a": {
- "a": 0,
- "k": [
- 0,
- 0,
- 0
- ],
- "ix": 1,
- "l": 2
- },
+ "a": { "a": 0, "k": [0, 0, 0], "ix": 1, "l": 2 },
"s": {
"a": 1,
"k": [
{
- "i": {
- "x": [
- 0.8,
- 0.8,
- 0.8
- ],
- "y": [
- 0.15,
- 0.15,
- 1
- ]
- },
- "o": {
- "x": [
- 0.3,
- 0.3,
- 0.3
- ],
- "y": [
- 0,
- 0,
- 0
- ]
- },
+ "i": { "x": [0.8, 0.8, 0.8], "y": [0.15, 0.15, 1] },
+ "o": { "x": [0.3, 0.3, 0.3], "y": [0, 0, 0] },
"t": 30,
- "s": [
- 100,
- 100,
- 100
- ]
+ "s": [100, 100, 100]
},
{
- "i": {
- "x": [
- 0.1,
- 0.1,
- 0.1
- ],
- "y": [
- 1,
- 1,
- 1
- ]
- },
- "o": {
- "x": [
- 0.05,
- 0.05,
- 0.05
- ],
- "y": [
- 0.7,
- 0.7,
- 0
- ]
- },
+ "i": { "x": [0.1, 0.1, 0.1], "y": [1, 1, 1] },
+ "o": { "x": [0.05, 0.05, 0.05], "y": [0.7, 0.7, 0] },
"t": 35,
- "s": [
- 79.2,
- 79.2,
- 100
- ]
+ "s": [79.2, 79.2, 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
- ]
- },
+ "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": 60,
- "s": [
- 48,
- 48,
- 100
- ]
+ "s": [48, 48, 100]
},
{
- "i": {
- "x": [
- 0.8,
- 0.8,
- 0.8
- ],
- "y": [
- 0.15,
- 0.15,
- 1
- ]
- },
- "o": {
- "x": [
- 0.3,
- 0.3,
- 0.3
- ],
- "y": [
- 0,
- 0,
- 0
- ]
- },
+ "i": { "x": [0.8, 0.8, 0.8], "y": [0.15, 0.15, 1] },
+ "o": { "x": [0.3, 0.3, 0.3], "y": [0, 0, 0] },
"t": 120,
- "s": [
- 48,
- 48,
- 100
- ]
+ "s": [48, 48, 100]
},
{
- "i": {
- "x": [
- 0.1,
- 0.1,
- 0.1
- ],
- "y": [
- 1,
- 1,
- 1
- ]
- },
- "o": {
- "x": [
- 0.05,
- 0.05,
- 0.05
- ],
- "y": [
- 0.7,
- 0.7,
- 0
- ]
- },
+ "i": { "x": [0.1, 0.1, 0.1], "y": [1, 1, 1] },
+ "o": { "x": [0.05, 0.05, 0.05], "y": [0.7, 0.7, 0] },
"t": 125,
- "s": [
- 68.8,
- 68.8,
- 100
- ]
+ "s": [68.8, 68.8, 100]
},
{
+ "i": { "x": [0.99, 0.99, 0.99], "y": [1, 1, 1] },
+ "o": { "x": [0.01, 0.01, 0.01], "y": [0, 0, 0] },
"t": 150,
- "s": [
- 100,
- 100,
- 100
- ]
- }
+ "s": [100, 100, 100]
+ },
+ {
+ "i": { "x": [0.8, 0.8, 0.8], "y": [0.15, 0.15, 1] },
+ "o": { "x": [0.3, 0.3, 0.3], "y": [0, 0, 0] },
+ "t": 210,
+ "s": [100, 100, 100]
+ },
+ {
+ "i": { "x": [0.1, 0.1, 0.1], "y": [1, 1, 1] },
+ "o": { "x": [0.05, 0.05, 0.05], "y": [0.7, 0.7, 0] },
+ "t": 215,
+ "s": [79.2, 79.2, 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": 240,
+ "s": [48, 48, 100]
+ },
+ {
+ "i": { "x": [0.8, 0.8, 0.8], "y": [0.15, 0.15, 1] },
+ "o": { "x": [0.3, 0.3, 0.3], "y": [0, 0, 0] },
+ "t": 300,
+ "s": [48, 48, 100]
+ },
+ {
+ "i": { "x": [0.1, 0.1, 0.1], "y": [1, 1, 1] },
+ "o": { "x": [0.05, 0.05, 0.05], "y": [0.7, 0.7, 0] },
+ "t": 305,
+ "s": [68.8, 68.8, 100]
+ },
+ { "t": 330, "s": [100, 100, 100] }
],
"ix": 6,
"l": 2
@@ -372,46 +205,11 @@
"parent": 3,
"sr": 1,
"ks": {
- "o": {
- "a": 0,
- "k": 100,
- "ix": 11
- },
- "r": {
- "a": 0,
- "k": 0,
- "ix": 10
- },
- "p": {
- "a": 0,
- "k": [
- -3,
- -1,
- 0
- ],
- "ix": 2,
- "l": 2
- },
- "a": {
- "a": 0,
- "k": [
- 0,
- 0,
- 0
- ],
- "ix": 1,
- "l": 2
- },
- "s": {
- "a": 0,
- "k": [
- 100,
- 100,
- 100
- ],
- "ix": 6,
- "l": 2
- }
+ "o": { "a": 0, "k": 100, "ix": 11 },
+ "r": { "a": 0, "k": 0, "ix": 10 },
+ "p": { "a": 0, "k": [-3, -1, 0], "ix": 2, "l": 2 },
+ "a": { "a": 0, "k": [0, 0, 0], "ix": 1, "l": 2 },
+ "s": { "a": 0, "k": [100, 100, 100], "ix": 6, "l": 2 }
},
"ao": 0,
"shapes": [
@@ -426,130 +224,40 @@
"a": 0,
"k": {
"i": [
- [
- -12.194,
- 8.13
- ],
- [
- -14.642,
- -0.049
- ],
- [
- -13.858,
- -13.91
- ],
- [
- 0,
- -19.64
- ],
- [
- 8.129,
- -12.146
- ],
- [
- 13.516,
- -5.632
- ],
- [
- 14.348,
- 2.841
- ],
- [
- 10.333,
- 10.334
- ],
- [
- 2.889,
- 14.35
- ],
- [
- -5.583,
- 13.518
- ]
+ [-12.194, 8.13],
+ [-14.642, -0.049],
+ [-13.858, -13.91],
+ [0, -19.64],
+ [8.129, -12.146],
+ [13.516, -5.632],
+ [14.348, 2.841],
+ [10.333, 10.334],
+ [2.889, 14.35],
+ [-5.583, 13.518]
],
"o": [
- [
- 12.194,
- -8.13
- ],
- [
- 19.637,
- 0
- ],
- [
- 13.858,
- 13.861
- ],
- [
- 0,
- 14.595
- ],
- [
- -8.129,
- 12.195
- ],
- [
- -13.516,
- 5.583
- ],
- [
- -14.348,
- -2.89
- ],
- [
- -10.333,
- -10.383
- ],
- [
- -2.889,
- -14.35
- ],
- [
- 5.583,
- -13.518
- ]
+ [12.194, -8.13],
+ [19.637, 0],
+ [13.858, 13.861],
+ [0, 14.595],
+ [-8.129, 12.195],
+ [-13.516, 5.583],
+ [-14.348, -2.89],
+ [-10.333, -10.383],
+ [-2.889, -14.35],
+ [5.583, -13.518]
],
"v": [
- [
- -41.079,
- -61.559
- ],
- [
- 0.055,
- -74
- ],
- [
- 52.355,
- -52.303
- ],
- [
- 74,
- 0.005
- ],
- [
- 61.513,
- 41.097
- ],
- [
- 28.311,
- 68.377
- ],
- [
- -14.44,
- 72.589
- ],
- [
- -52.343,
- 52.313
- ],
- [
- -72.567,
- 14.404
- ],
- [
- -68.356,
- -28.353
- ]
+ [-41.079, -61.559],
+ [0.055, -74],
+ [52.355, -52.303],
+ [74, 0.005],
+ [61.513, 41.097],
+ [28.311, 68.377],
+ [-14.44, 72.589],
+ [-52.343, 52.313],
+ [-72.567, 14.404],
+ [-68.356, -28.353]
],
"c": true
},
@@ -567,154 +275,46 @@
"a": 0,
"k": {
"i": [
- [
- 1.322,
- 1.469
- ],
- [
- 1.959,
- 0.147
- ],
- [
- 1.028,
- -0.343
- ],
- [
- 0.784,
- -0.735
- ],
- [
- 0.441,
- -0.98
- ],
- [
- 0,
- -1.077
- ],
- [
- -0.441,
- -0.98
- ],
- [
- -0.784,
- -0.735
- ],
- [
- -1.028,
- -0.343
- ],
- [
- -1.077,
- 0.049
- ],
- [
- -1.322,
- 1.42
- ],
- [
- 0,
- 1.959
- ]
+ [1.322, 1.469],
+ [1.959, 0.147],
+ [1.028, -0.343],
+ [0.784, -0.735],
+ [0.441, -0.98],
+ [0, -1.077],
+ [-0.441, -0.98],
+ [-0.784, -0.735],
+ [-1.028, -0.343],
+ [-1.077, 0.049],
+ [-1.322, 1.42],
+ [0, 1.959]
],
"o": [
- [
- -1.322,
- -1.42
- ],
- [
- -1.077,
- -0.098
- ],
- [
- -1.028,
- 0.343
- ],
- [
- -0.784,
- 0.735
- ],
- [
- -0.392,
- 0.98
- ],
- [
- 0,
- 1.077
- ],
- [
- 0.441,
- 0.98
- ],
- [
- 0.784,
- 0.735
- ],
- [
- 1.028,
- 0.392
- ],
- [
- 1.959,
- -0.196
- ],
- [
- 1.322,
- -1.42
- ],
- [
- 0,
- -1.959
- ]
+ [-1.322, -1.42],
+ [-1.077, -0.098],
+ [-1.028, 0.343],
+ [-0.784, 0.735],
+ [-0.392, 0.98],
+ [0, 1.077],
+ [0.441, 0.98],
+ [0.784, 0.735],
+ [1.028, 0.392],
+ [1.959, -0.196],
+ [1.322, -1.42],
+ [0, -1.959]
],
"v": [
- [
- 5.148,
- -35.895
- ],
- [
- 0.055,
- -38.344
- ],
- [
- -3.128,
- -37.952
- ],
- [
- -5.87,
- -36.336
- ],
- [
- -7.731,
- -33.741
- ],
- [
- -8.367,
- -30.605
- ],
- [
- -7.731,
- -27.471
- ],
- [
- -5.87,
- -24.875
- ],
- [
- -3.128,
- -23.259
- ],
- [
- 0.055,
- -22.819
- ],
- [
- 5.148,
- -25.317
- ],
- [
- 7.205,
- -30.605
- ]
+ [5.148, -35.895],
+ [0.055, -38.344],
+ [-3.128, -37.952],
+ [-5.87, -36.336],
+ [-7.731, -33.741],
+ [-8.367, -30.605],
+ [-7.731, -27.471],
+ [-5.87, -24.875],
+ [-3.128, -23.259],
+ [0.055, -22.819],
+ [5.148, -25.317],
+ [7.205, -30.605]
],
"c": true
},
@@ -732,166 +332,49 @@
"a": 0,
"k": {
"i": [
- [
- 0,
- 0
- ],
- [
- 0,
- 0
- ],
- [
- 0,
- 0
- ],
- [
- -7.688,
- 1.959
- ],
- [
- 0,
- 0
- ],
- [
- 21.645,
- 5.143
- ],
- [
- 0,
- 0
- ],
- [
- -7.835,
- -0.637
- ],
- [
- 0,
- 0
- ],
- [
- 0,
- 0
- ],
- [
- 0,
- 0
- ],
- [
- 0,
- 0
- ],
- [
- 0,
- 0
- ]
+ [0, 0],
+ [0, 0],
+ [0, 0],
+ [-7.688, 1.959],
+ [0, 0],
+ [21.645, 5.143],
+ [0, 0],
+ [-7.835, -0.637],
+ [0, 0],
+ [0, 0],
+ [0, 0],
+ [0, 0],
+ [0, 0]
],
"o": [
- [
- 0,
- 0
- ],
- [
- 0,
- 0
- ],
- [
- 7.933,
- -0.588
- ],
- [
- 0,
- 0
- ],
- [
- -21.645,
- 5.143
- ],
- [
- 0,
- 0
- ],
- [
- 7.639,
- 1.959
- ],
- [
- 0,
- 0
- ],
- [
- 0,
- 0
- ],
- [
- 0,
- 0
- ],
- [
- 0,
- 0
- ],
- [
- 0,
- 0
- ],
- [
- 0,
- 0
- ]
+ [0, 0],
+ [0, 0],
+ [7.933, -0.588],
+ [0, 0],
+ [-21.645, 5.143],
+ [0, 0],
+ [7.639, 1.959],
+ [0, 0],
+ [0, 0],
+ [0, 0],
+ [0, 0],
+ [0, 0],
+ [0, 0]
],
"v": [
- [
- 11.661,
- 39.187
- ],
- [
- 11.661,
- -11.211
- ],
- [
- 11.465,
- -11.211
- ],
- [
- 34.922,
- -15.08
- ],
- [
- 33.012,
- -22.819
- ],
- [
- -32.901,
- -22.819
- ],
- [
- -34.86,
- -15.08
- ],
- [
- -11.6,
- -11.211
- ],
- [
- -11.6,
- 39.138
- ],
- [
- -3.862,
- 39.138
- ],
- [
- -3.862,
- 15.874
- ],
- [
- 3.924,
- 15.874
- ],
- [
- 3.924,
- 39.187
- ]
+ [11.661, 39.187],
+ [11.661, -11.211],
+ [11.465, -11.211],
+ [34.922, -15.08],
+ [33.012, -22.819],
+ [-32.901, -22.819],
+ [-34.86, -15.08],
+ [-11.6, -11.211],
+ [-11.6, 39.138],
+ [-3.862, 39.138],
+ [-3.862, 15.874],
+ [3.924, 15.874],
+ [3.924, 39.187]
],
"c": true
},
@@ -905,19 +388,10 @@
"ty": "fl",
"c": {
"a": 0,
- "k": [
- 0.909803921569,
- 0.917647058824,
- 0.929411764706,
- 1
- ],
+ "k": [0.909803921569, 0.917647058824, 0.929411764706, 1],
"ix": 4
},
- "o": {
- "a": 0,
- "k": 100,
- "ix": 5
- },
+ "o": { "a": 0, "k": 100, "ix": 5 },
"r": 1,
"bm": 0,
"nm": "Fill 1",
@@ -926,50 +400,13 @@
},
{
"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
- },
+ "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"
}
],
@@ -997,46 +434,11 @@
"parent": 1,
"sr": 1,
"ks": {
- "o": {
- "a": 0,
- "k": 100,
- "ix": 11
- },
- "r": {
- "a": 0,
- "k": 0,
- "ix": 10
- },
- "p": {
- "a": 0,
- "k": [
- 0,
- 0,
- 0
- ],
- "ix": 2,
- "l": 2
- },
- "a": {
- "a": 0,
- "k": [
- 98,
- 0,
- 0
- ],
- "ix": 1,
- "l": 2
- },
- "s": {
- "a": 0,
- "k": [
- 100,
- 100,
- 100
- ],
- "ix": 6,
- "l": 2
- }
+ "o": { "a": 0, "k": 100, "ix": 11 },
+ "r": { "a": 0, "k": 0, "ix": 10 },
+ "p": { "a": 0, "k": [0, 0, 0], "ix": 2, "l": 2 },
+ "a": { "a": 0, "k": [98, 0, 0], "ix": 1, "l": 2 },
+ "s": { "a": 0, "k": [100, 100, 100], "ix": 6, "l": 2 }
},
"ao": 0,
"shapes": [
@@ -1051,94 +453,31 @@
"a": 0,
"k": {
"i": [
- [
- 0,
- 0
- ],
- [
- 0,
- 0
- ],
- [
- 17.884,
- 17.997
- ],
- [
- 0,
- 25.479
- ],
- [
- -17.884,
- 17.997
- ],
- [
- -25.32,
- 0
- ],
- [
- 0,
- 0
- ]
+ [0, 0],
+ [0, 0],
+ [17.884, 17.997],
+ [0, 25.479],
+ [-17.884, 17.997],
+ [-25.32, 0],
+ [0, 0]
],
"o": [
- [
- 0,
- 0
- ],
- [
- -25.32,
- 0
- ],
- [
- -17.884,
- -17.997
- ],
- [
- 0,
- -25.479
- ],
- [
- 17.884,
- -18.046
- ],
- [
- 0,
- 0
- ],
- [
- 0,
- 0
- ]
+ [0, 0],
+ [-25.32, 0],
+ [-17.884, -17.997],
+ [0, -25.479],
+ [17.884, -18.046],
+ [0, 0],
+ [0, 0]
],
"v": [
- [
- 98,
- 96
- ],
- [
- -2.6,
- 96
- ],
- [
- -70.056,
- 67.88
- ],
- [
- -98,
- 0.001
- ],
- [
- -70.056,
- -67.88
- ],
- [
- -2.6,
- -96
- ],
- [
- 98,
- -96
- ]
+ [98, 96],
+ [-2.6, 96],
+ [-70.056, 67.88],
+ [-98, 0.001],
+ [-70.056, -67.88],
+ [-2.6, -96],
+ [98, -96]
],
"c": false
},
@@ -1152,24 +491,11 @@
"ty": "st",
"c": {
"a": 0,
- "k": [
- 0.909803921569,
- 0.917647058824,
- 0.929411764706,
- 1
- ],
+ "k": [0.909803921569, 0.917647058824, 0.929411764706, 1],
"ix": 3
},
- "o": {
- "a": 0,
- "k": 100,
- "ix": 4
- },
- "w": {
- "a": 0,
- "k": 4,
- "ix": 5
- },
+ "o": { "a": 0, "k": 100, "ix": 4 },
+ "w": { "a": 0, "k": 4, "ix": 5 },
"lc": 1,
"lj": 1,
"ml": 4,
@@ -1180,50 +506,13 @@
},
{
"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
- },
+ "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"
}
],
@@ -1250,46 +539,11 @@
"cl": "black",
"sr": 1,
"ks": {
- "o": {
- "a": 0,
- "k": 100,
- "ix": 11
- },
- "r": {
- "a": 0,
- "k": 0,
- "ix": 10
- },
- "p": {
- "a": 0,
- "k": [
- 206,
- 150,
- 0
- ],
- "ix": 2,
- "l": 2
- },
- "a": {
- "a": 0,
- "k": [
- 0,
- 0,
- 0
- ],
- "ix": 1,
- "l": 2
- },
- "s": {
- "a": 0,
- "k": [
- 100,
- 100,
- 100
- ],
- "ix": 6,
- "l": 2
- }
+ "o": { "a": 0, "k": 100, "ix": 11 },
+ "r": { "a": 0, "k": 0, "ix": 10 },
+ "p": { "a": 0, "k": [206, 150, 0], "ix": 2, "l": 2 },
+ "a": { "a": 0, "k": [0, 0, 0], "ix": 1, "l": 2 },
+ "s": { "a": 0, "k": [100, 100, 100], "ix": 6, "l": 2 }
},
"ao": 0,
"shapes": [
@@ -1304,106 +558,34 @@
"a": 0,
"k": {
"i": [
- [
- -15.3,
- 0
- ],
- [
- 0,
- 0
- ],
- [
- 0,
- 15.5
- ],
- [
- 0,
- 0
- ],
- [
- 15.2,
- 0
- ],
- [
- 0,
- 0
- ],
- [
- 0,
- -15.7
- ],
- [
- 0,
- 0
- ]
+ [-15.3, 0],
+ [0, 0],
+ [0, 15.5],
+ [0, 0],
+ [15.2, 0],
+ [0, 0],
+ [0, -15.7],
+ [0, 0]
],
"o": [
- [
- 0,
- 0
- ],
- [
- 15.3,
- 0
- ],
- [
- 0,
- 0
- ],
- [
- 0,
- -15.7
- ],
- [
- 0,
- 0
- ],
- [
- -15.3,
- 0
- ],
- [
- 0,
- 0
- ],
- [
- 0,
- 15.7
- ]
+ [0, 0],
+ [15.3, 0],
+ [0, 0],
+ [0, -15.7],
+ [0, 0],
+ [-15.3, 0],
+ [0, 0],
+ [0, 15.7]
],
"v": [
- [
- -178.2,
- 150
- ],
- [
- 178.2,
- 150
- ],
- [
- 206,
- 121.7
- ],
- [
- 206,
- -121.5
- ],
- [
- 178.3,
- -150
- ],
- [
- -178.2,
- -150
- ],
- [
- -206,
- -121.5
- ],
- [
- -206,
- 121.5
- ]
+ [-178.2, 150],
+ [178.2, 150],
+ [206, 121.7],
+ [206, -121.5],
+ [178.3, -150],
+ [-178.2, -150],
+ [-206, -121.5],
+ [-206, 121.5]
],
"c": true
},
@@ -1415,21 +597,8 @@
},
{
"ty": "fl",
- "c": {
- "a": 0,
- "k": [
- 0,
- 0,
- 0,
- 1
- ],
- "ix": 4
- },
- "o": {
- "a": 0,
- "k": 100,
- "ix": 5
- },
+ "c": { "a": 0, "k": [0, 0, 0, 1], "ix": 4 },
+ "o": { "a": 0, "k": 100, "ix": 5 },
"r": 1,
"bm": 0,
"nm": "Fill 1",
@@ -1438,50 +607,13 @@
},
{
"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
- },
+ "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"
}
],
@@ -1503,4 +635,4 @@
],
"markers": [],
"props": {}
-}
\ No newline at end of file
+}
diff --git a/res/raw/accessibility_shortcut_type_tripletap.json b/res/raw/accessibility_shortcut_type_tripletap.json
index 18f1736..c74c66b 100644
--- a/res/raw/accessibility_shortcut_type_tripletap.json
+++ b/res/raw/accessibility_shortcut_type_tripletap.json
@@ -2,10 +2,10 @@
"v": "5.12.1",
"fr": 60,
"ip": 0,
- "op": 135,
+ "op": 126,
"w": 412,
"h": 300,
- "nm": "Accessibility_Triple_Tap_v5_export",
+ "nm": "Accessibility_Triple_Tap_v5_export 2",
"ddd": 0,
"assets": [],
"layers": [
@@ -21,644 +21,274 @@
"a": 1,
"k": [
{
- "i": {
- "x": [
- 0.833
- ],
- "y": [
- 0.833
- ]
- },
- "o": {
- "x": [
- 0.167
- ],
- "y": [
- 0.167
- ]
- },
+ "i": { "x": [0.833], "y": [0.833] },
+ "o": { "x": [0.167], "y": [0.167] },
"t": 0,
- "s": [
- 0
- ]
+ "s": [0]
},
{
- "i": {
- "x": [
- 0.833
- ],
- "y": [
- 0.833
- ]
- },
- "o": {
- "x": [
- 0.167
- ],
- "y": [
- 0.167
- ]
- },
+ "i": { "x": [0.833], "y": [0.833] },
+ "o": { "x": [0.167], "y": [0.167] },
"t": 1.832,
- "s": [
- 50
- ]
+ "s": [50]
},
{
- "i": {
- "x": [
- 0.833
- ],
- "y": [
- 0.833
- ]
- },
- "o": {
- "x": [
- 0.167
- ],
- "y": [
- 0.167
- ]
- },
+ "i": { "x": [0.833], "y": [0.833] },
+ "o": { "x": [0.167], "y": [0.167] },
"t": 9.623,
- "s": [
- 50
- ]
+ "s": [50]
},
{
- "i": {
- "x": [
- 0.833
- ],
- "y": [
- 0.833
- ]
- },
- "o": {
- "x": [
- 0.167
- ],
- "y": [
- 0.167
- ]
- },
+ "i": { "x": [0.833], "y": [0.833] },
+ "o": { "x": [0.167], "y": [0.167] },
"t": 11.91,
- "s": [
- 0
- ]
+ "s": [0]
},
{
- "i": {
- "x": [
- 0.833
- ],
- "y": [
- 0.833
- ]
- },
- "o": {
- "x": [
- 0.167
- ],
- "y": [
- 0.167
- ]
- },
+ "i": { "x": [0.833], "y": [0.833] },
+ "o": { "x": [0.167], "y": [0.167] },
"t": 16.543,
- "s": [
- 0
- ]
+ "s": [0]
},
{
- "i": {
- "x": [
- 0.833
- ],
- "y": [
- 0.833
- ]
- },
- "o": {
- "x": [
- 0.167
- ],
- "y": [
- 0.167
- ]
- },
+ "i": { "x": [0.833], "y": [0.833] },
+ "o": { "x": [0.167], "y": [0.167] },
"t": 18.377,
- "s": [
- 50
- ]
+ "s": [50]
},
{
- "i": {
- "x": [
- 0.833
- ],
- "y": [
- 0.833
- ]
- },
- "o": {
- "x": [
- 0.167
- ],
- "y": [
- 0.167
- ]
- },
+ "i": { "x": [0.833], "y": [0.833] },
+ "o": { "x": [0.167], "y": [0.167] },
"t": 26.164,
- "s": [
- 50
- ]
+ "s": [50]
},
{
- "i": {
- "x": [
- 0.833
- ],
- "y": [
- 0.833
- ]
- },
- "o": {
- "x": [
- 0.167
- ],
- "y": [
- 0.167
- ]
- },
+ "i": { "x": [0.833], "y": [0.833] },
+ "o": { "x": [0.167], "y": [0.167] },
"t": 28.457,
- "s": [
- 0
- ]
+ "s": [0]
},
{
- "i": {
- "x": [
- 0.833
- ],
- "y": [
- 0.833
- ]
- },
- "o": {
- "x": [
- 0.167
- ],
- "y": [
- 0.167
- ]
- },
+ "i": { "x": [0.833], "y": [0.833] },
+ "o": { "x": [0.167], "y": [0.167] },
"t": 33.09,
- "s": [
- 0
- ]
+ "s": [0]
},
{
- "i": {
- "x": [
- 0.833
- ],
- "y": [
- 0.833
- ]
- },
- "o": {
- "x": [
- 0.167
- ],
- "y": [
- 0.167
- ]
- },
+ "i": { "x": [0.833], "y": [0.833] },
+ "o": { "x": [0.167], "y": [0.167] },
"t": 34.922,
- "s": [
- 50
- ]
+ "s": [50]
},
{
- "i": {
- "x": [
- 0.833
- ],
- "y": [
- 0.833
- ]
- },
- "o": {
- "x": [
- 0.167
- ],
- "y": [
- 0.167
- ]
- },
+ "i": { "x": [0.833], "y": [0.833] },
+ "o": { "x": [0.167], "y": [0.167] },
"t": 42.711,
- "s": [
- 50
- ]
+ "s": [50]
},
{
+ "i": { "x": [0.833], "y": [0.833] },
+ "o": { "x": [0.167], "y": [0.167] },
"t": 45,
- "s": [
- 0
- ]
- }
+ "s": [0]
+ },
+ {
+ "i": { "x": [0.833], "y": [0.833] },
+ "o": { "x": [0.167], "y": [0.167] },
+ "t": 85,
+ "s": [0]
+ },
+ {
+ "i": { "x": [0.833], "y": [0.833] },
+ "o": { "x": [0.167], "y": [0.167] },
+ "t": 86.832,
+ "s": [50]
+ },
+ {
+ "i": { "x": [0.833], "y": [0.833] },
+ "o": { "x": [0.167], "y": [0.167] },
+ "t": 94.623,
+ "s": [50]
+ },
+ {
+ "i": { "x": [0.833], "y": [0.833] },
+ "o": { "x": [0.167], "y": [0.167] },
+ "t": 96.91,
+ "s": [0]
+ },
+ {
+ "i": { "x": [0.833], "y": [0.833] },
+ "o": { "x": [0.167], "y": [0.167] },
+ "t": 101.543,
+ "s": [0]
+ },
+ {
+ "i": { "x": [0.833], "y": [0.833] },
+ "o": { "x": [0.167], "y": [0.167] },
+ "t": 103.377,
+ "s": [50]
+ },
+ {
+ "i": { "x": [0.833], "y": [0.833] },
+ "o": { "x": [0.167], "y": [0.167] },
+ "t": 111.164,
+ "s": [50]
+ },
+ {
+ "i": { "x": [0.833], "y": [0.833] },
+ "o": { "x": [0.167], "y": [0.167] },
+ "t": 113.457,
+ "s": [0]
+ },
+ {
+ "i": { "x": [0.833], "y": [0.833] },
+ "o": { "x": [0.167], "y": [0.167] },
+ "t": 118.09,
+ "s": [0]
+ },
+ { "t": 119.921875, "s": [50] }
],
"ix": 11
},
- "r": {
- "a": 0,
- "k": 0,
- "ix": 10
- },
- "p": {
- "a": 0,
- "k": [
- 206.01,
- 150.01,
- 0
- ],
- "ix": 2,
- "l": 2
- },
- "a": {
- "a": 0,
- "k": [
- 0,
- 0,
- 0
- ],
- "ix": 1,
- "l": 2
- },
+ "r": { "a": 0, "k": 0, "ix": 10 },
+ "p": { "a": 0, "k": [206.01, 150.01, 0], "ix": 2, "l": 2 },
+ "a": { "a": 0, "k": [0, 0, 0], "ix": 1, "l": 2 },
"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
- ]
- },
+ "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": [
- 120,
- 120,
- 100
- ]
+ "s": [120, 120, 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
- ]
- },
+ "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": 5.498,
- "s": [
- 100,
- 100,
- 100
- ]
+ "s": [100, 100, 100]
},
{
- "i": {
- "x": [
- 0.667,
- 0.667,
- 0.667
- ],
- "y": [
- 1,
- 1,
- 1
- ]
- },
- "o": {
- "x": [
- 0.167,
- 0.167,
- 0.167
- ],
- "y": [
- 0,
- 0,
- 0
- ]
- },
+ "i": { "x": [0.667, 0.667, 0.667], "y": [1, 1, 1] },
+ "o": { "x": [0.167, 0.167, 0.167], "y": [0, 0, 0] },
"t": 7.328,
- "s": [
- 100,
- 100,
- 100
- ]
+ "s": [100, 100, 100]
},
{
- "i": {
- "x": [
- 0.667,
- 0.667,
- 0.667
- ],
- "y": [
- 1,
- 1,
- 1
- ]
- },
- "o": {
- "x": [
- 0.167,
- 0.167,
- 0.167
- ],
- "y": [
- 0,
- 0,
- 0
- ]
- },
+ "i": { "x": [0.667, 0.667, 0.667], "y": [1, 1, 1] },
+ "o": { "x": [0.167, 0.167, 0.167], "y": [0, 0, 0] },
"t": 11.91,
- "s": [
- 120,
- 120,
- 100
- ]
+ "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
- ]
- },
+ "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.543,
- "s": [
- 120,
- 120,
- 100
- ]
+ "s": [120, 120, 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
- ]
- },
+ "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": 22.043,
- "s": [
- 100,
- 100,
- 100
- ]
+ "s": [100, 100, 100]
},
{
- "i": {
- "x": [
- 0.667,
- 0.667,
- 0.667
- ],
- "y": [
- 1,
- 1,
- 1
- ]
- },
- "o": {
- "x": [
- 0.167,
- 0.167,
- 0.167
- ],
- "y": [
- 0,
- 0,
- 0
- ]
- },
+ "i": { "x": [0.667, 0.667, 0.667], "y": [1, 1, 1] },
+ "o": { "x": [0.167, 0.167, 0.167], "y": [0, 0, 0] },
"t": 23.873,
- "s": [
- 100,
- 100,
- 100
- ]
+ "s": [100, 100, 100]
},
{
- "i": {
- "x": [
- 0.667,
- 0.667,
- 0.667
- ],
- "y": [
- 1,
- 1,
- 1
- ]
- },
- "o": {
- "x": [
- 0.167,
- 0.167,
- 0.167
- ],
- "y": [
- 0,
- 0,
- 0
- ]
- },
+ "i": { "x": [0.667, 0.667, 0.667], "y": [1, 1, 1] },
+ "o": { "x": [0.167, 0.167, 0.167], "y": [0, 0, 0] },
"t": 28.457,
- "s": [
- 120,
- 120,
- 100
- ]
+ "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
- ]
- },
+ "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": 33.09,
- "s": [
- 120,
- 120,
- 100
- ]
+ "s": [120, 120, 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
- ]
- },
+ "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": 38.588,
- "s": [
- 100,
- 100,
- 100
- ]
+ "s": [100, 100, 100]
},
{
- "i": {
- "x": [
- 0.667,
- 0.667,
- 0.667
- ],
- "y": [
- 1,
- 1,
- 1
- ]
- },
- "o": {
- "x": [
- 0.167,
- 0.167,
- 0.167
- ],
- "y": [
- 0,
- 0,
- 0
- ]
- },
+ "i": { "x": [0.667, 0.667, 0.667], "y": [1, 1, 1] },
+ "o": { "x": [0.167, 0.167, 0.167], "y": [0, 0, 0] },
"t": 40.418,
- "s": [
- 100,
- 100,
- 100
- ]
+ "s": [100, 100, 100]
},
{
+ "i": { "x": [0.667, 0.667, 0.667], "y": [1, 1, 1] },
+ "o": { "x": [0.167, 0.167, 0.167], "y": [0, 0, 0] },
"t": 45,
- "s": [
- 120,
- 120,
- 100
- ]
- }
+ "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": 85,
+ "s": [120, 120, 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": 90.498,
+ "s": [100, 100, 100]
+ },
+ {
+ "i": { "x": [0.667, 0.667, 0.667], "y": [1, 1, 1] },
+ "o": { "x": [0.167, 0.167, 0.167], "y": [0, 0, 0] },
+ "t": 92.328,
+ "s": [100, 100, 100]
+ },
+ {
+ "i": { "x": [0.667, 0.667, 0.667], "y": [1, 1, 1] },
+ "o": { "x": [0.167, 0.167, 0.167], "y": [0, 0, 0] },
+ "t": 96.91,
+ "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": 101.543,
+ "s": [120, 120, 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": 107.043,
+ "s": [100, 100, 100]
+ },
+ {
+ "i": { "x": [0.667, 0.667, 0.667], "y": [1, 1, 1] },
+ "o": { "x": [0.167, 0.167, 0.167], "y": [0, 0, 0] },
+ "t": 108.873,
+ "s": [100, 100, 100]
+ },
+ {
+ "i": { "x": [0.667, 0.667, 0.667], "y": [1, 1, 1] },
+ "o": { "x": [0.167, 0.167, 0.167], "y": [0, 0, 0] },
+ "t": 113.457,
+ "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": 118.09,
+ "s": [120, 120, 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": 123.588,
+ "s": [100, 100, 100]
+ },
+ { "t": 125.41796875, "s": [100, 100, 100] }
],
"ix": 6,
"l": 2
@@ -677,58 +307,22 @@
"a": 0,
"k": {
"i": [
- [
- -20.621,
- 0
- ],
- [
- 0,
- 20.621
- ],
- [
- 20.621,
- 0
- ],
- [
- 0,
- -20.621
- ]
+ [-20.621, 0],
+ [0, 20.621],
+ [20.621, 0],
+ [0, -20.621]
],
"o": [
- [
- 20.621,
- 0
- ],
- [
- 0,
- -20.621
- ],
- [
- -20.621,
- 0
- ],
- [
- 0,
- 20.621
- ]
+ [20.621, 0],
+ [0, -20.621],
+ [-20.621, 0],
+ [0, 20.621]
],
"v": [
- [
- 0,
- 37.338
- ],
- [
- 37.338,
- 0
- ],
- [
- 0,
- -37.338
- ],
- [
- -37.338,
- 0
- ]
+ [0, 37.338],
+ [37.338, 0],
+ [0, -37.338],
+ [-37.338, 0]
],
"c": true
},
@@ -742,24 +336,11 @@
"ty": "st",
"c": {
"a": 0,
- "k": [
- 0.40000000596,
- 0.615686297417,
- 0.964705884457,
- 1
- ],
+ "k": [0.40000000596, 0.615686297417, 0.964705884457, 1],
"ix": 3
},
- "o": {
- "a": 0,
- "k": 100,
- "ix": 4
- },
- "w": {
- "a": 0,
- "k": 2.764,
- "ix": 5
- },
+ "o": { "a": 0, "k": 100, "ix": 4 },
+ "w": { "a": 0, "k": 2.764, "ix": 5 },
"lc": 1,
"lj": 1,
"ml": 4,
@@ -772,19 +353,10 @@
"ty": "fl",
"c": {
"a": 0,
- "k": [
- 0.40000000596,
- 0.615686297417,
- 0.964705884457,
- 1
- ],
+ "k": [0.40000000596, 0.615686297417, 0.964705884457, 1],
"ix": 4
},
- "o": {
- "a": 0,
- "k": 100,
- "ix": 5
- },
+ "o": { "a": 0, "k": 100, "ix": 5 },
"r": 1,
"bm": 0,
"nm": "Fill 1",
@@ -793,50 +365,13 @@
},
{
"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
- },
+ "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"
}
],
@@ -867,644 +402,274 @@
"a": 1,
"k": [
{
- "i": {
- "x": [
- 0.833
- ],
- "y": [
- 0.833
- ]
- },
- "o": {
- "x": [
- 0.167
- ],
- "y": [
- 0.167
- ]
- },
+ "i": { "x": [0.833], "y": [0.833] },
+ "o": { "x": [0.167], "y": [0.167] },
"t": 0,
- "s": [
- 1
- ]
+ "s": [1]
},
{
- "i": {
- "x": [
- 0.833
- ],
- "y": [
- 0.833
- ]
- },
- "o": {
- "x": [
- 0.167
- ],
- "y": [
- 0.167
- ]
- },
+ "i": { "x": [0.833], "y": [0.833] },
+ "o": { "x": [0.167], "y": [0.167] },
"t": 1.832,
- "s": [
- 50
- ]
+ "s": [50]
},
{
- "i": {
- "x": [
- 0.833
- ],
- "y": [
- 0.833
- ]
- },
- "o": {
- "x": [
- 0.167
- ],
- "y": [
- 0.167
- ]
- },
+ "i": { "x": [0.833], "y": [0.833] },
+ "o": { "x": [0.167], "y": [0.167] },
"t": 9.623,
- "s": [
- 50
- ]
+ "s": [50]
},
{
- "i": {
- "x": [
- 0.833
- ],
- "y": [
- 0.833
- ]
- },
- "o": {
- "x": [
- 0.167
- ],
- "y": [
- 0.167
- ]
- },
+ "i": { "x": [0.833], "y": [0.833] },
+ "o": { "x": [0.167], "y": [0.167] },
"t": 11.91,
- "s": [
- 0
- ]
+ "s": [0]
},
{
- "i": {
- "x": [
- 0.833
- ],
- "y": [
- 0.833
- ]
- },
- "o": {
- "x": [
- 0.167
- ],
- "y": [
- 0.167
- ]
- },
+ "i": { "x": [0.833], "y": [0.833] },
+ "o": { "x": [0.167], "y": [0.167] },
"t": 16.543,
- "s": [
- 1
- ]
+ "s": [1]
},
{
- "i": {
- "x": [
- 0.833
- ],
- "y": [
- 0.833
- ]
- },
- "o": {
- "x": [
- 0.167
- ],
- "y": [
- 0.167
- ]
- },
+ "i": { "x": [0.833], "y": [0.833] },
+ "o": { "x": [0.167], "y": [0.167] },
"t": 18.377,
- "s": [
- 50
- ]
+ "s": [50]
},
{
- "i": {
- "x": [
- 0.833
- ],
- "y": [
- 0.833
- ]
- },
- "o": {
- "x": [
- 0.167
- ],
- "y": [
- 0.167
- ]
- },
+ "i": { "x": [0.833], "y": [0.833] },
+ "o": { "x": [0.167], "y": [0.167] },
"t": 26.164,
- "s": [
- 50
- ]
+ "s": [50]
},
{
- "i": {
- "x": [
- 0.833
- ],
- "y": [
- 0.833
- ]
- },
- "o": {
- "x": [
- 0.167
- ],
- "y": [
- 0.167
- ]
- },
+ "i": { "x": [0.833], "y": [0.833] },
+ "o": { "x": [0.167], "y": [0.167] },
"t": 28.457,
- "s": [
- 0
- ]
+ "s": [0]
},
{
- "i": {
- "x": [
- 0.833
- ],
- "y": [
- 0.833
- ]
- },
- "o": {
- "x": [
- 0.167
- ],
- "y": [
- 0.167
- ]
- },
+ "i": { "x": [0.833], "y": [0.833] },
+ "o": { "x": [0.167], "y": [0.167] },
"t": 33.09,
- "s": [
- 1
- ]
+ "s": [1]
},
{
- "i": {
- "x": [
- 0.833
- ],
- "y": [
- 0.833
- ]
- },
- "o": {
- "x": [
- 0.167
- ],
- "y": [
- 0.167
- ]
- },
+ "i": { "x": [0.833], "y": [0.833] },
+ "o": { "x": [0.167], "y": [0.167] },
"t": 34.922,
- "s": [
- 50
- ]
+ "s": [50]
},
{
- "i": {
- "x": [
- 0.833
- ],
- "y": [
- 0.833
- ]
- },
- "o": {
- "x": [
- 0.167
- ],
- "y": [
- 0.167
- ]
- },
+ "i": { "x": [0.833], "y": [0.833] },
+ "o": { "x": [0.167], "y": [0.167] },
"t": 42.711,
- "s": [
- 50
- ]
+ "s": [50]
},
{
+ "i": { "x": [0.833], "y": [0.833] },
+ "o": { "x": [0.167], "y": [0.167] },
"t": 45,
- "s": [
- 0
- ]
- }
+ "s": [0]
+ },
+ {
+ "i": { "x": [0.833], "y": [0.833] },
+ "o": { "x": [0.167], "y": [0.167] },
+ "t": 85,
+ "s": [1]
+ },
+ {
+ "i": { "x": [0.833], "y": [0.833] },
+ "o": { "x": [0.167], "y": [0.167] },
+ "t": 86.832,
+ "s": [50]
+ },
+ {
+ "i": { "x": [0.833], "y": [0.833] },
+ "o": { "x": [0.167], "y": [0.167] },
+ "t": 94.623,
+ "s": [50]
+ },
+ {
+ "i": { "x": [0.833], "y": [0.833] },
+ "o": { "x": [0.167], "y": [0.167] },
+ "t": 96.91,
+ "s": [0]
+ },
+ {
+ "i": { "x": [0.833], "y": [0.833] },
+ "o": { "x": [0.167], "y": [0.167] },
+ "t": 101.543,
+ "s": [1]
+ },
+ {
+ "i": { "x": [0.833], "y": [0.833] },
+ "o": { "x": [0.167], "y": [0.167] },
+ "t": 103.377,
+ "s": [50]
+ },
+ {
+ "i": { "x": [0.833], "y": [0.833] },
+ "o": { "x": [0.167], "y": [0.167] },
+ "t": 111.164,
+ "s": [50]
+ },
+ {
+ "i": { "x": [0.833], "y": [0.833] },
+ "o": { "x": [0.167], "y": [0.167] },
+ "t": 113.457,
+ "s": [0]
+ },
+ {
+ "i": { "x": [0.833], "y": [0.833] },
+ "o": { "x": [0.167], "y": [0.167] },
+ "t": 118.09,
+ "s": [1]
+ },
+ { "t": 119.921875, "s": [50] }
],
"ix": 11
},
- "r": {
- "a": 0,
- "k": 0,
- "ix": 10
- },
- "p": {
- "a": 0,
- "k": [
- 206.012,
- 150.012,
- 0
- ],
- "ix": 2,
- "l": 2
- },
- "a": {
- "a": 0,
- "k": [
- 0,
- 0,
- 0
- ],
- "ix": 1,
- "l": 2
- },
+ "r": { "a": 0, "k": 0, "ix": 10 },
+ "p": { "a": 0, "k": [206.012, 150.012, 0], "ix": 2, "l": 2 },
+ "a": { "a": 0, "k": [0, 0, 0], "ix": 1, "l": 2 },
"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
- ]
- },
+ "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": [
- 80,
- 80,
- 100
- ]
+ "s": [80, 80, 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
- ]
- },
+ "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": 5.498,
- "s": [
- 100,
- 100,
- 100
- ]
+ "s": [100, 100, 100]
},
{
- "i": {
- "x": [
- 0.667,
- 0.667,
- 0.667
- ],
- "y": [
- 1,
- 1,
- 1
- ]
- },
- "o": {
- "x": [
- 0.167,
- 0.167,
- 0.167
- ],
- "y": [
- 0,
- 0,
- 0
- ]
- },
+ "i": { "x": [0.667, 0.667, 0.667], "y": [1, 1, 1] },
+ "o": { "x": [0.167, 0.167, 0.167], "y": [0, 0, 0] },
"t": 7.328,
- "s": [
- 100,
- 100,
- 100
- ]
+ "s": [100, 100, 100]
},
{
- "i": {
- "x": [
- 0.667,
- 0.667,
- 0.667
- ],
- "y": [
- 1,
- 1,
- 1
- ]
- },
- "o": {
- "x": [
- 0.167,
- 0.167,
- 0.167
- ],
- "y": [
- 0,
- 0,
- 0
- ]
- },
+ "i": { "x": [0.667, 0.667, 0.667], "y": [1, 1, 1] },
+ "o": { "x": [0.167, 0.167, 0.167], "y": [0, 0, 0] },
"t": 11.91,
- "s": [
- 80,
- 80,
- 100
- ]
+ "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
- ]
- },
+ "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.543,
- "s": [
- 80,
- 80,
- 100
- ]
+ "s": [80, 80, 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
- ]
- },
+ "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": 22.043,
- "s": [
- 100,
- 100,
- 100
- ]
+ "s": [100, 100, 100]
},
{
- "i": {
- "x": [
- 0.667,
- 0.667,
- 0.667
- ],
- "y": [
- 1,
- 1,
- 1
- ]
- },
- "o": {
- "x": [
- 0.167,
- 0.167,
- 0.167
- ],
- "y": [
- 0,
- 0,
- 0
- ]
- },
+ "i": { "x": [0.667, 0.667, 0.667], "y": [1, 1, 1] },
+ "o": { "x": [0.167, 0.167, 0.167], "y": [0, 0, 0] },
"t": 23.873,
- "s": [
- 100,
- 100,
- 100
- ]
+ "s": [100, 100, 100]
},
{
- "i": {
- "x": [
- 0.667,
- 0.667,
- 0.667
- ],
- "y": [
- 1,
- 1,
- 1
- ]
- },
- "o": {
- "x": [
- 0.167,
- 0.167,
- 0.167
- ],
- "y": [
- 0,
- 0,
- 0
- ]
- },
+ "i": { "x": [0.667, 0.667, 0.667], "y": [1, 1, 1] },
+ "o": { "x": [0.167, 0.167, 0.167], "y": [0, 0, 0] },
"t": 28.457,
- "s": [
- 80,
- 80,
- 100
- ]
+ "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
- ]
- },
+ "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": 33.09,
- "s": [
- 80,
- 80,
- 100
- ]
+ "s": [80, 80, 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
- ]
- },
+ "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": 38.588,
- "s": [
- 100,
- 100,
- 100
- ]
+ "s": [100, 100, 100]
},
{
- "i": {
- "x": [
- 0.667,
- 0.667,
- 0.667
- ],
- "y": [
- 1,
- 1,
- 1
- ]
- },
- "o": {
- "x": [
- 0.167,
- 0.167,
- 0.167
- ],
- "y": [
- 0,
- 0,
- 0
- ]
- },
+ "i": { "x": [0.667, 0.667, 0.667], "y": [1, 1, 1] },
+ "o": { "x": [0.167, 0.167, 0.167], "y": [0, 0, 0] },
"t": 40.418,
- "s": [
- 100,
- 100,
- 100
- ]
+ "s": [100, 100, 100]
},
{
+ "i": { "x": [0.667, 0.667, 0.667], "y": [1, 1, 1] },
+ "o": { "x": [0.167, 0.167, 0.167], "y": [0, 0, 0] },
"t": 45,
- "s": [
- 80,
- 80,
- 100
- ]
- }
+ "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": 85,
+ "s": [80, 80, 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": 90.498,
+ "s": [100, 100, 100]
+ },
+ {
+ "i": { "x": [0.667, 0.667, 0.667], "y": [1, 1, 1] },
+ "o": { "x": [0.167, 0.167, 0.167], "y": [0, 0, 0] },
+ "t": 92.328,
+ "s": [100, 100, 100]
+ },
+ {
+ "i": { "x": [0.667, 0.667, 0.667], "y": [1, 1, 1] },
+ "o": { "x": [0.167, 0.167, 0.167], "y": [0, 0, 0] },
+ "t": 96.91,
+ "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": 101.543,
+ "s": [80, 80, 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": 107.043,
+ "s": [100, 100, 100]
+ },
+ {
+ "i": { "x": [0.667, 0.667, 0.667], "y": [1, 1, 1] },
+ "o": { "x": [0.167, 0.167, 0.167], "y": [0, 0, 0] },
+ "t": 108.873,
+ "s": [100, 100, 100]
+ },
+ {
+ "i": { "x": [0.667, 0.667, 0.667], "y": [1, 1, 1] },
+ "o": { "x": [0.167, 0.167, 0.167], "y": [0, 0, 0] },
+ "t": 113.457,
+ "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": 118.09,
+ "s": [80, 80, 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": 123.588,
+ "s": [100, 100, 100]
+ },
+ { "t": 125.41796875, "s": [100, 100, 100] }
],
"ix": 6,
"l": 2
@@ -1523,58 +688,22 @@
"a": 0,
"k": {
"i": [
- [
- -31.444,
- 0
- ],
- [
- 0,
- 31.444
- ],
- [
- 31.444,
- 0
- ],
- [
- 0,
- -31.444
- ]
+ [-31.444, 0],
+ [0, 31.444],
+ [31.444, 0],
+ [0, -31.444]
],
"o": [
- [
- 31.444,
- 0
- ],
- [
- 0,
- -31.444
- ],
- [
- -31.444,
- 0
- ],
- [
- 0,
- 31.444
- ]
+ [31.444, 0],
+ [0, -31.444],
+ [-31.444, 0],
+ [0, 31.444]
],
"v": [
- [
- 0,
- 56.934
- ],
- [
- 56.934,
- 0
- ],
- [
- 0,
- -56.934
- ],
- [
- -56.934,
- 0
- ]
+ [0, 56.934],
+ [56.934, 0],
+ [0, -56.934],
+ [-56.934, 0]
],
"c": true
},
@@ -1588,24 +717,11 @@
"ty": "st",
"c": {
"a": 0,
- "k": [
- 0.40000000596,
- 0.615686297417,
- 0.964705884457,
- 1
- ],
+ "k": [0.40000000596, 0.615686297417, 0.964705884457, 1],
"ix": 3
},
- "o": {
- "a": 0,
- "k": 100,
- "ix": 4
- },
- "w": {
- "a": 0,
- "k": 2.764,
- "ix": 5
- },
+ "o": { "a": 0, "k": 100, "ix": 4 },
+ "w": { "a": 0, "k": 2.764, "ix": 5 },
"lc": 1,
"lj": 1,
"ml": 4,
@@ -1618,19 +734,10 @@
"ty": "fl",
"c": {
"a": 0,
- "k": [
- 0.40000000596,
- 0.615686297417,
- 0.964705884457,
- 1
- ],
+ "k": [0.40000000596, 0.615686297417, 0.964705884457, 1],
"ix": 4
},
- "o": {
- "a": 0,
- "k": 100,
- "ix": 5
- },
+ "o": { "a": 0, "k": 100, "ix": 5 },
"r": 1,
"bm": 0,
"nm": "Fill 1",
@@ -1639,50 +746,13 @@
},
{
"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
- },
+ "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"
}
],
@@ -1713,644 +783,274 @@
"a": 1,
"k": [
{
- "i": {
- "x": [
- 0.833
- ],
- "y": [
- 0.833
- ]
- },
- "o": {
- "x": [
- 0.167
- ],
- "y": [
- 0.167
- ]
- },
+ "i": { "x": [0.833], "y": [0.833] },
+ "o": { "x": [0.167], "y": [0.167] },
"t": 0,
- "s": [
- 1
- ]
+ "s": [1]
},
{
- "i": {
- "x": [
- 0.833
- ],
- "y": [
- 0.833
- ]
- },
- "o": {
- "x": [
- 0.167
- ],
- "y": [
- 0.167
- ]
- },
+ "i": { "x": [0.833], "y": [0.833] },
+ "o": { "x": [0.167], "y": [0.167] },
"t": 1.832,
- "s": [
- 50
- ]
+ "s": [50]
},
{
- "i": {
- "x": [
- 0.833
- ],
- "y": [
- 0.833
- ]
- },
- "o": {
- "x": [
- 0.167
- ],
- "y": [
- 0.167
- ]
- },
+ "i": { "x": [0.833], "y": [0.833] },
+ "o": { "x": [0.167], "y": [0.167] },
"t": 9.623,
- "s": [
- 50
- ]
+ "s": [50]
},
{
- "i": {
- "x": [
- 0.833
- ],
- "y": [
- 0.833
- ]
- },
- "o": {
- "x": [
- 0.167
- ],
- "y": [
- 0.167
- ]
- },
+ "i": { "x": [0.833], "y": [0.833] },
+ "o": { "x": [0.167], "y": [0.167] },
"t": 11.91,
- "s": [
- 0
- ]
+ "s": [0]
},
{
- "i": {
- "x": [
- 0.833
- ],
- "y": [
- 0.833
- ]
- },
- "o": {
- "x": [
- 0.167
- ],
- "y": [
- 0.167
- ]
- },
+ "i": { "x": [0.833], "y": [0.833] },
+ "o": { "x": [0.167], "y": [0.167] },
"t": 16.543,
- "s": [
- 1
- ]
+ "s": [1]
},
{
- "i": {
- "x": [
- 0.833
- ],
- "y": [
- 0.833
- ]
- },
- "o": {
- "x": [
- 0.167
- ],
- "y": [
- 0.167
- ]
- },
+ "i": { "x": [0.833], "y": [0.833] },
+ "o": { "x": [0.167], "y": [0.167] },
"t": 18.377,
- "s": [
- 50
- ]
+ "s": [50]
},
{
- "i": {
- "x": [
- 0.833
- ],
- "y": [
- 0.833
- ]
- },
- "o": {
- "x": [
- 0.167
- ],
- "y": [
- 0.167
- ]
- },
+ "i": { "x": [0.833], "y": [0.833] },
+ "o": { "x": [0.167], "y": [0.167] },
"t": 26.164,
- "s": [
- 50
- ]
+ "s": [50]
},
{
- "i": {
- "x": [
- 0.833
- ],
- "y": [
- 0.833
- ]
- },
- "o": {
- "x": [
- 0.167
- ],
- "y": [
- 0.167
- ]
- },
+ "i": { "x": [0.833], "y": [0.833] },
+ "o": { "x": [0.167], "y": [0.167] },
"t": 28.457,
- "s": [
- 0
- ]
+ "s": [0]
},
{
- "i": {
- "x": [
- 0.833
- ],
- "y": [
- 0.833
- ]
- },
- "o": {
- "x": [
- 0.167
- ],
- "y": [
- 0.167
- ]
- },
+ "i": { "x": [0.833], "y": [0.833] },
+ "o": { "x": [0.167], "y": [0.167] },
"t": 33.09,
- "s": [
- 1
- ]
+ "s": [1]
},
{
- "i": {
- "x": [
- 0.833
- ],
- "y": [
- 0.833
- ]
- },
- "o": {
- "x": [
- 0.167
- ],
- "y": [
- 0.167
- ]
- },
+ "i": { "x": [0.833], "y": [0.833] },
+ "o": { "x": [0.167], "y": [0.167] },
"t": 34.922,
- "s": [
- 50
- ]
+ "s": [50]
},
{
- "i": {
- "x": [
- 0.833
- ],
- "y": [
- 0.833
- ]
- },
- "o": {
- "x": [
- 0.167
- ],
- "y": [
- 0.167
- ]
- },
+ "i": { "x": [0.833], "y": [0.833] },
+ "o": { "x": [0.167], "y": [0.167] },
"t": 42.711,
- "s": [
- 50
- ]
+ "s": [50]
},
{
+ "i": { "x": [0.833], "y": [0.833] },
+ "o": { "x": [0.167], "y": [0.167] },
"t": 45,
- "s": [
- 0
- ]
- }
+ "s": [0]
+ },
+ {
+ "i": { "x": [0.833], "y": [0.833] },
+ "o": { "x": [0.167], "y": [0.167] },
+ "t": 85,
+ "s": [1]
+ },
+ {
+ "i": { "x": [0.833], "y": [0.833] },
+ "o": { "x": [0.167], "y": [0.167] },
+ "t": 86.832,
+ "s": [50]
+ },
+ {
+ "i": { "x": [0.833], "y": [0.833] },
+ "o": { "x": [0.167], "y": [0.167] },
+ "t": 94.623,
+ "s": [50]
+ },
+ {
+ "i": { "x": [0.833], "y": [0.833] },
+ "o": { "x": [0.167], "y": [0.167] },
+ "t": 96.91,
+ "s": [0]
+ },
+ {
+ "i": { "x": [0.833], "y": [0.833] },
+ "o": { "x": [0.167], "y": [0.167] },
+ "t": 101.543,
+ "s": [1]
+ },
+ {
+ "i": { "x": [0.833], "y": [0.833] },
+ "o": { "x": [0.167], "y": [0.167] },
+ "t": 103.377,
+ "s": [50]
+ },
+ {
+ "i": { "x": [0.833], "y": [0.833] },
+ "o": { "x": [0.167], "y": [0.167] },
+ "t": 111.164,
+ "s": [50]
+ },
+ {
+ "i": { "x": [0.833], "y": [0.833] },
+ "o": { "x": [0.167], "y": [0.167] },
+ "t": 113.457,
+ "s": [0]
+ },
+ {
+ "i": { "x": [0.833], "y": [0.833] },
+ "o": { "x": [0.167], "y": [0.167] },
+ "t": 118.09,
+ "s": [1]
+ },
+ { "t": 119.921875, "s": [50] }
],
"ix": 11
},
- "r": {
- "a": 0,
- "k": 0,
- "ix": 10
- },
- "p": {
- "a": 0,
- "k": [
- 206,
- 150,
- 0
- ],
- "ix": 2,
- "l": 2
- },
- "a": {
- "a": 0,
- "k": [
- 0,
- 0,
- 0
- ],
- "ix": 1,
- "l": 2
- },
+ "r": { "a": 0, "k": 0, "ix": 10 },
+ "p": { "a": 0, "k": [206, 150, 0], "ix": 2, "l": 2 },
+ "a": { "a": 0, "k": [0, 0, 0], "ix": 1, "l": 2 },
"s": {
"a": 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
- ]
- },
+ "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": [
- 60,
- 60,
- 100
- ]
+ "s": [60, 60, 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
- ]
- },
+ "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": 5.498,
- "s": [
- 100,
- 100,
- 100
- ]
+ "s": [100, 100, 100]
},
{
- "i": {
- "x": [
- 0.667,
- 0.667,
- 0.667
- ],
- "y": [
- 1,
- 1,
- 1
- ]
- },
- "o": {
- "x": [
- 0.167,
- 0.167,
- 0.167
- ],
- "y": [
- 0,
- 0,
- 0
- ]
- },
+ "i": { "x": [0.667, 0.667, 0.667], "y": [1, 1, 1] },
+ "o": { "x": [0.167, 0.167, 0.167], "y": [0, 0, 0] },
"t": 7.328,
- "s": [
- 100,
- 100,
- 100
- ]
+ "s": [100, 100, 100]
},
{
- "i": {
- "x": [
- 0.667,
- 0.667,
- 0.667
- ],
- "y": [
- 1,
- 1,
- 1
- ]
- },
- "o": {
- "x": [
- 0.167,
- 0.167,
- 0.167
- ],
- "y": [
- 0,
- 0,
- 0
- ]
- },
+ "i": { "x": [0.667, 0.667, 0.667], "y": [1, 1, 1] },
+ "o": { "x": [0.167, 0.167, 0.167], "y": [0, 0, 0] },
"t": 11.91,
- "s": [
- 60,
- 60,
- 100
- ]
+ "s": [60, 60, 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
- ]
- },
+ "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.543,
- "s": [
- 60,
- 60,
- 100
- ]
+ "s": [60, 60, 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
- ]
- },
+ "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": 22.043,
- "s": [
- 100,
- 100,
- 100
- ]
+ "s": [100, 100, 100]
},
{
- "i": {
- "x": [
- 0.667,
- 0.667,
- 0.667
- ],
- "y": [
- 1,
- 1,
- 1
- ]
- },
- "o": {
- "x": [
- 0.167,
- 0.167,
- 0.167
- ],
- "y": [
- 0,
- 0,
- 0
- ]
- },
+ "i": { "x": [0.667, 0.667, 0.667], "y": [1, 1, 1] },
+ "o": { "x": [0.167, 0.167, 0.167], "y": [0, 0, 0] },
"t": 23.873,
- "s": [
- 100,
- 100,
- 100
- ]
+ "s": [100, 100, 100]
},
{
- "i": {
- "x": [
- 0.667,
- 0.667,
- 0.667
- ],
- "y": [
- 1,
- 1,
- 1
- ]
- },
- "o": {
- "x": [
- 0.167,
- 0.167,
- 0.167
- ],
- "y": [
- 0,
- 0,
- 0
- ]
- },
+ "i": { "x": [0.667, 0.667, 0.667], "y": [1, 1, 1] },
+ "o": { "x": [0.167, 0.167, 0.167], "y": [0, 0, 0] },
"t": 28.457,
- "s": [
- 60,
- 60,
- 100
- ]
+ "s": [60, 60, 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
- ]
- },
+ "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": 33.09,
- "s": [
- 60,
- 60,
- 100
- ]
+ "s": [60, 60, 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
- ]
- },
+ "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": 38.588,
- "s": [
- 100,
- 100,
- 100
- ]
+ "s": [100, 100, 100]
},
{
- "i": {
- "x": [
- 0.667,
- 0.667,
- 0.667
- ],
- "y": [
- 1,
- 1,
- 1
- ]
- },
- "o": {
- "x": [
- 0.167,
- 0.167,
- 0.167
- ],
- "y": [
- 0,
- 0,
- 0
- ]
- },
+ "i": { "x": [0.667, 0.667, 0.667], "y": [1, 1, 1] },
+ "o": { "x": [0.167, 0.167, 0.167], "y": [0, 0, 0] },
"t": 40.418,
- "s": [
- 100,
- 100,
- 100
- ]
+ "s": [100, 100, 100]
},
{
+ "i": { "x": [0.667, 0.667, 0.667], "y": [1, 1, 1] },
+ "o": { "x": [0.167, 0.167, 0.167], "y": [0, 0, 0] },
"t": 45,
- "s": [
- 60,
- 60,
- 100
- ]
- }
+ "s": [60, 60, 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": 85,
+ "s": [60, 60, 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": 90.498,
+ "s": [100, 100, 100]
+ },
+ {
+ "i": { "x": [0.667, 0.667, 0.667], "y": [1, 1, 1] },
+ "o": { "x": [0.167, 0.167, 0.167], "y": [0, 0, 0] },
+ "t": 92.328,
+ "s": [100, 100, 100]
+ },
+ {
+ "i": { "x": [0.667, 0.667, 0.667], "y": [1, 1, 1] },
+ "o": { "x": [0.167, 0.167, 0.167], "y": [0, 0, 0] },
+ "t": 96.91,
+ "s": [60, 60, 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": 101.543,
+ "s": [60, 60, 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": 107.043,
+ "s": [100, 100, 100]
+ },
+ {
+ "i": { "x": [0.667, 0.667, 0.667], "y": [1, 1, 1] },
+ "o": { "x": [0.167, 0.167, 0.167], "y": [0, 0, 0] },
+ "t": 108.873,
+ "s": [100, 100, 100]
+ },
+ {
+ "i": { "x": [0.667, 0.667, 0.667], "y": [1, 1, 1] },
+ "o": { "x": [0.167, 0.167, 0.167], "y": [0, 0, 0] },
+ "t": 113.457,
+ "s": [60, 60, 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": 118.09,
+ "s": [60, 60, 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": 123.588,
+ "s": [100, 100, 100]
+ },
+ { "t": 125.41796875, "s": [100, 100, 100] }
],
"ix": 6,
"l": 2
@@ -2369,58 +1069,22 @@
"a": 0,
"k": {
"i": [
- [
- -41.974,
- 0
- ],
- [
- 0,
- 41.974
- ],
- [
- 41.974,
- 0
- ],
- [
- 0,
- -41.974
- ]
+ [-41.974, 0],
+ [0, 41.974],
+ [41.974, 0],
+ [0, -41.974]
],
"o": [
- [
- 41.974,
- 0
- ],
- [
- 0,
- -41.974
- ],
- [
- -41.974,
- 0
- ],
- [
- 0,
- 41.974
- ]
+ [41.974, 0],
+ [0, -41.974],
+ [-41.974, 0],
+ [0, 41.974]
],
"v": [
- [
- 0,
- 76
- ],
- [
- 76,
- 0
- ],
- [
- 0,
- -76
- ],
- [
- -76,
- 0
- ]
+ [0, 76],
+ [76, 0],
+ [0, -76],
+ [-76, 0]
],
"c": true
},
@@ -2434,24 +1098,11 @@
"ty": "st",
"c": {
"a": 0,
- "k": [
- 0.40000000596,
- 0.615686297417,
- 0.964705884457,
- 1
- ],
+ "k": [0.40000000596, 0.615686297417, 0.964705884457, 1],
"ix": 3
},
- "o": {
- "a": 0,
- "k": 100,
- "ix": 4
- },
- "w": {
- "a": 0,
- "k": 2.764,
- "ix": 5
- },
+ "o": { "a": 0, "k": 100, "ix": 4 },
+ "w": { "a": 0, "k": 2.764, "ix": 5 },
"lc": 1,
"lj": 1,
"ml": 4,
@@ -2464,19 +1115,10 @@
"ty": "fl",
"c": {
"a": 0,
- "k": [
- 0.40000000596,
- 0.615686297417,
- 0.964705884457,
- 1
- ],
+ "k": [0.40000000596, 0.615686297417, 0.964705884457, 1],
"ix": 4
},
- "o": {
- "a": 0,
- "k": 100,
- "ix": 5
- },
+ "o": { "a": 0, "k": 100, "ix": 5 },
"r": 1,
"bm": 0,
"nm": "Fill 1",
@@ -2485,50 +1127,13 @@
},
{
"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
- },
+ "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"
}
],
@@ -2555,46 +1160,11 @@
"cl": "black",
"sr": 1,
"ks": {
- "o": {
- "a": 0,
- "k": 100,
- "ix": 11
- },
- "r": {
- "a": 0,
- "k": 0,
- "ix": 10
- },
- "p": {
- "a": 0,
- "k": [
- 206,
- 150,
- 0
- ],
- "ix": 2,
- "l": 2
- },
- "a": {
- "a": 0,
- "k": [
- 0,
- 0,
- 0
- ],
- "ix": 1,
- "l": 2
- },
- "s": {
- "a": 0,
- "k": [
- 100,
- 100,
- 100
- ],
- "ix": 6,
- "l": 2
- }
+ "o": { "a": 0, "k": 100, "ix": 11 },
+ "r": { "a": 0, "k": 0, "ix": 10 },
+ "p": { "a": 0, "k": [206, 150, 0], "ix": 2, "l": 2 },
+ "a": { "a": 0, "k": [0, 0, 0], "ix": 1, "l": 2 },
+ "s": { "a": 0, "k": [100, 100, 100], "ix": 6, "l": 2 }
},
"ao": 0,
"shapes": [
@@ -2609,106 +1179,34 @@
"a": 0,
"k": {
"i": [
- [
- -15.3,
- 0
- ],
- [
- 0,
- 0
- ],
- [
- 0,
- 15.5
- ],
- [
- 0,
- 0
- ],
- [
- 15.2,
- 0
- ],
- [
- 0,
- 0
- ],
- [
- 0,
- -15.7
- ],
- [
- 0,
- 0
- ]
+ [-15.3, 0],
+ [0, 0],
+ [0, 15.5],
+ [0, 0],
+ [15.2, 0],
+ [0, 0],
+ [0, -15.7],
+ [0, 0]
],
"o": [
- [
- 0,
- 0
- ],
- [
- 15.3,
- 0
- ],
- [
- 0,
- 0
- ],
- [
- 0,
- -15.7
- ],
- [
- 0,
- 0
- ],
- [
- -15.3,
- 0
- ],
- [
- 0,
- 0
- ],
- [
- 0,
- 15.7
- ]
+ [0, 0],
+ [15.3, 0],
+ [0, 0],
+ [0, -15.7],
+ [0, 0],
+ [-15.3, 0],
+ [0, 0],
+ [0, 15.7]
],
"v": [
- [
- -178.2,
- 150
- ],
- [
- 178.2,
- 150
- ],
- [
- 206,
- 121.7
- ],
- [
- 206,
- -121.5
- ],
- [
- 178.3,
- -150
- ],
- [
- -178.2,
- -150
- ],
- [
- -206,
- -121.5
- ],
- [
- -206,
- 121.5
- ]
+ [-178.2, 150],
+ [178.2, 150],
+ [206, 121.7],
+ [206, -121.5],
+ [178.3, -150],
+ [-178.2, -150],
+ [-206, -121.5],
+ [-206, 121.5]
],
"c": true
},
@@ -2720,21 +1218,8 @@
},
{
"ty": "fl",
- "c": {
- "a": 0,
- "k": [
- 0,
- 0,
- 0,
- 1
- ],
- "ix": 4
- },
- "o": {
- "a": 0,
- "k": 100,
- "ix": 5
- },
+ "c": { "a": 0, "k": [0, 0, 0, 1], "ix": 4 },
+ "o": { "a": 0, "k": 100, "ix": 5 },
"r": 1,
"bm": 0,
"nm": "Fill 1",
@@ -2743,50 +1228,13 @@
},
{
"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
- },
+ "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"
}
],
@@ -2806,12 +1254,6 @@
"bm": 0
}
],
- "markers": [
- {
- "tm": 135,
- "cm": "1",
- "dr": 0
- }
- ],
+ "markers": [{ "tm": 211, "cm": "1", "dr": 0 }],
"props": {}
-}
\ No newline at end of file
+}
diff --git a/res/values/config.xml b/res/values/config.xml
index 4e4c5c4..95f8eba 100644
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -842,4 +842,7 @@
<!-- Package name for Linux terminal app -->
<string name="config_linux_terminal_app_package_name" translatable="false">com.android.virtualization.terminal</string>
+
+ <!-- Disable the Testing Setting Menu for user builds, i.e only display the menu on userdebug/eng builds -->
+ <bool name="config_hide_testing_settings_menu_for_user_builds">false</bool>
</resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 0ab4ade..847e27c 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -11182,6 +11182,23 @@
<!-- Summary text for double tap power for camera [CHAR LIMIT=160]-->
<string name="double_tap_power_for_camera_summary">To quickly open camera, press the power button twice. Works from any screen.</string>
+ <!-- Title text for double tap power gesture [CHAR LIMIT=80]-->
+ <string name="double_tap_power_title">Double tap power button</string>
+ <!-- Summary for double tap power settings [DO NOT TRANSLATE] -->
+ <string name="double_tap_power_summary" translatable="false"><xliff:g id="double_tap_power_on_off" example="On">%1$s</xliff:g> / <xliff:g id="double_tap_power_actions" example="Access Wallet">%2$s</xliff:g></string>
+ <!-- Switch label to enable/disable double tap power button gesture [CHAR LIMIT=60] -->
+ <string name="double_tap_power_enabled">Use double tap</string>
+ <!-- Category title for double tap power gesture [CHAR_LIMIT=80] -->
+ <string name="double_tap_power_target_action_category">Double Tap Power Button</string>
+ <!-- Double Tap Power Gesture camera launch action title [CHAR_LIMIT=60] -->
+ <string name="double_tap_power_camera_action_title">Open Camera</string>
+ <!-- Setting summary to describe double tap power button will open camera. [CHAR LIMIT=NONE] -->
+ <string name="double_tap_power_camera_action_summary">Access Camera</string>
+ <!-- Double Tap Power Gesture wallet launch action title [CHAR_LIMIT=60] -->
+ <string name="double_tap_power_wallet_action_title">Open Wallet</string>
+ <!-- Setting summary to describe double tap power button will open wallet. [CHAR LIMIT=NONE] -->
+ <string name="double_tap_power_wallet_action_summary">Access Wallet</string>
+
<!-- Title text for double twist for camera mode [CHAR LIMIT=60]-->
<string name="double_twist_for_camera_mode_title">Flip camera for selfie</string>
@@ -12870,7 +12887,7 @@
<string name="page_agnostic_notification_action">Read more</string>
<string name= "enable_16k_app_compat_title">Run app with page size compat mode</string>
- <string name= "enable_16k_app_compat_details">App will be run in page size compatibility mode on 16 KB device toggled.</string>
+ <string name= "enable_16k_app_compat_details">App will be run in page size compatibility mode on 16 KB device when toggled.</string>
<!-- DSU Loader. Do not translate. -->
diff --git a/res/xml/double_tap_power_settings.xml b/res/xml/double_tap_power_settings.xml
index fb5dd52..783d045 100644
--- a/res/xml/double_tap_power_settings.xml
+++ b/res/xml/double_tap_power_settings.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
- Copyright (C) 2016 The Android Open Source Project
+ Copyright (C) 2024 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.
@@ -18,19 +18,28 @@
<PreferenceScreen
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:settings="http://schemas.android.com/apk/res-auto"
- xmlns:app="http://schemas.android.com/apk/res-auto"
- android:title="@string/double_tap_power_for_camera_title">
-
+ android:title="@string/double_tap_power_title">
<com.android.settingslib.widget.IllustrationPreference
android:key="gesture_double_tap_power_video"
settings:searchable="false"
- app:lottie_rawRes="@drawable/quickly_open_camera"/>
+ settings:lottie_rawRes="@drawable/quickly_open_camera"
+ settings:controller="com.android.settings.gestures.DoubleTapPowerIllustrationPreferenceController"/>
- <SwitchPreferenceCompat
- android:key="gesture_double_tap_power"
- android:title="@string/double_tap_power_for_camera_title"
- android:summary="@string/double_tap_power_for_camera_summary"
- app:keywords="@string/keywords_gesture"
- app:controller="com.android.settings.gestures.DoubleTapPowerPreferenceController"/>
-
+ <com.android.settingslib.widget.MainSwitchPreference
+ android:key="gesture_double_tap_power_enabled_main_switch"
+ android:title="@string/double_tap_power_enabled"
+ settings:keywords="@string/keywords_gesture"
+ settings:controller="com.android.settings.gestures.DoubleTapPowerMainSwitchPreferenceController"/>
+ <PreferenceCategory
+ android:key="gesture_double_tap_power_actions"
+ android:title="@string/double_tap_power_target_action_category">
+ <com.android.settingslib.widget.SelectorWithWidgetPreference
+ android:key="gesture_double_power_tap_camera"
+ android:title="@string/double_tap_power_camera_action_title"
+ settings:controller="com.android.settings.gestures.DoubleTapPowerForCameraPreferenceController"/>
+ <com.android.settingslib.widget.SelectorWithWidgetPreference
+ android:key="gesture_double_power_tap_wallet"
+ android:title="@string/double_tap_power_wallet_action_title"
+ settings:controller="com.android.settings.gestures.DoubleTapPowerForWalletPreferenceController"/>
+ </PreferenceCategory>
</PreferenceScreen>
diff --git a/res/xml/double_tap_power_to_open_camera_settings.xml b/res/xml/double_tap_power_to_open_camera_settings.xml
new file mode 100644
index 0000000..315c7f0
--- /dev/null
+++ b/res/xml/double_tap_power_to_open_camera_settings.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ 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.
+ -->
+
+<PreferenceScreen
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:settings="http://schemas.android.com/apk/res-auto"
+ android:title="@string/double_tap_power_for_camera_title">
+
+ <com.android.settingslib.widget.IllustrationPreference
+ android:key="gesture_double_tap_power_video"
+ settings:searchable="false"
+ settings:lottie_rawRes="@drawable/quickly_open_camera"/>
+
+ <SwitchPreferenceCompat
+ android:key="gesture_double_tap_power"
+ android:title="@string/double_tap_power_for_camera_title"
+ android:summary="@string/double_tap_power_for_camera_summary"
+ settings:keywords="@string/keywords_gesture"
+ settings:controller="com.android.settings.gestures.DoubleTapPowerToOpenCameraPreferenceController"/>
+
+</PreferenceScreen>
diff --git a/res/xml/gestures.xml b/res/xml/gestures.xml
index 035c7f7..bfb359a 100644
--- a/res/xml/gestures.xml
+++ b/res/xml/gestures.xml
@@ -29,7 +29,7 @@
<Preference
android:key="gesture_double_tap_power_input_summary"
- android:title="@string/double_tap_power_for_camera_title"
+ android:title="@string/double_tap_power_title"
android:fragment="com.android.settings.gestures.DoubleTapPowerSettings"
settings:searchable="false"
settings:controller="com.android.settings.gestures.DoubleTapPowerPreferenceController" />
diff --git a/res/xml/power_background_usage_detail.xml b/res/xml/power_background_usage_detail.xml
index 32d80b5..05e4cfb 100644
--- a/res/xml/power_background_usage_detail.xml
+++ b/res/xml/power_background_usage_detail.xml
@@ -20,9 +20,8 @@
xmlns:settings="http://schemas.android.com/apk/res-auto"
android:title="@string/manager_battery_usage_allow_background_usage_settings_title">
- <com.android.settingslib.widget.LayoutPreference
+ <com.android.settingslib.widget.IntroPreference
android:key="header_view"
- android:layout="@layout/settings_entity_header"
android:selectable="false"/>
<PreferenceCategory
diff --git a/res/xml/power_usage_detail.xml b/res/xml/power_usage_detail.xml
index 655dbc5..c2b1c5e 100644
--- a/res/xml/power_usage_detail.xml
+++ b/res/xml/power_usage_detail.xml
@@ -19,9 +19,8 @@
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:settings="http://schemas.android.com/apk/res-auto">
- <com.android.settingslib.widget.LayoutPreference
+ <com.android.settingslib.widget.IntroPreference
android:key="header_view"
- android:layout="@layout/settings_entity_header"
android:selectable="false"/>
<com.android.settingslib.widget.ActionButtonsPreference
diff --git a/src/com/android/settings/TestingSettingsBroadcastReceiver.java b/src/com/android/settings/TestingSettingsBroadcastReceiver.java
index 30a0d79..9965630 100644
--- a/src/com/android/settings/TestingSettingsBroadcastReceiver.java
+++ b/src/com/android/settings/TestingSettingsBroadcastReceiver.java
@@ -19,6 +19,7 @@
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
+import android.os.Build;
import android.telephony.TelephonyManager;
import com.android.settings.Settings.TestingSettingsActivity;
@@ -32,11 +33,17 @@
@Override
public void onReceive(Context context, Intent intent) {
if (intent != null && intent.getAction() != null
- && intent.getAction().equals(TelephonyManager.ACTION_SECRET_CODE)) {
+ && intent.getAction().equals(TelephonyManager.ACTION_SECRET_CODE)
+ && !isDisabled(context)) {
Intent i = new Intent(Intent.ACTION_MAIN);
i.setClass(context, TestingSettingsActivity.class);
i.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
context.startActivity(i);
}
}
+
+ private boolean isDisabled(Context context) {
+ return "user".equals(Build.TYPE) && context.getResources().getBoolean(
+ R.bool.config_hide_testing_settings_menu_for_user_builds);
+ }
}
diff --git a/src/com/android/settings/accessibility/AccessibilityShortcutsTutorial.java b/src/com/android/settings/accessibility/AccessibilityShortcutsTutorial.java
index 9386ba0..03b70e5 100644
--- a/src/com/android/settings/accessibility/AccessibilityShortcutsTutorial.java
+++ b/src/com/android/settings/accessibility/AccessibilityShortcutsTutorial.java
@@ -72,7 +72,6 @@
import com.android.settingslib.widget.LottieColorUtils;
import com.airbnb.lottie.LottieAnimationView;
-import com.airbnb.lottie.LottieDrawable;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
@@ -335,7 +334,8 @@
result -> Log.w(TAG, "Invalid image raw resource id: " + imageRawRes,
result));
lottieView.setAnimation(imageRawRes);
- lottieView.setRepeatCount(LottieDrawable.INFINITE);
+ // Follow the Motion Stoppable requirement by using a finite animation.
+ lottieView.setRepeatCount(0);
LottieColorUtils.applyDynamicColors(context, lottieView);
lottieView.playAnimation();
diff --git a/src/com/android/settings/accessibility/LaunchAccessibilityActivityPreferenceFragment.java b/src/com/android/settings/accessibility/LaunchAccessibilityActivityPreferenceFragment.java
index 91e65b1..e49078b 100644
--- a/src/com/android/settings/accessibility/LaunchAccessibilityActivityPreferenceFragment.java
+++ b/src/com/android/settings/accessibility/LaunchAccessibilityActivityPreferenceFragment.java
@@ -81,7 +81,7 @@
super.onProcessArguments(arguments);
mComponentName = arguments.getParcelable(AccessibilitySettings.EXTRA_COMPONENT_NAME);
final ActivityInfo info = getAccessibilityShortcutInfo().getActivityInfo();
- mPackageName = info.loadLabel(getPackageManager()).toString();
+ mFeatureName = info.loadLabel(getPackageManager());
// Settings animated image.
final int animatedImageRes = arguments.getInt(
diff --git a/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java b/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java
index 5ccea52..b56906e 100644
--- a/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java
@@ -385,8 +385,8 @@
}
// Get Accessibility service name.
- mPackageName = getAccessibilityServiceInfo().getResolveInfo().loadLabel(
- getPackageManager());
+ AccessibilityServiceInfo info = getAccessibilityServiceInfo();
+ mFeatureName = info == null ? "" : info.getResolveInfo().loadLabel(getPackageManager());
if (arguments.containsKey(AccessibilitySettings.EXTRA_TILE_SERVICE_COMPONENT_NAME)) {
final String tileServiceComponentName = arguments.getString(
diff --git a/src/com/android/settings/accessibility/ToggleColorInversionPreferenceFragment.java b/src/com/android/settings/accessibility/ToggleColorInversionPreferenceFragment.java
index 24aae3f..e286225 100644
--- a/src/com/android/settings/accessibility/ToggleColorInversionPreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleColorInversionPreferenceFragment.java
@@ -74,7 +74,7 @@
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
mComponentName = COLOR_INVERSION_COMPONENT_NAME;
- mPackageName = getText(R.string.accessibility_display_inversion_preference_title);
+ mFeatureName = getText(R.string.accessibility_display_inversion_preference_title);
mHtmlDescription = getText(R.string.accessibility_display_inversion_preference_subtitle);
mTopIntroTitle = getText(R.string.accessibility_display_inversion_preference_intro_text);
mImageUri = new Uri.Builder().scheme(ContentResolver.SCHEME_ANDROID_RESOURCE)
diff --git a/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java b/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java
index 747efaa..5b2df5a 100644
--- a/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java
@@ -78,7 +78,7 @@
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
mComponentName = DALTONIZER_COMPONENT_NAME;
- mPackageName = getText(com.android.settingslib.R
+ mFeatureName = getText(com.android.settingslib.R
.string.accessibility_display_daltonizer_preference_title);
mHtmlDescription = getText(com.android.settingslib.R
.string.accessibility_display_daltonizer_preference_subtitle);
diff --git a/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java b/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java
index b7f4602..ae01f5f 100644
--- a/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java
@@ -104,7 +104,7 @@
protected Intent mSettingsIntent;
// The mComponentName maybe null, such as Magnify
protected ComponentName mComponentName;
- protected CharSequence mPackageName;
+ protected CharSequence mFeatureName;
protected Uri mImageUri;
protected CharSequence mHtmlDescription;
protected CharSequence mTopIntroTitle;
@@ -204,12 +204,12 @@
mDialog = AccessibilityShortcutsTutorial
.createAccessibilityTutorialDialogForSetupWizard(
getPrefContext(), getUserPreferredShortcutTypes(),
- this::callOnTutorialDialogButtonClicked, mPackageName);
+ this::callOnTutorialDialogButtonClicked, mFeatureName);
} else {
mDialog = AccessibilityShortcutsTutorial
.createAccessibilityTutorialDialog(
getPrefContext(), getUserPreferredShortcutTypes(),
- this::callOnTutorialDialogButtonClicked, mPackageName);
+ this::callOnTutorialDialogButtonClicked, mFeatureName);
}
mDialog.setCanceledOnTouchOutside(false);
return mDialog;
@@ -318,7 +318,7 @@
protected void updateToggleServiceTitle(SettingsMainSwitchPreference switchPreference) {
final CharSequence title =
- getString(R.string.accessibility_service_primary_switch_title, mPackageName);
+ getString(R.string.accessibility_service_primary_switch_title, mFeatureName);
switchPreference.setTitle(title);
}
@@ -327,7 +327,7 @@
}
protected CharSequence getShortcutTitle() {
- return getString(R.string.accessibility_shortcut_title, mPackageName);
+ return getString(R.string.accessibility_shortcut_title, mFeatureName);
}
protected void onPreferenceToggled(String preferenceKey, boolean enabled) {
@@ -573,7 +573,7 @@
screen.addPreference(mHtmlFooterPreference);
// TODO(b/171272809): Migrate to DashboardFragment.
- final String title = getString(R.string.accessibility_introduction_title, mPackageName);
+ final String title = getString(R.string.accessibility_introduction_title, mFeatureName);
mFooterPreferenceController = new AccessibilityFooterPreferenceController(
screen.getContext(), mHtmlFooterPreference.getKey());
mFooterPreferenceController.setIntroductionTitle(title);
@@ -598,7 +598,7 @@
private void initFooterPreference() {
if (!TextUtils.isEmpty(mDescription)) {
createFooterPreference(getPreferenceScreen(), mDescription,
- getString(R.string.accessibility_introduction_title, mPackageName));
+ getString(R.string.accessibility_introduction_title, mFeatureName));
}
}
diff --git a/src/com/android/settings/accessibility/ToggleReduceBrightColorsPreferenceFragment.java b/src/com/android/settings/accessibility/ToggleReduceBrightColorsPreferenceFragment.java
index ffb8d39..16911f6 100644
--- a/src/com/android/settings/accessibility/ToggleReduceBrightColorsPreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleReduceBrightColorsPreferenceFragment.java
@@ -84,7 +84,7 @@
.appendPath(String.valueOf(R.raw.a11y_extra_dim_banner))
.build();
mComponentName = REDUCE_BRIGHT_COLORS_COMPONENT_NAME;
- mPackageName = getText(R.string.reduce_bright_colors_preference_title);
+ mFeatureName = getText(R.string.reduce_bright_colors_preference_title);
mHtmlDescription = getText(R.string.reduce_bright_colors_preference_subtitle);
mTopIntroTitle = getText(R.string.reduce_bright_colors_preference_intro_text);
mRbcIntensityPreferenceController =
diff --git a/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java b/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java
index f225460..73b31c3 100644
--- a/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java
@@ -112,7 +112,7 @@
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
- mPackageName = getString(R.string.accessibility_screen_magnification_title);
+ mFeatureName = getString(R.string.accessibility_screen_magnification_title);
mImageUri = new Uri.Builder().scheme(ContentResolver.SCHEME_ANDROID_RESOURCE)
.authority(getPrefContext().getPackageName())
.appendPath(String.valueOf(R.raw.a11y_magnification_banner))
diff --git a/src/com/android/settings/accessibility/VolumeShortcutToggleAccessibilityServicePreferenceFragment.java b/src/com/android/settings/accessibility/VolumeShortcutToggleAccessibilityServicePreferenceFragment.java
index 11aa565..b74e5d7 100644
--- a/src/com/android/settings/accessibility/VolumeShortcutToggleAccessibilityServicePreferenceFragment.java
+++ b/src/com/android/settings/accessibility/VolumeShortcutToggleAccessibilityServicePreferenceFragment.java
@@ -55,8 +55,8 @@
final boolean isServiceOn =
getArguments().getBoolean(AccessibilitySettings.EXTRA_CHECKED);
final AccessibilityServiceInfo info = getAccessibilityServiceInfo();
- final boolean hasRequestAccessibilityButtonFlag =
- (info.flags & AccessibilityServiceInfo.FLAG_REQUEST_ACCESSIBILITY_BUTTON) != 0;
+ final boolean hasRequestAccessibilityButtonFlag = info != null
+ && (info.flags & AccessibilityServiceInfo.FLAG_REQUEST_ACCESSIBILITY_BUTTON) != 0;
if (hasRequestAccessibilityButtonFlag && isServiceOn) {
shortcutTypes |= SOFTWARE;
} else {
diff --git a/src/com/android/settings/accessibility/shortcuts/ShortcutOptionPreference.java b/src/com/android/settings/accessibility/shortcuts/ShortcutOptionPreference.java
index 26855d5..7b61d93 100644
--- a/src/com/android/settings/accessibility/shortcuts/ShortcutOptionPreference.java
+++ b/src/com/android/settings/accessibility/shortcuts/ShortcutOptionPreference.java
@@ -35,7 +35,6 @@
import com.android.settingslib.widget.LottieColorUtils;
import com.airbnb.lottie.LottieAnimationView;
-import com.airbnb.lottie.LottieDrawable;
/**
* A preference represents an accessibility shortcut option with a checkbox and a tutorial image
@@ -96,7 +95,8 @@
.getResourceEntryName(mIntroImageRawResId),
result));
imageView.setAnimation(mIntroImageRawResId);
- imageView.setRepeatCount(LottieDrawable.INFINITE);
+ // Follow the Motion Stoppable requirement by using a finite animation.
+ imageView.setRepeatCount(0);
LottieColorUtils.applyDynamicColors(imageView.getContext(), imageView);
imageView.playAnimation();
} else {
diff --git a/src/com/android/settings/connecteddevice/display/DisplayTopology.kt b/src/com/android/settings/connecteddevice/display/DisplayTopology.kt
index 8155902..162d9d2 100644
--- a/src/com/android/settings/connecteddevice/display/DisplayTopology.kt
+++ b/src/com/android/settings/connecteddevice/display/DisplayTopology.kt
@@ -19,9 +19,118 @@
import com.android.settings.R
import android.content.Context
+import android.graphics.Point
+import android.graphics.PointF
+import android.graphics.RectF
import androidx.preference.Preference
+import java.util.Locale
+
+import kotlin.math.max
+import kotlin.math.min
+
+/**
+ * Contains the parameters needed for transforming global display coordinates to and from topology
+ * pane coordinates. This is necessary for implementing an interactive display topology pane. The
+ * pane allows dragging and dropping display blocks into place to define the topology. Conversion to
+ * pane coordinates is necessary when rendering the original topology. Conversion in the other
+ * direction, to display coordinates, is necessary for resolve a drag position to display space.
+ *
+ * The topology pane coordinates are integral and represent the relative position from the upper-
+ * left corner of the pane. It uses a scale optimized for showing all displays with minimal or no
+ * scrolling. The display coordinates are floating point and the origin can be in any position. In
+ * practice the origin will be the upper-left coordinate of the primary display.
+ */
+class TopologyScale(paneWidth : Int, displaysPos : Collection<RectF>) {
+ /** Scale of block sizes to real-world display sizes. Should be less than 1. */
+ val blockRatio : Float
+
+ /** Height of topology pane needed to allow all display blocks to appear with some padding. */
+ val paneHeight : Int
+
+ /** Pane's X view coordinate that corresponds with topology's X=0 coordinate. */
+ val originPaneX : Int
+
+ /** Pane's Y view coordinate that corresponds with topology's Y=0 coordinate. */
+ val originPaneY : Int
+
+ init {
+ val displayBounds = RectF(
+ Float.MAX_VALUE, Float.MAX_VALUE, Float.MIN_VALUE, Float.MIN_VALUE)
+ var smallestDisplayDim = Float.MAX_VALUE
+ var biggestDisplayHeight = Float.MIN_VALUE
+
+ // displayBounds is the smallest rect encompassing all displays, in display space.
+ // smallestDisplayDim is the size of the smallest display edge, in display space.
+ for (pos in displaysPos) {
+ displayBounds.union(pos)
+ smallestDisplayDim = minOf(smallestDisplayDim, pos.height(), pos.width())
+ biggestDisplayHeight = max(biggestDisplayHeight, pos.height())
+ }
+
+ // Set height according to the width and the aspect ratio of the display bounds.
+ // 0.05 is a reasonable limit to the size of display blocks. It appears to match the
+ // ratio used in the ChromeOS topology editor. It prevents blocks from being too large,
+ // which would make dragging and dropping awkward.
+ val rawBlockRatio = min(0.05, paneWidth.toDouble() * 0.6 / displayBounds.width())
+
+ // If the `ratio` is set too low because one of the displays will have an edge less than
+ // 48dp long, increase it such that the smallest edge is that long. This may override the
+ // 0.05 limit since it is more important than it.
+ blockRatio = max(48.0 / smallestDisplayDim, rawBlockRatio).toFloat()
+
+ // Essentially, we just set the pane height based on the pre-determined pane width and the
+ // aspect ratio of the display bounds. But we may need to increase it slightly to achieve
+ // 20% padding above and below the display bounds - this is where the 0.6 comes from.
+ val rawPaneHeight = max(
+ paneWidth.toDouble() / displayBounds.width() * displayBounds.height(),
+ displayBounds.height() * blockRatio / 0.6)
+
+ // It is easy for the aspect ratio to result in an excessively tall pane, since the width is
+ // pre-determined and may be considerably wider than necessary. So we prevent the height
+ // from growing too large here, by limiting vertical padding to the size of the tallest
+ // display. This improves results for very tall display bounds.
+ paneHeight = min(
+ rawPaneHeight.toInt(),
+ (blockRatio * (displayBounds.height() + biggestDisplayHeight * 2f)).toInt())
+
+ // Set originPaneXY (the location of 0,0 in display space in the pane's coordinate system)
+ // such that the display bounds rect is centered in the pane.
+ // It is unlikely that either of these coordinates will be negative since blockRatio has
+ // been chosen to allow 20% padding around each side of the display blocks. However, the
+ // a11y requirement applied above (48.0 / smallestDisplayDim) may cause the blocks to not
+ // fit. This should be rare in practice, and can be worked around by moving the settings UI
+ // to a larger display.
+ val blockMostLeft = (paneWidth - displayBounds.width() * blockRatio) / 2
+ val blockMostTop = (paneHeight - displayBounds.height() * blockRatio) / 2
+
+ originPaneX = (blockMostLeft - displayBounds.left * blockRatio).toInt()
+ originPaneY = (blockMostTop - displayBounds.top * blockRatio).toInt()
+ }
+
+ /** Transforms coordinates in view pane space to display space. */
+ fun paneToDisplayCoor(panePos : Point) : PointF {
+ return PointF(
+ (panePos.x - originPaneX).toFloat() / blockRatio,
+ (panePos.y - originPaneY).toFloat() / blockRatio)
+ }
+
+ /** Transforms coordinates in display space to view pane space. */
+ fun displayToPaneCoor(displayPos : PointF) : Point {
+ return Point(
+ (displayPos.x * blockRatio).toInt() + originPaneX,
+ (displayPos.y * blockRatio).toInt() + originPaneY)
+ }
+
+ override fun toString() : String {
+ return String.format(
+ Locale.ROOT,
+ "{TopoScale blockRatio=%f originPaneXY=%d,%d paneHeight=%d}",
+ blockRatio, originPaneX, originPaneY, paneHeight)
+ }
+}
+
const val PREFERENCE_KEY = "display_topology_preference"
/**
diff --git a/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java b/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java
index 28d7d58..288ec20 100644
--- a/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java
+++ b/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java
@@ -27,13 +27,11 @@
import android.os.Bundle;
import android.os.UserHandle;
import android.util.Log;
-import android.view.View;
import androidx.annotation.VisibleForTesting;
import com.android.settings.R;
import com.android.settings.SettingsActivity;
-import com.android.settings.Utils;
import com.android.settings.applications.appinfo.AppButtonsPreferenceController;
import com.android.settings.applications.appinfo.ButtonActionDialogFragment;
import com.android.settings.core.InstrumentedPreferenceFragment;
@@ -44,12 +42,11 @@
import com.android.settings.fuelgauge.batteryusage.BatteryDiffEntry;
import com.android.settings.fuelgauge.batteryusage.BatteryEntry;
import com.android.settings.overlay.FeatureFactory;
-import com.android.settings.widget.EntityHeaderController;
-import com.android.settingslib.applications.AppUtils;
+import com.android.settingslib.Utils;
import com.android.settingslib.applications.ApplicationsState;
import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.core.instrumentation.Instrumentable;
-import com.android.settingslib.widget.LayoutPreference;
+import com.android.settingslib.widget.IntroPreference;
import java.util.ArrayList;
import java.util.List;
@@ -285,30 +282,26 @@
@VisibleForTesting
void initHeader() {
- final LayoutPreference headerPreference = findPreference(KEY_PREF_HEADER);
- final View appSnippet = headerPreference.findViewById(R.id.entity_header);
+ final IntroPreference introPreference = findPreference(KEY_PREF_HEADER);
+ if (introPreference == null) {
+ return;
+ }
final Activity context = getActivity();
final Bundle bundle = getArguments();
- EntityHeaderController controller =
- EntityHeaderController.newInstance(context, this, appSnippet)
- .setButtonActions(
- EntityHeaderController.ActionType.ACTION_NONE,
- EntityHeaderController.ActionType.ACTION_NONE);
if (mAppEntry == null) {
- controller.setLabel(bundle.getString(EXTRA_LABEL));
+ introPreference.setTitle(bundle.getString(EXTRA_LABEL));
final int iconId = bundle.getInt(EXTRA_ICON_ID, 0);
if (iconId == 0) {
- controller.setIcon(context.getPackageManager().getDefaultActivityIcon());
+ introPreference.setIcon(context.getPackageManager().getDefaultActivityIcon());
} else {
- controller.setIcon(context.getDrawable(bundle.getInt(EXTRA_ICON_ID)));
+ introPreference.setIcon(context.getDrawable(bundle.getInt(EXTRA_ICON_ID)));
}
} else {
mState.ensureIcon(mAppEntry);
- controller.setLabel(mAppEntry);
- controller.setIcon(mAppEntry);
- controller.setIsInstantApp(AppUtils.isInstant(mAppEntry.info));
+ introPreference.setTitle(mAppEntry.label);
+ introPreference.setIcon(Utils.getBadgedIcon(context, mAppEntry.info));
}
if (mPowerUsageTimeController != null) {
@@ -324,7 +317,6 @@
anomalyHintPrefKey,
anomalyHintText);
}
- controller.done(true /* rebindActions */);
}
@Override
diff --git a/src/com/android/settings/fuelgauge/PowerBackgroundUsageDetail.java b/src/com/android/settings/fuelgauge/PowerBackgroundUsageDetail.java
index dadf2e8..90ced96 100644
--- a/src/com/android/settings/fuelgauge/PowerBackgroundUsageDetail.java
+++ b/src/com/android/settings/fuelgauge/PowerBackgroundUsageDetail.java
@@ -25,7 +25,6 @@
import android.os.Bundle;
import android.os.UserHandle;
import android.util.Log;
-import android.view.View;
import androidx.annotation.VisibleForTesting;
@@ -34,13 +33,12 @@
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.fuelgauge.batteryusage.AppOptModeSharedPreferencesUtils;
import com.android.settings.overlay.FeatureFactory;
-import com.android.settings.widget.EntityHeaderController;
import com.android.settingslib.HelpUtils;
-import com.android.settingslib.applications.AppUtils;
+import com.android.settingslib.Utils;
import com.android.settingslib.applications.ApplicationsState;
import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.widget.FooterPreference;
-import com.android.settingslib.widget.LayoutPreference;
+import com.android.settingslib.widget.IntroPreference;
import java.util.ArrayList;
import java.util.List;
@@ -153,36 +151,27 @@
@VisibleForTesting
void initHeader() {
- final LayoutPreference headerPreference = findPreference(KEY_PREF_HEADER);
- if (headerPreference == null) {
+ final IntroPreference introPreference = findPreference(KEY_PREF_HEADER);
+ if (introPreference == null) {
return;
}
- final View appSnippet = headerPreference.findViewById(R.id.entity_header);
final Activity context = getActivity();
final Bundle bundle = getArguments();
- EntityHeaderController controller =
- EntityHeaderController.newInstance(context, this, appSnippet)
- .setButtonActions(
- EntityHeaderController.ActionType.ACTION_NONE,
- EntityHeaderController.ActionType.ACTION_NONE);
if (mAppEntry == null) {
- controller.setLabel(bundle.getString(EXTRA_LABEL));
+ introPreference.setTitle(bundle.getString(EXTRA_LABEL));
final int iconId = bundle.getInt(EXTRA_ICON_ID, 0);
if (iconId == 0) {
- controller.setIcon(context.getPackageManager().getDefaultActivityIcon());
+ introPreference.setIcon(context.getPackageManager().getDefaultActivityIcon());
} else {
- controller.setIcon(context.getDrawable(bundle.getInt(EXTRA_ICON_ID)));
+ introPreference.setIcon(context.getDrawable(bundle.getInt(EXTRA_ICON_ID)));
}
} else {
mState.ensureIcon(mAppEntry);
- controller.setLabel(mAppEntry);
- controller.setIcon(mAppEntry);
- controller.setIsInstantApp(AppUtils.isInstant(mAppEntry.info));
+ introPreference.setTitle(mAppEntry.label);
+ introPreference.setIcon(Utils.getBadgedIcon(context, mAppEntry.info));
}
-
- controller.done(true /* rebindActions */);
}
@VisibleForTesting
diff --git a/src/com/android/settings/gestures/DoubleTapPowerForCameraPreferenceController.java b/src/com/android/settings/gestures/DoubleTapPowerForCameraPreferenceController.java
new file mode 100644
index 0000000..0c7c65a
--- /dev/null
+++ b/src/com/android/settings/gestures/DoubleTapPowerForCameraPreferenceController.java
@@ -0,0 +1,114 @@
+/*
+ * Copyright (C) 2024 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.gestures;
+
+import android.content.Context;
+import android.database.ContentObserver;
+import android.net.Uri;
+import android.os.Handler;
+import android.os.Looper;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
+import com.android.settings.core.BasePreferenceController;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnStart;
+import com.android.settingslib.core.lifecycle.events.OnStop;
+import com.android.settingslib.widget.SelectorWithWidgetPreference;
+
+public class DoubleTapPowerForCameraPreferenceController extends BasePreferenceController
+ implements LifecycleObserver, OnStart, OnStop {
+
+ @Nullable private Preference mPreference;
+ private final ContentObserver mSettingsObserver =
+ new ContentObserver(new Handler(Looper.getMainLooper())) {
+ @Override
+ public void onChange(boolean selfChange, @Nullable Uri uri) {
+ if (mPreference == null || uri == null) {
+ return;
+ }
+ if (uri.equals(
+ DoubleTapPowerSettingsUtils
+ .DOUBLE_TAP_POWER_BUTTON_GESTURE_ENABLED_URI)) {
+ mPreference.setEnabled(
+ DoubleTapPowerSettingsUtils.isDoubleTapPowerButtonGestureEnabled(
+ mContext));
+ } else if (uri.equals(
+ DoubleTapPowerSettingsUtils
+ .DOUBLE_TAP_POWER_BUTTON_GESTURE_TARGET_ACTION_URI)) {
+ updateState(mPreference);
+ }
+ }
+ };
+
+ public DoubleTapPowerForCameraPreferenceController(
+ @NonNull Context context, @NonNull String preferenceKey) {
+ super(context, preferenceKey);
+ }
+
+ @Override
+ public int getAvailabilityStatus() {
+ if (!DoubleTapPowerSettingsUtils.isDoubleTapPowerButtonGestureAvailable(mContext)) {
+ return UNSUPPORTED_ON_DEVICE;
+ }
+ return DoubleTapPowerSettingsUtils.isDoubleTapPowerButtonGestureEnabled(mContext)
+ ? AVAILABLE
+ : DISABLED_DEPENDENT_SETTING;
+ }
+
+ @Override
+ public void displayPreference(@NonNull PreferenceScreen screen) {
+ super.displayPreference(screen);
+ mPreference = screen.findPreference(getPreferenceKey());
+ }
+
+ @Override
+ public void updateState(@NonNull Preference preference) {
+ super.updateState(preference);
+ if (preference instanceof SelectorWithWidgetPreference) {
+ ((SelectorWithWidgetPreference) preference)
+ .setChecked(
+ DoubleTapPowerSettingsUtils
+ .isDoubleTapPowerButtonGestureForCameraLaunchEnabled(mContext));
+ }
+ }
+
+ @Override
+ public boolean handlePreferenceTreeClick(@NonNull Preference preference) {
+ if (!getPreferenceKey().equals(preference.getKey())) {
+ return false;
+ }
+ DoubleTapPowerSettingsUtils.setDoubleTapPowerButtonForCameraLaunch(mContext);
+ if (preference instanceof SelectorWithWidgetPreference) {
+ ((SelectorWithWidgetPreference) preference).setChecked(true);
+ }
+ return true;
+ }
+
+ @Override
+ public void onStart() {
+ DoubleTapPowerSettingsUtils.registerObserver(mContext, mSettingsObserver);
+ }
+
+ @Override
+ public void onStop() {
+ DoubleTapPowerSettingsUtils.unregisterObserver(mContext, mSettingsObserver);
+ }
+}
diff --git a/src/com/android/settings/gestures/DoubleTapPowerForWalletPreferenceController.java b/src/com/android/settings/gestures/DoubleTapPowerForWalletPreferenceController.java
new file mode 100644
index 0000000..56dda4d
--- /dev/null
+++ b/src/com/android/settings/gestures/DoubleTapPowerForWalletPreferenceController.java
@@ -0,0 +1,114 @@
+/*
+ * Copyright (C) 2024 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.gestures;
+
+import android.content.Context;
+import android.database.ContentObserver;
+import android.net.Uri;
+import android.os.Handler;
+import android.os.Looper;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
+import com.android.settings.core.BasePreferenceController;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnStart;
+import com.android.settingslib.core.lifecycle.events.OnStop;
+import com.android.settingslib.widget.SelectorWithWidgetPreference;
+
+public class DoubleTapPowerForWalletPreferenceController extends BasePreferenceController
+ implements LifecycleObserver, OnStart, OnStop {
+
+ @Nullable private Preference mPreference;
+ private final ContentObserver mSettingsObserver =
+ new ContentObserver(new Handler(Looper.getMainLooper())) {
+ @Override
+ public void onChange(boolean selfChange, @Nullable Uri uri) {
+ if (mPreference == null || uri == null) {
+ return;
+ }
+ if (uri.equals(
+ DoubleTapPowerSettingsUtils
+ .DOUBLE_TAP_POWER_BUTTON_GESTURE_ENABLED_URI)) {
+ mPreference.setEnabled(
+ DoubleTapPowerSettingsUtils.isDoubleTapPowerButtonGestureEnabled(
+ mContext));
+ } else if (uri.equals(
+ DoubleTapPowerSettingsUtils
+ .DOUBLE_TAP_POWER_BUTTON_GESTURE_TARGET_ACTION_URI)) {
+ updateState(mPreference);
+ }
+ }
+ };
+
+ public DoubleTapPowerForWalletPreferenceController(
+ @NonNull Context context, @NonNull String preferenceKey) {
+ super(context, preferenceKey);
+ }
+
+ @Override
+ public int getAvailabilityStatus() {
+ if (!DoubleTapPowerSettingsUtils.isDoubleTapPowerButtonGestureAvailable(mContext)) {
+ return UNSUPPORTED_ON_DEVICE;
+ }
+ return DoubleTapPowerSettingsUtils.isDoubleTapPowerButtonGestureEnabled(mContext)
+ ? AVAILABLE
+ : DISABLED_DEPENDENT_SETTING;
+ }
+
+ @Override
+ public void displayPreference(@NonNull PreferenceScreen screen) {
+ super.displayPreference(screen);
+ mPreference = screen.findPreference(getPreferenceKey());
+ }
+
+ @Override
+ public void updateState(@NonNull Preference preference) {
+ super.updateState(preference);
+ if (preference instanceof SelectorWithWidgetPreference) {
+ ((SelectorWithWidgetPreference) preference)
+ .setChecked(
+ !DoubleTapPowerSettingsUtils
+ .isDoubleTapPowerButtonGestureForCameraLaunchEnabled(mContext));
+ }
+ }
+
+ @Override
+ public boolean handlePreferenceTreeClick(@NonNull Preference preference) {
+ if (!getPreferenceKey().equals(preference.getKey())) {
+ return false;
+ }
+ DoubleTapPowerSettingsUtils.setDoubleTapPowerButtonForWalletLaunch(mContext);
+ if (preference instanceof SelectorWithWidgetPreference) {
+ ((SelectorWithWidgetPreference) preference).setChecked(true);
+ }
+ return true;
+ }
+
+ @Override
+ public void onStart() {
+ DoubleTapPowerSettingsUtils.registerObserver(mContext, mSettingsObserver);
+ }
+
+ @Override
+ public void onStop() {
+ DoubleTapPowerSettingsUtils.unregisterObserver(mContext, mSettingsObserver);
+ }
+}
diff --git a/src/com/android/settings/gestures/DoubleTapPowerIllustrationPreferenceController.java b/src/com/android/settings/gestures/DoubleTapPowerIllustrationPreferenceController.java
new file mode 100644
index 0000000..75af168
--- /dev/null
+++ b/src/com/android/settings/gestures/DoubleTapPowerIllustrationPreferenceController.java
@@ -0,0 +1,96 @@
+/*
+ * Copyright (C) 2024 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.gestures;
+
+import static com.android.settings.gestures.DoubleTapPowerSettingsUtils.DOUBLE_TAP_POWER_BUTTON_GESTURE_TARGET_ACTION_URI;
+
+import android.content.ContentResolver;
+import android.content.Context;
+import android.database.ContentObserver;
+import android.net.Uri;
+import android.os.Handler;
+import android.os.Looper;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+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.OnStart;
+import com.android.settingslib.core.lifecycle.events.OnStop;
+import com.android.settingslib.widget.IllustrationPreference;
+
+/** Configures the behaviour of the double tap power illustration. */
+public class DoubleTapPowerIllustrationPreferenceController extends BasePreferenceController
+ implements LifecycleObserver, OnStart, OnStop {
+
+ @Nullable
+ private IllustrationPreference mIllustrationPreference;
+ private final ContentObserver mSettingsObserver =
+ new ContentObserver(new Handler(Looper.getMainLooper())) {
+ @Override
+ public void onChange(boolean selfChange, @Nullable Uri uri) {
+ if (mIllustrationPreference != null && uri != null) {
+ updateState(mIllustrationPreference);
+ }
+ }
+ };
+
+ public DoubleTapPowerIllustrationPreferenceController(
+ @NonNull Context context, @NonNull String key) {
+ super(context, key);
+ }
+
+ @Override
+ public int getAvailabilityStatus() {
+ return AVAILABLE;
+ }
+
+ @Override
+ public void displayPreference(@NonNull PreferenceScreen screen) {
+ super.displayPreference(screen);
+ mIllustrationPreference = screen.findPreference(getPreferenceKey());
+ }
+
+ @Override
+ public void updateState(@NonNull Preference preference) {
+ super.updateState(preference);
+
+ ((IllustrationPreference) preference)
+ .setLottieAnimationResId(
+ DoubleTapPowerSettingsUtils
+ .isDoubleTapPowerButtonGestureForCameraLaunchEnabled(
+ mContext)
+ ? R.drawable.quickly_open_camera
+ : R.drawable.double_tap_power_for_wallet);
+ }
+
+ @Override
+ public void onStart() {
+ final ContentResolver resolver = mContext.getContentResolver();
+ resolver.registerContentObserver(
+ DOUBLE_TAP_POWER_BUTTON_GESTURE_TARGET_ACTION_URI, true, mSettingsObserver);
+ }
+
+ @Override
+ public void onStop() {
+ DoubleTapPowerSettingsUtils.unregisterObserver(mContext, mSettingsObserver);
+ }
+}
diff --git a/src/com/android/settings/gestures/DoubleTapPowerMainSwitchPreferenceController.java b/src/com/android/settings/gestures/DoubleTapPowerMainSwitchPreferenceController.java
new file mode 100644
index 0000000..3eb18eb
--- /dev/null
+++ b/src/com/android/settings/gestures/DoubleTapPowerMainSwitchPreferenceController.java
@@ -0,0 +1,92 @@
+/*
+ * Copyright (C) 2024 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.gestures;
+
+import static com.android.settings.gestures.DoubleTapPowerSettingsUtils.DOUBLE_TAP_POWER_BUTTON_GESTURE_ENABLED_URI;
+
+import android.content.ContentResolver;
+import android.content.Context;
+import android.database.ContentObserver;
+import android.net.Uri;
+import android.os.Handler;
+import android.os.Looper;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.android.settings.R;
+import com.android.settings.widget.SettingsMainSwitchPreferenceController;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnStart;
+import com.android.settingslib.core.lifecycle.events.OnStop;
+
+/** The controller to handle double tap power button main switch enable or disable state. */
+public class DoubleTapPowerMainSwitchPreferenceController
+ extends SettingsMainSwitchPreferenceController
+ implements LifecycleObserver, OnStart, OnStop {
+
+ private final ContentObserver mSettingsObserver =
+ new ContentObserver(new Handler(Looper.getMainLooper())) {
+ @Override
+ public void onChange(boolean selfChange, @Nullable Uri uri) {
+ if (mSwitchPreference == null || uri == null) {
+ return;
+ }
+ updateState(mSwitchPreference);
+ }
+ };
+
+ public DoubleTapPowerMainSwitchPreferenceController(
+ @NonNull Context context, @NonNull String preferenceKey) {
+ super(context, preferenceKey);
+ }
+
+ @Override
+ public int getAvailabilityStatus() {
+ return DoubleTapPowerSettingsUtils.isDoubleTapPowerButtonGestureAvailable(mContext)
+ ? AVAILABLE
+ : UNSUPPORTED_ON_DEVICE;
+ }
+
+ @Override
+ public boolean isChecked() {
+ return DoubleTapPowerSettingsUtils.isDoubleTapPowerButtonGestureEnabled(mContext);
+ }
+
+ @Override
+ public boolean setChecked(boolean isChecked) {
+ return DoubleTapPowerSettingsUtils.setDoubleTapPowerButtonGestureEnabled(
+ mContext, isChecked);
+ }
+
+ @Override
+ public void onStart() {
+ final ContentResolver resolver = mContext.getContentResolver();
+ resolver.registerContentObserver(
+ DOUBLE_TAP_POWER_BUTTON_GESTURE_ENABLED_URI, true, mSettingsObserver);
+ }
+
+ @Override
+ public void onStop() {
+ DoubleTapPowerSettingsUtils.unregisterObserver(mContext, mSettingsObserver);
+ }
+
+ @Override
+ public int getSliceHighlightMenuRes() {
+ return R.string.menu_key_system;
+ }
+}
diff --git a/src/com/android/settings/gestures/DoubleTapPowerPreferenceController.java b/src/com/android/settings/gestures/DoubleTapPowerPreferenceController.java
index 3d2e176..686d64c 100644
--- a/src/com/android/settings/gestures/DoubleTapPowerPreferenceController.java
+++ b/src/com/android/settings/gestures/DoubleTapPowerPreferenceController.java
@@ -21,22 +21,17 @@
import android.content.Context;
import android.content.SharedPreferences;
import android.provider.Settings;
-import android.text.TextUtils;
-import androidx.annotation.VisibleForTesting;
+import androidx.annotation.NonNull;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
-public class DoubleTapPowerPreferenceController extends GesturePreferenceController {
+import com.android.settings.R;
+import com.android.settings.core.BasePreferenceController;
- @VisibleForTesting
- static final int ON = 0;
- @VisibleForTesting
- static final int OFF = 1;
+public class DoubleTapPowerPreferenceController extends BasePreferenceController {
- private static final String PREF_KEY_VIDEO = "gesture_double_tap_power_video";
-
- private final String SECURE_KEY = CAMERA_DOUBLE_TAP_POWER_GESTURE_DISABLED;
-
- public DoubleTapPowerPreferenceController(Context context, String key) {
+ public DoubleTapPowerPreferenceController(@NonNull Context context, @NonNull String key) {
super(context, key);
}
@@ -45,9 +40,13 @@
|| prefs.getBoolean(DoubleTapPowerSettings.PREF_KEY_SUGGESTION_COMPLETE, false);
}
- private static boolean isGestureAvailable(Context context) {
- return context.getResources()
- .getBoolean(com.android.internal.R.bool.config_cameraDoubleTapPowerGestureEnabled);
+ private static boolean isGestureAvailable(@NonNull Context context) {
+ if (!android.service.quickaccesswallet.Flags.launchWalletOptionOnPowerDoubleTap()) {
+ return context.getResources()
+ .getBoolean(
+ com.android.internal.R.bool.config_cameraDoubleTapPowerGestureEnabled);
+ }
+ return DoubleTapPowerSettingsUtils.isDoubleTapPowerButtonGestureAvailable(context);
}
@Override
@@ -56,30 +55,41 @@
}
@Override
- public boolean isSliceable() {
- return TextUtils.equals(getPreferenceKey(), "gesture_double_tap_power");
+ public void displayPreference(@NonNull PreferenceScreen screen) {
+ if (!android.service.quickaccesswallet.Flags.launchWalletOptionOnPowerDoubleTap()) {
+ final Preference preference = screen.findPreference(getPreferenceKey());
+ if (preference != null) {
+ preference.setTitle(R.string.double_tap_power_for_camera_title);
+ }
+ }
+ super.displayPreference(screen);
}
@Override
- public boolean isPublicSlice() {
- return true;
- }
-
- @Override
- protected String getVideoPrefKey() {
- return PREF_KEY_VIDEO;
- }
-
- @Override
- public boolean isChecked() {
- final int cameraDisabled = Settings.Secure.getInt(mContext.getContentResolver(),
- SECURE_KEY, ON);
- return cameraDisabled == ON;
- }
-
- @Override
- public boolean setChecked(boolean isChecked) {
- return Settings.Secure.putInt(mContext.getContentResolver(), SECURE_KEY,
- isChecked ? ON : OFF);
+ @NonNull
+ public CharSequence getSummary() {
+ if (!android.service.quickaccesswallet.Flags.launchWalletOptionOnPowerDoubleTap()) {
+ final boolean isCameraDoubleTapPowerGestureEnabled =
+ Settings.Secure.getInt(
+ mContext.getContentResolver(),
+ CAMERA_DOUBLE_TAP_POWER_GESTURE_DISABLED,
+ DoubleTapPowerToOpenCameraPreferenceController.ON)
+ == DoubleTapPowerToOpenCameraPreferenceController.ON;
+ return mContext.getText(
+ isCameraDoubleTapPowerGestureEnabled
+ ? R.string.gesture_setting_on
+ : R.string.gesture_setting_off);
+ }
+ if (DoubleTapPowerSettingsUtils.isDoubleTapPowerButtonGestureEnabled(mContext)) {
+ final CharSequence onString =
+ mContext.getText(com.android.settings.R.string.gesture_setting_on);
+ final CharSequence actionString =
+ DoubleTapPowerSettingsUtils.isDoubleTapPowerButtonGestureForCameraLaunchEnabled(
+ mContext)
+ ? mContext.getText(R.string.double_tap_power_camera_action_summary)
+ : mContext.getText(R.string.double_tap_power_wallet_action_summary);
+ return mContext.getString(R.string.double_tap_power_summary, onString, actionString);
+ }
+ return mContext.getText(com.android.settings.R.string.gesture_setting_off);
}
}
diff --git a/src/com/android/settings/gestures/DoubleTapPowerSettings.java b/src/com/android/settings/gestures/DoubleTapPowerSettings.java
index 577758d..076f23f 100644
--- a/src/com/android/settings/gestures/DoubleTapPowerSettings.java
+++ b/src/com/android/settings/gestures/DoubleTapPowerSettings.java
@@ -19,6 +19,9 @@
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.content.SharedPreferences;
+import android.provider.SearchIndexableResource;
+
+import androidx.annotation.NonNull;
import com.android.settings.R;
import com.android.settings.dashboard.DashboardFragment;
@@ -27,6 +30,8 @@
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settingslib.search.SearchIndexable;
+import java.util.List;
+
@SearchIndexable
public class DoubleTapPowerSettings extends DashboardFragment {
@@ -56,9 +61,24 @@
@Override
protected int getPreferenceScreenResId() {
- return R.xml.double_tap_power_settings;
+ return android.service.quickaccesswallet.Flags.launchWalletOptionOnPowerDoubleTap()
+ ? R.xml.double_tap_power_settings
+ : R.xml.double_tap_power_to_open_camera_settings;
}
public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
- new BaseSearchIndexProvider(R.xml.double_tap_power_settings);
+ new BaseSearchIndexProvider() {
+ @Override
+ @NonNull
+ public List<SearchIndexableResource> getXmlResourcesToIndex(
+ @NonNull Context context, boolean enabled) {
+ final SearchIndexableResource sir = new SearchIndexableResource(context);
+ sir.xmlResId =
+ android.service.quickaccesswallet.Flags
+ .launchWalletOptionOnPowerDoubleTap()
+ ? R.xml.double_tap_power_settings
+ : R.xml.double_tap_power_to_open_camera_settings;
+ return List.of(sir);
+ }
+ };
}
diff --git a/src/com/android/settings/gestures/DoubleTapPowerSettingsUtils.java b/src/com/android/settings/gestures/DoubleTapPowerSettingsUtils.java
new file mode 100644
index 0000000..a1bf9cb
--- /dev/null
+++ b/src/com/android/settings/gestures/DoubleTapPowerSettingsUtils.java
@@ -0,0 +1,149 @@
+/*
+ * 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.gestures;
+
+import android.content.ContentResolver;
+import android.content.Context;
+import android.database.ContentObserver;
+import android.net.Uri;
+import android.provider.Settings;
+
+import androidx.annotation.NonNull;
+
+import com.android.internal.R;
+
+/** Common code for double tap power settings shared between controllers. */
+final class DoubleTapPowerSettingsUtils {
+
+ /** Setting storing whether the double tap power button gesture is enabled. */
+ private static final String DOUBLE_TAP_POWER_BUTTON_GESTURE_ENABLED =
+ Settings.Secure.DOUBLE_TAP_POWER_BUTTON_GESTURE_ENABLED;
+
+ static final Uri DOUBLE_TAP_POWER_BUTTON_GESTURE_ENABLED_URI =
+ Settings.Secure.getUriFor(DOUBLE_TAP_POWER_BUTTON_GESTURE_ENABLED);
+
+ /** Setting storing the target action of the double tap power button gesture. */
+ private static final String DOUBLE_TAP_POWER_BUTTON_GESTURE_TARGET_ACTION =
+ Settings.Secure.DOUBLE_TAP_POWER_BUTTON_GESTURE;
+
+ static final Uri DOUBLE_TAP_POWER_BUTTON_GESTURE_TARGET_ACTION_URI =
+ Settings.Secure.getUriFor(DOUBLE_TAP_POWER_BUTTON_GESTURE_TARGET_ACTION);
+
+ private static final int DOUBLE_TAP_POWER_BUTTON_CAMERA_LAUNCH_VALUE = 0;
+ private static final int DOUBLE_TAP_POWER_BUTTON_WALLET_LAUNCH_VALUE = 1;
+
+ static final int ON = 1;
+ static final int OFF = 0;
+
+ /**
+ * @return true if double tap power button gesture is available.
+ */
+ public static boolean isDoubleTapPowerButtonGestureAvailable(@NonNull Context context) {
+ return context.getResources().getBoolean(R.bool.config_doubleTapPowerGestureEnabled);
+ }
+
+ /**
+ * Gets double tap power button gesture enable or disable flag from Settings provider.
+ *
+ * @return true if double tap on the power button gesture is currently enabled.
+ * @param context App context
+ */
+ public static boolean isDoubleTapPowerButtonGestureEnabled(@NonNull Context context) {
+ return Settings.Secure.getInt(
+ context.getContentResolver(), DOUBLE_TAP_POWER_BUTTON_GESTURE_ENABLED, ON)
+ == ON;
+ }
+
+ /**
+ * Sets double tap power button gesture enable or disable flag to Settings provider.
+ *
+ * @param context App context
+ * @param enable enable or disable double tap power button gesture.
+ * @return {@code true} if the setting is updated.
+ */
+ public static boolean setDoubleTapPowerButtonGestureEnabled(
+ @NonNull Context context, boolean enable) {
+ return Settings.Secure.putInt(
+ context.getContentResolver(),
+ DOUBLE_TAP_POWER_BUTTON_GESTURE_ENABLED,
+ enable ? ON : OFF);
+ }
+
+ /**
+ * @return true if double tap on the power button gesture for camera launch is currently
+ * enabled.
+ * @param context App context
+ */
+ public static boolean isDoubleTapPowerButtonGestureForCameraLaunchEnabled(
+ @NonNull Context context) {
+ return Settings.Secure.getInt(
+ context.getContentResolver(),
+ DOUBLE_TAP_POWER_BUTTON_GESTURE_TARGET_ACTION,
+ context.getResources()
+ .getInteger(
+ com.android.internal.R.integer
+ .config_defaultDoubleTapPowerGestureAction))
+ == DOUBLE_TAP_POWER_BUTTON_CAMERA_LAUNCH_VALUE;
+ }
+
+ /**
+ * Sets double tap power button gesture behavior to launch the camera.
+ *
+ * @param context App context
+ * @return {@code true} if the setting is updated.
+ */
+ public static boolean setDoubleTapPowerButtonForCameraLaunch(@NonNull Context context) {
+ return Settings.Secure.putInt(
+ context.getContentResolver(),
+ DOUBLE_TAP_POWER_BUTTON_GESTURE_TARGET_ACTION,
+ DOUBLE_TAP_POWER_BUTTON_CAMERA_LAUNCH_VALUE);
+ }
+
+ /**
+ * Sets double tap power button gesture behavior to launch the wallet.
+ *
+ * @param context App context
+ * @return {@code true} if the setting is updated.
+ */
+ public static boolean setDoubleTapPowerButtonForWalletLaunch(@NonNull Context context) {
+ return Settings.Secure.putInt(
+ context.getContentResolver(),
+ DOUBLE_TAP_POWER_BUTTON_GESTURE_TARGET_ACTION,
+ DOUBLE_TAP_POWER_BUTTON_WALLET_LAUNCH_VALUE);
+ }
+
+ /**
+ * Registers observer for settings state.
+ *
+ * @param observer Settings Content Observer
+ */
+ public static void registerObserver(
+ @NonNull Context context, @NonNull ContentObserver observer) {
+ final ContentResolver resolver = context.getContentResolver();
+ resolver.registerContentObserver(
+ DOUBLE_TAP_POWER_BUTTON_GESTURE_ENABLED_URI, true, observer);
+ resolver.registerContentObserver(
+ DOUBLE_TAP_POWER_BUTTON_GESTURE_TARGET_ACTION_URI, true, observer);
+ }
+
+ /** Unregisters observer. */
+ public static void unregisterObserver(
+ @NonNull Context context, @NonNull ContentObserver observer) {
+ final ContentResolver resolver = context.getContentResolver();
+ resolver.unregisterContentObserver(observer);
+ }
+}
diff --git a/src/com/android/settings/gestures/DoubleTapPowerToOpenCameraPreferenceController.java b/src/com/android/settings/gestures/DoubleTapPowerToOpenCameraPreferenceController.java
new file mode 100644
index 0000000..4362a66
--- /dev/null
+++ b/src/com/android/settings/gestures/DoubleTapPowerToOpenCameraPreferenceController.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright (C) 2024 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.gestures;
+
+import static android.provider.Settings.Secure.CAMERA_DOUBLE_TAP_POWER_GESTURE_DISABLED;
+
+import android.content.Context;
+import android.provider.Settings;
+import android.text.TextUtils;
+
+import androidx.annotation.NonNull;
+
+import com.android.settings.R;
+import com.android.settings.core.TogglePreferenceController;
+
+public class DoubleTapPowerToOpenCameraPreferenceController extends TogglePreferenceController {
+
+ static final int ON = 0;
+ static final int OFF = 1;
+
+ public DoubleTapPowerToOpenCameraPreferenceController(
+ @NonNull Context context, @NonNull String key) {
+ super(context, key);
+ }
+
+ @Override
+ public int getAvailabilityStatus() {
+ return mContext.getResources()
+ .getBoolean(
+ com.android.internal.R.bool
+ .config_cameraDoubleTapPowerGestureEnabled)
+ ? AVAILABLE
+ : UNSUPPORTED_ON_DEVICE;
+ }
+
+ @Override
+ public boolean isChecked() {
+ return Settings.Secure.getInt(
+ mContext.getContentResolver(), CAMERA_DOUBLE_TAP_POWER_GESTURE_DISABLED, ON)
+ == ON;
+ }
+
+ @Override
+ public boolean setChecked(boolean isChecked) {
+ return Settings.Secure.putInt(
+ mContext.getContentResolver(),
+ CAMERA_DOUBLE_TAP_POWER_GESTURE_DISABLED,
+ isChecked ? ON : OFF);
+ }
+
+ @Override
+ public boolean isSliceable() {
+ return TextUtils.equals(getPreferenceKey(), "gesture_double_tap_power");
+ }
+
+ @Override
+ public boolean isPublicSlice() {
+ return true;
+ }
+
+ @Override
+ public int getSliceHighlightMenuRes() {
+ return R.string.menu_key_system;
+ }
+}
diff --git a/src/com/android/settings/network/SimOnboardingActivity.kt b/src/com/android/settings/network/SimOnboardingActivity.kt
index 8d8fcba..6d9800b 100644
--- a/src/com/android/settings/network/SimOnboardingActivity.kt
+++ b/src/com/android/settings/network/SimOnboardingActivity.kt
@@ -109,6 +109,12 @@
}
var targetSubId = intent.getIntExtra(SUB_ID,SubscriptionManager.INVALID_SUBSCRIPTION_ID)
+ if (targetSubId == SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
+ targetSubId = intent.getIntExtra(
+ Settings.EXTRA_SUB_ID,
+ SubscriptionManager.INVALID_SUBSCRIPTION_ID
+ )
+ }
initServiceData(this, targetSubId, callbackListener)
if (!onboardingService.isUsableTargetSubscriptionId) {
Log.e(TAG, "The subscription id is not usable.")
@@ -608,4 +614,4 @@
CALLBACK_FINISH(5)
}
}
-}
\ No newline at end of file
+}
diff --git a/src/com/android/settings/sim/SimSelectNotification.java b/src/com/android/settings/sim/SimSelectNotification.java
index 3d9d41c..44fd43f 100644
--- a/src/com/android/settings/sim/SimSelectNotification.java
+++ b/src/com/android/settings/sim/SimSelectNotification.java
@@ -42,6 +42,7 @@
import android.content.Context;
import android.content.Intent;
import android.content.res.Resources;
+import android.os.UserManager;
import android.provider.Settings;
import android.telephony.SubscriptionInfo;
import android.telephony.SubscriptionManager;
@@ -91,6 +92,11 @@
@Override
public void onReceive(Context context, Intent intent) {
+ UserManager userManager = context.getSystemService(UserManager.class);
+ if (userManager != null && !userManager.isMainUser()) {
+ Log.d(TAG, "The userId is not the main user");
+ return;
+ }
if (!SubscriptionUtil.isSimHardwareVisible(context)) {
Log.w(TAG, "Received unexpected intent with null action.");
return;
diff --git a/src/com/android/settings/wifi/WifiSwitchPreference.kt b/src/com/android/settings/wifi/WifiSwitchPreference.kt
index 72bee59..2a18d3f 100644
--- a/src/com/android/settings/wifi/WifiSwitchPreference.kt
+++ b/src/com/android/settings/wifi/WifiSwitchPreference.kt
@@ -16,22 +16,31 @@
package com.android.settings.wifi
+import android.content.BroadcastReceiver
import android.content.Context
+import android.content.Intent
+import android.content.IntentFilter
import android.net.wifi.WifiManager
import android.os.UserManager
import android.provider.Settings
import android.util.Log
+import android.widget.Toast
import androidx.preference.Preference
+import androidx.preference.Preference.OnPreferenceChangeListener
import com.android.settings.PreferenceRestrictionMixin
import com.android.settings.R
import com.android.settings.network.SatelliteRepository
-import com.android.settings.overlay.FeatureFactory.Companion.featureFactory
-import com.android.settings.widget.GenericSwitchController
+import com.android.settings.network.SatelliteWarningDialogActivity
import com.android.settingslib.RestrictedSwitchPreference
import com.android.settingslib.WirelessUtils
+import com.android.settingslib.datastore.AbstractKeyedDataObservable
+import com.android.settingslib.datastore.DataChangeReason
import com.android.settingslib.datastore.KeyValueStore
-import com.android.settingslib.datastore.NoOpKeyedObservable
-import com.android.settingslib.metadata.*
+import com.android.settingslib.metadata.PreferenceLifecycleProvider
+import com.android.settingslib.metadata.PreferenceMetadata
+import com.android.settingslib.metadata.ReadWritePermit
+import com.android.settingslib.metadata.SensitivityLevel
+import com.android.settingslib.metadata.SwitchPreference
import com.android.settingslib.preference.SwitchPreferenceBinding
import java.util.concurrent.Executors
import java.util.concurrent.TimeUnit
@@ -40,12 +49,10 @@
class WifiSwitchPreference :
SwitchPreference(KEY, R.string.wifi),
SwitchPreferenceBinding,
+ OnPreferenceChangeListener,
PreferenceLifecycleProvider,
PreferenceRestrictionMixin {
- // TODO(b/372733639) Remove WifiEnabler and migrate to catalyst
- private var wifiEnabler: WifiEnabler? = null
-
override val keywords: Int
get() = R.string.keywords_wifi
@@ -57,21 +64,57 @@
override val useAdminDisabledSummary: Boolean
get() = true
+ override fun createWidget(context: Context) = RestrictedSwitchPreference(context)
+
+ override fun bind(preference: Preference, metadata: PreferenceMetadata) {
+ super.bind(preference, metadata)
+ preference.onPreferenceChangeListener = this
+ }
+
+ override fun onPreferenceChange(preference: Preference, newValue: Any): Boolean {
+ val context = preference.context
+
+ // Show dialog and do nothing under satellite mode.
+ if (context.isSatelliteOn()) {
+ context.startActivity(
+ Intent(context, SatelliteWarningDialogActivity::class.java)
+ .putExtra(
+ SatelliteWarningDialogActivity.EXTRA_TYPE_OF_SATELLITE_WARNING_DIALOG,
+ SatelliteWarningDialogActivity.TYPE_IS_WIFI,
+ )
+ )
+ return false
+ }
+
+ // Show toast message if Wi-Fi is not allowed in airplane mode
+ if (newValue == true && !context.isRadioAllowed()) {
+ Toast.makeText(context, R.string.wifi_in_airplane_mode, Toast.LENGTH_SHORT).show()
+ return false
+ }
+
+ return true
+ }
+
override fun getReadPermit(context: Context, myUid: Int, callingUid: Int) =
ReadWritePermit.ALLOW
override fun getWritePermit(context: Context, value: Boolean?, myUid: Int, callingUid: Int) =
when {
- isRadioAllowed(context, value) && !isSatelliteOn(context) -> ReadWritePermit.ALLOW
- else -> ReadWritePermit.DISALLOW
+ (value == true && !context.isRadioAllowed()) || context.isSatelliteOn() ->
+ ReadWritePermit.DISALLOW
+ else -> ReadWritePermit.ALLOW
}
+ override val sensitivityLevel
+ get() = SensitivityLevel.LOW_SENSITIVITY
+
override fun storage(context: Context): KeyValueStore = WifiSwitchStore(context)
@Suppress("UNCHECKED_CAST")
private class WifiSwitchStore(private val context: Context) :
- NoOpKeyedObservable<String>(),
- KeyValueStore {
+ AbstractKeyedDataObservable<String>(), KeyValueStore {
+
+ private var broadcastReceiver: BroadcastReceiver? = null
override fun contains(key: String) =
key == KEY && context.getSystemService(WifiManager::class.java) != null
@@ -85,60 +128,51 @@
context.getSystemService(WifiManager::class.java)?.isWifiEnabled = value
}
}
- }
- override fun onCreate(context: PreferenceLifecycleContext) {
- context.requirePreference<RestrictedSwitchPreference>(KEY).let {
- it.onPreferenceChangeListener =
- Preference.OnPreferenceChangeListener { _: Preference, newValue: Any ->
- if (!isRadioAllowed(context, newValue as Boolean?)) {
- Log.w(TAG, "Don't set APM, AIRPLANE_MODE_RADIOS is not allowed")
- return@OnPreferenceChangeListener false
+ override fun onFirstObserverAdded() {
+ broadcastReceiver =
+ object : BroadcastReceiver() {
+ override fun onReceive(context: Context, intent: Intent) {
+ val wifiState = intent.wifiState
+ // do not notify for enabling/disabling state
+ if (
+ wifiState == WifiManager.WIFI_STATE_ENABLED ||
+ wifiState == WifiManager.WIFI_STATE_DISABLED
+ ) {
+ notifyChange(KEY, DataChangeReason.UPDATE)
+ }
}
- if (isSatelliteOn(context)) {
- Log.w(TAG, "Don't set APM, the satellite is on")
- return@OnPreferenceChangeListener false
- }
- return@OnPreferenceChangeListener true
}
- val widget = GenericSwitchController(it)
- wifiEnabler = WifiEnabler(context, widget, featureFactory.metricsFeatureProvider)
- Log.i(TAG, "Create WifiEnabler:$wifiEnabler")
+ context.registerReceiver(
+ broadcastReceiver,
+ IntentFilter(WifiManager.WIFI_STATE_CHANGED_ACTION),
+ )
}
- }
- override fun onResume(context: PreferenceLifecycleContext) {
- wifiEnabler?.resume(context)
- }
-
- override fun onPause(context: PreferenceLifecycleContext) {
- wifiEnabler?.pause()
- }
-
- override fun onDestroy(context: PreferenceLifecycleContext) {
- wifiEnabler?.teardownSwitchController()
- wifiEnabler = null
- }
-
- private fun isRadioAllowed(context: Context, newValue: Boolean?): Boolean {
- newValue?.let { if (!it) return true } ?: return false
- return WirelessUtils.isRadioAllowed(context, Settings.Global.RADIO_WIFI)
- }
-
- private fun isSatelliteOn(context: Context): Boolean {
- try {
- return SatelliteRepository(context)
- .requestIsSessionStarted(Executors.newSingleThreadExecutor())
- .get(2000, TimeUnit.MILLISECONDS)
- } catch (e: Exception) {
- Log.e(TAG, "Error to get satellite status : $e")
+ override fun onLastObserverRemoved() {
+ broadcastReceiver?.let { context.unregisterReceiver(it) }
}
- return false
}
companion object {
const val TAG = "WifiSwitchPreference"
const val KEY = "main_toggle_wifi"
+
+ private fun Context.isRadioAllowed() =
+ WirelessUtils.isRadioAllowed(this, Settings.Global.RADIO_WIFI)
+
+ private fun Context.isSatelliteOn() =
+ try {
+ SatelliteRepository(this)
+ .requestIsSessionStarted(Executors.newSingleThreadExecutor())
+ .get(2000, TimeUnit.MILLISECONDS)
+ } catch (e: Exception) {
+ Log.e(TAG, "Error to get satellite status : $e")
+ false
+ }
+
+ private val Intent.wifiState
+ get() = getIntExtra(WifiManager.EXTRA_WIFI_STATE, WifiManager.WIFI_STATE_UNKNOWN)
}
}
// LINT.ThenChange(WifiSwitchPreferenceController.java)
diff --git a/tests/robotests/src/com/android/settings/TestingSettingsBroadcastReceiverTest.java b/tests/robotests/src/com/android/settings/TestingSettingsBroadcastReceiverTest.java
index 10fdffb..eb51ae8 100644
--- a/tests/robotests/src/com/android/settings/TestingSettingsBroadcastReceiverTest.java
+++ b/tests/robotests/src/com/android/settings/TestingSettingsBroadcastReceiverTest.java
@@ -18,9 +18,13 @@
import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+
import android.app.Application;
import android.content.Context;
import android.content.Intent;
+import android.content.res.Resources;
import android.telephony.TelephonyManager;
import org.junit.Before;
@@ -29,6 +33,7 @@
import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.Shadows;
+import org.robolectric.shadows.ShadowBuild;
@RunWith(RobolectricTestRunner.class)
public class TestingSettingsBroadcastReceiverTest {
@@ -78,4 +83,68 @@
final String dest = next.getComponent().getClassName();
assertThat(dest).isEqualTo(Settings.TestingSettingsActivity.class.getName());
}
+
+ @Test
+ public void onReceive_disabledForUserBuild_BuildType_User_shouldNotStartActivity() {
+ // TestingSettingsMenu should be disabled if current Build.TYPE is "user" and
+ // 'config_hide_testing_settings_menu_for_user_builds' is true
+ ShadowBuild.setType("user");
+
+ mContext = spy(RuntimeEnvironment.application);
+ setUpConfig(mContext, true /*disable for user build*/);
+
+ final Intent intent = new Intent();
+ intent.setAction(TelephonyManager.ACTION_SECRET_CODE);
+
+ mReceiver.onReceive(mContext, intent);
+
+ final Intent next = Shadows.shadowOf(mApplication).getNextStartedActivity();
+ assertThat(next).isNull();
+ }
+
+ @Test
+ public void onReceive_disabledForUserBuild_BuildType_Userdebug_shouldStartActivity() {
+ // TestingSettingsMenu should not be disabled if current Build.TYPE is "userdebug" and
+ // 'config_hide_testing_settings_menu_for_user_builds' is true
+ ShadowBuild.setType("userdebug");
+
+ mContext = spy(RuntimeEnvironment.application);
+ setUpConfig(mContext, true /*disable for user build*/);
+
+ final Intent intent = new Intent();
+ intent.setAction(TelephonyManager.ACTION_SECRET_CODE);
+
+ mReceiver.onReceive(mContext, intent);
+
+ final Intent next = Shadows.shadowOf(mApplication).getNextStartedActivity();
+ assertThat(next).isNotNull();
+ final String dest = next.getComponent().getClassName();
+ assertThat(dest).isEqualTo(Settings.TestingSettingsActivity.class.getName());
+ }
+
+ @Test
+ public void onReceive_notDisabledForUserBuildType_shouldStartActivity() {
+ // TestingSettingsMenu should not be disabled if
+ // 'config_hide_testing_settings_menu_for_user_builds' is false, regardless of Build.TYPE
+ mContext = spy(RuntimeEnvironment.application);
+ setUpConfig(mContext, false /*disable for user build*/);
+
+ final Intent intent = new Intent();
+ intent.setAction(TelephonyManager.ACTION_SECRET_CODE);
+
+ mReceiver.onReceive(mContext, intent);
+
+ final Intent next = Shadows.shadowOf(mApplication).getNextStartedActivity();
+ assertThat(next).isNotNull();
+ final String dest = next.getComponent().getClassName();
+ assertThat(dest).isEqualTo(Settings.TestingSettingsActivity.class.getName());
+ }
+
+ private static void setUpConfig(Context context, boolean disabledForUserBuild) {
+ when(context.getApplicationContext()).thenReturn(context);
+ Resources spiedResources = spy(context.getResources());
+ when(context.getResources()).thenReturn(spiedResources);
+ when(spiedResources.getBoolean(R.bool.config_hide_testing_settings_menu_for_user_builds))
+ .thenReturn(disabledForUserBuild);
+ }
}
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/display/TopologyScaleTest.kt b/tests/robotests/src/com/android/settings/connecteddevice/display/TopologyScaleTest.kt
new file mode 100644
index 0000000..0784362
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/connecteddevice/display/TopologyScaleTest.kt
@@ -0,0 +1,97 @@
+/*
+ * Copyright (C) 2024 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.display
+
+import android.graphics.Point
+import android.graphics.PointF
+import android.graphics.RectF
+import org.junit.Assert.assertEquals
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+
+fun assertPointF(x: Float, y: Float, delta: Float, actual: PointF) {
+ assertEquals(x, actual.x, delta)
+ assertEquals(y, actual.y, delta)
+}
+
+@RunWith(RobolectricTestRunner::class)
+class TopologyScaleTest {
+ @Test
+ fun oneDisplay4to3Aspect() {
+ val scale = TopologyScale(
+ /* paneWidth= */ 640,
+ listOf(RectF(0f, 0f, 640f, 480f)))
+
+ // blockRatio is higher than 0.05 in order to make the smallest display edge (480 dp) 48dp
+ // in the pane.
+ assertEquals(
+ "{TopoScale blockRatio=0.100000 originPaneXY=288,48 paneHeight=144}", "" + scale)
+
+ assertEquals(Point(352, 96), scale.displayToPaneCoor(PointF(640f, 480f)))
+ assertEquals(Point(320, 72), scale.displayToPaneCoor(PointF(320f, 240f)))
+ assertEquals(PointF(640f, 480f), scale.paneToDisplayCoor(Point(352, 96)))
+ }
+
+ @Test
+ fun twoUnalignedDisplays() {
+ val scale = TopologyScale(
+ /* paneWidth= */ 300,
+ listOf(RectF(0f, 0f, 1920f, 1200f), RectF(1920f, -300f, 3840f, 900f)))
+
+ assertEquals(
+ "{TopoScale blockRatio=0.046875 originPaneXY=60,37 paneHeight=117}", "" + scale)
+
+ assertEquals(Point(78, 55), scale.displayToPaneCoor(PointF(400f, 400f)))
+ assertEquals(Point(42, 37), scale.displayToPaneCoor(PointF(-400f, 0f)))
+ assertPointF(-384f, 106.6666f, 0.001f, scale.paneToDisplayCoor(Point(42, 42)))
+ }
+
+ @Test
+ fun twoDisplaysBlockRatioBumpedForGarSizeMinimumHorizontal() {
+ val scale = TopologyScale(
+ /* paneWidth= */ 192,
+ listOf(RectF(0f, 0f, 240f, 320f), RectF(-240f, -320f, 0f, 0f)))
+
+ // blockRatio is higher than 0.05 in order to make the smallest display edge (240 dp) 48dp
+ // in the pane.
+ assertEquals(
+ "{TopoScale blockRatio=0.200000 originPaneXY=96,128 paneHeight=256}", "" + scale)
+
+ assertEquals(Point(192, 256), scale.displayToPaneCoor(PointF(480f, 640f)))
+ assertEquals(Point(96, 64), scale.displayToPaneCoor(PointF(0f, -320f)))
+ assertPointF(220f, -430f, 0.001f, scale.paneToDisplayCoor(Point(140, 42)))
+ }
+
+ @Test
+ fun paneVerticalPaddingLimitedByTallestDisplay() {
+ val scale = TopologyScale(
+ /* paneWidth= */ 300,
+ listOf(
+ RectF(0f, 0f, 640f, 480f),
+ RectF(0f, 480f, 640f, 960f),
+ RectF(0f, 960f, 640f, 1440f),
+ RectF(0f, 1440f, 640f, 1920f),
+ RectF(0f, 1920f, 640f, 2400f),
+ RectF(0f, 2400f, 640f, 2880f)))
+
+ assertEquals(
+ "{TopoScale blockRatio=0.100000 originPaneXY=118,48 paneHeight=384}", "" + scale)
+ assertEquals(Point(150, 48), scale.displayToPaneCoor(PointF(320f, 0f)))
+ assertPointF(-180f, 2880f, 0.001f, scale.paneToDisplayCoor(Point(100, 336)))
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java b/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java
index f3848b3..139a15f 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java
@@ -25,6 +25,7 @@
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.ArgumentMatchers.nullable;
import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.doNothing;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
@@ -39,6 +40,7 @@
import android.content.pm.ApplicationInfo;
import android.content.pm.InstallSourceInfo;
import android.content.pm.PackageManager;
+import android.graphics.drawable.ColorDrawable;
import android.graphics.drawable.Drawable;
import android.os.Bundle;
import android.os.UserHandle;
@@ -55,12 +57,12 @@
import com.android.settings.fuelgauge.batteryusage.ConvertUtils;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.shadow.ShadowEntityHeaderController;
-import com.android.settings.widget.EntityHeaderController;
+import com.android.settingslib.Utils;
import com.android.settingslib.applications.AppUtils;
import com.android.settingslib.applications.ApplicationsState;
import com.android.settingslib.applications.instantapps.InstantAppDataProvider;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
-import com.android.settingslib.widget.LayoutPreference;
+import com.android.settingslib.widget.IntroPreference;
import org.junit.After;
import org.junit.Before;
@@ -75,6 +77,8 @@
import org.mockito.stubbing.Answer;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.annotation.Config;
+import org.robolectric.annotation.Implementation;
+import org.robolectric.annotation.Implements;
import org.robolectric.util.ReflectionHelpers;
import java.util.concurrent.TimeUnit;
@@ -82,7 +86,6 @@
@RunWith(RobolectricTestRunner.class)
@Config(
shadows = {
- ShadowEntityHeaderController.class,
com.android.settings.testutils.shadow.ShadowFragment.class,
})
public class AdvancedPowerUsageDetailTest {
@@ -90,6 +93,7 @@
@Rule public final MockitoRule mMockitoRule = MockitoJUnit.rule();
private static final String APP_LABEL = "app label";
+ private static final String APP_ENTRY_LABEL = "app entry label";
private static final String SUMMARY = "summary";
private static final String PACKAGE_NAME = "com.android.app";
private static final String INITIATING_PACKAGE_NAME = "com.android.vending";
@@ -100,17 +104,16 @@
private static final long FOREGROUND_SERVICE_TIME_MS = 123;
private static final long BACKGROUND_TIME_MS = 100;
private static final long SCREEN_ON_TIME_MS = 321;
+ private static final Drawable TEST_DRAWABLE = new ColorDrawable(0);
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
private FragmentActivity mActivity;
- @Mock private EntityHeaderController mEntityHeaderController;
@Mock private ApplicationsState mState;
@Mock private ApplicationsState.AppEntry mAppEntry;
@Mock private BatteryEntry mBatteryEntry;
@Mock private PackageManager mPackageManager;
@Mock private InstallSourceInfo mInstallSourceInfo;
- @Mock private LayoutPreference mLayoutPreference;
@Mock private AppOpsManager mAppOpsManager;
@Mock private LoaderManager mLoaderManager;
@@ -123,6 +126,15 @@
private BatteryDiffEntry mBatteryDiffEntry;
private Bundle mBundle;
private BatteryOptimizeUtils mBatteryOptimizeUtils;
+ private IntroPreference mIntroPreference;
+
+ @Implements(Utils.class)
+ private static class ShadowUtils {
+ @Implementation
+ public static Drawable getBadgedIcon(Context context, ApplicationInfo appInfo) {
+ return AdvancedPowerUsageDetailTest.TEST_DRAWABLE;
+ }
+ }
@Before
public void setUp() throws Exception {
@@ -136,7 +148,8 @@
prepareTestBatteryOptimizationUtils();
mFragment = spy(new AdvancedPowerUsageDetail());
mFragment.mBatteryOptimizeUtils = mBatteryOptimizeUtils;
- doReturn(mLayoutPreference).when(mFragment).findPreference(any());
+ mIntroPreference = new IntroPreference(mContext);
+ doReturn(mIntroPreference).when(mFragment).findPreference(any());
mBundle = spy(new Bundle());
doReturn(mContext).when(mFragment).getContext();
doReturn(mActivity).when(mFragment).getActivity();
@@ -145,29 +158,6 @@
when(mFragment.getArguments()).thenReturn(mBundle);
doReturn(mLoaderManager).when(mFragment).getLoaderManager();
- ShadowEntityHeaderController.setUseMock(mEntityHeaderController);
- doReturn(mEntityHeaderController)
- .when(mEntityHeaderController)
- .setButtonActions(anyInt(), anyInt());
- doReturn(mEntityHeaderController)
- .when(mEntityHeaderController)
- .setIcon(nullable(Drawable.class));
- doReturn(mEntityHeaderController)
- .when(mEntityHeaderController)
- .setIcon(nullable(ApplicationsState.AppEntry.class));
- doReturn(mEntityHeaderController)
- .when(mEntityHeaderController)
- .setLabel(nullable(String.class));
- doReturn(mEntityHeaderController)
- .when(mEntityHeaderController)
- .setLabel(nullable(String.class));
- doReturn(mEntityHeaderController)
- .when(mEntityHeaderController)
- .setLabel(nullable(ApplicationsState.AppEntry.class));
- doReturn(mEntityHeaderController)
- .when(mEntityHeaderController)
- .setSummary(nullable(String.class));
-
when(mBatteryEntry.getUid()).thenReturn(UID);
when(mBatteryEntry.getLabel()).thenReturn(APP_LABEL);
when(mBatteryEntry.getTimeInForegroundMs()).thenReturn(FOREGROUND_TIME_MS);
@@ -202,7 +192,9 @@
mFragment.mState = mState;
mFragment.mBatteryOptimizeUtils = mBatteryOptimizeUtils;
mFragment.mLogStringBuilder = new StringBuilder();
+ doNothing().when(mState).ensureIcon(mAppEntry);
mAppEntry.info = mock(ApplicationInfo.class);
+ mAppEntry.label = APP_ENTRY_LABEL;
mTestActivity = spy(new SettingsActivity());
doReturn(mPackageManager).when(mTestActivity).getPackageManager();
@@ -235,34 +227,27 @@
}
@Test
+ @Config(shadows = ShadowUtils.class)
public void initHeader_NoAppEntry_BuildByBundle() {
mFragment.mAppEntry = null;
mFragment.initHeader();
- verify(mEntityHeaderController).setIcon(nullable(Drawable.class));
- verify(mEntityHeaderController).setLabel(APP_LABEL);
+ assertThat(mIntroPreference.getIcon()).isNotEqualTo(TEST_DRAWABLE);
+ assertThat(mIntroPreference.getTitle()).isEqualTo(APP_LABEL);
}
@Test
+ @Config(shadows = ShadowUtils.class)
public void initHeader_HasAppEntry_BuildByAppEntry() {
- ReflectionHelpers.setStaticField(
- AppUtils.class,
- "sInstantAppDataProvider",
- new InstantAppDataProvider() {
- @Override
- public boolean isInstantApp(ApplicationInfo info) {
- return false;
- }
- });
mFragment.mAppEntry = mAppEntry;
mFragment.initHeader();
- verify(mEntityHeaderController).setIcon(mAppEntry);
- verify(mEntityHeaderController).setLabel(mAppEntry);
- verify(mEntityHeaderController).setIsInstantApp(false);
+ assertThat(mIntroPreference.getIcon()).isEqualTo(TEST_DRAWABLE);
+ assertThat(mIntroPreference.getTitle()).isEqualTo(mAppEntry.label);
}
@Test
+ @Config(shadows = ShadowUtils.class)
public void initHeader_HasAppEntry_InstantApp() {
ReflectionHelpers.setStaticField(
AppUtils.class,
@@ -276,9 +261,8 @@
mFragment.mAppEntry = mAppEntry;
mFragment.initHeader();
- verify(mEntityHeaderController).setIcon(mAppEntry);
- verify(mEntityHeaderController).setLabel(mAppEntry);
- verify(mEntityHeaderController).setIsInstantApp(true);
+ assertThat(mIntroPreference.getIcon()).isEqualTo(TEST_DRAWABLE);
+ assertThat(mIntroPreference.getTitle()).isEqualTo(mAppEntry.label);
}
@Test
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/PowerBackgroundUsageDetailTest.java b/tests/robotests/src/com/android/settings/fuelgauge/PowerBackgroundUsageDetailTest.java
index 9f98d78..2451cc5 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/PowerBackgroundUsageDetailTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/PowerBackgroundUsageDetailTest.java
@@ -25,6 +25,7 @@
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.ArgumentMatchers.nullable;
import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.doNothing;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
@@ -39,6 +40,7 @@
import android.content.pm.ApplicationInfo;
import android.content.pm.InstallSourceInfo;
import android.content.pm.PackageManager;
+import android.graphics.drawable.ColorDrawable;
import android.graphics.drawable.Drawable;
import android.os.Bundle;
import android.os.UserHandle;
@@ -51,15 +53,12 @@
import com.android.settings.SettingsActivity;
import com.android.settings.fuelgauge.batteryusage.BatteryEntry;
import com.android.settings.testutils.FakeFeatureFactory;
-import com.android.settings.testutils.shadow.ShadowEntityHeaderController;
import com.android.settings.testutils.shadow.ShadowHelpUtils;
-import com.android.settings.widget.EntityHeaderController;
-import com.android.settingslib.applications.AppUtils;
+import com.android.settingslib.Utils;
import com.android.settingslib.applications.ApplicationsState;
-import com.android.settingslib.applications.instantapps.InstantAppDataProvider;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
import com.android.settingslib.widget.FooterPreference;
-import com.android.settingslib.widget.LayoutPreference;
+import com.android.settingslib.widget.IntroPreference;
import org.junit.After;
import org.junit.Before;
@@ -74,14 +73,14 @@
import org.mockito.stubbing.Answer;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.annotation.Config;
-import org.robolectric.util.ReflectionHelpers;
+import org.robolectric.annotation.Implementation;
+import org.robolectric.annotation.Implements;
import java.util.concurrent.TimeUnit;
@RunWith(RobolectricTestRunner.class)
@Config(
shadows = {
- ShadowEntityHeaderController.class,
ShadowHelpUtils.class,
com.android.settings.testutils.shadow.ShadowFragment.class,
})
@@ -90,6 +89,7 @@
@Rule public final MockitoRule mMockitoRule = MockitoJUnit.rule();
private static final String APP_LABEL = "app label";
+ private static final String APP_ENTRY_LABEL = "app entry label";
private static final String SUMMARY = "summary";
private static final int ICON_ID = 123;
private static final int UID = 1;
@@ -97,6 +97,7 @@
private static final String KEY_PREF_HEADER = "header_view";
private static final String KEY_FOOTER_PREFERENCE = "app_usage_footer_preference";
private static final String INITIATING_PACKAGE_NAME = "com.android.vending";
+ private static final Drawable TEST_DRAWABLE = new ColorDrawable(0);
private int mTestMode;
private Context mContext;
@@ -104,11 +105,11 @@
private MetricsFeatureProvider mMetricsFeatureProvider;
private SettingsActivity mTestActivity;
private BatteryOptimizeUtils mBatteryOptimizeUtils;
+ private IntroPreference mIntroPreference;
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
private FragmentActivity mActivity;
- @Mock private EntityHeaderController mEntityHeaderController;
@Mock private ApplicationsState mState;
@Mock private Bundle mBundle;
@Mock private LoaderManager mLoaderManager;
@@ -117,9 +118,16 @@
@Mock private PackageManager mPackageManager;
@Mock private AppOpsManager mAppOpsManager;
@Mock private InstallSourceInfo mInstallSourceInfo;
- @Mock private LayoutPreference mLayoutPreference;
@Mock private FooterPreference mFooterPreference;
+ @Implements(Utils.class)
+ private static class ShadowUtils {
+ @Implementation
+ public static Drawable getBadgedIcon(Context context, ApplicationInfo appInfo) {
+ return PowerBackgroundUsageDetailTest.TEST_DRAWABLE;
+ }
+ }
+
@Before
public void setUp() throws Exception {
mContext = spy(ApplicationProvider.getApplicationContext());
@@ -134,7 +142,8 @@
mFragment = spy(new PowerBackgroundUsageDetail());
mFragment.mBatteryOptimizeUtils = mBatteryOptimizeUtils;
mFragment.mLogStringBuilder = new StringBuilder();
- doReturn(mLayoutPreference).when(mFragment).findPreference(KEY_PREF_HEADER);
+ mIntroPreference = new IntroPreference(mContext);
+ doReturn(mIntroPreference).when(mFragment).findPreference(KEY_PREF_HEADER);
doReturn(mFooterPreference).when(mFragment).findPreference(KEY_FOOTER_PREFERENCE);
doReturn(mContext).when(mFragment).getContext();
doReturn(mActivity).when(mFragment).getActivity();
@@ -143,35 +152,14 @@
when(mFragment.getArguments()).thenReturn(mBundle);
doReturn(mLoaderManager).when(mFragment).getLoaderManager();
- ShadowEntityHeaderController.setUseMock(mEntityHeaderController);
- doReturn(mEntityHeaderController)
- .when(mEntityHeaderController)
- .setButtonActions(anyInt(), anyInt());
- doReturn(mEntityHeaderController)
- .when(mEntityHeaderController)
- .setIcon(nullable(Drawable.class));
- doReturn(mEntityHeaderController)
- .when(mEntityHeaderController)
- .setIcon(nullable(ApplicationsState.AppEntry.class));
- doReturn(mEntityHeaderController)
- .when(mEntityHeaderController)
- .setLabel(nullable(String.class));
- doReturn(mEntityHeaderController)
- .when(mEntityHeaderController)
- .setLabel(nullable(String.class));
- doReturn(mEntityHeaderController)
- .when(mEntityHeaderController)
- .setLabel(nullable(ApplicationsState.AppEntry.class));
- doReturn(mEntityHeaderController)
- .when(mEntityHeaderController)
- .setSummary(nullable(String.class));
-
when(mBatteryEntry.getUid()).thenReturn(UID);
when(mBatteryEntry.getLabel()).thenReturn(APP_LABEL);
mBatteryEntry.mIconId = ICON_ID;
mFragment.mState = mState;
+ doNothing().when(mState).ensureIcon(mAppEntry);
mAppEntry.info = mock(ApplicationInfo.class);
+ mAppEntry.label = APP_ENTRY_LABEL;
mTestActivity = spy(new SettingsActivity());
doReturn(mPackageManager).when(mTestActivity).getPackageManager();
@@ -194,55 +182,37 @@
@After
public void reset() {
- ShadowEntityHeaderController.reset();
ShadowHelpUtils.reset();
}
@Test
+ @Config(shadows = ShadowUtils.class)
public void initHeader_NoAppEntry_BuildByBundle() {
mFragment.mAppEntry = null;
mFragment.initHeader();
- verify(mEntityHeaderController).setIcon(nullable(Drawable.class));
- verify(mEntityHeaderController).setLabel(APP_LABEL);
+ assertThat(mIntroPreference.getIcon()).isNotEqualTo(TEST_DRAWABLE);
+ assertThat(mIntroPreference.getTitle()).isEqualTo(APP_LABEL);
}
@Test
+ @Config(shadows = ShadowUtils.class)
public void initHeader_HasAppEntry_BuildByAppEntry() {
- ReflectionHelpers.setStaticField(
- AppUtils.class,
- "sInstantAppDataProvider",
- new InstantAppDataProvider() {
- @Override
- public boolean isInstantApp(ApplicationInfo info) {
- return false;
- }
- });
mFragment.mAppEntry = mAppEntry;
mFragment.initHeader();
- verify(mEntityHeaderController).setIcon(mAppEntry);
- verify(mEntityHeaderController).setLabel(mAppEntry);
- verify(mEntityHeaderController).setIsInstantApp(false);
+ assertThat(mIntroPreference.getIcon()).isEqualTo(TEST_DRAWABLE);
+ assertThat(mIntroPreference.getTitle()).isEqualTo(mAppEntry.label);
}
@Test
+ @Config(shadows = ShadowUtils.class)
public void initHeader_HasAppEntry_InstantApp() {
- ReflectionHelpers.setStaticField(
- AppUtils.class,
- "sInstantAppDataProvider",
- new InstantAppDataProvider() {
- @Override
- public boolean isInstantApp(ApplicationInfo info) {
- return true;
- }
- });
mFragment.mAppEntry = mAppEntry;
mFragment.initHeader();
- verify(mEntityHeaderController).setIcon(mAppEntry);
- verify(mEntityHeaderController).setLabel(mAppEntry);
- verify(mEntityHeaderController).setIsInstantApp(true);
+ assertThat(mIntroPreference.getIcon()).isEqualTo(TEST_DRAWABLE);
+ assertThat(mIntroPreference.getTitle()).isEqualTo(mAppEntry.label);
}
@Test
diff --git a/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerForCameraPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerForCameraPreferenceControllerTest.java
new file mode 100644
index 0000000..cc710ec
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerForCameraPreferenceControllerTest.java
@@ -0,0 +1,98 @@
+/*
+ * Copyright (C) 2024 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.gestures;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.content.res.Resources;
+
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import com.android.internal.R;
+import com.android.settings.core.BasePreferenceController;
+import com.android.settingslib.widget.SelectorWithWidgetPreference;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+public class DoubleTapPowerForCameraPreferenceControllerTest {
+
+ private static final String KEY = "gesture_double_power_tap_launch_camera";
+ private Context mContext;
+ private Resources mResources;
+ private DoubleTapPowerForCameraPreferenceController mController;
+ private SelectorWithWidgetPreference mPreference;
+
+ @Before
+ public void setUp() {
+ mContext = spy(ApplicationProvider.getApplicationContext());
+ mResources = mock(Resources.class);
+ when(mContext.getResources()).thenReturn(mResources);
+ mController = new DoubleTapPowerForCameraPreferenceController(mContext, KEY);
+ mPreference = new SelectorWithWidgetPreference(mContext);
+ }
+
+ @Test
+ public void updateState_launchCameraEnabled_preferenceChecked() {
+ DoubleTapPowerSettingsUtils.setDoubleTapPowerButtonForCameraLaunch(mContext);
+
+ mController.updateState(mPreference);
+ assertThat(mPreference.isChecked()).isTrue();
+ }
+
+ @Test
+ public void updateState_launchCameraDisabled_preferenceNotChecked() {
+ DoubleTapPowerSettingsUtils.setDoubleTapPowerButtonForWalletLaunch(mContext);
+
+ mController.updateState(mPreference);
+ assertThat(mPreference.isChecked()).isFalse();
+ }
+
+ @Test
+ public void getAvailabilityStatus_setDoubleTapPowerGestureNotAvailable_preferenceUnsupported() {
+ when(mResources.getBoolean(R.bool.config_doubleTapPowerGestureEnabled)).thenReturn(false);
+
+ assertThat(mController.getAvailabilityStatus())
+ .isEqualTo(BasePreferenceController.UNSUPPORTED_ON_DEVICE);
+ }
+
+ @Test
+ public void getAvailabilityStatus_setDoubleTapPowerButtonDisabled_preferenceDisabled() {
+ when(mResources.getBoolean(R.bool.config_doubleTapPowerGestureEnabled)).thenReturn(true);
+ DoubleTapPowerSettingsUtils.setDoubleTapPowerButtonGestureEnabled(mContext, false);
+
+ assertThat(mController.getAvailabilityStatus())
+ .isEqualTo(BasePreferenceController.DISABLED_DEPENDENT_SETTING);
+ }
+
+ @Test
+ public void getAvailabilityStatus_setDoubleTapPowerCameraLaunchEnabled_preferenceEnabled() {
+ when(mResources.getBoolean(R.bool.config_doubleTapPowerGestureEnabled)).thenReturn(true);
+ DoubleTapPowerSettingsUtils.setDoubleTapPowerButtonGestureEnabled(mContext, true);
+
+ assertThat(mController.getAvailabilityStatus())
+ .isEqualTo(BasePreferenceController.AVAILABLE);
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerForWalletPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerForWalletPreferenceControllerTest.java
new file mode 100644
index 0000000..c86a82e
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerForWalletPreferenceControllerTest.java
@@ -0,0 +1,100 @@
+/*
+ * Copyright (C) 2024 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.gestures;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.content.res.Resources;
+
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import com.android.internal.R;
+import com.android.settings.core.BasePreferenceController;
+import com.android.settingslib.widget.SelectorWithWidgetPreference;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+public class DoubleTapPowerForWalletPreferenceControllerTest {
+
+ private static final String KEY = "gesture_double_power_tap_launch_wallet";
+ private Context mContext;
+ private Resources mResources;
+ private DoubleTapPowerForWalletPreferenceController mController;
+ private SelectorWithWidgetPreference mPreference;
+
+ @Before
+ public void setUp() {
+ mContext = spy(ApplicationProvider.getApplicationContext());
+ mResources = mock(Resources.class);
+ when(mContext.getResources()).thenReturn(mResources);
+ mController = new DoubleTapPowerForWalletPreferenceController(mContext, KEY);
+ mPreference = new SelectorWithWidgetPreference(mContext);
+ }
+
+ @Test
+ public void updateState_launchWalletEnabled_preferenceChecked() {
+ DoubleTapPowerSettingsUtils.setDoubleTapPowerButtonForWalletLaunch(mContext);
+
+ mController.updateState(mPreference);
+
+ assertThat(mPreference.isChecked()).isTrue();
+ }
+
+ @Test
+ public void updateState_launchWalletDisabled_preferenceNotChecked() {
+ DoubleTapPowerSettingsUtils.setDoubleTapPowerButtonForCameraLaunch(mContext);
+
+ mController.updateState(mPreference);
+
+ assertThat(mPreference.isChecked()).isFalse();
+ }
+
+ @Test
+ public void getAvailabilityStatus_setDoubleTapPowerGestureNotAvailable_preferenceUnsupported() {
+ when(mResources.getBoolean(R.bool.config_doubleTapPowerGestureEnabled)).thenReturn(false);
+
+ assertThat(mController.getAvailabilityStatus())
+ .isEqualTo(BasePreferenceController.UNSUPPORTED_ON_DEVICE);
+ }
+
+ @Test
+ public void getAvailabilityStatus_setDoubleTapPowerButtonDisabled_preferenceDisabled() {
+ when(mResources.getBoolean(R.bool.config_doubleTapPowerGestureEnabled)).thenReturn(true);
+ DoubleTapPowerSettingsUtils.setDoubleTapPowerButtonGestureEnabled(mContext, false);
+
+ assertThat(mController.getAvailabilityStatus())
+ .isEqualTo(BasePreferenceController.DISABLED_DEPENDENT_SETTING);
+ }
+
+ @Test
+ public void getAvailabilityStatus_setDoubleTapPowerWalletLaunchEnabled_preferenceEnabled() {
+ when(mResources.getBoolean(R.bool.config_doubleTapPowerGestureEnabled)).thenReturn(true);
+ DoubleTapPowerSettingsUtils.setDoubleTapPowerButtonGestureEnabled(mContext, true);
+
+ assertThat(mController.getAvailabilityStatus())
+ .isEqualTo(BasePreferenceController.AVAILABLE);
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerIllustrationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerIllustrationPreferenceControllerTest.java
new file mode 100644
index 0000000..1ea2a4e
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerIllustrationPreferenceControllerTest.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright (C) 2024 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.gestures;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import android.app.Application;
+
+import androidx.preference.PreferenceScreen;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import com.android.settings.R;
+import com.android.settingslib.widget.IllustrationPreference;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+public class DoubleTapPowerIllustrationPreferenceControllerTest {
+
+ private static final String KEY = "gesture_double_tap_power_video";
+ private Application mContext;
+ private IllustrationPreference mPreference;
+ private DoubleTapPowerIllustrationPreferenceController mController;
+
+ @Before
+ public void setUp() {
+ mContext = ApplicationProvider.getApplicationContext();
+ mPreference = new IllustrationPreference(mContext);
+ mController = new DoubleTapPowerIllustrationPreferenceController(mContext, KEY);
+
+ PreferenceScreen mScreen = mock(PreferenceScreen.class);
+ when(mScreen.findPreference(KEY)).thenReturn(mPreference);
+ mController.displayPreference(mScreen);
+ }
+
+ @Test
+ public void updateState_setDoubleTapPowerForCamera_showsCameraIllustration() {
+ DoubleTapPowerSettingsUtils.setDoubleTapPowerButtonForCameraLaunch(mContext);
+
+ mController.updateState(mPreference);
+
+ assertThat(mPreference.getLottieAnimationResId()).isEqualTo(R.drawable.quickly_open_camera);
+ }
+
+ @Test
+ public void updateState_setDoubleTapPowerForWallet_showsWalletIllustration() {
+ DoubleTapPowerSettingsUtils.setDoubleTapPowerButtonForWalletLaunch(mContext);
+
+ mController.updateState(mPreference);
+
+ assertThat(mPreference.getLottieAnimationResId())
+ .isEqualTo(R.drawable.double_tap_power_for_wallet);
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerMainSwitchPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerMainSwitchPreferenceControllerTest.java
new file mode 100644
index 0000000..502e52e
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerMainSwitchPreferenceControllerTest.java
@@ -0,0 +1,98 @@
+/*
+ * Copyright (C) 2024 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.gestures;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.content.res.Resources;
+
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import com.android.internal.R;
+import com.android.settings.core.BasePreferenceController;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+public class DoubleTapPowerMainSwitchPreferenceControllerTest {
+
+ private static final String KEY = "gesture_double_tap_power_enabled_main_switch";
+
+ private Context mContext;
+ private Resources mResources;
+ private DoubleTapPowerMainSwitchPreferenceController mController;
+
+ @Before
+ public void setUp() {
+ mContext = spy(ApplicationProvider.getApplicationContext());
+ mResources = mock(Resources.class);
+ when(mContext.getResources()).thenReturn(mResources);
+ mController = new DoubleTapPowerMainSwitchPreferenceController(mContext, KEY);
+ }
+
+ @Test
+ public void getAvailabilityStatus_setDoubleTapPowerGestureAvailable_preferenceEnabled() {
+ when(mResources.getBoolean(R.bool.config_doubleTapPowerGestureEnabled)).thenReturn(true);
+
+ assertThat(mController.getAvailabilityStatus())
+ .isEqualTo(BasePreferenceController.AVAILABLE);
+ }
+
+ @Test
+ public void getAvailabilityStatus_setDoubleTapPowerGestureUnavailable_preferenceUnsupported() {
+ when(mResources.getBoolean(R.bool.config_doubleTapPowerGestureEnabled)).thenReturn(false);
+
+ assertThat(mController.getAvailabilityStatus())
+ .isEqualTo(BasePreferenceController.UNSUPPORTED_ON_DEVICE);
+ }
+
+ @Test
+ public void isChecked_setDoubleTapPowerGestureEnabled_mainSwitchChecked() {
+ DoubleTapPowerSettingsUtils.setDoubleTapPowerButtonGestureEnabled(mContext, true);
+
+ assertThat(mController.isChecked()).isTrue();
+ }
+
+ @Test
+ public void isChecked_setDoubleTapPowerGestureDisabled_mainSwitchUnchecked() {
+ DoubleTapPowerSettingsUtils.setDoubleTapPowerButtonGestureEnabled(mContext, false);
+
+ assertThat(mController.isChecked()).isFalse();
+ }
+
+ @Test
+ public void setChecked_checkMainSwitch_doubleTapPowerGestureEnabled() {
+ mController.setChecked(true);
+ assertThat(DoubleTapPowerSettingsUtils.isDoubleTapPowerButtonGestureEnabled(mContext))
+ .isTrue();
+ }
+
+ @Test
+ public void setChecked_uncheckMainSwitch_doubleTapPowerGestureDisabled() {
+ mController.setChecked(false);
+ assertThat(DoubleTapPowerSettingsUtils.isDoubleTapPowerButtonGestureEnabled(mContext))
+ .isFalse();
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerPreferenceControllerTest.java
index 72dd36e..17b03f3 100644
--- a/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerPreferenceControllerTest.java
@@ -17,23 +17,37 @@
package com.android.settings.gestures;
import static android.provider.Settings.Secure.CAMERA_DOUBLE_TAP_POWER_GESTURE_DISABLED;
+import static android.provider.Settings.Secure.DOUBLE_TAP_POWER_BUTTON_GESTURE_ENABLED;
-import static com.android.settings.gestures.DoubleTapPowerPreferenceController.OFF;
-import static com.android.settings.gestures.DoubleTapPowerPreferenceController.ON;
import static com.android.settings.gestures.DoubleTapPowerPreferenceController.isSuggestionComplete;
+import static com.android.settings.gestures.DoubleTapPowerToOpenCameraPreferenceController.OFF;
+import static com.android.settings.gestures.DoubleTapPowerToOpenCameraPreferenceController.ON;
import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
import android.content.ContentResolver;
import android.content.Context;
import android.content.SharedPreferences;
+import android.platform.test.annotations.DisableFlags;
+import android.platform.test.annotations.EnableFlags;
+import android.platform.test.flag.junit.SetFlagsRule;
import android.provider.Settings;
+import android.service.quickaccesswallet.Flags;
+import android.text.TextUtils;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
+import com.android.settings.R;
import com.android.settings.dashboard.suggestions.SuggestionFeatureProviderImpl;
import com.android.settings.testutils.shadow.SettingsShadowResources;
import org.junit.After;
import org.junit.Before;
+import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner;
@@ -44,16 +58,22 @@
@Config(shadows = SettingsShadowResources.class)
public class DoubleTapPowerPreferenceControllerTest {
+ @Rule public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
private Context mContext;
private ContentResolver mContentResolver;
private DoubleTapPowerPreferenceController mController;
+ private Preference mPreference;
+ private PreferenceScreen mScreen;
private static final String KEY_DOUBLE_TAP_POWER = "gesture_double_tap_power";
@Before
public void setUp() {
- mContext = RuntimeEnvironment.application;
+ mContext = RuntimeEnvironment.getApplication();
mContentResolver = mContext.getContentResolver();
mController = new DoubleTapPowerPreferenceController(mContext, KEY_DOUBLE_TAP_POWER);
+ mPreference = new Preference(mContext);
+ mScreen = mock(PreferenceScreen.class);
+ when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
}
@After
@@ -62,7 +82,26 @@
}
@Test
- public void isAvailable_configIsTrue_shouldReturnTrue() {
+ @EnableFlags(Flags.FLAG_LAUNCH_WALLET_OPTION_ON_POWER_DOUBLE_TAP)
+ public void isAvailable_flagEnabled_configIsTrue_returnsTrue() {
+ SettingsShadowResources.overrideResource(
+ com.android.internal.R.bool.config_doubleTapPowerGestureEnabled, Boolean.TRUE);
+
+ assertThat(mController.isAvailable()).isTrue();
+ }
+
+ @Test
+ @EnableFlags(Flags.FLAG_LAUNCH_WALLET_OPTION_ON_POWER_DOUBLE_TAP)
+ public void isAvailable_flagEnabled_configIsFalse_returnsFalse() {
+ SettingsShadowResources.overrideResource(
+ com.android.internal.R.bool.config_doubleTapPowerGestureEnabled, Boolean.FALSE);
+
+ assertThat(mController.isAvailable()).isFalse();
+ }
+
+ @Test
+ @DisableFlags(Flags.FLAG_LAUNCH_WALLET_OPTION_ON_POWER_DOUBLE_TAP)
+ public void isAvailable_flagDisabled_configIsTrue_returnsTrue() {
SettingsShadowResources.overrideResource(
com.android.internal.R.bool.config_cameraDoubleTapPowerGestureEnabled,
Boolean.TRUE);
@@ -71,7 +110,8 @@
}
@Test
- public void isAvailable_configIsTrue_shouldReturnFalse() {
+ @DisableFlags(Flags.FLAG_LAUNCH_WALLET_OPTION_ON_POWER_DOUBLE_TAP)
+ public void isAvailable_flagDisabled_configIsFalse_returnsFalse() {
SettingsShadowResources.overrideResource(
com.android.internal.R.bool.config_cameraDoubleTapPowerGestureEnabled,
Boolean.FALSE);
@@ -80,43 +120,63 @@
}
@Test
- public void testIsChecked_configIsNotSet_shouldReturnTrue() {
- // Set the setting to be enabled.
- Settings.Secure.putInt(mContentResolver, CAMERA_DOUBLE_TAP_POWER_GESTURE_DISABLED, ON);
- mController = new DoubleTapPowerPreferenceController(mContext, KEY_DOUBLE_TAP_POWER);
+ @EnableFlags(Flags.FLAG_LAUNCH_WALLET_OPTION_ON_POWER_DOUBLE_TAP)
+ public void isSuggestionCompleted_enableFlag_doubleTapPower_trueWhenNotAvailable() {
+ SettingsShadowResources.overrideResource(
+ com.android.internal.R.bool.config_doubleTapPowerGestureEnabled, false);
- assertThat(mController.isChecked()).isTrue();
+ assertThat(isSuggestionComplete(mContext, null /* prefs */)).isTrue();
}
@Test
- public void testIsChecked_configIsSet_shouldReturnFalse() {
- // Set the setting to be disabled.
- Settings.Secure.putInt(mContentResolver, CAMERA_DOUBLE_TAP_POWER_GESTURE_DISABLED, OFF);
- mController = new DoubleTapPowerPreferenceController(mContext, KEY_DOUBLE_TAP_POWER);
+ @EnableFlags(Flags.FLAG_LAUNCH_WALLET_OPTION_ON_POWER_DOUBLE_TAP)
+ public void isSuggestionCompleted_enableFlag_doubleTapPower_falseWhenNotVisited() {
+ SettingsShadowResources.overrideResource(
+ com.android.internal.R.bool.config_doubleTapPowerGestureEnabled, true);
+ // No stored value in shared preferences if not visited yet.
+ final SharedPreferences prefs =
+ new SuggestionFeatureProviderImpl().getSharedPrefs(mContext);
- assertThat(mController.isChecked()).isFalse();
+ assertThat(isSuggestionComplete(mContext, prefs)).isFalse();
}
@Test
- public void isSuggestionCompleted_doubleTapPower_trueWhenNotAvailable() {
+ @EnableFlags(Flags.FLAG_LAUNCH_WALLET_OPTION_ON_POWER_DOUBLE_TAP)
+ public void isSuggestionCompleted_enableFlag_doubleTapPower_trueWhenVisited() {
+ SettingsShadowResources.overrideResource(
+ com.android.internal.R.bool.config_doubleTapPowerGestureEnabled, true);
+ // No stored value in shared preferences if not visited yet.
+ final SharedPreferences prefs =
+ new SuggestionFeatureProviderImpl().getSharedPrefs(mContext);
+ prefs.edit().putBoolean(DoubleTapPowerSettings.PREF_KEY_SUGGESTION_COMPLETE, true).commit();
+
+ assertThat(isSuggestionComplete(mContext, prefs)).isTrue();
+ }
+
+ @Test
+ @DisableFlags(Flags.FLAG_LAUNCH_WALLET_OPTION_ON_POWER_DOUBLE_TAP)
+ public void isSuggestionCompleted_disableFlag_doubleTapPower_trueWhenNotAvailable() {
SettingsShadowResources.overrideResource(
com.android.internal.R.bool.config_cameraDoubleTapPowerGestureEnabled, false);
- assertThat(isSuggestionComplete(mContext, null/* prefs */)).isTrue();
+ assertThat(isSuggestionComplete(mContext, null /* prefs */)).isTrue();
}
@Test
- public void isSuggestionCompleted_doubleTapPower_falseWhenNotVisited() {
+ @DisableFlags(Flags.FLAG_LAUNCH_WALLET_OPTION_ON_POWER_DOUBLE_TAP)
+ public void isSuggestionCompleted_disableFlag_doubleTapPower_falseWhenNotVisited() {
SettingsShadowResources.overrideResource(
com.android.internal.R.bool.config_cameraDoubleTapPowerGestureEnabled, true);
// No stored value in shared preferences if not visited yet.
final SharedPreferences prefs =
new SuggestionFeatureProviderImpl().getSharedPrefs(mContext);
+
assertThat(isSuggestionComplete(mContext, prefs)).isFalse();
}
@Test
- public void isSuggestionCompleted_doubleTapPower_trueWhenVisited() {
+ @DisableFlags(Flags.FLAG_LAUNCH_WALLET_OPTION_ON_POWER_DOUBLE_TAP)
+ public void isSuggestionCompleted_disableFlag_doubleTapPower_trueWhenVisited() {
SettingsShadowResources.overrideResource(
com.android.internal.R.bool.config_cameraDoubleTapPowerGestureEnabled, true);
// No stored value in shared preferences if not visited yet.
@@ -128,21 +188,92 @@
}
@Test
- public void isSliceableCorrectKey_returnsTrue() {
- final DoubleTapPowerPreferenceController controller =
- new DoubleTapPowerPreferenceController(mContext, "gesture_double_tap_power");
- assertThat(controller.isSliceable()).isTrue();
+ @DisableFlags(Flags.FLAG_LAUNCH_WALLET_OPTION_ON_POWER_DOUBLE_TAP)
+ public void displayPreference_flagDisabled_doubleTapPowerLegacyTitleIsDisplayed() {
+ mController.displayPreference(mScreen);
+
+ assertThat(
+ TextUtils.equals(
+ mPreference.getTitle(),
+ mContext.getText(R.string.double_tap_power_for_camera_title)))
+ .isTrue();
}
@Test
- public void isSliceableIncorrectKey_returnsFalse() {
- final DoubleTapPowerPreferenceController controller =
- new DoubleTapPowerPreferenceController(mContext, "bad_key");
- assertThat(controller.isSliceable()).isFalse();
+ @DisableFlags(Flags.FLAG_LAUNCH_WALLET_OPTION_ON_POWER_DOUBLE_TAP)
+ public void getSummary_flagDisabled_doubleTapPowerEnabled_returnsOn() {
+ // Set the setting to be enabled.
+ Settings.Secure.putInt(mContentResolver, CAMERA_DOUBLE_TAP_POWER_GESTURE_DISABLED, ON);
+
+ assertThat(
+ TextUtils.equals(
+ mController.getSummary(),
+ mContext.getText(R.string.gesture_setting_on)))
+ .isTrue();
}
@Test
- public void isPublicSlice_returnTrue() {
- assertThat(mController.isPublicSlice()).isTrue();
+ @DisableFlags(Flags.FLAG_LAUNCH_WALLET_OPTION_ON_POWER_DOUBLE_TAP)
+ public void getSummary_flagDisabled_doubleTapPowerDisabled_returnsOff() {
+ // Set the setting to be disabled.
+ Settings.Secure.putInt(mContentResolver, CAMERA_DOUBLE_TAP_POWER_GESTURE_DISABLED, OFF);
+
+ assertThat(
+ TextUtils.equals(
+ mController.getSummary(),
+ mContext.getText(R.string.gesture_setting_off)))
+ .isTrue();
+ }
+
+ @Test
+ @EnableFlags(Flags.FLAG_LAUNCH_WALLET_OPTION_ON_POWER_DOUBLE_TAP)
+ public void getSummary_flagEnabled_doubleTapPowerDisabled_returnsOff() {
+ // Set the setting to be disabled.
+ Settings.Secure.putInt(
+ mContentResolver, DOUBLE_TAP_POWER_BUTTON_GESTURE_ENABLED, 0 /* OFF */);
+
+ assertThat(
+ TextUtils.equals(
+ mController.getSummary(),
+ mContext.getText(R.string.gesture_setting_off)))
+ .isTrue();
+ }
+
+ @Test
+ @EnableFlags(Flags.FLAG_LAUNCH_WALLET_OPTION_ON_POWER_DOUBLE_TAP)
+ public void getSummary_flagEnabled_doubleTapPowerEnabled_cameraTargetAction_returnsSummary() {
+ // Set the setting to be enabled.
+ Settings.Secure.putInt(
+ mContentResolver, DOUBLE_TAP_POWER_BUTTON_GESTURE_ENABLED, 1 /* ON */);
+ DoubleTapPowerSettingsUtils.setDoubleTapPowerButtonForCameraLaunch(mContext);
+
+ assertThat(
+ TextUtils.equals(
+ mController.getSummary(),
+ mContext.getString(
+ R.string.double_tap_power_summary,
+ mContext.getText(R.string.gesture_setting_on),
+ mContext.getText(
+ R.string.double_tap_power_camera_action_summary))))
+ .isTrue();
+ }
+
+ @Test
+ @EnableFlags(Flags.FLAG_LAUNCH_WALLET_OPTION_ON_POWER_DOUBLE_TAP)
+ public void getSummary_flagEnabled_doubleTapPowerEnabled_walletTargetAction_returnsSummary() {
+ // Set the setting to be enabled.
+ Settings.Secure.putInt(
+ mContentResolver, DOUBLE_TAP_POWER_BUTTON_GESTURE_ENABLED, 1 /* ON */);
+ DoubleTapPowerSettingsUtils.setDoubleTapPowerButtonForWalletLaunch(mContext);
+
+ assertThat(
+ TextUtils.equals(
+ mController.getSummary(),
+ mContext.getString(
+ R.string.double_tap_power_summary,
+ mContext.getText(R.string.gesture_setting_on),
+ mContext.getText(
+ R.string.double_tap_power_wallet_action_summary))))
+ .isTrue();
}
}
diff --git a/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerSettingsTest.java b/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerSettingsTest.java
index a08b818..7d4f52e 100644
--- a/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerSettingsTest.java
@@ -18,9 +18,16 @@
import static com.google.common.truth.Truth.assertThat;
+import android.platform.test.annotations.DisableFlags;
+import android.platform.test.annotations.EnableFlags;
+import android.platform.test.flag.junit.SetFlagsRule;
import android.provider.SearchIndexableResource;
+import android.service.quickaccesswallet.Flags;
+
+import com.android.settings.R;
import org.junit.Before;
+import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner;
@@ -31,6 +38,7 @@
@RunWith(RobolectricTestRunner.class)
public class DoubleTapPowerSettingsTest {
+ @Rule public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
private DoubleTapPowerSettings mSettings;
@Before
@@ -39,12 +47,38 @@
}
@Test
- public void testSearchIndexProvider_shouldIndexResource() {
+ @EnableFlags(Flags.FLAG_LAUNCH_WALLET_OPTION_ON_POWER_DOUBLE_TAP)
+ public void getPreferenceScreenResId_flagEnabled_returnsFlagEnabledResId() {
+ assertThat(mSettings.getPreferenceScreenResId()).isEqualTo(R.xml.double_tap_power_settings);
+ }
+
+ @Test
+ @DisableFlags(Flags.FLAG_LAUNCH_WALLET_OPTION_ON_POWER_DOUBLE_TAP)
+ public void getPreferenceScreenResId_flagDisabled_returnsFlagDisabledResId() {
+ assertThat(mSettings.getPreferenceScreenResId())
+ .isEqualTo(R.xml.double_tap_power_to_open_camera_settings);
+ }
+
+ @Test
+ @EnableFlags(Flags.FLAG_LAUNCH_WALLET_OPTION_ON_POWER_DOUBLE_TAP)
+ public void testSearchIndexProvider_flagEnabled_shouldIndexFlagEnabledResource() {
final List<SearchIndexableResource> indexRes =
- DoubleTapPowerSettings.SEARCH_INDEX_DATA_PROVIDER.getXmlResourcesToIndex(
- RuntimeEnvironment.application, true /* enabled */);
+ DoubleTapPowerSettings.SEARCH_INDEX_DATA_PROVIDER.getXmlResourcesToIndex(
+ RuntimeEnvironment.getApplication(), true /* enabled */);
assertThat(indexRes).isNotNull();
- assertThat(indexRes.get(0).xmlResId).isEqualTo(mSettings.getPreferenceScreenResId());
+ assertThat(indexRes.get(0).xmlResId).isEqualTo(R.xml.double_tap_power_settings);
+ }
+
+ @Test
+ @DisableFlags(Flags.FLAG_LAUNCH_WALLET_OPTION_ON_POWER_DOUBLE_TAP)
+ public void testSearchIndexProvider_flagDisabled_shouldIndexFlagDisabledResource() {
+ final List<SearchIndexableResource> indexRes =
+ DoubleTapPowerSettings.SEARCH_INDEX_DATA_PROVIDER.getXmlResourcesToIndex(
+ RuntimeEnvironment.getApplication(), true /* enabled */);
+
+ assertThat(indexRes).isNotNull();
+ assertThat(indexRes.get(0).xmlResId)
+ .isEqualTo(R.xml.double_tap_power_to_open_camera_settings);
}
}
diff --git a/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerSettingsUtilsTest.java b/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerSettingsUtilsTest.java
new file mode 100644
index 0000000..817f198
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerSettingsUtilsTest.java
@@ -0,0 +1,203 @@
+/*
+ * Copyright (C) 2021 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.gestures;
+
+import static com.android.settings.gestures.DoubleTapPowerSettingsUtils.OFF;
+import static com.android.settings.gestures.DoubleTapPowerSettingsUtils.ON;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.content.res.Resources;
+import android.provider.Settings;
+
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import com.android.internal.R;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+public class DoubleTapPowerSettingsUtilsTest {
+
+ private static final int DOUBLE_TAP_POWER_BUTTON_CAMERA_LAUNCH_VALUE = 0;
+ private static final int DOUBLE_TAP_POWER_BUTTON_WALLET_LAUNCH_VALUE = 1;
+
+ private Context mContext;
+ private Resources mResources;
+
+ @Before
+ public void setUp() {
+ mContext = spy(ApplicationProvider.getApplicationContext());
+ mResources = mock(Resources.class);
+ when(mContext.getResources()).thenReturn(mResources);
+ }
+
+ @Test
+ public void isDoubleTapPowerButtonGestureAvailable_setAvailable_returnsTrue() {
+ when(mResources.getBoolean(R.bool.config_doubleTapPowerGestureEnabled)).thenReturn(true);
+
+ assertThat(DoubleTapPowerSettingsUtils.isDoubleTapPowerButtonGestureAvailable(mContext))
+ .isTrue();
+ }
+
+ @Test
+ public void isDoubleTapPowerButtonGestureAvailable_setUnavailable_returnsFalse() {
+ when(mResources.getBoolean(R.bool.config_doubleTapPowerGestureEnabled)).thenReturn(false);
+
+ assertThat(DoubleTapPowerSettingsUtils.isDoubleTapPowerButtonGestureAvailable(mContext))
+ .isFalse();
+ }
+
+ @Test
+ public void isDoubleTapPowerButtonGestureEnabled_setEnabled_returnsTrue() {
+ Settings.Secure.putInt(
+ mContext.getContentResolver(),
+ Settings.Secure.DOUBLE_TAP_POWER_BUTTON_GESTURE_ENABLED,
+ ON);
+
+ assertThat(DoubleTapPowerSettingsUtils.isDoubleTapPowerButtonGestureEnabled(mContext))
+ .isTrue();
+ }
+
+ @Test
+ public void isDoubleTapPowerButtonGestureEnabled_setDisabled_returnsFalse() {
+ Settings.Secure.putInt(
+ mContext.getContentResolver(),
+ Settings.Secure.DOUBLE_TAP_POWER_BUTTON_GESTURE_ENABLED,
+ OFF);
+
+ assertThat(DoubleTapPowerSettingsUtils.isDoubleTapPowerButtonGestureEnabled(mContext))
+ .isFalse();
+ }
+
+ @Test
+ public void isDoubleTapPowerButtonGestureEnabled_valueNotSet_returnsTrue() {
+ assertThat(DoubleTapPowerSettingsUtils.isDoubleTapPowerButtonGestureEnabled(mContext))
+ .isTrue();
+ }
+
+ @Test
+ public void setDoubleTapPowerButtonGestureEnabled_setEnabled_returnsEnabled() {
+ DoubleTapPowerSettingsUtils.setDoubleTapPowerButtonGestureEnabled(mContext, true);
+
+ assertThat(
+ Settings.Secure.getInt(
+ mContext.getContentResolver(),
+ Settings.Secure.DOUBLE_TAP_POWER_BUTTON_GESTURE_ENABLED,
+ OFF))
+ .isEqualTo(ON);
+ }
+
+ @Test
+ public void setDoubleTapPowerButtonGestureEnabled_setDisabled_returnsDisabled() {
+ DoubleTapPowerSettingsUtils.setDoubleTapPowerButtonGestureEnabled(mContext, false);
+
+ assertThat(
+ Settings.Secure.getInt(
+ mContext.getContentResolver(),
+ Settings.Secure.DOUBLE_TAP_POWER_BUTTON_GESTURE_ENABLED,
+ ON))
+ .isEqualTo(OFF);
+ }
+
+ @Test
+ public void isDoubleTapPowerButtonGestureForCameraLaunchEnabled_valueSetToCamera_returnsTrue() {
+ Settings.Secure.putInt(
+ mContext.getContentResolver(),
+ Settings.Secure.DOUBLE_TAP_POWER_BUTTON_GESTURE,
+ DOUBLE_TAP_POWER_BUTTON_CAMERA_LAUNCH_VALUE);
+
+ assertThat(
+ DoubleTapPowerSettingsUtils
+ .isDoubleTapPowerButtonGestureForCameraLaunchEnabled(mContext))
+ .isTrue();
+ }
+
+ @Test
+ public void
+ isDoubleTapPowerButtonGestureForCameraLaunchEnabled_valueNotSetToCamera_returnsFalse() {
+ Settings.Secure.putInt(
+ mContext.getContentResolver(),
+ Settings.Secure.DOUBLE_TAP_POWER_BUTTON_GESTURE,
+ DOUBLE_TAP_POWER_BUTTON_WALLET_LAUNCH_VALUE);
+
+ assertThat(
+ DoubleTapPowerSettingsUtils
+ .isDoubleTapPowerButtonGestureForCameraLaunchEnabled(mContext))
+ .isFalse();
+ }
+
+ @Test
+ public void
+ isDoubleTapPowerButtonGestureForCameraLaunchEnabled_defaultSetToCamera_returnsTrue() {
+ when(mResources.getInteger(R.integer.config_defaultDoubleTapPowerGestureAction))
+ .thenReturn(DOUBLE_TAP_POWER_BUTTON_CAMERA_LAUNCH_VALUE);
+
+ assertThat(
+ DoubleTapPowerSettingsUtils
+ .isDoubleTapPowerButtonGestureForCameraLaunchEnabled(mContext))
+ .isTrue();
+ }
+
+ @Test
+ public void
+ isDoubleTapPowerButtonGestureForCameraLaunchEnabled_defaultNotCamera_returnsFalse() {
+ when(mResources.getInteger(R.integer.config_defaultDoubleTapPowerGestureAction))
+ .thenReturn(DOUBLE_TAP_POWER_BUTTON_WALLET_LAUNCH_VALUE);
+
+ assertThat(
+ DoubleTapPowerSettingsUtils
+ .isDoubleTapPowerButtonGestureForCameraLaunchEnabled(mContext))
+ .isFalse();
+ }
+
+ @Test
+ public void setDoubleTapPowerButtonForCameraLaunch_setGestureBehaviorToCameraLaunch() {
+ boolean result =
+ DoubleTapPowerSettingsUtils.setDoubleTapPowerButtonForCameraLaunch(mContext);
+
+ assertThat(result).isTrue();
+ assertThat(
+ Settings.Secure.getInt(
+ mContext.getContentResolver(),
+ Settings.Secure.DOUBLE_TAP_POWER_BUTTON_GESTURE,
+ DOUBLE_TAP_POWER_BUTTON_WALLET_LAUNCH_VALUE))
+ .isEqualTo(DOUBLE_TAP_POWER_BUTTON_CAMERA_LAUNCH_VALUE);
+ }
+
+ @Test
+ public void setDoubleTapPowerButtonForWalletLaunch_setGestureBehaviorToWalletLaunch() {
+ boolean result =
+ DoubleTapPowerSettingsUtils.setDoubleTapPowerButtonForWalletLaunch(mContext);
+
+ assertThat(result).isTrue();
+ assertThat(
+ Settings.Secure.getInt(
+ mContext.getContentResolver(),
+ Settings.Secure.DOUBLE_TAP_POWER_BUTTON_GESTURE,
+ DOUBLE_TAP_POWER_BUTTON_CAMERA_LAUNCH_VALUE))
+ .isEqualTo(DOUBLE_TAP_POWER_BUTTON_WALLET_LAUNCH_VALUE);
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerToOpenCameraPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerToOpenCameraPreferenceControllerTest.java
new file mode 100644
index 0000000..54d17ba
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerToOpenCameraPreferenceControllerTest.java
@@ -0,0 +1,162 @@
+/*
+ * Copyright (C) 2024 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.gestures;
+
+import static android.provider.Settings.Secure.CAMERA_DOUBLE_TAP_POWER_GESTURE_DISABLED;
+
+import static com.android.settings.gestures.DoubleTapPowerToOpenCameraPreferenceController.OFF;
+import static com.android.settings.gestures.DoubleTapPowerToOpenCameraPreferenceController.ON;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.content.res.Resources;
+import android.platform.test.flag.junit.SetFlagsRule;
+import android.provider.Settings;
+
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import com.android.internal.R;
+import com.android.settings.core.BasePreferenceController;
+import com.android.settings.testutils.shadow.SettingsShadowResources;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+@RunWith(AndroidJUnit4.class)
+@Config(shadows = SettingsShadowResources.class)
+public class DoubleTapPowerToOpenCameraPreferenceControllerTest {
+ @Rule public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
+ private Context mContext;
+ private Resources mResources;
+ private DoubleTapPowerToOpenCameraPreferenceController mController;
+ private static final String KEY_DOUBLE_TAP_POWER = "gesture_double_tap_power";
+
+ @Before
+ public void setUp() {
+ mContext = spy(RuntimeEnvironment.getApplication());
+ mResources = mock(Resources.class);
+ when(mContext.getResources()).thenReturn(mResources);
+ mController =
+ new DoubleTapPowerToOpenCameraPreferenceController(mContext, KEY_DOUBLE_TAP_POWER);
+ }
+
+ @After
+ public void tearDown() {
+ SettingsShadowResources.reset();
+ }
+
+ @Test
+ public void getAvailabilityStatus_setDoubleTapPowerGestureDisabled_preferenceUnsupported() {
+ when(mResources.getBoolean(R.bool.config_cameraDoubleTapPowerGestureEnabled))
+ .thenReturn(false);
+
+ assertThat(mController.getAvailabilityStatus())
+ .isEqualTo(BasePreferenceController.UNSUPPORTED_ON_DEVICE);
+ }
+
+ @Test
+ public void getAvailabilityStatus_setDoubleTapPowerGestureEnabled_preferenceSupported() {
+ when(mResources.getBoolean(R.bool.config_cameraDoubleTapPowerGestureEnabled))
+ .thenReturn(true);
+
+ assertThat(mController.getAvailabilityStatus())
+ .isEqualTo(BasePreferenceController.AVAILABLE);
+ }
+
+ @Test
+ public void isChecked_configIsNotSet_returnsTrue() {
+ // Set the setting to be enabled.
+ Settings.Secure.putInt(
+ mContext.getContentResolver(), CAMERA_DOUBLE_TAP_POWER_GESTURE_DISABLED, ON);
+
+ assertThat(mController.isChecked()).isTrue();
+ }
+
+ @Test
+ public void isChecked_setConfigFalse_returnsFalse() {
+ // Set the setting to be disabled.
+ Settings.Secure.putInt(
+ mContext.getContentResolver(), CAMERA_DOUBLE_TAP_POWER_GESTURE_DISABLED, OFF);
+
+ assertThat(mController.isChecked()).isFalse();
+ }
+
+ @Test
+ public void isChecked_setConfigTrue_returnsFalse() {
+ // Set the setting to be disabled.
+ Settings.Secure.putInt(
+ mContext.getContentResolver(), CAMERA_DOUBLE_TAP_POWER_GESTURE_DISABLED, ON);
+
+ assertThat(mController.isChecked()).isTrue();
+ }
+
+ @Test
+ public void setChecked_checkToggle_cameraDoubleTapPowerGestureEnabled() {
+ mController.setChecked(true);
+
+ assertThat(
+ Settings.Secure.getInt(
+ mContext.getContentResolver(),
+ CAMERA_DOUBLE_TAP_POWER_GESTURE_DISABLED,
+ OFF))
+ .isEqualTo(ON);
+ }
+
+ @Test
+ public void setChecked_uncheckToggle_cameraDoubleTapPowerGestureDisabled() {
+ mController.setChecked(false);
+
+ assertThat(
+ Settings.Secure.getInt(
+ mContext.getContentResolver(),
+ CAMERA_DOUBLE_TAP_POWER_GESTURE_DISABLED,
+ ON))
+ .isEqualTo(OFF);
+ }
+
+ @Test
+ public void isSliceableCorrectKey_returnsTrue() {
+ final DoubleTapPowerToOpenCameraPreferenceController controller =
+ new DoubleTapPowerToOpenCameraPreferenceController(
+ mContext, "gesture_double_tap_power");
+
+ assertThat(controller.isSliceable()).isTrue();
+ }
+
+ @Test
+ public void isSliceableIncorrectKey_returnsFalse() {
+ final DoubleTapPowerToOpenCameraPreferenceController controller =
+ new DoubleTapPowerToOpenCameraPreferenceController(mContext, "bad_key");
+
+ assertThat(controller.isSliceable()).isFalse();
+ }
+
+ @Test
+ public void isPublicSlice_returnTrue() {
+ assertThat(mController.isPublicSlice()).isTrue();
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/sim/SimSelectNotificationTest.java b/tests/robotests/src/com/android/settings/sim/SimSelectNotificationTest.java
index 36f6cd4..0171dc4 100644
--- a/tests/robotests/src/com/android/settings/sim/SimSelectNotificationTest.java
+++ b/tests/robotests/src/com/android/settings/sim/SimSelectNotificationTest.java
@@ -54,6 +54,7 @@
import android.content.pm.ApplicationInfo;
import android.content.pm.PackageManager;
import android.content.res.Resources;
+import android.os.UserManager;
import android.provider.Settings;
import android.telephony.SubscriptionInfo;
import android.telephony.SubscriptionManager;
@@ -103,6 +104,8 @@
private DisplayMetrics mDisplayMetrics;
@Mock
private SimDialogActivity mActivity;
+ @Mock
+ private UserManager mUserManager;
private final String mFakeDisplayName = "fake_display_name";
private final CharSequence mFakeNotificationChannelTitle = "fake_notification_channel_title";
@@ -128,6 +131,8 @@
.thenReturn(mNotificationManager);
when(mContext.getSystemService(Context.TELEPHONY_SERVICE))
.thenReturn(mTelephonyManager);
+ when(mContext.getSystemService(UserManager.class))
+ .thenReturn(mUserManager);
when(mContext.getSystemService(SubscriptionManager.class)).thenReturn(mSubscriptionManager);
when(mContext.getSystemService(Context.TELEPHONY_SUBSCRIPTION_SERVICE))
.thenReturn(mSubscriptionManager);
@@ -135,6 +140,7 @@
when(mContext.getPackageManager()).thenReturn(mPackageManager);
when(mPackageManager.checkPermission(any(), any()))
.thenReturn(PackageManager.PERMISSION_GRANTED);
+ when(mUserManager.isMainUser()).thenReturn(true);
when(mTelephonyManager.createForSubscriptionId(anyInt())).thenReturn(mTelephonyManager);
when(mTelephonyManager.isDataEnabledForApn(TYPE_MMS)).thenReturn(false);
@@ -218,6 +224,18 @@
}
@Test
+ public void onReceivePrimarySubListChange_userIdIsNotMain_notificationShouldNotSend() {
+ when(mUserManager.isMainUser()).thenReturn(false);
+ Intent intent = new Intent(TelephonyManager.ACTION_PRIMARY_SUBSCRIPTION_LIST_CHANGED);
+ intent.putExtra(EXTRA_DEFAULT_SUBSCRIPTION_SELECT_TYPE,
+ EXTRA_DEFAULT_SUBSCRIPTION_SELECT_TYPE_DATA);
+
+ // If MMS data is already enabled, there's no need to trigger the notification.
+ mSimSelectNotification.onReceive(mContext, intent);
+ verify(mNotificationManager, never()).createNotificationChannel(any());
+ }
+
+ @Test
public void onReceivePrimarySubListChange_NoExtra_notificationShouldNotSend() {
Intent intent = new Intent(TelephonyManager.ACTION_PRIMARY_SUBSCRIPTION_LIST_CHANGED);
diff --git a/tests/unit/src/com/android/settings/network/telephony/SatelliteSettingsSosFooterPreferenceControllerTest.java b/tests/unit/src/com/android/settings/network/telephony/SatelliteSettingsSosFooterPreferenceControllerTest.java
index 7aa6535..498ebce 100644
--- a/tests/unit/src/com/android/settings/network/telephony/SatelliteSettingsSosFooterPreferenceControllerTest.java
+++ b/tests/unit/src/com/android/settings/network/telephony/SatelliteSettingsSosFooterPreferenceControllerTest.java
@@ -19,6 +19,7 @@
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.os.Looper;
@@ -32,6 +33,7 @@
import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.mockito.Mock;
import org.mockito.junit.MockitoJUnit;
import org.mockito.junit.MockitoRule;
@@ -42,8 +44,10 @@
@Rule
public final MockitoRule mMockitoRule = MockitoJUnit.rule();
- private Context mContext = null;
+ @Mock
private FooterPreference mFooterPreference;
+
+ private Context mContext = null;
private SatelliteSettingsSosFooterPreferenceController mController;
@Before
@@ -52,8 +56,7 @@
Looper.prepare();
}
mContext = spy(ApplicationProvider.getApplicationContext());
- mFooterPreference = spy(new FooterPreference(mContext));
- mFooterPreference.setKey(KEY);
+ when(mFooterPreference.getKey()).thenReturn(KEY);
mController = new SatelliteSettingsSosFooterPreferenceController(mContext, KEY);
}