From f8937ff81f1da16d78ab0070953c9860468a8f8b Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Wed, 16 Mar 2022 07:26:33 +0000 Subject: [PATCH] Changes for March 2022, syncing up to v410 --- .../0001-Add-SPenPointerOverlay.patch | 4 +- ...002-UI-Monet-Default-to-Lineage-Teal.patch | 334 +++++++++++++++ ...003-Disable-vendor-mismatch-warning.patch} | 8 +- ...04-UI-Adjust-default-navbar-layouts.patch} | 8 +- ...-seascape-navigation-bar-optionally.patch} | 12 +- ...h => 0006-UI-Disable-wallpaper-zoom.patch} | 8 +- ...I-Increase-default-status-bar-height.patch | 26 -- ...I-Increase-default-status-bar-height.patch | 26 ++ ...plit-screen-divider-to-pre-Sv2-looks.patch | 43 ++ ...layout-tuning-via-sysui_nav_bar-tun.patch} | 4 +- ...009-UI-Unblock-alarm-status-bar-icon.patch | 40 -- ...XED_RATIO-for-multi-window-globally.patch} | 10 +- ...refresh-power-menu-on-UI-mode-change.patch | 32 -- ...011-UI-Unblock-alarm-status-bar-icon.patch | 40 ++ ...re-Remove-old-app-target-SDK-dialog.patch} | 4 +- ...refresh-power-menu-on-UI-mode-change.patch | 41 ++ ...mUI-Use-Monet-colors-for-power-menu.patch} | 12 +- ...ake-QS-always-use-dark-theme-colors.patch} | 14 +- ...inflate-QS-and-SB-when-CONFIG_UI_MO.patch} | 8 +- ...-light-dark-theme-in-quick-settings.patch} | 129 +++--- ...itialize-QS-tiles-in-inactive-state.patch} | 4 +- ...l-tone-light-and-dark-themes-for-QS.patch} | 20 +- ...ubpixel-text-positioning-by-default.patch} | 4 +- ...overly-low-chroma-for-tones-below-90.patch | 41 ++ ...QS-clock-being-white-on-light-theme.patch} | 42 +- ...ove-clear-all-button-to-actions-view.patch | 379 ++++-------------- ...og-privapp-permissions-whitelist-vio.patch | 10 +- ...Revert-overlay-Default-to-night-mode.patch | 32 ++ ...01-SearchLauncher-Adapt-to-Trebuchet.patch | 4 +- ...0002-SearchLauncher-Fix-build-on-Sv2.patch | 42 ++ ...ild-Integrate-prop-modifications-1-2.patch | 10 +- .../0002-build-Remove-Stk-1-2.patch | 2 +- .../0001-Add-LineageMonetAccentOverlay.patch | 173 -------- ...patch => 0001-Add-MiuiNavbarOverlay.patch} | 10 +- ...ag-by-default-for-editable-TextView.patch} | 4 +- ...s.patch => 0003-Disable-FP-lockouts.patch} | 4 +- ...=> 0004-Keyguard-Adjust-clock-style.patch} | 44 +- ...-Hide-padlock-unless-UDFPS-is-in-use.patch | 43 ++ ...-Hide-padlock-unless-UDFPS-is-in-use.patch | 59 --- ...Keyguard-Never-switch-to-large-clock.patch | 28 ++ ...Keyguard-Never-switch-to-large-clock.patch | 38 -- ...007-Keyguard-Refine-indication-text.patch} | 54 +-- ...tatus-bar-quick-settings-margins-an.patch} | 133 ++---- ...date-RAT-icons-to-match-Silk-design.patch} | 4 +- ...rt-monet-Add-support-for-monet-cam16.patch | 378 ----------------- ...-Always-render-windows-into-cutouts.patch} | 8 +- ...unded-corners-in-notification-scrim.patch} | 10 +- ...012-UI-Reconfigure-power-menu-items.patch} | 17 +- ...-UI-Reconfigure-quick-settings-tiles.patch | 26 ++ ...irement-for-HINT_SUPPORTS_DARK_TEXT.patch} | 4 +- ... 0015-UI-Remove-privacy-dot-padding.patch} | 8 +- ...RGE-Allow-a-settings-override-for-do.patch | 225 +++++++++++ ...-LocalColorExtractor-using-monet-the.patch | 260 ------------ ...ake-overview-scrim-transparent-again.patch | 20 +- ...02-Trebuchet-Kill-haptics-in-recents.patch | 82 ++++ ...ild-Integrate-prop-modifications-2-2.patch | 4 +- .../0002-build-Remove-Stk-2-2.patch | 4 +- .../0003-Revert-overlay-Enable-monet.patch | 23 -- ...r_lineage-Ignore-neverallows.-again.patch} | 4 +- .../0001-Remove-init.vndk-nodef.rc.patch | 8 +- .../0001-treble-Lineage-ify.patch | 21 +- ...ARD_EXT4_SHARE_DUP_BLOCKS-explicitly.patch | 4 +- ...treble-Set-TARGET_NO_KERNEL_OVERRIDE.patch | 4 +- .../0004-treble-Set-OTA-JSON-URL.patch | 24 ++ ...> 0005-add-offline-charger-sepolicy.patch} | 4 +- ...vendor-specific-initialization-hooks.patch | 20 +- ...into-recovery-rather-than-bootloader.patch | 2 +- ...estore-sbin-for-Magisk-compatibility.patch | 2 +- .../0004-fix-offline-charger-v7.patch | 8 +- .../0001-Disable-vndklite-handling.patch | 10 +- ...m-to-fake-vendor-props-on-a-per-proc.patch | 78 ++++ ...id-autobrightness-if-brightness-valu.patch | 4 +- ...uirement-for-visible-flag-to-sdcards.patch | 4 +- ...h-if-there-is-IR-HAL-is-not-declared.patch | 4 +- ...-Show-APN-Settings-for-CDMA-carriers.patch | 8 +- ...s-so-that-it-works-even-without-qtag.patch | 4 +- ...-Support-samsung-Pie-and-Q-light-hal.patch | 4 +- ...samsung-touch-physical-and-hover-pro.patch | 10 +- ...erriding-the-number-of-work-profiles.patch | 4 +- ...-wake-up-devices-just-as-well-as-bac.patch | 4 +- ...e-proximity-sensor-reporting-NaN-as-.patch | 8 +- ...ange-not-being-complete-on-Samsung-d.patch | 8 +- ...atch-like-behaviour-for-RRO-java-sid.patch | 8 +- ...ners-padding-overridable-with-persis.patch | 49 +-- ...otification-about-console-service-be.patch | 8 +- ...t-Remove-unused-SystemProperties.set.patch | 6 +- ...nyManager-bring-back-getNetworkClass.patch | 6 +- ...-add-API-annotations-for-setTelephon.patch | 6 +- .../0018-Fix-Wakelock-issue.patch | 4 +- ...ect-pick-up-sensor-so-that-an-overl.patch} | 10 +- ...e-AVCProfileMain-for-screen-recorder.patch | 30 -- ...BuiltInDisplayCutoutRectApproximati.patch} | 30 +- ...-Fix-backlight-control-on-Galaxy-S9.patch} | 4 +- ...-support-for-app-signature-spoofing.patch} | 18 +- ...h-long-press-power-behavior-in-AOSP.patch} | 10 +- ...f-udfps-enroll-progress-bar.-Some-d.patch} | 8 +- ...d-UDFPS-support-for-various-devices.patch} | 71 ++-- ...e-boot-animation-to-match-screen-si.patch} | 4 +- ...-Samsung-Power-hal-in-libpowermanag.patch} | 4 +- ...phh.ultrasonic_udfps-property-to-dis.patch | 39 ++ ...A1-IPSec-keys.-This-is-required-to-i.patch | 26 ++ .../0030-Fix-FOD-on-ZF8.patch | 67 ++++ ...ed-to-send-a-hack-message-to-HAL-to-.patch | 6 +- ...oser-hacks-to-properly-display-FOD-l.patch | 4 +- ...-Samsung-Xiaomi-new-FOD-HBM-controls.patch | 8 +- ...n-input-with-a-display-uses-uniqueId.patch | 6 +- ...n-t-exist-in-O-P-so-detect-its-suppo.patch | 4 +- ...Samsung-system-permission-on-sensors.patch | 4 +- ...to-fallback-mCallingSid-to-getpidcon.patch | 4 +- ...er-input-as-sensor-exclusively-if-th.patch | 8 +- ...es-for-FOD-HBM-set-specific-usage-bi.patch | 14 +- ...0-Update-FOD-HBM-method-Xiaomi-Oplus.patch | 4 +- ...sus-devices-call-the-HWC-extended-ca.patch | 8 +- ...er-Add-support-Samsung-miscpower-HAL.patch | 4 +- .../0013-Fix-loading-power-hidl-v1.0.patch | 4 +- ...-Asus-ZF8-had-layer-classes-inverted.patch | 34 ++ ...If-Vboot2-fails-fall-back-to-Vboot1.patch} | 4 +- ...riding-system-properties-from-vendor.patch | 27 -- ...ating-property-tree-if-there-is-a-c.patch} | 4 +- ...llowed-sdcard-options-based-on-vndk.patch} | 4 +- ...et-dev-uinput-as-0666-to-fix-finger.patch} | 4 +- ...y-own-OTA-mechanism-going-over-data.patch} | 10 +- ...et-system-override-ro.apex.updatable.patch | 36 ++ ...Squashed-revert-of-LOS-UDFPS-changes.patch | 285 +++++++++++++ .../frameworks_base/placeholder | 0 ...onEngine-Request-device-composition-.patch | 54 +++ ...inger-Add-support-for-Udfps-extensio.patch | 188 +++++++++ 127 files changed, 2470 insertions(+), 1973 deletions(-) create mode 100644 patches_platform/frameworks_base/0002-UI-Monet-Default-to-Lineage-Teal.patch rename patches_platform/frameworks_base/{0002-Disable-vendor-mismatch-warning.patch => 0003-Disable-vendor-mismatch-warning.patch} (89%) rename patches_platform/frameworks_base/{0003-UI-Adjust-default-navbar-layouts.patch => 0004-UI-Adjust-default-navbar-layouts.patch} (93%) rename patches_platform/frameworks_base/{0004-UI-Disable-left-seascape-navigation-bar-optionally.patch => 0005-UI-Disable-left-seascape-navigation-bar-optionally.patch} (89%) rename patches_platform/frameworks_base/{0005-UI-Disable-wallpaper-zoom.patch => 0006-UI-Disable-wallpaper-zoom.patch} (83%) delete mode 100644 patches_platform/frameworks_base/0006-UI-Increase-default-status-bar-height.patch create mode 100644 patches_platform/frameworks_base/0007-UI-Increase-default-status-bar-height.patch create mode 100644 patches_platform/frameworks_base/0008-UI-Restore-split-screen-divider-to-pre-Sv2-looks.patch rename patches_platform/frameworks_base/{0007-UI-Revive-navbar-layout-tuning-via-sysui_nav_bar-tun.patch => 0009-UI-Revive-navbar-layout-tuning-via-sysui_nav_bar-tun.patch} (95%) delete mode 100644 patches_platform/frameworks_base/0009-UI-Unblock-alarm-status-bar-icon.patch rename patches_platform/frameworks_base/{0008-UI-Use-SNAP_FIXED_RATIO-for-multi-window-globally.patch => 0010-UI-Use-SNAP_FIXED_RATIO-for-multi-window-globally.patch} (94%) delete mode 100644 patches_platform/frameworks_base/0011-SystemUI-Always-refresh-power-menu-on-UI-mode-change.patch create mode 100644 patches_platform/frameworks_base/0011-UI-Unblock-alarm-status-bar-icon.patch rename patches_platform/frameworks_base/{0010-core-Remove-old-app-target-SDK-dialog.patch => 0012-core-Remove-old-app-target-SDK-dialog.patch} (89%) create mode 100644 patches_platform/frameworks_base/0013-SystemUI-Always-refresh-power-menu-on-UI-mode-change.patch rename patches_platform/frameworks_base/{0012-SystemUI-Use-Monet-colors-for-power-menu.patch => 0014-SystemUI-Use-Monet-colors-for-power-menu.patch} (89%) rename patches_platform/frameworks_base/{0013-Revert-Make-QS-always-use-dark-theme-colors.patch => 0015-Revert-Make-QS-always-use-dark-theme-colors.patch} (87%) rename patches_platform/frameworks_base/{0014-Revert-Do-not-re-inflate-QS-and-SB-when-CONFIG_UI_MO.patch => 0016-Revert-Do-not-re-inflate-QS-and-SB-when-CONFIG_UI_MO.patch} (85%) rename patches_platform/frameworks_base/{0015-SystemUI-Follow-light-dark-theme-in-quick-settings.patch => 0017-SystemUI-Follow-light-dark-theme-in-quick-settings.patch} (79%) rename patches_platform/frameworks_base/{0016-SystemUI-Initialize-QS-tiles-in-inactive-state.patch => 0018-SystemUI-Initialize-QS-tiles-in-inactive-state.patch} (91%) rename patches_platform/frameworks_base/{0017-SystemUI-Add-dual-tone-light-and-dark-themes-for-QS.patch => 0019-SystemUI-Add-dual-tone-light-and-dark-themes-for-QS.patch} (93%) rename patches_platform/frameworks_base/{0018-Paint-Enable-subpixel-text-positioning-by-default.patch => 0020-Paint-Enable-subpixel-text-positioning-by-default.patch} (92%) create mode 100644 patches_platform/frameworks_base/0021-monet-Fix-overly-low-chroma-for-tones-below-90.patch rename patches_platform/frameworks_base/{0019-Fix-QS-clock-being-white-on-light-theme.patch => 0022-Fix-QS-clock-being-white-on-light-theme.patch} (65%) create mode 100644 patches_platform/vendor_lineage/0002-Revert-overlay-Default-to-night-mode.patch create mode 100644 patches_platform/vendor_partner_gms/0002-SearchLauncher-Fix-build-on-Sv2.patch delete mode 100644 patches_platform_personal/frameworks_base/0001-Add-LineageMonetAccentOverlay.patch rename patches_platform_personal/frameworks_base/{0002-Add-MiuiNavbarOverlay.patch => 0001-Add-MiuiNavbarOverlay.patch} (98%) rename patches_platform_personal/frameworks_base/{0003-Disable-cursor-drag-by-default-for-editable-TextView.patch => 0002-Disable-cursor-drag-by-default-for-editable-TextView.patch} (88%) rename patches_platform_personal/frameworks_base/{0004-Disable-FP-lockouts.patch => 0003-Disable-FP-lockouts.patch} (94%) rename patches_platform_personal/frameworks_base/{0005-Keyguard-Adjust-clock-style.patch => 0004-Keyguard-Adjust-clock-style.patch} (78%) create mode 100644 patches_platform_personal/frameworks_base/0005-Keyguard-Hide-padlock-unless-UDFPS-is-in-use.patch delete mode 100644 patches_platform_personal/frameworks_base/0006-Keyguard-Hide-padlock-unless-UDFPS-is-in-use.patch create mode 100644 patches_platform_personal/frameworks_base/0006-Keyguard-Never-switch-to-large-clock.patch delete mode 100644 patches_platform_personal/frameworks_base/0007-Keyguard-Never-switch-to-large-clock.patch rename patches_platform_personal/frameworks_base/{0008-Keyguard-Refine-indication-text.patch => 0007-Keyguard-Refine-indication-text.patch} (78%) rename patches_platform_personal/frameworks_base/{0009-Keyguard-UI-Fix-status-bar-quick-settings-margins-an.patch => 0008-Keyguard-UI-Fix-status-bar-quick-settings-margins-an.patch} (70%) rename patches_platform_personal/frameworks_base/{0011-Revert-Update-RAT-icons-to-match-Silk-design.patch => 0009-Revert-Update-RAT-icons-to-match-Silk-design.patch} (99%) delete mode 100644 patches_platform_personal/frameworks_base/0010-Revert-monet-Add-support-for-monet-cam16.patch rename patches_platform_personal/frameworks_base/{0012-UI-Always-render-windows-into-cutouts.patch => 0010-UI-Always-render-windows-into-cutouts.patch} (94%) rename patches_platform_personal/frameworks_base/{0013-UI-Kill-rounded-corners-in-notification-scrim.patch => 0011-UI-Kill-rounded-corners-in-notification-scrim.patch} (76%) rename patches_platform_personal/frameworks_base/{0014-UI-Reconfigure-power-menu-items.patch => 0012-UI-Reconfigure-power-menu-items.patch} (68%) create mode 100644 patches_platform_personal/frameworks_base/0013-UI-Reconfigure-quick-settings-tiles.patch rename patches_platform_personal/frameworks_base/{0015-UI-Relax-requirement-for-HINT_SUPPORTS_DARK_TEXT.patch => 0014-UI-Relax-requirement-for-HINT_SUPPORTS_DARK_TEXT.patch} (88%) rename patches_platform_personal/frameworks_base/{0016-UI-Remove-privacy-dot-padding.patch => 0015-UI-Remove-privacy-dot-padding.patch} (83%) create mode 100644 patches_platform_personal/packages_apps_Settings/0001-Revert-DO-NOT-MERGE-Allow-a-settings-override-for-do.patch delete mode 100644 patches_platform_personal/packages_apps_Trebuchet/0001-Revert-Implement-LocalColorExtractor-using-monet-the.patch create mode 100644 patches_platform_personal/packages_apps_Trebuchet/0002-Trebuchet-Kill-haptics-in-recents.patch delete mode 100644 patches_platform_personal/vendor_lineage/0003-Revert-overlay-Enable-monet.patch rename patches_platform_personal/vendor_lineage/{0004-vendor_lineage-Ignore-neverallows.-again.patch => 0003-vendor_lineage-Ignore-neverallows.-again.patch} (88%) create mode 100644 patches_treble/device_phh_treble/0004-treble-Set-OTA-JSON-URL.patch rename patches_treble/device_phh_treble/{0004-add-offline-charger-sepolicy.patch => 0005-add-offline-charger-sepolicy.patch} (77%) create mode 100644 patches_treble_phh/platform_bionic/0002-Add-new-mechanism-to-fake-vendor-props-on-a-per-proc.patch rename patches_treble_phh/platform_frameworks_base/{0020-Automatically-detect-pick-up-sensor-so-that-an-overl.patch => 0019-Automatically-detect-pick-up-sensor-so-that-an-overl.patch} (85%) delete mode 100644 patches_treble_phh/platform_frameworks_base/0019-SystemUI-Use-AVCProfileMain-for-screen-recorder.patch rename patches_treble_phh/platform_frameworks_base/{0021-Catch-broken-mainBuiltInDisplayCutoutRectApproximati.patch => 0020-Catch-broken-mainBuiltInDisplayCutoutRectApproximati.patch} (58%) rename patches_treble_phh/platform_frameworks_base/{0022-backlight-Fix-backlight-control-on-Galaxy-S9.patch => 0021-backlight-Fix-backlight-control-on-Galaxy-S9.patch} (97%) rename patches_treble_phh/platform_frameworks_base/{0023-Add-support-for-app-signature-spoofing.patch => 0022-Add-support-for-app-signature-spoofing.patch} (95%) rename patches_treble_phh/platform_frameworks_base/{0024-Revert-Switch-long-press-power-behavior-in-AOSP.patch => 0023-Revert-Switch-long-press-power-behavior-in-AOSP.patch} (85%) rename patches_treble_phh/platform_frameworks_base/{0025-Reduce-the-size-of-udfps-enroll-progress-bar.-Some-d.patch => 0024-Reduce-the-size-of-udfps-enroll-progress-bar.-Some-d.patch} (81%) rename patches_treble_phh/platform_frameworks_base/{0026-Add-UDFPS-support-for-various-devices.patch => 0025-Add-UDFPS-support-for-various-devices.patch} (94%) rename patches_treble_phh/platform_frameworks_base/{0027-Dynamically-resize-boot-animation-to-match-screen-si.patch => 0026-Dynamically-resize-boot-animation-to-match-screen-si.patch} (91%) rename patches_treble_phh/platform_frameworks_base/{0028-Once-we-integrate-Samsung-Power-hal-in-libpowermanag.patch => 0027-Once-we-integrate-Samsung-Power-hal-in-libpowermanag.patch} (85%) create mode 100644 patches_treble_phh/platform_frameworks_base/0028-Add-persist.sys.phh.ultrasonic_udfps-property-to-dis.patch create mode 100644 patches_treble_phh/platform_frameworks_base/0029-Allow-128bits-SHA1-IPSec-keys.-This-is-required-to-i.patch create mode 100644 patches_treble_phh/platform_frameworks_base/0030-Fix-FOD-on-ZF8.patch create mode 100644 patches_treble_phh/platform_frameworks_native/0014-FOD-for-Asus-ZF8-had-layer-classes-inverted.patch rename patches_treble_phh/platform_system_core/{0002-If-Vboot2-fails-fall-back-to-Vboot1.patch => 0001-If-Vboot2-fails-fall-back-to-Vboot1.patch} (91%) delete mode 100644 patches_treble_phh/platform_system_core/0001-Stop-overriding-system-properties-from-vendor.patch rename patches_treble_phh/platform_system_core/{0003-Don-t-abandon-creating-property-tree-if-there-is-a-c.patch => 0002-Don-t-abandon-creating-property-tree-if-there-is-a-c.patch} (90%) rename patches_treble_phh/platform_system_core/{0004-Detect-allowed-sdcard-options-based-on-vndk.patch => 0003-Detect-allowed-sdcard-options-based-on-vndk.patch} (93%) rename patches_treble_phh/platform_system_core/{0005-Ugly-but-secure-Set-dev-uinput-as-0666-to-fix-finger.patch => 0004-Ugly-but-secure-Set-dev-uinput-as-0666-to-fix-finger.patch} (89%) rename patches_treble_phh/platform_system_core/{0006-Add-my-own-OTA-mechanism-going-over-data.patch => 0005-Add-my-own-OTA-mechanism-going-over-data.patch} (94%) create mode 100644 patches_treble_phh/platform_system_core/0006-Let-system-override-ro.apex.updatable.patch create mode 100644 patches_treble_prerequisite/frameworks_base/0001-Squashed-revert-of-LOS-UDFPS-changes.patch delete mode 100644 patches_treble_prerequisite/frameworks_base/placeholder create mode 100644 patches_treble_prerequisite/frameworks_native/0001-Revert-CompositionEngine-Request-device-composition-.patch create mode 100644 patches_treble_prerequisite/frameworks_native/0002-Revert-surfaceflinger-Add-support-for-Udfps-extensio.patch diff --git a/patches_platform/frameworks_base/0001-Add-SPenPointerOverlay.patch b/patches_platform/frameworks_base/0001-Add-SPenPointerOverlay.patch index 5ec2af4..7979bf0 100644 --- a/patches_platform/frameworks_base/0001-Add-SPenPointerOverlay.patch +++ b/patches_platform/frameworks_base/0001-Add-SPenPointerOverlay.patch @@ -1,7 +1,7 @@ -From 9644e048f2a52b51195003bb90a45c3a0efb67c8 Mon Sep 17 00:00:00 2001 +From 9bfffff2b717e8606d4b0332b485e5c7bb1a02e1 Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Thu, 13 Jan 2022 14:22:24 +0000 -Subject: [PATCH 01/19] Add SPenPointerOverlay +Subject: [PATCH 01/22] Add SPenPointerOverlay Toggle this overlay with property "persist.ui.spen.pointer" diff --git a/patches_platform/frameworks_base/0002-UI-Monet-Default-to-Lineage-Teal.patch b/patches_platform/frameworks_base/0002-UI-Monet-Default-to-Lineage-Teal.patch new file mode 100644 index 0000000..b9de1e5 --- /dev/null +++ b/patches_platform/frameworks_base/0002-UI-Monet-Default-to-Lineage-Teal.patch @@ -0,0 +1,334 @@ +From e75e1b19b2da6bea129d320436f3796de4635936 Mon Sep 17 00:00:00 2001 +From: Andy CrossGate Yan +Date: Mon, 14 Mar 2022 08:20:43 +0000 +Subject: [PATCH 02/22] UI: Monet: Default to Lineage Teal + +Embrace Monet, but also maintain some LOS identity +Applies the signature teal of LineageOS (#167C80) as fallback (e.g. with live wallpapers) + +Change-Id: Ida88fa1d891223ad11e058d24b3c96bebbc9cd62 +--- + core/res/res/values/colors.xml | 120 +++++++++--------- + .../com/android/systemui/monet/ColorScheme.kt | 14 +- + 2 files changed, 67 insertions(+), 67 deletions(-) + +diff --git a/core/res/res/values/colors.xml b/core/res/res/values/colors.xml +index 59d6005ba193..36cf03f5268e 100644 +--- a/core/res/res/values/colors.xml ++++ b/core/res/res/values/colors.xml +@@ -245,200 +245,200 @@ + + +- #ffffff ++ #FFFFFF + +- #F9FCFF ++ #EFFFFF + +- #E0F3FF ++ #B4FDFF + +- #C1E8FF ++ #6EF6FC + +- #76D1FF ++ #4CD9E0 + +- #4BB6E8 ++ #1EBDC4 + +- #219BCC ++ #00A1A7 + +- #007FAC ++ #008388 + +- #00668B ++ #00696E + +- #004C69 ++ #004F53 + +- #003549 ++ #00373A + +- #001E2C ++ #002022 + + #000000 + + +- #ffffff ++ #FFFFFF + +- #F9FCFF ++ #EFFFFF + +- #E0F3FF ++ #DAF6F7 + +- #D1E5F4 ++ #CCE8E8 + +- #B5CAD7 ++ #B0CCCC + +- #9AAEBB ++ #96B0B1 + +- #8094A0 ++ #7B9697 + +- #657985 ++ #617B7C + +- #4E616C ++ #496364 + +- #374955 ++ #324B4D + +- #20333D ++ #1B3436 + +- #091E28 ++ #051F21 + + #000000 + + +- #ffffff ++ #FFFFFF + +- #FFFBFF ++ #FDFCFF + +- #F5EEFF ++ #EBF1FF + +- #E6DEFF ++ #D4E3FF + +- #CAC1EA ++ #ACC8F7 + +- #AEA6CE ++ #91ACDB + +- #938CB1 ++ #7692BE + +- #787296 ++ #5C77A2 + +- #605A7C ++ #445F8A + +- #484264 ++ #2B4770 + +- #322C4C ++ #113158 + +- #1D1736 ++ #001B3D + + #000000 + + +- #ffffff ++ #FFFFFF + +- #FCFCFF ++ #FAFDFC + +- #F0F0F3 ++ #EFF1F1 + +- #E1E3E5 ++ #E0E3E2 + +- #C5C7C9 ++ #C4C7C6 + +- #AAABAE ++ #A9ACAB + +- #8F9193 ++ #8E9191 + +- #747679 ++ #737776 + +- #5C5F61 ++ #5B5F5F + +- #454749 ++ #444747 + +- #2E3133 ++ #2E3131 + +- #191C1E ++ #191C1C + + #000000 + + +- #ffffff ++ #FFFFFF + +- #F9FCFF ++ #F4FEFE + +- #EBF1F8 ++ #E8F3F2 + +- #DCE3E9 ++ #DAE5E4 + +- #C0C7CD ++ #BEC8C9 + +- #A5ACB2 ++ #A3ADAE + +- #8A9297 ++ #889393 + +- #70777C ++ #6E7878 + +- #585F65 ++ #566061 + +- #40484D ++ #3F4949 + +- #2A3136 ++ #293232 + +- #161C20 ++ #141D1E + + #000000 +diff --git a/packages/SystemUI/monet/src/com/android/systemui/monet/ColorScheme.kt b/packages/SystemUI/monet/src/com/android/systemui/monet/ColorScheme.kt +index 0b3eccfd3a91..eabc1c510ecb 100644 +--- a/packages/SystemUI/monet/src/com/android/systemui/monet/ColorScheme.kt ++++ b/packages/SystemUI/monet/src/com/android/systemui/monet/ColorScheme.kt +@@ -35,7 +35,7 @@ const val ACCENT3_HUE_SHIFT = 60.0f + const val NEUTRAL1_CHROMA = 4.0f + const val NEUTRAL2_CHROMA = 8.0f + +-const val GOOGLE_BLUE = 0xFF1b6ef3.toInt() ++const val LINEAGE_TEAL = 0xFF167C80.toInt() + + const val MIN_CHROMA = 5 + +@@ -76,9 +76,9 @@ public class ColorScheme(@ColorInt seed: Int, val darkTheme: Boolean) { + init { + val proposedSeedCam = Cam.fromInt(seed) + val seedArgb = if (seed == Color.TRANSPARENT) { +- GOOGLE_BLUE ++ LINEAGE_TEAL + } else if (proposedSeedCam.chroma < 5) { +- GOOGLE_BLUE ++ LINEAGE_TEAL + } else { + seed + } +@@ -140,7 +140,7 @@ public class ColorScheme(@ColorInt seed: Int, val darkTheme: Boolean) { + }.toList() + + if (distinctColors.isEmpty()) { +- return listOf(GOOGLE_BLUE) ++ return listOf(LINEAGE_TEAL) + } + return distinctColors + } +@@ -204,8 +204,8 @@ public class ColorScheme(@ColorInt seed: Int, val darkTheme: Boolean) { + } + + if (seeds.isEmpty()) { +- // Use gBlue 500 if there are 0 colors +- seeds.add(GOOGLE_BLUE) ++ // Use Lineage Teal 500 if there are 0 colors ++ seeds.add(LINEAGE_TEAL) + } + + return seeds +@@ -259,4 +259,4 @@ public class ColorScheme(@ColorInt seed: Int, val darkTheme: Boolean) { + return huePopulation + } + } +-} +\ No newline at end of file ++} +-- +2.25.1 + diff --git a/patches_platform/frameworks_base/0002-Disable-vendor-mismatch-warning.patch b/patches_platform/frameworks_base/0003-Disable-vendor-mismatch-warning.patch similarity index 89% rename from patches_platform/frameworks_base/0002-Disable-vendor-mismatch-warning.patch rename to patches_platform/frameworks_base/0003-Disable-vendor-mismatch-warning.patch index 4b3c817..3861dce 100644 --- a/patches_platform/frameworks_base/0002-Disable-vendor-mismatch-warning.patch +++ b/patches_platform/frameworks_base/0003-Disable-vendor-mismatch-warning.patch @@ -1,7 +1,7 @@ -From 160ca5e73a2d075c5514db911180d4523fedf860 Mon Sep 17 00:00:00 2001 +From 32011e0db7f8ee8de64a9b9a5912e6c39a2ab7cb Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Thu, 5 Apr 2018 10:01:19 +0800 -Subject: [PATCH 02/19] Disable vendor mismatch warning +Subject: [PATCH 03/22] Disable vendor mismatch warning Change-Id: Ieb8fe91e2f02462f074312ed0f4885d183e9780b --- @@ -9,10 +9,10 @@ Change-Id: Ieb8fe91e2f02462f074312ed0f4885d183e9780b 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java -index 5d0d182230e1..789968e19ab6 100644 +index 112a56957fc0..8b6ec8bbf3ff 100644 --- a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java +++ b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java -@@ -5508,20 +5508,8 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { +@@ -5665,20 +5665,8 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { } if (!Build.isBuildConsistent()) { diff --git a/patches_platform/frameworks_base/0003-UI-Adjust-default-navbar-layouts.patch b/patches_platform/frameworks_base/0004-UI-Adjust-default-navbar-layouts.patch similarity index 93% rename from patches_platform/frameworks_base/0003-UI-Adjust-default-navbar-layouts.patch rename to patches_platform/frameworks_base/0004-UI-Adjust-default-navbar-layouts.patch index e1b42a0..184a9dc 100644 --- a/patches_platform/frameworks_base/0003-UI-Adjust-default-navbar-layouts.patch +++ b/patches_platform/frameworks_base/0004-UI-Adjust-default-navbar-layouts.patch @@ -1,7 +1,7 @@ -From 79e4311950c147ce85983a7088f4d921050f3f74 Mon Sep 17 00:00:00 2001 +From e9b33bcd2d50330e1b34e3f865cc46b9fc7aaaf3 Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Sat, 16 Oct 2021 02:23:48 +0000 -Subject: [PATCH 03/19] UI: Adjust default navbar layouts +Subject: [PATCH 04/22] UI: Adjust default navbar layouts - Slightly tighten nodpi layout - Remove sw372dp layout - looks terrible, probably meant for legacy phablets, but most modern phones qualify @@ -45,10 +45,10 @@ index 07b797a32428..000000000000 - left[.25W],back[.5WC];home;recent[.5WC],right[.25W] - diff --git a/packages/SystemUI/res/values/config.xml b/packages/SystemUI/res/values/config.xml -index ebf7b8407727..557699b35aa8 100644 +index 1bee8eee1534..d0a3a807a79a 100644 --- a/packages/SystemUI/res/values/config.xml +++ b/packages/SystemUI/res/values/config.xml -@@ -350,7 +350,7 @@ +@@ -332,7 +332,7 @@ diff --git a/patches_platform/frameworks_base/0004-UI-Disable-left-seascape-navigation-bar-optionally.patch b/patches_platform/frameworks_base/0005-UI-Disable-left-seascape-navigation-bar-optionally.patch similarity index 89% rename from patches_platform/frameworks_base/0004-UI-Disable-left-seascape-navigation-bar-optionally.patch rename to patches_platform/frameworks_base/0005-UI-Disable-left-seascape-navigation-bar-optionally.patch index e9b016f..c76a764 100644 --- a/patches_platform/frameworks_base/0004-UI-Disable-left-seascape-navigation-bar-optionally.patch +++ b/patches_platform/frameworks_base/0005-UI-Disable-left-seascape-navigation-bar-optionally.patch @@ -1,7 +1,7 @@ -From 47b42ba04a71792b6a0d9bcfa6fe515593d4bcc8 Mon Sep 17 00:00:00 2001 +From 4a097fc8eba629cc0e6784c7b1d8da7a1a9c0a6e Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Fri, 9 Mar 2018 15:41:26 +0800 -Subject: [PATCH 04/19] UI: Disable left (seascape) navigation bar optionally +Subject: [PATCH 05/22] UI: Disable left (seascape) navigation bar optionally Toggle this behaviour with property "persist.ui.seascape.disable" @@ -45,12 +45,12 @@ index f1e1366404a2..f43bef8532b8 100644 for (int i = 0; i < group.getChildCount(); i++) { final View child = group.getChildAt(i); diff --git a/services/core/java/com/android/server/wm/DisplayPolicy.java b/services/core/java/com/android/server/wm/DisplayPolicy.java -index 21bca6ed6a53..b699c4e4f38d 100644 +index 65eaa63118b2..89ac6585c673 100644 --- a/services/core/java/com/android/server/wm/DisplayPolicy.java +++ b/services/core/java/com/android/server/wm/DisplayPolicy.java -@@ -2388,9 +2388,10 @@ public class DisplayPolicy { - @NavigationBarPosition - int navigationBarPosition(int displayWidth, int displayHeight, int displayRotation) { +@@ -2644,9 +2644,10 @@ public class DisplayPolicy { + } + } if (navigationBarCanMove() && displayWidth > displayHeight) { - if (displayRotation == Surface.ROTATION_270) { + boolean isSeascapeDisabled = SystemProperties.getBoolean("persist.ui.seascape.disable", false); 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 83% 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 f66dbc6..a240cd5 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 66956ebbdb5645ff2cfb2a010d4371faa7c41554 Mon Sep 17 00:00:00 2001 +From a83a00cadfd1ab7746fda648ec0f54c2bcec794d Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Sun, 10 Jan 2021 11:44:29 +0000 -Subject: [PATCH 05/19] UI: Disable wallpaper zoom +Subject: [PATCH 06/22] UI: Disable wallpaper zoom It does little more than inducing motion sickness @@ -11,10 +11,10 @@ Change-Id: I78cc5484930b27f172cd8d8a5bd9042dce3478d0 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml -index 3ce1886fef6d..d8f280ddbf93 100644 +index e2216d23e15e..9d6c712c8285 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml -@@ -4770,7 +4770,7 @@ +@@ -4842,7 +4842,7 @@ diff --git a/patches_platform/frameworks_base/0006-UI-Increase-default-status-bar-height.patch b/patches_platform/frameworks_base/0006-UI-Increase-default-status-bar-height.patch deleted file mode 100644 index a76e6a0..0000000 --- a/patches_platform/frameworks_base/0006-UI-Increase-default-status-bar-height.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 04b13419bb9446b5b25fe329be88804e297050b2 Mon Sep 17 00:00:00 2001 -From: Andy CrossGate Yan -Date: Wed, 3 Jun 2020 01:31:34 +0000 -Subject: [PATCH 06/19] UI: Increase default status bar height - -Change-Id: Ibbcf63159e19bb2bb2b1094ea07ab85917630b07 ---- - core/res/res/values/dimens.xml | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/core/res/res/values/dimens.xml b/core/res/res/values/dimens.xml -index a666a5b4b796..b62a785cd69f 100644 ---- a/core/res/res/values/dimens.xml -+++ b/core/res/res/values/dimens.xml -@@ -43,7 +43,7 @@ - @dimen/status_bar_height_portrait - -- 24dp -+ 28dp - - @dimen/status_bar_height_portrait --- -2.25.1 - diff --git a/patches_platform/frameworks_base/0007-UI-Increase-default-status-bar-height.patch b/patches_platform/frameworks_base/0007-UI-Increase-default-status-bar-height.patch new file mode 100644 index 0000000..b1ce68a --- /dev/null +++ b/patches_platform/frameworks_base/0007-UI-Increase-default-status-bar-height.patch @@ -0,0 +1,26 @@ +From 0157abc9f7b706b3b884178f1668da6f6874e90a Mon Sep 17 00:00:00 2001 +From: Andy CrossGate Yan +Date: Wed, 3 Jun 2020 01:31:34 +0000 +Subject: [PATCH 07/22] UI: Increase default status bar height + +Change-Id: Ibbcf63159e19bb2bb2b1094ea07ab85917630b07 +--- + core/res/res/values/dimens.xml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/core/res/res/values/dimens.xml b/core/res/res/values/dimens.xml +index f331f1ab720f..a31e166296ee 100644 +--- a/core/res/res/values/dimens.xml ++++ b/core/res/res/values/dimens.xml +@@ -42,7 +42,7 @@ + +- 24dp ++ 28dp + +-- +2.25.1 + diff --git a/patches_platform/frameworks_base/0008-UI-Restore-split-screen-divider-to-pre-Sv2-looks.patch b/patches_platform/frameworks_base/0008-UI-Restore-split-screen-divider-to-pre-Sv2-looks.patch new file mode 100644 index 0000000..93bde0c --- /dev/null +++ b/patches_platform/frameworks_base/0008-UI-Restore-split-screen-divider-to-pre-Sv2-looks.patch @@ -0,0 +1,43 @@ +From c84e0185c5cd5e9312eb1d393e36a2b82cf02e67 Mon Sep 17 00:00:00 2001 +From: Andy CrossGate Yan +Date: Sat, 19 Mar 2022 09:22:24 +0000 +Subject: [PATCH 08/22] 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 + +Change-Id: I240b627793b615c82bd07ebd77638cde180ef80f +--- + .../Shell/res/color/split_divider_background.xml | 4 ++-- + libs/WindowManager/Shell/res/values/dimen.xml | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/libs/WindowManager/Shell/res/color/split_divider_background.xml b/libs/WindowManager/Shell/res/color/split_divider_background.xml +index 329e5b9b31a0..cd54ac26a7fd 100644 +--- a/libs/WindowManager/Shell/res/color/split_divider_background.xml ++++ b/libs/WindowManager/Shell/res/color/split_divider_background.xml +@@ -15,5 +15,5 @@ + ~ limitations under the License. + --> + +- +- +\ No newline at end of file ++ ++ +diff --git a/libs/WindowManager/Shell/res/values/dimen.xml b/libs/WindowManager/Shell/res/values/dimen.xml +index af78293eb3ea..489fb0c83681 100644 +--- a/libs/WindowManager/Shell/res/values/dimen.xml ++++ b/libs/WindowManager/Shell/res/values/dimen.xml +@@ -88,7 +88,7 @@ + 3dp + + 10dp +- 42dp ++ 0dp + + + +-- +2.25.1 + diff --git a/patches_platform/frameworks_base/0007-UI-Revive-navbar-layout-tuning-via-sysui_nav_bar-tun.patch b/patches_platform/frameworks_base/0009-UI-Revive-navbar-layout-tuning-via-sysui_nav_bar-tun.patch similarity index 95% rename from patches_platform/frameworks_base/0007-UI-Revive-navbar-layout-tuning-via-sysui_nav_bar-tun.patch rename to patches_platform/frameworks_base/0009-UI-Revive-navbar-layout-tuning-via-sysui_nav_bar-tun.patch index 09823aa..c991405 100644 --- a/patches_platform/frameworks_base/0007-UI-Revive-navbar-layout-tuning-via-sysui_nav_bar-tun.patch +++ b/patches_platform/frameworks_base/0009-UI-Revive-navbar-layout-tuning-via-sysui_nav_bar-tun.patch @@ -1,7 +1,7 @@ -From 65e25646ab0c3cbfdc7199a791cd5e8bcccbaffe Mon Sep 17 00:00:00 2001 +From dee59312a6b9ba10154af6ec96f9004a670177b9 Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Tue, 6 Oct 2020 01:41:16 +0000 -Subject: [PATCH 07/19] UI: Revive navbar layout tuning via sysui_nav_bar +Subject: [PATCH 09/22] UI: Revive navbar layout tuning via sysui_nav_bar tunable Google keeps fixing what ain't broken. diff --git a/patches_platform/frameworks_base/0009-UI-Unblock-alarm-status-bar-icon.patch b/patches_platform/frameworks_base/0009-UI-Unblock-alarm-status-bar-icon.patch deleted file mode 100644 index b7c01d0..0000000 --- a/patches_platform/frameworks_base/0009-UI-Unblock-alarm-status-bar-icon.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 5bfabfbe5d9b44e85f18151fa1f29ed59b505dd5 Mon Sep 17 00:00:00 2001 -From: Andy CrossGate Yan -Date: Thu, 14 Oct 2021 15:45:24 +0000 -Subject: [PATCH 09/19] UI: Unblock alarm status bar icon - -That's very Zen of you, Google... - -Change-Id: I2c9f91f47bb1e324a20c13d588dcdbbca91dc12e ---- - .../systemui/statusbar/phone/CollapsedStatusBarFragment.java | 1 - - .../android/systemui/statusbar/phone/KeyguardStatusBarView.java | 1 - - 2 files changed, 2 deletions(-) - -diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/CollapsedStatusBarFragment.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/CollapsedStatusBarFragment.java -index 2e40af4fab2a..f8c79ceabf2e 100644 ---- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/CollapsedStatusBarFragment.java -+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/CollapsedStatusBarFragment.java -@@ -162,7 +162,6 @@ public class CollapsedStatusBarFragment extends Fragment implements CommandQueue - } - mDarkIconManager = new DarkIconManager(view.findViewById(R.id.statusIcons), mFeatureFlags); - mDarkIconManager.setShouldLog(true); -- mBlockedIcons.add(getString(com.android.internal.R.string.status_bar_alarm_clock)); - mBlockedIcons.add(getString(com.android.internal.R.string.status_bar_call_strength)); - mDarkIconManager.setBlockList(mBlockedIcons); - mStatusBarIconController.addIconGroup(mDarkIconManager); -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 a32e7c4765ef..efc02548763a 100644 ---- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java -+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java -@@ -203,7 +203,6 @@ public class KeyguardStatusBarView extends RelativeLayout implements - // Set hidden status bar items - private void loadBlockList() { - Resources r = getResources(); -- mBlockedIcons.add(r.getString(com.android.internal.R.string.status_bar_alarm_clock)); - mBlockedIcons.add(r.getString(com.android.internal.R.string.status_bar_call_strength)); - } - --- -2.25.1 - diff --git a/patches_platform/frameworks_base/0008-UI-Use-SNAP_FIXED_RATIO-for-multi-window-globally.patch b/patches_platform/frameworks_base/0010-UI-Use-SNAP_FIXED_RATIO-for-multi-window-globally.patch similarity index 94% rename from patches_platform/frameworks_base/0008-UI-Use-SNAP_FIXED_RATIO-for-multi-window-globally.patch rename to patches_platform/frameworks_base/0010-UI-Use-SNAP_FIXED_RATIO-for-multi-window-globally.patch index e61e66e..48ffc85 100644 --- a/patches_platform/frameworks_base/0008-UI-Use-SNAP_FIXED_RATIO-for-multi-window-globally.patch +++ b/patches_platform/frameworks_base/0010-UI-Use-SNAP_FIXED_RATIO-for-multi-window-globally.patch @@ -1,7 +1,7 @@ -From e2774d80fc6cd0de872259c555f21ae2e8f8bf2c Mon Sep 17 00:00:00 2001 +From 96aed2ae04eb83bcacc6f9e9dc26143852a54369 Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Sun, 26 Apr 2020 08:56:13 +0000 -Subject: [PATCH 08/19] UI: Use SNAP_FIXED_RATIO for multi-window globally +Subject: [PATCH 10/22] UI: Use SNAP_FIXED_RATIO for multi-window globally Enables multiple snap targets under landscape for phone UI @@ -40,7 +40,7 @@ index 7308dc5882c1..000000000000 - \ No newline at end of file diff --git a/core/res/res/values-sw600dp/config.xml b/core/res/res/values-sw600dp/config.xml -index 34b6a54be493..3921c9edfeac 100644 +index 624581aba7dd..658654e2a63f 100644 --- a/core/res/res/values-sw600dp/config.xml +++ b/core/res/res/values-sw600dp/config.xml @@ -3,16 +3,16 @@ @@ -78,10 +78,10 @@ index 34b6a54be493..3921c9edfeac 100644 Only applies if the device display is not square. --> false diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml -index d8f280ddbf93..3a62b51d3cbc 100644 +index 9d6c712c8285..1b9306913e7d 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml -@@ -3531,7 +3531,7 @@ +@@ -3589,7 +3589,7 @@ 1 - 3 snap targets: fixed ratio, 1:1, (1 - fixed ratio) 2 - 1 snap target: 1:1 --> diff --git a/patches_platform/frameworks_base/0011-SystemUI-Always-refresh-power-menu-on-UI-mode-change.patch b/patches_platform/frameworks_base/0011-SystemUI-Always-refresh-power-menu-on-UI-mode-change.patch deleted file mode 100644 index 16f9a92..0000000 --- a/patches_platform/frameworks_base/0011-SystemUI-Always-refresh-power-menu-on-UI-mode-change.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 69866119d54b6e5aee80530f4030980ef0ab28c1 Mon Sep 17 00:00:00 2001 -From: Danny Lin -Date: Tue, 5 Oct 2021 21:01:15 -0700 -Subject: [PATCH 11/19] SystemUI: Always refresh power menu on UI mode change - -This is necessary for reliably theming the global actions dialog with -dynamic colors and adapting it to light/dark themes. - -Demo screenshots (with color overlays applied): -https://twitter.com/kdrag0n/status/1445960685427433473 - -Change-Id: Id6f6623096ed231e841ca3794b47f8a0ab54dae6 ---- - .../android/systemui/globalactions/GlobalActionsDialogLite.java | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialogLite.java b/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialogLite.java -index 11da4f5ca39e..afe2629fd53d 100644 ---- a/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialogLite.java -+++ b/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialogLite.java -@@ -762,7 +762,7 @@ public class GlobalActionsDialogLite implements DialogInterface.OnDismissListene - @Override - public void onUiModeChanged() { - mContext.getTheme().applyStyle(mContext.getThemeResId(), true); -- if (mDialog != null && mDialog.isShowing()) { -+ if (mDialog != null) { - mDialog.refreshDialog(); - } - } --- -2.25.1 - diff --git a/patches_platform/frameworks_base/0011-UI-Unblock-alarm-status-bar-icon.patch b/patches_platform/frameworks_base/0011-UI-Unblock-alarm-status-bar-icon.patch new file mode 100644 index 0000000..5e4d500 --- /dev/null +++ b/patches_platform/frameworks_base/0011-UI-Unblock-alarm-status-bar-icon.patch @@ -0,0 +1,40 @@ +From f38c5f4211a7454f4232d55322939b2b07716937 Mon Sep 17 00:00:00 2001 +From: Andy CrossGate Yan +Date: Thu, 14 Oct 2021 15:45:24 +0000 +Subject: [PATCH 11/22] UI: Unblock alarm status bar icon + +That's very Zen of you, Google... + +Change-Id: I2c9f91f47bb1e324a20c13d588dcdbbca91dc12e +--- + .../statusbar/phone/KeyguardStatusBarViewController.java | 1 - + .../statusbar/phone/fragment/CollapsedStatusBarFragment.java | 1 - + 2 files changed, 2 deletions(-) + +diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarViewController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarViewController.java +index 20e20e19ce11..69936c63c7ed 100644 +--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarViewController.java ++++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarViewController.java +@@ -264,7 +264,6 @@ public class KeyguardStatusBarViewController extends ViewController Date: Tue, 3 Nov 2020 22:43:12 -0800 -Subject: [PATCH 10/19] core: Remove old app target SDK dialog +Subject: [PATCH 12/22] 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-SystemUI-Always-refresh-power-menu-on-UI-mode-change.patch b/patches_platform/frameworks_base/0013-SystemUI-Always-refresh-power-menu-on-UI-mode-change.patch new file mode 100644 index 0000000..5cb1663 --- /dev/null +++ b/patches_platform/frameworks_base/0013-SystemUI-Always-refresh-power-menu-on-UI-mode-change.patch @@ -0,0 +1,41 @@ +From 894572f399ce6132eae919fa2106e8554648c79c Mon Sep 17 00:00:00 2001 +From: Danny Lin +Date: Tue, 8 Mar 2022 20:37:33 -0800 +Subject: [PATCH 13/22] SystemUI: Always refresh power menu on UI mode change + +This is necessary for reliably theming the global actions dialog with +dynamic colors and adapting it to light/dark themes. + +Demo screenshots (with color overlays applied): +https://twitter.com/kdrag0n/status/1445960685427433473 + +[kdrag0n: ported to 12L] + +Change-Id: If58fb4079a4cd11414ff928fad3576beecb14ff5 +--- + .../systemui/globalactions/GlobalActionsDialogLite.java | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialogLite.java b/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialogLite.java +index bddf5756f925..0ed1042f21e2 100644 +--- a/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialogLite.java ++++ b/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialogLite.java +@@ -787,6 +787,15 @@ public class GlobalActionsDialogLite implements DialogInterface.OnDismissListene + && (currentUser == null || currentUser.isPrimary()); + } + ++ @Override ++ public void onUiModeChanged() { ++ // Colors may change, depending on UI mode ++ mContext.getTheme().applyStyle(mContext.getThemeResId(), true); ++ if (mDialog != null) { ++ mDialog.refreshDialog(); ++ } ++ } ++ + @Override + public void onConfigChanged(Configuration newConfig) { + if (mDialog != null && mDialog.isShowing() +-- +2.25.1 + diff --git a/patches_platform/frameworks_base/0012-SystemUI-Use-Monet-colors-for-power-menu.patch b/patches_platform/frameworks_base/0014-SystemUI-Use-Monet-colors-for-power-menu.patch similarity index 89% rename from patches_platform/frameworks_base/0012-SystemUI-Use-Monet-colors-for-power-menu.patch rename to patches_platform/frameworks_base/0014-SystemUI-Use-Monet-colors-for-power-menu.patch index 06fee5d..48031a7 100644 --- a/patches_platform/frameworks_base/0012-SystemUI-Use-Monet-colors-for-power-menu.patch +++ b/patches_platform/frameworks_base/0014-SystemUI-Use-Monet-colors-for-power-menu.patch @@ -1,7 +1,7 @@ -From a08e7b27c44c384da58a118f5a0f3290a37f07da Mon Sep 17 00:00:00 2001 +From 4424a099b13b1ec10580134071384fa498ff3356 Mon Sep 17 00:00:00 2001 From: Danny Lin Date: Sat, 9 Oct 2021 14:39:38 -0700 -Subject: [PATCH 12/19] SystemUI: Use Monet colors for power menu +Subject: [PATCH 14/22] SystemUI: Use Monet colors for power menu It's odd that the power menu doesn't use Monet colors, unlike most of System UI. This makes it feel more integrated with the rest of the @@ -14,7 +14,7 @@ Change-Id: Iaffb178fe2c09a33925cb40e89d78640fab2b23c 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/packages/SystemUI/res/values-night/colors.xml b/packages/SystemUI/res/values-night/colors.xml -index b98694e2fae7..3a6b62dfe1c8 100644 +index fcb369876cf2..a0015a72f268 100644 --- a/packages/SystemUI/res/values-night/colors.xml +++ b/packages/SystemUI/res/values-night/colors.xml @@ -99,4 +99,11 @@ @@ -30,11 +30,11 @@ index b98694e2fae7..3a6b62dfe1c8 100644 + @*android:color/accent_device_default_dark diff --git a/packages/SystemUI/res/values/colors.xml b/packages/SystemUI/res/values/colors.xml -index f539b0cf68a1..9ea915c1cb3f 100644 +index e455aaa225be..04d4fedccdec 100644 --- a/packages/SystemUI/res/values/colors.xml +++ b/packages/SystemUI/res/values/colors.xml -@@ -53,11 +53,11 @@ - @color/GM2_grey_100 +@@ -34,11 +34,11 @@ + #F1F3F4 - #191C18 diff --git a/patches_platform/frameworks_base/0013-Revert-Make-QS-always-use-dark-theme-colors.patch b/patches_platform/frameworks_base/0015-Revert-Make-QS-always-use-dark-theme-colors.patch similarity index 87% rename from patches_platform/frameworks_base/0013-Revert-Make-QS-always-use-dark-theme-colors.patch rename to patches_platform/frameworks_base/0015-Revert-Make-QS-always-use-dark-theme-colors.patch index c7b1715..02367e1 100644 --- a/patches_platform/frameworks_base/0013-Revert-Make-QS-always-use-dark-theme-colors.patch +++ b/patches_platform/frameworks_base/0015-Revert-Make-QS-always-use-dark-theme-colors.patch @@ -1,7 +1,7 @@ -From 09ea8e6106959f6c8a6399227ee029d1feace6b2 Mon Sep 17 00:00:00 2001 +From bf258bd06284df94c2872e677679299d2498b4df Mon Sep 17 00:00:00 2001 From: Danny Lin Date: Wed, 6 Oct 2021 18:40:30 -0700 -Subject: [PATCH 13/19] Revert "Make QS always use dark theme colors" +Subject: [PATCH 15/22] Revert "Make QS always use dark theme colors" This reverts commit d62f7249f9e3222da95ecf6816601c408aac6be5. @@ -15,11 +15,11 @@ Change-Id: Iac4c96ccb3845812ca3df820bf27dc533816f72e 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/SystemUI/res/layout/quick_qs_status_icons.xml b/packages/SystemUI/res/layout/quick_qs_status_icons.xml -index 42a7c895ff84..27514617fb23 100644 +index 542a1c9d22bd..7a370d8cbc48 100644 --- a/packages/SystemUI/res/layout/quick_qs_status_icons.xml +++ b/packages/SystemUI/res/layout/quick_qs_status_icons.xml @@ -24,7 +24,7 @@ - android:minHeight="48dp" + android:minHeight="@dimen/qs_header_row_min_height" android:clickable="false" android:focusable="true" - android:theme="@style/Theme.SystemUI.QuickSettings.Header"> @@ -28,10 +28,10 @@ index 42a7c895ff84..27514617fb23 100644 ?android:attr/textColorSecondary @@ -40,7 +40,7 @@ index 93d60cce2915..e592fe2dd630 100644 @style/QSIconTheme @style/QSIconTheme @*android:color/error_color_material_dark -@@ -486,7 +486,7 @@ +@@ -421,7 +421,7 @@ @color/dark_mode_qs_icon_color_single_tone diff --git a/patches_platform/frameworks_base/0014-Revert-Do-not-re-inflate-QS-and-SB-when-CONFIG_UI_MO.patch b/patches_platform/frameworks_base/0016-Revert-Do-not-re-inflate-QS-and-SB-when-CONFIG_UI_MO.patch similarity index 85% rename from patches_platform/frameworks_base/0014-Revert-Do-not-re-inflate-QS-and-SB-when-CONFIG_UI_MO.patch rename to patches_platform/frameworks_base/0016-Revert-Do-not-re-inflate-QS-and-SB-when-CONFIG_UI_MO.patch index c7c03ab..38676c6 100644 --- a/patches_platform/frameworks_base/0014-Revert-Do-not-re-inflate-QS-and-SB-when-CONFIG_UI_MO.patch +++ b/patches_platform/frameworks_base/0016-Revert-Do-not-re-inflate-QS-and-SB-when-CONFIG_UI_MO.patch @@ -1,7 +1,7 @@ -From 9bce4fe471a1d7c107fad69b9285525041feed72 Mon Sep 17 00:00:00 2001 +From f245cb8f21951c04b094708eb0c9c67bcb2fa795 Mon Sep 17 00:00:00 2001 From: Danny Lin Date: Wed, 6 Oct 2021 18:41:11 -0700 -Subject: [PATCH 14/19] Revert "Do not re-inflate QS and SB when +Subject: [PATCH 16/22] Revert "Do not re-inflate QS and SB when CONFIG_UI_MODE" This reverts commit 8a40ff855b86bc86e23367017002289920855a4e. @@ -15,10 +15,10 @@ Change-Id: Ibad399ece587505559cc73febdda2f2d8558e94d 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/SystemUI/src/com/android/systemui/fragments/FragmentHostManager.java b/packages/SystemUI/src/com/android/systemui/fragments/FragmentHostManager.java -index b45dc52585ad..87d90adceba5 100644 +index 10878dcc2474..483865186945 100644 --- a/packages/SystemUI/src/com/android/systemui/fragments/FragmentHostManager.java +++ b/packages/SystemUI/src/com/android/systemui/fragments/FragmentHostManager.java -@@ -54,7 +54,8 @@ public class FragmentHostManager { +@@ -53,7 +53,8 @@ public class FragmentHostManager { private final View mRootView; private final InterestingConfigChanges mConfigChanges = new InterestingConfigChanges( ActivityInfo.CONFIG_FONT_SCALE | ActivityInfo.CONFIG_LOCALE diff --git a/patches_platform/frameworks_base/0015-SystemUI-Follow-light-dark-theme-in-quick-settings.patch b/patches_platform/frameworks_base/0017-SystemUI-Follow-light-dark-theme-in-quick-settings.patch similarity index 79% rename from patches_platform/frameworks_base/0015-SystemUI-Follow-light-dark-theme-in-quick-settings.patch rename to patches_platform/frameworks_base/0017-SystemUI-Follow-light-dark-theme-in-quick-settings.patch index d38a685..9d8c7d0 100644 --- a/patches_platform/frameworks_base/0015-SystemUI-Follow-light-dark-theme-in-quick-settings.patch +++ b/patches_platform/frameworks_base/0017-SystemUI-Follow-light-dark-theme-in-quick-settings.patch @@ -1,7 +1,7 @@ -From c87db4a6ea8c4c399dd92923dd28f2533246c293 Mon Sep 17 00:00:00 2001 +From dae69872bd37ea8b2f4877ecb44ef5338f589079 Mon Sep 17 00:00:00 2001 From: Danny Lin Date: Mon, 11 Oct 2021 19:24:58 -0700 -Subject: [PATCH 15/19] SystemUI: Follow light/dark theme in quick settings +Subject: [PATCH 17/22] SystemUI: Follow light/dark theme in quick settings Android 12's dual-tone style where the quick settings panel is always dark makes the light theme look like a second-class citizen. Pure black @@ -22,18 +22,22 @@ the notification shade. Demo screenshots (with dual-tone commit): https://twitter.com/kdrag0n/status/1445922541218922496 +[kdrag0n: ported to 12L] + Change-Id: I3d45b72f0f119e100505409d178ab8f698993881 --- .../brightness_progress_full_drawable.xml | 2 +- - .../qs_footer_action_chip_background.xml | 8 +---- - .../qs_security_footer_background.xml | 3 +- - packages/SystemUI/res/values-night/styles.xml | 12 ++++++++ - packages/SystemUI/res/values/styles.xml | 10 +++---- - .../systemui/privacy/OngoingPrivacyChip.kt | 4 +-- + .../qs_footer_action_chip_background.xml | 8 +------- + .../qs_security_footer_background.xml | 3 +-- + .../res/layout/combined_qs_header.xml | 4 ++-- + .../res/layout/split_shade_header.xml | 2 +- + packages/SystemUI/res/values-night/styles.xml | 12 +++++++++++ + packages/SystemUI/res/values/styles.xml | 10 +++++----- + .../systemui/privacy/OngoingPrivacyChip.kt | 4 ++-- .../systemui/qs/tileimpl/QSTileViewImpl.kt | 2 +- .../statusbar/phone/ScrimController.java | 2 +- - .../systemui/statusbar/phone/ScrimState.java | 30 +++++++++---------- - 9 files changed, 39 insertions(+), 34 deletions(-) + .../systemui/statusbar/phone/ScrimState.java | 20 +++++++++---------- + 11 files changed, 37 insertions(+), 32 deletions(-) diff --git a/packages/SystemUI/res/drawable/brightness_progress_full_drawable.xml b/packages/SystemUI/res/drawable/brightness_progress_full_drawable.xml index 4d9188c40822..1eae667c6e79 100644 @@ -81,8 +85,41 @@ index 860d23b11439..8f12b95ed4f6 100644 +diff --git a/packages/SystemUI/res/layout/combined_qs_header.xml b/packages/SystemUI/res/layout/combined_qs_header.xml +index 1f10e5dfeed8..4e46c42a053a 100644 +--- a/packages/SystemUI/res/layout/combined_qs_header.xml ++++ b/packages/SystemUI/res/layout/combined_qs_header.xml +@@ -26,7 +26,7 @@ + android:paddingLeft="@dimen/qs_panel_padding" + android:paddingRight="@dimen/qs_panel_padding" + android:visibility="gone" +- android:theme="@style/Theme.SystemUI.QuickSettings.Header" ++ android:theme="@style/QSHeaderTheme" + app:layoutDescription="@xml/combined_qs_header_scene"> + + + +- +\ No newline at end of file ++ +diff --git a/packages/SystemUI/res/layout/split_shade_header.xml b/packages/SystemUI/res/layout/split_shade_header.xml +index b6e96ceeaf20..ecb017a3b606 100644 +--- a/packages/SystemUI/res/layout/split_shade_header.xml ++++ b/packages/SystemUI/res/layout/split_shade_header.xml +@@ -25,7 +25,7 @@ + android:paddingLeft="@dimen/qs_panel_padding" + android:paddingRight="@dimen/qs_panel_padding" + android:visibility="gone" +- android:theme="@style/Theme.SystemUI.QuickSettings.Header"> ++ android:theme="@style/QSHeaderTheme"> + + @*android:string/config_bodyFontFamilyMedium ?android:attr/textColorPrimary diff --git a/packages/SystemUI/res/values/styles.xml b/packages/SystemUI/res/values/styles.xml -index e592fe2dd630..a5ed039bd3fd 100644 +index e2665f879e5e..47344cb6d352 100644 --- a/packages/SystemUI/res/values/styles.xml +++ b/packages/SystemUI/res/values/styles.xml -@@ -398,12 +398,12 @@ +@@ -329,12 +329,12 @@ -@@ -619,7 +619,7 @@ +@@ -540,7 +540,7 @@ diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java -index 6bdf82a60e40..cc1c8e6255b8 100644 +index fd44a9b5a5b3..00db68981eb6 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java -@@ -186,6 +186,7 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, Dump +@@ -180,6 +180,7 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, Dump private UnlockedScreenOffAnimationController mUnlockedScreenOffAnimationController; private GradientColors mColors; @@ -104,15 +104,15 @@ index 6bdf82a60e40..cc1c8e6255b8 100644 private boolean mNeedsDrawableColorUpdate; private float mScrimBehindAlphaKeyguard = KEYGUARD_SCRIM_ALPHA; -@@ -284,6 +285,7 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, Dump - }); +@@ -276,6 +277,7 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, Dump + ); mColors = new GradientColors(); + mBehindColors = new GradientColors(); } /** -@@ -851,7 +853,7 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, Dump +@@ -874,7 +876,7 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, Dump && !mBlankScreen; mScrimInFront.setColors(mColors, animateScrimInFront); @@ -121,7 +121,7 @@ index 6bdf82a60e40..cc1c8e6255b8 100644 mNotificationsScrim.setColors(mColors, animateScrimNotifications); dispatchBackScrimState(mScrimBehind.getViewAlpha()); -@@ -1207,11 +1209,20 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, Dump +@@ -1214,11 +1216,20 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, Dump if (mScrimBehind == null) return; int background = Utils.getColorAttr(mScrimBehind.getContext(), android.R.attr.colorBackgroundFloating).getDefaultColor(); diff --git a/patches_platform/frameworks_base/0018-Paint-Enable-subpixel-text-positioning-by-default.patch b/patches_platform/frameworks_base/0020-Paint-Enable-subpixel-text-positioning-by-default.patch similarity index 92% rename from patches_platform/frameworks_base/0018-Paint-Enable-subpixel-text-positioning-by-default.patch rename to patches_platform/frameworks_base/0020-Paint-Enable-subpixel-text-positioning-by-default.patch index fd8c3b0..e18b9af 100644 --- a/patches_platform/frameworks_base/0018-Paint-Enable-subpixel-text-positioning-by-default.patch +++ b/patches_platform/frameworks_base/0020-Paint-Enable-subpixel-text-positioning-by-default.patch @@ -1,7 +1,7 @@ -From 3606dbe992a728d9e348d1d1802c189cc6a393f7 Mon Sep 17 00:00:00 2001 +From c788defdb9c94c2537315a1b3eb08528ab807db0 Mon Sep 17 00:00:00 2001 From: Danny Lin Date: Tue, 5 Oct 2021 21:01:50 -0700 -Subject: [PATCH 18/19] Paint: Enable subpixel text positioning by default +Subject: [PATCH 20/22] 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/0021-monet-Fix-overly-low-chroma-for-tones-below-90.patch b/patches_platform/frameworks_base/0021-monet-Fix-overly-low-chroma-for-tones-below-90.patch new file mode 100644 index 0000000..dac29a3 --- /dev/null +++ b/patches_platform/frameworks_base/0021-monet-Fix-overly-low-chroma-for-tones-below-90.patch @@ -0,0 +1,41 @@ +From dc81ab2729689f570fa04c72496b20ea98792706 Mon Sep 17 00:00:00 2001 +From: Danny Lin +Date: Fri, 18 Mar 2022 23:19:54 -0700 +Subject: [PATCH 21/22] monet: Fix overly low chroma for tones below 90 + +Chroma is capped to 40 for light colors of L* 90 and above for valid +reasons. However, assigning the capped value to "chroma" fails to +account for the fact that chroma is an argument passed to the method, +so the capping effect persists across iterations. This unintentionally +affects and limits the chroma of *all* shades because the first +iteration of the loop is L*=90. + +As a result, almost all colors are less chromatic than the intended +chroma >= 48. Fix the issue by assigning capped chroma to a temporary +per-iteration variable. + +Change-Id: I18102d0072c89535e27f23fdb98af7c83864ff7e +--- + .../monet/src/com/android/systemui/monet/Shades.java | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) + +diff --git a/packages/SystemUI/monet/src/com/android/systemui/monet/Shades.java b/packages/SystemUI/monet/src/com/android/systemui/monet/Shades.java +index aab3538e3c4c..c5b9458614e1 100644 +--- a/packages/SystemUI/monet/src/com/android/systemui/monet/Shades.java ++++ b/packages/SystemUI/monet/src/com/android/systemui/monet/Shades.java +@@ -59,10 +59,8 @@ public class Shades { + shades[1] = ColorUtils.CAMToColor(hue, Math.min(40f, chroma), 95); + for (int i = 2; i < 12; i++) { + float lStar = (i == 6) ? MIDDLE_LSTAR : 100 - 10 * (i - 1); +- if (lStar >= 90) { +- chroma = Math.min(40f, chroma); +- } +- shades[i] = ColorUtils.CAMToColor(hue, chroma, lStar); ++ float shadeChroma = (lStar >= 90) ? Math.min(40f, chroma) : chroma; ++ shades[i] = ColorUtils.CAMToColor(hue, shadeChroma, lStar); + } + return shades; + } +-- +2.25.1 + diff --git a/patches_platform/frameworks_base/0019-Fix-QS-clock-being-white-on-light-theme.patch b/patches_platform/frameworks_base/0022-Fix-QS-clock-being-white-on-light-theme.patch similarity index 65% rename from patches_platform/frameworks_base/0019-Fix-QS-clock-being-white-on-light-theme.patch rename to patches_platform/frameworks_base/0022-Fix-QS-clock-being-white-on-light-theme.patch index 3d3bab0..edae696 100644 --- a/patches_platform/frameworks_base/0019-Fix-QS-clock-being-white-on-light-theme.patch +++ b/patches_platform/frameworks_base/0022-Fix-QS-clock-being-white-on-light-theme.patch @@ -1,7 +1,7 @@ -From e6bb7fa0f413c0f68bd021bca26fac6a060e52b1 Mon Sep 17 00:00:00 2001 +From 708976d1ac2ea6cbf3498f546e53488736dfd471 Mon Sep 17 00:00:00 2001 From: SagarMakhar Date: Sat, 6 Nov 2021 13:16:24 +0000 -Subject: [PATCH 19/19] Fix QS clock being white on light theme +Subject: [PATCH 22/22] Fix QS clock being white on light theme Steps to reproduce without this commit: - Turn off dark theme @@ -16,39 +16,39 @@ Signed-off-by: SagarMakhar 1 file changed, 13 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeaderController.java b/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeaderController.java -index 18d6e646b007..7aa668440b4b 100644 +index 2dc4ee4e0064..c9e9b2ad69d0 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeaderController.java +++ b/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeaderController.java -@@ -22,10 +22,8 @@ import android.view.View.OnClickListener; +@@ -18,10 +18,8 @@ package com.android.systemui.qs; - import androidx.annotation.NonNull; + import android.os.Bundle; -import com.android.internal.colorextraction.ColorExtractor; - import com.android.internal.logging.UiEventLogger; import com.android.systemui.R; + import com.android.systemui.battery.BatteryMeterViewController; -import com.android.systemui.colorextraction.SysuiColorExtractor; import com.android.systemui.demomode.DemoMode; import com.android.systemui.demomode.DemoModeController; - import com.android.systemui.plugins.ActivityStarter; -@@ -83,9 +81,6 @@ class QuickStatusBarHeaderController extends ViewController privacyItems) { -@@ -135,7 +130,6 @@ class QuickStatusBarHeaderController extends ViewController Date: Mon, 26 Oct 2020 17:05:18 +0100 Subject: [PATCH] Trebuchet: Move clear all button to actions view +@AndyCGYan: Instead of removing the original, hide it in a simple way + Change-Id: I7a0b2729c163169f7606ad4644870d07d5165e8e --- - .../ic_clear_all_recents.xml} | 20 +++--- - .../res/layout/overview_actions_container.xml | 17 ++++- - .../RecentsViewStateController.java | 4 -- - .../FallbackRecentsStateController.java | 4 -- - .../android/quickstep/views/RecentsView.java | 64 ++----------------- - 5 files changed, 31 insertions(+), 78 deletions(-) - rename quickstep/res/{layout/overview_clear_all_button.xml => drawable/ic_clear_all_recents.xml} (52%) + .../res/drawable/ic_recents_clear_all.xml | 18 ++++++++++++++++++ + .../res/layout/overview_actions_container.xml | 17 ++++++++++++++++- + .../quickstep/fallback/RecentsState.java | 2 +- + .../quickstep/views/LauncherRecentsView.java | 3 +-- + .../android/quickstep/views/RecentsView.java | 6 +++++- + 5 files changed, 41 insertions(+), 5 deletions(-) + create mode 100644 quickstep/res/drawable/ic_recents_clear_all.xml -diff --git a/quickstep/res/layout/overview_clear_all_button.xml b/quickstep/res/drawable/ic_clear_all_recents.xml -similarity index 52% -rename from quickstep/res/layout/overview_clear_all_button.xml -rename to quickstep/res/drawable/ic_clear_all_recents.xml -index 1ee726e62e..7cba0220b0 100644 ---- a/quickstep/res/layout/overview_clear_all_button.xml -+++ b/quickstep/res/drawable/ic_clear_all_recents.xml -@@ -1,6 +1,4 @@ -- -- -- -\ No newline at end of file ++ Licensed under the Apache License, Version 2.0 (the "License"); ++ you may not use this file except in compliance with the License. ++ You may obtain a copy of the License at ++ http://www.apache.org/licenses/LICENSE-2.0 ++ Unless required by applicable law or agreed to in writing, software ++ distributed under the License is distributed on an "AS IS" BASIS, ++ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ++ See the License for the specific language governing permissions and ++ limitations under the License. ++--> + + diff --git a/quickstep/res/layout/overview_actions_container.xml b/quickstep/res/layout/overview_actions_container.xml -index b652252ce1..f12cad6875 100644 +index 0fda0bf8d4..9a6f5ae062 100644 --- a/quickstep/res/layout/overview_actions_container.xml +++ b/quickstep/res/layout/overview_actions_container.xml -@@ -46,6 +46,21 @@ - android:layout_height="1dp" - android:layout_weight="1" /> +@@ -40,6 +40,21 @@ + android:text="@string/action_screenshot" + android:theme="@style/ThemeControlHighlightWorkspaceColor" /> ++ ++ +