From 51507b9cc3ce5d177bfb571aa5634d1f057122ee Mon Sep 17 00:00:00 2001 From: Aayush Gupta Date: Wed, 26 May 2021 10:17:03 +0200 Subject: [PATCH 01/20] Settings: res: Set proper title for system version Signed-off-by: Aayush Gupta Change-Id: I3146e445e7b299086a566a66f8a13708699a91f7 Signed-off-by: althafvly --- res/values/cm_strings.xml | 5 +++++ res/xml/firmware_version.xml | 3 ++- res/xml/my_device_info.xml | 3 ++- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml index 45bab9b84fe..b36e8531aa5 100644 --- a/res/values/cm_strings.xml +++ b/res/values/cm_strings.xml @@ -183,4 +183,9 @@ Warning: This option may not work properly or lead to data loss and is therefore not recommended! + + + + + /e/ OS version diff --git a/res/xml/firmware_version.xml b/res/xml/firmware_version.xml index 4eb25fd5786..8d78dcd0312 100644 --- a/res/xml/firmware_version.xml +++ b/res/xml/firmware_version.xml @@ -33,8 +33,9 @@ diff --git a/res/xml/my_device_info.xml b/res/xml/my_device_info.xml index 7eeffee2095..1135e794d18 100644 --- a/res/xml/my_device_info.xml +++ b/res/xml/my_device_info.xml @@ -136,8 +136,9 @@ -- GitLab From d0d789c061d3facd960f4c9cba0c82d135cc9d88 Mon Sep 17 00:00:00 2001 From: TheScarastic Date: Mon, 22 Aug 2022 13:43:49 +0000 Subject: [PATCH 02/20] Settings: Add /e/ legal --- res/values/cm_strings.xml | 3 + res/xml/about_legal.xml | 6 ++ .../legal/ELicensePreferenceController.java | 63 +++++++++++++++++++ 3 files changed, 72 insertions(+) create mode 100644 src/com/android/settings/deviceinfo/legal/ELicensePreferenceController.java diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml index b36e8531aa5..be98f6f91ff 100644 --- a/res/values/cm_strings.xml +++ b/res/values/cm_strings.xml @@ -188,4 +188,7 @@ /e/ OS version + + + /e/ legal diff --git a/res/xml/about_legal.xml b/res/xml/about_legal.xml index a36ab66a601..a63a74a8881 100644 --- a/res/xml/about_legal.xml +++ b/res/xml/about_legal.xml @@ -41,6 +41,12 @@ android:title="@string/lineagelicense_title" settings:controller="com.android.settings.deviceinfo.legal.LineageLicensePreferenceController" /> + + + { + mContext.startActivity(getIntent()); + return true; + }); + } + } + + @Override + public int getAvailabilityStatus() { + if (getIntent().resolveActivity(mContext.getPackageManager()) != null) { + return AVAILABLE; + } else { + return UNSUPPORTED_ON_DEVICE; + } + } + + private Intent getIntent() { + return new Intent(Intent.ACTION_VIEW, + Uri.parse(SystemProperties.get(PROPERTY_E_LICENSE_URL))); + } +} -- GitLab From dae201ce03f1eea4665f811be1405367b83e71ae Mon Sep 17 00:00:00 2001 From: Mohit Mali Date: Tue, 27 Oct 2020 16:33:04 +0000 Subject: [PATCH 03/20] Settings: Move updater to top of settings main page Signed-off-by: Aayush Gupta --- res/values/cm_strings.xml | 3 +++ res/xml/system_dashboard_fragment.xml | 11 ----------- res/xml/top_level_settings.xml | 12 ++++++++++++ .../system/SystemUpdatePreferenceController.java | 2 +- 4 files changed, 16 insertions(+), 12 deletions(-) diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml index be98f6f91ff..031d1d811bf 100644 --- a/res/values/cm_strings.xml +++ b/res/values/cm_strings.xml @@ -191,4 +191,7 @@ /e/ legal + + + Updates, preferences, release notes diff --git a/res/xml/system_dashboard_fragment.xml b/res/xml/system_dashboard_fragment.xml index 9228ddd5f5a..fa0d100ed81 100644 --- a/res/xml/system_dashboard_fragment.xml +++ b/res/xml/system_dashboard_fragment.xml @@ -54,17 +54,6 @@ android:targetClass="@string/additional_system_update_menu"/> - - - - diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml index 031d1d811bf..d2c3621bdfe 100644 --- a/res/values/cm_strings.xml +++ b/res/values/cm_strings.xml @@ -194,4 +194,10 @@ Updates, preferences, release notes + + + Connect to /e/ OS test channel + Access test releases of /e/ OS + You are about to connect to /e/ OS test channel + It will allow you to download and install test versions of /e/ OS. Those builds may be unstable, and should be used only for test purposes. Please accept only if you know what you are doing. diff --git a/res/xml/development_settings.xml b/res/xml/development_settings.xml index 160d81d83ce..90461a8327c 100644 --- a/res/xml/development_settings.xml +++ b/res/xml/development_settings.xml @@ -669,6 +669,11 @@ + + 0; + } + + private String retrieveStatus() { + Cursor cursor = mContext.getContentResolver().query(Uri.parse(UPDATE_URI), null, OTAProvider.id + "=?", new String[]{"1"}, OTAProvider.Status); + if (cursor.moveToFirst()) { + do { + status = cursor.getString(cursor.getColumnIndex(OTAProvider.Status)); + } while (cursor.moveToNext()); + } + return status; + } +} diff --git a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java index 70237e061ff..f1110b436ff 100644 --- a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java +++ b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java @@ -1,5 +1,6 @@ /* * Copyright (C) 2017 The Android Open Source Project + * Copyright (C) 2021 ECORP SAS * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -560,6 +561,7 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra controllers.add(new BluetoothMaxConnectedAudioDevicesPreferenceController(context)); controllers.add(new NfcStackDebugLogPreferenceController(context)); controllers.add(new ShowTapsPreferenceController(context)); + controllers.add(new ChangeSourcePreferenceController(context)); controllers.add(new PointerLocationPreferenceController(context)); controllers.add(new ShowSurfaceUpdatesPreferenceController(context)); controllers.add(new ShowLayoutBoundsPreferenceController(context)); diff --git a/src/com/android/settings/development/OTAProvider.java b/src/com/android/settings/development/OTAProvider.java new file mode 100644 index 00000000000..58ec5a78294 --- /dev/null +++ b/src/com/android/settings/development/OTAProvider.java @@ -0,0 +1,158 @@ +/* + * Copyright (C) 2021 ECORP SAS + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy + * of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. + */ + +package com.android.settings.development; + +import android.content.ContentProvider; +import android.content.ContentUris; +import android.content.ContentValues; +import android.content.Context; +import android.content.UriMatcher; +import android.database.Cursor; +import android.database.SQLException; +import android.database.sqlite.SQLiteDatabase; +import android.database.sqlite.SQLiteOpenHelper; +import android.database.sqlite.SQLiteQueryBuilder; +import android.net.Uri; + +import java.util.HashMap; + +public class OTAProvider extends ContentProvider { + + static final String PROVIDER_NAME = "custom.setting.Provider.OTA_SERVER"; + static final String URL = "content://" + PROVIDER_NAME + "/cte"; + static final Uri CONTENT_URI = Uri.parse(URL); + + static final String id = "id"; + static final String Status = "Status"; + static final int uriCode = 1; + static final UriMatcher uriMatcher; + static final String DATABASE_NAME = "mydb"; + static final String TABLE_NAME = "ota"; + static final int DATABASE_VERSION = 1; + static final String CREATE_DB_TABLE = " CREATE TABLE " + TABLE_NAME + + " (id INTEGER PRIMARY KEY AUTOINCREMENT, " + + " Status TEXT NOT NULL);"; + private static HashMap values; + + static { + uriMatcher = new UriMatcher(UriMatcher.NO_MATCH); + uriMatcher.addURI(PROVIDER_NAME, "cte", uriCode); + uriMatcher.addURI(PROVIDER_NAME, "cte/*", uriCode); + } + + private SQLiteDatabase db; + + @Override + public boolean onCreate() { + Context context = getContext(); + DatabaseHelper dbHelper = new DatabaseHelper(context); + db = dbHelper.getWritableDatabase(); + return db != null; + } + + @Override + public Cursor query(Uri uri, String[] projection, String selection, + String[] selectionArgs, String sortOrder) { + SQLiteQueryBuilder qb = new SQLiteQueryBuilder(); + qb.setTables(TABLE_NAME); + + switch (uriMatcher.match(uri)) { + case uriCode: + qb.setProjectionMap(values); + break; + default: + throw new IllegalArgumentException("Unknown URI " + uri); + } + if (sortOrder == null || sortOrder == "") { + sortOrder = Status; + } + Cursor c = qb.query(db, projection, selection, selectionArgs, null, + null, sortOrder); + c.setNotificationUri(getContext().getContentResolver(), uri); + return c; + } + + + @Override + public String getType(Uri uri) { + switch (uriMatcher.match(uri)) { + case uriCode: + return "vnd.android.cursor.dir/cte"; + + default: + throw new IllegalArgumentException("Unsupported URI: " + uri); + } + } + + @Override + public Uri insert(Uri uri, ContentValues values) { + long rowID = db.insert(TABLE_NAME, "", values); + if (rowID > 0) { + Uri _uri = ContentUris.withAppendedId(CONTENT_URI, rowID); + getContext().getContentResolver().notifyChange(_uri, null); + return _uri; + } + throw new SQLException("Failed to add a record into " + uri); + } + + @Override + public int delete(Uri uri, String selection, String[] selectionArgs) { + int count = 0; + switch (uriMatcher.match(uri)) { + case uriCode: + count = db.delete(TABLE_NAME, selection, selectionArgs); + break; + default: + throw new IllegalArgumentException("Unknown URI " + uri); + } + getContext().getContentResolver().notifyChange(uri, null); + return count; + } + + @Override + public int update(Uri uri, ContentValues values, String selection, + String[] selectionArgs) { + int count = 0; + switch (uriMatcher.match(uri)) { + case uriCode: + count = db.update(TABLE_NAME, values, selection, selectionArgs); + break; + default: + throw new IllegalArgumentException("Unknown URI " + uri); + } + getContext().getContentResolver().notifyChange(uri, null); + return count; + } + + + private static class DatabaseHelper extends SQLiteOpenHelper { + DatabaseHelper(Context context) { + super(context, DATABASE_NAME, null, DATABASE_VERSION); + } + + @Override + public void onCreate(SQLiteDatabase db) { + db.execSQL(CREATE_DB_TABLE); + } + + @Override + public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) { + db.execSQL("DROP TABLE IF EXISTS " + TABLE_NAME); + onCreate(db); + } + } +} -- GitLab From 93c76622c4e2c349e0eb68e92bed22200ffebecd Mon Sep 17 00:00:00 2001 From: Abhishek Aggarwal Date: Wed, 23 Mar 2022 15:35:02 +0000 Subject: [PATCH 05/20] Settings: Integrate Privacy Central into settings Settings: Change packagename for advanced privacy * ALso explicitly specify component name --- res/drawable/ic_homepage_advanced_privacy.xml | 39 ++++++++++++++ res/values/cm_strings.xml | 4 ++ .../advanced_privacy_dashboard_settings.xml | 28 ++++++++++ res/xml/top_level_settings.xml | 8 +++ .../core/gateway/SettingsGateway.java | 4 +- .../dashboard/DashboardFragmentRegistry.java | 3 ++ .../AdvancedPrivacyDashboardFragment.java | 52 +++++++++++++++++++ 7 files changed, 137 insertions(+), 1 deletion(-) create mode 100644 res/drawable/ic_homepage_advanced_privacy.xml create mode 100644 res/xml/advanced_privacy_dashboard_settings.xml create mode 100644 src/com/android/settings/privacy/AdvancedPrivacyDashboardFragment.java diff --git a/res/drawable/ic_homepage_advanced_privacy.xml b/res/drawable/ic_homepage_advanced_privacy.xml new file mode 100644 index 00000000000..c75e102402b --- /dev/null +++ b/res/drawable/ic_homepage_advanced_privacy.xml @@ -0,0 +1,39 @@ + + + + + + + diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml index d2c3621bdfe..a2092b06864 100644 --- a/res/values/cm_strings.xml +++ b/res/values/cm_strings.xml @@ -200,4 +200,8 @@ Access test releases of /e/ OS You are about to connect to /e/ OS test channel It will allow you to download and install test versions of /e/ OS. Those builds may be unstable, and should be used only for test purposes. Please accept only if you know what you are doing. + + + Advanced Privacy + Manage trackers, fake location, hide IP address diff --git a/res/xml/advanced_privacy_dashboard_settings.xml b/res/xml/advanced_privacy_dashboard_settings.xml new file mode 100644 index 00000000000..8433a4402a8 --- /dev/null +++ b/res/xml/advanced_privacy_dashboard_settings.xml @@ -0,0 +1,28 @@ + + + + + + + + + diff --git a/res/xml/top_level_settings.xml b/res/xml/top_level_settings.xml index a6c39d69209..995785870b8 100644 --- a/res/xml/top_level_settings.xml +++ b/res/xml/top_level_settings.xml @@ -167,6 +167,14 @@ settings:highlightableMenuKey="@string/menu_key_privacy" settings:controller="com.android.settings.privacy.TopLevelPrivacyEntryPreferenceController"/> + + Date: Tue, 5 Apr 2022 12:06:30 +0000 Subject: [PATCH 06/20] Settings: mark eDrive as safe to be opened by accountManager --- .../settings/accounts/AccountTypePreferenceLoader.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/com/android/settings/accounts/AccountTypePreferenceLoader.java b/src/com/android/settings/accounts/AccountTypePreferenceLoader.java index f1b5be109d2..2c075c14cba 100644 --- a/src/com/android/settings/accounts/AccountTypePreferenceLoader.java +++ b/src/com/android/settings/accounts/AccountTypePreferenceLoader.java @@ -199,6 +199,11 @@ public class AccountTypePreferenceLoader { } ActivityInfo resolvedActivityInfo = resolveInfo.activityInfo; ApplicationInfo resolvedAppInfo = resolvedActivityInfo.applicationInfo; + + if (resolvedActivityInfo.packageName.equals("foundation.e.drive")) { + return true; + } + try { // Allows to launch only authenticator owned activities. ApplicationInfo authenticatorAppInf = pm.getApplicationInfo(authDesc.packageName, 0); -- GitLab From 14bbfaa97e7af44f87893b1c261fd682f8561893 Mon Sep 17 00:00:00 2001 From: TheScarastic Date: Fri, 15 Jul 2022 05:02:01 +0000 Subject: [PATCH 07/20] Settings: Notify users all their accounts will be removed and not just google --- res/layout/main_clear.xml | 2 +- res/values/cm_strings.xml | 4 ++++ tests/robotests/res/layout/main_clear.xml | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/res/layout/main_clear.xml b/res/layout/main_clear.xml index a2464e2c986..618fef293a6 100644 --- a/res/layout/main_clear.xml +++ b/res/layout/main_clear.xml @@ -42,7 +42,7 @@ android:id="@+id/sud_layout_description" android:layout_width="match_parent" android:layout_height="wrap_content" - android:text="@string/main_clear_desc"/> + android:text="@string/main_clear_desc_e"/> Advanced Privacy Manage trackers, fake location, hide IP address + + + This will erase all data from your tablet\u2019s internal storage, including:\n\n
  • All your account
    • \n
  • System and app data and settings
    • \n
  • Downloaded apps
    •  + This will erase all data from your phone\u2019s internal storage, including:\n\n
  • All your account
    • \n
  • System and app data and settings
    • \n
  • Downloaded apps
    •  diff --git a/tests/robotests/res/layout/main_clear.xml b/tests/robotests/res/layout/main_clear.xml index b9a126d423f..81fa94353f1 100644 --- a/tests/robotests/res/layout/main_clear.xml +++ b/tests/robotests/res/layout/main_clear.xml @@ -42,7 +42,7 @@ android:id="@+id/sud_layout_description" android:layout_width="match_parent" android:layout_height="wrap_content" - android:text="@string/main_clear_desc"/> + android:text="@string/main_clear_desc_e"/> Date: Wed, 14 Sep 2022 12:09:39 +0000 Subject: [PATCH 08/20] Settings: Change updater summary for /e/OS version --- res/values/cm_strings.xml | 3 +++ .../settings/system/SystemUpdatePreferenceController.java | 7 +++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml index df63ccd8765..c9b68bde482 100644 --- a/res/values/cm_strings.xml +++ b/res/values/cm_strings.xml @@ -208,4 +208,7 @@ This will erase all data from your tablet\u2019s internal storage, including:\n\n
  • All your account
    • \n
  • System and app data and settings
    • \n
  • Downloaded apps
    •  This will erase all data from your phone\u2019s internal storage, including:\n\n
  • All your account
    • \n
  • System and app data and settings
    • \n
  • Downloaded apps
    •  + + + Updated to /e/OS v%1$s diff --git a/src/com/android/settings/system/SystemUpdatePreferenceController.java b/src/com/android/settings/system/SystemUpdatePreferenceController.java index fa6a4112821..c83c12b048e 100644 --- a/src/com/android/settings/system/SystemUpdatePreferenceController.java +++ b/src/com/android/settings/system/SystemUpdatePreferenceController.java @@ -23,6 +23,7 @@ import android.content.Intent; import android.os.Build; import android.os.Bundle; import android.os.PersistableBundle; +import android.os.SystemProperties; import android.os.SystemUpdateManager; import android.os.UserManager; import android.telephony.CarrierConfigManager; @@ -45,6 +46,8 @@ public class SystemUpdatePreferenceController extends BasePreferenceController { private static final String KEY_SYSTEM_UPDATE_SETTINGS = "top_level_update"; + private static final String E_OS_VERSION_PROP = "ro.lineage.build.version"; + private final UserManager mUm; private final SystemUpdateManager mUpdateManager; @@ -88,8 +91,8 @@ public class SystemUpdatePreferenceController extends BasePreferenceController { @Override public CharSequence getSummary() { - CharSequence summary = mContext.getString(R.string.android_version_summary, - Build.VERSION.RELEASE_OR_PREVIEW_DISPLAY); + CharSequence summary = mContext.getString(R.string.e_version_summary, + SystemProperties.get(E_OS_VERSION_PROP)); final FutureTask bundleFutureTask = new FutureTask<>( // Put the API call in a future to avoid StrictMode violation. () -> mUpdateManager.retrieveSystemUpdateInfo()); -- GitLab From 20d48253a5b588b339340cd4e9ff47a48802bab2 Mon Sep 17 00:00:00 2001 From: TheScarastic Date: Wed, 21 Sep 2022 07:17:01 +0000 Subject: [PATCH 09/20] Settings: Add support for more status in updater summary --- res/values/cm_strings.xml | 3 +++ .../SystemUpdatePreferenceController.java | 23 +++++++++---------- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml index c9b68bde482..19f2354e2ea 100644 --- a/res/values/cm_strings.xml +++ b/res/values/cm_strings.xml @@ -211,4 +211,7 @@ Updated to /e/OS v%1$s + /e/OS v%1$s - update available + /e/OS v%1$s - update in progress + /e/OS v%1$s - installed reboot required diff --git a/src/com/android/settings/system/SystemUpdatePreferenceController.java b/src/com/android/settings/system/SystemUpdatePreferenceController.java index c83c12b048e..f2727cbae4a 100644 --- a/src/com/android/settings/system/SystemUpdatePreferenceController.java +++ b/src/com/android/settings/system/SystemUpdatePreferenceController.java @@ -91,8 +91,8 @@ public class SystemUpdatePreferenceController extends BasePreferenceController { @Override public CharSequence getSummary() { - CharSequence summary = mContext.getString(R.string.e_version_summary, - SystemProperties.get(E_OS_VERSION_PROP)); + final String currentVersion = SystemProperties.get(E_OS_VERSION_PROP); + CharSequence summary = mContext.getString(R.string.e_version_summary, currentVersion); final FutureTask bundleFutureTask = new FutureTask<>( // Put the API call in a future to avoid StrictMode violation. () -> mUpdateManager.retrieveSystemUpdateInfo()); @@ -104,21 +104,20 @@ public class SystemUpdatePreferenceController extends BasePreferenceController { Log.w(TAG, "Error getting system update info."); return summary; } + + String version = updateInfo.getString(SystemUpdateManager.KEY_TITLE); switch (updateInfo.getInt(SystemUpdateManager.KEY_STATUS)) { case SystemUpdateManager.STATUS_WAITING_DOWNLOAD: + summary = mContext.getString(R.string.e_version_pending_update_summary, version); + break; case SystemUpdateManager.STATUS_IN_PROGRESS: - case SystemUpdateManager.STATUS_WAITING_INSTALL: + summary = mContext.getString(R.string.e_version_in_progress_update_summary, version); + break; case SystemUpdateManager.STATUS_WAITING_REBOOT: - summary = mContext.getText(R.string.android_version_pending_update_summary); + summary = mContext.getString(R.string.e_version_reboot_pending_summary, version); break; - case SystemUpdateManager.STATUS_UNKNOWN: - Log.d(TAG, "Update statue unknown"); - // fall through to next branch - case SystemUpdateManager.STATUS_IDLE: - final String version = updateInfo.getString(SystemUpdateManager.KEY_TITLE); - if (!TextUtils.isEmpty(version)) { - summary = mContext.getString(R.string.android_version_summary, version); - } + default: + summary = mContext.getString(R.string.e_version_summary, currentVersion); break; } return summary; -- GitLab From bff72880db3ca1c9f90af18ede685a190aa6f2bf Mon Sep 17 00:00:00 2001 From: Nishith Khanna Date: Thu, 1 Sep 2022 17:35:32 +0530 Subject: [PATCH 10/20] Change app icon to our custom icon --- res/drawable/ic_launcher_background.xml | 37 ++++++++++++---- res/drawable/ic_launcher_foreground.xml | 56 +++++++++++++++---------- res/drawable/ic_launcher_monochrome.xml | 15 ------- res/drawable/ic_launcher_settings.xml | 24 ++++++++--- 4 files changed, 80 insertions(+), 52 deletions(-) delete mode 100644 res/drawable/ic_launcher_monochrome.xml diff --git a/res/drawable/ic_launcher_background.xml b/res/drawable/ic_launcher_background.xml index 8c651550f93..b91ae327864 100644 --- a/res/drawable/ic_launcher_background.xml +++ b/res/drawable/ic_launcher_background.xml @@ -1,18 +1,37 @@ + ~ Copyright ECORP SAS 2022 + ~ This program is free software: you can redistribute it and/or modify + ~ it under the terms of the GNU General Public License as published by + ~ the Free Software Foundation, either version 3 of the License, or + ~ (at your option) any later version. + ~ + ~ This program is distributed in the hope that it will be useful, + ~ but WITHOUT ANY WARRANTY; without even the implied warranty of + ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + ~ GNU General Public License for more details. + ~ + ~ You should have received a copy of the GNU General Public License + ~ along with this program. If not, see . + --> - + android:pathData="M0,0h108v108h-108z"> + + + + + + + diff --git a/res/drawable/ic_launcher_foreground.xml b/res/drawable/ic_launcher_foreground.xml index 4d28d393e2b..91e4ce3eee7 100644 --- a/res/drawable/ic_launcher_foreground.xml +++ b/res/drawable/ic_launcher_foreground.xml @@ -1,36 +1,48 @@ + ~ Copyright ECORP SAS 2022 + ~ This program is free software: you can redistribute it and/or modify + ~ it under the terms of the GNU General Public License as published by + ~ the Free Software Foundation, either version 3 of the License, or + ~ (at your option) any later version. + ~ + ~ This program is distributed in the hope that it will be useful, + ~ but WITHOUT ANY WARRANTY; without even the implied warranty of + ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + ~ GNU General Public License for more details. + ~ + ~ You should have received a copy of the GNU General Public License + ~ along with this program. If not, see . + --> + + android:pathData="M54,28C47.1,28 40.49,30.74 35.62,35.62C30.74,40.49 28,47.1 28,54C28,57.41 28.67,60.8 29.98,63.95C31.29,67.1 33.2,69.97 35.62,72.38C38.03,74.8 40.9,76.71 44.05,78.02C47.2,79.33 50.59,80 54,80C57.41,80 60.8,79.33 63.95,78.02C67.1,76.71 69.97,74.8 72.38,72.38C74.8,69.97 76.71,67.1 78.02,63.95C79.33,60.8 80,57.41 80,54C80,47.1 77.26,40.49 72.38,35.62C67.51,30.74 60.9,28 54,28Z"/> + android:pathData="M84.83,38.39L87.36,37.89C87.33,37.49 87.29,37.09 87.24,36.69H84.66C84.59,36.22 84.5,35.76 84.39,35.31L86.77,34.33C86.67,33.94 86.54,33.55 86.4,33.17L83.88,33.68C83.72,33.23 83.54,32.8 83.34,32.38L85.48,30.95C85.3,30.58 85.11,30.21 84.91,29.88L82.53,30.87C82.29,30.47 82.03,30.08 81.75,29.7L83.57,27.88C83.33,27.57 83.07,27.25 82.8,26.95L80.67,28.38C80.35,28.04 80.02,27.71 79.67,27.39L81.1,25.25C80.8,24.99 80.49,24.73 80.17,24.48L78.35,26.3C77.98,26.03 77.59,25.77 77.18,25.52L78.17,23.15C77.82,22.94 77.47,22.75 77.11,22.57L75.68,24.72C75.26,24.52 74.82,24.35 74.38,24.18L74.88,21.65C74.52,21.53 74.12,21.4 73.73,21.29L72.74,23.67C72.29,23.56 71.83,23.46 71.37,23.39V20.82C70.97,20.76 70.57,20.72 70.16,20.69L69.66,23.22C69.43,23.22 69.19,23.22 68.96,23.22C68.72,23.22 68.49,23.22 68.25,23.22L67.76,20.69C67.35,20.72 66.95,20.76 66.55,20.82V23.39C66.09,23.46 65.63,23.56 65.18,23.67L64.19,21.29C63.8,21.39 63.42,21.51 63.04,21.65L63.54,24.18C63.1,24.34 62.67,24.52 62.24,24.72L60.81,22.57C60.44,22.75 60.1,22.94 59.75,23.15L60.74,25.52C60.33,25.77 59.95,26.03 59.57,26.3L57.75,24.48C57.43,24.73 57.12,24.99 56.82,25.25L58.25,27.39C57.9,27.71 57.57,28.04 57.25,28.38L55.12,26.95C54.85,27.25 54.59,27.57 54.35,27.88L56.17,29.7C55.9,30.07 55.63,30.47 55.39,30.87L53.01,29.88C52.81,30.23 52.62,30.58 52.44,30.95L54.58,32.38C54.39,32.8 54.21,33.23 54.04,33.68L51.52,33.17C51.39,33.54 51.27,33.94 51.15,34.33L53.54,35.31C53.43,35.76 53.33,36.22 53.26,36.69H50.68C50.63,37.09 50.59,37.49 50.57,37.89L53.09,38.39C53.09,38.63 53.09,38.86 53.09,39.1C53.09,39.33 53.09,39.56 53.09,39.8L50.57,40.3C50.59,40.7 50.63,41.1 50.68,41.5H53.26C53.33,41.96 53.43,42.42 53.54,42.88L51.15,43.86C51.26,44.25 51.38,44.64 51.52,45.02L54.04,44.51C54.2,44.96 54.39,45.39 54.58,45.81L52.44,47.24C52.62,47.61 52.81,47.96 53.01,48.31L55.39,47.32C55.63,47.72 55.9,48.11 56.17,48.48L54.35,50.32C54.59,50.64 54.85,50.95 55.12,51.26L57.25,49.83C57.57,50.17 57.9,50.5 58.25,50.82L56.82,52.95C57.12,53.22 57.43,53.48 57.75,53.72L59.57,51.9C59.94,52.18 60.33,52.44 60.74,52.69L59.75,55.06C60.12,55.26 60.45,55.45 60.81,55.63L62.24,53.49C62.67,53.69 63.1,53.86 63.54,54.03L63.04,56.55C63.4,56.68 63.8,56.8 64.19,56.9L65.18,54.52C65.63,54.63 66.09,54.73 66.55,54.8V57.38C66.95,57.43 67.35,57.47 67.76,57.49L68.25,54.96C68.49,54.96 68.72,54.96 68.96,54.96C69.19,54.96 69.43,54.96 69.66,54.96L70.16,57.49C70.57,57.47 70.97,57.43 71.37,57.38V54.8C71.83,54.73 72.29,54.63 72.74,54.52L73.73,56.9C74.12,56.8 74.5,56.68 74.88,56.55L74.38,54.03C74.82,53.87 75.26,53.69 75.68,53.49L77.11,55.63C77.47,55.45 77.82,55.27 78.17,55.06L77.18,52.69C77.59,52.44 77.98,52.18 78.35,51.9L80.17,53.72C80.49,53.48 80.8,53.22 81.1,52.95L79.67,50.82C80.02,50.5 80.35,50.17 80.67,49.83L82.8,51.26C83.07,50.95 83.33,50.64 83.57,50.32L81.75,48.48C82.03,48.11 82.29,47.72 82.53,47.32L84.91,48.31C85.11,47.96 85.3,47.6 85.48,47.24L83.34,45.81C83.54,45.39 83.71,44.96 83.88,44.51L86.4,45.02C86.53,44.65 86.65,44.25 86.77,43.86L84.39,42.88C84.5,42.42 84.59,41.96 84.66,41.5H87.24C87.29,41.1 87.33,40.7 87.36,40.3L84.83,39.8C84.83,39.56 84.83,39.33 84.83,39.1C84.83,38.86 84.84,38.63 84.83,38.39ZM82.76,39.1C82.76,40.91 82.41,42.7 81.71,44.37C81.02,46.04 80.01,47.56 78.73,48.84C77.45,50.12 75.93,51.13 74.26,51.83C72.59,52.52 70.79,52.87 68.98,52.87C67.17,52.87 65.38,52.52 63.71,51.82C62.04,51.13 60.52,50.12 59.24,48.84C57.96,47.56 56.95,46.04 56.26,44.37C55.56,42.7 55.21,40.91 55.21,39.1C55.21,37.29 55.56,35.5 56.25,33.82C56.95,32.15 57.96,30.63 59.24,29.35C60.52,28.07 62.04,27.06 63.71,26.37C65.38,25.67 67.17,25.32 68.98,25.32C70.79,25.32 72.59,25.67 74.26,26.37C75.93,27.06 77.45,28.08 78.73,29.36C80.01,30.64 81.03,32.16 81.72,33.83C82.41,35.5 82.77,37.3 82.76,39.11V39.1Z" + android:strokeAlpha="0.25" + android:fillColor="#838484" + android:fillAlpha="0.25"/> + android:pathData="M94.97,37.95L99.11,37.12C99.07,36.46 99,35.8 98.91,35.15H94.7C94.58,34.39 94.43,33.64 94.24,32.9L98.15,31.28C97.98,30.64 97.78,30.01 97.57,29.38L93.44,30.21C93.17,29.48 92.87,28.78 92.55,28.08L96.07,25.74C95.77,25.15 95.46,24.56 95.13,24L91.23,25.61C90.83,24.95 90.4,24.32 89.95,23.7L92.94,20.72C92.53,20.19 92.11,19.68 91.67,19.18L88.17,21.53C87.65,20.97 87.11,20.42 86.54,19.91L88.89,16.4C88.4,15.96 87.89,15.54 87.36,15.14L84.38,18.13C83.76,17.67 83.12,17.24 82.47,16.84L84.08,12.95C83.51,12.62 82.93,12.3 82.34,12.01L79.99,15.53C79.3,15.2 78.59,14.9 77.87,14.64L78.69,10.5C78.07,10.29 77.44,10.1 76.8,9.92L75.18,13.83C74.45,13.65 73.69,13.49 72.93,13.38V9.16C72.27,9.08 71.62,9.01 70.95,8.97L70.13,13.11C69.76,13.09 69.37,13.08 68.98,13.08C68.59,13.08 68.21,13.08 67.83,13.11L67.01,8.97C66.34,9.01 65.69,9.08 65.04,9.16V13.38C64.27,13.49 63.52,13.65 62.78,13.83L61.17,9.92C60.52,10.1 59.89,10.29 59.27,10.5L60.1,14.64C59.36,14.9 58.66,15.2 57.97,15.53L55.63,12.01C55.03,12.3 54.45,12.62 53.88,12.95L55.5,16.84C54.84,17.24 54.2,17.67 53.58,18.13L50.6,15.14C50.08,15.54 49.57,15.96 49.07,16.4L51.42,19.91C50.85,20.42 50.31,20.97 49.79,21.53L46.29,19.18C45.85,19.68 45.43,20.19 45.03,20.72L48.01,23.7C47.56,24.32 47.13,24.95 46.73,25.61L42.83,24C42.51,24.57 42.19,25.15 41.89,25.74L45.41,28.08C45.09,28.78 44.79,29.49 44.53,30.21L40.39,29.38C40.18,30.01 39.98,30.64 39.81,31.28L43.72,32.9C43.54,33.63 43.38,34.37 43.26,35.15H39.05C38.96,35.8 38.9,36.46 38.85,37.12L42.99,37.95C42.99,38.31 42.97,38.71 42.97,39.1C42.97,39.48 42.97,39.87 42.99,40.25L38.85,41.07C38.9,41.73 38.96,42.39 39.05,43.04H43.26C43.38,43.8 43.54,44.56 43.72,45.3L39.81,46.91C39.98,47.55 40.18,48.18 40.39,48.81L44.53,47.98C44.79,48.72 45.09,49.41 45.41,50.11L41.89,52.45C42.19,53.05 42.51,53.62 42.83,54.2L46.73,52.58C47.13,53.24 47.56,53.87 48.01,54.49L45.03,57.47C45.43,58 45.85,58.51 46.29,59.01L49.79,56.66C50.31,57.22 50.85,57.76 51.42,58.28L49.07,61.79C49.57,62.23 50.08,62.65 50.6,63.05L53.58,60.06C54.2,60.52 54.84,60.95 55.5,61.35L53.88,65.24C54.45,65.57 55.03,65.89 55.63,66.18L57.97,62.66C58.66,62.99 59.37,63.29 60.1,63.55L59.27,67.69C59.89,67.9 60.52,68.1 61.17,68.27L62.78,64.36C63.51,64.54 64.27,64.7 65.04,64.81V69.03C65.69,69.11 66.34,69.18 67.01,69.22L67.83,65.08C68.2,65.1 68.59,65.11 68.98,65.11C69.37,65.11 69.75,65.11 70.13,65.08L70.95,69.22C71.62,69.18 72.27,69.11 72.93,69.03V64.81C73.69,64.7 74.44,64.54 75.18,64.36L76.8,68.27C77.44,68.1 78.07,67.9 78.69,67.69L77.87,63.55C78.6,63.29 79.3,62.99 79.99,62.66L82.34,66.18C82.93,65.89 83.51,65.57 84.08,65.24L82.47,61.35C83.12,60.95 83.76,60.52 84.38,60.06L87.36,63.05C87.88,62.65 88.4,62.23 88.89,61.79L86.54,58.28C87.11,57.77 87.65,57.22 88.17,56.66L91.67,59.01C92.11,58.51 92.54,58 92.94,57.47L89.95,54.49C90.4,53.87 90.83,53.24 91.23,52.58L95.13,54.2C95.46,53.62 95.77,53.05 96.07,52.45L92.55,50.11C92.87,49.41 93.17,48.71 93.44,47.98L97.57,48.81C97.78,48.18 97.98,47.55 98.15,46.91L94.24,45.3C94.43,44.56 94.58,43.8 94.7,43.04H98.9C98.99,42.39 99.05,41.73 99.1,41.07L94.95,40.25C94.97,39.88 94.98,39.48 94.98,39.1C94.98,38.71 94.98,38.33 94.97,37.95ZM91.57,39.1C91.57,45.09 89.19,50.83 84.96,55.07C80.72,59.31 74.97,61.69 68.98,61.69C62.99,61.69 57.25,59.31 53.01,55.07C48.78,50.83 46.4,45.09 46.4,39.1C46.4,33.11 48.78,27.36 53.01,23.12C57.25,18.89 62.99,16.51 68.98,16.51C71.95,16.51 74.89,17.09 77.63,18.23C80.37,19.36 82.86,21.03 84.96,23.13C87.06,25.23 88.72,27.72 89.86,30.46C90.99,33.2 91.57,36.14 91.57,39.11V39.1Z" + android:fillColor="#838484"/> - - - - - - - + android:pathData="M80.66,39.11C80.66,36.01 79.43,33.04 77.24,30.85C75.05,28.66 72.08,27.43 68.98,27.43C67.45,27.43 65.93,27.73 64.52,28.32C63.1,28.91 61.81,29.77 60.73,30.85C59.65,31.94 58.79,33.22 58.2,34.64C57.61,36.06 57.31,37.58 57.31,39.11C57.31,40.64 57.61,42.16 58.2,43.58C58.79,44.99 59.65,46.28 60.73,47.36C61.82,48.45 63.1,49.31 64.52,49.89C65.94,50.48 67.45,50.78 68.99,50.78C72.08,50.78 75.05,49.55 77.24,47.36C79.43,45.17 80.66,42.2 80.66,39.11ZM72.82,39.11C72.82,40.13 72.42,41.1 71.7,41.82C70.98,42.54 70,42.94 68.98,42.94C67.97,42.94 66.99,42.54 66.27,41.82C65.55,41.1 65.15,40.13 65.15,39.11C65.15,38.6 65.25,38.11 65.44,37.64C65.63,37.17 65.91,36.75 66.27,36.39C66.63,36.04 67.05,35.75 67.52,35.56C67.98,35.37 68.48,35.27 68.98,35.27C69.49,35.27 69.99,35.37 70.45,35.56C70.92,35.75 71.34,36.04 71.7,36.39C72.05,36.75 72.34,37.17 72.53,37.64C72.72,38.1 72.82,38.6 72.82,39.11Z" + android:fillColor="#838484"/> + + diff --git a/res/drawable/ic_launcher_monochrome.xml b/res/drawable/ic_launcher_monochrome.xml deleted file mode 100644 index 087d83f82b3..00000000000 --- a/res/drawable/ic_launcher_monochrome.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/res/drawable/ic_launcher_settings.xml b/res/drawable/ic_launcher_settings.xml index b58c81ff94f..bc056f2e186 100644 --- a/res/drawable/ic_launcher_settings.xml +++ b/res/drawable/ic_launcher_settings.xml @@ -1,10 +1,22 @@ + ~ Copyright ECORP SAS 2022 + ~ This program is free software: you can redistribute it and/or modify + ~ it under the terms of the GNU General Public License as published by + ~ the Free Software Foundation, either version 3 of the License, or + ~ (at your option) any later version. + ~ + ~ This program is distributed in the hope that it will be useful, + ~ but WITHOUT ANY WARRANTY; without even the implied warranty of + ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + ~ GNU General Public License for more details. + ~ + ~ You should have received a copy of the GNU General Public License + ~ along with this program. If not, see . + --> - - - + + + + -- GitLab From 7f723c08a8d1f7e605f78709295c4102f9cc0688 Mon Sep 17 00:00:00 2001 From: Fahim Salam Chowdhury Date: Tue, 1 Nov 2022 05:06:15 +0000 Subject: [PATCH 11/20] 697-s-Recalculate_accountType_sorting --- .../accounts/AccountPreferenceController.java | 32 ++++++++++++++++--- .../accounts/MurenaAccountHelper.java | 27 ++++++++++++++++ .../settings/accounts/ProviderEntry.java | 15 +++++++++ 3 files changed, 69 insertions(+), 5 deletions(-) create mode 100644 src/com/android/settings/accounts/MurenaAccountHelper.java diff --git a/src/com/android/settings/accounts/AccountPreferenceController.java b/src/com/android/settings/accounts/AccountPreferenceController.java index 8c717f03e77..db85742cdea 100644 --- a/src/com/android/settings/accounts/AccountPreferenceController.java +++ b/src/com/android/settings/accounts/AccountPreferenceController.java @@ -529,6 +529,8 @@ public class AccountPreferenceController extends AbstractPreferenceController final ArrayList accountTypePreferences = new ArrayList<>(accountTypes.length); + final ArrayList murenaAccountPreferences = new ArrayList<>(); + for (int i = 0; i < accountTypes.length; i++) { final String accountType = accountTypes[i]; // Skip showing any account that does not have any of the requested authorities @@ -552,6 +554,11 @@ public class AccountPreferenceController extends AbstractPreferenceController final AccountTypePreference preference = preferenceToRemove.remove(AccountTypePreference.buildKey(account)); if (preference != null) { + if (MurenaAccountHelper.isMurenaAccount(accountType)) { + murenaAccountPreferences.add(preference); + continue; + } + accountTypePreferences.add(preference); continue; } @@ -572,23 +579,38 @@ public class AccountPreferenceController extends AbstractPreferenceController fragmentArguments.putInt(AccountDetailDashboardFragment.KEY_ACCOUNT_TITLE_RES, titleResId); fragmentArguments.putParcelable(EXTRA_USER, userHandle); - accountTypePreferences.add(new AccountTypePreference( + AccountTypePreference accountTypePreference = new AccountTypePreference( prefContext, mMetricsFeatureProvider.getMetricsCategory(mFragment), account, titleResPackageName, titleResId, label, - AccountDetailDashboardFragment.class.getName(), fragmentArguments, icon)); + AccountDetailDashboardFragment.class.getName(), fragmentArguments, icon); + + if (MurenaAccountHelper.isMurenaAccount(accountType)) { + murenaAccountPreferences.add(accountTypePreference); + continue; + } + + accountTypePreferences.add(accountTypePreference); } helper.preloadDrawableForType(mContext, accountType); } // Sort by label - Collections.sort(accountTypePreferences, new Comparator() { + Collections.sort(accountTypePreferences, getAccountTypePreferenceComparator()); + Collections.sort(murenaAccountPreferences, getAccountTypePreferenceComparator()); + + accountTypePreferences.addAll(0, murenaAccountPreferences); + + return accountTypePreferences; + } + + private Comparator getAccountTypePreferenceComparator() { + return new Comparator() { @Override public int compare(AccountTypePreference t1, AccountTypePreference t2) { int result = t1.getSummary().toString().compareTo(t2.getSummary().toString()); return result != 0 ? result : t1.getTitle().toString().compareTo(t2.getTitle().toString()); } - }); - return accountTypePreferences; + }; } private boolean accountTypeHasAnyRequestedAuthorities(AuthenticatorHelper helper, diff --git a/src/com/android/settings/accounts/MurenaAccountHelper.java b/src/com/android/settings/accounts/MurenaAccountHelper.java new file mode 100644 index 00000000000..df449d2b0b4 --- /dev/null +++ b/src/com/android/settings/accounts/MurenaAccountHelper.java @@ -0,0 +1,27 @@ +/* + * Copyright MURENA SAS 2022 + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.android.settings.accounts; + +public class MurenaAccountHelper { + + public static final String MURENA_ACCOUNT_TYPE = "e.foundation.webdav.eelo"; + public static final String MURENA_ADDRESS_BOOK_ACCOUNT_TYPE = "foundation.e.accountmanager.eelo.address_book"; + + public static boolean isMurenaAccount(String accountType) { + return accountType.equals(MURENA_ACCOUNT_TYPE) || accountType.equals(MURENA_ADDRESS_BOOK_ACCOUNT_TYPE); + } +} diff --git a/src/com/android/settings/accounts/ProviderEntry.java b/src/com/android/settings/accounts/ProviderEntry.java index cf55e1423fc..bbf09ab43ac 100644 --- a/src/com/android/settings/accounts/ProviderEntry.java +++ b/src/com/android/settings/accounts/ProviderEntry.java @@ -34,6 +34,21 @@ public class ProviderEntry implements Comparable { if (another.name == null) { return +1; } + + // both are murena accounts, compare them normally + if (MurenaAccountHelper.isMurenaAccount(type) && MurenaAccountHelper.isMurenaAccount(another.type)) { + return CharSequences.compareToIgnoreCase(name, another.name); + } + + // if any one is Murena account, put it on top + if (MurenaAccountHelper.isMurenaAccount(type)) { + return -1; + } + + if (MurenaAccountHelper.isMurenaAccount(another.type)) { + return 1; + } + return CharSequences.compareToIgnoreCase(name, another.name); } -- GitLab From b3fe3647150c3913cf85e721f4948739e47879ba Mon Sep 17 00:00:00 2001 From: Yash Garg Date: Fri, 18 Nov 2022 12:26:01 +0000 Subject: [PATCH 12/20] Settings: Fixup start padding for battery usage graph --- res/layout/battery_usage_graph.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/res/layout/battery_usage_graph.xml b/res/layout/battery_usage_graph.xml index e79c7b94f85..310d5c7b2c3 100644 --- a/res/layout/battery_usage_graph.xml +++ b/res/layout/battery_usage_graph.xml @@ -19,7 +19,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:paddingTop="16dp" - android:paddingStart="@dimen/preference_no_icon_padding_start" + android:paddingStart="?android:attr/listPreferredItemPaddingStart" android:paddingEnd="?android:attr/listPreferredItemPaddingEnd" android:orientation="vertical"> -- GitLab From 801c0ebd6909385180bd6760ab8574c0e81ea1f8 Mon Sep 17 00:00:00 2001 From: althafvly Date: Thu, 8 Dec 2022 12:23:18 +0530 Subject: [PATCH 13/20] Settings: Remove security settings placeholder --- res/xml/security_dashboard_settings.xml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/res/xml/security_dashboard_settings.xml b/res/xml/security_dashboard_settings.xml index 0550441d3f2..211ff997d1e 100644 --- a/res/xml/security_dashboard_settings.xml +++ b/res/xml/security_dashboard_settings.xml @@ -21,12 +21,6 @@ android:key="security_dashboard_page" android:title="@string/security_settings_title"> - - - -- GitLab From 2e9642aef833725adcc3c45500983e43ac8951ca Mon Sep 17 00:00:00 2001 From: althafvly Date: Thu, 8 Dec 2022 12:28:25 +0530 Subject: [PATCH 14/20] Settings: Remove find my device from top level settings --- res/values/strings.xml | 3 +++ res/xml/top_level_settings.xml | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/res/values/strings.xml b/res/values/strings.xml index d8a2c3b41cf..164f0436a39 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -790,6 +790,9 @@ App security, device lock, permissions + + Screen lock, app security + diff --git a/res/xml/top_level_settings.xml b/res/xml/top_level_settings.xml index 995785870b8..203b7ecb1e6 100644 --- a/res/xml/top_level_settings.xml +++ b/res/xml/top_level_settings.xml @@ -153,7 +153,7 @@ android:key="top_level_security" android:order="-50" android:title="@string/security_settings_title" - android:summary="@string/security_dashboard_summary" + android:summary="@string/security_dashboard_summary_e" settings:highlightableMenuKey="@string/menu_key_security" settings:controller="com.android.settings.security.TopLevelSecurityEntryPreferenceController"/> -- GitLab From eb1f33a39e32c6e22e08317fe8678dd9fa5f9878 Mon Sep 17 00:00:00 2001 From: althafvly Date: Wed, 11 Jan 2023 11:09:17 +0530 Subject: [PATCH 15/20] Settings: top_level_settings: Move accounts entry to top - Use title string Accounts_settings_title instead of account_dashboard_title --- AndroidManifest.xml | 2 +- res/xml/accounts_dashboard_settings.xml | 2 +- .../accounts_dashboard_settings_header.xml | 2 +- .../accounts_personal_dashboard_settings.xml | 2 +- res/xml/accounts_work_dashboard_settings.xml | 2 +- res/xml/top_level_settings.xml | 22 +++++++++---------- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index ecee52449f0..d9d3e3226b2 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -3946,7 +3946,7 @@ diff --git a/res/xml/accounts_dashboard_settings.xml b/res/xml/accounts_dashboard_settings.xml index c8627e7e9e7..6d9364a67f5 100644 --- a/res/xml/accounts_dashboard_settings.xml +++ b/res/xml/accounts_dashboard_settings.xml @@ -18,7 +18,7 @@ xmlns:android="http://schemas.android.com/apk/res/android" xmlns:settings="http://schemas.android.com/apk/res-auto" android:key="user_and_account_settings_screen" - android:title="@string/account_dashboard_title" + android:title="@string/Accounts_settings_title" settings:keywords="@string/keywords_accounts"> diff --git a/res/xml/accounts_personal_dashboard_settings.xml b/res/xml/accounts_personal_dashboard_settings.xml index e0ba71bbef3..29b92b818aa 100644 --- a/res/xml/accounts_personal_dashboard_settings.xml +++ b/res/xml/accounts_personal_dashboard_settings.xml @@ -19,7 +19,7 @@ xmlns:android="http://schemas.android.com/apk/res/android" xmlns:settings="http://schemas.android.com/apk/res-auto" android:key="user_and_account_settings_screen" - android:title="@string/account_dashboard_title" + android:title="@string/Accounts_settings_title" settings:keywords="@string/keywords_accounts">     + + - - Date: Tue, 21 Mar 2023 17:14:03 +0530 Subject: [PATCH 16/20] Theme app according to our palette --- .../ic_accessibility_magnification_ftsw.xml | 29 +++++++ .../ic_adaptive_font_download_ftsw.xml | 26 ++++++ res/drawable/ic_apps.xml | 66 +++++++++----- res/drawable/ic_devices_other.xml | 57 ++++++++----- res/drawable/ic_files_go_round.xml | 56 ++++++++++++ res/drawable/ic_homepage_advanced_privacy.xml | 60 ++++++------- res/drawable/ic_lock_pin.xml | 2 +- res/drawable/ic_notifications_settings.xml | 45 ++++++++++ res/drawable/ic_password.xml | 8 +- res/drawable/ic_pattern.xml | 10 +-- res/drawable/ic_phone_info.xml | 57 ++++++++----- res/drawable/ic_pin.xml | 2 +- res/drawable/ic_screen_zoom_ftsw.xml | 26 ++++++ res/drawable/ic_settings_accessibility.xml | 57 +++++++------ res/drawable/ic_settings_accounts.xml | 80 +++++++++++------ res/drawable/ic_settings_battery_white.xml | 70 ++++++++++----- res/drawable/ic_settings_display_white.xml | 85 ++++++++++++++----- res/drawable/ic_settings_emergency.xml | 71 +++++++++++----- res/drawable/ic_settings_location.xml | 54 +++++++----- res/drawable/ic_settings_privacy.xml | 60 ++++++------- res/drawable/ic_settings_security_white.xml | 54 +++++++----- .../ic_settings_system_dashboard_white.xml | 60 +++++++------ res/drawable/ic_settings_wallpaper_white.xml | 55 +++++++----- res/drawable/ic_storage_white.xml | 62 +++++++++----- res/drawable/ic_updater.xml | 42 +++++++++ res/drawable/ic_volume_up_24dp.xml | 58 +++++++------ res/drawable/ic_wireless.xml | 41 +++++++++ res/layout/homepage_preference.xml | 6 +- res/layout/notification_history.xml | 2 +- res/values-night/colors.xml | 2 +- res/values/colors.xml | 2 +- res/values/styles.xml | 4 +- res/values/themes.xml | 2 +- ...ccessibility_settings_for_setup_wizard.xml | 4 +- res/xml/storage_category_fragment.xml | 1 + res/xml/storage_dashboard_fragment.xml | 1 + res/xml/top_level_settings.xml | 6 +- .../ManageStoragePreferenceController.java | 1 - .../settings/homepage/TopLevelSettings.java | 7 -- ...ighlightableTopLevelPreferenceAdapter.java | 4 - 40 files changed, 930 insertions(+), 405 deletions(-) create mode 100644 res/drawable/ic_accessibility_magnification_ftsw.xml create mode 100644 res/drawable/ic_adaptive_font_download_ftsw.xml create mode 100644 res/drawable/ic_files_go_round.xml create mode 100644 res/drawable/ic_notifications_settings.xml create mode 100644 res/drawable/ic_screen_zoom_ftsw.xml create mode 100644 res/drawable/ic_updater.xml create mode 100644 res/drawable/ic_wireless.xml diff --git a/res/drawable/ic_accessibility_magnification_ftsw.xml b/res/drawable/ic_accessibility_magnification_ftsw.xml new file mode 100644 index 00000000000..59f55901d39 --- /dev/null +++ b/res/drawable/ic_accessibility_magnification_ftsw.xml @@ -0,0 +1,29 @@ + + + + + + diff --git a/res/drawable/ic_adaptive_font_download_ftsw.xml b/res/drawable/ic_adaptive_font_download_ftsw.xml new file mode 100644 index 00000000000..045342fd953 --- /dev/null +++ b/res/drawable/ic_adaptive_font_download_ftsw.xml @@ -0,0 +1,26 @@ + + + + + + \ No newline at end of file diff --git a/res/drawable/ic_apps.xml b/res/drawable/ic_apps.xml index 76ba829f5db..4b17edb8aab 100644 --- a/res/drawable/ic_apps.xml +++ b/res/drawable/ic_apps.xml @@ -1,26 +1,48 @@ + + ~ Copyright ECORP SAS 2022 + ~ This program is free software: you can redistribute it and/or modify + ~ it under the terms of the GNU General Public License as published by + ~ the Free Software Foundation, either version 3 of the License, or + ~ (at your option) any later version. + ~ + ~ This program is distributed in the hope that it will be useful, + ~ but WITHOUT ANY WARRANTY; without even the implied warranty of + ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + ~ GNU General Public License for more details. + ~ + ~ You should have received a copy of the GNU General Public License + ~ along with this program. If not, see . + --> + android:width="36dp" + android:height="36dp" + android:viewportWidth="32" + android:viewportHeight="32"> + + + android:pathData="M7,0L25,0A7,7 0,0 1,32 7L32,25A7,7 0,0 1,25 32L7,32A7,7 0,0 1,0 25L0,7A7,7 0,0 1,7 0z" + android:fillColor="#E83A52"/> + + + + + + diff --git a/res/drawable/ic_devices_other.xml b/res/drawable/ic_devices_other.xml index 3d292649c79..bb22e0dc6cd 100644 --- a/res/drawable/ic_devices_other.xml +++ b/res/drawable/ic_devices_other.xml @@ -1,25 +1,40 @@ + + ~ Copyright ECORP SAS 2022 + ~ This program is free software: you can redistribute it and/or modify + ~ it under the terms of the GNU General Public License as published by + ~ the Free Software Foundation, either version 3 of the License, or + ~ (at your option) any later version. + ~ + ~ This program is distributed in the hope that it will be useful, + ~ but WITHOUT ANY WARRANTY; without even the implied warranty of + ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + ~ GNU General Public License for more details. + ~ + ~ You should have received a copy of the GNU General Public License + ~ along with this program. If not, see . + --> + android:width="36dp" + android:height="36dp" + android:viewportWidth="32" + android:viewportHeight="32"> + + + android:pathData="M7,0L25,0A7,7 0,0 1,32 7L32,25A7,7 0,0 1,25 32L7,32A7,7 0,0 1,0 25L0,7A7,7 0,0 1,7 0z" + android:fillColor="#0088ED"/> + + + + diff --git a/res/drawable/ic_files_go_round.xml b/res/drawable/ic_files_go_round.xml new file mode 100644 index 00000000000..3dc14f64d49 --- /dev/null +++ b/res/drawable/ic_files_go_round.xml @@ -0,0 +1,56 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/res/drawable/ic_homepage_advanced_privacy.xml b/res/drawable/ic_homepage_advanced_privacy.xml index c75e102402b..3786ebb858c 100644 --- a/res/drawable/ic_homepage_advanced_privacy.xml +++ b/res/drawable/ic_homepage_advanced_privacy.xml @@ -1,39 +1,41 @@ + + + android:pathData="M7,0L25,0A7,7 0,0 1,32 7L32,25A7,7 0,0 1,25 32L7,32A7,7 0,0 1,0 25L0,7A7,7 0,0 1,7 0z" + android:fillColor="#2CCF69"/> + android:pathData="M15.983,6.667V6.667C15.917,6.666 15.85,6.675 15.785,6.693L7.869,10.044C7.815,10.069 7.765,10.111 7.727,10.168C7.689,10.228 7.667,10.301 7.667,10.377L7.667,10.379C7.667,18.181 12.058,23.35 15.862,24.975L15.865,24.977C15.902,24.992 15.94,25 15.978,25C16.016,25 16.054,24.992 16.091,24.977L16.097,24.974L16.097,24.974C19.126,23.687 24.324,19.049 24.333,10.402C24.33,10.323 24.305,10.248 24.263,10.186C24.22,10.122 24.162,10.075 24.099,10.049C24.099,10.049 24.099,10.049 24.099,10.049L16.169,6.691C16.112,6.675 16.053,6.667 15.994,6.667L15.983,6.667ZM16.75,5.127L24.75,8.514C25.114,8.669 25.425,8.927 25.647,9.258C25.869,9.589 25.992,9.979 26,10.379C26,19.777 20.332,24.986 16.749,26.508C16.505,26.613 16.243,26.667 15.978,26.667C15.713,26.667 15.451,26.613 15.207,26.508C10.749,24.603 6,18.803 6,10.379C5.999,9.982 6.114,9.594 6.328,9.262C6.543,8.931 6.849,8.671 7.208,8.514L15.207,5.127C15.463,5.041 15.73,4.998 15.999,5C16.255,5.001 16.508,5.044 16.75,5.127Z" + android:fillColor="#ffffff" + android:fillType="evenOdd"/> + android:pathData="M13.672,11.986C13.998,12.312 13.998,12.84 13.672,13.165C13.03,13.808 12.708,14.649 12.708,15.493C12.708,16.336 13.03,17.177 13.672,17.82C14.315,18.463 15.156,18.784 16,18.784C16.844,18.784 17.684,18.463 18.327,17.82C18.97,17.177 19.291,16.336 19.291,15.493C19.291,14.649 18.97,13.808 18.327,13.165C18.002,12.84 18.002,12.312 18.327,11.986C18.653,11.661 19.18,11.661 19.506,11.986C20.474,12.955 20.958,14.225 20.958,15.493C20.958,16.76 20.474,18.03 19.506,18.998C18.538,19.966 17.267,20.451 16,20.451C14.732,20.451 13.462,19.966 12.494,18.998C11.526,18.03 11.042,16.76 11.042,15.493C11.042,14.225 11.526,12.955 12.494,11.986C12.819,11.661 13.347,11.661 13.672,11.986Z" + android:fillColor="#ffffff" + android:fillType="evenOdd"/> + + diff --git a/res/drawable/ic_lock_pin.xml b/res/drawable/ic_lock_pin.xml index 587f49cab5b..e1821f6ec8b 100644 --- a/res/drawable/ic_lock_pin.xml +++ b/res/drawable/ic_lock_pin.xml @@ -21,5 +21,5 @@ android:viewportHeight="24"> + android:fillColor="?attr/sudListItemIconColor"/> diff --git a/res/drawable/ic_notifications_settings.xml b/res/drawable/ic_notifications_settings.xml new file mode 100644 index 00000000000..b3b4bfd1fe3 --- /dev/null +++ b/res/drawable/ic_notifications_settings.xml @@ -0,0 +1,45 @@ + + + + + + + + + + + + + diff --git a/res/drawable/ic_password.xml b/res/drawable/ic_password.xml index 341e544c63c..7d5f47190e9 100644 --- a/res/drawable/ic_password.xml +++ b/res/drawable/ic_password.xml @@ -20,15 +20,15 @@ android:viewportHeight="24.0" android:viewportWidth="24.0"> diff --git a/res/drawable/ic_pattern.xml b/res/drawable/ic_pattern.xml index 788eaa79bad..b41129fb7c1 100644 --- a/res/drawable/ic_pattern.xml +++ b/res/drawable/ic_pattern.xml @@ -20,18 +20,18 @@ android:viewportHeight="24.0" android:viewportWidth="24.0"> diff --git a/res/drawable/ic_phone_info.xml b/res/drawable/ic_phone_info.xml index 3675c8bc100..cfad1358142 100644 --- a/res/drawable/ic_phone_info.xml +++ b/res/drawable/ic_phone_info.xml @@ -1,25 +1,40 @@ + + ~ Copyright ECORP SAS 2022 + ~ This program is free software: you can redistribute it and/or modify + ~ it under the terms of the GNU General Public License as published by + ~ the Free Software Foundation, either version 3 of the License, or + ~ (at your option) any later version. + ~ + ~ This program is distributed in the hope that it will be useful, + ~ but WITHOUT ANY WARRANTY; without even the implied warranty of + ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + ~ GNU General Public License for more details. + ~ + ~ You should have received a copy of the GNU General Public License + ~ along with this program. If not, see . + --> + android:width="36dp" + android:height="36dp" + android:viewportWidth="32" + android:viewportHeight="32"> + + + android:pathData="M7,0L25,0A7,7 0,0 1,32 7L32,25A7,7 0,0 1,25 32L7,32A7,7 0,0 1,0 25L0,7A7,7 0,0 1,7 0z" + android:fillColor="#2CCF69"/> + + + + diff --git a/res/drawable/ic_pin.xml b/res/drawable/ic_pin.xml index 682e934018f..577e04f6adc 100644 --- a/res/drawable/ic_pin.xml +++ b/res/drawable/ic_pin.xml @@ -20,6 +20,6 @@ android:viewportHeight="24.0" android:viewportWidth="24.0"> diff --git a/res/drawable/ic_screen_zoom_ftsw.xml b/res/drawable/ic_screen_zoom_ftsw.xml new file mode 100644 index 00000000000..4e5f0851384 --- /dev/null +++ b/res/drawable/ic_screen_zoom_ftsw.xml @@ -0,0 +1,26 @@ + + + + + \ No newline at end of file diff --git a/res/drawable/ic_settings_accessibility.xml b/res/drawable/ic_settings_accessibility.xml index 58a5fc2e6ad..b75fda903af 100644 --- a/res/drawable/ic_settings_accessibility.xml +++ b/res/drawable/ic_settings_accessibility.xml @@ -1,29 +1,38 @@ + + ~ Copyright ECORP SAS 2022 + ~ This program is free software: you can redistribute it and/or modify + ~ it under the terms of the GNU General Public License as published by + ~ the Free Software Foundation, either version 3 of the License, or + ~ (at your option) any later version. + ~ + ~ This program is distributed in the hope that it will be useful, + ~ but WITHOUT ANY WARRANTY; without even the implied warranty of + ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + ~ GNU General Public License for more details. + ~ + ~ You should have received a copy of the GNU General Public License + ~ along with this program. If not, see . + --> + android:width="36dp" + android:height="36dp" + android:viewportWidth="32" + android:viewportHeight="32"> + + + android:pathData="M7,0L25,0A7,7 0,0 1,32 7L32,25A7,7 0,0 1,25 32L7,32A7,7 0,0 1,0 25L0,7A7,7 0,0 1,7 0z" + android:fillColor="#0088ED"/> + android:pathData="M14.905,12.42C12.827,12.42 11.133,10.727 11.133,8.649C11.133,6.571 12.827,4.878 14.905,4.878C16.982,4.878 18.676,6.571 18.676,8.649C18.676,10.727 16.982,12.42 14.905,12.42ZM14.905,6.459C13.708,6.459 12.714,7.452 12.714,8.649C12.714,9.846 13.708,10.84 14.905,10.84C16.101,10.84 17.095,9.846 17.095,8.649C17.095,7.452 16.124,6.459 14.905,6.459Z" + android:fillColor="#ffffff"/> + + + diff --git a/res/drawable/ic_settings_accounts.xml b/res/drawable/ic_settings_accounts.xml index c0c93dd5065..3ddcf62835c 100644 --- a/res/drawable/ic_settings_accounts.xml +++ b/res/drawable/ic_settings_accounts.xml @@ -1,29 +1,57 @@ + + ~ Copyright ECORP SAS 2022 + ~ This program is free software: you can redistribute it and/or modify + ~ it under the terms of the GNU General Public License as published by + ~ the Free Software Foundation, either version 3 of the License, or + ~ (at your option) any later version. + ~ + ~ This program is distributed in the hope that it will be useful, + ~ but WITHOUT ANY WARRANTY; without even the implied warranty of + ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + ~ GNU General Public License for more details. + ~ + ~ You should have received a copy of the GNU General Public License + ~ along with this program. If not, see . + --> - - + android:width="36dp" + android:height="36dp" + android:viewportWidth="32" + android:viewportHeight="32"> + + + + + + + + + + + diff --git a/res/drawable/ic_settings_battery_white.xml b/res/drawable/ic_settings_battery_white.xml index e042249ad65..fed92e6464b 100644 --- a/res/drawable/ic_settings_battery_white.xml +++ b/res/drawable/ic_settings_battery_white.xml @@ -1,28 +1,54 @@ + + android:width="36dp" + android:height="36dp" + android:viewportWidth="32" + android:viewportHeight="32"> + + + android:pathData="M7,0L25,0A7,7 0,0 1,32 7L32,25A7,7 0,0 1,25 32L7,32A7,7 0,0 1,0 25L0,7A7,7 0,0 1,7 0z" + android:fillColor="#2CCF69"/> + android:pathData="M8.604,7.339C8.604,6.903 8.958,6.549 9.395,6.549H22.628C23.065,6.549 23.419,6.903 23.419,7.339V26.512C23.419,26.949 23.065,27.303 22.628,27.303H9.395C8.958,27.303 8.604,26.949 8.604,26.512V7.339ZM10.185,8.13V25.722H21.838V8.13H10.185Z" + android:fillColor="#ffffff" + android:fillType="evenOdd"/> + + + + + + + diff --git a/res/drawable/ic_settings_display_white.xml b/res/drawable/ic_settings_display_white.xml index 6e2014421ed..8b0a9eb0dfa 100644 --- a/res/drawable/ic_settings_display_white.xml +++ b/res/drawable/ic_settings_display_white.xml @@ -1,25 +1,68 @@ + - + android:width="36dp" + android:height="36dp" + android:viewportWidth="32" + android:viewportHeight="32"> + + + + + + + + + + + + + + diff --git a/res/drawable/ic_settings_emergency.xml b/res/drawable/ic_settings_emergency.xml index d331e3e4161..98c207bd0a8 100644 --- a/res/drawable/ic_settings_emergency.xml +++ b/res/drawable/ic_settings_emergency.xml @@ -1,24 +1,55 @@ + + ~ Copyright ECORP SAS 2022 + ~ This program is free software: you can redistribute it and/or modify + ~ it under the terms of the GNU General Public License as published by + ~ the Free Software Foundation, either version 3 of the License, or + ~ (at your option) any later version. + ~ + ~ This program is distributed in the hope that it will be useful, + ~ but WITHOUT ANY WARRANTY; without even the implied warranty of + ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + ~ GNU General Public License for more details. + ~ + ~ You should have received a copy of the GNU General Public License + ~ along with this program. If not, see . + --> + android:width="36dp" + android:height="36dp" + android:viewportWidth="32" + android:viewportHeight="32"> + + + android:pathData="M7,0L25,0A7,7 0,0 1,32 7L32,25A7,7 0,0 1,25 32L7,32A7,7 0,0 1,0 25L0,7A7,7 0,0 1,7 0z" + android:fillColor="#E83A52"/> + + + + + + + + + + + diff --git a/res/drawable/ic_settings_location.xml b/res/drawable/ic_settings_location.xml index 9bd630b3b52..6a3748beccd 100644 --- a/res/drawable/ic_settings_location.xml +++ b/res/drawable/ic_settings_location.xml @@ -1,28 +1,36 @@ + + ~ Copyright ECORP SAS 2022 + ~ This program is free software: you can redistribute it and/or modify + ~ it under the terms of the GNU General Public License as published by + ~ the Free Software Foundation, either version 3 of the License, or + ~ (at your option) any later version. + ~ + ~ This program is distributed in the hope that it will be useful, + ~ but WITHOUT ANY WARRANTY; without even the implied warranty of + ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + ~ GNU General Public License for more details. + ~ + ~ You should have received a copy of the GNU General Public License + ~ along with this program. If not, see . + --> + android:width="36dp" + android:height="36dp" + android:viewportWidth="32" + android:viewportHeight="32"> + + + android:pathData="M7,0L25,0A7,7 0,0 1,32 7L32,25A7,7 0,0 1,25 32L7,32A7,7 0,0 1,0 25L0,7A7,7 0,0 1,7 0z" + android:fillColor="#E83A52"/> + android:pathData="M19.389,7.492C17.961,6.607 16.427,6.345 14.762,6.67L14.753,6.672C12.878,7.015 11.437,8.01 10.398,9.618C9.509,11.014 9.188,12.537 9.431,14.179L9.432,14.186C9.533,14.915 9.759,15.643 10.042,16.384L10.043,16.386C10.693,18.097 11.609,19.715 12.632,21.295L12.632,21.295C13.602,22.794 14.685,24.232 15.84,25.632C15.889,25.686 15.939,25.741 15.988,25.796L16.53,25.152C17.736,23.656 18.885,22.107 19.875,20.479L19.879,20.472C20.9,18.83 21.763,17.182 22.299,15.381C22.616,14.303 22.748,13.256 22.572,12.214L22.571,12.213C22.224,10.151 21.18,8.571 19.397,7.497L19.389,7.492ZM16.721,27.379L16.721,27.379L16.721,27.379L16.721,27.38L16.721,27.38L16.721,27.38L16.721,27.381L16.721,27.381L16.72,27.381L16.72,27.381L16.72,27.382L16.72,27.382L16.72,27.382L16.72,27.382L16.719,27.383L16.719,27.383L16.719,27.383L16.719,27.383L16.719,27.384L16.719,27.385L16.719,27.385L16.718,27.385C16.6,27.622 16.371,27.784 16.108,27.816C15.845,27.849 15.583,27.747 15.411,27.546C15.371,27.5 15.332,27.454 15.293,27.409C15.066,27.143 14.863,26.906 14.661,26.685C14.651,26.675 14.643,26.665 14.634,26.654C13.445,25.214 12.319,23.721 11.305,22.154C10.252,20.528 9.271,18.805 8.566,16.948C8.262,16.155 7.992,15.303 7.867,14.407C7.569,12.393 7.971,10.485 9.067,8.766L9.069,8.763C10.333,6.805 12.142,5.543 14.464,5.118C16.501,4.721 18.44,5.046 20.217,6.146C22.407,7.466 23.71,9.453 24.13,11.951C24.359,13.302 24.176,14.603 23.815,15.828L23.815,15.83C23.222,17.821 22.28,19.604 21.224,21.303C20.183,23.014 18.987,24.623 17.756,26.15C17.752,26.155 17.749,26.159 17.745,26.163L16.721,27.379Z" + android:fillColor="#ffffff" + android:fillType="evenOdd"/> + + diff --git a/res/drawable/ic_settings_privacy.xml b/res/drawable/ic_settings_privacy.xml index af0f9fd2467..911e96cfb74 100644 --- a/res/drawable/ic_settings_privacy.xml +++ b/res/drawable/ic_settings_privacy.xml @@ -1,37 +1,37 @@ + + android:width="36dp" + android:height="36dp" + android:viewportWidth="32" + android:viewportHeight="32"> + + + android:pathData="M7,0L25,0A7,7 0,0 1,32 7L32,25A7,7 0,0 1,25 32L7,32A7,7 0,0 1,0 25L0,7A7,7 0,0 1,7 0z" + android:fillColor="#2CCF69"/> + android:pathData="M16,18.5C17.381,18.5 18.5,17.381 18.5,16C18.5,14.619 17.381,13.5 16,13.5C14.619,13.5 13.5,14.619 13.5,16C13.5,17.381 14.619,18.5 16,18.5ZM16,20.167C18.302,20.167 20.167,18.302 20.167,16C20.167,13.699 18.302,11.833 16,11.833C13.699,11.833 11.833,13.699 11.833,16C11.833,18.302 13.699,20.167 16,20.167Z" + android:fillColor="#ffffff" + android:fillType="evenOdd"/> - + android:pathData="M6.998,16C8.654,19.296 12.065,21.554 16,21.554C19.935,21.554 23.346,19.296 25.002,16C23.346,12.704 19.935,10.446 16,10.446C12.065,10.446 8.654,12.704 6.998,16ZM26.834,16C25.066,11.76 20.881,8.779 16,8.779C11.119,8.779 6.934,11.76 5.165,16C6.934,20.24 11.119,23.221 16,23.221C20.881,23.221 25.066,20.24 26.834,16Z" + android:fillColor="#ffffff" + android:fillType="evenOdd"/> + diff --git a/res/drawable/ic_settings_security_white.xml b/res/drawable/ic_settings_security_white.xml index 7d18275b92c..50f2e6764d9 100644 --- a/res/drawable/ic_settings_security_white.xml +++ b/res/drawable/ic_settings_security_white.xml @@ -1,25 +1,37 @@ + + android:width="36dp" + android:height="36dp" + android:viewportWidth="32" + android:viewportHeight="32"> + + - \ No newline at end of file + android:pathData="M7,0L25,0A7,7 0,0 1,32 7L32,25A7,7 0,0 1,25 32L7,32A7,7 0,0 1,0 25L0,7A7,7 0,0 1,7 0z" + android:fillColor="#E83A52"/> + + + + diff --git a/res/drawable/ic_settings_system_dashboard_white.xml b/res/drawable/ic_settings_system_dashboard_white.xml index b12ae75dcd7..2ed4a758ecf 100644 --- a/res/drawable/ic_settings_system_dashboard_white.xml +++ b/res/drawable/ic_settings_system_dashboard_white.xml @@ -1,31 +1,43 @@ + + android:width="36dp" + android:height="36dp" + android:viewportWidth="32" + android:viewportHeight="32"> + + + android:pathData="M7,0L25,0A7,7 0,0 1,32 7L32,25A7,7 0,0 1,25 32L7,32A7,7 0,0 1,0 25L0,7A7,7 0,0 1,7 0z" + android:fillColor="#0088ED"/> + android:pathData="M12.963,7.136C10.568,7.136 8.627,9.077 8.627,11.472C8.627,13.867 10.568,15.808 12.963,15.808C15.357,15.808 17.299,13.867 17.299,11.472C17.299,9.077 15.357,7.136 12.963,7.136ZM7.046,11.472C7.046,8.204 9.695,5.555 12.963,5.555C16.23,5.555 18.879,8.204 18.879,11.472C18.879,14.74 16.23,17.389 12.963,17.389C9.695,17.389 7.046,14.74 7.046,11.472Z" + android:fillColor="#ffffff" + android:fillType="evenOdd"/> + android:pathData="M12.91,17.953L14.024,17.953C14.46,17.953 14.814,18.307 14.814,18.744C14.814,19.18 14.46,19.534 14.024,19.534H12.94C11.968,19.534 11.109,19.535 10.339,19.636C9.577,19.735 8.968,19.926 8.483,20.26C7.561,20.899 6.797,22.284 6.797,25.677C6.797,26.113 6.444,26.467 6.007,26.467C5.571,26.467 5.217,26.113 5.217,25.677C5.217,22.136 6.001,20.055 7.584,18.96C8.353,18.429 9.237,18.185 10.135,18.068C11.016,17.953 11.972,17.953 12.91,17.953Z" + android:fillColor="#ffffff" + android:fillType="evenOdd"/> + + + diff --git a/res/drawable/ic_settings_wallpaper_white.xml b/res/drawable/ic_settings_wallpaper_white.xml index 5cdbeb6cc3e..3906bc71740 100644 --- a/res/drawable/ic_settings_wallpaper_white.xml +++ b/res/drawable/ic_settings_wallpaper_white.xml @@ -1,25 +1,40 @@ + + android:width="36dp" + android:height="36dp" + android:viewportWidth="32" + android:viewportHeight="32"> + + + android:pathData="M7,0L25,0A7,7 0,0 1,32 7L32,25A7,7 0,0 1,25 32L7,32A7,7 0,0 1,0 25L0,7A7,7 0,0 1,7 0z" + android:fillColor="#0088ED"/> + + + + + + + diff --git a/res/drawable/ic_storage_white.xml b/res/drawable/ic_storage_white.xml index d1149a88dd2..294b144a191 100644 --- a/res/drawable/ic_storage_white.xml +++ b/res/drawable/ic_storage_white.xml @@ -1,25 +1,47 @@ + + android:width="36dp" + android:height="36dp" + android:viewportWidth="32" + android:viewportHeight="32"> + + + android:pathData="M7,0L25,0A7,7 0,0 1,32 7L32,25A7,7 0,0 1,25 32L7,32A7,7 0,0 1,0 25L0,7A7,7 0,0 1,7 0z" + android:fillColor="#24527F"/> + + + + + + diff --git a/res/drawable/ic_updater.xml b/res/drawable/ic_updater.xml new file mode 100644 index 00000000000..43ccd95bc9d --- /dev/null +++ b/res/drawable/ic_updater.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/res/drawable/ic_volume_up_24dp.xml b/res/drawable/ic_volume_up_24dp.xml index ca5ffa5ac5c..5f4aa8562c4 100644 --- a/res/drawable/ic_volume_up_24dp.xml +++ b/res/drawable/ic_volume_up_24dp.xml @@ -1,31 +1,41 @@ + + android:width="36dp" + android:height="36dp" + android:viewportWidth="32" + android:viewportHeight="32"> + + + android:pathData="M7,0L25,0A7,7 0,0 1,32 7L32,25A7,7 0,0 1,25 32L7,32A7,7 0,0 1,0 25L0,7A7,7 0,0 1,7 0z" + android:fillColor="#FF7301"/> + android:pathData="M19.133,11.162C19.442,10.853 19.943,10.853 20.251,11.162C22.931,13.841 22.931,18.181 20.251,20.861C19.943,21.17 19.442,21.17 19.133,20.861C18.825,20.552 18.825,20.052 19.133,19.743C21.196,17.681 21.196,14.342 19.133,12.279C18.825,11.971 18.825,11.47 19.133,11.162Z" + android:fillColor="#ffffff" + android:fillType="evenOdd"/> + android:pathData="M21.866,8.429C22.175,8.12 22.675,8.12 22.984,8.429C27.177,12.622 27.177,19.4 22.984,23.593C22.675,23.902 22.175,23.902 21.866,23.593C21.557,23.285 21.557,22.784 21.866,22.476C25.442,18.9 25.442,13.122 21.866,9.547C21.557,9.238 21.557,8.738 21.866,8.429Z" + android:fillColor="#ffffff" + android:fillType="evenOdd"/> + + diff --git a/res/drawable/ic_wireless.xml b/res/drawable/ic_wireless.xml new file mode 100644 index 00000000000..c6312c69bf9 --- /dev/null +++ b/res/drawable/ic_wireless.xml @@ -0,0 +1,41 @@ + + + + + + + + + + + + diff --git a/res/layout/homepage_preference.xml b/res/layout/homepage_preference.xml index 18ecdcffde6..6ea0c7c7e36 100644 --- a/res/layout/homepage_preference.xml +++ b/res/layout/homepage_preference.xml @@ -39,8 +39,8 @@ @@ -53,7 +53,7 @@ android:layout_weight="1" android:paddingTop="16dp" android:paddingBottom="16dp" - android:paddingStart="@dimen/homepage_preference_text_padding_start" + android:paddingStart="20dp" android:paddingEnd="24dp"> diff --git a/res/values-night/colors.xml b/res/values-night/colors.xml index aa9417a4a74..e537618dc01 100644 --- a/res/values-night/colors.xml +++ b/res/values-night/colors.xml @@ -22,7 +22,7 @@ #3F5FBD @*android:color/material_grey_900 @*android:color/material_grey_900 - ?androidprv:attr/colorSurfaceVariant + @*android:color/surface_header_dark @*android:color/material_grey_800 #AECBFA #5F6368 diff --git a/res/values/colors.xml b/res/values/colors.xml index 2215be4c715..3d92ef5a82d 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -134,7 +134,7 @@ - ?androidprv:attr/colorSurfaceHighlight + @android:color/system_neutral1_50 #42a5f5 diff --git a/res/values/styles.xml b/res/values/styles.xml index 4fc6e9f05bf..4e484869c6e 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -442,8 +442,8 @@ diff --git a/res/values/themes.xml b/res/values/themes.xml index ff56e7edca9..4e19c363bd0 100644 --- a/res/values/themes.xml +++ b/res/values/themes.xml @@ -46,7 +46,7 @@ @drawable/wifi_friction 0dp - ?android:attr/colorAccent + ?android:attr/textColorSecondary @style/Widget.ActionBar diff --git a/res/xml/accessibility_settings_for_setup_wizard.xml b/res/xml/accessibility_settings_for_setup_wizard.xml index 0926d2d3008..6c68e9d1c54 100644 --- a/res/xml/accessibility_settings_for_setup_wizard.xml +++ b/res/xml/accessibility_settings_for_setup_wizard.xml @@ -22,7 +22,7 @@ diff --git a/res/xml/storage_category_fragment.xml b/res/xml/storage_category_fragment.xml index 973183614c4..bb9b58c30c1 100644 --- a/res/xml/storage_category_fragment.xml +++ b/res/xml/storage_category_fragment.xml @@ -24,6 +24,7 @@ android:order="4" android:title="@string/storage_free_up_space_title" android:summary="@string/storage_free_up_space_summary" + android:icon="@drawable/ic_files_go_round" settings:controller="com.android.settings.deviceinfo.storage.ManageStoragePreferenceController"/> @@ -44,7 +44,7 @@ { - Drawable icon = preference.getIcon(); - if (icon != null) { - icon.setTint(tintColor); - } - }); } @Override diff --git a/src/com/android/settings/widget/HighlightableTopLevelPreferenceAdapter.java b/src/com/android/settings/widget/HighlightableTopLevelPreferenceAdapter.java index 3cc7ef27f7e..85931968d13 100644 --- a/src/com/android/settings/widget/HighlightableTopLevelPreferenceAdapter.java +++ b/src/com/android/settings/widget/HighlightableTopLevelPreferenceAdapter.java @@ -243,10 +243,6 @@ public class HighlightableTopLevelPreferenceAdapter extends PreferenceGroupAdapt v.setBackgroundResource(RES_NORMAL_BACKGROUND); ((TextView) v.findViewById(android.R.id.title)).setTextColor(mTitleColorNormal); ((TextView) v.findViewById(android.R.id.summary)).setTextColor(mSummaryColorNormal); - final Drawable drawable = ((ImageView) v.findViewById(android.R.id.icon)).getDrawable(); - if (drawable != null) { - drawable.setTint(mIconColorNormal); - } } private boolean isHighlightNeeded() { -- GitLab From 4494535d912c5ed99a21c7ad84dd3fcd7e6c6892 Mon Sep 17 00:00:00 2001 From: Jonathan Klee Date: Fri, 24 Feb 2023 16:01:17 +0100 Subject: [PATCH 17/20] Write telemetry system settings --- res/values/cm_strings.xml | 6 ++ res/xml/development_settings.xml | 5 + .../DevelopmentSettingsDashboardFragment.java | 1 + .../EnableTelemetryPreferenceController.java | 101 ++++++++++++++++++ 4 files changed, 113 insertions(+) create mode 100644 src/com/android/settings/development/EnableTelemetryPreferenceController.java diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml index 19f2354e2ea..62353a81b79 100644 --- a/res/values/cm_strings.xml +++ b/res/values/cm_strings.xml @@ -201,6 +201,12 @@ You are about to connect to /e/ OS test channel It will allow you to download and install test versions of /e/ OS. Those builds may be unstable, and should be used only for test purposes. Please accept only if you know what you are doing. + + Enable /e/OS Telemetry + Enable automatic bug reporting + You are about to enable /e/OS Telemetry + It will allow automatic bug report when an application crash or when the application ends up in an unexpected state. Please reboot your device after changing this setting. + Advanced Privacy Manage trackers, fake location, hide IP address diff --git a/res/xml/development_settings.xml b/res/xml/development_settings.xml index 90461a8327c..f41c7df8b34 100644 --- a/res/xml/development_settings.xml +++ b/res/xml/development_settings.xml @@ -674,6 +674,11 @@ android:key="change_update_source" android:title="@string/title_ota_server" android:summary="@string/use_ota_summary" /> + +     Date: Thu, 16 Mar 2023 11:47:28 +0530 Subject: [PATCH 18/20] Settings: Remove battery manager animation --- res/raw/auto_awesome_battery.mp4 | 0 res/raw/auto_awesome_battery_lottie.json | 1 - res/xml/smart_battery_detail.xml | 4 ---- 3 files changed, 5 deletions(-) delete mode 100644 res/raw/auto_awesome_battery.mp4 delete mode 100644 res/raw/auto_awesome_battery_lottie.json diff --git a/res/raw/auto_awesome_battery.mp4 b/res/raw/auto_awesome_battery.mp4 deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/res/raw/auto_awesome_battery_lottie.json b/res/raw/auto_awesome_battery_lottie.json deleted file mode 100644 index 6a51b6695b7..00000000000 --- a/res/raw/auto_awesome_battery_lottie.json +++ /dev/null @@ -1 +0,0 @@ -{"v":"5.6.5","fr":60,"ip":0,"op":240,"w":412,"h":300,"nm":"Adaptive_Battery","ddd":0,"assets":[{"id":"comp_0","layers":[{"ddd":0,"ind":1,"ty":4,"nm":".blue50","cl":"blue50","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[95.824,105.277,0],"ix":2},"a":{"a":0,"k":[72.737,21.013,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0.311,0.172],[0.187,0.001],[0,0],[0,0],[0,0],[0,0],[0.392,-0.207],[0.109,-0.141]],"o":[[0,0],[-0.108,-0.14],[-0.402,-0.222],[0,0],[0,0],[0,0],[0,0],[-0.185,0.001],[-0.33,0.174],[0,0]],"v":[[0.001,6.453],[12.127,-5.673],[11.511,-6.203],[10.543,-6.453],[7.25,-6.453],[0.001,0.796],[-7.248,-6.453],[-10.541,-6.453],[-11.481,-6.218],[-12.127,-5.676]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.909803921569,0.941176470588,0.996078431373,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[72.737,21.013],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 30","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":579,"st":0,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":".white","cl":"white","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[95.825,108.4,0],"ix":2},"a":{"a":0,"k":[72.738,24.136,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[1.104,0],[0,0],[0,1.104],[0,0],[-1.104,0],[0,0],[0,-1.104],[0,0]],"o":[[0,0],[-1.104,0],[0,0],[0,-1.104],[0,0],[1.104,0],[0,0],[0,1.104]],"v":[[10.542,9.576],[-10.542,9.576],[-12.542,7.576],[-12.542,-7.576],[-10.542,-9.576],[10.542,-9.576],[12.542,-7.576],[12.542,7.576]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[72.738,24.136],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 31","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":579,"st":0,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":".blue600","cl":"blue600","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[95.825,107.728,0],"ix":2},"a":{"a":0,"k":[72.739,23.464,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,-11.984],[11.984,0],[0,11.984],[-11.984,0]],"o":[[0,11.984],[-11.984,0],[0,-11.984],[11.984,0]],"v":[[21.699,0],[-0.001,21.699],[-21.699,0],[-0.001,-21.699]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.101960784314,0.450980392157,0.909803921569,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[72.739,23.464],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 32","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":579,"st":0,"bm":0}]},{"id":"comp_1","layers":[{"ddd":0,"ind":1,"ty":4,"nm":".green50","cl":"green50","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[44.909,108.585,0],"ix":2},"a":{"a":0,"k":[21.822,24.322,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[15.102,27.297],[23.559,27.297]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0.901960784314,0.956862745098,0.917647058824,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":4,"ix":5},"lc":1,"lj":1,"ml":10,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 26","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[15.102,21.346],[28.542,21.346]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0.901960784314,0.956862745098,0.917647058824,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":4,"ix":5},"lc":1,"lj":1,"ml":10,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 27","np":2,"cix":2,"bm":0,"ix":2,"mn":"ADBE Vector Group","hd":false},{"ty":"tr","p":{"a":0,"k":[21.822,24.322],"ix":2},"a":{"a":0,"k":[21.822,24.322],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 30","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":579,"st":0,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":".white","cl":"white","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[44.909,107.713,0],"ix":2},"a":{"a":0,"k":[21.822,23.45,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,2.275],[7.54,0],[0,-7.539],[-7.539,0],[-1.886,0.984],[0,0]],"o":[[0.983,-1.886],[0,-7.539],[-7.539,0],[0,7.54],[2.275,0],[0,0],[0,0]],"v":[[12.104,6.3],[13.652,-0.001],[-0.001,-13.652],[-13.652,-0.001],[-0.001,13.652],[6.301,12.104],[12.104,12.104]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[21.822,23.45],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 28","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":579,"st":0,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":".green600","cl":"green600","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[45.035,107.728,0],"ix":2},"a":{"a":0,"k":[21.948,23.464,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,11.984],[-11.984,0],[0,-11.984],[11.984,0]],"o":[[0,-11.984],[11.984,0],[0,11.984],[-11.984,0]],"v":[[-21.699,0],[0.001,-21.699],[21.699,0],[0.001,21.699]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.117647058824,0.556862745098,0.243137254902,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[21.948,23.464],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 29","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":579,"st":0,"bm":0}]},{"id":"comp_2","layers":[{"ddd":0,"ind":1,"ty":4,"nm":".white","cl":"white","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[311.765,105.986,0],"ix":2},"a":{"a":0,"k":[288.678,21.723,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[2.425,1.49],[-2.425,1.49],[-2.425,-1.49],[2.425,-1.49]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[288.678,21.723],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 19","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":579,"st":0,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":".blue50","cl":"blue50","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[316.229,106.162,0],"ix":2},"a":{"a":0,"k":[293.142,21.899,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[8.707,6.449],[-8.707,6.449],[-8.707,-6.449],[8.707,-6.449]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.909803921569,0.941176470588,0.996078431373,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[293.142,24.776],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 20","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":579,"st":0,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":".white","cl":"white","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[316.339,107.259,0],"ix":2},"a":{"a":0,"k":[316.339,107.259,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"gr","it":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[286.254,12.573],[286.254,17.652]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[1,1,1,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":2,"ix":5},"lc":1,"lj":1,"ml":10,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 17","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[300.248,12.573],[300.248,17.652]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[1,1,1,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":2,"ix":5},"lc":1,"lj":1,"ml":10,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 18","np":2,"cix":2,"bm":0,"ix":2,"mn":"ADBE Vector Group","hd":false},{"ty":"tr","p":{"a":0,"k":[293.251,15.113],"ix":2},"a":{"a":0,"k":[293.251,15.113],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 21","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tr","p":{"a":0,"k":[316.229,106.162],"ix":2},"a":{"a":0,"k":[293.142,21.899],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 23","np":1,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[11.223,9.152],[-11.223,9.152],[-11.223,-9.152],[11.223,-9.152]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[293.252,24.266],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 21","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tr","p":{"a":0,"k":[316.339,108.53],"ix":2},"a":{"a":0,"k":[293.252,24.266],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 21","np":1,"cix":2,"bm":0,"ix":2,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":579,"st":0,"bm":0},{"ddd":0,"ind":4,"ty":4,"nm":".blue600","cl":"blue600","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[316.339,107.728,0],"ix":2},"a":{"a":0,"k":[293.252,23.464,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,-11.984],[11.984,0],[0,11.984],[-11.984,0]],"o":[[0,11.984],[-11.984,0],[0,-11.984],[11.984,0]],"v":[[21.698,0],[0,21.699],[-21.698,0],[0,-21.699]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.101960784314,0.450980392157,0.909803921569,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[293.252,23.464],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 22","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":579,"st":0,"bm":0}]},{"id":"comp_3","layers":[{"ddd":0,"ind":1,"ty":4,"nm":".red50","cl":"red50","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[367.331,107.483,0],"ix":2},"a":{"a":0,"k":[344.245,22.219,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[1.333,0.77],[0,0],[0,-1.539],[0,0],[-1.333,0.77],[0,0]],"o":[[0,0],[-1.333,-0.77],[0,0],[0,1.539],[0,0],[1.333,-0.77]],"v":[[3.478,-1.732],[-1.811,-4.785],[-4.811,-3.053],[-4.811,3.053],[-1.811,4.785],[3.478,1.732]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.988235294118,0.909803921569,0.901960784314,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[344.411,22.219],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 9","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":579,"st":0,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":".white","cl":"white","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[366.965,107.483,0],"ix":2},"a":{"a":0,"k":[343.878,22.219,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[1.104,0],[0,0],[0,1.104],[0,0],[-1.105,0],[0,0],[0,-1.105],[0,0]],"o":[[0,0],[-1.105,0],[0,0],[0,-1.105],[0,0],[1.104,0],[0,0],[0,1.104]],"v":[[9.885,10.599],[-9.885,10.599],[-11.885,8.599],[-11.885,-8.599],[-9.885,-10.599],[9.885,-10.599],[11.885,-8.599],[11.885,8.599]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[343.878,22.219],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 10","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":579,"st":0,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":".red600","cl":"red600","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[366.964,107.482,0],"ix":2},"a":{"a":0,"k":[343.877,22.219,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0.276,-11.98],[11.98,0.276],[-0.276,11.98],[-11.982,-0.276]],"o":[[-0.276,11.981],[-11.982,-0.276],[0.277,-11.981],[11.98,0.276]],"v":[[21.693,0.5],[-0.499,21.693],[-21.693,-0.5],[0.501,-21.693]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.850980392157,0.188235294118,0.145098039216,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[343.877,22.219],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 11","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":579,"st":0,"bm":0}]},{"id":"comp_4","layers":[{"ddd":0,"ind":1,"ty":4,"nm":".red50","cl":"red50","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[94.505,189.306,0],"ix":2},"a":{"a":0,"k":[71.418,105.042,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0],[0.735,0.244]],"o":[[0,0],[0,0],[0,0],[0,0],[-0.735,-0.244]],"v":[[71.913,100.924],[69.976,107.049],[71.913,107.237],[73.726,101.424],[73.21,100.543]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0.988235294118,0.909803921569,0.901960784314,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":7,"ix":5},"lc":1,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":true},{"ty":"fl","c":{"a":0,"k":[0.988235294118,0.909803921569,0.901960784314,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Shape 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0]],"v":[[4.064,-4.734],[0.939,4.735],[-4.064,3.714]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0.988235294118,0.909803921569,0.901960784314,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":2,"ix":5},"lc":1,"lj":1,"ml":10,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[67.841,105.757],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 12","np":2,"cix":2,"bm":0,"ix":2,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[1.715,6.863],[1.715,0.929],[-1.715,-1.057],[0.141,-6.863]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0.988235294118,0.909803921569,0.901960784314,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":2,"ix":5},"lc":1,"lj":1,"ml":10,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[73.614,108.32],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 13","np":2,"cix":2,"bm":0,"ix":3,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0.707,1.237],[0,0],[0.619,0],[0.265,0],[0,0],[0,0]],"o":[[-1.679,0],[0,0],[-0.353,-0.53],[-0.265,0],[0,0],[0,0],[0,0]],"v":[[5.939,1.648],[2.139,-0.473],[1.255,-1.886],[-0.247,-2.77],[-0.953,-2.682],[-4.716,-1.164],[-5.939,2.77]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0.988235294118,0.909803921569,0.901960784314,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":2,"ix":5},"lc":1,"lj":1,"ml":10,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[73.121,103.041],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 14","np":2,"cix":2,"bm":0,"ix":4,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-1.077,0],[0,1.077],[1.077,0],[0,-1.076]],"o":[[1.077,0],[0,-1.076],[-1.077,0],[0,1.077]],"v":[[0,1.958],[1.958,0],[0,-1.958],[-1.958,0]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.988235294118,0.909803921569,0.901960784314,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[74.597,96.86],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 15","np":2,"cix":2,"bm":0,"ix":5,"mn":"ADBE Vector Group","hd":false},{"ty":"tr","p":{"a":0,"k":[71.418,105.042],"ix":2},"a":{"a":0,"k":[71.418,105.042],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 17","np":5,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":579,"st":0,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":".red600","cl":"red600","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[95.825,189.162,0],"ix":2},"a":{"a":0,"k":[72.739,104.898,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,-11.984],[11.984,0],[0,11.983],[-11.984,0]],"o":[[0,11.983],[-11.984,0],[0,-11.984],[11.984,0]],"v":[[21.699,0.001],[-0.001,21.699],[-21.699,0.001],[-0.001,-21.699]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.850980392157,0.188235294118,0.145098039216,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[72.739,104.898],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 16","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":579,"st":0,"bm":0}]},{"id":"comp_5","layers":[{"ddd":0,"ind":1,"ty":4,"nm":".yellow50","cl":"yellow50","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[45.036,190.901,0],"ix":2},"a":{"a":0,"k":[21.949,106.637,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[28.511,98.421],[28.511,114.853]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0.996078431373,0.96862745098,0.878431372549,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":2,"ix":5},"lc":1,"lj":1,"ml":10,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[15.386,98.421],[15.386,114.853]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0.996078431373,0.96862745098,0.878431372549,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":2,"ix":5},"lc":1,"lj":1,"ml":10,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 2","np":2,"cix":2,"bm":0,"ix":2,"mn":"ADBE Vector Group","hd":false},{"ty":"tr","p":{"a":0,"k":[21.949,106.637],"ix":2},"a":{"a":0,"k":[21.949,106.637],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 6","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":579,"st":0,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":".white","cl":"white","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[45.035,189.253,0],"ix":2},"a":{"a":0,"k":[21.949,104.99,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[-1.104,0],[0,0],[0,-1.105],[0,0]],"o":[[0,0],[0,-1.105],[0,0],[1.104,0],[0,0],[0,0]],"v":[[-3.014,2.014],[-3.014,-0.014],[-1.014,-2.014],[1.014,-2.014],[3.014,-0.014],[3.014,2.014]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[1,1,1,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":2,"ix":5},"lc":1,"lj":1,"ml":10,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[21.949,97.14],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 3","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[1.104,0],[0,0],[0,1.104],[0,0],[-1.105,0],[0,0],[0,-1.104],[0,0]],"o":[[0,0],[-1.105,0],[0,0],[0,-1.104],[0,0],[1.104,0],[0,0],[0,1.104]],"v":[[8.57,8.216],[-8.57,8.216],[-10.57,6.216],[-10.57,-6.216],[-8.57,-8.216],[8.57,-8.216],[10.57,-6.216],[10.57,6.216]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[21.949,106.637],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 4","np":2,"cix":2,"bm":0,"ix":2,"mn":"ADBE Vector Group","hd":false},{"ty":"tr","p":{"a":0,"k":[21.949,104.99],"ix":2},"a":{"a":0,"k":[21.949,104.99],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 7","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":579,"st":0,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":".yellow600","cl":"yellow600","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[45.036,189.162,0],"ix":2},"a":{"a":0,"k":[21.949,104.898,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,-11.984],[11.984,0],[0,11.983],[-11.984,0]],"o":[[0,11.983],[-11.984,0],[0,-11.984],[11.984,0]],"v":[[21.699,0.001],[-0.001,21.699],[-21.699,0.001],[-0.001,-21.699]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.976470588235,0.670588235294,0,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[21.949,104.898],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 5","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":579,"st":0,"bm":0}]},{"id":"comp_6","layers":[{"ddd":0,"ind":1,"ty":4,"nm":".green50","cl":"green50","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[316.338,187.297,0],"ix":2},"a":{"a":0,"k":[293.251,103.034,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,-2.646],[2.645,0],[0,2.646],[-2.646,0]],"o":[[0,2.646],[-2.646,0],[0,-2.646],[2.645,0]],"v":[[4.79,0],[0,4.79],[-4.79,0],[0,-4.79]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.901960784314,0.956862745098,0.917647058824,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[293.251,103.034],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 6","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":579,"st":0,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":".white","cl":"white","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[316.338,189.567,0],"ix":2},"a":{"a":0,"k":[293.251,105.304,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[-4.281,4.281],[-4.28,-4.281],[4.281,-4.28]],"o":[[0,0],[-4.281,-4.28],[4.281,-4.281],[4.281,4.281],[0,0]],"v":[[0,13.768],[-7.751,6.016],[-7.751,-9.487],[7.751,-9.487],[7.751,6.016]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[293.251,104.769],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 7","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":579,"st":0,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":".green600","cl":"green600","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[316.338,189.162,0],"ix":2},"a":{"a":0,"k":[293.251,104.898,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,11.983],[-11.983,0],[0,-11.984],[11.985,0]],"o":[[0,-11.984],[11.985,0],[0,11.983],[-11.983,0]],"v":[[-21.698,0.001],[0,-21.699],[21.698,0.001],[0,21.699]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.117647058824,0.556862745098,0.243137254902,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[293.251,104.898],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 8","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":579,"st":0,"bm":0}]},{"id":"comp_7","layers":[{"ddd":0,"ind":1,"ty":4,"nm":".yellow50","cl":"yellow50","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[372.222,189.563,0],"ix":2},"a":{"a":0,"k":[349.135,106.3,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[349.085,100.106],[349.085,112.494]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0.996078431373,0.96862745098,0.878431372549,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":4,"ix":5},"lc":1,"lj":1,"ml":10,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 23","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":579,"st":0,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":".white","cl":"white","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[366.839,189.563,0],"ix":2},"a":{"a":0,"k":[343.752,106.3,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0.961],[-0.638,0.622],[0,0],[0,0],[0,0],[0,0],[0,0]],"o":[[0,-0.961],[0,0],[0,0],[0,0],[0,0],[0,0],[-0.638,-0.622]],"v":[[8.704,-0.029],[9.739,-2.478],[9.739,-6.194],[-9.739,-6.194],[-9.739,6.194],[9.739,6.194],[9.739,2.42]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[343.752,106.3],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 24","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":579,"st":0,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":".yellow600","cl":"yellow600","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[366.964,189.535,0],"ix":2},"a":{"a":0,"k":[343.877,106.271,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,11.984],[-11.983,0],[0,-11.983],[11.985,0]],"o":[[0,-11.983],[11.985,0],[0,11.984],[-11.983,0]],"v":[[-21.698,-0.001],[0,-21.699],[21.698,-0.001],[0,21.699]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.976470588235,0.670588235294,0,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[343.877,106.271],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 25","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":579,"st":0,"bm":0}]},{"id":"comp_8","layers":[{"ddd":0,"ind":1,"ty":4,"nm":".green600","cl":"green600","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[239.851,142.625,0],"ix":2},"a":{"a":0,"k":[79.701,66.597,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,-2.209],[0,0],[2.209,0],[0,0],[0,2.21],[0,0],[-2.21,0],[0,0],[0,0],[-1.104,0],[0,0],[0,-1.104],[0,0]],"o":[[2.209,0],[0,0],[0,2.21],[0,0],[-2.21,0],[0,0],[0,-2.209],[0,0],[0,0],[0,-1.104],[0,0],[1.104,0],[0,0],[0,0]],"v":[[31.851,-52.738],[35.851,-48.738],[35.851,58.416],[31.851,62.416],[-31.851,62.416],[-35.851,58.416],[-35.851,-48.738],[-31.851,-52.738],[-16.864,-52.738],[-16.864,-60.416],[-14.864,-62.416],[14.864,-62.416],[16.863,-60.416],[16.863,-52.738]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"tm","s":{"a":0,"k":0,"ix":1},"e":{"a":0,"k":25,"ix":2},"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":0,"s":[0]},{"t":240,"s":[360]}],"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1","mn":"ADBE Vector Filter - Trim","hd":false},{"ty":"st","c":{"a":0,"k":[0.117647058824,0.556862745098,0.243137254902,1],"ix":3},"o":{"a":1,"k":[{"i":{"x":[0.12],"y":[1]},"o":{"x":[0.44],"y":[0]},"t":11.6,"s":[0]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":29,"s":[100]},{"i":{"x":[0.12],"y":[1]},"o":{"x":[0.44],"y":[0]},"t":138,"s":[100]},{"t":150,"s":[0]}],"ix":4},"w":{"a":0,"k":4,"ix":5},"lc":1,"lj":1,"ml":10,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[45.851,72.416],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"green","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":483,"st":-299,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":".yellow600","cl":"yellow600","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[206,200.202,0],"ix":2},"a":{"a":0,"k":[45.851,124.174,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,-2.209],[0,0],[2.209,0],[0,0],[0,2.21],[0,0],[-2.21,0],[0,0],[0,0],[-1.104,0],[0,0],[0,-1.104],[0,0]],"o":[[2.209,0],[0,0],[0,2.21],[0,0],[-2.21,0],[0,0],[0,-2.209],[0,0],[0,0],[0,-1.104],[0,0],[1.104,0],[0,0],[0,0]],"v":[[31.851,-52.738],[35.851,-48.738],[35.851,58.416],[31.851,62.416],[-31.851,62.416],[-35.851,58.416],[-35.851,-48.738],[-31.851,-52.738],[-16.864,-52.738],[-16.864,-60.416],[-14.864,-62.416],[14.864,-62.416],[16.863,-60.416],[16.863,-52.738]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"tm","s":{"a":0,"k":25,"ix":1},"e":{"a":0,"k":50,"ix":2},"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":0,"s":[0]},{"t":240,"s":[360]}],"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1","mn":"ADBE Vector Filter - Trim","hd":false},{"ty":"st","c":{"a":0,"k":[0.976470588235,0.670588235294,0,1],"ix":3},"o":{"a":1,"k":[{"i":{"x":[0.12],"y":[1]},"o":{"x":[0.44],"y":[0]},"t":7.732,"s":[0]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":25.133,"s":[100]},{"i":{"x":[0.12],"y":[1]},"o":{"x":[0.44],"y":[0]},"t":135.334,"s":[100]},{"t":147.333984375,"s":[0]}],"ix":4},"w":{"a":0,"k":4,"ix":5},"lc":1,"lj":1,"ml":10,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[45.851,72.416],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"yellow","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":483,"st":-299,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":".red600","cl":"red600","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[170.2,156.264,0],"ix":2},"a":{"a":0,"k":[10.05,80.236,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,-2.209],[0,0],[2.209,0],[0,0],[0,2.21],[0,0],[-2.21,0],[0,0],[0,0],[-1.104,0],[0,0],[0,-1.104],[0,0]],"o":[[2.209,0],[0,0],[0,2.21],[0,0],[-2.21,0],[0,0],[0,-2.209],[0,0],[0,0],[0,-1.104],[0,0],[1.104,0],[0,0],[0,0]],"v":[[31.851,-52.738],[35.851,-48.738],[35.851,58.416],[31.851,62.416],[-31.851,62.416],[-35.851,58.416],[-35.851,-48.738],[-31.851,-52.738],[-16.864,-52.738],[-16.864,-60.416],[-14.864,-62.416],[14.864,-62.416],[16.863,-60.416],[16.863,-52.738]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"tm","s":{"a":0,"k":50,"ix":1},"e":{"a":0,"k":75,"ix":2},"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":0,"s":[0]},{"t":240,"s":[360]}],"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1","mn":"ADBE Vector Filter - Trim","hd":false},{"ty":"st","c":{"a":0,"k":[0.850980392157,0.188235294118,0.145098039216,1],"ix":3},"o":{"a":1,"k":[{"i":{"x":[0.12],"y":[1]},"o":{"x":[0.44],"y":[0]},"t":3.867,"s":[0]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":21.268,"s":[100]},{"i":{"x":[0.12],"y":[1]},"o":{"x":[0.44],"y":[0]},"t":132.666,"s":[100]},{"t":144.666015625,"s":[0]}],"ix":4},"w":{"a":0,"k":4,"ix":5},"lc":1,"lj":1,"ml":10,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[45.851,72.416],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"red","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":483,"st":-299,"bm":0},{"ddd":0,"ind":4,"ty":4,"nm":".blue600","cl":"blue600","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[204,97.116,0],"ix":2},"a":{"a":0,"k":[43.851,21.087,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,-2.209],[0,0],[2.209,0],[0,0],[0,2.21],[0,0],[-2.21,0],[0,0],[0,0],[-1.104,0],[0,0],[0,-1.104],[0,0]],"o":[[2.209,0],[0,0],[0,2.21],[0,0],[-2.21,0],[0,0],[0,-2.209],[0,0],[0,0],[0,-1.104],[0,0],[1.104,0],[0,0],[0,0]],"v":[[31.851,-52.738],[35.851,-48.738],[35.851,58.416],[31.851,62.416],[-31.851,62.416],[-35.851,58.416],[-35.851,-48.738],[-31.851,-52.738],[-16.864,-52.738],[-16.864,-60.416],[-14.864,-62.416],[14.864,-62.416],[16.863,-60.416],[16.863,-52.738]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"tm","s":{"a":0,"k":75,"ix":1},"e":{"a":0,"k":100,"ix":2},"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":0,"s":[0]},{"t":240,"s":[360]}],"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1","mn":"ADBE Vector Filter - Trim","hd":false},{"ty":"st","c":{"a":0,"k":[0.101960784314,0.450980392157,0.909803921569,1],"ix":3},"o":{"a":1,"k":[{"i":{"x":[0.12],"y":[1]},"o":{"x":[0.44],"y":[0]},"t":0,"s":[0]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":17.4,"s":[100]},{"i":{"x":[0.12],"y":[1]},"o":{"x":[0.44],"y":[0]},"t":130,"s":[100]},{"t":142,"s":[0]}],"ix":4},"w":{"a":0,"k":4,"ix":5},"lc":1,"lj":1,"ml":10,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[45.851,72.416],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"blue","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":483,"st":-299,"bm":0}]},{"id":"comp_9","layers":[{"ddd":0,"ind":1,"ty":4,"nm":".grey300","cl":"grey300","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[205.639,149.71,0],"ix":2},"a":{"a":0,"k":[87.101,45.31,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,5.681],[0,0],[5.681,0],[0,0]],"o":[[0,0],[-5.682,0],[0,0],[0,-5.682],[0,0],[0,0]],"v":[[19.731,18.05],[10.36,18.05],[0.073,7.763],[0.073,-7.763],[-10.214,-18.05],[-19.731,-18.05]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0.854901960784,0.862745098039,0.878431372549,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":1,"k":[{"i":{"x":[0.12],"y":[1]},"o":{"x":[0.44],"y":[0]},"t":90,"s":[7]},{"i":{"x":[0.999],"y":[1]},"o":{"x":[0.001],"y":[0]},"t":120,"s":[8]},{"i":{"x":[0.12],"y":[1]},"o":{"x":[0.44],"y":[0]},"t":210,"s":[8]},{"t":240,"s":[7]}],"ix":5},"lc":1,"lj":1,"ml":10,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[24.731,23.05],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"12","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,5.681],[0,0],[-5.681,0],[0,0]],"o":[[0,0],[5.682,0],[0,0],[0,-5.682],[0,0],[0,0]],"v":[[-19.731,18.05],[-10.361,18.05],[-0.074,7.763],[-0.074,-7.763],[10.215,-18.05],[19.732,-18.05]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0.854901960784,0.862745098039,0.878431372549,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":1,"k":[{"i":{"x":[0.12],"y":[1]},"o":{"x":[0.44],"y":[0]},"t":90,"s":[7]},{"i":{"x":[0.999],"y":[1]},"o":{"x":[0.001],"y":[0]},"t":120,"s":[2]},{"i":{"x":[0.12],"y":[1]},"o":{"x":[0.44],"y":[0]},"t":210,"s":[2]},{"t":240,"s":[7]}],"ix":5},"lc":1,"lj":1,"ml":10,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[149.471,23.05],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"24","np":2,"cix":2,"bm":0,"ix":2,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,-5.681],[0,0],[5.681,0],[0,0]],"o":[[0,0],[-5.682,0],[0,0],[0,5.682],[0,0],[0,0]],"v":[[19.731,-18.051],[10.36,-18.051],[0.073,-7.764],[0.073,7.763],[-10.214,18.051],[-19.731,18.051]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0.854901960784,0.862745098039,0.878431372549,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":1,"k":[{"i":{"x":[0.12],"y":[1]},"o":{"x":[0.44],"y":[0]},"t":90,"s":[7]},{"i":{"x":[0.999],"y":[1]},"o":{"x":[0.001],"y":[0]},"t":120,"s":[2]},{"i":{"x":[0.12],"y":[1]},"o":{"x":[0.44],"y":[0]},"t":210,"s":[2]},{"t":240,"s":[7]}],"ix":5},"lc":1,"lj":1,"ml":10,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[24.731,67.57],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"48","np":2,"cix":2,"bm":0,"ix":3,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,-5.681],[0,0],[-5.681,0],[0,0]],"o":[[0,0],[5.682,0],[0,0],[0,5.682],[0,0],[0,0]],"v":[[-19.731,-18.051],[-10.361,-18.051],[-0.074,-7.764],[-0.074,7.763],[10.215,18.051],[19.732,18.051]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0.854901960784,0.862745098039,0.878431372549,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":1,"k":[{"i":{"x":[0.12],"y":[1]},"o":{"x":[0.44],"y":[0]},"t":90,"s":[7]},{"i":{"x":[0.999],"y":[1]},"o":{"x":[0.001],"y":[0]},"t":120,"s":[2]},{"i":{"x":[0.12],"y":[1]},"o":{"x":[0.44],"y":[0]},"t":210,"s":[2]},{"t":240,"s":[7]}],"ix":5},"lc":1,"lj":1,"ml":10,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[149.471,67.57],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"49","np":2,"cix":2,"bm":0,"ix":4,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":579,"st":0,"bm":0}]},{"id":"comp_10","layers":[{"ddd":0,"ind":1,"ty":4,"nm":".white","cl":"white","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[206,148.444,0],"ix":2},"a":{"a":0,"k":[45.851,72.416,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0]],"v":[[34.465,76.705],[45.85,76.705],[51.535,55.259]],"c":true},"ix":2},"nm":"Path 2","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[43,65.982],"ix":2},"a":{"a":0,"k":[43,65.982],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0]],"v":[[8.535,-10.723],[-2.851,-10.723],[-8.535,10.723]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 2","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[48.701,87.428],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 2","np":2,"cix":2,"bm":0,"ix":2,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":579,"st":0,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":".grey300","cl":"grey300","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[206,148.444,0],"ix":2},"a":{"a":0,"k":[45.851,72.416,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,-2.209],[0,0],[2.209,0],[0,0],[0,2.21],[0,0],[-2.21,0],[0,0],[0,0],[-1.104,0],[0,0],[0,-1.104],[0,0]],"o":[[2.209,0],[0,0],[0,2.21],[0,0],[-2.21,0],[0,0],[0,-2.209],[0,0],[0,0],[0,-1.104],[0,0],[1.104,0],[0,0],[0,0]],"v":[[31.851,-52.738],[35.851,-48.738],[35.851,58.416],[31.851,62.416],[-31.851,62.416],[-35.851,58.416],[-35.851,-48.738],[-31.851,-52.738],[-16.864,-52.738],[-16.864,-60.416],[-14.864,-62.416],[14.864,-62.416],[16.863,-60.416],[16.863,-52.738]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0.855000035903,0.862999949736,0.877999997606,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":4,"ix":5},"lc":1,"lj":1,"ml":10,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[45.851,72.416],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"grey","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":579,"st":0,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":".grey300","cl":"grey300","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[206,204.175,0],"ix":2},"a":{"a":0,"k":[0,45.925,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0,0.53,0.667],"y":[1,0.927,1]},"o":{"x":[0.333,0.534,0.333],"y":[0,0.01,0]},"t":0,"s":[100,87,100]},{"i":{"x":[0,0.536,0.833],"y":[1,0.997,1]},"o":{"x":[0.333,0.305,0.333],"y":[0,0.452,0]},"t":90,"s":[100,5,100]},{"i":{"x":[0.833,0.833,0.833],"y":[1,0.833,1]},"o":{"x":[0,0,0.167],"y":[0,0,0]},"t":121,"s":[100,100,100]},{"t":240,"s":[100,87,100]}],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[60,102.783],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.854901960784,0.862745098039,0.878431372549,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[-0.114,-5.467],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":540,"st":0,"bm":0}]}],"layers":[{"ddd":0,"ind":1,"ty":0,"nm":"mail","refId":"comp_0","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":0,"s":[100]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":75,"s":[25]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":105,"s":[25]},{"t":120,"s":[100]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[206,150,0],"ix":2},"a":{"a":0,"k":[206,150,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"w":412,"h":300,"ip":0,"op":540,"st":0,"bm":0},{"ddd":0,"ind":2,"ty":0,"nm":"chat","refId":"comp_1","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":0,"s":[100]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":75,"s":[25]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":105,"s":[25]},{"t":120,"s":[100]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[206,150,0],"ix":2},"a":{"a":0,"k":[206,150,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"w":412,"h":300,"ip":0,"op":540,"st":0,"bm":0},{"ddd":0,"ind":3,"ty":0,"nm":"cal","refId":"comp_2","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":0,"s":[100]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":75,"s":[25]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":105,"s":[25]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":120,"s":[75]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":225,"s":[75]},{"t":240,"s":[100]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[206,150,0],"ix":2},"a":{"a":0,"k":[206,150,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"w":412,"h":300,"ip":0,"op":540,"st":0,"bm":0},{"ddd":0,"ind":4,"ty":0,"nm":"youtube","refId":"comp_3","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":0,"s":[100]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":75,"s":[25]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":105,"s":[25]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":120,"s":[75]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":225,"s":[75]},{"t":240,"s":[100]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[206,150,0],"ix":2},"a":{"a":0,"k":[206,150,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"w":412,"h":300,"ip":0,"op":540,"st":0,"bm":0},{"ddd":0,"ind":5,"ty":0,"nm":"run","refId":"comp_4","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":0,"s":[100]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":75,"s":[25]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":105,"s":[25]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":120,"s":[75]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":225,"s":[75]},{"t":240,"s":[100]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[206,150,0],"ix":2},"a":{"a":0,"k":[206,150,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"w":412,"h":300,"ip":0,"op":540,"st":0,"bm":0},{"ddd":0,"ind":6,"ty":0,"nm":"trips","refId":"comp_5","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":0,"s":[100]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":75,"s":[25]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":105,"s":[25]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":120,"s":[50]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":225,"s":[50]},{"t":240,"s":[100]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[206,150,0],"ix":2},"a":{"a":0,"k":[206,150,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"w":412,"h":300,"ip":0,"op":540,"st":0,"bm":0},{"ddd":0,"ind":7,"ty":0,"nm":"maps","refId":"comp_6","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":0,"s":[100]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":75,"s":[25]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":105,"s":[25]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":120,"s":[25]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":225,"s":[25]},{"t":240,"s":[100]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[206,150,0],"ix":2},"a":{"a":0,"k":[206,150,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"w":412,"h":300,"ip":0,"op":540,"st":0,"bm":0},{"ddd":0,"ind":8,"ty":0,"nm":"tix","refId":"comp_7","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":0,"s":[100]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":75,"s":[25]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":105,"s":[25]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":120,"s":[25]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":225,"s":[25]},{"t":240,"s":[100]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[206,150,0],"ix":2},"a":{"a":0,"k":[206,150,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"w":412,"h":300,"ip":0,"op":540,"st":0,"bm":0},{"ddd":0,"ind":9,"ty":0,"nm":"ColorLines","refId":"comp_8","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[206,150,0],"ix":2},"a":{"a":0,"k":[206,150,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"w":412,"h":300,"ip":90,"op":573,"st":90,"bm":0},{"ddd":0,"ind":10,"ty":0,"nm":"Lines","refId":"comp_9","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[206,150,0],"ix":2},"a":{"a":0,"k":[206,150,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"w":412,"h":300,"ip":0,"op":540,"st":0,"bm":0},{"ddd":0,"ind":11,"ty":0,"nm":"Battery","refId":"comp_10","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[206,150,0],"ix":2},"a":{"a":0,"k":[206,150,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"w":412,"h":300,"ip":0,"op":540,"st":0,"bm":0},{"ddd":0,"ind":12,"ty":4,"nm":".white","cl":"white","hd":true,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[206,150,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[15.4,0],[0,0],[0,15.4],[0,0],[-15.4,0],[0,0],[0,-15.4],[0,0]],"o":[[0,0],[-15.4,0],[0,0],[0,-15.4],[0,0],[15.4,0],[0,0],[0,15.4]],"v":[[178,150],[-178,150],[-206,122],[-206,-122],[-178,-150],[178,-150],[206,-122],[206,122]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":540,"st":0,"bm":0}],"markers":[]} \ No newline at end of file diff --git a/res/xml/smart_battery_detail.xml b/res/xml/smart_battery_detail.xml index 97951252525..ef2c4deb78b 100644 --- a/res/xml/smart_battery_detail.xml +++ b/res/xml/smart_battery_detail.xml @@ -22,10 +22,6 @@ android:title="@string/smart_battery_manager_title" settings:keywords="@string/keywords_battery_adaptive_preferences"> - - Date: Thu, 16 Mar 2023 12:07:03 +0530 Subject: [PATCH 19/20] Settings: Remove adaptive connectivity logo --- res/drawable/ic_enhanced_connectivity.xml | 91 ---------------------- res/xml/adaptive_connectivity_settings.xml | 5 -- 2 files changed, 96 deletions(-) delete mode 100644 res/drawable/ic_enhanced_connectivity.xml diff --git a/res/drawable/ic_enhanced_connectivity.xml b/res/drawable/ic_enhanced_connectivity.xml deleted file mode 100644 index 45767bd7d44..00000000000 --- a/res/drawable/ic_enhanced_connectivity.xml +++ /dev/null @@ -1,91 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/res/xml/adaptive_connectivity_settings.xml b/res/xml/adaptive_connectivity_settings.xml index d5941ad0507..b657cf34bfe 100644 --- a/res/xml/adaptive_connectivity_settings.xml +++ b/res/xml/adaptive_connectivity_settings.xml @@ -23,11 +23,6 @@ settings:searchable="false" android:title="@string/adaptive_connectivity_summary"/> - - Date: Wed, 22 Mar 2023 16:11:39 +0530 Subject: [PATCH 20/20] Settings: Remove google learn more links --- .../LocationSettingsFooterPreferenceController.java | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/src/com/android/settings/location/LocationSettingsFooterPreferenceController.java b/src/com/android/settings/location/LocationSettingsFooterPreferenceController.java index 05d153c43a8..1b5c7f86164 100644 --- a/src/com/android/settings/location/LocationSettingsFooterPreferenceController.java +++ b/src/com/android/settings/location/LocationSettingsFooterPreferenceController.java @@ -106,21 +106,9 @@ public class LocationSettingsFooterPreferenceController extends LocationBasePref } if (mFooterPreference != null) { mFooterPreference.setTitle(Html.fromHtml(footerString)); - mFooterPreference.setLearnMoreAction(v -> openLocationLearnMoreLink()); - mFooterPreference.setLearnMoreText(mContext.getString( - R.string.location_settings_footer_learn_more_content_description)); } } - private void openLocationLearnMoreLink() { - mFragment.startActivityForResult( - HelpUtils.getHelpIntent( - mContext, - mContext.getString(R.string.location_settings_footer_learn_more_link), - /*backupContext=*/""), - /*requestCode=*/ 0); - } - /** * Location footer preference group should always be displayed. */ -- GitLab