nehemiah-zb/lineage_patches_unified
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Changes for May 2024, syncing up to 20240508

Browse Source
This commit is contained in:
Andy CrossGate Yan 2024-05-25 20:07:30 +08:00
parent e9902a4450
commit 3963eaa06e
300 changed files with 15353 additions and 40472 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
patches_platform/frameworks_base/0001-Disable-FP-lockouts-optionally.patch
View File

@ -1,7 +1,7 @@
From 9d54280afa329e036ba97cd5f39e1371c4beea0a Mon Sep 17 00:00:00 2001 From 92d00894b0d84c8d3fd0a6ba253132ac96402251 Mon Sep 17 00:00:00 2001
From: AndyCGYan <GeForce8800Ultra@gmail.com> From: AndyCGYan <GeForce8800Ultra@gmail.com>
Date: Fri, 22 Mar 2019 00:41:20 +0800 Date: Fri, 22 Mar 2019 00:41:20 +0800
Subject: [PATCH 01/31] Disable FP lockouts optionally Subject: [PATCH 01/34] Disable FP lockouts optionally
Both timed and permanent lockouts - GET THE FUCK OUT Both timed and permanent lockouts - GET THE FUCK OUT
Now targeting LockoutFramework, introduced in Android 12 Now targeting LockoutFramework, introduced in Android 12
@ -13,7 +13,7 @@ Change-Id: I2d4b091f3546d4d7903bfb4d5585629212dc9915
1 file changed, 17 insertions(+), 11 deletions(-) 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 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 36d56c8a1544..7ee15e97a383 100644 index 0730c672acd9..972421758223 100644
--- a/services/core/java/com/android/server/biometrics/sensors/fingerprint/hidl/LockoutFrameworkImpl.java --- 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 +++ b/services/core/java/com/android/server/biometrics/sensors/fingerprint/hidl/LockoutFrameworkImpl.java
@@ -27,6 +27,7 @@ import android.content.IntentFilter; @@ -27,6 +27,7 @@ import android.content.IntentFilter;
@ -32,10 +32,10 @@ index 36d56c8a1544..7ee15e97a383 100644
private final class LockoutReceiver extends BroadcastReceiver { private final class LockoutReceiver extends BroadcastReceiver {
@Override @Override
@@ -105,23 +107,27 @@ public class LockoutFrameworkImpl implements LockoutTracker { @@ -107,24 +109,28 @@ public class LockoutFrameworkImpl implements LockoutTracker {
}
void addFailedAttemptForUser(int userId) { @Override
public void addFailedAttemptForUser(int userId) {
- mFailedAttempts.put(userId, mFailedAttempts.get(userId, 0) + 1); - mFailedAttempts.put(userId, mFailedAttempts.get(userId, 0) + 1);
- mTimedLockoutCleared.put(userId, false); - mTimedLockoutCleared.put(userId, false);
+ if (!SystemProperties.getBoolean(DISABLE_FP_LOCKOUTS_PROPERTY, false)) { + if (!SystemProperties.getBoolean(DISABLE_FP_LOCKOUTS_PROPERTY, false)) {
@ -51,7 +51,8 @@ index 36d56c8a1544..7ee15e97a383 100644
} }
@Override @Override
public @LockoutMode int getLockoutModeForUser(int userId) { @LockoutMode
public int getLockoutModeForUser(int userId) {
- final int failedAttempts = mFailedAttempts.get(userId, 0); - final int failedAttempts = mFailedAttempts.get(userId, 0);
- if (failedAttempts >= MAX_FAILED_ATTEMPTS_LOCKOUT_PERMANENT) { - if (failedAttempts >= MAX_FAILED_ATTEMPTS_LOCKOUT_PERMANENT) {
- return LOCKOUT_PERMANENT; - return LOCKOUT_PERMANENT;

20
patches_platform/frameworks_base/0002-Disable-vendor-mismatch-warning.patch
View File

@ -1,22 +1,21 @@
From cdbb1b13a0c0577db791e0826e55cbd922a3d533 Mon Sep 17 00:00:00 2001 From b3aa7feea26bb5d713a8511f5720f33f0c204002 Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com> From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Thu, 5 Apr 2018 10:01:19 +0800 Date: Thu, 5 Apr 2018 10:01:19 +0800
Subject: [PATCH 02/31] Disable vendor mismatch warning Subject: [PATCH 02/34] Disable vendor mismatch warning
Change-Id: Ieb8fe91e2f02462f074312ed0f4885d183e9780b Change-Id: Ieb8fe91e2f02462f074312ed0f4885d183e9780b
--- ---
.../server/wm/ActivityTaskManagerService.java | 16 ++-------------- .../server/wm/ActivityTaskManagerService.java | 14 +-------------
1 file changed, 2 insertions(+), 14 deletions(-) 1 file changed, 1 insertion(+), 13 deletions(-)
diff --git a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java diff --git a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
index 8382fa97c5c5..a3e37193d513 100644 index ad9ac201e22b..b42e4e2e22dc 100644
--- a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java --- a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
+++ b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java +++ b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
@@ -6116,20 +6116,8 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { @@ -6237,19 +6237,7 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub {
}
if (!Build.isBuildConsistent()) { if (!isBuildConsistent) {
- Slog.e(TAG, "Build fingerprint is not consistent, warning user"); Slog.e(TAG, "Build fingerprint is not consistent, warning user");
- mUiHandler.post(() -> { - mUiHandler.post(() -> {
- if (mShowDialogs) { - if (mShowDialogs) {
- AlertDialog d = new BaseErrorDialog(mUiContext); - AlertDialog d = new BaseErrorDialog(mUiContext);
@ -30,11 +29,10 @@ index 8382fa97c5c5..a3e37193d513 100644
- d.show(); - d.show();
- } - }
- }); - });
+ Slog.e(TAG, "Build fingerprint is not consistent");
+ // Do not emit warning about vendor mismatch + // Do not emit warning about vendor mismatch
} }
} }
} Trace.traceEnd(TRACE_TAG_WINDOW_MANAGER);
-- --
2.34.1 2.34.1

8
patches_platform/frameworks_base/0003-Keyguard-Allow-locking-to-any-rotation-mode.patch
View File

@ -1,7 +1,7 @@
From dc1b9d58a7f5522fb1c5b7155b52c733b9f5080d Mon Sep 17 00:00:00 2001 From e492a141400c534bfc1f08b904e7e7f60e92164e Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com> From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Sun, 21 Jan 2024 22:03:47 +0800 Date: Sun, 21 Jan 2024 22:03:47 +0800
Subject: [PATCH 03/31] Keyguard: Allow locking to any rotation mode Subject: [PATCH 03/34] Keyguard: Allow locking to any rotation mode
Change-Id: I0f12c433f3547e9bfcdbc2cf50e2a4f3ec8ca311 Change-Id: I0f12c433f3547e9bfcdbc2cf50e2a4f3ec8ca311
--- ---
@ -9,10 +9,10 @@ Change-Id: I0f12c433f3547e9bfcdbc2cf50e2a4f3ec8ca311
1 file changed, 3 insertions(+), 6 deletions(-) 1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/packages/SystemUI/src/com/android/systemui/shade/NotificationShadeWindowControllerImpl.java b/packages/SystemUI/src/com/android/systemui/shade/NotificationShadeWindowControllerImpl.java diff --git a/packages/SystemUI/src/com/android/systemui/shade/NotificationShadeWindowControllerImpl.java b/packages/SystemUI/src/com/android/systemui/shade/NotificationShadeWindowControllerImpl.java
index 2ebe2bcf7099..6e51746c6ea7 100644 index b4082694bbe5..f9f3dd911a74 100644
--- a/packages/SystemUI/src/com/android/systemui/shade/NotificationShadeWindowControllerImpl.java --- a/packages/SystemUI/src/com/android/systemui/shade/NotificationShadeWindowControllerImpl.java
+++ b/packages/SystemUI/src/com/android/systemui/shade/NotificationShadeWindowControllerImpl.java +++ b/packages/SystemUI/src/com/android/systemui/shade/NotificationShadeWindowControllerImpl.java
@@ -382,12 +382,9 @@ public class NotificationShadeWindowControllerImpl implements NotificationShadeW @@ -431,12 +431,9 @@ public class NotificationShadeWindowControllerImpl implements NotificationShadeW
} }
private void adjustScreenOrientation(NotificationShadeWindowState state) { private void adjustScreenOrientation(NotificationShadeWindowState state) {

12
patches_platform/frameworks_base/0004-Keyguard-Fix-colors-of-slices-not-updating-on-doze.patch
View File

@ -1,7 +1,7 @@
From 966dbb52453bb6bd3d301a23c6ab4101951a2489 Mon Sep 17 00:00:00 2001 From beea20462b965e2c790549f7d854ed71b46b54e9 Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com> From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Tue, 17 Jan 2023 17:19:19 +0000 Date: Tue, 17 Jan 2023 17:19:19 +0000
Subject: [PATCH 04/31] Keyguard: Fix colors of slices not updating on doze Subject: [PATCH 04/34] Keyguard: Fix colors of slices not updating on doze
Slices were invisible (black) in doze when using light wallpapers Slices were invisible (black) in doze when using light wallpapers
Introduced in https://github.com/LineageOS/android_frameworks_base/commit/a19e59d717ec6d573c11c7e8277bba3c4de189c2 Introduced in https://github.com/LineageOS/android_frameworks_base/commit/a19e59d717ec6d573c11c7e8277bba3c4de189c2
@ -13,10 +13,10 @@ Change-Id: I06abd8bf2e28655cc9e6d81366fd82a13454ec5a
2 files changed, 8 insertions(+) 2 files changed, 8 insertions(+)
diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardStatusViewController.java b/packages/SystemUI/src/com/android/keyguard/KeyguardStatusViewController.java diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardStatusViewController.java b/packages/SystemUI/src/com/android/keyguard/KeyguardStatusViewController.java
index c314586e4a21..5262a2c04c00 100644 index 2a54a4eee657..de2d1ec89b61 100644
--- a/packages/SystemUI/src/com/android/keyguard/KeyguardStatusViewController.java --- a/packages/SystemUI/src/com/android/keyguard/KeyguardStatusViewController.java
+++ b/packages/SystemUI/src/com/android/keyguard/KeyguardStatusViewController.java +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardStatusViewController.java
@@ -207,6 +207,13 @@ public class KeyguardStatusViewController extends ViewController<KeyguardStatusV @@ -297,6 +297,13 @@ public class KeyguardStatusViewController extends ViewController<KeyguardStatusV
mKeyguardSliceViewController.refresh(); mKeyguardSliceViewController.refresh();
} }
@ -31,10 +31,10 @@ index c314586e4a21..5262a2c04c00 100644
* Set which clock should be displayed on the keyguard. The other one will be automatically * Set which clock should be displayed on the keyguard. The other one will be automatically
* hidden. * hidden.
diff --git a/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java b/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java diff --git a/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java b/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java
index 87eeff2c3157..8d531913b3c0 100644 index 6aa11143f21e..b0ae87580292 100644
--- a/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java --- a/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java
+++ b/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java +++ b/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java
@@ -4637,6 +4637,7 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump @@ -4551,6 +4551,7 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump
public void onDozeAmountChanged(float linearAmount, float amount) { public void onDozeAmountChanged(float linearAmount, float amount) {
mInterpolatedDarkAmount = amount; mInterpolatedDarkAmount = amount;
mLinearDarkAmount = linearAmount; mLinearDarkAmount = linearAmount;

8
patches_platform/frameworks_base/0005-UI-Adjust-default-navbar-layouts.patch
View File

@ -1,7 +1,7 @@
From 2ef56aadc11858d1cddad3a4b0083a3708d6528c Mon Sep 17 00:00:00 2001 From 5ee95318ee1be083a2a2569be7362fcafd8fbc94 Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com> From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Sat, 16 Oct 2021 02:23:48 +0000 Date: Sat, 16 Oct 2021 02:23:48 +0000
Subject: [PATCH 05/31] UI: Adjust default navbar layouts Subject: [PATCH 05/34] UI: Adjust default navbar layouts
- Slightly tighten nodpi layout - Slightly tighten nodpi layout
- Remove sw372dp layout - looks terrible, probably meant for legacy phablets, but most modern phones qualify - Remove sw372dp layout - looks terrible, probably meant for legacy phablets, but most modern phones qualify
@ -45,10 +45,10 @@ index 07b797a32428..000000000000
- <string name="config_navBarLayout" translatable="false">left[.25W],back[.5WC];home;recent[.5WC],right[.25W]</string> - <string name="config_navBarLayout" translatable="false">left[.25W],back[.5WC];home;recent[.5WC],right[.25W]</string>
-</resources> -</resources>
diff --git a/packages/SystemUI/res/values/config.xml b/packages/SystemUI/res/values/config.xml diff --git a/packages/SystemUI/res/values/config.xml b/packages/SystemUI/res/values/config.xml
index f530d0d6e06f..9cd22313e0a1 100644 index 038e9da33b83..4791ad8969f0 100644
--- a/packages/SystemUI/res/values/config.xml --- a/packages/SystemUI/res/values/config.xml
+++ b/packages/SystemUI/res/values/config.xml +++ b/packages/SystemUI/res/values/config.xml
@@ -315,7 +315,7 @@ @@ -325,7 +325,7 @@
</string-array> </string-array>
<!-- Nav bar button default ordering/layout --> <!-- Nav bar button default ordering/layout -->

10
patches_platform/frameworks_base/0006-UI-Adjust-split-screen-divider.patch
View File

@ -1,7 +1,7 @@
From 78487f8b35969298a76f61ae71651f537fe8e90e Mon Sep 17 00:00:00 2001 From 5b8bc8a9cf51ed8fb40101b7a5234fccaee36327 Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com> From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Sat, 19 Mar 2022 09:22:24 +0000 Date: Sat, 19 Mar 2022 09:22:24 +0000
Subject: [PATCH 06/31] UI: Adjust split-screen divider Subject: [PATCH 06/34] UI: Adjust split-screen divider
- Kill rounded corners - where two rectangles collide should be perfectly straight - Kill rounded corners - where two rectangles collide should be perfectly straight
- Make it black (pre-Sv2) for phones - Make it black (pre-Sv2) for phones
@ -150,7 +150,7 @@ index 000000000000..8a1907da76e5
+ <color name="split_divider_background">@color/taskbar_background</color> + <color name="split_divider_background">@color/taskbar_background</color>
+</resources> +</resources>
diff --git a/libs/WindowManager/Shell/res/values/colors.xml b/libs/WindowManager/Shell/res/values/colors.xml diff --git a/libs/WindowManager/Shell/res/values/colors.xml b/libs/WindowManager/Shell/res/values/colors.xml
index b2ec98bc1b15..b21a6f50c9ab 100644 index fae71efe3b39..fb50f0119b43 100644
--- a/libs/WindowManager/Shell/res/values/colors.xml --- a/libs/WindowManager/Shell/res/values/colors.xml
+++ b/libs/WindowManager/Shell/res/values/colors.xml +++ b/libs/WindowManager/Shell/res/values/colors.xml
@@ -18,7 +18,7 @@ @@ -18,7 +18,7 @@
@ -163,10 +163,10 @@ index b2ec98bc1b15..b21a6f50c9ab 100644
<color name="minimize_dock_shadow_start">#60000000</color> <color name="minimize_dock_shadow_start">#60000000</color>
<color name="minimize_dock_shadow_end">#00000000</color> <color name="minimize_dock_shadow_end">#00000000</color>
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 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 755dba0c895f..9a2c9bfdab5d 100644 index 53caddb52f23..fae5008283cc 100644
--- a/libs/WindowManager/Shell/src/com/android/wm/shell/common/split/SplitLayout.java --- 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 +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/common/split/SplitLayout.java
@@ -157,23 +157,8 @@ public final class SplitLayout implements DisplayInsetsController.OnInsetsChange @@ -168,23 +168,8 @@ public final class SplitLayout implements DisplayInsetsController.OnInsetsChange
} }
private void updateDividerConfig(Context context) { private void updateDividerConfig(Context context) {

8
patches_platform/frameworks_base/0007-UI-Disable-wallpaper-zoom.patch
View File

@ -1,7 +1,7 @@
From 2df74582c930fc05aa5eeed48ed766d74652bf45 Mon Sep 17 00:00:00 2001 From f9879e5977ca089dae074c63e609a2a5bc734199 Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com> From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Sun, 10 Jan 2021 11:44:29 +0000 Date: Sun, 10 Jan 2021 11:44:29 +0000
Subject: [PATCH 07/31] UI: Disable wallpaper zoom Subject: [PATCH 07/34] UI: Disable wallpaper zoom
It does little more than inducing motion sickness It does little more than inducing motion sickness
@ -11,10 +11,10 @@ Change-Id: I78cc5484930b27f172cd8d8a5bd9042dce3478d0
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
index 04a69f8c1e6d..15c4a37b76cd 100644 index 3bc33bac37bc..369eb84ccd84 100644
--- a/core/res/res/values/config.xml --- a/core/res/res/values/config.xml
+++ b/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml
@@ -5534,7 +5534,7 @@ @@ -5768,7 +5768,7 @@
<item name="config_wallpaperMinScale" format="float" type="dimen">1</item> <item name="config_wallpaperMinScale" format="float" type="dimen">1</item>
<!-- The max scale for the wallpaper when it's zoomed in --> <!-- The max scale for the wallpaper when it's zoomed in -->

8
patches_platform/frameworks_base/0008-UI-Follow-Monet-and-light-dark-theme-in-user-1-icon.patch
View File

@ -1,7 +1,7 @@
From 1f5882a5305f1a5e01ebfcd3cc7fb30faaa69074 Mon Sep 17 00:00:00 2001 From 2ffb66fa7c00b63536c3de706bd6e36b2b696512 Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com> From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Sun, 25 Sep 2022 02:20:52 +0000 Date: Sun, 25 Sep 2022 02:20:52 +0000
Subject: [PATCH 08/31] UI: Follow Monet and light/dark theme in user 1 icon Subject: [PATCH 08/34] UI: Follow Monet and light/dark theme in user 1 icon
Change-Id: I755077c6003c39ddc9428da1defe6a6ddd0e5ff8 Change-Id: I755077c6003c39ddc9428da1defe6a6ddd0e5ff8
--- ---
@ -22,10 +22,10 @@ index d3f998fb70cf..4f7b9e093bb7 100644
<color name="user_icon_6">#ff4ecde6</color><!-- cyan --> <color name="user_icon_6">#ff4ecde6</color><!-- cyan -->
<color name="user_icon_7">#fffbbc04</color><!-- yellow --> <color name="user_icon_7">#fffbbc04</color><!-- yellow -->
diff --git a/core/res/res/values/colors.xml b/core/res/res/values/colors.xml diff --git a/core/res/res/values/colors.xml b/core/res/res/values/colors.xml
index a6830a6e3793..bbeb4e371018 100644 index eddd81e78692..00cf4243cfa9 100644
--- a/core/res/res/values/colors.xml --- a/core/res/res/values/colors.xml
+++ b/core/res/res/values/colors.xml +++ b/core/res/res/values/colors.xml
@@ -176,7 +176,7 @@ @@ -177,7 +177,7 @@
<color name="system_notification_accent_color">#00000000</color> <color name="system_notification_accent_color">#00000000</color>
<!-- Default user icon colors --> <!-- Default user icon colors -->

40
patches_platform/frameworks_base/0009-UI-Hide-QS-footer-background.patch Normal file
View File

@ -0,0 +1,40 @@
From 17eb4477f1607ea91917ddce4137d7e337d3037b Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Thu, 4 Apr 2024 18:19:19 +0800
Subject: [PATCH 09/34] UI: Hide QS footer background
Change-Id: I4d83037e9206dec4181f9b0acd302114fa4a98c1
---
.../com/android/systemui/qs/footer/ui/compose/FooterActions.kt | 2 +-
packages/SystemUI/res/drawable/qs_footer_actions_background.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/packages/SystemUI/compose/features/src/com/android/systemui/qs/footer/ui/compose/FooterActions.kt b/packages/SystemUI/compose/features/src/com/android/systemui/qs/footer/ui/compose/FooterActions.kt
index eb71490f049a..8242afefc56b 100644
--- a/packages/SystemUI/compose/features/src/com/android/systemui/qs/footer/ui/compose/FooterActions.kt
+++ b/packages/SystemUI/compose/features/src/com/android/systemui/qs/footer/ui/compose/FooterActions.kt
@@ -119,7 +119,7 @@ fun FooterActions(
}
}
- val backgroundColor = colorAttr(R.attr.underSurface)
+ val backgroundColor = colorAttr(android.R.color.transparent)
val contentColor = LocalAndroidColorScheme.current.onSurface
val backgroundTopRadius = dimensionResource(R.dimen.qs_corner_radius)
val backgroundModifier =
diff --git a/packages/SystemUI/res/drawable/qs_footer_actions_background.xml b/packages/SystemUI/res/drawable/qs_footer_actions_background.xml
index a7e8762a2593..6bfa8f75de03 100644
--- a/packages/SystemUI/res/drawable/qs_footer_actions_background.xml
+++ b/packages/SystemUI/res/drawable/qs_footer_actions_background.xml
@@ -15,7 +15,7 @@
-->
<inset xmlns:android="http://schemas.android.com/apk/res/android">
<shape>
- <solid android:color="?attr/underSurface"/>
+ <solid android:color="@android:color/transparent"/>
<corners android:topLeftRadius="@dimen/qs_corner_radius"
android:topRightRadius="@dimen/qs_corner_radius"/>
</shape>
--
2.34.1

6
patches_platform/frameworks_base/0009-UI-Increase-default-status-bar-height.patch → patches_platform/frameworks_base/0010-UI-Increase-default-status-bar-height.patch
View File

@ -1,7 +1,7 @@
From 0f62a57ac11e78a3595ba7598f151e7fd891e7c1 Mon Sep 17 00:00:00 2001 From 0e9361f835650e386bb6b797ebb1b6852d40c762 Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com> From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Wed, 3 Jun 2020 01:31:34 +0000 Date: Wed, 3 Jun 2020 01:31:34 +0000
Subject: [PATCH 09/31] UI: Increase default status bar height Subject: [PATCH 10/34] UI: Increase default status bar height
Change-Id: Ibbcf63159e19bb2bb2b1094ea07ab85917630b07 Change-Id: Ibbcf63159e19bb2bb2b1094ea07ab85917630b07
--- ---
@ -9,7 +9,7 @@ Change-Id: Ibbcf63159e19bb2bb2b1094ea07ab85917630b07
1 file changed, 2 insertions(+), 2 deletions(-) 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/core/res/res/values/dimens.xml b/core/res/res/values/dimens.xml diff --git a/core/res/res/values/dimens.xml b/core/res/res/values/dimens.xml
index 190b7a62e2e0..32589b542a1d 100644 index 96c4bf432c05..a086f16c769e 100644
--- a/core/res/res/values/dimens.xml --- a/core/res/res/values/dimens.xml
+++ b/core/res/res/values/dimens.xml +++ b/core/res/res/values/dimens.xml
@@ -41,7 +41,7 @@ @@ -41,7 +41,7 @@

26
patches_platform/frameworks_base/0010-UI-Remove-QS-footer-background.patch
View File

@ -1,26 +0,0 @@
From 7efb158bc07f7366ff2d2d92752e663e16c9e03d Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Sun, 25 Sep 2022 02:20:20 +0000
Subject: [PATCH 10/31] UI: Remove QS footer background
Change-Id: I68e82e0c5e3eddb2d3f767fe792b1436eae506ef
---
packages/SystemUI/res-keyguard/layout/footer_actions.xml | 1 -
1 file changed, 1 deletion(-)
diff --git a/packages/SystemUI/res-keyguard/layout/footer_actions.xml b/packages/SystemUI/res-keyguard/layout/footer_actions.xml
index 4a2a1cb9dc6d..b7f30d9e4344 100644
--- a/packages/SystemUI/res-keyguard/layout/footer_actions.xml
+++ b/packages/SystemUI/res-keyguard/layout/footer_actions.xml
@@ -23,7 +23,6 @@
android:elevation="@dimen/qs_panel_elevation"
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|end"
android:layout_gravity="bottom"
/>
\ No newline at end of file
--
2.34.1

82
patches_platform/frameworks_base/0011-UI-Revive-navbar-layout-tuning-via-sysui_nav_bar-tun.patch Normal file
View File

@ -0,0 +1,82 @@
From 635207ed57659f3c89cfa144de981706c569d9c8 Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Tue, 6 Oct 2020 01:41:16 +0000
Subject: [PATCH 11/34] UI: Revive navbar layout tuning via sysui_nav_bar
tunable
Google keeps fixing what ain't broken.
Change-Id: Ied7d7859e50fd0fcc346219964e747c5d5f4c352
---
.../NavigationBarInflaterView.java | 21 +++++++++++++++++++
1 file changed, 21 insertions(+)
diff --git a/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarInflaterView.java b/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarInflaterView.java
index 73ca35557133..bbb312c4e56b 100644
--- a/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarInflaterView.java
+++ b/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarInflaterView.java
@@ -135,6 +135,7 @@ public class NavigationBarInflaterView extends FrameLayout {
private boolean mInverseLayout;
private boolean mIsHintEnabled;
+ private boolean mUsingCustomLayout;
private final ContentObserver mContentObserver;
@@ -159,6 +160,9 @@ public class NavigationBarInflaterView extends FrameLayout {
mContext.getMainExecutor().execute(() -> {
onLikelyDefaultLayoutChange();
});
+ } else if (Settings.Secure.getUriFor(NAV_BAR_VIEWS).equals(uri)) {
+ setNavigationBarLayout(Settings.Secure.getString(mContext.getContentResolver(),
+ NAV_BAR_VIEWS));
}
}
};
@@ -215,12 +219,16 @@ public class NavigationBarInflaterView extends FrameLayout {
Uri navBarInverse = Settings.Secure.getUriFor(NAV_BAR_INVERSE);
Uri navigationBarHint = LineageSettings.System.getUriFor(
LineageSettings.System.NAVIGATION_BAR_HINT);
+ Uri navBarViews = Settings.Secure.getUriFor(NAV_BAR_VIEWS);
mContext.getContentResolver().registerContentObserver(navBarInverse, false,
mContentObserver);
mContext.getContentResolver().registerContentObserver(navigationBarHint, false,
mContentObserver);
+ mContext.getContentResolver().registerContentObserver(navBarViews, false,
+ mContentObserver);
mContentObserver.onChange(true, navBarInverse);
mContentObserver.onChange(true, navigationBarHint);
+ mContentObserver.onChange(true, navBarViews);
}
@Override
@@ -237,6 +245,9 @@ public class NavigationBarInflaterView extends FrameLayout {
}
public void onLikelyDefaultLayoutChange() {
+ // Don't override custom layouts
+ if (mUsingCustomLayout) return;
+
// Reevaluate new layout
final String newValue = getDefaultLayout();
if (!Objects.equals(mCurrentLayout, newValue)) {
@@ -245,6 +256,16 @@ public class NavigationBarInflaterView extends FrameLayout {
}
}
+ public void setNavigationBarLayout(String layoutValue) {
+ mContext.getMainExecutor().execute(() -> {
+ if (!Objects.equals(mCurrentLayout, layoutValue)) {
+ mUsingCustomLayout = layoutValue != null;
+ clearViews();
+ inflateLayout(layoutValue);
+ }
+ });
+ }
+
public void setButtonDispatchers(SparseArray<ButtonDispatcher> buttonDispatchers) {
mButtonDispatchers = buttonDispatchers;
clearDispatcherViews();
--
2.34.1

8
patches_platform/frameworks_base/0011-UI-Use-SNAP_FIXED_RATIO-for-multi-window-globally.patch → patches_platform/frameworks_base/0012-UI-Use-SNAP_FIXED_RATIO-for-multi-window-globally.patch
View File

@ -1,7 +1,7 @@
From 1edb91ecfa56336cc94aa2bd49c1a3e07274447a Mon Sep 17 00:00:00 2001 From b2ca16f3b497b0f69e125eb9f47f2324d2a2019e Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com> From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Sun, 26 Apr 2020 08:56:13 +0000 Date: Sun, 26 Apr 2020 08:56:13 +0000
Subject: [PATCH 11/31] UI: Use SNAP_FIXED_RATIO for multi-window globally Subject: [PATCH 12/34] UI: Use SNAP_FIXED_RATIO for multi-window globally
Enables multiple snap targets under landscape for phone UI Enables multiple snap targets under landscape for phone UI
@ -78,10 +78,10 @@ index 34b6a54be493..3921c9edfeac 100644
Only applies if the device display is not square. --> Only applies if the device display is not square. -->
<bool name="config_navBarCanMove">false</bool> <bool name="config_navBarCanMove">false</bool>
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
index 15c4a37b76cd..43dbb1513f8a 100644 index 369eb84ccd84..c223ec0d6ed0 100644
--- a/core/res/res/values/config.xml --- a/core/res/res/values/config.xml
+++ b/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml
@@ -4081,7 +4081,7 @@ @@ -4203,7 +4203,7 @@
1 - 3 snap targets: fixed ratio, 1:1, (1 - fixed ratio) 1 - 3 snap targets: fixed ratio, 1:1, (1 - fixed ratio)
2 - 1 snap target: 1:1 2 - 1 snap target: 1:1
--> -->

8
patches_platform/frameworks_base/0012-core-Remove-old-app-target-SDK-dialog.patch → patches_platform/frameworks_base/0013-core-Remove-old-app-target-SDK-dialog.patch
View File

@ -1,7 +1,7 @@
From 5dbac2415145bea20ff01debbe03e815bce09334 Mon Sep 17 00:00:00 2001 From 77275322ff6606110bec9f11bbdc90932ab1fded Mon Sep 17 00:00:00 2001
From: Danny Lin <danny@kdrag0n.dev> From: Danny Lin <danny@kdrag0n.dev>
Date: Tue, 3 Nov 2020 22:43:12 -0800 Date: Tue, 3 Nov 2020 22:43:12 -0800
Subject: [PATCH 12/31] core: Remove old app target SDK dialog Subject: [PATCH 13/34] core: Remove old app target SDK dialog
If an app is old, users should already know that, and there's usually no 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 point in warning them about it because they would already be using a
@ -15,10 +15,10 @@ Change-Id: I1a3021f0f9bec1ab6ff7641776391e1bd4c3cc49
1 file changed, 1 deletion(-) 1 file changed, 1 deletion(-)
diff --git a/services/core/java/com/android/server/wm/AppWarnings.java b/services/core/java/com/android/server/wm/AppWarnings.java diff --git a/services/core/java/com/android/server/wm/AppWarnings.java b/services/core/java/com/android/server/wm/AppWarnings.java
index 0273a30e157c..d54aadfd6d24 100644 index ad5f4427fbc4..94ccee7b4771 100644
--- a/services/core/java/com/android/server/wm/AppWarnings.java --- a/services/core/java/com/android/server/wm/AppWarnings.java
+++ b/services/core/java/com/android/server/wm/AppWarnings.java +++ b/services/core/java/com/android/server/wm/AppWarnings.java
@@ -206,7 +206,6 @@ class AppWarnings { @@ -210,7 +210,6 @@ class AppWarnings {
public void onStartActivity(ActivityRecord r) { public void onStartActivity(ActivityRecord r) {
showUnsupportedCompileSdkDialogIfNeeded(r); showUnsupportedCompileSdkDialogIfNeeded(r);
showUnsupportedDisplaySizeDialogIfNeeded(r); showUnsupportedDisplaySizeDialogIfNeeded(r);

163
patches_platform/frameworks_base/0014-Add-support-for-app-signature-spoofing.patch
View File

@ -1,163 +0,0 @@
From 1001116630f817f53c2b6adbe51499ca6ff6ab4f Mon Sep 17 00:00:00 2001
From: Danny Lin <danny@kdrag0n.dev>
Date: Sat, 16 Oct 2021 05:27:57 -0700
Subject: [PATCH 14/31] 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
to make sure it matches Google's official certificate.
This was forward-ported from the Android 10 patch by gudenau:
https://github.com/microg/android_packages_apps_GmsCore/pull/957
Changes made for Android 11:
- Updated PackageInfo calls
- Added new permission to public API surface, needed for
PermissionController which is now an updatable APEX on 11
- Added a dummy permission group to allow users to manage the
permission through the PermissionController UI
(by Vachounet <vachounet@live.fr>)
- Updated location provider comment for conciseness
Changes made for Android 12:
- Moved mayFakeSignature into lock-free Computer subclass
- Always get permissions for packages that request signature spoofing
(otherwise permissions are usually ommitted and thus the permission
check doesn't work properly)
- Optimize mayFakeSignature check order to improve performance
Changes made for Android 13:
- Computer subclass is now an independent class.
Change-Id: Ied7d6ce0b83a2d2345c3abba0429998d86494a88
---
core/api/current.txt | 2 ++
core/res/AndroidManifest.xml | 15 ++++++++++
core/res/res/values/strings.xml | 12 ++++++++
.../com/android/server/pm/ComputerEngine.java | 30 +++++++++++++++++--
4 files changed, 56 insertions(+), 3 deletions(-)
diff --git a/core/api/current.txt b/core/api/current.txt
index 288ab479c0fb..2124d89c6e6f 100644
--- a/core/api/current.txt
+++ b/core/api/current.txt
@@ -95,6 +95,7 @@ package android {
field public static final String EXECUTE_APP_ACTION = "android.permission.EXECUTE_APP_ACTION";
field public static final String EXPAND_STATUS_BAR = "android.permission.EXPAND_STATUS_BAR";
field public static final String FACTORY_TEST = "android.permission.FACTORY_TEST";
+ field public static final String FAKE_PACKAGE_SIGNATURE = "android.permission.FAKE_PACKAGE_SIGNATURE";
field public static final String FOREGROUND_SERVICE = "android.permission.FOREGROUND_SERVICE";
field public static final String FOREGROUND_SERVICE_CAMERA = "android.permission.FOREGROUND_SERVICE_CAMERA";
field public static final String FOREGROUND_SERVICE_CONNECTED_DEVICE = "android.permission.FOREGROUND_SERVICE_CONNECTED_DEVICE";
@@ -326,6 +327,7 @@ package android {
field public static final String CALL_LOG = "android.permission-group.CALL_LOG";
field public static final String CAMERA = "android.permission-group.CAMERA";
field public static final String CONTACTS = "android.permission-group.CONTACTS";
+ field public static final String FAKE_PACKAGE = "android.permission-group.FAKE_PACKAGE";
field public static final String LOCATION = "android.permission-group.LOCATION";
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 14cb052b121f..09dc7b293b73 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -4258,6 +4258,21 @@
android:description="@string/permdesc_getPackageSize"
android:protectionLevel="normal" />
+ <!-- Dummy user-facing group for faking package signature -->
+ <permission-group android:name="android.permission-group.FAKE_PACKAGE"
+ android:label="@string/permgrouplab_fake_package_signature"
+ android:description="@string/permgroupdesc_fake_package_signature"
+ android:request="@string/permgrouprequest_fake_package_signature"
+ android:priority="100" />
+
+ <!-- Allows an application to change the package signature as
+ seen by applications -->
+ <permission android:name="android.permission.FAKE_PACKAGE_SIGNATURE"
+ android:permissionGroup="android.permission-group.UNDEFINED"
+ android:protectionLevel="signature|privileged"
+ android:label="@string/permlab_fakePackageSignature"
+ android:description="@string/permdesc_fakePackageSignature" />
+
<!-- @deprecated No longer useful, see
{@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 9c018c30f9e3..966fec172070 100644
--- a/core/res/res/values/strings.xml
+++ b/core/res/res/values/strings.xml
@@ -991,6 +991,18 @@
<!-- Permissions -->
+ <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+ <string name="permlab_fakePackageSignature">Spoof package signature</string>
+ <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+ <string name="permdesc_fakePackageSignature">Allows the app to pretend to be a different app. Malicious applications might be able to use this to access private application data. Legitimate uses include an emulator pretending to be what it emulates. Grant this permission with caution only!</string>
+ <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+ <string name="permgrouplab_fake_package_signature">Spoof package signature</string>
+ <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+ <string name="permgroupdesc_fake_package_signature">allow to spoof package signature</string>
+ <!-- Message shown to the user when the apps requests permission from this group. If ever possible this should stay below 80 characters (assuming the parameters takes 20 characters). Don't abbreviate until the message reaches 120 characters though. [CHAR LIMIT=120] -->
+ <string name="permgrouprequest_fake_package_signature">Allow
+ &lt;b><xliff:g id="app_name" example="Gmail">%1$s</xliff:g>&lt;/b> to spoof package signature?</string>
+
<!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
<string name="permlab_statusBar">disable or modify status bar</string>
<!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
diff --git a/services/core/java/com/android/server/pm/ComputerEngine.java b/services/core/java/com/android/server/pm/ComputerEngine.java
index 78f1fa60b69f..fb2f7da97cda 100644
--- a/services/core/java/com/android/server/pm/ComputerEngine.java
+++ b/services/core/java/com/android/server/pm/ComputerEngine.java
@@ -1450,6 +1450,29 @@ public class ComputerEngine implements Computer {
return result;
}
+ private boolean requestsFakeSignature(AndroidPackage p) {
+ return p.getMetaData() != null &&
+ p.getMetaData().getString("fake-signature") != null;
+ }
+
+ private PackageInfo mayFakeSignature(AndroidPackage p, PackageInfo pi,
+ Set<String> permissions) {
+ try {
+ if (p.getMetaData() != null &&
+ p.getTargetSdkVersion() > Build.VERSION_CODES.LOLLIPOP_MR1) {
+ String sig = p.getMetaData().getString("fake-signature");
+ if (sig != null &&
+ permissions.contains("android.permission.FAKE_PACKAGE_SIGNATURE")) {
+ pi.signatures = new Signature[] {new Signature(sig)};
+ }
+ }
+ } catch (Throwable t) {
+ // We should never die because of any failures, this is system code!
+ Log.w("PackageManagerService.FAKE_PACKAGE_SIGNATURE", t);
+ }
+ return pi;
+ }
+
public final PackageInfo generatePackageInfo(PackageStateInternal ps,
@PackageManager.PackageInfoFlagsBits long flags, int userId) {
if (!mUserManager.exists(userId)) return null;
@@ -1483,13 +1506,14 @@ public class ComputerEngine implements Computer {
|| ArrayUtils.isEmpty(p.getPermissions())) ? Collections.emptySet()
: mPermissionManager.getInstalledPermissions(ps.getPackageName());
// Compute granted permissions only if package has requested permissions
- final Set<String> grantedPermissions = ((flags & PackageManager.GET_PERMISSIONS) == 0
+ final Set<String> grantedPermissions = (((flags & PackageManager.GET_PERMISSIONS) == 0
+ && !requestsFakeSignature(p))
|| ArrayUtils.isEmpty(p.getRequestedPermissions())) ? Collections.emptySet()
: mPermissionManager.getGrantedPermissions(ps.getPackageName(), userId);
- PackageInfo packageInfo = PackageInfoUtils.generate(p, gids, flags,
+ PackageInfo packageInfo = mayFakeSignature(p, PackageInfoUtils.generate(p, gids, flags,
state.getFirstInstallTimeMillis(), ps.getLastUpdateTime(), installedPermissions,
- grantedPermissions, state, userId, ps);
+ grantedPermissions, state, userId, ps), grantedPermissions);
if (packageInfo == null) {
return null;
--
2.34.1

8
patches_platform/frameworks_base/0013-Paint-Enable-subpixel-text-positioning-by-default.patch → patches_platform/frameworks_base/0014-Paint-Enable-subpixel-text-positioning-by-default.patch
View File

@ -1,7 +1,7 @@
From 11a651e734f3b32ca60f6a17d7b8a1f11cca5800 Mon Sep 17 00:00:00 2001 From 4639be840945f29ba14ed58de8c2f538e2f487fb Mon Sep 17 00:00:00 2001
From: Danny Lin <danny@kdrag0n.dev> From: Danny Lin <danny@kdrag0n.dev>
Date: Tue, 5 Oct 2021 21:01:50 -0700 Date: Tue, 5 Oct 2021 21:01:50 -0700
Subject: [PATCH 13/31] Paint: Enable subpixel text positioning by default Subject: [PATCH 14/34] Paint: Enable subpixel text positioning by default
On desktop Linux, subpixel text positioning is necessary to avoid On desktop Linux, subpixel text positioning is necessary to avoid
kerning issues, and Android is no different. Even though most phone kerning issues, and Android is no different. Even though most phone
@ -24,10 +24,10 @@ Change-Id: I8d71e5848a745c5a2d457a28c68458920928ee09
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/graphics/java/android/graphics/Paint.java b/graphics/java/android/graphics/Paint.java diff --git a/graphics/java/android/graphics/Paint.java b/graphics/java/android/graphics/Paint.java
index d35dcab11f49..e4e814a1c941 100644 index f10cdb82022e..a083c723f9c3 100644
--- a/graphics/java/android/graphics/Paint.java --- a/graphics/java/android/graphics/Paint.java
+++ b/graphics/java/android/graphics/Paint.java +++ b/graphics/java/android/graphics/Paint.java
@@ -260,7 +260,7 @@ public class Paint { @@ -266,7 +266,7 @@ public class Paint {
// These flags are always set on a new/reset paint, even if flags 0 is passed. // These flags are always set on a new/reset paint, even if flags 0 is passed.
static final int HIDDEN_DEFAULT_PAINT_FLAGS = DEV_KERN_TEXT_FLAG | EMBEDDED_BITMAP_TEXT_FLAG static final int HIDDEN_DEFAULT_PAINT_FLAGS = DEV_KERN_TEXT_FLAG | EMBEDDED_BITMAP_TEXT_FLAG

28
patches_platform/frameworks_base/0015-Remove-debuggable-requirement-for-signature-spoofing.patch Normal file
View File

@ -0,0 +1,28 @@
From 33ea20cb105c85d2c7bc0bab20c5d87ecf2d3df6 Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Sun, 17 Mar 2024 17:10:38 +0800
Subject: [PATCH 15/34] Remove debuggable requirement for signature spoofing
Change-Id: I8d637ddbbd117a9c5b1d9c5e462b0f4b30d98333
---
services/core/java/com/android/server/pm/ComputerEngine.java | 4 ----
1 file changed, 4 deletions(-)
diff --git a/services/core/java/com/android/server/pm/ComputerEngine.java b/services/core/java/com/android/server/pm/ComputerEngine.java
index d8cbe9d5e7c7..13af78f56462 100644
--- a/services/core/java/com/android/server/pm/ComputerEngine.java
+++ b/services/core/java/com/android/server/pm/ComputerEngine.java
@@ -1472,10 +1472,6 @@ public class ComputerEngine implements Computer {
private static native boolean isDebuggable();
public static boolean isMicrogSigned(AndroidPackage p) {
- if (!isDebuggable()) {
- return false;
- }
-
// Allowlist the following apps:
// * com.android.vending - microG Companion
// * com.google.android.gms - microG Services
--
2.34.1

879
patches_platform/frameworks_base/0016-Revert-Update-SystemUI-to-new-notification-color-spe.patch Normal file
View File

@ -0,0 +1,879 @@
From c650743c1e67f48640774af517a2ce77f04e1141 Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Thu, 4 Apr 2024 18:26:02 +0800
Subject: [PATCH 16/34] Revert "Update SystemUI to new notification color spec"
This reverts commit db2c5554ac653567d1433d3ff99328c5d855c233.
Change-Id: Iddbe46f4d01d05d6579c1e8b9dab266dd605e199
---
...ication_guts_priority_button_bg_stroke.xml | 5 ++--
.../notification_guts_priority_contents.xml | 5 ++--
.../SystemUI/res/color/remote_input_hint.xml | 5 ++--
.../SystemUI/res/color/remote_input_send.xml | 7 ++---
.../SystemUI/res/color/remote_input_text.xml | 7 ++---
.../drawable/notif_footer_btn_background.xml | 2 +-
.../res/drawable/notification_guts_bg.xml | 2 +-
.../res/drawable/notification_material_bg.xml | 2 +-
.../drawable/remote_input_view_text_bg.xml | 5 ++--
..._notification_section_header_clear_btn.xml | 3 +-
.../SystemUI/res/layout/notif_half_shelf.xml | 3 +-
.../res/layout/notif_half_shelf_row.xml | 5 ++--
.../layout/notification_children_divider.xml | 3 +-
.../layout/notification_conversation_info.xml | 3 +-
.../SystemUI/res/layout/notification_info.xml | 5 ++--
.../res/layout/notification_snooze.xml | 4 +--
.../res/layout/notification_snooze_option.xml | 3 +-
.../layout/status_bar_notification_footer.xml | 6 ++--
...status_bar_notification_section_header.xml | 2 +-
packages/SystemUI/res/values-night/colors.xml | 2 +-
packages/SystemUI/res/values/colors.xml | 2 +-
packages/SystemUI/res/values/styles.xml | 30 ++++---------------
.../systemui/statusbar/EmptyShadeView.java | 8 ++---
.../footer/ui/view/FooterView.java | 29 +++++++++---------
.../row/ActivatableNotificationView.java | 2 +-
.../row/HybridNotificationView.java | 5 ++--
.../row/NotificationConversationInfo.java | 9 +++---
.../row/wrapper/NotificationViewWrapper.java | 3 +-
.../stack/NotificationChildrenContainer.java | 2 +-
.../stack/NotificationSectionsManager.kt | 8 ++---
.../stack/NotificationStackScrollLayout.java | 25 +++++++---------
.../notification/stack/SectionHeaderView.java | 6 ++--
.../statusbar/phone/ScrimController.java | 5 ++--
.../statusbar/phone/TapAgainView.java | 7 ++---
.../statusbar/policy/RemoteInputView.java | 15 +++++-----
.../row/ActivatableNotificationViewTest.kt | 5 ++--
36 files changed, 101 insertions(+), 139 deletions(-)
diff --git a/packages/SystemUI/res/color/notification_guts_priority_button_bg_stroke.xml b/packages/SystemUI/res/color/notification_guts_priority_button_bg_stroke.xml
index d1b8a064724d..015e9f99212d 100644
--- a/packages/SystemUI/res/color/notification_guts_priority_button_bg_stroke.xml
+++ b/packages/SystemUI/res/color/notification_guts_priority_button_bg_stroke.xml
@@ -14,9 +14,8 @@
~ limitations under the License
-->
-<selector xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_selected="true"
- android:color="?androidprv:attr/materialColorOnSurfaceVariant" />
+ android:color="?android:attr/colorAccent" />
<item android:color="@color/notification_guts_priority_button_bg_stroke_color" />
</selector>
diff --git a/packages/SystemUI/res/color/notification_guts_priority_contents.xml b/packages/SystemUI/res/color/notification_guts_priority_contents.xml
index cc8c25a2d1ec..42f01896d7a1 100644
--- a/packages/SystemUI/res/color/notification_guts_priority_contents.xml
+++ b/packages/SystemUI/res/color/notification_guts_priority_contents.xml
@@ -14,9 +14,8 @@
~ limitations under the License.
-->
-<selector xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_selected="true"
- android:color="?androidprv:attr/materialColorOnSurfaceVariant" />
+ android:color="?android:attr/colorAccent" />
<item android:color="@color/notification_guts_priority_button_content_color" />
</selector>
diff --git a/packages/SystemUI/res/color/remote_input_hint.xml b/packages/SystemUI/res/color/remote_input_hint.xml
index 0d90ee6b47c6..7fe58dbcf822 100644
--- a/packages/SystemUI/res/color/remote_input_hint.xml
+++ b/packages/SystemUI/res/color/remote_input_hint.xml
@@ -14,7 +14,6 @@
~ limitations under the License.
-->
-<selector xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">
- <item android:color="?androidprv:attr/materialColorOnSurfaceVariant" android:alpha=".6" />
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+ <item android:color="?android:attr/textColorPrimary" android:alpha=".6" />
</selector>
\ No newline at end of file
diff --git a/packages/SystemUI/res/color/remote_input_send.xml b/packages/SystemUI/res/color/remote_input_send.xml
index 0acc66b9050f..4dcd3dd229fb 100644
--- a/packages/SystemUI/res/color/remote_input_send.xml
+++ b/packages/SystemUI/res/color/remote_input_send.xml
@@ -15,8 +15,7 @@
~ limitations under the License
-->
-<selector xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">
- <item android:state_enabled="false" android:color="?androidprv:attr/materialColorPrimary" android:alpha=".3" />
- <item android:color="?androidprv:attr/materialColorPrimary" />
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+ <item android:state_enabled="false" android:color="?android:attr/colorAccent" android:alpha=".3" />
+ <item android:color="?android:attr/colorAccent" />
</selector>
\ No newline at end of file
diff --git a/packages/SystemUI/res/color/remote_input_text.xml b/packages/SystemUI/res/color/remote_input_text.xml
index bf2c198fe540..13bb1d7cbe7d 100644
--- a/packages/SystemUI/res/color/remote_input_text.xml
+++ b/packages/SystemUI/res/color/remote_input_text.xml
@@ -15,8 +15,7 @@
~ limitations under the License
-->
-<selector xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">
- <item android:state_enabled="false" android:color="?androidprv:attr/materialColorOnSurfaceVariant" android:alpha=".6" />
- <item android:color="?androidprv:attr/materialColorOnSurfaceVariant" />
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+ <item android:state_enabled="false" android:color="?android:attr/textColorPrimary" android:alpha=".6" />
+ <item android:color="?android:attr/textColorPrimary" />
</selector>
\ No newline at end of file
diff --git a/packages/SystemUI/res/drawable/notif_footer_btn_background.xml b/packages/SystemUI/res/drawable/notif_footer_btn_background.xml
index b9597375c3df..e6266754c0af 100644
--- a/packages/SystemUI/res/drawable/notif_footer_btn_background.xml
+++ b/packages/SystemUI/res/drawable/notif_footer_btn_background.xml
@@ -26,7 +26,7 @@
<padding
android:left="20dp"
android:right="20dp" />
- <solid android:color="?androidprv:attr/materialColorSurfaceContainerHigh" />
+ <solid android:color="?androidprv:attr/colorSurface" />
</shape>
</inset>
</item>
diff --git a/packages/SystemUI/res/drawable/notification_guts_bg.xml b/packages/SystemUI/res/drawable/notification_guts_bg.xml
index 84e2231738d4..bd9394bf9f8a 100644
--- a/packages/SystemUI/res/drawable/notification_guts_bg.xml
+++ b/packages/SystemUI/res/drawable/notification_guts_bg.xml
@@ -17,7 +17,7 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">
- <solid android:color="?androidprv:attr/materialColorSurfaceContainerHigh" />
+ <solid android:color="?androidprv:attr/colorSurface" />
<!--The radius is 1dp smaller than the notification one, to avoid aliasing bugs on the corners -->
<corners android:radius="1dp" />
</shape>
diff --git a/packages/SystemUI/res/drawable/notification_material_bg.xml b/packages/SystemUI/res/drawable/notification_material_bg.xml
index 355e75d0716b..3eaa6180ba1b 100644
--- a/packages/SystemUI/res/drawable/notification_material_bg.xml
+++ b/packages/SystemUI/res/drawable/notification_material_bg.xml
@@ -20,7 +20,7 @@
android:color="?android:attr/colorControlHighlight">
<item>
<shape>
- <solid android:color="?androidprv:attr/materialColorSurfaceContainerHigh" />
+ <solid android:color="?androidprv:attr/colorSurface" />
</shape>
</item>
<item>
diff --git a/packages/SystemUI/res/drawable/remote_input_view_text_bg.xml b/packages/SystemUI/res/drawable/remote_input_view_text_bg.xml
index 45d1a530cd20..535b35497b5c 100644
--- a/packages/SystemUI/res/drawable/remote_input_view_text_bg.xml
+++ b/packages/SystemUI/res/drawable/remote_input_view_text_bg.xml
@@ -14,13 +14,12 @@
~ limitations under the License.
-->
<shape xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
android:shape="rectangle">
- <solid android:color="?androidprv:attr/materialColorSurfaceDim" />
+ <solid android:color="?android:attr/colorBackgroundFloating" />
<stroke
android:width="@dimen/remote_input_view_text_stroke"
- android:color="?androidprv:attr/materialColorPrimary"/>
+ android:color="?android:attr/colorAccent"/>
<padding
android:bottom="0dp"
android:left="12dp"
diff --git a/packages/SystemUI/res/drawable/status_bar_notification_section_header_clear_btn.xml b/packages/SystemUI/res/drawable/status_bar_notification_section_header_clear_btn.xml
index 06bed001ae1a..8b3408048848 100644
--- a/packages/SystemUI/res/drawable/status_bar_notification_section_header_clear_btn.xml
+++ b/packages/SystemUI/res/drawable/status_bar_notification_section_header_clear_btn.xml
@@ -15,12 +15,11 @@
limitations under the License.
-->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
android:width="40dp"
android:height="40dp"
android:viewportWidth="40"
android:viewportHeight="40">
<path
- android:fillColor="?androidprv:attr/materialColorOnSurfaceVariant"
+ android:fillColor="@color/notification_section_clear_all_btn_color"
android:pathData="M24.6667 16.2733L23.7267 15.3333L20 19.06L16.2734 15.3333L15.3334 16.2733L19.06 20L15.3334 23.7267L16.2734 24.6667L20 20.94L23.7267 24.6667L24.6667 23.7267L20.94 20L24.6667 16.2733Z"/>
</vector>
diff --git a/packages/SystemUI/res/layout/notif_half_shelf.xml b/packages/SystemUI/res/layout/notif_half_shelf.xml
index 68c8dd96d188..c70f8e2b1c07 100644
--- a/packages/SystemUI/res/layout/notif_half_shelf.xml
+++ b/packages/SystemUI/res/layout/notif_half_shelf.xml
@@ -16,7 +16,6 @@
<FrameLayout
xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
android:id="@+id/half_shelf_dialog"
android:orientation="vertical"
android:layout_width="wrap_content"
@@ -66,7 +65,7 @@
android:gravity="center_vertical|start"
android:ellipsize="end"
android:maxLines="2"
- android:textColor="?androidprv:attr/materialColorOnSurface"
+ android:textColor="?android:attr/textColorPrimary"
android:fontFamily="@*android:string/config_headlineFontFamilyMedium"
android:textSize="16sp"
/>
diff --git a/packages/SystemUI/res/layout/notif_half_shelf_row.xml b/packages/SystemUI/res/layout/notif_half_shelf_row.xml
index 9ef342ce5220..190f9994b1dc 100644
--- a/packages/SystemUI/res/layout/notif_half_shelf_row.xml
+++ b/packages/SystemUI/res/layout/notif_half_shelf_row.xml
@@ -16,7 +16,6 @@
<com.android.systemui.statusbar.notification.row.ChannelRow
xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
android:id="@+id/half_shelf_row"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -60,7 +59,7 @@
android:ellipsize="end"
android:maxLines="1"
android:fontFamily="@*android:string/config_headlineFontFamily"
- android:textColor="?androidprv:attr/materialColorOnSurface"
+ android:textColor="?android:attr/textColorPrimary"
android:textSize="16sp"
/>
@@ -75,7 +74,7 @@
android:maxLines="1"
android:layout_below="@id/channel_name"
android:fontFamily="@*android:string/config_bodyFontFamily"
- android:textColor="?androidprv:attr/materialColorOnSurfaceVariant"
+ android:textColor="?android:attr/textColorSecondary"
android:textSize="14sp"
/>
</RelativeLayout>
diff --git a/packages/SystemUI/res/layout/notification_children_divider.xml b/packages/SystemUI/res/layout/notification_children_divider.xml
index 13e24a9ea277..eb743067933d 100644
--- a/packages/SystemUI/res/layout/notification_children_divider.xml
+++ b/packages/SystemUI/res/layout/notification_children_divider.xml
@@ -17,8 +17,7 @@
<com.android.systemui.statusbar.AlphaOptimizedView
xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
android:id="@+id/notification_more_divider"
android:layout_width="match_parent"
android:layout_height="@dimen/notification_divider_height"
- android:background="?androidprv:attr/materialColorOnSurfaceVariant" />
+ android:background="@color/notification_divider_color" />
diff --git a/packages/SystemUI/res/layout/notification_conversation_info.xml b/packages/SystemUI/res/layout/notification_conversation_info.xml
index 3a752c81b95a..4f6e88c2266f 100644
--- a/packages/SystemUI/res/layout/notification_conversation_info.xml
+++ b/packages/SystemUI/res/layout/notification_conversation_info.xml
@@ -17,7 +17,6 @@
<com.android.systemui.statusbar.notification.row.NotificationConversationInfo
xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
android:id="@+id/notification_guts"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -174,7 +173,7 @@
android:contentDescription="@string/notification_more_settings"
android:background="@drawable/ripple_drawable_20dp"
android:src="@drawable/ic_settings"
- android:tint="?androidprv:attr/materialColorPrimary"
+ android:tint="?android:attr/colorAccent"
android:layout_alignParentEnd="true" />
</LinearLayout>
diff --git a/packages/SystemUI/res/layout/notification_info.xml b/packages/SystemUI/res/layout/notification_info.xml
index 19a3f2fd521c..852db1b8fb91 100644
--- a/packages/SystemUI/res/layout/notification_info.xml
+++ b/packages/SystemUI/res/layout/notification_info.xml
@@ -17,7 +17,6 @@
<com.android.systemui.statusbar.notification.row.NotificationInfo
xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
android:id="@+id/notification_guts"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -103,7 +102,7 @@ asked for it -->
android:contentDescription="@string/notification_app_settings"
android:src="@drawable/ic_info"
android:layout_toStartOf="@id/info"
- android:tint="?androidprv:attr/materialColorPrimary"/>
+ android:tint="@color/notification_guts_link_icon_tint"/>
<ImageButton
android:id="@+id/info"
android:layout_width="@dimen/notification_importance_toggle_size"
@@ -112,7 +111,7 @@ asked for it -->
android:contentDescription="@string/notification_more_settings"
android:background="@drawable/ripple_drawable_20dp"
android:src="@drawable/ic_settings"
- android:tint="?androidprv:attr/materialColorPrimary"
+ android:tint="?android:attr/colorAccent"
android:layout_alignParentEnd="true" />
</LinearLayout>
diff --git a/packages/SystemUI/res/layout/notification_snooze.xml b/packages/SystemUI/res/layout/notification_snooze.xml
index 6e541a7a5f32..8b5368098c00 100644
--- a/packages/SystemUI/res/layout/notification_snooze.xml
+++ b/packages/SystemUI/res/layout/notification_snooze.xml
@@ -23,7 +23,7 @@
android:orientation="vertical"
android:paddingTop="2dp"
android:paddingBottom="2dp"
- android:background="?androidprv:attr/materialColorSurfaceContainerHigh"
+ android:background="?androidprv:attr/colorSurface"
android:theme="@style/Theme.SystemUI">
<RelativeLayout
@@ -38,7 +38,7 @@
android:layout_alignParentStart="true"
android:layout_centerVertical="true"
android:paddingStart="@*android:dimen/notification_content_margin_end"
- android:textColor="?androidprv:attr/materialColorOnSurface"
+ android:textColor="?android:attr/textColorPrimary"
android:paddingEnd="4dp"/>
<ImageView
diff --git a/packages/SystemUI/res/layout/notification_snooze_option.xml b/packages/SystemUI/res/layout/notification_snooze_option.xml
index fa6f965198d4..d42cc0212fd8 100644
--- a/packages/SystemUI/res/layout/notification_snooze_option.xml
+++ b/packages/SystemUI/res/layout/notification_snooze_option.xml
@@ -16,11 +16,10 @@
-->
<TextView
xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
android:layout_width="match_parent"
android:layout_height="@*android:dimen/notification_headerless_min_height"
android:layout_marginStart="@*android:dimen/notification_content_margin_end"
android:layout_marginEnd="@*android:dimen/notification_content_margin_end"
android:gravity="center_vertical"
android:textSize="14sp"
- android:textColor="?androidprv:attr/materialColorOnSurfaceVariant"/>
\ No newline at end of file
+ android:textColor="?android:attr/textColorSecondary"/>
\ No newline at end of file
diff --git a/packages/SystemUI/res/layout/status_bar_notification_footer.xml b/packages/SystemUI/res/layout/status_bar_notification_footer.xml
index 72424a13d0f1..c1bac3151049 100644
--- a/packages/SystemUI/res/layout/status_bar_notification_footer.xml
+++ b/packages/SystemUI/res/layout/status_bar_notification_footer.xml
@@ -41,7 +41,7 @@
android:layout_height="wrap_content"
>
<com.android.systemui.statusbar.notification.row.FooterViewButton
- style="@style/TextAppearance.NotificationFooterButton"
+ style="@style/TextAppearance.NotificationSectionHeaderButton"
android:id="@+id/manage_text"
android:layout_width="wrap_content"
android:layout_height="48dp"
@@ -54,11 +54,12 @@
app:layout_constraintEnd_toStartOf="@id/dismiss_text"
android:background="@drawable/notif_footer_btn_background"
android:focusable="true"
+ android:textColor="@color/notif_pill_text"
android:contentDescription="@string/manage_notifications_history_text"
android:text="@string/manage_notifications_history_text"
/>
<com.android.systemui.statusbar.notification.row.FooterViewButton
- style="@style/TextAppearance.NotificationFooterButton"
+ style="@style/TextAppearance.NotificationSectionHeaderButton"
android:id="@+id/dismiss_text"
android:layout_width="wrap_content"
android:layout_height="48dp"
@@ -69,6 +70,7 @@
app:layout_constraintStart_toEndOf="@id/manage_text"
android:background="@drawable/notif_footer_btn_background"
android:focusable="true"
+ android:textColor="@color/notif_pill_text"
android:contentDescription="@string/accessibility_clear_all"
android:text="@string/clear_all_notifications_text"
/>
diff --git a/packages/SystemUI/res/layout/status_bar_notification_section_header.xml b/packages/SystemUI/res/layout/status_bar_notification_section_header.xml
index 53abe87e7c12..c4d8d55f74e2 100644
--- a/packages/SystemUI/res/layout/status_bar_notification_section_header.xml
+++ b/packages/SystemUI/res/layout/status_bar_notification_section_header.xml
@@ -40,7 +40,7 @@
android:layout_weight="1">
<TextView
- style="@style/TextAppearance.NotificationSectionHeaderLabel"
+ style="@style/TextAppearance.NotificationSectionHeaderButton"
android:id="@+id/header_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
diff --git a/packages/SystemUI/res/values-night/colors.xml b/packages/SystemUI/res/values-night/colors.xml
index bcc3c83b4560..e759c1211a93 100644
--- a/packages/SystemUI/res/values-night/colors.xml
+++ b/packages/SystemUI/res/values-night/colors.xml
@@ -33,7 +33,7 @@
<!-- The color of the text inside a notification -->
<color name="notification_primary_text_color">@*android:color/notification_primary_text_color_dark</color>
- <color name="notif_pill_text">@android:color/system_on_surface_dark</color>
+ <color name="notif_pill_text">@color/material_dynamic_neutral95</color>
<color name="notification_guts_link_icon_tint">@color/GM2_grey_500</color>
<color name="notification_guts_sub_text_color">@color/GM2_grey_300</color>
diff --git a/packages/SystemUI/res/values/colors.xml b/packages/SystemUI/res/values/colors.xml
index 34dcd655b8e7..91a72922fd0a 100644
--- a/packages/SystemUI/res/values/colors.xml
+++ b/packages/SystemUI/res/values/colors.xml
@@ -116,7 +116,7 @@
<!-- Chosen so fill over background matches single tone -->
<color name="dark_mode_qs_icon_color_dual_tone_fill">#99000000</color>
- <color name="notif_pill_text">@android:color/system_on_surface_light</color>
+ <color name="notif_pill_text">@color/material_dynamic_neutral10</color>
<!-- Keyboard shortcuts colors -->
<color name="ksh_application_group_color">#fff44336</color>
diff --git a/packages/SystemUI/res/values/styles.xml b/packages/SystemUI/res/values/styles.xml
index e3d4419afceb..7852608df57d 100644
--- a/packages/SystemUI/res/values/styles.xml
+++ b/packages/SystemUI/res/values/styles.xml
@@ -602,34 +602,34 @@
<style name="TextAppearance.NotificationImportanceChannel">
<item name="android:textSize">@dimen/notification_importance_channel_text</item>
<item name="android:fontFamily">@*android:string/config_headlineFontFamilyMedium</item>
- <item name="android:textColor">?androidprv:attr/materialColorOnSurface</item>
+ <item name="android:textColor">@color/notification_guts_header_text_color</item>
<item name="android:textSize">@dimen/notification_importance_channel_text</item>
</style>
<style name="TextAppearance.NotificationImportanceChannelGroup">
<item name="android:textSize">@dimen/notification_importance_channel_group_text</item>
<item name="android:fontFamily">@*android:string/config_headlineFontFamily</item>
- <item name="android:textColor">?androidprv:attr/materialColorOnSurface</item>
+ <item name="android:textColor">@color/notification_guts_header_text_color</item>
<item name="android:textSize">@dimen/notification_importance_channel_group_text</item>
</style>
<style name="TextAppearance.NotificationImportanceApp">
<item name="android:textSize">@dimen/notification_importance_channel_group_text</item>
<item name="android:fontFamily">@*android:string/config_headlineFontFamily</item>
- <item name="android:textColor">?androidprv:attr/materialColorOnSurfaceVariant</item>
+ <item name="android:textColor">@color/notification_guts_sub_text_color</item>
<item name="android:textSize">@dimen/notification_importance_channel_group_text</item>
</style>
<style name="TextAppearance.NotificationImportanceHeader">
<item name="android:textSize">@dimen/notification_importance_header_text</item>
<item name="android:fontFamily">@*android:string/config_headlineFontFamily</item>
- <item name="android:textColor">?androidprv:attr/materialColorOnSurface</item>
+ <item name="android:textColor">@color/notification_guts_header_text_color</item>
</style>
<style name="TextAppearance.NotificationImportanceDetail">
<item name="android:textSize">@dimen/notification_importance_description_text</item>
<item name="android:fontFamily">@*android:string/config_bodyFontFamily</item>
- <item name="android:textColor">?androidprv:attr/materialColorOnSurfaceVariant</item>
+ <item name="android:textColor">@color/notification_guts_sub_text_color</item>
<item name="android:gravity">center</item>
</style>
@@ -640,28 +640,10 @@
<item name="android:gravity">center</item>
</style>
- <style
- name="TextAppearance.NotificationSectionHeaderLabel"
- parent="@android:style/Widget.DeviceDefault.Button.Borderless">
- <item name="android:textColor">?androidprv:attr/materialColorOnSurface</item>
- <item name="android:textAllCaps">false</item>
- <item name="android:textSize">14sp</item>
- <item name="android:minWidth">0dp</item>
- </style>
-
<style
name="TextAppearance.NotificationSectionHeaderButton"
parent="@android:style/Widget.DeviceDefault.Button.Borderless">
- <item name="android:textColor">?androidprv:attr/materialColorOnSurface</item>
- <item name="android:textAllCaps">false</item>
- <item name="android:textSize">14sp</item>
- <item name="android:minWidth">0dp</item>
- </style>
-
- <style
- name="TextAppearance.NotificationFooterButton"
- parent="@android:style/Widget.DeviceDefault.Button.Borderless">
- <item name="android:textColor">?androidprv:attr/materialColorOnSurface</item>
+ <item name="android:textColor">?android:attr/textColorPrimary</item>
<item name="android:textAllCaps">false</item>
<item name="android:textSize">14sp</item>
<item name="android:minWidth">0dp</item>
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/EmptyShadeView.java b/packages/SystemUI/src/com/android/systemui/statusbar/EmptyShadeView.java
index 2338be28d32c..c9758471a30e 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/EmptyShadeView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/EmptyShadeView.java
@@ -72,10 +72,10 @@ public class EmptyShadeView extends StackScrollerDecorView {
return findViewById(R.id.no_notifications_footer);
}
- public void setTextColors(@ColorInt int onSurface, @ColorInt int onSurfaceVariant) {
- mEmptyText.setTextColor(onSurfaceVariant);
- mEmptyFooterText.setTextColor(onSurface);
- mEmptyFooterText.setCompoundDrawableTintList(ColorStateList.valueOf(onSurface));
+ public void setTextColor(@ColorInt int color) {
+ mEmptyText.setTextColor(color);
+ mEmptyFooterText.setTextColor(color);
+ mEmptyFooterText.setCompoundDrawableTintList(ColorStateList.valueOf(color));
}
public void setText(@StringRes int text) {
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/footer/ui/view/FooterView.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/footer/ui/view/FooterView.java
index 3616fd6d8cd1..a6e07f1f5e3e 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/footer/ui/view/FooterView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/footer/ui/view/FooterView.java
@@ -313,25 +313,26 @@ public class FooterView extends StackScrollerDecorView {
*/
public void updateColors() {
Resources.Theme theme = mContext.getTheme();
- final @ColorInt int onSurface = Utils.getColorAttrDefaultColor(mContext,
- com.android.internal.R.attr.materialColorOnSurface);
+ final @ColorInt int textColor = getResources().getColor(R.color.notif_pill_text, theme);
final Drawable clearAllBg = theme.getDrawable(R.drawable.notif_footer_btn_background);
final Drawable manageBg = theme.getDrawable(R.drawable.notif_footer_btn_background);
- if (!notificationBackgroundTintOptimization()) {
- final @ColorInt int scHigh = Utils.getColorAttrDefaultColor(mContext,
- com.android.internal.R.attr.materialColorSurfaceContainerHigh);
- if (scHigh != 0) {
- final ColorFilter bgColorFilter = new PorterDuffColorFilter(scHigh, SRC_ATOP);
- clearAllBg.setColorFilter(bgColorFilter);
- manageBg.setColorFilter(bgColorFilter);
- }
+ // TODO(b/282173943): Remove redundant tinting once Resources are thread-safe
+ final @ColorInt int buttonBgColor =
+ Utils.getColorAttrDefaultColor(mContext, com.android.internal.R.attr.colorSurface);
+ final ColorFilter bgColorFilter = new PorterDuffColorFilter(buttonBgColor, SRC_ATOP);
+ if (buttonBgColor != 0) {
+ clearAllBg.setColorFilter(bgColorFilter);
+ manageBg.setColorFilter(bgColorFilter);
}
mClearAllButton.setBackground(clearAllBg);
- mClearAllButton.setTextColor(onSurface);
+ mClearAllButton.setTextColor(textColor);
mManageButton.setBackground(manageBg);
- mManageButton.setTextColor(onSurface);
- mSeenNotifsFooterTextView.setTextColor(onSurface);
- mSeenNotifsFooterTextView.setCompoundDrawableTintList(ColorStateList.valueOf(onSurface));
+ mManageButton.setTextColor(textColor);
+ final @ColorInt int labelTextColor =
+ Utils.getColorAttrDefaultColor(mContext, android.R.attr.textColorPrimary);
+ mSeenNotifsFooterTextView.setTextColor(labelTextColor);
+ mSeenNotifsFooterTextView.setCompoundDrawableTintList(
+ ColorStateList.valueOf(labelTextColor));
}
private void updateResources() {
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ActivatableNotificationView.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ActivatableNotificationView.java
index 4fe05ec9990c..9fa9049cc7cd 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ActivatableNotificationView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ActivatableNotificationView.java
@@ -124,7 +124,7 @@ public abstract class ActivatableNotificationView extends ExpandableOutlineView
private void updateColors() {
mNormalColor = Utils.getColorAttrDefaultColor(mContext,
- com.android.internal.R.attr.materialColorSurfaceContainerHigh);
+ com.android.internal.R.attr.colorSurface);
mTintedRippleColor = mContext.getColor(
R.color.notification_ripple_tinted_color);
mNormalRippleColor = mContext.getColor(
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/HybridNotificationView.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/HybridNotificationView.java
index da8c4dc08bf0..892a63505a71 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/HybridNotificationView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/HybridNotificationView.java
@@ -28,6 +28,7 @@ import android.widget.TextView;
import androidx.annotation.ColorInt;
+import com.android.internal.util.ContrastColorUtil;
import com.android.keyguard.AlphaOptimizedLinearLayout;
import com.android.systemui.res.R;
import com.android.systemui.statusbar.CrossFadeHelper;
@@ -97,8 +98,8 @@ public class HybridNotificationView extends AlphaOptimizedLinearLayout
private void resolveThemeTextColors() {
try (TypedArray ta = mContext.getTheme().obtainStyledAttributes(
android.R.style.Theme_DeviceDefault_DayNight, new int[]{
- com.android.internal.R.attr.materialColorOnSurface,
- com.android.internal.R.attr.materialColorOnSurfaceVariant
+ android.R.attr.textColorPrimary,
+ android.R.attr.textColorSecondary
})) {
if (ta != null) {
mPrimaryTextColor = ta.getColor(0, mPrimaryTextColor);
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationConversationInfo.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationConversationInfo.java
index 14593cb1b381..62b268b90cf3 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationConversationInfo.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationConversationInfo.java
@@ -65,10 +65,10 @@ import android.widget.TextView;
import com.android.internal.annotations.VisibleForTesting;
import com.android.settingslib.notification.ConversationIconFactory;
+import com.android.systemui.res.R;
import com.android.systemui.dagger.qualifiers.Background;
import com.android.systemui.dagger.qualifiers.Main;
import com.android.systemui.people.widget.PeopleSpaceWidgetManager;
-import com.android.systemui.res.R;
import com.android.systemui.shade.ShadeController;
import com.android.systemui.statusbar.notification.NotificationChannelHelper;
import com.android.systemui.statusbar.notification.collection.NotificationEntry;
@@ -336,11 +336,10 @@ public class NotificationConversationInfo extends LinearLayout implements
Drawable person = mIconFactory.getBaseIconDrawable(mShortcutInfo);
if (person == null) {
person = mContext.getDrawable(R.drawable.ic_person).mutate();
- TypedArray ta = mContext.obtainStyledAttributes(
- new int[]{com.android.internal.R.attr.materialColorPrimary});
- int colorPrimary = ta.getColor(0, 0);
+ TypedArray ta = mContext.obtainStyledAttributes(new int[]{android.R.attr.colorAccent});
+ int colorAccent = ta.getColor(0, 0);
ta.recycle();
- person.setTint(colorPrimary);
+ person.setTint(colorAccent);
}
ImageView image = findViewById(R.id.conversation_icon);
image.setImageDrawable(person);
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/wrapper/NotificationViewWrapper.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/wrapper/NotificationViewWrapper.java
index 50f3e7896442..6f602ff437eb 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/wrapper/NotificationViewWrapper.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/wrapper/NotificationViewWrapper.java
@@ -337,8 +337,7 @@ public abstract class NotificationViewWrapper implements TransformableView {
if (customBackgroundColor != 0) {
return customBackgroundColor;
}
- return Utils.getColorAttr(mView.getContext(),
- com.android.internal.R.attr.materialColorSurfaceContainerHigh)
+ return Utils.getColorAttr(mView.getContext(), android.R.attr.colorBackground)
.getDefaultColor();
}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationChildrenContainer.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationChildrenContainer.java
index 0236fc265add..a929e4f3ea7f 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationChildrenContainer.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationChildrenContainer.java
@@ -1362,7 +1362,7 @@ public class NotificationChildrenContainer extends ViewGroup
Resources.Theme theme = new ContextThemeWrapper(mContext,
com.android.internal.R.style.Theme_DeviceDefault_DayNight).getTheme();
try (TypedArray ta = theme.obtainStyledAttributes(
- new int[]{com.android.internal.R.attr.materialColorPrimary})) {
+ new int[]{com.android.internal.R.attr.colorAccent})) {
color = ta.getColor(0, color);
}
mHybridGroupManager.setOverflowNumberColor(mOverflowNumber, color);
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationSectionsManager.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationSectionsManager.kt
index cfc433a09c4d..fd064eeab2ab 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationSectionsManager.kt
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationSectionsManager.kt
@@ -244,10 +244,10 @@ class NotificationSectionsManager @Inject internal constructor(
}
}
- fun setHeaderForegroundColors(@ColorInt onSurface: Int, @ColorInt onSurfaceVariant: Int) {
- peopleHeaderView?.setForegroundColors(onSurface, onSurfaceVariant)
- silentHeaderView?.setForegroundColors(onSurface, onSurfaceVariant)
- alertingHeaderView?.setForegroundColors(onSurface, onSurfaceVariant)
+ fun setHeaderForegroundColor(@ColorInt color: Int) {
+ peopleHeaderView?.setForegroundColor(color)
+ silentHeaderView?.setForegroundColor(color)
+ alertingHeaderView?.setForegroundColor(color)
}
companion object {
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java
index 3bbdfd164ba7..c84aab1f83cb 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java
@@ -341,7 +341,7 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable
private boolean mAnimateNextBackgroundTop;
private boolean mAnimateNextBackgroundBottom;
private boolean mAnimateNextSectionBoundsChange;
- private @ColorInt int mBgColor;
+ private int mBgColor;
private float mDimAmount;
private ValueAnimator mDimAnimator;
private final ArrayList<ExpandableView> mTmpSortedChildren = new ArrayList<>();
@@ -643,8 +643,8 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable
mSections = mSectionsManager.createSectionsForBuckets();
mAmbientState = Dependency.get(AmbientState.class);
- mBgColor = Utils.getColorAttr(mContext,
- com.android.internal.R.attr.materialColorSurfaceContainerHigh).getDefaultColor();
+ mBgColor = Utils.getColorAttr(mContext, android.R.attr.colorBackgroundFloating)
+ .getDefaultColor();
int minHeight = res.getDimensionPixelSize(R.dimen.notification_min_height);
int maxHeight = res.getDimensionPixelSize(R.dimen.notification_max_height);
mSplitShadeMinContentHeight = res.getDimensionPixelSize(
@@ -780,8 +780,8 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable
}
void updateBgColor() {
- mBgColor = Utils.getColorAttr(mContext,
- com.android.internal.R.attr.materialColorSurfaceContainerHigh).getDefaultColor();
+ mBgColor = Utils.getColorAttr(mContext, android.R.attr.colorBackgroundFloating)
+ .getDefaultColor();
updateBackgroundDimming();
for (int i = 0; i < getChildCount(); i++) {
View child = getChildAt(i);
@@ -4473,19 +4473,14 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable
}
/**
- * Update colors of section headers, shade footer, and empty shade views.
+ * Update colors of "dismiss" and "empty shade" views.
*/
void updateDecorViews() {
- final @ColorInt int onSurface = Utils.getColorAttrDefaultColor(
- mContext, com.android.internal.R.attr.materialColorOnSurface);
- final @ColorInt int onSurfaceVariant = Utils.getColorAttrDefaultColor(
- mContext, com.android.internal.R.attr.materialColorOnSurfaceVariant);
-
- mSectionsManager.setHeaderForegroundColors(onSurface, onSurfaceVariant);
-
+ final @ColorInt int textColor =
+ Utils.getColorAttrDefaultColor(mContext, android.R.attr.textColorPrimary);
+ mSectionsManager.setHeaderForegroundColor(textColor);
mFooterView.updateColors();
-
- mEmptyShadeView.setTextColors(onSurface, onSurfaceVariant);
+ mEmptyShadeView.setTextColor(textColor);
}
void goToFullShade(long delay) {
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/SectionHeaderView.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/SectionHeaderView.java
index 580431a13d1b..59e1af5eb6f1 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/SectionHeaderView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/SectionHeaderView.java
@@ -132,8 +132,8 @@ public class SectionHeaderView extends StackScrollerDecorView {
mLabelView.setText(resId);
}
- void setForegroundColors(@ColorInt int onSurface, @ColorInt int onSurfaceVariant) {
- mLabelView.setTextColor(onSurface);
- mClearAllButton.setImageTintList(ColorStateList.valueOf(onSurfaceVariant));
+ void setForegroundColor(@ColorInt int color) {
+ mLabelView.setTextColor(color);
+ mClearAllButton.setImageTintList(ColorStateList.valueOf(color));
}
}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java
index ae04eaf49b65..05904eae769c 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java
@@ -1496,9 +1496,8 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, Dump
private void updateThemeColors() {
if (mScrimBehind == null) return;
int background = Utils.getColorAttr(mScrimBehind.getContext(),
- com.android.internal.R.attr.materialColorSurfaceDim).getDefaultColor();
- int accent = Utils.getColorAttr(mScrimBehind.getContext(),
- com.android.internal.R.attr.materialColorPrimary).getDefaultColor();
+ android.R.attr.colorBackgroundFloating).getDefaultColor();
+ int accent = Utils.getColorAccent(mScrimBehind.getContext()).getDefaultColor();
mColors.setMainColor(background);
mColors.setSecondaryColor(accent);
final boolean isBackgroundLight = !ContrastColorUtil.isColorDark(background);
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/TapAgainView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/TapAgainView.java
index 66ac17eee545..a033e1d55333 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/TapAgainView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/TapAgainView.java
@@ -20,7 +20,6 @@ import android.animation.Animator;
import android.animation.AnimatorListenerAdapter;
import android.animation.AnimatorSet;
import android.animation.ObjectAnimator;
-import android.annotation.ColorInt;
import android.content.Context;
import android.util.AttributeSet;
import android.view.View;
@@ -29,7 +28,6 @@ import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
-import com.android.settingslib.Utils;
import com.android.systemui.res.R;
import com.android.wm.shell.animation.Interpolators;
@@ -51,9 +49,8 @@ public class TapAgainView extends TextView {
}
void updateColor() {
- final @ColorInt int onSurface = Utils.getColorAttrDefaultColor(mContext,
- com.android.internal.R.attr.materialColorOnSurface);
- setTextColor(onSurface);
+ int textColor = getResources().getColor(R.color.notif_pill_text, mContext.getTheme());
+ setTextColor(textColor);
setBackground(getResources().getDrawable(R.drawable.rounded_bg_full, mContext.getTheme()));
}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/RemoteInputView.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/RemoteInputView.java
index 4864fb8ca634..ceed81a182aa 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/RemoteInputView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/RemoteInputView.java
@@ -130,7 +130,7 @@ public class RemoteInputView extends LinearLayout implements View.OnClickListene
private ImageView mDelete;
private ImageView mDeleteBg;
private boolean mColorized;
- private int mLastBackgroundColor;
+ private int mTint;
private boolean mResetting;
@Nullable
private RevealParams mRevealParams;
@@ -181,9 +181,10 @@ public class RemoteInputView extends LinearLayout implements View.OnClickListene
mEditorActionHandler = new EditorActionHandler();
mUiEventLogger = Dependency.get(UiEventLogger.class);
TypedArray ta = getContext().getTheme().obtainStyledAttributes(new int[]{
- com.android.internal.R.attr.materialColorSurfaceDim,
+ com.android.internal.R.attr.colorAccent,
+ com.android.internal.R.attr.colorSurface,
});
- mLastBackgroundColor = ta.getColor(0, 0);
+ mTint = ta.getColor(0, 0);
ta.recycle();
}
@@ -209,9 +210,9 @@ public class RemoteInputView extends LinearLayout implements View.OnClickListene
* @param backgroundColor colorized notification color
*/
public void setBackgroundTintColor(final int backgroundColor, boolean colorized) {
- if (colorized == mColorized && backgroundColor == mLastBackgroundColor) return;
+ if (colorized == mColorized && backgroundColor == mTint) return;
mColorized = colorized;
- mLastBackgroundColor = backgroundColor;
+ mTint = backgroundColor;
final int editBgColor;
final int deleteBgColor;
final int deleteFgColor;
@@ -236,8 +237,8 @@ public class RemoteInputView extends LinearLayout implements View.OnClickListene
hintColor = mContext.getColor(R.color.remote_input_hint);
deleteFgColor = textColor.getDefaultColor();
try (TypedArray ta = getContext().getTheme().obtainStyledAttributes(new int[]{
- com.android.internal.R.attr.materialColorSurfaceDim,
- com.android.internal.R.attr.materialColorSurfaceVariant
+ com.android.internal.R.attr.colorSurfaceHighlight,
+ com.android.internal.R.attr.colorSurfaceVariant
})) {
editBgColor = ta.getColor(0, backgroundColor);
deleteBgColor = ta.getColor(1, Color.GRAY);
diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/ActivatableNotificationViewTest.kt b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/ActivatableNotificationViewTest.kt
index 9b9cb8213c91..ccef1d56c6a0 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/ActivatableNotificationViewTest.kt
+++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/ActivatableNotificationViewTest.kt
@@ -61,9 +61,8 @@ class ActivatableNotificationViewTest : SysuiTestCase() {
else -> null
} as T?
}
-
- mNormalColor = Utils.getColorAttrDefaultColor(mContext,
- com.android.internal.R.attr.materialColorSurfaceContainerHigh)
+ mNormalColor =
+ Utils.getColorAttrDefaultColor(mContext, com.android.internal.R.attr.colorSurface)
}
@Test
--
2.34.1

181
patches_platform/frameworks_base/0017-Revert-Update-framework-to-new-notification-color-sp.patch Normal file
View File

@ -0,0 +1,181 @@
From 456e921e4ea5b79cdf5afbf5207c663d47e1a3b2 Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Thu, 4 Apr 2024 18:26:08 +0800
Subject: [PATCH 17/34] Revert "Update framework to new notification color
spec"
This reverts commit 6063e254e0cc84243e3a3fb85fe1bff71b302a87.
---
core/java/android/app/Notification.java | 50 ++++---------------
core/res/res/values/colors.xml | 9 ++--
.../src/android/app/NotificationTest.java | 9 ----
3 files changed, 15 insertions(+), 53 deletions(-)
diff --git a/core/java/android/app/Notification.java b/core/java/android/app/Notification.java
index 7454e52b50ef..5d55f3440b57 100644
--- a/core/java/android/app/Notification.java
+++ b/core/java/android/app/Notification.java
@@ -5618,8 +5618,7 @@ public class Notification implements Parcelable
contentView.setInt(R.id.expand_button, "setDefaultPillColor", pillColor);
// Use different highlighted colors for conversations' unread count
if (p.mHighlightExpander) {
- pillColor = Colors.flattenAlpha(
- getColors(p).getTertiaryFixedDimAccentColor(), bgColor);
+ pillColor = Colors.flattenAlpha(getColors(p).getTertiaryAccentColor(), bgColor);
textColor = Colors.flattenAlpha(
getColors(p).getOnTertiaryAccentTextColor(), pillColor);
}
@@ -12782,9 +12781,6 @@ public class Notification implements Parcelable
private int mSecondaryAccentColor = COLOR_INVALID;
private int mTertiaryAccentColor = COLOR_INVALID;
private int mOnTertiaryAccentTextColor = COLOR_INVALID;
- private int mTertiaryFixedDimAccentColor = COLOR_INVALID;
- private int mOnTertiaryFixedAccentTextColor = COLOR_INVALID;
-
private int mErrorColor = COLOR_INVALID;
private int mContrastColor = COLOR_INVALID;
private int mRippleAlpha = 0x33;
@@ -12842,7 +12838,7 @@ public class Notification implements Parcelable
if (isColorized) {
if (rawColor == COLOR_DEFAULT) {
- int[] attrs = {R.attr.materialColorSecondary};
+ int[] attrs = {R.attr.colorAccentSecondary};
try (TypedArray ta = obtainDayNightAttributes(ctx, attrs)) {
mBackgroundColor = getColor(ta, 0, Color.WHITE);
}
@@ -12860,21 +12856,17 @@ public class Notification implements Parcelable
mSecondaryAccentColor = mSecondaryTextColor;
mTertiaryAccentColor = flattenAlpha(mPrimaryTextColor, mBackgroundColor);
mOnTertiaryAccentTextColor = mBackgroundColor;
- mTertiaryFixedDimAccentColor = mTertiaryAccentColor;
- mOnTertiaryFixedAccentTextColor = mOnTertiaryAccentTextColor;
mErrorColor = mPrimaryTextColor;
mRippleAlpha = 0x33;
} else {
int[] attrs = {
- R.attr.materialColorSurfaceContainerHigh,
- R.attr.materialColorOnSurface,
- R.attr.materialColorOnSurfaceVariant,
- R.attr.materialColorPrimary,
- R.attr.materialColorSecondary,
- R.attr.materialColorTertiary,
- R.attr.materialColorOnTertiary,
- R.attr.materialColorTertiaryFixedDim,
- R.attr.materialColorOnTertiaryFixed,
+ R.attr.colorSurface,
+ R.attr.textColorPrimary,
+ R.attr.textColorSecondary,
+ R.attr.colorAccent,
+ R.attr.colorAccentSecondary,
+ R.attr.colorAccentTertiary,
+ R.attr.textColorOnAccent,
R.attr.colorError,
R.attr.colorControlHighlight
};
@@ -12886,10 +12878,8 @@ public class Notification implements Parcelable
mSecondaryAccentColor = getColor(ta, 4, COLOR_INVALID);
mTertiaryAccentColor = getColor(ta, 5, COLOR_INVALID);
mOnTertiaryAccentTextColor = getColor(ta, 6, COLOR_INVALID);
- mTertiaryFixedDimAccentColor = getColor(ta, 7, COLOR_INVALID);
- mOnTertiaryFixedAccentTextColor = getColor(ta, 8, COLOR_INVALID);
- mErrorColor = getColor(ta, 9, COLOR_INVALID);
- mRippleAlpha = Color.alpha(getColor(ta, 10, 0x33ffffff));
+ mErrorColor = getColor(ta, 7, COLOR_INVALID);
+ mRippleAlpha = Color.alpha(getColor(ta, 8, 0x33ffffff));
}
mContrastColor = calculateContrastColor(ctx, rawColor, mPrimaryAccentColor,
mBackgroundColor, nightMode);
@@ -12917,14 +12907,6 @@ public class Notification implements Parcelable
ContrastColorUtil.resolvePrimaryColor(
ctx, mTertiaryAccentColor, nightMode), 0xFF);
}
- if (mTertiaryFixedDimAccentColor == COLOR_INVALID) {
- mTertiaryFixedDimAccentColor = mContrastColor;
- }
- if (mOnTertiaryFixedAccentTextColor == COLOR_INVALID) {
- mOnTertiaryFixedAccentTextColor = ColorUtils.setAlphaComponent(
- ContrastColorUtil.resolvePrimaryColor(
- ctx, mTertiaryFixedDimAccentColor, nightMode), 0xFF);
- }
if (mErrorColor == COLOR_INVALID) {
mErrorColor = mPrimaryTextColor;
}
@@ -12998,16 +12980,6 @@ public class Notification implements Parcelable
return mOnTertiaryAccentTextColor;
}
- /** @return the theme's tertiary fixed dim accent color for colored UI elements. */
- public @ColorInt int getTertiaryFixedDimAccentColor() {
- return mTertiaryFixedDimAccentColor;
- }
-
- /** @return the theme's text color to be used on the tertiary fixed accent color. */
- public @ColorInt int getOnTertiaryFixedAccentTextColor() {
- return mOnTertiaryFixedAccentTextColor;
- }
-
/**
* @return the contrast-adjusted version of the color provided by the app, or the
* primary text color when colorized.
diff --git a/core/res/res/values/colors.xml b/core/res/res/values/colors.xml
index 00cf4243cfa9..2050cfe11d0e 100644
--- a/core/res/res/values/colors.xml
+++ b/core/res/res/values/colors.xml
@@ -135,12 +135,11 @@
<drawable name="notification_template_icon_low_bg">#0cffffff</drawable>
<drawable name="notification_template_divider">#29000000</drawable>
<drawable name="notification_template_divider_media">#29ffffff</drawable>
- <color name="notification_primary_text_color_light">@color/system_on_surface_light</color>
- <color name="notification_primary_text_color_dark">@color/system_on_surface_dark</color>
- <!-- Note that the primary and secondary notification text colors are, in fact, the same. -->
- <color name="notification_secondary_text_color_light">@color/system_on_surface_light</color>
- <color name="notification_secondary_text_color_dark">@color/system_on_surface_dark</color>
+ <color name="notification_primary_text_color_light">@color/primary_text_default_material_light</color>
+ <color name="notification_primary_text_color_dark">@color/primary_text_default_material_dark</color>
+ <color name="notification_secondary_text_color_light">@color/primary_text_default_material_light</color>
<item name="notification_secondary_text_disabled_alpha" format="float" type="dimen">0.38</item>
+ <color name="notification_secondary_text_color_dark">@color/primary_text_default_material_dark</color>
<color name="notification_default_color_dark">#ddffffff</color>
<color name="notification_default_color_light">#a3202124</color>
diff --git a/core/tests/coretests/src/android/app/NotificationTest.java b/core/tests/coretests/src/android/app/NotificationTest.java
index 5b0502da1bdf..297f8254ded1 100644
--- a/core/tests/coretests/src/android/app/NotificationTest.java
+++ b/core/tests/coretests/src/android/app/NotificationTest.java
@@ -859,10 +859,6 @@ public class NotificationTest {
assertEquals(cDay.getTertiaryAccentColor(), cNight.getTertiaryAccentColor());
assertEquals(cDay.getOnTertiaryAccentTextColor(),
cNight.getOnTertiaryAccentTextColor());
- assertEquals(cDay.getTertiaryFixedDimAccentColor(),
- cNight.getTertiaryFixedDimAccentColor());
- assertEquals(cDay.getOnTertiaryFixedAccentTextColor(),
- cNight.getOnTertiaryFixedAccentTextColor());
assertEquals(cDay.getProtectionColor(), cNight.getProtectionColor());
assertEquals(cDay.getContrastColor(), cNight.getContrastColor());
assertEquals(cDay.getRippleAlpha(), cNight.getRippleAlpha());
@@ -1844,8 +1840,6 @@ public class NotificationTest {
assertThat(c.getSecondaryAccentColor()).isNotEqualTo(Notification.COLOR_INVALID);
assertThat(c.getTertiaryAccentColor()).isNotEqualTo(Notification.COLOR_INVALID);
assertThat(c.getOnTertiaryAccentTextColor()).isNotEqualTo(Notification.COLOR_INVALID);
- assertThat(c.getTertiaryFixedDimAccentColor()).isNotEqualTo(Notification.COLOR_INVALID);
- assertThat(c.getOnTertiaryFixedAccentTextColor()).isNotEqualTo(Notification.COLOR_INVALID);
assertThat(c.getErrorColor()).isNotEqualTo(Notification.COLOR_INVALID);
assertThat(c.getContrastColor()).isNotEqualTo(Notification.COLOR_INVALID);
assertThat(c.getRippleAlpha()).isAtLeast(0x00);
@@ -1861,12 +1855,9 @@ public class NotificationTest {
// These colors are only used for emphasized buttons; they do not need contrast
assertContrastIsAtLeast(c.getSecondaryAccentColor(), c.getBackgroundColor(), 1);
assertContrastIsAtLeast(c.getTertiaryAccentColor(), c.getBackgroundColor(), 1);
- assertContrastIsAtLeast(c.getTertiaryFixedDimAccentColor(), c.getBackgroundColor(), 1);
// The text that is used within the accent color DOES need to have contrast
assertContrastIsAtLeast(c.getOnTertiaryAccentTextColor(), c.getTertiaryAccentColor(), 4.5);
- assertContrastIsAtLeast(c.getOnTertiaryFixedAccentTextColor(),
- c.getTertiaryFixedDimAccentColor(), 4.5);
}
private void resolveColorsInNightMode(boolean nightMode, Notification.Colors c, int rawColor,
--
2.34.1

8
patches_platform/frameworks_base/0015-Revert-Make-QS-always-use-dark-theme-colors.patch → patches_platform/frameworks_base/0018-Revert-Make-QS-always-use-dark-theme-colors.patch
View File

@ -1,7 +1,7 @@
From 15d6e574126494d166fda1bdfaa22568e0c4aa1c Mon Sep 17 00:00:00 2001 From 35bdcaf6f7a98a68854ac256261d0eb91b1493aa Mon Sep 17 00:00:00 2001
From: Danny Lin <danny@kdrag0n.dev> From: Danny Lin <danny@kdrag0n.dev>
Date: Wed, 6 Oct 2021 18:40:30 -0700 Date: Wed, 6 Oct 2021 18:40:30 -0700
Subject: [PATCH 15/31] Revert "Make QS always use dark theme colors" Subject: [PATCH 18/34] Revert "Make QS always use dark theme colors"
This reverts commit d62f7249f9e3222da95ecf6816601c408aac6be5. This reverts commit d62f7249f9e3222da95ecf6816601c408aac6be5.
@ -14,10 +14,10 @@ Change-Id: Iac4c96ccb3845812ca3df820bf27dc533816f72e
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/packages/SystemUI/res/values/styles.xml b/packages/SystemUI/res/values/styles.xml diff --git a/packages/SystemUI/res/values/styles.xml b/packages/SystemUI/res/values/styles.xml
index d520670ec012..bd38548dbc65 100644 index 7852608df57d..a3d93d832b38 100644
--- a/packages/SystemUI/res/values/styles.xml --- a/packages/SystemUI/res/values/styles.xml
+++ b/packages/SystemUI/res/values/styles.xml +++ b/packages/SystemUI/res/values/styles.xml
@@ -370,7 +370,7 @@ @@ -389,7 +389,7 @@
<item name="containerStyle">@style/AuthCredentialPinPasswordContainerStyle</item> <item name="containerStyle">@style/AuthCredentialPinPasswordContainerStyle</item>
</style> </style>

4
patches_platform/frameworks_base/0016-Revert-Do-not-re-inflate-QS-and-SB-when-CONFIG_UI_MO.patch → patches_platform/frameworks_base/0019-Revert-Do-not-re-inflate-QS-and-SB-when-CONFIG_UI_MO.patch
View File

@ -1,7 +1,7 @@
From 7a570109ab3deea49d6c77e2fd731629e4edabb2 Mon Sep 17 00:00:00 2001 From 2ae2df9278711f93390bede651b69a56099af35b Mon Sep 17 00:00:00 2001
From: Danny Lin <danny@kdrag0n.dev> From: Danny Lin <danny@kdrag0n.dev>
Date: Wed, 6 Oct 2021 18:41:11 -0700 Date: Wed, 6 Oct 2021 18:41:11 -0700
Subject: [PATCH 16/31] Revert "Do not re-inflate QS and SB when Subject: [PATCH 19/34] Revert "Do not re-inflate QS and SB when
CONFIG_UI_MODE" CONFIG_UI_MODE"
This reverts commit 8a40ff855b86bc86e23367017002289920855a4e. This reverts commit 8a40ff855b86bc86e23367017002289920855a4e.

16
patches_platform/frameworks_base/0017-SystemUI-Follow-light-dark-theme-in-quick-settings.patch → patches_platform/frameworks_base/0020-SystemUI-Follow-light-dark-theme-in-quick-settings.patch
View File

@ -1,7 +1,7 @@
From 48c44b93881a1d839f9906c666a8f40e110bab93 Mon Sep 17 00:00:00 2001 From 5f65456d8135c74d48cd0528fdf7005e235ffd43 Mon Sep 17 00:00:00 2001
From: Danny Lin <danny@kdrag0n.dev> From: Danny Lin <danny@kdrag0n.dev>
Date: Mon, 11 Oct 2021 19:24:58 -0700 Date: Mon, 11 Oct 2021 19:24:58 -0700
Subject: [PATCH 17/31] SystemUI: Follow light/dark theme in quick settings Subject: [PATCH 20/34] SystemUI: Follow light/dark theme in quick settings
Android 12's dual-tone style where the quick settings panel is always 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 dark makes the light theme look like a second-class citizen. Pure black
@ -86,10 +86,10 @@ index b6971d3c1fa4..8972df2b7490 100644
<style name="LongScreenshotActivity" parent="@android:style/Theme.DeviceDefault.DayNight"> <style name="LongScreenshotActivity" parent="@android:style/Theme.DeviceDefault.DayNight">
<item name="android:windowNoTitle">true</item> <item name="android:windowNoTitle">true</item>
diff --git a/packages/SystemUI/res/values/styles.xml b/packages/SystemUI/res/values/styles.xml diff --git a/packages/SystemUI/res/values/styles.xml b/packages/SystemUI/res/values/styles.xml
index bd38548dbc65..af92c021ec62 100644 index a3d93d832b38..7ed9f91f30cd 100644
--- a/packages/SystemUI/res/values/styles.xml --- a/packages/SystemUI/res/values/styles.xml
+++ b/packages/SystemUI/res/values/styles.xml +++ b/packages/SystemUI/res/values/styles.xml
@@ -374,7 +374,7 @@ @@ -393,7 +393,7 @@
<item name="isQsTheme">true</item> <item name="isQsTheme">true</item>
<item name="lightIconTheme">@style/QSIconTheme</item> <item name="lightIconTheme">@style/QSIconTheme</item>
<item name="darkIconTheme">@style/QSIconTheme</item> <item name="darkIconTheme">@style/QSIconTheme</item>
@ -98,7 +98,7 @@ index bd38548dbc65..af92c021ec62 100644
<item name="android:windowIsFloating">true</item> <item name="android:windowIsFloating">true</item>
<item name="android:homeAsUpIndicator">@drawable/ic_arrow_back</item> <item name="android:homeAsUpIndicator">@drawable/ic_arrow_back</item>
@@ -387,14 +387,14 @@ @@ -406,14 +406,14 @@
<item name="onSurfaceVariant">?androidprv:attr/materialColorOnSurfaceVariant</item> <item name="onSurfaceVariant">?androidprv:attr/materialColorOnSurfaceVariant</item>
<item name="outline">?androidprv:attr/materialColorOutline</item> <item name="outline">?androidprv:attr/materialColorOutline</item>
@ -121,7 +121,7 @@ index bd38548dbc65..af92c021ec62 100644
<item name="android:itemTextAppearance">@style/Control.MenuItem</item> <item name="android:itemTextAppearance">@style/Control.MenuItem</item>
</style> </style>
@@ -634,7 +634,7 @@ @@ -663,7 +663,7 @@
<style name="QSCustomizeToolbar" parent="@*android:style/Widget.DeviceDefault.Toolbar"> <style name="QSCustomizeToolbar" parent="@*android:style/Widget.DeviceDefault.Toolbar">
<item name="android:textColor">?attr/onSurface</item> <item name="android:textColor">?attr/onSurface</item>
@ -131,10 +131,10 @@ index bd38548dbc65..af92c021ec62 100644
<!-- Media controls always have light background --> <!-- Media controls always have light background -->
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java 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 b0f8276e460d..fe64f08558f5 100644 index 05904eae769c..1130585db0c7 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java
@@ -940,7 +940,7 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, Dump @@ -945,7 +945,7 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, Dump
mNotificationsAlpha = behindAlpha; mNotificationsAlpha = behindAlpha;
mNotificationsTint = behindTint; mNotificationsTint = behindTint;
mBehindAlpha = 1; mBehindAlpha = 1;

14
patches_platform/frameworks_base/0018-SystemUI-Use-themewrapper-for-QSCustomizer-and-tune-.patch → patches_platform/frameworks_base/0021-SystemUI-Use-themewrapper-for-QSCustomizer-and-tune-.patch
View File

@ -1,7 +1,7 @@
From 98ec3af75b139f7bf445d296ededc1e1b2c349d3 Mon Sep 17 00:00:00 2001 From 2ec9f99186510028c1f9d75377a8e65fbc100723 Mon Sep 17 00:00:00 2001
From: Pranav Vashi <neobuddy89@gmail.com> From: Pranav Vashi <neobuddy89@gmail.com>
Date: Wed, 13 Dec 2023 23:24:29 +0530 Date: Wed, 13 Dec 2023 23:24:29 +0530
Subject: [PATCH 18/31] SystemUI: Use themewrapper for QSCustomizer and tune Subject: [PATCH 21/34] SystemUI: Use themewrapper for QSCustomizer and tune
colorUnavailable colorUnavailable
* Restores behvavior from A13 for colorUnavailable, shadeDisabled is now unused. * Restores behvavior from A13 for colorUnavailable, shadeDisabled is now unused.
@ -13,7 +13,7 @@ Signed-off-by: Pranav Vashi <neobuddy89@gmail.com>
2 files changed, 7 insertions(+), 4 deletions(-) 2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/packages/SystemUI/src/com/android/systemui/qs/customize/QSCustomizer.java b/packages/SystemUI/src/com/android/systemui/qs/customize/QSCustomizer.java diff --git a/packages/SystemUI/src/com/android/systemui/qs/customize/QSCustomizer.java b/packages/SystemUI/src/com/android/systemui/qs/customize/QSCustomizer.java
index 7ef47ab2293a..969bce57699b 100644 index 1af2306ad77d..705d6bb940d6 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/customize/QSCustomizer.java --- a/packages/SystemUI/src/com/android/systemui/qs/customize/QSCustomizer.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/customize/QSCustomizer.java +++ b/packages/SystemUI/src/com/android/systemui/qs/customize/QSCustomizer.java
@@ -23,6 +23,7 @@ import android.content.res.Configuration; @@ -23,6 +23,7 @@ import android.content.res.Configuration;
@ -44,18 +44,18 @@ index 7ef47ab2293a..969bce57699b 100644
toolbar.getMenu().add(Menu.NONE, MENU_RESET, 0, com.android.internal.R.string.reset) toolbar.getMenu().add(Menu.NONE, MENU_RESET, 0, com.android.internal.R.string.reset)
.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM); .setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
diff --git a/packages/SystemUI/src/com/android/systemui/qs/tileimpl/QSTileViewImpl.kt b/packages/SystemUI/src/com/android/systemui/qs/tileimpl/QSTileViewImpl.kt 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 764ef681106b..4e59e8c98424 100644 index 456520051f58..3a018c70a8ad 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/tileimpl/QSTileViewImpl.kt --- a/packages/SystemUI/src/com/android/systemui/qs/tileimpl/QSTileViewImpl.kt
+++ b/packages/SystemUI/src/com/android/systemui/qs/tileimpl/QSTileViewImpl.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/tileimpl/QSTileViewImpl.kt
@@ -95,7 +95,7 @@ open class QSTileViewImpl @JvmOverloads constructor( @@ -100,7 +100,7 @@ open class QSTileViewImpl @JvmOverloads constructor(
private val colorActive = Utils.getColorAttrDefaultColor(context, R.attr.shadeActive) private val colorActive = Utils.getColorAttrDefaultColor(context, R.attr.shadeActive)
private val colorInactive = Utils.getColorAttrDefaultColor(context, R.attr.shadeInactive) private val colorInactive = Utils.getColorAttrDefaultColor(context, R.attr.shadeInactive)
- private val colorUnavailable = Utils.getColorAttrDefaultColor(context, R.attr.shadeDisabled) - private val colorUnavailable = Utils.getColorAttrDefaultColor(context, R.attr.shadeDisabled)
+ private val colorUnavailable = Utils.applyAlpha(UNAVAILABLE_ALPHA, colorInactive) + private val colorUnavailable = Utils.applyAlpha(UNAVAILABLE_ALPHA, colorInactive)
private val colorLabelActive = Utils.getColorAttrDefaultColor(context, R.attr.onShadeActive) private val overlayColorActive = Utils.applyAlpha(
private val colorLabelInactive = Utils.getColorAttrDefaultColor(context, R.attr.onShadeInactive) /* alpha= */ 0.11f,
-- --
2.34.1 2.34.1

8
patches_platform/frameworks_base/0019-SystemUI-Initialize-QS-tiles-in-inactive-state.patch → patches_platform/frameworks_base/0022-SystemUI-Initialize-QS-tiles-in-inactive-state.patch
View File

@ -1,7 +1,7 @@
From ff212e50fa84225c115cb7583b22c4bfdd5aac65 Mon Sep 17 00:00:00 2001 From 11a452ed141a31cff8d0ff3c10c28c189a2dffe7 Mon Sep 17 00:00:00 2001
From: Danny Lin <danny@kdrag0n.dev> From: Danny Lin <danny@kdrag0n.dev>
Date: Mon, 11 Oct 2021 19:25:02 -0700 Date: Mon, 11 Oct 2021 19:25:02 -0700
Subject: [PATCH 19/31] SystemUI: Initialize QS tiles in inactive state Subject: [PATCH 22/34] SystemUI: Initialize QS tiles in inactive state
Now that the QS fragment is recreated when changing the UI mode (so that 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 it follows light/dark themes), all tiles flash with active color briefly
@ -17,10 +17,10 @@ Change-Id: I048171d503f5533e91bab486b8805ac15c329f31
1 file changed, 1 insertion(+), 1 deletion(-) 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 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 25f77ea4e6d5..7934c5023329 100644 index 5d85fbade873..0c7c46d8d31d 100644
--- a/packages/SystemUI/plugin/src/com/android/systemui/plugins/qs/QSTile.java --- a/packages/SystemUI/plugin/src/com/android/systemui/plugins/qs/QSTile.java
+++ b/packages/SystemUI/plugin/src/com/android/systemui/plugins/qs/QSTile.java +++ b/packages/SystemUI/plugin/src/com/android/systemui/plugins/qs/QSTile.java
@@ -156,7 +156,7 @@ public interface QSTile { @@ -154,7 +154,7 @@ public interface QSTile {
@ProvidesInterface(version = State.VERSION) @ProvidesInterface(version = State.VERSION)
public static class State { public static class State {
public static final int VERSION = 1; public static final int VERSION = 1;

16
patches_platform/frameworks_base/0020-SystemUI-Add-dual-tone-light-and-dark-themes-for-QS.patch → patches_platform/frameworks_base/0023-SystemUI-Add-dual-tone-light-and-dark-themes-for-QS.patch
View File

@ -1,7 +1,7 @@
From e390498360800b89f064fb96145f204b98dc5dbe Mon Sep 17 00:00:00 2001 From 52d583bc1d9c696bfd4e3cfb12f6b59ec12e3ce4 Mon Sep 17 00:00:00 2001
From: Danny Lin <danny@kdrag0n.dev> From: Danny Lin <danny@kdrag0n.dev>
Date: Mon, 11 Oct 2021 19:25:08 -0700 Date: Mon, 11 Oct 2021 19:25:08 -0700
Subject: [PATCH 20/31] SystemUI: Add dual-tone light and dark themes for QS Subject: [PATCH 23/34] SystemUI: Add dual-tone light and dark themes for QS
Google's dual-tone QS design where the notification panel has a Google's dual-tone QS design where the notification panel has a
semantically higher elevation adds depth to the notification+QS shade, semantically higher elevation adds depth to the notification+QS shade,
@ -80,10 +80,10 @@ index 1571fab66a5b..0683c20a4a4c 100644
<item name="alertDialogTheme">@style/Theme.DeviceDefault.Dialog.Alert</item> <item name="alertDialogTheme">@style/Theme.DeviceDefault.Dialog.Alert</item>
<item name="forceDarkAllowed">false</item> <item name="forceDarkAllowed">false</item>
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java 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 fe64f08558f5..842f3dd8f54c 100644 index 1130585db0c7..b6488cff6842 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java
@@ -215,6 +215,7 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, Dump @@ -219,6 +219,7 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, Dump
private final StatusBarKeyguardViewManager mStatusBarKeyguardViewManager; private final StatusBarKeyguardViewManager mStatusBarKeyguardViewManager;
private GradientColors mColors; private GradientColors mColors;
@ -91,7 +91,7 @@ index fe64f08558f5..842f3dd8f54c 100644
private boolean mNeedsDrawableColorUpdate; private boolean mNeedsDrawableColorUpdate;
private float mAdditionalScrimBehindAlphaKeyguard = 0f; private float mAdditionalScrimBehindAlphaKeyguard = 0f;
@@ -352,6 +353,7 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, Dump @@ -359,6 +360,7 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, Dump
mKeyguardTransitionInteractor = keyguardTransitionInteractor; mKeyguardTransitionInteractor = keyguardTransitionInteractor;
mWallpaperRepository = wallpaperRepository; mWallpaperRepository = wallpaperRepository;
mMainDispatcher = mainDispatcher; mMainDispatcher = mainDispatcher;
@ -99,7 +99,7 @@ index fe64f08558f5..842f3dd8f54c 100644
} }
@Override @Override
@@ -1127,7 +1129,7 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, Dump @@ -1132,7 +1134,7 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, Dump
&& !mBlankScreen; && !mBlankScreen;
mScrimInFront.setColors(mColors, animateScrimInFront); mScrimInFront.setColors(mColors, animateScrimInFront);
@ -108,7 +108,7 @@ index fe64f08558f5..842f3dd8f54c 100644
mNotificationsScrim.setColors(mColors, animateScrimNotifications); mNotificationsScrim.setColors(mColors, animateScrimNotifications);
dispatchBackScrimState(mScrimBehind.getViewAlpha()); dispatchBackScrimState(mScrimBehind.getViewAlpha());
@@ -1492,7 +1494,10 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, Dump @@ -1497,7 +1499,10 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, Dump
if (mScrimBehind == null) return; if (mScrimBehind == null) return;
int background = Utils.getColorAttr(mScrimBehind.getContext(), int background = Utils.getColorAttr(mScrimBehind.getContext(),
android.R.attr.colorBackgroundFloating).getDefaultColor(); android.R.attr.colorBackgroundFloating).getDefaultColor();
@ -119,7 +119,7 @@ index fe64f08558f5..842f3dd8f54c 100644
mColors.setMainColor(background); mColors.setMainColor(background);
mColors.setSecondaryColor(accent); mColors.setSecondaryColor(accent);
final boolean isBackgroundLight = !ContrastColorUtil.isColorDark(background); final boolean isBackgroundLight = !ContrastColorUtil.isColorDark(background);
@@ -1504,6 +1509,11 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, Dump @@ -1509,6 +1514,11 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, Dump
state.setSurfaceColor(surface); state.setSurfaceColor(surface);
} }

12
patches_platform/frameworks_base/0021-SystemUI-Follow-light-dark-theme-in-power-menu.patch → patches_platform/frameworks_base/0024-SystemUI-Follow-light-dark-theme-in-power-menu.patch
View File

@ -1,7 +1,7 @@
From a4b814c2e24e9a5c3bb9d1f50393b207216df6ac Mon Sep 17 00:00:00 2001 From 799c920e75780cf5146f3a3875ce3e84a6df32c1 Mon Sep 17 00:00:00 2001
From: Danny Lin <danny@kdrag0n.dev> From: Danny Lin <danny@kdrag0n.dev>
Date: Tue, 8 Mar 2022 20:37:33 -0800 Date: Tue, 8 Mar 2022 20:37:33 -0800
Subject: [PATCH 21/31] SystemUI: Follow light/dark theme in power menu Subject: [PATCH 24/34] SystemUI: Follow light/dark theme in power menu
Now that we've modified the power menu to refresh on UI mode changes, Now that we've modified the power menu to refresh on UI mode changes,
make it follow the system light/dark theme for better integration in make it follow the system light/dark theme for better integration in
@ -27,7 +27,7 @@ Signed-off-by: Pranav Vashi <neobuddy89@gmail.com>
3 files changed, 18 insertions(+), 4 deletions(-) 3 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/packages/SystemUI/res/values-night/colors.xml b/packages/SystemUI/res/values-night/colors.xml diff --git a/packages/SystemUI/res/values-night/colors.xml b/packages/SystemUI/res/values-night/colors.xml
index 99311e3d1e1b..6e61294327f7 100644 index e759c1211a93..e98196e800cf 100644
--- a/packages/SystemUI/res/values-night/colors.xml --- a/packages/SystemUI/res/values-night/colors.xml
+++ b/packages/SystemUI/res/values-night/colors.xml +++ b/packages/SystemUI/res/values-night/colors.xml
@@ -55,6 +55,11 @@ @@ -55,6 +55,11 @@
@ -43,7 +43,7 @@ index 99311e3d1e1b..6e61294327f7 100644
<color name="global_actions_alert_text">@color/GM2_red_300</color> <color name="global_actions_alert_text">@color/GM2_red_300</color>
diff --git a/packages/SystemUI/res/values/colors.xml b/packages/SystemUI/res/values/colors.xml diff --git a/packages/SystemUI/res/values/colors.xml b/packages/SystemUI/res/values/colors.xml
index fed2f9172dc3..b494973b319f 100644 index 91a72922fd0a..0e59b3b774df 100644
--- a/packages/SystemUI/res/values/colors.xml --- a/packages/SystemUI/res/values/colors.xml
+++ b/packages/SystemUI/res/values/colors.xml +++ b/packages/SystemUI/res/values/colors.xml
@@ -36,10 +36,10 @@ @@ -36,10 +36,10 @@
@ -62,10 +62,10 @@ index fed2f9172dc3..b494973b319f 100644
<color name="global_actions_lite_emergency_icon">@color/GM2_grey_900</color> <color name="global_actions_lite_emergency_icon">@color/GM2_grey_900</color>
diff --git a/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialogLite.java b/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialogLite.java diff --git a/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialogLite.java b/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialogLite.java
index cb8e7c4ca073..3ec6a7cde410 100644 index d94c7bb1c0f8..661e4e6b4b95 100644
--- a/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialogLite.java --- a/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialogLite.java
+++ b/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialogLite.java +++ b/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialogLite.java
@@ -831,6 +831,15 @@ public class GlobalActionsDialogLite implements DialogInterface.OnDismissListene @@ -842,6 +842,15 @@ public class GlobalActionsDialogLite implements DialogInterface.OnDismissListene
user.id) != 0; user.id) != 0;
} }

23
patches_platform/frameworks_base/0022-SystemUI-Re-evaluate-system-theme-on-UI-mode-change.patch → patches_platform/frameworks_base/0025-SystemUI-Re-evaluate-system-theme-on-UI-mode-change.patch
View File

@ -1,7 +1,7 @@
From 5bfb64b6e1fe6e78a1b15869332a33c40afde56c Mon Sep 17 00:00:00 2001 From f38638b25fb4dbabf96d5f30ebe3c2e893a39439 Mon Sep 17 00:00:00 2001
From: althafvly <althafvly@gmail.com> From: althafvly <althafvly@gmail.com>
Date: Tue, 26 May 2020 21:17:59 +0800 Date: Tue, 26 May 2020 21:17:59 +0800
Subject: [PATCH 22/31] SystemUI: Re-evaluate system theme on UI mode change Subject: [PATCH 25/34] SystemUI: Re-evaluate system theme on UI mode change
- Need for power menu to set accurate colors - Need for power menu to set accurate colors
@ -11,10 +11,10 @@ Change-Id: I05d41eaf8ea19ce3b6ce659d01da33cf55de3b7e
1 file changed, 16 insertions(+), 1 deletion(-) 1 file changed, 16 insertions(+), 1 deletion(-)
diff --git a/packages/SystemUI/src/com/android/systemui/theme/ThemeOverlayController.java b/packages/SystemUI/src/com/android/systemui/theme/ThemeOverlayController.java diff --git a/packages/SystemUI/src/com/android/systemui/theme/ThemeOverlayController.java b/packages/SystemUI/src/com/android/systemui/theme/ThemeOverlayController.java
index 395bb6c6f1af..e27ec424a444 100644 index 8d4e70c2b961..744f1eb67f41 100644
--- a/packages/SystemUI/src/com/android/systemui/theme/ThemeOverlayController.java --- a/packages/SystemUI/src/com/android/systemui/theme/ThemeOverlayController.java
+++ b/packages/SystemUI/src/com/android/systemui/theme/ThemeOverlayController.java +++ b/packages/SystemUI/src/com/android/systemui/theme/ThemeOverlayController.java
@@ -75,6 +75,8 @@ import com.android.systemui.monet.ColorScheme; @@ -78,6 +78,8 @@ import com.android.systemui.monet.ColorScheme;
import com.android.systemui.monet.Style; import com.android.systemui.monet.Style;
import com.android.systemui.monet.TonalPalette; import com.android.systemui.monet.TonalPalette;
import com.android.systemui.settings.UserTracker; import com.android.systemui.settings.UserTracker;
@ -22,8 +22,8 @@ index 395bb6c6f1af..e27ec424a444 100644
+import com.android.systemui.statusbar.policy.ConfigurationController.ConfigurationListener; +import com.android.systemui.statusbar.policy.ConfigurationController.ConfigurationListener;
import com.android.systemui.statusbar.policy.DeviceProvisionedController; import com.android.systemui.statusbar.policy.DeviceProvisionedController;
import com.android.systemui.statusbar.policy.DeviceProvisionedController.DeviceProvisionedListener; import com.android.systemui.statusbar.policy.DeviceProvisionedController.DeviceProvisionedListener;
import com.android.systemui.util.settings.SecureSettings; import com.android.systemui.util.kotlin.JavaAdapter;
@@ -138,6 +140,7 @@ public class ThemeOverlayController implements CoreStartable, Dumpable { @@ -141,6 +143,7 @@ public class ThemeOverlayController implements CoreStartable, Dumpable {
private final boolean mIsMonetEnabled; private final boolean mIsMonetEnabled;
private final boolean mIsFidelityEnabled; private final boolean mIsFidelityEnabled;
private final UserTracker mUserTracker; private final UserTracker mUserTracker;
@ -31,7 +31,7 @@ index 395bb6c6f1af..e27ec424a444 100644
private final DeviceProvisionedController mDeviceProvisionedController; private final DeviceProvisionedController mDeviceProvisionedController;
private final Resources mResources; private final Resources mResources;
// Current wallpaper colors associated to a user. // Current wallpaper colors associated to a user.
@@ -176,6 +179,15 @@ public class ThemeOverlayController implements CoreStartable, Dumpable { @@ -181,6 +184,15 @@ public class ThemeOverlayController implements CoreStartable, Dumpable {
// Determines if we should ignore THEME_CUSTOMIZATION_OVERLAY_PACKAGES setting changes. // Determines if we should ignore THEME_CUSTOMIZATION_OVERLAY_PACKAGES setting changes.
private boolean mSkipSettingChange; private boolean mSkipSettingChange;
@ -47,22 +47,21 @@ index 395bb6c6f1af..e27ec424a444 100644
private final DeviceProvisionedListener mDeviceProvisionedListener = private final DeviceProvisionedListener mDeviceProvisionedListener =
new DeviceProvisionedListener() { new DeviceProvisionedListener() {
@Override @Override
@@ -402,11 +414,13 @@ public class ThemeOverlayController implements CoreStartable, Dumpable { @@ -421,10 +433,12 @@ public class ThemeOverlayController implements CoreStartable, Dumpable {
FeatureFlags featureFlags,
@Main Resources resources,
WakefulnessLifecycle wakefulnessLifecycle, WakefulnessLifecycle wakefulnessLifecycle,
JavaAdapter javaAdapter,
KeyguardTransitionInteractor keyguardTransitionInteractor,
- UiModeManager uiModeManager) { - UiModeManager uiModeManager) {
+ UiModeManager uiModeManager, + UiModeManager uiModeManager,
+ ConfigurationController configurationController) { + ConfigurationController configurationController) {
mContext = context; mContext = context;
mIsMonochromaticEnabled = featureFlags.isEnabled(Flags.MONOCHROMATIC_THEME);
mIsMonetEnabled = featureFlags.isEnabled(Flags.MONET); mIsMonetEnabled = featureFlags.isEnabled(Flags.MONET);
mIsFidelityEnabled = featureFlags.isEnabled(Flags.COLOR_FIDELITY); mIsFidelityEnabled = featureFlags.isEnabled(Flags.COLOR_FIDELITY);
+ mConfigurationController = configurationController; + mConfigurationController = configurationController;
mDeviceProvisionedController = deviceProvisionedController; mDeviceProvisionedController = deviceProvisionedController;
mBroadcastDispatcher = broadcastDispatcher; mBroadcastDispatcher = broadcastDispatcher;
mUserManager = userManager; mUserManager = userManager;
@@ -518,6 +532,7 @@ public class ThemeOverlayController implements CoreStartable, Dumpable { @@ -538,6 +552,7 @@ public class ThemeOverlayController implements CoreStartable, Dumpable {
mUserTracker.addCallback(mUserTrackerCallback, mMainExecutor); mUserTracker.addCallback(mUserTrackerCallback, mMainExecutor);

10
patches_platform/frameworks_base/0023-SystemUI-Fix-QS-header-clock-color.patch → patches_platform/frameworks_base/0026-SystemUI-Fix-QS-header-clock-color.patch
View File

@ -1,7 +1,7 @@
From 7a6c86c406d9fc8ef0be07caa5d87982402f6d2a Mon Sep 17 00:00:00 2001 From 7b7aab383a7a326b5ae110a2154815c088685d85 Mon Sep 17 00:00:00 2001
From: Danny Baumann <dannybaumann@web.de> From: Danny Baumann <dannybaumann@web.de>
Date: Wed, 20 Jul 2022 15:53:13 +0200 Date: Wed, 20 Jul 2022 15:53:13 +0200
Subject: [PATCH 23/31] SystemUI: Fix QS header clock color Subject: [PATCH 26/34] SystemUI: Fix QS header clock color
Now that we're flipping QS colors by theme (dark/light), we can no longer Now that we're flipping QS colors by theme (dark/light), we can no longer
rely on wallpaper colors for QS clock. Instead, we now can rely on clock color rely on wallpaper colors for QS clock. Instead, we now can rely on clock color
@ -15,10 +15,10 @@ Signed-off-by: Pranav Vashi <neobuddy89@gmail.com>
1 file changed, 8 deletions(-) 1 file changed, 8 deletions(-)
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/Clock.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/Clock.java diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/Clock.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/Clock.java
index b5b2f0d98733..8664b9c984e5 100644 index cc7a82d49fab..e7d146a5cd5a 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/Clock.java --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/Clock.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/Clock.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/Clock.java
@@ -42,7 +42,6 @@ import android.text.style.CharacterStyle; @@ -43,7 +43,6 @@ import android.text.style.CharacterStyle;
import android.text.style.RelativeSizeSpan; import android.text.style.RelativeSizeSpan;
import android.util.AttributeSet; import android.util.AttributeSet;
import android.util.TypedValue; import android.util.TypedValue;
@ -26,7 +26,7 @@ index b5b2f0d98733..8664b9c984e5 100644
import android.view.Display; import android.view.Display;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
@@ -432,13 +431,6 @@ public class Clock extends TextView implements @@ -433,13 +432,6 @@ public class Clock extends TextView implements
setTextColor(mNonAdaptedColor); setTextColor(mNonAdaptedColor);
} }

8
patches_platform/frameworks_base/0024-SystemUI-Calculate-paged-QS-tiles-height-properly.patch → patches_platform/frameworks_base/0027-SystemUI-Calculate-paged-QS-tiles-height-properly.patch
View File

@ -1,7 +1,7 @@
From b3ea300144d8d4924754f0516cc2adcb26c7f710 Mon Sep 17 00:00:00 2001 From a4c50a3dbcb4140d93c813be6d128f2d6bf54809 Mon Sep 17 00:00:00 2001
From: Adithya R <gh0strider.2k18.reborn@gmail.com> From: Adithya R <gh0strider.2k18.reborn@gmail.com>
Date: Mon, 30 May 2022 00:13:02 +0530 Date: Mon, 30 May 2022 00:13:02 +0530
Subject: [PATCH 24/31] SystemUI: Calculate paged QS tiles height properly Subject: [PATCH 27/34] SystemUI: Calculate paged QS tiles height properly
When QS is re-inflated during UI mode change and we're on the When QS is re-inflated during UI mode change and we're on the
3rd or higher QS page, the first QS page is misaligned and 3rd or higher QS page, the first QS page is misaligned and
@ -15,10 +15,10 @@ Change-Id: I539babdb75c114cc44b4213ff114d4272be22ef6
1 file changed, 9 insertions(+), 5 deletions(-) 1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/packages/SystemUI/src/com/android/systemui/qs/PagedTileLayout.java b/packages/SystemUI/src/com/android/systemui/qs/PagedTileLayout.java diff --git a/packages/SystemUI/src/com/android/systemui/qs/PagedTileLayout.java b/packages/SystemUI/src/com/android/systemui/qs/PagedTileLayout.java
index 9a5f43b0d6f3..3ec1221f5d01 100644 index 052c0daf0b56..cf2834914f66 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/PagedTileLayout.java --- a/packages/SystemUI/src/com/android/systemui/qs/PagedTileLayout.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/PagedTileLayout.java +++ b/packages/SystemUI/src/com/android/systemui/qs/PagedTileLayout.java
@@ -123,12 +123,16 @@ public class PagedTileLayout extends ViewPager implements QSTileLayout { @@ -135,12 +135,16 @@ public class PagedTileLayout extends ViewPager implements QSTileLayout {
@Override @Override
public int getTilesHeight() { public int getTilesHeight() {

4
patches_platform/frameworks_base/0025-SystemUI-Re-inflate-QS-and-SB-when-CONFIG_SCREEN_LAY.patch → patches_platform/frameworks_base/0028-SystemUI-Re-inflate-QS-and-SB-when-CONFIG_SCREEN_LAY.patch
View File

@ -1,7 +1,7 @@
From 8d7d5edb443453eac836fd1595bdc67e79164a75 Mon Sep 17 00:00:00 2001 From 6d944c3e413c882c8203bd8eaf2bfc5183fffffd Mon Sep 17 00:00:00 2001
From: althafvly <althafvly@gmail.com> From: althafvly <althafvly@gmail.com>
Date: Tue, 4 Oct 2022 18:34:08 +0530 Date: Tue, 4 Oct 2022 18:34:08 +0530
Subject: [PATCH 25/31] SystemUI: Re-inflate QS and SB when Subject: [PATCH 28/34] SystemUI: Re-inflate QS and SB when
CONFIG_SCREEN_LAYOUT CONFIG_SCREEN_LAYOUT
- It was removed in a13, needed for light theme change in landscape. - It was removed in a13, needed for light theme change in landscape.

53
patches_platform/frameworks_base/0026-SystemUI-Follow-light-dark-theme-in-SplitShade-Heade.patch → patches_platform/frameworks_base/0029-SystemUI-Follow-light-dark-theme-in-SplitShade-Heade.patch
View File

@ -1,7 +1,7 @@
From cbb3174a2aca29c815b00c840cba3771defa8298 Mon Sep 17 00:00:00 2001 From 901e7a826dcde851f61bd7811eceba2456fb9c25 Mon Sep 17 00:00:00 2001
From: ReallySnow <reallysnow233@gmail.com> From: ReallySnow <reallysnow233@gmail.com>
Date: Thu, 15 Sep 2022 13:38:48 +0800 Date: Thu, 15 Sep 2022 13:38:48 +0800
Subject: [PATCH 26/31] SystemUI: Follow light/dark theme in SplitShade Header Subject: [PATCH 29/34] SystemUI: Follow light/dark theme in SplitShade Header
* Google's default implementation is dark, which means * Google's default implementation is dark, which means
it doesn't need to follow the light/dark color change, it doesn't need to follow the light/dark color change,
@ -11,26 +11,28 @@ Subject: [PATCH 26/31] SystemUI: Follow light/dark theme in SplitShade Header
Co-authored-by: Col_or <col_or@qq.com> Co-authored-by: Col_or <col_or@qq.com>
Change-Id: I5464039885197eeb43bd31b822bfcba7a1b08776 Change-Id: I5464039885197eeb43bd31b822bfcba7a1b08776
--- ---
.../systemui/shade/ShadeHeaderController.kt | 27 +++++++++++++++++++ .../systemui/shade/ShadeHeaderController.kt | 28 +++++++++++++++++++
.../systemui/shade/carrier/ShadeCarrier.java | 8 ++++++ .../systemui/shade/carrier/ShadeCarrier.java | 8 ++++++
.../shade/carrier/ShadeCarrierGroup.java | 16 +++++++++++ .../shade/carrier/ShadeCarrierGroup.java | 16 +++++++++++
3 files changed, 51 insertions(+) .../shade/ShadeHeaderControllerTest.kt | 1 +
4 files changed, 53 insertions(+)
diff --git a/packages/SystemUI/src/com/android/systemui/shade/ShadeHeaderController.kt b/packages/SystemUI/src/com/android/systemui/shade/ShadeHeaderController.kt diff --git a/packages/SystemUI/src/com/android/systemui/shade/ShadeHeaderController.kt b/packages/SystemUI/src/com/android/systemui/shade/ShadeHeaderController.kt
index 3c08389a7ca2..5cdd6f44d4a0 100644 index 593260996198..5a5cb792c10b 100644
--- a/packages/SystemUI/src/com/android/systemui/shade/ShadeHeaderController.kt --- a/packages/SystemUI/src/com/android/systemui/shade/ShadeHeaderController.kt
+++ b/packages/SystemUI/src/com/android/systemui/shade/ShadeHeaderController.kt +++ b/packages/SystemUI/src/com/android/systemui/shade/ShadeHeaderController.kt
@@ -22,7 +22,10 @@ import android.annotation.IdRes @@ -21,8 +21,11 @@ import android.animation.AnimatorListenerAdapter
import android.annotation.IdRes
import android.app.PendingIntent import android.app.PendingIntent
import android.app.StatusBarManager import android.app.StatusBarManager
import android.content.Intent
+import android.content.Context +import android.content.Context
import android.content.Intent
+import android.content.res.ColorStateList +import android.content.res.ColorStateList
import android.content.res.Configuration import android.content.res.Configuration
+import android.graphics.Color +import android.graphics.Color
import android.graphics.Insets
import android.os.Bundle import android.os.Bundle
import android.os.Trace import android.os.Trace
import android.os.Trace.TRACE_TAG_APP
@@ -91,6 +94,7 @@ constructor( @@ -91,6 +94,7 @@ constructor(
private val privacyIconsController: HeaderPrivacyIconsController, private val privacyIconsController: HeaderPrivacyIconsController,
private val insetsProvider: StatusBarContentInsetsProvider, private val insetsProvider: StatusBarContentInsetsProvider,
@ -39,7 +41,7 @@ index 3c08389a7ca2..5cdd6f44d4a0 100644
private val variableDateViewControllerFactory: VariableDateViewController.Factory, private val variableDateViewControllerFactory: VariableDateViewController.Factory,
@Named(SHADE_HEADER) private val batteryMeterViewController: BatteryMeterViewController, @Named(SHADE_HEADER) private val batteryMeterViewController: BatteryMeterViewController,
private val dumpManager: DumpManager, private val dumpManager: DumpManager,
@@ -141,6 +145,7 @@ constructor( @@ -142,6 +146,7 @@ constructor(
private var cutout: DisplayCutout? = null private var cutout: DisplayCutout? = null
private var lastInsets: WindowInsets? = null private var lastInsets: WindowInsets? = null
private var nextAlarmIntent: PendingIntent? = null private var nextAlarmIntent: PendingIntent? = null
@ -47,7 +49,7 @@ index 3c08389a7ca2..5cdd6f44d4a0 100644
private var qsDisabled = false private var qsDisabled = false
private var visible = false private var visible = false
@@ -283,6 +288,10 @@ constructor( @@ -288,6 +293,10 @@ constructor(
updateCarrierGroupPadding() updateCarrierGroupPadding()
clock.onDensityOrFontScaleChanged() clock.onDensityOrFontScaleChanged()
} }
@ -58,21 +60,19 @@ index 3c08389a7ca2..5cdd6f44d4a0 100644
} }
private val nextAlarmCallback = private val nextAlarmCallback =
@@ -335,6 +344,7 @@ constructor( @@ -341,6 +350,7 @@ constructor(
demoModeController.addCallback(demoModeReceiver) demoModeController.addCallback(demoModeReceiver)
statusBarIconController.addIconGroup(iconManager) statusBarIconController.addIconGroup(iconManager)
nextAlarmController.addCallback(nextAlarmCallback) nextAlarmController.addCallback(nextAlarmCallback)
+ updateResources() + updateResources()
systemIcons.setOnHoverListener( systemIconsHoverContainer.setOnHoverListener(
statusOverlayHoverListenerFactory.createListener(systemIcons) statusOverlayHoverListenerFactory.createListener(systemIconsHoverContainer)
) )
@@ -538,6 +548,23 @@ constructor( @@ -544,6 +554,24 @@ constructor(
header.setPadding(padding, header.paddingTop, padding, header.paddingBottom) header.setPadding(padding, header.paddingTop, padding, header.paddingBottom)
updateQQSPaddings() updateQQSPaddings()
qsBatteryModeController.updateResources() qsBatteryModeController.updateResources()
+ +
+ val fillColor = Utils.getColorAttrDefaultColor(context, android.R.attr.textColorPrimary)
+ iconManager.setTint(fillColor)
+ val textColor = Utils.getColorAttrDefaultColor(context, android.R.attr.textColorPrimary) + val textColor = Utils.getColorAttrDefaultColor(context, android.R.attr.textColorPrimary)
+ val colorStateList = Utils.getColorAttr(context, android.R.attr.textColorPrimary) + val colorStateList = Utils.getColorAttr(context, android.R.attr.textColorPrimary)
+ if (textColor != textColorPrimary) { + if (textColor != textColorPrimary) {
@ -80,7 +80,10 @@ index 3c08389a7ca2..5cdd6f44d4a0 100644
+ android.R.attr.textColorSecondary) + android.R.attr.textColorSecondary)
+ textColorPrimary = textColor + textColorPrimary = textColor
+ if (iconManager != null) { + if (iconManager != null) {
+ iconManager.setTint(textColor) + iconManager.setTint(
+ textColorPrimary,
+ Utils.getColorAttrDefaultColor(context, android.R.attr.textColorPrimaryInverse),
+ )
+ } + }
+ clock.setTextColor(textColorPrimary) + clock.setTextColor(textColorPrimary)
+ date.setTextColor(textColorPrimary) + date.setTextColor(textColorPrimary)
@ -91,7 +94,7 @@ index 3c08389a7ca2..5cdd6f44d4a0 100644
private fun updateQQSPaddings() { private fun updateQQSPaddings() {
diff --git a/packages/SystemUI/src/com/android/systemui/shade/carrier/ShadeCarrier.java b/packages/SystemUI/src/com/android/systemui/shade/carrier/ShadeCarrier.java diff --git a/packages/SystemUI/src/com/android/systemui/shade/carrier/ShadeCarrier.java b/packages/SystemUI/src/com/android/systemui/shade/carrier/ShadeCarrier.java
index 8612cdf12c6e..5940677c4842 100644 index 6ca0ad47a0a7..24a1e7cda1fd 100644
--- a/packages/SystemUI/src/com/android/systemui/shade/carrier/ShadeCarrier.java --- a/packages/SystemUI/src/com/android/systemui/shade/carrier/ShadeCarrier.java
+++ b/packages/SystemUI/src/com/android/systemui/shade/carrier/ShadeCarrier.java +++ b/packages/SystemUI/src/com/android/systemui/shade/carrier/ShadeCarrier.java
@@ -152,6 +152,14 @@ public class ShadeCarrier extends LinearLayout { @@ -152,6 +152,14 @@ public class ShadeCarrier extends LinearLayout {
@ -110,7 +113,7 @@ index 8612cdf12c6e..5940677c4842 100644
View getRSSIView() { View getRSSIView() {
return mMobileGroup; return mMobileGroup;
diff --git a/packages/SystemUI/src/com/android/systemui/shade/carrier/ShadeCarrierGroup.java b/packages/SystemUI/src/com/android/systemui/shade/carrier/ShadeCarrierGroup.java diff --git a/packages/SystemUI/src/com/android/systemui/shade/carrier/ShadeCarrierGroup.java b/packages/SystemUI/src/com/android/systemui/shade/carrier/ShadeCarrierGroup.java
index 68561d1cfd0f..97964c38a92f 100644 index e84fb485829c..a5bcfeacff31 100644
--- a/packages/SystemUI/src/com/android/systemui/shade/carrier/ShadeCarrierGroup.java --- a/packages/SystemUI/src/com/android/systemui/shade/carrier/ShadeCarrierGroup.java
+++ b/packages/SystemUI/src/com/android/systemui/shade/carrier/ShadeCarrierGroup.java +++ b/packages/SystemUI/src/com/android/systemui/shade/carrier/ShadeCarrierGroup.java
@@ -18,8 +18,11 @@ package com.android.systemui.shade.carrier; @@ -18,8 +18,11 @@ package com.android.systemui.shade.carrier;
@ -145,6 +148,18 @@ index 68561d1cfd0f..97964c38a92f 100644
public void updateTextAppearance(@StyleRes int resId) { public void updateTextAppearance(@StyleRes int resId) {
FontSizeUtils.updateFontSizeFromStyle(getNoSimTextView(), resId); FontSizeUtils.updateFontSizeFromStyle(getNoSimTextView(), resId);
getCarrier1View().updateTextAppearance(resId); getCarrier1View().updateTextAppearance(resId);
diff --git a/packages/SystemUI/tests/src/com/android/systemui/shade/ShadeHeaderControllerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/shade/ShadeHeaderControllerTest.kt
index 9fa173ab040a..de321ba62105 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/shade/ShadeHeaderControllerTest.kt
+++ b/packages/SystemUI/tests/src/com/android/systemui/shade/ShadeHeaderControllerTest.kt
@@ -189,6 +189,7 @@ class ShadeHeaderControllerTest : SysuiTestCase() {
privacyIconsController,
insetsProvider,
configurationController,
+ mockedContext,
variableDateViewControllerFactory,
batteryMeterViewController,
dumpManager,
-- --
2.34.1 2.34.1

6
patches_platform/frameworks_base/0027-SystemUI-Remove-visibility-check-in-setting-QSCarrie.patch → patches_platform/frameworks_base/0030-SystemUI-Remove-visibility-check-in-setting-QSCarrie.patch
View File

@ -1,7 +1,7 @@
From 8fc39e71d3601ff02b1da15b8db234e4e8952045 Mon Sep 17 00:00:00 2001 From 740f1c7ff7d0a429e79d5bf075c162314ca6fd66 Mon Sep 17 00:00:00 2001
From: Adithya R <gh0strider.2k18.reborn@gmail.com> From: Adithya R <gh0strider.2k18.reborn@gmail.com>
Date: Thu, 19 Jan 2023 14:37:43 +0530 Date: Thu, 19 Jan 2023 14:37:43 +0530
Subject: [PATCH 27/31] SystemUI: Remove visibility check in setting QSCarrier Subject: [PATCH 30/34] SystemUI: Remove visibility check in setting QSCarrier
color color
This fixes a corner case where the signal icon color is incorrect: This fixes a corner case where the signal icon color is incorrect:
@ -19,7 +19,7 @@ Change-Id: I092c06053fc4bc8d9ca51d1d31128da27ef6a823
1 file changed, 2 insertions(+), 5 deletions(-) 1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/packages/SystemUI/src/com/android/systemui/shade/carrier/ShadeCarrier.java b/packages/SystemUI/src/com/android/systemui/shade/carrier/ShadeCarrier.java diff --git a/packages/SystemUI/src/com/android/systemui/shade/carrier/ShadeCarrier.java b/packages/SystemUI/src/com/android/systemui/shade/carrier/ShadeCarrier.java
index 5940677c4842..fef896579bbf 100644 index 24a1e7cda1fd..727a187d20f7 100644
--- a/packages/SystemUI/src/com/android/systemui/shade/carrier/ShadeCarrier.java --- a/packages/SystemUI/src/com/android/systemui/shade/carrier/ShadeCarrier.java
+++ b/packages/SystemUI/src/com/android/systemui/shade/carrier/ShadeCarrier.java +++ b/packages/SystemUI/src/com/android/systemui/shade/carrier/ShadeCarrier.java
@@ -153,11 +153,8 @@ public class ShadeCarrier extends LinearLayout { @@ -153,11 +153,8 @@ public class ShadeCarrier extends LinearLayout {

14
patches_platform/frameworks_base/0028-SystemUI-Switch-notification-background-to-monet-on-.patch → patches_platform/frameworks_base/0031-SystemUI-Switch-notification-background-to-monet-on-.patch
View File

@ -1,7 +1,7 @@
From ee07d3b1026400a4aac3743d8fb6feff5242c5ac Mon Sep 17 00:00:00 2001 From b983f9062624d76c6cf6a66eee0851bb99e83c3d Mon Sep 17 00:00:00 2001
From: DillerOFire <niktofe1@gmail.com> From: DillerOFire <niktofe1@gmail.com>
Date: Wed, 27 Jul 2022 15:28:16 +1000 Date: Wed, 27 Jul 2022 15:28:16 +1000
Subject: [PATCH 28/31] SystemUI: Switch notification background to monet on Subject: [PATCH 31/34] SystemUI: Switch notification background to monet on
heads up heads up
Change-Id: If1822acc3ea604444f2083d7fadec06ffb8eec19 Change-Id: If1822acc3ea604444f2083d7fadec06ffb8eec19
@ -47,10 +47,10 @@ index 000000000000..61a8e8e9c6e1
+</ripple> +</ripple>
\ No newline at end of file \ No newline at end of file
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ActivatableNotificationView.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ActivatableNotificationView.java diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ActivatableNotificationView.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ActivatableNotificationView.java
index 1b790fdc35c1..e958cbf452db 100644 index 9fa9049cc7cd..dc04895508d0 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ActivatableNotificationView.java --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ActivatableNotificationView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ActivatableNotificationView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ActivatableNotificationView.java
@@ -168,7 +168,7 @@ public abstract class ActivatableNotificationView extends ExpandableOutlineView @@ -171,7 +171,7 @@ public abstract class ActivatableNotificationView extends ExpandableOutlineView
* be useful in a configuration change. * be useful in a configuration change.
*/ */
protected void initBackground() { protected void initBackground() {
@ -59,7 +59,7 @@ index 1b790fdc35c1..e958cbf452db 100644
} }
protected boolean hideBackground() { protected boolean hideBackground() {
@@ -179,6 +179,13 @@ public abstract class ActivatableNotificationView extends ExpandableOutlineView @@ -182,6 +182,13 @@ public abstract class ActivatableNotificationView extends ExpandableOutlineView
mBackgroundNormal.setVisibility(hideBackground() ? INVISIBLE : VISIBLE); mBackgroundNormal.setVisibility(hideBackground() ? INVISIBLE : VISIBLE);
} }
@ -74,10 +74,10 @@ index 1b790fdc35c1..e958cbf452db 100644
@Override @Override
public boolean onInterceptTouchEvent(MotionEvent ev) { public boolean onInterceptTouchEvent(MotionEvent ev) {
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRow.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRow.java diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRow.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRow.java
index d92d11b18d74..ce9eac753550 100644 index b6d4dedfe6f7..2ea46cae819f 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRow.java --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRow.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRow.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRow.java
@@ -1047,6 +1047,9 @@ public class ExpandableNotificationRow extends ActivatableNotificationView @@ -1041,6 +1041,9 @@ public class ExpandableNotificationRow extends ActivatableNotificationView
if (intrinsicHeight != getIntrinsicHeight()) { if (intrinsicHeight != getIntrinsicHeight()) {
notifyHeightChanged(false /* needsAnimation */); notifyHeightChanged(false /* needsAnimation */);
} }

14
patches_platform/frameworks_base/0029-SystemUI-Follow-Dark-Light-theme-for-Safe-Mode-dialo.patch → patches_platform/frameworks_base/0032-SystemUI-Follow-Dark-Light-theme-for-Safe-Mode-dialo.patch
View File

@ -1,7 +1,7 @@
From 84c5455182edb1703ba9cb0c209eb66c636fec6b Mon Sep 17 00:00:00 2001 From ab0a1b7775420943aae88747a3c79893e934e672 Mon Sep 17 00:00:00 2001
From: Pulkit077 <pulkitagarwal2k1@gmail.com> From: Pulkit077 <pulkitagarwal2k1@gmail.com>
Date: Fri, 16 Sep 2022 14:46:37 +0530 Date: Fri, 16 Sep 2022 14:46:37 +0530
Subject: [PATCH 29/31] SystemUI: Follow Dark/Light theme for Safe Mode dialog Subject: [PATCH 32/34] SystemUI: Follow Dark/Light theme for Safe Mode dialog
Change-Id: Ia9864a45551e969abaccd351e8b6d65e21d99165 Change-Id: Ia9864a45551e969abaccd351e8b6d65e21d99165
Signed-off-by: Pulkit077 <pulkitagarwal2k1@gmail.com> Signed-off-by: Pulkit077 <pulkitagarwal2k1@gmail.com>
@ -11,18 +11,18 @@ Signed-off-by: Pranav Vashi <neobuddy89@gmail.com>
1 file changed, 7 insertions(+), 1 deletion(-) 1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/services/core/java/com/android/server/power/ShutdownThread.java b/services/core/java/com/android/server/power/ShutdownThread.java diff --git a/services/core/java/com/android/server/power/ShutdownThread.java b/services/core/java/com/android/server/power/ShutdownThread.java
index 3630ae26fbc2..98a37d0a8e96 100644 index c919dcbad45b..cb3c30b3fef1 100644
--- a/services/core/java/com/android/server/power/ShutdownThread.java --- a/services/core/java/com/android/server/power/ShutdownThread.java
+++ b/services/core/java/com/android/server/power/ShutdownThread.java +++ b/services/core/java/com/android/server/power/ShutdownThread.java
@@ -30,6 +30,7 @@ import android.content.IIntentReceiver; @@ -31,6 +31,7 @@ import android.content.IIntentReceiver;
import android.content.Intent; import android.content.Intent;
import android.content.IntentFilter; import android.content.IntentFilter;
import android.content.pm.PackageManagerInternal; import android.content.pm.PackageManagerInternal;
+import android.content.res.Configuration; +import android.content.res.Configuration;
import android.media.AudioAttributes;
import android.os.Bundle; import android.os.Bundle;
import android.os.FileUtils; import android.os.FileUtils;
@@ -185,6 +186,11 @@ public final class ShutdownThread extends Thread { import android.os.Handler;
@@ -194,6 +195,11 @@ public final class ShutdownThread extends Thread {
? com.android.internal.R.string.shutdown_confirm_question ? com.android.internal.R.string.shutdown_confirm_question
: com.android.internal.R.string.shutdown_confirm); : com.android.internal.R.string.shutdown_confirm);
@ -34,7 +34,7 @@ index 3630ae26fbc2..98a37d0a8e96 100644
if (DEBUG) { if (DEBUG) {
Log.d(TAG, "Notifying thread to start shutdown longPressBehavior=" + longPressBehavior); Log.d(TAG, "Notifying thread to start shutdown longPressBehavior=" + longPressBehavior);
} }
@@ -194,7 +200,7 @@ public final class ShutdownThread extends Thread { @@ -203,7 +209,7 @@ public final class ShutdownThread extends Thread {
if (sConfirmDialog != null) { if (sConfirmDialog != null) {
sConfirmDialog.dismiss(); sConfirmDialog.dismiss();
} }

10
patches_platform/frameworks_base/0030-SystemUI-Follow-monet-theme-on-privacy-indicators.patch → patches_platform/frameworks_base/0033-SystemUI-Follow-monet-theme-on-privacy-indicators.patch
View File

@ -1,7 +1,7 @@
From a4b5ee62c8b2e49ce188631cb9155cef5c2dd143 Mon Sep 17 00:00:00 2001 From 43b40366ed1feb86002b849851678baeed250d47 Mon Sep 17 00:00:00 2001
From: minaripenguin <minaripenguin@users.noreply.github.com> From: minaripenguin <minaripenguin@users.noreply.github.com>
Date: Fri, 24 Mar 2023 13:04:06 +0800 Date: Fri, 24 Mar 2023 13:04:06 +0800
Subject: [PATCH 30/31] SystemUI: Follow monet theme on privacy indicators Subject: [PATCH 33/34] SystemUI: Follow monet theme on privacy indicators
Change-Id: Ib713cb3283fcf3a49086c5da8360d2a1b6cd6704 Change-Id: Ib713cb3283fcf3a49086c5da8360d2a1b6cd6704
Signed-off-by: minaripenguin <minaripenguin@users.noreply.github.com> Signed-off-by: minaripenguin <minaripenguin@users.noreply.github.com>
@ -12,10 +12,10 @@ Signed-off-by: Pranav Vashi <neobuddy89@gmail.com>
2 files changed, 2 insertions(+), 2 deletions(-) 2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/packages/SystemUI/res/values/colors.xml b/packages/SystemUI/res/values/colors.xml diff --git a/packages/SystemUI/res/values/colors.xml b/packages/SystemUI/res/values/colors.xml
index b494973b319f..d65f5d66c5e4 100644 index 0e59b3b774df..8a02dca04251 100644
--- a/packages/SystemUI/res/values/colors.xml --- a/packages/SystemUI/res/values/colors.xml
+++ b/packages/SystemUI/res/values/colors.xml +++ b/packages/SystemUI/res/values/colors.xml
@@ -217,7 +217,7 @@ @@ -216,7 +216,7 @@
<color name="screenrecord_status_color">#E94235</color> <color name="screenrecord_status_color">#E94235</color>
<color name="screenrecord_icon_color">#D93025</color><!-- red 600 --> <color name="screenrecord_icon_color">#D93025</color><!-- red 600 -->
@ -25,7 +25,7 @@ index b494973b319f..d65f5d66c5e4 100644
<!-- Accessibility floating menu --> <!-- Accessibility floating menu -->
<color name="accessibility_floating_menu_background">#CCFFFFFF</color> <!-- 80% --> <color name="accessibility_floating_menu_background">#CCFFFFFF</color> <!-- 80% -->
diff --git a/packages/SystemUI/src/com/android/systemui/privacy/OngoingPrivacyChip.kt b/packages/SystemUI/src/com/android/systemui/privacy/OngoingPrivacyChip.kt diff --git a/packages/SystemUI/src/com/android/systemui/privacy/OngoingPrivacyChip.kt b/packages/SystemUI/src/com/android/systemui/privacy/OngoingPrivacyChip.kt
index 310d23407d5d..957fc8faad2c 100644 index 8e1b00d825aa..a79a10639b9d 100644
--- a/packages/SystemUI/src/com/android/systemui/privacy/OngoingPrivacyChip.kt --- a/packages/SystemUI/src/com/android/systemui/privacy/OngoingPrivacyChip.kt
+++ b/packages/SystemUI/src/com/android/systemui/privacy/OngoingPrivacyChip.kt +++ b/packages/SystemUI/src/com/android/systemui/privacy/OngoingPrivacyChip.kt
@@ -123,7 +123,7 @@ class OngoingPrivacyChip @JvmOverloads constructor( @@ -123,7 +123,7 @@ class OngoingPrivacyChip @JvmOverloads constructor(

30
patches_platform/frameworks_base/0031-SystemUI-Follow-monet-theme-on-battery-chip.patch → patches_platform/frameworks_base/0034-SystemUI-Follow-monet-theme-on-battery-chip.patch
View File

@ -1,15 +1,15 @@
From c84b629202ee60515734b3798e5914cda8a6424b Mon Sep 17 00:00:00 2001 From 83a1b45cc8d1d6d4f5d8d275db29fc7ed3f34cff Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com> From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Wed, 10 Jan 2024 23:36:41 +0800 Date: Wed, 10 Jan 2024 23:36:41 +0800
Subject: [PATCH 31/31] SystemUI: Follow monet theme on battery chip Subject: [PATCH 34/34] SystemUI: Follow monet theme on battery chip
Why does this chip even exist... Why does this chip even exist...
Change-Id: I178fdda5d8d310c4c7fa5f05f9911b3f94986cb9 Change-Id: I178fdda5d8d310c4c7fa5f05f9911b3f94986cb9
--- ---
packages/SystemUI/res/drawable/statusbar_chip_bg.xml | 8 +++----- packages/SystemUI/res/drawable/statusbar_chip_bg.xml | 8 +++-----
.../com/android/systemui/statusbar/BatteryStatusChip.kt | 4 ++-- .../com/android/systemui/statusbar/BatteryStatusChip.kt | 6 ++++++
2 files changed, 5 insertions(+), 7 deletions(-) 2 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/packages/SystemUI/res/drawable/statusbar_chip_bg.xml b/packages/SystemUI/res/drawable/statusbar_chip_bg.xml diff --git a/packages/SystemUI/res/drawable/statusbar_chip_bg.xml b/packages/SystemUI/res/drawable/statusbar_chip_bg.xml
index d7de16d7c5bb..dd1db04e77d7 100644 index d7de16d7c5bb..dd1db04e77d7 100644
@ -30,21 +30,29 @@ index d7de16d7c5bb..dd1db04e77d7 100644
\ No newline at end of file \ No newline at end of file
+</shape> +</shape>
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/BatteryStatusChip.kt b/packages/SystemUI/src/com/android/systemui/statusbar/BatteryStatusChip.kt diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/BatteryStatusChip.kt b/packages/SystemUI/src/com/android/systemui/statusbar/BatteryStatusChip.kt
index 520976746785..e22a599ed80e 100644 index 835225009110..04373eb7ed87 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/BatteryStatusChip.kt --- a/packages/SystemUI/src/com/android/systemui/statusbar/BatteryStatusChip.kt
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/BatteryStatusChip.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/BatteryStatusChip.kt
@@ -64,9 +64,9 @@ class BatteryStatusChip @JvmOverloads constructor(context: Context, attrs: Attri @@ -22,6 +22,7 @@ import android.util.AttributeSet
import android.view.View
import android.widget.FrameLayout
import android.widget.LinearLayout
+import com.android.settingslib.Utils
import com.android.systemui.battery.BatteryMeterView
import com.android.systemui.res.R
import com.android.systemui.statusbar.events.BackgroundAnimatableView
@@ -65,6 +66,11 @@ class BatteryStatusChip @JvmOverloads constructor(context: Context, attrs: Attri
@SuppressLint("UseCompatLoadingForDrawables") @SuppressLint("UseCompatLoadingForDrawables")
private fun updateResources() { private fun updateResources() {
val primaryColor = + val primaryColor =
- Utils.getColorAttrDefaultColor(context, com.android.internal.R.attr.colorPrimary)
+ Utils.getColorAttrDefaultColor(context, android.R.attr.textColorPrimaryInverse) + Utils.getColorAttrDefaultColor(context, android.R.attr.textColorPrimaryInverse)
val textColorSecondary = + val textColorSecondary =
- Utils.getColorAttrDefaultColor(mContext, android.R.attr.textColorSecondary)
+ Utils.getColorAttrDefaultColor(mContext, android.R.attr.textColorSecondaryInverse) + Utils.getColorAttrDefaultColor(mContext, android.R.attr.textColorSecondaryInverse)
batteryMeterView.updateColors(primaryColor, textColorSecondary, primaryColor) + batteryMeterView.updateColors(primaryColor, textColorSecondary, primaryColor)
roundedContainer.background = mContext.getDrawable(R.drawable.statusbar_chip_bg) roundedContainer.background = mContext.getDrawable(R.drawable.statusbar_chip_bg)
} }
}
-- --
2.34.1 2.34.1

65
patches_platform/packages_apps_SetupWizard/0001-SetupWizard-Remove-step-for-changing-theme.patch Normal file
View File

@ -0,0 +1,65 @@
From 2194bcf5d390be451ff641a0d779a2a815d1d67a Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Mon, 26 Feb 2024 08:41:08 +0800
Subject: [PATCH] SetupWizard: Remove step for changing theme
This partially reverts commit 554f63530a257db3194bd7c492e1c954eb11374d.
Change-Id: Id83207c766d6b0b23cd240b35936289c44026db5
---
res/raw/lineage_wizard_script.xml | 6 ------
res/raw/lineage_wizard_script_user.xml | 6 ------
res/raw/wizard_script.xml | 3 ---
3 files changed, 15 deletions(-)
diff --git a/res/raw/lineage_wizard_script.xml b/res/raw/lineage_wizard_script.xml
index 0befc2b..ea342b6 100644
--- a/res/raw/lineage_wizard_script.xml
+++ b/res/raw/lineage_wizard_script.xml
@@ -82,12 +82,6 @@
<WizardAction
wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_BIOMETRIC_SETTINGS;end"
id="biometric_settings">
- <result wizard:action="theme_settings" />
- </WizardAction>
-
- <WizardAction
- wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.THEME_SETTINGS;end"
- id="theme_settings">
<result wizard:action="navigation_settings" />
</WizardAction>
diff --git a/res/raw/lineage_wizard_script_user.xml b/res/raw/lineage_wizard_script_user.xml
index aef7f2e..af38520 100644
--- a/res/raw/lineage_wizard_script_user.xml
+++ b/res/raw/lineage_wizard_script_user.xml
@@ -34,12 +34,6 @@
<WizardAction
wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_BIOMETRIC_SETTINGS;end"
id="biometric_settings">
- <result wizard:action="theme_settings" />
- </WizardAction>
-
- <WizardAction
- wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.THEME_SETTINGS;end"
- id="theme_settings">
<result wizard:action="navigation_settings" />
</WizardAction>
diff --git a/res/raw/wizard_script.xml b/res/raw/wizard_script.xml
index 38ec267..ba93494 100644
--- a/res/raw/wizard_script.xml
+++ b/res/raw/wizard_script.xml
@@ -112,9 +112,6 @@
<result wizard:action="lineage_settings" />
</WizardAction>
<WizardAction wizard:uri="intent:#Intent;package=org.lineageos.setupwizard;action=org.lineageos.setupwizard.LINEAGE_SETTINGS;end" id="lineage_settings">
- <result wizard:action="theme_settings" />
- </WizardAction>
- <WizardAction wizard:uri="intent:#Intent;package=org.lineageos.setupwizard;action=org.lineageos.setupwizard.THEME_SETTINGS;end" id="theme_settings">
<result wizard:action="navigation_settings" />
</WizardAction>
<WizardAction wizard:uri="intent:#Intent;package=org.lineageos.setupwizard;action=org.lineageos.setupwizard.NAVIGATION_SETTINGS;end" id="navigation_settings">
--
2.34.1

12
patches_platform_personal/build_make/0001-build-Integrate-prop-modifications-1-2.patch
View File

@ -1,4 +1,4 @@
From 2a644e6a7d3dbdea344fc24408c86e0676811333 Mon Sep 17 00:00:00 2001 From 6c64bd7235f1c7b080fd95dc7a199350c740d8b0 Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com> From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Sun, 20 Jun 2021 09:08:43 +0000 Date: Sun, 20 Jun 2021 09:08:43 +0000
Subject: [PATCH 1/2] build: Integrate prop modifications (1/2) Subject: [PATCH 1/2] build: Integrate prop modifications (1/2)
@ -9,15 +9,15 @@ Change-Id: I24f54937e3e542b7c29ea86d24e3f523583a0c61
1 file changed, 7 insertions(+), 2 deletions(-) 1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/tools/buildinfo.sh b/tools/buildinfo.sh diff --git a/tools/buildinfo.sh b/tools/buildinfo.sh
index 4c82ec9edc..c01872c369 100755 index e68162a6fe..ba29698719 100755
--- a/tools/buildinfo.sh --- a/tools/buildinfo.sh
+++ b/tools/buildinfo.sh +++ b/tools/buildinfo.sh
@@ -9,7 +9,7 @@ if [ "$BOARD_USE_VBMETA_DIGTEST_IN_FINGERPRINT" = "true" ] ; then @@ -9,7 +9,7 @@ if [ "$BOARD_USE_VBMETA_DIGTEST_IN_FINGERPRINT" = "true" ] ; then
else else
echo "ro.build.id=$BUILD_ID" echo "ro.build.id?=$BUILD_ID"
fi fi
-echo "ro.build.display.id=$BUILD_DISPLAY_ID" -echo "ro.build.display.id?=$BUILD_DISPLAY_ID"
+echo "ro.build.display.id=$BUILD_ID" +echo "ro.build.display.id?=$BUILD_ID"
echo "ro.build.version.incremental=$BUILD_NUMBER" echo "ro.build.version.incremental=$BUILD_NUMBER"
echo "ro.build.version.sdk=$PLATFORM_SDK_VERSION" echo "ro.build.version.sdk=$PLATFORM_SDK_VERSION"
echo "ro.build.version.preview_sdk=$PLATFORM_PREVIEW_SDK_VERSION" echo "ro.build.version.preview_sdk=$PLATFORM_PREVIEW_SDK_VERSION"
@ -30,7 +30,7 @@ index 4c82ec9edc..c01872c369 100755
echo "ro.build.date.utc=`$DATE +%s`" echo "ro.build.date.utc=`$DATE +%s`"
echo "ro.build.type=$TARGET_BUILD_TYPE" echo "ro.build.type=$TARGET_BUILD_TYPE"
echo "ro.build.user=$BUILD_USERNAME" echo "ro.build.user=$BUILD_USERNAME"
@@ -55,5 +55,10 @@ if [ -n "$BUILD_THUMBPRINT" ] ; then @@ -57,5 +57,10 @@ if [ -n "$BUILD_THUMBPRINT" ] ; then
fi fi
echo "ro.lineage.device=$LINEAGE_DEVICE" echo "ro.lineage.device=$LINEAGE_DEVICE"

4
patches_platform_personal/build_make/0002-build-Remove-Stk-1-2.patch
View File

@ -1,4 +1,4 @@
From 614df52d701e164b0da9586209e4a45e404df52b Mon Sep 17 00:00:00 2001 From 5266372262a0d48bbb6251c6f8af75c01c76ab5c Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com> From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Sat, 16 Oct 2021 00:39:15 +0000 Date: Sat, 16 Oct 2021 00:39:15 +0000
Subject: [PATCH 2/2] build: Remove Stk (1/2) Subject: [PATCH 2/2] build: Remove Stk (1/2)
@ -9,7 +9,7 @@ Change-Id: I24ef17c74c3137a11b463cde96c74d0edc853edd
1 file changed, 1 deletion(-) 1 file changed, 1 deletion(-)
diff --git a/target/product/generic_system.mk b/target/product/generic_system.mk diff --git a/target/product/generic_system.mk b/target/product/generic_system.mk
index 98d6046854..da9adc3af5 100644 index 08a7cdf83e..5afb9a3a99 100644
--- a/target/product/generic_system.mk --- a/target/product/generic_system.mk
+++ b/target/product/generic_system.mk +++ b/target/product/generic_system.mk
@@ -33,7 +33,6 @@ PRODUCT_PACKAGES += \ @@ -33,7 +33,6 @@ PRODUCT_PACKAGES += \

159
patches_platform_personal/frameworks_base/0001-Add-MotoHelloUINavbarOverlay-1-2.patch Normal file
View File

@ -0,0 +1,159 @@
From e1866ef3ab91a394c0a810675df59a9c328ce0b2 Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Mon, 22 Apr 2024 23:34:04 +0800
Subject: [PATCH 01/20] Add MotoHelloUINavbarOverlay (1/2)
Redrawn after extracted SVGs, resized and adjusted stroke width
Change-Id: Idd8deb529ab39444737676d7bdba1c52555d6661
---
packages/overlays/Android.mk | 1 +
.../MotoHelloUINavbarOverlay/Android.bp | 28 +++++++++++++++++++
.../AndroidManifest.xml | 22 +++++++++++++++
.../res/drawable/ic_sysbar_back.xml | 12 ++++++++
.../res/drawable/ic_sysbar_home.xml | 11 ++++++++
.../res/drawable/ic_sysbar_recent.xml | 19 +++++++++++++
6 files changed, 93 insertions(+)
create mode 100644 packages/overlays/MotoHelloUINavbarOverlay/Android.bp
create mode 100644 packages/overlays/MotoHelloUINavbarOverlay/AndroidManifest.xml
create mode 100644 packages/overlays/MotoHelloUINavbarOverlay/res/drawable/ic_sysbar_back.xml
create mode 100644 packages/overlays/MotoHelloUINavbarOverlay/res/drawable/ic_sysbar_home.xml
create mode 100644 packages/overlays/MotoHelloUINavbarOverlay/res/drawable/ic_sysbar_recent.xml
diff --git a/packages/overlays/Android.mk b/packages/overlays/Android.mk
index a41d0e57cd21..c0573b2a9c16 100644
--- a/packages/overlays/Android.mk
+++ b/packages/overlays/Android.mk
@@ -26,6 +26,7 @@ LOCAL_REQUIRED_MODULES := \
DisplayCutoutEmulationTallOverlay \
DisplayCutoutEmulationWaterfallOverlay \
FontNotoSerifSourceOverlay \
+ MotoHelloUINavbarOverlay \
NavigationBarMode3ButtonOverlay \
NavigationBarModeGesturalOverlay \
NavigationBarModeGesturalOverlayNarrowBack \
diff --git a/packages/overlays/MotoHelloUINavbarOverlay/Android.bp b/packages/overlays/MotoHelloUINavbarOverlay/Android.bp
new file mode 100644
index 000000000000..06515997990a
--- /dev/null
+++ b/packages/overlays/MotoHelloUINavbarOverlay/Android.bp
@@ -0,0 +1,28 @@
+//
+// Copyright 2021, The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+package {
+ // See: http://go/android-license-faq
+ // A large-scale-change added 'default_applicable_licenses' to import
+ // all of the 'license_kinds' from "frameworks_base_license"
+ // to get the below license kinds:
+ // SPDX-license-identifier-Apache-2.0
+ default_applicable_licenses: ["frameworks_base_license"],
+}
+
+runtime_resource_overlay {
+ name: "MotoHelloUINavbarOverlay",
+ product_specific: true,
+}
diff --git a/packages/overlays/MotoHelloUINavbarOverlay/AndroidManifest.xml b/packages/overlays/MotoHelloUINavbarOverlay/AndroidManifest.xml
new file mode 100644
index 000000000000..25646b2c4603
--- /dev/null
+++ b/packages/overlays/MotoHelloUINavbarOverlay/AndroidManifest.xml
@@ -0,0 +1,22 @@
+<!--
+ ~ Copyright (C) 2021 The Android Open Source Project
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+ package="com.android.systemui.navbar.motohelloui"
+ android:versionCode="1"
+ android:versionName="1.0">
+ <overlay android:targetPackage="com.android.systemui" android:priority="1337" android:isStatic="true"/>
+</manifest>
diff --git a/packages/overlays/MotoHelloUINavbarOverlay/res/drawable/ic_sysbar_back.xml b/packages/overlays/MotoHelloUINavbarOverlay/res/drawable/ic_sysbar_back.xml
new file mode 100644
index 000000000000..2fe4ba43b89b
--- /dev/null
+++ b/packages/overlays/MotoHelloUINavbarOverlay/res/drawable/ic_sysbar_back.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:height="24dp"
+ android:width="24dp"
+ android:autoMirrored="true"
+ android:viewportWidth="24.0"
+ android:viewportHeight="24.0">
+ <path
+ android:pathData="M 15.5 5.875 L 8.5 12 L 15.5 18.125"
+ android:strokeColor="#FFFFFFFF"
+ android:strokeWidth="1.75" />
+</vector>
diff --git a/packages/overlays/MotoHelloUINavbarOverlay/res/drawable/ic_sysbar_home.xml b/packages/overlays/MotoHelloUINavbarOverlay/res/drawable/ic_sysbar_home.xml
new file mode 100644
index 000000000000..14110ab58bd7
--- /dev/null
+++ b/packages/overlays/MotoHelloUINavbarOverlay/res/drawable/ic_sysbar_home.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:height="24dp"
+ android:width="24dp"
+ android:viewportWidth="24.0"
+ android:viewportHeight="24.0">
+ <path
+ android:pathData="M 5.875 12 a 6.125 6.125 90 1 0 12.25 0 a 6.125 6.125 90 1 0 -12.25 0"
+ android:strokeColor="#FFFFFFFF"
+ android:strokeWidth="1.75" />
+</vector>
diff --git a/packages/overlays/MotoHelloUINavbarOverlay/res/drawable/ic_sysbar_recent.xml b/packages/overlays/MotoHelloUINavbarOverlay/res/drawable/ic_sysbar_recent.xml
new file mode 100644
index 000000000000..7436752d5b0a
--- /dev/null
+++ b/packages/overlays/MotoHelloUINavbarOverlay/res/drawable/ic_sysbar_recent.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:height="24dp"
+ android:width="24dp"
+ android:viewportWidth="24.0"
+ android:viewportHeight="24.0">
+ <path
+ android:pathData="M 5.56 5.56 V 18.44"
+ android:strokeColor="#FFFFFFFF"
+ android:strokeWidth="1.53" />
+ <path
+ android:pathData="M 12 6.48 H 9.24 V 17.52 H 14.76 V 6.48 H 12"
+ android:strokeColor="#FFFFFFFF"
+ android:strokeWidth="1.53" />
+ <path
+ android:pathData="M 18.44 5.56 V 18.44"
+ android:strokeColor="#FFFFFFFF"
+ android:strokeWidth="1.53" />
+</vector>
--
2.34.1

52
patches_platform_personal/frameworks_base/0001-Add-keylayout-for-Backbone-One-for-Android-with-AB-X.patch
View File

@ -1,52 +0,0 @@
From a72755422c5a5a8ddd6bb4ca94cd98672f25b30b Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Sun, 18 Jun 2023 19:33:27 +0800
Subject: [PATCH 01/21] Add keylayout for Backbone One for Android, with AB/XY
keys swapped
Change-Id: Ia057c084099015b544c926cd57c37b4ac314867a
---
data/keyboards/Vendor_358a_Product_0201.kl | 31 ++++++++++++++++++++++
1 file changed, 31 insertions(+)
create mode 100644 data/keyboards/Vendor_358a_Product_0201.kl
diff --git a/data/keyboards/Vendor_358a_Product_0201.kl b/data/keyboards/Vendor_358a_Product_0201.kl
new file mode 100644
index 000000000000..e15907f9c6f2
--- /dev/null
+++ b/data/keyboards/Vendor_358a_Product_0201.kl
@@ -0,0 +1,31 @@
+#
+# Backbone One for Android
+#
+
+# AB/XY swapped
+key 305 BUTTON_A
+key 304 BUTTON_B
+key 308 BUTTON_X
+key 307 BUTTON_Y
+
+key 310 BUTTON_L1
+key 311 BUTTON_R1
+key 312 BUTTON_L2
+key 313 BUTTON_R2
+
+key 317 BUTTON_THUMBL
+key 318 BUTTON_THUMBR
+
+axis 0x00 X flat 4096
+axis 0x01 Y flat 4096
+axis 0x02 Z flat 4096
+axis 0x05 RZ flat 4096
+
+axis 0x0a LTRIGGER
+axis 0x09 RTRIGGER
+
+axis 0x10 HAT_X
+axis 0x11 HAT_Y
+
+key 315 BUTTON_START
+key 314 BUTTON_SELECT
--
2.34.1

389
patches_platform_personal/frameworks_base/0002-Add-MiuiNavbarOverlay.patch
View File

@ -1,389 +0,0 @@
From 9e9d9ca5a1497cee04b47825e37dbded5fb90bab Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Sun, 20 Jun 2021 03:39:32 +0000
Subject: [PATCH 02/21] Add MiuiNavbarOverlay
Change-Id: I0e6791abc3c9521d7dc612df2fec2b041affe7e9
---
packages/overlays/Android.mk | 1 +
.../overlays/MiuiNavbarOverlay/Android.bp | 28 ++++++++++++++++++
.../MiuiNavbarOverlay/AndroidManifest.xml | 22 ++++++++++++++
.../res/drawable-440dpi-v4/ic_sysbar_back.png | Bin 0 -> 2756 bytes
.../ic_sysbar_back_darkmode.png | Bin 0 -> 2547 bytes
.../drawable-440dpi-v4/ic_sysbar_docked.png | Bin 0 -> 3642 bytes
.../ic_sysbar_docked_darkmode.png | Bin 0 -> 2810 bytes
.../res/drawable-440dpi-v4/ic_sysbar_home.png | Bin 0 -> 1362 bytes
.../ic_sysbar_home_darkmode.png | Bin 0 -> 980 bytes
.../drawable-440dpi-v4/ic_sysbar_recent.png | Bin 0 -> 278 bytes
.../ic_sysbar_recent_darkmode.png | Bin 0 -> 205 bytes
11 files changed, 51 insertions(+)
create mode 100644 packages/overlays/MiuiNavbarOverlay/Android.bp
create mode 100644 packages/overlays/MiuiNavbarOverlay/AndroidManifest.xml
create mode 100644 packages/overlays/MiuiNavbarOverlay/res/drawable-440dpi-v4/ic_sysbar_back.png
create mode 100644 packages/overlays/MiuiNavbarOverlay/res/drawable-440dpi-v4/ic_sysbar_back_darkmode.png
create mode 100644 packages/overlays/MiuiNavbarOverlay/res/drawable-440dpi-v4/ic_sysbar_docked.png
create mode 100644 packages/overlays/MiuiNavbarOverlay/res/drawable-440dpi-v4/ic_sysbar_docked_darkmode.png
create mode 100644 packages/overlays/MiuiNavbarOverlay/res/drawable-440dpi-v4/ic_sysbar_home.png
create mode 100644 packages/overlays/MiuiNavbarOverlay/res/drawable-440dpi-v4/ic_sysbar_home_darkmode.png
create mode 100644 packages/overlays/MiuiNavbarOverlay/res/drawable-440dpi-v4/ic_sysbar_recent.png
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 a41d0e57cd21..8f2090ed807a 100644
--- a/packages/overlays/Android.mk
+++ b/packages/overlays/Android.mk
@@ -26,6 +26,7 @@ LOCAL_REQUIRED_MODULES := \
DisplayCutoutEmulationTallOverlay \
DisplayCutoutEmulationWaterfallOverlay \
FontNotoSerifSourceOverlay \
+ MiuiNavbarOverlay \
NavigationBarMode3ButtonOverlay \
NavigationBarModeGesturalOverlay \
NavigationBarModeGesturalOverlayNarrowBack \
diff --git a/packages/overlays/MiuiNavbarOverlay/Android.bp b/packages/overlays/MiuiNavbarOverlay/Android.bp
new file mode 100644
index 000000000000..fc724fb7a686
--- /dev/null
+++ b/packages/overlays/MiuiNavbarOverlay/Android.bp
@@ -0,0 +1,28 @@
+//
+// Copyright 2021, The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+package {
+ // See: http://go/android-license-faq
+ // A large-scale-change added 'default_applicable_licenses' to import
+ // all of the 'license_kinds' from "frameworks_base_license"
+ // to get the below license kinds:
+ // SPDX-license-identifier-Apache-2.0
+ default_applicable_licenses: ["frameworks_base_license"],
+}
+
+runtime_resource_overlay {
+ name: "MiuiNavbarOverlay",
+ product_specific: true,
+}
diff --git a/packages/overlays/MiuiNavbarOverlay/AndroidManifest.xml b/packages/overlays/MiuiNavbarOverlay/AndroidManifest.xml
new file mode 100644
index 000000000000..3f10e2e03675
--- /dev/null
+++ b/packages/overlays/MiuiNavbarOverlay/AndroidManifest.xml
@@ -0,0 +1,22 @@
+<!--
+ ~ Copyright (C) 2021 The Android Open Source Project
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+ package="com.miui.systemui.navbar.overlay"
+ android:versionCode="1"
+ android:versionName="1.0">
+ <overlay android:targetPackage="com.android.systemui" android:priority="1337" android:isStatic="true"/>
+</manifest>
diff --git a/packages/overlays/MiuiNavbarOverlay/res/drawable-440dpi-v4/ic_sysbar_back.png b/packages/overlays/MiuiNavbarOverlay/res/drawable-440dpi-v4/ic_sysbar_back.png
new file mode 100644
index 0000000000000000000000000000000000000000..be2b145b4c698679bfdfdc3e5834ad12a56724c0
GIT binary patch
literal 2756
zcmcgu3s4hx8V?1-3OZnL5L?tGprz_2n-D@036KXu)CfXOJj=t)?k3rRWWy$qfRADd
zhu~RzrHmZ`k!wBAa-g0-rC<@UbSw%?@2-FjLbWI3sc4FiE8=+@UZak6oX*Yd%<lg8
z|Nnj8_xql+C5ap3=6k*A#b7YztKyYO^xNUO0Ve${b@zQjzvi0be`{edy!~9a8{=SQ
z0E02-I-%KO-J;$gK}jPA!ALF6u^Y`an!$*Swwn<&6Ssm|Tu+#!?7J;(Y>>dD?38dd
ztTrof0}-E3;mP?MHE4b&D#qB+QDCH9LMt%hRs^&gvrHC=UCN%+E1}n}Z7v&}gjh4B
zY?;d-xJ8`^Do6?k!#P3-<q7y;gqXt<!eYK)HOPl~5nMQe%L{{Go&*+3!o=Y8#ip%M
zm`;+UTsv)x{*tl{R;yXU<=SjEjxCHsQhF{=EEaQNK9|pjXar=*Gg%QkWU>U$Xi(x7
zlp@Slf;53Hjfj@au}axA(<v8>=2^8S%XFCNfN|}JnaktAE|(^O7&?nH=TKRb#xazO
zXW>TNWVO&(-YnK^Ag!duK>mX2+2iL7(4keUXKlQci_ti1!eWihrQMhg$V<@{O`aL&
zCgBz`heGk#T$*OE%Nw&qLE(s%q%<U%HIt~s8OoqS;Yy4M3{4?S7-_S-^Nb9xM69@!
z&4>9g1PdUZSi=)Z;4q0mv<jvd@Dx-{VuUX5c_<&&z+wr^e-1~N42D>dS0gc0q9Z9I
zLVHUX5k1Z|oAhjOHii-fnMG2xNt##Kv->KAB9S6>L>7HuNs5z$s#t}PCl(4JK8H6+
zRIQe%OcpC*LUEN+%BCa3AqY&Oi@?J$Ow5Nc1V$i!xIhPKg(wU~XoZ+CLZFL41n7*s
zl0<V{`Ja);Xn7tSCgcf3;dFTT0*D_WKq0M&r-igAj_`Ftfmj4%Gx7-(LH8e$^{e%`
zy3$oRl6b;Gr!;T6Z<6us=~Wg1PS%P9L0vr{Wuva-<1~Y*ZQ>;ncs&oM<ZT9=R{DyH
zn1WeIoz;d=xJ*w+>vf8b`%C;SNbalIzh3@c#{R`3{gu?GBa0dklOCsMDwpkYhU=O>
zQ+eUOn6k;UXC~DQoF0F!<?P(0KV~O4ZlYCF^j!XUap^q<!=qTGlxgghcLpzI2I7Hd
zop&1=Rb{C=O13WFv&cEW&Z{wW;e<Q&?MZ<+BoVl;U0-vbb#Cc)|K)p_8jp83c{$Qs
zf#$i|iq9(c4X9IU6PsEtnf9^*eRi@sPh4r$f7vp`odAP8ZY+*k++U>^ZVLS7lRN7l
zGj9J74={mtxg3rG{8<h+`H2sG=lME{3bz&bt`6~VFWeRs6aad7&uwP}ZTX)=m&8A2
z<bEDn+B8vnHu!AKy$90a>eHA0^M}}$j0Nn&!DSa(^KN}#w`^tkw+ViJesRq{pPnhb
zetNmiJ2qydzrX+F*1FBVSA4B?vU;l?=0D88{Gim=ZOI}|s)%}cdtiN9T3S#2#PE$v
z718cb|70_~Q{Hs`<9eWKq`PVjExG8r^3<tQ%iQ<7J^n7e=TLQ9gAX_dsM2>==4BGZ
zu@9BzC*uzicE4Tlr0%{ayKp?GGHU1ezBRVdAIpHh4&2tewg0R3&kcRSg@f;(a14JD
z;%IJe?&)Lu%KdusfwggQ`!y@ee+~z}x_$Fz9tFJ-BydIo?Z=XjrXSa=w5UAB#>O(j
z<zV58Lu-NG6&Ghf2f7AA97RP%U4w&z2~#JMC6U?J&UgKj%FCVaAir0*&`d!05%AN`
z6Xp9r+EfCo{X*H>87s@zrIZ0)Md!+|UcGuW!Vv?gBUb@TCNq6?`MS0h3s!SDyZZY2
z9$j3!0H`VP6!i`bJ>79kGrqiJxO3lIL!|$1--Gso`c%#%ge8lre(JpULr0I%U$#bW
zIM%X1JMeD8uC~_J3ERS0V`Dqkbp*=xJPvp=Jv}o*4|M%4v)=2iT}OILNAQjj?j84j
z8PGd?=6!k1y*oPIXJ?iMW%;}j^G$DW@2Z@u>WTcYfbY`x`!@Nw9Y!(i$HsL>eu|!V
zYcRuC?!BRE^Qh>?M*&oGYR8%n<c8fu;-D00P960={75z_mFq8Ob;wx?VMSd_P%NO1
zy7hNM^|g?aouxE-ASTDg>A84uN0N`?@~s8uMrC^ny2nO(+S2Marz|s+To)apFUHaY
zZTxnryk82`26T3Ie(;;xe+-oc)TgyP+{BualgDfAM>p3#ImztsJp1Xt3)YWyuh?7A
z?Q}YAnT?mLRr8XQlkd7$5y#_z?e55&j+zZCEEA)HE$`LEg!=D2Ky(yuOO7sB81xtI
zX}j~9^U4=wM%vb`2P-Nocld}taaHOcjg{w%KR515?39hZm&k0m>4`VY^SF`@H7YJN
h9r{0Z;ER1d?z2;NqUud$cCPC`Qx&^WSufw__%Gd*;i3Ql
literal 0
HcmV?d00001
diff --git a/packages/overlays/MiuiNavbarOverlay/res/drawable-440dpi-v4/ic_sysbar_back_darkmode.png b/packages/overlays/MiuiNavbarOverlay/res/drawable-440dpi-v4/ic_sysbar_back_darkmode.png
new file mode 100644
index 0000000000000000000000000000000000000000..4873f84ff7f4750fa3adc70428ffb123502c1051
GIT binary patch
literal 2547
zcmb_eeQeZZ81J!-O&ofY7;XsC6~zzi_3L(9o89Ji-N!}lm~(+4Q|z_9t?aJ7wPkn1
zfy<Q1N5sVaL5?ZINzkZ#i3x{-Y|2E!v6)~*5ZF)|2|5SPgf9`_?&AVxDjF|o`}Xbc
z`8~hq<9%|gOFhMtCrz6KLC|DZ30nr9O~#cn5!}}#n6HD!9l?@?8U)=r#kfq+hSx0+
zl=PESUZGdG=Q6w!uyTUp6|Lbw5TGF_Codf2_!?1%y<(LlJCMPT_am?*IFJRIZrmMo
ziq%rdGF5zPnWvmzR>RW*l9vnTgc(2(5Ood?2mG?egdNB*F9X)bHip2%5WU8M<Qop*
z3U?{&R8$epwAxXgu#s>UZ6)kDP1+uVNu0>S@GOj=P@G_JJ44a%=nnzjRKdrTu|=c4
zz?%c9*7YERVWCjS8ltR<T7?lbO=CETkt7Nbs8%oQTo{$LSz`>WsPU>4)FnlR4MxtZ
zEY%$dP&yJqAQ-2Wwb3+zgkfPWh!IxY2x%B7@Nrylsp=ngF7TM>7XzZKYXD2cvB7FZ
zSF~#7FR0_6Z*c%p>vqR|jH@LOh`Z4A!a5MfXhOzCYvuJp5i1ilWvR-Gg>^vYEF+pA
z<5WdXSJZMv@sAa%bWAerbQ*=ph96!a$$}En9=XXzWI0`QAS6!WC~iXux}3;naEh^I
z&%wb0AA!0RLGsn#3MKJ!oMv#6!HHX-plbw9=l&5a@QhDU100B13UE~-7L=<HIG#zy
zsrVHYI0ovdoA+H#XQ`_ABtQ6|l@%Aju0p4spzU^)v=YN|-EPJuYdR<MqKkDPAU{?~
z5*Q!n&BA${LP-(NMrofd3-x+QaO3TnbS6)6w2d6IXBB>_(FJ4nf?>~lMcU3$XeKX^
zC{5YCD2-?0C_&PkS0rsbne7|1pQlRT6mtIm%wwEQqkWhXNdtwgA3Z%!iM69EzXT6=
z48!rpNpK*%(E_4?jBZQgW#G0V7@-YSi-7cR`eFp8DLy^KsbYQ=$ky$&9`;xIHLmU-
z)ZbS9##28|tNuszqsir~Ik`#%!xck}crarOjg$uabJd2w-88bs;9w3K%lH5WFYysB
z%79u01Ns?xr3r!(wz}B-^6={er+U|J(JTiqUYb=r=?+)j*+%v?w(NOt*UUFdHlyw5
zewov1Kk?#Ly5gAsp5x!BkN<A+KDn+0K~`^eKX8v{`o-)h)=(Ad^0W*NeA2sp*Ojk4
z$L0?1Ydf)g%fk2P&)M9vZ04p~Jkiv=$(u4EHNVT8XlYuLk%A}Q>oh-?@@O;MVJ=V2
zZ_Ied(gZn6iT@dxz2}l?QDA3<|9p?wU)Pu3XY1=ft6n)i|8!<uZdzmP<ix$ElTc+s
z&X<?kZ=C+g`9*BVf<$*jde7^gtX+3yP(4Y{CR>;EFHfs|=cwyc%>Gg==jDv1wXO9i
za{teI*@9iE0OJeO(an)d#Rr^kc+Sgp8Md^_6WwXGFTCAS#LdqT`WJT8bcjb9py>9V
z!taSzGdVQ34-eK;c_x;P{l0rsHv(uA!uLkoBW)9Ywl{VD0E8S(N1`7@?w$~u*1350
zjDo_TCHiipEvYWOv#4eAn@Bi4`cdR=Q^?Y}b9Q=xZ{wuBiIv~RdI<KyqPF)w5A1x}
z{Udhp>eZ`{bj;~k=UZ`q^g(3B_1$e%OM2J8Kz2R!scbL0fIMXBobD!GdTald#UE8(
z%%i%@UpIy}ys9K^?2aAT$BVOPPc2}7OFfyg_uJTRQ}Qck2Hn=g##NVBpE*@Dm^n1i
z(ein)p(WJ>BP)beXRiBBC*{bg2RHarptOq#pB+Ase57IO4mtHcH)B|BJag#6lT>d)
z&e!MKYd16)pcy-+T#iQ8NA~PL>UxV>Ywqi@Y)j6S`k$w?tzd_2HABdEi<&LDf&OGl
zTMQD)&(DC^16irql!1BVKzD548=h$^kFSKxX^W`?7wW0OL$Ts(m0$Hf=7d(Q+HUb)
zZja176mx*WEKzSvUf!OU*cv&PpiG!*8*(2$`^!o+r{-7RHTJTToo?Eeu+BEr?K!7Y
z*9^Z;G+Rzj%oUn%d}G_QeqvzVy#Kj5|3$lBneo8k53^T$kGYM%Wv)UGyRG24rau72
C-gtlj
literal 0
HcmV?d00001
diff --git a/packages/overlays/MiuiNavbarOverlay/res/drawable-440dpi-v4/ic_sysbar_docked.png b/packages/overlays/MiuiNavbarOverlay/res/drawable-440dpi-v4/ic_sysbar_docked.png
new file mode 100644
index 0000000000000000000000000000000000000000..1c88fc5d571d0ec91b735082cb9c512603b9ceec
GIT binary patch
literal 3642
zcmd5<c|4T)AAgXLtU?sZ>`;z1=4ec27}t!mFecWOW6V65n4>u|Nyt(m{I-K4RF+T?
zD;v2IE9>Y`v5jG4)vknAtz6k>N?yCa-~O)sYv(o3Jm2U0eSbg4`}_WUW+sK=?xeCt
zdkp{pDlX1sDs)ejUW%)s&s4c}i_lGp>+Ht|0A+RQB?IJ~+Xw*ix=b%$fv?*x0-eJ$
zqcJ$4pqYrph0p+CWh3I!=#iiR77B(l*+lr{%_caE$sodg%-v9KToM?;bdKSHyJOtF
z=rNIWJOgfH4YLvvAOkE=K!b@`QEWazM1;S$OMu4GX(Sx>9wLY&!tJCEVZLq@7>UCJ
zVdiEy1RagVz;@ux&^QzxgEfU=Q0N^<)D9$iI|79!pm2okc-Zm_4te7-!U$Bd<FYU4
zi3pDn2)G0!GCDfiEPA^chZl}S<MDVT3WLO85D)^vKfo5yL<lxt|Dy#m$fxs|Tmh5A
zhDj~bLODVK5e`NAAq5t9#Vnh@OcO*HQbgk-(Pk)VO7DRT`U;LK<VC%A&Y&Z~D3ArR
z1$+pLUcquBI06nog7a@ouPpz;0Yt5v+lr4rjfKTpalscj?1$1=Cge}ie6Iss5J?63
z93hVmI_!tS)R$(%C6IU^O~B!KaX3*Q4~p_JWEhDgJs1m^kq?v2;6(F{f42uD(*z(9
zjzM8i2ox59#(QBf1aor&8v7Z_f`CGOfVy!Q%&-Ih3f)dXLvP$4ppa@9Gy(0uf*Eu|
z7>CEAK{+#7v~Uo~WrxFID@+ndoG1<tatuYc{rB@OBoc+k31db<3w)}RJ<P>{ghS(T
zI0VKF{XSebH-ZbBFQBpMpbMD@hxjpLG8u$WIxRE|2Z9JRnt?{(vDi=qEewl6phC?-
z9NIh-1%hE8_meqvp;QGQ_cQ*_{T@6fRE4ytzidZZn^O4@oSA&+U=J);&u(zv@+gW4
zd#@M*jV`SOBAhOj0LXwZPc#2A10T#rM}Uyg|DcNxFg_<t5KZHOcHt0P|BLjHQ2a<~
z*?vd``OjItU;AB&e}qGQLpoe(SkS{t%LCa^pW{Idtrjhl4*-g-E@V3|(Ycp-tO$+S
z&FxK=+vlxrqVESZoEf;j@ym6`TKrmdN42#hk`pIQVr1+tAak^g?MGujO?qpO{vqvD
zHRYZ@)@0Cf=sFkqkax9h%U4c?&Y?!xhLT5C<2_vy<2|I{u6V)m>NPj(CVp9L&g@tS
z-yi+VrXX+DW}!c6PoMm!)CSdrdOgZ2*#!7H83!0(B)k6a@^F|sDOZw3F?#K~J^@wF
z-woWEO3H4<*{t)OyK%TkFGEo$LH;~E3%OXB=D5_PrGm5vf)gHIkL-&ZkVqCw%gXXP
z7(6GeHtRHqU;oL`lc^UCNEiOG3aBz|H*lc>&HK)!vc%hf8|9IHS>9K?O#F+e#yQ2a
z4^hXj6f>93=I1vGhg(w)0$33hTO(s#{sJdZv<HSqMn(!od9?>8#BF|lezimlrb^HD
z3UjP-P=WGBNkn#Za#B50JUjlTuM+oDU84mS`%rG5&mo`Z^EL1v>(UQ}D<4QtLMSUM
z_gNAMahe04n`QTX{r&hib>+y&oSHo*ryuVuI^k)mseHnqR!2uiUR=WhC>jnfmwL-a
zEG{rGXH&`W4w2Ph&aQ1@Z||4=jfdvr96V3lnkmT5y;*l~W+GVb&W;%3V@c~?xdaS>
z5YsFSG@MEnhJ}SSj!#Yw$(>iR)wWf$)g63kwFU-<o3;dJrXEroHfI6>3JMA{J$LU8
ztsUH8+KHK)o3maGdvtS4S$TVmo~;V`n535fe8(;2*Hce#>j2iaES=jlz%nZ<i>+W2
z$>aT^1)PfMBVE70c0|#YkT>z#CrWG<STA}dn_w=I)cbqNT#Fg`Hhub5%Vx{{f{RKq
z!QHULugb>U<3XYD&8^YSY%NNFQmn}(_q;iuO5fOLTGiFnvB$QRv>&mN0o*T8d|&za
z2L#OM5@V`2bDjriTgShP^|0D9G^VAoCRw*$=F*YkP2_7h98Pm#gM+79_}%<PL;_;U
zaYJOX?0F%VJCznf!{sh+87!fbdNtq!4F_k;Wc6bu5=nuFheyGSmoFC;Z9hxUs1It+
zeZ4WUVfBWfiVLiekdT@2@$pFlbX;Tc87%Q=X=!PEp%OVFXJ1lLQBlPcu~;EdoZ2@0
zbrf!1)vZ@kIk_d3nWIxzuBF>vDGcm0Iqljuv?I^`@(F|Ftu80pEbL7*(~8tn$d2BR
zGBIbn44-m+RT`HHoif=1p>T1Hu2V_8BAiaAE4cOUi5^;igmz`Es_IP3&BBKbTguYw
z^lTp){;*zlUBQ_%KLrN{E>673t|ahk2PF6J-<ONHSbHQ)gtb~yALLsLr=N8fL__Ru
zRZGbr!z+o}>1<Dpt)IG3_jsN%0`64lo;ENZZ|biym25ao^UI=%YnbBwm3z#zT#Fv`
zQcGWB3+^Jjy1HWd3vXXF$r-^=^ZiqA`lk%1_F5;dsz}ybzf-B=nSMy`gS*73eX^Y)
zD7_1Z`_EC-$ZFz+B9D99qI=_VgC{#5_WQ)CcN?@!x1Q?g==g$2Bo-9+{@mkhT7%F`
zW2KSd#(r5NRi;iG99)2)Onr;Ojl0|{O*;j;mm;8`a-P-EHhQeR?RzdacV7JT_R*!a
zllLi(Un_b}I=Wt855qw!hh=w47UNYK{IAv3%}H8Y$u{-hcTsjfq&KLZA5))FRD}rC
zK2rJ1T&J(juHHR*Iy#n$6$t7~ObIThsParcWO<}K@MgxUZ@f)5Aac9oE;FCZ9HB9G
z7Ev1^Iu`7<w(m2UjSZTfQ9XM5DFahF_l4{Ii0ZAUT@RI%?RDCA62I;o9Y`1*9j%C-
z7?|A&ykHmlFdE#h-~i{NpKN{t`ekie__n8~C(ay&x|gn%Vr&w$B`mJ@$5R>!j|T?_
z_1rx?mTpN-0sN;e$<|mqYkP_6`PJ~GilBxV3!_^tEiHXOO<_$sZBuj2{LJK%@ms%d
z*b;&~?DI)!3bY3<Jq(PVymE1I@t|X9s!GV>KrNr11#XI??cAxXzI#ypD=(8bhnuLT
zngw}ye%R{4W{<0t<-tvj^))rW-a|SUQFrY+;K7BeC*QERb>!96Y_q^8%IHmA^iwAd
zJ@(gJzb>4Y&nZS6PBEU8e>~Ejsg)@2l%b24tN7A)=Ozu{>LrhYclKGM&riC|#=c_}
zwKW8cNt{dV=$>OQUd%%Z)9*i)TTsx1x3IXO)%<zAb9g+I{KooQaGSh_t4&SucOji+
zPZS4zaV9zHZ4jyVxPDhp&%4IUmtRc(fa|P!ZRnA|u)DX~A+Rqyt!>!9cF$vBAkz87
zkI$wLbXS=w0}Q{c0DpgK#z@leD-l#+TSF`RHNCyXCp#Dix1F3dP)mtYYFru~9u6j0
zT4pAWD85lWjDfmy;fuM8^BE|&>9aR<ux)ojA>PN-MRrjP24m^F@4jQrjEbYXJ4Sgk
z-?q2gkkq@)v7Lo7BJ_MoP%UrNY5v!j^C@LzHqHiWXCtt62;EQGZ$G_OX5?z6vBtQ$
zv%@%J#J7f(4M1JEy~?zKTKZEBOQ)Dw{&U?s-`?tE1=TIF{PF(ErbLKVt)-Ep7>)Y3
zmB;;;C`Ss;J@85~Rzb>^s&u0=Z1)0xudnCjUkeLb#35AXG~LEX`tQ!g!JS-gACmYR
D=8d64
literal 0
HcmV?d00001
diff --git a/packages/overlays/MiuiNavbarOverlay/res/drawable-440dpi-v4/ic_sysbar_docked_darkmode.png b/packages/overlays/MiuiNavbarOverlay/res/drawable-440dpi-v4/ic_sysbar_docked_darkmode.png
new file mode 100644
index 0000000000000000000000000000000000000000..fe51e11921ecb35c5535e7c446769af7f66be893
GIT binary patch
literal 2810
zcmcIm3se(V8jh_}EK8-jfcRpFisopZKuAUc4GBuXuz*;Bl4?jMA>=V}5=f#b5>wH&
zNOz?^0L5da^%X&CG(sC#P&iP~WhtQrr3fM-rHFt=DYz3}$L@Bwk8?Wb+_`t|{qFa_
z|1$?7BQ`j{x#&#{2II^LWk;j4-aZ^1(Dz?ocNs&cxysNu6$az9z&>VSa`P8rFmskj
zVq(>?+>M|BmJ|3wI1wUf<w_Kd!2|?pm3)B|QUi&QSfXHH2g=H^fJDf^Zt>%ixJnk3
zBnjPtK$~_%#0Yjs1#}@cC=dwHf+&F;Qu6_=T&7TgS_XE47ev?gZ6X$!fT*PmEYmI!
zh~-8CEEs_RKLQmmAp24Pe>#CoCDAFqYXJ(0>`x^56Ujb!5*Z{>K_5CW^<YtHh)@JZ
zv)50_LcbW;B(+)z5{Vj(hM@5wz=)Vgrqk&}5`{>i;86r#rBkT+TD(HFe42p`sRW2b
zsg}SBz|P1|gj3WEEUM|G33BBOtwJ^BCe&d>Eni6_6G(QGCV)c03{IJX$R>mf1w=>&
z$svVWg<{DwSY;BdhE+-M|Dc{Z{)qt8wOsCujGxs-E}s#hQir6XW=uKcXVIz{of0BO
zLn=505kMiSsG7^|)+j+10`b)_5(C4s=|DwJs|>JM_Q249)mtPAA*@m1UbzFY`D%!P
zrI08jJjoYNrpHhypr0Q|_FY4wfh5u-lnV<bBHe#OeLyk=B>VgXie`<Fujc<ESSSER
zFe2xpHcRAuF+@}<#8_a)lOPM0!3ZiC)z0VDeGZEiiNGR>3_VaqZwLlBAuKAHPNm{0
z1oDKsTrS8_sMLIg0OGJ2SkylRi9`sBXk?nNfF{5T{i$TU(AO8j(?nD{o=Q)INCJ^R
z**8%%eV+{rQtVkUeP8$+@BamnpjF71{caw6ZQ9cZ43((R!0M)|XA`u2Y9*5Z6Bz^Y
z1@=l{U<LLRfP~noZOQNUz$C3E2|`K#PhL#IRIo^`;Uf@JjC$+Wq#hB~pJ*@JNmGdb
zY30P(D<wV+NBf3-In%JvkC~PSDbPNLpbgCy>ah>)lLii(8Kcebzsuc!V$0GuI>awl
zKKQ(mz4v(ayJf{4l_4t~-GU<TTtDl?GrKVT^|zvu@hjKN-ORof>8>}smVR9r8}m<W
zh&#{G^<3);?tT+Dw<xTy#!Ty>z@Ih*BLgSu?>&<}_;O%Z&v;M!^X~kild63eWir`*
zGgOwo$4p=0m@(U{bhg(=0Q)E~d%oe}e8W3>7oOfF)a7)z%WHFk)pLUZ=6(XxafM^!
z%0C9IY)gHK87eL*K^nT^`^L1GfodMj!1yM6m)W$nbg^c*tL1TW(75}hj*rJjmfY$r
zvTeq7XE*Iw{$tOoHLNcVEHlLSeQEOwyj+1Sws}~h!|369Wm9ZiT$Ge|b6~rc0~J(V
zj;?$Dc3_oP>AoM<wJ+4W4~FMgI+^!eFyARCH@qC~YAe3xInY#^b&c=(EXi0uUMv0X
z;D*60o#jA3g?+HtVzHbbD-rMgz&T*wg2J3FMWb0SGvoVarMYj-&9~_HN~O}GhEJ+f
z7ZrxsK5B5O=qk+F&=Yqm2bs0?lF71k-qWU?O3#zW#m0V8U4K_&?cnCLof)R94ziRC
z(-F}PAb=O9(?xv{hD)zJUVBc1KX0XE%{Me1?i!UEHH7n#<sl3TeWderGQMdwljcWn
z&)nb^E0tbTz2FwL^4EK;4K&`x)jNDRuQ{H0Z)agnOHb4(Yw3Gs3!dM(KO8jpeZc$a
zWzO42zgd-YvO;_<AjP4)Vra~Ey5aiXHLWpE>fi78tTx79DA|(dPy6s$XBVxwd&HAi
zm?k&eR_3_PT4voHm+9SesKd$W{If4^wx3wryjn23Fz2w1bTU5pdO=r4bX|D(S<|1Z
z)Xtks*6h}VT?sdt#&h3g@y1Gc+OO`n5jxAqY$aFc>o(^d3Ct{)8Y|#%-0h8h&VwF@
z9(#9IJ2&~=$nr=mwt4fa-ncSYc~|=x^-0jS&!xwVl=jY6*PFc$a^hN)9z@B7qpJq<
zqU(x28(E*UIrHHn@5P(m9TcP`|6^rArF%Fo-J5Ba4C@SgTdQ-*j>bIov~9z6-*+sy
z=fY!Y?kr|0nQh0OxXbUSM@b)v4~M<HdYv;z(Q@Pnx*j!M-(NP!X}LsR@~@|>Hi{Q%
zE_%fqMn*<>@j>I(+Fs9&zeU$I>%Kl~YR|~L!a39HaBQd5YK^!x8F%w-lb7~%&XZ=H
z+e4|_s$}En<A&Wk=G0ta-akY|gU)+zndjDR#+oaapa%~}2zNN^=T@%st`UdfZsX5K
z;<{ab<Ri&aN6nciy)qR^J7axe32}Y2(=D4DaiX-{w61nFQ_KIVYk||nl!UxvxgJ=@
zPyXaq(EQZ>``&ENi>7hMdC%_F_+PY^hPRo)r3OWZW=K2MPrcDED2RL!Xt8vkJE)zX
z-V~oT)Oux5R;-E33*V;tVNb)yb+5NR>W-2ZRjJp$7KAHI+dUEV4C~Ug_)(`b$H#2-
z`bQ_KuDK1jhWpnoWa7F50`&#S+^1N^Ir+wKLF%`c_w_FNG}$;%Q}cLP|G-;sNxL%F
zjkdIn7B)5DillcP<S(B8-D*l`w7N#LCG5&?4-_@xs>vH$T>QQN$hPt;8`hqev)+b-
VfHkC3x%R(PPDlj%Qt&qYzX3LdVM71_
literal 0
HcmV?d00001
diff --git a/packages/overlays/MiuiNavbarOverlay/res/drawable-440dpi-v4/ic_sysbar_home.png b/packages/overlays/MiuiNavbarOverlay/res/drawable-440dpi-v4/ic_sysbar_home.png
new file mode 100644
index 0000000000000000000000000000000000000000..20f1d887aedebaadec7f31184bdfe3e662401522
GIT binary patch
literal 1362
zcma)5dsvcZ6eq3COPOfdW%DV^ZrZSmmu5@DVMeK8>Y7WZW@(O;T+M9eB{VT<`aG7k
zn)f@oE<`v`G!hdlR3b#c8xe|l8>DE0=1%!ff9^cb_kQR6zW4o|-#O>~uHt;XmYJ+I
zK_C#zum>?m;Z6Mb7#YIa&@1aeAQowH-T|Hv{vWHXtnBFM=<e<w92^`Q8&j**TCH|w
zW=5ye&3!WP0UQ|_Q79BrskFVly|A!wfjKuf7x4M{d8JaBnwknAkw}F7z<|f&A$<GE
z#9}dz$7^nGX0cc_8jVh;L(;OcvZ|`8#>Pg#+uGV-5Af^tdQj5Y*@;G@7g7WV2lw^$
z&Cbrcy1D|=)YK%ANCpN5N=ix~<n#IPDIy{wJ3E`nWcKv*3=a<jJ~cJf+S&>ZaQ652
zkB^VPe*JoAXb4sSfdMK7NivzNx3?D%jYb1`<#IVVU0q$En!#X*L?S?ds;;h1AP_)}
zAPmlOI2^#?IGhE}g|<Kzp-{LW0Lq7!LM=f-K_n8XzP_H#W&;}}s;H>Q%*+JYC=?2V
z!GL%y77OKo5-yhu+n_ns)zwrgwWXy6T1_UCp`W0EKp^Dh<v}6PaFC%=sbDCRlamt@
z6CeiW0^~4=G>fQ@x1sX<QD1+=qAyI$kd`a0R;^yM1V^rBzv>>;Oz3t0N?$cpk-RL7
z-Curq>S*LLrm$bkV3lSj#D<6Y;{swYW|gxi%Zs*{e(6A+T4!*U^3;3jAJaPzMpw75
z7$ut5KkB^M^5?QL0f}~RdGFoYzGCL-{5n-sF6Va91!l$rZes=YHif6k(V{Rhzm^#u
zalK`;ZDwOVJvHuRU~uxaZ`Dc^TF`p)x#X>!QNDJ?g&SrFgh3=0gAPcLj)}XDS)x}j
zQJ<v!mA=U?%l=1~tj%`B)z`KbFE+KKzBz$GdPW=@wWdy+ogj$E`&FZwuZ!Zp<C4}~
zVm#p%keE^NFI+55ke}Hcsp&xT<5FtE)tFl*wILQcp5N@wHNu;kTknn!mb^C}u(Xb{
zz`fa%H*memyTCaq1Ap2W>D!)vB`lDpEI*IgAvkB_L`bG*pdVVjPYM(XQGXx5K?%)o
zLs2>$w}*(t!qJq_*t<Eng8LR58%v)#oqHZo6K-pf@#;>Nf;aRca6{9uQ_PEv<)W-?
z(KCaVz2Og5`HT(EW0DOY#`%Z2w?rbt$vWfcc*OArS@cn<@fq^g9Guwf{7Pas%bMNJ
zdS?{t^03BBAX+^7!xLN9zWoH>T^@;-lRUM^DZ}5M%WCC|WMSxw>0+B=^sbRM4jZXO
z$_Lnf*!02(cHH5lbT?VLt;YvjoU;yD7jgjM%PiY#eFT3yJ0;{s)Z^`kQt+<!k~_Qu
zviuCA6KQS^l4A0z$7lHCo-;d7g&3e}+$(1}x<hC;kGbLH_zAlm>$e4s;^kW?4ngm_
zE`Q~cX8O<Z(zEsV8qXf?Mb7nT$Cn62o198j$sS3_dA5Umo!g_|H>CWM;Mc75nWk1-
zsTCC62DdZ&CLU}r=+K8QH9PflBu(;$$CuS~(S5S#8@}fRZa&GnX#a%YkXXbwx5=MX
z``wiJ|MZgXydqYc;eH`$&5TsFXJu)BBv++(-ld-NA|wj=+9rOa!u0;M{>s}ZN=&zg
jp|o;zi!=ZHCR`6amaD0~y#7)m{38ggr!VHdM;P%x23q9L
literal 0
HcmV?d00001
diff --git a/packages/overlays/MiuiNavbarOverlay/res/drawable-440dpi-v4/ic_sysbar_home_darkmode.png b/packages/overlays/MiuiNavbarOverlay/res/drawable-440dpi-v4/ic_sysbar_home_darkmode.png
new file mode 100644
index 0000000000000000000000000000000000000000..96dc83e4a42d70c1b11ac5a55ea5eb8cd75e1e20
GIT binary patch
literal 980
zcmeAS@N?(olHy`uVBq!ia0vp^O(4v{3?%p7eQ=(EfiWY%C&U%V?H>iS4*_MFJ{MqE
zmzM<j1v8iwPFQ>B+}+pje*SoQ_Tb9?Tpg9&|JF;%JijfpWO-*ypo^KYc~ESA_nHsA
ztz3e$KC_1!6n_!c@R_*xN!py_HCyTq=gggUaniy|?MuCzA69H^h|Zp|b=B<p2PGc`
z0>b30*|@*0n4jWq;gIy|zKGh99kpj}USHgEp;$&A80||uT^vIyZoR$k8h+S8g!O?F
zcj^bHLXDPyjKZ$qJ6m_`-hKM-Z=Y)^yB^s@+{vH0dq%aAaitu;AQIT=<@xp3rAvP$
zy;7MXy;6S{7k&Q3%$mf?)m#uB5~Fl^!4@93r=m)tT64E<TJ6;MO6v5gt#7SPb6q!g
zS=4*(tJ=ib0ZZOj6rVo7V5@I<#(RMk0++cf?<&vlvtrdMVZ3YmE^z(23+e$2<s}SK
z3ljnsIEfmhoN8+nY~)&eV1{Nl6Oi%vK#S&VmSrqjKFn8_<*>~VU17l9;(OC(gF?VT
zew|sHRA+K^s)$ZwynjDjB9%2Z@o9hj@z9yqKg!oksmhKrP8D1bl-3+)o+@o5{UvQu
za+deA^S<)eZhOAF(C5HfE5hn~GjCG+m+o&3f0++AEUdr7$EqdsvefBVI!p9|LmNK}
z*BAXVwz%BS@myD^`ADnrrX%|0>yoZt>&?Br{aWc8JyVg;b6@KwX1@Ay&*p-y%_*L#
z{^ysm=`T&%{PpeY3#V^a$E?)Zo3}Wqvw!=8=ht19w|5|cm|EtWFQ%k?JmTvKOfn3f
Lu6{1-oD!M<_NCyP
literal 0
HcmV?d00001
diff --git a/packages/overlays/MiuiNavbarOverlay/res/drawable-440dpi-v4/ic_sysbar_recent.png b/packages/overlays/MiuiNavbarOverlay/res/drawable-440dpi-v4/ic_sysbar_recent.png
new file mode 100644
index 0000000000000000000000000000000000000000..4f0d314e2621d018c3cd2e4267cf4cf82a78943f
GIT binary patch
literal 278
zcmeAS@N?(olHy`uVBq!ia0vp^O(4v{3?%p7eQ+K~IR*HHxB_W3aOlvXS731D$dNyP
z{`~&^8>ry@`}c3(z6CO@t*tk0+O&D|W?NfZAou_O|I!nsR|8q1B|(0{3``sX!dw~0
z&!m6(D0J#1t5jH`B>TrxD!+gV@;qG}Ln>~)y?T=OumO*&<LOWDj(nQ-FWQ&&(?pJ@
znOy%Gk7P>$)d4|WP*!pH)Y~Ek3+0ck%$oDNf%ERC$_@LN)Si65+@j0wqw%{iOg5Zz
u=kcQOsZZh^l}((KO_)H0lQP7Be}}|<Jmh~yiM-bb33$5txvX<aXaWF$9A~fq
literal 0
HcmV?d00001
diff --git a/packages/overlays/MiuiNavbarOverlay/res/drawable-440dpi-v4/ic_sysbar_recent_darkmode.png b/packages/overlays/MiuiNavbarOverlay/res/drawable-440dpi-v4/ic_sysbar_recent_darkmode.png
new file mode 100644
index 0000000000000000000000000000000000000000..f53ec649e615e8491fb6abb63d169ab7e0faa1ce
GIT binary patch
literal 205
zcmeAS@N?(olHy`uVBq!ia0vp^O(4v{3?%p7eQ+K~DF*n2xB}^ZynuIaZ52=vS4ogx
zFoXa0-5=lXWwUX~o_?MiC>rSL;uunK>+RLuyayBnTpaC=HT>3}!PR$SSH`j?-mt2r
zKs7+%uwa{9mTBst&#^sIIN#?w`Oh@C&bRjEiUzlg7B>c|g@RIyV08!V`R32zx~(4j
Q*9XM+boFyt=akR{0CQqV3jhEB
literal 0
HcmV?d00001
--
2.34.1

6
patches_platform_personal/frameworks_base/0003-Disable-Bluetooth-by-default.patch → patches_platform_personal/frameworks_base/0002-Disable-Bluetooth-by-default.patch
View File

@ -1,7 +1,7 @@
From b2dee98e6f08035160ae2e9b792774cea1903106 Mon Sep 17 00:00:00 2001 From 06799a1be4a78be284b530b009b9edd67bb1aae7 Mon Sep 17 00:00:00 2001
From: Hikari-no-Tenshi <kyryljan.serhij@gmail.com> From: Hikari-no-Tenshi <kyryljan.serhij@gmail.com>
Date: Thu, 30 Jan 2020 22:20:54 +0200 Date: Thu, 30 Jan 2020 22:20:54 +0200
Subject: [PATCH 03/21] Disable Bluetooth by default Subject: [PATCH 02/20] Disable Bluetooth by default
Change-Id: Iea5d24f977928bf01cd7a46b98c75c0a4bd6a23c Change-Id: Iea5d24f977928bf01cd7a46b98c75c0a4bd6a23c
--- ---
@ -9,7 +9,7 @@ Change-Id: Iea5d24f977928bf01cd7a46b98c75c0a4bd6a23c
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/packages/SettingsProvider/res/values/defaults.xml b/packages/SettingsProvider/res/values/defaults.xml diff --git a/packages/SettingsProvider/res/values/defaults.xml b/packages/SettingsProvider/res/values/defaults.xml
index a93cd62e6301..b63896f09710 100644 index 89a8dd95d3c3..576c85caf2e2 100644
--- a/packages/SettingsProvider/res/values/defaults.xml --- a/packages/SettingsProvider/res/values/defaults.xml
+++ b/packages/SettingsProvider/res/values/defaults.xml +++ b/packages/SettingsProvider/res/values/defaults.xml
@@ -38,7 +38,7 @@ @@ -38,7 +38,7 @@

4
patches_platform_personal/frameworks_base/0004-Disable-cursor-drag-by-default-for-editable-TextView.patch → patches_platform_personal/frameworks_base/0003-Disable-cursor-drag-by-default-for-editable-TextView.patch
View File

@ -1,7 +1,7 @@
From 0f053cd66bac314b38669190d4a2386428314838 Mon Sep 17 00:00:00 2001 From 509d9f3180617e12e7c6bd07be5500104e869e43 Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com> From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Mon, 27 Sep 2021 16:30:00 +0000 Date: Mon, 27 Sep 2021 16:30:00 +0000
Subject: [PATCH 04/21] Disable cursor drag by default for editable TextViews Subject: [PATCH 03/20] Disable cursor drag by default for editable TextViews
Requested by @TadiT7 Requested by @TadiT7

6
patches_platform_personal/frameworks_base/0005-Disable-RESTRICTED-bucket-toast.patch → patches_platform_personal/frameworks_base/0004-Disable-RESTRICTED-bucket-toast.patch
View File

@ -1,7 +1,7 @@
From 999e9b865755a14a241e3dae2be11ced1e7c587e Mon Sep 17 00:00:00 2001 From d148f0f146d6e76927630726223a48664e33fcd1 Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com> From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Sun, 3 Jul 2022 00:08:42 +0000 Date: Sun, 3 Jul 2022 00:08:42 +0000
Subject: [PATCH 05/21] Disable "RESTRICTED bucket" toast Subject: [PATCH 04/20] Disable "RESTRICTED bucket" toast
Change-Id: I20a328d3c77962f3a6095bfca42d0b165a093ce8 Change-Id: I20a328d3c77962f3a6095bfca42d0b165a093ce8
--- ---
@ -9,7 +9,7 @@ Change-Id: I20a328d3c77962f3a6095bfca42d0b165a093ce8
1 file changed, 1 insertion(+), 19 deletions(-) 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 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 7d3837786be9..d12210f704fa 100644 index 12f455ad0144..a76a7f67a91a 100644
--- a/apex/jobscheduler/service/java/com/android/server/usage/AppStandbyController.java --- a/apex/jobscheduler/service/java/com/android/server/usage/AppStandbyController.java
+++ b/apex/jobscheduler/service/java/com/android/server/usage/AppStandbyController.java +++ b/apex/jobscheduler/service/java/com/android/server/usage/AppStandbyController.java
@@ -1846,25 +1846,7 @@ public class AppStandbyController @@ -1846,25 +1846,7 @@ public class AppStandbyController

31
patches_platform_personal/frameworks_base/0006-Keyguard-Adjust-clock-style.patch → patches_platform_personal/frameworks_base/0005-Keyguard-Adjust-clock-style.patch
View File

@ -1,7 +1,7 @@
From 47391e102c2ab15bdf913a9856e20dba82668472 Mon Sep 17 00:00:00 2001 From 623f673df7542f0286b32bde1485d9de3c1715f8 Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com> From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Thu, 2 Sep 2021 16:15:19 +0000 Date: Thu, 2 Sep 2021 16:15:19 +0000
Subject: [PATCH 06/21] Keyguard: Adjust clock style Subject: [PATCH 05/20] Keyguard: Adjust clock style
Thinner font, less padding and unintrusive colors Thinner font, less padding and unintrusive colors
@ -14,11 +14,11 @@ Change-Id: I21e5d5bf37d724e75ebce4cd89349e0cc4dfc910
.../android/systemui/shared/clocks/DefaultClockController.kt | 4 ++-- .../android/systemui/shared/clocks/DefaultClockController.kt | 4 ++--
.../SystemUI/res-keyguard/layout/keyguard_clock_switch.xml | 2 +- .../SystemUI/res-keyguard/layout/keyguard_clock_switch.xml | 2 +-
.../SystemUI/res-keyguard/layout/keyguard_slice_view.xml | 2 +- .../SystemUI/res-keyguard/layout/keyguard_slice_view.xml | 2 +-
packages/SystemUI/res-keyguard/values/dimens.xml | 2 +- packages/SystemUI/res-keyguard/values/dimens.xml | 4 ++--
packages/SystemUI/res-keyguard/values/styles.xml | 2 -- packages/SystemUI/res-keyguard/values/styles.xml | 2 --
packages/SystemUI/res/layout/keyguard_status_bar.xml | 2 +- packages/SystemUI/res/layout/keyguard_status_bar.xml | 2 +-
packages/SystemUI/res/values/styles.xml | 4 ++-- packages/SystemUI/res/values/styles.xml | 4 ++--
11 files changed, 17 insertions(+), 13 deletions(-) 11 files changed, 18 insertions(+), 14 deletions(-)
create mode 100644 packages/SystemUI/customization/res/values/colors.xml create mode 100644 packages/SystemUI/customization/res/values/colors.xml
diff --git a/packages/SystemUI/customization/res/layout/clock_default_large.xml b/packages/SystemUI/customization/res/layout/clock_default_large.xml diff --git a/packages/SystemUI/customization/res/layout/clock_default_large.xml b/packages/SystemUI/customization/res/layout/clock_default_large.xml
@ -58,10 +58,10 @@ index 000000000000..f80af4376ff1
+ <color name="clock_default_color_light">@*android:color/primary_text_material_light</color> + <color name="clock_default_color_light">@*android:color/primary_text_material_light</color>
+</resources> +</resources>
diff --git a/packages/SystemUI/customization/res/values/dimens.xml b/packages/SystemUI/customization/res/values/dimens.xml diff --git a/packages/SystemUI/customization/res/values/dimens.xml b/packages/SystemUI/customization/res/values/dimens.xml
index 8eb8132b07b9..02688e5b1329 100644 index c574d1fc674b..0a2c81f1cb38 100644
--- a/packages/SystemUI/customization/res/values/dimens.xml --- a/packages/SystemUI/customization/res/values/dimens.xml
+++ b/packages/SystemUI/customization/res/values/dimens.xml +++ b/packages/SystemUI/customization/res/values/dimens.xml
@@ -31,5 +31,5 @@ @@ -32,5 +32,5 @@
<!-- additional offset for clock switch area items --> <!-- additional offset for clock switch area items -->
<dimen name="small_clock_height">114dp</dimen> <dimen name="small_clock_height">114dp</dimen>
<dimen name="small_clock_padding_top">28dp</dimen> <dimen name="small_clock_padding_top">28dp</dimen>
@ -71,10 +71,10 @@ index 8eb8132b07b9..02688e5b1329 100644
+ <dimen name="clock_padding_start">22dp</dimen> + <dimen name="clock_padding_start">22dp</dimen>
+</resources> +</resources>
diff --git a/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/DefaultClockController.kt b/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/DefaultClockController.kt diff --git a/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/DefaultClockController.kt b/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/DefaultClockController.kt
index b28920c590c5..a786adad32e5 100644 index 01c03b1f25f6..9cff7ef5911b 100644
--- a/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/DefaultClockController.kt --- a/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/DefaultClockController.kt
+++ b/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/DefaultClockController.kt +++ b/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/DefaultClockController.kt
@@ -157,9 +157,9 @@ class DefaultClockController( @@ -168,9 +168,9 @@ class DefaultClockController(
if (seedColor != null) { if (seedColor != null) {
seedColor!! seedColor!!
} else if (isRegionDark) { } else if (isRegionDark) {
@ -113,12 +113,15 @@ index 7c5dbc247428..64657547621f 100644
/> />
</com.android.keyguard.KeyguardSliceView> </com.android.keyguard.KeyguardSliceView>
diff --git a/packages/SystemUI/res-keyguard/values/dimens.xml b/packages/SystemUI/res-keyguard/values/dimens.xml diff --git a/packages/SystemUI/res-keyguard/values/dimens.xml b/packages/SystemUI/res-keyguard/values/dimens.xml
index 8c817330953c..cfbc3b96da7c 100644 index 0628c3e957b1..ccb729de92e1 100644
--- a/packages/SystemUI/res-keyguard/values/dimens.xml --- a/packages/SystemUI/res-keyguard/values/dimens.xml
+++ b/packages/SystemUI/res-keyguard/values/dimens.xml +++ b/packages/SystemUI/res-keyguard/values/dimens.xml
@@ -97,7 +97,7 @@ @@ -95,9 +95,9 @@
<dimen name="num_pad_key_margin_end">12dp</dimen>
<!-- additional offset for clock switch area items --> <!-- additional offset for clock switch area items -->
<dimen name="below_clock_padding_start">32dp</dimen> - <dimen name="below_clock_padding_start">32dp</dimen>
+ <dimen name="below_clock_padding_start">28dp</dimen>
<dimen name="below_clock_padding_end">16dp</dimen> <dimen name="below_clock_padding_end">16dp</dimen>
- <dimen name="below_clock_padding_start_icons">28dp</dimen> - <dimen name="below_clock_padding_start_icons">28dp</dimen>
+ <dimen name="below_clock_padding_start_icons">22dp</dimen> + <dimen name="below_clock_padding_start_icons">22dp</dimen>
@ -152,10 +155,10 @@ index fc0bf242dc1e..388ab51a6245 100644
android:singleLine="true" android:singleLine="true"
systemui:showMissingSim="true" systemui:showMissingSim="true"
diff --git a/packages/SystemUI/res/values/styles.xml b/packages/SystemUI/res/values/styles.xml diff --git a/packages/SystemUI/res/values/styles.xml b/packages/SystemUI/res/values/styles.xml
index af92c021ec62..847b8a961322 100644 index 7ed9f91f30cd..2cb0c89cd785 100644
--- a/packages/SystemUI/res/values/styles.xml --- a/packages/SystemUI/res/values/styles.xml
+++ b/packages/SystemUI/res/values/styles.xml +++ b/packages/SystemUI/res/values/styles.xml
@@ -311,7 +311,7 @@ @@ -329,7 +329,7 @@
<item name="darkIconTheme">@style/DualToneDarkTheme</item> <item name="darkIconTheme">@style/DualToneDarkTheme</item>
<item name="wallpaperTextColor">@*android:color/primary_text_material_dark</item> <item name="wallpaperTextColor">@*android:color/primary_text_material_dark</item>
<item name="wallpaperTextColorSecondary">@*android:color/secondary_text_material_dark</item> <item name="wallpaperTextColorSecondary">@*android:color/secondary_text_material_dark</item>
@ -164,7 +167,7 @@ index af92c021ec62..847b8a961322 100644
<item name="android:colorError">@*android:color/error_color_material_dark</item> <item name="android:colorError">@*android:color/error_color_material_dark</item>
<item name="*android:lockPatternStyle">@style/LockPatternViewStyle</item> <item name="*android:lockPatternStyle">@style/LockPatternViewStyle</item>
<item name="lockPatternStyle">@style/LockPatternContainerStyle</item> <item name="lockPatternStyle">@style/LockPatternContainerStyle</item>
@@ -329,7 +329,7 @@ @@ -347,7 +347,7 @@
<style name="Theme.SystemUI.LightWallpaper"> <style name="Theme.SystemUI.LightWallpaper">
<item name="wallpaperTextColor">@*android:color/primary_text_material_light</item> <item name="wallpaperTextColor">@*android:color/primary_text_material_light</item>
<item name="wallpaperTextColorSecondary">@*android:color/secondary_text_material_light</item> <item name="wallpaperTextColorSecondary">@*android:color/secondary_text_material_light</item>

8
patches_platform_personal/frameworks_base/0007-Keyguard-Hide-padlock-unless-UDFPS-is-in-use.patch → patches_platform_personal/frameworks_base/0006-Keyguard-Hide-padlock-unless-UDFPS-is-in-use.patch
View File

@ -1,7 +1,7 @@
From 3bf2d7ef087a2f458ba67ab2adfdfea5ae58f8da Mon Sep 17 00:00:00 2001 From 2d7a9b6d34331608e349d1f6075e0112fde7d24c Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com> From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Sat, 2 Nov 2019 06:41:03 +0000 Date: Sat, 2 Nov 2019 06:41:03 +0000
Subject: [PATCH 07/21] Keyguard: Hide padlock unless UDFPS is in use Subject: [PATCH 06/20] Keyguard: Hide padlock unless UDFPS is in use
Fair enough Google, but don't give me that otherwise Fair enough Google, but don't give me that otherwise
@ -11,10 +11,10 @@ Change-Id: Ie91e80ca5c6637a51a8acc72fb28cd6ac2a7abb6
1 file changed, 3 insertions(+), 14 deletions(-) 1 file changed, 3 insertions(+), 14 deletions(-)
diff --git a/packages/SystemUI/src/com/android/keyguard/LockIconViewController.java b/packages/SystemUI/src/com/android/keyguard/LockIconViewController.java diff --git a/packages/SystemUI/src/com/android/keyguard/LockIconViewController.java b/packages/SystemUI/src/com/android/keyguard/LockIconViewController.java
index 951a6aeef11b..269c72d75e8f 100644 index 175fcdb6e11a..2472def4d037 100644
--- a/packages/SystemUI/src/com/android/keyguard/LockIconViewController.java --- a/packages/SystemUI/src/com/android/keyguard/LockIconViewController.java
+++ b/packages/SystemUI/src/com/android/keyguard/LockIconViewController.java +++ b/packages/SystemUI/src/com/android/keyguard/LockIconViewController.java
@@ -310,25 +310,14 @@ public class LockIconViewController extends ViewController<LockIconView> impleme @@ -360,25 +360,14 @@ public class LockIconViewController implements Dumpable {
return; return;
} }

28
patches_platform_personal/frameworks_base/0007-Keyguard-Default-to-small-clock-1-3.patch Normal file
View File

@ -0,0 +1,28 @@
From fbe718b53b0898e984d276dc431d89402bfabbaa Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Wed, 1 Sep 2021 14:41:53 +0000
Subject: [PATCH 07/20] Keyguard: Default to small clock (1/3)
It looks alright actually, but as always breaks under landscape
Change-Id: I434d033ecae597ed2a7b2ed71e96ba1a963e9cc3
---
core/res/res/values/config.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
index c223ec0d6ed0..19f0ee14d5d5 100644
--- a/core/res/res/values/config.xml
+++ b/core/res/res/values/config.xml
@@ -1498,7 +1498,7 @@
<!-- Provides default value for double line clock in lock screen setting:
0 - Don't show double line clock
1 - Show double line clock in lock screen (default) -->
- <integer name="config_doublelineClockDefault">1</integer>
+ <integer name="config_doublelineClockDefault">0</integer>
<!-- If true, enables verification of the lockscreen credential in the factory reset protection
flow. This should be true if gatekeeper / weaver credentials can still be checked after a
--
2.34.1

28
patches_platform_personal/frameworks_base/0008-Keyguard-Default-to-small-clock-1-3.patch
View File

@ -1,28 +0,0 @@
From 4748bf4af0e391f772c498976d3fed372d688de7 Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Wed, 1 Sep 2021 14:41:53 +0000
Subject: [PATCH 08/21] Keyguard: Default to small clock (1/3)
It looks alright actually, but as always breaks under landscape
Change-Id: I434d033ecae597ed2a7b2ed71e96ba1a963e9cc3
---
.../src/com/android/keyguard/KeyguardClockSwitchController.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitchController.java b/packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitchController.java
index 94f6dba792e8..7a72d10975fa 100644
--- a/packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitchController.java
+++ b/packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitchController.java
@@ -543,7 +543,7 @@ public class KeyguardClockSwitchController extends ViewController<KeyguardClockS
private void updateDoubleLineClock() {
mCanShowDoubleLineClock = mSecureSettings.getIntForUser(
- Settings.Secure.LOCKSCREEN_USE_DOUBLE_LINE_CLOCK, 1,
+ Settings.Secure.LOCKSCREEN_USE_DOUBLE_LINE_CLOCK, 0,
UserHandle.USER_CURRENT) != 0;
if (!mCanShowDoubleLineClock) {
--
2.34.1

16
patches_platform_personal/frameworks_base/0009-Keyguard-Refine-indication-text.patch → patches_platform_personal/frameworks_base/0008-Keyguard-Refine-indication-text.patch
View File

@ -1,7 +1,7 @@
From 654cfde395c0a1704fee02d3b9bbb27246e488ca Mon Sep 17 00:00:00 2001 From 8b68d455ebc34a78177be70ec62c94dae3192fdf Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com> From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Sat, 2 Nov 2019 08:31:36 +0000 Date: Sat, 2 Nov 2019 08:31:36 +0000
Subject: [PATCH 09/21] Keyguard: Refine indication text Subject: [PATCH 08/20] Keyguard: Refine indication text
Change-Id: Ib771c35610f712a1de34736e817bcfe616ac37d8 Change-Id: Ib771c35610f712a1de34736e817bcfe616ac37d8
--- ---
@ -26,7 +26,7 @@ index f0cff767b74d..9edd294a8981 100644
<style name="TextAppearance.Keyguard.BottomArea.Button"> <style name="TextAppearance.Keyguard.BottomArea.Button">
diff --git a/packages/SystemUI/res/layout/keyguard_bottom_area.xml b/packages/SystemUI/res/layout/keyguard_bottom_area.xml diff --git a/packages/SystemUI/res/layout/keyguard_bottom_area.xml b/packages/SystemUI/res/layout/keyguard_bottom_area.xml
index 66c57fc2a9ac..dde97f679c9a 100644 index 6d7ce0623817..4d1af83c9d3b 100644
--- a/packages/SystemUI/res/layout/keyguard_bottom_area.xml --- a/packages/SystemUI/res/layout/keyguard_bottom_area.xml
+++ b/packages/SystemUI/res/layout/keyguard_bottom_area.xml +++ b/packages/SystemUI/res/layout/keyguard_bottom_area.xml
@@ -35,6 +35,7 @@ @@ -35,6 +35,7 @@
@ -38,12 +38,12 @@ index 66c57fc2a9ac..dde97f679c9a 100644
android:paddingEnd="@dimen/keyguard_indication_text_padding" android:paddingEnd="@dimen/keyguard_indication_text_padding"
android:textAppearance="@style/TextAppearance.Keyguard.BottomArea" android:textAppearance="@style/TextAppearance.Keyguard.BottomArea"
diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml
index 0fdbf89d760a..ca2455548c2d 100644 index 2852403c8a21..bb1b552ab1c1 100644
--- a/packages/SystemUI/res/values/dimens.xml --- a/packages/SystemUI/res/values/dimens.xml
+++ b/packages/SystemUI/res/values/dimens.xml +++ b/packages/SystemUI/res/values/dimens.xml
@@ -857,7 +857,7 @@ @@ -897,7 +897,7 @@
<dimen name="keyguard_security_container_padding_top">20dp</dimen> <dimen name="keyguard_translate_distance_on_swipe_up">-200dp</dimen>
- <dimen name="keyguard_indication_margin_bottom">32dp</dimen> - <dimen name="keyguard_indication_margin_bottom">32dp</dimen>
+ <dimen name="keyguard_indication_margin_bottom">16dp</dimen> + <dimen name="keyguard_indication_margin_bottom">16dp</dimen>
@ -51,7 +51,7 @@ index 0fdbf89d760a..ca2455548c2d 100644
<dimen name="ambient_indication_margin_bottom">71dp</dimen> <dimen name="ambient_indication_margin_bottom">71dp</dimen>
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java b/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java b/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java
index feb02586a820..eaca85f8d55d 100644 index 08415cb5b0cb..a1e865e96a6d 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java --- a/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java
@@ -445,7 +445,6 @@ public class KeyguardIndicationController { @@ -445,7 +445,6 @@ public class KeyguardIndicationController {
@ -111,7 +111,7 @@ index feb02586a820..eaca85f8d55d 100644
private void updateLockScreenLogoutView() { private void updateLockScreenLogoutView() {
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardIndicationTextView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardIndicationTextView.java diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardIndicationTextView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardIndicationTextView.java
index 29a249fcaa41..67f5201bbf2e 100644 index c6690c91c1f8..d6c8af74d71a 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardIndicationTextView.java --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardIndicationTextView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardIndicationTextView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardIndicationTextView.java
@@ -46,7 +46,7 @@ public class KeyguardIndicationTextView extends TextView { @@ -46,7 +46,7 @@ public class KeyguardIndicationTextView extends TextView {

71
patches_platform_personal/frameworks_base/0010-Keyguard-UI-Fix-status-bar-quick-settings-margins-an.patch → patches_platform_personal/frameworks_base/0009-Keyguard-UI-Fix-status-bar-quick-settings-margins-an.patch
View File

@ -1,10 +1,10 @@
From 6961fc087e920eac71bca4673b49d7ac193ee5a1 Mon Sep 17 00:00:00 2001 From 6214db6cea55c2072b2a51cc07ee8d27eecf299c Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com> From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Sat, 20 Mar 2021 10:35:14 +0000 Date: Sat, 20 Mar 2021 10:35:14 +0000
Subject: [PATCH 10/21] Keyguard/UI: Fix status bar / quick settings margins Subject: [PATCH 09/20] Keyguard/UI: Fix status bar / quick settings margins
and paddings and paddings
Last revised on 2024/01/21, targeting U Last revised on 2024/04/04, targeting U QPR2
The way I think SB/QS margins/paddings should work: The way I think SB/QS margins/paddings should work:
- Devices with left notch: [notch_definition][status_bar_padding_start][content]...[content][status_bar_padding_end][rounded_corner_content_padding] - Devices with left notch: [notch_definition][status_bar_padding_start][content]...[content][status_bar_padding_end][rounded_corner_content_padding]
@ -21,12 +21,14 @@ As a result, below changes have been made:
Change-Id: Ic91fa398813e1907297bb0892c444d96405950e7 Change-Id: Ic91fa398813e1907297bb0892c444d96405950e7
--- ---
packages/SystemUI/res/layout/keyguard_status_bar.xml | 2 +- packages/SystemUI/res/layout/keyguard_status_bar.xml | 2 +-
packages/SystemUI/res/layout/operator_name.xml | 3 ++-
packages/SystemUI/res/values-sw600dp/dimens.xml | 7 ++----- packages/SystemUI/res/values-sw600dp/dimens.xml | 7 ++-----
packages/SystemUI/res/values/dimens.xml | 6 +++--- packages/SystemUI/res/values/dimens.xml | 6 +++---
packages/SystemUI/res/xml/qqs_header.xml | 4 ++-- packages/SystemUI/res/xml/qqs_header.xml | 4 ++--
.../android/systemui/shade/ShadeHeaderController.kt | 10 +++++++--- .../android/systemui/shade/ShadeHeaderController.kt | 10 +++++++---
.../systemui/statusbar/OperatorNameViewController.java | 2 +-
.../statusbar/phone/KeyguardStatusBarView.java | 7 ------- .../statusbar/phone/KeyguardStatusBarView.java | 7 -------
6 files changed, 15 insertions(+), 21 deletions(-) 8 files changed, 18 insertions(+), 23 deletions(-)
diff --git a/packages/SystemUI/res/layout/keyguard_status_bar.xml b/packages/SystemUI/res/layout/keyguard_status_bar.xml diff --git a/packages/SystemUI/res/layout/keyguard_status_bar.xml b/packages/SystemUI/res/layout/keyguard_status_bar.xml
index 388ab51a6245..0c4b898055fe 100644 index 388ab51a6245..0c4b898055fe 100644
@ -41,8 +43,20 @@ index 388ab51a6245..0c4b898055fe 100644
android:layout_toStartOf="@id/system_icons_container" android:layout_toStartOf="@id/system_icons_container"
android:gravity="center_vertical" android:gravity="center_vertical"
android:ellipsize="marquee" android:ellipsize="marquee"
diff --git a/packages/SystemUI/res/layout/operator_name.xml b/packages/SystemUI/res/layout/operator_name.xml
index 015e30a5d050..8ae4faee8325 100644
--- a/packages/SystemUI/res/layout/operator_name.xml
+++ b/packages/SystemUI/res/layout/operator_name.xml
@@ -28,5 +28,6 @@
android:gravity="center_vertical|start"
android:textAppearance="?android:attr/textAppearanceSmall"
android:singleLine="true"
- android:paddingEnd="5dp" />
+ android:paddingEnd="5dp"
+ android:visibility="gone" />
</com.android.systemui.statusbar.AlphaOptimizedFrameLayout>
diff --git a/packages/SystemUI/res/values-sw600dp/dimens.xml b/packages/SystemUI/res/values-sw600dp/dimens.xml diff --git a/packages/SystemUI/res/values-sw600dp/dimens.xml b/packages/SystemUI/res/values-sw600dp/dimens.xml
index 915dcdb9755f..4a727ad6ce3d 100644 index 1e54fc9e1445..6c1cb6ce43cb 100644
--- a/packages/SystemUI/res/values-sw600dp/dimens.xml --- a/packages/SystemUI/res/values-sw600dp/dimens.xml
+++ b/packages/SystemUI/res/values-sw600dp/dimens.xml +++ b/packages/SystemUI/res/values-sw600dp/dimens.xml
@@ -21,7 +21,7 @@ @@ -21,7 +21,7 @@
@ -67,17 +81,17 @@ index 915dcdb9755f..4a727ad6ce3d 100644
@@ -81,7 +78,7 @@ @@ -81,7 +78,7 @@
<dimen name="large_screen_shade_header_height">42dp</dimen> <dimen name="large_screen_shade_header_height">42dp</dimen>
<!-- start padding is smaller to account for status icon margins coming from drawable itself --> <!-- start padding is smaller to account for status icon margins coming from drawable itself -->
<dimen name="shade_header_system_icons_padding_start">3dp</dimen> <dimen name="hover_system_icons_container_padding_start">3dp</dimen>
- <dimen name="shade_header_system_icons_padding_end">4dp</dimen> - <dimen name="hover_system_icons_container_padding_end">4dp</dimen>
+ <dimen name="shade_header_system_icons_padding_end">0dp</dimen> + <dimen name="hover_system_icons_container_padding_end">0dp</dimen>
<dimen name="shade_header_system_icons_padding_top">2dp</dimen> <dimen name="hover_system_icons_container_padding_top">2dp</dimen>
<dimen name="shade_header_system_icons_padding_bottom">2dp</dimen> <dimen name="hover_system_icons_container_padding_bottom">2dp</dimen>
diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml
index ca2455548c2d..3320f98d1620 100644 index bb1b552ab1c1..a6b766f60d6f 100644
--- a/packages/SystemUI/res/values/dimens.xml --- a/packages/SystemUI/res/values/dimens.xml
+++ b/packages/SystemUI/res/values/dimens.xml +++ b/packages/SystemUI/res/values/dimens.xml
@@ -149,7 +149,7 @@ @@ -172,7 +172,7 @@
<dimen name="status_bar_clock_size">14sp</dimen> <dimen name="status_bar_clock_size">14sp</dimen>
<!-- The starting padding for the clock in the status bar. --> <!-- The starting padding for the clock in the status bar. -->
@ -86,7 +100,7 @@ index ca2455548c2d..3320f98d1620 100644
<!-- The end padding for the clock in the status bar. --> <!-- The end padding for the clock in the status bar. -->
<dimen name="status_bar_clock_end_padding">0dp</dimen> <dimen name="status_bar_clock_end_padding">0dp</dimen>
@@ -353,7 +353,7 @@ @@ -384,7 +384,7 @@
<!-- padding start is a bit smaller than end to account for status icon margin--> <!-- padding start is a bit smaller than end to account for status icon margin-->
<dimen name="status_bar_icons_padding_start">3dp</dimen> <dimen name="status_bar_icons_padding_start">3dp</dimen>
@ -95,7 +109,7 @@ index ca2455548c2d..3320f98d1620 100644
<dimen name="status_bar_icons_padding_bottom">0dp</dimen> <dimen name="status_bar_icons_padding_bottom">0dp</dimen>
<dimen name="status_bar_icons_padding_top">0dp</dimen> <dimen name="status_bar_icons_padding_top">0dp</dimen>
@@ -823,7 +823,7 @@ @@ -856,7 +856,7 @@
<dimen name="kg_framed_avatar_size">32dp</dimen> <dimen name="kg_framed_avatar_size">32dp</dimen>
<!-- Margin on the left side of the carrier text on Keyguard --> <!-- Margin on the left side of the carrier text on Keyguard -->
@ -125,10 +139,10 @@ index 50a388d0fa64..81d30c210770 100644
\ No newline at end of file \ No newline at end of file
+</ConstraintSet> +</ConstraintSet>
diff --git a/packages/SystemUI/src/com/android/systemui/shade/ShadeHeaderController.kt b/packages/SystemUI/src/com/android/systemui/shade/ShadeHeaderController.kt diff --git a/packages/SystemUI/src/com/android/systemui/shade/ShadeHeaderController.kt b/packages/SystemUI/src/com/android/systemui/shade/ShadeHeaderController.kt
index 5cdd6f44d4a0..098eb27995d8 100644 index 5a5cb792c10b..874579b83aca 100644
--- a/packages/SystemUI/src/com/android/systemui/shade/ShadeHeaderController.kt --- a/packages/SystemUI/src/com/android/systemui/shade/ShadeHeaderController.kt
+++ b/packages/SystemUI/src/com/android/systemui/shade/ShadeHeaderController.kt +++ b/packages/SystemUI/src/com/android/systemui/shade/ShadeHeaderController.kt
@@ -143,6 +143,8 @@ constructor( @@ -144,6 +144,8 @@ constructor(
private var roundedCorners = 0 private var roundedCorners = 0
private var cutout: DisplayCutout? = null private var cutout: DisplayCutout? = null
@ -137,9 +151,9 @@ index 5cdd6f44d4a0..098eb27995d8 100644
private var lastInsets: WindowInsets? = null private var lastInsets: WindowInsets? = null
private var nextAlarmIntent: PendingIntent? = null private var nextAlarmIntent: PendingIntent? = null
private var textColorPrimary = Color.TRANSPARENT private var textColorPrimary = Color.TRANSPARENT
@@ -415,14 +417,17 @@ constructor( @@ -421,14 +423,17 @@ constructor(
val cutoutLeft = sbInsets.first val cutoutLeft = sbInsets.left
val cutoutRight = sbInsets.second val cutoutRight = sbInsets.right
val hasCornerCutout: Boolean = insetsProvider.currentRotationHasCornerCutout() val hasCornerCutout: Boolean = insetsProvider.currentRotationHasCornerCutout()
+ roundedCorners = resources.getDimensionPixelSize(R.dimen.rounded_corner_content_padding) + roundedCorners = resources.getDimensionPixelSize(R.dimen.rounded_corner_content_padding)
+ statusBarPaddingStart = resources.getDimensionPixelSize(R.dimen.status_bar_padding_start) + statusBarPaddingStart = resources.getDimensionPixelSize(R.dimen.status_bar_padding_start)
@ -157,7 +171,7 @@ index 5cdd6f44d4a0..098eb27995d8 100644
header.paddingEnd header.paddingEnd
) )
@@ -543,7 +548,6 @@ constructor( @@ -549,7 +554,6 @@ constructor(
} }
private fun updateResources() { private fun updateResources() {
@ -165,8 +179,21 @@ index 5cdd6f44d4a0..098eb27995d8 100644
val padding = resources.getDimensionPixelSize(R.dimen.qs_panel_padding) val padding = resources.getDimensionPixelSize(R.dimen.qs_panel_padding)
header.setPadding(padding, header.paddingTop, padding, header.paddingBottom) header.setPadding(padding, header.paddingTop, padding, header.paddingBottom)
updateQQSPaddings() updateQQSPaddings()
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/OperatorNameViewController.java b/packages/SystemUI/src/com/android/systemui/statusbar/OperatorNameViewController.java
index 8afc72f08656..fe66c21ae568 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/OperatorNameViewController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/OperatorNameViewController.java
@@ -86,7 +86,7 @@ public class OperatorNameViewController extends ViewController<OperatorNameView>
boolean showOperatorName =
mCarrierConfigTracker
.getShowOperatorNameInStatusBarConfig(defaultSubInfo.getSubId())
- && (mTunerService.getValue(KEY_SHOW_OPERATOR_NAME, 1) != 0);
+ && (mTunerService.getValue(KEY_SHOW_OPERATOR_NAME, 0) != 0);
mView.update(showOperatorName, mTelephonyManager.isDataCapable(), getDefaultSubInfo());
}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java
index 5eb3f587a023..be9b32bde0f1 100644 index 50ce8a9a14e3..e3480f7a311e 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java
@@ -179,14 +179,7 @@ public class KeyguardStatusBarView extends RelativeLayout { @@ -179,14 +179,7 @@ public class KeyguardStatusBarView extends RelativeLayout {
@ -177,7 +204,7 @@ index 5eb3f587a023..be9b32bde0f1 100644
- int marginStart = calculateMargin( - int marginStart = calculateMargin(
- getResources().getDimensionPixelSize(R.dimen.keyguard_carrier_text_margin), - getResources().getDimensionPixelSize(R.dimen.keyguard_carrier_text_margin),
- mPadding.first); - mPadding.left);
- lp.setMarginStart(marginStart); - lp.setMarginStart(marginStart);
- -
- mCarrierLabel.setLayoutParams(lp); - mCarrierLabel.setLayoutParams(lp);

12
patches_platform_personal/frameworks_base/0011-Revert-SystemUI-Add-left-padding-for-keyguard-slices.patch → patches_platform_personal/frameworks_base/0010-Revert-SystemUI-Add-left-padding-for-keyguard-slices.patch
View File

@ -1,7 +1,7 @@
From 2ea9b12d2f9d2d49ddcc99a7971af35dc15f221c Mon Sep 17 00:00:00 2001 From 0440d36fc0d1126bc9a7266291395f466969c2b1 Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com> From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Tue, 31 May 2022 00:00:08 +0000 Date: Tue, 31 May 2022 00:00:08 +0000
Subject: [PATCH 11/21] Revert "SystemUI: Add left padding for keyguard slices" Subject: [PATCH 10/20] Revert "SystemUI: Add left padding for keyguard slices"
This reverts commit 4a7a4426944e28e70a3eca6a696ff6c7599fb896. This reverts commit 4a7a4426944e28e70a3eca6a696ff6c7599fb896.
--- ---
@ -9,17 +9,17 @@ This reverts commit 4a7a4426944e28e70a3eca6a696ff6c7599fb896.
1 file changed, 3 insertions(+), 6 deletions(-) 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 diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardSliceView.java b/packages/SystemUI/src/com/android/keyguard/KeyguardSliceView.java
index abb22f526f85..b4f124aa598a 100644 index 062ff3828a60..7b5325d4eaa6 100644
--- a/packages/SystemUI/src/com/android/keyguard/KeyguardSliceView.java --- a/packages/SystemUI/src/com/android/keyguard/KeyguardSliceView.java
+++ b/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.annotations.VisibleForTesting; @@ -48,7 +48,6 @@ import com.android.app.animation.Interpolators;
import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.graphics.ColorUtils; import com.android.internal.graphics.ColorUtils;
import com.android.settingslib.Utils; import com.android.settingslib.Utils;
import com.android.systemui.R;
-import com.android.systemui.keyguard.KeyguardSliceProvider; -import com.android.systemui.keyguard.KeyguardSliceProvider;
import com.android.systemui.res.R;
import com.android.systemui.util.wakelock.KeepAwakeAnimationListener; import com.android.systemui.util.wakelock.KeepAwakeAnimationListener;
import java.io.PrintWriter;
@@ -446,15 +445,13 @@ public class KeyguardSliceView extends LinearLayout { @@ -446,15 +445,13 @@ public class KeyguardSliceView extends LinearLayout {
private void updatePadding() { private void updatePadding() {

4
patches_platform_personal/frameworks_base/0012-Revert-Update-RAT-icons-to-match-Silk-design.patch → patches_platform_personal/frameworks_base/0011-Revert-Update-RAT-icons-to-match-Silk-design.patch
View File

@ -1,7 +1,7 @@
From e18664e9b380b7b96cc506f8e106903478b4b214 Mon Sep 17 00:00:00 2001 From de378a339c6d00ed8fb0a1f447895b3165cb2223 Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com> From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Sun, 5 Sep 2021 01:20:12 +0000 Date: Sun, 5 Sep 2021 01:20:12 +0000
Subject: [PATCH 12/21] Revert "Update RAT icons to match Silk design" Subject: [PATCH 11/20] Revert "Update RAT icons to match Silk design"
This reverts commit 084c13c8216f6a899cd3eda04fc1d7acff3d1248. This reverts commit 084c13c8216f6a899cd3eda04fc1d7acff3d1248.
--- ---

4
patches_platform_personal/frameworks_base/0013-Revert-Use-the-default-top-clock-margin-on-h800-devi.patch → patches_platform_personal/frameworks_base/0012-Revert-Use-the-default-top-clock-margin-on-h800-devi.patch
View File

@ -1,7 +1,7 @@
From 916d532636decc77b67fd22e96507b2c9aaa4267 Mon Sep 17 00:00:00 2001 From d7204273188551ba0ac198bc0362d60a2419007a Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com> From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Thu, 29 Sep 2022 11:27:57 +0000 Date: Thu, 29 Sep 2022 11:27:57 +0000
Subject: [PATCH 13/21] Revert "Use the default top clock margin on h800 Subject: [PATCH 12/20] Revert "Use the default top clock margin on h800
devices" devices"
This reverts commits 50ba380f4d8d1c2523e0f76295ca556038796bfd This reverts commits 50ba380f4d8d1c2523e0f76295ca556038796bfd

20
patches_platform_personal/frameworks_base/0014-UI-Always-render-into-cutouts.patch → patches_platform_personal/frameworks_base/0013-UI-Always-render-into-cutouts.patch
View File

@ -1,7 +1,7 @@
From 560702e79e667348a4487f4d34dd6ee2dba5d828 Mon Sep 17 00:00:00 2001 From 569849c38ae630e1cd907ef28b48aac79a904252 Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com> From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Wed, 7 Oct 2020 14:00:35 +0000 Date: Wed, 7 Oct 2020 14:00:35 +0000
Subject: [PATCH 14/21] UI: Always render into cutouts Subject: [PATCH 13/20] UI: Always render into cutouts
Eliminates black/white letterboxing in apps, keyguard and QS Eliminates black/white letterboxing in apps, keyguard and QS
@ -43,10 +43,10 @@ index 59e0932ecd80..a090a59a1357 100644
public void setRoundedCorners(RoundedCorners roundedCorners) { public void setRoundedCorners(RoundedCorners roundedCorners) {
diff --git a/packages/SystemUI/src/com/android/systemui/shade/QuickSettingsController.java b/packages/SystemUI/src/com/android/systemui/shade/QuickSettingsController.java diff --git a/packages/SystemUI/src/com/android/systemui/shade/QuickSettingsController.java b/packages/SystemUI/src/com/android/systemui/shade/QuickSettingsController.java
index 1842dd110d6d..e14bcc232823 100644 index 21de4c81353d..54578d347b2f 100644
--- a/packages/SystemUI/src/com/android/systemui/shade/QuickSettingsController.java --- a/packages/SystemUI/src/com/android/systemui/shade/QuickSettingsController.java
+++ b/packages/SystemUI/src/com/android/systemui/shade/QuickSettingsController.java +++ b/packages/SystemUI/src/com/android/systemui/shade/QuickSettingsController.java
@@ -296,6 +296,8 @@ public class QuickSettingsController implements Dumpable { @@ -293,6 +293,8 @@ public class QuickSettingsController implements Dumpable {
private int mOneFingerQuickSettingsIntercept; private int mOneFingerQuickSettingsIntercept;
private final ContentObserver mOneFingerQuickSettingsInterceptObserver; private final ContentObserver mOneFingerQuickSettingsInterceptObserver;
@ -55,7 +55,7 @@ index 1842dd110d6d..e14bcc232823 100644
private final Region mInterceptRegion = new Region(); private final Region mInterceptRegion = new Region();
/** The end bounds of a clipping animation. */ /** The end bounds of a clipping animation. */
private final Rect mClippingAnimationEndBounds = new Rect(); private final Rect mClippingAnimationEndBounds = new Rect();
@@ -413,6 +415,8 @@ public class QuickSettingsController implements Dumpable { @@ -410,6 +412,8 @@ public class QuickSettingsController implements Dumpable {
} }
}; };
@ -64,7 +64,7 @@ index 1842dd110d6d..e14bcc232823 100644
dumpManager.registerDumpable(this); dumpManager.registerDumpable(this);
} }
@@ -556,8 +560,7 @@ public class QuickSettingsController implements Dumpable { @@ -553,8 +557,7 @@ public class QuickSettingsController implements Dumpable {
* on ACTION_DOWN, and safely queried repeatedly thereafter during ACTION_MOVE events. * on ACTION_DOWN, and safely queried repeatedly thereafter during ACTION_MOVE events.
*/ */
public void updateGestureInsetsCache() { public void updateGestureInsetsCache() {
@ -73,8 +73,8 @@ index 1842dd110d6d..e14bcc232823 100644
+ WindowMetrics windowMetrics = mWindowManager.getCurrentWindowMetrics(); + WindowMetrics windowMetrics = mWindowManager.getCurrentWindowMetrics();
mCachedGestureInsets = windowMetrics.getWindowInsets().getInsets( mCachedGestureInsets = windowMetrics.getWindowInsets().getInsets(
WindowInsets.Type.systemGestures()); WindowInsets.Type.systemGestures());
} mCachedWindowWidth = windowMetrics.getBounds().width();
@@ -1534,8 +1537,8 @@ public class QuickSettingsController implements Dumpable { @@ -1536,8 +1539,8 @@ public class QuickSettingsController implements Dumpable {
private int calculateRightClippingBound() { private int calculateRightClippingBound() {
if (mIsFullWidth) { if (mIsFullWidth) {
@ -86,10 +86,10 @@ index 1842dd110d6d..e14bcc232823 100644
return mNotificationStackScrollLayoutController.getRight() return mNotificationStackScrollLayoutController.getRight()
+ mDisplayLeftInset; + mDisplayLeftInset;
diff --git a/services/core/java/com/android/server/wm/DisplayPolicy.java b/services/core/java/com/android/server/wm/DisplayPolicy.java diff --git a/services/core/java/com/android/server/wm/DisplayPolicy.java b/services/core/java/com/android/server/wm/DisplayPolicy.java
index 8b3e4d38d736..99d905deae72 100644 index a85038f5d656..8541b1dc1965 100644
--- a/services/core/java/com/android/server/wm/DisplayPolicy.java --- a/services/core/java/com/android/server/wm/DisplayPolicy.java
+++ b/services/core/java/com/android/server/wm/DisplayPolicy.java +++ b/services/core/java/com/android/server/wm/DisplayPolicy.java
@@ -1396,6 +1396,7 @@ public class DisplayPolicy { @@ -1414,6 +1414,7 @@ public class DisplayPolicy {
displayFrames = win.getDisplayFrames(displayFrames); displayFrames = win.getDisplayFrames(displayFrames);
final WindowManager.LayoutParams attrs = win.mAttrs.forRotation(displayFrames.mRotation); final WindowManager.LayoutParams attrs = win.mAttrs.forRotation(displayFrames.mRotation);

12
patches_platform_personal/frameworks_base/0015-UI-Kill-rounded-corners-in-notification-scrim.patch → patches_platform_personal/frameworks_base/0014-UI-Kill-rounded-corners-in-notification-scrim.patch
View File

@ -1,7 +1,7 @@
From 6b596089d52d5e95ff75605a97269770a5d3a061 Mon Sep 17 00:00:00 2001 From 860e099390e9ce4cb4365824c2bb05c5a5b152d6 Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com> From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Wed, 1 Sep 2021 14:10:50 +0000 Date: Wed, 1 Sep 2021 14:10:50 +0000
Subject: [PATCH 15/21] UI: Kill rounded corners in notification scrim Subject: [PATCH 14/20] 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 Rounded corners in S is nicely implemented, but this is one occasion where it looks out of place
@ -11,12 +11,12 @@ Change-Id: I09ed59e0e658ebd512a9d02a8ef3edfe2c9888da
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml
index 3320f98d1620..be08d662ed14 100644 index a6b766f60d6f..272019c5893b 100644
--- a/packages/SystemUI/res/values/dimens.xml --- a/packages/SystemUI/res/values/dimens.xml
+++ b/packages/SystemUI/res/values/dimens.xml +++ b/packages/SystemUI/res/values/dimens.xml
@@ -759,7 +759,7 @@ @@ -792,7 +792,7 @@
<!-- When large clock is showing, offset the smartspace by this amount --> <!-- The amount to translate lockscreen elements on the GONE->AOD transition -->
<dimen name="keyguard_smartspace_top_offset">12dp</dimen> <dimen name="keyguard_enter_from_top_translation_y">-100dp</dimen>
- <dimen name="notification_scrim_corner_radius">32dp</dimen> - <dimen name="notification_scrim_corner_radius">32dp</dimen>
+ <dimen name="notification_scrim_corner_radius">0dp</dimen> + <dimen name="notification_scrim_corner_radius">0dp</dimen>

8
patches_platform_personal/frameworks_base/0016-UI-Reconfigure-power-menu-items.patch → patches_platform_personal/frameworks_base/0015-UI-Reconfigure-power-menu-items.patch
View File

@ -1,7 +1,7 @@
From 7ed48ed3b7a097290de3695da736da668bfc5b88 Mon Sep 17 00:00:00 2001 From 8026a42c4ac7ef9bd682a47525c2f7875c8aa938 Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com> From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Mon, 26 Oct 2020 14:06:56 +0000 Date: Mon, 26 Oct 2020 14:06:56 +0000
Subject: [PATCH 16/21] UI: Reconfigure power menu items Subject: [PATCH 15/20] UI: Reconfigure power menu items
Change-Id: I32cca6e2c6bb64d891efee959127edf7c0802cbc Change-Id: I32cca6e2c6bb64d891efee959127edf7c0802cbc
--- ---
@ -9,10 +9,10 @@ Change-Id: I32cca6e2c6bb64d891efee959127edf7c0802cbc
1 file changed, 1 insertion(+), 4 deletions(-) 1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
index 2ae5f1f43335..82668de63c28 100644 index 19f0ee14d5d5..cd959bb4a831 100644
--- a/core/res/res/values/config.xml --- a/core/res/res/values/config.xml
+++ b/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml
@@ -3489,13 +3489,10 @@ @@ -3594,13 +3594,10 @@
"logout" = Logout the current user "logout" = Logout the current user
--> -->
<string-array translatable="false" name="config_globalActionsList"> <string-array translatable="false" name="config_globalActionsList">

10
patches_platform_personal/frameworks_base/0017-UI-Reconfigure-quick-settings-tiles.patch → patches_platform_personal/frameworks_base/0016-UI-Reconfigure-quick-settings-tiles.patch
View File

@ -1,7 +1,7 @@
From e1cd8d1cdc216ba64b34a3bae83a07b7003b1218 Mon Sep 17 00:00:00 2001 From abadefb66f417ccfab7b179647201d4e3db9b7c6 Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com> From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Sat, 5 Mar 2022 01:43:37 +0000 Date: Sat, 5 Mar 2022 01:43:37 +0000
Subject: [PATCH 17/21] UI: Reconfigure quick settings tiles Subject: [PATCH 16/20] UI: Reconfigure quick settings tiles
Change-Id: I743f52ef3a95db0ca2c02ae973faa4629e41885d Change-Id: I743f52ef3a95db0ca2c02ae973faa4629e41885d
--- ---
@ -9,14 +9,14 @@ Change-Id: I743f52ef3a95db0ca2c02ae973faa4629e41885d
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/packages/SystemUI/res/values/config.xml b/packages/SystemUI/res/values/config.xml diff --git a/packages/SystemUI/res/values/config.xml b/packages/SystemUI/res/values/config.xml
index 9cd22313e0a1..03135f215e05 100644 index 4791ad8969f0..05ff8736f429 100644
--- a/packages/SystemUI/res/values/config.xml --- a/packages/SystemUI/res/values/config.xml
+++ b/packages/SystemUI/res/values/config.xml +++ b/packages/SystemUI/res/values/config.xml
@@ -78,7 +78,7 @@ @@ -88,7 +88,7 @@
<!-- The default tiles to display in QuickSettings --> <!-- The default tiles to display in QuickSettings -->
<string name="quick_settings_tiles_default" translatable="false"> <string name="quick_settings_tiles_default" translatable="false">
- internet,bt,flashlight,dnd,alarm,airplane,controls,wallet,rotation,battery,cast,screenrecord,mictoggle,cameratoggle,custom(com.android.permissioncontroller/.permission.service.SafetyCenterQsTileService) - internet,bt,flashlight,dnd,alarm,airplane,controls,wallet,rotation,battery,cast,screenrecord,mictoggle,cameratoggle,custom(com.android.permissioncontroller/.permission.service.v33.SafetyCenterQsTileService)
+ wifi,cell,hotspot,location,rotation,flashlight + wifi,cell,hotspot,location,rotation,flashlight
</string> </string>

4
patches_platform_personal/frameworks_base/0018-UI-Relax-requirement-for-HINT_SUPPORTS_DARK_TEXT.patch → patches_platform_personal/frameworks_base/0017-UI-Relax-requirement-for-HINT_SUPPORTS_DARK_TEXT.patch
View File

@ -1,7 +1,7 @@
From 55c864cf004f63aa0475a76be4537bb26589ae4f Mon Sep 17 00:00:00 2001 From 738b824c574d4189f5bdcc188b40fe51785854c2 Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com> From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Tue, 29 Jun 2021 22:57:01 +0000 Date: Tue, 29 Jun 2021 22:57:01 +0000
Subject: [PATCH 18/21] UI: Relax requirement for HINT_SUPPORTS_DARK_TEXT Subject: [PATCH 17/20] UI: Relax requirement for HINT_SUPPORTS_DARK_TEXT
I decide what's good enough for a wallpaper! I decide what's good enough for a wallpaper!

8
patches_platform_personal/frameworks_base/0019-UI-Remove-privacy-dot.patch → patches_platform_personal/frameworks_base/0018-UI-Remove-privacy-dot.patch
View File

@ -1,7 +1,7 @@
From 1c65cb4d1b36523bdc993a56e7183c8b736c9382 Mon Sep 17 00:00:00 2001 From 6de4216d8fb76e3df95992417df1a11f33118361 Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com> From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Tue, 19 Oct 2021 12:09:34 +0000 Date: Tue, 19 Oct 2021 12:09:34 +0000
Subject: [PATCH 19/21] UI: Remove privacy dot Subject: [PATCH 18/20] UI: Remove privacy dot
Change-Id: I5d2e2b3e36f027b4348a83030d4b4d3c4f0209d1 Change-Id: I5d2e2b3e36f027b4348a83030d4b4d3c4f0209d1
--- ---
@ -9,10 +9,10 @@ Change-Id: I5d2e2b3e36f027b4348a83030d4b4d3c4f0209d1
1 file changed, 2 insertions(+), 2 deletions(-) 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml
index be08d662ed14..ea4a1db20819 100644 index 272019c5893b..b84566f64080 100644
--- a/packages/SystemUI/res/values/dimens.xml --- a/packages/SystemUI/res/values/dimens.xml
+++ b/packages/SystemUI/res/values/dimens.xml +++ b/packages/SystemUI/res/values/dimens.xml
@@ -1102,12 +1102,12 @@ @@ -1139,12 +1139,12 @@
<dimen name="ongoing_appops_chip_min_width">56dp</dimen> <dimen name="ongoing_appops_chip_min_width">56dp</dimen>
<!-- Three privacy items. This value must not be exceeded --> <!-- Three privacy items. This value must not be exceeded -->
<dimen name="ongoing_appops_chip_max_width">76dp</dimen> <dimen name="ongoing_appops_chip_max_width">76dp</dimen>

6
patches_platform_personal/frameworks_base/0020-UI-Restore-quick-settings-fonts-to-pre-T-QPR2.patch → patches_platform_personal/frameworks_base/0019-UI-Restore-quick-settings-fonts-to-pre-T-QPR2.patch
View File

@ -1,7 +1,7 @@
From bdedcba0f39eb17bcf93d954eede85f5c079d067 Mon Sep 17 00:00:00 2001 From d60458e34f7570e362b244c156020f986f26a36c Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com> From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Wed, 22 Mar 2023 00:29:13 +0000 Date: Wed, 22 Mar 2023 00:29:13 +0000
Subject: [PATCH 20/21] UI: Restore quick settings fonts to pre-T-QPR2 Subject: [PATCH 19/20] UI: Restore quick settings fonts to pre-T-QPR2
TODO: Large header clock looks better in Regular - perhaps figure out how to transition smoothly? TODO: Large header clock looks better in Regular - perhaps figure out how to transition smoothly?
Change-Id: If2e57fee61b6bd4b6b7fedc7e3011164cd2cb56f Change-Id: If2e57fee61b6bd4b6b7fedc7e3011164cd2cb56f
@ -10,7 +10,7 @@ Change-Id: If2e57fee61b6bd4b6b7fedc7e3011164cd2cb56f
1 file changed, 2 insertions(+), 1 deletion(-) 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/packages/SystemUI/res/values/styles.xml b/packages/SystemUI/res/values/styles.xml diff --git a/packages/SystemUI/res/values/styles.xml b/packages/SystemUI/res/values/styles.xml
index 847b8a961322..09d7888ce552 100644 index 2cb0c89cd785..80831abc1201 100644
--- a/packages/SystemUI/res/values/styles.xml --- a/packages/SystemUI/res/values/styles.xml
+++ b/packages/SystemUI/res/values/styles.xml +++ b/packages/SystemUI/res/values/styles.xml
@@ -143,7 +143,7 @@ @@ -143,7 +143,7 @@

4
patches_platform_personal/frameworks_base/0021-UI-Revert-to-HSL-luminance-for-wallpaper-dark-hints.patch → patches_platform_personal/frameworks_base/0020-UI-Revert-to-HSL-luminance-for-wallpaper-dark-hints.patch
View File

@ -1,7 +1,7 @@
From a1bee1d208afbf20b3db1cd03ae393d6e7d93a05 Mon Sep 17 00:00:00 2001 From 92e809ecdc3cb63ad9d4aa107dd959896cb6024c Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com> From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Fri, 30 Sep 2022 16:02:16 +0000 Date: Fri, 30 Sep 2022 16:02:16 +0000
Subject: [PATCH 21/21] UI: Revert to HSL luminance for wallpaper dark hints Subject: [PATCH 20/20] UI: Revert to HSL luminance for wallpaper dark hints
Y U no test for consistency, Google? Y U no test for consistency, Google?

14
patches_platform_personal/lineage-sdk/0001-sdk-I-have-Trust-issues.patch
View File

@ -1,4 +1,4 @@
From d8a13aada0c4951deeda873543b8d6f33c402889 Mon Sep 17 00:00:00 2001 From e130858b3f35dabed681a6bce8a8dbda7e71b607 Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com> From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Thu, 23 Nov 2023 22:31:47 +0800 Date: Thu, 23 Nov 2023 22:31:47 +0800
Subject: [PATCH] sdk: I have Trust issues Subject: [PATCH] sdk: I have Trust issues
@ -11,13 +11,13 @@ Change-Id: Id36104c8a9c386145e6d99a9d741947bddaa37be
1 file changed, 29 deletions(-) 1 file changed, 29 deletions(-)
diff --git a/lineage/lib/main/java/org/lineageos/platform/internal/TrustInterfaceService.java b/lineage/lib/main/java/org/lineageos/platform/internal/TrustInterfaceService.java diff --git a/lineage/lib/main/java/org/lineageos/platform/internal/TrustInterfaceService.java b/lineage/lib/main/java/org/lineageos/platform/internal/TrustInterfaceService.java
index 473bfe08..281c70ef 100644 index 3cb8e5e7..aad5f3f4 100644
--- a/lineage/lib/main/java/org/lineageos/platform/internal/TrustInterfaceService.java --- a/lineage/lib/main/java/org/lineageos/platform/internal/TrustInterfaceService.java
+++ b/lineage/lib/main/java/org/lineageos/platform/internal/TrustInterfaceService.java +++ b/lineage/lib/main/java/org/lineageos/platform/internal/TrustInterfaceService.java
@@ -99,15 +99,6 @@ public class TrustInterfaceService extends LineageSystemService { @@ -87,15 +87,6 @@ public class TrustInterfaceService extends LineageSystemService {
} catch (NoSuchElementException | RemoteException e) { public void onBootPhase(int phase) {
// ignore, the hal is not available if (phase == PHASE_BOOT_COMPLETED) {
} mNotificationManager = mContext.getSystemService(NotificationManager.class);
- -
- // Onboard - // Onboard
- if (!hasOnboardedUser()) { - if (!hasOnboardedUser()) {
@ -30,7 +30,7 @@ index 473bfe08..281c70ef 100644
} }
} }
@@ -351,26 +342,6 @@ public class TrustInterfaceService extends LineageSystemService { @@ -338,26 +329,6 @@ public class TrustInterfaceService extends LineageSystemService {
LineageSettings.System.TRUST_INTERFACE_HINTED, 0) == 1; LineageSettings.System.TRUST_INTERFACE_HINTED, 0) == 1;
} }

69
patches_platform_personal/packages_apps_DeskClock/0001-Squashed-revert-of-LOS-widget-redesign.patch
View File

@ -1,4 +1,4 @@
From f0f5e3f2db8aad94329c6354da8dbca17b8cef81 Mon Sep 17 00:00:00 2001 From 7262d6fa8ee2dac2e359e1cc0bbd2d1ef81cfd26 Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com> From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Thu, 8 Jun 2023 00:46:00 +0800 Date: Thu, 8 Jun 2023 00:46:00 +0800
Subject: [PATCH 1/4] Squashed revert of LOS widget redesign Subject: [PATCH 1/4] Squashed revert of LOS widget redesign
@ -52,7 +52,7 @@ Until it no longer works...
res/xml/digital_appwidget.xml | 13 +- res/xml/digital_appwidget.xml | 13 +-
.../DigitalAppWidgetCityViewsFactory.java | 10 +- .../DigitalAppWidgetCityViewsFactory.java | 10 +-
...DigitalAppWidgetConfigurationActivity.java | 50 ------ ...DigitalAppWidgetConfigurationActivity.java | 50 ------
.../alarmclock/DigitalAppWidgetProvider.java | 60 ++----- .../alarmclock/DigitalAppWidgetProvider.java | 61 ++-----
src/com/android/alarmclock/WidgetUtils.java | 28 --- src/com/android/alarmclock/WidgetUtils.java | 28 ---
src/com/android/deskclock/ClockFragment.java | 1 + src/com/android/deskclock/ClockFragment.java | 1 +
.../deskclock/DropShadowController.java | 2 - .../deskclock/DropShadowController.java | 2 -
@ -84,7 +84,7 @@ Until it no longer works...
.../uidata/PeriodicCallbackModel.java | 1 - .../uidata/PeriodicCallbackModel.java | 1 -
.../widget/CollapsingToolbarBaseActivity.java | 3 + .../widget/CollapsingToolbarBaseActivity.java | 3 +
.../deskclock/widget/MockFabContainer.java | 27 ++- .../deskclock/widget/MockFabContainer.java | 27 ++-
75 files changed, 388 insertions(+), 933 deletions(-) 75 files changed, 388 insertions(+), 934 deletions(-)
create mode 100644 res/drawable-nodpi/appwidget_digital_clock_preview.png create mode 100644 res/drawable-nodpi/appwidget_digital_clock_preview.png
create mode 100644 res/drawable/ic_checkmark.xml create mode 100644 res/drawable/ic_checkmark.xml
delete mode 100644 res/drawable/widget_background.xml delete mode 100644 res/drawable/widget_background.xml
@ -2043,7 +2043,7 @@ index d65a9e9d9..000000000
- } - }
-} -}
diff --git a/src/com/android/alarmclock/DigitalAppWidgetProvider.java b/src/com/android/alarmclock/DigitalAppWidgetProvider.java diff --git a/src/com/android/alarmclock/DigitalAppWidgetProvider.java b/src/com/android/alarmclock/DigitalAppWidgetProvider.java
index ec6fac409..b54a500c5 100644 index 7bda49314..709835ebc 100644
--- a/src/com/android/alarmclock/DigitalAppWidgetProvider.java --- a/src/com/android/alarmclock/DigitalAppWidgetProvider.java
+++ b/src/com/android/alarmclock/DigitalAppWidgetProvider.java +++ b/src/com/android/alarmclock/DigitalAppWidgetProvider.java
@@ -24,7 +24,6 @@ import static android.appwidget.AppWidgetManager.OPTION_APPWIDGET_MAX_HEIGHT; @@ -24,7 +24,6 @@ import static android.appwidget.AppWidgetManager.OPTION_APPWIDGET_MAX_HEIGHT;
@ -2078,15 +2078,18 @@ index ec6fac409..b54a500c5 100644
for (int widgetId : widgetIds) { for (int widgetId : widgetIds) {
relayoutWidget(context, wm, widgetId, wm.getAppWidgetOptions(widgetId)); relayoutWidget(context, wm, widgetId, wm.getAppWidgetOptions(widgetId));
} }
@@ -182,7 +180,6 @@ public class DigitalAppWidgetProvider extends AppWidgetProvider { @@ -182,10 +180,8 @@ public class DigitalAppWidgetProvider extends AppWidgetProvider {
IntentFilter intentFilter = new IntentFilter(); IntentFilter intentFilter = new IntentFilter();
intentFilter.addAction(ACTION_WORLD_CITIES_CHANGED); intentFilter.addAction(ACTION_WORLD_CITIES_CHANGED);
intentFilter.addAction(ACTION_ON_DAY_CHANGE); intentFilter.addAction(ACTION_ON_DAY_CHANGE);
- intentFilter.addAction(ACTION_CONFIGURATION_CHANGED); - intentFilter.addAction(ACTION_CONFIGURATION_CHANGED);
context.getApplicationContext().registerReceiver(receiver, intentFilter); context.getApplicationContext().registerReceiver(receiver, intentFilter,
Context.RECEIVER_NOT_EXPORTED);
-
sReceiversRegistered = true; sReceiversRegistered = true;
@@ -213,10 +210,6 @@ public class DigitalAppWidgetProvider extends AppWidgetProvider { }
@@ -214,10 +210,6 @@ public class DigitalAppWidgetProvider extends AppWidgetProvider {
wm.notifyAppWidgetViewDataChanged(widgetId, R.id.world_city_list); wm.notifyAppWidgetViewDataChanged(widgetId, R.id.world_city_list);
} }
@ -2097,7 +2100,7 @@ index ec6fac409..b54a500c5 100644
/** /**
* Compute optimal font and icon sizes offscreen for the given orientation. * Compute optimal font and icon sizes offscreen for the given orientation.
*/ */
@@ -224,18 +217,13 @@ public class DigitalAppWidgetProvider extends AppWidgetProvider { @@ -225,18 +217,13 @@ public class DigitalAppWidgetProvider extends AppWidgetProvider {
Bundle options, boolean portrait) { Bundle options, boolean portrait) {
// Create a remote view for the digital clock. // Create a remote view for the digital clock.
final String packageName = context.getPackageName(); final String packageName = context.getPackageName();
@ -2118,7 +2121,7 @@ index ec6fac409..b54a500c5 100644
} }
// Configure child views of the remote view. // Configure child views of the remote view.
@@ -279,15 +267,10 @@ public class DigitalAppWidgetProvider extends AppWidgetProvider { @@ -280,15 +267,10 @@ public class DigitalAppWidgetProvider extends AppWidgetProvider {
} }
// Apply the computed sizes to the remote views. // Apply the computed sizes to the remote views.
@ -2135,7 +2138,7 @@ index ec6fac409..b54a500c5 100644
final int smallestWorldCityListSizePx = final int smallestWorldCityListSizePx =
resources.getDimensionPixelSize(R.dimen.widget_min_world_city_list_size); resources.getDimensionPixelSize(R.dimen.widget_min_world_city_list_size);
@@ -324,8 +307,6 @@ public class DigitalAppWidgetProvider extends AppWidgetProvider { @@ -325,8 +307,6 @@ public class DigitalAppWidgetProvider extends AppWidgetProvider {
@SuppressLint("InflateParams") @SuppressLint("InflateParams")
final View sizer = inflater.inflate(R.layout.digital_widget_sizer, null /* root */); final View sizer = inflater.inflate(R.layout.digital_widget_sizer, null /* root */);
@ -2144,7 +2147,7 @@ index ec6fac409..b54a500c5 100644
// Configure the date to display the current date string. // Configure the date to display the current date string.
final CharSequence dateFormat = getDateFormat(context); final CharSequence dateFormat = getDateFormat(context);
final TextClock date = sizer.findViewById(R.id.date); final TextClock date = sizer.findViewById(R.id.date);
@@ -439,7 +420,6 @@ public class DigitalAppWidgetProvider extends AppWidgetProvider { @@ -440,7 +420,6 @@ public class DigitalAppWidgetProvider extends AppWidgetProvider {
final TextClock clock = sizer.findViewById(R.id.clock); final TextClock clock = sizer.findViewById(R.id.clock);
final TextView nextAlarm = sizer.findViewById(R.id.nextAlarm); final TextView nextAlarm = sizer.findViewById(R.id.nextAlarm);
final TextView nextAlarmIcon = sizer.findViewById(R.id.nextAlarmIcon); final TextView nextAlarmIcon = sizer.findViewById(R.id.nextAlarmIcon);
@ -2152,7 +2155,7 @@ index ec6fac409..b54a500c5 100644
// Adjust the font sizes. // Adjust the font sizes.
measuredSizes.setClockFontSizePx(clockFontSize); measuredSizes.setClockFontSizePx(clockFontSize);
@@ -449,17 +429,6 @@ public class DigitalAppWidgetProvider extends AppWidgetProvider { @@ -450,17 +429,6 @@ public class DigitalAppWidgetProvider extends AppWidgetProvider {
nextAlarm.setTextSize(COMPLEX_UNIT_PX, measuredSizes.mFontSizePx); nextAlarm.setTextSize(COMPLEX_UNIT_PX, measuredSizes.mFontSizePx);
nextAlarmIcon.setTextSize(COMPLEX_UNIT_PX, measuredSizes.mIconFontSizePx); nextAlarmIcon.setTextSize(COMPLEX_UNIT_PX, measuredSizes.mIconFontSizePx);
nextAlarmIcon.setPadding(measuredSizes.mIconPaddingPx, 0, measuredSizes.mIconPaddingPx, 0); nextAlarmIcon.setPadding(measuredSizes.mIconPaddingPx, 0, measuredSizes.mIconPaddingPx, 0);
@ -2170,7 +2173,7 @@ index ec6fac409..b54a500c5 100644
// Measure and layout the sizer. // Measure and layout the sizer.
final int widthSize = View.MeasureSpec.getSize(measuredSizes.mTargetWidthPx); final int widthSize = View.MeasureSpec.getSize(measuredSizes.mTargetWidthPx);
@@ -475,6 +444,11 @@ public class DigitalAppWidgetProvider extends AppWidgetProvider { @@ -476,6 +444,11 @@ public class DigitalAppWidgetProvider extends AppWidgetProvider {
measuredSizes.mMeasuredTextClockWidthPx = clock.getMeasuredWidth(); measuredSizes.mMeasuredTextClockWidthPx = clock.getMeasuredWidth();
measuredSizes.mMeasuredTextClockHeightPx = clock.getMeasuredHeight(); measuredSizes.mMeasuredTextClockHeightPx = clock.getMeasuredHeight();
@ -2182,7 +2185,7 @@ index ec6fac409..b54a500c5 100644
return measuredSizes; return measuredSizes;
} }
@@ -509,6 +483,7 @@ public class DigitalAppWidgetProvider extends AppWidgetProvider { @@ -510,6 +483,7 @@ public class DigitalAppWidgetProvider extends AppWidgetProvider {
private final int mTargetHeightPx; private final int mTargetHeightPx;
private final int mLargestClockFontSizePx; private final int mLargestClockFontSizePx;
private final int mSmallestClockFontSizePx; private final int mSmallestClockFontSizePx;
@ -2190,7 +2193,7 @@ index ec6fac409..b54a500c5 100644
private int mMeasuredWidthPx; private int mMeasuredWidthPx;
private int mMeasuredHeightPx; private int mMeasuredHeightPx;
@@ -524,9 +499,6 @@ public class DigitalAppWidgetProvider extends AppWidgetProvider { @@ -525,9 +499,6 @@ public class DigitalAppWidgetProvider extends AppWidgetProvider {
private int mIconFontSizePx; private int mIconFontSizePx;
private int mIconPaddingPx; private int mIconPaddingPx;
@ -2200,7 +2203,7 @@ index ec6fac409..b54a500c5 100644
private Sizes(int targetWidthPx, int targetHeightPx, int largestClockFontSizePx) { private Sizes(int targetWidthPx, int targetHeightPx, int largestClockFontSizePx) {
mTargetWidthPx = targetWidthPx; mTargetWidthPx = targetWidthPx;
mTargetHeightPx = targetHeightPx; mTargetHeightPx = targetHeightPx;
@@ -539,21 +511,11 @@ public class DigitalAppWidgetProvider extends AppWidgetProvider { @@ -540,21 +511,11 @@ public class DigitalAppWidgetProvider extends AppWidgetProvider {
private int getClockFontSizePx() { return mClockFontSizePx; } private int getClockFontSizePx() { return mClockFontSizePx; }
private void setClockFontSizePx(int clockFontSizePx) { private void setClockFontSizePx(int clockFontSizePx) {
mClockFontSizePx = clockFontSizePx; mClockFontSizePx = clockFontSizePx;
@ -2268,7 +2271,7 @@ index 21f3bd067..7ad2df7b8 100644
- } - }
} }
diff --git a/src/com/android/deskclock/ClockFragment.java b/src/com/android/deskclock/ClockFragment.java diff --git a/src/com/android/deskclock/ClockFragment.java b/src/com/android/deskclock/ClockFragment.java
index a6dbdfe16..bf53584e4 100644 index 7591a18d0..2a1f2770f 100644
--- a/src/com/android/deskclock/ClockFragment.java --- a/src/com/android/deskclock/ClockFragment.java
+++ b/src/com/android/deskclock/ClockFragment.java +++ b/src/com/android/deskclock/ClockFragment.java
@@ -28,6 +28,7 @@ import android.content.BroadcastReceiver; @@ -28,6 +28,7 @@ import android.content.BroadcastReceiver;
@ -2356,7 +2359,7 @@ index cbf6883cc..10df12ec6 100644
FragmentTransaction transaction = mFragmentManager.beginTransaction(); FragmentTransaction transaction = mFragmentManager.beginTransaction();
diff --git a/src/com/android/deskclock/ScreensaverActivity.java b/src/com/android/deskclock/ScreensaverActivity.java diff --git a/src/com/android/deskclock/ScreensaverActivity.java b/src/com/android/deskclock/ScreensaverActivity.java
index 2cfd2c2a9..b30f82ee7 100644 index ab0e8b2bc..8b4b422d8 100644
--- a/src/com/android/deskclock/ScreensaverActivity.java --- a/src/com/android/deskclock/ScreensaverActivity.java
+++ b/src/com/android/deskclock/ScreensaverActivity.java +++ b/src/com/android/deskclock/ScreensaverActivity.java
@@ -28,12 +28,9 @@ import android.os.Bundle; @@ -28,12 +28,9 @@ import android.os.Bundle;
@ -2390,7 +2393,7 @@ index 2cfd2c2a9..b30f82ee7 100644
mPositionUpdater = new MoveScreensaverRunnable(mContentView, mMainClockView); mPositionUpdater = new MoveScreensaverRunnable(mContentView, mMainClockView);
@@ -224,19 +219,14 @@ public class ScreensaverActivity extends BaseActivity { @@ -225,19 +220,14 @@ public class ScreensaverActivity extends BaseActivity {
} }
} }
@ -2523,11 +2526,11 @@ index e5c78e4c5..2e5330668 100644
/** /**
diff --git a/src/com/android/deskclock/data/RingtoneModel.java b/src/com/android/deskclock/data/RingtoneModel.java diff --git a/src/com/android/deskclock/data/RingtoneModel.java b/src/com/android/deskclock/data/RingtoneModel.java
index d765ba8b9..b83270cab 100644 index de7e9a25d..145bdf280 100644
--- a/src/com/android/deskclock/data/RingtoneModel.java --- a/src/com/android/deskclock/data/RingtoneModel.java
+++ b/src/com/android/deskclock/data/RingtoneModel.java +++ b/src/com/android/deskclock/data/RingtoneModel.java
@@ -81,16 +81,17 @@ final class RingtoneModel { @@ -82,16 +82,17 @@ final class RingtoneModel {
mContext.registerReceiver(mLocaleChangedReceiver, localeBroadcastFilter); Context.RECEIVER_NOT_EXPORTED);
} }
- void addCustomRingtone(Uri uri, String title) { - void addCustomRingtone(Uri uri, String title) {
@ -2547,10 +2550,10 @@ index d765ba8b9..b83270cab 100644
void removeCustomRingtone(Uri uri) { void removeCustomRingtone(Uri uri) {
diff --git a/src/com/android/deskclock/data/SilentSettingsModel.java b/src/com/android/deskclock/data/SilentSettingsModel.java diff --git a/src/com/android/deskclock/data/SilentSettingsModel.java b/src/com/android/deskclock/data/SilentSettingsModel.java
index 1cfc1884c..af3caee2a 100644 index 052dbf39f..8aabfefc4 100644
--- a/src/com/android/deskclock/data/SilentSettingsModel.java --- a/src/com/android/deskclock/data/SilentSettingsModel.java
+++ b/src/com/android/deskclock/data/SilentSettingsModel.java +++ b/src/com/android/deskclock/data/SilentSettingsModel.java
@@ -145,8 +145,8 @@ final class SilentSettingsModel { @@ -146,8 +146,8 @@ final class SilentSettingsModel {
* making noise, a description of the setting is reported to this model on the main thread. * making noise, a description of the setting is reported to this model on the main thread.
*/ */
private final class CheckSilenceSettingsTask { private final class CheckSilenceSettingsTask {
@ -2577,10 +2580,10 @@ index 9f0c7cdd6..b3d5c07be 100644
+ void stopwatchUpdated(Stopwatch before, Stopwatch after); + void stopwatchUpdated(Stopwatch before, Stopwatch after);
} }
diff --git a/src/com/android/deskclock/data/StopwatchModel.java b/src/com/android/deskclock/data/StopwatchModel.java diff --git a/src/com/android/deskclock/data/StopwatchModel.java b/src/com/android/deskclock/data/StopwatchModel.java
index ba2489333..a9ea1376f 100644 index 804bea9a5..2ae3febbf 100644
--- a/src/com/android/deskclock/data/StopwatchModel.java --- a/src/com/android/deskclock/data/StopwatchModel.java
+++ b/src/com/android/deskclock/data/StopwatchModel.java +++ b/src/com/android/deskclock/data/StopwatchModel.java
@@ -101,7 +101,7 @@ final class StopwatchModel { @@ -102,7 +102,7 @@ final class StopwatchModel {
/** /**
* @param stopwatch the new state of the stopwatch * @param stopwatch the new state of the stopwatch
*/ */
@ -2589,7 +2592,7 @@ index ba2489333..a9ea1376f 100644
final Stopwatch before = getStopwatch(); final Stopwatch before = getStopwatch();
if (before != stopwatch) { if (before != stopwatch) {
StopwatchDAO.setStopwatch(mPrefs, stopwatch); StopwatchDAO.setStopwatch(mPrefs, stopwatch);
@@ -123,7 +123,7 @@ final class StopwatchModel { @@ -124,7 +124,7 @@ final class StopwatchModel {
} }
} }
@ -2633,10 +2636,10 @@ index 0cb304d81..93e4d8cd6 100644
private final List<State> stateExpiryOrder = Arrays.asList(MISSED, EXPIRED, RUNNING, PAUSED, private final List<State> stateExpiryOrder = Arrays.asList(MISSED, EXPIRED, RUNNING, PAUSED,
RESET); RESET);
diff --git a/src/com/android/deskclock/data/TimerModel.java b/src/com/android/deskclock/data/TimerModel.java diff --git a/src/com/android/deskclock/data/TimerModel.java b/src/com/android/deskclock/data/TimerModel.java
index cc06add50..784a72c7b 100644 index 47bafe31c..1197373af 100644
--- a/src/com/android/deskclock/data/TimerModel.java --- a/src/com/android/deskclock/data/TimerModel.java
+++ b/src/com/android/deskclock/data/TimerModel.java +++ b/src/com/android/deskclock/data/TimerModel.java
@@ -294,7 +294,7 @@ final class TimerModel { @@ -295,7 +295,7 @@ final class TimerModel {
* @param eventLabelId the label of the timer event to send; 0 if no event should be sent * @param eventLabelId the label of the timer event to send; 0 if no event should be sent
* @return the reset {@code timer} or {@code null} if the timer was deleted * @return the reset {@code timer} or {@code null} if the timer was deleted
*/ */
@ -2645,7 +2648,7 @@ index cc06add50..784a72c7b 100644
final Timer result = doResetOrDeleteTimer(timer, allowDelete, eventLabelId); final Timer result = doResetOrDeleteTimer(timer, allowDelete, eventLabelId);
// Update the notification after updating the timer data. // Update the notification after updating the timer data.
@@ -306,7 +306,7 @@ final class TimerModel { @@ -307,7 +307,7 @@ final class TimerModel {
updateNotification(); updateNotification();
} }
@ -2958,10 +2961,10 @@ index 979be1440..c6a557a8e 100644
public void onBind(int timerId) { public void onBind(int timerId) {
diff --git a/src/com/android/deskclock/uidata/PeriodicCallbackModel.java b/src/com/android/deskclock/uidata/PeriodicCallbackModel.java diff --git a/src/com/android/deskclock/uidata/PeriodicCallbackModel.java b/src/com/android/deskclock/uidata/PeriodicCallbackModel.java
index 4928244ec..0127e66cd 100644 index 1b0e00fca..8a74000eb 100644
--- a/src/com/android/deskclock/uidata/PeriodicCallbackModel.java --- a/src/com/android/deskclock/uidata/PeriodicCallbackModel.java
+++ b/src/com/android/deskclock/uidata/PeriodicCallbackModel.java +++ b/src/com/android/deskclock/uidata/PeriodicCallbackModel.java
@@ -93,7 +93,6 @@ final class PeriodicCallbackModel { @@ -94,7 +94,6 @@ final class PeriodicCallbackModel {
/** /**
* @param runnable to be called every hour * @param runnable to be called every hour
*/ */

8
patches_platform_personal/packages_apps_DeskClock/0002-DeskClock-Remove-night-mode.patch
View File

@ -1,4 +1,4 @@
From 1b76c4a2eb60baceab9cd169cbded8f58b06b89e Mon Sep 17 00:00:00 2001 From 2f468ddf5a40a1e267144691242610e96b2b58b6 Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com> From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Sun, 5 Sep 2021 00:30:33 +0000 Date: Sun, 5 Sep 2021 00:30:33 +0000
Subject: [PATCH 2/4] DeskClock: Remove night mode Subject: [PATCH 2/4] DeskClock: Remove night mode
@ -27,10 +27,10 @@ index 7b8c9764a..908f76fef 100644
- -
</PreferenceScreen> </PreferenceScreen>
diff --git a/src/com/android/deskclock/Screensaver.java b/src/com/android/deskclock/Screensaver.java diff --git a/src/com/android/deskclock/Screensaver.java b/src/com/android/deskclock/Screensaver.java
index ad92b1149..f6c03ed0a 100644 index 1031f37d6..5b6de21d1 100644
--- a/src/com/android/deskclock/Screensaver.java --- a/src/com/android/deskclock/Screensaver.java
+++ b/src/com/android/deskclock/Screensaver.java +++ b/src/com/android/deskclock/Screensaver.java
@@ -136,9 +136,8 @@ public final class Screensaver extends DreamService { @@ -137,9 +137,8 @@ public final class Screensaver extends DreamService {
private void setClockStyle() { private void setClockStyle() {
Utils.setScreensaverClockStyle(mDigitalClock, mAnalogClock); Utils.setScreensaverClockStyle(mDigitalClock, mAnalogClock);
@ -43,7 +43,7 @@ index ad92b1149..f6c03ed0a 100644
/** /**
diff --git a/src/com/android/deskclock/ScreensaverActivity.java b/src/com/android/deskclock/ScreensaverActivity.java diff --git a/src/com/android/deskclock/ScreensaverActivity.java b/src/com/android/deskclock/ScreensaverActivity.java
index b30f82ee7..90235351f 100644 index 8b4b422d8..2f80537a6 100644
--- a/src/com/android/deskclock/ScreensaverActivity.java --- a/src/com/android/deskclock/ScreensaverActivity.java
+++ b/src/com/android/deskclock/ScreensaverActivity.java +++ b/src/com/android/deskclock/ScreensaverActivity.java
@@ -101,7 +101,7 @@ public class ScreensaverActivity extends BaseActivity { @@ -101,7 +101,7 @@ public class ScreensaverActivity extends BaseActivity {

6
patches_platform_personal/packages_apps_DeskClock/0003-DeskClock-Adapt-digital-clocks-to-S-style.patch
View File

@ -1,4 +1,4 @@
From 57684772d748887b4eca93d6fb5c35ee1dff72eb Mon Sep 17 00:00:00 2001 From 2bbdf8a6e96e5f6fe14da94eddf729e374c681b4 Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com> From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Wed, 19 Jan 2022 18:04:36 +0000 Date: Wed, 19 Jan 2022 18:04:36 +0000
Subject: [PATCH 3/4] DeskClock: Adapt digital clocks to S style Subject: [PATCH 3/4] DeskClock: Adapt digital clocks to S style
@ -432,7 +432,7 @@ index 8c6364344..159f24766 100644
+ </style> + </style>
</resources> </resources>
diff --git a/src/com/android/alarmclock/DigitalAppWidgetProvider.java b/src/com/android/alarmclock/DigitalAppWidgetProvider.java diff --git a/src/com/android/alarmclock/DigitalAppWidgetProvider.java b/src/com/android/alarmclock/DigitalAppWidgetProvider.java
index b54a500c5..fb1b30aa7 100644 index 709835ebc..621b39132 100644
--- a/src/com/android/alarmclock/DigitalAppWidgetProvider.java --- a/src/com/android/alarmclock/DigitalAppWidgetProvider.java
+++ b/src/com/android/alarmclock/DigitalAppWidgetProvider.java +++ b/src/com/android/alarmclock/DigitalAppWidgetProvider.java
@@ -223,7 +223,7 @@ public class DigitalAppWidgetProvider extends AppWidgetProvider { @@ -223,7 +223,7 @@ public class DigitalAppWidgetProvider extends AppWidgetProvider {
@ -540,7 +540,7 @@ index c3739bac8..5b931a46d 100644
return (String) DateFormat.format(pattern, time); return (String) DateFormat.format(pattern, time);
} }
diff --git a/src/com/android/deskclock/ClockFragment.java b/src/com/android/deskclock/ClockFragment.java diff --git a/src/com/android/deskclock/ClockFragment.java b/src/com/android/deskclock/ClockFragment.java
index bf53584e4..7a0e3ae0b 100644 index 2a1f2770f..eaf796659 100644
--- a/src/com/android/deskclock/ClockFragment.java --- a/src/com/android/deskclock/ClockFragment.java
+++ b/src/com/android/deskclock/ClockFragment.java +++ b/src/com/android/deskclock/ClockFragment.java
@@ -123,7 +123,6 @@ public final class ClockFragment extends DeskClockFragment { @@ -123,7 +123,6 @@ public final class ClockFragment extends DeskClockFragment {

4
patches_platform_personal/packages_apps_DeskClock/0004-DeskClock-Wallpaper-based-text-coloring-for-digital-.patch
View File

@ -1,4 +1,4 @@
From 13cd5543d2d0a253c86fa84030bb3dfb636ceea1 Mon Sep 17 00:00:00 2001 From 8183a51d8cac2772c1e8d17a264218a4fa0a0287 Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com> From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Thu, 20 Jan 2022 04:42:03 +0000 Date: Thu, 20 Jan 2022 04:42:03 +0000
Subject: [PATCH 4/4] DeskClock: Wallpaper-based text coloring for digital Subject: [PATCH 4/4] DeskClock: Wallpaper-based text coloring for digital
@ -12,7 +12,7 @@ Change-Id: Ie22c4980526575f73ebb4e56780d4c2193cc45d3
1 file changed, 57 insertions(+) 1 file changed, 57 insertions(+)
diff --git a/src/com/android/alarmclock/DigitalAppWidgetProvider.java b/src/com/android/alarmclock/DigitalAppWidgetProvider.java diff --git a/src/com/android/alarmclock/DigitalAppWidgetProvider.java b/src/com/android/alarmclock/DigitalAppWidgetProvider.java
index fb1b30aa7..c04528240 100644 index 621b39132..1031a65b2 100644
--- a/src/com/android/alarmclock/DigitalAppWidgetProvider.java --- a/src/com/android/alarmclock/DigitalAppWidgetProvider.java
+++ b/src/com/android/alarmclock/DigitalAppWidgetProvider.java +++ b/src/com/android/alarmclock/DigitalAppWidgetProvider.java
@@ -38,6 +38,8 @@ import static java.lang.Math.round; @@ -38,6 +38,8 @@ import static java.lang.Math.round;

12
patches_platform_personal/packages_apps_Nfc/0001-NfcService-Disable-NFC-by-default.patch
View File

@ -1,4 +1,4 @@
From 61630e83287a097f512b03203722f7385100bd5f Mon Sep 17 00:00:00 2001 From ed635e14cc220e49b736c8071f368201931dd4b0 Mon Sep 17 00:00:00 2001
From: Daniel Micay <danielmicay@gmail.com> From: Daniel Micay <danielmicay@gmail.com>
Date: Sat, 6 Jun 2015 10:40:51 -0400 Date: Sat, 6 Jun 2015 10:40:51 -0400
Subject: [PATCH] NfcService: Disable NFC by default Subject: [PATCH] NfcService: Disable NFC by default
@ -9,18 +9,18 @@ Change-Id: Ibe6abec7fa84c6fde476b8a083f57a3f61b50909
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/com/android/nfc/NfcService.java b/src/com/android/nfc/NfcService.java diff --git a/src/com/android/nfc/NfcService.java b/src/com/android/nfc/NfcService.java
index f22dc9da..28aedc59 100644 index f74e78ab..a4654977 100644
--- a/src/com/android/nfc/NfcService.java --- a/src/com/android/nfc/NfcService.java
+++ b/src/com/android/nfc/NfcService.java +++ b/src/com/android/nfc/NfcService.java
@@ -141,7 +141,7 @@ public class NfcService implements DeviceHostListener, ForegroundUtils.Callback @@ -144,7 +144,7 @@ public class NfcService implements DeviceHostListener, ForegroundUtils.Callback
public static final String PREF_TAG_APP_LIST = "TagIntentAppPreferenceListPrefs"; public static final String PREF_TAG_APP_LIST = "TagIntentAppPreferenceListPrefs";
static final String PREF_NFC_ON = "nfc_on"; static final String PREF_NFC_ON = "nfc_on";
- static final boolean NFC_ON_DEFAULT = true; - static final boolean NFC_ON_DEFAULT = true;
+ static final boolean NFC_ON_DEFAULT = false; + static final boolean NFC_ON_DEFAULT = false;
static final String PREF_SECURE_NFC_ON = "secure_nfc_on";
static final boolean SECURE_NFC_ON_DEFAULT = false; static final String PREF_NFC_READER_OPTION_ON = "nfc_reader_on";
static final String PREF_FIRST_BOOT = "first_boot"; static final boolean NFC_READER_OPTION_DEFAULT = true;
-- --
2.34.1 2.34.1

26
patches_platform_personal/packages_apps_Settings/0001-Keyguard-Default-to-small-clock-2-3.patch
View File

@ -1,26 +0,0 @@
From 4dad46e31da483f2b0818e81791cac4a4a674385 Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Mon, 20 Nov 2023 10:42:58 +0800
Subject: [PATCH] Keyguard: Default to small clock (2/3)
Change-Id: Ieb39c323e99fd2795f683a8a2930bb3a27212a6d
---
.../settings/display/LockscreenClockPreferenceController.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/com/android/settings/display/LockscreenClockPreferenceController.java b/src/com/android/settings/display/LockscreenClockPreferenceController.java
index 70ae55eaf9..fd6e0fe248 100644
--- a/src/com/android/settings/display/LockscreenClockPreferenceController.java
+++ b/src/com/android/settings/display/LockscreenClockPreferenceController.java
@@ -37,7 +37,7 @@ public class LockscreenClockPreferenceController extends TogglePreferenceControl
@Override
public boolean isChecked() {
- return Settings.Secure.getInt(mContext.getContentResolver(), SETTING_KEY, 1) != 0;
+ return Settings.Secure.getInt(mContext.getContentResolver(), SETTING_KEY, 0) != 0;
}
@Override
--
2.34.1

174
patches_platform_personal/packages_apps_SetupWizard/0001-SetupWizard-Least-Action-s-Principle.patch
View File

@ -1,163 +1,189 @@
From 7f78c8c7ea3b7aad4c234338263ed88eef8485e7 Mon Sep 17 00:00:00 2001 From 132abfada735742924b1d02a044fb56072d43f0d Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com> From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Thu, 23 Nov 2023 23:21:58 +0800 Date: Thu, 23 Nov 2023 23:21:58 +0800
Subject: [PATCH] SetupWizard: Least Action(s) Principle Subject: [PATCH] SetupWizard: Least Action(s) Principle
Change-Id: I892634b8ffc7beafa5a223de0afdc64276efd2f5 Change-Id: I892634b8ffc7beafa5a223de0afdc64276efd2f5
--- ---
res/raw/lineage_wizard_script.xml | 43 +------------------ res/raw/lineage_wizard_script.xml | 62 +------------------
.../lineage_wizard_script_managed_profile.xml | 15 +------ .../lineage_wizard_script_managed_profile.xml | 22 +------
res/raw/lineage_wizard_script_user.xml | 27 +----------- res/raw/lineage_wizard_script_user.xml | 39 +-----------
3 files changed, 5 insertions(+), 80 deletions(-) 3 files changed, 3 insertions(+), 120 deletions(-)
diff --git a/res/raw/lineage_wizard_script.xml b/res/raw/lineage_wizard_script.xml diff --git a/res/raw/lineage_wizard_script.xml b/res/raw/lineage_wizard_script.xml
index 616f6ed..e7c9b7f 100644 index 511ac7b..21cd2ef 100644
--- a/res/raw/lineage_wizard_script.xml --- a/res/raw/lineage_wizard_script.xml
+++ b/res/raw/lineage_wizard_script.xml +++ b/res/raw/lineage_wizard_script.xml
@@ -18,21 +18,13 @@ @@ -5,13 +5,7 @@
SPDX-License-Identifier: Apache-2.0
--> -->
<WizardScript xmlns:wizard="http://schemas.android.com/apk/res/com.google.android.setupwizard" <WizardScript xmlns:wizard="http://schemas.android.com/apk/res/com.google.android.setupwizard"
- wizard:firstAction="bluetooth_setup"> - wizard:firstAction="bluetooth_setup">
- -
- <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_BLUETOOTH_SETUP;end" id="bluetooth_setup"> - <WizardAction
- wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_BLUETOOTH_SETUP;end"
- id="bluetooth_setup">
- <result wizard:action="welcome" /> - <result wizard:action="welcome" />
- </WizardAction> - </WizardAction>
+ wizard:firstAction="welcome"> + wizard:firstAction="welcome">
<WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_WELCOME;end" id="welcome"> <WizardAction
<result wizard:action="locale" /> wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_WELCOME;end"
</WizardAction> @@ -23,12 +17,6 @@
<WizardAction
<WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_LOCALE;end" id="locale"> wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_LOCALE;end"
id="locale">
- <result wizard:action="sim_missing" /> - <result wizard:action="sim_missing" />
- </WizardAction> - </WizardAction>
- -
- <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_SIM_MISSING;end" id="sim_missing"> - <WizardAction
- wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_SIM_MISSING;end"
- id="sim_missing">
<result wizard:action="network_setup" /> <result wizard:action="network_setup" />
</WizardAction> </WizardAction>
@@ -41,44 +33,13 @@ @@ -41,54 +29,6 @@
</WizardAction> <WizardAction
wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_DATETIME;end"
<WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_DATETIME;end" id="datetime"> id="datetime">
- <result wizard:action="restore" />
- </WizardAction>
-
- <WizardAction
- wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_RESTORE_BACKUP;end"
- id="restore">
- <result wizard:action="location_settings" /> - <result wizard:action="location_settings" />
- </WizardAction> - </WizardAction>
- -
- <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_LOCATION_SETTINGS;end" id="location_settings"> - <WizardAction
- wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_LOCATION_SETTINGS;end"
- id="location_settings">
- <result wizard:action="device_specific" /> - <result wizard:action="device_specific" />
- </WizardAction> - </WizardAction>
- -
- <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.DEVICE_SPECIFIC;end" id="device_specific"> - <WizardAction
- wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.DEVICE_SPECIFIC;end"
- id="device_specific">
- <result wizard:action="recovery_update" /> - <result wizard:action="recovery_update" />
- </WizardAction> - </WizardAction>
- -
- <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_RECOVERY_UPDATE;end" id="recovery_update"> - <WizardAction
- wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_RECOVERY_UPDATE;end"
- id="recovery_update">
- <result wizard:action="lineage_settings" /> - <result wizard:action="lineage_settings" />
- </WizardAction> - </WizardAction>
- -
- <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_SETTINGS;end" id="lineage_settings"> - <WizardAction
- wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_SETTINGS;end"
- id="lineage_settings">
- <result wizard:action="lockscreen_settings" /> - <result wizard:action="lockscreen_settings" />
- </WizardAction> - </WizardAction>
- -
- <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_LOCKSCREEN_SETTINGS;end" id="lockscreen_settings"> - <WizardAction
- wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_LOCKSCREEN_SETTINGS;end"
- id="lockscreen_settings">
- <result wizard:action="biometric_settings" /> - <result wizard:action="biometric_settings" />
- </WizardAction> - </WizardAction>
- -
- <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_BIOMETRIC_SETTINGS;end" id="biometric_settings"> - <WizardAction
- <result wizard:action="restore" /> - wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_BIOMETRIC_SETTINGS;end"
- </WizardAction> - id="biometric_settings">
-
- <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_RESTORE_BACKUP;end" id="restore">
- <result wizard:action="navigation_settings" /> - <result wizard:action="navigation_settings" />
- </WizardAction> - </WizardAction>
- -
- <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.NAVIGATION_SETTINGS;end" id="navigation_settings"> - <WizardAction
- wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.NAVIGATION_SETTINGS;end"
- id="navigation_settings">
<result wizard:action="finish" /> <result wizard:action="finish" />
</WizardAction> </WizardAction>
<WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_SETUP_COMPLETE;end" id="finish">
<result wizard:action="exit" />
</WizardAction>
+
<WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.EXIT;end" id="exit" />
</WizardScript>
diff --git a/res/raw/lineage_wizard_script_managed_profile.xml b/res/raw/lineage_wizard_script_managed_profile.xml diff --git a/res/raw/lineage_wizard_script_managed_profile.xml b/res/raw/lineage_wizard_script_managed_profile.xml
index 00a66e3..4f8b867 100644 index 36f80c6..47e99c5 100644
--- a/res/raw/lineage_wizard_script_managed_profile.xml --- a/res/raw/lineage_wizard_script_managed_profile.xml
+++ b/res/raw/lineage_wizard_script_managed_profile.xml +++ b/res/raw/lineage_wizard_script_managed_profile.xml
@@ -2,7 +2,6 @@ @@ -1,31 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- <!--
Copyright (C) 2016 The CyanogenMod Project SPDX-FileCopyrightText: 2016 The CyanogenMod Project
- Copyright (C) 2021 The Calyx Institute - SPDX-FileCopyrightText: 2021 The Calyx Institute
SPDX-FileCopyrightText: 2021-2024 The LineageOS Project
Licensed under the Apache License, Version 2.0 (the "License"); SPDX-License-Identifier: Apache-2.0
you may not use this file except in compliance with the License.
@@ -18,19 +17,7 @@
--> -->
<WizardScript xmlns:wizard="http://schemas.android.com/apk/res/com.google.android.setupwizard" <WizardScript xmlns:wizard="http://schemas.android.com/apk/res/com.google.android.setupwizard"
- wizard:firstAction="welcome"> - wizard:firstAction="welcome">
- -
- <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_WELCOME;end" id="welcome"> - <WizardAction
- <result wizard:action="location_settings" /> - wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_WELCOME;end"
- </WizardAction> - id="welcome">
- - <result wizard:name="skip" wizard:resultCode="1" />
- <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_LOCATION_SETTINGS;end" id="location_settings">
- <result wizard:action="restore" /> - <result wizard:action="restore" />
- </WizardAction> - </WizardAction>
- -
- <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_RESTORE_BACKUP;end" id="restore"> - <WizardAction
- wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_RESTORE_BACKUP;end"
- id="restore">
- <result wizard:action="location_settings" />
- </WizardAction>
-
- <WizardAction
- wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_LOCATION_SETTINGS;end"
- id="location_settings">
- <result wizard:action="finish" /> - <result wizard:action="finish" />
- </WizardAction> - </WizardAction>
+ wizard:firstAction="finish"> + wizard:firstAction="finish">
<WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_SETUP_COMPLETE;end" id="finish"> <WizardAction
<result wizard:action="exit" /> wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_SETUP_COMPLETE;end"
diff --git a/res/raw/lineage_wizard_script_user.xml b/res/raw/lineage_wizard_script_user.xml diff --git a/res/raw/lineage_wizard_script_user.xml b/res/raw/lineage_wizard_script_user.xml
index d480901..4f8b867 100644 index 7f52c6f..47e99c5 100644
--- a/res/raw/lineage_wizard_script_user.xml --- a/res/raw/lineage_wizard_script_user.xml
+++ b/res/raw/lineage_wizard_script_user.xml +++ b/res/raw/lineage_wizard_script_user.xml
@@ -17,35 +17,12 @@ @@ -5,44 +5,7 @@
SPDX-License-Identifier: Apache-2.0
--> -->
<WizardScript xmlns:wizard="http://schemas.android.com/apk/res/com.google.android.setupwizard" <WizardScript xmlns:wizard="http://schemas.android.com/apk/res/com.google.android.setupwizard"
- wizard:firstAction="welcome"> - wizard:firstAction="welcome">
- -
- <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_WELCOME;end" id="welcome"> - <WizardAction
- wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_WELCOME;end"
- id="welcome">
- <result wizard:name="skip" wizard:resultCode="1" />
- <result wizard:action="restore" />
- </WizardAction>
-
- <WizardAction
- wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_RESTORE_BACKUP;end"
- id="restore">
- <result wizard:action="location_settings" /> - <result wizard:action="location_settings" />
- </WizardAction> - </WizardAction>
- -
- <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_LOCATION_SETTINGS;end" id="location_settings"> - <WizardAction
- wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_LOCATION_SETTINGS;end"
- id="location_settings">
- <result wizard:action="lockscreen_settings" /> - <result wizard:action="lockscreen_settings" />
- </WizardAction> - </WizardAction>
- -
- <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_LOCKSCREEN_SETTINGS;end" id="lockscreen_settings"> - <WizardAction
- wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_LOCKSCREEN_SETTINGS;end"
- id="lockscreen_settings">
- <result wizard:action="biometric_settings" /> - <result wizard:action="biometric_settings" />
- </WizardAction> - </WizardAction>
- -
- <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_BIOMETRIC_SETTINGS;end" id="biometric_settings"> - <WizardAction
- <result wizard:action="restore" /> - wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_BIOMETRIC_SETTINGS;end"
- </WizardAction> - id="biometric_settings">
-
- <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_RESTORE_BACKUP;end" id="restore">
- <result wizard:action="navigation_settings" /> - <result wizard:action="navigation_settings" />
- </WizardAction> - </WizardAction>
- -
- <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.NAVIGATION_SETTINGS;end" id="navigation_settings"> - <WizardAction
- wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.NAVIGATION_SETTINGS;end"
- id="navigation_settings">
- <result wizard:action="finish" /> - <result wizard:action="finish" />
- </WizardAction> - </WizardAction>
+ wizard:firstAction="finish"> + wizard:firstAction="finish">
<WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_SETUP_COMPLETE;end" id="finish"> <WizardAction
<result wizard:action="exit" /> wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_SETUP_COMPLETE;end"
</WizardAction>
+
<WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.EXIT;end" id="exit" />
</WizardScript>
-- --
2.34.1 2.34.1

8
patches_platform_personal/packages_apps_Trebuchet/0001-Trebuchet-Make-overview-scrim-transparent-again.patch
View File

@ -1,4 +1,4 @@
From 13b848a8b08c6e99086ab3af9e526c698920ebaa Mon Sep 17 00:00:00 2001 From fbc5159270447f5d81be73aab5e7b8ee08d789a2 Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com> From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Thu, 28 Oct 2021 02:30:59 +0000 Date: Thu, 28 Oct 2021 02:30:59 +0000
Subject: [PATCH 1/3] Trebuchet: Make overview scrim transparent again Subject: [PATCH 1/3] Trebuchet: Make overview scrim transparent again
@ -23,7 +23,7 @@ Change-Id: I78c84865eb06b8e59c9c271cd2e267ae4cd7cc08
delete mode 100644 res/color-v33/overview_scrim_dark.xml delete mode 100644 res/color-v33/overview_scrim_dark.xml
diff --git a/quickstep/res/values/styles.xml b/quickstep/res/values/styles.xml diff --git a/quickstep/res/values/styles.xml b/quickstep/res/values/styles.xml
index fc0370421d..61ca1e05d6 100644 index bdc86b217d..7c47d126a8 100644
--- a/quickstep/res/values/styles.xml --- a/quickstep/res/values/styles.xml
+++ b/quickstep/res/values/styles.xml +++ b/quickstep/res/values/styles.xml
@@ -227,7 +227,7 @@ @@ -227,7 +227,7 @@
@ -36,10 +36,10 @@ index fc0370421d..61ca1e05d6 100644
<item name="android:textAllCaps">false</item> <item name="android:textAllCaps">false</item>
</style> </style>
diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index 23fcbea42f..9b151394fa 100644 index 08ec0398a7..e1ab7311dd 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java --- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java +++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -793,7 +793,7 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T @@ -805,7 +805,7 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
mEmptyIcon.setCallback(this); mEmptyIcon.setCallback(this);
mEmptyMessage = context.getText(R.string.recents_empty_message); mEmptyMessage = context.getText(R.string.recents_empty_message);
mEmptyMessagePaint = new TextPaint(); mEmptyMessagePaint = new TextPaint();

14
patches_platform_personal/packages_apps_Trebuchet/0002-Trebuchet-Kill-haptics-in-recents.patch
View File

@ -1,4 +1,4 @@
From 471be03743d96834bea2007e1beccd858149b8f6 Mon Sep 17 00:00:00 2001 From 5137588e22d194c87da0000ba6642f17fe37516a Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com> From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Fri, 18 Mar 2022 08:42:18 +0000 Date: Fri, 18 Mar 2022 08:42:18 +0000
Subject: [PATCH 2/3] Trebuchet: Kill haptics in recents Subject: [PATCH 2/3] Trebuchet: Kill haptics in recents
@ -13,10 +13,10 @@ Change-Id: Ie3b0eabe8cc0421e696720740edc492cae2f5153
3 files changed, 1 insertion(+), 32 deletions(-) 3 files changed, 1 insertion(+), 32 deletions(-)
diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java
index 6f421eb14a..655797da62 100644 index 968faf07c7..bb93664b46 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java --- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java +++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java
@@ -438,14 +438,7 @@ public class NoButtonQuickSwitchTouchController implements TouchController, @@ -437,14 +437,7 @@ public class NoButtonQuickSwitchTouchController implements TouchController,
nonOverviewAnim.setFloatValues(startProgress, endProgress); nonOverviewAnim.setFloatValues(startProgress, endProgress);
mNonOverviewAnim.dispatchOnStart(); mNonOverviewAnim.dispatchOnStart();
} }
@ -33,10 +33,10 @@ index 6f421eb14a..655797da62 100644
} }
diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TaskViewTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TaskViewTouchController.java diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TaskViewTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TaskViewTouchController.java
index 3d94857848..849b9fd2d1 100644 index 19bfe069c8..f6cb2c7024 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TaskViewTouchController.java --- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TaskViewTouchController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TaskViewTouchController.java +++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TaskViewTouchController.java
@@ -369,11 +369,6 @@ public abstract class TaskViewTouchController<T extends BaseDraggingActivity> @@ -370,11 +370,6 @@ public abstract class TaskViewTouchController<T extends BaseDraggingActivity>
mCurrentAnimation.startWithVelocity(mActivity, goingToEnd, mCurrentAnimation.startWithVelocity(mActivity, goingToEnd,
velocity * orientationHandler.getSecondaryTranslationDirectionFactor(), velocity * orientationHandler.getSecondaryTranslationDirectionFactor(),
mEndDisplacement, animationDuration); mEndDisplacement, animationDuration);
@ -49,10 +49,10 @@ index 3d94857848..849b9fd2d1 100644
private void clearState() { private void clearState() {
diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index 9b151394fa..0ce5537d2e 100644 index e1ab7311dd..c2f848c71a 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java --- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java +++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -1558,25 +1558,6 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T @@ -1583,25 +1583,6 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
} }
} }

16
patches_platform_personal/packages_apps_Trebuchet/0003-Trebuchet-Kill-inverted-rounded-corners-above-the-ta.patch
View File

@ -1,4 +1,4 @@
From 1d5fe3cd174200d7ec1e34b1363b4b7aa34154e1 Mon Sep 17 00:00:00 2001 From 3123bcedf9a080c651e9f009f14111585c7f1f38 Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com> From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Mon, 20 Nov 2023 14:09:32 +0800 Date: Mon, 20 Nov 2023 14:09:32 +0800
Subject: [PATCH 3/3] Trebuchet: Kill inverted rounded corners above the Subject: [PATCH 3/3] Trebuchet: Kill inverted rounded corners above the
@ -12,13 +12,13 @@ Change-Id: Ibf03a84cb8f3866b5151b02fe8a0e74167cf90ce
1 file changed, 7 deletions(-) 1 file changed, 7 deletions(-)
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarBackgroundRenderer.kt b/quickstep/src/com/android/launcher3/taskbar/TaskbarBackgroundRenderer.kt diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarBackgroundRenderer.kt b/quickstep/src/com/android/launcher3/taskbar/TaskbarBackgroundRenderer.kt
index d237c1f997..d7142eef59 100644 index d6016f1304..c77fadb9aa 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarBackgroundRenderer.kt --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarBackgroundRenderer.kt
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarBackgroundRenderer.kt +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarBackgroundRenderer.kt
@@ -131,13 +131,6 @@ class TaskbarBackgroundRenderer(context: TaskbarActivityContext) { @@ -159,13 +159,6 @@ class TaskbarBackgroundRenderer(private val context: TaskbarActivityContext) {
canvas.translate(0f, canvas.height - backgroundHeight - bottomMargin)
// Draw the background behind taskbar content. // Draw the background behind taskbar content.
canvas.drawRect(0f, 0f, canvas.width.toFloat(), backgroundHeight, paint) canvas.drawRect(0f, 0f, canvas.width.toFloat(), persistentTaskbarHeight, paint)
}
- -
- // Draw the inverted rounded corners above the taskbar. - // Draw the inverted rounded corners above the taskbar.
- canvas.translate(0f, -leftCornerRadius) - canvas.translate(0f, -leftCornerRadius)
@ -26,9 +26,9 @@ index d237c1f997..d7142eef59 100644
- canvas.translate(0f, leftCornerRadius) - canvas.translate(0f, leftCornerRadius)
- canvas.translate(canvas.width - rightCornerRadius, -rightCornerRadius) - canvas.translate(canvas.width - rightCornerRadius, -rightCornerRadius)
- canvas.drawPath(invertedRightCornerPath, paint) - canvas.drawPath(invertedRightCornerPath, paint)
} else if (!isInSetup) { }
// backgroundHeight is a value from [0...maxBackgroundHeight], so we can use it as a
// proxy to figure out the animation progress of the stash/unstash animation. private fun drawTransientBackground(canvas: Canvas) {
-- --
2.34.1 2.34.1

80
patches_platform_personal/vendor_lineage/0001-Add-MotoHelloUINavbarOverlay-2-2.patch Normal file
View File

@ -0,0 +1,80 @@
From 240e06c899c59d96de4764219c7f0e23b0d077c3 Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Fri, 10 May 2024 01:25:37 +0800
Subject: [PATCH 1/5] Add MotoHelloUINavbarOverlay (2/2)
Redrawn after extracted SVGs, resized and adjusted stroke width
Change-Id: Ifba5adfd10b3eee31e97baa52ce897db31f019d9
---
.../res/drawable/ic_sysbar_back.xml | 12 ++++++++++++
.../res/drawable/ic_sysbar_home.xml | 11 +++++++++++
.../res/drawable/ic_sysbar_recent.xml | 19 +++++++++++++++++++
3 files changed, 42 insertions(+)
create mode 100644 overlay/rro_packages/TrebuchetOverlay/res/drawable/ic_sysbar_back.xml
create mode 100644 overlay/rro_packages/TrebuchetOverlay/res/drawable/ic_sysbar_home.xml
create mode 100644 overlay/rro_packages/TrebuchetOverlay/res/drawable/ic_sysbar_recent.xml
diff --git a/overlay/rro_packages/TrebuchetOverlay/res/drawable/ic_sysbar_back.xml b/overlay/rro_packages/TrebuchetOverlay/res/drawable/ic_sysbar_back.xml
new file mode 100644
index 00000000..2fe4ba43
--- /dev/null
+++ b/overlay/rro_packages/TrebuchetOverlay/res/drawable/ic_sysbar_back.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:height="24dp"
+ android:width="24dp"
+ android:autoMirrored="true"
+ android:viewportWidth="24.0"
+ android:viewportHeight="24.0">
+ <path
+ android:pathData="M 15.5 5.875 L 8.5 12 L 15.5 18.125"
+ android:strokeColor="#FFFFFFFF"
+ android:strokeWidth="1.75" />
+</vector>
diff --git a/overlay/rro_packages/TrebuchetOverlay/res/drawable/ic_sysbar_home.xml b/overlay/rro_packages/TrebuchetOverlay/res/drawable/ic_sysbar_home.xml
new file mode 100644
index 00000000..14110ab5
--- /dev/null
+++ b/overlay/rro_packages/TrebuchetOverlay/res/drawable/ic_sysbar_home.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:height="24dp"
+ android:width="24dp"
+ android:viewportWidth="24.0"
+ android:viewportHeight="24.0">
+ <path
+ android:pathData="M 5.875 12 a 6.125 6.125 90 1 0 12.25 0 a 6.125 6.125 90 1 0 -12.25 0"
+ android:strokeColor="#FFFFFFFF"
+ android:strokeWidth="1.75" />
+</vector>
diff --git a/overlay/rro_packages/TrebuchetOverlay/res/drawable/ic_sysbar_recent.xml b/overlay/rro_packages/TrebuchetOverlay/res/drawable/ic_sysbar_recent.xml
new file mode 100644
index 00000000..7436752d
--- /dev/null
+++ b/overlay/rro_packages/TrebuchetOverlay/res/drawable/ic_sysbar_recent.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:height="24dp"
+ android:width="24dp"
+ android:viewportWidth="24.0"
+ android:viewportHeight="24.0">
+ <path
+ android:pathData="M 5.56 5.56 V 18.44"
+ android:strokeColor="#FFFFFFFF"
+ android:strokeWidth="1.53" />
+ <path
+ android:pathData="M 12 6.48 H 9.24 V 17.52 H 14.76 V 6.48 H 12"
+ android:strokeColor="#FFFFFFFF"
+ android:strokeWidth="1.53" />
+ <path
+ android:pathData="M 18.44 5.56 V 18.44"
+ android:strokeColor="#FFFFFFFF"
+ android:strokeWidth="1.53" />
+</vector>
--
2.34.1

4
patches_platform_personal/vendor_lineage/0001-build-Integrate-prop-modifications-2-2.patch → patches_platform_personal/vendor_lineage/0002-build-Integrate-prop-modifications-2-2.patch
View File

@ -1,7 +1,7 @@
From 863e8f70e3a4f987938ff4ad01c22822bc38e409 Mon Sep 17 00:00:00 2001 From 9bde413afbac1f96c43c4b4ed0e3846937a93f4f Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com> From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Sun, 20 Jun 2021 09:09:15 +0000 Date: Sun, 20 Jun 2021 09:09:15 +0000
Subject: [PATCH 1/4] build: Integrate prop modifications (2/2) Subject: [PATCH 2/5] build: Integrate prop modifications (2/2)
Change-Id: I076973f902ab20011964e50955e4326c18d5b34e Change-Id: I076973f902ab20011964e50955e4326c18d5b34e
--- ---

8
patches_platform_personal/vendor_lineage/0002-build-Remove-Stk-2-2.patch → patches_platform_personal/vendor_lineage/0003-build-Remove-Stk-2-2.patch
View File

@ -1,7 +1,7 @@
From 34f8aa093286970f82014f1dae0e86e4cbeba896 Mon Sep 17 00:00:00 2001 From e244927e57dc90182935201595635e0649d9101c Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com> From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Sat, 16 Oct 2021 00:41:07 +0000 Date: Sat, 16 Oct 2021 00:41:07 +0000
Subject: [PATCH 2/4] build: Remove Stk (2/2) Subject: [PATCH 3/5] build: Remove Stk (2/2)
Change-Id: I4e1cfacd296e47ef1731f3c32555089a5fca6f0c Change-Id: I4e1cfacd296e47ef1731f3c32555089a5fca6f0c
--- ---
@ -22,10 +22,10 @@ index 5ff877c9..ab70301b 100644
-PRODUCT_PACKAGES += \ -PRODUCT_PACKAGES += \
- Stk - Stk
diff --git a/config/telephony.mk b/config/telephony.mk diff --git a/config/telephony.mk b/config/telephony.mk
index 6adf48d9..e63b320d 100644 index 0c6ebba8..47437035 100644
--- a/config/telephony.mk --- a/config/telephony.mk
+++ b/config/telephony.mk +++ b/config/telephony.mk
@@ -8,8 +8,7 @@ PRODUCT_PACKAGES += \ @@ -13,8 +13,7 @@ PRODUCT_PACKAGES += \
# Telephony packages # Telephony packages
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \

4
patches_platform_personal/vendor_lineage/0003-vendor_lineage-Ignore-neverallows.-again.patch → patches_platform_personal/vendor_lineage/0004-vendor_lineage-Ignore-neverallows.-again.patch
View File

@ -1,7 +1,7 @@
From 84b5b23519166701423a324cac955e9110e36eae Mon Sep 17 00:00:00 2001 From 9f3c9c81bcfa84269f99ae4e2577ab937ac9c32a Mon Sep 17 00:00:00 2001
From: AndyCGYan <GeForce8800Ultra@gmail.com> From: AndyCGYan <GeForce8800Ultra@gmail.com>
Date: Mon, 1 Jul 2019 07:03:04 +0000 Date: Mon, 1 Jul 2019 07:03:04 +0000
Subject: [PATCH 3/4] vendor_lineage: Ignore neverallows... again Subject: [PATCH 4/5] vendor_lineage: Ignore neverallows... again
Because unofficial builds are better than no builds! Because unofficial builds are better than no builds!

117
patches_platform_personal/vendor_lineage/0004-vendor_lineage-Personal-theme-as-SRO.patch → patches_platform_personal/vendor_lineage/0005-vendor_lineage-Personal-theme-as-SRO.patch
View File

@ -1,9 +1,9 @@
From 05700475543c1dece33a8f49bcb84d5b709a3164 Mon Sep 17 00:00:00 2001 From 0986eff9b1f734268f330f13389cb9e7ee8798f9 Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com> From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Sat, 9 Apr 2022 02:48:55 +0000 Date: Sat, 9 Apr 2022 02:48:55 +0000
Subject: [PATCH 4/4] vendor_lineage: Personal theme as SRO Subject: [PATCH 5/5] vendor_lineage: Personal theme as SRO
Last revised on 2023/02/11 Last revised on 2024/02/26
... ...
@ -70,12 +70,12 @@ Change-Id: I43164b7a4145616d162c6b4b4b84d1953cb483cc
.../res/drawable/ic_launcher_foreground.xml | 60 +++++++++ .../res/drawable/ic_launcher_foreground.xml | 60 +++++++++
.../res/drawable/ic_launcher_background.xml | 24 ++++ .../res/drawable/ic_launcher_background.xml | 24 ++++
.../res/drawable/ic_launcher_foreground.xml | 34 +++++ .../res/drawable/ic_launcher_foreground.xml | 34 +++++
.../res/drawable/ic_launcher_background.xml | 24 ++++
.../res/drawable/ic_launcher_foreground.xml | 34 +++++
.../res/drawable/ic_launcher_background.xml | 17 +++ .../res/drawable/ic_launcher_background.xml | 17 +++
.../res/drawable/ic_launcher_foreground.xml | 33 +++++ .../res/drawable/ic_launcher_foreground.xml | 33 +++++
.../res/drawable/ic_launcher_background.xml | 18 +++ .../res/drawable/ic_launcher_background.xml | 18 +++
.../res/drawable/ic_launcher_foreground.xml | 34 +++++ .../res/drawable/ic_launcher_foreground.xml | 34 +++++
.../apps/Messaging/res/values/colors.xml | 7 ++
.../Messaging/res/values/lineage_colors.xml | 4 +
.../res/drawable/ic_launcher_background.xml | 23 ++++ .../res/drawable/ic_launcher_background.xml | 23 ++++
.../res/drawable/ic_launcher_foreground.xml | 33 +++++ .../res/drawable/ic_launcher_foreground.xml | 33 +++++
.../res/drawable/ic_launcher_background.xml | 18 +++ .../res/drawable/ic_launcher_background.xml | 18 +++
@ -84,7 +84,7 @@ Change-Id: I43164b7a4145616d162c6b4b4b84d1953cb483cc
.../res/drawable/ic_launcher_foreground.xml | 34 +++++ .../res/drawable/ic_launcher_foreground.xml | 34 +++++
.../res/drawable/ic_launcher_background.xml | 20 +++ .../res/drawable/ic_launcher_background.xml | 20 +++
.../res/drawable/ic_launcher_foreground.xml | 34 +++++ .../res/drawable/ic_launcher_foreground.xml | 34 +++++
73 files changed, 1632 insertions(+), 2 deletions(-) 73 files changed, 1679 insertions(+), 2 deletions(-)
create mode 100644 overlay/personal/packages/apps/Aperture/app/src/main/res/drawable/ic_launcher_background.xml create mode 100644 overlay/personal/packages/apps/Aperture/app/src/main/res/drawable/ic_launcher_background.xml
create mode 100644 overlay/personal/packages/apps/Aperture/app/src/main/res/drawable/ic_launcher_foreground.xml create mode 100644 overlay/personal/packages/apps/Aperture/app/src/main/res/drawable/ic_launcher_foreground.xml
create mode 100644 overlay/personal/packages/apps/AudioFX/res/drawable/ic_launcher_background.xml create mode 100644 overlay/personal/packages/apps/AudioFX/res/drawable/ic_launcher_background.xml
@ -143,12 +143,12 @@ Change-Id: I43164b7a4145616d162c6b4b4b84d1953cb483cc
create mode 100644 overlay/personal/packages/apps/ExactCalculator/res/drawable/ic_launcher_foreground.xml create mode 100644 overlay/personal/packages/apps/ExactCalculator/res/drawable/ic_launcher_foreground.xml
create mode 100644 overlay/personal/packages/apps/Gallery2/res/drawable/ic_launcher_background.xml create mode 100644 overlay/personal/packages/apps/Gallery2/res/drawable/ic_launcher_background.xml
create mode 100644 overlay/personal/packages/apps/Gallery2/res/drawable/ic_launcher_foreground.xml create mode 100644 overlay/personal/packages/apps/Gallery2/res/drawable/ic_launcher_foreground.xml
create mode 100644 overlay/personal/packages/apps/Glimpse/app/src/main/res/drawable/ic_launcher_background.xml
create mode 100644 overlay/personal/packages/apps/Glimpse/app/src/main/res/drawable/ic_launcher_foreground.xml
create mode 100644 overlay/personal/packages/apps/Jelly/app/src/main/res/drawable/ic_launcher_background.xml create mode 100644 overlay/personal/packages/apps/Jelly/app/src/main/res/drawable/ic_launcher_background.xml
create mode 100644 overlay/personal/packages/apps/Jelly/app/src/main/res/drawable/ic_launcher_foreground.xml create mode 100644 overlay/personal/packages/apps/Jelly/app/src/main/res/drawable/ic_launcher_foreground.xml
create mode 100644 overlay/personal/packages/apps/Messaging/res/drawable/ic_launcher_background.xml create mode 100644 overlay/personal/packages/apps/Messaging/res/drawable/ic_launcher_background.xml
create mode 100644 overlay/personal/packages/apps/Messaging/res/drawable/ic_launcher_foreground.xml create mode 100644 overlay/personal/packages/apps/Messaging/res/drawable/ic_launcher_foreground.xml
create mode 100644 overlay/personal/packages/apps/Messaging/res/values/colors.xml
create mode 100644 overlay/personal/packages/apps/Messaging/res/values/lineage_colors.xml
create mode 100644 overlay/personal/packages/apps/Recorder/app/src/main/res/drawable/ic_launcher_background.xml create mode 100644 overlay/personal/packages/apps/Recorder/app/src/main/res/drawable/ic_launcher_background.xml
create mode 100644 overlay/personal/packages/apps/Recorder/app/src/main/res/drawable/ic_launcher_foreground.xml create mode 100644 overlay/personal/packages/apps/Recorder/app/src/main/res/drawable/ic_launcher_foreground.xml
create mode 100644 overlay/personal/packages/apps/Settings/res/drawable/ic_launcher_background.xml create mode 100644 overlay/personal/packages/apps/Settings/res/drawable/ic_launcher_background.xml
@ -159,12 +159,12 @@ Change-Id: I43164b7a4145616d162c6b4b4b84d1953cb483cc
create mode 100644 overlay/personal/packages/inputmethods/LatinIME/java/res/drawable/ic_launcher_foreground.xml create mode 100644 overlay/personal/packages/inputmethods/LatinIME/java/res/drawable/ic_launcher_foreground.xml
diff --git a/config/common.mk b/config/common.mk diff --git a/config/common.mk b/config/common.mk
index 70e0cbaf..4da11943 100644 index 460a0085..f37187ad 100644
--- a/config/common.mk --- a/config/common.mk
+++ b/config/common.mk +++ b/config/common.mk
@@ -189,10 +189,13 @@ PRODUCT_DEXPREOPT_SPEED_APPS += \ @@ -219,10 +219,13 @@ PRODUCT_PRODUCT_PROPERTIES += \
PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \ setupwizard.theme=glif_v4 \
dalvik.vm.systemuicompilerfilter=speed setupwizard.feature.day_night_mode_enabled=true
-PRODUCT_ENFORCE_RRO_EXCLUDED_OVERLAYS += vendor/lineage/overlay/no-rro -PRODUCT_ENFORCE_RRO_EXCLUDED_OVERLAYS += vendor/lineage/overlay/no-rro
+PRODUCT_ENFORCE_RRO_EXCLUDED_OVERLAYS += \ +PRODUCT_ENFORCE_RRO_EXCLUDED_OVERLAYS += \
@ -1822,6 +1822,76 @@ index 00000000..03b51d0c
+ </path> + </path>
+ </group> + </group>
+</vector> +</vector>
diff --git a/overlay/personal/packages/apps/Glimpse/app/src/main/res/drawable/ic_launcher_background.xml b/overlay/personal/packages/apps/Glimpse/app/src/main/res/drawable/ic_launcher_background.xml
new file mode 100644
index 00000000..32abe0b8
--- /dev/null
+++ b/overlay/personal/packages/apps/Glimpse/app/src/main/res/drawable/ic_launcher_background.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ SPDX-FileCopyrightText: 2022 The LineageOS Project
+ SPDX-License-Identifier: Apache-2.0
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="108dp"
+ android:height="108dp"
+ android:viewportWidth="108"
+ android:viewportHeight="108">
+ <group>
+ <clip-path
+ android:pathData="M0,0h108v108h-108z"/>
+ <path
+ android:pathData="M0,0h108v108h-108z"
+ android:fillColor="#FFFFFF"/>
+ <path
+ android:pathData="M15,108L78,45L141,108H15Z"
+ android:fillColor="@android:color/system_neutral1_200"/>
+ <path
+ android:pathData="M-18,108L45,45L108,108H-18Z"
+ android:fillColor="@android:color/system_neutral1_100"/>
+ </group>
+</vector>
diff --git a/overlay/personal/packages/apps/Glimpse/app/src/main/res/drawable/ic_launcher_foreground.xml b/overlay/personal/packages/apps/Glimpse/app/src/main/res/drawable/ic_launcher_foreground.xml
new file mode 100644
index 00000000..03b51d0c
--- /dev/null
+++ b/overlay/personal/packages/apps/Glimpse/app/src/main/res/drawable/ic_launcher_foreground.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ SPDX-FileCopyrightText: 2022 The LineageOS Project
+ SPDX-License-Identifier: Apache-2.0
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:aapt="http://schemas.android.com/aapt"
+ android:width="108dp"
+ android:height="108dp"
+ android:viewportWidth="108"
+ android:viewportHeight="108">
+ <group>
+ <clip-path
+ android:pathData="M0,0h108v108h-108z"/>
+ <path
+ android:pathData="M108,0H0V108H108V0ZM34,38C31.791,38 30,39.791 30,42V66C30,68.209 31.791,70 34,70H74C76.209,70 78,68.209 78,66V42C78,39.791 76.209,38 74,38H34Z"
+ android:fillColor="@android:color/system_accent1_600"
+ android:fillType="evenOdd"/>
+ <path
+ android:pathData="M28.54,28.54m-72,0a72,72 0,1 1,144 0a72,72 0,1 1,-144 0"
+ android:fillAlpha="0.6">
+ <aapt:attr name="android:fillColor">
+ <gradient
+ android:gradientRadius="72"
+ android:centerX="28.54"
+ android:centerY="28.54"
+ android:type="radial">
+ <item android:offset="0" android:color="#19FFFFFF"/>
+ <item android:offset="1" android:color="#00FFFFFF"/>
+ </gradient>
+ </aapt:attr>
+ </path>
+ </group>
+</vector>
diff --git a/overlay/personal/packages/apps/Jelly/app/src/main/res/drawable/ic_launcher_background.xml b/overlay/personal/packages/apps/Jelly/app/src/main/res/drawable/ic_launcher_background.xml diff --git a/overlay/personal/packages/apps/Jelly/app/src/main/res/drawable/ic_launcher_background.xml b/overlay/personal/packages/apps/Jelly/app/src/main/res/drawable/ic_launcher_background.xml
new file mode 100644 new file mode 100644
index 00000000..bf75b615 index 00000000..bf75b615
@ -1948,29 +2018,6 @@ index 00000000..ab598892
+ </path> + </path>
+ </group> + </group>
+</vector> +</vector>
diff --git a/overlay/personal/packages/apps/Messaging/res/values/colors.xml b/overlay/personal/packages/apps/Messaging/res/values/colors.xml
new file mode 100644
index 00000000..6e1ef338
--- /dev/null
+++ b/overlay/personal/packages/apps/Messaging/res/values/colors.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+ <color name="primary_color">#2A56C6</color>
+ <color name="action_bar_background_color_dark">#1C3AA9</color>
+ <color name="message_image_selected_tint">#802A56C6</color>
+ <color name="text_highlight_color">#802A56C6</color>
+</resources>
diff --git a/overlay/personal/packages/apps/Messaging/res/values/lineage_colors.xml b/overlay/personal/packages/apps/Messaging/res/values/lineage_colors.xml
new file mode 100644
index 00000000..7b407a1c
--- /dev/null
+++ b/overlay/personal/packages/apps/Messaging/res/values/lineage_colors.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+ <color name="lineage_accent">#F50057</color>
+</resources>
diff --git a/overlay/personal/packages/apps/Recorder/app/src/main/res/drawable/ic_launcher_background.xml b/overlay/personal/packages/apps/Recorder/app/src/main/res/drawable/ic_launcher_background.xml diff --git a/overlay/personal/packages/apps/Recorder/app/src/main/res/drawable/ic_launcher_background.xml b/overlay/personal/packages/apps/Recorder/app/src/main/res/drawable/ic_launcher_background.xml
new file mode 100644 new file mode 100644
index 00000000..afc988fc index 00000000..afc988fc

6
patches_treble/device_phh_treble/0001-treble-Lineage-ify.patch
View File

@ -1,4 +1,4 @@
From b444ea5ab4942f4877aee7227a8e4408dd12ba98 Mon Sep 17 00:00:00 2001 From e50480813b4a96cb3f3105dc5b1ccb7e5928ac68 Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com> From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Sun, 8 Aug 2021 01:43:40 +0000 Date: Sun, 8 Aug 2021 01:43:40 +0000
Subject: [PATCH 1/9] treble: Lineage-ify Subject: [PATCH 1/9] treble: Lineage-ify
@ -31,7 +31,7 @@ Change-Id: I25eee7a3804f335430a447ae1424402d7e37851b
create mode 100644 overlay-lineage/lineage-sdk/lineage/res/res/values/config.xml create mode 100644 overlay-lineage/lineage-sdk/lineage/res/res/values/config.xml
diff --git a/base.mk b/base.mk diff --git a/base.mk b/base.mk
index 620fb96..d7b71b0 100644 index 22525cd..e40af53 100644
--- a/base.mk --- a/base.mk
+++ b/base.mk +++ b/base.mk
@@ -18,7 +18,13 @@ PRODUCT_COPY_FILES += \ @@ -18,7 +18,13 @@ PRODUCT_COPY_FILES += \
@ -57314,7 +57314,7 @@ index 0000000..8df673a
+ <integer name="config_deviceHardwareWakeKeys">127</integer> + <integer name="config_deviceHardwareWakeKeys">127</integer>
+</resources> +</resources>
diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index 52f44a2..0561e2b 100644 index b832a66..4e9b176 100644
--- a/overlay/frameworks/base/core/res/res/values/config.xml --- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml +++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -22,7 +22,6 @@ @@ -22,7 +22,6 @@

2
patches_treble/device_phh_treble/0002-treble-Set-BOARD_EXT4_SHARE_DUP_BLOCKS-explicitly.patch
View File

@ -1,4 +1,4 @@
From ae62c13bca7549786b4705d4fb7913ccceb6917e Mon Sep 17 00:00:00 2001 From 50987c84d728f49fc04c78e4a935231caaf6317f Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com> From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Sun, 8 Aug 2021 09:29:32 +0000 Date: Sun, 8 Aug 2021 09:29:32 +0000
Subject: [PATCH 2/9] treble: Set BOARD_EXT4_SHARE_DUP_BLOCKS explicitly Subject: [PATCH 2/9] treble: Set BOARD_EXT4_SHARE_DUP_BLOCKS explicitly

2
patches_treble/device_phh_treble/0003-treble-Set-TARGET_NO_KERNEL_OVERRIDE.patch
View File

@ -1,4 +1,4 @@
From bb54a87ee1d14bd80308129c1ab38ad042d807a2 Mon Sep 17 00:00:00 2001 From aece8f5deb59a054729539eef6957bd5db325bb5 Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com> From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Wed, 20 Oct 2021 11:30:25 +0000 Date: Wed, 20 Oct 2021 11:30:25 +0000
Subject: [PATCH 3/9] treble: Set TARGET_NO_KERNEL_OVERRIDE Subject: [PATCH 3/9] treble: Set TARGET_NO_KERNEL_OVERRIDE

2
patches_treble/device_phh_treble/0004-treble-Enable-call-recording.patch
View File

@ -1,4 +1,4 @@
From c4cf51f21f0b23e57fd4eb49cce0056f459ebc65 Mon Sep 17 00:00:00 2001 From 29d58c7756130f41aaa10d457cef3806792b5d13 Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com> From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Tue, 11 Oct 2022 11:29:02 +0000 Date: Tue, 11 Oct 2022 11:29:02 +0000
Subject: [PATCH 4/9] treble: Enable call recording Subject: [PATCH 4/9] treble: Enable call recording

2
patches_treble/device_phh_treble/0005-treble-Switch-to-MindTheGapps.patch
View File

@ -1,4 +1,4 @@
From 7295a2f4cd712111205bcbc356e468f2a8ad01fd Mon Sep 17 00:00:00 2001 From 1a5f992428f38427b3d3e25984bc0b425ff6d4f1 Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com> From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Sat, 5 Nov 2022 23:49:11 +0000 Date: Sat, 5 Nov 2022 23:49:11 +0000
Subject: [PATCH 5/9] treble: Switch to MindTheGapps Subject: [PATCH 5/9] treble: Switch to MindTheGapps

8
patches_treble/device_phh_treble/0006-treble-Stop-securing-ADB.patch
View File

@ -1,4 +1,4 @@
From 86cd9fa8131d6a7534b7ee7944e7ac177d032442 Mon Sep 17 00:00:00 2001 From d0c31b8531c239d6c550ed14690496fa9d6b13d2 Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com> From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Tue, 22 Nov 2022 00:36:15 +0000 Date: Tue, 22 Nov 2022 00:36:15 +0000
Subject: [PATCH 6/9] treble: Stop securing ADB Subject: [PATCH 6/9] treble: Stop securing ADB
@ -13,17 +13,17 @@ Change-Id: I0215b3ed970dd53a124f48e30ca2cf4b0c6d2899
1 file changed, 3 deletions(-) 1 file changed, 3 deletions(-)
diff --git a/rw-system.sh b/rw-system.sh diff --git a/rw-system.sh b/rw-system.sh
index 358f232..e631b64 100644 index 968b903..4dd61f3 100644
--- a/rw-system.sh --- a/rw-system.sh
+++ b/rw-system.sh +++ b/rw-system.sh
@@ -793,13 +793,10 @@ if [ -f /system/phh/secure ] || [ -f /metadata/phh/secure ];then @@ -804,13 +804,10 @@ if [ -f /system/phh/secure ] || [ -f /metadata/phh/secure ];then
resetprop_phh ro.boot.veritymode enforcing resetprop_phh ro.boot.veritymode enforcing
resetprop_phh ro.boot.warranty_bit 0 resetprop_phh ro.boot.warranty_bit 0
resetprop_phh ro.warranty_bit 0 resetprop_phh ro.warranty_bit 0
- resetprop_phh ro.debuggable 0 - resetprop_phh ro.debuggable 0
resetprop_phh ro.secure 1 resetprop_phh ro.secure 1
resetprop_phh ro.build.type user resetprop_phh ro.build.type user
resetprop_phh ro.build.selinux 0 resetprop_phh --delete ro.build.selinux
- resetprop_phh ro.adb.secure 1 - resetprop_phh ro.adb.secure 1
- -

16
patches_treble/device_phh_treble/0007-treble-Securize-on-demand.patch
View File

@ -1,4 +1,4 @@
From 211c16eca1949b5813b7e4d65eaa0fa8cdeb2b01 Mon Sep 17 00:00:00 2001 From 77488a9ec7f97c5b658cd6224b0ef147ef9752cd Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com> From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Thu, 29 Dec 2022 15:12:03 +0000 Date: Thu, 29 Dec 2022 15:12:03 +0000
Subject: [PATCH 7/9] treble: Securize on-demand Subject: [PATCH 7/9] treble: Securize on-demand
@ -12,10 +12,10 @@ Change-Id: I8069b6f471ad87ab34c18b743689ab3584cee35b
2 files changed, 17 insertions(+) 2 files changed, 17 insertions(+)
diff --git a/phh-prop-handler.sh b/phh-prop-handler.sh diff --git a/phh-prop-handler.sh b/phh-prop-handler.sh
index aea5bb0..0020d21 100644 index e187466..fe857b7 100644
--- a/phh-prop-handler.sh --- a/phh-prop-handler.sh
+++ b/phh-prop-handler.sh +++ b/phh-prop-handler.sh
@@ -279,3 +279,17 @@ if [ "$1" == "persist.bluetooth.system_audio_hal.enabled" ]; then @@ -281,3 +281,17 @@ if [ "$1" == "persist.bluetooth.system_audio_hal.enabled" ]; then
restartAudio restartAudio
exit exit
fi fi
@ -34,13 +34,13 @@ index aea5bb0..0020d21 100644
+ exit + exit
+fi +fi
diff --git a/vndk.rc b/vndk.rc diff --git a/vndk.rc b/vndk.rc
index 3029abf..d75bc9e 100644 index 9f74ffd..dfcfcfe 100644
--- a/vndk.rc --- a/vndk.rc
+++ b/vndk.rc +++ b/vndk.rc
@@ -102,3 +102,6 @@ service watchdogd-gsi /system/bin/watchdogd 10 20 @@ -112,3 +112,6 @@ service watchdogd-gsi /system/bin/watchdogd 10 20
class core # Fix for non-AMOLED Transsion devices where brightness would be dimmer than usual
oneshot on property:ro.vendor.transsion.backlight_12bit=*
seclabel u:r:watchdogd:s0 setprop ro.vendor.transsion.backlight_hal.optimization ${ro.vendor.transsion.backlight_12bit}
+ +
+on property:persist.sys.phh.securize=* +on property:persist.sys.phh.securize=*
+ exec u:r:phhsu_daemon:s0 root -- /system/bin/phh-prop-handler.sh "persist.sys.phh.securize" + exec u:r:phhsu_daemon:s0 root -- /system/bin/phh-prop-handler.sh "persist.sys.phh.securize"

10
patches_treble/device_phh_treble/0008-treble-Also-use-data-adb-for-securize-status.patch
View File

@ -1,4 +1,4 @@
From 985159eedef9f48dececcef108b9bee809adef3b Mon Sep 17 00:00:00 2001 From 74ec0afa2767a82f22e16d8499ef1a48ffa34f1c Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com> From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Wed, 22 Mar 2023 23:37:05 +0000 Date: Wed, 22 Mar 2023 23:37:05 +0000
Subject: [PATCH 8/9] treble: Also use /data/adb for securize status Subject: [PATCH 8/9] treble: Also use /data/adb for securize status
@ -10,10 +10,10 @@ Change-Id: I778f2be5407ae0a548a098c72031cce9be83cf96
2 files changed, 5 insertions(+), 2 deletions(-) 2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/phh-prop-handler.sh b/phh-prop-handler.sh diff --git a/phh-prop-handler.sh b/phh-prop-handler.sh
index 0020d21..750f1eb 100644 index fe857b7..c21438c 100644
--- a/phh-prop-handler.sh --- a/phh-prop-handler.sh
+++ b/phh-prop-handler.sh +++ b/phh-prop-handler.sh
@@ -286,10 +286,13 @@ if [ "$1" == "persist.sys.phh.securize" ];then @@ -288,10 +288,13 @@ if [ "$1" == "persist.sys.phh.securize" ];then
fi fi
if [[ "$prop_value" == "true" ]]; then if [[ "$prop_value" == "true" ]]; then
@ -29,10 +29,10 @@ index 0020d21..750f1eb 100644
exit exit
fi fi
diff --git a/rw-system.sh b/rw-system.sh diff --git a/rw-system.sh b/rw-system.sh
index e631b64..c5df982 100644 index 4dd61f3..2817795 100644
--- a/rw-system.sh --- a/rw-system.sh
+++ b/rw-system.sh +++ b/rw-system.sh
@@ -756,7 +756,7 @@ copyprop() { @@ -767,7 +767,7 @@ copyprop() {
resetprop_phh "$1" "$(getprop "$2")" resetprop_phh "$1" "$(getprop "$2")"
fi fi
} }

2
patches_treble/device_phh_treble/0009-treble-Import-prebuilt-PHH-Superuser.patch
View File

@ -1,4 +1,4 @@
From b931a3f8b6b6c9744881b7d88b730b1a6e7fa02c Mon Sep 17 00:00:00 2001 From 4f32c09f61ab0c69b3768257764d1257e812839e Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com> From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Sat, 15 Jul 2023 17:01:27 +0800 Date: Sat, 15 Jul 2023 17:01:27 +0800
Subject: [PATCH 9/9] treble: Import prebuilt PHH Superuser Subject: [PATCH 9/9] treble: Import prebuilt PHH Superuser

20
patches_treble/system_core/0001-Restore-sbin-for-Magisk-compatibility.patch
View File

@ -1,4 +1,4 @@
From 10c70671dc889ac496c433ee312a5b7259bed22e Mon Sep 17 00:00:00 2001 From 7b5af6750bdcfd107e607906b886a3034d52cb53 Mon Sep 17 00:00:00 2001
From: Victor Bo <bvoid@yandex.ru> From: Victor Bo <bvoid@yandex.ru>
Date: Wed, 3 Mar 2021 06:31:17 -0500 Date: Wed, 3 Mar 2021 06:31:17 -0500
Subject: [PATCH] Restore /sbin for Magisk compatibility Subject: [PATCH] Restore /sbin for Magisk compatibility
@ -30,10 +30,10 @@ index 0a534a2bd..81150a0fa 100644
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/product_services.img) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/product_services.img)
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/product_services) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/product_services)
diff --git a/libcutils/fs_config.cpp b/libcutils/fs_config.cpp diff --git a/libcutils/fs_config.cpp b/libcutils/fs_config.cpp
index 8aadc3bb7..5535425e2 100644 index 9ab7f4305..c45317d0f 100644
--- a/libcutils/fs_config.cpp --- a/libcutils/fs_config.cpp
+++ b/libcutils/fs_config.cpp +++ b/libcutils/fs_config.cpp
@@ -80,6 +80,7 @@ static const struct fs_path_config android_dirs[] = { @@ -76,6 +76,7 @@ static const struct fs_path_config android_dirs[] = {
{ 00771, AID_SYSTEM, AID_SYSTEM, 0, "data" }, { 00771, AID_SYSTEM, AID_SYSTEM, 0, "data" },
{ 00755, AID_ROOT, AID_SYSTEM, 0, "mnt" }, { 00755, AID_ROOT, AID_SYSTEM, 0, "mnt" },
{ 00751, AID_ROOT, AID_SHELL, 0, "product/bin" }, { 00751, AID_ROOT, AID_SHELL, 0, "product/bin" },
@ -41,7 +41,7 @@ index 8aadc3bb7..5535425e2 100644
{ 00751, AID_ROOT, AID_SHELL, 0, "product/apex/*/bin" }, { 00751, AID_ROOT, AID_SHELL, 0, "product/apex/*/bin" },
{ 00777, AID_ROOT, AID_ROOT, 0, "sdcard" }, { 00777, AID_ROOT, AID_ROOT, 0, "sdcard" },
{ 00751, AID_ROOT, AID_SDCARD_R, 0, "storage" }, { 00751, AID_ROOT, AID_SDCARD_R, 0, "storage" },
@@ -168,6 +169,7 @@ static const struct fs_path_config android_files[] = { @@ -164,6 +165,7 @@ static const struct fs_path_config android_files[] = {
{ 00600, AID_ROOT, AID_ROOT, 0, "system_ext/build.prop" }, { 00600, AID_ROOT, AID_ROOT, 0, "system_ext/build.prop" },
{ 00444, AID_ROOT, AID_ROOT, 0, system_ext_conf_dir + 1 }, { 00444, AID_ROOT, AID_ROOT, 0, system_ext_conf_dir + 1 },
{ 00444, AID_ROOT, AID_ROOT, 0, system_ext_conf_file + 1 }, { 00444, AID_ROOT, AID_ROOT, 0, system_ext_conf_file + 1 },
@ -49,7 +49,7 @@ index 8aadc3bb7..5535425e2 100644
{ 00755, AID_ROOT, AID_SHELL, 0, "system/bin/crash_dump32" }, { 00755, AID_ROOT, AID_SHELL, 0, "system/bin/crash_dump32" },
{ 00755, AID_ROOT, AID_SHELL, 0, "system/bin/crash_dump64" }, { 00755, AID_ROOT, AID_SHELL, 0, "system/bin/crash_dump64" },
{ 00755, AID_ROOT, AID_SHELL, 0, "system/bin/debuggerd" }, { 00755, AID_ROOT, AID_SHELL, 0, "system/bin/debuggerd" },
@@ -222,6 +224,7 @@ static const struct fs_path_config android_files[] = { @@ -219,6 +221,7 @@ static const struct fs_path_config android_files[] = {
{ 00750, AID_ROOT, AID_SHELL, 0, "init*" }, { 00750, AID_ROOT, AID_SHELL, 0, "init*" },
{ 00755, AID_ROOT, AID_SHELL, 0, "odm/bin/*" }, { 00755, AID_ROOT, AID_SHELL, 0, "odm/bin/*" },
{ 00755, AID_ROOT, AID_SHELL, 0, "product/bin/*" }, { 00755, AID_ROOT, AID_SHELL, 0, "product/bin/*" },
@ -58,20 +58,20 @@ index 8aadc3bb7..5535425e2 100644
{ 00755, AID_ROOT, AID_SHELL, 0, "system/bin/*" }, { 00755, AID_ROOT, AID_SHELL, 0, "system/bin/*" },
{ 00755, AID_ROOT, AID_SHELL, 0, "system/xbin/*" }, { 00755, AID_ROOT, AID_SHELL, 0, "system/xbin/*" },
diff --git a/rootdir/Android.mk b/rootdir/Android.mk diff --git a/rootdir/Android.mk b/rootdir/Android.mk
index 3362872c0..1b686c38f 100644 index 7deb17324..aeeaad496 100644
--- a/rootdir/Android.mk --- a/rootdir/Android.mk
+++ b/rootdir/Android.mk +++ b/rootdir/Android.mk
@@ -91,7 +91,7 @@ endif @@ -96,7 +96,7 @@ endif
# #
# create some directories (some are mount points) and symlinks # create some directories (some are mount points) and symlinks
LOCAL_POST_INSTALL_CMD := mkdir -p $(addprefix $(TARGET_ROOT_OUT)/, \ LOCAL_POST_INSTALL_CMD := mkdir -p $(addprefix $(TARGET_ROOT_OUT)/, \
- dev proc sys system data data_mirror odm oem acct config storage mnt apex debug_ramdisk \ - dev proc sys system data data_mirror odm oem acct config storage mnt apex bootstrap-apex debug_ramdisk \
+ sbin dev proc sys system data data_mirror odm oem acct config storage mnt apex debug_ramdisk \ + sbin dev proc sys system data data_mirror odm oem acct config storage mnt apex bootstrap-apex debug_ramdisk \
linkerconfig second_stage_resources postinstall $(BOARD_ROOT_EXTRA_FOLDERS)); \ linkerconfig second_stage_resources postinstall $(BOARD_ROOT_EXTRA_FOLDERS)); \
ln -sf /system/bin $(TARGET_ROOT_OUT)/bin; \ ln -sf /system/bin $(TARGET_ROOT_OUT)/bin; \
ln -sf /system/etc $(TARGET_ROOT_OUT)/etc; \ ln -sf /system/etc $(TARGET_ROOT_OUT)/etc; \
diff --git a/rootdir/init.environ.rc.in b/rootdir/init.environ.rc.in diff --git a/rootdir/init.environ.rc.in b/rootdir/init.environ.rc.in
index bf6e986c4..090fa5a78 100644 index 7ba1f46e7..f54aa60f7 100644
--- a/rootdir/init.environ.rc.in --- a/rootdir/init.environ.rc.in
+++ b/rootdir/init.environ.rc.in +++ b/rootdir/init.environ.rc.in
@@ -10,6 +10,7 @@ on early-init @@ -10,6 +10,7 @@ on early-init

99
patches_treble/treble_app/0001-Simplify-Securize-to-CheckBoxPreference-and-persist-.patch Normal file
View File

@ -0,0 +1,99 @@
From 66534cd4c678494e0aa0e74197a39fcee57e313a Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Thu, 29 Dec 2022 15:08:49 +0000
Subject: [PATCH] Simplify Securize to CheckBoxPreference and persist prop
For "Securize on-demand"
---
app/src/main/java/me/phh/treble/app/Misc.kt | 5 +++
.../java/me/phh/treble/app/MiscSettings.kt | 33 -------------------
app/src/main/res/xml/pref_misc.xml | 7 ++--
3 files changed, 10 insertions(+), 35 deletions(-)
diff --git a/app/src/main/java/me/phh/treble/app/Misc.kt b/app/src/main/java/me/phh/treble/app/Misc.kt
index a56b460..8861d51 100644
--- a/app/src/main/java/me/phh/treble/app/Misc.kt
+++ b/app/src/main/java/me/phh/treble/app/Misc.kt
@@ -302,6 +302,10 @@ object Misc: EntryStartup {
val value = sp.getString(key, "0")
SystemProperties.set("persist.sys.bt.esco_transport_unit_size", value)
}
+ MiscSettings.securize -> {
+ val value = sp.getBoolean(key, false)
+ SystemProperties.set("persist.sys.phh.securize", if (value) "true" else "false")
+ }
}
}
@@ -328,5 +332,6 @@ object Misc: EntryStartup {
spListener.onSharedPreferenceChanged(sp, MiscSettings.noHwcomposer)
spListener.onSharedPreferenceChanged(sp, MiscSettings.storageFUSE)
spListener.onSharedPreferenceChanged(sp, MiscSettings.dt2w)
+ spListener.onSharedPreferenceChanged(sp, MiscSettings.securize)
}
}
diff --git a/app/src/main/java/me/phh/treble/app/MiscSettings.kt b/app/src/main/java/me/phh/treble/app/MiscSettings.kt
index e3b5312..5fe481f 100644
--- a/app/src/main/java/me/phh/treble/app/MiscSettings.kt
+++ b/app/src/main/java/me/phh/treble/app/MiscSettings.kt
@@ -56,39 +56,6 @@ class MiscSettingsFragment : SettingsFragment() {
override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
super.onCreatePreferences(savedInstanceState, rootKey)
- val securizePref = findPreference<Preference>(MiscSettings.securize)
- securizePref!!.setOnPreferenceClickListener {
- val builder = AlertDialog.Builder( this.getActivity() )
- builder.setTitle(getString(R.string.remove_root))
- builder.setMessage(getString(R.string.continue_question))
-
- builder.setPositiveButton(android.R.string.yes) { dialog, which ->
-
- var cmds = listOf(
- arrayOf("/sbin/su", "-c", "/system/bin/phh-securize.sh"),
- arrayOf("/system/xbin/su", "-c", "/system/bin/phh-securize.sh"),
- arrayOf("/system/xbin/phh-su", "-c", "/system/bin/phh-securize.sh"),
- arrayOf("/sbin/su", "0", "/system/bin/phh-securize.sh"),
- arrayOf("/system/xbin/su", "0", "/system/bin/phh-securize.sh"),
- arrayOf("/system/xbin/phh-su", "0", "/system/bin/phh-securize.sh")
- )
- for (cmd in cmds) {
- try {
- Runtime.getRuntime().exec(cmd).waitFor()
- break
- } catch (t: Throwable) {
- Log.d("PHH", "Failed to exec \"" + cmd.joinToString(separator = " ") + "\", skipping")
- }
- }
- }
-
- builder.setNegativeButton(android.R.string.no) { dialog, which ->
- }
-
- builder.show()
- return@setOnPreferenceClickListener true
- }
-
val removeTelephonyPref = findPreference<Preference>(MiscSettings.removeTelephony)
removeTelephonyPref!!.setOnPreferenceClickListener {
diff --git a/app/src/main/res/xml/pref_misc.xml b/app/src/main/res/xml/pref_misc.xml
index e41659d..bdf1147 100644
--- a/app/src/main/res/xml/pref_misc.xml
+++ b/app/src/main/res/xml/pref_misc.xml
@@ -193,8 +193,11 @@
android:entryValues="@array/pref_misc_fod_color_values"
android:key="key_misc_fod_color"
android:title="Under-display fp color" />
- <Preference android:title="Securize"
- android:key="key_misc_securize" />
+ <CheckBoxPreference
+ android:defaultValue="false"
+ android:key="key_misc_securize"
+ android:title="Spoof system properties"
+ android:summary="For better chances of passing SafetyNet\nMight cause bootloop on some devices" />
</PreferenceCategory>
<PreferenceCategory android:title="Debugging">
<Preference android:title="Debug Sensors">
--
2.34.1

36419
patches_treble/vendor_hardware_overlay/0001-TEMP-Up-TrebleApp-to-20240216.patch
View File

File diff suppressed because it is too large Load Diff

6
patches_treble/vendor_lineage/0001-build_soong-Disable-generated_kernel_headers.patch
View File

@ -1,4 +1,4 @@
From 3e4384c994002a3164ece52d9a942d6c3451feb1 Mon Sep 17 00:00:00 2001 From 329e8930c11cd2a90dae2f127645ec2e830d3aa2 Mon Sep 17 00:00:00 2001
From: AndyCGYan <GeForce8800Ultra@gmail.com> From: AndyCGYan <GeForce8800Ultra@gmail.com>
Date: Sun, 3 Mar 2019 14:07:33 +0800 Date: Sun, 3 Mar 2019 14:07:33 +0800
Subject: [PATCH 1/2] build_soong: Disable generated_kernel_headers Subject: [PATCH 1/2] build_soong: Disable generated_kernel_headers
@ -11,7 +11,7 @@ Change-Id: I630857cec208f1830e776bf5031d7bb9bc4435d0
1 file changed, 12 deletions(-) 1 file changed, 12 deletions(-)
diff --git a/build/soong/Android.bp b/build/soong/Android.bp diff --git a/build/soong/Android.bp b/build/soong/Android.bp
index 2a21c5c0..417fac02 100644 index 5899c987..3846fa01 100644
--- a/build/soong/Android.bp --- a/build/soong/Android.bp
+++ b/build/soong/Android.bp +++ b/build/soong/Android.bp
@@ -20,9 +20,6 @@ bootstrap_go_package { @@ -20,9 +20,6 @@ bootstrap_go_package {
@ -19,7 +19,7 @@ index 2a21c5c0..417fac02 100644
name: "generated_kernel_includes", name: "generated_kernel_includes",
- // The headers make command - // The headers make command
- cmd: "$(PATH_OVERRIDE_SOONG) $(KERNEL_MAKE_CMD) $(KERNEL_MAKE_FLAGS) -C $(TARGET_KERNEL_SOURCE) O=$(KERNEL_BUILD_OUT_PREFIX)$(genDir) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) headers_install", - cmd: "$(PATH_OVERRIDE_SOONG) $(KERNEL_MAKE_CMD) $(KERNEL_MAKE_FLAGS) -C $(TARGET_KERNEL_SOURCE) O=$(KERNEL_BUILD_OUT_PREFIX)$(genDir) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) headers_install && vendor/lineage/tools/clean_headers.sh $(KERNEL_BUILD_OUT_PREFIX)$(genDir)",
- -
// Directories that can be imported by a cc_* module generated_headers property // Directories that can be imported by a cc_* module generated_headers property
export_include_dirs: [ export_include_dirs: [

8
patches_treble/vendor_lineage/0002-vendor_lineage-Disable-ADB-authentication.patch
View File

@ -1,4 +1,4 @@
From c942de76b74fa53e3b3983d17444c051a8a38dcc Mon Sep 17 00:00:00 2001 From 12793ea2bcf49d7ffa7231aa8560d5a629e48c88 Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com> From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Tue, 19 Oct 2021 15:48:43 +0000 Date: Tue, 19 Oct 2021 15:48:43 +0000
Subject: [PATCH 2/2] vendor_lineage: Disable ADB authentication Subject: [PATCH 2/2] vendor_lineage: Disable ADB authentication
@ -9,11 +9,11 @@ Change-Id: I4370583ecab1c88ef6f42e29d3eaa52c24d13f09
1 file changed, 5 deletions(-) 1 file changed, 5 deletions(-)
diff --git a/config/common.mk b/config/common.mk diff --git a/config/common.mk b/config/common.mk
index 00d0a416..c9930600 100644 index cc81102d..460a0085 100644
--- a/config/common.mk --- a/config/common.mk
+++ b/config/common.mk +++ b/config/common.mk
@@ -13,16 +13,11 @@ PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \ @@ -23,16 +23,11 @@ PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
ro.com.google.clientidbase=$(PRODUCT_GMS_CLIENTID_BASE) endif
endif endif
-ifeq ($(TARGET_BUILD_VARIANT),eng) -ifeq ($(TARGET_BUILD_VARIANT),eng)

12
patches_treble_personal/device_phh_treble/0001-Add-Meizu-18-vibrator-support.patch
View File

@ -1,4 +1,4 @@
From d062f81edadf8595aa6638779ecdb868fa89503f Mon Sep 17 00:00:00 2001 From c237d550fffad14a20990d9ee072dbe44cb31768 Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com> From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Tue, 22 Jun 2021 13:38:31 +0000 Date: Tue, 22 Jun 2021 13:38:31 +0000
Subject: [PATCH 1/3] Add Meizu 18 vibrator support Subject: [PATCH 1/3] Add Meizu 18 vibrator support
@ -28,18 +28,18 @@ Change-Id: Iecf12cd814e8773abfd78a19f98e31125a73761a
create mode 100644 meizu-vibrator/service.cpp create mode 100644 meizu-vibrator/service.cpp
diff --git a/base.mk b/base.mk diff --git a/base.mk b/base.mk
index e2ab27a..588511a 100644 index 7dce0a0..bb48831 100644
--- a/base.mk --- a/base.mk
+++ b/base.mk +++ b/base.mk
@@ -268,4 +268,8 @@ PRODUCT_PACKAGES += \ @@ -269,4 +269,8 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/window_extensions.mk)
PRODUCT_PACKAGES += \ PRODUCT_PRODUCT_PROPERTIES += \
androidx.window.extensions persist.settings.large_screen_opt.enabled=true
+# Meizu vibrator +# Meizu vibrator
+PRODUCT_PACKAGES += \ +PRODUCT_PACKAGES += \
+ android.hardware.vibrator@1.3-service.meizu + android.hardware.vibrator@1.3-service.meizu
+ +
PRODUCT_EXTRA_VNDK_VERSIONS += 28 PRODUCT_EXTRA_VNDK_VERSIONS += 28 29
diff --git a/meizu-vibrator/Android.bp b/meizu-vibrator/Android.bp diff --git a/meizu-vibrator/Android.bp b/meizu-vibrator/Android.bp
new file mode 100644 new file mode 100644
index 0000000..76ad034 index 0000000..76ad034

4
patches_treble_personal/device_phh_treble/0002-Revert-Include-sim-toolkit-app.patch
View File

@ -1,4 +1,4 @@
From 2189f25680a7cfd966b4edf35031b50f9d4e5f88 Mon Sep 17 00:00:00 2001 From 5e0cf531dacb7a8c6d112917fd69d67c3d978909 Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com> From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Thu, 28 Oct 2021 01:51:27 +0000 Date: Thu, 28 Oct 2021 01:51:27 +0000
Subject: [PATCH 2/3] Revert "Include sim toolkit app" Subject: [PATCH 2/3] Revert "Include sim toolkit app"
@ -11,7 +11,7 @@ Change-Id: I1eb7f4bb070eea649b4cea6280299e629d1edb3d
1 file changed, 3 deletions(-) 1 file changed, 3 deletions(-)
diff --git a/base.mk b/base.mk diff --git a/base.mk b/base.mk
index 588511a..6f50cb0 100644 index bb48831..27f74f3 100644
--- a/base.mk --- a/base.mk
+++ b/base.mk +++ b/base.mk
@@ -172,9 +172,6 @@ PRODUCT_PACKAGES += \ @@ -172,9 +172,6 @@ PRODUCT_PACKAGES += \

2
patches_treble_personal/device_phh_treble/0003-Revert-treble-Set-BOARD_EXT4_SHARE_DUP_BLOCKS-explic.patch
View File

@ -1,4 +1,4 @@
From 87c3be43f218104271b2d2fc6376c9bcad322392 Mon Sep 17 00:00:00 2001 From 1332d9d8058ce117d1a3cf8880c13aa24556985b Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com> From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Sun, 8 Aug 2021 09:31:01 +0000 Date: Sun, 8 Aug 2021 09:31:01 +0000
Subject: [PATCH 3/3] Revert "treble: Set BOARD_EXT4_SHARE_DUP_BLOCKS Subject: [PATCH 3/3] Revert "treble: Set BOARD_EXT4_SHARE_DUP_BLOCKS

80
patches_treble_prerequisite/frameworks_base/0001-Squashed-revert-of-LOS-UDFPS-changes.patch
View File

@ -1,10 +1,14 @@
From d68dec915906c30f41828fda7d501d1e476d646c Mon Sep 17 00:00:00 2001 From 927ad33505d92b92867c6c0b0c0d412780be2e93 Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com> From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Wed, 31 Jan 2024 08:39:53 +0800 Date: Sun, 21 Apr 2024 18:02:54 +0800
Subject: [PATCH 1/2] 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 Way less than FOD, but reverting them nonetheless to keep in line with PHH AOSP
- Revert "fixup! udfps: Restore illumination dot for global hbm"
- Revert "fixup! SystemUI: Add UDFPS framework dimming support"
- Revert "fixup! SystemUI: Add UDFPS framework dimming support"
- Revert "fixup! udfps: Make pressed udfp view configurable"
- Revert "SystemUI: Only set dim behind UDFPS if it is actually enabled" - Revert "SystemUI: Only set dim behind UDFPS if it is actually enabled"
- Revert "SystemUI: Add UDFPS framework dimming support" - Revert "SystemUI: Add UDFPS framework dimming support"
- Revert "udfps: Make pressed udfp view configurable" - Revert "udfps: Make pressed udfp view configurable"
@ -16,8 +20,8 @@ Way less than FOD, but reverting them nonetheless to keep in line with PHH AOSP
.../systemui/biometrics/UdfpsController.java | 82 --------- .../systemui/biometrics/UdfpsController.java | 82 ---------
.../biometrics/UdfpsControllerOverlay.kt | 13 -- .../biometrics/UdfpsControllerOverlay.kt | 13 --
.../systemui/biometrics/UdfpsSurfaceView.java | 159 ------------------ .../systemui/biometrics/UdfpsSurfaceView.java | 159 ------------------
.../android/systemui/biometrics/UdfpsView.kt | 31 +--- .../android/systemui/biometrics/UdfpsView.kt | 32 +---
7 files changed, 1 insertion(+), 329 deletions(-) 7 files changed, 1 insertion(+), 330 deletions(-)
delete mode 100644 packages/SystemUI/res/drawable-nodpi/udfps_icon_pressed.png delete mode 100644 packages/SystemUI/res/drawable-nodpi/udfps_icon_pressed.png
delete mode 100644 packages/SystemUI/src/com/android/systemui/biometrics/UdfpsSurfaceView.java delete mode 100644 packages/SystemUI/src/com/android/systemui/biometrics/UdfpsSurfaceView.java
@ -49,7 +53,7 @@ index 0fcbfa161ddf..257d238f5c54 100644
- -
</com.android.systemui.biometrics.UdfpsView> </com.android.systemui.biometrics.UdfpsView>
diff --git a/packages/SystemUI/res/values/lineage_config.xml b/packages/SystemUI/res/values/lineage_config.xml diff --git a/packages/SystemUI/res/values/lineage_config.xml b/packages/SystemUI/res/values/lineage_config.xml
index 0454ba1205d9..31a7012accc4 100644 index 79c2865567a7..a708f909d4a9 100644
--- a/packages/SystemUI/res/values/lineage_config.xml --- a/packages/SystemUI/res/values/lineage_config.xml
+++ b/packages/SystemUI/res/values/lineage_config.xml +++ b/packages/SystemUI/res/values/lineage_config.xml
@@ -15,45 +15,6 @@ @@ -15,45 +15,6 @@
@ -99,10 +103,10 @@ index 0454ba1205d9..31a7012accc4 100644
<bool name="doze_double_tap_proximity_check">false</bool> <bool name="doze_double_tap_proximity_check">false</bool>
diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsController.java b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsController.java diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsController.java b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsController.java
index 7ccd2881a0ea..3472a859ac82 100644 index 0dc13ff29771..65668b56a9f3 100644
--- a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsController.java --- a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsController.java
+++ b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsController.java +++ b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsController.java
@@ -50,7 +50,6 @@ import android.os.Process; @@ -48,7 +48,6 @@ import android.os.PowerManager;
import android.os.Trace; import android.os.Trace;
import android.os.VibrationAttributes; import android.os.VibrationAttributes;
import android.os.VibrationEffect; import android.os.VibrationEffect;
@ -110,7 +114,7 @@ index 7ccd2881a0ea..3472a859ac82 100644
import android.util.Log; import android.util.Log;
import android.view.HapticFeedbackConstants; import android.view.HapticFeedbackConstants;
import android.view.LayoutInflater; import android.view.LayoutInflater;
@@ -221,9 +220,6 @@ public class UdfpsController implements DozeReceiver, Dumpable { @@ -217,9 +216,6 @@ public class UdfpsController implements DozeReceiver, Dumpable {
private boolean mAttemptedToDismissKeyguard; private boolean mAttemptedToDismissKeyguard;
private final Set<Callback> mCallbacks = new HashSet<>(); private final Set<Callback> mCallbacks = new HashSet<>();
@ -120,7 +124,7 @@ index 7ccd2881a0ea..3472a859ac82 100644
@VisibleForTesting @VisibleForTesting
public static final VibrationAttributes UDFPS_VIBRATION_ATTRIBUTES = public static final VibrationAttributes UDFPS_VIBRATION_ATTRIBUTES =
new VibrationAttributes.Builder() new VibrationAttributes.Builder()
@@ -928,8 +924,6 @@ public class UdfpsController implements DozeReceiver, Dumpable { @@ -746,8 +742,6 @@ public class UdfpsController implements DozeReceiver, Dumpable {
final UdfpsOverlayController mUdfpsOverlayController = new UdfpsOverlayController(); final UdfpsOverlayController mUdfpsOverlayController = new UdfpsOverlayController();
mFingerprintManager.setUdfpsOverlayController(mUdfpsOverlayController); mFingerprintManager.setUdfpsOverlayController(mUdfpsOverlayController);
@ -129,17 +133,17 @@ index 7ccd2881a0ea..3472a859ac82 100644
final IntentFilter filter = new IntentFilter(); final IntentFilter filter = new IntentFilter();
filter.addAction(Intent.ACTION_CLOSE_SYSTEM_DIALOGS); filter.addAction(Intent.ACTION_CLOSE_SYSTEM_DIALOGS);
context.registerReceiver(mBroadcastReceiver, filter, context.registerReceiver(mBroadcastReceiver, filter,
@@ -1146,64 +1140,6 @@ public class UdfpsController implements DozeReceiver, Dumpable { @@ -970,64 +964,6 @@ public class UdfpsController implements DozeReceiver, Dumpable {
return mSensorProps.sensorType == FingerprintSensorProperties.TYPE_UDFPS_OPTICAL; return mSensorProps.sensorType == FingerprintSensorProperties.TYPE_UDFPS_OPTICAL;
} }
- private void initUdfpsFrameworkDimming() { - private void initUdfpsFrameworkDimming() {
- mUseFrameworkDimming = mContext.getResources().getBoolean( - mUseFrameworkDimming = mContext.getResources().getBoolean(
- com.android.systemui.R.bool.config_udfpsFrameworkDimming); - com.android.systemui.res.R.bool.config_udfpsFrameworkDimming);
- -
- if (mUseFrameworkDimming) { - if (mUseFrameworkDimming) {
- String[] array = mContext.getResources().getStringArray( - String[] array = mContext.getResources().getStringArray(
- com.android.systemui.R.array.config_udfpsDimmingBrightnessAlphaArray); - com.android.systemui.res.R.array.config_udfpsDimmingBrightnessAlphaArray);
- mBrightnessAlphaArray = new int[array.length][2]; - mBrightnessAlphaArray = new int[array.length][2];
- for (int i = 0; i < array.length; i++) { - for (int i = 0; i < array.length; i++) {
- String[] s = array[i].split(","); - String[] s = array[i].split(",");
@ -158,9 +162,9 @@ index 7ccd2881a0ea..3472a859ac82 100644
- Settings.System.SCREEN_BRIGHTNESS, 100); - Settings.System.SCREEN_BRIGHTNESS, 100);
- // Since the brightness is taken from the system settings, we need to interpolate it - // Since the brightness is taken from the system settings, we need to interpolate it
- final int brightnessMin = mContext.getResources().getInteger( - final int brightnessMin = mContext.getResources().getInteger(
- com.android.systemui.R.integer.config_udfpsDimmingBrightnessMin); - com.android.systemui.res.R.integer.config_udfpsDimmingBrightnessMin);
- final int brightnessMax = mContext.getResources().getInteger( - final int brightnessMax = mContext.getResources().getInteger(
- com.android.systemui.R.integer.config_udfpsDimmingBrightnessMax); - com.android.systemui.res.R.integer.config_udfpsDimmingBrightnessMax);
- if (brightnessMax > 0) { - if (brightnessMax > 0) {
- brightness = interpolate(brightness, 0, 255, brightnessMin, brightnessMax); - brightness = interpolate(brightness, 0, 255, brightnessMin, brightnessMax);
- } - }
@ -194,24 +198,24 @@ index 7ccd2881a0ea..3472a859ac82 100644
public boolean isFingerDown() { public boolean isFingerDown() {
return mOnFingerDown; return mOnFingerDown;
} }
@@ -1219,7 +1155,6 @@ public class UdfpsController implements DozeReceiver, Dumpable { @@ -1036,7 +972,6 @@ public class UdfpsController implements DozeReceiver, Dumpable {
mFingerprintManager.onUdfpsUiEvent(FingerprintManager.UDFPS_UI_READY, requestId,
mSensorProps.sensorId); mSensorProps.sensorId);
mLatencyTracker.onActionEnd(LatencyTracker.ACTION_UDFPS_ILLUMINATE); mLatencyTracker.onActionEnd(LatencyTracker.ACTION_UDFPS_ILLUMINATE);
}
- updateViewDimAmount(); - updateViewDimAmount();
} }
private void onFingerDown( private void onFingerDown(
@@ -1369,23 +1304,6 @@ public class UdfpsController implements DozeReceiver, Dumpable { @@ -1158,23 +1093,6 @@ public class UdfpsController implements DozeReceiver, Dumpable {
mOnFingerDown = false;
unconfigureDisplay(view); unconfigureDisplay(view);
}
cancelAodSendFingerUpAction(); cancelAodSendFingerUpAction();
- -
- // Add a delay to ensure that the dim amount is updated after the display has had chance - // Add a delay to ensure that the dim amount is updated after the display has had chance
- // to switch out of HBM mode. The delay, in ms is stored in config_udfpsDimmingDisableDelay. - // to switch out of HBM mode. The delay, in ms is stored in config_udfpsDimmingDisableDelay.
- // If the delay is 0, the dim amount will be updated immediately. - // If the delay is 0, the dim amount will be updated immediately.
- final int delay = mContext.getResources().getInteger( - final int delay = mContext.getResources().getInteger(
- com.android.systemui.R.integer.config_udfpsDimmingDisableDelay); - com.android.systemui.res.R.integer.config_udfpsDimmingDisableDelay);
- if (delay > 0) { - if (delay > 0) {
- mFgExecutor.executeDelayed(() -> { - mFgExecutor.executeDelayed(() -> {
- // A race condition exists where the overlay is destroyed before the dim amount - // A race condition exists where the overlay is destroyed before the dim amount
@ -227,10 +231,10 @@ index 7ccd2881a0ea..3472a859ac82 100644
/** /**
diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsControllerOverlay.kt b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsControllerOverlay.kt diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsControllerOverlay.kt b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsControllerOverlay.kt
index 1edcf86650d6..d6ef94d18e71 100644 index 4983610df57a..dae6d08f7331 100644
--- a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsControllerOverlay.kt --- a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsControllerOverlay.kt
+++ b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsControllerOverlay.kt +++ b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsControllerOverlay.kt
@@ -123,8 +123,6 @@ class UdfpsControllerOverlay @JvmOverloads constructor( @@ -131,8 +131,6 @@ class UdfpsControllerOverlay @JvmOverloads constructor(
private var overlayTouchListener: TouchExplorationStateChangeListener? = null private var overlayTouchListener: TouchExplorationStateChangeListener? = null
@ -239,7 +243,7 @@ index 1edcf86650d6..d6ef94d18e71 100644
private val coreLayoutParams = WindowManager.LayoutParams( private val coreLayoutParams = WindowManager.LayoutParams(
WindowManager.LayoutParams.TYPE_NAVIGATION_BAR_PANEL, WindowManager.LayoutParams.TYPE_NAVIGATION_BAR_PANEL,
0 /* flags set in computeLayoutParams() */, 0 /* flags set in computeLayoutParams() */,
@@ -136,11 +134,7 @@ class UdfpsControllerOverlay @JvmOverloads constructor( @@ -144,23 +142,12 @@ class UdfpsControllerOverlay @JvmOverloads constructor(
layoutInDisplayCutoutMode = WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_ALWAYS layoutInDisplayCutoutMode = WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_ALWAYS
flags = (Utils.FINGERPRINT_OVERLAY_LAYOUT_PARAM_FLAGS or flags = (Utils.FINGERPRINT_OVERLAY_LAYOUT_PARAM_FLAGS or
WindowManager.LayoutParams.FLAG_SPLIT_TOUCH) WindowManager.LayoutParams.FLAG_SPLIT_TOUCH)
@ -250,24 +254,22 @@ index 1edcf86650d6..d6ef94d18e71 100644
- dimAmount = 0.0f - dimAmount = 0.0f
// Avoid announcing window title. // Avoid announcing window title.
accessibilityTitle = " " accessibilityTitle = " "
inputFeatures = WindowManager.LayoutParams.INPUT_FEATURE_SPY
@@ -149,13 +143,6 @@ class UdfpsControllerOverlay @JvmOverloads constructor(
}
} }
- var dimAmount - var dimAmount
- get() = coreLayoutParams.dimAmount - get() = coreLayoutParams.dimAmount
- set(value) { - set(value) {
- coreLayoutParams.dimAmount = value - coreLayoutParams.dimAmount = value
- windowManager.updateViewLayout(overlayView, coreLayoutParams) - windowManager.updateViewLayout(getTouchOverlay(), coreLayoutParams)
- } - }
- -
/** If the overlay is currently showing. */ /** If the overlay is currently showing. */
val isShowing: Boolean val isShowing: Boolean
get() = overlayView != null get() = getTouchOverlay() != null
diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsSurfaceView.java b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsSurfaceView.java diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsSurfaceView.java b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsSurfaceView.java
deleted file mode 100644 deleted file mode 100644
index 2488132b508b..000000000000 index 2e0e9491dd5b..000000000000
--- a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsSurfaceView.java --- a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsSurfaceView.java
+++ /dev/null +++ /dev/null
@@ -1,159 +0,0 @@ @@ -1,159 +0,0 @@
@ -303,7 +305,7 @@ index 2488132b508b..000000000000
-import android.view.SurfaceHolder; -import android.view.SurfaceHolder;
-import android.view.SurfaceView; -import android.view.SurfaceView;
- -
-import com.android.systemui.R; -import com.android.systemui.res.R;
- -
-/** -/**
- * Surface View for providing the Global High-Brightness Mode (GHBM) illumination for UDFPS. - * Surface View for providing the Global High-Brightness Mode (GHBM) illumination for UDFPS.
@ -431,19 +433,23 @@ index 2488132b508b..000000000000
- } - }
-} -}
diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsView.kt b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsView.kt diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsView.kt b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsView.kt
index ef7fcc954590..06dee7a2b9f6 100644 index a8e4e95114ca..76bcd6e2863b 100644
--- a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsView.kt --- a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsView.kt
+++ b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsView.kt +++ b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsView.kt
@@ -25,7 +25,6 @@ import android.graphics.RectF @@ -24,11 +24,9 @@ import android.graphics.RectF
import android.util.AttributeSet import android.util.AttributeSet
import android.util.Log import android.util.Log
import android.view.MotionEvent import android.view.MotionEvent
-import android.view.Surface -import android.view.Surface
import android.widget.FrameLayout import android.widget.FrameLayout
import com.android.settingslib.udfps.UdfpsOverlayParams import com.android.systemui.biometrics.shared.model.UdfpsOverlayParams
import com.android.systemui.R import com.android.systemui.doze.DozeReceiver
@@ -62,8 +61,6 @@ class UdfpsView( -import com.android.systemui.res.R
a.getFloat(R.styleable.UdfpsView_sensorTouchAreaCoefficient, 0f)
private const val TAG = "UdfpsView"
@@ -49,8 +47,6 @@ class UdfpsView(
textSize = 32f
} }
- private var ghbmView: UdfpsSurfaceView? = null - private var ghbmView: UdfpsSurfaceView? = null
@ -451,7 +457,7 @@ index ef7fcc954590..06dee7a2b9f6 100644
/** View controller (can be different for enrollment, BiometricPrompt, Keyguard, etc.). */ /** View controller (can be different for enrollment, BiometricPrompt, Keyguard, etc.). */
var animationViewController: UdfpsAnimationViewController<*>? = null var animationViewController: UdfpsAnimationViewController<*>? = null
@@ -90,10 +87,6 @@ class UdfpsView( @@ -77,10 +73,6 @@ class UdfpsView(
return (animationViewController == null || !animationViewController!!.shouldPauseAuth()) return (animationViewController == null || !animationViewController!!.shouldPauseAuth())
} }
@ -462,7 +468,7 @@ index ef7fcc954590..06dee7a2b9f6 100644
override fun dozeTimeTick() { override fun dozeTimeTick() {
animationViewController?.dozeTimeTick() animationViewController?.dozeTimeTick()
} }
@@ -157,34 +150,12 @@ class UdfpsView( @@ -114,34 +106,12 @@ class UdfpsView(
fun configureDisplay(onDisplayConfigured: Runnable) { fun configureDisplay(onDisplayConfigured: Runnable) {
isDisplayConfigured = true isDisplayConfigured = true
animationViewController?.onDisplayConfiguring() animationViewController?.onDisplayConfiguring()

16
patches_treble_prerequisite/frameworks_base/0002-Revert-Biometrics-Allow-disabling-of-fingerprint-cle.patch
View File

@ -1,4 +1,4 @@
From c99885957f2f301d69d6e4f142856f1ea44f2703 Mon Sep 17 00:00:00 2001 From 58171eec5da2091f45c6c110ae4de2bd6717820b Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com> From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Sun, 21 Jan 2024 23:21:02 +0800 Date: Sun, 21 Jan 2024 23:21:02 +0800
Subject: [PATCH 2/2] Revert "Biometrics: Allow disabling of fingerprint Subject: [PATCH 2/2] Revert "Biometrics: Allow disabling of fingerprint
@ -10,21 +10,21 @@ This reverts commit add9f4dc93bba9d414ad67a0770b82c06747d09f.
1 file changed, 8 deletions(-) 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 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 8ba20b66122c..d0b71fcf2dbb 100644 index 4ff18edc82b9..d3cecd0e34c7 100644
--- a/services/core/java/com/android/server/biometrics/sensors/fingerprint/hidl/Fingerprint21.java --- 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 +++ b/services/core/java/com/android/server/biometrics/sensors/fingerprint/hidl/Fingerprint21.java
@@ -133,8 +133,6 @@ public class Fingerprint21 implements IHwBinder.DeathRecipient, ServiceProvider @@ -143,8 +143,6 @@ public class Fingerprint21 implements IHwBinder.DeathRecipient, ServiceProvider
private final int mSensorId;
private final boolean mIsPowerbuttonFps; private final boolean mIsPowerbuttonFps;
private AidlSession mSession;
- private boolean mCleanup; - private boolean mCleanup;
- -
private final class BiometricTaskStackListener extends TaskStackListener { private final class BiometricTaskStackListener extends TaskStackListener {
@Override @Override
public void onTaskStackChanged() { public void onTaskStackChanged() {
@@ -359,9 +357,6 @@ public class Fingerprint21 implements IHwBinder.DeathRecipient, ServiceProvider @@ -377,9 +375,6 @@ public class Fingerprint21 implements IHwBinder.DeathRecipient, ServiceProvider
mAuthenticationStatsCollector = new AuthenticationStatsCollector(mContext, mAuthenticationStatsCollector = collector;
BiometricsProtoEnums.MODALITY_FINGERPRINT, new BiometricNotificationImpl()); });
- mCleanup = context.getResources().getBoolean( - mCleanup = context.getResources().getBoolean(
- org.lineageos.platform.internal.R.bool.config_cleanupUnusedFingerprints); - org.lineageos.platform.internal.R.bool.config_cleanupUnusedFingerprints);
@ -32,7 +32,7 @@ index 8ba20b66122c..d0b71fcf2dbb 100644
try { try {
ActivityManager.getService().registerUserSwitchObserver(mUserSwitchObserver, TAG); ActivityManager.getService().registerUserSwitchObserver(mUserSwitchObserver, TAG);
} catch (RemoteException e) { } catch (RemoteException e) {
@@ -751,9 +746,6 @@ public class Fingerprint21 implements IHwBinder.DeathRecipient, ServiceProvider @@ -1009,9 +1004,6 @@ public class Fingerprint21 implements IHwBinder.DeathRecipient, ServiceProvider
private void scheduleInternalCleanup(int userId, private void scheduleInternalCleanup(int userId,
@Nullable ClientMonitorCallback callback) { @Nullable ClientMonitorCallback callback) {

10
patches_treble_prerequisite/frameworks_native/0001-Revert-CompositionEngine-Request-device-composition-.patch
View File

@ -1,4 +1,4 @@
From 09fac47349b2e39d2e53b2b638b98d17d3bd18a4 Mon Sep 17 00:00:00 2001 From d39466c50305a64ff3a683b1e13373379273ee57 Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com> From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Mon, 20 Nov 2023 22:00:14 +0800 Date: Mon, 20 Nov 2023 22:00:14 +0800
Subject: [PATCH 1/2] Revert "CompositionEngine: Request device composition for Subject: [PATCH 1/2] Revert "CompositionEngine: Request device composition for
@ -10,7 +10,7 @@ This reverts commit 69fad8aa4098b007fe17472902159705fdcd957f.
1 file changed, 1 insertion(+), 15 deletions(-) 1 file changed, 1 insertion(+), 15 deletions(-)
diff --git a/services/surfaceflinger/CompositionEngine/src/Output.cpp b/services/surfaceflinger/CompositionEngine/src/Output.cpp diff --git a/services/surfaceflinger/CompositionEngine/src/Output.cpp b/services/surfaceflinger/CompositionEngine/src/Output.cpp
index 2eb1a5c399..793959cea6 100644 index f680fc5eac..09c7c9933a 100644
--- a/services/surfaceflinger/CompositionEngine/src/Output.cpp --- a/services/surfaceflinger/CompositionEngine/src/Output.cpp
+++ b/services/surfaceflinger/CompositionEngine/src/Output.cpp +++ b/services/surfaceflinger/CompositionEngine/src/Output.cpp
@@ -22,7 +22,6 @@ @@ -22,7 +22,6 @@
@ -21,7 +21,7 @@ index 2eb1a5c399..793959cea6 100644
#include <compositionengine/impl/HwcAsyncWorker.h> #include <compositionengine/impl/HwcAsyncWorker.h>
#include <compositionengine/impl/Output.h> #include <compositionengine/impl/Output.h>
#include <compositionengine/impl/OutputCompositionState.h> #include <compositionengine/impl/OutputCompositionState.h>
@@ -901,10 +900,7 @@ void Output::writeCompositionState(const compositionengine::CompositionRefreshAr @@ -915,10 +914,7 @@ void Output::writeCompositionState(const compositionengine::CompositionRefreshAr
compositionengine::OutputLayer* Output::findLayerRequestingBackgroundComposition() const { compositionengine::OutputLayer* Output::findLayerRequestingBackgroundComposition() const {
compositionengine::OutputLayer* layerRequestingBgComposition = nullptr; compositionengine::OutputLayer* layerRequestingBgComposition = nullptr;
@ -30,10 +30,10 @@ index 2eb1a5c399..793959cea6 100644
- compositionengine::OutputLayer* nextLayer = getOutputLayerOrderedByZByIndex(i + 1); - compositionengine::OutputLayer* nextLayer = getOutputLayerOrderedByZByIndex(i + 1);
- -
+ for (auto* layer : getOutputLayersOrderedByZ()) { + for (auto* layer : getOutputLayersOrderedByZ()) {
auto* compState = layer->getLayerFE().getCompositionState(); const auto* compState = layer->getLayerFE().getCompositionState();
// If any layer has a sideband stream, we will disable blurs. In that case, we don't // If any layer has a sideband stream, we will disable blurs. In that case, we don't
@@ -918,16 +914,6 @@ compositionengine::OutputLayer* Output::findLayerRequestingBackgroundComposition @@ -938,16 +934,6 @@ compositionengine::OutputLayer* Output::findLayerRequestingBackgroundComposition
if (compState->backgroundBlurRadius > 0 || compState->blurRegions.size() > 0) { if (compState->backgroundBlurRadius > 0 || compState->blurRegions.size() > 0) {
layerRequestingBgComposition = layer; layerRequestingBgComposition = layer;
} }

34
patches_treble_prerequisite/frameworks_native/0002-Revert-surfaceflinger-Add-support-for-Udfps-extensio.patch
View File

@ -1,4 +1,4 @@
From 9428b1b39a473592423f2d2f7812cf3815a68b86 Mon Sep 17 00:00:00 2001 From 16d9d6827247991744b80aff6793582c42da9ba0 Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com> From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Mon, 20 Nov 2023 22:00:23 +0800 Date: Mon, 20 Nov 2023 22:00:23 +0800
Subject: [PATCH 2/2] Revert "surfaceflinger: Add support for Udfps extension Subject: [PATCH 2/2] Revert "surfaceflinger: Add support for Udfps extension
@ -15,10 +15,16 @@ This reverts commit 8655d06e960235c0f9ad079be3541fee2a0359f7.
delete mode 100644 services/surfaceflinger/CompositionEngine/src/UdfpsExtension.cpp delete mode 100644 services/surfaceflinger/CompositionEngine/src/UdfpsExtension.cpp
diff --git a/services/surfaceflinger/CompositionEngine/Android.bp b/services/surfaceflinger/CompositionEngine/Android.bp diff --git a/services/surfaceflinger/CompositionEngine/Android.bp b/services/surfaceflinger/CompositionEngine/Android.bp
index cdec4abdba..f3a0186e3e 100644 index 52bc260720..ae2f2dbbf5 100644
--- a/services/surfaceflinger/CompositionEngine/Android.bp --- a/services/surfaceflinger/CompositionEngine/Android.bp
+++ b/services/surfaceflinger/CompositionEngine/Android.bp +++ b/services/surfaceflinger/CompositionEngine/Android.bp
@@ -61,10 +61,7 @@ cc_defaults { @@ -84,16 +84,12 @@ filegroup {
"src/OutputLayer.cpp",
"src/OutputLayerCompositionState.cpp",
"src/RenderSurface.cpp",
- "src/UdfpsExtension.cpp",
],
}
cc_library { cc_library {
name: "libcompositionengine", name: "libcompositionengine",
@ -27,18 +33,10 @@ index cdec4abdba..f3a0186e3e 100644
- "surfaceflinger_udfps_lib_defaults", - "surfaceflinger_udfps_lib_defaults",
- ], - ],
+ defaults: ["libcompositionengine_defaults"], + defaults: ["libcompositionengine_defaults"],
srcs: [ static_libs: [
"src/planner/CachedSet.cpp", "libsurfaceflinger_common",
"src/planner/Flattener.cpp", "libsurfaceflingerflags",
@@ -86,7 +83,6 @@ cc_library { @@ -136,14 +132,6 @@ cc_library {
"src/OutputLayer.cpp",
"src/OutputLayerCompositionState.cpp",
"src/RenderSurface.cpp",
- "src/UdfpsExtension.cpp",
],
local_include_dirs: ["include"],
export_include_dirs: ["include"],
@@ -115,14 +111,6 @@ cc_library {
export_include_dirs: ["include"], export_include_dirs: ["include"],
} }
@ -89,10 +87,10 @@ index 4306cb4a02..0000000000
- -
-#endif /* __UDFPS_EXTENSION__H__ */ -#endif /* __UDFPS_EXTENSION__H__ */
diff --git a/services/surfaceflinger/CompositionEngine/src/OutputLayer.cpp b/services/surfaceflinger/CompositionEngine/src/OutputLayer.cpp diff --git a/services/surfaceflinger/CompositionEngine/src/OutputLayer.cpp b/services/surfaceflinger/CompositionEngine/src/OutputLayer.cpp
index a314553dd2..0ac0ecb727 100644 index 11b9024e99..7fe3369f88 100644
--- a/services/surfaceflinger/CompositionEngine/src/OutputLayer.cpp --- a/services/surfaceflinger/CompositionEngine/src/OutputLayer.cpp
+++ b/services/surfaceflinger/CompositionEngine/src/OutputLayer.cpp +++ b/services/surfaceflinger/CompositionEngine/src/OutputLayer.cpp
@@ -19,7 +19,6 @@ @@ -18,7 +18,6 @@
#include <compositionengine/DisplayColorProfile.h> #include <compositionengine/DisplayColorProfile.h>
#include <compositionengine/LayerFECompositionState.h> #include <compositionengine/LayerFECompositionState.h>
#include <compositionengine/Output.h> #include <compositionengine/Output.h>
@ -100,7 +98,7 @@ index a314553dd2..0ac0ecb727 100644
#include <compositionengine/impl/HwcBufferCache.h> #include <compositionengine/impl/HwcBufferCache.h>
#include <compositionengine/impl/OutputCompositionState.h> #include <compositionengine/impl/OutputCompositionState.h>
#include <compositionengine/impl/OutputLayer.h> #include <compositionengine/impl/OutputLayer.h>
@@ -449,17 +448,7 @@ void OutputLayer::writeOutputDependentGeometryStateToHWC(HWC2::Layer* hwcLayer, @@ -459,17 +458,7 @@ void OutputLayer::writeOutputDependentGeometryStateToHWC(HWC2::Layer* hwcLayer,
sourceCrop.bottom, to_string(error).c_str(), static_cast<int32_t>(error)); sourceCrop.bottom, to_string(error).c_str(), static_cast<int32_t>(error));
} }

8
patches_treble_td/platform_bionic/0001-Disable-vndklite-handling.patch
View File

@ -1,4 +1,4 @@
From cb9d1aaacaa105c20551952ead0ad7a49408efce Mon Sep 17 00:00:00 2001 From b354689bc72bb0ab0da52cc11ec5930444606d2c Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me> From: Pierre-Hugues Husson <phh@phh.me>
Date: Wed, 27 Oct 2021 14:39:29 -0400 Date: Wed, 27 Oct 2021 14:39:29 -0400
Subject: [PATCH 1/2] Disable vndklite handling Subject: [PATCH 1/2] Disable vndklite handling
@ -9,10 +9,10 @@ Change-Id: Ic4474cf80fc4b45a9a2760dd51e2ca29c4d961e2
1 file changed, 5 deletions(-) 1 file changed, 5 deletions(-)
diff --git a/linker/linker.cpp b/linker/linker.cpp diff --git a/linker/linker.cpp b/linker/linker.cpp
index 17b574fc1..c863f8ea6 100644 index 135eaa380..93523dcc0 100644
--- a/linker/linker.cpp --- a/linker/linker.cpp
+++ b/linker/linker.cpp +++ b/linker/linker.cpp
@@ -95,7 +95,6 @@ static uint64_t g_module_unload_counter = 0; @@ -97,7 +97,6 @@ static uint64_t g_module_unload_counter = 0;
static const char* const kLdConfigArchFilePath = "/system/etc/ld.config." ABI_STRING ".txt"; static const char* const kLdConfigArchFilePath = "/system/etc/ld.config." ABI_STRING ".txt";
static const char* const kLdConfigFilePath = "/system/etc/ld.config.txt"; static const char* const kLdConfigFilePath = "/system/etc/ld.config.txt";
@ -20,7 +20,7 @@ index 17b574fc1..c863f8ea6 100644
static const char* const kLdGeneratedConfigFilePath = "/linkerconfig/ld.config.txt"; static const char* const kLdGeneratedConfigFilePath = "/linkerconfig/ld.config.txt";
@@ -3423,10 +3422,6 @@ static std::string get_ld_config_file_apex_path(const char* executable_path) { @@ -3444,10 +3443,6 @@ static std::string get_ld_config_file_apex_path(const char* executable_path) {
} }
static std::string get_ld_config_file_vndk_path() { static std::string get_ld_config_file_vndk_path() {

Some files were not shown because too many files have changed in this diff Show More