diff --git a/patches_platform/frameworks_base/0001-Add-SPenPointerOverlay.patch b/patches_platform/frameworks_base/0001-Add-SPenPointerOverlay.patch index 5d55b17..178f228 100644 --- a/patches_platform/frameworks_base/0001-Add-SPenPointerOverlay.patch +++ b/patches_platform/frameworks_base/0001-Add-SPenPointerOverlay.patch @@ -1,7 +1,7 @@ -From b94084cca9202c12ea41de9f6f23785c818a64c0 Mon Sep 17 00:00:00 2001 +From ae74e74a16845c786042581f0fae8c8685ee5be7 Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Thu, 13 Jan 2022 14:22:24 +0000 -Subject: [PATCH 01/12] Add SPenPointerOverlay +Subject: [PATCH 01/14] Add SPenPointerOverlay Toggle this overlay with property "persist.ui.spen.pointer" diff --git a/patches_platform/frameworks_base/0002-Disable-FP-lockouts-optionally.patch b/patches_platform/frameworks_base/0002-Disable-FP-lockouts-optionally.patch new file mode 100644 index 0000000..1aaa1c3 --- /dev/null +++ b/patches_platform/frameworks_base/0002-Disable-FP-lockouts-optionally.patch @@ -0,0 +1,76 @@ +From 4e591984e8f533e0ad305caf8aa03c60cd9314d0 Mon Sep 17 00:00:00 2001 +From: AndyCGYan +Date: Fri, 22 Mar 2019 00:41:20 +0800 +Subject: [PATCH 02/14] Disable FP lockouts optionally + +Both timed and permanent lockouts - GET THE FUCK OUT +Now targeting LockoutFramework, introduced in Android 12 +Now controlled by property "persist.sys.fp.lockouts.disable" + +Change-Id: I2d4b091f3546d4d7903bfb4d5585629212dc9915 +--- + .../hidl/LockoutFrameworkImpl.java | 28 +++++++++++-------- + 1 file changed, 17 insertions(+), 11 deletions(-) + +diff --git a/services/core/java/com/android/server/biometrics/sensors/fingerprint/hidl/LockoutFrameworkImpl.java b/services/core/java/com/android/server/biometrics/sensors/fingerprint/hidl/LockoutFrameworkImpl.java +index a0befea8e085..48c4ded9f5ca 100644 +--- a/services/core/java/com/android/server/biometrics/sensors/fingerprint/hidl/LockoutFrameworkImpl.java ++++ b/services/core/java/com/android/server/biometrics/sensors/fingerprint/hidl/LockoutFrameworkImpl.java +@@ -25,6 +25,7 @@ import android.content.Context; + import android.content.Intent; + import android.content.IntentFilter; + import android.os.SystemClock; ++import android.os.SystemProperties; + import android.util.Slog; + import android.util.SparseBooleanArray; + import android.util.SparseIntArray; +@@ -44,6 +45,7 @@ public class LockoutFrameworkImpl implements LockoutTracker { + private static final int MAX_FAILED_ATTEMPTS_LOCKOUT_PERMANENT = 20; + private static final long FAIL_LOCKOUT_TIMEOUT_MS = 30 * 1000; + private static final String KEY_LOCKOUT_RESET_USER = "lockout_reset_user"; ++ private static final String DISABLE_FP_LOCKOUTS_PROPERTY = "persist.sys.fp.lockouts.disable"; + + private final class LockoutReceiver extends BroadcastReceiver { + @Override +@@ -101,23 +103,27 @@ public class LockoutFrameworkImpl implements LockoutTracker { + } + + void addFailedAttemptForUser(int userId) { +- mFailedAttempts.put(userId, mFailedAttempts.get(userId, 0) + 1); +- mTimedLockoutCleared.put(userId, false); ++ if (!SystemProperties.getBoolean(DISABLE_FP_LOCKOUTS_PROPERTY, false)) { ++ mFailedAttempts.put(userId, mFailedAttempts.get(userId, 0) + 1); ++ mTimedLockoutCleared.put(userId, false); + +- if (getLockoutModeForUser(userId) != LOCKOUT_NONE) { +- scheduleLockoutResetForUser(userId); ++ if (getLockoutModeForUser(userId) != LOCKOUT_NONE) { ++ scheduleLockoutResetForUser(userId); ++ } + } + } + + @Override + public @LockoutMode int getLockoutModeForUser(int userId) { +- final int failedAttempts = mFailedAttempts.get(userId, 0); +- if (failedAttempts >= MAX_FAILED_ATTEMPTS_LOCKOUT_PERMANENT) { +- return LOCKOUT_PERMANENT; +- } else if (failedAttempts > 0 +- && !mTimedLockoutCleared.get(userId, false) +- && (failedAttempts % MAX_FAILED_ATTEMPTS_LOCKOUT_TIMED == 0)) { +- return LOCKOUT_TIMED; ++ if (!SystemProperties.getBoolean(DISABLE_FP_LOCKOUTS_PROPERTY, false)) { ++ final int failedAttempts = mFailedAttempts.get(userId, 0); ++ if (failedAttempts >= MAX_FAILED_ATTEMPTS_LOCKOUT_PERMANENT) { ++ return LOCKOUT_PERMANENT; ++ } else if (failedAttempts > 0 ++ && !mTimedLockoutCleared.get(userId, false) ++ && (failedAttempts % MAX_FAILED_ATTEMPTS_LOCKOUT_TIMED == 0)) { ++ return LOCKOUT_TIMED; ++ } + } + return LOCKOUT_NONE; + } +-- +2.25.1 + diff --git a/patches_platform/frameworks_base/0002-Disable-vendor-mismatch-warning.patch b/patches_platform/frameworks_base/0003-Disable-vendor-mismatch-warning.patch similarity index 89% rename from patches_platform/frameworks_base/0002-Disable-vendor-mismatch-warning.patch rename to patches_platform/frameworks_base/0003-Disable-vendor-mismatch-warning.patch index 1b12f9d..8595015 100644 --- a/patches_platform/frameworks_base/0002-Disable-vendor-mismatch-warning.patch +++ b/patches_platform/frameworks_base/0003-Disable-vendor-mismatch-warning.patch @@ -1,7 +1,7 @@ -From 5d4c54f6956862135a6066f4c0e322690145cce8 Mon Sep 17 00:00:00 2001 +From 3b4a0dc39f8d03ddac9c45fd3e7fc4577334a645 Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Thu, 5 Apr 2018 10:01:19 +0800 -Subject: [PATCH 02/12] Disable vendor mismatch warning +Subject: [PATCH 03/14] Disable vendor mismatch warning Change-Id: Ieb8fe91e2f02462f074312ed0f4885d183e9780b --- @@ -9,10 +9,10 @@ Change-Id: Ieb8fe91e2f02462f074312ed0f4885d183e9780b 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java -index 43b66d181326..1f0d60cf3a38 100644 +index 01490f029e97..6199267cac0b 100644 --- a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java +++ b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java -@@ -5696,20 +5696,8 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { +@@ -5856,20 +5856,8 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { } if (!Build.isBuildConsistent()) { diff --git a/patches_platform/frameworks_base/0003-UI-Adjust-default-navbar-layouts.patch b/patches_platform/frameworks_base/0004-UI-Adjust-default-navbar-layouts.patch similarity index 93% rename from patches_platform/frameworks_base/0003-UI-Adjust-default-navbar-layouts.patch rename to patches_platform/frameworks_base/0004-UI-Adjust-default-navbar-layouts.patch index 0bc6819..4104b3b 100644 --- a/patches_platform/frameworks_base/0003-UI-Adjust-default-navbar-layouts.patch +++ b/patches_platform/frameworks_base/0004-UI-Adjust-default-navbar-layouts.patch @@ -1,7 +1,7 @@ -From 4dc4d1ec5be6658812b82c09d745975674707572 Mon Sep 17 00:00:00 2001 +From becd4bf809789b1d0d53956539d3d452e9f20e5a Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Sat, 16 Oct 2021 02:23:48 +0000 -Subject: [PATCH 03/12] UI: Adjust default navbar layouts +Subject: [PATCH 04/14] UI: Adjust default navbar layouts - Slightly tighten nodpi layout - Remove sw372dp layout - looks terrible, probably meant for legacy phablets, but most modern phones qualify @@ -45,10 +45,10 @@ index 07b797a32428..000000000000 - left[.25W],back[.5WC];home;recent[.5WC],right[.25W] - diff --git a/packages/SystemUI/res/values/config.xml b/packages/SystemUI/res/values/config.xml -index ba31e7f1f1d1..c4625e7e784d 100644 +index d7d88cea2dbc..8a2b88d3cf9a 100644 --- a/packages/SystemUI/res/values/config.xml +++ b/packages/SystemUI/res/values/config.xml -@@ -307,7 +307,7 @@ +@@ -301,7 +301,7 @@ diff --git a/patches_platform/frameworks_base/0004-UI-Disable-wallpaper-zoom.patch b/patches_platform/frameworks_base/0005-UI-Disable-wallpaper-zoom.patch similarity index 84% rename from patches_platform/frameworks_base/0004-UI-Disable-wallpaper-zoom.patch rename to patches_platform/frameworks_base/0005-UI-Disable-wallpaper-zoom.patch index ec6e319..22a90ff 100644 --- a/patches_platform/frameworks_base/0004-UI-Disable-wallpaper-zoom.patch +++ b/patches_platform/frameworks_base/0005-UI-Disable-wallpaper-zoom.patch @@ -1,7 +1,7 @@ -From 06c01a490bf6379a8f9d8e4e8499add7a4ea2cbc Mon Sep 17 00:00:00 2001 +From 1d9cba70b8a820933b6e54afef69a72e7e1ab85e Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Sun, 10 Jan 2021 11:44:29 +0000 -Subject: [PATCH 04/12] UI: Disable wallpaper zoom +Subject: [PATCH 05/14] 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 34b5589bf81f..be2dbc3cd5dc 100644 +index 659d0f37bf05..272df37188bf 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml -@@ -5029,7 +5029,7 @@ +@@ -5104,7 +5104,7 @@ 1 diff --git a/patches_platform/frameworks_base/0005-UI-Follow-Monet-and-light-dark-theme-in-user-1-icon.patch b/patches_platform/frameworks_base/0006-UI-Follow-Monet-and-light-dark-theme-in-user-1-icon.patch similarity index 87% rename from patches_platform/frameworks_base/0005-UI-Follow-Monet-and-light-dark-theme-in-user-1-icon.patch rename to patches_platform/frameworks_base/0006-UI-Follow-Monet-and-light-dark-theme-in-user-1-icon.patch index b674425..7458257 100644 --- a/patches_platform/frameworks_base/0005-UI-Follow-Monet-and-light-dark-theme-in-user-1-icon.patch +++ b/patches_platform/frameworks_base/0006-UI-Follow-Monet-and-light-dark-theme-in-user-1-icon.patch @@ -1,7 +1,7 @@ -From 202ed6730a9b3182c33ef3d5169ff026ab269a2a Mon Sep 17 00:00:00 2001 +From 4c3587987591a1c4545322b0855ea138e7fd26ce Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Sun, 25 Sep 2022 02:20:52 +0000 -Subject: [PATCH 05/12] UI: Follow Monet and light/dark theme in user 1 icon +Subject: [PATCH 06/14] UI: Follow Monet and light/dark theme in user 1 icon Change-Id: I755077c6003c39ddc9428da1defe6a6ddd0e5ff8 --- @@ -10,7 +10,7 @@ Change-Id: I755077c6003c39ddc9428da1defe6a6ddd0e5ff8 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/core/res/res/values-night/colors.xml b/core/res/res/values-night/colors.xml -index 33c9b95c5819..f3531caa47d9 100644 +index ffaccd3ddc57..e2a955b89c77 100644 --- a/core/res/res/values-night/colors.xml +++ b/core/res/res/values-night/colors.xml @@ -33,6 +33,7 @@ @@ -22,7 +22,7 @@ index 33c9b95c5819..f3531caa47d9 100644 #ff4ecde6 #fffbbc04 diff --git a/core/res/res/values/colors.xml b/core/res/res/values/colors.xml -index b515abc4000f..87a4bb9da02b 100644 +index d5875f547e91..c7711ed3e493 100644 --- a/core/res/res/values/colors.xml +++ b/core/res/res/values/colors.xml @@ -174,7 +174,7 @@ diff --git a/patches_platform/frameworks_base/0006-UI-Increase-default-status-bar-height.patch b/patches_platform/frameworks_base/0007-UI-Increase-default-status-bar-height.patch similarity index 88% rename from patches_platform/frameworks_base/0006-UI-Increase-default-status-bar-height.patch rename to patches_platform/frameworks_base/0007-UI-Increase-default-status-bar-height.patch index f8c698b..665aa82 100644 --- a/patches_platform/frameworks_base/0006-UI-Increase-default-status-bar-height.patch +++ b/patches_platform/frameworks_base/0007-UI-Increase-default-status-bar-height.patch @@ -1,7 +1,7 @@ -From 448d7cb6f0689082ec63820f72e8ef221154fcfd Mon Sep 17 00:00:00 2001 +From cd200004d3b59dcb33187a3228a4bdab6b16619b Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Wed, 3 Jun 2020 01:31:34 +0000 -Subject: [PATCH 06/12] UI: Increase default status bar height +Subject: [PATCH 07/14] UI: Increase default status bar height Change-Id: Ibbcf63159e19bb2bb2b1094ea07ab85917630b07 --- @@ -9,7 +9,7 @@ Change-Id: Ibbcf63159e19bb2bb2b1094ea07ab85917630b07 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/res/res/values/dimens.xml b/core/res/res/values/dimens.xml -index b754100a3ed6..1851b42c0f3b 100644 +index 2542268a153a..099a6badc034 100644 --- a/core/res/res/values/dimens.xml +++ b/core/res/res/values/dimens.xml @@ -41,7 +41,7 @@ diff --git a/patches_platform/frameworks_base/0007-UI-Remove-QS-footer-background.patch b/patches_platform/frameworks_base/0008-UI-Remove-QS-footer-background.patch similarity index 50% rename from patches_platform/frameworks_base/0007-UI-Remove-QS-footer-background.patch rename to patches_platform/frameworks_base/0008-UI-Remove-QS-footer-background.patch index 936d5a9..1b60384 100644 --- a/patches_platform/frameworks_base/0007-UI-Remove-QS-footer-background.patch +++ b/patches_platform/frameworks_base/0008-UI-Remove-QS-footer-background.patch @@ -1,25 +1,32 @@ -From 057673be164d2bc9cefbe2161bb8293909e72ae6 Mon Sep 17 00:00:00 2001 +From 6bc225de6c671c50ed045eef9575b0aa2ab5835f Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Sun, 25 Sep 2022 02:20:20 +0000 -Subject: [PATCH 07/12] UI: Remove QS footer background +Subject: [PATCH 08/14] UI: Remove QS footer background Change-Id: I68e82e0c5e3eddb2d3f767fe792b1436eae506ef --- - packages/SystemUI/res-keyguard/layout/footer_actions.xml | 1 - - 1 file changed, 1 deletion(-) + packages/SystemUI/res-keyguard/layout/footer_actions.xml | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/SystemUI/res-keyguard/layout/footer_actions.xml b/packages/SystemUI/res-keyguard/layout/footer_actions.xml -index 876f275ab042..497181d9ee03 100644 +index a101c64a48e0..028ab29b8643 100644 --- a/packages/SystemUI/res-keyguard/layout/footer_actions.xml +++ b/packages/SystemUI/res-keyguard/layout/footer_actions.xml -@@ -24,7 +24,6 @@ +@@ -25,7 +25,6 @@ android:elevation="@dimen/qs_panel_elevation" - android:paddingTop="8dp" + android:paddingTop="@dimen/qs_footer_actions_top_padding" android:paddingBottom="@dimen/qs_footer_actions_bottom_padding" - android:background="@drawable/qs_footer_actions_background" - android:gravity="center_vertical" + android:gravity="center_vertical|end" android:layout_gravity="bottom" > +@@ -98,4 +97,4 @@ + android:tint="?androidprv:attr/textColorPrimaryInverse" /> + + +- +\ No newline at end of file ++ -- 2.25.1 diff --git a/patches_platform/frameworks_base/0008-UI-Restore-split-screen-divider-to-pre-Sv2-looks.patch b/patches_platform/frameworks_base/0009-UI-Restore-split-screen-divider-to-pre-Sv2-looks.patch similarity index 91% rename from patches_platform/frameworks_base/0008-UI-Restore-split-screen-divider-to-pre-Sv2-looks.patch rename to patches_platform/frameworks_base/0009-UI-Restore-split-screen-divider-to-pre-Sv2-looks.patch index eb2c1e7..22c7ca8 100644 --- a/patches_platform/frameworks_base/0008-UI-Restore-split-screen-divider-to-pre-Sv2-looks.patch +++ b/patches_platform/frameworks_base/0009-UI-Restore-split-screen-divider-to-pre-Sv2-looks.patch @@ -1,7 +1,7 @@ -From e5ac2b04e10ce9b900e9a3ca0c1c609a26e4aaee Mon Sep 17 00:00:00 2001 +From b421fc2bb853966ede836e09203718dfc8d0cb56 Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Sat, 19 Mar 2022 09:22:24 +0000 -Subject: [PATCH 08/12] UI: Restore split-screen divider to pre-Sv2 looks +Subject: [PATCH 09/14] 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 @@ -26,10 +26,10 @@ index 049980803ee3..cd54ac26a7fd 100644 + + diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/common/split/SplitLayout.java b/libs/WindowManager/Shell/src/com/android/wm/shell/common/split/SplitLayout.java -index c94455d9151a..5eedb1fdb824 100644 +index 419e62daf586..229844e42a49 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/common/split/SplitLayout.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/common/split/SplitLayout.java -@@ -138,20 +138,7 @@ public final class SplitLayout implements DisplayInsetsController.OnInsetsChange +@@ -152,20 +152,7 @@ public final class SplitLayout implements DisplayInsetsController.OnInsetsChange } private int getDividerInsets(Resources resources, Display display) { diff --git a/patches_platform/frameworks_base/0009-UI-Revive-navbar-layout-tuning-via-sysui_nav_bar-tun.patch b/patches_platform/frameworks_base/0010-UI-Revive-navbar-layout-tuning-via-sysui_nav_bar-tun.patch similarity index 95% rename from patches_platform/frameworks_base/0009-UI-Revive-navbar-layout-tuning-via-sysui_nav_bar-tun.patch rename to patches_platform/frameworks_base/0010-UI-Revive-navbar-layout-tuning-via-sysui_nav_bar-tun.patch index bce85f3..f4a7ac0 100644 --- a/patches_platform/frameworks_base/0009-UI-Revive-navbar-layout-tuning-via-sysui_nav_bar-tun.patch +++ b/patches_platform/frameworks_base/0010-UI-Revive-navbar-layout-tuning-via-sysui_nav_bar-tun.patch @@ -1,7 +1,7 @@ -From d9518a3ec3b88c36f16d8a7417d1d2c29bec25fc Mon Sep 17 00:00:00 2001 +From 03ed62fb9ce9ce4da4f666f24a9c9c65cc5b9c03 Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Tue, 6 Oct 2020 01:41:16 +0000 -Subject: [PATCH 09/12] UI: Revive navbar layout tuning via sysui_nav_bar +Subject: [PATCH 10/14] UI: Revive navbar layout tuning via sysui_nav_bar tunable Google keeps fixing what ain't broken. diff --git a/patches_platform/frameworks_base/0010-UI-Use-SNAP_FIXED_RATIO-for-multi-window-globally.patch b/patches_platform/frameworks_base/0011-UI-Use-SNAP_FIXED_RATIO-for-multi-window-globally.patch similarity index 94% rename from patches_platform/frameworks_base/0010-UI-Use-SNAP_FIXED_RATIO-for-multi-window-globally.patch rename to patches_platform/frameworks_base/0011-UI-Use-SNAP_FIXED_RATIO-for-multi-window-globally.patch index f14392a..c41b5c3 100644 --- a/patches_platform/frameworks_base/0010-UI-Use-SNAP_FIXED_RATIO-for-multi-window-globally.patch +++ b/patches_platform/frameworks_base/0011-UI-Use-SNAP_FIXED_RATIO-for-multi-window-globally.patch @@ -1,7 +1,7 @@ -From 1556f8d5c97d6fdec1099d6c587a2cac128d4f97 Mon Sep 17 00:00:00 2001 +From 69581c7e2ab9106877b8c8951244c63c14ea97e4 Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Sun, 26 Apr 2020 08:56:13 +0000 -Subject: [PATCH 10/12] UI: Use SNAP_FIXED_RATIO for multi-window globally +Subject: [PATCH 11/14] UI: Use SNAP_FIXED_RATIO for multi-window globally Enables multiple snap targets under landscape for phone UI @@ -40,7 +40,7 @@ index 7308dc5882c1..000000000000 - \ No newline at end of file diff --git a/core/res/res/values-sw600dp/config.xml b/core/res/res/values-sw600dp/config.xml -index d686dd2ea690..03dcf51846dd 100644 +index 34b6a54be493..3921c9edfeac 100644 --- a/core/res/res/values-sw600dp/config.xml +++ b/core/res/res/values-sw600dp/config.xml @@ -3,16 +3,16 @@ @@ -78,10 +78,10 @@ index d686dd2ea690..03dcf51846dd 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 be2dbc3cd5dc..c62cce393ff0 100644 +index 272df37188bf..58cd819b9404 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml -@@ -3726,7 +3726,7 @@ +@@ -3790,7 +3790,7 @@ 1 - 3 snap targets: fixed ratio, 1:1, (1 - fixed ratio) 2 - 1 snap target: 1:1 --> diff --git a/patches_platform/frameworks_base/0011-core-Remove-old-app-target-SDK-dialog.patch b/patches_platform/frameworks_base/0012-core-Remove-old-app-target-SDK-dialog.patch similarity index 89% rename from patches_platform/frameworks_base/0011-core-Remove-old-app-target-SDK-dialog.patch rename to patches_platform/frameworks_base/0012-core-Remove-old-app-target-SDK-dialog.patch index 5c88cf5..7076d24 100644 --- a/patches_platform/frameworks_base/0011-core-Remove-old-app-target-SDK-dialog.patch +++ b/patches_platform/frameworks_base/0012-core-Remove-old-app-target-SDK-dialog.patch @@ -1,7 +1,7 @@ -From f7e374407e133b9c53ecfbc9a5dc99a1460b6eb0 Mon Sep 17 00:00:00 2001 +From 5dd8363ed108cb2443fad9e7cd25a3ad54e020b9 Mon Sep 17 00:00:00 2001 From: Danny Lin Date: Tue, 3 Nov 2020 22:43:12 -0800 -Subject: [PATCH 11/12] core: Remove old app target SDK dialog +Subject: [PATCH 12/14] 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/0012-Paint-Enable-subpixel-text-positioning-by-default.patch b/patches_platform/frameworks_base/0013-Paint-Enable-subpixel-text-positioning-by-default.patch similarity index 92% rename from patches_platform/frameworks_base/0012-Paint-Enable-subpixel-text-positioning-by-default.patch rename to patches_platform/frameworks_base/0013-Paint-Enable-subpixel-text-positioning-by-default.patch index 4c93f68..10d3f8d 100644 --- a/patches_platform/frameworks_base/0012-Paint-Enable-subpixel-text-positioning-by-default.patch +++ b/patches_platform/frameworks_base/0013-Paint-Enable-subpixel-text-positioning-by-default.patch @@ -1,7 +1,7 @@ -From 1e6d2e5f957d1a0f497248d1673d9ecaa1a676a3 Mon Sep 17 00:00:00 2001 +From 84e2133ee773923f221a9b9754e4b1ce6bcf5e1a Mon Sep 17 00:00:00 2001 From: Danny Lin Date: Tue, 5 Oct 2021 21:01:50 -0700 -Subject: [PATCH 12/12] Paint: Enable subpixel text positioning by default +Subject: [PATCH 13/14] 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_treble_td/platform_frameworks_base/0004-Add-support-for-app-signature-spoofing.patch b/patches_platform/frameworks_base/0014-Add-support-for-app-signature-spoofing.patch similarity index 96% rename from patches_treble_td/platform_frameworks_base/0004-Add-support-for-app-signature-spoofing.patch rename to patches_platform/frameworks_base/0014-Add-support-for-app-signature-spoofing.patch index 5f55395..494584b 100644 --- a/patches_treble_td/platform_frameworks_base/0004-Add-support-for-app-signature-spoofing.patch +++ b/patches_platform/frameworks_base/0014-Add-support-for-app-signature-spoofing.patch @@ -1,7 +1,7 @@ -From b9fdd321006e6cc79697bc6224a60ac330a6e24e Mon Sep 17 00:00:00 2001 +From 8fc6fb99d86c4e4887d49d7bbff571b50b76c73f Mon Sep 17 00:00:00 2001 From: Danny Lin Date: Sat, 16 Oct 2021 05:27:57 -0700 -Subject: [PATCH 04/30] Add support for app signature spoofing +Subject: [PATCH 14/14] 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 @@ -58,7 +58,7 @@ index c8a43db2f9c2..277183036c60 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 6e48de5ba31f..cef98d01a44c 100644 +index 1b90803404f7..d1cb6c3241f2 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -3542,6 +3542,21 @@ @@ -84,7 +84,7 @@ index 6e48de5ba31f..cef98d01a44c 100644 {@link android.content.pm.PackageManager#addPackageToPreferred} for details. --> diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml -index c6b60f586047..ecf5034f18bb 100644 +index 5763345aba4d..8ffdbdd6f15b 100644 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -974,6 +974,18 @@ @@ -107,10 +107,10 @@ index c6b60f586047..ecf5034f18bb 100644 disable or modify status bar diff --git a/services/core/java/com/android/server/pm/ComputerEngine.java b/services/core/java/com/android/server/pm/ComputerEngine.java -index 259ca655d2b9..674b22e28a83 100644 +index 46b7460dff1b..40549962436f 100644 --- a/services/core/java/com/android/server/pm/ComputerEngine.java +++ b/services/core/java/com/android/server/pm/ComputerEngine.java -@@ -1591,6 +1591,29 @@ public class ComputerEngine implements Computer { +@@ -1603,6 +1603,29 @@ public class ComputerEngine implements Computer { return result; } @@ -140,7 +140,7 @@ index 259ca655d2b9..674b22e28a83 100644 public final PackageInfo generatePackageInfo(PackageStateInternal ps, @PackageManager.PackageInfoFlagsBits long flags, int userId) { if (!mUserManager.exists(userId)) return null; -@@ -1620,13 +1643,14 @@ public class ComputerEngine implements Computer { +@@ -1632,13 +1655,14 @@ public class ComputerEngine implements Computer { final int[] gids = (flags & PackageManager.GET_GIDS) == 0 ? EMPTY_INT_ARRAY : mPermissionManager.getGidsForUid(UserHandle.getUid(userId, ps.getAppId())); // Compute granted permissions only if package has requested permissions diff --git a/patches_platform/packages_apps_Trebuchet/0001-Trebuchet-Move-clear-all-button-to-actions-view.patch b/patches_platform/packages_apps_Trebuchet/0001-Trebuchet-Move-clear-all-button-to-actions-view.patch index b312add..e152d64 100644 --- a/patches_platform/packages_apps_Trebuchet/0001-Trebuchet-Move-clear-all-button-to-actions-view.patch +++ b/patches_platform/packages_apps_Trebuchet/0001-Trebuchet-Move-clear-all-button-to-actions-view.patch @@ -1,4 +1,4 @@ -From ff8f6e85177a0bab9c27785c3c0d9a59c4952e49 Mon Sep 17 00:00:00 2001 +From d8f9f479012d522aed7377e5996cf7a5265ea268 Mon Sep 17 00:00:00 2001 From: Vachounet Date: Mon, 26 Oct 2020 17:05:18 +0100 Subject: [PATCH] Trebuchet: Move clear all button to actions view @@ -73,10 +73,10 @@ index 0fda0bf8d4..9a6f5ae062 100644 \ No newline at end of file + diff --git a/quickstep/src/com/android/quickstep/fallback/RecentsState.java b/quickstep/src/com/android/quickstep/fallback/RecentsState.java -index 77db6b79f4..c0b6771e6a 100644 +index 223eba5b95..75f8baed6b 100644 --- a/quickstep/src/com/android/quickstep/fallback/RecentsState.java +++ b/quickstep/src/com/android/quickstep/fallback/RecentsState.java -@@ -102,7 +102,7 @@ public class RecentsState implements BaseState { +@@ -105,7 +105,7 @@ public class RecentsState implements BaseState { * For this state, whether clear all button should be shown. */ public boolean hasClearAllButton() { @@ -86,10 +86,10 @@ index 77db6b79f4..c0b6771e6a 100644 /** diff --git a/quickstep/src/com/android/quickstep/views/LauncherRecentsView.java b/quickstep/src/com/android/quickstep/views/LauncherRecentsView.java -index 306ebd73c8..5b2f544c02 100644 +index bb8506d26f..e8c18f1d45 100644 --- a/quickstep/src/com/android/quickstep/views/LauncherRecentsView.java +++ b/quickstep/src/com/android/quickstep/views/LauncherRecentsView.java -@@ -133,8 +133,7 @@ public class LauncherRecentsView extends RecentsView Date: Sun, 20 Jun 2021 03:39:32 +0000 Subject: [PATCH 01/21] Add MiuiNavbarOverlay @@ -29,7 +29,7 @@ Change-Id: I0e6791abc3c9521d7dc612df2fec2b041affe7e9 create mode 100644 packages/overlays/MiuiNavbarOverlay/res/drawable-440dpi-v4/ic_sysbar_recent_darkmode.png diff --git a/packages/overlays/Android.mk b/packages/overlays/Android.mk -index 36ec11af3068..c5ee8556b75a 100644 +index 69641e69a9f2..1efc296d9689 100644 --- a/packages/overlays/Android.mk +++ b/packages/overlays/Android.mk @@ -26,6 +26,7 @@ LOCAL_REQUIRED_MODULES := \ diff --git a/patches_platform_personal/frameworks_base/0002-Disable-Bluetooth-by-default.patch b/patches_platform_personal/frameworks_base/0002-Disable-Bluetooth-by-default.patch index a31fb7d..293a471 100644 --- a/patches_platform_personal/frameworks_base/0002-Disable-Bluetooth-by-default.patch +++ b/patches_platform_personal/frameworks_base/0002-Disable-Bluetooth-by-default.patch @@ -1,4 +1,4 @@ -From aa57f00821e0ec7ee6fc38a20bb4f86f83d74d94 Mon Sep 17 00:00:00 2001 +From 8c24a74eb289bdf3abeed57d490ccf1073f14677 Mon Sep 17 00:00:00 2001 From: Hikari-no-Tenshi Date: Thu, 30 Jan 2020 22:20:54 +0200 Subject: [PATCH 02/21] Disable Bluetooth by default diff --git a/patches_platform_personal/frameworks_base/0003-Disable-cursor-drag-by-default-for-editable-TextView.patch b/patches_platform_personal/frameworks_base/0003-Disable-cursor-drag-by-default-for-editable-TextView.patch index 29e704b..032af2a 100644 --- a/patches_platform_personal/frameworks_base/0003-Disable-cursor-drag-by-default-for-editable-TextView.patch +++ b/patches_platform_personal/frameworks_base/0003-Disable-cursor-drag-by-default-for-editable-TextView.patch @@ -1,4 +1,4 @@ -From 99dcde5dd0b72aa0e1c3efa37176db236135d252 Mon Sep 17 00:00:00 2001 +From c15f13abb5819da69fc6906d30f8507fd27f1e4b Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Mon, 27 Sep 2021 16:30:00 +0000 Subject: [PATCH 03/21] Disable cursor drag by default for editable TextViews diff --git a/patches_platform_personal/frameworks_base/0004-Disable-FP-lockouts.patch b/patches_platform_personal/frameworks_base/0004-Disable-FP-lockouts.patch deleted file mode 100644 index 082e0f3..0000000 --- a/patches_platform_personal/frameworks_base/0004-Disable-FP-lockouts.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 63879a514c40c02d119950d347ff00c7420f23e3 Mon Sep 17 00:00:00 2001 -From: AndyCGYan -Date: Fri, 22 Mar 2019 00:41:20 +0800 -Subject: [PATCH 04/21] Disable FP lockouts - -Both timed and permanent lockouts - GET THE FUCK OUT -Now targeting LockoutFramework, introduced in Android 12 - -Change-Id: I2d4b091f3546d4d7903bfb4d5585629212dc9915 ---- - .../fingerprint/hidl/LockoutFrameworkImpl.java | 17 +---------------- - 1 file changed, 1 insertion(+), 16 deletions(-) - -diff --git a/services/core/java/com/android/server/biometrics/sensors/fingerprint/hidl/LockoutFrameworkImpl.java b/services/core/java/com/android/server/biometrics/sensors/fingerprint/hidl/LockoutFrameworkImpl.java -index a0befea8e085..325e1fcecc2b 100644 ---- a/services/core/java/com/android/server/biometrics/sensors/fingerprint/hidl/LockoutFrameworkImpl.java -+++ b/services/core/java/com/android/server/biometrics/sensors/fingerprint/hidl/LockoutFrameworkImpl.java -@@ -100,25 +100,10 @@ public class LockoutFrameworkImpl implements LockoutTracker { - mLockoutResetCallback.onLockoutReset(userId); - } - -- void addFailedAttemptForUser(int userId) { -- mFailedAttempts.put(userId, mFailedAttempts.get(userId, 0) + 1); -- mTimedLockoutCleared.put(userId, false); -- -- if (getLockoutModeForUser(userId) != LOCKOUT_NONE) { -- scheduleLockoutResetForUser(userId); -- } -- } -+ void addFailedAttemptForUser(int userId) {} - - @Override - public @LockoutMode int getLockoutModeForUser(int userId) { -- final int failedAttempts = mFailedAttempts.get(userId, 0); -- if (failedAttempts >= MAX_FAILED_ATTEMPTS_LOCKOUT_PERMANENT) { -- return LOCKOUT_PERMANENT; -- } else if (failedAttempts > 0 -- && !mTimedLockoutCleared.get(userId, false) -- && (failedAttempts % MAX_FAILED_ATTEMPTS_LOCKOUT_TIMED == 0)) { -- return LOCKOUT_TIMED; -- } - return LOCKOUT_NONE; - } - --- -2.25.1 - diff --git a/patches_platform_personal/frameworks_base/0005-Disable-RESTRICTED-bucket-toast.patch b/patches_platform_personal/frameworks_base/0004-Disable-RESTRICTED-bucket-toast.patch similarity index 91% rename from patches_platform_personal/frameworks_base/0005-Disable-RESTRICTED-bucket-toast.patch rename to patches_platform_personal/frameworks_base/0004-Disable-RESTRICTED-bucket-toast.patch index f2e0fbf..2c24330 100644 --- a/patches_platform_personal/frameworks_base/0005-Disable-RESTRICTED-bucket-toast.patch +++ b/patches_platform_personal/frameworks_base/0004-Disable-RESTRICTED-bucket-toast.patch @@ -1,7 +1,7 @@ -From 560136af642a5155d82571b96afd62b55e89cffd Mon Sep 17 00:00:00 2001 +From 89c3645edd918789933549bf9be38ea7a7cd1184 Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Sun, 3 Jul 2022 00:08:42 +0000 -Subject: [PATCH 05/21] Disable "RESTRICTED bucket" toast +Subject: [PATCH 04/21] Disable "RESTRICTED bucket" toast Change-Id: I20a328d3c77962f3a6095bfca42d0b165a093ce8 --- @@ -9,10 +9,10 @@ Change-Id: I20a328d3c77962f3a6095bfca42d0b165a093ce8 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/apex/jobscheduler/service/java/com/android/server/usage/AppStandbyController.java b/apex/jobscheduler/service/java/com/android/server/usage/AppStandbyController.java -index 9e3e3553c125..ec43489d70e4 100644 +index 5d9f3357125a..49d3c8de7b80 100644 --- a/apex/jobscheduler/service/java/com/android/server/usage/AppStandbyController.java +++ b/apex/jobscheduler/service/java/com/android/server/usage/AppStandbyController.java -@@ -1738,25 +1738,7 @@ public class AppStandbyController +@@ -1759,25 +1759,7 @@ public class AppStandbyController .noteRestrictionAttempt(packageName, userId, elapsedRealtime, reason); if (isForcedByUser) { diff --git a/patches_platform_personal/frameworks_base/0006-Keyguard-Adjust-clock-style.patch b/patches_platform_personal/frameworks_base/0005-Keyguard-Adjust-clock-style.patch similarity index 53% rename from patches_platform_personal/frameworks_base/0006-Keyguard-Adjust-clock-style.patch rename to patches_platform_personal/frameworks_base/0005-Keyguard-Adjust-clock-style.patch index 6ef48e5..d383a7d 100644 --- a/patches_platform_personal/frameworks_base/0006-Keyguard-Adjust-clock-style.patch +++ b/patches_platform_personal/frameworks_base/0005-Keyguard-Adjust-clock-style.patch @@ -1,50 +1,25 @@ -From 051a47e9e9e79b7897658a2ac5f5f9d56fa24e6c Mon Sep 17 00:00:00 2001 +From 3eb0073c25efb72c691cf8058385ebb74259ccac Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Thu, 2 Sep 2021 16:15:19 +0000 -Subject: [PATCH 06/21] Keyguard: Adjust clock style +Subject: [PATCH 05/21] Keyguard: Adjust clock style Thinner font, less padding and unintrusive colors Change-Id: I21e5d5bf37d724e75ebce4cd89349e0cc4dfc910 --- - .../SystemUI/res-keyguard/layout/keyguard_clock_switch.xml | 7 ++++--- - .../SystemUI/res-keyguard/layout/keyguard_slice_view.xml | 2 +- - packages/SystemUI/res-keyguard/values/dimens.xml | 6 +++--- - packages/SystemUI/res-keyguard/values/styles.xml | 2 -- - packages/SystemUI/res/layout/keyguard_status_bar.xml | 2 +- - packages/SystemUI/res/values/styles.xml | 4 ++-- - .../src/com/android/keyguard/AnimatableClockView.kt | 2 +- - 7 files changed, 12 insertions(+), 13 deletions(-) + .../SystemUI/res-keyguard/layout/keyguard_slice_view.xml | 2 +- + packages/SystemUI/res-keyguard/values/dimens.xml | 6 +++--- + packages/SystemUI/res-keyguard/values/styles.xml | 2 -- + packages/SystemUI/res/layout/keyguard_status_bar.xml | 2 +- + packages/SystemUI/res/values/styles.xml | 4 ++-- + packages/SystemUI/shared/res/layout/clock_default_large.xml | 1 + + packages/SystemUI/shared/res/layout/clock_default_small.xml | 2 +- + packages/SystemUI/shared/res/values/colors.xml | 5 +++++ + .../android/systemui/shared/clocks/AnimatableClockView.kt | 2 +- + .../android/systemui/shared/clocks/DefaultClockProvider.kt | 4 ++-- + 10 files changed, 17 insertions(+), 13 deletions(-) + create mode 100644 packages/SystemUI/shared/res/values/colors.xml -diff --git a/packages/SystemUI/res-keyguard/layout/keyguard_clock_switch.xml b/packages/SystemUI/res-keyguard/layout/keyguard_clock_switch.xml -index 87a9825af1cb..93e827ac540e 100644 ---- a/packages/SystemUI/res-keyguard/layout/keyguard_clock_switch.xml -+++ b/packages/SystemUI/res-keyguard/layout/keyguard_clock_switch.xml -@@ -38,10 +38,10 @@ - android:layout_gravity="start" - android:gravity="start" - android:textSize="@dimen/clock_text_size" -- android:fontFamily="@font/clock" -+ android:fontFamily="sans-serif-thin" - android:elegantTextHeight="false" - android:singleLine="true" -- android:fontFeatureSettings="pnum" -+ android:fontFeatureSettings="tnum" - chargeAnimationDelay="350" - dozeWeight="200" - lockScreenWeight="400" -@@ -60,9 +60,10 @@ - android:layout_gravity="center" - android:gravity="center_horizontal" - android:textSize="@dimen/large_clock_text_size" -- android:fontFamily="@font/clock" -+ android:fontFamily="sans-serif-thin" - android:typeface="monospace" - android:elegantTextHeight="false" -+ android:fontFeatureSettings="tnum" - chargeAnimationDelay="200" - dozeWeight="200" - lockScreenWeight="400" diff --git a/packages/SystemUI/res-keyguard/layout/keyguard_slice_view.xml b/packages/SystemUI/res-keyguard/layout/keyguard_slice_view.xml index 7c5dbc247428..64657547621f 100644 --- a/packages/SystemUI/res-keyguard/layout/keyguard_slice_view.xml @@ -59,7 +34,7 @@ index 7c5dbc247428..64657547621f 100644 /> diff --git a/packages/SystemUI/res-keyguard/values/dimens.xml b/packages/SystemUI/res-keyguard/values/dimens.xml -index 77f1803523a8..ed0bca225550 100644 +index 46f6ab2399d1..6fce16ced94f 100644 --- a/packages/SystemUI/res-keyguard/values/dimens.xml +++ b/packages/SystemUI/res-keyguard/values/dimens.xml @@ -91,10 +91,10 @@ @@ -77,7 +52,7 @@ index 77f1803523a8..ed0bca225550 100644 diff --git a/patches_platform_personal/frameworks_base/0011-Replace-NTP-server.patch b/patches_platform_personal/frameworks_base/0011-Replace-NTP-server.patch index 8ebf365..3522be7 100644 --- a/patches_platform_personal/frameworks_base/0011-Replace-NTP-server.patch +++ b/patches_platform_personal/frameworks_base/0011-Replace-NTP-server.patch @@ -1,4 +1,4 @@ -From 8e54cfb859e4a6bdd99290108095974922cecc81 Mon Sep 17 00:00:00 2001 +From a8a6e151d39736c5e73394839e476c5b82630d3a Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Sun, 17 Apr 2022 08:48:42 +0000 Subject: [PATCH 11/21] Replace NTP server @@ -9,10 +9,10 @@ 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 a1b97506b1f5..3accbddbe38b 100644 +index 80fa6013ee77..9410897a24a0 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml -@@ -2352,7 +2352,7 @@ +@@ -2390,7 +2390,7 @@ true diff --git a/patches_platform_personal/frameworks_base/0012-Revert-SystemUI-Add-left-padding-for-keyguard-slices.patch b/patches_platform_personal/frameworks_base/0012-Revert-SystemUI-Add-left-padding-for-keyguard-slices.patch index ed72272..68fffd9 100644 --- a/patches_platform_personal/frameworks_base/0012-Revert-SystemUI-Add-left-padding-for-keyguard-slices.patch +++ b/patches_platform_personal/frameworks_base/0012-Revert-SystemUI-Add-left-padding-for-keyguard-slices.patch @@ -1,4 +1,4 @@ -From c125258153937e30bbeeaa9666af7ac3d2b03366 Mon Sep 17 00:00:00 2001 +From 2406fad099bf603dd754a0e279210b606517b77d Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Tue, 31 May 2022 00:00:08 +0000 Subject: [PATCH 12/21] Revert "SystemUI: Add left padding for keyguard slices" diff --git a/patches_platform_personal/frameworks_base/0013-Revert-Update-RAT-icons-to-match-Silk-design.patch b/patches_platform_personal/frameworks_base/0013-Revert-Update-RAT-icons-to-match-Silk-design.patch index e2e3619..4d98543 100644 --- a/patches_platform_personal/frameworks_base/0013-Revert-Update-RAT-icons-to-match-Silk-design.patch +++ b/patches_platform_personal/frameworks_base/0013-Revert-Update-RAT-icons-to-match-Silk-design.patch @@ -1,4 +1,4 @@ -From 6dbe76e67aa9fb8ad6285b3730093af49cde6a4d Mon Sep 17 00:00:00 2001 +From fba26224a6d73d49389a8eddad477950a729ee59 Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Sun, 5 Sep 2021 01:20:12 +0000 Subject: [PATCH 13/21] Revert "Update RAT icons to match Silk design" diff --git a/patches_platform_personal/frameworks_base/0014-Revert-Use-the-default-top-clock-margin-on-h800-devi.patch b/patches_platform_personal/frameworks_base/0014-Revert-Use-the-default-top-clock-margin-on-h800-devi.patch index ef694de..8f52d8a 100644 --- a/patches_platform_personal/frameworks_base/0014-Revert-Use-the-default-top-clock-margin-on-h800-devi.patch +++ b/patches_platform_personal/frameworks_base/0014-Revert-Use-the-default-top-clock-margin-on-h800-devi.patch @@ -1,4 +1,4 @@ -From ea9a73648e61b2ab2e35aaefae7a27e92dea210b Mon Sep 17 00:00:00 2001 +From 2760ca8d2b0c8920b60d7d4f9ee8f2ae2cabd8b6 Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Thu, 29 Sep 2022 11:27:57 +0000 Subject: [PATCH 14/21] Revert "Use the default top clock margin on h800 diff --git a/patches_platform_personal/frameworks_base/0015-UI-Always-render-windows-into-cutouts.patch b/patches_platform_personal/frameworks_base/0015-UI-Always-render-windows-into-cutouts.patch index 3763095..2c0c985 100644 --- a/patches_platform_personal/frameworks_base/0015-UI-Always-render-windows-into-cutouts.patch +++ b/patches_platform_personal/frameworks_base/0015-UI-Always-render-windows-into-cutouts.patch @@ -1,4 +1,4 @@ -From c4f2d8931a870eaf3faff1d73da630ba7ab339f4 Mon Sep 17 00:00:00 2001 +From 8fd984bf1c1a79ed4f7d97ace689f0b6718968bb Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Wed, 7 Oct 2020 14:00:35 +0000 Subject: [PATCH 15/21] UI: Always render windows into cutouts @@ -8,31 +8,40 @@ Quick and dirty way to do the latter - wait for proper fix from Google Change-Id: I4661c7979bfa7de453329fcddbaeefc2009e2da3 --- - .../com/android/server/wm/DisplayFrames.java | 19 ++++--------------- + .../com/android/server/wm/DisplayFrames.java | 28 +++---------------- .../com/android/server/wm/DisplayPolicy.java | 1 + - 2 files changed, 5 insertions(+), 15 deletions(-) + 2 files changed, 5 insertions(+), 24 deletions(-) diff --git a/services/core/java/com/android/server/wm/DisplayFrames.java b/services/core/java/com/android/server/wm/DisplayFrames.java -index fd0631320520..97989e086c74 100644 +index 33641f72b2ff..6e201970ac03 100644 --- a/services/core/java/com/android/server/wm/DisplayFrames.java +++ b/services/core/java/com/android/server/wm/DisplayFrames.java -@@ -99,21 +99,10 @@ public class DisplayFrames { +@@ -92,30 +92,10 @@ public class DisplayFrames { state.setRoundedCorners(roundedCorners); state.setPrivacyIndicatorBounds(indicatorBounds); state.getDisplayCutoutSafe(safe); -- if (!cutout.isEmpty()) { +- if (safe.left > unrestricted.left) { - state.getSource(ITYPE_LEFT_DISPLAY_CUTOUT).setFrame( - unrestricted.left, unrestricted.top, safe.left, unrestricted.bottom); +- } else { +- state.removeSource(ITYPE_LEFT_DISPLAY_CUTOUT); +- } +- if (safe.top > unrestricted.top) { - state.getSource(ITYPE_TOP_DISPLAY_CUTOUT).setFrame( - unrestricted.left, unrestricted.top, unrestricted.right, safe.top); +- } else { +- state.removeSource(ITYPE_TOP_DISPLAY_CUTOUT); +- } +- if (safe.right < unrestricted.right) { - state.getSource(ITYPE_RIGHT_DISPLAY_CUTOUT).setFrame( - safe.right, unrestricted.top, unrestricted.right, unrestricted.bottom); +- } else { +- state.removeSource(ITYPE_RIGHT_DISPLAY_CUTOUT); +- } +- if (safe.bottom < unrestricted.bottom) { - state.getSource(ITYPE_BOTTOM_DISPLAY_CUTOUT).setFrame( - unrestricted.left, safe.bottom, unrestricted.right, unrestricted.bottom); - } else { -- state.removeSource(ITYPE_LEFT_DISPLAY_CUTOUT); -- state.removeSource(ITYPE_TOP_DISPLAY_CUTOUT); -- state.removeSource(ITYPE_RIGHT_DISPLAY_CUTOUT); - state.removeSource(ITYPE_BOTTOM_DISPLAY_CUTOUT); - } + state.removeSource(ITYPE_LEFT_DISPLAY_CUTOUT); @@ -43,15 +52,15 @@ index fd0631320520..97989e086c74 100644 } diff --git a/services/core/java/com/android/server/wm/DisplayPolicy.java b/services/core/java/com/android/server/wm/DisplayPolicy.java -index 6363479d318f..7c3df487b208 100644 +index f4cb23d5f369..a4cd2fbcc89f 100644 --- a/services/core/java/com/android/server/wm/DisplayPolicy.java +++ b/services/core/java/com/android/server/wm/DisplayPolicy.java -@@ -1594,6 +1594,7 @@ public class DisplayPolicy { +@@ -1639,6 +1639,7 @@ public class DisplayPolicy { displayFrames = win.getDisplayFrames(displayFrames); - final WindowManager.LayoutParams attrs = win.getLayoutingAttrs(displayFrames.mRotation); + final WindowManager.LayoutParams attrs = win.mAttrs.forRotation(displayFrames.mRotation); + attrs.layoutInDisplayCutoutMode = LAYOUT_IN_DISPLAY_CUTOUT_MODE_ALWAYS; - final Rect attachedWindowFrame = attached != null ? attached.getFrame() : null; + sTmpClientFrames.attachedFrame = attached != null ? attached.getFrame() : null; // If this window has different LayoutParams for rotations, we cannot trust its requested -- diff --git a/patches_platform_personal/frameworks_base/0016-UI-Kill-rounded-corners-in-notification-scrim.patch b/patches_platform_personal/frameworks_base/0016-UI-Kill-rounded-corners-in-notification-scrim.patch index 0e0162b..e3169f1 100644 --- a/patches_platform_personal/frameworks_base/0016-UI-Kill-rounded-corners-in-notification-scrim.patch +++ b/patches_platform_personal/frameworks_base/0016-UI-Kill-rounded-corners-in-notification-scrim.patch @@ -1,4 +1,4 @@ -From 7e637a2930dd450bbed631e29a46d96ec2cde12f Mon Sep 17 00:00:00 2001 +From 06472eb420c14153266aca7dc2487f33c32f2f44 Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Wed, 1 Sep 2021 14:10:50 +0000 Subject: [PATCH 16/21] UI: Kill rounded corners in notification scrim @@ -11,12 +11,12 @@ Change-Id: I09ed59e0e658ebd512a9d02a8ef3edfe2c9888da 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml -index b91143e9d6bb..790e5d7044b6 100644 +index 569926a1e1a0..09dd8ed9ef9d 100644 --- a/packages/SystemUI/res/values/dimens.xml +++ b/packages/SystemUI/res/values/dimens.xml -@@ -626,7 +626,7 @@ - - 1 +@@ -672,7 +672,7 @@ + + -60dp - 32dp + 0dp diff --git a/patches_platform_personal/frameworks_base/0017-UI-Reconfigure-power-menu-items.patch b/patches_platform_personal/frameworks_base/0017-UI-Reconfigure-power-menu-items.patch index d6fb4c2..841d862 100644 --- a/patches_platform_personal/frameworks_base/0017-UI-Reconfigure-power-menu-items.patch +++ b/patches_platform_personal/frameworks_base/0017-UI-Reconfigure-power-menu-items.patch @@ -1,4 +1,4 @@ -From f3cda7c608ba6fd49024c7e2920d70e22b4c93ee Mon Sep 17 00:00:00 2001 +From eef68c9e3faad07776544f152946ad299be23d51 Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Mon, 26 Oct 2020 14:06:56 +0000 Subject: [PATCH 17/21] UI: Reconfigure power menu items @@ -9,10 +9,10 @@ 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 3accbddbe38b..b461c062396d 100644 +index 9410897a24a0..a6e437b1efd6 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml -@@ -3178,13 +3178,10 @@ +@@ -3213,13 +3213,10 @@ "logout" = Logout the current user --> diff --git a/patches_platform_personal/frameworks_base/0018-UI-Reconfigure-quick-settings-tiles.patch b/patches_platform_personal/frameworks_base/0018-UI-Reconfigure-quick-settings-tiles.patch index 9f66e8b..ea70fec 100644 --- a/patches_platform_personal/frameworks_base/0018-UI-Reconfigure-quick-settings-tiles.patch +++ b/patches_platform_personal/frameworks_base/0018-UI-Reconfigure-quick-settings-tiles.patch @@ -1,4 +1,4 @@ -From 2c0b16610475573d1aaecfbb6c7ce15aa35f3121 Mon Sep 17 00:00:00 2001 +From be8f19801ee144b27fdd74ddfa8f7ecb9c60bfaa Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Sat, 5 Mar 2022 01:43:37 +0000 Subject: [PATCH 18/21] UI: Reconfigure quick settings tiles @@ -9,10 +9,10 @@ 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 22ca3a2c637c..3f4ab235b37e 100644 +index d7d6fa34cce8..61c7613baadc 100644 --- a/packages/SystemUI/res/values/config.xml +++ b/packages/SystemUI/res/values/config.xml -@@ -74,7 +74,7 @@ +@@ -68,7 +68,7 @@ diff --git a/patches_platform_personal/frameworks_base/0019-UI-Relax-requirement-for-HINT_SUPPORTS_DARK_TEXT.patch b/patches_platform_personal/frameworks_base/0019-UI-Relax-requirement-for-HINT_SUPPORTS_DARK_TEXT.patch index 53fbb41..7d5de7e 100644 --- a/patches_platform_personal/frameworks_base/0019-UI-Relax-requirement-for-HINT_SUPPORTS_DARK_TEXT.patch +++ b/patches_platform_personal/frameworks_base/0019-UI-Relax-requirement-for-HINT_SUPPORTS_DARK_TEXT.patch @@ -1,4 +1,4 @@ -From 83a3672002f098bf37101915387bd13d99ca2b4b Mon Sep 17 00:00:00 2001 +From 6616bcdd57fa5a9f3f482d41ba7667995f083c61 Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Tue, 29 Jun 2021 22:57:01 +0000 Subject: [PATCH 19/21] UI: Relax requirement for HINT_SUPPORTS_DARK_TEXT diff --git a/patches_platform_personal/frameworks_base/0020-UI-Remove-privacy-dot-padding.patch b/patches_platform_personal/frameworks_base/0020-UI-Remove-privacy-dot-padding.patch index 15815d4..8e6160a 100644 --- a/patches_platform_personal/frameworks_base/0020-UI-Remove-privacy-dot-padding.patch +++ b/patches_platform_personal/frameworks_base/0020-UI-Remove-privacy-dot-padding.patch @@ -1,4 +1,4 @@ -From 5efc5dd187e73421399e1190eb22eef2d735b80e Mon Sep 17 00:00:00 2001 +From d329a8c0310ece234f68f1bf271e27b6a3ef948c Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Tue, 19 Oct 2021 12:09:34 +0000 Subject: [PATCH 20/21] UI: Remove privacy dot padding @@ -9,10 +9,10 @@ Change-Id: I5d2e2b3e36f027b4348a83030d4b4d3c4f0209d1 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml -index 790e5d7044b6..06d13fc2b9f3 100644 +index 09dd8ed9ef9d..4515539bb4b4 100644 --- a/packages/SystemUI/res/values/dimens.xml +++ b/packages/SystemUI/res/values/dimens.xml -@@ -960,7 +960,7 @@ +@@ -1002,7 +1002,7 @@ 15dp 7dp diff --git a/patches_platform_personal/frameworks_base/0021-UI-Revert-to-HSL-luminance-for-wallpaper-dark-hints.patch b/patches_platform_personal/frameworks_base/0021-UI-Revert-to-HSL-luminance-for-wallpaper-dark-hints.patch index 8cdc8cc..8d40d72 100644 --- a/patches_platform_personal/frameworks_base/0021-UI-Revert-to-HSL-luminance-for-wallpaper-dark-hints.patch +++ b/patches_platform_personal/frameworks_base/0021-UI-Revert-to-HSL-luminance-for-wallpaper-dark-hints.patch @@ -1,4 +1,4 @@ -From 1d61f2f34fbf2df23f5bb506f86cd6f59675ebb4 Mon Sep 17 00:00:00 2001 +From 12c19b3e96fde96dab5093ac2134ad1453bb59b8 Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Fri, 30 Sep 2022 16:02:16 +0000 Subject: [PATCH 21/21] UI: Revert to HSL luminance for wallpaper dark hints diff --git a/patches_platform_personal/packages_apps_DeskClock/0001-DeskClock-Remove-night-mode.patch b/patches_platform_personal/packages_apps_DeskClock/0001-DeskClock-Remove-night-mode.patch index d69332c..8ffdda0 100644 --- a/patches_platform_personal/packages_apps_DeskClock/0001-DeskClock-Remove-night-mode.patch +++ b/patches_platform_personal/packages_apps_DeskClock/0001-DeskClock-Remove-night-mode.patch @@ -1,4 +1,4 @@ -From 2e7478c72aa7c3b6585ec64bd61d9df6366e1c48 Mon Sep 17 00:00:00 2001 +From 02bc17bb2554380d7f7d76e3adffce05a2ba2444 Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Sun, 5 Sep 2021 00:30:33 +0000 Subject: [PATCH 1/3] DeskClock: Remove night mode diff --git a/patches_platform_personal/packages_apps_DeskClock/0002-DeskClock-Adapt-digital-clocks-to-S-style.patch b/patches_platform_personal/packages_apps_DeskClock/0002-DeskClock-Adapt-digital-clocks-to-S-style.patch index 6f023ad..847f214 100644 --- a/patches_platform_personal/packages_apps_DeskClock/0002-DeskClock-Adapt-digital-clocks-to-S-style.patch +++ b/patches_platform_personal/packages_apps_DeskClock/0002-DeskClock-Adapt-digital-clocks-to-S-style.patch @@ -1,4 +1,4 @@ -From e72a06f095a0363085f32d631597611b96e6c160 Mon Sep 17 00:00:00 2001 +From 2a0ca4dab02447bb8fdabb480ed94de15107e22b Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Wed, 19 Jan 2022 18:04:36 +0000 Subject: [PATCH 2/3] DeskClock: Adapt digital clocks to S style @@ -447,12 +447,12 @@ index 856ef8241..3061e27f6 100644 + 5.5dp diff --git a/res/values/styles.xml b/res/values/styles.xml -index 7ae54c97c..73a800383 100644 +index f57bab2fa..28b68fd55 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml -@@ -187,4 +187,23 @@ - + +