From 5322f4610f47cc2b413a7804951512f70ea872cd Mon Sep 17 00:00:00 2001 From: Nishith Khanna Date: Thu, 1 Sep 2022 17:35:32 +0530 Subject: [PATCH 1/2] 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_settings.xml | 25 ++++++++--- 3 files changed, 81 insertions(+), 37 deletions(-) diff --git a/res/drawable/ic_launcher_background.xml b/res/drawable/ic_launcher_background.xml index 8c651550f93..d293cb2b587 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_settings.xml b/res/drawable/ic_launcher_settings.xml index 3d90bc5c336..1816bb23a6c 100644 --- a/res/drawable/ic_launcher_settings.xml +++ b/res/drawable/ic_launcher_settings.xml @@ -1,9 +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 . + --> - - - + + + + + \ No newline at end of file -- GitLab From 74c1eb29c951a8b725b7a5cbf05dc8dfafda7bb0 Mon Sep 17 00:00:00 2001 From: Nishith Khanna Date: Mon, 10 Oct 2022 19:40:19 +0530 Subject: [PATCH 2/2] Theme app according to our palette --- .../ic_accessibility_magnification_ftsw.xml | 29 +++ res/drawable/ic_apps.xml | 65 ++++--- res/drawable/ic_devices_other.xml | 57 +++--- res/drawable/ic_files_go_round.xml | 171 ++++++------------ res/drawable/ic_font_size_ftsw.xml | 26 +++ res/drawable/ic_homepage_advanced_privacy.xml | 64 +++---- res/drawable/ic_lock_pin.xml | 2 +- res/drawable/ic_notifications.xml | 62 ++++--- 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 | 54 ++++-- 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 | 40 ++++ res/layout/homepage_preference.xml | 2 +- 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 | 6 +- res/xml/top_level_settings.xml | 4 +- .../settings/homepage/TopLevelSettings.java | 17 -- ...ighlightableTopLevelPreferenceAdapter.java | 4 - 37 files changed, 918 insertions(+), 553 deletions(-) create mode 100644 res/drawable/ic_accessibility_magnification_ftsw.xml create mode 100644 res/drawable/ic_font_size_ftsw.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_apps.xml b/res/drawable/ic_apps.xml index 20583a16f73..3340dceff37 100644 --- a/res/drawable/ic_apps.xml +++ b/res/drawable/ic_apps.xml @@ -1,25 +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="38dp" + android:height="38dp" + android:viewportWidth="38" + android:viewportHeight="38"> + + + android:pathData="M19,0L19,0A19,19 0,0 1,38 19L38,19A19,19 0,0 1,19 38L19,38A19,19 0,0 1,0 19L0,19A19,19 0,0 1,19 0z" + android:fillColor="#E83A52"/> + + + + + + diff --git a/res/drawable/ic_devices_other.xml b/res/drawable/ic_devices_other.xml index 3d292649c79..02bb07ccc35 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="38dp" + android:height="38dp" + android:viewportWidth="38" + android:viewportHeight="38"> + + + android:pathData="M19,0L19,0A19,19 0,0 1,38 19L38,19A19,19 0,0 1,19 38L19,38A19,19 0,0 1,0 19L0,19A19,19 0,0 1,19 0z" + android:fillColor="#0088ED"/> + + + + diff --git a/res/drawable/ic_files_go_round.xml b/res/drawable/ic_files_go_round.xml index 2025b000ea8..3dc14f64d49 100644 --- a/res/drawable/ic_files_go_round.xml +++ b/res/drawable/ic_files_go_round.xml @@ -1,121 +1,56 @@ + -. + --> + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + android:width="40dp" + android:height="40dp" + android:viewportWidth="180" + android:viewportHeight="181"> + + + + + + + + + + + + + + + + diff --git a/res/drawable/ic_font_size_ftsw.xml b/res/drawable/ic_font_size_ftsw.xml new file mode 100644 index 00000000000..8c9c214a72d --- /dev/null +++ b/res/drawable/ic_font_size_ftsw.xml @@ -0,0 +1,26 @@ + + + + + \ No newline at end of file diff --git a/res/drawable/ic_homepage_advanced_privacy.xml b/res/drawable/ic_homepage_advanced_privacy.xml index c75e102402b..e56a2ae9e40 100644 --- a/res/drawable/ic_homepage_advanced_privacy.xml +++ b/res/drawable/ic_homepage_advanced_privacy.xml @@ -1,39 +1,41 @@ + android:width="38dp" + android:height="38dp" + android:viewportWidth="38" + android:viewportHeight="38"> + + + android:pathData="M19,0L19,0A19,19 0,0 1,38 19L38,19A19,19 0,0 1,19 38L19,38A19,19 0,0 1,0 19L0,19A19,19 0,0 1,19 0z" + android:fillColor="#2CCF69"/> + android:pathData="M18.983,9.667V9.667C18.917,9.666 18.85,9.675 18.785,9.693L10.869,13.044C10.815,13.069 10.765,13.111 10.727,13.168C10.689,13.228 10.667,13.301 10.667,13.377L10.667,13.379C10.667,21.181 15.058,26.35 18.862,27.975L18.865,27.977C18.902,27.992 18.94,28 18.978,28C19.016,28 19.054,27.992 19.091,27.977L19.097,27.974L19.097,27.974C22.126,26.687 27.324,22.049 27.333,13.402C27.33,13.323 27.305,13.248 27.263,13.186C27.22,13.122 27.162,13.075 27.099,13.049C27.099,13.049 27.099,13.049 27.099,13.049L19.169,9.691C19.112,9.675 19.053,9.667 18.994,9.667L18.983,9.667ZM19.75,8.127L27.75,11.514C28.114,11.668 28.425,11.927 28.647,12.258C28.869,12.589 28.992,12.979 29,13.379C29,22.777 23.332,27.986 19.749,29.508C19.505,29.613 19.243,29.667 18.978,29.667C18.713,29.667 18.451,29.613 18.207,29.508C13.749,27.603 9,21.803 9,13.379C8.999,12.982 9.114,12.594 9.328,12.262C9.543,11.931 9.849,11.671 10.208,11.514L18.207,8.127C18.463,8.041 18.73,7.998 18.999,8C19.255,8.001 19.508,8.044 19.75,8.127Z" + android:fillColor="#ffffff" + android:fillType="evenOdd"/> + android:pathData="M16.673,14.986C16.998,15.312 16.998,15.84 16.673,16.165C16.03,16.808 15.708,17.649 15.708,18.493C15.708,19.336 16.03,20.177 16.673,20.82C17.315,21.463 18.156,21.784 19,21.784C19.844,21.784 20.684,21.463 21.327,20.82C21.97,20.177 22.291,19.336 22.291,18.493C22.291,17.649 21.97,16.808 21.327,16.165C21.002,15.84 21.002,15.312 21.327,14.986C21.653,14.661 22.18,14.661 22.506,14.986C23.474,15.955 23.958,17.225 23.958,18.493C23.958,19.76 23.474,21.03 22.506,21.998C21.538,22.966 20.267,23.451 19,23.451C17.732,23.451 16.462,22.966 15.494,21.998C14.526,21.03 14.042,19.76 14.042,18.493C14.042,17.225 14.526,15.955 15.494,14.986C15.819,14.661 16.347,14.661 16.673,14.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.xml b/res/drawable/ic_notifications.xml index 37d77d87671..db78536ee1e 100644 --- a/res/drawable/ic_notifications.xml +++ b/res/drawable/ic_notifications.xml @@ -1,26 +1,44 @@ + + ~ 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="38dp" + android:height="38dp" + android:viewportWidth="38" + android:viewportHeight="38"> + + + android:pathData="M19,0L19,0A19,19 0,0 1,38 19L38,19A19,19 0,0 1,19 38L19,38A19,19 0,0 1,0 19L0,19A19,19 0,0 1,19 0z" + android:fillColor="#FF7301"/> + + + + + 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..33367ee458e 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="38dp" + android:height="38dp" + android:viewportWidth="38" + android:viewportHeight="38"> + + + android:pathData="M19,0L19,0A19,19 0,0 1,38 19L38,19A19,19 0,0 1,19 38L19,38A19,19 0,0 1,0 19L0,19A19,19 0,0 1,19 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..5c5f0611d00 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="38dp" + android:height="38dp" + android:viewportWidth="38" + android:viewportHeight="38"> + + + android:pathData="M19,0L19,0A19,19 0,0 1,38 19L38,19A19,19 0,0 1,19 38L19,38A19,19 0,0 1,0 19L0,19A19,19 0,0 1,19 0z" + android:fillColor="#0088ED"/> + android:pathData="M17.905,15.42C15.827,15.42 14.133,13.727 14.133,11.649C14.133,9.571 15.827,7.878 17.905,7.878C19.982,7.878 21.676,9.571 21.676,11.649C21.676,13.727 19.982,15.42 17.905,15.42ZM17.905,9.459C16.708,9.459 15.714,10.452 15.714,11.649C15.714,12.846 16.708,13.84 17.905,13.84C19.101,13.84 20.095,12.846 20.095,11.649C20.095,10.452 19.124,9.459 17.905,9.459Z" + android:fillColor="#ffffff"/> + + + diff --git a/res/drawable/ic_settings_accounts.xml b/res/drawable/ic_settings_accounts.xml index c0c93dd5065..908bc5bb08f 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="38dp" + android:height="38dp" + android:viewportWidth="38" + android:viewportHeight="38"> + + + + + + + + + + + diff --git a/res/drawable/ic_settings_battery_white.xml b/res/drawable/ic_settings_battery_white.xml index e042249ad65..ca15ac18af8 100644 --- a/res/drawable/ic_settings_battery_white.xml +++ b/res/drawable/ic_settings_battery_white.xml @@ -1,28 +1,54 @@ + + android:width="38dp" + android:height="38dp" + android:viewportWidth="38" + android:viewportHeight="38"> + + + android:pathData="M19,0L19,0A19,19 0,0 1,38 19L38,19A19,19 0,0 1,19 38L19,38A19,19 0,0 1,0 19L0,19A19,19 0,0 1,19 0z" + android:fillColor="#2CCF69"/> + android:pathData="M11.604,10.34C11.604,9.903 11.958,9.549 12.394,9.549H25.628C26.065,9.549 26.419,9.903 26.419,10.34V29.512C26.419,29.949 26.065,30.303 25.628,30.303H12.394C11.958,30.303 11.604,29.949 11.604,29.512V10.34ZM13.185,11.13V28.722H24.838V11.13H13.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..8d991cc7c0a 100644 --- a/res/drawable/ic_settings_display_white.xml +++ b/res/drawable/ic_settings_display_white.xml @@ -1,25 +1,68 @@ + - + android:width="38dp" + android:height="38dp" + android:viewportWidth="38" + android:viewportHeight="38"> + + + + + + + + + + + + + + diff --git a/res/drawable/ic_settings_emergency.xml b/res/drawable/ic_settings_emergency.xml index d331e3e4161..c24a19c2090 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="38dp" + android:height="38dp" + android:viewportWidth="38" + android:viewportHeight="38"> + + + android:pathData="M7,0L31,0A7,7 0,0 1,38 7L38,31A7,7 0,0 1,31 38L7,38A7,7 0,0 1,0 31L0,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..3872766e91f 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="38dp" + android:height="38dp" + android:viewportWidth="38" + android:viewportHeight="38"> + + + android:pathData="M19,0L19,0A19,19 0,0 1,38 19L38,19A19,19 0,0 1,19 38L19,38A19,19 0,0 1,0 19L0,19A19,19 0,0 1,19 0z" + android:fillColor="#E83A52"/> + android:pathData="M22.389,10.492C20.961,9.607 19.427,9.345 17.763,9.67L17.753,9.672C15.878,10.014 14.437,11.01 13.398,12.618C12.509,14.014 12.188,15.537 12.431,17.179L12.432,17.186C12.533,17.915 12.759,18.643 13.042,19.384L13.043,19.386C13.693,21.097 14.609,22.715 15.632,24.295L15.632,24.295C16.602,25.794 17.685,27.232 18.84,28.632C18.889,28.686 18.938,28.741 18.988,28.796L19.53,28.152C20.736,26.656 21.885,25.107 22.875,23.479L22.879,23.472C23.9,21.83 24.763,20.182 25.299,18.381C25.616,17.303 25.748,16.256 25.572,15.214L25.571,15.213C25.224,13.151 24.18,11.571 22.397,10.497L22.389,10.492ZM19.721,30.379L19.721,30.379L19.721,30.379L19.721,30.38L19.721,30.38L19.721,30.38L19.721,30.381L19.721,30.381L19.72,30.381L19.72,30.381L19.72,30.382L19.72,30.382L19.72,30.382L19.72,30.382L19.719,30.383L19.719,30.383L19.719,30.383L19.719,30.383L19.719,30.384L19.719,30.385L19.719,30.385L19.718,30.385C19.6,30.622 19.371,30.784 19.108,30.816C18.845,30.849 18.583,30.747 18.411,30.546C18.371,30.5 18.332,30.454 18.293,30.409C18.066,30.143 17.864,29.906 17.661,29.685C17.652,29.675 17.643,29.665 17.634,29.654C16.445,28.214 15.319,26.721 14.305,25.154C13.252,23.528 12.271,21.805 11.566,19.948C11.262,19.155 10.992,18.303 10.867,17.407C10.569,15.393 10.97,13.485 12.067,11.766L12.069,11.763C13.333,9.805 15.142,8.543 17.464,8.118C19.501,7.721 21.44,8.046 23.217,9.146C25.407,10.466 26.71,12.453 27.13,14.951C27.359,16.302 27.176,17.603 26.815,18.828L26.815,18.83C26.222,20.821 25.28,22.604 24.224,24.303C23.183,26.014 21.987,27.623 20.756,29.15C20.752,29.155 20.749,29.159 20.745,29.163L19.721,30.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..42bf4b2fbf2 100644 --- a/res/drawable/ic_settings_privacy.xml +++ b/res/drawable/ic_settings_privacy.xml @@ -1,37 +1,37 @@ + + android:width="38dp" + android:height="38dp" + android:viewportWidth="38" + android:viewportHeight="38"> + + + android:pathData="M19,0L19,0A19,19 0,0 1,38 19L38,19A19,19 0,0 1,19 38L19,38A19,19 0,0 1,0 19L0,19A19,19 0,0 1,19 0z" + android:fillColor="#2CCF69"/> + android:pathData="M19,21.5C20.381,21.5 21.5,20.381 21.5,19C21.5,17.619 20.381,16.5 19,16.5C17.619,16.5 16.5,17.619 16.5,19C16.5,20.381 17.619,21.5 19,21.5ZM19,23.167C21.302,23.167 23.167,21.302 23.167,19C23.167,16.699 21.302,14.833 19,14.833C16.699,14.833 14.833,16.699 14.833,19C14.833,21.302 16.699,23.167 19,23.167Z" + android:fillColor="#ffffff" + android:fillType="evenOdd"/> - + android:pathData="M9.998,19C11.654,22.296 15.065,24.554 19,24.554C22.935,24.554 26.346,22.296 28.002,19C26.346,15.704 22.935,13.446 19,13.446C15.065,13.446 11.654,15.704 9.998,19ZM29.834,19C28.066,14.76 23.881,11.779 19,11.779C14.119,11.779 9.934,14.76 8.165,19C9.934,23.24 14.119,26.221 19,26.221C23.881,26.221 28.066,23.24 29.834,19Z" + 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..430aed363b9 100644 --- a/res/drawable/ic_settings_security_white.xml +++ b/res/drawable/ic_settings_security_white.xml @@ -1,25 +1,37 @@ + + android:width="38dp" + android:height="38dp" + android:viewportWidth="38" + android:viewportHeight="38"> + + - \ No newline at end of file + android:pathData="M19,0L19,0A19,19 0,0 1,38 19L38,19A19,19 0,0 1,19 38L19,38A19,19 0,0 1,0 19L0,19A19,19 0,0 1,19 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..243d2c1042c 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="38dp" + android:height="38dp" + android:viewportWidth="38" + android:viewportHeight="38"> + + + android:pathData="M19,0L19,0A19,19 0,0 1,38 19L38,19A19,19 0,0 1,19 38L19,38A19,19 0,0 1,0 19L0,19A19,19 0,0 1,19 0z" + android:fillColor="#0088ED"/> + android:pathData="M15.963,10.136C13.568,10.136 11.627,12.078 11.627,14.472C11.627,16.867 13.568,18.808 15.963,18.808C18.357,18.808 20.299,16.867 20.299,14.472C20.299,12.078 18.357,10.136 15.963,10.136ZM10.046,14.472C10.046,11.204 12.695,8.555 15.963,8.555C19.23,8.555 21.879,11.204 21.879,14.472C21.879,17.74 19.23,20.389 15.963,20.389C12.695,20.389 10.046,17.74 10.046,14.472Z" + android:fillColor="#ffffff" + android:fillType="evenOdd"/> + android:pathData="M15.91,20.953L17.024,20.953C17.461,20.953 17.814,21.307 17.814,21.744C17.814,22.18 17.461,22.534 17.024,22.534H15.94C14.968,22.534 14.109,22.535 13.339,22.636C12.577,22.735 11.968,22.926 11.483,23.26C10.561,23.899 9.797,25.284 9.797,28.677C9.797,29.113 9.444,29.467 9.007,29.467C8.571,29.467 8.217,29.113 8.217,28.677C8.217,25.136 9,23.055 10.584,21.96C11.353,21.429 12.237,21.185 13.135,21.068C14.016,20.953 14.972,20.953 15.91,20.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..73be2c8e722 100644 --- a/res/drawable/ic_settings_wallpaper_white.xml +++ b/res/drawable/ic_settings_wallpaper_white.xml @@ -1,25 +1,39 @@ + + android:width="38dp" + android:height="38dp" + android:viewportWidth="38" + android:viewportHeight="38"> + + + android:pathData="M7,0L31,0A7,7 0,0 1,38 7L38,31A7,7 0,0 1,31 38L7,38A7,7 0,0 1,0 31L0,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..b3c0210b916 100644 --- a/res/drawable/ic_storage_white.xml +++ b/res/drawable/ic_storage_white.xml @@ -1,25 +1,47 @@ + + android:width="38dp" + android:height="38dp" + android:viewportWidth="38" + android:viewportHeight="38"> + + + android:pathData="M19,0L19,0A19,19 0,0 1,38 19L38,19A19,19 0,0 1,19 38L19,38A19,19 0,0 1,0 19L0,19A19,19 0,0 1,19 0z" + android:fillColor="#24527F"/> + + + + + + diff --git a/res/drawable/ic_updater.xml b/res/drawable/ic_updater.xml new file mode 100644 index 00000000000..61fafb5911b --- /dev/null +++ b/res/drawable/ic_updater.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + diff --git a/res/drawable/ic_volume_up_24dp.xml b/res/drawable/ic_volume_up_24dp.xml index ca5ffa5ac5c..af5bf3aaee1 100644 --- a/res/drawable/ic_volume_up_24dp.xml +++ b/res/drawable/ic_volume_up_24dp.xml @@ -1,31 +1,41 @@ + + android:width="38dp" + android:height="38dp" + android:viewportWidth="38" + android:viewportHeight="38"> + + + android:pathData="M19,0L19,0A19,19 0,0 1,38 19L38,19A19,19 0,0 1,19 38L19,38A19,19 0,0 1,0 19L0,19A19,19 0,0 1,19 0z" + android:fillColor="#FF7301"/> + android:pathData="M22.133,14.162C22.442,13.853 22.943,13.853 23.251,14.162C25.931,16.841 25.931,21.181 23.251,23.861C22.943,24.17 22.442,24.17 22.133,23.861C21.825,23.552 21.825,23.052 22.133,22.743C24.196,20.681 24.196,17.342 22.133,15.279C21.825,14.971 21.825,14.47 22.133,14.162Z" + android:fillColor="#ffffff" + android:fillType="evenOdd"/> + android:pathData="M24.866,11.429C25.175,11.12 25.675,11.12 25.984,11.429C30.177,15.622 30.177,22.4 25.984,26.593C25.675,26.902 25.175,26.902 24.866,26.593C24.557,26.285 24.557,25.784 24.866,25.476C28.442,21.9 28.442,16.122 24.866,12.547C24.557,12.238 24.557,11.738 24.866,11.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..e84cfe6d1f4 --- /dev/null +++ b/res/drawable/ic_wireless.xml @@ -0,0 +1,40 @@ + + + + + + + + + + + diff --git a/res/layout/homepage_preference.xml b/res/layout/homepage_preference.xml index 62f6457d27f..b4f6507e168 100644 --- a/res/layout/homepage_preference.xml +++ b/res/layout/homepage_preference.xml @@ -36,7 +36,7 @@ android:gravity="center" android:orientation="horizontal" android:paddingStart="8dp" - android:paddingEnd="8dp" + android:paddingEnd="16dp" android:paddingTop="4dp" android:paddingBottom="4dp"> diff --git a/res/layout/notification_history.xml b/res/layout/notification_history.xml index 557f1723a85..737a8efa2a5 100644 --- a/res/layout/notification_history.xml +++ b/res/layout/notification_history.xml @@ -17,7 +17,7 @@ diff --git a/res/values-night/colors.xml b/res/values-night/colors.xml index 4e4ee5ddb22..c085063854a 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 9de420e68ff..4c44fb701d7 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -138,7 +138,7 @@ - ?androidprv:attr/colorSurfaceHighlight + @android:color/system_neutral1_50 #42a5f5 diff --git a/res/values/styles.xml b/res/values/styles.xml index 8402dec73ca..22af97971f2 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -464,8 +464,8 @@ diff --git a/res/values/themes.xml b/res/values/themes.xml index d65c1b39413..3b8476b3b8a 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 dc359f4f112..c2fc7389769 100644 --- a/res/xml/accessibility_settings_for_setup_wizard.xml +++ b/res/xml/accessibility_settings_for_setup_wizard.xml @@ -22,14 +22,14 @@ @@ -37,7 +37,7 @@ diff --git a/res/xml/top_level_settings.xml b/res/xml/top_level_settings.xml index 59262c8d533..de74db2ce1b 100644 --- a/res/xml/top_level_settings.xml +++ b/res/xml/top_level_settings.xml @@ -25,7 +25,7 @@ android:key="top_level_update" android:title="@string/system_update_settings_list_item_title" android:summary="@string/system_update_summary" - android:icon="@drawable/ic_system_update" + android:icon="@drawable/ic_updater" android:order="-160" settings:controller="com.android.settings.system.SystemUpdatePreferenceController" settings:keywords="@string/keywords_system_update_settings"> @@ -34,7 +34,7 @@