diff --git a/patches_platform/frameworks_base/0001-Add-SPenPointerOverlay.patch b/patches_platform/frameworks_base/0001-Add-SPenPointerOverlay.patch index d863960..d66bd5f 100644 --- a/patches_platform/frameworks_base/0001-Add-SPenPointerOverlay.patch +++ b/patches_platform/frameworks_base/0001-Add-SPenPointerOverlay.patch @@ -1,7 +1,7 @@ -From 3092553e69dcf3976fe329939cc56fb2e9e2a4cc Mon Sep 17 00:00:00 2001 +From 853ee250c636882896bcfeb94c61317145222ff6 Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Thu, 13 Jan 2022 14:22:24 +0000 -Subject: [PATCH 01/19] Add SPenPointerOverlay +Subject: [PATCH 01/12] Add SPenPointerOverlay Toggle this overlay with property "persist.ui.spen.pointer" 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 9010d1b..257e1a4 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 6b598113408b5e7f8fc425efd86779e96c0d7e69 Mon Sep 17 00:00:00 2001 +From 26fe8ee33de29f64dcf245bc1e86733140d89809 Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Thu, 5 Apr 2018 10:01:19 +0800 -Subject: [PATCH 02/19] Disable vendor mismatch warning +Subject: [PATCH 02/12] Disable vendor mismatch warning Change-Id: Ieb8fe91e2f02462f074312ed0f4885d183e9780b --- @@ -9,7 +9,7 @@ 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 112a56957fc0..8b6ec8bbf3ff 100644 +index 68df0e433c1d..89d1a7ba3317 100644 --- a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java +++ b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java @@ -5665,20 +5665,8 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { diff --git a/patches_platform/frameworks_base/0003-UI-Adjust-default-navbar-layouts.patch b/patches_platform/frameworks_base/0003-UI-Adjust-default-navbar-layouts.patch index 75502d5..b68ab57 100644 --- a/patches_platform/frameworks_base/0003-UI-Adjust-default-navbar-layouts.patch +++ b/patches_platform/frameworks_base/0003-UI-Adjust-default-navbar-layouts.patch @@ -1,7 +1,7 @@ -From ba083752bf0310ee14884e4a2fe3e3e5846c62b5 Mon Sep 17 00:00:00 2001 +From fc56cacb75ec154140784fe4115c610d2db9d2bc Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Sat, 16 Oct 2021 02:23:48 +0000 -Subject: [PATCH 03/19] UI: Adjust default navbar layouts +Subject: [PATCH 03/12] 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 6ccabf226772..909e7e7f46b3 100644 +index 53523e3f4f5a..94cc561f5fb0 100644 --- a/packages/SystemUI/res/values/config.xml +++ b/packages/SystemUI/res/values/config.xml @@ -332,7 +332,7 @@ diff --git a/patches_platform/frameworks_base/0004-UI-Disable-left-seascape-navigation-bar-optionally.patch b/patches_platform/frameworks_base/0004-UI-Disable-left-seascape-navigation-bar-optionally.patch index 5ab70b5..90a6cf3 100644 --- a/patches_platform/frameworks_base/0004-UI-Disable-left-seascape-navigation-bar-optionally.patch +++ b/patches_platform/frameworks_base/0004-UI-Disable-left-seascape-navigation-bar-optionally.patch @@ -1,7 +1,7 @@ -From d461abc9968ac7937e5530efd15d46671565c316 Mon Sep 17 00:00:00 2001 +From 7c54f36cc9e53c9b4781d7233fb0b0f389c12ecc Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Fri, 9 Mar 2018 15:41:26 +0800 -Subject: [PATCH 04/19] UI: Disable left (seascape) navigation bar optionally +Subject: [PATCH 04/12] 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 65eaa63118b2..89ac6585c673 100644 +index 0a5d7f41f40f..969d70099cfb 100644 --- a/services/core/java/com/android/server/wm/DisplayPolicy.java +++ b/services/core/java/com/android/server/wm/DisplayPolicy.java -@@ -2644,9 +2644,10 @@ public class DisplayPolicy { +@@ -2694,9 +2694,10 @@ public class DisplayPolicy { } } if (navigationBarCanMove() && displayWidth > displayHeight) { diff --git a/patches_platform/frameworks_base/0005-UI-Disable-wallpaper-zoom.patch b/patches_platform/frameworks_base/0005-UI-Disable-wallpaper-zoom.patch index 599edc4..26c5283 100644 --- a/patches_platform/frameworks_base/0005-UI-Disable-wallpaper-zoom.patch +++ b/patches_platform/frameworks_base/0005-UI-Disable-wallpaper-zoom.patch @@ -1,7 +1,7 @@ -From a996ded413ad03db5074c8cf32858e478d196fc7 Mon Sep 17 00:00:00 2001 +From a5daefa52e5bee3d961c2db3a288387736d58269 Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Sun, 10 Jan 2021 11:44:29 +0000 -Subject: [PATCH 05/19] UI: Disable wallpaper zoom +Subject: [PATCH 05/12] 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 e2216d23e15e..9d6c712c8285 100644 +index e502765617af..92026da0981e 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml -@@ -4842,7 +4842,7 @@ +@@ -4844,7 +4844,7 @@ diff --git a/patches_platform/frameworks_base/0006-UI-Increase-default-status-bar-height.patch b/patches_platform/frameworks_base/0006-UI-Increase-default-status-bar-height.patch index 88682fd..ef5fce8 100644 --- a/patches_platform/frameworks_base/0006-UI-Increase-default-status-bar-height.patch +++ b/patches_platform/frameworks_base/0006-UI-Increase-default-status-bar-height.patch @@ -1,26 +1,35 @@ -From 972bc4938064c391290503d7fbeb200e339fe326 Mon Sep 17 00:00:00 2001 +From f67b7f525bf11860fcb6e08a4450937040b786cd Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Wed, 3 Jun 2020 01:31:34 +0000 -Subject: [PATCH 06/19] UI: Increase default status bar height +Subject: [PATCH 06/12] UI: Increase default status bar height Change-Id: Ibbcf63159e19bb2bb2b1094ea07ab85917630b07 --- - core/res/res/values/dimens.xml | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + core/res/res/values/dimens.xml | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/res/res/values/dimens.xml b/core/res/res/values/dimens.xml -index f331f1ab720f..a31e166296ee 100644 +index cafebcec454e..11515b57dff1 100644 --- a/core/res/res/values/dimens.xml +++ b/core/res/res/values/dimens.xml -@@ -42,7 +42,7 @@ +@@ -41,7 +41,7 @@ + + +- 24dp ++ 28dp -- 24dp -+ 28dp +@@ -49,7 +49,7 @@ +- 24dp ++ 28dp + -- 2.25.1 diff --git a/patches_platform/frameworks_base/0007-UI-Restore-split-screen-divider-to-pre-Sv2-looks.patch b/patches_platform/frameworks_base/0007-UI-Restore-split-screen-divider-to-pre-Sv2-looks.patch index 961910f..796b324 100644 --- a/patches_platform/frameworks_base/0007-UI-Restore-split-screen-divider-to-pre-Sv2-looks.patch +++ b/patches_platform/frameworks_base/0007-UI-Restore-split-screen-divider-to-pre-Sv2-looks.patch @@ -1,7 +1,7 @@ -From e31ba474b5b86eefe07fdd630c761fc035a0e05f Mon Sep 17 00:00:00 2001 +From e4cc0b28ec7a8ac5addecd370b2af6de0617abec Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Sat, 19 Mar 2022 09:22:24 +0000 -Subject: [PATCH 07/19] UI: Restore split-screen divider to pre-Sv2 looks +Subject: [PATCH 07/12] UI: Restore split-screen divider to pre-Sv2 looks - Kill rounded corners - where two rectangles collide should be perfectly straight - Make it black again - taskbar should mind its own business diff --git a/patches_platform/frameworks_base/0008-UI-Revive-navbar-layout-tuning-via-sysui_nav_bar-tun.patch b/patches_platform/frameworks_base/0008-UI-Revive-navbar-layout-tuning-via-sysui_nav_bar-tun.patch index 585d150..4a906c2 100644 --- a/patches_platform/frameworks_base/0008-UI-Revive-navbar-layout-tuning-via-sysui_nav_bar-tun.patch +++ b/patches_platform/frameworks_base/0008-UI-Revive-navbar-layout-tuning-via-sysui_nav_bar-tun.patch @@ -1,7 +1,7 @@ -From bb47f4b8d64a57c3eb5dae7a13c3abdac8533736 Mon Sep 17 00:00:00 2001 +From 179273341668efc421afb80fdf4356f1034adff4 Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Tue, 6 Oct 2020 01:41:16 +0000 -Subject: [PATCH 08/19] UI: Revive navbar layout tuning via sysui_nav_bar +Subject: [PATCH 08/12] UI: Revive navbar layout tuning via sysui_nav_bar tunable Google keeps fixing what ain't broken. @@ -12,7 +12,7 @@ Change-Id: Ied7d7859e50fd0fcc346219964e747c5d5f4c352 1 file changed, 15 insertions(+) diff --git a/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarInflaterView.java b/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarInflaterView.java -index c8bc143f0bd8..fab079b91608 100644 +index eb9544c1372b..8cc9a32a1794 100644 --- a/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarInflaterView.java +++ b/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarInflaterView.java @@ -118,6 +118,7 @@ public class NavigationBarInflaterView extends FrameLayout diff --git a/patches_platform/frameworks_base/0009-UI-Use-SNAP_FIXED_RATIO-for-multi-window-globally.patch b/patches_platform/frameworks_base/0009-UI-Use-SNAP_FIXED_RATIO-for-multi-window-globally.patch index 3ecad29..f88beab 100644 --- a/patches_platform/frameworks_base/0009-UI-Use-SNAP_FIXED_RATIO-for-multi-window-globally.patch +++ b/patches_platform/frameworks_base/0009-UI-Use-SNAP_FIXED_RATIO-for-multi-window-globally.patch @@ -1,7 +1,7 @@ -From 30cb3ac5413b13486cf8a4035aaf58f302f6c922 Mon Sep 17 00:00:00 2001 +From f712cf528b67e2c2b2a13dd84de8a288a9e216d9 Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Sun, 26 Apr 2020 08:56:13 +0000 -Subject: [PATCH 09/19] UI: Use SNAP_FIXED_RATIO for multi-window globally +Subject: [PATCH 09/12] UI: Use SNAP_FIXED_RATIO for multi-window globally Enables multiple snap targets under landscape for phone UI @@ -78,7 +78,7 @@ index 624581aba7dd..658654e2a63f 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 9d6c712c8285..1b9306913e7d 100644 +index 92026da0981e..e4e7243bbb76 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -3589,7 +3589,7 @@ diff --git a/patches_platform/frameworks_base/0010-core-Remove-old-app-target-SDK-dialog.patch b/patches_platform/frameworks_base/0010-core-Remove-old-app-target-SDK-dialog.patch index 00a1e06..bcccb6b 100644 --- a/patches_platform/frameworks_base/0010-core-Remove-old-app-target-SDK-dialog.patch +++ b/patches_platform/frameworks_base/0010-core-Remove-old-app-target-SDK-dialog.patch @@ -1,7 +1,7 @@ -From 7a1136397113e10afc36276f70f62083c20abe95 Mon Sep 17 00:00:00 2001 +From 075046ebdb3172a09ecefdda5c8a15206ae9eaa8 Mon Sep 17 00:00:00 2001 From: Danny Lin Date: Tue, 3 Nov 2020 22:43:12 -0800 -Subject: [PATCH 10/19] core: Remove old app target SDK dialog +Subject: [PATCH 10/12] 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/0018-Paint-Enable-subpixel-text-positioning-by-default.patch b/patches_platform/frameworks_base/0011-Paint-Enable-subpixel-text-positioning-by-default.patch similarity index 92% rename from patches_platform/frameworks_base/0018-Paint-Enable-subpixel-text-positioning-by-default.patch rename to patches_platform/frameworks_base/0011-Paint-Enable-subpixel-text-positioning-by-default.patch index 00f5243..faade5e 100644 --- a/patches_platform/frameworks_base/0018-Paint-Enable-subpixel-text-positioning-by-default.patch +++ b/patches_platform/frameworks_base/0011-Paint-Enable-subpixel-text-positioning-by-default.patch @@ -1,7 +1,7 @@ -From 757fc3ae84413ca0b158c1a4f5fa6b18d517beab Mon Sep 17 00:00:00 2001 +From 3947b3df5f72e803dae08f2fe6725535e6da1d45 Mon Sep 17 00:00:00 2001 From: Danny Lin Date: Tue, 5 Oct 2021 21:01:50 -0700 -Subject: [PATCH 18/19] Paint: Enable subpixel text positioning by default +Subject: [PATCH 11/12] 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/0011-SystemUI-Always-refresh-power-menu-on-UI-mode-change.patch b/patches_platform/frameworks_base/0011-SystemUI-Always-refresh-power-menu-on-UI-mode-change.patch deleted file mode 100644 index 431dd4a..0000000 --- a/patches_platform/frameworks_base/0011-SystemUI-Always-refresh-power-menu-on-UI-mode-change.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 00f4d1dfbf1e280000872545d873fef7fec30ba0 Mon Sep 17 00:00:00 2001 -From: Danny Lin -Date: Tue, 8 Mar 2022 20:37:33 -0800 -Subject: [PATCH 11/19] SystemUI: Always refresh power menu on UI mode change - -This is necessary for reliably theming the global actions dialog with -dynamic colors and adapting it to light/dark themes. - -Demo screenshots (with color overlays applied): -https://twitter.com/kdrag0n/status/1445960685427433473 - -[kdrag0n: ported to 12L] - -Change-Id: If58fb4079a4cd11414ff928fad3576beecb14ff5 ---- - .../systemui/globalactions/GlobalActionsDialogLite.java | 9 +++++++++ - 1 file changed, 9 insertions(+) - -diff --git a/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialogLite.java b/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialogLite.java -index bddf5756f925..0ed1042f21e2 100644 ---- a/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialogLite.java -+++ b/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialogLite.java -@@ -787,6 +787,15 @@ public class GlobalActionsDialogLite implements DialogInterface.OnDismissListene - && (currentUser == null || currentUser.isPrimary()); - } - -+ @Override -+ public void onUiModeChanged() { -+ // Colors may change, depending on UI mode -+ mContext.getTheme().applyStyle(mContext.getThemeResId(), true); -+ if (mDialog != null) { -+ mDialog.refreshDialog(); -+ } -+ } -+ - @Override - public void onConfigChanged(Configuration newConfig) { - if (mDialog != null && mDialog.isShowing() --- -2.25.1 - diff --git a/patches_platform/frameworks_base/0019-Fix-QS-clock-being-white-on-light-theme.patch b/patches_platform/frameworks_base/0012-Fix-QS-clock-being-white-on-light-theme.patch similarity index 96% rename from patches_platform/frameworks_base/0019-Fix-QS-clock-being-white-on-light-theme.patch rename to patches_platform/frameworks_base/0012-Fix-QS-clock-being-white-on-light-theme.patch index 4704fe7..af3e19c 100644 --- a/patches_platform/frameworks_base/0019-Fix-QS-clock-being-white-on-light-theme.patch +++ b/patches_platform/frameworks_base/0012-Fix-QS-clock-being-white-on-light-theme.patch @@ -1,7 +1,7 @@ -From 80a2541826f9faa2f58c135dcbafb81f1399dcfb Mon Sep 17 00:00:00 2001 +From f7ba774141c921d1c44a4d83d3c0dd40fc67061f Mon Sep 17 00:00:00 2001 From: SagarMakhar Date: Sat, 6 Nov 2021 13:16:24 +0000 -Subject: [PATCH 19/19] Fix QS clock being white on light theme +Subject: [PATCH 12/12] Fix QS clock being white on light theme Steps to reproduce without this commit: - Turn off dark theme diff --git a/patches_platform/frameworks_base/0012-SystemUI-Use-Monet-colors-for-power-menu.patch b/patches_platform/frameworks_base/0012-SystemUI-Use-Monet-colors-for-power-menu.patch deleted file mode 100644 index 9aed3eb..0000000 --- a/patches_platform/frameworks_base/0012-SystemUI-Use-Monet-colors-for-power-menu.patch +++ /dev/null @@ -1,55 +0,0 @@ -From b708cbead42948667b098a818432c073169c6ffa Mon Sep 17 00:00:00 2001 -From: Danny Lin -Date: Sat, 9 Oct 2021 14:39:38 -0700 -Subject: [PATCH 12/19] SystemUI: Use Monet colors for power menu - -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 -system. - -Change-Id: Iaffb178fe2c09a33925cb40e89d78640fab2b23c ---- - packages/SystemUI/res/values-night/colors.xml | 7 +++++++ - packages/SystemUI/res/values/colors.xml | 10 +++++----- - 2 files changed, 12 insertions(+), 5 deletions(-) - -diff --git a/packages/SystemUI/res/values-night/colors.xml b/packages/SystemUI/res/values-night/colors.xml -index fcb369876cf2..a0015a72f268 100644 ---- a/packages/SystemUI/res/values-night/colors.xml -+++ b/packages/SystemUI/res/values-night/colors.xml -@@ -99,4 +99,11 @@ - #B3000000 - - @android:color/system_accent2_800 -+ -+ -+ @*android:color/primary_device_default_dark -+ @*android:color/surface_dark -+ @*android:color/foreground_device_default_dark -+ @*android:color/surface_dark -+ @*android:color/accent_device_default_dark - -diff --git a/packages/SystemUI/res/values/colors.xml b/packages/SystemUI/res/values/colors.xml -index e455aaa225be..04d4fedccdec 100644 ---- a/packages/SystemUI/res/values/colors.xml -+++ b/packages/SystemUI/res/values/colors.xml -@@ -34,11 +34,11 @@ - #F1F3F4 - - -- #191C18 -- #303030 -- #F0F0F0 -- #F85D4D -- @color/GM2_grey_900 -+ @*android:color/primary_device_default_light -+ @*android:color/surface_light -+ @*android:color/foreground_device_default_light -+ @*android:color/surface_light -+ @*android:color/accent_device_default_light - - @color/control_primary_text - --- -2.25.1 - diff --git a/patches_platform/frameworks_base/0013-Revert-Make-QS-always-use-dark-theme-colors.patch b/patches_platform/frameworks_base/0013-Revert-Make-QS-always-use-dark-theme-colors.patch deleted file mode 100644 index 91f76da..0000000 --- a/patches_platform/frameworks_base/0013-Revert-Make-QS-always-use-dark-theme-colors.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 485e73406b919813149356a66bb3b92c5a4fd216 Mon Sep 17 00:00:00 2001 -From: Danny Lin -Date: Wed, 6 Oct 2021 18:40:30 -0700 -Subject: [PATCH 13/19] Revert "Make QS always use dark theme colors" - -This reverts commit d62f7249f9e3222da95ecf6816601c408aac6be5. - -This is a prerequisite for making the QS panel follow the light system -theme setting. - -Change-Id: Iac4c96ccb3845812ca3df820bf27dc533816f72e ---- - packages/SystemUI/res/layout/quick_qs_status_icons.xml | 2 +- - packages/SystemUI/res/values/styles.xml | 4 ++-- - 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 542a1c9d22bd..7a370d8cbc48 100644 ---- a/packages/SystemUI/res/layout/quick_qs_status_icons.xml -+++ b/packages/SystemUI/res/layout/quick_qs_status_icons.xml -@@ -24,7 +24,7 @@ - android:minHeight="@dimen/qs_header_row_min_height" - android:clickable="false" - android:focusable="true" -- android:theme="@style/Theme.SystemUI.QuickSettings.Header"> -+ android:theme="@style/QSHeaderTheme"> - - ?android:attr/textColorSecondary - - -- - -- --- -2.25.1 - diff --git a/patches_platform/frameworks_base/0014-Revert-Do-not-re-inflate-QS-and-SB-when-CONFIG_UI_MO.patch b/patches_platform/frameworks_base/0014-Revert-Do-not-re-inflate-QS-and-SB-when-CONFIG_UI_MO.patch deleted file mode 100644 index 8fe1da9..0000000 --- a/patches_platform/frameworks_base/0014-Revert-Do-not-re-inflate-QS-and-SB-when-CONFIG_UI_MO.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 3e3f73958f43aa63986cac35a119467ca4cafbd8 Mon Sep 17 00:00:00 2001 -From: Danny Lin -Date: Wed, 6 Oct 2021 18:41:11 -0700 -Subject: [PATCH 14/19] Revert "Do not re-inflate QS and SB when - CONFIG_UI_MODE" - -This reverts commit 8a40ff855b86bc86e23367017002289920855a4e. - -This is a prerequisite for making the QS panel follow the light system -mode setting. - -Change-Id: Ibad399ece587505559cc73febdda2f2d8558e94d ---- - .../com/android/systemui/fragments/FragmentHostManager.java | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/packages/SystemUI/src/com/android/systemui/fragments/FragmentHostManager.java b/packages/SystemUI/src/com/android/systemui/fragments/FragmentHostManager.java -index 10878dcc2474..483865186945 100644 ---- a/packages/SystemUI/src/com/android/systemui/fragments/FragmentHostManager.java -+++ b/packages/SystemUI/src/com/android/systemui/fragments/FragmentHostManager.java -@@ -53,7 +53,8 @@ public class FragmentHostManager { - private final View mRootView; - private final InterestingConfigChanges mConfigChanges = new InterestingConfigChanges( - ActivityInfo.CONFIG_FONT_SCALE | ActivityInfo.CONFIG_LOCALE -- | ActivityInfo.CONFIG_SCREEN_LAYOUT | ActivityInfo.CONFIG_ASSETS_PATHS); -+ | ActivityInfo.CONFIG_SCREEN_LAYOUT | ActivityInfo.CONFIG_ASSETS_PATHS -+ | ActivityInfo.CONFIG_UI_MODE); - private final FragmentService mManager; - private final ExtensionFragmentManager mPlugins = new ExtensionFragmentManager(); - --- -2.25.1 - diff --git a/patches_platform/frameworks_base/0015-SystemUI-Follow-light-dark-theme-in-quick-settings.patch b/patches_platform/frameworks_base/0015-SystemUI-Follow-light-dark-theme-in-quick-settings.patch deleted file mode 100644 index 4def3e2..0000000 --- a/patches_platform/frameworks_base/0015-SystemUI-Follow-light-dark-theme-in-quick-settings.patch +++ /dev/null @@ -1,294 +0,0 @@ -From 11dd90792ba2293e623a686cea1f4a61ed292993 Mon Sep 17 00:00:00 2001 -From: Danny Lin -Date: Mon, 11 Oct 2021 19:24:58 -0700 -Subject: [PATCH 15/19] SystemUI: Follow light/dark theme in quick settings - -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 -also looks out-of-place next to QS tiles and the notification panel -because dynamic themes don't affect it at all. - -Revert to the ~Beta 1 style where quick settings used the same theme as -the notification shade. - -- colorAccentPrimary has been replaced with colorAccent for contrast in - light mode, because colorAccentPrimary is system_accent1_100 (dark - accent color) -- Footer chips have been converted to surfaces (similar to QS tiles and - notifications), which makes more sense with the new style -- The QS background is now the same as the notification shade background - in both light and dark modes - -Demo screenshots (with dual-tone commit): -https://twitter.com/kdrag0n/status/1445922541218922496 - -[kdrag0n: ported to 12L] - -Change-Id: I3d45b72f0f119e100505409d178ab8f698993881 ---- - .../brightness_progress_full_drawable.xml | 2 +- - .../qs_footer_action_chip_background.xml | 8 +------- - .../qs_security_footer_background.xml | 3 +-- - .../res/layout/combined_qs_header.xml | 4 ++-- - .../res/layout/split_shade_header.xml | 2 +- - packages/SystemUI/res/values-night/styles.xml | 12 +++++++++++ - packages/SystemUI/res/values/styles.xml | 10 +++++----- - .../systemui/privacy/OngoingPrivacyChip.kt | 4 ++-- - .../systemui/qs/tileimpl/QSTileViewImpl.kt | 2 +- - .../statusbar/phone/ScrimController.java | 2 +- - .../systemui/statusbar/phone/ScrimState.java | 20 +++++++++---------- - 11 files changed, 37 insertions(+), 32 deletions(-) - -diff --git a/packages/SystemUI/res/drawable/brightness_progress_full_drawable.xml b/packages/SystemUI/res/drawable/brightness_progress_full_drawable.xml -index 4d9188c40822..1eae667c6e79 100644 ---- a/packages/SystemUI/res/drawable/brightness_progress_full_drawable.xml -+++ b/packages/SystemUI/res/drawable/brightness_progress_full_drawable.xml -@@ -22,7 +22,7 @@ - android:height="@dimen/rounded_slider_height"> - - -- -+ - - - -diff --git a/packages/SystemUI/res/drawable/qs_footer_action_chip_background.xml b/packages/SystemUI/res/drawable/qs_footer_action_chip_background.xml -index 9076da795e71..3aefc95a98b5 100644 ---- a/packages/SystemUI/res/drawable/qs_footer_action_chip_background.xml -+++ b/packages/SystemUI/res/drawable/qs_footer_action_chip_background.xml -@@ -28,13 +28,7 @@ - - - -- -- -- -- -- -- -- -+ - - - -diff --git a/packages/SystemUI/res/drawable/qs_security_footer_background.xml b/packages/SystemUI/res/drawable/qs_security_footer_background.xml -index 860d23b11439..8f12b95ed4f6 100644 ---- a/packages/SystemUI/res/drawable/qs_security_footer_background.xml -+++ b/packages/SystemUI/res/drawable/qs_security_footer_background.xml -@@ -28,8 +28,7 @@ - - - -- -+ - - - -diff --git a/packages/SystemUI/res/layout/combined_qs_header.xml b/packages/SystemUI/res/layout/combined_qs_header.xml -index 1f10e5dfeed8..4e46c42a053a 100644 ---- a/packages/SystemUI/res/layout/combined_qs_header.xml -+++ b/packages/SystemUI/res/layout/combined_qs_header.xml -@@ -26,7 +26,7 @@ - android:paddingLeft="@dimen/qs_panel_padding" - android:paddingRight="@dimen/qs_panel_padding" - android:visibility="gone" -- android:theme="@style/Theme.SystemUI.QuickSettings.Header" -+ android:theme="@style/QSHeaderTheme" - app:layoutDescription="@xml/combined_qs_header_scene"> - - - -- -\ No newline at end of file -+ -diff --git a/packages/SystemUI/res/layout/split_shade_header.xml b/packages/SystemUI/res/layout/split_shade_header.xml -index b6e96ceeaf20..ecb017a3b606 100644 ---- a/packages/SystemUI/res/layout/split_shade_header.xml -+++ b/packages/SystemUI/res/layout/split_shade_header.xml -@@ -25,7 +25,7 @@ - android:paddingLeft="@dimen/qs_panel_padding" - android:paddingRight="@dimen/qs_panel_padding" - android:visibility="gone" -- android:theme="@style/Theme.SystemUI.QuickSettings.Header"> -+ android:theme="@style/QSHeaderTheme"> - - true - - -+ -+ - - -@@ -540,7 +540,7 @@ - - - - -diff --git a/packages/SystemUI/src/com/android/systemui/privacy/OngoingPrivacyChip.kt b/packages/SystemUI/src/com/android/systemui/privacy/OngoingPrivacyChip.kt -index 9cd97ff8e343..461f67935a11 100644 ---- a/packages/SystemUI/src/com/android/systemui/privacy/OngoingPrivacyChip.kt -+++ b/packages/SystemUI/src/com/android/systemui/privacy/OngoingPrivacyChip.kt -@@ -90,8 +90,8 @@ class OngoingPrivacyChip @JvmOverloads constructor( - .getDimensionPixelSize(R.dimen.ongoing_appops_chip_icon_margin) - iconSize = context.resources - .getDimensionPixelSize(R.dimen.ongoing_appops_chip_icon_size) -- iconColor = -- Utils.getColorAttrDefaultColor(context, com.android.internal.R.attr.colorPrimary) -+ iconColor = context.resources -+ .getColor(android.R.color.system_neutral1_900) - - val padding = context.resources - .getDimensionPixelSize(R.dimen.ongoing_appops_chip_side_padding) -diff --git a/packages/SystemUI/src/com/android/systemui/qs/tileimpl/QSTileViewImpl.kt b/packages/SystemUI/src/com/android/systemui/qs/tileimpl/QSTileViewImpl.kt -index 9d60e63032c3..405080c32807 100644 ---- a/packages/SystemUI/src/com/android/systemui/qs/tileimpl/QSTileViewImpl.kt -+++ b/packages/SystemUI/src/com/android/systemui/qs/tileimpl/QSTileViewImpl.kt -@@ -83,7 +83,7 @@ open class QSTileViewImpl @JvmOverloads constructor( - } - - private val colorActive = Utils.getColorAttrDefaultColor(context, -- com.android.internal.R.attr.colorAccentPrimary) -+ android.R.attr.colorAccent) - private val colorInactive = Utils.getColorAttrDefaultColor(context, R.attr.offStateColor) - private val colorUnavailable = Utils.applyAlpha(UNAVAILABLE_ALPHA, colorInactive) - -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 1077347eab0a..fd44a9b5a5b3 100644 ---- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java -+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java -@@ -704,7 +704,7 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, Dump - mNotificationsAlpha = behindAlpha; - mNotificationsTint = behindTint; - mBehindAlpha = 1; -- mBehindTint = Color.BLACK; -+ mBehindTint = Color.TRANSPARENT; - } else { - mBehindAlpha = behindAlpha; - if (mState == ScrimState.SHADE_LOCKED) { -diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimState.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimState.java -index 9246c0e73289..b30641bbf1af 100644 ---- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimState.java -+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimState.java -@@ -82,7 +82,7 @@ public enum ScrimState { - mBehindAlpha = mClipQsScrim ? 1 : mScrimBehindAlphaKeyguard; - mNotifAlpha = mClipQsScrim ? mScrimBehindAlphaKeyguard : 0; - if (mClipQsScrim) { -- updateScrimColor(mScrimBehind, 1f /* alpha */, Color.BLACK); -+ updateScrimColor(mScrimBehind, 1f /* alpha */, Color.TRANSPARENT); - } - } - }, -@@ -119,7 +119,7 @@ public enum ScrimState { - @Override - public void prepare(ScrimState previousState) { - mBehindAlpha = mClipQsScrim ? 1 : mDefaultScrimAlpha; -- mBehindTint = mClipQsScrim ? Color.BLACK : Color.TRANSPARENT; -+ mBehindTint = Color.TRANSPARENT; - mNotifAlpha = mClipQsScrim ? mDefaultScrimAlpha : 0; - mNotifTint = Color.TRANSPARENT; - mFrontAlpha = 0f; -@@ -143,17 +143,17 @@ public enum ScrimState { - mBehindAlpha = mClipQsScrim ? 1 : mDefaultScrimAlpha; - mNotifAlpha = 1f; - mFrontAlpha = 0f; -- mBehindTint = Color.BLACK; -+ mBehindTint = Color.TRANSPARENT; - - if (mClipQsScrim) { -- updateScrimColor(mScrimBehind, 1f /* alpha */, Color.BLACK); -+ updateScrimColor(mScrimBehind, 1f /* alpha */, Color.TRANSPARENT); - } - } - - // to make sure correct color is returned before "prepare" is called - @Override - public int getBehindTint() { -- return Color.BLACK; -+ return Color.TRANSPARENT; - } - }, - -@@ -244,22 +244,22 @@ public enum ScrimState { - mAnimateChange = !mLaunchingAffordanceWithPreview && !fromAod; - - mFrontTint = Color.TRANSPARENT; -- mBehindTint = Color.BLACK; -+ mBehindTint = Color.TRANSPARENT; - mBlankScreen = false; - - if (previousState == ScrimState.AOD) { - // Set all scrims black, before they fade transparent. - updateScrimColor(mScrimInFront, 1f /* alpha */, Color.BLACK /* tint */); -- updateScrimColor(mScrimBehind, 1f /* alpha */, Color.BLACK /* tint */); -+ updateScrimColor(mScrimBehind, 1f /* alpha */, Color.TRANSPARENT /* tint */); - - // Scrims should still be black at the end of the transition. - mFrontTint = Color.BLACK; -- mBehindTint = Color.BLACK; -+ mBehindTint = Color.TRANSPARENT; - mBlankScreen = true; - } - - if (mClipQsScrim) { -- updateScrimColor(mScrimBehind, 1f /* alpha */, Color.BLACK); -+ updateScrimColor(mScrimBehind, 1f /* alpha */, Color.TRANSPARENT); - } - } - }; -@@ -399,4 +399,4 @@ public enum ScrimState { - public void setClipQsScrim(boolean clipsQsScrim) { - mClipQsScrim = clipsQsScrim; - } --} -\ No newline at end of file -+} --- -2.25.1 - diff --git a/patches_platform/frameworks_base/0016-SystemUI-Initialize-QS-tiles-in-inactive-state.patch b/patches_platform/frameworks_base/0016-SystemUI-Initialize-QS-tiles-in-inactive-state.patch deleted file mode 100644 index 6e74b4d..0000000 --- a/patches_platform/frameworks_base/0016-SystemUI-Initialize-QS-tiles-in-inactive-state.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 51ddcd1625e36db7a7817c8fdcf78008e3dcc472 Mon Sep 17 00:00:00 2001 -From: Danny Lin -Date: Mon, 11 Oct 2021 19:25:02 -0700 -Subject: [PATCH 16/19] SystemUI: Initialize QS tiles in inactive state - -Now that the QS fragment is recreated when changing the UI mode (so that -it follows light/dark themes), all tiles flash with active color briefly -because the new views become visible before states are refreshed. - -Initializing tiles in the inactive state is much less disruptive, and -the effect is very hard to see as compared to the active color because -the background color is much less prominent. - -Change-Id: I048171d503f5533e91bab486b8805ac15c329f31 ---- - .../plugin/src/com/android/systemui/plugins/qs/QSTile.java | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/packages/SystemUI/plugin/src/com/android/systemui/plugins/qs/QSTile.java b/packages/SystemUI/plugin/src/com/android/systemui/plugins/qs/QSTile.java -index 77018d736163..9e02b140175b 100644 ---- a/packages/SystemUI/plugin/src/com/android/systemui/plugins/qs/QSTile.java -+++ b/packages/SystemUI/plugin/src/com/android/systemui/plugins/qs/QSTile.java -@@ -148,7 +148,7 @@ public interface QSTile { - @ProvidesInterface(version = State.VERSION) - public static class State { - public static final int VERSION = 1; -- public static final int DEFAULT_STATE = Tile.STATE_ACTIVE; -+ public static final int DEFAULT_STATE = Tile.STATE_INACTIVE; - - public Icon icon; - public Supplier iconSupplier; --- -2.25.1 - diff --git a/patches_platform/frameworks_base/0017-SystemUI-Add-dual-tone-light-and-dark-themes-for-QS.patch b/patches_platform/frameworks_base/0017-SystemUI-Add-dual-tone-light-and-dark-themes-for-QS.patch deleted file mode 100644 index c76800c..0000000 --- a/patches_platform/frameworks_base/0017-SystemUI-Add-dual-tone-light-and-dark-themes-for-QS.patch +++ /dev/null @@ -1,147 +0,0 @@ -From 8015abe8a29cf35760b18691a8e732f0d1b84b65 Mon Sep 17 00:00:00 2001 -From: Danny Lin -Date: Mon, 11 Oct 2021 19:25:08 -0700 -Subject: [PATCH 17/19] SystemUI: Add dual-tone light and dark themes for QS - -Google's dual-tone QS design where the notification panel has a -semantically higher elevation adds depth to the notification+QS shade, -and we don't necessarily have to give it up just because our QS has -light and dark themes. - -To preserve the dual-tone effect, use a darker background color for the -QS section: - -Light: - Notifications: neutral1 20 (surface_light) - Notification panel: neutral1 50 (light BG) - QS background: neutral1 100 (darker light BG / surface_header_light) - Inactive QS tiles: neutral1 20 (surface_light) - -Dark: - Notifications: neutral1 800 (surface_dark) - Notification panel: neutral1 900 (dark BG) - QS background: neutral1 950 (surface_header_dark_sysui modulated to L* 5) - Inactive QS tiles: neutral1 800 (surface_dark) - -The dark QS background could be neutral1 0 (black) like it was before, -but I don't think it looks as good because it can't be tinted based on -the active wallpaper and thus stands out from other colors. - -Unfortunately, Google's current CAM16-based modulation causes hue shifts -in extreme light and dark shades (e.g. L* = 98 / 5), but we'll fix this -by generating and overlaying modulated surface colors in our -ThemeOverlayController implementation. - -Demo screenshots: https://twitter.com/kdrag0n/status/1445922541218922496 - -Change-Id: Icdc4957ecb4e0201377351f1a3e1c6928d6b3955 ---- - .../res/color/surface_header_dark_sysui.xml | 18 ++++++++++++++++++ - core/res/res/values-night/values.xml | 1 + - packages/SystemUI/res/values/styles.xml | 2 +- - .../statusbar/phone/ScrimController.java | 13 ++++++++++++- - 4 files changed, 32 insertions(+), 2 deletions(-) - create mode 100644 core/res/res/color/surface_header_dark_sysui.xml - -diff --git a/core/res/res/color/surface_header_dark_sysui.xml b/core/res/res/color/surface_header_dark_sysui.xml -new file mode 100644 -index 000000000000..ec070c96f91a ---- /dev/null -+++ b/core/res/res/color/surface_header_dark_sysui.xml -@@ -0,0 +1,18 @@ -+ -+ -+ -+ -+ -diff --git a/core/res/res/values-night/values.xml b/core/res/res/values-night/values.xml -index 1571fab66a5b..0683c20a4a4c 100644 ---- a/core/res/res/values-night/values.xml -+++ b/core/res/res/values-night/values.xml -@@ -22,6 +22,7 @@ - @color/secondary_device_default_settings - @color/accent_device_default_dark - @color/error_color_device_default_dark -+ @color/surface_header_dark_sysui - ?attr/textColorPrimary - @style/Theme.DeviceDefault.Dialog.Alert - false -diff --git a/packages/SystemUI/res/values/styles.xml b/packages/SystemUI/res/values/styles.xml -index 47344cb6d352..ba0361de6e8b 100644 ---- a/packages/SystemUI/res/values/styles.xml -+++ b/packages/SystemUI/res/values/styles.xml -@@ -333,7 +333,7 @@ - true - @drawable/ic_arrow_back - @*android:color/surface_light -- @android:color/system_neutral1_50 -+ @android:color/system_neutral1_100 - @android:color/system_neutral1_50 - @style/Control.MenuItem - -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 fd44a9b5a5b3..00db68981eb6 100644 ---- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java -+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java -@@ -180,6 +180,7 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, Dump - private UnlockedScreenOffAnimationController mUnlockedScreenOffAnimationController; - - private GradientColors mColors; -+ private GradientColors mBehindColors; - private boolean mNeedsDrawableColorUpdate; - - private float mScrimBehindAlphaKeyguard = KEYGUARD_SCRIM_ALPHA; -@@ -276,6 +277,7 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, Dump - ); - - mColors = new GradientColors(); -+ mBehindColors = new GradientColors(); - } - - /** -@@ -874,7 +876,7 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, Dump - && !mBlankScreen; - - mScrimInFront.setColors(mColors, animateScrimInFront); -- mScrimBehind.setColors(mColors, animateBehindScrim); -+ mScrimBehind.setColors(mBehindColors, animateBehindScrim); - mNotificationsScrim.setColors(mColors, animateScrimNotifications); - - dispatchBackScrimState(mScrimBehind.getViewAlpha()); -@@ -1214,11 +1216,20 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, Dump - if (mScrimBehind == null) return; - int background = Utils.getColorAttr(mScrimBehind.getContext(), - android.R.attr.colorBackgroundFloating).getDefaultColor(); -+ int surfaceBackground = Utils.getColorAttr(mScrimBehind.getContext(), -+ com.android.internal.R.attr.colorSurfaceHeader).getDefaultColor(); - int accent = Utils.getColorAccent(mScrimBehind.getContext()).getDefaultColor(); -+ - mColors.setMainColor(background); - mColors.setSecondaryColor(accent); - mColors.setSupportsDarkText( - ColorUtils.calculateContrast(mColors.getMainColor(), Color.WHITE) > 4.5); -+ -+ mBehindColors.setMainColor(surfaceBackground); -+ mBehindColors.setSecondaryColor(accent); -+ mBehindColors.setSupportsDarkText( -+ ColorUtils.calculateContrast(mBehindColors.getMainColor(), Color.WHITE) > 4.5); -+ - mNeedsDrawableColorUpdate = true; - } - --- -2.25.1 - diff --git a/patches_platform_personal/frameworks_base/0001-Add-MiuiNavbarOverlay.patch b/patches_platform_personal/frameworks_base/0001-Add-MiuiNavbarOverlay.patch index 1adfc85..ab336b1 100644 --- a/patches_platform_personal/frameworks_base/0001-Add-MiuiNavbarOverlay.patch +++ b/patches_platform_personal/frameworks_base/0001-Add-MiuiNavbarOverlay.patch @@ -1,7 +1,7 @@ -From 86d6f44dc9416d088604aec09d6ceb333899bd33 Mon Sep 17 00:00:00 2001 +From d74d1cb657dcee5ff59ca3b5ee3564db7afa6a66 Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Sun, 20 Jun 2021 03:39:32 +0000 -Subject: [PATCH 01/16] Add MiuiNavbarOverlay +Subject: [PATCH 01/17] Add MiuiNavbarOverlay Change-Id: I0e6791abc3c9521d7dc612df2fec2b041affe7e9 --- diff --git a/patches_platform_personal/frameworks_base/0002-Disable-cursor-drag-by-default-for-editable-TextView.patch b/patches_platform_personal/frameworks_base/0002-Disable-cursor-drag-by-default-for-editable-TextView.patch index 0c20000..8390317 100644 --- a/patches_platform_personal/frameworks_base/0002-Disable-cursor-drag-by-default-for-editable-TextView.patch +++ b/patches_platform_personal/frameworks_base/0002-Disable-cursor-drag-by-default-for-editable-TextView.patch @@ -1,7 +1,7 @@ -From 53fd03722a9a1fa09054f4c3a368140e20ea866f Mon Sep 17 00:00:00 2001 +From c01a32795448437e5bf624fc4c2c4e31108c4566 Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Mon, 27 Sep 2021 16:30:00 +0000 -Subject: [PATCH 02/16] Disable cursor drag by default for editable TextViews +Subject: [PATCH 02/17] Disable cursor drag by default for editable TextViews Requested by @TadiT7 diff --git a/patches_platform_personal/frameworks_base/0003-Disable-FP-lockouts.patch b/patches_platform_personal/frameworks_base/0003-Disable-FP-lockouts.patch index a526f88..606c40b 100644 --- a/patches_platform_personal/frameworks_base/0003-Disable-FP-lockouts.patch +++ b/patches_platform_personal/frameworks_base/0003-Disable-FP-lockouts.patch @@ -1,7 +1,7 @@ -From 51cdf8b65466eeedb8a2c856666f51cb6f1fed34 Mon Sep 17 00:00:00 2001 +From b4ca2e090b7a049691be56bda35c36f51c201f1d Mon Sep 17 00:00:00 2001 From: AndyCGYan Date: Fri, 22 Mar 2019 00:41:20 +0800 -Subject: [PATCH 03/16] Disable FP lockouts +Subject: [PATCH 03/17] Disable FP lockouts Both timed and permanent lockouts - GET THE FUCK OUT Now targeting LockoutFramework, introduced in Android 12 diff --git a/patches_platform_personal/frameworks_base/0004-Keyguard-Adjust-clock-style.patch b/patches_platform_personal/frameworks_base/0004-Keyguard-Adjust-clock-style.patch index 8979b89..e702fb3 100644 --- a/patches_platform_personal/frameworks_base/0004-Keyguard-Adjust-clock-style.patch +++ b/patches_platform_personal/frameworks_base/0004-Keyguard-Adjust-clock-style.patch @@ -1,7 +1,7 @@ -From 0112a0d00e937e8472dfde7976b5e67a9d1b9eec Mon Sep 17 00:00:00 2001 +From 895cde345dd8b0126ca9081ece183b873ded0d47 Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Thu, 2 Sep 2021 16:15:19 +0000 -Subject: [PATCH 04/16] Keyguard: Adjust clock style +Subject: [PATCH 04/17] Keyguard: Adjust clock style Thinner font, less padding and unintrusive colors diff --git a/patches_platform_personal/frameworks_base/0005-Keyguard-Hide-padlock-unless-UDFPS-is-in-use.patch b/patches_platform_personal/frameworks_base/0005-Keyguard-Hide-padlock-unless-UDFPS-is-in-use.patch index c5d5a40..bb92deb 100644 --- a/patches_platform_personal/frameworks_base/0005-Keyguard-Hide-padlock-unless-UDFPS-is-in-use.patch +++ b/patches_platform_personal/frameworks_base/0005-Keyguard-Hide-padlock-unless-UDFPS-is-in-use.patch @@ -1,7 +1,7 @@ -From 7f01826f95a5f48d94ccbd0b83a28cd8acdf7496 Mon Sep 17 00:00:00 2001 +From 4a8a2dd5f300a8bac754508011e83244a1825638 Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Sat, 2 Nov 2019 06:41:03 +0000 -Subject: [PATCH 05/16] Keyguard: Hide padlock unless UDFPS is in use +Subject: [PATCH 05/17] Keyguard: Hide padlock unless UDFPS is in use Fair enough Google, but don't give me that otherwise diff --git a/patches_platform_personal/frameworks_base/0006-Keyguard-Never-switch-to-large-clock.patch b/patches_platform_personal/frameworks_base/0006-Keyguard-Never-switch-to-large-clock.patch index 533f457..88bbafc 100644 --- a/patches_platform_personal/frameworks_base/0006-Keyguard-Never-switch-to-large-clock.patch +++ b/patches_platform_personal/frameworks_base/0006-Keyguard-Never-switch-to-large-clock.patch @@ -1,7 +1,7 @@ -From 45fa09cefe77021303c2904cd492d67a1ced90d3 Mon Sep 17 00:00:00 2001 +From 950789a6a39f79506dd05c293f2edb709710810e Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Wed, 1 Sep 2021 14:41:53 +0000 -Subject: [PATCH 06/16] Keyguard: Never switch to large clock +Subject: [PATCH 06/17] Keyguard: Never switch to large clock It looks alright actually, but as always breaks under landscape diff --git a/patches_platform_personal/frameworks_base/0007-Keyguard-Refine-indication-text.patch b/patches_platform_personal/frameworks_base/0007-Keyguard-Refine-indication-text.patch index 6b79f9c..8b04beb 100644 --- a/patches_platform_personal/frameworks_base/0007-Keyguard-Refine-indication-text.patch +++ b/patches_platform_personal/frameworks_base/0007-Keyguard-Refine-indication-text.patch @@ -1,7 +1,7 @@ -From 6b7493641b38d8bfc9d1e9f3d09deaabeaf4b2b9 Mon Sep 17 00:00:00 2001 +From 096def92c7e4ff40d1bee39e27f57ca858957324 Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Sat, 2 Nov 2019 08:31:36 +0000 -Subject: [PATCH 07/16] Keyguard: Refine indication text +Subject: [PATCH 07/17] Keyguard: Refine indication text Change-Id: Ib771c35610f712a1de34736e817bcfe616ac37d8 --- diff --git a/patches_platform_personal/frameworks_base/0008-Keyguard-UI-Fix-status-bar-quick-settings-margins-an.patch b/patches_platform_personal/frameworks_base/0008-Keyguard-UI-Fix-status-bar-quick-settings-margins-an.patch index 3e7d3f2..ac4c686 100644 --- a/patches_platform_personal/frameworks_base/0008-Keyguard-UI-Fix-status-bar-quick-settings-margins-an.patch +++ b/patches_platform_personal/frameworks_base/0008-Keyguard-UI-Fix-status-bar-quick-settings-margins-an.patch @@ -1,7 +1,7 @@ -From 312bf4b794331d797c37b9e9bfe0f3a2605a4905 Mon Sep 17 00:00:00 2001 +From 8ce58e00f60ce8a9c28b8d1ce4dcaa656e51cc51 Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Sat, 20 Mar 2021 10:35:14 +0000 -Subject: [PATCH 08/16] Keyguard/UI: Fix status bar / quick settings margins +Subject: [PATCH 08/17] Keyguard/UI: Fix status bar / quick settings margins and paddings Last revised on 2022/03/13, targeting s-v2 @@ -139,7 +139,7 @@ index aa59fd6a9b51..a55c394a3e53 100644 diff --git a/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java b/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java -index 60a5df0665e7..55112ee27ef3 100644 +index ec31c4cd942b..936a1f98f767 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java +++ b/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java @@ -93,6 +93,10 @@ public class QuickStatusBarHeader extends FrameLayout implements TunerService.Tu diff --git a/patches_platform_personal/frameworks_base/0009-Replace-NTP-server.patch b/patches_platform_personal/frameworks_base/0009-Replace-NTP-server.patch index 2ab1567..5797139 100644 --- a/patches_platform_personal/frameworks_base/0009-Replace-NTP-server.patch +++ b/patches_platform_personal/frameworks_base/0009-Replace-NTP-server.patch @@ -1,7 +1,7 @@ -From 73f2f4f2bbdcc13a681b7cf730d8eb8d02150e4e Mon Sep 17 00:00:00 2001 +From 7ac21db0fa546257587e7d39f496e33be2835049 Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Sun, 17 Apr 2022 08:48:42 +0000 -Subject: [PATCH 09/16] Replace NTP server +Subject: [PATCH 09/17] Replace NTP server Change-Id: I938ab46026d841e7536d8fc02b0ef6b28ebb6ea1 --- @@ -9,7 +9,7 @@ Change-Id: I938ab46026d841e7536d8fc02b0ef6b28ebb6ea1 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml -index 1b9306913e7d..38654117b95e 100644 +index e4e7243bbb76..d7872f457b34 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -2246,7 +2246,7 @@ diff --git a/patches_platform_personal/frameworks_base/0010-Revert-SystemUI-Add-left-padding-for-keyguard-slices.patch b/patches_platform_personal/frameworks_base/0010-Revert-SystemUI-Add-left-padding-for-keyguard-slices.patch new file mode 100644 index 0000000..05ac90f --- /dev/null +++ b/patches_platform_personal/frameworks_base/0010-Revert-SystemUI-Add-left-padding-for-keyguard-slices.patch @@ -0,0 +1,44 @@ +From 29f205b99483c357c5186795da3f4a935ae1362c Mon Sep 17 00:00:00 2001 +From: Andy CrossGate Yan +Date: Tue, 31 May 2022 00:00:08 +0000 +Subject: [PATCH 10/17] Revert "SystemUI: Add left padding for keyguard slices" + +This reverts commit 4a7a4426944e28e70a3eca6a696ff6c7599fb896. +--- + .../src/com/android/keyguard/KeyguardSliceView.java | 9 +++------ + 1 file changed, 3 insertions(+), 6 deletions(-) + +diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardSliceView.java b/packages/SystemUI/src/com/android/keyguard/KeyguardSliceView.java +index 79ac96e3bde2..9b76bab5c2a7 100644 +--- a/packages/SystemUI/src/com/android/keyguard/KeyguardSliceView.java ++++ b/packages/SystemUI/src/com/android/keyguard/KeyguardSliceView.java +@@ -49,7 +49,6 @@ import com.android.internal.graphics.ColorUtils; + import com.android.settingslib.Utils; + import com.android.systemui.R; + import com.android.systemui.animation.Interpolators; +-import com.android.systemui.keyguard.KeyguardSliceProvider; + import com.android.systemui.util.wakelock.KeepAwakeAnimationListener; + + import java.io.FileDescriptor; +@@ -447,15 +446,13 @@ public class KeyguardSliceView extends LinearLayout { + + private void updatePadding() { + boolean hasText = !TextUtils.isEmpty(getText()); +- boolean isDate = Uri.parse(KeyguardSliceProvider.KEYGUARD_DATE_URI).equals(getTag()); + int padding = (int) getContext().getResources() + .getDimension(R.dimen.widget_horizontal_padding) / 2; +- int iconPadding = (int) mContext.getResources() +- .getDimension(R.dimen.widget_icon_padding); + // orientation is vertical, so add padding to top & bottom +- setPadding(!isDate ? iconPadding : 0, padding, 0, hasText ? padding : 0); ++ setPadding(0, padding, 0, hasText ? padding : 0); + +- setCompoundDrawablePadding(iconPadding); ++ setCompoundDrawablePadding((int) mContext.getResources() ++ .getDimension(R.dimen.widget_icon_padding)); + } + + @Override +-- +2.25.1 + diff --git a/patches_platform_personal/frameworks_base/0010-Revert-Update-RAT-icons-to-match-Silk-design.patch b/patches_platform_personal/frameworks_base/0011-Revert-Update-RAT-icons-to-match-Silk-design.patch similarity index 99% rename from patches_platform_personal/frameworks_base/0010-Revert-Update-RAT-icons-to-match-Silk-design.patch rename to patches_platform_personal/frameworks_base/0011-Revert-Update-RAT-icons-to-match-Silk-design.patch index 7d25d34..5e78c5a 100644 --- a/patches_platform_personal/frameworks_base/0010-Revert-Update-RAT-icons-to-match-Silk-design.patch +++ b/patches_platform_personal/frameworks_base/0011-Revert-Update-RAT-icons-to-match-Silk-design.patch @@ -1,7 +1,7 @@ -From 4c17766af4ece72a4170062ea381d90910ec96c4 Mon Sep 17 00:00:00 2001 +From 2ca4a9aba74165e037de2434b64108138d145328 Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Sun, 5 Sep 2021 01:20:12 +0000 -Subject: [PATCH 10/16] Revert "Update RAT icons to match Silk design" +Subject: [PATCH 11/17] Revert "Update RAT icons to match Silk design" This reverts commit 084c13c8216f6a899cd3eda04fc1d7acff3d1248. --- diff --git a/patches_platform_personal/frameworks_base/0011-UI-Always-render-windows-into-cutouts.patch b/patches_platform_personal/frameworks_base/0012-UI-Always-render-windows-into-cutouts.patch similarity index 94% rename from patches_platform_personal/frameworks_base/0011-UI-Always-render-windows-into-cutouts.patch rename to patches_platform_personal/frameworks_base/0012-UI-Always-render-windows-into-cutouts.patch index 030cd41..05a0e07 100644 --- a/patches_platform_personal/frameworks_base/0011-UI-Always-render-windows-into-cutouts.patch +++ b/patches_platform_personal/frameworks_base/0012-UI-Always-render-windows-into-cutouts.patch @@ -1,7 +1,7 @@ -From f94652bb879b8fbe9f9710276b7ca46fd0e8c76a Mon Sep 17 00:00:00 2001 +From 6906f3f8b74104d9c2e80f469d1296ed72f1af96 Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Wed, 7 Oct 2020 14:00:35 +0000 -Subject: [PATCH 11/16] UI: Always render windows into cutouts +Subject: [PATCH 12/17] UI: Always render windows into cutouts Eliminates black/white letterboxing Quick and dirty way to do the latter - wait for proper fix from Google @@ -55,10 +55,10 @@ index 32e43ca4e56c..18c28ae674f9 100644 } diff --git a/services/core/java/com/android/server/wm/DisplayPolicy.java b/services/core/java/com/android/server/wm/DisplayPolicy.java -index 89ac6585c673..b08604c6b4e7 100644 +index 969d70099cfb..3a64c085beaf 100644 --- a/services/core/java/com/android/server/wm/DisplayPolicy.java +++ b/services/core/java/com/android/server/wm/DisplayPolicy.java -@@ -1817,7 +1817,7 @@ public class DisplayPolicy { +@@ -1867,7 +1867,7 @@ public class DisplayPolicy { pf.set((fl & FLAG_LAYOUT_IN_SCREEN) == 0 ? attached.getFrame() : df); } diff --git a/patches_platform_personal/frameworks_base/0012-UI-Kill-rounded-corners-in-notification-scrim.patch b/patches_platform_personal/frameworks_base/0013-UI-Kill-rounded-corners-in-notification-scrim.patch similarity index 89% rename from patches_platform_personal/frameworks_base/0012-UI-Kill-rounded-corners-in-notification-scrim.patch rename to patches_platform_personal/frameworks_base/0013-UI-Kill-rounded-corners-in-notification-scrim.patch index 8d15b10..3cac8b8 100644 --- a/patches_platform_personal/frameworks_base/0012-UI-Kill-rounded-corners-in-notification-scrim.patch +++ b/patches_platform_personal/frameworks_base/0013-UI-Kill-rounded-corners-in-notification-scrim.patch @@ -1,7 +1,7 @@ -From 4134c3669ab24d54ce58c4bd6ceca786b1d14907 Mon Sep 17 00:00:00 2001 +From 8044b45f7aa0108fdc4d5f7fd445adbe20dc515e Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Wed, 1 Sep 2021 14:10:50 +0000 -Subject: [PATCH 12/16] UI: Kill rounded corners in notification scrim +Subject: [PATCH 13/17] UI: Kill rounded corners in notification scrim Rounded corners in S is nicely implemented, but this is one occasion where it looks out of place diff --git a/patches_platform_personal/frameworks_base/0013-UI-Reconfigure-power-menu-items.patch b/patches_platform_personal/frameworks_base/0014-UI-Reconfigure-power-menu-items.patch similarity index 85% rename from patches_platform_personal/frameworks_base/0013-UI-Reconfigure-power-menu-items.patch rename to patches_platform_personal/frameworks_base/0014-UI-Reconfigure-power-menu-items.patch index ed2cef1..3b0c910 100644 --- a/patches_platform_personal/frameworks_base/0013-UI-Reconfigure-power-menu-items.patch +++ b/patches_platform_personal/frameworks_base/0014-UI-Reconfigure-power-menu-items.patch @@ -1,7 +1,7 @@ -From a268294cefcabea1dc8759409419d4307a36b839 Mon Sep 17 00:00:00 2001 +From 9dbf50b60e1ceb062174e05e28b78f34149c25e0 Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Mon, 26 Oct 2020 14:06:56 +0000 -Subject: [PATCH 13/16] UI: Reconfigure power menu items +Subject: [PATCH 14/17] UI: Reconfigure power menu items Change-Id: I32cca6e2c6bb64d891efee959127edf7c0802cbc --- @@ -9,7 +9,7 @@ Change-Id: I32cca6e2c6bb64d891efee959127edf7c0802cbc 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml -index 38654117b95e..137efaec97fc 100644 +index d7872f457b34..df9a0d487e9e 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -3016,13 +3016,10 @@ diff --git a/patches_platform_personal/frameworks_base/0014-UI-Reconfigure-quick-settings-tiles.patch b/patches_platform_personal/frameworks_base/0015-UI-Reconfigure-quick-settings-tiles.patch similarity index 84% rename from patches_platform_personal/frameworks_base/0014-UI-Reconfigure-quick-settings-tiles.patch rename to patches_platform_personal/frameworks_base/0015-UI-Reconfigure-quick-settings-tiles.patch index 8a47620..72bc8ac 100644 --- a/patches_platform_personal/frameworks_base/0014-UI-Reconfigure-quick-settings-tiles.patch +++ b/patches_platform_personal/frameworks_base/0015-UI-Reconfigure-quick-settings-tiles.patch @@ -1,7 +1,7 @@ -From 0345bd3c25148d7dc10b84b1a32be96b3ab81879 Mon Sep 17 00:00:00 2001 +From d7fc8ae4d57d3ec1ccd9ff6ca6d7becbfaec9c70 Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Sat, 5 Mar 2022 01:43:37 +0000 -Subject: [PATCH 14/16] UI: Reconfigure quick settings tiles +Subject: [PATCH 15/17] UI: Reconfigure quick settings tiles Change-Id: I743f52ef3a95db0ca2c02ae973faa4629e41885d --- @@ -9,7 +9,7 @@ Change-Id: I743f52ef3a95db0ca2c02ae973faa4629e41885d 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/SystemUI/res/values/config.xml b/packages/SystemUI/res/values/config.xml -index 909e7e7f46b3..5f894cab264f 100644 +index 94cc561f5fb0..ad20d2227087 100644 --- a/packages/SystemUI/res/values/config.xml +++ b/packages/SystemUI/res/values/config.xml @@ -74,7 +74,7 @@ diff --git a/patches_platform_personal/frameworks_base/0015-UI-Relax-requirement-for-HINT_SUPPORTS_DARK_TEXT.patch b/patches_platform_personal/frameworks_base/0016-UI-Relax-requirement-for-HINT_SUPPORTS_DARK_TEXT.patch similarity index 88% rename from patches_platform_personal/frameworks_base/0015-UI-Relax-requirement-for-HINT_SUPPORTS_DARK_TEXT.patch rename to patches_platform_personal/frameworks_base/0016-UI-Relax-requirement-for-HINT_SUPPORTS_DARK_TEXT.patch index b349bc0..2d52888 100644 --- a/patches_platform_personal/frameworks_base/0015-UI-Relax-requirement-for-HINT_SUPPORTS_DARK_TEXT.patch +++ b/patches_platform_personal/frameworks_base/0016-UI-Relax-requirement-for-HINT_SUPPORTS_DARK_TEXT.patch @@ -1,7 +1,7 @@ -From 2ae7a729e6a9bc4cae65ca0793f4834487172c63 Mon Sep 17 00:00:00 2001 +From a536944a4e71fc775d76f92267ea61f6c49e089e Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Tue, 29 Jun 2021 22:57:01 +0000 -Subject: [PATCH 15/16] UI: Relax requirement for HINT_SUPPORTS_DARK_TEXT +Subject: [PATCH 16/17] UI: Relax requirement for HINT_SUPPORTS_DARK_TEXT I decide what's good enough for a wallpaper! diff --git a/patches_platform_personal/frameworks_base/0016-UI-Remove-privacy-dot-padding.patch b/patches_platform_personal/frameworks_base/0017-UI-Remove-privacy-dot-padding.patch similarity index 89% rename from patches_platform_personal/frameworks_base/0016-UI-Remove-privacy-dot-padding.patch rename to patches_platform_personal/frameworks_base/0017-UI-Remove-privacy-dot-padding.patch index d3df882..4c887ab 100644 --- a/patches_platform_personal/frameworks_base/0016-UI-Remove-privacy-dot-padding.patch +++ b/patches_platform_personal/frameworks_base/0017-UI-Remove-privacy-dot-padding.patch @@ -1,7 +1,7 @@ -From 3821df3d4498bc7b5f148e93303543f281a53ce8 Mon Sep 17 00:00:00 2001 +From 79e652d4979ca20448434f643f1373044f42ce2a Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Tue, 19 Oct 2021 12:09:34 +0000 -Subject: [PATCH 16/16] UI: Remove privacy dot padding +Subject: [PATCH 17/17] UI: Remove privacy dot padding Change-Id: I5d2e2b3e36f027b4348a83030d4b4d3c4f0209d1 --- diff --git a/patches_treble_phh/platform_frameworks_base/0001-Fallback-to-stupid-autobrightness-if-brightness-valu.patch b/patches_treble_phh/platform_frameworks_base/0001-Fallback-to-stupid-autobrightness-if-brightness-valu.patch index 4f2f657..9aa0088 100644 --- a/patches_treble_phh/platform_frameworks_base/0001-Fallback-to-stupid-autobrightness-if-brightness-valu.patch +++ b/patches_treble_phh/platform_frameworks_base/0001-Fallback-to-stupid-autobrightness-if-brightness-valu.patch @@ -1,7 +1,7 @@ -From 50894d0b194706219e869070d0d0a60c2fedbd83 Mon Sep 17 00:00:00 2001 +From 3c980fc355795a371b4d93199e66654c240b0c3a Mon Sep 17 00:00:00 2001 From: Pierre-Hugues Husson Date: Tue, 5 Oct 2021 17:59:16 -0400 -Subject: [PATCH 01/33] Fallback to stupid autobrightness if brightness values +Subject: [PATCH 01/34] Fallback to stupid autobrightness if brightness values are broken This is needed because of: @@ -14,10 +14,10 @@ Change-Id: Ieb679b34239013a5e31b34cb010b12febd9ef6d9 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/display/DisplayDeviceConfig.java b/services/core/java/com/android/server/display/DisplayDeviceConfig.java -index 2ae5cbbbf24b..9cd8dc663cfa 100644 +index 255494f98667..022870870222 100644 --- a/services/core/java/com/android/server/display/DisplayDeviceConfig.java +++ b/services/core/java/com/android/server/display/DisplayDeviceConfig.java -@@ -172,7 +172,12 @@ public class DisplayDeviceConfig { +@@ -178,7 +178,12 @@ public class DisplayDeviceConfig { public static DisplayDeviceConfig create(Context context, boolean useConfigXml) { DisplayDeviceConfig config; if (useConfigXml) { diff --git a/patches_treble_phh/platform_frameworks_base/0002-Relax-requirement-for-visible-flag-to-sdcards.patch b/patches_treble_phh/platform_frameworks_base/0002-Relax-requirement-for-visible-flag-to-sdcards.patch index 27446e7..119b92a 100644 --- a/patches_treble_phh/platform_frameworks_base/0002-Relax-requirement-for-visible-flag-to-sdcards.patch +++ b/patches_treble_phh/platform_frameworks_base/0002-Relax-requirement-for-visible-flag-to-sdcards.patch @@ -1,7 +1,7 @@ -From 01d72f3de8dd8e1a4671d4a1f1d5bbab9241194a Mon Sep 17 00:00:00 2001 +From 42f5b7c6772d99fb710543d8ab63e0212de4e082 Mon Sep 17 00:00:00 2001 From: Pierre-Hugues Husson Date: Tue, 28 Nov 2017 18:28:04 +0100 -Subject: [PATCH 02/33] Relax requirement for visible flag to sdcards +Subject: [PATCH 02/34] Relax requirement for visible flag to sdcards The vast majority of sdcard readers are stable enough to be declared by the API. (I see no counter-example) diff --git a/patches_treble_phh/platform_frameworks_base/0003-Don-t-crash-if-there-is-IR-HAL-is-not-declared.patch b/patches_treble_phh/platform_frameworks_base/0003-Don-t-crash-if-there-is-IR-HAL-is-not-declared.patch index ca40398..3dea2ac 100644 --- a/patches_treble_phh/platform_frameworks_base/0003-Don-t-crash-if-there-is-IR-HAL-is-not-declared.patch +++ b/patches_treble_phh/platform_frameworks_base/0003-Don-t-crash-if-there-is-IR-HAL-is-not-declared.patch @@ -1,7 +1,7 @@ -From cb46b9da6a63fe5cb89348c03e707fc43981a465 Mon Sep 17 00:00:00 2001 +From b7b1812fc9b262415e4557ee4e9438b707f864c7 Mon Sep 17 00:00:00 2001 From: Pierre-Hugues Husson Date: Thu, 17 May 2018 20:28:35 +0200 -Subject: [PATCH 03/33] Don't crash if there is IR HAL is not declared +Subject: [PATCH 03/34] Don't crash if there is IR HAL is not declared Change-Id: I3afded27441bbee8244d5fda544b3e6d1238dc1b --- diff --git a/patches_treble_phh/platform_frameworks_base/0004-Show-APN-Settings-for-CDMA-carriers.patch b/patches_treble_phh/platform_frameworks_base/0004-Show-APN-Settings-for-CDMA-carriers.patch index cb1ce39..6687ef4 100644 --- a/patches_treble_phh/platform_frameworks_base/0004-Show-APN-Settings-for-CDMA-carriers.patch +++ b/patches_treble_phh/platform_frameworks_base/0004-Show-APN-Settings-for-CDMA-carriers.patch @@ -1,17 +1,17 @@ -From f3f8c69914b7c20bac11c3fb0a217ced1944901e Mon Sep 17 00:00:00 2001 +From 09c628a3bab752f9dab961dd262a6e6a7d899aa3 Mon Sep 17 00:00:00 2001 From: Pierre-Hugues Husson Date: Mon, 6 Aug 2018 12:49:00 +0200 -Subject: [PATCH 04/33] Show APN Settings for CDMA carriers +Subject: [PATCH 04/34] Show APN Settings for CDMA carriers --- telephony/java/android/telephony/CarrierConfigManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java -index b8a14b8ea72e..51cbd880af77 100644 +index 1ca251d370ab..cb05839ba220 100644 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java -@@ -5342,7 +5342,7 @@ public class CarrierConfigManager { +@@ -5483,7 +5483,7 @@ public class CarrierConfigManager { sDefaults.putBoolean(KEY_MDN_IS_ADDITIONAL_VOICEMAIL_NUMBER_BOOL, false); sDefaults.putBoolean(KEY_OPERATOR_SELECTION_EXPAND_BOOL, true); sDefaults.putBoolean(KEY_PREFER_2G_BOOL, true); diff --git a/patches_treble_phh/platform_frameworks_base/0005-Re-order-services-so-that-it-works-even-without-qtag.patch b/patches_treble_phh/platform_frameworks_base/0005-Re-order-services-so-that-it-works-even-without-qtag.patch index 1cc55e7..8db37d3 100644 --- a/patches_treble_phh/platform_frameworks_base/0005-Re-order-services-so-that-it-works-even-without-qtag.patch +++ b/patches_treble_phh/platform_frameworks_base/0005-Re-order-services-so-that-it-works-even-without-qtag.patch @@ -1,7 +1,7 @@ -From c441a4d08d3226a89f5a9d5d54a3e092bc398bc3 Mon Sep 17 00:00:00 2001 +From 12a577a737a326dbd46bbc80795fbacd5dbf49ff Mon Sep 17 00:00:00 2001 From: Pierre-Hugues Husson Date: Thu, 8 Nov 2018 23:04:03 +0100 -Subject: [PATCH 05/33] Re-order services so that it works even without qtaguid +Subject: [PATCH 05/34] Re-order services so that it works even without qtaguid Change-Id: I0c0f527b3ae151d45c68f7ac6c205da3f34e74df --- diff --git a/patches_treble_phh/platform_frameworks_base/0006-Support-samsung-Pie-and-Q-light-hal.patch b/patches_treble_phh/platform_frameworks_base/0006-Support-samsung-Pie-and-Q-light-hal.patch index 1f2bd16..e9431b1 100644 --- a/patches_treble_phh/platform_frameworks_base/0006-Support-samsung-Pie-and-Q-light-hal.patch +++ b/patches_treble_phh/platform_frameworks_base/0006-Support-samsung-Pie-and-Q-light-hal.patch @@ -1,7 +1,7 @@ -From cdf6204270d189dc035fee8f21b4f73697eaa711 Mon Sep 17 00:00:00 2001 +From 0fbf86d42d82889abd274f819ccd9f43e15e873c Mon Sep 17 00:00:00 2001 From: Pierre-Hugues Husson Date: Sun, 24 Mar 2019 23:05:14 +0100 -Subject: [PATCH 06/33] Support samsung Pie and Q light hal +Subject: [PATCH 06/34] Support samsung Pie and Q light hal Change-Id: I01f94acd7d0672733e48854d80368f9ac6f861c6 --- diff --git a/patches_treble_phh/platform_frameworks_base/0007-Add-support-for-samsung-touch-physical-and-hover-pro.patch b/patches_treble_phh/platform_frameworks_base/0007-Add-support-for-samsung-touch-physical-and-hover-pro.patch index 55c7417..ab8762f 100644 --- a/patches_treble_phh/platform_frameworks_base/0007-Add-support-for-samsung-touch-physical-and-hover-pro.patch +++ b/patches_treble_phh/platform_frameworks_base/0007-Add-support-for-samsung-touch-physical-and-hover-pro.patch @@ -1,7 +1,7 @@ -From c2c21c01856fc410d196633429f22535957a0d0f Mon Sep 17 00:00:00 2001 +From 6e0b073e00185711c140252a1e178a91ba307716 Mon Sep 17 00:00:00 2001 From: Pierre-Hugues Husson Date: Mon, 12 Aug 2019 23:08:26 +0200 -Subject: [PATCH 07/33] Add support for samsung touch, physical and hover +Subject: [PATCH 07/34] Add support for samsung touch, physical and hover proximity sensor as fallback to real proximity sensor Change-Id: I7a0f8b4665c802140d19197d850b77b2a7ac1865 @@ -10,10 +10,10 @@ Change-Id: I7a0f8b4665c802140d19197d850b77b2a7ac1865 1 file changed, 35 insertions(+) diff --git a/services/core/java/com/android/server/display/DisplayPowerController.java b/services/core/java/com/android/server/display/DisplayPowerController.java -index 171fdfa5ca6d..abf4d20a1cf5 100644 +index 6ba1ed4dabf8..4909681eed48 100644 --- a/services/core/java/com/android/server/display/DisplayPowerController.java +++ b/services/core/java/com/android/server/display/DisplayPowerController.java -@@ -1744,6 +1744,27 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call +@@ -1756,6 +1756,27 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call ? Sensor.TYPE_PROXIMITY : SensorUtils.NO_FALLBACK; mProximitySensor = SensorUtils.findSensor(mSensorManager, proxSensor.type, proxSensor.name, fallbackType); @@ -41,7 +41,7 @@ index 171fdfa5ca6d..abf4d20a1cf5 100644 if (mProximitySensor != null) { mProximityThreshold = Math.min(mProximitySensor.getMaximumRange(), TYPICAL_PROXIMITY_THRESHOLD); -@@ -2516,6 +2537,20 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call +@@ -2528,6 +2549,20 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call public void onSensorChanged(SensorEvent event) { if (mProximitySensorEnabled) { final long time = SystemClock.uptimeMillis(); diff --git a/patches_treble_phh/platform_frameworks_base/0008-Always-allow-overriding-the-number-of-work-profiles.patch b/patches_treble_phh/platform_frameworks_base/0008-Always-allow-overriding-the-number-of-work-profiles.patch index eab0d90..de103d2 100644 --- a/patches_treble_phh/platform_frameworks_base/0008-Always-allow-overriding-the-number-of-work-profiles.patch +++ b/patches_treble_phh/platform_frameworks_base/0008-Always-allow-overriding-the-number-of-work-profiles.patch @@ -1,7 +1,7 @@ -From 0e304464a29e1905e64bceb63638b1a946d80720 Mon Sep 17 00:00:00 2001 +From a1921c5aab9f324070cb606cd510850580e5cce8 Mon Sep 17 00:00:00 2001 From: Pierre-Hugues Husson Date: Sun, 5 Apr 2020 16:32:46 +0200 -Subject: [PATCH 08/33] Always allow overriding the number of work profiles +Subject: [PATCH 08/34] Always allow overriding the number of work profiles Change-Id: I6eb09aa71663c6fbe7563e3038bffcabdba0ff6a --- diff --git a/patches_treble_phh/platform_frameworks_base/0009-HOME-deserves-to-wake-up-devices-just-as-well-as-bac.patch b/patches_treble_phh/platform_frameworks_base/0009-HOME-deserves-to-wake-up-devices-just-as-well-as-bac.patch index e9edca1..b4e9f26 100644 --- a/patches_treble_phh/platform_frameworks_base/0009-HOME-deserves-to-wake-up-devices-just-as-well-as-bac.patch +++ b/patches_treble_phh/platform_frameworks_base/0009-HOME-deserves-to-wake-up-devices-just-as-well-as-bac.patch @@ -1,7 +1,7 @@ -From 1e97292318d9af4b29d450f819f1f954232473d7 Mon Sep 17 00:00:00 2001 +From ce490f85085dc545995d8251e422e930c55e3584 Mon Sep 17 00:00:00 2001 From: Pierre-Hugues Husson Date: Sat, 6 Jun 2020 18:21:56 +0200 -Subject: [PATCH 09/33] HOME deserves to wake-up devices just as well as back +Subject: [PATCH 09/34] HOME deserves to wake-up devices just as well as back and menu Change-Id: Ia562bafd8c620d00c17e8eb338e4701c6c4a3c3a diff --git a/patches_treble_phh/platform_frameworks_base/0010-Some-devices-have-proximity-sensor-reporting-NaN-as-.patch b/patches_treble_phh/platform_frameworks_base/0010-Some-devices-have-proximity-sensor-reporting-NaN-as-.patch index 5fcac64..9759f54 100644 --- a/patches_treble_phh/platform_frameworks_base/0010-Some-devices-have-proximity-sensor-reporting-NaN-as-.patch +++ b/patches_treble_phh/platform_frameworks_base/0010-Some-devices-have-proximity-sensor-reporting-NaN-as-.patch @@ -1,7 +1,7 @@ -From 26b1e0b7a9dd7f289d297c3af395d997efa8d4d1 Mon Sep 17 00:00:00 2001 +From 571da6c4146d34bf006fe8aa32e00c2f6f1c46e5 Mon Sep 17 00:00:00 2001 From: Pierre-Hugues Husson Date: Tue, 29 Sep 2020 22:39:47 +0200 -Subject: [PATCH 10/33] Some devices have proximity sensor reporting NaN as max +Subject: [PATCH 10/34] Some devices have proximity sensor reporting NaN as max range for some reason. Make them behave standard way by setting 5 cm Change-Id: I3c39e3e914a05903c140235702e0480d2d58a612 @@ -10,10 +10,10 @@ Change-Id: I3c39e3e914a05903c140235702e0480d2d58a612 1 file changed, 3 insertions(+) diff --git a/services/core/java/com/android/server/display/DisplayPowerController.java b/services/core/java/com/android/server/display/DisplayPowerController.java -index abf4d20a1cf5..5f7fd1b23df4 100644 +index 4909681eed48..4599e57d1cb5 100644 --- a/services/core/java/com/android/server/display/DisplayPowerController.java +++ b/services/core/java/com/android/server/display/DisplayPowerController.java -@@ -1768,6 +1768,9 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call +@@ -1780,6 +1780,9 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call if (mProximitySensor != null) { mProximityThreshold = Math.min(mProximitySensor.getMaximumRange(), TYPICAL_PROXIMITY_THRESHOLD); diff --git a/patches_treble_phh/platform_frameworks_base/0011-Fix-brightness-range-not-being-complete-on-Samsung-d.patch b/patches_treble_phh/platform_frameworks_base/0011-Fix-brightness-range-not-being-complete-on-Samsung-d.patch index 2a46d16..6a621ae 100644 --- a/patches_treble_phh/platform_frameworks_base/0011-Fix-brightness-range-not-being-complete-on-Samsung-d.patch +++ b/patches_treble_phh/platform_frameworks_base/0011-Fix-brightness-range-not-being-complete-on-Samsung-d.patch @@ -1,7 +1,7 @@ -From e0837f217283c60aff22b83e43823e1411b05428 Mon Sep 17 00:00:00 2001 +From 3bc662b68a1064b756cb302c0f73c71f6cceb94c Mon Sep 17 00:00:00 2001 From: Pierre-Hugues Husson Date: Tue, 29 Sep 2020 22:40:10 +0200 -Subject: [PATCH 11/33] Fix brightness range not being complete on Samsung +Subject: [PATCH 11/34] Fix brightness range not being complete on Samsung devices On some devices, minimum brightness is 0, which totally messes with diff --git a/patches_treble_phh/platform_frameworks_base/0012-Re-implement-fnmatch-like-behaviour-for-RRO-java-sid.patch b/patches_treble_phh/platform_frameworks_base/0012-Re-implement-fnmatch-like-behaviour-for-RRO-java-sid.patch index 52cc718..991aaca 100644 --- a/patches_treble_phh/platform_frameworks_base/0012-Re-implement-fnmatch-like-behaviour-for-RRO-java-sid.patch +++ b/patches_treble_phh/platform_frameworks_base/0012-Re-implement-fnmatch-like-behaviour-for-RRO-java-sid.patch @@ -1,7 +1,7 @@ -From 1b94ddc6fc561f136a7e73d06b5dcdb674700270 Mon Sep 17 00:00:00 2001 +From db2f66125bf0093215cfd37633865e5bf55bd84f Mon Sep 17 00:00:00 2001 From: Pierre-Hugues Husson Date: Sun, 25 Oct 2020 23:57:26 +0100 -Subject: [PATCH 12/33] Re-implement fnmatch-like behaviour for RRO java-side +Subject: [PATCH 12/34] Re-implement fnmatch-like behaviour for RRO java-side Change-Id: Id38292a9a1453aa87b8401c1fdb390fa4e63c7d1 --- diff --git a/patches_treble_phh/platform_frameworks_base/0013-Make-rounded-corners-padding-overridable-with-persis.patch b/patches_treble_phh/platform_frameworks_base/0013-Make-rounded-corners-padding-overridable-with-persis.patch index 62fa232..52e09f8 100644 --- a/patches_treble_phh/platform_frameworks_base/0013-Make-rounded-corners-padding-overridable-with-persis.patch +++ b/patches_treble_phh/platform_frameworks_base/0013-Make-rounded-corners-padding-overridable-with-persis.patch @@ -1,7 +1,7 @@ -From 1d4a485384d3089b720ef47f8941fa2a7fae4708 Mon Sep 17 00:00:00 2001 +From 903e15083b4607878f016ea87a65a36cc845c044 Mon Sep 17 00:00:00 2001 From: Pierre-Hugues Husson Date: Sun, 6 Dec 2020 12:20:08 +0100 -Subject: [PATCH 13/33] Make rounded corners padding overridable with +Subject: [PATCH 13/34] Make rounded corners padding overridable with persist.sys.phh.rounded_corners_padding Change-Id: I481c1c8849b2f22a7cdfb2896a6d3c2e7e3b44d9 @@ -12,7 +12,7 @@ Change-Id: I481c1c8849b2f22a7cdfb2896a6d3c2e7e3b44d9 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java b/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java -index 8e0b413209ec..60a5df0665e7 100644 +index 22bbb79734e1..ec31c4cd942b 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java +++ b/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java @@ -22,6 +22,7 @@ import android.content.res.Configuration; diff --git a/patches_treble_phh/platform_frameworks_base/0014-Remove-useless-notification-about-console-service-be.patch b/patches_treble_phh/platform_frameworks_base/0014-Remove-useless-notification-about-console-service-be.patch index 571789e..4225a34 100644 --- a/patches_treble_phh/platform_frameworks_base/0014-Remove-useless-notification-about-console-service-be.patch +++ b/patches_treble_phh/platform_frameworks_base/0014-Remove-useless-notification-about-console-service-be.patch @@ -1,7 +1,7 @@ -From 2d0bba690d67b91bf1fd6b73eade6200c131daa8 Mon Sep 17 00:00:00 2001 +From 28c5d8d82b0335a4c637b5684ef1f4d27b11abac Mon Sep 17 00:00:00 2001 From: Pierre-Hugues Husson Date: Fri, 11 Dec 2020 14:41:09 +0100 -Subject: [PATCH 14/33] Remove useless notification about "console" service +Subject: [PATCH 14/34] Remove useless notification about "console" service being running --- @@ -9,10 +9,10 @@ Subject: [PATCH 14/33] Remove useless notification about "console" service 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java -index 330d2ddc0a94..b2c86b89ccb0 100644 +index f5103df80d6a..86299c2938fd 100644 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java -@@ -4801,7 +4801,7 @@ public class ActivityManagerService extends IActivityManager.Stub +@@ -4802,7 +4802,7 @@ public class ActivityManagerService extends IActivityManager.Stub } private void showConsoleNotificationIfActive() { diff --git a/patches_treble_phh/platform_frameworks_base/0015-Revert-Remove-unused-SystemProperties.set.patch b/patches_treble_phh/platform_frameworks_base/0015-Revert-Remove-unused-SystemProperties.set.patch index b5cedfa..b1722ef 100644 --- a/patches_treble_phh/platform_frameworks_base/0015-Revert-Remove-unused-SystemProperties.set.patch +++ b/patches_treble_phh/platform_frameworks_base/0015-Revert-Remove-unused-SystemProperties.set.patch @@ -1,7 +1,7 @@ -From a6a8d7d07f710e3156ef1b3143834b23eda0e3b3 Mon Sep 17 00:00:00 2001 +From 4665e03509959f366534406fb4cfdf28d8232082 Mon Sep 17 00:00:00 2001 From: Peter Cai Date: Wed, 16 Dec 2020 21:24:12 +0800 -Subject: [PATCH 15/33] Revert "Remove unused SystemProperties.set" +Subject: [PATCH 15/34] Revert "Remove unused SystemProperties.set" This reverts commit debb4616ef67f9ed5054eca51ec58592358ff55f. diff --git a/patches_treble_phh/platform_frameworks_base/0016-TelephonyManager-bring-back-getNetworkClass.patch b/patches_treble_phh/platform_frameworks_base/0016-TelephonyManager-bring-back-getNetworkClass.patch index 8cdb08f..082168f 100644 --- a/patches_treble_phh/platform_frameworks_base/0016-TelephonyManager-bring-back-getNetworkClass.patch +++ b/patches_treble_phh/platform_frameworks_base/0016-TelephonyManager-bring-back-getNetworkClass.patch @@ -1,7 +1,7 @@ -From f18c5862688e3875aab0144c6d657708470175b9 Mon Sep 17 00:00:00 2001 +From f81875d580a5451a6ad846e9f7b214af394fca10 Mon Sep 17 00:00:00 2001 From: Peter Cai Date: Wed, 16 Dec 2020 13:46:15 +0800 -Subject: [PATCH 16/33] TelephonyManager: bring back getNetworkClass() +Subject: [PATCH 16/34] TelephonyManager: bring back getNetworkClass() This partially reverts commit c058cac051ab083dc7fb7ea6aa85699110b2e9bf. diff --git a/patches_treble_phh/platform_frameworks_base/0017-TelephonyManager-add-API-annotations-for-setTelephon.patch b/patches_treble_phh/platform_frameworks_base/0017-TelephonyManager-add-API-annotations-for-setTelephon.patch index 20086bd..ed56e5a 100644 --- a/patches_treble_phh/platform_frameworks_base/0017-TelephonyManager-add-API-annotations-for-setTelephon.patch +++ b/patches_treble_phh/platform_frameworks_base/0017-TelephonyManager-add-API-annotations-for-setTelephon.patch @@ -1,7 +1,7 @@ -From 5a73b02dbc2b956482709865dd6e2140496a669b Mon Sep 17 00:00:00 2001 +From 9cfd0056138cd06fc983d40c51ee0af4b7d898e5 Mon Sep 17 00:00:00 2001 From: Peter Cai Date: Wed, 16 Dec 2020 21:26:45 +0800 -Subject: [PATCH 17/33] TelephonyManager: add API annotations for +Subject: [PATCH 17/34] TelephonyManager: add API annotations for setTelephonyProperty * This method was added back by reverting commit diff --git a/patches_treble_phh/platform_frameworks_base/0018-Fix-Wakelock-issue.patch b/patches_treble_phh/platform_frameworks_base/0018-Fix-Wakelock-issue.patch index 477651b..a0f3d80 100644 --- a/patches_treble_phh/platform_frameworks_base/0018-Fix-Wakelock-issue.patch +++ b/patches_treble_phh/platform_frameworks_base/0018-Fix-Wakelock-issue.patch @@ -1,7 +1,7 @@ -From fd7520b8edfd852c64867282e0d12f8b4cbc33b1 Mon Sep 17 00:00:00 2001 +From b8d27a58aba6540dd1ae28b395ed0057f378ebac Mon Sep 17 00:00:00 2001 From: Alberto Ponces Date: Tue, 2 Feb 2021 10:20:51 +0000 -Subject: [PATCH 18/33] Fix Wakelock issue +Subject: [PATCH 18/34] Fix Wakelock issue Prevent SystemUI crash due to "WakeLock under-locked Doze" (issue #12) by only releasing a wakelock that was not already released --- diff --git a/patches_treble_phh/platform_frameworks_base/0019-Automatically-detect-pick-up-sensor-so-that-an-overl.patch b/patches_treble_phh/platform_frameworks_base/0019-Automatically-detect-pick-up-sensor-so-that-an-overl.patch index 31e6e9e..a9d7a54 100644 --- a/patches_treble_phh/platform_frameworks_base/0019-Automatically-detect-pick-up-sensor-so-that-an-overl.patch +++ b/patches_treble_phh/platform_frameworks_base/0019-Automatically-detect-pick-up-sensor-so-that-an-overl.patch @@ -1,7 +1,7 @@ -From 84b5f050a8fe593d4c285014c0b39dcb3b76b2af Mon Sep 17 00:00:00 2001 +From 1a2afede98bcc9875f9a13c34db17c1354ce47c2 Mon Sep 17 00:00:00 2001 From: Pierre-Hugues Husson Date: Sat, 20 Mar 2021 14:31:01 +0100 -Subject: [PATCH 19/33] Automatically detect pick up sensor, so that an overlay +Subject: [PATCH 19/34] Automatically detect pick up sensor, so that an overlay is required for the sole purpose of enabling pulse doze on pick up sensor --- diff --git a/patches_treble_phh/platform_frameworks_base/0020-Catch-broken-mainBuiltInDisplayCutoutRectApproximati.patch b/patches_treble_phh/platform_frameworks_base/0020-Catch-broken-mainBuiltInDisplayCutoutRectApproximati.patch index b468a84..92e1e41 100644 --- a/patches_treble_phh/platform_frameworks_base/0020-Catch-broken-mainBuiltInDisplayCutoutRectApproximati.patch +++ b/patches_treble_phh/platform_frameworks_base/0020-Catch-broken-mainBuiltInDisplayCutoutRectApproximati.patch @@ -1,7 +1,7 @@ -From 323b26d91a1ee03a7cb5d80bf3d678b4a07d1d1c Mon Sep 17 00:00:00 2001 +From af7e41ec724143b04785f4660830d3beca00a67d Mon Sep 17 00:00:00 2001 From: Pierre-Hugues Husson Date: Tue, 23 Mar 2021 19:43:26 +0100 -Subject: [PATCH 20/33] Catch broken mainBuiltInDisplayCutoutRectApproximation +Subject: [PATCH 20/34] Catch broken mainBuiltInDisplayCutoutRectApproximation Some devices (Redmi Note 9T) have: mainBuiltInDisplayCutoutRectApproximation = @android:mainBuiltInDisplayCutout diff --git a/patches_treble_phh/platform_frameworks_base/0021-backlight-Fix-backlight-control-on-Galaxy-S9.patch b/patches_treble_phh/platform_frameworks_base/0021-backlight-Fix-backlight-control-on-Galaxy-S9.patch index fef081d..110fcf3 100644 --- a/patches_treble_phh/platform_frameworks_base/0021-backlight-Fix-backlight-control-on-Galaxy-S9.patch +++ b/patches_treble_phh/platform_frameworks_base/0021-backlight-Fix-backlight-control-on-Galaxy-S9.patch @@ -1,7 +1,7 @@ -From 82d865e76a3d19d9cc2749bc4d4ea444f526d6ca Mon Sep 17 00:00:00 2001 +From 63f14179ce66d6d90e4f0c761ce65aea9990edf0 Mon Sep 17 00:00:00 2001 From: Pierre-Hugues Husson Date: Sat, 24 Mar 2018 08:01:48 +0100 -Subject: [PATCH 21/33] backlight: Fix backlight control on Galaxy S9(+) +Subject: [PATCH 21/34] backlight: Fix backlight control on Galaxy S9(+) Change-Id: I1fbbb47939c377597ef8ad6b88b2acea5f4acaa6 diff --git a/patches_treble_phh/platform_frameworks_base/0022-Add-support-for-app-signature-spoofing.patch b/patches_treble_phh/platform_frameworks_base/0022-Add-support-for-app-signature-spoofing.patch index 7263b6c..db20edb 100644 --- a/patches_treble_phh/platform_frameworks_base/0022-Add-support-for-app-signature-spoofing.patch +++ b/patches_treble_phh/platform_frameworks_base/0022-Add-support-for-app-signature-spoofing.patch @@ -1,7 +1,7 @@ -From f20085c942cc67e25ee5f14e9b4f350b03e6ef87 Mon Sep 17 00:00:00 2001 +From cbe318400deeffacb90598fe09b3219bc99cce12 Mon Sep 17 00:00:00 2001 From: Danny Lin Date: Sat, 16 Oct 2021 05:27:57 -0700 -Subject: [PATCH 22/33] Add support for app signature spoofing +Subject: [PATCH 22/34] Add support for app signature spoofing This is needed by microG GmsCore to pretend to be the official Google Play Services package, because client apps check the package signature @@ -56,10 +56,10 @@ index 1dd401d04e2b..ada2c59ff24c 100644 field public static final String MICROPHONE = "android.permission-group.MICROPHONE"; field public static final String NEARBY_DEVICES = "android.permission-group.NEARBY_DEVICES"; diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml -index 030310406949..a7e5ee11cc10 100644 +index cb6ef5a8f1ae..896c89bc5f50 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml -@@ -3202,6 +3202,21 @@ +@@ -3203,6 +3203,21 @@ android:description="@string/permdesc_getPackageSize" android:protectionLevel="normal" /> @@ -105,7 +105,7 @@ index 166d6abd1809..cba87ff17600 100644 disable or modify status bar diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java -index 1e001c598987..61a303fcee22 100644 +index 243c0c9c14e2..2e50e2e91ef2 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java @@ -3330,6 +3330,29 @@ public class PackageManagerService extends IPackageManager.Stub diff --git a/patches_treble_phh/platform_frameworks_base/0023-Revert-Switch-long-press-power-behavior-in-AOSP.patch b/patches_treble_phh/platform_frameworks_base/0023-Revert-Switch-long-press-power-behavior-in-AOSP.patch index f27a50f..b110ec0 100644 --- a/patches_treble_phh/platform_frameworks_base/0023-Revert-Switch-long-press-power-behavior-in-AOSP.patch +++ b/patches_treble_phh/platform_frameworks_base/0023-Revert-Switch-long-press-power-behavior-in-AOSP.patch @@ -1,7 +1,7 @@ -From c9dbe8146db94cd49c6a7034b57dbc70bb90e46d Mon Sep 17 00:00:00 2001 +From 0211bab53d095a751cdbe0bd670429c8ffca5a10 Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Sat, 4 Sep 2021 08:26:30 +0000 -Subject: [PATCH 23/33] Revert "Switch long-press power behavior in AOSP." +Subject: [PATCH 23/34] Revert "Switch long-press power behavior in AOSP." This reverts commit 803c77a0a24624111944832098c6f65158051dc4. --- @@ -9,7 +9,7 @@ This reverts commit 803c77a0a24624111944832098c6f65158051dc4. 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml -index 7305ccc93e93..e2216d23e15e 100644 +index 07367aee8f5c..e502765617af 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -978,7 +978,7 @@ diff --git a/patches_treble_phh/platform_frameworks_base/0024-Reduce-the-size-of-udfps-enroll-progress-bar.-Some-d.patch b/patches_treble_phh/platform_frameworks_base/0024-Reduce-the-size-of-udfps-enroll-progress-bar.-Some-d.patch index a9c989b..d208408 100644 --- a/patches_treble_phh/platform_frameworks_base/0024-Reduce-the-size-of-udfps-enroll-progress-bar.-Some-d.patch +++ b/patches_treble_phh/platform_frameworks_base/0024-Reduce-the-size-of-udfps-enroll-progress-bar.-Some-d.patch @@ -1,7 +1,7 @@ -From fecdff7eb4527d68556c283bfb6fc214f0987e83 Mon Sep 17 00:00:00 2001 +From c28cb3664b5d40ed44f676fe1e00b5123483f1b8 Mon Sep 17 00:00:00 2001 From: Pierre-Hugues Husson Date: Fri, 17 Dec 2021 17:16:14 -0500 -Subject: [PATCH 24/33] Reduce the size of udfps enroll progress bar. Some +Subject: [PATCH 24/34] Reduce the size of udfps enroll progress bar. Some devices have their udfps pretty low, and the progress bar would make the icon at the wrong place @@ -11,7 +11,7 @@ Change-Id: I1609ad9ca316293dcaaf07f7e681d11aadfcd29c 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/SystemUI/res/values/config.xml b/packages/SystemUI/res/values/config.xml -index a41418102c90..6ccabf226772 100644 +index 636413c5d2d8..53523e3f4f5a 100644 --- a/packages/SystemUI/res/values/config.xml +++ b/packages/SystemUI/res/values/config.xml @@ -592,7 +592,7 @@ diff --git a/patches_treble_phh/platform_frameworks_base/0025-Add-UDFPS-support-for-various-devices.patch b/patches_treble_phh/platform_frameworks_base/0025-Add-UDFPS-support-for-various-devices.patch index 8b2b9b4..d27af3a 100644 --- a/patches_treble_phh/platform_frameworks_base/0025-Add-UDFPS-support-for-various-devices.patch +++ b/patches_treble_phh/platform_frameworks_base/0025-Add-UDFPS-support-for-various-devices.patch @@ -1,7 +1,7 @@ -From c0a26634b7f0c7803be78afda76ba35b61d6f5dc Mon Sep 17 00:00:00 2001 +From 2198ae080c58104b05afe5be31276444e3c766ec Mon Sep 17 00:00:00 2001 From: Pierre-Hugues Husson Date: Sun, 19 Dec 2021 17:08:22 -0500 -Subject: [PATCH 25/33] Add UDFPS support for various devices +Subject: [PATCH 25/34] Add UDFPS support for various devices Successfully tested on Galaxy A51, Xiaomi Mi 9, and OnePlus Nord 2 diff --git a/patches_treble_phh/platform_frameworks_base/0026-Dynamically-resize-boot-animation-to-match-screen-si.patch b/patches_treble_phh/platform_frameworks_base/0026-Dynamically-resize-boot-animation-to-match-screen-si.patch index afbc8d3..ab5f3c6 100644 --- a/patches_treble_phh/platform_frameworks_base/0026-Dynamically-resize-boot-animation-to-match-screen-si.patch +++ b/patches_treble_phh/platform_frameworks_base/0026-Dynamically-resize-boot-animation-to-match-screen-si.patch @@ -1,7 +1,7 @@ -From fed8b0ec9d0e831ae4ce7c4236d98576fe023148 Mon Sep 17 00:00:00 2001 +From c693acbc7bbf03fa4791aea1334cd7e2c91f22cf Mon Sep 17 00:00:00 2001 From: Pierre-Hugues Husson Date: Mon, 20 Dec 2021 15:01:41 -0500 -Subject: [PATCH 26/33] Dynamically resize boot animation to match screen size +Subject: [PATCH 26/34] Dynamically resize boot animation to match screen size Change-Id: I54e49fc6b8c670103852e212d1416e27ff976205 --- diff --git a/patches_treble_phh/platform_frameworks_base/0027-Once-we-integrate-Samsung-Power-hal-in-libpowermanag.patch b/patches_treble_phh/platform_frameworks_base/0027-Once-we-integrate-Samsung-Power-hal-in-libpowermanag.patch index cb7ce2b..09481ed 100644 --- a/patches_treble_phh/platform_frameworks_base/0027-Once-we-integrate-Samsung-Power-hal-in-libpowermanag.patch +++ b/patches_treble_phh/platform_frameworks_base/0027-Once-we-integrate-Samsung-Power-hal-in-libpowermanag.patch @@ -1,7 +1,7 @@ -From 7866d0de9feb99616ce229e923541bd8928d01d6 Mon Sep 17 00:00:00 2001 +From 7fe680986fa9203326f7ba806f8aea809b9da568 Mon Sep 17 00:00:00 2001 From: Pierre-Hugues Husson Date: Mon, 27 Dec 2021 17:57:11 -0500 -Subject: [PATCH 27/33] Once we integrate Samsung Power hal in libpowermanager, +Subject: [PATCH 27/34] Once we integrate Samsung Power hal in libpowermanager, libpowermanager and its deps require linking against vendor.samsung.hardware.miscpower@2.0 diff --git a/patches_treble_phh/platform_frameworks_base/0028-Add-persist.sys.phh.ultrasonic_udfps-property-to-dis.patch b/patches_treble_phh/platform_frameworks_base/0028-Add-persist.sys.phh.ultrasonic_udfps-property-to-dis.patch index 708a6b5..1c9a004 100644 --- a/patches_treble_phh/platform_frameworks_base/0028-Add-persist.sys.phh.ultrasonic_udfps-property-to-dis.patch +++ b/patches_treble_phh/platform_frameworks_base/0028-Add-persist.sys.phh.ultrasonic_udfps-property-to-dis.patch @@ -1,7 +1,7 @@ -From 36ba1df150d83e6967e66b45d82564fae7016f5f Mon Sep 17 00:00:00 2001 +From 195b5e1fcbd7d6b50661e442594d879466aa70dc Mon Sep 17 00:00:00 2001 From: Pierre-Hugues Husson Date: Thu, 3 Mar 2022 09:15:32 -0500 -Subject: [PATCH 28/33] Add persist.sys.phh.ultrasonic_udfps property to +Subject: [PATCH 28/34] Add persist.sys.phh.ultrasonic_udfps property to disable green circle for udfps --- diff --git a/patches_treble_phh/platform_frameworks_base/0029-Allow-128bits-SHA1-IPSec-keys.-This-is-required-to-i.patch b/patches_treble_phh/platform_frameworks_base/0029-Allow-128bits-SHA1-IPSec-keys.-This-is-required-to-i.patch index 8a372e6..854bf70 100644 --- a/patches_treble_phh/platform_frameworks_base/0029-Allow-128bits-SHA1-IPSec-keys.-This-is-required-to-i.patch +++ b/patches_treble_phh/platform_frameworks_base/0029-Allow-128bits-SHA1-IPSec-keys.-This-is-required-to-i.patch @@ -1,7 +1,7 @@ -From b704b4313ed6157ed22d134a65acd6444e5b4ac8 Mon Sep 17 00:00:00 2001 +From 01e72e754b9f7189a9d0a3784613c4f647eaba3e Mon Sep 17 00:00:00 2001 From: Pierre-Hugues Husson Date: Thu, 3 Mar 2022 09:17:17 -0500 -Subject: [PATCH 29/33] Allow 128bits SHA1 IPSec keys. This is required to +Subject: [PATCH 29/34] Allow 128bits SHA1 IPSec keys. This is required to implement VoLTE with this API --- diff --git a/patches_treble_phh/platform_frameworks_base/0030-Fix-FOD-on-ZF8.patch b/patches_treble_phh/platform_frameworks_base/0030-Fix-FOD-on-ZF8.patch index 4a93583..5b9c71c 100644 --- a/patches_treble_phh/platform_frameworks_base/0030-Fix-FOD-on-ZF8.patch +++ b/patches_treble_phh/platform_frameworks_base/0030-Fix-FOD-on-ZF8.patch @@ -1,7 +1,7 @@ -From 0d1dd110b3668b355c6da4dcbc74816786cc02ec Mon Sep 17 00:00:00 2001 +From 64c4108f091f8a3749c5d43cd1bcbd4919c10bde Mon Sep 17 00:00:00 2001 From: Pierre-Hugues Husson Date: Fri, 4 Mar 2022 19:26:53 -0500 -Subject: [PATCH 30/33] Fix FOD on ZF8 +Subject: [PATCH 30/34] Fix FOD on ZF8 Goodix HAL expects events in this order: - Fingerprint down when touchscreen says fp down diff --git a/patches_treble_phh/platform_frameworks_base/0031-Allow-disabling-of-fingerprint-cleanups-needed-on-so.patch b/patches_treble_phh/platform_frameworks_base/0031-Allow-disabling-of-fingerprint-cleanups-needed-on-so.patch index 89ff33e..d7bd511 100644 --- a/patches_treble_phh/platform_frameworks_base/0031-Allow-disabling-of-fingerprint-cleanups-needed-on-so.patch +++ b/patches_treble_phh/platform_frameworks_base/0031-Allow-disabling-of-fingerprint-cleanups-needed-on-so.patch @@ -1,7 +1,7 @@ -From d598259994a1a283acf0605f63f0891765efbe57 Mon Sep 17 00:00:00 2001 +From b5b9e2e933acf5eb85fcbabc9809e46a15ea472f Mon Sep 17 00:00:00 2001 From: Pierre-Hugues Husson Date: Sat, 2 Apr 2022 18:04:01 -0400 -Subject: [PATCH 31/33] Allow disabling of fingerprint cleanups, needed on some +Subject: [PATCH 31/34] Allow disabling of fingerprint cleanups, needed on some Realme devices that cant enumerate --- @@ -9,10 +9,10 @@ Subject: [PATCH 31/33] Allow disabling of fingerprint cleanups, needed on some 1 file changed, 2 insertions(+) diff --git a/services/core/java/com/android/server/biometrics/sensors/fingerprint/hidl/Fingerprint21.java b/services/core/java/com/android/server/biometrics/sensors/fingerprint/hidl/Fingerprint21.java -index 5f2f4cf6ef3c..29fe37138137 100644 +index 6feb5fa418bb..f2e5d77dec63 100644 --- a/services/core/java/com/android/server/biometrics/sensors/fingerprint/hidl/Fingerprint21.java +++ b/services/core/java/com/android/server/biometrics/sensors/fingerprint/hidl/Fingerprint21.java -@@ -694,6 +694,8 @@ public class Fingerprint21 implements IHwBinder.DeathRecipient, ServiceProvider +@@ -700,6 +700,8 @@ public class Fingerprint21 implements IHwBinder.DeathRecipient, ServiceProvider private void scheduleInternalCleanup(int userId, @Nullable BaseClientMonitor.Callback callback) { diff --git a/patches_treble_phh/platform_frameworks_base/0032-Switch-FOD-to-WHITE.patch b/patches_treble_phh/platform_frameworks_base/0032-Switch-FOD-to-WHITE.patch index 104b7f7..97d8b27 100644 --- a/patches_treble_phh/platform_frameworks_base/0032-Switch-FOD-to-WHITE.patch +++ b/patches_treble_phh/platform_frameworks_base/0032-Switch-FOD-to-WHITE.patch @@ -1,7 +1,7 @@ -From 779a85d010dfef34500e3f1e35513d87fedc6073 Mon Sep 17 00:00:00 2001 +From 7c9b59bc486787484262f180bce4a4b06e7e55df Mon Sep 17 00:00:00 2001 From: Pierre-Hugues Husson Date: Mon, 2 May 2022 18:02:25 -0400 -Subject: [PATCH 32/33] Switch FOD to WHITE +Subject: [PATCH 32/34] Switch FOD to WHITE --- .../src/com/android/systemui/biometrics/UdfpsSurfaceView.java | 2 +- diff --git a/patches_treble_phh/platform_frameworks_base/0033-Support-samsung-ultrasonic-udfps.patch b/patches_treble_phh/platform_frameworks_base/0033-Support-samsung-ultrasonic-udfps.patch index e5f35c5..f6a7536 100644 --- a/patches_treble_phh/platform_frameworks_base/0033-Support-samsung-ultrasonic-udfps.patch +++ b/patches_treble_phh/platform_frameworks_base/0033-Support-samsung-ultrasonic-udfps.patch @@ -1,7 +1,7 @@ -From a0dff1c926402da7b867d7d96ce596439d94023c Mon Sep 17 00:00:00 2001 +From 22702d6ae549ab2268e4de57a48e078bd0d86eff Mon Sep 17 00:00:00 2001 From: Pierre-Hugues Husson Date: Mon, 2 May 2022 18:02:40 -0400 -Subject: [PATCH 33/33] Support samsung ultrasonic udfps +Subject: [PATCH 33/34] Support samsung ultrasonic udfps --- .../systemui/biometrics/UdfpsView.java | 4 +++- diff --git a/patches_treble_phh/platform_frameworks_base/0034-Allow-FOD-color-to-be-customized-with-persist.sys.ph.patch b/patches_treble_phh/platform_frameworks_base/0034-Allow-FOD-color-to-be-customized-with-persist.sys.ph.patch new file mode 100644 index 0000000..075c69b --- /dev/null +++ b/patches_treble_phh/platform_frameworks_base/0034-Allow-FOD-color-to-be-customized-with-persist.sys.ph.patch @@ -0,0 +1,47 @@ +From 3cc1c4d087c4a7c0de08d6aa07a8fe92fbf9e121 Mon Sep 17 00:00:00 2001 +From: Pierre-Hugues Husson +Date: Thu, 9 Jun 2022 14:08:46 -0400 +Subject: [PATCH 34/34] Allow FOD color to be customized with + persist.sys.phh.fod_color + +--- + .../systemui/biometrics/UdfpsSurfaceView.java | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsSurfaceView.java b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsSurfaceView.java +index 77fad35d32d4..d46f041c066c 100644 +--- a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsSurfaceView.java ++++ b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsSurfaceView.java +@@ -20,9 +20,11 @@ import android.annotation.NonNull; + import android.annotation.Nullable; + import android.content.Context; + import android.graphics.Canvas; ++import android.graphics.Color; + import android.graphics.Paint; + import android.graphics.PixelFormat; + import android.graphics.RectF; ++import android.os.SystemProperties; + import android.util.AttributeSet; + import android.util.Log; + import android.view.Surface; +@@ -69,7 +71,17 @@ public class UdfpsSurfaceView extends SurfaceView implements SurfaceHolder.Callb + + mSensorPaint = new Paint(0 /* flags */); + mSensorPaint.setAntiAlias(true); ++ String colorStr = SystemProperties.get("persist.sys.phh.fod_color", "00ff00"); + mSensorPaint.setARGB(255, 255, 255, 255); ++ try { ++ int parsedColor = Color.parseColor("#" + colorStr); ++ int r = (parsedColor >> 16) & 0xff; ++ int g = (parsedColor >> 8) & 0xff; ++ int b = (parsedColor >> 0) & 0xff; ++ mSensorPaint.setARGB(255, r, g, b); ++ } catch(Throwable t) { ++ Log.d("PHH", "Failed parsing color #" + colorStr, t); ++ } + mSensorPaint.setStyle(Paint.Style.FILL); + } + +-- +2.25.1 + diff --git a/patches_treble_prerequisite/frameworks_base/0001-Squashed-revert-of-LOS-UDFPS-changes.patch b/patches_treble_prerequisite/frameworks_base/0001-Squashed-revert-of-LOS-UDFPS-changes.patch index f4637cf..c92b6e3 100644 --- a/patches_treble_prerequisite/frameworks_base/0001-Squashed-revert-of-LOS-UDFPS-changes.patch +++ b/patches_treble_prerequisite/frameworks_base/0001-Squashed-revert-of-LOS-UDFPS-changes.patch @@ -1,7 +1,7 @@ -From 953e5c0c69a444a75f18ae8f6ff7f1614be75ce0 Mon Sep 17 00:00:00 2001 +From fbb1939f6ab28ce541cde5edfe442bfbc212c131 Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Sun, 13 Mar 2022 09:51:36 +0000 -Subject: [PATCH] Squashed revert of LOS UDFPS changes +Subject: [PATCH 1/2] Squashed revert of LOS UDFPS changes Way less than FOD, but reverting them nonetheless to keep in line with PHH AOSP @@ -123,7 +123,7 @@ index a1ec9c2bb76e..000000000000 - } -} diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsController.java b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsController.java -index e77d78acff02..3e9d6b0fa362 100644 +index 8533f356d67a..250c16c81eac 100644 --- a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsController.java +++ b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsController.java @@ -426,12 +426,7 @@ public class UdfpsController implements DozeReceiver { @@ -139,7 +139,7 @@ index e77d78acff02..3e9d6b0fa362 100644 handled = true; } if ((withinSensorArea || fromUdfpsView) && shouldTryToDismissKeyguard()) { -@@ -552,7 +547,7 @@ public class UdfpsController implements DozeReceiver { +@@ -577,7 +572,7 @@ public class UdfpsController implements DozeReceiver { @NonNull ScreenLifecycle screenLifecycle, @Nullable Vibrator vibrator, @NonNull UdfpsHapticsSimulator udfpsHapticsSimulator, @@ -148,7 +148,7 @@ index e77d78acff02..3e9d6b0fa362 100644 @NonNull KeyguardStateController keyguardStateController, @NonNull KeyguardBypassController keyguardBypassController, @NonNull DisplayManager displayManager, -@@ -581,7 +576,7 @@ public class UdfpsController implements DozeReceiver { +@@ -606,7 +601,7 @@ public class UdfpsController implements DozeReceiver { mPowerManager = powerManager; mAccessibilityManager = accessibilityManager; mLockscreenShadeTransitionController = lockscreenShadeTransitionController; @@ -157,7 +157,7 @@ index e77d78acff02..3e9d6b0fa362 100644 screenLifecycle.addObserver(mScreenObserver); mScreenOn = screenLifecycle.getScreenState() == ScreenLifecycle.SCREEN_ON; mKeyguardBypassController = keyguardBypassController; -@@ -603,7 +598,7 @@ public class UdfpsController implements DozeReceiver { +@@ -628,7 +623,7 @@ public class UdfpsController implements DozeReceiver { }); mCoreLayoutParams = new WindowManager.LayoutParams( diff --git a/patches_treble_prerequisite/frameworks_base/0002-Revert-Biometrics-Allow-disabling-of-fingerprint-cle.patch b/patches_treble_prerequisite/frameworks_base/0002-Revert-Biometrics-Allow-disabling-of-fingerprint-cle.patch new file mode 100644 index 0000000..5be94a3 --- /dev/null +++ b/patches_treble_prerequisite/frameworks_base/0002-Revert-Biometrics-Allow-disabling-of-fingerprint-cle.patch @@ -0,0 +1,47 @@ +From e590f003166adccf2aa739f86138d10054415371 Mon Sep 17 00:00:00 2001 +From: Andy CrossGate Yan +Date: Fri, 10 Jun 2022 21:33:47 +0800 +Subject: [PATCH 2/2] Revert "Biometrics: Allow disabling of fingerprint + cleanups" + +This reverts commit 87f04da03724b26f64b78e628f171e4bc4b20673. +--- + .../sensors/fingerprint/hidl/Fingerprint21.java | 8 -------- + 1 file changed, 8 deletions(-) + +diff --git a/services/core/java/com/android/server/biometrics/sensors/fingerprint/hidl/Fingerprint21.java b/services/core/java/com/android/server/biometrics/sensors/fingerprint/hidl/Fingerprint21.java +index 94fd8f80f9f8..6feb5fa418bb 100644 +--- a/services/core/java/com/android/server/biometrics/sensors/fingerprint/hidl/Fingerprint21.java ++++ b/services/core/java/com/android/server/biometrics/sensors/fingerprint/hidl/Fingerprint21.java +@@ -123,8 +123,6 @@ public class Fingerprint21 implements IHwBinder.DeathRecipient, ServiceProvider + private final int mSensorId; + private final boolean mIsPowerbuttonFps; + +- private boolean mCleanup; +- + private final class BiometricTaskStackListener extends TaskStackListener { + @Override + public void onTaskStackChanged() { +@@ -348,9 +346,6 @@ public class Fingerprint21 implements IHwBinder.DeathRecipient, ServiceProvider + mCurrentUserId = UserHandle.USER_NULL; + }); + +- mCleanup = context.getResources().getBoolean( +- org.lineageos.platform.internal.R.bool.config_cleanupUnusedFingerprints); +- + try { + ActivityManager.getService().registerUserSwitchObserver(mUserSwitchObserver, TAG); + } catch (RemoteException e) { +@@ -705,9 +700,6 @@ public class Fingerprint21 implements IHwBinder.DeathRecipient, ServiceProvider + + private void scheduleInternalCleanup(int userId, + @Nullable BaseClientMonitor.Callback callback) { +- if (!mCleanup) { +- return; +- } + mHandler.post(() -> { + scheduleUpdateActiveUserWithoutHandler(userId); + +-- +2.25.1 +