diff --git a/patches_platform/frameworks_base/0001-Add-SPenPointerOverlay.patch b/patches_platform/frameworks_base/0001-Add-SPenPointerOverlay.patch index 178f228..109bcc8 100644 --- a/patches_platform/frameworks_base/0001-Add-SPenPointerOverlay.patch +++ b/patches_platform/frameworks_base/0001-Add-SPenPointerOverlay.patch @@ -1,7 +1,7 @@ -From ae74e74a16845c786042581f0fae8c8685ee5be7 Mon Sep 17 00:00:00 2001 +From f0314afe5afcd4bf19188c8688a35e322a7bcf44 Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Thu, 13 Jan 2022 14:22:24 +0000 -Subject: [PATCH 01/14] Add SPenPointerOverlay +Subject: [PATCH 01/15] Add SPenPointerOverlay Toggle this overlay with property "persist.ui.spen.pointer" diff --git a/patches_platform/frameworks_base/0002-Disable-FP-lockouts-optionally.patch b/patches_platform/frameworks_base/0002-Disable-FP-lockouts-optionally.patch index 1aaa1c3..1cde4e9 100644 --- a/patches_platform/frameworks_base/0002-Disable-FP-lockouts-optionally.patch +++ b/patches_platform/frameworks_base/0002-Disable-FP-lockouts-optionally.patch @@ -1,7 +1,7 @@ -From 4e591984e8f533e0ad305caf8aa03c60cd9314d0 Mon Sep 17 00:00:00 2001 +From bdb1e544a11d7c82366c636d49da988c8ce6a218 Mon Sep 17 00:00:00 2001 From: AndyCGYan Date: Fri, 22 Mar 2019 00:41:20 +0800 -Subject: [PATCH 02/14] Disable FP lockouts optionally +Subject: [PATCH 02/15] Disable FP lockouts optionally Both timed and permanent lockouts - GET THE FUCK OUT Now targeting LockoutFramework, introduced in Android 12 diff --git a/patches_platform/frameworks_base/0003-Disable-vendor-mismatch-warning.patch b/patches_platform/frameworks_base/0003-Disable-vendor-mismatch-warning.patch index 8595015..8081d9f 100644 --- a/patches_platform/frameworks_base/0003-Disable-vendor-mismatch-warning.patch +++ b/patches_platform/frameworks_base/0003-Disable-vendor-mismatch-warning.patch @@ -1,7 +1,7 @@ -From 3b4a0dc39f8d03ddac9c45fd3e7fc4577334a645 Mon Sep 17 00:00:00 2001 +From 1b1a877dc08bf8177192b4c44644eecac9469721 Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Thu, 5 Apr 2018 10:01:19 +0800 -Subject: [PATCH 03/14] Disable vendor mismatch warning +Subject: [PATCH 03/15] Disable vendor mismatch warning Change-Id: Ieb8fe91e2f02462f074312ed0f4885d183e9780b --- diff --git a/patches_platform/frameworks_base/0004-Keyguard-Fix-colors-of-slices-not-updating-on-doze.patch b/patches_platform/frameworks_base/0004-Keyguard-Fix-colors-of-slices-not-updating-on-doze.patch new file mode 100644 index 0000000..b9cdb7b --- /dev/null +++ b/patches_platform/frameworks_base/0004-Keyguard-Fix-colors-of-slices-not-updating-on-doze.patch @@ -0,0 +1,47 @@ +From 25a596aa94e3e050e5c7726bf3cfa35f8f0492ac Mon Sep 17 00:00:00 2001 +From: Andy CrossGate Yan +Date: Tue, 17 Jan 2023 17:19:19 +0000 +Subject: [PATCH 04/15] Keyguard: Fix colors of slices not updating on doze + +Slices were invisible (black) in doze when using light wallpapers +Introduced in https://github.com/LineageOS/android_frameworks_base/commit/a19e59d717ec6d573c11c7e8277bba3c4de189c2 + +Change-Id: I06abd8bf2e28655cc9e6d81366fd82a13454ec5a +--- + .../com/android/keyguard/KeyguardStatusViewController.java | 7 +++++++ + .../systemui/shade/NotificationPanelViewController.java | 1 + + 2 files changed, 8 insertions(+) + +diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardStatusViewController.java b/packages/SystemUI/src/com/android/keyguard/KeyguardStatusViewController.java +index c715a4eaef2b..a16ab6b8283a 100644 +--- a/packages/SystemUI/src/com/android/keyguard/KeyguardStatusViewController.java ++++ b/packages/SystemUI/src/com/android/keyguard/KeyguardStatusViewController.java +@@ -93,6 +93,13 @@ public class KeyguardStatusViewController extends ViewController Date: Sat, 16 Oct 2021 02:23:48 +0000 -Subject: [PATCH 04/14] UI: Adjust default navbar layouts +Subject: [PATCH 05/15] UI: Adjust default navbar layouts - Slightly tighten nodpi layout - Remove sw372dp layout - looks terrible, probably meant for legacy phablets, but most modern phones qualify diff --git a/patches_platform/frameworks_base/0005-UI-Disable-wallpaper-zoom.patch b/patches_platform/frameworks_base/0006-UI-Disable-wallpaper-zoom.patch similarity index 89% rename from patches_platform/frameworks_base/0005-UI-Disable-wallpaper-zoom.patch rename to patches_platform/frameworks_base/0006-UI-Disable-wallpaper-zoom.patch index 22a90ff..c3146e5 100644 --- a/patches_platform/frameworks_base/0005-UI-Disable-wallpaper-zoom.patch +++ b/patches_platform/frameworks_base/0006-UI-Disable-wallpaper-zoom.patch @@ -1,7 +1,7 @@ -From 1d9cba70b8a820933b6e54afef69a72e7e1ab85e Mon Sep 17 00:00:00 2001 +From d95f2986ab877e2f33ce45fea6e4997ff17a35e1 Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Sun, 10 Jan 2021 11:44:29 +0000 -Subject: [PATCH 05/14] UI: Disable wallpaper zoom +Subject: [PATCH 06/15] UI: Disable wallpaper zoom It does little more than inducing motion sickness diff --git a/patches_platform/frameworks_base/0006-UI-Follow-Monet-and-light-dark-theme-in-user-1-icon.patch b/patches_platform/frameworks_base/0007-UI-Follow-Monet-and-light-dark-theme-in-user-1-icon.patch similarity index 92% rename from patches_platform/frameworks_base/0006-UI-Follow-Monet-and-light-dark-theme-in-user-1-icon.patch rename to patches_platform/frameworks_base/0007-UI-Follow-Monet-and-light-dark-theme-in-user-1-icon.patch index 7458257..e082272 100644 --- a/patches_platform/frameworks_base/0006-UI-Follow-Monet-and-light-dark-theme-in-user-1-icon.patch +++ b/patches_platform/frameworks_base/0007-UI-Follow-Monet-and-light-dark-theme-in-user-1-icon.patch @@ -1,7 +1,7 @@ -From 4c3587987591a1c4545322b0855ea138e7fd26ce Mon Sep 17 00:00:00 2001 +From 3495203480c06150d56ffd11513f0dc0cfffa9dc Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Sun, 25 Sep 2022 02:20:52 +0000 -Subject: [PATCH 06/14] UI: Follow Monet and light/dark theme in user 1 icon +Subject: [PATCH 07/15] UI: Follow Monet and light/dark theme in user 1 icon Change-Id: I755077c6003c39ddc9428da1defe6a6ddd0e5ff8 --- diff --git a/patches_platform/frameworks_base/0007-UI-Increase-default-status-bar-height.patch b/patches_platform/frameworks_base/0008-UI-Increase-default-status-bar-height.patch similarity index 91% rename from patches_platform/frameworks_base/0007-UI-Increase-default-status-bar-height.patch rename to patches_platform/frameworks_base/0008-UI-Increase-default-status-bar-height.patch index 665aa82..9f3c009 100644 --- a/patches_platform/frameworks_base/0007-UI-Increase-default-status-bar-height.patch +++ b/patches_platform/frameworks_base/0008-UI-Increase-default-status-bar-height.patch @@ -1,7 +1,7 @@ -From cd200004d3b59dcb33187a3228a4bdab6b16619b Mon Sep 17 00:00:00 2001 +From 953d205e2408dcd0f7fe25e7c2801512fad196fd Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Wed, 3 Jun 2020 01:31:34 +0000 -Subject: [PATCH 07/14] UI: Increase default status bar height +Subject: [PATCH 08/15] UI: Increase default status bar height Change-Id: Ibbcf63159e19bb2bb2b1094ea07ab85917630b07 --- diff --git a/patches_platform/frameworks_base/0008-UI-Remove-QS-footer-background.patch b/patches_platform/frameworks_base/0009-UI-Remove-QS-footer-background.patch similarity index 90% rename from patches_platform/frameworks_base/0008-UI-Remove-QS-footer-background.patch rename to patches_platform/frameworks_base/0009-UI-Remove-QS-footer-background.patch index 1b60384..8c6f044 100644 --- a/patches_platform/frameworks_base/0008-UI-Remove-QS-footer-background.patch +++ b/patches_platform/frameworks_base/0009-UI-Remove-QS-footer-background.patch @@ -1,7 +1,7 @@ -From 6bc225de6c671c50ed045eef9575b0aa2ab5835f Mon Sep 17 00:00:00 2001 +From 29b987ef4e37748102b41aeabf6a6fb810e6c37e Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Sun, 25 Sep 2022 02:20:20 +0000 -Subject: [PATCH 08/14] UI: Remove QS footer background +Subject: [PATCH 09/15] UI: Remove QS footer background Change-Id: I68e82e0c5e3eddb2d3f767fe792b1436eae506ef --- diff --git a/patches_platform/frameworks_base/0009-UI-Restore-split-screen-divider-to-pre-Sv2-looks.patch b/patches_platform/frameworks_base/0010-UI-Restore-split-screen-divider-to-pre-Sv2-looks.patch similarity index 95% rename from patches_platform/frameworks_base/0009-UI-Restore-split-screen-divider-to-pre-Sv2-looks.patch rename to patches_platform/frameworks_base/0010-UI-Restore-split-screen-divider-to-pre-Sv2-looks.patch index 22c7ca8..c1881f1 100644 --- a/patches_platform/frameworks_base/0009-UI-Restore-split-screen-divider-to-pre-Sv2-looks.patch +++ b/patches_platform/frameworks_base/0010-UI-Restore-split-screen-divider-to-pre-Sv2-looks.patch @@ -1,7 +1,7 @@ -From b421fc2bb853966ede836e09203718dfc8d0cb56 Mon Sep 17 00:00:00 2001 +From f37c5b2151383a120c728d02439692f55c90334e Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Sat, 19 Mar 2022 09:22:24 +0000 -Subject: [PATCH 09/14] UI: Restore split-screen divider to pre-Sv2 looks +Subject: [PATCH 10/15] UI: Restore split-screen divider to pre-Sv2 looks - Kill rounded corners - where two rectangles collide should be perfectly straight - Make it black again - taskbar should mind its own business diff --git a/patches_platform/frameworks_base/0010-UI-Revive-navbar-layout-tuning-via-sysui_nav_bar-tun.patch b/patches_platform/frameworks_base/0011-UI-Revive-navbar-layout-tuning-via-sysui_nav_bar-tun.patch similarity index 95% rename from patches_platform/frameworks_base/0010-UI-Revive-navbar-layout-tuning-via-sysui_nav_bar-tun.patch rename to patches_platform/frameworks_base/0011-UI-Revive-navbar-layout-tuning-via-sysui_nav_bar-tun.patch index f4a7ac0..6f79355 100644 --- a/patches_platform/frameworks_base/0010-UI-Revive-navbar-layout-tuning-via-sysui_nav_bar-tun.patch +++ b/patches_platform/frameworks_base/0011-UI-Revive-navbar-layout-tuning-via-sysui_nav_bar-tun.patch @@ -1,7 +1,7 @@ -From 03ed62fb9ce9ce4da4f666f24a9c9c65cc5b9c03 Mon Sep 17 00:00:00 2001 +From 9d7f2acaa960dd74aa0bc030c3e6d9cd5a234a74 Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Tue, 6 Oct 2020 01:41:16 +0000 -Subject: [PATCH 10/14] UI: Revive navbar layout tuning via sysui_nav_bar +Subject: [PATCH 11/15] UI: Revive navbar layout tuning via sysui_nav_bar tunable Google keeps fixing what ain't broken. diff --git a/patches_platform/frameworks_base/0011-UI-Use-SNAP_FIXED_RATIO-for-multi-window-globally.patch b/patches_platform/frameworks_base/0012-UI-Use-SNAP_FIXED_RATIO-for-multi-window-globally.patch similarity index 96% rename from patches_platform/frameworks_base/0011-UI-Use-SNAP_FIXED_RATIO-for-multi-window-globally.patch rename to patches_platform/frameworks_base/0012-UI-Use-SNAP_FIXED_RATIO-for-multi-window-globally.patch index c41b5c3..d02a011 100644 --- a/patches_platform/frameworks_base/0011-UI-Use-SNAP_FIXED_RATIO-for-multi-window-globally.patch +++ b/patches_platform/frameworks_base/0012-UI-Use-SNAP_FIXED_RATIO-for-multi-window-globally.patch @@ -1,7 +1,7 @@ -From 69581c7e2ab9106877b8c8951244c63c14ea97e4 Mon Sep 17 00:00:00 2001 +From f5e22a9b6f467439f4c84ee6afbcbcdbbb45b3da Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Sun, 26 Apr 2020 08:56:13 +0000 -Subject: [PATCH 11/14] UI: Use SNAP_FIXED_RATIO for multi-window globally +Subject: [PATCH 12/15] UI: Use SNAP_FIXED_RATIO for multi-window globally Enables multiple snap targets under landscape for phone UI diff --git a/patches_platform/frameworks_base/0012-core-Remove-old-app-target-SDK-dialog.patch b/patches_platform/frameworks_base/0013-core-Remove-old-app-target-SDK-dialog.patch similarity index 89% rename from patches_platform/frameworks_base/0012-core-Remove-old-app-target-SDK-dialog.patch rename to patches_platform/frameworks_base/0013-core-Remove-old-app-target-SDK-dialog.patch index 7076d24..4ae17d5 100644 --- a/patches_platform/frameworks_base/0012-core-Remove-old-app-target-SDK-dialog.patch +++ b/patches_platform/frameworks_base/0013-core-Remove-old-app-target-SDK-dialog.patch @@ -1,7 +1,7 @@ -From 5dd8363ed108cb2443fad9e7cd25a3ad54e020b9 Mon Sep 17 00:00:00 2001 +From c29a4e448651024369665a67a9938592f727394a Mon Sep 17 00:00:00 2001 From: Danny Lin Date: Tue, 3 Nov 2020 22:43:12 -0800 -Subject: [PATCH 12/14] core: Remove old app target SDK dialog +Subject: [PATCH 13/15] core: Remove old app target SDK dialog If an app is old, users should already know that, and there's usually no point in warning them about it because they would already be using a diff --git a/patches_platform/frameworks_base/0013-Paint-Enable-subpixel-text-positioning-by-default.patch b/patches_platform/frameworks_base/0014-Paint-Enable-subpixel-text-positioning-by-default.patch similarity index 92% rename from patches_platform/frameworks_base/0013-Paint-Enable-subpixel-text-positioning-by-default.patch rename to patches_platform/frameworks_base/0014-Paint-Enable-subpixel-text-positioning-by-default.patch index 10d3f8d..321822c 100644 --- a/patches_platform/frameworks_base/0013-Paint-Enable-subpixel-text-positioning-by-default.patch +++ b/patches_platform/frameworks_base/0014-Paint-Enable-subpixel-text-positioning-by-default.patch @@ -1,7 +1,7 @@ -From 84e2133ee773923f221a9b9754e4b1ce6bcf5e1a Mon Sep 17 00:00:00 2001 +From feca2661444f0d615f8c050fed4d79acffb42890 Mon Sep 17 00:00:00 2001 From: Danny Lin Date: Tue, 5 Oct 2021 21:01:50 -0700 -Subject: [PATCH 13/14] Paint: Enable subpixel text positioning by default +Subject: [PATCH 14/15] Paint: Enable subpixel text positioning by default On desktop Linux, subpixel text positioning is necessary to avoid kerning issues, and Android is no different. Even though most phone diff --git a/patches_platform/frameworks_base/0014-Add-support-for-app-signature-spoofing.patch b/patches_platform/frameworks_base/0015-Add-support-for-app-signature-spoofing.patch similarity index 98% rename from patches_platform/frameworks_base/0014-Add-support-for-app-signature-spoofing.patch rename to patches_platform/frameworks_base/0015-Add-support-for-app-signature-spoofing.patch index 494584b..f947d06 100644 --- a/patches_platform/frameworks_base/0014-Add-support-for-app-signature-spoofing.patch +++ b/patches_platform/frameworks_base/0015-Add-support-for-app-signature-spoofing.patch @@ -1,7 +1,7 @@ -From 8fc6fb99d86c4e4887d49d7bbff571b50b76c73f Mon Sep 17 00:00:00 2001 +From 933a1e4767cc3deec8545623ce7e44f39a05a922 Mon Sep 17 00:00:00 2001 From: Danny Lin Date: Sat, 16 Oct 2021 05:27:57 -0700 -Subject: [PATCH 14/14] Add support for app signature spoofing +Subject: [PATCH 15/15] Add support for app signature spoofing This is needed by microG GmsCore to pretend to be the official Google Play Services package, because client apps check the package signature diff --git a/patches_platform/vendor_lineage/0001-vendor_lineage-Log-privapp-permissions-whitelist-vio.patch b/patches_platform/vendor_lineage/0001-vendor_lineage-Log-privapp-permissions-whitelist-vio.patch index 4fb93b9..11c0dd0 100644 --- a/patches_platform/vendor_lineage/0001-vendor_lineage-Log-privapp-permissions-whitelist-vio.patch +++ b/patches_platform/vendor_lineage/0001-vendor_lineage-Log-privapp-permissions-whitelist-vio.patch @@ -1,4 +1,4 @@ -From e330d170e8e64c5c7849d0a0c288fb167ee828a8 Mon Sep 17 00:00:00 2001 +From 80d66b7f255176e7cf761ce9c62c436cb729df71 Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Thu, 5 Sep 2019 02:08:22 +0000 Subject: [PATCH 1/2] vendor_lineage: Log privapp-permissions whitelist @@ -10,7 +10,7 @@ Change-Id: I49dba61f332253e291a65e79ca70d9a07d45bb07 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/common.mk b/config/common.mk -index 43c36252..52a4bfd4 100644 +index 7048c9cb..9dc5c710 100644 --- a/config/common.mk +++ b/config/common.mk @@ -74,9 +74,9 @@ PRODUCT_COPY_FILES += \ @@ -23,8 +23,8 @@ index 43c36252..52a4bfd4 100644 - ro.control_privapp_permissions=enforce + ro.control_privapp_permissions=log - # Include AOSP audio files - include vendor/lineage/config/aosp_audio.mk + ifneq ($(TARGET_DISABLE_LINEAGE_SDK), true) + # Lineage SDK -- 2.25.1 diff --git a/patches_platform/vendor_lineage/0002-Revert-overlay-Default-to-night-mode.patch b/patches_platform/vendor_lineage/0002-Revert-overlay-Default-to-night-mode.patch index 3c9646c..a8dff75 100644 --- a/patches_platform/vendor_lineage/0002-Revert-overlay-Default-to-night-mode.patch +++ b/patches_platform/vendor_lineage/0002-Revert-overlay-Default-to-night-mode.patch @@ -1,4 +1,4 @@ -From 77bae190086a8c75bd80800487955bb7577cd374 Mon Sep 17 00:00:00 2001 +From 9218670153d5aa40fd05f51d89240fc7859293a2 Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Mon, 14 Mar 2022 03:44:59 +0000 Subject: [PATCH 2/2] Revert "overlay: Default to night mode" @@ -11,7 +11,7 @@ Change-Id: I036bdd576e536392cf41e3c536d5ca2eb04e5a0f 1 file changed, 8 deletions(-) diff --git a/overlay/common/frameworks/base/core/res/res/values/config.xml b/overlay/common/frameworks/base/core/res/res/values/config.xml -index 3b6eedce..fccecf90 100644 +index 94687fe1..579b98f7 100644 --- a/overlay/common/frameworks/base/core/res/res/values/config.xml +++ b/overlay/common/frameworks/base/core/res/res/values/config.xml @@ -146,14 +146,6 @@ diff --git a/patches_platform_personal/frameworks_base/0001-Add-MiuiNavbarOverlay.patch b/patches_platform_personal/frameworks_base/0001-Add-MiuiNavbarOverlay.patch index 62f5576..d608109 100644 --- a/patches_platform_personal/frameworks_base/0001-Add-MiuiNavbarOverlay.patch +++ b/patches_platform_personal/frameworks_base/0001-Add-MiuiNavbarOverlay.patch @@ -1,4 +1,4 @@ -From cfdeeceda335538663684b6a3d7bc7c2ad25eaf9 Mon Sep 17 00:00:00 2001 +From d6798034133d378b48f226e876e679b0131c1dbd Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Sun, 20 Jun 2021 03:39:32 +0000 Subject: [PATCH 01/21] Add MiuiNavbarOverlay @@ -29,7 +29,7 @@ Change-Id: I0e6791abc3c9521d7dc612df2fec2b041affe7e9 create mode 100644 packages/overlays/MiuiNavbarOverlay/res/drawable-440dpi-v4/ic_sysbar_recent_darkmode.png diff --git a/packages/overlays/Android.mk b/packages/overlays/Android.mk -index 69641e69a9f2..1efc296d9689 100644 +index 36ec11af3068..c5ee8556b75a 100644 --- a/packages/overlays/Android.mk +++ b/packages/overlays/Android.mk @@ -26,6 +26,7 @@ LOCAL_REQUIRED_MODULES := \ diff --git a/patches_platform_personal/frameworks_base/0002-Disable-Bluetooth-by-default.patch b/patches_platform_personal/frameworks_base/0002-Disable-Bluetooth-by-default.patch index 293a471..f576419 100644 --- a/patches_platform_personal/frameworks_base/0002-Disable-Bluetooth-by-default.patch +++ b/patches_platform_personal/frameworks_base/0002-Disable-Bluetooth-by-default.patch @@ -1,4 +1,4 @@ -From 8c24a74eb289bdf3abeed57d490ccf1073f14677 Mon Sep 17 00:00:00 2001 +From 3d733c87e62d1b84124e5a2c1172bb94df3501d2 Mon Sep 17 00:00:00 2001 From: Hikari-no-Tenshi Date: Thu, 30 Jan 2020 22:20:54 +0200 Subject: [PATCH 02/21] Disable Bluetooth by default diff --git a/patches_platform_personal/frameworks_base/0003-Disable-cursor-drag-by-default-for-editable-TextView.patch b/patches_platform_personal/frameworks_base/0003-Disable-cursor-drag-by-default-for-editable-TextView.patch index 032af2a..09c07f5 100644 --- a/patches_platform_personal/frameworks_base/0003-Disable-cursor-drag-by-default-for-editable-TextView.patch +++ b/patches_platform_personal/frameworks_base/0003-Disable-cursor-drag-by-default-for-editable-TextView.patch @@ -1,4 +1,4 @@ -From c15f13abb5819da69fc6906d30f8507fd27f1e4b Mon Sep 17 00:00:00 2001 +From 1a6a0ac98a327cfee7e3d703792ef456197ae212 Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Mon, 27 Sep 2021 16:30:00 +0000 Subject: [PATCH 03/21] Disable cursor drag by default for editable TextViews diff --git a/patches_platform_personal/frameworks_base/0004-Disable-RESTRICTED-bucket-toast.patch b/patches_platform_personal/frameworks_base/0004-Disable-RESTRICTED-bucket-toast.patch index 2c24330..318557e 100644 --- a/patches_platform_personal/frameworks_base/0004-Disable-RESTRICTED-bucket-toast.patch +++ b/patches_platform_personal/frameworks_base/0004-Disable-RESTRICTED-bucket-toast.patch @@ -1,4 +1,4 @@ -From 89c3645edd918789933549bf9be38ea7a7cd1184 Mon Sep 17 00:00:00 2001 +From 57b4bdcc55b85a0c92a348c23e31e6d7d373ba83 Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Sun, 3 Jul 2022 00:08:42 +0000 Subject: [PATCH 04/21] Disable "RESTRICTED bucket" toast diff --git a/patches_platform_personal/frameworks_base/0005-Keyguard-Adjust-clock-style.patch b/patches_platform_personal/frameworks_base/0005-Keyguard-Adjust-clock-style.patch index d383a7d..3a8a408 100644 --- a/patches_platform_personal/frameworks_base/0005-Keyguard-Adjust-clock-style.patch +++ b/patches_platform_personal/frameworks_base/0005-Keyguard-Adjust-clock-style.patch @@ -1,4 +1,4 @@ -From 3eb0073c25efb72c691cf8058385ebb74259ccac Mon Sep 17 00:00:00 2001 +From 2288c34ff8bf06a7be040815ff4d6496eb36062a Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Thu, 2 Sep 2021 16:15:19 +0000 Subject: [PATCH 05/21] Keyguard: Adjust clock style diff --git a/patches_platform_personal/frameworks_base/0006-Keyguard-Hide-padlock-unless-UDFPS-is-in-use.patch b/patches_platform_personal/frameworks_base/0006-Keyguard-Hide-padlock-unless-UDFPS-is-in-use.patch index 9e25080..cf6e96c 100644 --- a/patches_platform_personal/frameworks_base/0006-Keyguard-Hide-padlock-unless-UDFPS-is-in-use.patch +++ b/patches_platform_personal/frameworks_base/0006-Keyguard-Hide-padlock-unless-UDFPS-is-in-use.patch @@ -1,4 +1,4 @@ -From a75f9906f81debf9940b3e9b54ddb05205d1b5fc Mon Sep 17 00:00:00 2001 +From 9524ee57bd44eba56aa592164544f623a010614a Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Sat, 2 Nov 2019 06:41:03 +0000 Subject: [PATCH 06/21] Keyguard: Hide padlock unless UDFPS is in use diff --git a/patches_platform_personal/frameworks_base/0007-Keyguard-Never-switch-to-large-clock.patch b/patches_platform_personal/frameworks_base/0007-Keyguard-Never-switch-to-large-clock.patch index 734be43..79c52d0 100644 --- a/patches_platform_personal/frameworks_base/0007-Keyguard-Never-switch-to-large-clock.patch +++ b/patches_platform_personal/frameworks_base/0007-Keyguard-Never-switch-to-large-clock.patch @@ -1,4 +1,4 @@ -From 9f0dbda9fb7f965f994a374c2194c81fc2a36c65 Mon Sep 17 00:00:00 2001 +From 97ad90dbfeab360820f198a39c48fd6f7d1139b6 Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Wed, 1 Sep 2021 14:41:53 +0000 Subject: [PATCH 07/21] Keyguard: Never switch to large clock diff --git a/patches_platform_personal/frameworks_base/0008-Keyguard-Refine-indication-text.patch b/patches_platform_personal/frameworks_base/0008-Keyguard-Refine-indication-text.patch index f438edf..9127be6 100644 --- a/patches_platform_personal/frameworks_base/0008-Keyguard-Refine-indication-text.patch +++ b/patches_platform_personal/frameworks_base/0008-Keyguard-Refine-indication-text.patch @@ -1,4 +1,4 @@ -From 5ccbd8949c23e2d21ff0dc36d1915418803c2d19 Mon Sep 17 00:00:00 2001 +From c7579711632d2fc79e9775bb79e3f56126accbc3 Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Sat, 2 Nov 2019 08:31:36 +0000 Subject: [PATCH 08/21] Keyguard: Refine indication text diff --git a/patches_platform_personal/frameworks_base/0009-Revert-SystemUI-Align-QS-header-with-status-bar.patch b/patches_platform_personal/frameworks_base/0009-Revert-SystemUI-Align-QS-header-with-status-bar.patch index 649b2cd..44208c7 100644 --- a/patches_platform_personal/frameworks_base/0009-Revert-SystemUI-Align-QS-header-with-status-bar.patch +++ b/patches_platform_personal/frameworks_base/0009-Revert-SystemUI-Align-QS-header-with-status-bar.patch @@ -1,4 +1,4 @@ -From cccdc9392402135535e81d35bb1c8d62222f061f Mon Sep 17 00:00:00 2001 +From f6022c3e0b759dbcbe8ef750db0f83f1e244ff33 Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Thu, 29 Dec 2022 02:53:16 +0000 Subject: [PATCH 09/21] Revert "SystemUI: Align QS header with status bar" @@ -59,10 +59,10 @@ index 2220bbbb76a5..60bc3732cde0 100644 android:gravity="center_vertical|start" > diff --git a/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java b/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java -index 04ace4dc2f3a..614b0c03c696 100644 +index efa864f12481..b0e2f8368703 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java +++ b/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java -@@ -106,7 +106,6 @@ public class QuickStatusBarHeader extends FrameLayout implements TunerService.Tu +@@ -105,7 +105,6 @@ public class QuickStatusBarHeader extends FrameLayout implements TunerService.Tu private StatusBarContentInsetsProvider mInsetsProvider; private int mRoundedCornerPadding = 0; @@ -70,9 +70,9 @@ index 04ace4dc2f3a..614b0c03c696 100644 private int mWaterfallTopInset; private int mCutOutPaddingLeft; private int mCutOutPaddingRight; -@@ -270,20 +269,19 @@ public class QuickStatusBarHeader extends FrameLayout implements TunerService.Tu - mRoundedCornerPadding = resources.getDimensionPixelSize( - R.dimen.rounded_corner_content_padding); +@@ -267,20 +266,19 @@ public class QuickStatusBarHeader extends FrameLayout implements TunerService.Tu + mRoundedCornerPadding = resources.getDimensionPixelSize( + R.dimen.rounded_corner_content_padding); - int statusBarHeight = SystemBarUtils.getStatusBarHeight(mContext); + int qsOffsetHeight = SystemBarUtils.getQuickQsOffsetHeight(mContext); @@ -97,7 +97,7 @@ index 04ace4dc2f3a..614b0c03c696 100644 } else { lp.height = WRAP_CONTENT; } -@@ -307,9 +305,8 @@ public class QuickStatusBarHeader extends FrameLayout implements TunerService.Tu +@@ -304,9 +302,8 @@ public class QuickStatusBarHeader extends FrameLayout implements TunerService.Tu } MarginLayoutParams qqsLP = (MarginLayoutParams) mHeaderQsPanel.getLayoutParams(); @@ -109,7 +109,7 @@ index 04ace4dc2f3a..614b0c03c696 100644 mHeaderQsPanel.setLayoutParams(qqsLP); updateBatteryMode(); -@@ -556,11 +553,11 @@ public class QuickStatusBarHeader extends FrameLayout implements TunerService.Tu +@@ -553,11 +550,11 @@ public class QuickStatusBarHeader extends FrameLayout implements TunerService.Tu } mDatePrivacyView.setPadding(paddingLeft, diff --git a/patches_platform_personal/frameworks_base/0010-Keyguard-UI-Fix-status-bar-quick-settings-margins-an.patch b/patches_platform_personal/frameworks_base/0010-Keyguard-UI-Fix-status-bar-quick-settings-margins-an.patch index a21383b..decc436 100644 --- a/patches_platform_personal/frameworks_base/0010-Keyguard-UI-Fix-status-bar-quick-settings-margins-an.patch +++ b/patches_platform_personal/frameworks_base/0010-Keyguard-UI-Fix-status-bar-quick-settings-margins-an.patch @@ -1,4 +1,4 @@ -From 790f729ba423a331c05ead93c0baadc0cc3a5eff Mon Sep 17 00:00:00 2001 +From 808ad70d1c92dfc1ac6b6e665b826504a760b88c Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Sat, 20 Mar 2021 10:35:14 +0000 Subject: [PATCH 10/21] Keyguard/UI: Fix status bar / quick settings margins @@ -139,10 +139,10 @@ index 44766f3b6a6d..569926a1e1a0 100644 diff --git a/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java b/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java -index 614b0c03c696..55d7336e5c39 100644 +index b0e2f8368703..4ff7e5753a1d 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java +++ b/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java -@@ -106,6 +106,10 @@ public class QuickStatusBarHeader extends FrameLayout implements TunerService.Tu +@@ -105,6 +105,10 @@ public class QuickStatusBarHeader extends FrameLayout implements TunerService.Tu private StatusBarContentInsetsProvider mInsetsProvider; private int mRoundedCornerPadding = 0; @@ -153,9 +153,9 @@ index 614b0c03c696..55d7336e5c39 100644 private int mWaterfallTopInset; private int mCutOutPaddingLeft; private int mCutOutPaddingRight; -@@ -269,6 +273,11 @@ public class QuickStatusBarHeader extends FrameLayout implements TunerService.Tu - mRoundedCornerPadding = resources.getDimensionPixelSize( - R.dimen.rounded_corner_content_padding); +@@ -266,6 +270,11 @@ public class QuickStatusBarHeader extends FrameLayout implements TunerService.Tu + mRoundedCornerPadding = resources.getDimensionPixelSize( + R.dimen.rounded_corner_content_padding); + mStatusBarPaddingStart = resources.getDimensionPixelSize( + R.dimen.status_bar_padding_start); @@ -165,7 +165,7 @@ index 614b0c03c696..55d7336e5c39 100644 int qsOffsetHeight = SystemBarUtils.getQuickQsOffsetHeight(mContext); mDatePrivacyView.getLayoutParams().height = -@@ -359,6 +368,9 @@ public class QuickStatusBarHeader extends FrameLayout implements TunerService.Tu +@@ -356,6 +365,9 @@ public class QuickStatusBarHeader extends FrameLayout implements TunerService.Tu .addFloat(mDateView, "alpha", 0, 0, 1) .addFloat(mClockDateView, "alpha", 1, 0, 0) .addFloat(mQSCarriers, "alpha", 0, 1) @@ -175,7 +175,7 @@ index 614b0c03c696..55d7336e5c39 100644 .setListener(new TouchAnimator.ListenerAdapter() { @Override public void onAnimationAtEnd() { -@@ -466,8 +478,6 @@ public class QuickStatusBarHeader extends FrameLayout implements TunerService.Tu +@@ -463,8 +475,6 @@ public class QuickStatusBarHeader extends FrameLayout implements TunerService.Tu .getStatusBarContentInsetsForCurrentRotation(); boolean hasCornerCutout = mInsetsProvider.currentRotationHasCornerCutout(); @@ -184,7 +184,7 @@ index 614b0c03c696..55d7336e5c39 100644 LinearLayout.LayoutParams datePrivacySeparatorLayoutParams = (LinearLayout.LayoutParams) mDatePrivacySeparator.getLayoutParams(); LinearLayout.LayoutParams mClockIconsSeparatorLayoutParams = -@@ -531,34 +541,38 @@ public class QuickStatusBarHeader extends FrameLayout implements TunerService.Tu +@@ -528,34 +538,38 @@ public class QuickStatusBarHeader extends FrameLayout implements TunerService.Tu private void updateHeadersPadding() { setContentMargins(mDatePrivacyView, 0, 0); setContentMargins(mStatusIconsView, 0, 0); @@ -240,10 +240,10 @@ index 614b0c03c696..55d7336e5c39 100644 } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java -index cc8b2d5c0913..f829fb421fc7 100644 +index 5119b8f95aa8..090fa7aac340 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java -@@ -157,14 +157,7 @@ public class KeyguardStatusBarView extends RelativeLayout { +@@ -156,14 +156,7 @@ public class KeyguardStatusBarView extends RelativeLayout { mCarrierLabel.setTextSize(TypedValue.COMPLEX_UNIT_PX, getResources().getDimensionPixelSize( com.android.internal.R.dimen.text_size_small_material)); diff --git a/patches_platform_personal/frameworks_base/0011-Replace-NTP-server.patch b/patches_platform_personal/frameworks_base/0011-Replace-NTP-server.patch index 3522be7..721c168 100644 --- a/patches_platform_personal/frameworks_base/0011-Replace-NTP-server.patch +++ b/patches_platform_personal/frameworks_base/0011-Replace-NTP-server.patch @@ -1,4 +1,4 @@ -From a8a6e151d39736c5e73394839e476c5b82630d3a Mon Sep 17 00:00:00 2001 +From 2f26229212e75def4f1072c5aaf05bf392007383 Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Sun, 17 Apr 2022 08:48:42 +0000 Subject: [PATCH 11/21] Replace NTP server @@ -9,7 +9,7 @@ Change-Id: I938ab46026d841e7536d8fc02b0ef6b28ebb6ea1 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml -index 80fa6013ee77..9410897a24a0 100644 +index 58cd819b9404..285a72320eee 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -2390,7 +2390,7 @@ diff --git a/patches_platform_personal/frameworks_base/0012-Revert-SystemUI-Add-left-padding-for-keyguard-slices.patch b/patches_platform_personal/frameworks_base/0012-Revert-SystemUI-Add-left-padding-for-keyguard-slices.patch index 68fffd9..0510731 100644 --- a/patches_platform_personal/frameworks_base/0012-Revert-SystemUI-Add-left-padding-for-keyguard-slices.patch +++ b/patches_platform_personal/frameworks_base/0012-Revert-SystemUI-Add-left-padding-for-keyguard-slices.patch @@ -1,4 +1,4 @@ -From 2406fad099bf603dd754a0e279210b606517b77d Mon Sep 17 00:00:00 2001 +From dd9133c4af60b222e4f09a430ef120accefb1f93 Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Tue, 31 May 2022 00:00:08 +0000 Subject: [PATCH 12/21] Revert "SystemUI: Add left padding for keyguard slices" diff --git a/patches_platform_personal/frameworks_base/0013-Revert-Update-RAT-icons-to-match-Silk-design.patch b/patches_platform_personal/frameworks_base/0013-Revert-Update-RAT-icons-to-match-Silk-design.patch index 4d98543..b0a90a2 100644 --- a/patches_platform_personal/frameworks_base/0013-Revert-Update-RAT-icons-to-match-Silk-design.patch +++ b/patches_platform_personal/frameworks_base/0013-Revert-Update-RAT-icons-to-match-Silk-design.patch @@ -1,4 +1,4 @@ -From fba26224a6d73d49389a8eddad477950a729ee59 Mon Sep 17 00:00:00 2001 +From 90b961d665973de20d59218fafcefca48f92d5b1 Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Sun, 5 Sep 2021 01:20:12 +0000 Subject: [PATCH 13/21] Revert "Update RAT icons to match Silk design" diff --git a/patches_platform_personal/frameworks_base/0014-Revert-Use-the-default-top-clock-margin-on-h800-devi.patch b/patches_platform_personal/frameworks_base/0014-Revert-Use-the-default-top-clock-margin-on-h800-devi.patch index 8f52d8a..09bd7fb 100644 --- a/patches_platform_personal/frameworks_base/0014-Revert-Use-the-default-top-clock-margin-on-h800-devi.patch +++ b/patches_platform_personal/frameworks_base/0014-Revert-Use-the-default-top-clock-margin-on-h800-devi.patch @@ -1,4 +1,4 @@ -From 2760ca8d2b0c8920b60d7d4f9ee8f2ae2cabd8b6 Mon Sep 17 00:00:00 2001 +From b96671ae18db307e2f4323132967544ff66d97ce Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Thu, 29 Sep 2022 11:27:57 +0000 Subject: [PATCH 14/21] Revert "Use the default top clock margin on h800 diff --git a/patches_platform_personal/frameworks_base/0015-UI-Always-render-windows-into-cutouts.patch b/patches_platform_personal/frameworks_base/0015-UI-Always-render-windows-into-cutouts.patch index 2c0c985..71bf589 100644 --- a/patches_platform_personal/frameworks_base/0015-UI-Always-render-windows-into-cutouts.patch +++ b/patches_platform_personal/frameworks_base/0015-UI-Always-render-windows-into-cutouts.patch @@ -1,4 +1,4 @@ -From 8fd984bf1c1a79ed4f7d97ace689f0b6718968bb Mon Sep 17 00:00:00 2001 +From 6b1e1b06f33f3fe3d0f5a5f6aaa8b9d6bdfbbe01 Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Wed, 7 Oct 2020 14:00:35 +0000 Subject: [PATCH 15/21] UI: Always render windows into cutouts diff --git a/patches_platform_personal/frameworks_base/0016-UI-Kill-rounded-corners-in-notification-scrim.patch b/patches_platform_personal/frameworks_base/0016-UI-Kill-rounded-corners-in-notification-scrim.patch index e3169f1..5794a6e 100644 --- a/patches_platform_personal/frameworks_base/0016-UI-Kill-rounded-corners-in-notification-scrim.patch +++ b/patches_platform_personal/frameworks_base/0016-UI-Kill-rounded-corners-in-notification-scrim.patch @@ -1,4 +1,4 @@ -From 06472eb420c14153266aca7dc2487f33c32f2f44 Mon Sep 17 00:00:00 2001 +From b4d980d9f9421f8043edf7e4eda459f40486d09e Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Wed, 1 Sep 2021 14:10:50 +0000 Subject: [PATCH 16/21] UI: Kill rounded corners in notification scrim diff --git a/patches_platform_personal/frameworks_base/0017-UI-Reconfigure-power-menu-items.patch b/patches_platform_personal/frameworks_base/0017-UI-Reconfigure-power-menu-items.patch index 841d862..fd28181 100644 --- a/patches_platform_personal/frameworks_base/0017-UI-Reconfigure-power-menu-items.patch +++ b/patches_platform_personal/frameworks_base/0017-UI-Reconfigure-power-menu-items.patch @@ -1,4 +1,4 @@ -From eef68c9e3faad07776544f152946ad299be23d51 Mon Sep 17 00:00:00 2001 +From 7b78452e09b2f142c9b6ae23dfab058da7bdb03e Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Mon, 26 Oct 2020 14:06:56 +0000 Subject: [PATCH 17/21] UI: Reconfigure power menu items @@ -9,7 +9,7 @@ Change-Id: I32cca6e2c6bb64d891efee959127edf7c0802cbc 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml -index 9410897a24a0..a6e437b1efd6 100644 +index 285a72320eee..828090c2ccda 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -3213,13 +3213,10 @@ diff --git a/patches_platform_personal/frameworks_base/0018-UI-Reconfigure-quick-settings-tiles.patch b/patches_platform_personal/frameworks_base/0018-UI-Reconfigure-quick-settings-tiles.patch index ea70fec..cc23bb1 100644 --- a/patches_platform_personal/frameworks_base/0018-UI-Reconfigure-quick-settings-tiles.patch +++ b/patches_platform_personal/frameworks_base/0018-UI-Reconfigure-quick-settings-tiles.patch @@ -1,4 +1,4 @@ -From be8f19801ee144b27fdd74ddfa8f7ecb9c60bfaa Mon Sep 17 00:00:00 2001 +From a72959c54bab273faf23b111b3c2ea37a05ebf1e Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Sat, 5 Mar 2022 01:43:37 +0000 Subject: [PATCH 18/21] UI: Reconfigure quick settings tiles @@ -9,7 +9,7 @@ Change-Id: I743f52ef3a95db0ca2c02ae973faa4629e41885d 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/SystemUI/res/values/config.xml b/packages/SystemUI/res/values/config.xml -index d7d6fa34cce8..61c7613baadc 100644 +index 8a2b88d3cf9a..3287463b7bd0 100644 --- a/packages/SystemUI/res/values/config.xml +++ b/packages/SystemUI/res/values/config.xml @@ -68,7 +68,7 @@ diff --git a/patches_platform_personal/frameworks_base/0019-UI-Relax-requirement-for-HINT_SUPPORTS_DARK_TEXT.patch b/patches_platform_personal/frameworks_base/0019-UI-Relax-requirement-for-HINT_SUPPORTS_DARK_TEXT.patch index 7d5de7e..c4eaf17 100644 --- a/patches_platform_personal/frameworks_base/0019-UI-Relax-requirement-for-HINT_SUPPORTS_DARK_TEXT.patch +++ b/patches_platform_personal/frameworks_base/0019-UI-Relax-requirement-for-HINT_SUPPORTS_DARK_TEXT.patch @@ -1,4 +1,4 @@ -From 6616bcdd57fa5a9f3f482d41ba7667995f083c61 Mon Sep 17 00:00:00 2001 +From 3e220efe0e330611011aae408c7341afb3ca6637 Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Tue, 29 Jun 2021 22:57:01 +0000 Subject: [PATCH 19/21] UI: Relax requirement for HINT_SUPPORTS_DARK_TEXT diff --git a/patches_platform_personal/frameworks_base/0020-UI-Remove-privacy-dot-padding.patch b/patches_platform_personal/frameworks_base/0020-UI-Remove-privacy-dot-padding.patch index 8e6160a..0860603 100644 --- a/patches_platform_personal/frameworks_base/0020-UI-Remove-privacy-dot-padding.patch +++ b/patches_platform_personal/frameworks_base/0020-UI-Remove-privacy-dot-padding.patch @@ -1,4 +1,4 @@ -From d329a8c0310ece234f68f1bf271e27b6a3ef948c Mon Sep 17 00:00:00 2001 +From a0b674ba56fd96ec0f732f587fb5b0b975d01a1a Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Tue, 19 Oct 2021 12:09:34 +0000 Subject: [PATCH 20/21] UI: Remove privacy dot padding diff --git a/patches_platform_personal/frameworks_base/0021-UI-Revert-to-HSL-luminance-for-wallpaper-dark-hints.patch b/patches_platform_personal/frameworks_base/0021-UI-Revert-to-HSL-luminance-for-wallpaper-dark-hints.patch index 8d40d72..d02894f 100644 --- a/patches_platform_personal/frameworks_base/0021-UI-Revert-to-HSL-luminance-for-wallpaper-dark-hints.patch +++ b/patches_platform_personal/frameworks_base/0021-UI-Revert-to-HSL-luminance-for-wallpaper-dark-hints.patch @@ -1,4 +1,4 @@ -From 12c19b3e96fde96dab5093ac2134ad1453bb59b8 Mon Sep 17 00:00:00 2001 +From c3a93b2e23aed8c3f831c0636655dccd80770d45 Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Fri, 30 Sep 2022 16:02:16 +0000 Subject: [PATCH 21/21] UI: Revert to HSL luminance for wallpaper dark hints diff --git a/patches_platform_personal/packages_apps_DeskClock/0001-DeskClock-Remove-night-mode.patch b/patches_platform_personal/packages_apps_DeskClock/0001-DeskClock-Remove-night-mode.patch index 8ffdda0..eaef796 100644 --- a/patches_platform_personal/packages_apps_DeskClock/0001-DeskClock-Remove-night-mode.patch +++ b/patches_platform_personal/packages_apps_DeskClock/0001-DeskClock-Remove-night-mode.patch @@ -1,17 +1,17 @@ -From 02bc17bb2554380d7f7d76e3adffce05a2ba2444 Mon Sep 17 00:00:00 2001 +From 093cc22ff7034256909c702288c94f99fb377671 Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Sun, 5 Sep 2021 00:30:33 +0000 Subject: [PATCH 1/3] DeskClock: Remove night mode Change-Id: I885f39027e78fcda397f1be59d17bc24bc66671a --- - res/xml/screensaver_settings.xml | 8 +------- + res/xml/screensaver_settings.xml | 6 ------ src/com/android/deskclock/Screensaver.java | 5 ++--- src/com/android/deskclock/ScreensaverActivity.java | 2 +- - 3 files changed, 4 insertions(+), 11 deletions(-) + 3 files changed, 3 insertions(+), 10 deletions(-) diff --git a/res/xml/screensaver_settings.xml b/res/xml/screensaver_settings.xml -index 1680aab83..73375dcfa 100644 +index 49a7f1d89..73375dcfa 100644 --- a/res/xml/screensaver_settings.xml +++ b/res/xml/screensaver_settings.xml @@ -24,10 +24,4 @@ @@ -24,14 +24,12 @@ index 1680aab83..73375dcfa 100644 - android:summary="@string/night_mode_summary" - android:title="@string/night_mode_title" /> - -- -\ No newline at end of file -+ + diff --git a/src/com/android/deskclock/Screensaver.java b/src/com/android/deskclock/Screensaver.java -index 29cc13ff9..8def22b30 100644 +index ad92b1149..f6c03ed0a 100644 --- a/src/com/android/deskclock/Screensaver.java +++ b/src/com/android/deskclock/Screensaver.java -@@ -141,9 +141,8 @@ public final class Screensaver extends DreamService { +@@ -136,9 +136,8 @@ public final class Screensaver extends DreamService { private void setClockStyle() { Utils.setScreensaverClockStyle(mDigitalClock, mAnalogClock); @@ -44,10 +42,10 @@ index 29cc13ff9..8def22b30 100644 /** diff --git a/src/com/android/deskclock/ScreensaverActivity.java b/src/com/android/deskclock/ScreensaverActivity.java -index cf770086b..7a756df7d 100644 +index b30f82ee7..90235351f 100644 --- a/src/com/android/deskclock/ScreensaverActivity.java +++ b/src/com/android/deskclock/ScreensaverActivity.java -@@ -107,7 +107,7 @@ public class ScreensaverActivity extends BaseActivity { +@@ -101,7 +101,7 @@ public class ScreensaverActivity extends BaseActivity { Utils.setClockIconTypeface(mMainClockView); Utils.setTimeFormat((TextClock) digitalClock, false); Utils.setClockStyle(digitalClock, analogClock); diff --git a/patches_platform_personal/packages_apps_DeskClock/0002-DeskClock-Adapt-digital-clocks-to-S-style.patch b/patches_platform_personal/packages_apps_DeskClock/0002-DeskClock-Adapt-digital-clocks-to-S-style.patch index 847f214..f01b4e4 100644 --- a/patches_platform_personal/packages_apps_DeskClock/0002-DeskClock-Adapt-digital-clocks-to-S-style.patch +++ b/patches_platform_personal/packages_apps_DeskClock/0002-DeskClock-Adapt-digital-clocks-to-S-style.patch @@ -1,4 +1,4 @@ -From 2a0ca4dab02447bb8fdabb480ed94de15107e22b Mon Sep 17 00:00:00 2001 +From c14821c4defd8da1f49ddc1a64875967166a277b Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Wed, 19 Jan 2022 18:04:36 +0000 Subject: [PATCH 2/3] DeskClock: Adapt digital clocks to S style @@ -13,62 +13,21 @@ Caveats/TODO: Change-Id: I10c6fa213c89ac2f6e342be13fdd6390f7f787b0 --- - res/layout-land/main_clock_frame.xml | 19 ++--- - res/layout/date_and_next_alarm_time.xml | 57 +++++++------- - res/layout/desk_clock_saver.xml | 12 +-- - res/layout/digital_widget.xml | 71 ++++++++--------- + res/layout/date_and_next_alarm_time.xml | 53 +++++++------ + res/layout/desk_clock_saver.xml | 10 +-- + res/layout/digital_widget.xml | 69 ++++++++--------- res/layout/digital_widget_sizer.xml | 77 ++++++++----------- - res/layout/main_clock_frame.xml | 23 +++--- + res/layout/main_clock_frame.xml | 36 +++------ res/values/dimens.xml | 12 ++- - res/values/styles.xml | 19 +++++ + res/values/styles.xml | 18 +++++ .../alarmclock/DigitalAppWidgetProvider.java | 31 ++++---- src/com/android/deskclock/AlarmUtils.java | 2 +- - 10 files changed, 167 insertions(+), 156 deletions(-) + src/com/android/deskclock/ClockFragment.java | 3 - + src/com/android/deskclock/Utils.java | 19 ----- + 11 files changed, 155 insertions(+), 175 deletions(-) -diff --git a/res/layout-land/main_clock_frame.xml b/res/layout-land/main_clock_frame.xml -index 6abfdddd6..8ad98c0cf 100644 ---- a/res/layout-land/main_clock_frame.xml -+++ b/res/layout-land/main_clock_frame.xml -@@ -21,10 +21,11 @@ - android:gravity="center_horizontal" - android:orientation="vertical"> - -- -+ android:layout_height="wrap_content" -+ android:gravity="center_vertical|start" -+ android:orientation="vertical"> - - - -- -+ - -- -+ - - diff --git a/res/layout/date_and_next_alarm_time.xml b/res/layout/date_and_next_alarm_time.xml -index 23df1cd3b..b29ffedcf 100644 +index 9a0cb9103..b29ffedcf 100644 --- a/res/layout/date_and_next_alarm_time.xml +++ b/res/layout/date_and_next_alarm_time.xml @@ -18,36 +18,41 @@ @@ -111,9 +70,6 @@ index 23df1cd3b..b29ffedcf 100644 - android:layout_height="wrap_content" - android:textAllCaps="true" - tools:text="Mo., 07:00"/> -- -- -\ No newline at end of file + + + -+ -+ + + diff --git a/res/layout/desk_clock_saver.xml b/res/layout/desk_clock_saver.xml -index dafabfddf..d24219dbb 100644 +index c147bf7cd..d24219dbb 100644 --- a/res/layout/desk_clock_saver.xml +++ b/res/layout/desk_clock_saver.xml -@@ -42,19 +42,13 @@ +@@ -42,16 +42,10 @@ - - -- -\ No newline at end of file -+ diff --git a/res/layout/digital_widget.xml b/res/layout/digital_widget.xml -index c5b4837a6..e376a5a7a 100644 +index 5cf896a84..e376a5a7a 100644 --- a/res/layout/digital_widget.xml +++ b/res/layout/digital_widget.xml @@ -19,58 +19,53 @@ @@ -263,13 +214,6 @@ index c5b4837a6..e376a5a7a 100644 -@@ -82,4 +77,4 @@ - android:layout_marginTop="20dp" - android:divider="@null" /> - -- -\ No newline at end of file -+ diff --git a/res/layout/digital_widget_sizer.xml b/res/layout/digital_widget_sizer.xml index f524cf536..b9a28c79f 100644 --- a/res/layout/digital_widget_sizer.xml @@ -374,26 +318,34 @@ index f524cf536..b9a28c79f 100644 diff --git a/res/layout/main_clock_frame.xml b/res/layout/main_clock_frame.xml -index 159956f19..d0701eaf0 100644 +index c26f61dbd..c2e84eaa3 100644 --- a/res/layout/main_clock_frame.xml +++ b/res/layout/main_clock_frame.xml -@@ -24,11 +24,11 @@ +@@ -26,44 +26,28 @@ android:layout_marginEnd="24dp" android:orientation="vertical"> -- -+ android:layout_height="wrap_content" + android:gravity="center_vertical|start" + android:orientation="vertical"> ++ android:layout_marginTop="@dimen/circle_margin_top"/> +- app:layout_constraintBottom_toBottomOf="parent" +- app:layout_constraintStart_toStartOf="parent" +- app:layout_constraintTop_toTopOf="parent" + tools:text="01:23"/> -- +- + + + -- -- -\ No newline at end of file -+ +- + diff --git a/res/values/dimens.xml b/res/values/dimens.xml -index 856ef8241..3061e27f6 100644 +index c136fe25a..58a9fedc0 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml -@@ -61,7 +61,7 @@ +@@ -62,7 +62,7 @@ 4dp 14sp @@ -431,10 +389,10 @@ index 856ef8241..3061e27f6 100644 24dp 90dp -@@ -140,4 +140,14 @@ - 8dp - +@@ -144,4 +144,14 @@ 4dp + + 0.5 + + + 86dp @@ -447,10 +405,10 @@ index 856ef8241..3061e27f6 100644 + 5.5dp diff --git a/res/values/styles.xml b/res/values/styles.xml -index f57bab2fa..28b68fd55 100644 +index 8c6364344..159f24766 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml -@@ -201,4 +201,23 @@ +@@ -209,4 +209,22 @@ parent @id/timer_setup_time @@ -472,13 +430,12 @@ index f57bab2fa..28b68fd55 100644 + false + 1 + -+ diff --git a/src/com/android/alarmclock/DigitalAppWidgetProvider.java b/src/com/android/alarmclock/DigitalAppWidgetProvider.java -index 1005f0ac0..e97bb474a 100644 +index b54a500c5..fb1b30aa7 100644 --- a/src/com/android/alarmclock/DigitalAppWidgetProvider.java +++ b/src/com/android/alarmclock/DigitalAppWidgetProvider.java -@@ -224,7 +224,7 @@ public class DigitalAppWidgetProvider extends AppWidgetProvider { +@@ -223,7 +223,7 @@ public class DigitalAppWidgetProvider extends AppWidgetProvider { if (Utils.isWidgetClickable(wm, widgetId)) { final Intent openApp = new Intent(context, DeskClock.class); final PendingIntent pi = PendingIntent.getActivity(context, 0, openApp, FLAG_IMMUTABLE); @@ -487,7 +444,7 @@ index 1005f0ac0..e97bb474a 100644 } // Configure child views of the remote view. -@@ -256,7 +256,7 @@ public class DigitalAppWidgetProvider extends AppWidgetProvider { +@@ -255,7 +255,7 @@ public class DigitalAppWidgetProvider extends AppWidgetProvider { final int targetWidthPx = portrait ? minWidthPx : maxWidthPx; final int targetHeightPx = portrait ? maxHeightPx : minHeightPx; final int largestClockFontSizePx = @@ -496,7 +453,7 @@ index 1005f0ac0..e97bb474a 100644 // Create a size template that describes the widget bounds. final Sizes template = new Sizes(targetWidthPx, targetHeightPx, largestClockFontSizePx); -@@ -328,13 +328,13 @@ public class DigitalAppWidgetProvider extends AppWidgetProvider { +@@ -327,13 +327,13 @@ public class DigitalAppWidgetProvider extends AppWidgetProvider { } // Measure the widget at the largest possible size. @@ -512,7 +469,7 @@ index 1005f0ac0..e97bb474a 100644 if (low.hasViolations()) { return low; } -@@ -346,7 +346,7 @@ public class DigitalAppWidgetProvider extends AppWidgetProvider { +@@ -345,7 +345,7 @@ public class DigitalAppWidgetProvider extends AppWidgetProvider { return low; } @@ -521,7 +478,7 @@ index 1005f0ac0..e97bb474a 100644 if (midSize.hasViolations()) { high = midSize; } else { -@@ -409,7 +409,7 @@ public class DigitalAppWidgetProvider extends AppWidgetProvider { +@@ -411,7 +411,7 @@ public class DigitalAppWidgetProvider extends AppWidgetProvider { * the offscreen {@code sizer} view. Measure the {@code sizer} view and return the resulting * size measurements. */ @@ -530,8 +487,8 @@ index 1005f0ac0..e97bb474a 100644 // Create a copy of the given template sizes. final Sizes measuredSizes = template.newSize(); -@@ -420,13 +420,13 @@ public class DigitalAppWidgetProvider extends AppWidgetProvider { - final TextView nextAlarmIcon = (TextView) sizer.findViewById(R.id.nextAlarmIcon); +@@ -422,13 +422,13 @@ public class DigitalAppWidgetProvider extends AppWidgetProvider { + final TextView nextAlarmIcon = sizer.findViewById(R.id.nextAlarmIcon); // Adjust the font sizes. - measuredSizes.setClockFontSizePx(clockFontSize); @@ -546,7 +503,7 @@ index 1005f0ac0..e97bb474a 100644 // Measure and layout the sizer. final int widthSize = View.MeasureSpec.getSize(measuredSizes.mTargetWidthPx); -@@ -507,12 +507,17 @@ public class DigitalAppWidgetProvider extends AppWidgetProvider { +@@ -509,12 +509,17 @@ public class DigitalAppWidgetProvider extends AppWidgetProvider { private int getLargestClockFontSizePx() { return mLargestClockFontSizePx; } private int getSmallestClockFontSizePx() { return mSmallestClockFontSizePx; } private int getClockFontSizePx() { return mClockFontSizePx; } @@ -570,10 +527,10 @@ index 1005f0ac0..e97bb474a 100644 /** * @return the amount of widget height available to the world cities list diff --git a/src/com/android/deskclock/AlarmUtils.java b/src/com/android/deskclock/AlarmUtils.java -index db60ace95..43767d313 100644 +index c3739bac8..5b931a46d 100644 --- a/src/com/android/deskclock/AlarmUtils.java +++ b/src/com/android/deskclock/AlarmUtils.java -@@ -37,7 +37,7 @@ import java.util.Locale; +@@ -38,7 +38,7 @@ import java.util.Locale; public class AlarmUtils { public static String getFormattedTime(Context context, Calendar time) { @@ -582,6 +539,72 @@ index db60ace95..43767d313 100644 final String pattern = DateFormat.getBestDateTimePattern(Locale.getDefault(), skeleton); return (String) DateFormat.format(pattern, time); } +diff --git a/src/com/android/deskclock/ClockFragment.java b/src/com/android/deskclock/ClockFragment.java +index bf53584e4..7a0e3ae0b 100644 +--- a/src/com/android/deskclock/ClockFragment.java ++++ b/src/com/android/deskclock/ClockFragment.java +@@ -123,7 +123,6 @@ public final class ClockFragment extends DeskClockFragment { + Utils.updateDate(mDateFormat, mDateFormatForAccessibility, mClockFrame); + Utils.setClockStyle(mDigitalClock, mAnalogClock); + Utils.setClockSecondsEnabled(mDigitalClock, mAnalogClock); +- Utils.updateDateGravity(mClockFrame); + } + + // Schedule a runnable to update the date every quarter hour. +@@ -151,7 +150,6 @@ public final class ClockFragment extends DeskClockFragment { + if (mDigitalClock != null && mAnalogClock != null) { + Utils.setClockStyle(mDigitalClock, mAnalogClock); + Utils.setClockSecondsEnabled(mDigitalClock, mAnalogClock); +- Utils.updateDateGravity(mClockFrame); + } + + final View view = getView(); +@@ -493,7 +491,6 @@ public final class ClockFragment extends DeskClockFragment { + Utils.updateDate(dateFormat, dateFormatForAccessibility, itemView); + Utils.setClockStyle(mDigitalClock, mAnalogClock); + Utils.setClockSecondsEnabled(mDigitalClock, mAnalogClock); +- Utils.updateDateGravity(itemView); + } + } + } +diff --git a/src/com/android/deskclock/Utils.java b/src/com/android/deskclock/Utils.java +index 7da7b15f4..48ea85041 100644 +--- a/src/com/android/deskclock/Utils.java ++++ b/src/com/android/deskclock/Utils.java +@@ -52,9 +52,7 @@ import android.text.style.RelativeSizeSpan; + import android.text.style.StyleSpan; + import android.text.style.TypefaceSpan; + import android.util.ArraySet; +-import android.view.Gravity; + import android.view.View; +-import android.widget.LinearLayout; + import android.widget.TextClock; + import android.widget.TextView; + +@@ -300,23 +298,6 @@ public class Utils { + dateDisplay.setContentDescription(new SimpleDateFormat(descriptionPattern, l).format(now)); + } + +- public static void updateDateGravity(View clockFrame) { +- View dateAndNextAlarm = clockFrame.findViewById(R.id.date_and_next_alarm_time); +- LinearLayout.LayoutParams lp = +- (LinearLayout.LayoutParams)dateAndNextAlarm.getLayoutParams(); +- +- final DataModel.ClockStyle clockStyle = DataModel.getDataModel().getClockStyle(); +- switch (clockStyle) { +- case ANALOG: +- lp.gravity = Gravity.CENTER; +- break; +- case DIGITAL: +- lp.gravity = Gravity.START; +- break; +- } +- dateAndNextAlarm.setLayoutParams(lp); +- } +- + /*** + * Formats the time in the TextClock according to the Locale with a special + * formatting treatment for the am/pm label. -- 2.25.1 diff --git a/patches_platform_personal/packages_apps_DeskClock/0003-DeskClock-Wallpaper-based-text-coloring-for-digital-.patch b/patches_platform_personal/packages_apps_DeskClock/0003-DeskClock-Wallpaper-based-text-coloring-for-digital-.patch index 9d9fcbe..5d8c5db 100644 --- a/patches_platform_personal/packages_apps_DeskClock/0003-DeskClock-Wallpaper-based-text-coloring-for-digital-.patch +++ b/patches_platform_personal/packages_apps_DeskClock/0003-DeskClock-Wallpaper-based-text-coloring-for-digital-.patch @@ -1,4 +1,4 @@ -From 8736347a89fc7e15e747ac5267c9f96b05bfaee8 Mon Sep 17 00:00:00 2001 +From d45263d0b73030ddb4a769038aaa96c5ef0ba49c Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Thu, 20 Jan 2022 04:42:03 +0000 Subject: [PATCH 3/3] DeskClock: Wallpaper-based text coloring for digital @@ -12,10 +12,10 @@ Change-Id: Ie22c4980526575f73ebb4e56780d4c2193cc45d3 1 file changed, 57 insertions(+) diff --git a/src/com/android/alarmclock/DigitalAppWidgetProvider.java b/src/com/android/alarmclock/DigitalAppWidgetProvider.java -index e97bb474a..d52693a1b 100644 +index fb1b30aa7..c04528240 100644 --- a/src/com/android/alarmclock/DigitalAppWidgetProvider.java +++ b/src/com/android/alarmclock/DigitalAppWidgetProvider.java -@@ -19,6 +19,8 @@ package com.android.alarmclock; +@@ -38,6 +38,8 @@ import static java.lang.Math.round; import android.annotation.SuppressLint; import android.app.AlarmManager; import android.app.PendingIntent; @@ -24,7 +24,7 @@ index e97bb474a..d52693a1b 100644 import android.appwidget.AppWidgetManager; import android.appwidget.AppWidgetProvider; import android.content.BroadcastReceiver; -@@ -112,12 +114,40 @@ public class DigitalAppWidgetProvider extends AppWidgetProvider { +@@ -111,12 +113,40 @@ public class DigitalAppWidgetProvider extends AppWidgetProvider { /** Intent used to deliver the {@link #ACTION_ON_DAY_CHANGE} callback. */ private static final Intent DAY_CHANGE_INTENT = new Intent(ACTION_ON_DAY_CHANGE); @@ -65,7 +65,7 @@ index e97bb474a..d52693a1b 100644 } @Override -@@ -216,6 +246,19 @@ public class DigitalAppWidgetProvider extends AppWidgetProvider { +@@ -215,6 +245,19 @@ public class DigitalAppWidgetProvider extends AppWidgetProvider { */ private static RemoteViews relayoutWidget(Context context, AppWidgetManager wm, int widgetId, Bundle options, boolean portrait) { @@ -85,7 +85,7 @@ index e97bb474a..d52693a1b 100644 // Create a remote view for the digital clock. final String packageName = context.getPackageName(); final RemoteViews rv = new RemoteViews(packageName, R.layout.digital_widget); -@@ -273,6 +316,17 @@ public class DigitalAppWidgetProvider extends AppWidgetProvider { +@@ -272,6 +315,17 @@ public class DigitalAppWidgetProvider extends AppWidgetProvider { rv.setTextViewTextSize(R.id.nextAlarm, COMPLEX_UNIT_PX, sizes.mFontSizePx); rv.setTextViewTextSize(R.id.clock, COMPLEX_UNIT_PX, sizes.mClockFontSizePx); @@ -103,7 +103,7 @@ index e97bb474a..d52693a1b 100644 final int smallestWorldCityListSizePx = resources.getDimensionPixelSize(R.dimen.widget_min_world_city_list_size); if (sizes.getListHeight() <= smallestWorldCityListSizePx) { -@@ -428,6 +482,9 @@ public class DigitalAppWidgetProvider extends AppWidgetProvider { +@@ -430,6 +484,9 @@ public class DigitalAppWidgetProvider extends AppWidgetProvider { nextAlarmIcon.setTextSize(COMPLEX_UNIT_PX, measuredSizes.mIconFontSizePx); nextAlarmIcon.setPadding(0, 0, measuredSizes.mIconPaddingPx, 0); diff --git a/patches_platform_personal/vendor_lineage/0001-build-Integrate-prop-modifications-2-2.patch b/patches_platform_personal/vendor_lineage/0001-build-Integrate-prop-modifications-2-2.patch index b2a7566..f9dfd96 100644 --- a/patches_platform_personal/vendor_lineage/0001-build-Integrate-prop-modifications-2-2.patch +++ b/patches_platform_personal/vendor_lineage/0001-build-Integrate-prop-modifications-2-2.patch @@ -1,4 +1,4 @@ -From 2386227e0541aa061579dd9c34da867174a7d6a2 Mon Sep 17 00:00:00 2001 +From 9dceb9dcaa424c2b9bdeacef6c1b60f055a464f6 Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Sun, 20 Jun 2021 09:09:15 +0000 Subject: [PATCH 1/4] build: Integrate prop modifications (2/2) diff --git a/patches_platform_personal/vendor_lineage/0002-build-Remove-Stk-2-2.patch b/patches_platform_personal/vendor_lineage/0002-build-Remove-Stk-2-2.patch index afc34a3..485457a 100644 --- a/patches_platform_personal/vendor_lineage/0002-build-Remove-Stk-2-2.patch +++ b/patches_platform_personal/vendor_lineage/0002-build-Remove-Stk-2-2.patch @@ -1,4 +1,4 @@ -From 209602b004deebac7846b67def29f3281d864080 Mon Sep 17 00:00:00 2001 +From 17d460d416fa4a721adb183b8ac445372543f5b9 Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Sat, 16 Oct 2021 00:41:07 +0000 Subject: [PATCH 2/4] build: Remove Stk (2/2) diff --git a/patches_platform_personal/vendor_lineage/0003-vendor_lineage-Ignore-neverallows.-again.patch b/patches_platform_personal/vendor_lineage/0003-vendor_lineage-Ignore-neverallows.-again.patch index 66c101b..c87fba2 100644 --- a/patches_platform_personal/vendor_lineage/0003-vendor_lineage-Ignore-neverallows.-again.patch +++ b/patches_platform_personal/vendor_lineage/0003-vendor_lineage-Ignore-neverallows.-again.patch @@ -1,4 +1,4 @@ -From d9e352c11ee8738439b73ff5f02429da3f045cc5 Mon Sep 17 00:00:00 2001 +From 6819a636e91927acd6c72586f21fcdd749330ad8 Mon Sep 17 00:00:00 2001 From: AndyCGYan Date: Mon, 1 Jul 2019 07:03:04 +0000 Subject: [PATCH 3/4] vendor_lineage: Ignore neverallows... again diff --git a/patches_platform_personal/vendor_lineage/0004-vendor_lineage-Personal-theme-as-SRO.patch b/patches_platform_personal/vendor_lineage/0004-vendor_lineage-Personal-theme-as-SRO.patch index f0b44a1..6f98a7e 100644 --- a/patches_platform_personal/vendor_lineage/0004-vendor_lineage-Personal-theme-as-SRO.patch +++ b/patches_platform_personal/vendor_lineage/0004-vendor_lineage-Personal-theme-as-SRO.patch @@ -1,9 +1,9 @@ -From 22d447f935abbc21abbc8398fe593c908c45a8f6 Mon Sep 17 00:00:00 2001 +From 91e15e1471b936462709906efaba8f53fef899f8 Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Sat, 9 Apr 2022 02:48:55 +0000 Subject: [PATCH 4/4] vendor_lineage: Personal theme as SRO -Last revised on 2022/10/23 +Last revised on 2023/02/11 ... @@ -11,47 +11,80 @@ I look forward to what LOS will look like in the future, when everything's ready Change-Id: I43164b7a4145616d162c6b4b4b84d1953cb483cc --- - config/common.mk | 7 ++- - .../res/drawable/ic_launcher_background.xml | 24 ++++++++ - .../res/drawable/ic_launcher_foreground.xml | 33 ++++++++++ - .../res/drawable/ic_launcher_background.xml | 24 ++++++++ - .../res/drawable/ic_launcher_foreground.xml | 39 ++++++++++++ - .../res/drawable/ic_launcher_background.xml | 24 ++++++++ - .../res/drawable/ic_launcher_foreground.xml | 33 ++++++++++ - .../res/drawable/ic_launcher_background.xml | 14 +++++ - .../res/drawable/ic_launcher_foreground.xml | 33 ++++++++++ - .../res/drawable/ic_launcher_background.xml | 20 +++++++ - .../res/drawable/ic_launcher_foreground.xml | 36 +++++++++++ - .../res/drawable/ic_launcher_background.xml | 23 +++++++ - .../res/drawable/ic_launcher_foreground.xml | 39 ++++++++++++ - .../apps/DeskClock/res/values/colors.xml | 8 +++ - .../res/drawable/ic_launcher_background.xml | 14 +++++ - .../res/drawable/ic_launcher_foreground.xml | 41 +++++++++++++ - .../res/drawable/ic_launcher_background.xml | 17 ++++++ - .../res/drawable/ic_launcher_foreground.xml | 34 +++++++++++ - .../res/drawable/ic_launcher_background.xml | 22 +++++++ - .../res/drawable/ic_launcher_foreground.xml | 34 +++++++++++ - .../res/drawable/ic_launcher_background.xml | 14 +++++ - .../res/drawable/ic_launcher_foreground.xml | 40 +++++++++++++ - .../res/drawable/ic_launcher_background.xml | 14 +++++ - .../res/drawable/ic_launcher_foreground.xml | 60 +++++++++++++++++++ - .../res/drawable/ic_launcher_background.xml | 24 ++++++++ - .../res/drawable/ic_launcher_foreground.xml | 34 +++++++++++ - .../res/drawable/ic_launcher_background.xml | 17 ++++++ - .../res/drawable/ic_launcher_foreground.xml | 33 ++++++++++ - .../res/drawable/ic_launcher_background.xml | 18 ++++++ - .../res/drawable/ic_launcher_foreground.xml | 34 +++++++++++ - .../apps/Messaging/res/values/colors.xml | 7 +++ - .../Messaging/res/values/lineage_colors.xml | 4 ++ - .../res/drawable/ic_launcher_background.xml | 23 +++++++ - .../res/drawable/ic_launcher_foreground.xml | 33 ++++++++++ - .../res/drawable/ic_launcher_background.xml | 18 ++++++ - .../res/drawable/ic_launcher_foreground.xml | 33 ++++++++++ - .../res/drawable/ic_launcher_background.xml | 23 +++++++ - .../res/drawable/ic_launcher_foreground.xml | 34 +++++++++++ - .../res/drawable/ic_launcher_background.xml | 20 +++++++ - .../res/drawable/ic_launcher_foreground.xml | 34 +++++++++++ - 40 files changed, 1034 insertions(+), 2 deletions(-) + config/common.mk | 7 +- + .../res/drawable/ic_launcher_background.xml | 24 ++++ + .../res/drawable/ic_launcher_foreground.xml | 33 +++++ + .../res/drawable/ic_launcher_background.xml | 24 ++++ + .../res/drawable/ic_launcher_foreground.xml | 39 ++++++ + .../res/drawable/ic_launcher_background.xml | 24 ++++ + .../res/drawable/ic_launcher_foreground.xml | 33 +++++ + .../res/drawable/ic_launcher_background.xml | 14 +++ + .../res/drawable/ic_launcher_foreground.xml | 33 +++++ + .../res/drawable/ic_launcher_background.xml | 20 +++ + .../res/drawable/ic_launcher_foreground.xml | 36 ++++++ + .../res/drawable/ic_launcher_background.xml | 23 ++++ + .../res/drawable/ic_launcher_foreground.xml | 39 ++++++ + .../res/mipmap-anydpi/launcher_clock.xml | 116 ++++++++++++++++++ + .../apps/DeskClock/res/values/colors.xml | 8 ++ + .../res/drawable/ic_launcher_background.xml | 14 +++ + .../res/drawable/ic_launcher_foreground.xml | 41 +++++++ + .../res/drawable/ic_launcher_background.xml | 17 +++ + .../res/drawable/ic_launcher_foreground.xml | 34 +++++ + .../res/drawable/ic_launcher_background.xml | 22 ++++ + .../res/drawable/ic_launcher_foreground.xml | 34 +++++ + .../res/drawable/ic_launcher_background.xml | 14 +++ + .../res/drawable/ic_launcher_foreground.xml | 40 ++++++ + .../res/drawable/logo_calendar_dyn_day_01.xml | 15 +++ + .../res/drawable/logo_calendar_dyn_day_02.xml | 15 +++ + .../res/drawable/logo_calendar_dyn_day_03.xml | 15 +++ + .../res/drawable/logo_calendar_dyn_day_04.xml | 15 +++ + .../res/drawable/logo_calendar_dyn_day_05.xml | 15 +++ + .../res/drawable/logo_calendar_dyn_day_06.xml | 15 +++ + .../res/drawable/logo_calendar_dyn_day_07.xml | 15 +++ + .../res/drawable/logo_calendar_dyn_day_08.xml | 15 +++ + .../res/drawable/logo_calendar_dyn_day_09.xml | 15 +++ + .../res/drawable/logo_calendar_dyn_day_10.xml | 15 +++ + .../res/drawable/logo_calendar_dyn_day_11.xml | 15 +++ + .../res/drawable/logo_calendar_dyn_day_12.xml | 15 +++ + .../res/drawable/logo_calendar_dyn_day_13.xml | 15 +++ + .../res/drawable/logo_calendar_dyn_day_14.xml | 15 +++ + .../res/drawable/logo_calendar_dyn_day_15.xml | 15 +++ + .../res/drawable/logo_calendar_dyn_day_16.xml | 15 +++ + .../res/drawable/logo_calendar_dyn_day_17.xml | 15 +++ + .../res/drawable/logo_calendar_dyn_day_18.xml | 15 +++ + .../res/drawable/logo_calendar_dyn_day_19.xml | 15 +++ + .../res/drawable/logo_calendar_dyn_day_20.xml | 15 +++ + .../res/drawable/logo_calendar_dyn_day_21.xml | 15 +++ + .../res/drawable/logo_calendar_dyn_day_22.xml | 15 +++ + .../res/drawable/logo_calendar_dyn_day_23.xml | 15 +++ + .../res/drawable/logo_calendar_dyn_day_24.xml | 15 +++ + .../res/drawable/logo_calendar_dyn_day_25.xml | 15 +++ + .../res/drawable/logo_calendar_dyn_day_26.xml | 15 +++ + .../res/drawable/logo_calendar_dyn_day_27.xml | 15 +++ + .../res/drawable/logo_calendar_dyn_day_28.xml | 15 +++ + .../res/drawable/logo_calendar_dyn_day_29.xml | 15 +++ + .../res/drawable/logo_calendar_dyn_day_30.xml | 15 +++ + .../res/drawable/logo_calendar_dyn_day_31.xml | 15 +++ + .../res/drawable/logo_calendar_midlayer.xml | 17 +++ + .../res/drawable/ic_launcher_background.xml | 14 +++ + .../res/drawable/ic_launcher_foreground.xml | 60 +++++++++ + .../res/drawable/ic_launcher_background.xml | 24 ++++ + .../res/drawable/ic_launcher_foreground.xml | 34 +++++ + .../res/drawable/ic_launcher_background.xml | 17 +++ + .../res/drawable/ic_launcher_foreground.xml | 33 +++++ + .../res/drawable/ic_launcher_background.xml | 18 +++ + .../res/drawable/ic_launcher_foreground.xml | 34 +++++ + .../apps/Messaging/res/values/colors.xml | 7 ++ + .../Messaging/res/values/lineage_colors.xml | 4 + + .../res/drawable/ic_launcher_background.xml | 23 ++++ + .../res/drawable/ic_launcher_foreground.xml | 33 +++++ + .../res/drawable/ic_launcher_background.xml | 18 +++ + .../res/drawable/ic_launcher_foreground.xml | 33 +++++ + .../res/drawable/ic_launcher_background.xml | 23 ++++ + .../res/drawable/ic_launcher_foreground.xml | 34 +++++ + .../res/drawable/ic_launcher_background.xml | 20 +++ + .../res/drawable/ic_launcher_foreground.xml | 34 +++++ + 73 files changed, 1632 insertions(+), 2 deletions(-) create mode 100644 overlay/personal/packages/apps/Aperture/app/src/main/res/drawable/ic_launcher_background.xml create mode 100644 overlay/personal/packages/apps/Aperture/app/src/main/res/drawable/ic_launcher_foreground.xml create mode 100644 overlay/personal/packages/apps/AudioFX/res/drawable/ic_launcher_background.xml @@ -64,6 +97,7 @@ Change-Id: I43164b7a4145616d162c6b4b4b84d1953cb483cc create mode 100644 overlay/personal/packages/apps/Contacts/res/drawable/ic_launcher_foreground.xml create mode 100644 overlay/personal/packages/apps/DeskClock/res/drawable/ic_launcher_background.xml create mode 100644 overlay/personal/packages/apps/DeskClock/res/drawable/ic_launcher_foreground.xml + create mode 100644 overlay/personal/packages/apps/DeskClock/res/mipmap-anydpi/launcher_clock.xml create mode 100644 overlay/personal/packages/apps/DeskClock/res/values/colors.xml create mode 100644 overlay/personal/packages/apps/Dialer/java/com/android/dialer/app/res/drawable/ic_launcher_background.xml create mode 100644 overlay/personal/packages/apps/Dialer/java/com/android/dialer/app/res/drawable/ic_launcher_foreground.xml @@ -73,6 +107,38 @@ Change-Id: I43164b7a4145616d162c6b4b4b84d1953cb483cc create mode 100644 overlay/personal/packages/apps/Eleven/res/drawable/ic_launcher_foreground.xml create mode 100644 overlay/personal/packages/apps/Etar/app/src/main/res/drawable/ic_launcher_background.xml create mode 100644 overlay/personal/packages/apps/Etar/app/src/main/res/drawable/ic_launcher_foreground.xml + create mode 100644 overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_01.xml + create mode 100644 overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_02.xml + create mode 100644 overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_03.xml + create mode 100644 overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_04.xml + create mode 100644 overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_05.xml + create mode 100644 overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_06.xml + create mode 100644 overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_07.xml + create mode 100644 overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_08.xml + create mode 100644 overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_09.xml + create mode 100644 overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_10.xml + create mode 100644 overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_11.xml + create mode 100644 overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_12.xml + create mode 100644 overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_13.xml + create mode 100644 overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_14.xml + create mode 100644 overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_15.xml + create mode 100644 overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_16.xml + create mode 100644 overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_17.xml + create mode 100644 overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_18.xml + create mode 100644 overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_19.xml + create mode 100644 overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_20.xml + create mode 100644 overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_21.xml + create mode 100644 overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_22.xml + create mode 100644 overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_23.xml + create mode 100644 overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_24.xml + create mode 100644 overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_25.xml + create mode 100644 overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_26.xml + create mode 100644 overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_27.xml + create mode 100644 overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_28.xml + create mode 100644 overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_29.xml + create mode 100644 overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_30.xml + create mode 100644 overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_31.xml + create mode 100644 overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_midlayer.xml create mode 100644 overlay/personal/packages/apps/ExactCalculator/res/drawable/ic_launcher_background.xml create mode 100644 overlay/personal/packages/apps/ExactCalculator/res/drawable/ic_launcher_foreground.xml create mode 100644 overlay/personal/packages/apps/Gallery2/res/drawable/ic_launcher_background.xml @@ -93,10 +159,10 @@ Change-Id: I43164b7a4145616d162c6b4b4b84d1953cb483cc create mode 100644 overlay/personal/packages/inputmethods/LatinIME/java/res/drawable/ic_launcher_foreground.xml diff --git a/config/common.mk b/config/common.mk -index a6703855..dcb452f7 100644 +index f5c6ce06..dcf8b79f 100644 --- a/config/common.mk +++ b/config/common.mk -@@ -197,10 +197,13 @@ PRODUCT_DEXPREOPT_SPEED_APPS += \ +@@ -189,10 +189,13 @@ PRODUCT_DEXPREOPT_SPEED_APPS += \ PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \ dalvik.vm.systemuicompilerfilter=speed @@ -526,6 +592,128 @@ index 00000000..f54da6b5 + + + +diff --git a/overlay/personal/packages/apps/DeskClock/res/mipmap-anydpi/launcher_clock.xml b/overlay/personal/packages/apps/DeskClock/res/mipmap-anydpi/launcher_clock.xml +new file mode 100644 +index 00000000..b353eae3 +--- /dev/null ++++ b/overlay/personal/packages/apps/DeskClock/res/mipmap-anydpi/launcher_clock.xml +@@ -0,0 +1,116 @@ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ diff --git a/overlay/personal/packages/apps/DeskClock/res/values/colors.xml b/overlay/personal/packages/apps/DeskClock/res/values/colors.xml new file mode 100644 index 00000000..f147a9d1 @@ -804,6 +992,680 @@ index 00000000..18756857 + + + +diff --git a/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_01.xml b/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_01.xml +new file mode 100644 +index 00000000..912b3810 +--- /dev/null ++++ b/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_01.xml +@@ -0,0 +1,15 @@ ++ ++ ++ ++ ++ +diff --git a/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_02.xml b/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_02.xml +new file mode 100644 +index 00000000..adf71480 +--- /dev/null ++++ b/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_02.xml +@@ -0,0 +1,15 @@ ++ ++ ++ ++ ++ +diff --git a/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_03.xml b/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_03.xml +new file mode 100644 +index 00000000..c4d7cda0 +--- /dev/null ++++ b/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_03.xml +@@ -0,0 +1,15 @@ ++ ++ ++ ++ ++ +diff --git a/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_04.xml b/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_04.xml +new file mode 100644 +index 00000000..1e9583e1 +--- /dev/null ++++ b/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_04.xml +@@ -0,0 +1,15 @@ ++ ++ ++ ++ ++ +diff --git a/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_05.xml b/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_05.xml +new file mode 100644 +index 00000000..eee804b2 +--- /dev/null ++++ b/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_05.xml +@@ -0,0 +1,15 @@ ++ ++ ++ ++ ++ +diff --git a/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_06.xml b/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_06.xml +new file mode 100644 +index 00000000..2596f406 +--- /dev/null ++++ b/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_06.xml +@@ -0,0 +1,15 @@ ++ ++ ++ ++ ++ +diff --git a/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_07.xml b/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_07.xml +new file mode 100644 +index 00000000..ed1c7508 +--- /dev/null ++++ b/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_07.xml +@@ -0,0 +1,15 @@ ++ ++ ++ ++ ++ +diff --git a/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_08.xml b/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_08.xml +new file mode 100644 +index 00000000..4066e2e9 +--- /dev/null ++++ b/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_08.xml +@@ -0,0 +1,15 @@ ++ ++ ++ ++ ++ +diff --git a/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_09.xml b/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_09.xml +new file mode 100644 +index 00000000..dc479d24 +--- /dev/null ++++ b/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_09.xml +@@ -0,0 +1,15 @@ ++ ++ ++ ++ ++ +diff --git a/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_10.xml b/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_10.xml +new file mode 100644 +index 00000000..bc783a67 +--- /dev/null ++++ b/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_10.xml +@@ -0,0 +1,15 @@ ++ ++ ++ ++ ++ +diff --git a/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_11.xml b/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_11.xml +new file mode 100644 +index 00000000..f37c0768 +--- /dev/null ++++ b/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_11.xml +@@ -0,0 +1,15 @@ ++ ++ ++ ++ ++ +diff --git a/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_12.xml b/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_12.xml +new file mode 100644 +index 00000000..466b69ed +--- /dev/null ++++ b/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_12.xml +@@ -0,0 +1,15 @@ ++ ++ ++ ++ ++ +diff --git a/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_13.xml b/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_13.xml +new file mode 100644 +index 00000000..2f16f68d +--- /dev/null ++++ b/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_13.xml +@@ -0,0 +1,15 @@ ++ ++ ++ ++ ++ +diff --git a/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_14.xml b/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_14.xml +new file mode 100644 +index 00000000..fb1e67a5 +--- /dev/null ++++ b/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_14.xml +@@ -0,0 +1,15 @@ ++ ++ ++ ++ ++ +diff --git a/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_15.xml b/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_15.xml +new file mode 100644 +index 00000000..daa1fb5c +--- /dev/null ++++ b/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_15.xml +@@ -0,0 +1,15 @@ ++ ++ ++ ++ ++ +diff --git a/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_16.xml b/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_16.xml +new file mode 100644 +index 00000000..93c7dd1c +--- /dev/null ++++ b/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_16.xml +@@ -0,0 +1,15 @@ ++ ++ ++ ++ ++ +diff --git a/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_17.xml b/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_17.xml +new file mode 100644 +index 00000000..af507ab8 +--- /dev/null ++++ b/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_17.xml +@@ -0,0 +1,15 @@ ++ ++ ++ ++ ++ +diff --git a/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_18.xml b/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_18.xml +new file mode 100644 +index 00000000..6afb61ef +--- /dev/null ++++ b/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_18.xml +@@ -0,0 +1,15 @@ ++ ++ ++ ++ ++ +diff --git a/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_19.xml b/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_19.xml +new file mode 100644 +index 00000000..c85da438 +--- /dev/null ++++ b/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_19.xml +@@ -0,0 +1,15 @@ ++ ++ ++ ++ ++ +diff --git a/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_20.xml b/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_20.xml +new file mode 100644 +index 00000000..60e5a2e8 +--- /dev/null ++++ b/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_20.xml +@@ -0,0 +1,15 @@ ++ ++ ++ ++ ++ +diff --git a/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_21.xml b/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_21.xml +new file mode 100644 +index 00000000..1298bccd +--- /dev/null ++++ b/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_21.xml +@@ -0,0 +1,15 @@ ++ ++ ++ ++ ++ +diff --git a/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_22.xml b/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_22.xml +new file mode 100644 +index 00000000..09d5574f +--- /dev/null ++++ b/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_22.xml +@@ -0,0 +1,15 @@ ++ ++ ++ ++ ++ +diff --git a/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_23.xml b/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_23.xml +new file mode 100644 +index 00000000..ee65e25a +--- /dev/null ++++ b/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_23.xml +@@ -0,0 +1,15 @@ ++ ++ ++ ++ ++ +diff --git a/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_24.xml b/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_24.xml +new file mode 100644 +index 00000000..3567ccc2 +--- /dev/null ++++ b/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_24.xml +@@ -0,0 +1,15 @@ ++ ++ ++ ++ ++ +diff --git a/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_25.xml b/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_25.xml +new file mode 100644 +index 00000000..88c64ea2 +--- /dev/null ++++ b/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_25.xml +@@ -0,0 +1,15 @@ ++ ++ ++ ++ ++ +diff --git a/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_26.xml b/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_26.xml +new file mode 100644 +index 00000000..a9bb39b5 +--- /dev/null ++++ b/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_26.xml +@@ -0,0 +1,15 @@ ++ ++ ++ ++ ++ +diff --git a/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_27.xml b/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_27.xml +new file mode 100644 +index 00000000..a648a673 +--- /dev/null ++++ b/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_27.xml +@@ -0,0 +1,15 @@ ++ ++ ++ ++ ++ +diff --git a/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_28.xml b/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_28.xml +new file mode 100644 +index 00000000..86fdba68 +--- /dev/null ++++ b/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_28.xml +@@ -0,0 +1,15 @@ ++ ++ ++ ++ ++ +diff --git a/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_29.xml b/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_29.xml +new file mode 100644 +index 00000000..cd4d9a7e +--- /dev/null ++++ b/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_29.xml +@@ -0,0 +1,15 @@ ++ ++ ++ ++ ++ +diff --git a/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_30.xml b/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_30.xml +new file mode 100644 +index 00000000..8cc3bbcb +--- /dev/null ++++ b/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_30.xml +@@ -0,0 +1,15 @@ ++ ++ ++ ++ ++ +diff --git a/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_31.xml b/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_31.xml +new file mode 100644 +index 00000000..5d62c419 +--- /dev/null ++++ b/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_31.xml +@@ -0,0 +1,15 @@ ++ ++ ++ ++ ++ +diff --git a/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_midlayer.xml b/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_midlayer.xml +new file mode 100644 +index 00000000..ae694d29 +--- /dev/null ++++ b/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_midlayer.xml +@@ -0,0 +1,17 @@ ++ ++ ++ ++ ++ ++ diff --git a/overlay/personal/packages/apps/ExactCalculator/res/drawable/ic_launcher_background.xml b/overlay/personal/packages/apps/ExactCalculator/res/drawable/ic_launcher_background.xml new file mode 100644 index 00000000..65b0e2db diff --git a/patches_treble/vendor_hardware_overlay/0001-TEMP-Up-TrebleApp-to-20221229.patch b/patches_treble/vendor_hardware_overlay/0001-TEMP-Up-TrebleApp-to-20221229.patch index 632dad3..27e71bf 100644 --- a/patches_treble/vendor_hardware_overlay/0001-TEMP-Up-TrebleApp-to-20221229.patch +++ b/patches_treble/vendor_hardware_overlay/0001-TEMP-Up-TrebleApp-to-20221229.patch @@ -1,7 +1,7 @@ -From 1ef20aa8db728fb8dd3729ba0280fb9809b7133d Mon Sep 17 00:00:00 2001 +From 2f728740ba2f76c6adb25d7d7eb47d0880888563 Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Thu, 29 Dec 2022 15:11:15 +0000 -Subject: [PATCH] Up TrebleApp to 20221229 +Subject: [PATCH] [TEMP] Up TrebleApp to 20221229 Change-Id: I03a44d0180208ce02752aa8fcc218e3726bada45 --- @@ -9,61235 +9,62290 @@ Change-Id: I03a44d0180208ce02752aa8fcc218e3726bada45 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/TrebleApp/app.apk b/TrebleApp/app.apk -index d2fe166371753ce703b3c8bdcddd996e2d72e3ea..a9151a96acc795ae69f235742de090d8f8e0fbb0 100644 +index b0fdb55f423d6852cb31ac9a0f1f3317f1d9109b..a9151a96acc795ae69f235742de090d8f8e0fbb0 100644 GIT binary patch -delta 3296182 -zcmb5%c|Z-{|3C1VxvjcN3Mmz7M+=2YD%nN$ol2p!QWVk6u0kk=7DBePk=(Q>lqE&h +delta 3353320 +zcmb5%c|Z-{|3C1VxvjcN3Mmz7M+=1tmF!CPorlqE&h zHZ7=7sYsGizvtX2Z@E6--ye^@eLkN#bM`Z@b7u18)@PH)lB&u0`H{57@{#O;V+c`V -z!)kYJyA3v;HmjUgkFd9Ma~QEnPn)i87Z?<@{;?8mxrNfCZ>dqQRSeuJ7rZ41f}zhh -z;l2)mL3CgqsT*WbksCDgB3oad5c+#2Hmhu{R(ZHs+1jtRb+qzuwQ_Z_a`xEZWTm64 -zPm8Z(X(a?-^dU9MZmoWrM-l{sZ@$dEXv=hgek>gw9VUMruG#`Bh15vbkPaP15d`D^ -zk{Vg_Qr84f3KadIl4OrH#@-@UXT2PYqBCU8eoG9hIcH0R3?Ti#^bg5czvU -z96c(i7&Ja-2#t#qxdra5Ap-OYTcj9A2=httU2q7cWk4T3Oli{@gGpsNPlr^e8*Ev= -zDr@_Xe{>mr#2CjfOZo{ZIF#0LLGp*asbe(f2E_~qJ_V!)P=X4_zT)CLH>gDVl^BaX -zYSh14#lhCfd9}+%E8C48on30<%vbFJ}#*Po1H9 -z(-pm0IrKI*if6#DHE5a=9NgI!nQZD7UGkk|59B-S=wwQ8P-h05c~oz%ax3Xd8hvUS -zsw|8V#?a`!{n)*W02Xslcw)X#M&)+iD8;eX&NwRdf&vePX6zv*_*3sivXxfY=DA!rW -zYk^c8ogK!zn%~UF)dK`ZG1cl=ff7oDQ=>@QPZFc?pE(Q=;FaoNGBtwxSdtY&1}!UN -z4;;;}QnZ|apj^=UvP|07pJMCi@atNp#ho17J*?Ka+HQ1TZD(cg>g0-nKSYvLpdV_m -zH0f>6$WgS{DvXpN0n~1lQtd0-pJU`R_!oGNfZ#y7&sa*4xyNG_o2kzZ=OF=u?;=4v -z3kb^c*2K`$)I*gmk&5NN(v0TY)&5L1nW-(eih4*FE28O5_|=t`6ckiuW;L&Jv?8fV -z8xO{Gvr@!xHs#yBNHti{$ziR%M`w+Yuv}$|`tp%)FbEk&e3OPFDK8N>;5Au7sf-fa -zVLV-cAQ=2-TZW*Z!mna-#j>eM0<_OJ6p{a8GfqfwXi#3!P@4OV%s6UC)08$nUgK2O5~~I!h-B{ak3hFHo}dfetEG -zr8s#PD-+$$7|S=CA|XL}dQJy5jy`&UI!Cv7ve+Z}jxJ`*y1O~JxUAmrbMbSw>RkVr -z5y#c`V$CP%>}h!Zj^;ZQZU_s?b+xgj99c%v!=6%X{W1JfFqwMTtg>=&v2(Ds@o@c> -zHE-RuyiHA~4?Lv;RpPd8o!TEu9AiA+alsK096&pZ2=)@Nv)SMnq;*-I`_7&vNvfD< -zJ&X92+=Opy{YowoWRg3WyU3f8B-Z -zugWwM4gERtc~b^yCAk-$kef*QDJT}YB* -zj(X_xtw)NOpe$`-MydwQjCx?I@@~oO*Qf`B?>gw>>fx}48J7--@m8(1a&q;wazo^a -z6`l6kN~zE$n<;nt;38@@ol%6I)8#u*B-nU%@{+U`VMX0+hoTzrZ9-hFz-vM)Gg63_ -zUqr2^vsI`8^n=aRER|2U3S1mfYK9@-+D5Sjhje!IFcE6a@Yx#bdH0ZjG5*hdo$NMv -zIQP3IqMtDa-|#7L8|6(-vcIpMwgi)dVf1I& -z|8mE_uSXJItkK*bKdA8}J^d=l9z6c>+_#G{k=ZC^|e`vWkAy9g%o>8k0q+}PF|hcoURHn -z+Z9^5hzgr>aE{TBIy5Px$He?I@jq(B+d_<4Ocjz-zl_^G?lf-4=<$U7+b#cEH7x^# -z-$Us#HCA8lfs@o8lD<5NWGk8eeFS>_SwkjRr0XY<^>lR>#WouE=W_6~9No$I){VZk -zoTb23yi280(`=N=@ApQ4!7%=F#{Tt|eCoyo!$Z0C3M>JNcDAP2Lwke=zwXvuLf+&G -z8vI6wd(E2CCh7MJSZrgyrRYw_w`MlDnKpOWLY4=M79UTt$McyDUca?2b2EN*x-|)_ -zwv{KcO_x=+RVe5 -zF0-fl&~yT}K0lTsNa(S2|4P9Wm+y|7H?46eN$$jD)G$(`F~p;NA_gr(|Ign2{f=Gx -zZsq~bltq#&Bf!!k>1cb3E#D)a{!3C_eO{!1q*f$-Lxjcbx&PRT{+^1d0>3>sVr_1{ -z2Ip}_36nGLEuja62XPJKeT(%&bHWRD!h -zuNr&@HE+7|ZWH8mzLNgXhA}wy&sDyw$h@sLZyYH8pn~YxFHpfA57(}%dAn}j+8z9Y -z+(^s0|8ubZ+I9b|6g!{#Mvt9L{bl3(D}$ev`fcOO?6#SaLSu@gs&JlOS8~GOWc1jw -z|GEjyY_@rmgtH9;bN@VQAxVF8U@`gr5#{|#(lcM))|S^UmM*x-xOJ>FlD_GOw$$Ty -zlg?c?FAZ-#3;0u8Y45|lBz%T8lcaO&%{yvIKTN$>@#ZQ&9*z1j^!N?S&V;-|GLJHD -zfe1DD*Z!N|+QICtnkZMN--!IJvQUNHw?ecc#u_&5WVd=`Ap@g*B!5C -zxD7*(-!!I~9XK||YD^ksI{XebDkwFlH+^&rWf!EL^OxhBUxnap!+9k~mf7^hL1@w* -z#|&K;^Y-7&IcC`)Dx22u#t=2(TP9}z&D*Tk3}HQ2S>{<#TZlR^dOT;lGU(oY^A?87 -zNz`+dxU%*vc{~#tJ%X98l---}(0WpaqDz8M69c}5V|Lw4;kZ)46pIz)9QUuahuLuR -zR*;~xaUpc|7F64e-`YX{+;KAx5`@W;^w=RR@1W$OziiUG%Fb-Nu|+SVLl@%KJ%Z=1 -z>zEDquWc;-u#LP+*A<|a{8u1mqy2jVO?qY_RwCEs6kCt)U}7dLpQkW$>cG9coQZJb -z#c}Syf21%wZl(*l@5EUMuQbd^X1C2}sxmq9-EH%BC!yk$DjjZ4jiEEl$oaGZv!&{> -z;qGcD-oElb8}6XJ7w*z&!YDHT@%k&31oPlU0y$b-gmsygWBSCD@4|#sYP<~%_i_t4 -zlBCD0^3G%UEfl!?=O&xCiXx39cb6(_FiDqA#^a$!i2dI>F?(!g#YX8QY2_*8IhBIS -zK1-4@r5OJ#WRHzDcMlH3+QpG+k3Du*ro25i_NL0T;!8?_p0!^{gkB**?x72r^9TNu -zk=bi^E{Ae2sTkURD@N%=e!Wlgw%F+AM=Ck*4#!G)Z;sT|Fy%`RiRGM3UQPzJ?I%S)#bYq@HW@HW6^ofkfWRm -zt~U7B)e4<$b|IGXWH#2eDq=g&YOO+BFna6=yV`@Dz`Z4;dB!W^#kN*5md4Ara -zGd!kwxA01&TB(Um7c|~}6(k5ok3s#PTkwySX^FAaU|QRWmB`)SpBg7fw>YxcvORXa -zU3cTXrD7IHB)KW1+F`WDwi3O}F#dClbSFZ@+&M<#^6+ShK14mHXP-dd_1LL(CE*3m -zycG?7M+coiiu-a%(c_I#cZ%+SnU@QD5EVwBTEhCvBcm$~(?fjTQsJ$b4!2?n>m{jL -z5?#buxML)B_l -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 -z%so4B+ZdNNb -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 -z0|>nv%NnI*l*9Yz;ElrKE1tsh8i?Y&h860 -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 +zRf>~$u`yP1=g2~jwW|ftLi>*lB9}R +z*0YFT$&LB8*01CeLB_d*xr@9hNs>Ok0rfTE+v`Z87G#p6$X)iF@*`Ea8AERFM-dsO +z{HjbN(a@hGpEqTYR+4-13Au@+KW_ZzOyiZXMnq7ebFMK(r1dsYpXkBmyt&5bvCHH* +zfJQnoT2WL`@VCUaDJT}YB* +zhHB{ZtwxHNpe$`{N~#7~L_IK3dADTtYgB{5cNuhX^>A3j3`+-uc&pZ0Ik|dTxgqex +zf=>HvrBrC+&6GQRa1mukXB461boq`G2{s;`ydO!zZjC)*7k +zPCsL4-7(s{sELVrbm{0b)D_x%8^t#45lsG(=x2z*H+l-(MtPHy?eD9nEy3Ji82wrH +zzufWf%aMc^Yc%)A4{8EQ&$vpm2T%C>ot$}_g02ejrW)rexn)XUgRKfb&=3qh_3BFd +zk9u{qVfoIHXT77-l~`jED +zZiQAZqQa&goMZH(4o%AFF)#m2{Er&(b`WD0Q-$QTFXMKPJB`~hdORTicFVt3P0Ik$ +z_fWb_jn$WX;3Tz&q%Th<*-9pVAAw$f){u!6>H5iJJzbqev5m(4xg7i~M|U#5b)#=B +zXDM(M?^3DMbQ`7e`@IogFvkBmWB+hl5xB();x8zL-b%l*er^!HRu75Htr5o&Ym +zMOYsxm91*t!wp!7W5JMLvokyI&H&hQC#A=tQ<&$;xIbsrugs5P*UfvJ;85flojVCn +z)*e&o*R`D+Y;0qHc8}C#^0M#4=Um5(Y)NlJW*G=n>3xrR?5&ht`ua6kQU8ni%jc9JA?W3dfZSrdX^X=eU2ZJ4V0s&u#+HHOYGCFj!y%$BOh +ze!Hukc-zYV?6-sVUbsuA38TpT$Lp_D63l}a3FK&T5!Pi|j_DH6+{-QG +zNRpnQ$~%tXw@~2npL=ZHDvC6c++C`y!6aQe1&@awA@+ak#B8yd6&t0Kq?M +zMrNzsxg5&9q+)3Mtr(?~`1L-`+hU`eAF1TLI~;cvHDUDFWOtPc*Z;oBR{V@C>hzHX +z-$;#SHrZVhVd!Y;DJ_a%P>=8U{nrj#SA{x3E5uQ&=|RtssV?7@fVa8kor=zTh8*Qo +zaJ9j|u2$%5vkS45C$q6$ts=Jbtkx>D1*6A~u&X_oJvHw+UObsvLCa~AY}v7YHulem +z{nx7~<_MJubGfUvNft@xZl~C?J&qf?)9^xLW>(CM?!%SZK?#tw(WH^=(LD~_x{@$c +z`k%3J!p!K)q~@FzElL4c*BSitXKwc2uy|N61P+TQk{c<_RX;{wl|)d==+U45DbLSa +zbcV+??-pK(R4X;9>4L`FuYv@@=rO4Oa|`~lGA%Kd8cb_Du@bra`%~it=@v&8Teiop +zx9e`amsHFGi6l3LR6C5;tgb{aGsgcpM!FLrV(uIxad~*OL?5Ca)3Z;Y?|SUix{~k$ +zXWoj2zN3RqAjN$-r0DU&s5?b>z|6~qJ%|dUPc32n<&n{qhUp%Xxt_E`LhvD5J^wkAcoNRk%`z +z>#odtNYcwZMl$b8{#dKK?)Y-{i +zD|h}Aj7Y|4zJsAVP-c>92KnWTqT`>Dy=hW{T1C6rqBnYMLA$eM0_U!xYSN+=C!(*Ep^Lu!ol7}8K^y@ +zM~KqZX3X&B6LvH2;+42Kt>lt)DAufhO{@RB>GCe2>?k^U8H+ude?-7!%s2Yh+CnX) +zXRpSiZLlUwB&eZGfS$dawVXB&#Q^9Lt#(zW^UY3o2+q8?;)GH&N!r4fH`e*Bxm^h* +z=vk8}EpD(cWk9NS98upr73(Xb$Ik0NnW`~s9@krtHIY)atgw-qjuec4jHKT}a^^4u +zX(bcXOGZ)j*h&AMmb?wauaKNZ^(47lCs7)t>WKV9^CqCP8UHTs?@>9gz6D!Y>KL2n +zMD)@y#27ucIo+mIuJ{~G(Rkezq0&}pn@T3idk#7O?ror&3bhZbg9WP$49tdQHy +z$d%D!Ti#t?=Dk=~RYP^i&$J^x2Sf1p$9}gv1utZ0&Uf?GsoiRmb*+^YFjg2nz7zO$ +zKK?Uw@5+aX&A7`WC=rsjuOQiSJw87BEg|nKvJO`SVwWpO1(IH>N3zHC*p7E6V3q`a +z(L2{ok94GH8H>YY1lMK>xz +zAZXcRwn2~c;s2)lcX<9HVOn0L2;DM+;x?liOhesGFN*n)mw}%PDhfS6R|r< +zS6p5;8F9IC29>WSYZbnt9OH)3zO|JYn0x3u8r4FlHAl}DxL}&QOK6-`FQWTQP)Rh +z@^rc+mP?PqDP&MwF?mOK}4ox?tqL$1LxJoA*^#eiM0tqW!U9 +z*VXM25OkI4XXXBg);qsG481~K#}^+QWZ5&m?7Bnu;r6LCY>h*$SQxG`%@mXEpUw=sT#iEBvWA*6qtM&(QlnqruJzpRc4yNaoFm!K;5_Fxf@GCC(vF_64!QP>v%8abMd$A8s1ACBDlVVc +zW99$P<-g)`<`ibND)mF{sml5fjY8NMLyyzA-+F>~$gTL2ROUYXK~@XVqA$^PJs&gO +znf>~<%r}P|$~AjQeiNaim$R6)jQBHx#1iBUH!2evQ +zcpsWEPk*GzrhCVee>wB(ZeM0D|1|{X#qu=@tp403@#H6xR_Kf3{%c4vQ8;hE$DP-g +zn#D4^?o|CY2cwhTs^MaVT!Q?%9I+jAY9$zqa-=-^w?*8D6J{3tVpH9*_pV0#U8s$)%PJ_(l^LuRU8w>3?{ +z5MWIC#~Q(e-5Bk>k5m*{tgCAMPHHv%I_97BkGcDw$eWqNG?FXOH$w2%rx%A}59+xM +z{H;}(Fp)c$LyaKmeU121zsHNEu8%eJw3)fWFGS=$o9GT(JVYNhlK05rZ1L(rzs_j? +zGHtq=i@9lc(0Hl2)W +zak0829dVIl4%q)Z$?DGQXXNp>PuqB*{@aV>W>!$IH|#+@PocZ-(izGz2@)*dB$4!T +z4OFq`Ci1rgogXSNn~75z)F7mYCYf=?zo4DxuDmjxiY8rH^fyt8J@PN{!+$!Z=N|^} +zzG}g-{ai|2%=#3(x0_g +zNc~my*S%ioO2%KdF}4{fVU=++n5%rd$ +z*X5wC|9ASXGSetCn;VxyX0zylF39^Yi$`~ff1ar^8FTSzMhK~%Byee`Cyq}T|0}6F +zjo@C3%XOqy;p_xo{`_r+*_9dJXDyb!yZC$!pL(4mX$L75d(dCD#9gJ_!AH=kj~J{`xxsW?Rj?SW)gi^`i64D0{lVd?b5NkB_H+pTEDJmz_`D&aSu0 +zUC7l}pw5%@C3!Ue#D5IEuBUeASJd1xd8&;J(#ZY4q+%X}ybKepa@$B+OCH0-tmmes +zyV-bUMXKK(fXHtl_l7)qp43|RvcG?W7(pz%{A(||HU^(?jGH84}TSMc&#r<0nUaq!yH=>fTIX+H~Zo%il%F2JF`&&ZZ +zH~iWOq|v~jft74c&HqD^pLroBO0cYq)6mUca)hO%j8+AeKWf*#s{dZUvZ)uh=jB;(Y@IC;LYi$jy-0 +z^~Lam-P|F9BBwR|BVtpMV`Kf*{nZbRyqVrS-d*j)^s3Su?)5{=k2H^a-2A}yNGkqQ +zvwNMvyOYg>jE%LHC%L`8y<2Pm?-x$jZ~yxjFLh!>+wfyz!UN)*3XPN_kFLxeAJO4y +za9&(~wui#%Bf|H^ZcAB|e9>1tCN{ux@+Ile{%rBL`5G&R*Tgjj7Qa$aSB(r+XqqWe +zKe{xeG={5^8d}Op|D^0cS-17vy=ei37Jde^SDE+C8l-AaWq_o8DUeIEw(GTuMF32nn_z#BDp^FA+>r8XSbE*SYX=`5bARZ%c8B?PSLe-pcW{5fcF*&Z2b|4_ +znR|9zbzStN<11`;&-u3Caed8`h8!y@;Fu5jd(JJBBt-K +z`Y4W2S;N^s%6XZpxyG~saduf@oTZ0IiGFLU13#2XWmOFHT)EDpYU=EOU9%S(BwX-tNz$7JV#R +z^5c1|^9!kSS>`b-uW+w@zfm&zMNmWH{^QbXAJo06uJoSaaWCw6kkjSO2X4B3&Hl!5 +zdT1=GC@_l~?W6I;(R=Z2lR1LbfeL=hZtc6fctm_;s!ZLZSpsKutJh7N61LAzZRJw) +zs2A$0FLsUZdnYopHdI>tah=wV6J7(}I~HdWe`-%q!SKPTR +zzuWi6Ff-j`HJ8bOB60ibU3-@$Da1TK6U*J|$?E@Lo)>CX> +zUfAS3z=EA{Wl-`^l^L1J7j3hYN6j(cF=Jtl)~99Gk|9SUZcp$HK7LE4agN?F(-%wT +zn){pOrniVJh<|WAe3e<$Zcn8#8R3$0D<%6J;%>dMI(q-tYu{$h{brrKTZ5SYaO@4X +zNh6g(lG`|?+pnC~vH!TtGl=`@fcp1YA6>NvygDqq;0!T)$U^~K#`2YxNx8AgZLTs~ +zta$dp(se3z0yn(|xIJ$Vzn$Ov!pT%BLy=9eti^o~8Shz>dFTG|5pK`?FQ^^4w`FgR +zb7erd6;*zF))Tog>csqcYI{g)!ki+^MoC50U!OEFg|p!C)S!FPaV^Um_Zp_h7*2LA +z8cN)^upwj!2V#F#ipk#mg@YyrCQ7bsyd*i~+}HYsr}I8it0vx5CG3~exLG7|NYZMX +z<#oZL^p@M){M?X1!|N#bZ5IbVx2voOxcD`_rD?!-fy~`ucDQ9BvH$V(JqPP=Zuy#g +z<5|5@Tnk4#sdd#UGJ|uAGCUqol$I2!m|Ne+VzA?p1D!YT?oa!7MqW6LMi?yb`$Buc3S;+b_0L5XL2BHu`oz+X +z%^&9d7)S_}FQ?o}uC-1L%HP_HsI)G6m1_Hh;0XDWV`*Y}Q(lE`MWWo@1CDQp5z8Y8 +zw-33GC+HqR86K$+`Rz?NuT}{RgX5?aL8Z +zeDi|zNsVDUY)))g^;C%!oP5K{($8ze(5l(b&00QO|KN3COSJdd>c^w%o5vGd9w)N$ +z>a!|$s#cww|ESbuH!U7qc&t{df8uF&8YeZKy~=p}@cn~_Rb{6cP0AS~er#qy%ht_) +z`)+*Snf7#*)|8;TTfa+2x4IdR8=;{((75gW5D|l|vr~`tb8oy?Z&q;F?CGkf?^f(y +zxkdc6?7-_cqaKExpnR8IXepP^;5;~Ex-CdabE=<;`BkUq*CJE{*mH6%t1j4$v&{CfYwd7cgPF6E!q+meB49rbVvw$ihc~1kiGjm +zwr;+1@rGSys#ue?Pl&VZ%Av`uS2`bk>R4`yzOBTsmj2n`|A+s>`QO)ADEKaux_xvng+1?#b)1_Z?E87g7MB<+s6-#> +zduFZlnu7b+=0D8tqY^()T>G5vmR9byXND_YB`i2KZS3 +zAn(L}n!`OMKxHxmfuuK%!HJFAy(o$uO^vz)dz$ +z5`OSh`-=P<5xeip_^MJS+B1{vtKQ#e@KB3L^bC=OI +zLp}#tR}1)j3YZ`wKB#r!@x_+QqaM^hn7)T@uHPXMsJOEutWEG{>qqIZ*y!g?>Cg8J +zP5<$6(YM;nz=jFb^gD@qw_lDJGCyC}qU_j#d!G`t8tYr?! +z&YROE_3wFFt(4u`-e~##yHUXxS(o_qJA~fn2W}pxeGIoPrRPk@P`#hF`BFnwt9SW4 +zrz7)Esd1jANLkcG_+OL9?EIgodBti=kKhdKv1mW`|0c+}W)bN($KegotLh +z5NuyDV*4tO`%x(d&t;lKM|%%?7l>88+HTjAaS?$WPTT1Rl!-)5ocZ~XjDfK(AoFBZ!6`=1(V$myySQg$*bJ=k%tJAR+Rvu +zjTR!D80psURp$yt1VZFB%=AR}e|FYT$#aS>J?3`h>}Ge_)+4#ENNG$6)dtiRrn03n+o^jq_YUtt9{36QHK%=y6)~DA~jh&9=D(FAC5#fH@ +zC@VCT<*}?iCt|yU?op`?bFE)L+A5c8bs@9Qz%#|w)f_YLEb-bkZ~B-x`FKjzJn}Dj +zpBuI;WY}a~`^ln9?@qb9@q(RO6b#^QZ|-c3lF%7DewOD%bNA;1 +z(!+dBKOE`1O1Wv+MF}1A53FzQY6WA7;7Jqb?Y&(1KIF0J`#~Qpl3vep8%p^eS*UsW +za>09rwLuI0+_MOd-Vnn6phWMME4P{?0v{Ee%q8>$3Hz}Jt8OM-Nt4R;t6nX-mXIAq +zT+9AcBmA&1PpGM=G`x>A#??|nJ-^92JizqBgKOWvS7^`vmi6w?r^ja-29_>(^etna +zt)Yw{Dx@`uGqOPZ`7*s +z9_-Ci)$JdqG&rrFu$5E&eDkOd3H!WvGsT9ee;NNiX>;Q2xcj~12O3>TpE={D<@YbE +z-|x_EGRYvm^&zee-xqz*wf3-Co*(=C@v0p6~Z8{m!>9UJYg6PgaHdk_{w>zz)VNQ%&)~ +zOr;C2GwvSg2eR|pZK2HpeHFYS7r)$>{?OyqFb}}gmd%yI! +zS=kTk4A+0xGkx9g=6PC4Js@$*z`RkI7)WvaN!q1)PEXiCu*+ +zMAJRdk6~*G`^25e#Xi~6=PcW6G6UVdeA6Af`L5^H2k#djTxC^RrsiXKLF1%{%hdCk +z&yS~T39vIZ3zgp}$$A=UJUo9*UV_o}7c3K#K3BvIhh26VMZ6Ow#;2HG&C#e2cw9o6 +z^zvUWk-%L$#+7Ioy?FY=1Fz^%&Z?SFX)T2r5AyCu3oK4enYRCPQmcXU$Ho%Z3k8wy +z7MF#8?`@BW2_pO^qSnFI}A| +z7h^cZ@6*UH2uQDZx9oUIagEEiRP?!EG~b6TKU_(SS7C; +z(K6?k2HDK;Ne*_j6dOJ+d8lGt!L{V1uZYhyqDmU%P;zEJEQN-zu`e)YU?SG~BZJCddz%%yTTB+G`r8yffgdMc`aOJva +zm~>o;=y{9kg0S9a)5?5?o)pOMH-6~xlR-F5nJ8oLbxq2rNiQIH>UML=#7IRUDEQm$ +z&(WOK>ESzE=E#+>4h0a>V@d12l#q!qac$?@=_{+^O+7CRI@x!HBJo6E1B=jjDkH%5 +z6({T`U!B)4wc5-~>)cpTqYNz~;(!?W5mc)p!=4P~+rdK`4b) +zsPNL^DY-XcLF)SjW*?jusN|F#`?$)7vw%=~bze+GhL9)nVn3!-~OT@8xh)b>wGIQTxTeSMvDRFtWxO?-4@pQ=jE +z+6-T>w&=Rxh;#8U#}FxMGKvdZmd#gFMTO_;EV74n_a=tx=TwXGwL>l&XZ>F3+~du~13l+Ci| +z6WwGZBImeOKSHX?Q`mP&qqm?*Zm=W2sf}Cbb +zygV^FeH0-vV2$ZoeL`tGD^D~|o;7$ihuC3aXJP3;Ja>3!#2S33t(1&-+@?=dcoP|7 +zjrqi(Q?cT{T8*x5+kHu$6f^TLQ&Knvj|B;rDVx`k`;M$?mnC`)BBFJj+m{j}U!NY- +zk4V)^m-p?hGp{!hmlG$#%Op^zpNKhGez#4WP`DSe(P=~QBD3&yRi5Nvv))8~PQ4_- +zs!|KOOj&2P`M)pfZ4uxwju6Olj;%c<+q=0^x!C@l+tTP6d+f7EIo~ut!Lgare$zci +zRbqO3agm$CH!inCrb@ +zo$$*WNQ(7xpPRHz!Dswr`+&X$?*`cVsd2Bh8{4_RP@ijNKcl%wWX0Jrx18E)^(^gT?9bgKqbW(;!F%y~4U{}#%zIg}hAsZ3j%6H~vbZ?*#>%z(mY$kab%7)B +zmHV~UceCKv=Bobo7Y_w5ux!k$6(4`Kq}SzU`c~1-$~TEWwq1^@a?S4(qrEFX;F^c$ +z;g1i(ckAeRI4{TxbJ#?jZy8LCm-KyID0*~WucxnXd{!z>eKRg1(`(?FBIAk%)58Ot +zR3ClW!S?Fo_*D3rl(j-gL-^HIi+2q;ezW-^hb?hCN#J&MiNJ!`A04(!=QrgKAE8os +zG+ba*^n(U1*{0o3Cwi$Dw<~NrH^ltMj4Q+L#SRovJaMXTfyRNurJ=_zpP!%dIqay= +zvzmP&#&I?|+^-*R=MU78PtTvfJ!IrMJyu-qJflWuu^Ejvgi2PcGVy5orx{Z3S2|Hm +zS9keUe&*Qjd&yD~xu|VDdSRc^O{{o_rxKwifva=JDh**%@jqfUoW5VwyteQf{u!K9 +z`(|sYeId)qb+^|9o{#?^b@8IuXovpR&fdlor{tbA@$A(cxl!xP8i^NewmvhgB{JVG +zTo7sG+{f8xt>9|+wf#emt!vlvI=D05p<>~eQ5Mb{p2R=r*cX2b!=~B0pXZJPF2Nt` +zYzjYmZP>VR#{$FDy1OkYXK&Pom)o0RL6Ep{v8298^lR*$8kc=RMc?(q%aaS28R9bA +zdV$rW#K;Jr?Ogel_ZluFT$CE8tWvZoP+!z=B=MOT+?25E?2=K5WW(*YM8Yv9ep^$#PjPHR1azrE00?deJV-J9tm6Gkv!oUIqBA!rie-T7GjdCp0m#YV#ASvzCt9<8)ctQlU?1L(0DR8$4boPx+=jbee^C)aPWft +zHKF=g(%i>WycH{QB+*;U*K3yb-i%_6+>)%F@xx`NdOJ+lNhbzRlp}^d7*6?4)F)ob +z%~&HzNDn586Nx-mAJQa8RVG9hvAG`c$dhtCujd)~h49_p!mQA_6<1k@RL<)QYzfMU +z6(nRA%3-y#SU$un?Ylv49Uameu +z83PEn?HP?*eHIYrwi|A+GMvO+w-GrftmKH*Rcnc@f`nzCu>(s+5US5)!by=s!5J&X +zOhS$qta;g1O~{NfW|hw*E}G81aAKYWA!?ACOg1P5aUPO{#cJ`9M>ArDGE|>2x9RPh +z+$ZTnMKUp1V|!YEBA_5(<`l|^Gb6tN$?sn +zWAx<$KV6f#R0?|0-Aj-NHn?6=P2mYNin!U!S4g1biFt79NG<&-{w*JgXgtKMDWghG +zb+TZ_B+5u7?zv#b{uVhEB6gt7>!%}c@0pn+;%-kUsAUaWohb8g_*t<@g^TT1?cMTv +zGKV^#KSBSx>eO>GRvXME4YBHaAuK&kq{!9dP8OhAaJ4Mk8ous$!+7 +z!queY%v~9^&P$X6xnc|Zn#w+?oA}M>q_nv=C*xcpclyVQgv%4hs$>P`%!-c8JwVrL +zTzT?nL_$FH+%LmrH{zI2>`u1-bfd%ba?Vw%>{*?2TWmr}2=(l0&@P2X7CRHYJ#RmK +zL$yt~G38mzgE!698dGOpnwaqU>14{td7?#YgMYL8yexllm)(iU%T5=r)jab;4yE4U +zg(Zx0UdKMl#B6a*(ET=71@)aTgdf_7FQhzNo*#{gDlB%?7fwua3jOGZ1=qeYRFty3oWGCSuvH_=q*Nz8Bs`}s9P%l1jeU*}kd!BW| zldXYOYyJBTTB%+l2*8P8m7+C%DGej;^^h5mPeY8 -zvK&{g^4^d?I?3^&tfF8>ZnEiff$Etxl+8S|J%eUOoGuVJ($C#GBu!MWf2ipi+l_aN -zP4s7M88$P5BkFJ^wx&5L`t8|s-yPdL-1W9Mh?|Snmg;-g&OG^O^`EkQ8hp8 -zV?QK3nDo5%v}|Zj*~~Dh=G>FkuDjMxj=Wc-`rSk7qQNGtnRku*_!iBI4-@!m{ce_9 -zrlE#tt$w(*leplt>DCuUo9Me<+@qG@UHtk*tw7_`eFq4FGyn0fnD{;i^u>*Cjl}Y1 -zO}=~?l%P*EY#5&|Ph7^g!AF)DIx<0)J`t%)91tRwihYDLW%+xif -zRrh0c9Cc$pv%Han_QB$BSPi9O9y~?!m0(4?Wub*h8>x%IzN=;P<}Y{I#L9T0R^~fr -zZ|LLK3or#_&n_b@sv2Ih5MvGWy({kf*6+##y~$kSc+Tq>Vc%T>n+6c?6GHV&Sb5UK -z?Clw$8o5oxp+gyUlrPR7*AhDpP#Gx`N1GAVrsW^EV$D-liLVhh?Fe3DL=?WUIW~j{ -z$sB!Y{g4H0UpYcr#BgB2p;?4)BB#2dR(T8|^RPmRu$T8)dT`v-xs;KdBv_l8)>e&T`}QK1_OZ`-A5CT~9YDNw*pF3U{D~|bLiXJ};*f&cnw_Pe -zzs^`27c$a;z4_yw^=ZZ5*o4ncVXGZh+G(4LGGo0)wtKE!s>g~D^7XY28YaL|IIkx> -z1#8)Iac%uY&qX-@sWfAF+1n=dad-4Me`JiM$uZVbe6VXWC{6q^Tvrj+Q&UGGhpY}Vf_^+1(v9% -zR@HN^G@P^~%HQSpm3Y5_ig?S}Gv@3>DRs3IWW$$Mf$axx7>g5i%>upy9t^J|b?7@a -z{RqRy7g)ZBb(fXjofK$y1n-Ixzi1G#wcBPaGfa{jU^4pS!AQ4=6+e>IoPO*i^H|%z -ze#cW*c_^`=ZvhtY@!MC7Ay$T2I#EB&jCPhLzIIO9QXMH+ab?(+Yw5RX4q-n;ysF6Y -zlBh?&sBQI!UI^b^t1=;QSKf426So9bhP;4e6S;Wb`MH7_rn0sph=EF>ovZP*;f;wz -zL)F%zchmy$eWh&9l9o2fFAJx(Sd+ND)J;?p0Z~E;?q`aJ!}d=ir9^oA;+ynG<8blX{%K9yhE)M~^Ab -zUp9M%>t>fZ3-@vt`5lxi$-Zbj;9|}v@%ej_zW9&4Wgl3c(uZ*ESUB_f63$W*uZ2oQ -zh^(-QHFa{|yw`vFv{i88^C+>^C;Gj+%@QGE-l&!aei^KHBYCvHe1WL%z}+V(;@;ef -zs13`<^cEa8&?flq)Dz2BuBa*El>OM5I^o{5s`S@SmIzj;yuS1@##LG&!TTd+#fmsO -zQhLh^73bo<#P*BJQpTm}w14%q+Sz_M)OzaD==V?Z)r}ubwru(G{&bs1aTIIyb>YUR -z9vuhNWHsdINZ@5_pnd@$#Fzmx!{KxfXw -z>%Gr4?^a6O%{hBcQsc?!qMwg52dQ2QUO(0t_ArR|`r*Q$Qpq>&<*g37MW>FAGmUBz -zWbf;>eSF*x)(!>lu>*~tho?q*RcmJ1#%w*uTAn_z;@y<9X89}HE|>_G=a(;xS-Mfe -z$1VF=fnSSVL(v!;ugu9Z;e&eHOLHPB>)uOp6=vQGsk~vVqT}p+tSqHNDbl*E~dHN=-#;rJ8&eeli%LqpB}7IpULW+-8=`vhO(;wl{Mu -zms*q#kN0JS(xI+Pf+8$_$sSPP1<11`OC*>QXq$ -zr1W$3XaBFR(HH9)s{J)Blbb#+Sa4_b&3P|A#w=LCe0Q*;Z0nrN+LlKTpRN+Rd1Y>9 -zZNm2#QOhjuEnE4*<;ByegW4lvk{v(REa0Xc;N0_zE57t$wdK-JfLvViM#4kV1=KY!ifc5O_{ng -zo($uPHlFp|wfFvvO_nWoAFZ0TOfBEHD=RFvjw`8u6Tn)!V!g&;i#}f_HmxhXx;p*3 -zamuUWP2b8n=_?F8%EuWe`#dk-EI%bM#51?yR^ylU18Q@I`)~en@$}PGE6-)7&RJzK -z_ui8`M~{0(-ETeqQMc-pilSPU@`vv~hOnx*@*~S#D+E6aY~DFeDRsh0vw9JU!n7}H -zSBUJnbO}RWQcCg5nvDVgCq_sH(Y3nD2o~-Ei`oz*k -zt5~n7bK0S0WQO3z!4U_=4zLpkm@o11IkTj~Q{#5t^_g)Cor}LtZhCTd^r8=~#;(u9 -zY_A(G(rvo;ai)T)c0s67Memd;MZ-?sh&tG!-LR3Up5S)n_>Fh(rr2`x)um1poiH}+K+-#qrmzUHC -zWr^jhmnO~qG~F@FXu#;vjh9P$Yt408O>5d&#j+h&yp9~UBzMB2{M48?yB|usE-n&NM#2~g~lE2#0mzO@trM0{;P0A1z>HpBEP-^C* -zZ(Aa)^_E?sFFok3f8}@(s-l+3~B`&@?x;d_w -zR^9%*eMbd|eMjjy4r_=w^E*DYgh9mcHFPP5CCkB|D-%ON6*OTijE5;O8y3MzSPf3# -z4qIS5?1Ml!2H_A1mx1{wM{Ym{F#j6mBX|L?;4M_cC-{cYi0HsCLMT-)kO4)|0evt4 -z6PO4yz!K)eVz2^Ra0FMtNgZ(qUO^LxQv{&~rmzGy0P{~{L_!+8gnEiY5F%)TAz%pe -zzzKH4Nw@+};0=5MLVzHIp%2Ky2$%}yeADn|2NP{fMffvvKtw0JAgadeR@M9kw -zh7wR0!i~TlTwoUjK@41j6u1LVpbl8VXf+rC6JQZI!FD(Xm*G0(!zZ|gPXhai;vby{ -zW8h4|4@>X{8t%d)D1g^c4NXAy!oQgXmf#39T!-ht!q%~1OAZN8~x7`$3GMT9&iz%1AZp-=$5`rukv0|9Ua3ZWg;CDEjC8A_l} -zUxKgzKS+Z2z?MR-!4*Q_t`z#8kjAJ7H@FDpAm5K5mcj`rfWH0F&#)8Hp&2v=5X3S# -z0GZGVBW2J!a1vfX?}2C)*ar_mRF)tn!7jKDY>piMrW$rZ3VZ>rK`0?yfiEyt9#am| -z;0G8f5X26+2OTh05q%C9p%PRFV`jiNT{RLz#FbYH4N3jS^^iL -zN(23`q=^v^=imdV4#R(j(#%PDz&<48Wv4%i2yay!{f>;j6AP*!=QJ`7)5eRv}Hp5a2+aVoV -zV8jG;2ONb*AZ(5$6}%xHKETk4ct*e(cn4~e(8q8dYGLGLR0Lw-9Vkt~^>BI$`o9vt -zXimlSgKN+NM$?c1WP;dqOd;3~sn85#X5cG&xCS3#m<0wNoP#2en2Cx2UJMaQ@EHtd -z5ri)!!&ew(iF;Uba8vw3&PM;hCWwH?@B`H55X3^*2PsemgXUrm!zQ=@FF1OpS6!ghEF{g$HZAO;#?>@rMQ@PkzN3>@|4SfAk#JcO?>bOru9@Pcr73O``v -zN<5e#2r}UdC|Y5}~C*zkw_zKKF&}9YQ -z5CML4u8N9`c|G6zuT-5db#AC3pq`t1Ep<0uS(p9S{g-Aqw)K -z5Z-d|qXt?*XdOWefMH+)Q(zugg9rG-5jYNKAqo=U4m^bhU^(K+2P&WqV_`llgS`+0 -z;SdG!z)8iAXYdMYfaQc*!w?t-qrea>VF_4)3wXjFI07di8>)bEMtT?uI$!}--~{_1 -z1QOsTJak6?zrZhb(8~oG!Z=t3n}7om5CbWY3&l_k%^>KCr4{6088|}#L_jp$f@~;+ -zH}C}rH%wRP2P53j|FiImEBL?xNQ8V~uSbDkGT6Zmh=Kc10+Jh$77juxRD*;&K`6sG -zm;(;r4Tm5Jq&+bAAr#`_F+Nrz+F;N|tp6|zmI4P3LO47H;Z3M1sDKg71UJ|Try&i7 -zdm>YC27kB=_n{J4UYJF&5d7dcL;|N2KZwm(lffJoz!nIENVoxQAiD(_!$t^)M-L#{XazYxE?2C=OO7GMr613Pd65AXp$I0Erd -z0Rr1F(m@aAf*asNN8%Es!ZUactE}?FawstTG#>y;3Nk>1h->q!9l=VE20|I -zcOZrXS2ze);Uo0jiD?CH5Ct_bVHXMphanY8L3lS}1vmw-fZT&=3BzG5ECP4n(D;!A -zZD6t&qa5O)0)+OV1;7ei;1DE2HVp8?x&TvP7R-kwU=8-*4%;CJPQq14h5JwhmGIFI -z{ojmVI-rj~!Y@#TQ7|4R!ECSrSJ)2z5Coxc5w5~hcntypxDSj4TfpZg_`m>}f#QA) -za99Z&;3!1xM_;Ajmjd_(q6bh2mn7sW`F}6f;4ylFQ62tK&*f; -z5+=Y3aD}~a26CVtesJ(Z;1CuQkOLLaf-x`&7J@x&hW!u@7vUP*hkSSoUx7G`Sp*6& -z0=B~icmf|mx5J-Z1@cab&|1*ARg+U=$?_m}=z+N~DiI4%0p%DZ^ -z(OsYf`d|gyAp#Pi5Sl?G3|$IiVJ^7APB;tcPzoP8_`wQC<}d=r!#+3zF^~e;Pz>yo -zs5$6>2~37%;0QY)2u{K|h=*jj4^{9Tgim251Wi~A+kq2|A9vwBh(uuY!*DQx72pjg -zAQ6f{{4}O0n1VHU!fptGOOOi1&;TN5a6cFiYhWWBf@sKxA7{}2a%ZvT!#21CW$+mU -zBeB}SY}f>05C_-c0lb1*Xa@Oncn-iUSPWa>ARL3U5DQ800E*xnh@Qv8>pTa2j$cND -z2^@oG(B}ez5b%Ro$bcMp0j!INj$j&W11{u11$4mBOSl)f!%jE`T=)VyQK&5JfM~eM -z!H;YxggW>RB9}41Kods8M3@PVuoVI!94K&5k_W}`78-zzLnsACU5MGQ5QM -z&_P*fzR*Z070QOLhvq`} -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 -zpfdJ)r=a(o-vUsAlz6pe?LoQ!VLoR7qc1^ -z=A^XbteiA12@=~SSWnRpS_NHIxe9V72scZ)dZ&<$ix^9B9+%zi&F$w=N6<*8;J?zy -zd>a?h$auH$?MCu3)cIRk=+Ve6Sxhrs@zcE@bL+6}Y=8mk8tL3VclUYvyzpJ+7A>Zw -zu5nvnPenBK9LsaAD6a}~8<3~1VRn{VwwT5i>M`em^yt8_t<_+2g>yYGy{L7yQzq=X -zS|!ZA|DAPp-tCH9R~IN4Ze5+XpxKhYwXW92MXalxBH`E7DiVHO?UV?+u2zX+?BH4& -zXsht+YNtflb+uC>?7CVd*tQ7P)!HKbx>_X)*6FNtT}x7J5q@2rw?z1Lb^cP$-drmq -zr&JN^YLzkHLxk&UZDRdMu|}wC&UVTav95N?6tS*$$`rA#&ReF)b+uElh;_A7rigX5 -zQzq=X+9?r!U7fc`;p=Lrg!$XPI?mw+PZ8^C)nj&X*y#(iS2*_+v98Wr_1{}pYfIk{;nvko8FO8Iv9)xuFEu*n5$WcMbhD}L6L2Xf -zo7dy53ze=VmUV$W_Amdry{+74&GMZGn7QTvu@(a6wY`+&QMl-tl9ig2W|encL$YeS -z*c+%@-O6p+v_Ne}k~dJ*&TZbjVD4YOKn?rS>AB|?$i-Vp$}+FrCudxnKB{GFTwO6g -z6ey$(`8pcZxi68lW>#V!mj#b7L)wr_c -zFA2vLe#)0y$Xwx#u&m(mUgzD;hXEST9XYbr~@|#=4 -zTd(#3+oB<`f4%#V_smbpL>C|=v|suSc~6fo~58&*mdlKh$z13HCjcuol&4YMK2@5Zf>q4bX?pPb@pK{B#JF$tt5);26HJf%sRmC -z*yQZYJitY)CEQkVwzC!!_Ws>Y$t`29ChRg{kG-{=us<+%eMpe|^Mh<-Ve5&o+gJ;V -zzg@30!MlfP?tALuGe3_sKN%{rOtt#XnxdF;&OY5CK6jtyszRUNxktED$~;QpmKEWf -zV6H1kjF;`!m-UarXM6$U=?nioym1YlWdEg&%0<5v(-RrB|cWy2=)WPBXYpym_s%Ovq^LK7t=5j-&Tp#@AMoPo^ShpU#v_Qw_ -z)@V+@S6h)Rd?B;ri=2Op-qf0a&(Q=NLD|uofeRcir`>8&(Nl2v?aet@N2kE3bM|6= -z5@+8TR$$OMh0LZDF?kjUM$U%T>=|br`vT!1w~#q~+J(X&Icxs3FBcS;8JwEf&cY_p -z@Ech(=-;o|na&E#CQfs#({lTb63;!2uf(k@wG -z_H)&VlJ+l%ce4(see<#|Av+g-M`vUur(~t!EGGZ8-~3l-6O2KB`Kwm8E?l}QvT}@> -zfB6G;cK*x43C7{S{59+uR%zzc7-imrYwa=rrPze~LV>z=jrp%Ag;5u -zMdQYK1G)8P&Fjmft?R`3-)Q~|%n8Q5-a!41Rwd`0Q&=Tq(o&ML@>h}nT6cnR${VQD -z*Q&ymlQ&{zOijreYo0>pyX5XVdiDnQM+GX|Z#e&gJHdF+7l^lWTzfJ$`vP_B9M{n^ -zKJ)4D<@Z{GaljvFR^9Tfc@aCmzpUJrc8zWaToVY?vUBo(!jNDfr&-2G>-3Qyfi#pMP+V;*}$IkdYIzZ>S4?(qC -znP~1cCkvk`ZhiR!QJcFGCRjQBJOw6tZtx& -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 -zR6!vd1O -zMhvrFx4~<~FY9$%yhiM@UbhPZ5V$Nb4=;k2_1ZjCu&4F<0=!1lvR+?^*N9lw>x=Lj -zhthi85wFcdY?d|uGoxBzU4%NFBaAvdK^hFDqeG1Da1OCK&*%`FbBqqLIlt%- -zn{$f}G0Hke*ql;ygi#hpnEj8!&LKAE5glR_whrrs_}BaoN5wg;gYa6;uaDO42q?1*w#;tjZ-IAx+ -zWyYUV1GPG!{Z1{3d9u&JYrVH7c&+z#K3o5)X-UnZ|4ZziuJZy~>63x$RUCMJW)A1xp>sa1L-b%io{0iA1^WbT{1sP9~wD?K#YviZMyU9;mj9;5&zj&Tu -z0rrb$4VnGod7jLE@oXfsUpz07*)N_=WcG{o6T{|_$5Sb-25vX=5!rq0D9@|h;5`=D -zMczw(jr>0O4e|%%H_7|RZ;?MF?gc{4===`6T%p@-O6X$-k2E;7_Z*Q{?Z+zmdNu{~61K<6h&lPXoxeobta$WKsavb?>aypGV+=%=M`5f}6WIW8+Izpe38CF3c{R)t@X6UbkZTaZta@ib+t{O?iitrtE#TG>kYg9Y%IWsA>{@yKP1 -zy&O<&yrHwlFnsF$$_Z0$Jw?```z_S}n?OQTa0}Bl%(jv>%w8dDm~A6#m~AI(n7vBY -zFxx@aFxyFXhS@GAXqdf5R>OCbHOyWoYnZ)3)-ZdMtYP*RS;K4(*%@YUGeN`b9kPbm -zyJQWs_sAM%d&wGR?~^smJ|JtD?IT;m%;@uFpi=N7CTU>pCu?AROxD2qgsg#efUJS_ -zDOm&SGqO3b%vg7j%yAX;9b$sqahR-ub%d;e^*LDs>nK?R>kG05)|X@qEUN*>$o9BG -ztow=y8dzVGHL$)RYhZm#*1-CXtbz4CSp(}h`FA$p1lbx_jc`bQV1fqLk7Nz3pFE+} -zCor(;|I7^e^CVe^?iWw!?2qOI){R3`Bda@EBdZ5lBdaG_BdZr#Bda%ABdZTtBkK~f -zGqU -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 -zJ|)Wy2gq{6*G8LUm_~hptO^A;C#oly=Ct$Db6 -zbcN7$UypBT`4GN92g#>?lw=&5QzNxidup-m>d_kX(xSvO@{7>`<93JCq~K -z4kgL5Lo7Ms$)XH5&}6ZKN8?|eEb`kSg0tXiY=9<<3S`-&Dp@wELY7U+lVy_{WM?^A -zi3#!v@1pj|C)Js+X{0o{zx}T-hOCHEku3lC$?}gHX!<9j3u@{^87MY1E5lr9)Mdr; -zPCQwmg#UWv9eTtGCG?O--ihP(@(#E2$U8NeAF+1|&LH{kV)>6>LE(|{$UA&z9(kt` -z-;un-d!#+`PCe$!JLi%e@6=*~yi=Pj?=&RKI}OP4PJObxQ->_?@X&kY9W^jw@2C&u -zotg%`6BlZoZ3Z8{ZRaCE9wsOF@RZUqP&>9x!H1`yj)A%{Uk2i>zm9=;R6PGR1F@TU -z*YyzhWaK{0@!*N7wqs==&Ml6C7!{p4D$!_@g+)etZpPw1E{#002`@Q1A%;sKk8DDJ -zI-d=8XMM5>{pnn@=K+;Xy805if$0--RZ`p;FK^2B$R=HFo4hvFv`HUUrZ{s6S#gG~ -za%|#086L*+iZlJlvPoaE;tY>MH8LQI&F?>P%+73^a}`1C1riKxyQN<4iU;kb(Z)MNSs$ -zvkin>4cuqM?u)kLjb_sjH&VHsd~!8eK1m|WCs&abXEMl&Gnr)BB%Q1{Gm1=`1bw_Q -z-?^*u8WxaGc%#1pjZY1XG|o(9eX_|UaPHYr=(8K6hk1iHv5?};EVAOwRI=>ijyJb5 -zUv`;BmR)Wj%PzCY5!>aTUf0~g2H18f7~UIU -zw_8|DcDb1>yWB{YU2Z4SF23u@iYh^}+%ko%sG?@jEd?*26u6Sl3S^f#c2v1#mKjwZ -zWTtGgm@JztBFiRA$y&YKOO{RUBg-ap$+F2k>f^NtS_Dl4YPJJOVP%)6AEFULear&yZ!H`?$SnpsMD=_%Rk3 -zVgHNI5{V-i9a&ou}AVOFBP{G6=5JV;hw9w4hP_mS0?`^oCdFUcD8cd}C>9`y0tK)vif -znfaJIP%pa&{TIyFp#P2>cF-SU0S)@E$QtzDlGXiRlQrm%ku~VQA#kHo!4ZaVImUxC0sJ -zPqGXY#R_GhUzslh{Y936&XOGi{l)|t=rmad@^J?;&=1U)fxOI@fqrDZ4D<_G22umV -z8t8j&FvkAZr#_T{JjUe3xav0k9@9YOxpx_;GFb+yMV5iek!7GtWErRoSq3UWmVs)J -zBaT4Do!&&VLK&#I2vnQpZ3E%-#=Y#QzygXurO7f-S+WdNk}Lz2BFjKkj4$R#$F;1+ -zWZ9%DSvILomQ5B#8*LXv*G;O(blIT}S$5FwOglt!aV?hH%MCScH=McObVCzn$_