diff --git a/patches_platform/frameworks_base/0001-Disable-vendor-mismatch-warning.patch b/patches_platform/frameworks_base/0001-Disable-vendor-mismatch-warning.patch index 1d43342..f45b761 100644 --- a/patches_platform/frameworks_base/0001-Disable-vendor-mismatch-warning.patch +++ b/patches_platform/frameworks_base/0001-Disable-vendor-mismatch-warning.patch @@ -1,7 +1,7 @@ -From 458abb420f0dc2d9df421c9c81d203f2e420241c Mon Sep 17 00:00:00 2001 +From 5c49797b6d93903bdfc4a6938eb18657f3525570 Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Thu, 5 Apr 2018 10:01:19 +0800 -Subject: [PATCH 01/21] Disable vendor mismatch warning +Subject: [PATCH 01/22] Disable vendor mismatch warning Change-Id: Ieb8fe91e2f02462f074312ed0f4885d183e9780b --- @@ -9,10 +9,10 @@ Change-Id: Ieb8fe91e2f02462f074312ed0f4885d183e9780b 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java -index f3ba56a03aef..f831b10f0ddc 100644 +index 08f3b1a8c6e0..d0387cc38d3d 100644 --- a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java +++ b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java -@@ -5493,20 +5493,8 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { +@@ -5499,20 +5499,8 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { } if (!Build.isBuildConsistent()) { diff --git a/patches_platform/frameworks_base/0002-UI-Adjust-default-navbar-layouts.patch b/patches_platform/frameworks_base/0002-UI-Adjust-default-navbar-layouts.patch index cd8462f..be3f132 100644 --- a/patches_platform/frameworks_base/0002-UI-Adjust-default-navbar-layouts.patch +++ b/patches_platform/frameworks_base/0002-UI-Adjust-default-navbar-layouts.patch @@ -1,7 +1,7 @@ -From cb50f98e9a0aca5ae5a2a4227ebdb9c957c16ac4 Mon Sep 17 00:00:00 2001 +From f4af00e6769797999721cbfe4673a7f2f0c76278 Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Sat, 16 Oct 2021 02:23:48 +0000 -Subject: [PATCH 02/21] UI: Adjust default navbar layouts +Subject: [PATCH 02/22] UI: Adjust default navbar layouts - Slightly tighten nodpi layout - Remove sw372dp layout - looks terrible, probably meant for legacy phablets, but most modern phones qualify diff --git a/patches_platform/frameworks_base/0003-UI-Disable-left-seascape-navigation-bar-optionally.patch b/patches_platform/frameworks_base/0003-UI-Disable-left-seascape-navigation-bar-optionally.patch index 2c0e215..61cd0d9 100644 --- a/patches_platform/frameworks_base/0003-UI-Disable-left-seascape-navigation-bar-optionally.patch +++ b/patches_platform/frameworks_base/0003-UI-Disable-left-seascape-navigation-bar-optionally.patch @@ -1,7 +1,7 @@ -From 86eedab915fadd671299755f597e1f6e1d1b08f9 Mon Sep 17 00:00:00 2001 +From 07a09e5d704b6971a5c061ac65bb7d765e368dec Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Fri, 9 Mar 2018 15:41:26 +0800 -Subject: [PATCH 03/21] UI: Disable left (seascape) navigation bar optionally +Subject: [PATCH 03/22] UI: Disable left (seascape) navigation bar optionally Toggle this behaviour with property "persist.ui.seascape.disable" @@ -45,10 +45,10 @@ index f1e1366404a2..f43bef8532b8 100644 for (int i = 0; i < group.getChildCount(); i++) { final View child = group.getChildAt(i); diff --git a/services/core/java/com/android/server/wm/DisplayPolicy.java b/services/core/java/com/android/server/wm/DisplayPolicy.java -index 73d31bf7e0c8..a070942cc76a 100644 +index d0457b08aa34..d165552d5ce8 100644 --- a/services/core/java/com/android/server/wm/DisplayPolicy.java +++ b/services/core/java/com/android/server/wm/DisplayPolicy.java -@@ -2334,9 +2334,10 @@ public class DisplayPolicy { +@@ -2352,9 +2352,10 @@ public class DisplayPolicy { @NavigationBarPosition int navigationBarPosition(int displayWidth, int displayHeight, int displayRotation) { if (navigationBarCanMove() && displayWidth > displayHeight) { diff --git a/patches_platform/frameworks_base/0004-UI-Disable-wallpaper-zoom.patch b/patches_platform/frameworks_base/0004-UI-Disable-wallpaper-zoom.patch index fdaa198..9d04383 100644 --- a/patches_platform/frameworks_base/0004-UI-Disable-wallpaper-zoom.patch +++ b/patches_platform/frameworks_base/0004-UI-Disable-wallpaper-zoom.patch @@ -1,7 +1,7 @@ -From 127d469f088affc27bf44ce16a43e938a313631d Mon Sep 17 00:00:00 2001 +From 58f4875f7b157bf408bd770a4131d5ee0c98f7da Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Sun, 10 Jan 2021 11:44:29 +0000 -Subject: [PATCH 04/21] UI: Disable wallpaper zoom +Subject: [PATCH 04/22] UI: Disable wallpaper zoom It does little more than inducing motion sickness @@ -11,10 +11,10 @@ Change-Id: I78cc5484930b27f172cd8d8a5bd9042dce3478d0 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml -index dd535da6d7bd..7e42418e06c8 100644 +index b7dfd49b7b78..08940c03b095 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml -@@ -4747,7 +4747,7 @@ +@@ -4768,7 +4768,7 @@ diff --git a/patches_platform/frameworks_base/0005-UI-Increase-default-status-bar-height.patch b/patches_platform/frameworks_base/0005-UI-Increase-default-status-bar-height.patch index 0d0595d..ca48814 100644 --- a/patches_platform/frameworks_base/0005-UI-Increase-default-status-bar-height.patch +++ b/patches_platform/frameworks_base/0005-UI-Increase-default-status-bar-height.patch @@ -1,7 +1,7 @@ -From 4aa1829873f1f8f855fc2bb32f37c5dfd343d9cd Mon Sep 17 00:00:00 2001 +From 88c071a7385821219dbb90bc8475bece813e84c9 Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Wed, 3 Jun 2020 01:31:34 +0000 -Subject: [PATCH 05/21] UI: Increase default status bar height +Subject: [PATCH 05/22] UI: Increase default status bar height Change-Id: Ibbcf63159e19bb2bb2b1094ea07ab85917630b07 --- @@ -9,7 +9,7 @@ Change-Id: Ibbcf63159e19bb2bb2b1094ea07ab85917630b07 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/res/res/values/dimens.xml b/core/res/res/values/dimens.xml -index de7a1175b4a3..8d56e94458db 100644 +index a666a5b4b796..b62a785cd69f 100644 --- a/core/res/res/values/dimens.xml +++ b/core/res/res/values/dimens.xml @@ -43,7 +43,7 @@ diff --git a/patches_platform/frameworks_base/0006-UI-Revive-navbar-layout-tuning-via-sysui_nav_bar-tun.patch b/patches_platform/frameworks_base/0006-UI-Revive-navbar-layout-tuning-via-sysui_nav_bar-tun.patch index cdb3525..ffffc5f 100644 --- a/patches_platform/frameworks_base/0006-UI-Revive-navbar-layout-tuning-via-sysui_nav_bar-tun.patch +++ b/patches_platform/frameworks_base/0006-UI-Revive-navbar-layout-tuning-via-sysui_nav_bar-tun.patch @@ -1,7 +1,7 @@ -From 2fff33790ba845ec3045497a4f3679cc8fb89a5e Mon Sep 17 00:00:00 2001 +From af017461178d08dcd0999b76d800e1e4f773c09b Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Tue, 6 Oct 2020 01:41:16 +0000 -Subject: [PATCH 06/21] UI: Revive navbar layout tuning via sysui_nav_bar +Subject: [PATCH 06/22] UI: Revive navbar layout tuning via sysui_nav_bar tunable Google keeps fixing what ain't broken. diff --git a/patches_platform/frameworks_base/0007-UI-Use-SNAP_FIXED_RATIO-for-multi-window-globally.patch b/patches_platform/frameworks_base/0007-UI-Use-SNAP_FIXED_RATIO-for-multi-window-globally.patch index b5252e0..9143407 100644 --- a/patches_platform/frameworks_base/0007-UI-Use-SNAP_FIXED_RATIO-for-multi-window-globally.patch +++ b/patches_platform/frameworks_base/0007-UI-Use-SNAP_FIXED_RATIO-for-multi-window-globally.patch @@ -1,7 +1,7 @@ -From 0b204ff8b577160aed587cff1d9d7b60c78c6b1d Mon Sep 17 00:00:00 2001 +From 3da8e7d5f61c024dd70a311f9b67622f419c07a0 Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Sun, 26 Apr 2020 08:56:13 +0000 -Subject: [PATCH 07/21] UI: Use SNAP_FIXED_RATIO for multi-window globally +Subject: [PATCH 07/22] 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 7e42418e06c8..b723eb64dc6a 100644 +index 08940c03b095..1319c26bb1be 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml -@@ -3515,7 +3515,7 @@ +@@ -3529,7 +3529,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/0008-UI-Unblock-alarm-status-bar-icon.patch b/patches_platform/frameworks_base/0008-UI-Unblock-alarm-status-bar-icon.patch index f92ec50..cbb3631 100644 --- a/patches_platform/frameworks_base/0008-UI-Unblock-alarm-status-bar-icon.patch +++ b/patches_platform/frameworks_base/0008-UI-Unblock-alarm-status-bar-icon.patch @@ -1,7 +1,7 @@ -From 9f0eafb52cf46793f29714979fabe9d245df530f Mon Sep 17 00:00:00 2001 +From 186e9e99567c3961a63535ae2b04aa172cfc1734 Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Thu, 14 Oct 2021 15:45:24 +0000 -Subject: [PATCH 08/21] UI: Unblock alarm status bar icon +Subject: [PATCH 08/22] UI: Unblock alarm status bar icon That's very Zen of you, Google... @@ -24,10 +24,10 @@ index 6a171ceff1ed..2c1321f1c013 100644 mDarkIconManager.setBlockList(mBlockedIcons); mStatusBarIconController.addIconGroup(mDarkIconManager); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java -index b9df71304b3c..4d6886714120 100644 +index f9c6ebbd26e3..7b4dc47a7b48 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java -@@ -210,7 +210,6 @@ public class KeyguardStatusBarView extends RelativeLayout implements +@@ -206,7 +206,6 @@ public class KeyguardStatusBarView extends RelativeLayout implements // Set hidden status bar items private void loadBlockList() { Resources r = getResources(); diff --git a/patches_platform/frameworks_base/0009-core-Remove-default-aspect-ratio-limit-for-old-apps.patch b/patches_platform/frameworks_base/0009-core-Remove-default-aspect-ratio-limit-for-old-apps.patch index e022e22..f39c80a 100644 --- a/patches_platform/frameworks_base/0009-core-Remove-default-aspect-ratio-limit-for-old-apps.patch +++ b/patches_platform/frameworks_base/0009-core-Remove-default-aspect-ratio-limit-for-old-apps.patch @@ -1,7 +1,7 @@ -From 366d61fb371f01453f0d46ac21927752b787b71f Mon Sep 17 00:00:00 2001 +From 1ec1cdc8f12227b0612d258ee110432ed954dde1 Mon Sep 17 00:00:00 2001 From: Danny Lin Date: Tue, 3 Nov 2020 22:38:49 -0800 -Subject: [PATCH 09/21] core: Remove default aspect ratio limit for old apps +Subject: [PATCH 09/22] core: Remove default aspect ratio limit for old apps MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit diff --git a/patches_platform/frameworks_base/0010-SystemUI-Always-refresh-power-menu-on-UI-mode-change.patch b/patches_platform/frameworks_base/0010-SystemUI-Always-refresh-power-menu-on-UI-mode-change.patch index 9cc0f59..21c1147 100644 --- a/patches_platform/frameworks_base/0010-SystemUI-Always-refresh-power-menu-on-UI-mode-change.patch +++ b/patches_platform/frameworks_base/0010-SystemUI-Always-refresh-power-menu-on-UI-mode-change.patch @@ -1,7 +1,7 @@ -From 3139b5f6c75f2d76640bd7c10fd7ab5d4ecd6f7e Mon Sep 17 00:00:00 2001 +From c1d673a010c19018d37ec21c2bbed09480c4dce9 Mon Sep 17 00:00:00 2001 From: Danny Lin Date: Tue, 5 Oct 2021 21:01:15 -0700 -Subject: [PATCH 10/21] SystemUI: Always refresh power menu on UI mode change +Subject: [PATCH 10/22] SystemUI: Always refresh power menu on UI mode change This is necessary for reliably theming the global actions dialog with dynamic colors and adapting it to light/dark themes. @@ -15,10 +15,10 @@ Change-Id: Id6f6623096ed231e841ca3794b47f8a0ab54dae6 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialogLite.java b/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialogLite.java -index 06e74821869e..b0333f3c4463 100644 +index 9ada54b9ef6f..1ae3b31fd836 100644 --- a/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialogLite.java +++ b/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialogLite.java -@@ -689,7 +689,7 @@ public class GlobalActionsDialogLite implements DialogInterface.OnDismissListene +@@ -703,7 +703,7 @@ public class GlobalActionsDialogLite implements DialogInterface.OnDismissListene @Override public void onUiModeChanged() { mContext.getTheme().applyStyle(mContext.getThemeResId(), true); diff --git a/patches_platform/frameworks_base/0011-SystemUI-Use-Monet-colors-for-power-menu.patch b/patches_platform/frameworks_base/0011-SystemUI-Use-Monet-colors-for-power-menu.patch index 3dd382a..96adb89 100644 --- a/patches_platform/frameworks_base/0011-SystemUI-Use-Monet-colors-for-power-menu.patch +++ b/patches_platform/frameworks_base/0011-SystemUI-Use-Monet-colors-for-power-menu.patch @@ -1,7 +1,7 @@ -From d06024052d975a00ebbc90dfe0e25479773ca0c4 Mon Sep 17 00:00:00 2001 +From 314462d52502de4c850b3e657bdca280679188e1 Mon Sep 17 00:00:00 2001 From: Danny Lin Date: Sat, 9 Oct 2021 14:39:38 -0700 -Subject: [PATCH 11/21] SystemUI: Use Monet colors for power menu +Subject: [PATCH 11/22] SystemUI: Use Monet colors for power menu It's odd that the power menu doesn't use Monet colors, unlike most of System UI. This makes it feel more integrated with the rest of the @@ -30,7 +30,7 @@ index b98694e2fae7..3a6b62dfe1c8 100644 + @*android:color/accent_device_default_dark diff --git a/packages/SystemUI/res/values/colors.xml b/packages/SystemUI/res/values/colors.xml -index 2260d2175268..87523686bb2a 100644 +index f539b0cf68a1..9ea915c1cb3f 100644 --- a/packages/SystemUI/res/values/colors.xml +++ b/packages/SystemUI/res/values/colors.xml @@ -53,11 +53,11 @@ diff --git a/patches_platform/frameworks_base/0012-Revert-Make-QS-always-use-dark-theme-colors.patch b/patches_platform/frameworks_base/0012-Revert-Make-QS-always-use-dark-theme-colors.patch index 5949fb1..aaba987 100644 --- a/patches_platform/frameworks_base/0012-Revert-Make-QS-always-use-dark-theme-colors.patch +++ b/patches_platform/frameworks_base/0012-Revert-Make-QS-always-use-dark-theme-colors.patch @@ -1,7 +1,7 @@ -From ca37991b2e96c287dfdd2bbc34d968a88a488fa1 Mon Sep 17 00:00:00 2001 +From d6a215d67f767fe6a793dd66f5bf8dcd02f48d57 Mon Sep 17 00:00:00 2001 From: Danny Lin Date: Wed, 6 Oct 2021 18:40:30 -0700 -Subject: [PATCH 12/21] Revert "Make QS always use dark theme colors" +Subject: [PATCH 12/22] Revert "Make QS always use dark theme colors" This reverts commit d62f7249f9e3222da95ecf6816601c408aac6be5. @@ -15,7 +15,7 @@ Change-Id: Iac4c96ccb3845812ca3df820bf27dc533816f72e 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/SystemUI/res/layout/quick_qs_status_icons.xml b/packages/SystemUI/res/layout/quick_qs_status_icons.xml -index 5b9ca1b26158..bbd3e47a568f 100644 +index 42a7c895ff84..27514617fb23 100644 --- a/packages/SystemUI/res/layout/quick_qs_status_icons.xml +++ b/packages/SystemUI/res/layout/quick_qs_status_icons.xml @@ -24,7 +24,7 @@ @@ -25,10 +25,10 @@ index 5b9ca1b26158..bbd3e47a568f 100644 - android:theme="@style/Theme.SystemUI.QuickSettings.Header"> + android:theme="@style/QSHeaderTheme"> - @style/QSIconTheme @style/QSIconTheme @*android:color/error_color_material_dark -@@ -484,7 +484,7 @@ +@@ -486,7 +486,7 @@ @color/dark_mode_qs_icon_color_single_tone diff --git a/patches_platform/frameworks_base/0013-Revert-Do-not-re-inflate-QS-and-SB-when-CONFIG_UI_MO.patch b/patches_platform/frameworks_base/0013-Revert-Do-not-re-inflate-QS-and-SB-when-CONFIG_UI_MO.patch index 25a1c3c..e05654c 100644 --- a/patches_platform/frameworks_base/0013-Revert-Do-not-re-inflate-QS-and-SB-when-CONFIG_UI_MO.patch +++ b/patches_platform/frameworks_base/0013-Revert-Do-not-re-inflate-QS-and-SB-when-CONFIG_UI_MO.patch @@ -1,7 +1,7 @@ -From 1f1db9627fe3962525d13db733e1171fd0207a53 Mon Sep 17 00:00:00 2001 +From 1ed0fb3e67d9d1f41435e7e60b801837a83c2c64 Mon Sep 17 00:00:00 2001 From: Danny Lin Date: Wed, 6 Oct 2021 18:41:11 -0700 -Subject: [PATCH 13/21] Revert "Do not re-inflate QS and SB when +Subject: [PATCH 13/22] Revert "Do not re-inflate QS and SB when CONFIG_UI_MODE" This reverts commit 8a40ff855b86bc86e23367017002289920855a4e. diff --git a/patches_platform/frameworks_base/0014-SystemUI-Follow-light-dark-theme-in-quick-settings.patch b/patches_platform/frameworks_base/0014-SystemUI-Follow-light-dark-theme-in-quick-settings.patch index 609c1c7..b27f5a3 100644 --- a/patches_platform/frameworks_base/0014-SystemUI-Follow-light-dark-theme-in-quick-settings.patch +++ b/patches_platform/frameworks_base/0014-SystemUI-Follow-light-dark-theme-in-quick-settings.patch @@ -1,7 +1,7 @@ -From 92ab25604e1dcf584f0790b3f1eb8f8d40e8b753 Mon Sep 17 00:00:00 2001 +From c0aadaca1ab833a13ecacc48cf5c458427f8f6b4 Mon Sep 17 00:00:00 2001 From: Danny Lin Date: Mon, 11 Oct 2021 19:24:58 -0700 -Subject: [PATCH 14/21] SystemUI: Follow light/dark theme in quick settings +Subject: [PATCH 14/22] SystemUI: Follow light/dark theme in quick settings Android 12's dual-tone style where the quick settings panel is always dark makes the light theme look like a second-class citizen. Pure black @@ -82,7 +82,7 @@ index 860d23b11439..8f12b95ed4f6 100644 diff --git a/packages/SystemUI/res/values-night/styles.xml b/packages/SystemUI/res/values-night/styles.xml -index 461505f12ce6..c1d2ca23de31 100644 +index ffcc3a821d36..a9fa9f3f9fde 100644 --- a/packages/SystemUI/res/values-night/styles.xml +++ b/packages/SystemUI/res/values-night/styles.xml @@ -24,6 +24,18 @@ @@ -105,7 +105,7 @@ index 461505f12ce6..c1d2ca23de31 100644 @*android:string/config_bodyFontFamily ?android:attr/textColorPrimary diff --git a/packages/SystemUI/res/values/styles.xml b/packages/SystemUI/res/values/styles.xml -index 504a06cfd9ba..5d230e522636 100644 +index e592fe2dd630..a5ed039bd3fd 100644 --- a/packages/SystemUI/res/values/styles.xml +++ b/packages/SystemUI/res/values/styles.xml @@ -398,12 +398,12 @@ @@ -125,7 +125,7 @@ index 504a06cfd9ba..5d230e522636 100644 @style/Control.MenuItem -@@ -617,7 +617,7 @@ +@@ -619,7 +619,7 @@ diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java -index 2e3d5bbcc4af..89e178117393 100644 +index 6bdf82a60e40..cc1c8e6255b8 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java @@ -186,6 +186,7 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, Dump @@ -112,7 +112,7 @@ index 2e3d5bbcc4af..89e178117393 100644 } /** -@@ -849,7 +851,7 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, Dump +@@ -851,7 +853,7 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, Dump && !mBlankScreen; mScrimInFront.setColors(mColors, animateScrimInFront); @@ -121,7 +121,7 @@ index 2e3d5bbcc4af..89e178117393 100644 mNotificationsScrim.setColors(mColors, animateScrimNotifications); dispatchBackScrimState(mScrimBehind.getViewAlpha()); -@@ -1205,11 +1207,20 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, Dump +@@ -1207,11 +1209,20 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, Dump if (mScrimBehind == null) return; int background = Utils.getColorAttr(mScrimBehind.getContext(), android.R.attr.colorBackgroundFloating).getDefaultColor(); diff --git a/patches_platform/frameworks_base/0017-SystemUI-Remove-nav-bar-background-in-QS-customizer.patch b/patches_platform/frameworks_base/0017-SystemUI-Remove-nav-bar-background-in-QS-customizer.patch index 83cc5f7..d113ea2 100644 --- a/patches_platform/frameworks_base/0017-SystemUI-Remove-nav-bar-background-in-QS-customizer.patch +++ b/patches_platform/frameworks_base/0017-SystemUI-Remove-nav-bar-background-in-QS-customizer.patch @@ -1,7 +1,7 @@ -From db01ad5d34519b5bd3d4c68f195b69de43d8bf3e Mon Sep 17 00:00:00 2001 +From 02806d68e92827a0799395338d3b29c055e176ef Mon Sep 17 00:00:00 2001 From: Danny Lin Date: Mon, 11 Oct 2021 19:25:11 -0700 -Subject: [PATCH 17/21] SystemUI: Remove nav bar background in QS customizer +Subject: [PATCH 17/22] SystemUI: Remove nav bar background in QS customizer This looks outdated, since most apps are edge-to-edge nowadays. diff --git a/patches_platform/frameworks_base/0018-Paint-Enable-subpixel-text-positioning-by-default.patch b/patches_platform/frameworks_base/0018-Paint-Enable-subpixel-text-positioning-by-default.patch index af38f19..3ae7fdc 100644 --- a/patches_platform/frameworks_base/0018-Paint-Enable-subpixel-text-positioning-by-default.patch +++ b/patches_platform/frameworks_base/0018-Paint-Enable-subpixel-text-positioning-by-default.patch @@ -1,7 +1,7 @@ -From c351a05332f409038c1b007706e010556d267b45 Mon Sep 17 00:00:00 2001 +From 22f30f47048335c6a64a35ce68eafc640bfb40af Mon Sep 17 00:00:00 2001 From: Danny Lin Date: Tue, 5 Oct 2021 21:01:50 -0700 -Subject: [PATCH 18/21] Paint: Enable subpixel text positioning by default +Subject: [PATCH 18/22] Paint: Enable subpixel text positioning by default On desktop Linux, subpixel text positioning is necessary to avoid kerning issues, and Android is no different. Even though most phone diff --git a/patches_platform/frameworks_base/0019-SystemUI-Fix-QS-status-font-weight-mismatch-in-dark-.patch b/patches_platform/frameworks_base/0019-SystemUI-Fix-QS-status-font-weight-mismatch-in-dark-.patch index 247481c..e34e523 100644 --- a/patches_platform/frameworks_base/0019-SystemUI-Fix-QS-status-font-weight-mismatch-in-dark-.patch +++ b/patches_platform/frameworks_base/0019-SystemUI-Fix-QS-status-font-weight-mismatch-in-dark-.patch @@ -1,7 +1,7 @@ -From 999b53f49d6b0a4c5d5fd123a04686d35118cee0 Mon Sep 17 00:00:00 2001 +From 00373ab57fc28c8f1e5320748879d99b30d49112 Mon Sep 17 00:00:00 2001 From: Danny Lin Date: Tue, 5 Oct 2021 21:02:12 -0700 -Subject: [PATCH 19/21] SystemUI: Fix QS status font weight mismatch in dark +Subject: [PATCH 19/22] SystemUI: Fix QS status font weight mismatch in dark mode Text in the QS status bar is medium in light mode and regular in dark @@ -13,7 +13,7 @@ Change-Id: Ic6e5dc547d4ded9d231f88f6cac3e1e9f8483d5e 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/SystemUI/res/values-night/styles.xml b/packages/SystemUI/res/values-night/styles.xml -index c1d2ca23de31..5f35afb6c731 100644 +index a9fa9f3f9fde..3fd6f9cc5454 100644 --- a/packages/SystemUI/res/values-night/styles.xml +++ b/packages/SystemUI/res/values-night/styles.xml @@ -37,7 +37,7 @@ diff --git a/patches_platform/frameworks_base/0020-SystemUI-Expose-legacy-Wi-Fi-and-cellular-data-QS-ti.patch b/patches_platform/frameworks_base/0020-SystemUI-Expose-legacy-Wi-Fi-and-cellular-data-QS-ti.patch index 9fe8707..8caa6f1 100644 --- a/patches_platform/frameworks_base/0020-SystemUI-Expose-legacy-Wi-Fi-and-cellular-data-QS-ti.patch +++ b/patches_platform/frameworks_base/0020-SystemUI-Expose-legacy-Wi-Fi-and-cellular-data-QS-ti.patch @@ -1,7 +1,7 @@ -From b7ffdcec4fa6b192198cff5d143d9fb9ef5ed4f2 Mon Sep 17 00:00:00 2001 +From 7850ab773ef48f6fddb166e1af10fce56ba06648 Mon Sep 17 00:00:00 2001 From: Danny Lin Date: Sat, 16 Oct 2021 03:27:23 -0700 -Subject: [PATCH 20/21] SystemUI: Expose legacy Wi-Fi and cellular data QS +Subject: [PATCH 20/22] SystemUI: Expose legacy Wi-Fi and cellular data QS tiles We'll still use Android 12's unified internet settings and the Internet diff --git a/patches_platform/frameworks_base/0021-SystemUI-Allow-Wi-Fi-cell-tiles-to-co-exist-with-pro.patch b/patches_platform/frameworks_base/0021-SystemUI-Allow-Wi-Fi-cell-tiles-to-co-exist-with-pro.patch index e2900ce..3f8ac5e 100644 --- a/patches_platform/frameworks_base/0021-SystemUI-Allow-Wi-Fi-cell-tiles-to-co-exist-with-pro.patch +++ b/patches_platform/frameworks_base/0021-SystemUI-Allow-Wi-Fi-cell-tiles-to-co-exist-with-pro.patch @@ -1,7 +1,7 @@ -From 48d242260887d95b592b8796fce1176d334394d0 Mon Sep 17 00:00:00 2001 +From 6ec18b7fe383ba54de08df6d6d76b74361491ddd Mon Sep 17 00:00:00 2001 From: Danny Lin Date: Mon, 25 Oct 2021 19:32:33 -0700 -Subject: [PATCH 21/21] SystemUI: Allow Wi-Fi/cell tiles to co-exist with +Subject: [PATCH 21/22] SystemUI: Allow Wi-Fi/cell tiles to co-exist with provider model The dedicated Wi-Fi/cellular data QS tiles are partially working now @@ -24,10 +24,10 @@ Change-Id: I10af134b35dfabdb9275f1aca8ca8512e1db6d27 4 files changed, 37 insertions(+), 58 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/InternetTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/InternetTile.java -index 7cb1421e3f0f..aa917d9ec397 100644 +index cc9e7485dcff..4bf8053017f1 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/InternetTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/InternetTile.java -@@ -245,7 +245,7 @@ public class InternetTile extends QSTileImpl { +@@ -255,7 +255,7 @@ public class InternetTile extends QSTileImpl { Log.d(TAG, "setWifiIndicators: " + indicators); } mWifiInfo.mEnabled = indicators.enabled; @@ -36,7 +36,7 @@ index 7cb1421e3f0f..aa917d9ec397 100644 return; } mWifiInfo.mConnected = indicators.qsIcon.visible; -@@ -265,7 +265,7 @@ public class InternetTile extends QSTileImpl { +@@ -275,7 +275,7 @@ public class InternetTile extends QSTileImpl { if (DEBUG) { Log.d(TAG, "setMobileDataIndicators: " + indicators); } @@ -110,10 +110,10 @@ index 43781f3941ba..cf89cabf6ab9 100644 } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java -index ef2ca985858d..39fa68cab281 100644 +index eeea699a0b74..4a25d1bd7661 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java -@@ -58,10 +58,11 @@ public interface NetworkController extends CallbackController, D +@@ -59,10 +59,11 @@ public interface NetworkController extends CallbackController, D public String description; public boolean isTransient; public String statusLabel; @@ -126,7 +126,7 @@ index ef2ca985858d..39fa68cab281 100644 this.enabled = enabled; this.statusIcon = statusIcon; this.qsIcon = qsIcon; -@@ -70,6 +71,7 @@ public interface NetworkController extends CallbackController, D +@@ -71,6 +72,7 @@ public interface NetworkController extends CallbackController, D this.description = description; this.isTransient = isTransient; this.statusLabel = statusLabel; @@ -134,7 +134,7 @@ index ef2ca985858d..39fa68cab281 100644 } @Override -@@ -83,6 +85,7 @@ public interface NetworkController extends CallbackController, D +@@ -84,6 +86,7 @@ public interface NetworkController extends CallbackController, D .append(",description=").append(description) .append(",isTransient=").append(isTransient) .append(",statusLabel=").append(statusLabel) @@ -142,7 +142,7 @@ index ef2ca985858d..39fa68cab281 100644 .append(']').toString(); } } -@@ -104,12 +107,13 @@ public interface NetworkController extends CallbackController, D +@@ -105,12 +108,13 @@ public interface NetworkController extends CallbackController, D public int subId; public boolean roaming; public boolean showTriangle; @@ -157,7 +157,7 @@ index ef2ca985858d..39fa68cab281 100644 this.statusIcon = statusIcon; this.qsIcon = qsIcon; this.statusType = statusType; -@@ -123,6 +127,7 @@ public interface NetworkController extends CallbackController, D +@@ -124,6 +128,7 @@ public interface NetworkController extends CallbackController, D this.subId = subId; this.roaming = roaming; this.showTriangle = showTriangle; @@ -165,7 +165,7 @@ index ef2ca985858d..39fa68cab281 100644 } @Override -@@ -141,6 +146,7 @@ public interface NetworkController extends CallbackController, D +@@ -142,6 +147,7 @@ public interface NetworkController extends CallbackController, D .append(",subId=").append(subId) .append(",roaming=").append(roaming) .append(",showTriangle=").append(showTriangle) diff --git a/patches_platform/frameworks_base/0022-Fix-QS-clock-being-white-on-light-theme.patch b/patches_platform/frameworks_base/0022-Fix-QS-clock-being-white-on-light-theme.patch new file mode 100644 index 0000000..16aedda --- /dev/null +++ b/patches_platform/frameworks_base/0022-Fix-QS-clock-being-white-on-light-theme.patch @@ -0,0 +1,72 @@ +From 00463f495ad23afddbf5bc0b4c227e63d09bc8e4 Mon Sep 17 00:00:00 2001 +From: SagarMakhar +Date: Sat, 6 Nov 2021 13:16:24 +0000 +Subject: [PATCH 22/22] Fix QS clock being white on light theme + +Steps to reproduce without this commit: +- Turn off dark theme +- Play a song and wait for media player to show in QS +- Confirm clock text color is white + +Signed-off-by: SagarMakhar +--- + .../systemui/qs/QuickStatusBarHeaderController.java | 13 ------------- + 1 file changed, 13 deletions(-) + +diff --git a/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeaderController.java b/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeaderController.java +index 18d6e646b007..7aa668440b4b 100644 +--- a/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeaderController.java ++++ b/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeaderController.java +@@ -22,10 +22,8 @@ import android.view.View.OnClickListener; + + import androidx.annotation.NonNull; + +-import com.android.internal.colorextraction.ColorExtractor; + import com.android.internal.logging.UiEventLogger; + import com.android.systemui.R; +-import com.android.systemui.colorextraction.SysuiColorExtractor; + import com.android.systemui.demomode.DemoMode; + import com.android.systemui.demomode.DemoModeController; + import com.android.systemui.plugins.ActivityStarter; +@@ -83,9 +81,6 @@ class QuickStatusBarHeaderController extends ViewController privacyItems) { +@@ -135,7 +130,6 @@ class QuickStatusBarHeaderController extends ViewController { +- final boolean lightTheme = mColorExtractor.getNeutralColors().supportsDarkText(); +- mClockView.onColorsChanged(lightTheme); +- }; +- mColorExtractor.addOnColorsChangedListener(mOnColorsChangedListener); + + mCameraSlot = getResources().getString(com.android.internal.R.string.status_bar_camera); + mMicSlot = getResources().getString(com.android.internal.R.string.status_bar_microphone); +@@ -223,7 +211,6 @@ class QuickStatusBarHeaderController extends ViewController Date: Tue, 26 Oct 2021 08:03:39 +0000 -Subject: [PATCH] [TEMP] Settings: Hack in LiveDisplay entrypoint +Subject: [PATCH] Settings: Hack in LiveDisplay entrypoint Change-Id: Icec153e3d9203bba8bb5b000ecf537397058b349 --- - res/xml/display_settings.xml | 5 +++++ - 1 file changed, 5 insertions(+) + res/xml/display_settings.xml | 4 ++++ + 1 file changed, 4 insertions(+) diff --git a/res/xml/display_settings.xml b/res/xml/display_settings.xml -index c48dcbcaef..fa5d3cc77e 100644 +index 7bd370816e..9cf7afe0a5 100644 --- a/res/xml/display_settings.xml +++ b/res/xml/display_settings.xml -@@ -16,6 +16,7 @@ - - diff --git a/patches_platform/vendor_lineage/0001-vendor_lineage-Log-privapp-permissions-whitelist-vio.patch b/patches_platform/vendor_lineage/0001-vendor_lineage-Log-privapp-permissions-whitelist-vio.patch index 423e36e..65684ed 100644 --- a/patches_platform/vendor_lineage/0001-vendor_lineage-Log-privapp-permissions-whitelist-vio.patch +++ b/patches_platform/vendor_lineage/0001-vendor_lineage-Log-privapp-permissions-whitelist-vio.patch @@ -1,4 +1,4 @@ -From 7a633a53d8e20e2d976597a332bf5ba855ec1f75 Mon Sep 17 00:00:00 2001 +From 8613949607345b954525b24dedc843f5039ac781 Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Thu, 5 Sep 2019 02:08:22 +0000 Subject: [PATCH] vendor_lineage: Log privapp-permissions whitelist violations @@ -10,12 +10,12 @@ Change-Id: I49dba61f332253e291a65e79ca70d9a07d45bb07 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/common.mk b/config/common.mk -index 2fe9cb01..7d971bba 100644 +index 9cc39324..fcf13b2b 100644 --- a/config/common.mk +++ b/config/common.mk -@@ -70,9 +70,9 @@ PRODUCT_COPY_FILES += \ +@@ -78,9 +78,9 @@ PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \ - vendor/lineage/config/permissions/org.lineageos.android.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/org.lineageos.android.xml + vendor/lineage/config/permissions/org.lineageos.android.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/org.lineageos.android.xml -# Enforce privapp-permissions whitelist +# Log privapp-permissions whitelist violations @@ -26,5 +26,5 @@ index 2fe9cb01..7d971bba 100644 # Include AOSP audio files include vendor/lineage/config/aosp_audio.mk -- -2.17.1 +2.25.1 diff --git a/patches_platform/vendor_partner_gms/0001-SearchLauncher-Adapt-to-Trebuchet.patch b/patches_platform/vendor_partner_gms/0001-SearchLauncher-Adapt-to-Trebuchet.patch new file mode 100644 index 0000000..9d8bcc3 --- /dev/null +++ b/patches_platform/vendor_partner_gms/0001-SearchLauncher-Adapt-to-Trebuchet.patch @@ -0,0 +1,49 @@ +From c4eac79c4f34e34e793f19e50d97a74daa05ec69 Mon Sep 17 00:00:00 2001 +From: Andy CrossGate Yan +Date: Tue, 30 Nov 2021 12:58:00 +0000 +Subject: [PATCH] SearchLauncher: Adapt to Trebuchet + +--- + apps/SearchLauncher/Android.mk | 4 ++-- + apps/SearchLauncher/AndroidManifest.xml | 3 ++- + 2 files changed, 4 insertions(+), 3 deletions(-) + +diff --git a/apps/SearchLauncher/Android.mk b/apps/SearchLauncher/Android.mk +index a9f182a..6b90364 100644 +--- a/apps/SearchLauncher/Android.mk ++++ b/apps/SearchLauncher/Android.mk +@@ -20,7 +20,7 @@ include $(BUILD_PREBUILT) + include $(CLEAR_VARS) + + # Relative path for Launcher3 directory +-LAUNCHER_PATH := ../../../../packages/apps/Launcher3 ++LAUNCHER_PATH := ../../../../packages/apps/Trebuchet + + LOCAL_STATIC_ANDROID_LIBRARIES := Launcher3CommonDepsLib + LOCAL_STATIC_JAVA_LIBRARIES := lib_launcherClient +@@ -59,7 +59,7 @@ include $(BUILD_PACKAGE) + include $(CLEAR_VARS) + + # Relative path for Launcher3 directory +-LAUNCHER_PATH := ../../../../packages/apps/Launcher3 ++LAUNCHER_PATH := ../../../../packages/apps/Trebuchet + + LOCAL_STATIC_ANDROID_LIBRARIES := Launcher3CommonDepsLib + LOCAL_STATIC_JAVA_LIBRARIES := \ +diff --git a/apps/SearchLauncher/AndroidManifest.xml b/apps/SearchLauncher/AndroidManifest.xml +index d5ffded..a9b5597 100644 +--- a/apps/SearchLauncher/AndroidManifest.xml ++++ b/apps/SearchLauncher/AndroidManifest.xml +@@ -55,7 +55,8 @@ + android:label="@string/derived_app_name" + android:largeHeap="@bool/config_largeHeap" + android:restoreAnyVersion="true" +- android:supportsRtl="true" > ++ android:supportsRtl="true" ++ tools:replace="android:icon" > + + Date: Wed, 27 Oct 2021 14:38:37 +0000 Subject: [PATCH 01/16] Add LineageMonetAccentOverlay diff --git a/patches_platform_personal/frameworks_base/0002-Add-MiuiNavbarOverlay.patch b/patches_platform_personal/frameworks_base/0002-Add-MiuiNavbarOverlay.patch index 7c26d63..6248083 100644 --- a/patches_platform_personal/frameworks_base/0002-Add-MiuiNavbarOverlay.patch +++ b/patches_platform_personal/frameworks_base/0002-Add-MiuiNavbarOverlay.patch @@ -1,4 +1,4 @@ -From 2f9d2d2ebd0e85061d4c0f3d71245faf489dbf7f Mon Sep 17 00:00:00 2001 +From 131d58227278ec7d36fe16223335368d4674ce46 Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Sun, 20 Jun 2021 03:39:32 +0000 Subject: [PATCH 02/16] Add MiuiNavbarOverlay 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 9e3d316..156b762 100644 --- a/patches_platform_personal/frameworks_base/0003-Disable-cursor-drag-by-default-for-editable-TextView.patch +++ b/patches_platform_personal/frameworks_base/0003-Disable-cursor-drag-by-default-for-editable-TextView.patch @@ -1,4 +1,4 @@ -From aa00ecce8f9b93b34039ad94d543f780c5a670a7 Mon Sep 17 00:00:00 2001 +From 98145d7967512d9e294c9eaf5b4782efd34a1f8d Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Mon, 27 Sep 2021 16:30:00 +0000 Subject: [PATCH 03/16] Disable cursor drag by default for editable TextViews diff --git a/patches_platform_personal/frameworks_base/0004-Disable-FP-lockouts.patch b/patches_platform_personal/frameworks_base/0004-Disable-FP-lockouts.patch index 9293dab..35fb385 100644 --- a/patches_platform_personal/frameworks_base/0004-Disable-FP-lockouts.patch +++ b/patches_platform_personal/frameworks_base/0004-Disable-FP-lockouts.patch @@ -1,4 +1,4 @@ -From 13a853a48ad6c807d7d7193b7426ce8cf28267f4 Mon Sep 17 00:00:00 2001 +From 54dcd5497db5593a77aa8c6eacf6b6ed693338cb Mon Sep 17 00:00:00 2001 From: AndyCGYan Date: Fri, 22 Mar 2019 00:41:20 +0800 Subject: [PATCH 04/16] Disable FP lockouts diff --git a/patches_platform_personal/frameworks_base/0005-Keyguard-Adjust-clock-style.patch b/patches_platform_personal/frameworks_base/0005-Keyguard-Adjust-clock-style.patch index 8de5185..142a73e 100644 --- a/patches_platform_personal/frameworks_base/0005-Keyguard-Adjust-clock-style.patch +++ b/patches_platform_personal/frameworks_base/0005-Keyguard-Adjust-clock-style.patch @@ -1,4 +1,4 @@ -From 6daf65e81a4f18bc0b1418281ad021fef9bc59e5 Mon Sep 17 00:00:00 2001 +From ae4b40705428d23abf321050a64e7793c591ae2b Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Thu, 2 Sep 2021 16:15:19 +0000 Subject: [PATCH 05/16] Keyguard: Adjust clock style @@ -60,7 +60,7 @@ index 7e3c87b24f07..58a1734aad22 100644 + 22dp diff --git a/packages/SystemUI/res-keyguard/values/styles.xml b/packages/SystemUI/res-keyguard/values/styles.xml -index 72b027af1bf6..6bfca3ece20e 100644 +index 098b7e8dedbe..86f053535ee6 100644 --- a/packages/SystemUI/res-keyguard/values/styles.xml +++ b/packages/SystemUI/res-keyguard/values/styles.xml @@ -123,8 +123,6 @@ @@ -73,7 +73,7 @@ index 72b027af1bf6..6bfca3ece20e 100644 - + +