From b6248125ef62810e3ce24ed4dc48847f119d298a Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Sun, 21 Jul 2024 17:16:11 +0800 Subject: [PATCH] Changes for July 2024 --- .../0001-Disable-FP-lockouts-optionally.patch | 12 +- ...0002-Disable-vendor-mismatch-warning.patch | 8 +- ...d-Allow-locking-to-any-rotation-mode.patch | 8 +- ...olors-of-slices-not-updating-on-doze.patch | 12 +- ...005-UI-Adjust-default-navbar-layouts.patch | 6 +- .../0006-UI-Adjust-split-screen-divider.patch | 8 +- .../0007-UI-Disable-wallpaper-zoom.patch | 8 +- ...-and-light-dark-theme-in-user-1-icon.patch | 6 +- ...-Increase-default-status-bar-height.patch} | 6 +- ...layout-tuning-via-sysui_nav_bar-tun.patch} | 4 +- ...XED_RATIO-for-multi-window-globally.patch} | 8 +- ...re-Remove-old-app-target-SDK-dialog.patch} | 4 +- ...ubpixel-text-positioning-by-default.patch} | 8 +- ...-requirement-for-signature-spoofing.patch} | 8 +- ...lorUpdateLogger-to-track-color-updat.patch | 1154 +++++++++++++++++ .../0016-Revert-Change-color-of-track.patch | 54 + ...ext-color-used-on-the-notification-u.patch | 27 + ...temUI-to-new-notification-color-spe.patch} | 75 +- ...mework-to-new-notification-color-sp.patch} | 22 +- ...ake-QS-always-use-dark-theme-colors.patch} | 8 +- ...inflate-QS-and-SB-when-CONFIG_UI_MO.patch} | 4 +- ...-light-dark-theme-in-quick-settings.patch} | 50 +- ...ewrapper-for-QSCustomizer-and-tune-.patch} | 16 +- ...itialize-QS-tiles-in-inactive-state.patch} | 6 +- ...l-tone-light-and-dark-themes-for-QS.patch} | 20 +- ...te-QS-and-SB-when-CONFIG_SCREEN_LAY.patch} | 4 +- ...ight-dark-theme-in-SplitShade-Heade.patch} | 113 +- ...ransparent-background-for-QS-footer.patch} | 29 +- ...t-Remove-unused-colorSchemeIsApplied.patch | 65 + ...ark-Light-theme-for-Safe-Mode-dialo.patch} | 6 +- ...llow-light-dark-theme-in-power-menu.patch} | 14 +- ...notification-background-to-monet-on-.patch | 92 -- ...uate-system-theme-on-UI-mode-change.patch} | 22 +- ...-SystemUI-Fix-QS-header-clock-color.patch} | 20 +- ...late-paged-QS-tiles-height-properly.patch} | 8 +- ...isibility-check-in-setting-QSCarrie.patch} | 8 +- ...-Fix-QS-tile-dialog-background-color.patch | 27 + ...Use-proper-Resolver-background-color.patch | 26 + ...w-monet-theme-on-privacy-indicators.patch} | 12 +- ...-Follow-monet-theme-on-battery-chip.patch} | 14 +- ...ntroller-Remove-repeated-monet-check.patch | 29 + ...-color-accent-for-charging-animation.patch | 54 + ...faults-Add-chroma-to-light-surface-h.patch | 33 + ...background_tint-Use-accent-color-for.patch | 30 + ...izard-Remove-step-for-changing-theme.patch | 18 +- ...ild-Integrate-prop-modifications-1-2.patch | 12 +- .../0002-build-Remove-Stk-1-2.patch | 6 +- ...001-Add-MotoHelloUINavbarOverlay-1-2.patch | 30 +- .../0002-Disable-Bluetooth-by-default.patch | 6 +- ...rag-by-default-for-editable-TextView.patch | 4 +- ...0004-Disable-RESTRICTED-bucket-toast.patch | 8 +- ...005-Disable-wake-on-gamepad-L-R-keys.patch | 32 + ...=> 0006-Keyguard-Adjust-clock-style.patch} | 26 +- ...Hide-padlock-unless-UDFPS-is-in-use.patch} | 8 +- ...Keyguard-Default-to-small-clock-1-3.patch} | 8 +- ...009-Keyguard-Refine-indication-text.patch} | 34 +- ...tatus-bar-quick-settings-margins-an.patch} | 30 +- ...dd-left-padding-for-keyguard-slices.patch} | 4 +- ...Match-keyguard-carrier-text-font-wit.patch | 27 + ...date-RAT-icons-to-match-Silk-design.patch} | 4 +- ...fault-top-clock-margin-on-h800-devi.patch} | 4 +- ... 0015-UI-Always-render-into-cutouts.patch} | 22 +- ...unded-corners-in-notification-scrim.patch} | 8 +- ...017-UI-Reconfigure-power-menu-items.patch} | 8 +- ...UI-Reconfigure-quick-settings-tiles.patch} | 6 +- ...irement-for-HINT_SUPPORTS_DARK_TEXT.patch} | 4 +- ...patch => 0020-UI-Remove-privacy-dot.patch} | 8 +- ...-quick-settings-fonts-to-pre-T-QPR2.patch} | 8 +- ...-luminance-for-wallpaper-dark-hints.patch} | 4 +- ...SetupWizard-Least-Action-s-Principle.patch | 48 +- ...ake-overview-scrim-transparent-again.patch | 8 +- ...02-Trebuchet-Kill-haptics-in-recents.patch | 24 +- ...nverted-rounded-corners-above-the-ta.patch | 6 +- ...atch-like-behaviour-for-RRO-java-sid.patch | 4 +- ...sService-Alternative-backlight-scale.patch | 6 +- ...more-FDE-methods-from-StorageManager.patch | 10 +- ...ateForSlotIndex-in-SubscriptionManag.patch | 8 +- ...PhysicalDisplayIds-in-SurfaceControl.patch | 18 +- ...certain-signature-to-install-work-li.patch | 93 ++ ...ide-their-vibrator-HAL-behind-non-de.patch | 4 +- ...eFlinger-Disable-SF-HWC-backpressure.patch | 27 + ...tings-Screen-resolution-refresh-rate.patch | 14 +- ...ttings-Basic-audio-and-display-fixes.patch | 8 +- .../0003-TrebleSettings-IMS.patch | 50 +- ...-TrebleSettings-Disable-A2DP-offload.patch | 8 +- ...ngs-Alternative-audio-jack-detection.patch | 8 +- ...Settings-Override-minimum-brightness.patch | 8 +- ...ettings-Override-navbar-availability.patch | 10 +- ...Settings-Disable-SF-HWC-backpressure.patch | 119 ++ ...08-TrebleSettings-Securize-on-demand.patch | 133 -- ...-TrebleSettings-Securize-placeholder.patch | 61 + ..._interface-Optionally-use-sysbta-HAL.patch | 50 +- ...Make-xbin-and-su-executable-by-other.patch | 2 +- ...estore-sbin-for-Magisk-compatibility.patch | 6 +- ...tart-console-service-when-debuggable.patch | 6 +- ...eating-property-tree-if-there-is-a-c.patch | 2 +- 96 files changed, 2462 insertions(+), 756 deletions(-) rename patches_platform/frameworks_base/{0010-UI-Increase-default-status-bar-height.patch => 0009-UI-Increase-default-status-bar-height.patch} (88%) rename patches_platform/frameworks_base/{0011-UI-Revive-navbar-layout-tuning-via-sysui_nav_bar-tun.patch => 0010-UI-Revive-navbar-layout-tuning-via-sysui_nav_bar-tun.patch} (96%) rename patches_platform/frameworks_base/{0012-UI-Use-SNAP_FIXED_RATIO-for-multi-window-globally.patch => 0011-UI-Use-SNAP_FIXED_RATIO-for-multi-window-globally.patch} (95%) rename patches_platform/frameworks_base/{0013-core-Remove-old-app-target-SDK-dialog.patch => 0012-core-Remove-old-app-target-SDK-dialog.patch} (90%) rename patches_platform/frameworks_base/{0014-Paint-Enable-subpixel-text-positioning-by-default.patch => 0013-Paint-Enable-subpixel-text-positioning-by-default.patch} (88%) rename patches_platform/frameworks_base/{0015-Remove-debuggable-requirement-for-signature-spoofing.patch => 0014-Remove-debuggable-requirement-for-signature-spoofing.patch} (79%) create mode 100644 patches_platform/frameworks_base/0015-Revert-Adding-ColorUpdateLogger-to-track-color-updat.patch create mode 100644 patches_platform/frameworks_base/0016-Revert-Change-color-of-track.patch create mode 100644 patches_platform/frameworks_base/0017-Revert-Fix-the-text-color-used-on-the-notification-u.patch rename patches_platform/frameworks_base/{0016-Revert-Update-SystemUI-to-new-notification-color-spe.patch => 0018-Revert-Update-SystemUI-to-new-notification-color-spe.patch} (96%) rename patches_platform/frameworks_base/{0017-Revert-Update-framework-to-new-notification-color-sp.patch => 0019-Revert-Update-framework-to-new-notification-color-sp.patch} (93%) rename patches_platform/frameworks_base/{0018-Revert-Make-QS-always-use-dark-theme-colors.patch => 0020-Revert-Make-QS-always-use-dark-theme-colors.patch} (84%) rename patches_platform/frameworks_base/{0019-Revert-Do-not-re-inflate-QS-and-SB-when-CONFIG_UI_MO.patch => 0021-Revert-Do-not-re-inflate-QS-and-SB-when-CONFIG_UI_MO.patch} (91%) rename patches_platform/frameworks_base/{0020-SystemUI-Follow-light-dark-theme-in-quick-settings.patch => 0022-SystemUI-Follow-light-dark-theme-in-quick-settings.patch} (88%) rename patches_platform/frameworks_base/{0021-SystemUI-Use-themewrapper-for-QSCustomizer-and-tune-.patch => 0023-SystemUI-Use-themewrapper-for-QSCustomizer-and-tune-.patch} (85%) rename patches_platform/frameworks_base/{0022-SystemUI-Initialize-QS-tiles-in-inactive-state.patch => 0024-SystemUI-Initialize-QS-tiles-in-inactive-state.patch} (89%) rename patches_platform/frameworks_base/{0023-SystemUI-Add-dual-tone-light-and-dark-themes-for-QS.patch => 0025-SystemUI-Add-dual-tone-light-and-dark-themes-for-QS.patch} (90%) rename patches_platform/frameworks_base/{0028-SystemUI-Re-inflate-QS-and-SB-when-CONFIG_SCREEN_LAY.patch => 0026-SystemUI-Re-inflate-QS-and-SB-when-CONFIG_SCREEN_LAY.patch} (91%) rename patches_platform/frameworks_base/{0029-SystemUI-Follow-light-dark-theme-in-SplitShade-Heade.patch => 0027-SystemUI-Follow-light-dark-theme-in-SplitShade-Heade.patch} (64%) rename patches_platform/frameworks_base/{0009-UI-Hide-QS-footer-background.patch => 0028-SystemUI-Use-transparent-background-for-QS-footer.patch} (60%) create mode 100644 patches_platform/frameworks_base/0029-SystemUI-monet-Remove-unused-colorSchemeIsApplied.patch rename patches_platform/frameworks_base/{0032-SystemUI-Follow-Dark-Light-theme-for-Safe-Mode-dialo.patch => 0030-SystemUI-Follow-Dark-Light-theme-for-Safe-Mode-dialo.patch} (92%) rename patches_platform/frameworks_base/{0024-SystemUI-Follow-light-dark-theme-in-power-menu.patch => 0031-SystemUI-Follow-light-dark-theme-in-power-menu.patch} (92%) delete mode 100644 patches_platform/frameworks_base/0031-SystemUI-Switch-notification-background-to-monet-on-.patch rename patches_platform/frameworks_base/{0025-SystemUI-Re-evaluate-system-theme-on-UI-mode-change.patch => 0032-SystemUI-Re-evaluate-system-theme-on-UI-mode-change.patch} (83%) rename patches_platform/frameworks_base/{0026-SystemUI-Fix-QS-header-clock-color.patch => 0033-SystemUI-Fix-QS-header-clock-color.patch} (73%) rename patches_platform/frameworks_base/{0027-SystemUI-Calculate-paged-QS-tiles-height-properly.patch => 0034-SystemUI-Calculate-paged-QS-tiles-height-properly.patch} (87%) rename patches_platform/frameworks_base/{0030-SystemUI-Remove-visibility-check-in-setting-QSCarrie.patch => 0035-SystemUI-Remove-visibility-check-in-setting-QSCarrie.patch} (86%) create mode 100644 patches_platform/frameworks_base/0036-SystemUI-Fix-QS-tile-dialog-background-color.patch create mode 100644 patches_platform/frameworks_base/0037-SystemUI-Use-proper-Resolver-background-color.patch rename patches_platform/frameworks_base/{0033-SystemUI-Follow-monet-theme-on-privacy-indicators.patch => 0038-SystemUI-Follow-monet-theme-on-privacy-indicators.patch} (86%) rename patches_platform/frameworks_base/{0034-SystemUI-Follow-monet-theme-on-battery-chip.patch => 0039-SystemUI-Follow-monet-theme-on-battery-chip.patch} (85%) create mode 100644 patches_platform/frameworks_base/0040-ThemeOverlayController-Remove-repeated-monet-check.patch create mode 100644 patches_platform/frameworks_base/0041-SystemUI-Use-color-accent-for-charging-animation.patch create mode 100644 patches_platform/frameworks_base/0042-colors_device_defaults-Add-chroma-to-light-surface-h.patch create mode 100644 patches_platform/frameworks_base/0043-config_progress_background_tint-Use-accent-color-for.patch create mode 100644 patches_platform_personal/frameworks_base/0005-Disable-wake-on-gamepad-L-R-keys.patch rename patches_platform_personal/frameworks_base/{0005-Keyguard-Adjust-clock-style.patch => 0006-Keyguard-Adjust-clock-style.patch} (95%) rename patches_platform_personal/frameworks_base/{0006-Keyguard-Hide-padlock-unless-UDFPS-is-in-use.patch => 0007-Keyguard-Hide-padlock-unless-UDFPS-is-in-use.patch} (90%) rename patches_platform_personal/frameworks_base/{0007-Keyguard-Default-to-small-clock-1-3.patch => 0008-Keyguard-Default-to-small-clock-1-3.patch} (84%) rename patches_platform_personal/frameworks_base/{0008-Keyguard-Refine-indication-text.patch => 0009-Keyguard-Refine-indication-text.patch} (84%) rename patches_platform_personal/frameworks_base/{0009-Keyguard-UI-Fix-status-bar-quick-settings-margins-an.patch => 0010-Keyguard-UI-Fix-status-bar-quick-settings-margins-an.patch} (94%) rename patches_platform_personal/frameworks_base/{0010-Revert-SystemUI-Add-left-padding-for-keyguard-slices.patch => 0011-Revert-SystemUI-Add-left-padding-for-keyguard-slices.patch} (94%) create mode 100644 patches_platform_personal/frameworks_base/0012-Revert-SystemUI-Match-keyguard-carrier-text-font-wit.patch rename patches_platform_personal/frameworks_base/{0011-Revert-Update-RAT-icons-to-match-Silk-design.patch => 0013-Revert-Update-RAT-icons-to-match-Silk-design.patch} (99%) rename patches_platform_personal/frameworks_base/{0012-Revert-Use-the-default-top-clock-margin-on-h800-devi.patch => 0014-Revert-Use-the-default-top-clock-margin-on-h800-devi.patch} (87%) rename patches_platform_personal/frameworks_base/{0013-UI-Always-render-into-cutouts.patch => 0015-UI-Always-render-into-cutouts.patch} (87%) rename patches_platform_personal/frameworks_base/{0014-UI-Kill-rounded-corners-in-notification-scrim.patch => 0016-UI-Kill-rounded-corners-in-notification-scrim.patch} (84%) rename patches_platform_personal/frameworks_base/{0015-UI-Reconfigure-power-menu-items.patch => 0017-UI-Reconfigure-power-menu-items.patch} (82%) rename patches_platform_personal/frameworks_base/{0016-UI-Reconfigure-quick-settings-tiles.patch => 0018-UI-Reconfigure-quick-settings-tiles.patch} (85%) rename patches_platform_personal/frameworks_base/{0017-UI-Relax-requirement-for-HINT_SUPPORTS_DARK_TEXT.patch => 0019-UI-Relax-requirement-for-HINT_SUPPORTS_DARK_TEXT.patch} (88%) rename patches_platform_personal/frameworks_base/{0018-UI-Remove-privacy-dot.patch => 0020-UI-Remove-privacy-dot.patch} (88%) rename patches_platform_personal/frameworks_base/{0019-UI-Restore-quick-settings-fonts-to-pre-T-QPR2.patch => 0021-UI-Restore-quick-settings-fonts-to-pre-T-QPR2.patch} (87%) rename patches_platform_personal/frameworks_base/{0020-UI-Revert-to-HSL-luminance-for-wallpaper-dark-hints.patch => 0022-UI-Revert-to-HSL-luminance-for-wallpaper-dark-hints.patch} (93%) create mode 100644 patches_treble/frameworks_base/0006-Allow-APKs-of-a-certain-signature-to-install-work-li.patch create mode 100644 patches_treble/frameworks_native/0002-SurfaceFlinger-Disable-SF-HWC-backpressure.patch create mode 100644 patches_treble/packages_apps_Settings/0008-TrebleSettings-Disable-SF-HWC-backpressure.patch delete mode 100644 patches_treble/packages_apps_Settings/0008-TrebleSettings-Securize-on-demand.patch create mode 100644 patches_treble/packages_apps_Settings/0009-TrebleSettings-Securize-placeholder.patch diff --git a/patches_platform/frameworks_base/0001-Disable-FP-lockouts-optionally.patch b/patches_platform/frameworks_base/0001-Disable-FP-lockouts-optionally.patch index 7896cbb..659401b 100644 --- a/patches_platform/frameworks_base/0001-Disable-FP-lockouts-optionally.patch +++ b/patches_platform/frameworks_base/0001-Disable-FP-lockouts-optionally.patch @@ -1,7 +1,7 @@ -From 92d00894b0d84c8d3fd0a6ba253132ac96402251 Mon Sep 17 00:00:00 2001 +From e535be2c76e6969ca8a58023b203bf66cfe0d3ae Mon Sep 17 00:00:00 2001 From: AndyCGYan Date: Fri, 22 Mar 2019 00:41:20 +0800 -Subject: [PATCH 01/34] Disable FP lockouts optionally +Subject: [PATCH 01/43] Disable FP lockouts optionally Both timed and permanent lockouts - GET THE FUCK OUT Now targeting LockoutFramework, introduced in Android 12 @@ -13,10 +13,10 @@ Change-Id: I2d4b091f3546d4d7903bfb4d5585629212dc9915 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/services/core/java/com/android/server/biometrics/sensors/fingerprint/hidl/LockoutFrameworkImpl.java b/services/core/java/com/android/server/biometrics/sensors/fingerprint/hidl/LockoutFrameworkImpl.java -index 0730c672acd9..972421758223 100644 +index 0e05a7923db4..34268e2f8a5a 100644 --- a/services/core/java/com/android/server/biometrics/sensors/fingerprint/hidl/LockoutFrameworkImpl.java +++ b/services/core/java/com/android/server/biometrics/sensors/fingerprint/hidl/LockoutFrameworkImpl.java -@@ -27,6 +27,7 @@ import android.content.IntentFilter; +@@ -29,6 +29,7 @@ import android.content.IntentFilter; import android.os.Handler; import android.os.Looper; import android.os.SystemClock; @@ -24,7 +24,7 @@ index 0730c672acd9..972421758223 100644 import android.util.Slog; import android.util.SparseBooleanArray; import android.util.SparseIntArray; -@@ -46,6 +47,7 @@ public class LockoutFrameworkImpl implements LockoutTracker { +@@ -51,6 +52,7 @@ public class LockoutFrameworkImpl implements LockoutTracker { private static final int MAX_FAILED_ATTEMPTS_LOCKOUT_PERMANENT = 20; private static final long FAIL_LOCKOUT_TIMEOUT_MS = 30 * 1000; private static final String KEY_LOCKOUT_RESET_USER = "lockout_reset_user"; @@ -32,7 +32,7 @@ index 0730c672acd9..972421758223 100644 private final class LockoutReceiver extends BroadcastReceiver { @Override -@@ -107,24 +109,28 @@ public class LockoutFrameworkImpl implements LockoutTracker { +@@ -133,24 +135,28 @@ public class LockoutFrameworkImpl implements LockoutTracker { @Override public void addFailedAttemptForUser(int userId) { diff --git a/patches_platform/frameworks_base/0002-Disable-vendor-mismatch-warning.patch b/patches_platform/frameworks_base/0002-Disable-vendor-mismatch-warning.patch index a5b706b..23dcf01 100644 --- a/patches_platform/frameworks_base/0002-Disable-vendor-mismatch-warning.patch +++ b/patches_platform/frameworks_base/0002-Disable-vendor-mismatch-warning.patch @@ -1,7 +1,7 @@ -From b3aa7feea26bb5d713a8511f5720f33f0c204002 Mon Sep 17 00:00:00 2001 +From 8595258b7aac74763f6f8b7edbe37b91f0a4c1a5 Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Thu, 5 Apr 2018 10:01:19 +0800 -Subject: [PATCH 02/34] Disable vendor mismatch warning +Subject: [PATCH 02/43] Disable vendor mismatch warning Change-Id: Ieb8fe91e2f02462f074312ed0f4885d183e9780b --- @@ -9,10 +9,10 @@ Change-Id: Ieb8fe91e2f02462f074312ed0f4885d183e9780b 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java -index ad9ac201e22b..b42e4e2e22dc 100644 +index b26cddaccc04..cdc661598f33 100644 --- a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java +++ b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java -@@ -6237,19 +6237,7 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { +@@ -6312,19 +6312,7 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { if (!isBuildConsistent) { Slog.e(TAG, "Build fingerprint is not consistent, warning user"); diff --git a/patches_platform/frameworks_base/0003-Keyguard-Allow-locking-to-any-rotation-mode.patch b/patches_platform/frameworks_base/0003-Keyguard-Allow-locking-to-any-rotation-mode.patch index 86f97ca..00ad41b 100644 --- a/patches_platform/frameworks_base/0003-Keyguard-Allow-locking-to-any-rotation-mode.patch +++ b/patches_platform/frameworks_base/0003-Keyguard-Allow-locking-to-any-rotation-mode.patch @@ -1,7 +1,7 @@ -From e492a141400c534bfc1f08b904e7e7f60e92164e Mon Sep 17 00:00:00 2001 +From 51ff3c370b9a75bb98f949506afe2dd1aafc6ca7 Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Sun, 21 Jan 2024 22:03:47 +0800 -Subject: [PATCH 03/34] Keyguard: Allow locking to any rotation mode +Subject: [PATCH 03/43] Keyguard: Allow locking to any rotation mode Change-Id: I0f12c433f3547e9bfcdbc2cf50e2a4f3ec8ca311 --- @@ -9,10 +9,10 @@ Change-Id: I0f12c433f3547e9bfcdbc2cf50e2a4f3ec8ca311 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/shade/NotificationShadeWindowControllerImpl.java b/packages/SystemUI/src/com/android/systemui/shade/NotificationShadeWindowControllerImpl.java -index b4082694bbe5..f9f3dd911a74 100644 +index 1aa42d1554fe..a2787a0bebe0 100644 --- a/packages/SystemUI/src/com/android/systemui/shade/NotificationShadeWindowControllerImpl.java +++ b/packages/SystemUI/src/com/android/systemui/shade/NotificationShadeWindowControllerImpl.java -@@ -431,12 +431,9 @@ public class NotificationShadeWindowControllerImpl implements NotificationShadeW +@@ -443,12 +443,9 @@ public class NotificationShadeWindowControllerImpl implements NotificationShadeW } private void adjustScreenOrientation(NotificationShadeWindowState state) { 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 index d78eb60..2b6440e 100644 --- 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 @@ -1,7 +1,7 @@ -From beea20462b965e2c790549f7d854ed71b46b54e9 Mon Sep 17 00:00:00 2001 +From b2c40aa3a127825dfacf3006d18639557dd4064d Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Tue, 17 Jan 2023 17:19:19 +0000 -Subject: [PATCH 04/34] Keyguard: Fix colors of slices not updating on doze +Subject: [PATCH 04/43] 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 @@ -13,10 +13,10 @@ Change-Id: I06abd8bf2e28655cc9e6d81366fd82a13454ec5a 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 2a54a4eee657..de2d1ec89b61 100644 +index c0ae4a1f4036..7b25a37a1632 100644 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardStatusViewController.java +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardStatusViewController.java -@@ -297,6 +297,13 @@ public class KeyguardStatusViewController extends ViewController Date: Sat, 16 Oct 2021 02:23:48 +0000 -Subject: [PATCH 05/34] UI: Adjust default navbar layouts +Subject: [PATCH 05/43] 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,7 +45,7 @@ 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 038e9da33b83..4791ad8969f0 100644 +index 2124ad9edca9..0286cc65c8e2 100644 --- a/packages/SystemUI/res/values/config.xml +++ b/packages/SystemUI/res/values/config.xml @@ -325,7 +325,7 @@ diff --git a/patches_platform/frameworks_base/0006-UI-Adjust-split-screen-divider.patch b/patches_platform/frameworks_base/0006-UI-Adjust-split-screen-divider.patch index ef1447e..8bee43c 100644 --- a/patches_platform/frameworks_base/0006-UI-Adjust-split-screen-divider.patch +++ b/patches_platform/frameworks_base/0006-UI-Adjust-split-screen-divider.patch @@ -1,7 +1,7 @@ -From 5b8bc8a9cf51ed8fb40101b7a5234fccaee36327 Mon Sep 17 00:00:00 2001 +From 2ff1e12e1ff9952fe489c9023eb76d342af1ddbf Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Sat, 19 Mar 2022 09:22:24 +0000 -Subject: [PATCH 06/34] UI: Adjust split-screen divider +Subject: [PATCH 06/43] UI: Adjust split-screen divider - Kill rounded corners - where two rectangles collide should be perfectly straight - Make it black (pre-Sv2) for phones @@ -150,7 +150,7 @@ index 000000000000..8a1907da76e5 + @color/taskbar_background + diff --git a/libs/WindowManager/Shell/res/values/colors.xml b/libs/WindowManager/Shell/res/values/colors.xml -index fae71efe3b39..fb50f0119b43 100644 +index 758dbfd5f3c5..e82f6ff9a4db 100644 --- a/libs/WindowManager/Shell/res/values/colors.xml +++ b/libs/WindowManager/Shell/res/values/colors.xml @@ -18,7 +18,7 @@ @@ -163,7 +163,7 @@ index fae71efe3b39..fb50f0119b43 100644 #60000000 #00000000 diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/common/split/SplitLayout.java b/libs/WindowManager/Shell/src/com/android/wm/shell/common/split/SplitLayout.java -index 53caddb52f23..fae5008283cc 100644 +index 6b2d544c192a..7c4db20d8cd8 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/common/split/SplitLayout.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/common/split/SplitLayout.java @@ -168,23 +168,8 @@ public final class SplitLayout implements DisplayInsetsController.OnInsetsChange diff --git a/patches_platform/frameworks_base/0007-UI-Disable-wallpaper-zoom.patch b/patches_platform/frameworks_base/0007-UI-Disable-wallpaper-zoom.patch index c44dac8..355c5d5 100644 --- a/patches_platform/frameworks_base/0007-UI-Disable-wallpaper-zoom.patch +++ b/patches_platform/frameworks_base/0007-UI-Disable-wallpaper-zoom.patch @@ -1,7 +1,7 @@ -From f9879e5977ca089dae074c63e609a2a5bc734199 Mon Sep 17 00:00:00 2001 +From 6cdab07dbf6a812c1c2daf80c292fa9088143572 Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Sun, 10 Jan 2021 11:44:29 +0000 -Subject: [PATCH 07/34] UI: Disable wallpaper zoom +Subject: [PATCH 07/43] 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 3bc33bac37bc..369eb84ccd84 100644 +index 0a4fc6515368..129c7160fe63 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml -@@ -5768,7 +5768,7 @@ +@@ -5858,7 +5858,7 @@ 1 diff --git a/patches_platform/frameworks_base/0008-UI-Follow-Monet-and-light-dark-theme-in-user-1-icon.patch b/patches_platform/frameworks_base/0008-UI-Follow-Monet-and-light-dark-theme-in-user-1-icon.patch index ae45b70..4a52a9a 100644 --- a/patches_platform/frameworks_base/0008-UI-Follow-Monet-and-light-dark-theme-in-user-1-icon.patch +++ b/patches_platform/frameworks_base/0008-UI-Follow-Monet-and-light-dark-theme-in-user-1-icon.patch @@ -1,7 +1,7 @@ -From 2ffb66fa7c00b63536c3de706bd6e36b2b696512 Mon Sep 17 00:00:00 2001 +From bfc38ff3a5a13606880951948d8e09b430405e25 Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Sun, 25 Sep 2022 02:20:52 +0000 -Subject: [PATCH 08/34] UI: Follow Monet and light/dark theme in user 1 icon +Subject: [PATCH 08/43] UI: Follow Monet and light/dark theme in user 1 icon Change-Id: I755077c6003c39ddc9428da1defe6a6ddd0e5ff8 --- @@ -22,7 +22,7 @@ index d3f998fb70cf..4f7b9e093bb7 100644 #ff4ecde6 #fffbbc04 diff --git a/core/res/res/values/colors.xml b/core/res/res/values/colors.xml -index eddd81e78692..00cf4243cfa9 100644 +index b879c9794f39..d8191c0c3597 100644 --- a/core/res/res/values/colors.xml +++ b/core/res/res/values/colors.xml @@ -177,7 +177,7 @@ diff --git a/patches_platform/frameworks_base/0010-UI-Increase-default-status-bar-height.patch b/patches_platform/frameworks_base/0009-UI-Increase-default-status-bar-height.patch similarity index 88% rename from patches_platform/frameworks_base/0010-UI-Increase-default-status-bar-height.patch rename to patches_platform/frameworks_base/0009-UI-Increase-default-status-bar-height.patch index 27220be..c3fcb45 100644 --- a/patches_platform/frameworks_base/0010-UI-Increase-default-status-bar-height.patch +++ b/patches_platform/frameworks_base/0009-UI-Increase-default-status-bar-height.patch @@ -1,7 +1,7 @@ -From 0e9361f835650e386bb6b797ebb1b6852d40c762 Mon Sep 17 00:00:00 2001 +From d53bbfe5b348426411d7c5739ec9910c2fcd3009 Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Wed, 3 Jun 2020 01:31:34 +0000 -Subject: [PATCH 10/34] UI: Increase default status bar height +Subject: [PATCH 09/43] UI: Increase default status bar height Change-Id: Ibbcf63159e19bb2bb2b1094ea07ab85917630b07 --- @@ -9,7 +9,7 @@ Change-Id: Ibbcf63159e19bb2bb2b1094ea07ab85917630b07 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/res/res/values/dimens.xml b/core/res/res/values/dimens.xml -index 96c4bf432c05..a086f16c769e 100644 +index 291a5936330a..5aed5c540a75 100644 --- a/core/res/res/values/dimens.xml +++ b/core/res/res/values/dimens.xml @@ -41,7 +41,7 @@ diff --git a/patches_platform/frameworks_base/0011-UI-Revive-navbar-layout-tuning-via-sysui_nav_bar-tun.patch b/patches_platform/frameworks_base/0010-UI-Revive-navbar-layout-tuning-via-sysui_nav_bar-tun.patch similarity index 96% rename from patches_platform/frameworks_base/0011-UI-Revive-navbar-layout-tuning-via-sysui_nav_bar-tun.patch rename to patches_platform/frameworks_base/0010-UI-Revive-navbar-layout-tuning-via-sysui_nav_bar-tun.patch index 31960ef..a51b0ff 100644 --- a/patches_platform/frameworks_base/0011-UI-Revive-navbar-layout-tuning-via-sysui_nav_bar-tun.patch +++ b/patches_platform/frameworks_base/0010-UI-Revive-navbar-layout-tuning-via-sysui_nav_bar-tun.patch @@ -1,7 +1,7 @@ -From 635207ed57659f3c89cfa144de981706c569d9c8 Mon Sep 17 00:00:00 2001 +From 6e308897ce7844197aa8cbc7bf43b2cdaa54a3df Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Tue, 6 Oct 2020 01:41:16 +0000 -Subject: [PATCH 11/34] UI: Revive navbar layout tuning via sysui_nav_bar +Subject: [PATCH 10/43] UI: Revive navbar layout tuning via sysui_nav_bar tunable Google keeps fixing what ain't broken. diff --git a/patches_platform/frameworks_base/0012-UI-Use-SNAP_FIXED_RATIO-for-multi-window-globally.patch b/patches_platform/frameworks_base/0011-UI-Use-SNAP_FIXED_RATIO-for-multi-window-globally.patch similarity index 95% rename from patches_platform/frameworks_base/0012-UI-Use-SNAP_FIXED_RATIO-for-multi-window-globally.patch rename to patches_platform/frameworks_base/0011-UI-Use-SNAP_FIXED_RATIO-for-multi-window-globally.patch index 5267a34..01a5efa 100644 --- a/patches_platform/frameworks_base/0012-UI-Use-SNAP_FIXED_RATIO-for-multi-window-globally.patch +++ b/patches_platform/frameworks_base/0011-UI-Use-SNAP_FIXED_RATIO-for-multi-window-globally.patch @@ -1,7 +1,7 @@ -From b2ca16f3b497b0f69e125eb9f47f2324d2a2019e Mon Sep 17 00:00:00 2001 +From 7d5902f123cc883437cf198fcc1d40c6773129a9 Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Sun, 26 Apr 2020 08:56:13 +0000 -Subject: [PATCH 12/34] UI: Use SNAP_FIXED_RATIO for multi-window globally +Subject: [PATCH 11/43] UI: Use SNAP_FIXED_RATIO for multi-window globally Enables multiple snap targets under landscape for phone UI @@ -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 369eb84ccd84..c223ec0d6ed0 100644 +index 129c7160fe63..2302cd3911d9 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml -@@ -4203,7 +4203,7 @@ +@@ -4273,7 +4273,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/0013-core-Remove-old-app-target-SDK-dialog.patch b/patches_platform/frameworks_base/0012-core-Remove-old-app-target-SDK-dialog.patch similarity index 90% rename from patches_platform/frameworks_base/0013-core-Remove-old-app-target-SDK-dialog.patch rename to patches_platform/frameworks_base/0012-core-Remove-old-app-target-SDK-dialog.patch index 5b8f183..75f8f93 100644 --- a/patches_platform/frameworks_base/0013-core-Remove-old-app-target-SDK-dialog.patch +++ b/patches_platform/frameworks_base/0012-core-Remove-old-app-target-SDK-dialog.patch @@ -1,7 +1,7 @@ -From 77275322ff6606110bec9f11bbdc90932ab1fded Mon Sep 17 00:00:00 2001 +From 2717db2bc74bbebcde07904bdf52afae2da35cfa Mon Sep 17 00:00:00 2001 From: Danny Lin Date: Tue, 3 Nov 2020 22:43:12 -0800 -Subject: [PATCH 13/34] core: Remove old app target SDK dialog +Subject: [PATCH 12/43] 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/0014-Paint-Enable-subpixel-text-positioning-by-default.patch b/patches_platform/frameworks_base/0013-Paint-Enable-subpixel-text-positioning-by-default.patch similarity index 88% rename from patches_platform/frameworks_base/0014-Paint-Enable-subpixel-text-positioning-by-default.patch rename to patches_platform/frameworks_base/0013-Paint-Enable-subpixel-text-positioning-by-default.patch index 8d3edc5..674b833 100644 --- a/patches_platform/frameworks_base/0014-Paint-Enable-subpixel-text-positioning-by-default.patch +++ b/patches_platform/frameworks_base/0013-Paint-Enable-subpixel-text-positioning-by-default.patch @@ -1,7 +1,7 @@ -From 4639be840945f29ba14ed58de8c2f538e2f487fb Mon Sep 17 00:00:00 2001 +From 38fbb12c2b6ce42d78e05248410c1de666d46700 Mon Sep 17 00:00:00 2001 From: Danny Lin Date: Tue, 5 Oct 2021 21:01:50 -0700 -Subject: [PATCH 14/34] Paint: Enable subpixel text positioning by default +Subject: [PATCH 13/43] 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 @@ -24,10 +24,10 @@ Change-Id: I8d71e5848a745c5a2d457a28c68458920928ee09 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/graphics/java/android/graphics/Paint.java b/graphics/java/android/graphics/Paint.java -index f10cdb82022e..a083c723f9c3 100644 +index df95a91d72d7..6cbae8b67815 100644 --- a/graphics/java/android/graphics/Paint.java +++ b/graphics/java/android/graphics/Paint.java -@@ -266,7 +266,7 @@ public class Paint { +@@ -329,7 +329,7 @@ public class Paint { // These flags are always set on a new/reset paint, even if flags 0 is passed. static final int HIDDEN_DEFAULT_PAINT_FLAGS = DEV_KERN_TEXT_FLAG | EMBEDDED_BITMAP_TEXT_FLAG diff --git a/patches_platform/frameworks_base/0015-Remove-debuggable-requirement-for-signature-spoofing.patch b/patches_platform/frameworks_base/0014-Remove-debuggable-requirement-for-signature-spoofing.patch similarity index 79% rename from patches_platform/frameworks_base/0015-Remove-debuggable-requirement-for-signature-spoofing.patch rename to patches_platform/frameworks_base/0014-Remove-debuggable-requirement-for-signature-spoofing.patch index df57460..fc6e8e2 100644 --- a/patches_platform/frameworks_base/0015-Remove-debuggable-requirement-for-signature-spoofing.patch +++ b/patches_platform/frameworks_base/0014-Remove-debuggable-requirement-for-signature-spoofing.patch @@ -1,7 +1,7 @@ -From 33ea20cb105c85d2c7bc0bab20c5d87ecf2d3df6 Mon Sep 17 00:00:00 2001 +From 76893bd08d5c89685320342db2a3bcec2bc981f5 Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Sun, 17 Mar 2024 17:10:38 +0800 -Subject: [PATCH 15/34] Remove debuggable requirement for signature spoofing +Subject: [PATCH 14/43] Remove debuggable requirement for signature spoofing Change-Id: I8d637ddbbd117a9c5b1d9c5e462b0f4b30d98333 --- @@ -9,10 +9,10 @@ Change-Id: I8d637ddbbd117a9c5b1d9c5e462b0f4b30d98333 1 file changed, 4 deletions(-) diff --git a/services/core/java/com/android/server/pm/ComputerEngine.java b/services/core/java/com/android/server/pm/ComputerEngine.java -index d8cbe9d5e7c7..13af78f56462 100644 +index 7d00436857a5..10a221eb8b9f 100644 --- a/services/core/java/com/android/server/pm/ComputerEngine.java +++ b/services/core/java/com/android/server/pm/ComputerEngine.java -@@ -1472,10 +1472,6 @@ public class ComputerEngine implements Computer { +@@ -1474,10 +1474,6 @@ public class ComputerEngine implements Computer { private static native boolean isDebuggable(); public static boolean isMicrogSigned(AndroidPackage p) { diff --git a/patches_platform/frameworks_base/0015-Revert-Adding-ColorUpdateLogger-to-track-color-updat.patch b/patches_platform/frameworks_base/0015-Revert-Adding-ColorUpdateLogger-to-track-color-updat.patch new file mode 100644 index 0000000..2b732ef --- /dev/null +++ b/patches_platform/frameworks_base/0015-Revert-Adding-ColorUpdateLogger-to-track-color-updat.patch @@ -0,0 +1,1154 @@ +From 533b667c2588eb8b241da7ccbb1955190cbda4c7 Mon Sep 17 00:00:00 2001 +From: Andy CrossGate Yan +Date: Sun, 30 Jun 2024 15:53:25 +0800 +Subject: [PATCH 15/43] Revert "Adding ColorUpdateLogger to track color updates + so that we demonstrate the root cause of our theme bugs" + +This reverts commit 3a819dee1225de25f0e228ef2c1b9447eb081661. + +Change-Id: I7f58b1fa44339d3cf76d5254c7b3aceb66e07c10 +--- + packages/SystemUI/aconfig/systemui.aconfig | 7 - + .../systemui/statusbar/NotificationShelf.java | 17 +- + .../notification/ColorUpdateLogger.kt | 153 ------------- + .../coordinator/ViewConfigCoordinator.kt | 14 +- + .../footer/ui/view/FooterView.java | 23 +- + .../row/ActivatableNotificationView.java | 6 +- + .../row/ExpandableNotificationRow.java | 21 +- + .../ExpandableNotificationRowController.java | 5 - + .../notification/row/ExpandableView.java | 6 +- + .../row/NotificationBackgroundView.java | 13 +- + .../stack/NotificationStackScrollLayout.java | 13 +- + ...tificationStackScrollLayoutController.java | 10 - + .../phone/ConfigurationControllerImpl.kt | 9 - + .../policy/ConfigurationController.java | 3 - + .../com/android/systemui/util/DrawableDump.kt | 201 ------------------ + .../coordinator/ViewConfigCoordinatorTest.kt | 6 +- + ...ExpandableNotificationRowControllerTest.kt | 3 - + .../row/NotificationTestHelper.java | 2 - + ...cationStackScrollLayoutControllerTest.java | 3 - + .../policy/FakeConfigurationController.kt | 1 - + .../leaks/FakeConfigurationController.java | 5 - + 21 files changed, 15 insertions(+), 506 deletions(-) + delete mode 100644 packages/SystemUI/src/com/android/systemui/statusbar/notification/ColorUpdateLogger.kt + delete mode 100644 packages/SystemUI/src/com/android/systemui/util/DrawableDump.kt + +diff --git a/packages/SystemUI/aconfig/systemui.aconfig b/packages/SystemUI/aconfig/systemui.aconfig +index d3cd1761a919..325e0d4133aa 100644 +--- a/packages/SystemUI/aconfig/systemui.aconfig ++++ b/packages/SystemUI/aconfig/systemui.aconfig +@@ -38,13 +38,6 @@ flag { + bug: "217799515" + } + +-flag { +- name: "notification_color_update_logger" +- namespace: "systemui" +- description: "Enabled debug logging and dumping of notification color updates." +- bug: "294347738" +-} +- + flag { + name: "notifications_footer_view_refactor" + namespace: "systemui" +diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationShelf.java b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationShelf.java +index 615534809c97..0e0f15237185 100644 +--- a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationShelf.java ++++ b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationShelf.java +@@ -17,7 +17,6 @@ + package com.android.systemui.statusbar; + + import static com.android.keyguard.BouncerPanelExpansionCalculator.aboutToShowBouncerProgress; +-import static com.android.systemui.util.ColorUtilKt.hexColorString; + + import android.content.Context; + import android.content.res.Configuration; +@@ -43,7 +42,6 @@ import com.android.systemui.flags.Flags; + import com.android.systemui.flags.RefactorFlag; + import com.android.systemui.res.R; + import com.android.systemui.shade.transition.LargeScreenShadeInterpolator; +-import com.android.systemui.statusbar.notification.ColorUpdateLogger; + import com.android.systemui.statusbar.notification.NotificationUtils; + import com.android.systemui.statusbar.notification.SourceType; + import com.android.systemui.statusbar.notification.row.ActivatableNotificationView; +@@ -189,8 +187,8 @@ public class NotificationShelf extends ActivatableNotificationView { + + @Override + public String toString() { +- return super.toString() +- + " (hideBackground=" + mHideBackground ++ return "NotificationShelf" ++ + "(hideBackground=" + mHideBackground + + " notGoneIndex=" + mNotGoneIndex + + " hasItemsInStableShelf=" + mHasItemsInStableShelf + + " interactive=" + mInteractive +@@ -370,17 +368,6 @@ public class NotificationShelf extends ActivatableNotificationView { + && isYInView(localY, slop, top, bottom); + } + +- @Override +- public void updateBackgroundColors() { +- super.updateBackgroundColors(); +- ColorUpdateLogger colorUpdateLogger = ColorUpdateLogger.getInstance(); +- if (colorUpdateLogger != null) { +- colorUpdateLogger.logEvent("Shelf.updateBackgroundColors()", +- "normalBgColor=" + hexColorString(getNormalBgColor()) +- + " background=" + mBackgroundNormal.toDumpString()); +- } +- } +- + /** + * Update the shelf appearance based on the other notifications around it. This transforms + * the icons from the notification area into the shelf. +diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/ColorUpdateLogger.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/ColorUpdateLogger.kt +deleted file mode 100644 +index 0f0ab2e36b8d..000000000000 +--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/ColorUpdateLogger.kt ++++ /dev/null +@@ -1,153 +0,0 @@ +-/* +- * Copyright (C) 2023 The Android Open Source Project +- * +- * Licensed under the Apache License, Version 2.0 (the "License"); +- * you may not use this file except in compliance with the License. +- * You may obtain a copy of the License at +- * +- * http://www.apache.org/licenses/LICENSE-2.0 +- * +- * Unless required by applicable law or agreed to in writing, software +- * distributed under the License is distributed on an "AS IS" BASIS, +- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +- * See the License for the specific language governing permissions and +- * limitations under the License +- */ +- +-package com.android.systemui.statusbar.notification +- +-import android.icu.text.SimpleDateFormat +-import android.util.IndentingPrintWriter +-import com.android.systemui.Dumpable +-import com.android.systemui.Flags.notificationColorUpdateLogger +-import com.android.systemui.dagger.SysUISingleton +-import com.android.systemui.dump.DumpManager +-import com.android.systemui.flags.FeatureFlagsClassic +-import com.android.systemui.util.Compile +-import com.android.systemui.util.asIndenting +-import com.android.systemui.util.printCollection +-import com.android.systemui.util.withIncreasedIndent +-import com.google.errorprone.annotations.CompileTimeConstant +-import java.io.PrintWriter +-import java.util.Locale +-import java.util.SortedSet +-import java.util.TreeSet +-import javax.inject.Inject +- +-@SysUISingleton +-class ColorUpdateLogger +-@Inject +-constructor( +- val featureFlags: FeatureFlagsClassic, +- dumpManager: DumpManager, +-) : Dumpable { +- +- inline val isEnabled +- get() = Compile.IS_DEBUG && notificationColorUpdateLogger() +- private val frames: MutableList = mutableListOf() +- +- init { +- dumpManager.registerDumpable(this) +- if (isEnabled) { +- instance = this +- } +- } +- +- @JvmOverloads +- fun logTriggerEvent(@CompileTimeConstant type: String, extra: String? = null) { +- if (!isEnabled) return +- val event = Event(type = type, extraValue = extra) +- val didAppend = frames.lastOrNull()?.tryAddTrigger(event) == true +- if (!didAppend) { +- frames.add(Frame(event)) +- if (frames.size > maxFrames) frames.removeAt(0) +- } +- } +- +- @JvmOverloads +- fun logEvent(@CompileTimeConstant type: String, extra: String? = null) { +- if (!isEnabled) return +- val frame = frames.lastOrNull() ?: return +- frame.events.add(Event(type = type, extraValue = extra)) +- frame.trim() +- } +- +- @JvmOverloads +- fun logNotificationEvent( +- @CompileTimeConstant type: String, +- key: String, +- extra: String? = null +- ) { +- if (!isEnabled) return +- val frame = frames.lastOrNull() ?: return +- frame.events.add(Event(type = type, extraValue = extra, notificationKey = key)) +- frame.trim() +- } +- +- override fun dump(pwOrig: PrintWriter, args: Array) { +- val pw = pwOrig.asIndenting() +- pw.println("enabled: $isEnabled") +- pw.printCollection("frames", frames) { it.dump(pw) } +- } +- +- private class Frame(event: Event) { +- val startTime: Long = event.time +- val events: MutableList = mutableListOf(event) +- val triggers: SortedSet = TreeSet().apply { add(event.type) } +- var trimmedEvents: Int = 0 +- +- fun tryAddTrigger(newEvent: Event): Boolean { +- if (newEvent.time < startTime) return false +- if (newEvent.time - startTime > triggerStartsNewFrameAge) return false +- if (newEvent.type in triggers) return false +- triggers.add(newEvent.type) +- events.add(newEvent) +- trim() +- return true +- } +- +- fun trim() { +- if (events.size > maxEventsPerFrame) { +- events.removeAt(0) +- trimmedEvents++ +- } +- } +- +- fun dump(pw: IndentingPrintWriter) { +- pw.println("Frame") +- pw.withIncreasedIndent { +- pw.println("startTime: ${timeString(startTime)}") +- pw.printCollection("triggers", triggers) +- pw.println("trimmedEvents: $trimmedEvents") +- pw.printCollection("events", events) { it.dump(pw) } +- } +- } +- } +- +- private class Event( +- @CompileTimeConstant val type: String, +- val extraValue: String? = null, +- val notificationKey: String? = null, +- ) { +- val time: Long = System.currentTimeMillis() +- +- fun dump(pw: IndentingPrintWriter) { +- pw.append(timeString(time)).append(": ").append(type) +- extraValue?.let { pw.append(" ").append(it) } +- notificationKey?.let { pw.append(" ---- ").append(logKey(it)) } +- pw.println() +- } +- } +- +- private companion object { +- @JvmStatic +- var instance: ColorUpdateLogger? = null +- private set +- private const val maxFrames = 5 +- private const val maxEventsPerFrame = 250 +- private const val triggerStartsNewFrameAge = 5000 +- +- private val dateFormat = SimpleDateFormat("MM-dd HH:mm:ss.SSS", Locale.US) +- private fun timeString(time: Long): String = dateFormat.format(time) +- } +-} +diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/ViewConfigCoordinator.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/ViewConfigCoordinator.kt +index b8a959440312..3809ea0f58da 100644 +--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/ViewConfigCoordinator.kt ++++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/ViewConfigCoordinator.kt +@@ -23,7 +23,6 @@ import com.android.keyguard.KeyguardUpdateMonitor + import com.android.keyguard.KeyguardUpdateMonitorCallback + import com.android.systemui.statusbar.NotificationLockscreenUserManager + import com.android.systemui.statusbar.NotificationLockscreenUserManager.UserChangedListener +-import com.android.systemui.statusbar.notification.ColorUpdateLogger + import com.android.systemui.statusbar.notification.collection.NotifPipeline + import com.android.systemui.statusbar.notification.collection.coordinator.dagger.CoordinatorScope + import com.android.systemui.statusbar.notification.row.NotificationGutsManager +@@ -42,8 +41,7 @@ class ViewConfigCoordinator @Inject internal constructor( + private val mConfigurationController: ConfigurationController, + private val mLockscreenUserManager: NotificationLockscreenUserManager, + private val mGutsManager: NotificationGutsManager, +- private val mKeyguardUpdateMonitor: KeyguardUpdateMonitor, +- private val colorUpdateLogger: ColorUpdateLogger, ++ private val mKeyguardUpdateMonitor: KeyguardUpdateMonitor + ) : Coordinator, ConfigurationController.ConfigurationListener { + + private var mIsSwitchingUser = false +@@ -53,13 +51,11 @@ class ViewConfigCoordinator @Inject internal constructor( + + private val mKeyguardUpdateCallback = object : KeyguardUpdateMonitorCallback() { + override fun onUserSwitching(userId: Int) { +- colorUpdateLogger.logTriggerEvent("VCC.mKeyguardUpdateCallback.onUserSwitching()") + log { "ViewConfigCoordinator.onUserSwitching(userId=$userId)" } + mIsSwitchingUser = true + } + + override fun onUserSwitchComplete(userId: Int) { +- colorUpdateLogger.logTriggerEvent("VCC.mKeyguardUpdateCallback.onUserSwitchComplete()") + log { "ViewConfigCoordinator.onUserSwitchComplete(userId=$userId)" } + mIsSwitchingUser = false + applyChangesOnUserSwitched() +@@ -68,7 +64,6 @@ class ViewConfigCoordinator @Inject internal constructor( + + private val mUserChangedListener = object : UserChangedListener { + override fun onUserChanged(userId: Int) { +- colorUpdateLogger.logTriggerEvent("VCC.mUserChangedListener.onUserChanged()") + log { "ViewConfigCoordinator.onUserChanged(userId=$userId)" } + applyChangesOnUserSwitched() + } +@@ -82,7 +77,6 @@ class ViewConfigCoordinator @Inject internal constructor( + } + + override fun onDensityOrFontScaleChanged() { +- colorUpdateLogger.logTriggerEvent("VCC.onDensityOrFontScaleChanged()") + log { + val keyguardIsSwitchingUser = mKeyguardUpdateMonitor.isSwitchingUser + "ViewConfigCoordinator.onDensityOrFontScaleChanged()" + +@@ -99,7 +93,6 @@ class ViewConfigCoordinator @Inject internal constructor( + } + + override fun onUiModeChanged() { +- colorUpdateLogger.logTriggerEvent("VCC.onUiModeChanged()") + log { + val keyguardIsSwitchingUser = mKeyguardUpdateMonitor.isSwitchingUser + "ViewConfigCoordinator.onUiModeChanged()" + +@@ -114,12 +107,10 @@ class ViewConfigCoordinator @Inject internal constructor( + } + + override fun onThemeChanged() { +- colorUpdateLogger.logTriggerEvent("VCC.onThemeChanged()") + onDensityOrFontScaleChanged() + } + + private fun applyChangesOnUserSwitched() { +- colorUpdateLogger.logEvent("VCC.applyChangesOnUserSwitched()") + if (mReinflateNotificationsOnUserSwitched) { + updateNotificationsOnDensityOrFontScaleChanged() + mReinflateNotificationsOnUserSwitched = false +@@ -131,8 +122,6 @@ class ViewConfigCoordinator @Inject internal constructor( + } + + private fun updateNotificationsOnUiModeChanged() { +- colorUpdateLogger.logEvent("VCC.updateNotificationsOnUiModeChanged()", +- "mode=" + mConfigurationController.nightModeName) + log { "ViewConfigCoordinator.updateNotificationsOnUiModeChanged()" } + traceSection("updateNotifOnUiModeChanged") { + mPipeline?.allNotifs?.forEach { entry -> +@@ -142,7 +131,6 @@ class ViewConfigCoordinator @Inject internal constructor( + } + + private fun updateNotificationsOnDensityOrFontScaleChanged() { +- colorUpdateLogger.logEvent("VCC.updateNotificationsOnDensityOrFontScaleChanged()") + mPipeline?.allNotifs?.forEach { entry -> + entry.onDensityOrFontScaleChanged() + val exposedGuts = entry.areGutsExposed() +diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/footer/ui/view/FooterView.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/footer/ui/view/FooterView.java +index f792898520a2..16f18a3c3fb6 100644 +--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/footer/ui/view/FooterView.java ++++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/footer/ui/view/FooterView.java +@@ -19,7 +19,6 @@ package com.android.systemui.statusbar.notification.footer.ui.view; + import static android.graphics.PorterDuff.Mode.SRC_ATOP; + + import static com.android.systemui.Flags.notificationBackgroundTintOptimization; +-import static com.android.systemui.util.ColorUtilKt.hexColorString; + + import android.annotation.ColorInt; + import android.annotation.DrawableRes; +@@ -41,13 +40,11 @@ import androidx.annotation.NonNull; + + import com.android.settingslib.Utils; + import com.android.systemui.res.R; +-import com.android.systemui.statusbar.notification.ColorUpdateLogger; + import com.android.systemui.statusbar.notification.footer.shared.FooterViewRefactor; + import com.android.systemui.statusbar.notification.row.FooterViewButton; + import com.android.systemui.statusbar.notification.row.StackScrollerDecorView; + import com.android.systemui.statusbar.notification.stack.ExpandableViewState; + import com.android.systemui.statusbar.notification.stack.ViewState; +-import com.android.systemui.util.DrawableDumpKt; + import com.android.systemui.util.DumpUtilsKt; + + import java.io.PrintWriter; +@@ -242,10 +239,6 @@ public class FooterView extends StackScrollerDecorView { + + @Override + protected void onFinishInflate() { +- ColorUpdateLogger colorUpdateLogger = ColorUpdateLogger.getInstance(); +- if (colorUpdateLogger != null) { +- colorUpdateLogger.logTriggerEvent("Footer.onFinishInflate()"); +- } + super.onFinishInflate(); + mClearAllButton = (FooterViewButton) findSecondaryView(); + mManageOrHistoryButton = findViewById(R.id.manage_text); +@@ -355,10 +348,6 @@ public class FooterView extends StackScrollerDecorView { + + @Override + protected void onConfigurationChanged(Configuration newConfig) { +- ColorUpdateLogger colorUpdateLogger = ColorUpdateLogger.getInstance(); +- if (colorUpdateLogger != null) { +- colorUpdateLogger.logTriggerEvent("Footer.onConfigurationChanged()"); +- } + super.onConfigurationChanged(newConfig); + updateColors(); + if (!FooterViewRefactor.isEnabled()) { +@@ -376,17 +365,14 @@ public class FooterView extends StackScrollerDecorView { + com.android.internal.R.attr.materialColorOnSurface); + final Drawable clearAllBg = theme.getDrawable(R.drawable.notif_footer_btn_background); + final Drawable manageBg = theme.getDrawable(R.drawable.notif_footer_btn_background); +- final @ColorInt int scHigh; + if (!notificationBackgroundTintOptimization()) { +- scHigh = Utils.getColorAttrDefaultColor(mContext, ++ final @ColorInt int scHigh = Utils.getColorAttrDefaultColor(mContext, + com.android.internal.R.attr.materialColorSurfaceContainerHigh); + if (scHigh != 0) { + final ColorFilter bgColorFilter = new PorterDuffColorFilter(scHigh, SRC_ATOP); + clearAllBg.setColorFilter(bgColorFilter); + manageBg.setColorFilter(bgColorFilter); + } +- } else { +- scHigh = 0; + } + mClearAllButton.setBackground(clearAllBg); + mClearAllButton.setTextColor(onSurface); +@@ -394,13 +380,6 @@ public class FooterView extends StackScrollerDecorView { + mManageOrHistoryButton.setTextColor(onSurface); + mSeenNotifsFooterTextView.setTextColor(onSurface); + mSeenNotifsFooterTextView.setCompoundDrawableTintList(ColorStateList.valueOf(onSurface)); +- ColorUpdateLogger colorUpdateLogger = ColorUpdateLogger.getInstance(); +- if (colorUpdateLogger != null) { +- colorUpdateLogger.logEvent("Footer.updateColors()", +- "textColor(onSurface)=" + hexColorString(onSurface) +- + " backgroundTint(surfaceContainerHigh)=" + hexColorString(scHigh) +- + " background=" + DrawableDumpKt.dumpToString(manageBg)); +- } + } + + private void updateResources() { +diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ActivatableNotificationView.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ActivatableNotificationView.java +index 61cdea190a43..83c50f52af6f 100644 +--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ActivatableNotificationView.java ++++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ActivatableNotificationView.java +@@ -88,7 +88,7 @@ public abstract class ActivatableNotificationView extends ExpandableOutlineView + private boolean mActivated; + + private Interpolator mCurrentAppearInterpolator; +- protected NotificationBackgroundView mBackgroundNormal; ++ NotificationBackgroundView mBackgroundNormal; + private float mAnimationTranslationY; + private boolean mDrawingAppearAnimation; + private ValueAnimator mAppearAnimator; +@@ -142,10 +142,6 @@ public abstract class ActivatableNotificationView extends ExpandableOutlineView + updateBackgroundTint(); + } + +- protected int getNormalBgColor() { +- return mNormalColor; +- } +- + /** + * @param width The actual width to apply to the background view. + */ +diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRow.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRow.java +index 1bb5a771a543..e564a15f462f 100644 +--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRow.java ++++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRow.java +@@ -21,7 +21,6 @@ import static android.service.notification.NotificationListenerService.REASON_CA + + import static com.android.systemui.statusbar.notification.collection.NotificationEntry.DismissState.PARENT_DISMISSED; + import static com.android.systemui.statusbar.notification.row.NotificationContentView.VISIBLE_TYPE_HEADSUP; +-import static com.android.systemui.util.ColorUtilKt.hexColorString; + + import android.animation.Animator; + import android.animation.AnimatorListenerAdapter; +@@ -86,7 +85,6 @@ import com.android.systemui.statusbar.RemoteInputController; + import com.android.systemui.statusbar.SmartReplyController; + import com.android.systemui.statusbar.StatusBarIconView; + import com.android.systemui.statusbar.notification.AboveShelfChangedListener; +-import com.android.systemui.statusbar.notification.ColorUpdateLogger; + import com.android.systemui.statusbar.notification.FeedbackIcon; + import com.android.systemui.statusbar.notification.LaunchAnimationParameters; + import com.android.systemui.statusbar.notification.NotificationFadeAware; +@@ -176,7 +174,6 @@ public class ExpandableNotificationRow extends ActivatableNotificationView + private Optional mBubblesManagerOptional; + private MetricsLogger mMetricsLogger; + private NotificationChildrenContainerLogger mChildrenContainerLogger; +- private ColorUpdateLogger mColorUpdateLogger; + private NotificationDismissibilityProvider mDismissibilityProvider; + private FeatureFlags mFeatureFlags; + private int mIconTransformContentShift; +@@ -451,7 +448,6 @@ public class ExpandableNotificationRow extends ActivatableNotificationView + + /** + * Sets animations running in the layouts of this row, including public, private, and children. +- * + * @param running whether the animations should be started running or stopped. + */ + public void setAnimationRunning(boolean running) { +@@ -621,12 +617,6 @@ public class ExpandableNotificationRow extends ActivatableNotificationView + + private void updateBackgroundColorsOfSelf() { + super.updateBackgroundColors(); +- if (mColorUpdateLogger.isEnabled()) { +- mColorUpdateLogger.logNotificationEvent("ENR.updateBackgroundColorsOfSelf()", +- mLoggingKey, +- "normalBgColor=" + hexColorString(getNormalBgColor()) +- + " background=" + mBackgroundNormal.toDumpString()); +- } + } + + @Override +@@ -1408,7 +1398,7 @@ public class ExpandableNotificationRow extends ActivatableNotificationView + } + + public void setContentBackground(int customBackgroundColor, boolean animate, +- NotificationContentView notificationContentView) { ++ NotificationContentView notificationContentView) { + if (getShowingLayout() == notificationContentView) { + setTintColor(customBackgroundColor, animate); + } +@@ -1477,7 +1467,7 @@ public class ExpandableNotificationRow extends ActivatableNotificationView + } + + /** +- * @return if this entry should be kept in its parent during removal. ++ * @return if this entry should be kept in its parent during removal. + */ + public boolean keepInParentForDismissAnimation() { + return mKeepInParentForDismissAnimation; +@@ -1824,7 +1814,6 @@ public class ExpandableNotificationRow extends ActivatableNotificationView + NotificationDismissibilityProvider dismissibilityProvider, + MetricsLogger metricsLogger, + NotificationChildrenContainerLogger childrenContainerLogger, +- ColorUpdateLogger colorUpdateLogger, + SmartReplyConstants smartReplyConstants, + SmartReplyController smartReplyController, + FeatureFlags featureFlags, +@@ -1863,7 +1852,6 @@ public class ExpandableNotificationRow extends ActivatableNotificationView + mNotificationGutsManager = gutsManager; + mMetricsLogger = metricsLogger; + mChildrenContainerLogger = childrenContainerLogger; +- mColorUpdateLogger = colorUpdateLogger; + mDismissibilityProvider = dismissibilityProvider; + mFeatureFlags = featureFlags; + } +@@ -2322,7 +2310,7 @@ public class ExpandableNotificationRow extends ActivatableNotificationView + } + + public Animator getTranslateViewAnimator(final float leftTarget, +- AnimatorUpdateListener listener) { ++ AnimatorUpdateListener listener) { + if (mTranslateAnim != null) { + mTranslateAnim.cancel(); + } +@@ -2721,7 +2709,6 @@ public class ExpandableNotificationRow extends ActivatableNotificationView + return getCollapsedHeight(); + } + } +- + /** + * @return {@code true} if the notification can show it's heads up layout. This is mostly true + * except for legacy use cases. +@@ -2906,7 +2893,7 @@ public class ExpandableNotificationRow extends ActivatableNotificationView + + @Override + public void setHideSensitive(boolean hideSensitive, boolean animated, long delay, +- long duration) { ++ long duration) { + if (getVisibility() == GONE) { + // If we are GONE, the hideSensitive parameter will not be calculated and always be + // false, which is incorrect, let's wait until a real call comes in later. +diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRowController.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRowController.java +index e59829bf3c99..5614f3a3fcc5 100644 +--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRowController.java ++++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRowController.java +@@ -41,7 +41,6 @@ import com.android.systemui.plugins.PluginManager; + import com.android.systemui.plugins.statusbar.NotificationMenuRowPlugin; + import com.android.systemui.plugins.statusbar.StatusBarStateController; + import com.android.systemui.statusbar.SmartReplyController; +-import com.android.systemui.statusbar.notification.ColorUpdateLogger; + import com.android.systemui.statusbar.notification.FeedbackIcon; + import com.android.systemui.statusbar.notification.collection.NotificationEntry; + import com.android.systemui.statusbar.notification.collection.provider.NotificationDismissibilityProvider; +@@ -87,7 +86,6 @@ public class ExpandableNotificationRowController implements NotifViewController + private final SystemClock mClock; + private final String mAppName; + private final String mNotificationKey; +- private final ColorUpdateLogger mColorUpdateLogger; + private final KeyguardBypassController mKeyguardBypassController; + private final GroupMembershipManager mGroupMembershipManager; + private final GroupExpansionManager mGroupExpansionManager; +@@ -202,7 +200,6 @@ public class ExpandableNotificationRowController implements NotifViewController + ActivatableNotificationViewController activatableNotificationViewController, + RemoteInputViewSubcomponent.Factory rivSubcomponentFactory, + MetricsLogger metricsLogger, +- ColorUpdateLogger colorUpdateLogger, + NotificationRowLogger logBufferLogger, + NotificationChildrenContainerLogger childrenContainerLogger, + NotificationListContainer listContainer, +@@ -259,7 +256,6 @@ public class ExpandableNotificationRowController implements NotifViewController + mDragController = dragController; + mMetricsLogger = metricsLogger; + mChildrenContainerLogger = childrenContainerLogger; +- mColorUpdateLogger = colorUpdateLogger; + mLogBufferLogger = logBufferLogger; + mSmartReplyConstants = smartReplyConstants; + mSmartReplyController = smartReplyController; +@@ -294,7 +290,6 @@ public class ExpandableNotificationRowController implements NotifViewController + mDismissibilityProvider, + mMetricsLogger, + mChildrenContainerLogger, +- mColorUpdateLogger, + mSmartReplyConstants, + mSmartReplyController, + mFeatureFlags, +diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableView.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableView.java +index ea9df9af8cff..ec8e5d730c36 100644 +--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableView.java ++++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableView.java +@@ -16,8 +16,6 @@ + + package com.android.systemui.statusbar.notification.row; + +-import static com.android.systemui.Flags.notificationColorUpdateLogger; +- + import android.animation.AnimatorListenerAdapter; + import android.content.Context; + import android.content.res.Configuration; +@@ -56,8 +54,8 @@ import java.util.List; + public abstract class ExpandableView extends FrameLayout implements Dumpable, Roundable { + private static final String TAG = "ExpandableView"; + /** whether the dump() for this class should include verbose details */ +- protected static final boolean DUMP_VERBOSE = Compile.IS_DEBUG +- && (Log.isLoggable(TAG, Log.VERBOSE) || notificationColorUpdateLogger()); ++ protected static final boolean DUMP_VERBOSE = ++ Compile.IS_DEBUG && Log.isLoggable(TAG, Log.VERBOSE); + + private RoundableState mRoundableState = null; + protected OnHeightChangedListener mOnHeightChangedListener; +diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationBackgroundView.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationBackgroundView.java +index ed3a38d3305b..7ea9b14353d3 100644 +--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationBackgroundView.java ++++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationBackgroundView.java +@@ -36,7 +36,6 @@ import com.android.internal.util.ContrastColorUtil; + import com.android.settingslib.Utils; + import com.android.systemui.Dumpable; + import com.android.systemui.res.R; +-import com.android.systemui.util.DrawableDumpKt; + + import java.io.PrintWriter; + import java.util.Arrays; +@@ -334,16 +333,6 @@ public class NotificationBackgroundView extends View implements Dumpable { + pw.println("mActualHeight: " + mActualHeight); + pw.println("mTintColor: " + hexColorString(mTintColor)); + pw.println("mRippleColor: " + hexColorString(mRippleColor)); +- pw.println("mBackground: " + DrawableDumpKt.dumpToString(mBackground)); +- } +- +- /** create a concise dump of this view's colors */ +- public String toDumpString() { +- return ""; +- ++ pw.println("mBackground: " + mBackground); + } + } +diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java +index 27db84f6715e..fb8bc7a34a9c 100644 +--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java ++++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java +@@ -99,7 +99,6 @@ import com.android.systemui.shade.TouchLogger; + import com.android.systemui.statusbar.EmptyShadeView; + import com.android.systemui.statusbar.NotificationShelf; + import com.android.systemui.statusbar.StatusBarState; +-import com.android.systemui.statusbar.notification.ColorUpdateLogger; + import com.android.systemui.statusbar.notification.FakeShadowView; + import com.android.systemui.statusbar.notification.LaunchAnimationParameters; + import com.android.systemui.statusbar.notification.NotificationTransitionAnimatorController; +@@ -123,7 +122,6 @@ import com.android.systemui.statusbar.policy.HeadsUpUtil; + import com.android.systemui.statusbar.policy.ScrollAdapter; + import com.android.systemui.statusbar.policy.SplitShadeStateController; + import com.android.systemui.util.Assert; +-import com.android.systemui.util.ColorUtilKt; + import com.android.systemui.util.Compile; + import com.android.systemui.util.DumpUtilsKt; + +@@ -817,8 +815,8 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable + updateBackgroundDimming(); + for (int i = 0; i < getChildCount(); i++) { + View child = getChildAt(i); +- if (child instanceof ActivatableNotificationView activatableView) { +- activatableView.updateBackgroundColors(); ++ if (child instanceof ActivatableNotificationView) { ++ ((ActivatableNotificationView) child).updateBackgroundColors(); + } + } + } +@@ -4632,13 +4630,6 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable + final @ColorInt int onSurfaceVariant = Utils.getColorAttrDefaultColor( + mContext, com.android.internal.R.attr.materialColorOnSurfaceVariant); + +- ColorUpdateLogger colorUpdateLogger = ColorUpdateLogger.getInstance(); +- if (colorUpdateLogger != null) { +- colorUpdateLogger.logEvent("NSSL.updateDecorViews()", +- "onSurface=" + ColorUtilKt.hexColorString(onSurface) +- + " onSurfaceVariant=" + ColorUtilKt.hexColorString(onSurfaceVariant)); +- } +- + mSectionsManager.setHeaderForegroundColors(onSurface, onSurfaceVariant); + + if (mFooterView != null) { +diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutController.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutController.java +index 7c138776d5a5..6dd07e1915b5 100644 +--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutController.java ++++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutController.java +@@ -96,7 +96,6 @@ import com.android.systemui.statusbar.NotificationShelf; + import com.android.systemui.statusbar.RemoteInputController; + import com.android.systemui.statusbar.StatusBarState; + import com.android.systemui.statusbar.SysuiStatusBarStateController; +-import com.android.systemui.statusbar.notification.ColorUpdateLogger; + import com.android.systemui.statusbar.notification.DynamicPrivacyController; + import com.android.systemui.statusbar.notification.LaunchAnimationParameters; + import com.android.systemui.statusbar.notification.NotificationActivityStarter; +@@ -178,7 +177,6 @@ public class NotificationStackScrollLayoutController implements Dumpable { + private final ConfigurationController mConfigurationController; + private final ZenModeController mZenModeController; + private final MetricsLogger mMetricsLogger; +- private final ColorUpdateLogger mColorUpdateLogger; + + private final DumpManager mDumpManager; + private final FalsingCollector mFalsingCollector; +@@ -241,7 +239,6 @@ public class NotificationStackScrollLayoutController implements Dumpable { + new View.OnAttachStateChangeListener() { + @Override + public void onViewAttachedToWindow(View v) { +- mColorUpdateLogger.logTriggerEvent("NSSLC.onViewAttachedToWindow()"); + mConfigurationController.addCallback(mConfigurationListener); + if (!FooterViewRefactor.isEnabled()) { + mZenModeController.addCallback(mZenModeControllerCallback); +@@ -257,7 +254,6 @@ public class NotificationStackScrollLayoutController implements Dumpable { + + @Override + public void onViewDetachedFromWindow(View v) { +- mColorUpdateLogger.logTriggerEvent("NSSLC.onViewDetachedFromWindow()"); + mConfigurationController.removeCallback(mConfigurationListener); + if (!FooterViewRefactor.isEnabled()) { + mZenModeController.removeCallback(mZenModeControllerCallback); +@@ -336,16 +332,12 @@ public class NotificationStackScrollLayoutController implements Dumpable { + + @Override + public void onUiModeChanged() { +- mColorUpdateLogger.logTriggerEvent("NSSLC.onUiModeChanged()", +- "mode=" + mConfigurationController.getNightModeName()); + mView.updateBgColor(); + mView.updateDecorViews(); + } + + @Override + public void onThemeChanged() { +- mColorUpdateLogger.logTriggerEvent("NSSLC.onThemeChanged()", +- "mode=" + mConfigurationController.getNightModeName()); + mView.updateCornerRadius(); + mView.updateBgColor(); + mView.updateDecorViews(); +@@ -727,7 +719,6 @@ public class NotificationStackScrollLayoutController implements Dumpable { + ZenModeController zenModeController, + NotificationLockscreenUserManager lockscreenUserManager, + MetricsLogger metricsLogger, +- ColorUpdateLogger colorUpdateLogger, + DumpManager dumpManager, + FalsingCollector falsingCollector, + FalsingManager falsingManager, +@@ -782,7 +773,6 @@ public class NotificationStackScrollLayoutController implements Dumpable { + mZenModeController = zenModeController; + mLockscreenUserManager = lockscreenUserManager; + mMetricsLogger = metricsLogger; +- mColorUpdateLogger = colorUpdateLogger; + mDumpManager = dumpManager; + mLockscreenShadeTransitionController = lockscreenShadeTransitionController; + mFalsingCollector = falsingCollector; +diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ConfigurationControllerImpl.kt b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ConfigurationControllerImpl.kt +index dea94162ad0e..6e8ad2e50620 100644 +--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ConfigurationControllerImpl.kt ++++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ConfigurationControllerImpl.kt +@@ -159,15 +159,6 @@ class ConfigurationControllerImpl @Inject constructor( + override fun isLayoutRtl(): Boolean { + return layoutDirection == LAYOUT_DIRECTION_RTL + } +- +- override fun getNightModeName(): String { +- return when (uiMode and Configuration.UI_MODE_NIGHT_MASK) { +- Configuration.UI_MODE_NIGHT_YES -> "night" +- Configuration.UI_MODE_NIGHT_NO -> "day" +- Configuration.UI_MODE_NIGHT_UNDEFINED -> "undefined" +- else -> "err" +- } +- } + } + + // This could be done with a Collection.filter and Collection.forEach, but Collection.filter +diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/ConfigurationController.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/ConfigurationController.java +index cec77c12a40b..b2ef818d3282 100644 +--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/ConfigurationController.java ++++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/ConfigurationController.java +@@ -33,9 +33,6 @@ public interface ConfigurationController extends CallbackController { +- return drawable.getStateField("mSolidColors") +- } +- is LayerDrawable -> { +- for (iLayer in 0 until drawable.numberOfLayers) { +- getSolidColors(drawable.getDrawable(iLayer))?.let { +- return it +- } +- } +- null +- } +- is DrawableWrapper -> { +- return getSolidColors(drawable.drawable) +- } +- else -> null +- } +-} +- +-private fun StringBuilder.appendDrawable(drawable: Drawable?): StringBuilder { +- if (drawable == null) { +- append("null") +- return this +- } +- append("<") +- append(drawable.javaClass.simpleName) +- +- drawable.getStateField("mTint", fieldRequired = false)?.let { +- append(" tint=") +- appendColors(it) +- append(" blendMode=") +- append(drawable.getStateField("mBlendMode")) +- } +- drawable.colorFilter +- ?.takeUnless { drawable is DrawableWrapper } +- ?.let { +- append(" colorFilter=") +- appendColorFilter(it) +- } +- when (drawable) { +- is DrawableWrapper -> { +- append(" wrapped=") +- appendDrawable(drawable.drawable) +- } +- is LayerDrawable -> { +- if (drawable is RippleDrawable) { +- drawable.getStateField("mColor")?.let { +- append(" color=") +- appendColors(it) +- } +- drawable.effectColor?.let { +- append(" effectColor=") +- appendColors(it) +- } +- } +- append(" layers=[") +- for (iLayer in 0 until drawable.numberOfLayers) { +- if (iLayer != 0) append(", ") +- appendDrawable(drawable.getDrawable(iLayer)) +- } +- append("]") +- } +- is GradientDrawable -> { +- drawable +- .getStateField("mShape") +- ?.takeIf { it != 0 } +- ?.let { +- append(" shape=") +- append(it) +- } +- drawable.getStateField("mSolidColors")?.let { +- append(" solidColors=") +- appendColors(it) +- } +- drawable.getStateField("mStrokeColors")?.let { +- append(" strokeColors=") +- appendColors(it) +- } +- drawable.colors?.let { +- append(" gradientColors=[") +- it.forEachIndexed { iColor, color -> +- if (iColor != 0) append(", ") +- append(hexColorString(color)) +- } +- append("]") +- } +- } +- } +- append(">") +- return this +-} +- +-private inline fun Drawable.getStateField( +- name: String, +- fieldRequired: Boolean = true +-): T? { +- val state = this.constantState ?: return null +- val clazz = state.javaClass +- return try { +- val field = clazz.getDeclaredField(name) +- field.isAccessible = true +- field.get(state) as T? +- } catch (ex: Exception) { +- if (fieldRequired) { +- Log.w(TAG, "Missing ${clazz.simpleName}.$name: ${T::class.simpleName}", ex) +- } else if (Log.isLoggable(TAG, Log.VERBOSE)) { +- Log.v(TAG, "Missing ${clazz.simpleName}.$name: ${T::class.simpleName} ($ex)") +- } +- null +- } +-} +- +-private fun Appendable.appendColors(colorStateList: ColorStateList?) { +- if (colorStateList == null) { +- append("null") +- return +- } +- val colors = colorStateList.colors +- if (colors.size == 1) { +- append(hexColorString(colors[0])) +- return +- } +- append("") +-} +- +-private fun Appendable.appendColorFilter(colorFilter: ColorFilter?) { +- if (colorFilter == null) { +- append("null") +- return +- } +- append("<") +- append(colorFilter.javaClass.simpleName) +- when (colorFilter) { +- is PorterDuffColorFilter -> { +- append(" color=") +- append(hexColorString(colorFilter.color)) +- append(" mode=") +- append(colorFilter.mode.toString()) +- } +- is BlendModeColorFilter -> { +- append(" color=") +- append(hexColorString(colorFilter.color)) +- append(" mode=") +- append(colorFilter.mode.toString()) +- } +- is LightingColorFilter -> { +- append(" multiply=") +- append(hexColorString(colorFilter.colorMultiply)) +- append(" add=") +- append(hexColorString(colorFilter.colorAdd)) +- } +- else -> append(" unhandled") +- } +- append(">") +-} +- +-private const val TAG = "DrawableDump" +diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/coordinator/ViewConfigCoordinatorTest.kt b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/coordinator/ViewConfigCoordinatorTest.kt +index b1d2ea21f7fc..0830191fe035 100644 +--- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/coordinator/ViewConfigCoordinatorTest.kt ++++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/coordinator/ViewConfigCoordinatorTest.kt +@@ -23,7 +23,6 @@ import com.android.keyguard.KeyguardUpdateMonitorCallback + import com.android.systemui.SysuiTestCase + import com.android.systemui.statusbar.NotificationLockscreenUserManager + import com.android.systemui.statusbar.NotificationLockscreenUserManager.UserChangedListener +-import com.android.systemui.statusbar.notification.ColorUpdateLogger + import com.android.systemui.statusbar.notification.collection.NotifPipeline + import com.android.systemui.statusbar.notification.collection.NotificationEntry + import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow +@@ -58,7 +57,6 @@ class ViewConfigCoordinatorTest : SysuiTestCase() { + private val lockscreenUserManager: NotificationLockscreenUserManager = mock() + private val gutsManager: NotificationGutsManager = mock() + private val keyguardUpdateMonitor: KeyguardUpdateMonitor = mock() +- private val colorUpdateLogger: ColorUpdateLogger = mock() + + @Before + fun setUp() { +@@ -68,9 +66,7 @@ class ViewConfigCoordinatorTest : SysuiTestCase() { + configurationController, + lockscreenUserManager, + gutsManager, +- keyguardUpdateMonitor, +- colorUpdateLogger, +- ) ++ keyguardUpdateMonitor) + coordinator.attach(pipeline) + userChangedListener = withArgCaptor { + verify(lockscreenUserManager).addUserChangedListener(capture()) +diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRowControllerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRowControllerTest.kt +index 210b1a7f22f4..8ac2a334818c 100644 +--- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRowControllerTest.kt ++++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRowControllerTest.kt +@@ -34,7 +34,6 @@ import com.android.systemui.plugins.PluginManager + import com.android.systemui.plugins.statusbar.StatusBarStateController + import com.android.systemui.statusbar.SbnBuilder + import com.android.systemui.statusbar.SmartReplyController +-import com.android.systemui.statusbar.notification.ColorUpdateLogger + import com.android.systemui.statusbar.notification.collection.NotificationEntry + import com.android.systemui.statusbar.notification.collection.NotificationEntryBuilder + import com.android.systemui.statusbar.notification.collection.provider.NotificationDismissibilityProvider +@@ -83,7 +82,6 @@ class ExpandableNotificationRowControllerTest : SysuiTestCase() { + private val rivSubComponentFactory: RemoteInputViewSubcomponent.Factory = mock() + private val metricsLogger: MetricsLogger = mock() + private val logBufferLogger = NotificationRowLogger(logcatLogBuffer(), logcatLogBuffer()) +- private val colorUpdateLogger: ColorUpdateLogger = mock() + private val listContainer: NotificationListContainer = mock() + private val childrenContainer: NotificationChildrenContainer = mock() + private val smartReplyConstants: SmartReplyConstants = mock() +@@ -119,7 +117,6 @@ class ExpandableNotificationRowControllerTest : SysuiTestCase() { + activableNotificationViewController, + rivSubComponentFactory, + metricsLogger, +- colorUpdateLogger, + logBufferLogger, + NotificationChildrenContainerLogger(logcatLogBuffer()), + listContainer, +diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/NotificationTestHelper.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/NotificationTestHelper.java +index 84139da38004..53b6dabf697b 100644 +--- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/NotificationTestHelper.java ++++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/NotificationTestHelper.java +@@ -65,7 +65,6 @@ import com.android.systemui.statusbar.NotificationMediaManager; + import com.android.systemui.statusbar.NotificationRemoteInputManager; + import com.android.systemui.statusbar.NotificationShadeWindowController; + import com.android.systemui.statusbar.SmartReplyController; +-import com.android.systemui.statusbar.notification.ColorUpdateLogger; + import com.android.systemui.statusbar.notification.ConversationNotificationProcessor; + import com.android.systemui.statusbar.notification.SourceType; + import com.android.systemui.statusbar.notification.collection.NotificationEntry; +@@ -606,7 +605,6 @@ public class NotificationTestHelper { + mDismissibilityProvider, + mock(MetricsLogger.class), + new NotificationChildrenContainerLogger(logcatLogBuffer()), +- mock(ColorUpdateLogger.class), + mock(SmartReplyConstants.class), + mock(SmartReplyController.class), + mFeatureFlags, +diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutControllerTest.java +index a4f88fbe1469..0b37b284ef25 100644 +--- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutControllerTest.java ++++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutControllerTest.java +@@ -78,7 +78,6 @@ import com.android.systemui.statusbar.NotificationLockscreenUserManager.UserChan + import com.android.systemui.statusbar.NotificationRemoteInputManager; + import com.android.systemui.statusbar.RemoteInputController; + import com.android.systemui.statusbar.SysuiStatusBarStateController; +-import com.android.systemui.statusbar.notification.ColorUpdateLogger; + import com.android.systemui.statusbar.notification.DynamicPrivacyController; + import com.android.systemui.statusbar.notification.collection.NotifCollection; + import com.android.systemui.statusbar.notification.collection.NotifPipeline; +@@ -149,7 +148,6 @@ public class NotificationStackScrollLayoutControllerTest extends SysuiTestCase { + @Mock private PrimaryBouncerInteractor mPrimaryBouncerInteractor; + @Mock private NotificationLockscreenUserManager mNotificationLockscreenUserManager; + @Mock private MetricsLogger mMetricsLogger; +- @Mock private ColorUpdateLogger mColorUpdateLogger; + @Mock private DumpManager mDumpManager; + @Mock(answer = Answers.RETURNS_SELF) + private NotificationSwipeHelper.Builder mNotificationSwipeHelperBuilder; +@@ -1009,7 +1007,6 @@ public class NotificationStackScrollLayoutControllerTest extends SysuiTestCase { + mZenModeController, + mNotificationLockscreenUserManager, + mMetricsLogger, +- mColorUpdateLogger, + mDumpManager, + new FalsingCollectorFake(), + new FalsingManagerFake(), +diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/policy/FakeConfigurationController.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/policy/FakeConfigurationController.kt +index 46a10532ea52..c51de334c8ca 100644 +--- a/packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/policy/FakeConfigurationController.kt ++++ b/packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/policy/FakeConfigurationController.kt +@@ -43,7 +43,6 @@ class FakeConfigurationController @Inject constructor() : ConfigurationControlle + } + + override fun isLayoutRtl(): Boolean = isRtl +- override fun getNightModeName(): String = "undefined" + } + + @Module +diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/utils/leaks/FakeConfigurationController.java b/packages/SystemUI/tests/utils/src/com/android/systemui/utils/leaks/FakeConfigurationController.java +index 111c40d49efc..516eb6e6dffd 100644 +--- a/packages/SystemUI/tests/utils/src/com/android/systemui/utils/leaks/FakeConfigurationController.java ++++ b/packages/SystemUI/tests/utils/src/com/android/systemui/utils/leaks/FakeConfigurationController.java +@@ -38,9 +38,4 @@ public class FakeConfigurationController + public boolean isLayoutRtl() { + return false; + } +- +- @Override +- public String getNightModeName() { +- return "undefined"; +- } + } +-- +2.34.1 + diff --git a/patches_platform/frameworks_base/0016-Revert-Change-color-of-track.patch b/patches_platform/frameworks_base/0016-Revert-Change-color-of-track.patch new file mode 100644 index 0000000..443dc1d --- /dev/null +++ b/patches_platform/frameworks_base/0016-Revert-Change-color-of-track.patch @@ -0,0 +1,54 @@ +From 2f0cb797274c27772f923c7a07ef830c12ddbfd4 Mon Sep 17 00:00:00 2001 +From: Andy CrossGate Yan +Date: Sun, 30 Jun 2024 16:49:47 +0800 +Subject: [PATCH 16/43] Revert "Change color of track" + +This reverts commit 9ba91db9836625e5f45367b38b76cf08615cce00. +--- + .../res/color/brightness_slider_track.xml | 19 ------------------- + .../drawable/brightness_progress_drawable.xml | 2 +- + 2 files changed, 1 insertion(+), 20 deletions(-) + delete mode 100644 packages/SystemUI/res/color/brightness_slider_track.xml + +diff --git a/packages/SystemUI/res/color/brightness_slider_track.xml b/packages/SystemUI/res/color/brightness_slider_track.xml +deleted file mode 100644 +index 6028769f3789..000000000000 +--- a/packages/SystemUI/res/color/brightness_slider_track.xml ++++ /dev/null +@@ -1,19 +0,0 @@ +- +- +- +- +- +\ No newline at end of file +diff --git a/packages/SystemUI/res/drawable/brightness_progress_drawable.xml b/packages/SystemUI/res/drawable/brightness_progress_drawable.xml +index cae9d6b0513e..95c7778c0e76 100644 +--- a/packages/SystemUI/res/drawable/brightness_progress_drawable.xml ++++ b/packages/SystemUI/res/drawable/brightness_progress_drawable.xml +@@ -24,7 +24,7 @@ + + + +- ++ + + + +-- +2.34.1 + diff --git a/patches_platform/frameworks_base/0017-Revert-Fix-the-text-color-used-on-the-notification-u.patch b/patches_platform/frameworks_base/0017-Revert-Fix-the-text-color-used-on-the-notification-u.patch new file mode 100644 index 0000000..185e2c5 --- /dev/null +++ b/patches_platform/frameworks_base/0017-Revert-Fix-the-text-color-used-on-the-notification-u.patch @@ -0,0 +1,27 @@ +From 587d8c7b04046a1a52c6dba36dbafaf95911b30e Mon Sep 17 00:00:00 2001 +From: Andy CrossGate Yan +Date: Sun, 30 Jun 2024 16:13:51 +0800 +Subject: [PATCH 17/43] Revert "Fix the text color used on the notification + unread indicator." + +This reverts commit aee60c49308a81125587ea0c53f40c9d5d60707e. +--- + core/java/android/app/Notification.java | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/core/java/android/app/Notification.java b/core/java/android/app/Notification.java +index 1129f9dbdfeb..baecf785a8af 100644 +--- a/core/java/android/app/Notification.java ++++ b/core/java/android/app/Notification.java +@@ -5721,7 +5721,7 @@ public class Notification implements Parcelable + pillColor = Colors.flattenAlpha( + getColors(p).getTertiaryFixedDimAccentColor(), bgColor); + textColor = Colors.flattenAlpha( +- getColors(p).getOnTertiaryFixedAccentTextColor(), pillColor); ++ getColors(p).getOnTertiaryAccentTextColor(), pillColor); + } + contentView.setInt(R.id.expand_button, "setHighlightTextColor", textColor); + contentView.setInt(R.id.expand_button, "setHighlightPillColor", pillColor); +-- +2.34.1 + diff --git a/patches_platform/frameworks_base/0016-Revert-Update-SystemUI-to-new-notification-color-spe.patch b/patches_platform/frameworks_base/0018-Revert-Update-SystemUI-to-new-notification-color-spe.patch similarity index 96% rename from patches_platform/frameworks_base/0016-Revert-Update-SystemUI-to-new-notification-color-spe.patch rename to patches_platform/frameworks_base/0018-Revert-Update-SystemUI-to-new-notification-color-spe.patch index 37333ce..e8ea5c1 100644 --- a/patches_platform/frameworks_base/0016-Revert-Update-SystemUI-to-new-notification-color-spe.patch +++ b/patches_platform/frameworks_base/0018-Revert-Update-SystemUI-to-new-notification-color-spe.patch @@ -1,7 +1,7 @@ -From c650743c1e67f48640774af517a2ce77f04e1141 Mon Sep 17 00:00:00 2001 +From 912eb2ce819f09cf4e4592833547ea94b8ee3d80 Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Thu, 4 Apr 2024 18:26:02 +0800 -Subject: [PATCH 16/34] Revert "Update SystemUI to new notification color spec" +Subject: [PATCH 18/43] Revert "Update SystemUI to new notification color spec" This reverts commit db2c5554ac653567d1433d3ff99328c5d855c233. @@ -37,13 +37,13 @@ Change-Id: Iddbe46f4d01d05d6579c1e8b9dab266dd605e199 .../row/wrapper/NotificationViewWrapper.java | 3 +- .../stack/NotificationChildrenContainer.java | 2 +- .../stack/NotificationSectionsManager.kt | 8 ++--- - .../stack/NotificationStackScrollLayout.java | 25 +++++++--------- + .../stack/NotificationStackScrollLayout.java | 23 +++++++------- .../notification/stack/SectionHeaderView.java | 6 ++-- .../statusbar/phone/ScrimController.java | 5 ++-- .../statusbar/phone/TapAgainView.java | 7 ++--- .../statusbar/policy/RemoteInputView.java | 15 +++++----- .../row/ActivatableNotificationViewTest.kt | 5 ++-- - 36 files changed, 101 insertions(+), 139 deletions(-) + 36 files changed, 101 insertions(+), 137 deletions(-) diff --git a/packages/SystemUI/res/color/notification_guts_priority_button_bg_stroke.xml b/packages/SystemUI/res/color/notification_guts_priority_button_bg_stroke.xml index d1b8a064724d..015e9f99212d 100644 @@ -153,7 +153,7 @@ index 84e2231738d4..bd9394bf9f8a 100644 diff --git a/packages/SystemUI/res/drawable/notification_material_bg.xml b/packages/SystemUI/res/drawable/notification_material_bg.xml -index 355e75d0716b..3eaa6180ba1b 100644 +index 3f903aece0b5..40b9238b5e87 100644 --- a/packages/SystemUI/res/drawable/notification_material_bg.xml +++ b/packages/SystemUI/res/drawable/notification_material_bg.xml @@ -20,7 +20,7 @@ @@ -320,7 +320,7 @@ index 19a3f2fd521c..852db1b8fb91 100644 diff --git a/packages/SystemUI/res/layout/notification_snooze.xml b/packages/SystemUI/res/layout/notification_snooze.xml -index 6e541a7a5f32..8b5368098c00 100644 +index ce09385eaf45..6608d8620f86 100644 --- a/packages/SystemUI/res/layout/notification_snooze.xml +++ b/packages/SystemUI/res/layout/notification_snooze.xml @@ -23,7 +23,7 @@ @@ -409,7 +409,7 @@ index 53abe87e7c12..c4d8d55f74e2 100644 android:layout_width="wrap_content" android:layout_height="wrap_content" diff --git a/packages/SystemUI/res/values-night/colors.xml b/packages/SystemUI/res/values-night/colors.xml -index bcc3c83b4560..e759c1211a93 100644 +index 61a323d44dfc..ddf188e3f1d3 100644 --- a/packages/SystemUI/res/values-night/colors.xml +++ b/packages/SystemUI/res/values-night/colors.xml @@ -33,7 +33,7 @@ @@ -422,10 +422,10 @@ index bcc3c83b4560..e759c1211a93 100644 @color/GM2_grey_500 @color/GM2_grey_300 diff --git a/packages/SystemUI/res/values/colors.xml b/packages/SystemUI/res/values/colors.xml -index 34dcd655b8e7..91a72922fd0a 100644 +index 46364820c5d5..846fd5736590 100644 --- a/packages/SystemUI/res/values/colors.xml +++ b/packages/SystemUI/res/values/colors.xml -@@ -116,7 +116,7 @@ +@@ -121,7 +121,7 @@ #99000000 @@ -435,10 +435,10 @@ index 34dcd655b8e7..91a72922fd0a 100644 #fff44336 diff --git a/packages/SystemUI/res/values/styles.xml b/packages/SystemUI/res/values/styles.xml -index e3d4419afceb..7852608df57d 100644 +index ce08ca3e43af..ae354d634f67 100644 --- a/packages/SystemUI/res/values/styles.xml +++ b/packages/SystemUI/res/values/styles.xml -@@ -602,34 +602,34 @@ +@@ -625,34 +625,34 @@ -@@ -640,28 +640,10 @@ +@@ -663,28 +663,10 @@ center @@ -528,10 +528,10 @@ index 2338be28d32c..c9758471a30e 100644 public void setText(@StringRes int text) { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/footer/ui/view/FooterView.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/footer/ui/view/FooterView.java -index 3616fd6d8cd1..a6e07f1f5e3e 100644 +index 16f18a3c3fb6..17dc2a6ad815 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/footer/ui/view/FooterView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/footer/ui/view/FooterView.java -@@ -313,25 +313,26 @@ public class FooterView extends StackScrollerDecorView { +@@ -361,25 +361,26 @@ public class FooterView extends StackScrollerDecorView { */ public void updateColors() { Resources.Theme theme = mContext.getTheme(); @@ -559,11 +559,11 @@ index 3616fd6d8cd1..a6e07f1f5e3e 100644 mClearAllButton.setBackground(clearAllBg); - mClearAllButton.setTextColor(onSurface); + mClearAllButton.setTextColor(textColor); - mManageButton.setBackground(manageBg); -- mManageButton.setTextColor(onSurface); + mManageOrHistoryButton.setBackground(manageBg); +- mManageOrHistoryButton.setTextColor(onSurface); - mSeenNotifsFooterTextView.setTextColor(onSurface); - mSeenNotifsFooterTextView.setCompoundDrawableTintList(ColorStateList.valueOf(onSurface)); -+ mManageButton.setTextColor(textColor); ++ mManageOrHistoryButton.setTextColor(textColor); + final @ColorInt int labelTextColor = + Utils.getColorAttrDefaultColor(mContext, android.R.attr.textColorPrimary); + mSeenNotifsFooterTextView.setTextColor(labelTextColor); @@ -573,10 +573,10 @@ index 3616fd6d8cd1..a6e07f1f5e3e 100644 private void updateResources() { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ActivatableNotificationView.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ActivatableNotificationView.java -index 4fe05ec9990c..9fa9049cc7cd 100644 +index 83c50f52af6f..455a286346e6 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ActivatableNotificationView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ActivatableNotificationView.java -@@ -124,7 +124,7 @@ public abstract class ActivatableNotificationView extends ExpandableOutlineView +@@ -122,7 +122,7 @@ public abstract class ActivatableNotificationView extends ExpandableOutlineView private void updateColors() { mNormalColor = Utils.getColorAttrDefaultColor(mContext, @@ -654,10 +654,10 @@ index 50f3e7896442..6f602ff437eb 100644 } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationChildrenContainer.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationChildrenContainer.java -index 0236fc265add..a929e4f3ea7f 100644 +index fa973001cec7..3ac14fc39065 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationChildrenContainer.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationChildrenContainer.java -@@ -1362,7 +1362,7 @@ public class NotificationChildrenContainer extends ViewGroup +@@ -1504,7 +1504,7 @@ public class NotificationChildrenContainer extends ViewGroup Resources.Theme theme = new ContextThemeWrapper(mContext, com.android.internal.R.style.Theme_DeviceDefault_DayNight).getTheme(); try (TypedArray ta = theme.obtainStyledAttributes( @@ -667,7 +667,7 @@ index 0236fc265add..a929e4f3ea7f 100644 } mHybridGroupManager.setOverflowNumberColor(mOverflowNumber, color); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationSectionsManager.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationSectionsManager.kt -index cfc433a09c4d..fd064eeab2ab 100644 +index d269eda6795a..5cd0c0d08d3b 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationSectionsManager.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationSectionsManager.kt @@ -244,10 +244,10 @@ class NotificationSectionsManager @Inject internal constructor( @@ -686,10 +686,10 @@ index cfc433a09c4d..fd064eeab2ab 100644 companion object { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java -index 3bbdfd164ba7..c84aab1f83cb 100644 +index fb8bc7a34a9c..d8363fa54427 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java -@@ -341,7 +341,7 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable +@@ -351,7 +351,7 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable private boolean mAnimateNextBackgroundTop; private boolean mAnimateNextBackgroundBottom; private boolean mAnimateNextSectionBoundsChange; @@ -698,7 +698,7 @@ index 3bbdfd164ba7..c84aab1f83cb 100644 private float mDimAmount; private ValueAnimator mDimAnimator; private final ArrayList mTmpSortedChildren = new ArrayList<>(); -@@ -643,8 +643,8 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable +@@ -665,8 +665,8 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable mSections = mSectionsManager.createSectionsForBuckets(); mAmbientState = Dependency.get(AmbientState.class); @@ -709,7 +709,7 @@ index 3bbdfd164ba7..c84aab1f83cb 100644 int minHeight = res.getDimensionPixelSize(R.dimen.notification_min_height); int maxHeight = res.getDimensionPixelSize(R.dimen.notification_max_height); mSplitShadeMinContentHeight = res.getDimensionPixelSize( -@@ -780,8 +780,8 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable +@@ -810,8 +810,8 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable } void updateBgColor() { @@ -720,7 +720,7 @@ index 3bbdfd164ba7..c84aab1f83cb 100644 updateBackgroundDimming(); for (int i = 0; i < getChildCount(); i++) { View child = getChildAt(i); -@@ -4473,19 +4473,14 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable +@@ -4622,22 +4622,19 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable } /** @@ -734,17 +734,20 @@ index 3bbdfd164ba7..c84aab1f83cb 100644 - mContext, com.android.internal.R.attr.materialColorOnSurfaceVariant); - - mSectionsManager.setHeaderForegroundColors(onSurface, onSurfaceVariant); -- + final @ColorInt int textColor = + Utils.getColorAttrDefaultColor(mContext, android.R.attr.textColorPrimary); + mSectionsManager.setHeaderForegroundColor(textColor); - mFooterView.updateColors(); -- -- mEmptyShadeView.setTextColors(onSurface, onSurfaceVariant); -+ mEmptyShadeView.setTextColor(textColor); + + if (mFooterView != null) { + mFooterView.updateColors(); + } + + if (mEmptyShadeView != null) { +- mEmptyShadeView.setTextColors(onSurface, onSurfaceVariant); ++ mEmptyShadeView.setTextColor(textColor); + } } - void goToFullShade(long delay) { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/SectionHeaderView.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/SectionHeaderView.java index 580431a13d1b..59e1af5eb6f1 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/SectionHeaderView.java @@ -762,10 +765,10 @@ index 580431a13d1b..59e1af5eb6f1 100644 } } 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 ae04eaf49b65..05904eae769c 100644 +index d2e36b88fd9d..3404d5bbcc53 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java -@@ -1496,9 +1496,8 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, Dump +@@ -1555,9 +1555,8 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, Dump private void updateThemeColors() { if (mScrimBehind == null) return; int background = Utils.getColorAttr(mScrimBehind.getContext(), @@ -810,7 +813,7 @@ index 66ac17eee545..a033e1d55333 100644 } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/RemoteInputView.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/RemoteInputView.java -index 4864fb8ca634..ceed81a182aa 100644 +index 2a48807ace2f..e02881951dd4 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/RemoteInputView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/RemoteInputView.java @@ -130,7 +130,7 @@ public class RemoteInputView extends LinearLayout implements View.OnClickListene diff --git a/patches_platform/frameworks_base/0017-Revert-Update-framework-to-new-notification-color-sp.patch b/patches_platform/frameworks_base/0019-Revert-Update-framework-to-new-notification-color-sp.patch similarity index 93% rename from patches_platform/frameworks_base/0017-Revert-Update-framework-to-new-notification-color-sp.patch rename to patches_platform/frameworks_base/0019-Revert-Update-framework-to-new-notification-color-sp.patch index e7464e6..dd2008d 100644 --- a/patches_platform/frameworks_base/0017-Revert-Update-framework-to-new-notification-color-sp.patch +++ b/patches_platform/frameworks_base/0019-Revert-Update-framework-to-new-notification-color-sp.patch @@ -1,7 +1,7 @@ -From 456e921e4ea5b79cdf5afbf5207c663d47e1a3b2 Mon Sep 17 00:00:00 2001 +From ddefb3aa749044a6b4838687f669c390512c6711 Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Thu, 4 Apr 2024 18:26:08 +0800 -Subject: [PATCH 17/34] Revert "Update framework to new notification color +Subject: [PATCH 19/43] Revert "Update framework to new notification color spec" This reverts commit 6063e254e0cc84243e3a3fb85fe1bff71b302a87. @@ -12,10 +12,10 @@ This reverts commit 6063e254e0cc84243e3a3fb85fe1bff71b302a87. 3 files changed, 15 insertions(+), 53 deletions(-) diff --git a/core/java/android/app/Notification.java b/core/java/android/app/Notification.java -index 7454e52b50ef..5d55f3440b57 100644 +index baecf785a8af..671b8d4153c5 100644 --- a/core/java/android/app/Notification.java +++ b/core/java/android/app/Notification.java -@@ -5618,8 +5618,7 @@ public class Notification implements Parcelable +@@ -5718,8 +5718,7 @@ public class Notification implements Parcelable contentView.setInt(R.id.expand_button, "setDefaultPillColor", pillColor); // Use different highlighted colors for conversations' unread count if (p.mHighlightExpander) { @@ -25,7 +25,7 @@ index 7454e52b50ef..5d55f3440b57 100644 textColor = Colors.flattenAlpha( getColors(p).getOnTertiaryAccentTextColor(), pillColor); } -@@ -12782,9 +12781,6 @@ public class Notification implements Parcelable +@@ -12944,9 +12943,6 @@ public class Notification implements Parcelable private int mSecondaryAccentColor = COLOR_INVALID; private int mTertiaryAccentColor = COLOR_INVALID; private int mOnTertiaryAccentTextColor = COLOR_INVALID; @@ -35,7 +35,7 @@ index 7454e52b50ef..5d55f3440b57 100644 private int mErrorColor = COLOR_INVALID; private int mContrastColor = COLOR_INVALID; private int mRippleAlpha = 0x33; -@@ -12842,7 +12838,7 @@ public class Notification implements Parcelable +@@ -13004,7 +13000,7 @@ public class Notification implements Parcelable if (isColorized) { if (rawColor == COLOR_DEFAULT) { @@ -44,7 +44,7 @@ index 7454e52b50ef..5d55f3440b57 100644 try (TypedArray ta = obtainDayNightAttributes(ctx, attrs)) { mBackgroundColor = getColor(ta, 0, Color.WHITE); } -@@ -12860,21 +12856,17 @@ public class Notification implements Parcelable +@@ -13022,21 +13018,17 @@ public class Notification implements Parcelable mSecondaryAccentColor = mSecondaryTextColor; mTertiaryAccentColor = flattenAlpha(mPrimaryTextColor, mBackgroundColor); mOnTertiaryAccentTextColor = mBackgroundColor; @@ -73,7 +73,7 @@ index 7454e52b50ef..5d55f3440b57 100644 R.attr.colorError, R.attr.colorControlHighlight }; -@@ -12886,10 +12878,8 @@ public class Notification implements Parcelable +@@ -13048,10 +13040,8 @@ public class Notification implements Parcelable mSecondaryAccentColor = getColor(ta, 4, COLOR_INVALID); mTertiaryAccentColor = getColor(ta, 5, COLOR_INVALID); mOnTertiaryAccentTextColor = getColor(ta, 6, COLOR_INVALID); @@ -86,7 +86,7 @@ index 7454e52b50ef..5d55f3440b57 100644 } mContrastColor = calculateContrastColor(ctx, rawColor, mPrimaryAccentColor, mBackgroundColor, nightMode); -@@ -12917,14 +12907,6 @@ public class Notification implements Parcelable +@@ -13079,14 +13069,6 @@ public class Notification implements Parcelable ContrastColorUtil.resolvePrimaryColor( ctx, mTertiaryAccentColor, nightMode), 0xFF); } @@ -101,7 +101,7 @@ index 7454e52b50ef..5d55f3440b57 100644 if (mErrorColor == COLOR_INVALID) { mErrorColor = mPrimaryTextColor; } -@@ -12998,16 +12980,6 @@ public class Notification implements Parcelable +@@ -13160,16 +13142,6 @@ public class Notification implements Parcelable return mOnTertiaryAccentTextColor; } @@ -119,7 +119,7 @@ index 7454e52b50ef..5d55f3440b57 100644 * @return the contrast-adjusted version of the color provided by the app, or the * primary text color when colorized. diff --git a/core/res/res/values/colors.xml b/core/res/res/values/colors.xml -index 00cf4243cfa9..2050cfe11d0e 100644 +index d8191c0c3597..b4139f343fa5 100644 --- a/core/res/res/values/colors.xml +++ b/core/res/res/values/colors.xml @@ -135,12 +135,11 @@ diff --git a/patches_platform/frameworks_base/0018-Revert-Make-QS-always-use-dark-theme-colors.patch b/patches_platform/frameworks_base/0020-Revert-Make-QS-always-use-dark-theme-colors.patch similarity index 84% rename from patches_platform/frameworks_base/0018-Revert-Make-QS-always-use-dark-theme-colors.patch rename to patches_platform/frameworks_base/0020-Revert-Make-QS-always-use-dark-theme-colors.patch index 0a1c0a7..dad3792 100644 --- a/patches_platform/frameworks_base/0018-Revert-Make-QS-always-use-dark-theme-colors.patch +++ b/patches_platform/frameworks_base/0020-Revert-Make-QS-always-use-dark-theme-colors.patch @@ -1,7 +1,7 @@ -From 35bdcaf6f7a98a68854ac256261d0eb91b1493aa Mon Sep 17 00:00:00 2001 +From 8a7d67d51befd145133c5ef14ba28988e26d991f Mon Sep 17 00:00:00 2001 From: Danny Lin Date: Wed, 6 Oct 2021 18:40:30 -0700 -Subject: [PATCH 18/34] Revert "Make QS always use dark theme colors" +Subject: [PATCH 20/43] Revert "Make QS always use dark theme colors" This reverts commit d62f7249f9e3222da95ecf6816601c408aac6be5. @@ -14,10 +14,10 @@ Change-Id: Iac4c96ccb3845812ca3df820bf27dc533816f72e 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/SystemUI/res/values/styles.xml b/packages/SystemUI/res/values/styles.xml -index 7852608df57d..a3d93d832b38 100644 +index ae354d634f67..7422d5a14221 100644 --- a/packages/SystemUI/res/values/styles.xml +++ b/packages/SystemUI/res/values/styles.xml -@@ -389,7 +389,7 @@ +@@ -412,7 +412,7 @@ @style/AuthCredentialPinPasswordContainerStyle diff --git a/patches_platform/frameworks_base/0019-Revert-Do-not-re-inflate-QS-and-SB-when-CONFIG_UI_MO.patch b/patches_platform/frameworks_base/0021-Revert-Do-not-re-inflate-QS-and-SB-when-CONFIG_UI_MO.patch similarity index 91% rename from patches_platform/frameworks_base/0019-Revert-Do-not-re-inflate-QS-and-SB-when-CONFIG_UI_MO.patch rename to patches_platform/frameworks_base/0021-Revert-Do-not-re-inflate-QS-and-SB-when-CONFIG_UI_MO.patch index 873dfac..79aabbf 100644 --- a/patches_platform/frameworks_base/0019-Revert-Do-not-re-inflate-QS-and-SB-when-CONFIG_UI_MO.patch +++ b/patches_platform/frameworks_base/0021-Revert-Do-not-re-inflate-QS-and-SB-when-CONFIG_UI_MO.patch @@ -1,7 +1,7 @@ -From 2ae2df9278711f93390bede651b69a56099af35b Mon Sep 17 00:00:00 2001 +From 5235e78b8933c01f407adf7d19f30ccd19d0ad16 Mon Sep 17 00:00:00 2001 From: Danny Lin Date: Wed, 6 Oct 2021 18:41:11 -0700 -Subject: [PATCH 19/34] Revert "Do not re-inflate QS and SB when +Subject: [PATCH 21/43] Revert "Do not re-inflate QS and SB when CONFIG_UI_MODE" This reverts commit 8a40ff855b86bc86e23367017002289920855a4e. diff --git a/patches_platform/frameworks_base/0020-SystemUI-Follow-light-dark-theme-in-quick-settings.patch b/patches_platform/frameworks_base/0022-SystemUI-Follow-light-dark-theme-in-quick-settings.patch similarity index 88% rename from patches_platform/frameworks_base/0020-SystemUI-Follow-light-dark-theme-in-quick-settings.patch rename to patches_platform/frameworks_base/0022-SystemUI-Follow-light-dark-theme-in-quick-settings.patch index c959ab6..dcebcc6 100644 --- a/patches_platform/frameworks_base/0020-SystemUI-Follow-light-dark-theme-in-quick-settings.patch +++ b/patches_platform/frameworks_base/0022-SystemUI-Follow-light-dark-theme-in-quick-settings.patch @@ -1,7 +1,7 @@ -From 5f65456d8135c74d48cd0528fdf7005e235ffd43 Mon Sep 17 00:00:00 2001 +From 4325ec74e21420a222860e473e9062c874046f9d Mon Sep 17 00:00:00 2001 From: Danny Lin Date: Mon, 11 Oct 2021 19:24:58 -0700 -Subject: [PATCH 20/34] SystemUI: Follow light/dark theme in quick settings +Subject: [PATCH 22/43] 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 @@ -33,8 +33,8 @@ Signed-off-by: Pranav Vashi packages/SystemUI/res/values-night/styles.xml | 31 ++++++++++++++++++- packages/SystemUI/res/values/styles.xml | 20 ++++++------ .../statusbar/phone/ScrimController.java | 2 +- - .../systemui/statusbar/phone/ScrimState.java | 16 +++++----- - 4 files changed, 49 insertions(+), 20 deletions(-) + .../systemui/statusbar/phone/ScrimState.java | 20 ++++++------ + 4 files changed, 51 insertions(+), 22 deletions(-) diff --git a/packages/SystemUI/res/values-night/styles.xml b/packages/SystemUI/res/values-night/styles.xml index b6971d3c1fa4..8972df2b7490 100644 @@ -86,10 +86,10 @@ index b6971d3c1fa4..8972df2b7490 100644 -@@ -663,7 +663,7 @@ +@@ -686,7 +686,7 @@ + +- + + + + + +-- +2.34.1 + diff --git a/patches_platform/frameworks_base/0033-SystemUI-Follow-monet-theme-on-privacy-indicators.patch b/patches_platform/frameworks_base/0038-SystemUI-Follow-monet-theme-on-privacy-indicators.patch similarity index 86% rename from patches_platform/frameworks_base/0033-SystemUI-Follow-monet-theme-on-privacy-indicators.patch rename to patches_platform/frameworks_base/0038-SystemUI-Follow-monet-theme-on-privacy-indicators.patch index 7708818..f3b05cf 100644 --- a/patches_platform/frameworks_base/0033-SystemUI-Follow-monet-theme-on-privacy-indicators.patch +++ b/patches_platform/frameworks_base/0038-SystemUI-Follow-monet-theme-on-privacy-indicators.patch @@ -1,7 +1,7 @@ -From 43b40366ed1feb86002b849851678baeed250d47 Mon Sep 17 00:00:00 2001 +From bdbd29ab6b1fb3db6084247eceabd95ec35993c6 Mon Sep 17 00:00:00 2001 From: minaripenguin Date: Fri, 24 Mar 2023 13:04:06 +0800 -Subject: [PATCH 33/34] SystemUI: Follow monet theme on privacy indicators +Subject: [PATCH 38/43] SystemUI: Follow monet theme on privacy indicators Change-Id: Ib713cb3283fcf3a49086c5da8360d2a1b6cd6704 Signed-off-by: minaripenguin @@ -12,10 +12,10 @@ Signed-off-by: Pranav Vashi 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/SystemUI/res/values/colors.xml b/packages/SystemUI/res/values/colors.xml -index 0e59b3b774df..8a02dca04251 100644 +index 402e44c3fb31..50b962310ac9 100644 --- a/packages/SystemUI/res/values/colors.xml +++ b/packages/SystemUI/res/values/colors.xml -@@ -216,7 +216,7 @@ +@@ -224,7 +224,7 @@ #E94235 #D93025 @@ -25,10 +25,10 @@ index 0e59b3b774df..8a02dca04251 100644 #CCFFFFFF diff --git a/packages/SystemUI/src/com/android/systemui/privacy/OngoingPrivacyChip.kt b/packages/SystemUI/src/com/android/systemui/privacy/OngoingPrivacyChip.kt -index 8e1b00d825aa..a79a10639b9d 100644 +index 7a4be3fdc93b..19ac5fccac5f 100644 --- a/packages/SystemUI/src/com/android/systemui/privacy/OngoingPrivacyChip.kt +++ b/packages/SystemUI/src/com/android/systemui/privacy/OngoingPrivacyChip.kt -@@ -123,7 +123,7 @@ class OngoingPrivacyChip @JvmOverloads constructor( +@@ -125,7 +125,7 @@ class OngoingPrivacyChip @JvmOverloads constructor( iconSize = context.resources .getDimensionPixelSize(R.dimen.ongoing_appops_chip_icon_size) iconColor = diff --git a/patches_platform/frameworks_base/0034-SystemUI-Follow-monet-theme-on-battery-chip.patch b/patches_platform/frameworks_base/0039-SystemUI-Follow-monet-theme-on-battery-chip.patch similarity index 85% rename from patches_platform/frameworks_base/0034-SystemUI-Follow-monet-theme-on-battery-chip.patch rename to patches_platform/frameworks_base/0039-SystemUI-Follow-monet-theme-on-battery-chip.patch index d0e7ec3..7a6c9c3 100644 --- a/patches_platform/frameworks_base/0034-SystemUI-Follow-monet-theme-on-battery-chip.patch +++ b/patches_platform/frameworks_base/0039-SystemUI-Follow-monet-theme-on-battery-chip.patch @@ -1,7 +1,7 @@ -From 83a1b45cc8d1d6d4f5d8d275db29fc7ed3f34cff Mon Sep 17 00:00:00 2001 +From 9b624db6528d95a77ea550b011af435ca4425571 Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Wed, 10 Jan 2024 23:36:41 +0800 -Subject: [PATCH 34/34] SystemUI: Follow monet theme on battery chip +Subject: [PATCH 39/43] SystemUI: Follow monet theme on battery chip Why does this chip even exist... @@ -30,18 +30,18 @@ index d7de16d7c5bb..dd1db04e77d7 100644 \ No newline at end of file + diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/BatteryStatusChip.kt b/packages/SystemUI/src/com/android/systemui/statusbar/BatteryStatusChip.kt -index 835225009110..04373eb7ed87 100644 +index a58ce4162ddc..32c015f3230d 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/BatteryStatusChip.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/BatteryStatusChip.kt -@@ -22,6 +22,7 @@ import android.util.AttributeSet - import android.view.View +@@ -23,6 +23,7 @@ import android.view.View import android.widget.FrameLayout import android.widget.LinearLayout + import com.android.settingslib.flags.Flags.newStatusBarIcons +import com.android.settingslib.Utils import com.android.systemui.battery.BatteryMeterView + import com.android.systemui.battery.unified.BatteryColors import com.android.systemui.res.R - import com.android.systemui.statusbar.events.BackgroundAnimatableView -@@ -65,6 +66,11 @@ class BatteryStatusChip @JvmOverloads constructor(context: Context, attrs: Attri +@@ -71,6 +72,11 @@ class BatteryStatusChip @JvmOverloads constructor(context: Context, attrs: Attri @SuppressLint("UseCompatLoadingForDrawables") private fun updateResources() { diff --git a/patches_platform/frameworks_base/0040-ThemeOverlayController-Remove-repeated-monet-check.patch b/patches_platform/frameworks_base/0040-ThemeOverlayController-Remove-repeated-monet-check.patch new file mode 100644 index 0000000..9fbf975 --- /dev/null +++ b/patches_platform/frameworks_base/0040-ThemeOverlayController-Remove-repeated-monet-check.patch @@ -0,0 +1,29 @@ +From 2f4e9b7a4cc9c22ba9586fe855c31f99cc47abbf Mon Sep 17 00:00:00 2001 +From: Pranav Vashi +Date: Sat, 17 Sep 2022 12:20:38 +0530 +Subject: [PATCH 40/43] ThemeOverlayController: Remove repeated monet check + +Change-Id: I6608df48c1a89a87eaf08d9f267e0a83e9bbd3d1 +Signed-off-by: Pranav Vashi +--- + .../com/android/systemui/theme/ThemeOverlayController.java | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/packages/SystemUI/src/com/android/systemui/theme/ThemeOverlayController.java b/packages/SystemUI/src/com/android/systemui/theme/ThemeOverlayController.java +index 84e32a1dbaae..44b54080efc4 100644 +--- a/packages/SystemUI/src/com/android/systemui/theme/ThemeOverlayController.java ++++ b/packages/SystemUI/src/com/android/systemui/theme/ThemeOverlayController.java +@@ -551,10 +551,6 @@ public class ThemeOverlayController implements CoreStartable, Dumpable { + }, + UserHandle.USER_ALL); + +- if (!mIsMonetEnabled) { +- return; +- } +- + mUserTracker.addCallback(mUserTrackerCallback, mMainExecutor); + + mConfigurationController.addCallback(mConfigurationListener); +-- +2.34.1 + diff --git a/patches_platform/frameworks_base/0041-SystemUI-Use-color-accent-for-charging-animation.patch b/patches_platform/frameworks_base/0041-SystemUI-Use-color-accent-for-charging-animation.patch new file mode 100644 index 0000000..9423d63 --- /dev/null +++ b/patches_platform/frameworks_base/0041-SystemUI-Use-color-accent-for-charging-animation.patch @@ -0,0 +1,54 @@ +From a1462dcc2242256bde5e69c60306726c25e7281c Mon Sep 17 00:00:00 2001 +From: Genkzsz11 +Date: Sat, 16 Apr 2022 00:18:51 +0700 +Subject: [PATCH 41/43] SystemUI: Use color accent for charging animation + +Change-Id: Ideade5e9375510a31496ad75c5b74f12444350c9 +Signed-off-by: Omkar Chandorkar +Signed-off-by: Pranav Vashi +--- + packages/SystemUI/res/values/styles.xml | 11 +++-------- + .../systemui/charging/WirelessChargingLayout.java | 4 ++-- + 2 files changed, 5 insertions(+), 10 deletions(-) + +diff --git a/packages/SystemUI/res/values/styles.xml b/packages/SystemUI/res/values/styles.xml +index e4f2cf70b0d3..fc5023697a32 100644 +--- a/packages/SystemUI/res/values/styles.xml ++++ b/packages/SystemUI/res/values/styles.xml +@@ -817,14 +817,9 @@ + + +- +- + + +diff --git a/packages/SystemUI/src/com/android/systemui/charging/WirelessChargingLayout.java b/packages/SystemUI/src/com/android/systemui/charging/WirelessChargingLayout.java +index 047d15daf6f8..a9a657730109 100644 +--- a/packages/SystemUI/src/com/android/systemui/charging/WirelessChargingLayout.java ++++ b/packages/SystemUI/src/com/android/systemui/charging/WirelessChargingLayout.java +@@ -78,9 +78,9 @@ final class WirelessChargingLayout extends FrameLayout { + (transmittingBatteryLevel != WirelessChargingAnimation.UNKNOWN_BATTERY_LEVEL); + + // set style based on background +- int style = R.style.ChargingAnim_WallpaperBackground; ++ int style = R.style.ChargingAnim_Background; + if (isDozing) { +- style = R.style.ChargingAnim_DarkBackground; ++ style = R.style.ChargingAnim_Background; + } + + inflate(new ContextThemeWrapper(context, style), R.layout.wireless_charging_layout, this); +-- +2.34.1 + diff --git a/patches_platform/frameworks_base/0042-colors_device_defaults-Add-chroma-to-light-surface-h.patch b/patches_platform/frameworks_base/0042-colors_device_defaults-Add-chroma-to-light-surface-h.patch new file mode 100644 index 0000000..eaf1b73 --- /dev/null +++ b/patches_platform/frameworks_base/0042-colors_device_defaults-Add-chroma-to-light-surface-h.patch @@ -0,0 +1,33 @@ +From af3769a81e043d84bf044dd5cbbd7fbd49627b86 Mon Sep 17 00:00:00 2001 +From: Danny Lin +Date: Thu, 13 Oct 2022 15:07:22 +0800 +Subject: [PATCH 42/43] colors_device_defaults: Add chroma to light surface + highlight color + +With dynamic Monet themes, most of the UI has at least a small amount +of color (chroma), so pure white stands out as the sole outlier (e.g. +Settings search bar in light mode). Use the 99% lightness shade instead +to improve consistency. + +Change-Id: I7dfe3e483fa207ce4d77349ac97872e0831ef3c8 +Signed-off-by: Pranav Vashi +--- + core/res/res/values/colors_device_defaults.xml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/core/res/res/values/colors_device_defaults.xml b/core/res/res/values/colors_device_defaults.xml +index 4c5a008a3402..5d3d6a3155a9 100644 +--- a/core/res/res/values/colors_device_defaults.xml ++++ b/core/res/res/values/colors_device_defaults.xml +@@ -59,7 +59,7 @@ + @color/system_neutral1_700 + @color/system_neutral2_100 + @color/system_neutral1_800 +- @color/system_neutral1_0 ++ @color/system_neutral1_10 + + + @color/text_color_primary_device_default_light +-- +2.34.1 + diff --git a/patches_platform/frameworks_base/0043-config_progress_background_tint-Use-accent-color-for.patch b/patches_platform/frameworks_base/0043-config_progress_background_tint-Use-accent-color-for.patch new file mode 100644 index 0000000..18bf6bc --- /dev/null +++ b/patches_platform/frameworks_base/0043-config_progress_background_tint-Use-accent-color-for.patch @@ -0,0 +1,30 @@ +From e3fcd9c40a3d0fa641bc1e90892bd5a54ecde7e6 Mon Sep 17 00:00:00 2001 +From: Danny Lin +Date: Thu, 13 Oct 2022 15:07:59 +0800 +Subject: [PATCH 43/43] config_progress_background_tint: Use accent color for + progress bar background + +This matches the stock Pixel style and makes progress bars look more +integrated, since the active (foreground) part is using the accent +color. + +Change-Id: Ife7a79a390f6f9bdb2fd76722cd39adcfc182da1 +Signed-off-by: Pranav Vashi +--- + core/res/res/color/config_progress_background_tint.xml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/core/res/res/color/config_progress_background_tint.xml b/core/res/res/color/config_progress_background_tint.xml +index b086e20bf161..dfc914e76c8d 100644 +--- a/core/res/res/color/config_progress_background_tint.xml ++++ b/core/res/res/color/config_progress_background_tint.xml +@@ -15,5 +15,5 @@ + --> + + +- ++ + +-- +2.34.1 + diff --git a/patches_platform/packages_apps_SetupWizard/0001-SetupWizard-Remove-step-for-changing-theme.patch b/patches_platform/packages_apps_SetupWizard/0001-SetupWizard-Remove-step-for-changing-theme.patch index d651590..8de0edc 100644 --- a/patches_platform/packages_apps_SetupWizard/0001-SetupWizard-Remove-step-for-changing-theme.patch +++ b/patches_platform/packages_apps_SetupWizard/0001-SetupWizard-Remove-step-for-changing-theme.patch @@ -1,4 +1,4 @@ -From 2194bcf5d390be451ff641a0d779a2a815d1d67a Mon Sep 17 00:00:00 2001 +From fb1a8efb48bd9aa11b1dfdab6ca7701a130e9bca Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Mon, 26 Feb 2024 08:41:08 +0800 Subject: [PATCH] SetupWizard: Remove step for changing theme @@ -13,13 +13,13 @@ Change-Id: Id83207c766d6b0b23cd240b35936289c44026db5 3 files changed, 15 deletions(-) diff --git a/res/raw/lineage_wizard_script.xml b/res/raw/lineage_wizard_script.xml -index 0befc2b..ea342b6 100644 +index 7c87abd..af3df01 100644 --- a/res/raw/lineage_wizard_script.xml +++ b/res/raw/lineage_wizard_script.xml -@@ -82,12 +82,6 @@ +@@ -83,12 +83,6 @@ + wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_LOCKSCREEN_SETTINGS;end" + id="lockscreen_settings"> - - - @@ -30,13 +30,13 @@ index 0befc2b..ea342b6 100644 diff --git a/res/raw/lineage_wizard_script_user.xml b/res/raw/lineage_wizard_script_user.xml -index aef7f2e..af38520 100644 +index 15325c6..1522eda 100644 --- a/res/raw/lineage_wizard_script_user.xml +++ b/res/raw/lineage_wizard_script_user.xml -@@ -34,12 +34,6 @@ +@@ -35,12 +35,6 @@ + wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_LOCKSCREEN_SETTINGS;end" + id="lockscreen_settings"> - - - diff --git a/patches_platform_personal/build_make/0001-build-Integrate-prop-modifications-1-2.patch b/patches_platform_personal/build_make/0001-build-Integrate-prop-modifications-1-2.patch index 25301e2..233c028 100644 --- a/patches_platform_personal/build_make/0001-build-Integrate-prop-modifications-1-2.patch +++ b/patches_platform_personal/build_make/0001-build-Integrate-prop-modifications-1-2.patch @@ -1,15 +1,15 @@ -From 6c64bd7235f1c7b080fd95dc7a199350c740d8b0 Mon Sep 17 00:00:00 2001 +From 3b91dda8987fcc5f4ccb33cff692f58d39b2f06d Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Sun, 20 Jun 2021 09:08:43 +0000 Subject: [PATCH 1/2] build: Integrate prop modifications (1/2) Change-Id: I24f54937e3e542b7c29ea86d24e3f523583a0c61 --- - tools/buildinfo.sh | 9 +++++++-- - 1 file changed, 7 insertions(+), 2 deletions(-) + tools/buildinfo.sh | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tools/buildinfo.sh b/tools/buildinfo.sh -index e68162a6fe..ba29698719 100755 +index e68162a6fe..a7d9f5bdcd 100755 --- a/tools/buildinfo.sh +++ b/tools/buildinfo.sh @@ -9,7 +9,7 @@ if [ "$BOARD_USE_VBMETA_DIGTEST_IN_FINGERPRINT" = "true" ] ; then @@ -30,15 +30,13 @@ index e68162a6fe..ba29698719 100755 echo "ro.build.date.utc=`$DATE +%s`" echo "ro.build.type=$TARGET_BUILD_TYPE" echo "ro.build.user=$BUILD_USERNAME" -@@ -57,5 +57,10 @@ if [ -n "$BUILD_THUMBPRINT" ] ; then +@@ -57,5 +57,8 @@ if [ -n "$BUILD_THUMBPRINT" ] ; then fi echo "ro.lineage.device=$LINEAGE_DEVICE" +echo "ro.lineage.version=LineageOS 21 Self-built CGMod" +echo "ro.lineage.display.version=LineageOS 21 Self-built CGMod" +echo "ro.modversion=LineageOS 21 Self-built CGMod" -+ -+echo "lockscreen.rot_override=true" echo "# end build properties" -- diff --git a/patches_platform_personal/build_make/0002-build-Remove-Stk-1-2.patch b/patches_platform_personal/build_make/0002-build-Remove-Stk-1-2.patch index f6f2166..1b3d266 100644 --- a/patches_platform_personal/build_make/0002-build-Remove-Stk-1-2.patch +++ b/patches_platform_personal/build_make/0002-build-Remove-Stk-1-2.patch @@ -1,4 +1,4 @@ -From 5266372262a0d48bbb6251c6f8af75c01c76ab5c Mon Sep 17 00:00:00 2001 +From 45dd8686e204f58063348a9ba5caeb2249ae85a5 Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Sat, 16 Oct 2021 00:39:15 +0000 Subject: [PATCH 2/2] build: Remove Stk (1/2) @@ -9,7 +9,7 @@ Change-Id: I24ef17c74c3137a11b463cde96c74d0edc853edd 1 file changed, 1 deletion(-) diff --git a/target/product/generic_system.mk b/target/product/generic_system.mk -index 08a7cdf83e..5afb9a3a99 100644 +index 7aff62c39f..b5bf7b3a57 100644 --- a/target/product/generic_system.mk +++ b/target/product/generic_system.mk @@ -33,7 +33,6 @@ PRODUCT_PACKAGES += \ @@ -19,7 +19,7 @@ index 08a7cdf83e..5afb9a3a99 100644 - Stk \ Tag \ - # OTA support + ifeq ($(RELEASE_AVATAR_PICKER_APP),true) -- 2.34.1 diff --git a/patches_platform_personal/frameworks_base/0001-Add-MotoHelloUINavbarOverlay-1-2.patch b/patches_platform_personal/frameworks_base/0001-Add-MotoHelloUINavbarOverlay-1-2.patch index ddad455..47a97d6 100644 --- a/patches_platform_personal/frameworks_base/0001-Add-MotoHelloUINavbarOverlay-1-2.patch +++ b/patches_platform_personal/frameworks_base/0001-Add-MotoHelloUINavbarOverlay-1-2.patch @@ -1,13 +1,13 @@ -From e1866ef3ab91a394c0a810675df59a9c328ce0b2 Mon Sep 17 00:00:00 2001 +From ed95d24fc0033ae71a55d5177699ffdf51e9ee29 Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Mon, 22 Apr 2024 23:34:04 +0800 -Subject: [PATCH 01/20] Add MotoHelloUINavbarOverlay (1/2) +Subject: [PATCH 01/22] Add MotoHelloUINavbarOverlay (1/2) Redrawn after extracted SVGs, resized and adjusted stroke width Change-Id: Idd8deb529ab39444737676d7bdba1c52555d6661 --- - packages/overlays/Android.mk | 1 + + packages/overlays/Android.bp | 1 + .../MotoHelloUINavbarOverlay/Android.bp | 28 +++++++++++++++++++ .../AndroidManifest.xml | 22 +++++++++++++++ .../res/drawable/ic_sysbar_back.xml | 12 ++++++++ @@ -20,18 +20,18 @@ Change-Id: Idd8deb529ab39444737676d7bdba1c52555d6661 create mode 100644 packages/overlays/MotoHelloUINavbarOverlay/res/drawable/ic_sysbar_home.xml create mode 100644 packages/overlays/MotoHelloUINavbarOverlay/res/drawable/ic_sysbar_recent.xml -diff --git a/packages/overlays/Android.mk b/packages/overlays/Android.mk -index a41d0e57cd21..c0573b2a9c16 100644 ---- a/packages/overlays/Android.mk -+++ b/packages/overlays/Android.mk -@@ -26,6 +26,7 @@ LOCAL_REQUIRED_MODULES := \ - DisplayCutoutEmulationTallOverlay \ - DisplayCutoutEmulationWaterfallOverlay \ - FontNotoSerifSourceOverlay \ -+ MotoHelloUINavbarOverlay \ - NavigationBarMode3ButtonOverlay \ - NavigationBarModeGesturalOverlay \ - NavigationBarModeGesturalOverlayNarrowBack \ +diff --git a/packages/overlays/Android.bp b/packages/overlays/Android.bp +index 5e001fba6aa1..8913b58807e6 100644 +--- a/packages/overlays/Android.bp ++++ b/packages/overlays/Android.bp +@@ -28,6 +28,7 @@ phony { + "DisplayCutoutEmulationTallOverlay", + "DisplayCutoutEmulationWaterfallOverlay", + "FontNotoSerifSourceOverlay", ++ "MotoHelloUINavbarOverlay", + "NavigationBarMode3ButtonOverlay", + "NavigationBarModeGesturalOverlay", + "NavigationBarModeGesturalOverlayNarrowBack", diff --git a/packages/overlays/MotoHelloUINavbarOverlay/Android.bp b/packages/overlays/MotoHelloUINavbarOverlay/Android.bp new file mode 100644 index 000000000000..06515997990a 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 f70c40e..d4542a8 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,7 +1,7 @@ -From 06799a1be4a78be284b530b009b9edd67bb1aae7 Mon Sep 17 00:00:00 2001 +From 522bbc14ea6cd6d17bd93fd3139b77d22362090c Mon Sep 17 00:00:00 2001 From: Hikari-no-Tenshi Date: Thu, 30 Jan 2020 22:20:54 +0200 -Subject: [PATCH 02/20] Disable Bluetooth by default +Subject: [PATCH 02/22] Disable Bluetooth by default Change-Id: Iea5d24f977928bf01cd7a46b98c75c0a4bd6a23c --- @@ -9,7 +9,7 @@ Change-Id: Iea5d24f977928bf01cd7a46b98c75c0a4bd6a23c 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/SettingsProvider/res/values/defaults.xml b/packages/SettingsProvider/res/values/defaults.xml -index 89a8dd95d3c3..576c85caf2e2 100644 +index 17d9f1b87fac..75686e96e201 100644 --- a/packages/SettingsProvider/res/values/defaults.xml +++ b/packages/SettingsProvider/res/values/defaults.xml @@ -38,7 +38,7 @@ 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 7440ebd..56ed59b 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,7 +1,7 @@ -From 509d9f3180617e12e7c6bd07be5500104e869e43 Mon Sep 17 00:00:00 2001 +From 24806592ddfc97002514f203c55e29338d52644e Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Mon, 27 Sep 2021 16:30:00 +0000 -Subject: [PATCH 03/20] Disable cursor drag by default for editable TextViews +Subject: [PATCH 03/22] Disable cursor drag by default for editable TextViews Requested by @TadiT7 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 711a1d2..638d9f5 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,7 +1,7 @@ -From d148f0f146d6e76927630726223a48664e33fcd1 Mon Sep 17 00:00:00 2001 +From fd4ee96f17bee1e0c639b9f5a66d877637eb442d Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Sun, 3 Jul 2022 00:08:42 +0000 -Subject: [PATCH 04/20] Disable "RESTRICTED bucket" toast +Subject: [PATCH 04/22] Disable "RESTRICTED bucket" toast Change-Id: I20a328d3c77962f3a6095bfca42d0b165a093ce8 --- @@ -9,10 +9,10 @@ Change-Id: I20a328d3c77962f3a6095bfca42d0b165a093ce8 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/apex/jobscheduler/service/java/com/android/server/usage/AppStandbyController.java b/apex/jobscheduler/service/java/com/android/server/usage/AppStandbyController.java -index 12f455ad0144..a76a7f67a91a 100644 +index 19bc7160e16a..567420a9c8f6 100644 --- a/apex/jobscheduler/service/java/com/android/server/usage/AppStandbyController.java +++ b/apex/jobscheduler/service/java/com/android/server/usage/AppStandbyController.java -@@ -1846,25 +1846,7 @@ public class AppStandbyController +@@ -1848,25 +1848,7 @@ public class AppStandbyController .noteRestrictionAttempt(packageName, userId, elapsedRealtime, reason); if (isForcedByUser) { diff --git a/patches_platform_personal/frameworks_base/0005-Disable-wake-on-gamepad-L-R-keys.patch b/patches_platform_personal/frameworks_base/0005-Disable-wake-on-gamepad-L-R-keys.patch new file mode 100644 index 0000000..54a21b7 --- /dev/null +++ b/patches_platform_personal/frameworks_base/0005-Disable-wake-on-gamepad-L-R-keys.patch @@ -0,0 +1,32 @@ +From 4aaaad704b3cedf07ace864b8fd03d7780f55903 Mon Sep 17 00:00:00 2001 +From: Andy CrossGate Yan +Date: Sat, 1 Jun 2024 17:56:42 +0800 +Subject: [PATCH 05/22] Disable wake on gamepad L/R keys + +Change-Id: I16cf69f07f205619a75111831de808748ee5795b +--- + .../com/android/server/policy/PhoneWindowManager.java | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/services/core/java/com/android/server/policy/PhoneWindowManager.java b/services/core/java/com/android/server/policy/PhoneWindowManager.java +index 231357e96306..f15c034107fc 100644 +--- a/services/core/java/com/android/server/policy/PhoneWindowManager.java ++++ b/services/core/java/com/android/server/policy/PhoneWindowManager.java +@@ -5945,6 +5945,14 @@ public class PhoneWindowManager implements WindowManagerPolicy { + case KeyEvent.KEYCODE_STYLUS_BUTTON_TERTIARY: + case KeyEvent.KEYCODE_STYLUS_BUTTON_TAIL: + return mStylusButtonsEnabled; ++ ++ case KeyEvent.KEYCODE_BUTTON_L1: ++ case KeyEvent.KEYCODE_BUTTON_R1: ++ case KeyEvent.KEYCODE_BUTTON_L2: ++ case KeyEvent.KEYCODE_BUTTON_R2: ++ case KeyEvent.KEYCODE_BUTTON_THUMBL: ++ case KeyEvent.KEYCODE_BUTTON_THUMBR: ++ return false; + } + + return true; +-- +2.34.1 + diff --git a/patches_platform_personal/frameworks_base/0005-Keyguard-Adjust-clock-style.patch b/patches_platform_personal/frameworks_base/0006-Keyguard-Adjust-clock-style.patch similarity index 95% rename from patches_platform_personal/frameworks_base/0005-Keyguard-Adjust-clock-style.patch rename to patches_platform_personal/frameworks_base/0006-Keyguard-Adjust-clock-style.patch index 87d4bdc..895a3b2 100644 --- a/patches_platform_personal/frameworks_base/0005-Keyguard-Adjust-clock-style.patch +++ b/patches_platform_personal/frameworks_base/0006-Keyguard-Adjust-clock-style.patch @@ -1,7 +1,7 @@ -From 623f673df7542f0286b32bde1485d9de3c1715f8 Mon Sep 17 00:00:00 2001 +From 4f4c07ae5cef82b0ede5656b19e730d7476a4a20 Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Thu, 2 Sep 2021 16:15:19 +0000 -Subject: [PATCH 05/20] Keyguard: Adjust clock style +Subject: [PATCH 06/22] Keyguard: Adjust clock style Thinner font, less padding and unintrusive colors @@ -71,10 +71,10 @@ index c574d1fc674b..0a2c81f1cb38 100644 + 22dp + diff --git a/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/DefaultClockController.kt b/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/DefaultClockController.kt -index 01c03b1f25f6..9cff7ef5911b 100644 +index 54c7a0823963..024c727dec84 100644 --- a/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/DefaultClockController.kt +++ b/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/DefaultClockController.kt -@@ -168,9 +168,9 @@ class DefaultClockController( +@@ -170,9 +170,9 @@ class DefaultClockController( if (seedColor != null) { seedColor!! } else if (isRegionDark) { @@ -113,10 +113,10 @@ index 7c5dbc247428..64657547621f 100644 /> diff --git a/packages/SystemUI/res-keyguard/values/dimens.xml b/packages/SystemUI/res-keyguard/values/dimens.xml -index 0628c3e957b1..ccb729de92e1 100644 +index 186bd7cc48c5..363730d1f1ab 100644 --- a/packages/SystemUI/res-keyguard/values/dimens.xml +++ b/packages/SystemUI/res-keyguard/values/dimens.xml -@@ -95,9 +95,9 @@ +@@ -107,9 +107,9 @@ 12dp @@ -129,10 +129,10 @@ index 0628c3e957b1..ccb729de92e1 100644 diff --git a/patches_platform_personal/frameworks_base/0008-Keyguard-Refine-indication-text.patch b/patches_platform_personal/frameworks_base/0009-Keyguard-Refine-indication-text.patch similarity index 84% rename from patches_platform_personal/frameworks_base/0008-Keyguard-Refine-indication-text.patch rename to patches_platform_personal/frameworks_base/0009-Keyguard-Refine-indication-text.patch index f6b0cc1..ca96e14 100644 --- a/patches_platform_personal/frameworks_base/0008-Keyguard-Refine-indication-text.patch +++ b/patches_platform_personal/frameworks_base/0009-Keyguard-Refine-indication-text.patch @@ -1,22 +1,22 @@ -From 8b68d455ebc34a78177be70ec62c94dae3192fdf Mon Sep 17 00:00:00 2001 +From 5e641f0f51ddffd5d7dd40f5ac080cce950a4515 Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Sat, 2 Nov 2019 08:31:36 +0000 -Subject: [PATCH 08/20] Keyguard: Refine indication text +Subject: [PATCH 09/22] Keyguard: Refine indication text Change-Id: Ib771c35610f712a1de34736e817bcfe616ac37d8 --- - .../SystemUI/res-keyguard/values/styles.xml | 2 -- + .../SystemUI/res-keyguard/values/styles.xml | 2 - .../res/layout/keyguard_bottom_area.xml | 1 + packages/SystemUI/res/values/dimens.xml | 2 +- - .../KeyguardIndicationController.java | 35 ++++--------------- + .../KeyguardIndicationController.java | 37 ++++--------------- .../phone/KeyguardIndicationTextView.java | 2 +- - 5 files changed, 10 insertions(+), 32 deletions(-) + 5 files changed, 10 insertions(+), 34 deletions(-) diff --git a/packages/SystemUI/res-keyguard/values/styles.xml b/packages/SystemUI/res-keyguard/values/styles.xml -index f0cff767b74d..9edd294a8981 100644 +index d73a3034c253..0394ab69b901 100644 --- a/packages/SystemUI/res-keyguard/values/styles.xml +++ b/packages/SystemUI/res-keyguard/values/styles.xml -@@ -153,8 +153,6 @@ +@@ -154,8 +154,6 @@ 1 center ?attr/wallpaperTextColor @@ -26,7 +26,7 @@ index f0cff767b74d..9edd294a8981 100644 diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java -index 08ec0398a7..e1ab7311dd 100644 +index 646c726fa0..80f884b4a9 100644 --- a/quickstep/src/com/android/quickstep/views/RecentsView.java +++ b/quickstep/src/com/android/quickstep/views/RecentsView.java -@@ -805,7 +805,7 @@ public abstract class RecentsView Date: Fri, 18 Mar 2022 08:42:18 +0000 Subject: [PATCH 2/3] Trebuchet: Kill haptics in recents @@ -13,10 +13,10 @@ Change-Id: Ie3b0eabe8cc0421e696720740edc492cae2f5153 3 files changed, 1 insertion(+), 32 deletions(-) diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java -index 968faf07c7..bb93664b46 100644 +index 3a1c42dc89..0e0397be39 100644 --- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java +++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java -@@ -437,14 +437,7 @@ public class NoButtonQuickSwitchTouchController implements TouchController, +@@ -441,14 +441,7 @@ public class NoButtonQuickSwitchTouchController implements TouchController, nonOverviewAnim.setFloatValues(startProgress, endProgress); mNonOverviewAnim.dispatchOnStart(); } @@ -29,30 +29,30 @@ index 968faf07c7..bb93664b46 100644 - RecentsView.SCROLL_VIBRATION_FALLBACK); - } else { + if (targetState != QUICK_SWITCH_FROM_HOME) { - InteractionJankMonitorWrapper.cancel(InteractionJankMonitorWrapper.CUJ_QUICK_SWITCH); + InteractionJankMonitorWrapper.cancel(Cuj.CUJ_LAUNCHER_QUICK_SWITCH); } diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TaskViewTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TaskViewTouchController.java -index 19bfe069c8..f6cb2c7024 100644 +index e9f2d4f019..5487414660 100644 --- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TaskViewTouchController.java +++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TaskViewTouchController.java -@@ -370,11 +370,6 @@ public abstract class TaskViewTouchController - mCurrentAnimation.startWithVelocity(mActivity, goingToEnd, - velocity * orientationHandler.getSecondaryTranslationDirectionFactor(), +@@ -374,11 +374,6 @@ public abstract class TaskViewTouchController + mCurrentAnimation.setEndAction(this::clearState); + mCurrentAnimation.startWithVelocity(mActivity, goingToEnd, Math.abs(velocity), mEndDisplacement, animationDuration); - if (goingUp && goingToEnd && !mIsDismissHapticRunning) { - VibratorWrapper.INSTANCE.get(mActivity).vibrate(TASK_DISMISS_VIBRATION_PRIMITIVE, - TASK_DISMISS_VIBRATION_PRIMITIVE_SCALE, TASK_DISMISS_VIBRATION_FALLBACK); - mIsDismissHapticRunning = true; - } - } - private void clearState() { + mDraggingEnabled = true; + } diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java -index e1ab7311dd..c2f848c71a 100644 +index 80f884b4a9..8dc8c20ff7 100644 --- a/quickstep/src/com/android/quickstep/views/RecentsView.java +++ b/quickstep/src/com/android/quickstep/views/RecentsView.java -@@ -1583,25 +1583,6 @@ public abstract class RecentsView Date: Mon, 20 Nov 2023 14:09:32 +0800 Subject: [PATCH 3/3] Trebuchet: Kill inverted rounded corners above the @@ -12,10 +12,10 @@ Change-Id: Ibf03a84cb8f3866b5151b02fe8a0e74167cf90ce 1 file changed, 7 deletions(-) diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarBackgroundRenderer.kt b/quickstep/src/com/android/launcher3/taskbar/TaskbarBackgroundRenderer.kt -index d6016f1304..c77fadb9aa 100644 +index e290c3fa3d..a3e4e1835e 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarBackgroundRenderer.kt +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarBackgroundRenderer.kt -@@ -159,13 +159,6 @@ class TaskbarBackgroundRenderer(private val context: TaskbarActivityContext) { +@@ -158,13 +158,6 @@ class TaskbarBackgroundRenderer(private val context: TaskbarActivityContext) { // Draw the background behind taskbar content. canvas.drawRect(0f, 0f, canvas.width.toFloat(), persistentTaskbarHeight, paint) } diff --git a/patches_treble/frameworks_base/0001-Re-implement-fnmatch-like-behaviour-for-RRO-java-sid.patch b/patches_treble/frameworks_base/0001-Re-implement-fnmatch-like-behaviour-for-RRO-java-sid.patch index edfea8e..11b2159 100644 --- a/patches_treble/frameworks_base/0001-Re-implement-fnmatch-like-behaviour-for-RRO-java-sid.patch +++ b/patches_treble/frameworks_base/0001-Re-implement-fnmatch-like-behaviour-for-RRO-java-sid.patch @@ -1,7 +1,7 @@ -From 3eca40aa6c2b4ef6e519556a109067d1be82dea0 Mon Sep 17 00:00:00 2001 +From 019df05a5d610f34f167195a2b69228e99160d6c Mon Sep 17 00:00:00 2001 From: Pierre-Hugues Husson Date: Sun, 25 Oct 2020 23:57:26 +0100 -Subject: [PATCH 1/5] Re-implement fnmatch-like behaviour for RRO java-side +Subject: [PATCH 1/6] Re-implement fnmatch-like behaviour for RRO java-side T: Also apply to FrameworkParsingPackageUtils (@PeterCxy) diff --git a/patches_treble/frameworks_base/0002-LightsService-Alternative-backlight-scale.patch b/patches_treble/frameworks_base/0002-LightsService-Alternative-backlight-scale.patch index f93f978..82b4a78 100644 --- a/patches_treble/frameworks_base/0002-LightsService-Alternative-backlight-scale.patch +++ b/patches_treble/frameworks_base/0002-LightsService-Alternative-backlight-scale.patch @@ -1,7 +1,7 @@ -From cf5d89e76aa67ca83e682a9e091e6ddc7e43fd41 Mon Sep 17 00:00:00 2001 +From f2b671435968f7693c6950d58ee06b42c1f38aef Mon Sep 17 00:00:00 2001 From: Pierre-Hugues Husson Date: Sat, 24 Mar 2018 08:01:48 +0100 -Subject: [PATCH 2/5] LightsService: Alternative backlight scale +Subject: [PATCH 2/6] LightsService: Alternative backlight scale Reserved a manual override just in case @@ -11,7 +11,7 @@ Change-Id: I46ae69c758d1a4609d89cf1c293488ea5fc76787 1 file changed, 13 insertions(+) diff --git a/services/core/java/com/android/server/lights/LightsService.java b/services/core/java/com/android/server/lights/LightsService.java -index 4d26f43307b2..c5e672726d21 100644 +index 76cf1348d313..91c3c32fe835 100644 --- a/services/core/java/com/android/server/lights/LightsService.java +++ b/services/core/java/com/android/server/lights/LightsService.java @@ -32,6 +32,7 @@ import android.os.Looper; diff --git a/patches_treble/frameworks_base/0003-Revert-Remove-more-FDE-methods-from-StorageManager.patch b/patches_treble/frameworks_base/0003-Revert-Remove-more-FDE-methods-from-StorageManager.patch index 5507c08..e53c84e 100644 --- a/patches_treble/frameworks_base/0003-Revert-Remove-more-FDE-methods-from-StorageManager.patch +++ b/patches_treble/frameworks_base/0003-Revert-Remove-more-FDE-methods-from-StorageManager.patch @@ -1,7 +1,7 @@ -From 09e7b9a70cfe3ac0bf4f4791bed3b0dd663f06f1 Mon Sep 17 00:00:00 2001 +From 5c06aad5517951b1b4f7dcdfb3089d4e147d5d53 Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Sat, 15 Oct 2022 09:33:56 +0000 -Subject: [PATCH 3/5] Revert "Remove more FDE methods from StorageManager" +Subject: [PATCH 3/6] Revert "Remove more FDE methods from StorageManager" This reverts commit bd13f84152449a3ead6fa8604fd31f48c0224676. @@ -12,10 +12,10 @@ Change-Id: Ic394934ec27b1a486c60123130825d44dad73412 2 files changed, 78 insertions(+) diff --git a/core/java/android/os/storage/StorageManager.java b/core/java/android/os/storage/StorageManager.java -index 78a12f75a508..f9999fa8fde8 100644 +index d45a17f7194e..6850e261e6ad 100644 --- a/core/java/android/os/storage/StorageManager.java +++ b/core/java/android/os/storage/StorageManager.java -@@ -1714,6 +1714,15 @@ public class StorageManager { +@@ -1709,6 +1709,15 @@ public class StorageManager { return false; } @@ -31,7 +31,7 @@ index 78a12f75a508..f9999fa8fde8 100644 /** {@hide} * Is this device encrypted? *

-@@ -1738,6 +1747,71 @@ public class StorageManager { +@@ -1733,6 +1742,71 @@ public class StorageManager { return RoSystemProperties.CRYPTO_FILE_ENCRYPTED; } diff --git a/patches_treble/frameworks_base/0004-Restore-getSimStateForSlotIndex-in-SubscriptionManag.patch b/patches_treble/frameworks_base/0004-Restore-getSimStateForSlotIndex-in-SubscriptionManag.patch index 9070b47..ecad38b 100644 --- a/patches_treble/frameworks_base/0004-Restore-getSimStateForSlotIndex-in-SubscriptionManag.patch +++ b/patches_treble/frameworks_base/0004-Restore-getSimStateForSlotIndex-in-SubscriptionManag.patch @@ -1,7 +1,7 @@ -From fa3c64ce2e193ccb61517284d66f78cc3d6db13e Mon Sep 17 00:00:00 2001 +From b1f7c0a4d99d3b14d143980af414d2adca441a4f Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Wed, 2 Aug 2023 20:59:53 +0800 -Subject: [PATCH 4/5] Restore getSimStateForSlotIndex in SubscriptionManager +Subject: [PATCH 4/6] Restore getSimStateForSlotIndex in SubscriptionManager MTK IMS still needs it here @@ -11,10 +11,10 @@ Change-Id: I41bac57c68055f369232359a464642daab94403b 1 file changed, 14 insertions(+) diff --git a/telephony/java/android/telephony/SubscriptionManager.java b/telephony/java/android/telephony/SubscriptionManager.java -index 326b6f5af613..b994888362b0 100644 +index c5f2d42389e5..1324741145bd 100644 --- a/telephony/java/android/telephony/SubscriptionManager.java +++ b/telephony/java/android/telephony/SubscriptionManager.java -@@ -2693,6 +2693,20 @@ public class SubscriptionManager { +@@ -2902,6 +2902,20 @@ public class SubscriptionManager { return TelephonyManager.getDefault().isNetworkRoaming(subId); } diff --git a/patches_treble/frameworks_base/0005-Restore-getPhysicalDisplayIds-in-SurfaceControl.patch b/patches_treble/frameworks_base/0005-Restore-getPhysicalDisplayIds-in-SurfaceControl.patch index 3fe32f0..992ac6f 100644 --- a/patches_treble/frameworks_base/0005-Restore-getPhysicalDisplayIds-in-SurfaceControl.patch +++ b/patches_treble/frameworks_base/0005-Restore-getPhysicalDisplayIds-in-SurfaceControl.patch @@ -1,7 +1,7 @@ -From 7dbc3c83213b1dacce2eaa90835721b13f504781 Mon Sep 17 00:00:00 2001 +From 4b4182708a6c183a52f5459d357f341ea6c99e1b Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Sun, 19 Nov 2023 23:07:03 +0800 -Subject: [PATCH 5/5] Restore getPhysicalDisplayIds in SurfaceControl +Subject: [PATCH 5/6] Restore getPhysicalDisplayIds in SurfaceControl For convenience of accessing DynamicDisplayInfo from Settings Copy over the updated implementation from DisplayControl while we're at it @@ -15,10 +15,10 @@ Change-Id: Ie056ecaf76acbc70d73e1c26cc4542088fcda18d 2 files changed, 26 insertions(+) diff --git a/core/java/android/view/SurfaceControl.java b/core/java/android/view/SurfaceControl.java -index cbbe7856178d..253eb492bd8b 100644 +index eff35c0c0f03..5cc1d0817688 100644 --- a/core/java/android/view/SurfaceControl.java +++ b/core/java/android/view/SurfaceControl.java -@@ -181,6 +181,7 @@ public final class SurfaceControl implements Parcelable { +@@ -176,6 +176,7 @@ public final class SurfaceControl implements Parcelable { private static native boolean nativeClearAnimationFrameStats(); private static native boolean nativeGetAnimationFrameStats(WindowAnimationFrameStats outStats); @@ -26,8 +26,8 @@ index cbbe7856178d..253eb492bd8b 100644 private static native void nativeSetDisplaySurface(long transactionObj, IBinder displayToken, long nativeSurfaceObject); private static native void nativeSetDisplayLayerStack(long transactionObj, -@@ -2440,6 +2441,13 @@ public final class SurfaceControl implements Parcelable { - IVirtualDisplayCallback.Stub.asInterface(displayToken)); +@@ -2379,6 +2380,13 @@ public final class SurfaceControl implements Parcelable { + nativeSetGameContentType(displayToken, on); } + /** @@ -41,7 +41,7 @@ index cbbe7856178d..253eb492bd8b 100644 * Returns whether protected content is supported in GPU composition. * @hide diff --git a/core/jni/android_view_SurfaceControl.cpp b/core/jni/android_view_SurfaceControl.cpp -index db42246ca76c..0be04bb380d8 100644 +index 6fec527aaa16..8c908aa3d451 100644 --- a/core/jni/android_view_SurfaceControl.cpp +++ b/core/jni/android_view_SurfaceControl.cpp @@ -36,6 +36,7 @@ @@ -52,7 +52,7 @@ index db42246ca76c..0be04bb380d8 100644 #include #include #include -@@ -1010,6 +1011,21 @@ static void nativeSetDestinationFrame(JNIEnv* env, jclass clazz, jlong transacti +@@ -1075,6 +1076,21 @@ static void nativeSetDestinationFrame(JNIEnv* env, jclass clazz, jlong transacti transaction->setDestinationFrame(ctrl, crop); } @@ -74,7 +74,7 @@ index db42246ca76c..0be04bb380d8 100644 static jobject nativeGetDisplayedContentSamplingAttributes(JNIEnv* env, jclass clazz, jobject tokenObj) { sp token(ibinderForJavaObject(env, tokenObj)); -@@ -2187,6 +2203,8 @@ static const JNINativeMethod sSurfaceControlMethods[] = { +@@ -2269,6 +2285,8 @@ static const JNINativeMethod sSurfaceControlMethods[] = { (void*)nativeSetFrameRateCategory}, {"nativeSetFrameRateSelectionStrategy", "(JJI)V", (void*)nativeSetFrameRateSelectionStrategy}, diff --git a/patches_treble/frameworks_base/0006-Allow-APKs-of-a-certain-signature-to-install-work-li.patch b/patches_treble/frameworks_base/0006-Allow-APKs-of-a-certain-signature-to-install-work-li.patch new file mode 100644 index 0000000..7fbf0fb --- /dev/null +++ b/patches_treble/frameworks_base/0006-Allow-APKs-of-a-certain-signature-to-install-work-li.patch @@ -0,0 +1,93 @@ +From 262cf4f5ed67cd8343ccb912bc8d265ea331af3e Mon Sep 17 00:00:00 2001 +From: Andy CrossGate Yan +Date: Sun, 7 Jul 2024 21:55:42 +0800 +Subject: [PATCH 6/6] Allow APKs of a certain signature to install/work like + platform-signed + +Intended usecase - one authoritative set of signed IMS APKs for any GSI, regardless of their signature + +Change-Id: Ia1a13edec8eb8ecf0ea25fffaee4aeff9c75a5e1 +--- + .../android/server/pm/PackageManagerServiceUtils.java | 11 +++++++++++ + .../core/java/com/android/server/pm/SELinuxMMAC.java | 5 +++++ + .../java/com/android/server/pm/ScanPackageUtils.java | 5 ++++- + 3 files changed, 20 insertions(+), 1 deletion(-) + +diff --git a/services/core/java/com/android/server/pm/PackageManagerServiceUtils.java b/services/core/java/com/android/server/pm/PackageManagerServiceUtils.java +index d7e0fca87059..675be60ea412 100644 +--- a/services/core/java/com/android/server/pm/PackageManagerServiceUtils.java ++++ b/services/core/java/com/android/server/pm/PackageManagerServiceUtils.java +@@ -221,6 +221,8 @@ public class PackageManagerServiceUtils { + */ + private static final boolean FORCE_PACKAGE_PARSED_CACHE_ENABLED = false; + ++ private static final Signature PHH_SIGNATURE = new Signature("308205fb308203e3a00302010202144cd9cede3ae98180d0c500b979c371be9189d42d300d06092a864886f70d01010b050030818b310b3009060355040613024652310f300d06035504080c064672616e6365310e300c06035504070c05506172697331143012060355040a0c0b547265626c6544726f696431143012060355040b0c0b547265626c6544726f69643114301206035504030c0b547265626c6544726f69643119301706092a864886f70d010901160a706868407068682e6d653020170d3234303731333136313435375a180f32303531313132393136313435375a30818b310b3009060355040613024652310f300d06035504080c064672616e6365310e300c06035504070c05506172697331143012060355040a0c0b547265626c6544726f696431143012060355040b0c0b547265626c6544726f69643114301206035504030c0b547265626c6544726f69643119301706092a864886f70d010901160a706868407068682e6d6530820222300d06092a864886f70d01010105000382020f003082020a0282020100ea313fa144409b3f52c489fb1401f98c0e2c1f66933c67e4f4b3ec1757b33b72d996de4f60fb6316aaab04b1c973e27833f8dca1bd109cb74525c48fda9a2d0f3fe2ff943e69042290f41f36c996b3c3c327a9cc6398ec3b4da7bd4a281005d10b6d022f4d871c113051b685d9e2059b68ffb00c174c2516cfa3c64d3d1e51f7f100fde5bf4a7af00f2c8bbb258f066fa1c4a077ee32ba1a3f56edec8f1e05b609aadb6dbe63487275812b8447881ada997d1ddf278008246565e97f1665943b6cbc6f4fe2f2982894d3b2dfec0eb5bc2f91e6d6d7497aef732b90c82531d7065bbacf234a73d53111cb8f2d117c67c9e873c326117410b9ea7a18d12811db8e2d0b183c37b53b5a4d066b7b5e2a6741748c7082f7fb0d7d8b21ad0c93ded88c71844f54fd25255f9a6eb7a7910475a1a2264110f5e0f267df671ea42d76a3381a632dde6c7f63f5e15d8d573b7f926e3106ead126d1ef0c0b22d909a6bfd6f3c444803d782a9aec3e4695016b055e180ccc1b7c24b532c226839d1ad1a5d7fe51f6e9e43460b8d706ca3d484b5994fb68fe212dbc2662935d0effb52ff018a9c760086b5ad5b7cd6549543677742cbf2f6bf409b2f70abb0ec6e042d30768eac5b61e1038f8b9c8dd4e801357cc7bfa2bfaebcbe59dc27331b5f388642d829a20893be0384bedab4287b881ef7a9a27765ba6910036a70128d8606f194acf070203010001a3533051301d0603551d0e04160414124752cf65d60fd9a632855450ae4124ebe78e3c301f0603551d23041830168014124752cf65d60fd9a632855450ae4124ebe78e3c300f0603551d130101ff040530030101ff300d06092a864886f70d01010b0500038202010045d310fab3cf34fda5c59a651853fe47ba759195db454b18727692fd54613fef6401ed31aff26a2579362fd6c0ae563b3c32472bafb919eb3e0a1173b0a3a9b0c475bf10db328d157eead62af2615b2b5bfa84cf51a3af38222ba737e5e47c5cdad3d2c8505796fa8b205e5fe39f2ff2516c961972c279c9197e913c2e6cc5951fe69bd8cbc09a9ee1664ce7a784b17ce721b8b61fa7a79c7919bed3de48b386eec4b5a1dd0bc4cde32ada097c2cb0fe13fc772d38740235866b0b304e79071a292ba77a8fb5532545df2452a11d53e7365851a515a9640c691d6d2570fee2d9b97cb1d52213411b3a29a16a5eb789000e2e2e2a4a33d38fc93d32c2511c57e6c420c29b5d1346904d9346537290bbefd7566c2ff3245db663ab5e21e721cbac1adada3e84defbc9758dbd1340cbd9b2a8e98542057eb517938462a5401825e31d640d57f881305d8474a9372db8459293fc9a2ccace877517bbedb759eb6eea45b5fcd5ea149d531ddf6a1ccf5f7dbe4d139a308af94049f717c09ff022a5ba0a2fbd35c4ce18671dfce2eccf292ac48b073d8e85a158ceac6f9253a1e6607b743fc2f557f55a1366716eda5653e9cb272e611c77e7949310ca3f294f1689efdfde087512a53bdf460029b9f0adb8fb7fada5e1443bdfdc8c8c29914b7856aa995c8cbf1866ac7d6c65e2d4c7c6738d7a8cb56d7ba9230ba9bc056d02e48f41"); ++ + /** + * Returns the registered PackageManagerLocal instance, or else throws an unchecked error. + */ +@@ -306,6 +308,11 @@ public class PackageManagerServiceUtils { + return maxModifiedTime; + } + ++ protected static boolean doesSignatureMatchPHH(SigningDetails signingDetails) { ++ return signingDetails.getSignatures() != null ++ && Signature.areExactMatch(signingDetails, new Signature[]{PHH_SIGNATURE}); ++ } ++ + private static File getSettingsProblemFile() { + File dataDir = Environment.getDataDirectory(); + File systemDir = new File(dataDir, "system"); +@@ -579,6 +586,10 @@ public class PackageManagerServiceUtils { + boolean compareCompat, boolean compareRecover, boolean isRollback) + throws PackageManagerException { + final String packageName = pkgSetting.getPackageName(); ++ if (doesSignatureMatchPHH(parsedSignatures)) { ++ Slog.w(TAG, "Package " + packageName + " has PHH signature, skipping subsequent checks"); ++ return false; ++ } + boolean compatMatch = false; + if (pkgSetting.getSigningDetails().getSignatures() != null) { + // For an already existing package, make sure the parsed signatures from the package +diff --git a/services/core/java/com/android/server/pm/SELinuxMMAC.java b/services/core/java/com/android/server/pm/SELinuxMMAC.java +index e667bfe36d18..e08a6ba24807 100644 +--- a/services/core/java/com/android/server/pm/SELinuxMMAC.java ++++ b/services/core/java/com/android/server/pm/SELinuxMMAC.java +@@ -448,6 +448,11 @@ public final class SELinuxMMAC { + } + } + ++ if (pkg.getSigningDetails() != SigningDetails.UNKNOWN && ++ PackageManagerServiceUtils.doesSignatureMatchPHH(pkg.getSigningDetails())) { ++ seInfo = "platform"; ++ } ++ + if (seInfo == null) { + seInfo = DEFAULT_SEINFO; + } +diff --git a/services/core/java/com/android/server/pm/ScanPackageUtils.java b/services/core/java/com/android/server/pm/ScanPackageUtils.java +index 2e67b2f41520..20a614235e6e 100644 +--- a/services/core/java/com/android/server/pm/ScanPackageUtils.java ++++ b/services/core/java/com/android/server/pm/ScanPackageUtils.java +@@ -47,6 +47,7 @@ import static com.android.server.pm.PackageManagerService.TAG; + import static com.android.server.pm.PackageManagerServiceUtils.compareSignatures; + import static com.android.server.pm.PackageManagerServiceUtils.compressedFileExists; + import static com.android.server.pm.PackageManagerServiceUtils.deriveAbiOverride; ++import static com.android.server.pm.PackageManagerServiceUtils.doesSignatureMatchPHH; + import static com.android.server.pm.PackageManagerServiceUtils.getLastModifiedTime; + + import android.annotation.NonNull; +@@ -918,7 +919,9 @@ final class ScanPackageUtils { + || (platformPkg != null && compareSignatures( + platformPkg.getSigningDetails(), + parsedPackage.getSigningDetails() +- ) == PackageManager.SIGNATURE_MATCH)) ++ ) == PackageManager.SIGNATURE_MATCH) ++ || doesSignatureMatchPHH( ++ parsedPackage.getSigningDetails())) + ); + + if (!isSystemApp) { +-- +2.34.1 + diff --git a/patches_treble/frameworks_native/0001-MIUI13-devices-hide-their-vibrator-HAL-behind-non-de.patch b/patches_treble/frameworks_native/0001-MIUI13-devices-hide-their-vibrator-HAL-behind-non-de.patch index f63d8d0..047d1c1 100644 --- a/patches_treble/frameworks_native/0001-MIUI13-devices-hide-their-vibrator-HAL-behind-non-de.patch +++ b/patches_treble/frameworks_native/0001-MIUI13-devices-hide-their-vibrator-HAL-behind-non-de.patch @@ -1,7 +1,7 @@ -From d817f1b8271e51853040685214aebc378dafd1aa Mon Sep 17 00:00:00 2001 +From a62c64145c25f62e0a6f6c264b5da12e7a253c72 Mon Sep 17 00:00:00 2001 From: Pierre-Hugues Husson Date: Fri, 25 Mar 2022 05:37:56 -0400 -Subject: [PATCH] MIUI13 devices hide their vibrator HAL behind non-default +Subject: [PATCH 1/2] MIUI13 devices hide their vibrator HAL behind non-default name: "vibratorfeature" --- diff --git a/patches_treble/frameworks_native/0002-SurfaceFlinger-Disable-SF-HWC-backpressure.patch b/patches_treble/frameworks_native/0002-SurfaceFlinger-Disable-SF-HWC-backpressure.patch new file mode 100644 index 0000000..13ca7f6 --- /dev/null +++ b/patches_treble/frameworks_native/0002-SurfaceFlinger-Disable-SF-HWC-backpressure.patch @@ -0,0 +1,27 @@ +From 939201042b7a18dd00eb865f78209ba9f8eaeed8 Mon Sep 17 00:00:00 2001 +From: Andy CrossGate Yan +Date: Sun, 26 May 2024 21:34:17 +0800 +Subject: [PATCH 2/2] SurfaceFlinger: Disable SF HWC backpressure + +Change-Id: I5b99a2b860b1387ef5b589cb5b7b1d3ff0cfeee8 +--- + services/surfaceflinger/SurfaceFlinger.cpp | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp +index 305e08c714..3b508cd043 100644 +--- a/services/surfaceflinger/SurfaceFlinger.cpp ++++ b/services/surfaceflinger/SurfaceFlinger.cpp +@@ -2556,7 +2556,8 @@ bool SurfaceFlinger::commit(PhysicalDisplayId pacesetterId, + } + } + +- if (pacesetterFrameTarget.isFramePending()) { ++ if (base::GetBoolProperty("persist.sys.treble.enable_sf_hwc_backpressure"s, true) ++ && pacesetterFrameTarget.isFramePending()) { + if (mBackpressureGpuComposition || pacesetterFrameTarget.didMissHwcFrame()) { + if (FlagManager::getInstance().vrr_config()) { + mScheduler->getVsyncSchedule()->getTracker().onFrameMissed( +-- +2.34.1 + diff --git a/patches_treble/packages_apps_Settings/0001-TrebleSettings-Screen-resolution-refresh-rate.patch b/patches_treble/packages_apps_Settings/0001-TrebleSettings-Screen-resolution-refresh-rate.patch index ba8668f..86e6b9d 100644 --- a/patches_treble/packages_apps_Settings/0001-TrebleSettings-Screen-resolution-refresh-rate.patch +++ b/patches_treble/packages_apps_Settings/0001-TrebleSettings-Screen-resolution-refresh-rate.patch @@ -1,7 +1,7 @@ -From e76618742f7398aa64c1e45b27a2dbcbcb3f20e1 Mon Sep 17 00:00:00 2001 +From 8162af1310582494ce99ee502abacb1f937d5596 Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Thu, 22 Sep 2022 12:37:50 +0000 -Subject: [PATCH 1/8] TrebleSettings: Screen resolution & refresh rate +Subject: [PATCH 1/9] TrebleSettings: Screen resolution & refresh rate Change-Id: I4a4679cdb6d4ede55479e9ab2f014342025b0fec --- @@ -20,10 +20,10 @@ Change-Id: I4a4679cdb6d4ede55479e9ab2f014342025b0fec create mode 100644 src/com/android/settings/treble/TrebleSettings.java diff --git a/AndroidManifest.xml b/AndroidManifest.xml -index deb24592737..e5edf4977df 100644 +index a6bb19fe58c..6fafd10f702 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml -@@ -248,6 +248,14 @@ +@@ -252,6 +252,14 @@ android:value="com.android.settings.shortcut.CreateShortcut" /> @@ -67,10 +67,10 @@ index 27e9639122a..ef25f9971c4 100755 top_level_communal top_level_connected_devices diff --git a/res/values/strings.xml b/res/values/strings.xml -index 8fcbcbf6b49..48f0b763431 100644 +index 61aa1b265e6..5a5edf00ebf 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml -@@ -7178,6 +7178,16 @@ +@@ -7345,6 +7345,16 @@ Settings @@ -88,7 +88,7 @@ index 8fcbcbf6b49..48f0b763431 100644 Network & internet diff --git a/res/xml/top_level_settings.xml b/res/xml/top_level_settings.xml -index d050a1f2747..258a567f561 100644 +index 31c6af3c40b..7fb404789ad 100644 --- a/res/xml/top_level_settings.xml +++ b/res/xml/top_level_settings.xml @@ -20,6 +20,15 @@ diff --git a/patches_treble/packages_apps_Settings/0002-TrebleSettings-Basic-audio-and-display-fixes.patch b/patches_treble/packages_apps_Settings/0002-TrebleSettings-Basic-audio-and-display-fixes.patch index 5fcce10..e923354 100644 --- a/patches_treble/packages_apps_Settings/0002-TrebleSettings-Basic-audio-and-display-fixes.patch +++ b/patches_treble/packages_apps_Settings/0002-TrebleSettings-Basic-audio-and-display-fixes.patch @@ -1,7 +1,7 @@ -From 7cff85caaabd92c499d24c2915d7735d0b5cad4d Mon Sep 17 00:00:00 2001 +From 2ddbe3a19b8775a02dfb933033d71e9e0b138260 Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Sat, 24 Sep 2022 03:38:41 +0000 -Subject: [PATCH 2/8] TrebleSettings: Basic audio and display fixes +Subject: [PATCH 2/9] TrebleSettings: Basic audio and display fixes - Alternative audio policy - Disable soundvolume effect @@ -21,10 +21,10 @@ Change-Id: I4f22dcd9c59c40b3fd70ba642db35b9466467b7d create mode 100644 src/com/android/settings/treble/UseAlternativeBacklightScalePreferenceController.java diff --git a/res/values/strings.xml b/res/values/strings.xml -index 48f0b763431..0961c045330 100644 +index 5a5edf00ebf..366194bf500 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml -@@ -7182,11 +7182,19 @@ +@@ -7349,11 +7349,19 @@ Treble settings Fixes & tweaks for GSIs diff --git a/patches_treble/packages_apps_Settings/0003-TrebleSettings-IMS.patch b/patches_treble/packages_apps_Settings/0003-TrebleSettings-IMS.patch index e623047..dafe5cb 100644 --- a/patches_treble/packages_apps_Settings/0003-TrebleSettings-IMS.patch +++ b/patches_treble/packages_apps_Settings/0003-TrebleSettings-IMS.patch @@ -1,25 +1,25 @@ -From fb208d5ca890f31bfff228836a548f3aacf3b061 Mon Sep 17 00:00:00 2001 +From e588ad066e470f910d44877bf506b2ecae1cbc59 Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Tue, 11 Oct 2022 10:29:36 +0000 -Subject: [PATCH 3/8] TrebleSettings: IMS +Subject: [PATCH 3/9] TrebleSettings: IMS Change-Id: Id7a12e150d4a3dc988f8ce1a888ad88443fa0ea4 --- Android.bp | 1 + res/values/strings.xml | 9 + res/xml/treble_settings.xml | 13 ++ - .../InstallImsApkPreferenceController.java | 209 ++++++++++++++++++ + .../InstallImsApkPreferenceController.java | 203 ++++++++++++++++++ ...VolteAvailabilityPreferenceController.java | 59 +++++ .../settings/treble/TrebleSettings.java | 2 + - 6 files changed, 293 insertions(+) + 6 files changed, 287 insertions(+) create mode 100644 src/com/android/settings/treble/InstallImsApkPreferenceController.java create mode 100644 src/com/android/settings/treble/OverrideVolteAvailabilityPreferenceController.java diff --git a/Android.bp b/Android.bp -index 7b7f7f42453..ab2d10cdb08 100644 +index b5018960056..d545aecda9e 100644 --- a/Android.bp +++ b/Android.bp -@@ -109,6 +109,7 @@ android_library { +@@ -117,6 +117,7 @@ android_library { "org.lineageos.platform.internal", "LineagePreferenceLib", "vendor.lineage.fastcharge-V1.0-java", @@ -28,10 +28,10 @@ index 7b7f7f42453..ab2d10cdb08 100644 plugins: ["androidx.room_room-compiler-plugin"], diff --git a/res/values/strings.xml b/res/values/strings.xml -index 0961c045330..029308db35b 100644 +index 366194bf500..ff534fe0152 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml -@@ -7186,6 +7186,8 @@ +@@ -7353,6 +7353,8 @@ Audio Display @@ -40,7 +40,7 @@ index 0961c045330..029308db35b 100644 Use alternative audio policy -@@ -7195,6 +7197,13 @@ +@@ -7362,6 +7364,13 @@ Screen resolution & refresh rate Use alternative backlight scale @@ -78,10 +78,10 @@ index 336137c95f1..09e6bc5d006 100644 diff --git a/src/com/android/settings/treble/InstallImsApkPreferenceController.java b/src/com/android/settings/treble/InstallImsApkPreferenceController.java new file mode 100644 -index 00000000000..6a63cbf1bf3 +index 00000000000..e86884e86cd --- /dev/null +++ b/src/com/android/settings/treble/InstallImsApkPreferenceController.java -@@ -0,0 +1,209 @@ +@@ -0,0 +1,203 @@ +package com.android.settings.treble; + +import android.app.DownloadManager; @@ -167,11 +167,8 @@ index 00000000000..6a63cbf1bf3 + case "mtk_q": + summary += "MediaTek Q"; + break; -+ case "mtk_r": -+ summary += "MediaTek R"; -+ break; -+ case "mtk_s": -+ summary += "MediaTek S"; ++ case "mtk_r+": ++ summary += "MediaTek R+"; + break; + default: + break; @@ -186,19 +183,16 @@ index 00000000000..6a63cbf1bf3 + public boolean onPreferenceClick(Preference preference) { + switch (mImsType) { + case "qcom": -+ mImsApkUrl = "https://treble.phh.me/ims-caf-u.apk"; ++ mImsApkUrl = "https://treble.phh.me/ims-caf-u-resigned.apk"; + break; + case "mtk_p": -+ mImsApkUrl = "https://treble.phh.me/stable/ims-mtk-p.apk"; ++ mImsApkUrl = "https://treble.phh.me/stable/ims-mtk-p-resigned.apk"; + break; + case "mtk_q": -+ mImsApkUrl = "https://treble.phh.me/stable/ims-mtk-q.apk"; ++ mImsApkUrl = "https://treble.phh.me/stable/ims-mtk-q-resigned.apk"; + break; -+ case "mtk_r": -+ mImsApkUrl = "https://treble.phh.me/stable/ims-mtk-r.apk"; -+ break; -+ case "mtk_s": -+ mImsApkUrl = "https://treble.phh.me/stable/ims-mtk-s.apk"; ++ case "mtk_r+": ++ mImsApkUrl = "https://treble.phh.me/ims-mtk-u-resigned.apk"; + break; + default: + break; @@ -279,10 +273,10 @@ index 00000000000..6a63cbf1bf3 + return "mtk_p"; + } else if (hidlManager.get("vendor.mediatek.hardware.mtkradioex@1.0::IMtkRadioEx", slot) != null) { + return "mtk_q"; -+ } else if (hidlManager.get("vendor.mediatek.hardware.mtkradioex@2.0::IMtkRadioEx", slot) != null) { -+ return "mtk_r"; -+ } else if (hidlManager.get("vendor.mediatek.hardware.mtkradioex@3.0::IMtkRadioEx", slot) != null) { -+ return "mtk_s"; ++ } else if (hidlManager.get("vendor.mediatek.hardware.mtkradioex@2.0::IMtkRadioEx", slot) != null ++ || hidlManager.get("vendor.mediatek.hardware.mtkradioex@3.0::IMtkRadioEx", slot) != null ++ || ServiceManager.getService("vendor.mediatek.hardware.mtkradioex.ims.IMtkRadioExIms/" + slot) != null) { ++ return "mtk_r+"; + } + } + } catch (RemoteException ex) {} diff --git a/patches_treble/packages_apps_Settings/0004-TrebleSettings-Disable-A2DP-offload.patch b/patches_treble/packages_apps_Settings/0004-TrebleSettings-Disable-A2DP-offload.patch index 00448e9..72ff5e1 100644 --- a/patches_treble/packages_apps_Settings/0004-TrebleSettings-Disable-A2DP-offload.patch +++ b/patches_treble/packages_apps_Settings/0004-TrebleSettings-Disable-A2DP-offload.patch @@ -1,7 +1,7 @@ -From 7168689803383166446266171d8ac0e54c052b41 Mon Sep 17 00:00:00 2001 +From a15199ab73e7f205ef16a287afd973b062ae9ac6 Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Sat, 10 Dec 2022 12:04:37 +0000 -Subject: [PATCH 4/8] TrebleSettings: Disable A2DP offload +Subject: [PATCH 4/9] TrebleSettings: Disable A2DP offload Change-Id: I737f49d146f83d96793f4436850529e3c528acbe --- @@ -13,10 +13,10 @@ Change-Id: I737f49d146f83d96793f4436850529e3c528acbe create mode 100644 src/com/android/settings/treble/DisableA2DPOffloadPreferenceController.java diff --git a/res/values/strings.xml b/res/values/strings.xml -index 029308db35b..ccdc9e04c3c 100644 +index ff534fe0152..26980abbd58 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml -@@ -7193,6 +7193,8 @@ +@@ -7360,6 +7360,8 @@ Use alternative audio policy Disable soundvolume effect diff --git a/patches_treble/packages_apps_Settings/0005-TrebleSettings-Alternative-audio-jack-detection.patch b/patches_treble/packages_apps_Settings/0005-TrebleSettings-Alternative-audio-jack-detection.patch index a2d3e6f..a5c67b8 100644 --- a/patches_treble/packages_apps_Settings/0005-TrebleSettings-Alternative-audio-jack-detection.patch +++ b/patches_treble/packages_apps_Settings/0005-TrebleSettings-Alternative-audio-jack-detection.patch @@ -1,7 +1,7 @@ -From 9111f1b57b14ad679422fe170e333088b20e0838 Mon Sep 17 00:00:00 2001 +From 1d11999625604110b51d31127a6b8e4a43ad6a5f Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Sat, 10 Dec 2022 14:16:50 +0000 -Subject: [PATCH 5/8] TrebleSettings: Alternative audio jack detection +Subject: [PATCH 5/9] TrebleSettings: Alternative audio jack detection Change-Id: I5d6d48f26a4a2134fd6edf996eca89a1fc42e6de --- @@ -13,10 +13,10 @@ Change-Id: I5d6d48f26a4a2134fd6edf996eca89a1fc42e6de create mode 100644 src/com/android/settings/treble/UseAlternativeAudioJackDetectionPreferenceController.java diff --git a/res/values/strings.xml b/res/values/strings.xml -index ccdc9e04c3c..62478ec1a6c 100644 +index 26980abbd58..08b953b9ccf 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml -@@ -7195,6 +7195,8 @@ +@@ -7362,6 +7362,8 @@ Disable soundvolume effect Disable A2DP offload diff --git a/patches_treble/packages_apps_Settings/0006-TrebleSettings-Override-minimum-brightness.patch b/patches_treble/packages_apps_Settings/0006-TrebleSettings-Override-minimum-brightness.patch index 49de5bb..0232d3c 100644 --- a/patches_treble/packages_apps_Settings/0006-TrebleSettings-Override-minimum-brightness.patch +++ b/patches_treble/packages_apps_Settings/0006-TrebleSettings-Override-minimum-brightness.patch @@ -1,7 +1,7 @@ -From f41885c3103b205838b186ca47c38da3d1aa837e Mon Sep 17 00:00:00 2001 +From 0640b1aa050f80bc8b095e2d78a134402fb0c0de Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Sat, 17 Dec 2022 10:29:05 +0000 -Subject: [PATCH 6/8] TrebleSettings: Override minimum brightness +Subject: [PATCH 6/9] TrebleSettings: Override minimum brightness Change-Id: I6d621f7dd04b675b6e2e851a5e474dc9a9841eb0 --- @@ -13,10 +13,10 @@ Change-Id: I6d621f7dd04b675b6e2e851a5e474dc9a9841eb0 create mode 100644 src/com/android/settings/treble/OverrideMinimumBrightnessPreferenceController.java diff --git a/res/values/strings.xml b/res/values/strings.xml -index 62478ec1a6c..724b0393626 100644 +index 08b953b9ccf..2dd1ddeb5a8 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml -@@ -7201,6 +7201,8 @@ +@@ -7368,6 +7368,8 @@ Screen resolution & refresh rate Use alternative backlight scale diff --git a/patches_treble/packages_apps_Settings/0007-TrebleSettings-Override-navbar-availability.patch b/patches_treble/packages_apps_Settings/0007-TrebleSettings-Override-navbar-availability.patch index d2720b6..bf67b75 100644 --- a/patches_treble/packages_apps_Settings/0007-TrebleSettings-Override-navbar-availability.patch +++ b/patches_treble/packages_apps_Settings/0007-TrebleSettings-Override-navbar-availability.patch @@ -1,7 +1,7 @@ -From 3f42e26678aa5b089011c613f371bbe44e99812c Mon Sep 17 00:00:00 2001 +From 36aebacf72f4366a1e6bc2c3e5f60c6596527752 Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Sat, 17 Dec 2022 11:00:38 +0000 -Subject: [PATCH 7/8] TrebleSettings: Override navbar availability +Subject: [PATCH 7/9] TrebleSettings: Override navbar availability Change-Id: I7c771caf6274543fed23a8cc47411bf8c369ac2c --- @@ -13,10 +13,10 @@ Change-Id: I7c771caf6274543fed23a8cc47411bf8c369ac2c create mode 100644 src/com/android/settings/treble/OverrideNavbarAvailabilityPreferenceController.java diff --git a/res/values/strings.xml b/res/values/strings.xml -index 724b0393626..843fe444dc9 100644 +index 2dd1ddeb5a8..cd79f4d3ed3 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml -@@ -7188,6 +7188,8 @@ +@@ -7355,6 +7355,8 @@ Display IMS @@ -25,7 +25,7 @@ index 724b0393626..843fe444dc9 100644 Use alternative audio policy -@@ -7210,6 +7212,8 @@ +@@ -7377,6 +7379,8 @@ IMS APK installed. Reboot required. Override VoLTE availability diff --git a/patches_treble/packages_apps_Settings/0008-TrebleSettings-Disable-SF-HWC-backpressure.patch b/patches_treble/packages_apps_Settings/0008-TrebleSettings-Disable-SF-HWC-backpressure.patch new file mode 100644 index 0000000..c8aa99e --- /dev/null +++ b/patches_treble/packages_apps_Settings/0008-TrebleSettings-Disable-SF-HWC-backpressure.patch @@ -0,0 +1,119 @@ +From 94c32f8dc4f427938340a1b5c704153561e44e06 Mon Sep 17 00:00:00 2001 +From: Andy CrossGate Yan +Date: Sun, 26 May 2024 21:32:44 +0800 +Subject: [PATCH 8/9] TrebleSettings: Disable SF HWC backpressure + +Change-Id: I4d6a1d43222a8e4dec202056a14b1b1ce41e33d3 +--- + res/values/strings.xml | 4 ++ + res/xml/treble_settings.xml | 5 ++ + ...SfHwcBackpressurePreferenceController.java | 53 +++++++++++++++++++ + .../settings/treble/TrebleSettings.java | 1 + + 4 files changed, 63 insertions(+) + create mode 100644 src/com/android/settings/treble/DisableSfHwcBackpressurePreferenceController.java + +diff --git a/res/values/strings.xml b/res/values/strings.xml +index cd79f4d3ed3..b9bed8d56b5 100644 +--- a/res/values/strings.xml ++++ b/res/values/strings.xml +@@ -7372,6 +7372,10 @@ + Use alternative backlight scale + + Override minimum brightness ++ ++ Disable SF HWC backpressure ++ ++ Might improve rendering performance + + Install IMS APK + +diff --git a/res/xml/treble_settings.xml b/res/xml/treble_settings.xml +index 250a8ee75ae..4e3bef9b644 100644 +--- a/res/xml/treble_settings.xml ++++ b/res/xml/treble_settings.xml +@@ -42,6 +42,11 @@ + android:key="override_minimum_brightness" + android:title="@string/override_minimum_brightness_title" /> + ++ ++ + + + -Date: Sat, 17 Dec 2022 14:30:52 +0000 -Subject: [PATCH 8/8] TrebleSettings: Securize on-demand - -Change-Id: I76f54620277ccdc41636d74d1afa6330c382ce6a ---- - res/values/strings.xml | 6 +++ - res/xml/treble_settings.xml | 10 ++++ - .../treble/SecurizePreferenceController.java | 53 +++++++++++++++++++ - .../settings/treble/TrebleSettings.java | 1 + - 4 files changed, 70 insertions(+) - create mode 100644 src/com/android/settings/treble/SecurizePreferenceController.java - -diff --git a/res/values/strings.xml b/res/values/strings.xml -index 843fe444dc9..f7940dce85d 100644 ---- a/res/values/strings.xml -+++ b/res/values/strings.xml -@@ -7188,6 +7188,8 @@ - Display - - IMS -+ -+ System - - UI - -@@ -7212,6 +7214,10 @@ - IMS APK installed. Reboot required. - - Override VoLTE availability -+ -+ Spoof system properties -+ -+ For better chances of passing SafetyNet\nMight cause bootloop on some devices - - Override navigation bar availability - -diff --git a/res/xml/treble_settings.xml b/res/xml/treble_settings.xml -index 250a8ee75ae..1f24352421f 100644 ---- a/res/xml/treble_settings.xml -+++ b/res/xml/treble_settings.xml -@@ -57,6 +57,16 @@ - - - -+ -+ -+ -+ -+ -+ - - -diff --git a/src/com/android/settings/treble/SecurizePreferenceController.java b/src/com/android/settings/treble/SecurizePreferenceController.java -new file mode 100644 -index 00000000000..0b59bbad81c ---- /dev/null -+++ b/src/com/android/settings/treble/SecurizePreferenceController.java -@@ -0,0 +1,53 @@ -+package com.android.settings.treble; -+ -+import android.content.Context; -+import android.os.SystemProperties; -+ -+import androidx.preference.Preference; -+import androidx.preference.PreferenceScreen; -+import androidx.preference.SwitchPreference; -+ -+import com.android.settings.core.BasePreferenceController; -+ -+public class SecurizePreferenceController extends BasePreferenceController -+ implements Preference.OnPreferenceChangeListener { -+ -+ private static final String SECURIZE_KEY = "securize"; -+ private static final String SECURIZE_PROPERTY = "persist.sys.treble.securize"; -+ -+ private SwitchPreference mSwitchPreference; -+ -+ public SecurizePreferenceController(Context context) { -+ super(context, SECURIZE_KEY); -+ } -+ -+ @Override -+ public int getAvailabilityStatus() { -+ return AVAILABLE; -+ } -+ -+ @Override -+ public String getPreferenceKey() { -+ return SECURIZE_KEY; -+ } -+ -+ @Override -+ public void displayPreference(PreferenceScreen screen) { -+ mSwitchPreference = screen.findPreference(getPreferenceKey()); -+ super.displayPreference(screen); -+ } -+ -+ @Override -+ public void updateState(Preference preference) { -+ boolean checked = SystemProperties.getBoolean(SECURIZE_PROPERTY, false); -+ mSwitchPreference.setChecked(checked); -+ } -+ -+ @Override -+ public boolean onPreferenceChange(Preference preference, Object newValue) { -+ SystemProperties.set(SECURIZE_PROPERTY, String.valueOf((boolean) newValue)); -+ mSwitchPreference.setChecked((boolean) newValue); -+ return true; -+ } -+ -+} -diff --git a/src/com/android/settings/treble/TrebleSettings.java b/src/com/android/settings/treble/TrebleSettings.java -index 634b7ce3ce1..149c18f2315 100644 ---- a/src/com/android/settings/treble/TrebleSettings.java -+++ b/src/com/android/settings/treble/TrebleSettings.java -@@ -41,6 +41,7 @@ public class TrebleSettings extends DashboardFragment { - controllers.add(new OverrideMinimumBrightnessPreferenceController(context)); - controllers.add(new InstallImsApkPreferenceController(context)); - controllers.add(new OverrideVolteAvailabilityPreferenceController(context)); -+ controllers.add(new SecurizePreferenceController(context)); - controllers.add(new OverrideNavbarAvailabilityPreferenceController(context)); - return controllers; - } --- -2.34.1 - diff --git a/patches_treble/packages_apps_Settings/0009-TrebleSettings-Securize-placeholder.patch b/patches_treble/packages_apps_Settings/0009-TrebleSettings-Securize-placeholder.patch new file mode 100644 index 0000000..1b2bc9e --- /dev/null +++ b/patches_treble/packages_apps_Settings/0009-TrebleSettings-Securize-placeholder.patch @@ -0,0 +1,61 @@ +From e6f53c10e76522ec31519264c40d95d872542f47 Mon Sep 17 00:00:00 2001 +From: Andy CrossGate Yan +Date: Wed, 17 Jul 2024 22:35:50 +0800 +Subject: [PATCH 9/9] TrebleSettings: Securize placeholder + +Leave this Play Integrity mess to the professionals + +Change-Id: Ic30a78f5417925e1c8899ce91c37fa41b2ff15c2 +--- + res/values/strings.xml | 6 ++++++ + res/xml/treble_settings.xml | 10 ++++++++++ + 2 files changed, 16 insertions(+) + +diff --git a/res/values/strings.xml b/res/values/strings.xml +index b9bed8d56b5..f55ee2a048d 100644 +--- a/res/values/strings.xml ++++ b/res/values/strings.xml +@@ -7355,6 +7355,8 @@ + Display + + IMS ++ ++ System + + UI + +@@ -7383,6 +7385,10 @@ + IMS APK installed. Reboot required. + + Override VoLTE availability ++ ++ Securize ++ ++ Unsupported - please try other methods\n(e.g. PlayIntegrityFix module) + + Override navigation bar availability + +diff --git a/res/xml/treble_settings.xml b/res/xml/treble_settings.xml +index 4e3bef9b644..13e74ee4f6c 100644 +--- a/res/xml/treble_settings.xml ++++ b/res/xml/treble_settings.xml +@@ -62,6 +62,16 @@ + + + ++ ++ ++ ++ ++ ++ + + +-- +2.34.1 + diff --git a/patches_treble/packages_modules_Bluetooth/0001-audio_hal_interface-Optionally-use-sysbta-HAL.patch b/patches_treble/packages_modules_Bluetooth/0001-audio_hal_interface-Optionally-use-sysbta-HAL.patch index f8ee9fa..e0b31ea 100644 --- a/patches_treble/packages_modules_Bluetooth/0001-audio_hal_interface-Optionally-use-sysbta-HAL.patch +++ b/patches_treble/packages_modules_Bluetooth/0001-audio_hal_interface-Optionally-use-sysbta-HAL.patch @@ -1,4 +1,4 @@ -From a128ba855ac44962c2bcacbe005dfe10a13ae74a Mon Sep 17 00:00:00 2001 +From 5a66cafc4821d898b3366445c07987ade57bab89 Mon Sep 17 00:00:00 2001 From: Peter Cai Date: Wed, 24 Aug 2022 15:45:18 -0400 Subject: [PATCH] audio_hal_interface: Optionally use sysbta HAL @@ -13,10 +13,10 @@ Change-Id: I59973e6ec84c5923be8a7c67b36b2e237f000860 3 files changed, 19 insertions(+), 5 deletions(-) diff --git a/system/audio_hal_interface/aidl/client_interface_aidl.cc b/system/audio_hal_interface/aidl/client_interface_aidl.cc -index 9faa725022..f6706d98f1 100644 +index 76e8788d02..bde4c4529c 100644 --- a/system/audio_hal_interface/aidl/client_interface_aidl.cc +++ b/system/audio_hal_interface/aidl/client_interface_aidl.cc -@@ -58,7 +58,7 @@ BluetoothAudioClientInterface::BluetoothAudioClientInterface( +@@ -63,7 +63,7 @@ BluetoothAudioClientInterface::BluetoothAudioClientInterface( bool BluetoothAudioClientInterface::is_aidl_available() { return AServiceManager_isDeclared( @@ -25,7 +25,7 @@ index 9faa725022..f6706d98f1 100644 } std::vector -@@ -74,7 +74,7 @@ BluetoothAudioClientInterface::GetAudioCapabilities(SessionType session_type) { +@@ -79,7 +79,7 @@ BluetoothAudioClientInterface::GetAudioCapabilities(SessionType session_type) { } auto provider_factory = IBluetoothAudioProviderFactory::fromBinder( ::ndk::SpAIBinder(AServiceManager_waitForService( @@ -34,7 +34,7 @@ index 9faa725022..f6706d98f1 100644 if (provider_factory == nullptr) { LOG(ERROR) << __func__ << ", can't get capability from unknown factory"; -@@ -101,7 +101,7 @@ void BluetoothAudioClientInterface::FetchAudioProvider() { +@@ -192,7 +192,7 @@ void BluetoothAudioClientInterface::FetchAudioProvider() { } auto provider_factory = IBluetoothAudioProviderFactory::fromBinder( ::ndk::SpAIBinder(AServiceManager_waitForService( @@ -44,18 +44,18 @@ index 9faa725022..f6706d98f1 100644 if (provider_factory == nullptr) { LOG(ERROR) << __func__ << ", can't get capability from unknown factory"; diff --git a/system/audio_hal_interface/aidl/client_interface_aidl.h b/system/audio_hal_interface/aidl/client_interface_aidl.h -index 0dd9575acb..d28e8e46fb 100644 +index c191e4054e..99d5192376 100644 --- a/system/audio_hal_interface/aidl/client_interface_aidl.h +++ b/system/audio_hal_interface/aidl/client_interface_aidl.h -@@ -28,6 +28,7 @@ +@@ -27,6 +27,7 @@ + #include "audio_ctrl_ack.h" #include "bluetooth_audio_port_impl.h" - #include "common/message_loop_thread.h" #include "transport_instance.h" +#include "osi/include/properties.h" #define BLUETOOTH_AUDIO_HAL_PROP_DISABLED \ "persist.bluetooth.bluetooth_audio_hal.disabled" -@@ -160,6 +161,12 @@ class BluetoothAudioClientInterface { +@@ -175,6 +176,12 @@ class BluetoothAudioClientInterface { // "android.hardware.bluetooth.audio.IBluetoothAudioProviderFactory/default"; static inline const std::string kDefaultAudioProviderFactoryInterface = std::string() + IBluetoothAudioProviderFactory::descriptor + "/default"; @@ -69,18 +69,18 @@ index 0dd9575acb..d28e8e46fb 100644 private: IBluetoothTransportInstance* transport_; diff --git a/system/audio_hal_interface/hal_version_manager.cc b/system/audio_hal_interface/hal_version_manager.cc -index 275bbb067e..885e34f188 100644 +index 36672cb32c..98f1cdecac 100644 --- a/system/audio_hal_interface/hal_version_manager.cc +++ b/system/audio_hal_interface/hal_version_manager.cc -@@ -25,6 +25,7 @@ - +@@ -26,6 +26,7 @@ #include "aidl/audio_aidl_interfaces.h" - #include "osi/include/log.h" + #include "include/check.h" + #include "os/log.h" +#include "osi/include/properties.h" namespace bluetooth { namespace audio { -@@ -34,6 +35,12 @@ using ::aidl::android::hardware::bluetooth::audio:: +@@ -35,6 +36,12 @@ using ::aidl::android::hardware::bluetooth::audio:: static const std::string kDefaultAudioProviderFactoryInterface = std::string() + IBluetoothAudioProviderFactory::descriptor + "/default"; @@ -91,18 +91,18 @@ index 275bbb067e..885e34f188 100644 + ? kSystemAudioProviderFactoryInterface : kDefaultAudioProviderFactoryInterface; +} - std::unique_ptr HalVersionManager::instance_ptr = - std::make_unique(); -@@ -88,7 +95,7 @@ BluetoothAudioHalVersion GetAidlInterfaceVersion() { + std::string toString(BluetoothAudioHalTransport transport) { + switch (transport) { +@@ -76,7 +83,7 @@ BluetoothAudioHalVersion GetAidlInterfaceVersion() { + int version = 0; + auto provider_factory = IBluetoothAudioProviderFactory::fromBinder( + ::ndk::SpAIBinder(AServiceManager_waitForService( +- kDefaultAudioProviderFactoryInterface.c_str()))); ++ audioProviderFactoryInterface().c_str()))); - auto provider_factory = IBluetoothAudioProviderFactory::fromBinder( - ::ndk::SpAIBinder(AServiceManager_waitForService( -- kDefaultAudioProviderFactoryInterface.c_str()))); -+ audioProviderFactoryInterface().c_str()))); - - if (provider_factory == nullptr) { - LOG_ERROR("Can't get aidl version from unknown factory"); -@@ -122,7 +129,7 @@ BluetoothAudioHalVersion GetAidlInterfaceVersion() { + if (provider_factory == nullptr) { + LOG_ERROR( +@@ -146,7 +153,7 @@ HalVersionManager::GetProvidersFactory_2_0() { HalVersionManager::HalVersionManager() { hal_transport_ = BluetoothAudioHalTransport::UNKNOWN; if (AServiceManager_checkService( diff --git a/patches_treble/system_core/0001-Make-xbin-and-su-executable-by-other.patch b/patches_treble/system_core/0001-Make-xbin-and-su-executable-by-other.patch index d696828..848b14c 100644 --- a/patches_treble/system_core/0001-Make-xbin-and-su-executable-by-other.patch +++ b/patches_treble/system_core/0001-Make-xbin-and-su-executable-by-other.patch @@ -1,4 +1,4 @@ -From 38e56ab78cdfdbe23de14570993bf26f94d9967a Mon Sep 17 00:00:00 2001 +From 1f5cafaf96da7e9f9049a7c41b9d2ce5998b8ea5 Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Mon, 26 Sep 2022 14:41:41 +0000 Subject: [PATCH 1/4] Make xbin and su executable by other diff --git a/patches_treble/system_core/0002-Restore-sbin-for-Magisk-compatibility.patch b/patches_treble/system_core/0002-Restore-sbin-for-Magisk-compatibility.patch index db5f0e2..de26236 100644 --- a/patches_treble/system_core/0002-Restore-sbin-for-Magisk-compatibility.patch +++ b/patches_treble/system_core/0002-Restore-sbin-for-Magisk-compatibility.patch @@ -1,4 +1,4 @@ -From a088bdd1d30e127815bd25ffd89a9ba858c20662 Mon Sep 17 00:00:00 2001 +From 9eb5fbb2fec3d1734d7f28f71e37655eaac067ce Mon Sep 17 00:00:00 2001 From: Victor Bo Date: Wed, 3 Mar 2021 06:31:17 -0500 Subject: [PATCH 2/4] Restore /sbin for Magisk compatibility @@ -58,7 +58,7 @@ index 809237bc9..584e513f8 100644 { 00755, AID_ROOT, AID_SHELL, 0, "system/bin/*" }, { 00755, AID_ROOT, AID_SHELL, 0, "system/xbin/*" }, diff --git a/rootdir/Android.mk b/rootdir/Android.mk -index 7deb17324..aeeaad496 100644 +index 7444f963f..b74887c43 100644 --- a/rootdir/Android.mk +++ b/rootdir/Android.mk @@ -96,7 +96,7 @@ endif @@ -67,7 +67,7 @@ index 7deb17324..aeeaad496 100644 LOCAL_POST_INSTALL_CMD := mkdir -p $(addprefix $(TARGET_ROOT_OUT)/, \ - dev proc sys system data data_mirror odm oem acct config storage mnt apex bootstrap-apex debug_ramdisk \ + sbin dev proc sys system data data_mirror odm oem acct config storage mnt apex bootstrap-apex debug_ramdisk \ - linkerconfig second_stage_resources postinstall $(BOARD_ROOT_EXTRA_FOLDERS)); \ + linkerconfig second_stage_resources postinstall tmp $(BOARD_ROOT_EXTRA_FOLDERS)); \ ln -sf /system/bin $(TARGET_ROOT_OUT)/bin; \ ln -sf /system/etc $(TARGET_ROOT_OUT)/etc; \ diff --git a/rootdir/init.environ.rc.in b/rootdir/init.environ.rc.in diff --git a/patches_treble/system_core/0003-init-Do-not-start-console-service-when-debuggable.patch b/patches_treble/system_core/0003-init-Do-not-start-console-service-when-debuggable.patch index a743236..5d5cdf6 100644 --- a/patches_treble/system_core/0003-init-Do-not-start-console-service-when-debuggable.patch +++ b/patches_treble/system_core/0003-init-Do-not-start-console-service-when-debuggable.patch @@ -1,4 +1,4 @@ -From 9665effe383d8caafb1114b28dfaca50924714a6 Mon Sep 17 00:00:00 2001 +From 767bbc383c83a8c9d04b7450d28a34d33e53392d Mon Sep 17 00:00:00 2001 From: Isaac Chen Date: Wed, 23 Jun 2021 13:07:30 +0800 Subject: [PATCH 3/4] init: Do not start console service when debuggable @@ -13,10 +13,10 @@ Change-Id: I34cfd6b42d3b9aee4b3e63181480cfb8b1255f29 1 file changed, 3 deletions(-) diff --git a/rootdir/init.rc b/rootdir/init.rc -index 317f80908..9dc09ea4a 100644 +index 92e8f27ba..432cd9784 100644 --- a/rootdir/init.rc +++ b/rootdir/init.rc -@@ -1290,9 +1290,6 @@ on property:ro.debuggable=1 +@@ -1306,9 +1306,6 @@ on property:ro.debuggable=1 # Give reads to anyone for the accessibility trace folder on debug builds. chmod 0775 /data/misc/a11ytrace diff --git a/patches_treble/system_core/0004-Don-t-abandon-creating-property-tree-if-there-is-a-c.patch b/patches_treble/system_core/0004-Don-t-abandon-creating-property-tree-if-there-is-a-c.patch index ea391d1..36da3be 100644 --- a/patches_treble/system_core/0004-Don-t-abandon-creating-property-tree-if-there-is-a-c.patch +++ b/patches_treble/system_core/0004-Don-t-abandon-creating-property-tree-if-there-is-a-c.patch @@ -1,4 +1,4 @@ -From a37a2492ba4f0e37bec5a76852db55856ae81427 Mon Sep 17 00:00:00 2001 +From 469c6ef39faeba84caf704564a3bc21c4261b665 Mon Sep 17 00:00:00 2001 From: Pierre-Hugues Husson Date: Sun, 18 Oct 2020 18:14:47 +0200 Subject: [PATCH 4/4] Don't abandon creating property tree if there is a