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

Changes for July 2024, syncing up to 20240721

Browse Source
This commit is contained in:
Andy CrossGate Yan 2024-07-21 17:19:43 +08:00
parent 3963eaa06e
commit bcc6abe459
240 changed files with 3746 additions and 2018 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,7 +1,7 @@
From 92d00894b0d84c8d3fd0a6ba253132ac96402251 Mon Sep 17 00:00:00 2001
From e535be2c76e6969ca8a58023b203bf66cfe0d3ae Mon Sep 17 00:00:00 2001
From: AndyCGYan <GeForce8800Ultra@gmail.com>
Date: Fri, 22 Mar 2019 00:41:20 +0800
Subject: [PATCH 01/34] Disable FP lockouts optionally
Subject: [PATCH 01/43] Disable FP lockouts optionally
Both timed and permanent lockouts - GET THE FUCK OUT
Now targeting LockoutFramework, introduced in Android 12
@ -13,10 +13,10 @@ Change-Id: I2d4b091f3546d4d7903bfb4d5585629212dc9915
1 file changed, 17 insertions(+), 11 deletions(-)
diff --git a/services/core/java/com/android/server/biometrics/sensors/fingerprint/hidl/LockoutFrameworkImpl.java b/services/core/java/com/android/server/biometrics/sensors/fingerprint/hidl/LockoutFrameworkImpl.java
index 0730c672acd9..972421758223 100644
index 0e05a7923db4..34268e2f8a5a 100644
--- a/services/core/java/com/android/server/biometrics/sensors/fingerprint/hidl/LockoutFrameworkImpl.java
+++ b/services/core/java/com/android/server/biometrics/sensors/fingerprint/hidl/LockoutFrameworkImpl.java
@@ -27,6 +27,7 @@ import android.content.IntentFilter;
@@ -29,6 +29,7 @@ import android.content.IntentFilter;
import android.os.Handler;
import android.os.Looper;
import android.os.SystemClock;
@ -24,7 +24,7 @@ index 0730c672acd9..972421758223 100644
import android.util.Slog;
import android.util.SparseBooleanArray;
import android.util.SparseIntArray;
@@ -46,6 +47,7 @@ public class LockoutFrameworkImpl implements LockoutTracker {
@@ -51,6 +52,7 @@ public class LockoutFrameworkImpl implements LockoutTracker {
private static final int MAX_FAILED_ATTEMPTS_LOCKOUT_PERMANENT = 20;
private static final long FAIL_LOCKOUT_TIMEOUT_MS = 30 * 1000;
private static final String KEY_LOCKOUT_RESET_USER = "lockout_reset_user";
@ -32,7 +32,7 @@ index 0730c672acd9..972421758223 100644
private final class LockoutReceiver extends BroadcastReceiver {
@Override
@@ -107,24 +109,28 @@ public class LockoutFrameworkImpl implements LockoutTracker {
@@ -133,24 +135,28 @@ public class LockoutFrameworkImpl implements LockoutTracker {
@Override
public void addFailedAttemptForUser(int userId) {

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

@ -1,7 +1,7 @@
From b3aa7feea26bb5d713a8511f5720f33f0c204002 Mon Sep 17 00:00:00 2001
From 8595258b7aac74763f6f8b7edbe37b91f0a4c1a5 Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Thu, 5 Apr 2018 10:01:19 +0800
Subject: [PATCH 02/34] Disable vendor mismatch warning
Subject: [PATCH 02/43] Disable vendor mismatch warning
Change-Id: Ieb8fe91e2f02462f074312ed0f4885d183e9780b
---
@ -9,10 +9,10 @@ Change-Id: Ieb8fe91e2f02462f074312ed0f4885d183e9780b
1 file changed, 1 insertion(+), 13 deletions(-)
diff --git a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
index ad9ac201e22b..b42e4e2e22dc 100644
index b26cddaccc04..cdc661598f33 100644
--- a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
+++ b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
@@ -6237,19 +6237,7 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub {
@@ -6312,19 +6312,7 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub {
if (!isBuildConsistent) {
Slog.e(TAG, "Build fingerprint is not consistent, warning user");

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

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

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

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

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

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

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

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

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

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

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

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

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

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

4
patches_platform/frameworks_base/0011-UI-Revive-navbar-layout-tuning-via-sysui_nav_bar-tun.patch → patches_platform/frameworks_base/0010-UI-Revive-navbar-layout-tuning-via-sysui_nav_bar-tun.patch
View File

@ -1,7 +1,7 @@
From 635207ed57659f3c89cfa144de981706c569d9c8 Mon Sep 17 00:00:00 2001
From 6e308897ce7844197aa8cbc7bf43b2cdaa54a3df Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <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
Subject: [PATCH 10/43] UI: Revive navbar layout tuning via sysui_nav_bar
tunable
Google keeps fixing what ain't broken.

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

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

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

@ -1,7 +1,7 @@
From 77275322ff6606110bec9f11bbdc90932ab1fded Mon Sep 17 00:00:00 2001
From 2717db2bc74bbebcde07904bdf52afae2da35cfa Mon Sep 17 00:00:00 2001
From: Danny Lin <danny@kdrag0n.dev>
Date: Tue, 3 Nov 2020 22:43:12 -0800
Subject: [PATCH 13/34] core: Remove old app target SDK dialog
Subject: [PATCH 12/43] core: Remove old app target SDK dialog
If an app is old, users should already know that, and there's usually no
point in warning them about it because they would already be using a

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

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

8
patches_platform/frameworks_base/0015-Remove-debuggable-requirement-for-signature-spoofing.patch → patches_platform/frameworks_base/0014-Remove-debuggable-requirement-for-signature-spoofing.patch
View File

@ -1,7 +1,7 @@
From 33ea20cb105c85d2c7bc0bab20c5d87ecf2d3df6 Mon Sep 17 00:00:00 2001
From 76893bd08d5c89685320342db2a3bcec2bc981f5 Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Sun, 17 Mar 2024 17:10:38 +0800
Subject: [PATCH 15/34] Remove debuggable requirement for signature spoofing
Subject: [PATCH 14/43] Remove debuggable requirement for signature spoofing
Change-Id: I8d637ddbbd117a9c5b1d9c5e462b0f4b30d98333
---
@ -9,10 +9,10 @@ Change-Id: I8d637ddbbd117a9c5b1d9c5e462b0f4b30d98333
1 file changed, 4 deletions(-)
diff --git a/services/core/java/com/android/server/pm/ComputerEngine.java b/services/core/java/com/android/server/pm/ComputerEngine.java
index d8cbe9d5e7c7..13af78f56462 100644
index 7d00436857a5..10a221eb8b9f 100644
--- a/services/core/java/com/android/server/pm/ComputerEngine.java
+++ b/services/core/java/com/android/server/pm/ComputerEngine.java
@@ -1472,10 +1472,6 @@ public class ComputerEngine implements Computer {
@@ -1474,10 +1474,6 @@ public class ComputerEngine implements Computer {
private static native boolean isDebuggable();
public static boolean isMicrogSigned(AndroidPackage p) {

1154
patches_platform/frameworks_base/0015-Revert-Adding-ColorUpdateLogger-to-track-color-updat.patch Normal file
View File

File diff suppressed because it is too large Load Diff

54
patches_platform/frameworks_base/0016-Revert-Change-color-of-track.patch Normal file
View File

@ -0,0 +1,54 @@
From 2f0cb797274c27772f923c7a07ef830c12ddbfd4 Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Sun, 30 Jun 2024 16:49:47 +0800
Subject: [PATCH 16/43] Revert "Change color of track"
This reverts commit 9ba91db9836625e5f45367b38b76cf08615cce00.
---
.../res/color/brightness_slider_track.xml | 19 -------------------
.../drawable/brightness_progress_drawable.xml | 2 +-
2 files changed, 1 insertion(+), 20 deletions(-)
delete mode 100644 packages/SystemUI/res/color/brightness_slider_track.xml
diff --git a/packages/SystemUI/res/color/brightness_slider_track.xml b/packages/SystemUI/res/color/brightness_slider_track.xml
deleted file mode 100644
index 6028769f3789..000000000000
--- a/packages/SystemUI/res/color/brightness_slider_track.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
- ~ Copyright (C) 2024 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.
- -->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:color="@android:color/system_neutral2_500" android:lStar="40" />
-</selector>
\ No newline at end of file
diff --git a/packages/SystemUI/res/drawable/brightness_progress_drawable.xml b/packages/SystemUI/res/drawable/brightness_progress_drawable.xml
index cae9d6b0513e..95c7778c0e76 100644
--- a/packages/SystemUI/res/drawable/brightness_progress_drawable.xml
+++ b/packages/SystemUI/res/drawable/brightness_progress_drawable.xml
@@ -24,7 +24,7 @@
<shape>
<size android:height="@dimen/rounded_slider_track_width" />
<corners android:radius="@dimen/rounded_slider_track_corner_radius" />
- <solid android:color="@color/brightness_slider_track" />
+ <solid android:color="?attr/shadeInactive" />
</shape>
</inset>
</item>
--
2.34.1

27
patches_platform/frameworks_base/0017-Revert-Fix-the-text-color-used-on-the-notification-u.patch Normal file
View File

@ -0,0 +1,27 @@
From 587d8c7b04046a1a52c6dba36dbafaf95911b30e Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Sun, 30 Jun 2024 16:13:51 +0800
Subject: [PATCH 17/43] Revert "Fix the text color used on the notification
unread indicator."
This reverts commit aee60c49308a81125587ea0c53f40c9d5d60707e.
---
core/java/android/app/Notification.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/core/java/android/app/Notification.java b/core/java/android/app/Notification.java
index 1129f9dbdfeb..baecf785a8af 100644
--- a/core/java/android/app/Notification.java
+++ b/core/java/android/app/Notification.java
@@ -5721,7 +5721,7 @@ public class Notification implements Parcelable
pillColor = Colors.flattenAlpha(
getColors(p).getTertiaryFixedDimAccentColor(), bgColor);
textColor = Colors.flattenAlpha(
- getColors(p).getOnTertiaryFixedAccentTextColor(), pillColor);
+ getColors(p).getOnTertiaryAccentTextColor(), pillColor);
}
contentView.setInt(R.id.expand_button, "setHighlightTextColor", textColor);
contentView.setInt(R.id.expand_button, "setHighlightPillColor", pillColor);
--
2.34.1

69
patches_platform/frameworks_base/0016-Revert-Update-SystemUI-to-new-notification-color-spe.patch → patches_platform/frameworks_base/0018-Revert-Update-SystemUI-to-new-notification-color-spe.patch
View File

@ -1,7 +1,7 @@
From c650743c1e67f48640774af517a2ce77f04e1141 Mon Sep 17 00:00:00 2001
From 912eb2ce819f09cf4e4592833547ea94b8ee3d80 Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Thu, 4 Apr 2024 18:26:02 +0800
Subject: [PATCH 16/34] Revert "Update SystemUI to new notification color spec"
Subject: [PATCH 18/43] Revert "Update SystemUI to new notification color spec"
This reverts commit db2c5554ac653567d1433d3ff99328c5d855c233.
@ -37,13 +37,13 @@ Change-Id: Iddbe46f4d01d05d6579c1e8b9dab266dd605e199
.../row/wrapper/NotificationViewWrapper.java | 3 +-
.../stack/NotificationChildrenContainer.java | 2 +-
.../stack/NotificationSectionsManager.kt | 8 ++---
.../stack/NotificationStackScrollLayout.java | 25 +++++++---------
.../stack/NotificationStackScrollLayout.java | 23 +++++++-------
.../notification/stack/SectionHeaderView.java | 6 ++--
.../statusbar/phone/ScrimController.java | 5 ++--
.../statusbar/phone/TapAgainView.java | 7 ++---
.../statusbar/policy/RemoteInputView.java | 15 +++++-----
.../row/ActivatableNotificationViewTest.kt | 5 ++--
36 files changed, 101 insertions(+), 139 deletions(-)
36 files changed, 101 insertions(+), 137 deletions(-)
diff --git a/packages/SystemUI/res/color/notification_guts_priority_button_bg_stroke.xml b/packages/SystemUI/res/color/notification_guts_priority_button_bg_stroke.xml
index d1b8a064724d..015e9f99212d 100644
@ -153,7 +153,7 @@ index 84e2231738d4..bd9394bf9f8a 100644
<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
index 3f903aece0b5..40b9238b5e87 100644
--- a/packages/SystemUI/res/drawable/notification_material_bg.xml
+++ b/packages/SystemUI/res/drawable/notification_material_bg.xml
@@ -20,7 +20,7 @@
@ -320,7 +320,7 @@ index 19a3f2fd521c..852db1b8fb91 100644
</LinearLayout>
diff --git a/packages/SystemUI/res/layout/notification_snooze.xml b/packages/SystemUI/res/layout/notification_snooze.xml
index 6e541a7a5f32..8b5368098c00 100644
index ce09385eaf45..6608d8620f86 100644
--- a/packages/SystemUI/res/layout/notification_snooze.xml
+++ b/packages/SystemUI/res/layout/notification_snooze.xml
@@ -23,7 +23,7 @@
@ -409,7 +409,7 @@ index 53abe87e7c12..c4d8d55f74e2 100644
android:layout_width="wrap_content"
android:layout_height="wrap_content"
diff --git a/packages/SystemUI/res/values-night/colors.xml b/packages/SystemUI/res/values-night/colors.xml
index bcc3c83b4560..e759c1211a93 100644
index 61a323d44dfc..ddf188e3f1d3 100644
--- a/packages/SystemUI/res/values-night/colors.xml
+++ b/packages/SystemUI/res/values-night/colors.xml
@@ -33,7 +33,7 @@
@ -422,10 +422,10 @@ index bcc3c83b4560..e759c1211a93 100644
<color 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
index 46364820c5d5..846fd5736590 100644
--- a/packages/SystemUI/res/values/colors.xml
+++ b/packages/SystemUI/res/values/colors.xml
@@ -116,7 +116,7 @@
@@ -121,7 +121,7 @@
<!-- Chosen so fill over background matches single tone -->
<color name="dark_mode_qs_icon_color_dual_tone_fill">#99000000</color>
@ -435,10 +435,10 @@ index 34dcd655b8e7..91a72922fd0a 100644
<!-- 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
index ce08ca3e43af..ae354d634f67 100644
--- a/packages/SystemUI/res/values/styles.xml
+++ b/packages/SystemUI/res/values/styles.xml
@@ -602,34 +602,34 @@
@@ -625,34 +625,34 @@
<style name="TextAppearance.NotificationImportanceChannel">
<item name="android:textSize">@dimen/notification_importance_channel_text</item>
<item name="android:fontFamily">@*android:string/config_headlineFontFamilyMedium</item>
@ -478,7 +478,7 @@ index e3d4419afceb..7852608df57d 100644
<item name="android:gravity">center</item>
</style>
@@ -640,28 +640,10 @@
@@ -663,28 +663,10 @@
<item name="android:gravity">center</item>
</style>
@ -528,10 +528,10 @@ index 2338be28d32c..c9758471a30e 100644
public void setText(@StringRes int text) {
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/footer/ui/view/FooterView.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/footer/ui/view/FooterView.java
index 3616fd6d8cd1..a6e07f1f5e3e 100644
index 16f18a3c3fb6..17dc2a6ad815 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/footer/ui/view/FooterView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/footer/ui/view/FooterView.java
@@ -313,25 +313,26 @@ public class FooterView extends StackScrollerDecorView {
@@ -361,25 +361,26 @@ public class FooterView extends StackScrollerDecorView {
*/
public void updateColors() {
Resources.Theme theme = mContext.getTheme();
@ -559,11 +559,11 @@ index 3616fd6d8cd1..a6e07f1f5e3e 100644
mClearAllButton.setBackground(clearAllBg);
- mClearAllButton.setTextColor(onSurface);
+ mClearAllButton.setTextColor(textColor);
mManageButton.setBackground(manageBg);
- mManageButton.setTextColor(onSurface);
mManageOrHistoryButton.setBackground(manageBg);
- mManageOrHistoryButton.setTextColor(onSurface);
- mSeenNotifsFooterTextView.setTextColor(onSurface);
- mSeenNotifsFooterTextView.setCompoundDrawableTintList(ColorStateList.valueOf(onSurface));
+ mManageButton.setTextColor(textColor);
+ mManageOrHistoryButton.setTextColor(textColor);
+ final @ColorInt int labelTextColor =
+ Utils.getColorAttrDefaultColor(mContext, android.R.attr.textColorPrimary);
+ mSeenNotifsFooterTextView.setTextColor(labelTextColor);
@ -573,10 +573,10 @@ index 3616fd6d8cd1..a6e07f1f5e3e 100644
private void updateResources() {
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ActivatableNotificationView.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ActivatableNotificationView.java
index 4fe05ec9990c..9fa9049cc7cd 100644
index 83c50f52af6f..455a286346e6 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ActivatableNotificationView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ActivatableNotificationView.java
@@ -124,7 +124,7 @@ public abstract class ActivatableNotificationView extends ExpandableOutlineView
@@ -122,7 +122,7 @@ public abstract class ActivatableNotificationView extends ExpandableOutlineView
private void updateColors() {
mNormalColor = Utils.getColorAttrDefaultColor(mContext,
@ -654,10 +654,10 @@ index 50f3e7896442..6f602ff437eb 100644
}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationChildrenContainer.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationChildrenContainer.java
index 0236fc265add..a929e4f3ea7f 100644
index fa973001cec7..3ac14fc39065 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationChildrenContainer.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationChildrenContainer.java
@@ -1362,7 +1362,7 @@ public class NotificationChildrenContainer extends ViewGroup
@@ -1504,7 +1504,7 @@ public class NotificationChildrenContainer extends ViewGroup
Resources.Theme theme = new ContextThemeWrapper(mContext,
com.android.internal.R.style.Theme_DeviceDefault_DayNight).getTheme();
try (TypedArray ta = theme.obtainStyledAttributes(
@ -667,7 +667,7 @@ index 0236fc265add..a929e4f3ea7f 100644
}
mHybridGroupManager.setOverflowNumberColor(mOverflowNumber, color);
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationSectionsManager.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationSectionsManager.kt
index cfc433a09c4d..fd064eeab2ab 100644
index d269eda6795a..5cd0c0d08d3b 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationSectionsManager.kt
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationSectionsManager.kt
@@ -244,10 +244,10 @@ class NotificationSectionsManager @Inject internal constructor(
@ -686,10 +686,10 @@ index cfc433a09c4d..fd064eeab2ab 100644
companion object {
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java
index 3bbdfd164ba7..c84aab1f83cb 100644
index fb8bc7a34a9c..d8363fa54427 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java
@@ -341,7 +341,7 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable
@@ -351,7 +351,7 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable
private boolean mAnimateNextBackgroundTop;
private boolean mAnimateNextBackgroundBottom;
private boolean mAnimateNextSectionBoundsChange;
@ -698,7 +698,7 @@ index 3bbdfd164ba7..c84aab1f83cb 100644
private float mDimAmount;
private ValueAnimator mDimAnimator;
private final ArrayList<ExpandableView> mTmpSortedChildren = new ArrayList<>();
@@ -643,8 +643,8 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable
@@ -665,8 +665,8 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable
mSections = mSectionsManager.createSectionsForBuckets();
mAmbientState = Dependency.get(AmbientState.class);
@ -709,7 +709,7 @@ index 3bbdfd164ba7..c84aab1f83cb 100644
int minHeight = res.getDimensionPixelSize(R.dimen.notification_min_height);
int maxHeight = res.getDimensionPixelSize(R.dimen.notification_max_height);
mSplitShadeMinContentHeight = res.getDimensionPixelSize(
@@ -780,8 +780,8 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable
@@ -810,8 +810,8 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable
}
void updateBgColor() {
@ -720,7 +720,7 @@ index 3bbdfd164ba7..c84aab1f83cb 100644
updateBackgroundDimming();
for (int i = 0; i < getChildCount(); i++) {
View child = getChildAt(i);
@@ -4473,19 +4473,14 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable
@@ -4622,22 +4622,19 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable
}
/**
@ -734,17 +734,20 @@ index 3bbdfd164ba7..c84aab1f83cb 100644
- mContext, com.android.internal.R.attr.materialColorOnSurfaceVariant);
-
- mSectionsManager.setHeaderForegroundColors(onSurface, onSurfaceVariant);
-
+ final @ColorInt int textColor =
+ Utils.getColorAttrDefaultColor(mContext, android.R.attr.textColorPrimary);
+ mSectionsManager.setHeaderForegroundColor(textColor);
if (mFooterView != null) {
mFooterView.updateColors();
-
}
if (mEmptyShadeView != null) {
- mEmptyShadeView.setTextColors(onSurface, onSurfaceVariant);
+ mEmptyShadeView.setTextColor(textColor);
}
}
void goToFullShade(long delay) {
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/SectionHeaderView.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/SectionHeaderView.java
index 580431a13d1b..59e1af5eb6f1 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/SectionHeaderView.java
@ -762,10 +765,10 @@ index 580431a13d1b..59e1af5eb6f1 100644
}
}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java
index ae04eaf49b65..05904eae769c 100644
index d2e36b88fd9d..3404d5bbcc53 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java
@@ -1496,9 +1496,8 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, Dump
@@ -1555,9 +1555,8 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, Dump
private void updateThemeColors() {
if (mScrimBehind == null) return;
int background = Utils.getColorAttr(mScrimBehind.getContext(),
@ -810,7 +813,7 @@ index 66ac17eee545..a033e1d55333 100644
}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/RemoteInputView.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/RemoteInputView.java
index 4864fb8ca634..ceed81a182aa 100644
index 2a48807ace2f..e02881951dd4 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/RemoteInputView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/RemoteInputView.java
@@ -130,7 +130,7 @@ public class RemoteInputView extends LinearLayout implements View.OnClickListene

22
patches_platform/frameworks_base/0017-Revert-Update-framework-to-new-notification-color-sp.patch → patches_platform/frameworks_base/0019-Revert-Update-framework-to-new-notification-color-sp.patch
View File

@ -1,7 +1,7 @@
From 456e921e4ea5b79cdf5afbf5207c663d47e1a3b2 Mon Sep 17 00:00:00 2001
From ddefb3aa749044a6b4838687f669c390512c6711 Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Thu, 4 Apr 2024 18:26:08 +0800
Subject: [PATCH 17/34] Revert "Update framework to new notification color
Subject: [PATCH 19/43] Revert "Update framework to new notification color
spec"
This reverts commit 6063e254e0cc84243e3a3fb85fe1bff71b302a87.
@ -12,10 +12,10 @@ This reverts commit 6063e254e0cc84243e3a3fb85fe1bff71b302a87.
3 files changed, 15 insertions(+), 53 deletions(-)
diff --git a/core/java/android/app/Notification.java b/core/java/android/app/Notification.java
index 7454e52b50ef..5d55f3440b57 100644
index baecf785a8af..671b8d4153c5 100644
--- a/core/java/android/app/Notification.java
+++ b/core/java/android/app/Notification.java
@@ -5618,8 +5618,7 @@ public class Notification implements Parcelable
@@ -5718,8 +5718,7 @@ public class Notification implements Parcelable
contentView.setInt(R.id.expand_button, "setDefaultPillColor", pillColor);
// Use different highlighted colors for conversations' unread count
if (p.mHighlightExpander) {
@ -25,7 +25,7 @@ index 7454e52b50ef..5d55f3440b57 100644
textColor = Colors.flattenAlpha(
getColors(p).getOnTertiaryAccentTextColor(), pillColor);
}
@@ -12782,9 +12781,6 @@ public class Notification implements Parcelable
@@ -12944,9 +12943,6 @@ public class Notification implements Parcelable
private int mSecondaryAccentColor = COLOR_INVALID;
private int mTertiaryAccentColor = COLOR_INVALID;
private int mOnTertiaryAccentTextColor = COLOR_INVALID;
@ -35,7 +35,7 @@ index 7454e52b50ef..5d55f3440b57 100644
private int mErrorColor = COLOR_INVALID;
private int mContrastColor = COLOR_INVALID;
private int mRippleAlpha = 0x33;
@@ -12842,7 +12838,7 @@ public class Notification implements Parcelable
@@ -13004,7 +13000,7 @@ public class Notification implements Parcelable
if (isColorized) {
if (rawColor == COLOR_DEFAULT) {
@ -44,7 +44,7 @@ index 7454e52b50ef..5d55f3440b57 100644
try (TypedArray ta = obtainDayNightAttributes(ctx, attrs)) {
mBackgroundColor = getColor(ta, 0, Color.WHITE);
}
@@ -12860,21 +12856,17 @@ public class Notification implements Parcelable
@@ -13022,21 +13018,17 @@ public class Notification implements Parcelable
mSecondaryAccentColor = mSecondaryTextColor;
mTertiaryAccentColor = flattenAlpha(mPrimaryTextColor, mBackgroundColor);
mOnTertiaryAccentTextColor = mBackgroundColor;
@ -73,7 +73,7 @@ index 7454e52b50ef..5d55f3440b57 100644
R.attr.colorError,
R.attr.colorControlHighlight
};
@@ -12886,10 +12878,8 @@ public class Notification implements Parcelable
@@ -13048,10 +13040,8 @@ public class Notification implements Parcelable
mSecondaryAccentColor = getColor(ta, 4, COLOR_INVALID);
mTertiaryAccentColor = getColor(ta, 5, COLOR_INVALID);
mOnTertiaryAccentTextColor = getColor(ta, 6, COLOR_INVALID);
@ -86,7 +86,7 @@ index 7454e52b50ef..5d55f3440b57 100644
}
mContrastColor = calculateContrastColor(ctx, rawColor, mPrimaryAccentColor,
mBackgroundColor, nightMode);
@@ -12917,14 +12907,6 @@ public class Notification implements Parcelable
@@ -13079,14 +13069,6 @@ public class Notification implements Parcelable
ContrastColorUtil.resolvePrimaryColor(
ctx, mTertiaryAccentColor, nightMode), 0xFF);
}
@ -101,7 +101,7 @@ index 7454e52b50ef..5d55f3440b57 100644
if (mErrorColor == COLOR_INVALID) {
mErrorColor = mPrimaryTextColor;
}
@@ -12998,16 +12980,6 @@ public class Notification implements Parcelable
@@ -13160,16 +13142,6 @@ public class Notification implements Parcelable
return mOnTertiaryAccentTextColor;
}
@ -119,7 +119,7 @@ index 7454e52b50ef..5d55f3440b57 100644
* @return the contrast-adjusted version of the color provided by the app, or the
* primary text color when colorized.
diff --git a/core/res/res/values/colors.xml b/core/res/res/values/colors.xml
index 00cf4243cfa9..2050cfe11d0e 100644
index d8191c0c3597..b4139f343fa5 100644
--- a/core/res/res/values/colors.xml
+++ b/core/res/res/values/colors.xml
@@ -135,12 +135,11 @@

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

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

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

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

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

@ -1,7 +1,7 @@
From 5f65456d8135c74d48cd0528fdf7005e235ffd43 Mon Sep 17 00:00:00 2001
From 4325ec74e21420a222860e473e9062c874046f9d Mon Sep 17 00:00:00 2001
From: Danny Lin <danny@kdrag0n.dev>
Date: Mon, 11 Oct 2021 19:24:58 -0700
Subject: [PATCH 20/34] SystemUI: Follow light/dark theme in quick settings
Subject: [PATCH 22/43] SystemUI: Follow light/dark theme in quick settings
Android 12's dual-tone style where the quick settings panel is always
dark makes the light theme look like a second-class citizen. Pure black
@ -33,8 +33,8 @@ Signed-off-by: Pranav Vashi <neobuddy89@gmail.com>
packages/SystemUI/res/values-night/styles.xml | 31 ++++++++++++++++++-
packages/SystemUI/res/values/styles.xml | 20 ++++++------
.../statusbar/phone/ScrimController.java | 2 +-
.../systemui/statusbar/phone/ScrimState.java | 16 +++++-----
4 files changed, 49 insertions(+), 20 deletions(-)
.../systemui/statusbar/phone/ScrimState.java | 20 ++++++------
4 files changed, 51 insertions(+), 22 deletions(-)
diff --git a/packages/SystemUI/res/values-night/styles.xml b/packages/SystemUI/res/values-night/styles.xml
index b6971d3c1fa4..8972df2b7490 100644
@ -86,10 +86,10 @@ index b6971d3c1fa4..8972df2b7490 100644
<style name="LongScreenshotActivity" parent="@android:style/Theme.DeviceDefault.DayNight">
<item name="android:windowNoTitle">true</item>
diff --git a/packages/SystemUI/res/values/styles.xml b/packages/SystemUI/res/values/styles.xml
index a3d93d832b38..7ed9f91f30cd 100644
index 7422d5a14221..0ac7e82fa42b 100644
--- a/packages/SystemUI/res/values/styles.xml
+++ b/packages/SystemUI/res/values/styles.xml
@@ -393,7 +393,7 @@
@@ -416,7 +416,7 @@
<item name="isQsTheme">true</item>
<item name="lightIconTheme">@style/QSIconTheme</item>
<item name="darkIconTheme">@style/QSIconTheme</item>
@ -98,7 +98,7 @@ index a3d93d832b38..7ed9f91f30cd 100644
<item name="android:windowIsFloating">true</item>
<item name="android:homeAsUpIndicator">@drawable/ic_arrow_back</item>
@@ -406,14 +406,14 @@
@@ -429,14 +429,14 @@
<item name="onSurfaceVariant">?androidprv:attr/materialColorOnSurfaceVariant</item>
<item name="outline">?androidprv:attr/materialColorOutline</item>
@ -121,7 +121,7 @@ index a3d93d832b38..7ed9f91f30cd 100644
<item name="android:itemTextAppearance">@style/Control.MenuItem</item>
</style>
@@ -663,7 +663,7 @@
@@ -686,7 +686,7 @@
<style name="QSCustomizeToolbar" parent="@*android:style/Widget.DeviceDefault.Toolbar">
<item name="android:textColor">?attr/onSurface</item>
@ -131,10 +131,10 @@ index a3d93d832b38..7ed9f91f30cd 100644
<!-- 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
index 05904eae769c..1130585db0c7 100644
index 3404d5bbcc53..04c2e5005d34 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java
@@ -945,7 +945,7 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, Dump
@@ -997,7 +997,7 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, Dump
mNotificationsAlpha = behindAlpha;
mNotificationsTint = behindTint;
mBehindAlpha = 1;
@ -144,36 +144,36 @@ index 05904eae769c..1130585db0c7 100644
mBehindAlpha = behindAlpha;
if (mState == ScrimState.KEYGUARD && mTransitionToFullShadeProgress > 0.0f) {
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimState.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimState.java
index e3b65ab27f48..44297566d0f4 100644
index f2a649ba2e32..394d6ba5f696 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimState.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimState.java
@@ -82,7 +82,7 @@ public enum ScrimState {
@@ -83,7 +83,7 @@ public enum ScrimState {
mBehindAlpha = mClipQsScrim ? 1 : mScrimBehindAlphaKeyguard;
mNotifAlpha = mClipQsScrim ? mScrimBehindAlphaKeyguard : 0;
if (mClipQsScrim) {
- updateScrimColor(mScrimBehind, 1f /* alpha */, Color.BLACK);
- updateScrimColor(mScrimBehind, 1f /* alpha */, mBackgroundColor);
+ updateScrimColor(mScrimBehind, 1f /* alpha */, Color.TRANSPARENT);
}
}
},
@@ -122,7 +122,7 @@ public enum ScrimState {
@@ -123,7 +123,7 @@ public enum ScrimState {
@Override
public void prepare(ScrimState previousState) {
mBehindAlpha = mClipQsScrim ? 1 : mDefaultScrimAlpha;
- mBehindTint = mClipQsScrim ? Color.BLACK : mSurfaceColor;
- mBehindTint = mClipQsScrim ? mBackgroundColor : mSurfaceColor;
+ mBehindTint = mSurfaceColor;
mNotifAlpha = mClipQsScrim ? mDefaultScrimAlpha : 0;
mNotifTint = Color.TRANSPARENT;
mFrontAlpha = 0f;
@@ -154,10 +154,10 @@ public enum ScrimState {
@@ -155,10 +155,10 @@ public enum ScrimState {
mBehindAlpha = mClipQsScrim ? 1 : mDefaultScrimAlpha;
mNotifAlpha = 1f;
mFrontAlpha = 0f;
- mBehindTint = mClipQsScrim ? Color.TRANSPARENT : Color.BLACK;
- mBehindTint = mClipQsScrim ? Color.TRANSPARENT : mBackgroundColor;
+ mBehindTint = Color.TRANSPARENT;
if (mClipQsScrim) {
- updateScrimColor(mScrimBehind, 1f /* alpha */, Color.BLACK);
- updateScrimColor(mScrimBehind, 1f /* alpha */, mBackgroundColor);
+ updateScrimColor(mScrimBehind, 1f /* alpha */, Color.TRANSPARENT);
}
}
@ -182,25 +182,27 @@ index e3b65ab27f48..44297566d0f4 100644
&& !fromAod;
mFrontTint = Color.TRANSPARENT;
- mBehindTint = Color.BLACK;
- mBehindTint = mBackgroundColor;
+ mBehindTint = Color.TRANSPARENT;
mBlankScreen = false;
if (mDisplayRequiresBlanking && previousState == ScrimState.AOD) {
// Set all scrims black, before they fade transparent.
updateScrimColor(mScrimInFront, 1f /* alpha */, Color.BLACK /* tint */);
- updateScrimColor(mScrimBehind, 1f /* alpha */, Color.BLACK /* tint */);
- updateScrimColor(mScrimInFront, 1f /* alpha */, mBackgroundColor /* tint */);
- updateScrimColor(mScrimBehind, 1f /* alpha */, mBackgroundColor /* tint */);
+ updateScrimColor(mScrimInFront, 1f /* alpha */, Color.BLACK /* tint */);
+ updateScrimColor(mScrimBehind, 1f /* alpha */, Color.TRANSPARENT /* tint */);
// Scrims should still be black at the end of the transition.
mFrontTint = Color.BLACK;
- mBehindTint = Color.BLACK;
- mFrontTint = mBackgroundColor;
- mBehindTint = mBackgroundColor;
+ mFrontTint = Color.BLACK;
+ mBehindTint = Color.TRANSPARENT;
mBlankScreen = true;
}
if (mClipQsScrim) {
- updateScrimColor(mScrimBehind, 1f /* alpha */, Color.BLACK);
- updateScrimColor(mScrimBehind, 1f /* alpha */, mBackgroundColor);
+ updateScrimColor(mScrimBehind, 1f /* alpha */, Color.TRANSPARENT);
}
}

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

@ -1,7 +1,7 @@
From 2ec9f99186510028c1f9d75377a8e65fbc100723 Mon Sep 17 00:00:00 2001
From eb8f957832c7c8e26dc0f006eda85e169ff9a020 Mon Sep 17 00:00:00 2001
From: Pranav Vashi <neobuddy89@gmail.com>
Date: Wed, 13 Dec 2023 23:24:29 +0530
Subject: [PATCH 21/34] SystemUI: Use themewrapper for QSCustomizer and tune
Subject: [PATCH 23/43] SystemUI: Use themewrapper for QSCustomizer and tune
colorUnavailable
* 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(-)
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 1af2306ad77d..705d6bb940d6 100644
index f8d408054d25..941e5e3699cf 100644
--- a/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;
@ -24,7 +24,7 @@ index 1af2306ad77d..705d6bb940d6 100644
import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
@@ -67,13 +68,15 @@ public class QSCustomizer extends LinearLayout {
@@ -70,13 +71,15 @@ public class QSCustomizer extends LinearLayout {
public QSCustomizer(Context context, AttributeSet attrs) {
super(context, attrs);
@ -33,18 +33,18 @@ index 1af2306ad77d..705d6bb940d6 100644
+ new ContextThemeWrapper(context, R.style.Theme_SystemUI_QuickSettings);
+ LayoutInflater.from(themedContext).inflate(R.layout.qs_customize_panel_content, this);
mClipper = new QSDetailClipper(findViewById(R.id.customize_container));
Toolbar toolbar = findViewById(com.android.internal.R.id.action_bar);
mToolbar = findViewById(com.android.internal.R.id.action_bar);
TypedValue value = new TypedValue();
- mContext.getTheme().resolveAttribute(android.R.attr.homeAsUpIndicator, value, true);
+ themedContext.getTheme().resolveAttribute(android.R.attr.homeAsUpIndicator, value, true);
toolbar.setNavigationIcon(
mToolbar.setNavigationIcon(
- getResources().getDrawable(value.resourceId, mContext.getTheme()));
+ getResources().getDrawable(value.resourceId, themedContext.getTheme()));
toolbar.getMenu().add(Menu.NONE, MENU_RESET, 0, com.android.internal.R.string.reset)
mToolbar.getMenu().add(Menu.NONE, MENU_RESET, 0, com.android.internal.R.string.reset)
.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
index 456520051f58..3a018c70a8ad 100644
index 9fefcbd86e51..0dd244eca2cb 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/tileimpl/QSTileViewImpl.kt
+++ b/packages/SystemUI/src/com/android/systemui/qs/tileimpl/QSTileViewImpl.kt
@@ -100,7 +100,7 @@ open class QSTileViewImpl @JvmOverloads constructor(

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

@ -1,7 +1,7 @@
From 11a452ed141a31cff8d0ff3c10c28c189a2dffe7 Mon Sep 17 00:00:00 2001
From 09b4775be2cb7bf94ba4815025164c41de1a1baf Mon Sep 17 00:00:00 2001
From: Danny Lin <danny@kdrag0n.dev>
Date: Mon, 11 Oct 2021 19:25:02 -0700
Subject: [PATCH 22/34] SystemUI: Initialize QS tiles in inactive state
Subject: [PATCH 24/43] SystemUI: Initialize QS tiles in inactive state
Now that the QS fragment is recreated when changing the UI mode (so that
it follows light/dark themes), all tiles flash with active color briefly
@ -17,7 +17,7 @@ Change-Id: I048171d503f5533e91bab486b8805ac15c329f31
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/packages/SystemUI/plugin/src/com/android/systemui/plugins/qs/QSTile.java b/packages/SystemUI/plugin/src/com/android/systemui/plugins/qs/QSTile.java
index 5d85fbade873..0c7c46d8d31d 100644
index c9e298934acc..83fd07d1359d 100644
--- a/packages/SystemUI/plugin/src/com/android/systemui/plugins/qs/QSTile.java
+++ b/packages/SystemUI/plugin/src/com/android/systemui/plugins/qs/QSTile.java
@@ -154,7 +154,7 @@ public interface QSTile {

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

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

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

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

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

@ -1,24 +1,49 @@
From 901e7a826dcde851f61bd7811eceba2456fb9c25 Mon Sep 17 00:00:00 2001
From 7d6f38a5a465aae5e1912b689ba42960580e1ca0 Mon Sep 17 00:00:00 2001
From: ReallySnow <reallysnow233@gmail.com>
Date: Thu, 15 Sep 2022 13:38:48 +0800
Subject: [PATCH 29/34] SystemUI: Follow light/dark theme in SplitShade Header
Subject: [PATCH 27/43] SystemUI: Follow light/dark theme in SplitShade Header
* Google's default implementation is dark, which means
it doesn't need to follow the light/dark color change,
but we broke it, so add it to complete the SplitShade
Header color change
Co-authored-by: Col_or <col_or@qq.com>
Change-Id: I5464039885197eeb43bd31b822bfcba7a1b08776
---
.../systemui/shade/ShadeHeaderController.kt | 28 +++++++++++++++++++
.../systemui/shade/carrier/ShadeCarrier.java | 8 ++++++
.../shade/carrier/ShadeCarrierGroup.java | 16 +++++++++++
.../shade/ShadeHeaderControllerTest.kt | 1 +
4 files changed, 53 insertions(+)
neobuddy89: Rewrite with some fixes.
Change-Id: I5464039885197eeb43bd31b822bfcba7a1b08776
Co-authored-by: Col_or <col_or@qq.com>
Co-authored-by: Pranav Vashi <neobuddy89@gmail.com>
Signed-off-by: Pranav Vashi <neobuddy89@gmail.com>
---
packages/SystemUI/res/values/styles.xml | 6 ++--
.../systemui/shade/ShadeHeaderController.kt | 28 +++++++++++++++++++
.../systemui/shade/carrier/ShadeCarrier.java | 12 ++++++++
.../shade/carrier/ShadeCarrierGroup.java | 14 ++++++++++
.../mobile/ui/binder/ShadeCarrierBinder.kt | 3 ++
.../shade/ShadeHeaderControllerTest.kt | 1 +
6 files changed, 62 insertions(+), 2 deletions(-)
diff --git a/packages/SystemUI/res/values/styles.xml b/packages/SystemUI/res/values/styles.xml
index 0ac7e82fa42b..a8447df43d0c 100644
--- a/packages/SystemUI/res/values/styles.xml
+++ b/packages/SystemUI/res/values/styles.xml
@@ -154,10 +154,12 @@
<item name="android:textColor">?attr/onSurface</item>
</style>
- <style name="TextAppearance.QS.Status.Carriers" />
+ <style name="TextAppearance.QS.Status.Carriers">
+ <item name="android:textColor">?android:attr/textColorPrimary</item>
+ </style>
<style name="TextAppearance.QS.Status.Carriers.NoCarrierText">
- <item name="android:textColor">?attr/onSurfaceVariant</item>
+ <item name="android:textColor">?android:attr/textColorPrimary</item>
</style>
<style name="TextAppearance.QS.Status.Build">
diff --git a/packages/SystemUI/src/com/android/systemui/shade/ShadeHeaderController.kt b/packages/SystemUI/src/com/android/systemui/shade/ShadeHeaderController.kt
index 593260996198..5a5cb792c10b 100644
index f3efa031a2a6..d26ef5e73152 100644
--- a/packages/SystemUI/src/com/android/systemui/shade/ShadeHeaderController.kt
+++ b/packages/SystemUI/src/com/android/systemui/shade/ShadeHeaderController.kt
@@ -21,8 +21,11 @@ import android.animation.AnimatorListenerAdapter
@ -33,7 +58,7 @@ index 593260996198..5a5cb792c10b 100644
import android.graphics.Insets
import android.os.Bundle
import android.os.Trace
@@ -91,6 +94,7 @@ constructor(
@@ -92,6 +95,7 @@ constructor(
private val privacyIconsController: HeaderPrivacyIconsController,
private val insetsProvider: StatusBarContentInsetsProvider,
private val configurationController: ConfigurationController,
@ -41,7 +66,7 @@ index 593260996198..5a5cb792c10b 100644
private val variableDateViewControllerFactory: VariableDateViewController.Factory,
@Named(SHADE_HEADER) private val batteryMeterViewController: BatteryMeterViewController,
private val dumpManager: DumpManager,
@@ -142,6 +146,7 @@ constructor(
@@ -143,6 +147,7 @@ constructor(
private var cutout: DisplayCutout? = null
private var lastInsets: WindowInsets? = null
private var nextAlarmIntent: PendingIntent? = null
@ -49,18 +74,18 @@ index 593260996198..5a5cb792c10b 100644
private var qsDisabled = false
private var visible = false
@@ -288,6 +293,10 @@ constructor(
updateCarrierGroupPadding()
@@ -290,6 +295,10 @@ constructor(
clock.onDensityOrFontScaleChanged()
}
+
+ override fun onUiModeChanged() {
+ updateResources()
+ }
}
private val nextAlarmCallback =
@@ -341,6 +350,7 @@ constructor(
+
override fun onThemeChanged() {
clock.setTextAppearance(R.style.TextAppearance_QS_Status)
date.setTextAppearance(R.style.TextAppearance_QS_Status)
@@ -348,6 +357,7 @@ constructor(
demoModeController.addCallback(demoModeReceiver)
statusBarIconController.addIconGroup(iconManager)
nextAlarmController.addCallback(nextAlarmCallback)
@ -68,7 +93,7 @@ index 593260996198..5a5cb792c10b 100644
systemIconsHoverContainer.setOnHoverListener(
statusOverlayHoverListenerFactory.createListener(systemIconsHoverContainer)
)
@@ -544,6 +554,24 @@ constructor(
@@ -554,6 +564,24 @@ constructor(
header.setPadding(padding, header.paddingTop, padding, header.paddingBottom)
updateQQSPaddings()
qsBatteryModeController.updateResources()
@ -94,10 +119,10 @@ index 593260996198..5a5cb792c10b 100644
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
index 6ca0ad47a0a7..24a1e7cda1fd 100644
index 9544d0f83bac..e1aac1771a30 100644
--- a/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 {
@@ -151,6 +151,14 @@ public class ShadeCarrier extends LinearLayout {
com.android.settingslib.R.string.not_default_data_content_description));
}
@ -112,8 +137,19 @@ index 6ca0ad47a0a7..24a1e7cda1fd 100644
@VisibleForTesting
View getRSSIView() {
return mMobileGroup;
@@ -160,6 +168,10 @@ public class ShadeCarrier extends LinearLayout {
mCarrierText.setText(text);
}
+ public void setCarrierTextColor(int color) {
+ mCarrierText.setTextColor(color);
+ }
+
public void updateTextAppearance(@StyleRes int resId) {
mCarrierText.setTextAppearance(resId);
if (mModernMobileView != null) {
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 e84fb485829c..a5bcfeacff31 100644
index 863858b4cee2..1b7d1047221c 100644
--- a/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;
@ -128,7 +164,7 @@ index e84fb485829c..a5bcfeacff31 100644
import android.widget.LinearLayout;
import android.widget.TextView;
@@ -58,6 +61,19 @@ public class ShadeCarrierGroup extends LinearLayout {
@@ -57,6 +60,17 @@ public class ShadeCarrierGroup extends LinearLayout {
return findViewById(R.id.shade_carrier_divider2);
}
@ -138,16 +174,35 @@ index e84fb485829c..a5bcfeacff31 100644
+ for (ShadeCarrier shadeCarrier : shadeCarriers) {
+ for (int i = 0; i < shadeCarrier.getChildCount(); i++) {
+ shadeCarrier.updateColors(colorStateList);
+ if (shadeCarrier.getChildAt(i) instanceof TextView) {
+ ((TextView) shadeCarrier.getChildAt(i)).setTextColor(color);
+ }
+ shadeCarrier.setCarrierTextColor(color);
+ }
+ }
+ }
+
public void updateTextAppearance(@StyleRes int resId) {
FontSizeUtils.updateFontSizeFromStyle(getNoSimTextView(), resId);
getNoSimTextView().setTextAppearance(resId);
getCarrier1View().updateTextAppearance(resId);
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/ui/binder/ShadeCarrierBinder.kt b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/ui/binder/ShadeCarrierBinder.kt
index 081e1015e26e..a3fb0c67dcba 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/ui/binder/ShadeCarrierBinder.kt
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/ui/binder/ShadeCarrierBinder.kt
@@ -24,6 +24,8 @@ import com.android.systemui.statusbar.pipeline.mobile.ui.viewmodel.ShadeCarrierG
import com.android.systemui.util.AutoMarqueeTextView
import kotlinx.coroutines.launch
+import com.android.systemui.res.R
+
object ShadeCarrierBinder {
/** Binds the view to the view-model, continuing to update the former based on the latter */
@JvmStatic
@@ -32,6 +34,7 @@ object ShadeCarrierBinder {
viewModel: ShadeCarrierGroupMobileIconViewModel,
) {
carrierTextView.isVisible = true
+ carrierTextView.setTextAppearance(R.style.TextAppearance_QS_Status_Carriers)
carrierTextView.repeatWhenAttached {
repeatOnLifecycle(Lifecycle.State.STARTED) {
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

29
patches_platform/frameworks_base/0009-UI-Hide-QS-footer-background.patch → patches_platform/frameworks_base/0028-SystemUI-Use-transparent-background-for-QS-footer.patch
View File

@ -1,16 +1,16 @@
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
From 8b2d57bd39bb54c8706329a856e52fd0ecc6f3db Mon Sep 17 00:00:00 2001
From: Pranav Vashi <neobuddy89@gmail.com>
Date: Wed, 17 Apr 2024 17:35:11 +0530
Subject: [PATCH 28/43] SystemUI: Use transparent background for QS footer
Change-Id: I4d83037e9206dec4181f9b0acd302114fa4a98c1
Signed-off-by: Pranav Vashi <neobuddy89@gmail.com>
---
.../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(-)
.../android/systemui/qs/footer/ui/compose/FooterActions.kt | 4 ++--
.../SystemUI/res/drawable/qs_footer_actions_background.xml | 2 +-
2 files changed, 3 insertions(+), 3 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
index eb71490f049a..d252ef7ffa06 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(
@ -18,10 +18,19 @@ index eb71490f049a..8242afefc56b 100644
}
- val backgroundColor = colorAttr(R.attr.underSurface)
+ val backgroundColor = colorAttr(android.R.color.transparent)
+ val backgroundColor = Color.Transparent
val contentColor = LocalAndroidColorScheme.current.onSurface
val backgroundTopRadius = dimensionResource(R.dimen.qs_corner_radius)
val backgroundModifier =
@@ -319,7 +319,7 @@ private fun TextButton(
) {
Expandable(
shape = CircleShape,
- color = colorAttr(R.attr.underSurface),
+ color = Color.Transparent,
contentColor = LocalAndroidColorScheme.current.onSurfaceVariant,
borderStroke = BorderStroke(1.dp, colorAttr(R.attr.shadeInactive)),
modifier = modifier.padding(horizontal = 4.dp),
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

65
patches_platform/frameworks_base/0029-SystemUI-monet-Remove-unused-colorSchemeIsApplied.patch Normal file
View File

@ -0,0 +1,65 @@
From 79f9b7b31a650bc9586a20ef032bed6f89f83810 Mon Sep 17 00:00:00 2001
From: Pranav Vashi <neobuddy89@gmail.com>
Date: Tue, 16 Apr 2024 21:32:43 +0530
Subject: [PATCH 29/43] SystemUI: monet: Remove unused colorSchemeIsApplied
Usage for this was removed in
https://github.com/crdroidandroid/android_frameworks_base/commit/e09dc531860bbe4e9c21e57a7eb59351078e1e4f
Signed-off-by: Pranav Vashi <neobuddy89@gmail.com>
---
.../theme/ThemeOverlayController.java | 38 -------------------
1 file changed, 38 deletions(-)
diff --git a/packages/SystemUI/src/com/android/systemui/theme/ThemeOverlayController.java b/packages/SystemUI/src/com/android/systemui/theme/ThemeOverlayController.java
index 3fe5fe4ef8c7..321429e43573 100644
--- a/packages/SystemUI/src/com/android/systemui/theme/ThemeOverlayController.java
+++ b/packages/SystemUI/src/com/android/systemui/theme/ThemeOverlayController.java
@@ -754,44 +754,6 @@ public class ThemeOverlayController implements CoreStartable, Dumpable {
});
}
- /**
- * Checks if the color scheme in mColorScheme matches the current system palettes.
- * @param managedProfiles List of managed profiles for this user.
- */
- private boolean colorSchemeIsApplied(Set<UserHandle> managedProfiles) {
- final ArraySet<UserHandle> allProfiles = new ArraySet<>(managedProfiles);
- allProfiles.add(UserHandle.SYSTEM);
- for (UserHandle userHandle : allProfiles) {
- Resources res = userHandle.isSystem()
- ? mResources : mContext.createContextAsUser(userHandle, 0).getResources();
- Resources.Theme theme = mContext.getTheme();
- MaterialDynamicColors dynamicColors = new MaterialDynamicColors(mIsFidelityEnabled);
- if (!(res.getColor(android.R.color.system_accent1_500, theme)
- == mColorScheme.getAccent1().getS500()
- && res.getColor(android.R.color.system_accent2_500, theme)
- == mColorScheme.getAccent2().getS500()
- && res.getColor(android.R.color.system_accent3_500, theme)
- == mColorScheme.getAccent3().getS500()
- && res.getColor(android.R.color.system_neutral1_500, theme)
- == mColorScheme.getNeutral1().getS500()
- && res.getColor(android.R.color.system_neutral2_500, theme)
- == mColorScheme.getNeutral2().getS500()
- && res.getColor(android.R.color.system_outline_variant_dark, theme)
- == dynamicColors.outlineVariant().getArgb(mDynamicSchemeDark)
- && res.getColor(android.R.color.system_outline_variant_light, theme)
- == dynamicColors.outlineVariant().getArgb(mDynamicSchemeLight)
- && res.getColor(android.R.color.system_primary_container_dark, theme)
- == dynamicColors.primaryContainer().getArgb(mDynamicSchemeDark)
- && res.getColor(android.R.color.system_primary_container_light, theme)
- == dynamicColors.primaryContainer().getArgb(mDynamicSchemeLight)
- && res.getColor(android.R.color.system_primary_fixed, theme)
- == dynamicColors.primaryFixed().getArgb(mDynamicSchemeLight))) {
- return false;
- }
- }
- return true;
- }
-
private void updateThemeOverlays() {
final int currentUser = mUserTracker.getUserId();
final String overlayPackageJson = mSecureSettings.getStringForUser(
--
2.34.1

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

@ -1,7 +1,7 @@
From ab0a1b7775420943aae88747a3c79893e934e672 Mon Sep 17 00:00:00 2001
From be6c596038f9a1168a174e20f68ff7dfe6e8a409 Mon Sep 17 00:00:00 2001
From: Pulkit077 <pulkitagarwal2k1@gmail.com>
Date: Fri, 16 Sep 2022 14:46:37 +0530
Subject: [PATCH 32/34] SystemUI: Follow Dark/Light theme for Safe Mode dialog
Subject: [PATCH 30/43] SystemUI: Follow Dark/Light theme for Safe Mode dialog
Change-Id: Ia9864a45551e969abaccd351e8b6d65e21d99165
Signed-off-by: Pulkit077 <pulkitagarwal2k1@gmail.com>
@ -11,7 +11,7 @@ Signed-off-by: Pranav Vashi <neobuddy89@gmail.com>
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
index c919dcbad45b..cb3c30b3fef1 100644
index 4d88510bdde8..431953408b49 100644
--- a/services/core/java/com/android/server/power/ShutdownThread.java
+++ b/services/core/java/com/android/server/power/ShutdownThread.java
@@ -31,6 +31,7 @@ import android.content.IIntentReceiver;

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

@ -1,7 +1,7 @@
From 799c920e75780cf5146f3a3875ce3e84a6df32c1 Mon Sep 17 00:00:00 2001
From e8cea9d915c82a481987aea72f33be9a8cdca6f1 Mon Sep 17 00:00:00 2001
From: Danny Lin <danny@kdrag0n.dev>
Date: Tue, 8 Mar 2022 20:37:33 -0800
Subject: [PATCH 24/34] SystemUI: Follow light/dark theme in power menu
Subject: [PATCH 31/43] SystemUI: Follow light/dark theme in power menu
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
@ -27,7 +27,7 @@ Signed-off-by: Pranav Vashi <neobuddy89@gmail.com>
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
index e759c1211a93..e98196e800cf 100644
index ddf188e3f1d3..3a403b69ff04 100644
--- a/packages/SystemUI/res/values-night/colors.xml
+++ b/packages/SystemUI/res/values-night/colors.xml
@@ -55,6 +55,11 @@
@ -43,10 +43,10 @@ index e759c1211a93..e98196e800cf 100644
<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
index 91a72922fd0a..0e59b3b774df 100644
index 846fd5736590..402e44c3fb31 100644
--- a/packages/SystemUI/res/values/colors.xml
+++ b/packages/SystemUI/res/values/colors.xml
@@ -36,10 +36,10 @@
@@ -39,10 +39,10 @@
<color name="global_actions_grid_background">#F1F3F4</color>
<!-- Colors for Power Menu Lite -->
@ -62,10 +62,10 @@ index 91a72922fd0a..0e59b3b774df 100644
<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
index d94c7bb1c0f8..661e4e6b4b95 100644
index fa1b430a4ed5..0b2cc012f999 100644
--- a/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialogLite.java
+++ b/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialogLite.java
@@ -842,6 +842,15 @@ public class GlobalActionsDialogLite implements DialogInterface.OnDismissListene
@@ -846,6 +846,15 @@ public class GlobalActionsDialogLite implements DialogInterface.OnDismissListene
user.id) != 0;
}

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

@ -1,92 +0,0 @@
From b983f9062624d76c6cf6a66eee0851bb99e83c3d Mon Sep 17 00:00:00 2001
From: DillerOFire <niktofe1@gmail.com>
Date: Wed, 27 Jul 2022 15:28:16 +1000
Subject: [PATCH 31/34] SystemUI: Switch notification background to monet on
heads up
Change-Id: If1822acc3ea604444f2083d7fadec06ffb8eec19
Signed-off-by: Pranav Vashi <neobuddy89@gmail.com>
---
.../notification_material_bg_monet.xml | 26 +++++++++++++++++++
.../row/ActivatableNotificationView.java | 9 ++++++-
.../row/ExpandableNotificationRow.java | 3 +++
3 files changed, 37 insertions(+), 1 deletion(-)
create mode 100644 packages/SystemUI/res/drawable/notification_material_bg_monet.xml
diff --git a/packages/SystemUI/res/drawable/notification_material_bg_monet.xml b/packages/SystemUI/res/drawable/notification_material_bg_monet.xml
new file mode 100644
index 000000000000..61a8e8e9c6e1
--- /dev/null
+++ b/packages/SystemUI/res/drawable/notification_material_bg_monet.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ ~ Copyright (C) 2014 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
+ -->
+
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
+ android:color="?android:attr/colorControlHighlight">
+ <item>
+ <shape>
+ <solid android:color="?androidprv:attr/colorSurface" />
+ </shape>
+ </item>
+</ripple>
\ 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
index 9fa9049cc7cd..dc04895508d0 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
@@ -171,7 +171,7 @@ public abstract class ActivatableNotificationView extends ExpandableOutlineView
* be useful in a configuration change.
*/
protected void initBackground() {
- mBackgroundNormal.setCustomBackground(R.drawable.notification_material_bg);
+ setTranslucentBackground(true);
}
protected boolean hideBackground() {
@@ -182,6 +182,13 @@ public abstract class ActivatableNotificationView extends ExpandableOutlineView
mBackgroundNormal.setVisibility(hideBackground() ? INVISIBLE : VISIBLE);
}
+ public void setTranslucentBackground(boolean translucent) {
+ if (translucent) {
+ mBackgroundNormal.setCustomBackground(R.drawable.notification_material_bg);
+ } else {
+ mBackgroundNormal.setCustomBackground(R.drawable.notification_material_bg_monet);
+ }
+ }
@Override
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
index b6d4dedfe6f7..2ea46cae819f 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRow.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRow.java
@@ -1041,6 +1041,9 @@ public class ExpandableNotificationRow extends ActivatableNotificationView
if (intrinsicHeight != getIntrinsicHeight()) {
notifyHeightChanged(false /* needsAnimation */);
}
+
+ setTranslucentBackground(!pinned);
+
if (pinned) {
setAnimationRunning(true);
mExpandedWhenPinned = false;
--
2.34.1

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

@ -1,7 +1,7 @@
From f38638b25fb4dbabf96d5f30ebe3c2e893a39439 Mon Sep 17 00:00:00 2001
From 3aa6aa1e16a385a3cef393fb58d4a319ca884632 Mon Sep 17 00:00:00 2001
From: althafvly <althafvly@gmail.com>
Date: Tue, 26 May 2020 21:17:59 +0800
Subject: [PATCH 25/34] SystemUI: Re-evaluate system theme on UI mode change
Subject: [PATCH 32/43] SystemUI: Re-evaluate system theme on UI mode change
- Need for power menu to set accurate colors
@ -11,10 +11,10 @@ Change-Id: I05d41eaf8ea19ce3b6ce659d01da33cf55de3b7e
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
index 8d4e70c2b961..744f1eb67f41 100644
index 321429e43573..84e32a1dbaae 100644
--- a/packages/SystemUI/src/com/android/systemui/theme/ThemeOverlayController.java
+++ b/packages/SystemUI/src/com/android/systemui/theme/ThemeOverlayController.java
@@ -78,6 +78,8 @@ import com.android.systemui.monet.ColorScheme;
@@ -80,6 +80,8 @@ import com.android.systemui.monet.ColorScheme;
import com.android.systemui.monet.Style;
import com.android.systemui.monet.TonalPalette;
import com.android.systemui.settings.UserTracker;
@ -23,7 +23,7 @@ index 8d4e70c2b961..744f1eb67f41 100644
import com.android.systemui.statusbar.policy.DeviceProvisionedController;
import com.android.systemui.statusbar.policy.DeviceProvisionedController.DeviceProvisionedListener;
import com.android.systemui.util.kotlin.JavaAdapter;
@@ -141,6 +143,7 @@ public class ThemeOverlayController implements CoreStartable, Dumpable {
@@ -143,6 +145,7 @@ public class ThemeOverlayController implements CoreStartable, Dumpable {
private final boolean mIsMonetEnabled;
private final boolean mIsFidelityEnabled;
private final UserTracker mUserTracker;
@ -31,7 +31,7 @@ index 8d4e70c2b961..744f1eb67f41 100644
private final DeviceProvisionedController mDeviceProvisionedController;
private final Resources mResources;
// Current wallpaper colors associated to a user.
@@ -181,6 +184,15 @@ public class ThemeOverlayController implements CoreStartable, Dumpable {
@@ -184,6 +187,15 @@ public class ThemeOverlayController implements CoreStartable, Dumpable {
// Determines if we should ignore THEME_CUSTOMIZATION_OVERLAY_PACKAGES setting changes.
private boolean mSkipSettingChange;
@ -47,12 +47,12 @@ index 8d4e70c2b961..744f1eb67f41 100644
private final DeviceProvisionedListener mDeviceProvisionedListener =
new DeviceProvisionedListener() {
@Override
@@ -421,10 +433,12 @@ public class ThemeOverlayController implements CoreStartable, Dumpable {
WakefulnessLifecycle wakefulnessLifecycle,
@@ -425,10 +437,12 @@ public class ThemeOverlayController implements CoreStartable, Dumpable {
JavaAdapter javaAdapter,
KeyguardTransitionInteractor keyguardTransitionInteractor,
- UiModeManager uiModeManager) {
+ UiModeManager uiModeManager,
UiModeManager uiModeManager,
- ActivityManager activityManager) {
+ ActivityManager activityManager,
+ ConfigurationController configurationController) {
mContext = context;
mIsMonetEnabled = featureFlags.isEnabled(Flags.MONET);
@ -61,7 +61,7 @@ index 8d4e70c2b961..744f1eb67f41 100644
mDeviceProvisionedController = deviceProvisionedController;
mBroadcastDispatcher = broadcastDispatcher;
mUserManager = userManager;
@@ -538,6 +552,7 @@ public class ThemeOverlayController implements CoreStartable, Dumpable {
@@ -543,6 +557,7 @@ public class ThemeOverlayController implements CoreStartable, Dumpable {
mUserTracker.addCallback(mUserTrackerCallback, mMainExecutor);

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

@ -1,7 +1,7 @@
From 7b7aab383a7a326b5ae110a2154815c088685d85 Mon Sep 17 00:00:00 2001
From 1a69a297d72035abc82ec534448eb1dda2cc6042 Mon Sep 17 00:00:00 2001
From: Danny Baumann <dannybaumann@web.de>
Date: Wed, 20 Jul 2022 15:53:13 +0200
Subject: [PATCH 26/34] SystemUI: Fix QS header clock color
Subject: [PATCH 33/43] SystemUI: Fix QS header clock color
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
@ -11,11 +11,11 @@ QuickStatusBarHeader.updateResources).
Change-Id: Icdf2484793cb63b7c0ab6ab87e94185e6bdc9ca4
Signed-off-by: Pranav Vashi <neobuddy89@gmail.com>
---
.../src/com/android/systemui/statusbar/policy/Clock.java | 8 --------
1 file changed, 8 deletions(-)
.../src/com/android/systemui/statusbar/policy/Clock.java | 9 ---------
1 file changed, 9 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
index cc7a82d49fab..e7d146a5cd5a 100644
index cc7a82d49fab..94f65f2a9833 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/Clock.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/Clock.java
@@ -43,7 +43,6 @@ import android.text.style.CharacterStyle;
@ -26,7 +26,15 @@ index cc7a82d49fab..e7d146a5cd5a 100644
import android.view.Display;
import android.view.View;
import android.view.ViewGroup;
@@ -433,13 +432,6 @@ public class Clock extends TextView implements
@@ -51,7 +50,6 @@ import android.widget.TextView;
import androidx.annotation.Nullable;
-import com.android.settingslib.Utils;
import com.android.systemui.Dependency;
import com.android.systemui.FontSizeUtils;
import com.android.systemui.res.R;
@@ -433,13 +431,6 @@ public class Clock extends TextView implements
setTextColor(mNonAdaptedColor);
}

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

@ -1,7 +1,7 @@
From a4c50a3dbcb4140d93c813be6d128f2d6bf54809 Mon Sep 17 00:00:00 2001
From 25940ffbfecb8b9eed4d9d461b11ea4af3b96e41 Mon Sep 17 00:00:00 2001
From: Adithya R <gh0strider.2k18.reborn@gmail.com>
Date: Mon, 30 May 2022 00:13:02 +0530
Subject: [PATCH 27/34] SystemUI: Calculate paged QS tiles height properly
Subject: [PATCH 34/43] SystemUI: Calculate paged QS tiles height properly
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
@ -15,10 +15,10 @@ Change-Id: I539babdb75c114cc44b4213ff114d4272be22ef6
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
index 052c0daf0b56..cf2834914f66 100644
index 43f3a2242da4..c7f74705a81e 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/PagedTileLayout.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/PagedTileLayout.java
@@ -135,12 +135,16 @@ public class PagedTileLayout extends ViewPager implements QSTileLayout {
@@ -137,12 +137,16 @@ public class PagedTileLayout extends ViewPager implements QSTileLayout {
@Override
public int getTilesHeight() {

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

@ -1,7 +1,7 @@
From 740f1c7ff7d0a429e79d5bf075c162314ca6fd66 Mon Sep 17 00:00:00 2001
From be8be7e3949c88489a4cf6af11326dcb5bac2d96 Mon Sep 17 00:00:00 2001
From: Adithya R <gh0strider.2k18.reborn@gmail.com>
Date: Thu, 19 Jan 2023 14:37:43 +0530
Subject: [PATCH 30/34] SystemUI: Remove visibility check in setting QSCarrier
Subject: [PATCH 35/43] SystemUI: Remove visibility check in setting QSCarrier
color
This fixes a corner case where the signal icon color is incorrect:
@ -19,10 +19,10 @@ Change-Id: I092c06053fc4bc8d9ca51d1d31128da27ef6a823
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
index 24a1e7cda1fd..727a187d20f7 100644
index e1aac1771a30..b7ee9e4b4a38 100644
--- a/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 {
@@ -152,11 +152,8 @@ public class ShadeCarrier extends LinearLayout {
}
public void updateColors(ColorStateList colorStateList) {

27
patches_platform/frameworks_base/0036-SystemUI-Fix-QS-tile-dialog-background-color.patch Normal file
View File

@ -0,0 +1,27 @@
From 0529a4ad0958c1a82739bcfbf7b19604c3cea4ed Mon Sep 17 00:00:00 2001
From: Pranav Vashi <neobuddy89@gmail.com>
Date: Mon, 4 Mar 2024 01:11:13 +0530
Subject: [PATCH 36/43] SystemUI: Fix QS tile dialog background color
Fixes: https://github.com/crdroidandroid/issue_tracker/issues/309
Signed-off-by: Pranav Vashi <neobuddy89@gmail.com>
---
packages/SystemUI/res/values/styles.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/packages/SystemUI/res/values/styles.xml b/packages/SystemUI/res/values/styles.xml
index a8447df43d0c..e4f2cf70b0d3 100644
--- a/packages/SystemUI/res/values/styles.xml
+++ b/packages/SystemUI/res/values/styles.xml
@@ -479,7 +479,7 @@
<item name="android:buttonBarPositiveButtonStyle">@style/Widget.Dialog.Button</item>
<item name="android:buttonBarNegativeButtonStyle">@style/Widget.Dialog.Button.BorderButton</item>
<item name="android:buttonBarNeutralButtonStyle">@style/Widget.Dialog.Button.BorderButton</item>
- <item name="android:colorBackground">?androidprv:attr/materialColorSurfaceBright</item>
+ <item name="android:colorBackground">@color/notification_divider_color</item>
<item name="android:alertDialogStyle">@style/ScrollableAlertDialogStyle</item>
<item name="android:buttonBarStyle">@style/ButtonBarStyle</item>
<item name="android:buttonBarButtonStyle">@style/Widget.Dialog.Button.Large</item>
--
2.34.1

26
patches_platform/frameworks_base/0037-SystemUI-Use-proper-Resolver-background-color.patch Normal file
View File

@ -0,0 +1,26 @@
From 20bdd1f747da317d1e277f333f19d6a7a126f7fc Mon Sep 17 00:00:00 2001
From: elluzion <dyrex2004@gmail.com>
Date: Mon, 7 Dec 2020 20:39:40 +0100
Subject: [PATCH 37/43] SystemUI: Use proper Resolver background color
Signed-off-by: Pranav Vashi <neobuddy89@gmail.com>
---
core/res/res/values-night/themes_device_defaults.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/core/res/res/values-night/themes_device_defaults.xml b/core/res/res/values-night/themes_device_defaults.xml
index 7cfdba7a65be..970dba3d844c 100644
--- a/core/res/res/values-night/themes_device_defaults.xml
+++ b/core/res/res/values-night/themes_device_defaults.xml
@@ -87,7 +87,7 @@ easier.
<style name="Theme.DeviceDefault.Resolver" parent="Theme.DeviceDefault.ResolverCommon">
<item name="windowLightNavigationBar">false</item>
- <item name="colorBackgroundFloating">@android:color/GM2_grey_800</item>
+ <item name="colorBackgroundFloating">?android:attr/colorPrimary</item>
<item name="textColorSecondary">@android:color/resolver_text_color_secondary_dark</item>
</style>
--
2.34.1

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

@ -1,7 +1,7 @@
From 43b40366ed1feb86002b849851678baeed250d47 Mon Sep 17 00:00:00 2001
From bdbd29ab6b1fb3db6084247eceabd95ec35993c6 Mon Sep 17 00:00:00 2001
From: minaripenguin <minaripenguin@users.noreply.github.com>
Date: Fri, 24 Mar 2023 13:04:06 +0800
Subject: [PATCH 33/34] SystemUI: Follow monet theme on privacy indicators
Subject: [PATCH 38/43] SystemUI: Follow monet theme on privacy indicators
Change-Id: Ib713cb3283fcf3a49086c5da8360d2a1b6cd6704
Signed-off-by: minaripenguin <minaripenguin@users.noreply.github.com>
@ -12,10 +12,10 @@ Signed-off-by: Pranav Vashi <neobuddy89@gmail.com>
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/packages/SystemUI/res/values/colors.xml b/packages/SystemUI/res/values/colors.xml
index 0e59b3b774df..8a02dca04251 100644
index 402e44c3fb31..50b962310ac9 100644
--- a/packages/SystemUI/res/values/colors.xml
+++ b/packages/SystemUI/res/values/colors.xml
@@ -216,7 +216,7 @@
@@ -224,7 +224,7 @@
<color name="screenrecord_status_color">#E94235</color>
<color name="screenrecord_icon_color">#D93025</color><!-- red 600 -->
@ -25,10 +25,10 @@ index 0e59b3b774df..8a02dca04251 100644
<!-- Accessibility floating menu -->
<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
index 8e1b00d825aa..a79a10639b9d 100644
index 7a4be3fdc93b..19ac5fccac5f 100644
--- a/packages/SystemUI/src/com/android/systemui/privacy/OngoingPrivacyChip.kt
+++ b/packages/SystemUI/src/com/android/systemui/privacy/OngoingPrivacyChip.kt
@@ -123,7 +123,7 @@ class OngoingPrivacyChip @JvmOverloads constructor(
@@ -125,7 +125,7 @@ class OngoingPrivacyChip @JvmOverloads constructor(
iconSize = context.resources
.getDimensionPixelSize(R.dimen.ongoing_appops_chip_icon_size)
iconColor =

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

@ -1,7 +1,7 @@
From 83a1b45cc8d1d6d4f5d8d275db29fc7ed3f34cff Mon Sep 17 00:00:00 2001
From 9b624db6528d95a77ea550b011af435ca4425571 Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Wed, 10 Jan 2024 23:36:41 +0800
Subject: [PATCH 34/34] SystemUI: Follow monet theme on battery chip
Subject: [PATCH 39/43] SystemUI: Follow monet theme on battery chip
Why does this chip even exist...
@ -30,18 +30,18 @@ index d7de16d7c5bb..dd1db04e77d7 100644
\ No newline at end of file
+</shape>
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/BatteryStatusChip.kt b/packages/SystemUI/src/com/android/systemui/statusbar/BatteryStatusChip.kt
index 835225009110..04373eb7ed87 100644
index a58ce4162ddc..32c015f3230d 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/BatteryStatusChip.kt
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/BatteryStatusChip.kt
@@ -22,6 +22,7 @@ import android.util.AttributeSet
import android.view.View
@@ -23,6 +23,7 @@ import android.view.View
import android.widget.FrameLayout
import android.widget.LinearLayout
import com.android.settingslib.flags.Flags.newStatusBarIcons
+import com.android.settingslib.Utils
import com.android.systemui.battery.BatteryMeterView
import com.android.systemui.battery.unified.BatteryColors
import com.android.systemui.res.R
import com.android.systemui.statusbar.events.BackgroundAnimatableView
@@ -65,6 +66,11 @@ class BatteryStatusChip @JvmOverloads constructor(context: Context, attrs: Attri
@@ -71,6 +72,11 @@ class BatteryStatusChip @JvmOverloads constructor(context: Context, attrs: Attri
@SuppressLint("UseCompatLoadingForDrawables")
private fun updateResources() {

29
patches_platform/frameworks_base/0040-ThemeOverlayController-Remove-repeated-monet-check.patch Normal file
View File

@ -0,0 +1,29 @@
From 2f4e9b7a4cc9c22ba9586fe855c31f99cc47abbf Mon Sep 17 00:00:00 2001
From: Pranav Vashi <neobuddy89@gmail.com>
Date: Sat, 17 Sep 2022 12:20:38 +0530
Subject: [PATCH 40/43] ThemeOverlayController: Remove repeated monet check
Change-Id: I6608df48c1a89a87eaf08d9f267e0a83e9bbd3d1
Signed-off-by: Pranav Vashi <neobuddy89@gmail.com>
---
.../com/android/systemui/theme/ThemeOverlayController.java | 4 ----
1 file changed, 4 deletions(-)
diff --git a/packages/SystemUI/src/com/android/systemui/theme/ThemeOverlayController.java b/packages/SystemUI/src/com/android/systemui/theme/ThemeOverlayController.java
index 84e32a1dbaae..44b54080efc4 100644
--- a/packages/SystemUI/src/com/android/systemui/theme/ThemeOverlayController.java
+++ b/packages/SystemUI/src/com/android/systemui/theme/ThemeOverlayController.java
@@ -551,10 +551,6 @@ public class ThemeOverlayController implements CoreStartable, Dumpable {
},
UserHandle.USER_ALL);
- if (!mIsMonetEnabled) {
- return;
- }
-
mUserTracker.addCallback(mUserTrackerCallback, mMainExecutor);
mConfigurationController.addCallback(mConfigurationListener);
--
2.34.1

54
patches_platform/frameworks_base/0041-SystemUI-Use-color-accent-for-charging-animation.patch Normal file
View File

@ -0,0 +1,54 @@
From a1462dcc2242256bde5e69c60306726c25e7281c Mon Sep 17 00:00:00 2001
From: Genkzsz11 <genkzsz11@gmail.com>
Date: Sat, 16 Apr 2022 00:18:51 +0700
Subject: [PATCH 41/43] SystemUI: Use color accent for charging animation
Change-Id: Ideade5e9375510a31496ad75c5b74f12444350c9
Signed-off-by: Omkar Chandorkar <gotenksIN@aosip.dev>
Signed-off-by: Pranav Vashi <neobuddy89@gmail.com>
---
packages/SystemUI/res/values/styles.xml | 11 +++--------
.../systemui/charging/WirelessChargingLayout.java | 4 ++--
2 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/packages/SystemUI/res/values/styles.xml b/packages/SystemUI/res/values/styles.xml
index e4f2cf70b0d3..fc5023697a32 100644
--- a/packages/SystemUI/res/values/styles.xml
+++ b/packages/SystemUI/res/values/styles.xml
@@ -817,14 +817,9 @@
<!-- Used to style charging animation AVD animation -->
<style name="ChargingAnim" />
- <style name="ChargingAnim.WallpaperBackground">
- <item name="chargingAnimColor">?attr/wallpaperTextColor</item>
- <item name="android:textColor">?attr/wallpaperTextColor</item>
- </style>
-
- <style name="ChargingAnim.DarkBackground">
- <item name="chargingAnimColor">@android:color/white</item>
- <item name="android:textColor">@android:color/white</item>
+ <style name="ChargingAnim.Background">
+ <item name="chargingAnimColor">?android:attr/colorAccent</item>
+ <item name="android:textColor">?android:attr/colorAccent</item>
</style>
<!-- Screen recording -->
diff --git a/packages/SystemUI/src/com/android/systemui/charging/WirelessChargingLayout.java b/packages/SystemUI/src/com/android/systemui/charging/WirelessChargingLayout.java
index 047d15daf6f8..a9a657730109 100644
--- a/packages/SystemUI/src/com/android/systemui/charging/WirelessChargingLayout.java
+++ b/packages/SystemUI/src/com/android/systemui/charging/WirelessChargingLayout.java
@@ -78,9 +78,9 @@ final class WirelessChargingLayout extends FrameLayout {
(transmittingBatteryLevel != WirelessChargingAnimation.UNKNOWN_BATTERY_LEVEL);
// set style based on background
- int style = R.style.ChargingAnim_WallpaperBackground;
+ int style = R.style.ChargingAnim_Background;
if (isDozing) {
- style = R.style.ChargingAnim_DarkBackground;
+ style = R.style.ChargingAnim_Background;
}
inflate(new ContextThemeWrapper(context, style), R.layout.wireless_charging_layout, this);
--
2.34.1

33
patches_platform/frameworks_base/0042-colors_device_defaults-Add-chroma-to-light-surface-h.patch Normal file
View File

@ -0,0 +1,33 @@
From af3769a81e043d84bf044dd5cbbd7fbd49627b86 Mon Sep 17 00:00:00 2001
From: Danny Lin <danny@kdrag0n.dev>
Date: Thu, 13 Oct 2022 15:07:22 +0800
Subject: [PATCH 42/43] colors_device_defaults: Add chroma to light surface
highlight color
With dynamic Monet themes, most of the UI has at least a small amount
of color (chroma), so pure white stands out as the sole outlier (e.g.
Settings search bar in light mode). Use the 99% lightness shade instead
to improve consistency.
Change-Id: I7dfe3e483fa207ce4d77349ac97872e0831ef3c8
Signed-off-by: Pranav Vashi <neobuddy89@gmail.com>
---
core/res/res/values/colors_device_defaults.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/core/res/res/values/colors_device_defaults.xml b/core/res/res/values/colors_device_defaults.xml
index 4c5a008a3402..5d3d6a3155a9 100644
--- a/core/res/res/values/colors_device_defaults.xml
+++ b/core/res/res/values/colors_device_defaults.xml
@@ -59,7 +59,7 @@
<color name="surface_variant_dark">@color/system_neutral1_700</color>
<color name="surface_variant_light">@color/system_neutral2_100</color>
<color name="surface_dark">@color/system_neutral1_800</color>
- <color name="surface_highlight_light">@color/system_neutral1_0</color>
+ <color name="surface_highlight_light">@color/system_neutral1_10</color>
<!-- Please refer to text_color_[primary]_device_default_[light].xml for text colors-->
<color name="foreground_device_default_light">@color/text_color_primary_device_default_light</color>
--
2.34.1

30
patches_platform/frameworks_base/0043-config_progress_background_tint-Use-accent-color-for.patch Normal file
View File

@ -0,0 +1,30 @@
From e3fcd9c40a3d0fa641bc1e90892bd5a54ecde7e6 Mon Sep 17 00:00:00 2001
From: Danny Lin <danny@kdrag0n.dev>
Date: Thu, 13 Oct 2022 15:07:59 +0800
Subject: [PATCH 43/43] config_progress_background_tint: Use accent color for
progress bar background
This matches the stock Pixel style and makes progress bars look more
integrated, since the active (foreground) part is using the accent
color.
Change-Id: Ife7a79a390f6f9bdb2fd76722cd39adcfc182da1
Signed-off-by: Pranav Vashi <neobuddy89@gmail.com>
---
core/res/res/color/config_progress_background_tint.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/core/res/res/color/config_progress_background_tint.xml b/core/res/res/color/config_progress_background_tint.xml
index b086e20bf161..dfc914e76c8d 100644
--- a/core/res/res/color/config_progress_background_tint.xml
+++ b/core/res/res/color/config_progress_background_tint.xml
@@ -15,5 +15,5 @@
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:color="?attr/colorControlNormal" />
+ <item android:color="?attr/colorControlActivated" />
</selector>
--
2.34.1

18
patches_platform/packages_apps_SetupWizard/0001-SetupWizard-Remove-step-for-changing-theme.patch
View File

@ -1,4 +1,4 @@
From 2194bcf5d390be451ff641a0d779a2a815d1d67a Mon Sep 17 00:00:00 2001
From fb1a8efb48bd9aa11b1dfdab6ca7701a130e9bca Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Mon, 26 Feb 2024 08:41:08 +0800
Subject: [PATCH] SetupWizard: Remove step for changing theme
@ -13,13 +13,13 @@ Change-Id: Id83207c766d6b0b23cd240b35936289c44026db5
3 files changed, 15 deletions(-)
diff --git a/res/raw/lineage_wizard_script.xml b/res/raw/lineage_wizard_script.xml
index 0befc2b..ea342b6 100644
index 7c87abd..af3df01 100644
--- a/res/raw/lineage_wizard_script.xml
+++ b/res/raw/lineage_wizard_script.xml
@@ -82,12 +82,6 @@
@@ -83,12 +83,6 @@
<WizardAction
wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_BIOMETRIC_SETTINGS;end"
id="biometric_settings">
wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_LOCKSCREEN_SETTINGS;end"
id="lockscreen_settings">
- <result wizard:action="theme_settings" />
- </WizardAction>
-
@ -30,13 +30,13 @@ index 0befc2b..ea342b6 100644
</WizardAction>
diff --git a/res/raw/lineage_wizard_script_user.xml b/res/raw/lineage_wizard_script_user.xml
index aef7f2e..af38520 100644
index 15325c6..1522eda 100644
--- a/res/raw/lineage_wizard_script_user.xml
+++ b/res/raw/lineage_wizard_script_user.xml
@@ -34,12 +34,6 @@
@@ -35,12 +35,6 @@
<WizardAction
wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_BIOMETRIC_SETTINGS;end"
id="biometric_settings">
wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_LOCKSCREEN_SETTINGS;end"
id="lockscreen_settings">
- <result wizard:action="theme_settings" />
- </WizardAction>
-

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

@ -1,15 +1,15 @@
From 6c64bd7235f1c7b080fd95dc7a199350c740d8b0 Mon Sep 17 00:00:00 2001
From 3b91dda8987fcc5f4ccb33cff692f58d39b2f06d Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Sun, 20 Jun 2021 09:08:43 +0000
Subject: [PATCH 1/2] build: Integrate prop modifications (1/2)
Change-Id: I24f54937e3e542b7c29ea86d24e3f523583a0c61
---
tools/buildinfo.sh | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
tools/buildinfo.sh | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/tools/buildinfo.sh b/tools/buildinfo.sh
index e68162a6fe..ba29698719 100755
index e68162a6fe..a7d9f5bdcd 100755
--- a/tools/buildinfo.sh
+++ b/tools/buildinfo.sh
@@ -9,7 +9,7 @@ if [ "$BOARD_USE_VBMETA_DIGTEST_IN_FINGERPRINT" = "true" ] ; then
@ -30,15 +30,13 @@ index e68162a6fe..ba29698719 100755
echo "ro.build.date.utc=`$DATE +%s`"
echo "ro.build.type=$TARGET_BUILD_TYPE"
echo "ro.build.user=$BUILD_USERNAME"
@@ -57,5 +57,10 @@ if [ -n "$BUILD_THUMBPRINT" ] ; then
@@ -57,5 +57,8 @@ if [ -n "$BUILD_THUMBPRINT" ] ; then
fi
echo "ro.lineage.device=$LINEAGE_DEVICE"
+echo "ro.lineage.version=LineageOS 21 Self-built CGMod"
+echo "ro.lineage.display.version=LineageOS 21 Self-built CGMod"
+echo "ro.modversion=LineageOS 21 Self-built CGMod"
+
+echo "lockscreen.rot_override=true"
echo "# end build properties"
--

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

@ -1,4 +1,4 @@
From 5266372262a0d48bbb6251c6f8af75c01c76ab5c Mon Sep 17 00:00:00 2001
From 45dd8686e204f58063348a9ba5caeb2249ae85a5 Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Sat, 16 Oct 2021 00:39:15 +0000
Subject: [PATCH 2/2] build: Remove Stk (1/2)
@ -9,7 +9,7 @@ Change-Id: I24ef17c74c3137a11b463cde96c74d0edc853edd
1 file changed, 1 deletion(-)
diff --git a/target/product/generic_system.mk b/target/product/generic_system.mk
index 08a7cdf83e..5afb9a3a99 100644
index 7aff62c39f..b5bf7b3a57 100644
--- a/target/product/generic_system.mk
+++ b/target/product/generic_system.mk
@@ -33,7 +33,6 @@ PRODUCT_PACKAGES += \
@ -19,7 +19,7 @@ index 08a7cdf83e..5afb9a3a99 100644
- Stk \
Tag \
# OTA support
ifeq ($(RELEASE_AVATAR_PICKER_APP),true)
--
2.34.1

30
patches_platform_personal/frameworks_base/0001-Add-MotoHelloUINavbarOverlay-1-2.patch
View File

@ -1,13 +1,13 @@
From e1866ef3ab91a394c0a810675df59a9c328ce0b2 Mon Sep 17 00:00:00 2001
From ed95d24fc0033ae71a55d5177699ffdf51e9ee29 Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Mon, 22 Apr 2024 23:34:04 +0800
Subject: [PATCH 01/20] Add MotoHelloUINavbarOverlay (1/2)
Subject: [PATCH 01/22] Add MotoHelloUINavbarOverlay (1/2)
Redrawn after extracted SVGs, resized and adjusted stroke width
Change-Id: Idd8deb529ab39444737676d7bdba1c52555d6661
---
packages/overlays/Android.mk | 1 +
packages/overlays/Android.bp | 1 +
.../MotoHelloUINavbarOverlay/Android.bp | 28 +++++++++++++++++++
.../AndroidManifest.xml | 22 +++++++++++++++
.../res/drawable/ic_sysbar_back.xml | 12 ++++++++
@ -20,18 +20,18 @@ Change-Id: Idd8deb529ab39444737676d7bdba1c52555d6661
create mode 100644 packages/overlays/MotoHelloUINavbarOverlay/res/drawable/ic_sysbar_home.xml
create mode 100644 packages/overlays/MotoHelloUINavbarOverlay/res/drawable/ic_sysbar_recent.xml
diff --git a/packages/overlays/Android.mk b/packages/overlays/Android.mk
index a41d0e57cd21..c0573b2a9c16 100644
--- a/packages/overlays/Android.mk
+++ b/packages/overlays/Android.mk
@@ -26,6 +26,7 @@ LOCAL_REQUIRED_MODULES := \
DisplayCutoutEmulationTallOverlay \
DisplayCutoutEmulationWaterfallOverlay \
FontNotoSerifSourceOverlay \
+ MotoHelloUINavbarOverlay \
NavigationBarMode3ButtonOverlay \
NavigationBarModeGesturalOverlay \
NavigationBarModeGesturalOverlayNarrowBack \
diff --git a/packages/overlays/Android.bp b/packages/overlays/Android.bp
index 5e001fba6aa1..8913b58807e6 100644
--- a/packages/overlays/Android.bp
+++ b/packages/overlays/Android.bp
@@ -28,6 +28,7 @@ phony {
"DisplayCutoutEmulationTallOverlay",
"DisplayCutoutEmulationWaterfallOverlay",
"FontNotoSerifSourceOverlay",
+ "MotoHelloUINavbarOverlay",
"NavigationBarMode3ButtonOverlay",
"NavigationBarModeGesturalOverlay",
"NavigationBarModeGesturalOverlayNarrowBack",
diff --git a/packages/overlays/MotoHelloUINavbarOverlay/Android.bp b/packages/overlays/MotoHelloUINavbarOverlay/Android.bp
new file mode 100644
index 000000000000..06515997990a

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

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

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

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

8
patches_platform_personal/frameworks_base/0004-Disable-RESTRICTED-bucket-toast.patch
View File

@ -1,7 +1,7 @@
From d148f0f146d6e76927630726223a48664e33fcd1 Mon Sep 17 00:00:00 2001
From fd4ee96f17bee1e0c639b9f5a66d877637eb442d Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Sun, 3 Jul 2022 00:08:42 +0000
Subject: [PATCH 04/20] Disable "RESTRICTED bucket" toast
Subject: [PATCH 04/22] Disable "RESTRICTED bucket" toast
Change-Id: I20a328d3c77962f3a6095bfca42d0b165a093ce8
---
@ -9,10 +9,10 @@ Change-Id: I20a328d3c77962f3a6095bfca42d0b165a093ce8
1 file changed, 1 insertion(+), 19 deletions(-)
diff --git a/apex/jobscheduler/service/java/com/android/server/usage/AppStandbyController.java b/apex/jobscheduler/service/java/com/android/server/usage/AppStandbyController.java
index 12f455ad0144..a76a7f67a91a 100644
index 19bc7160e16a..567420a9c8f6 100644
--- a/apex/jobscheduler/service/java/com/android/server/usage/AppStandbyController.java
+++ b/apex/jobscheduler/service/java/com/android/server/usage/AppStandbyController.java
@@ -1846,25 +1846,7 @@ public class AppStandbyController
@@ -1848,25 +1848,7 @@ public class AppStandbyController
.noteRestrictionAttempt(packageName, userId, elapsedRealtime, reason);
if (isForcedByUser) {

32
patches_platform_personal/frameworks_base/0005-Disable-wake-on-gamepad-L-R-keys.patch Normal file
View File

@ -0,0 +1,32 @@
From 4aaaad704b3cedf07ace864b8fd03d7780f55903 Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Sat, 1 Jun 2024 17:56:42 +0800
Subject: [PATCH 05/22] Disable wake on gamepad L/R keys
Change-Id: I16cf69f07f205619a75111831de808748ee5795b
---
.../com/android/server/policy/PhoneWindowManager.java | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/services/core/java/com/android/server/policy/PhoneWindowManager.java b/services/core/java/com/android/server/policy/PhoneWindowManager.java
index 231357e96306..f15c034107fc 100644
--- a/services/core/java/com/android/server/policy/PhoneWindowManager.java
+++ b/services/core/java/com/android/server/policy/PhoneWindowManager.java
@@ -5945,6 +5945,14 @@ public class PhoneWindowManager implements WindowManagerPolicy {
case KeyEvent.KEYCODE_STYLUS_BUTTON_TERTIARY:
case KeyEvent.KEYCODE_STYLUS_BUTTON_TAIL:
return mStylusButtonsEnabled;
+
+ case KeyEvent.KEYCODE_BUTTON_L1:
+ case KeyEvent.KEYCODE_BUTTON_R1:
+ case KeyEvent.KEYCODE_BUTTON_L2:
+ case KeyEvent.KEYCODE_BUTTON_R2:
+ case KeyEvent.KEYCODE_BUTTON_THUMBL:
+ case KeyEvent.KEYCODE_BUTTON_THUMBR:
+ return false;
}
return true;
--
2.34.1

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

@ -1,7 +1,7 @@
From 623f673df7542f0286b32bde1485d9de3c1715f8 Mon Sep 17 00:00:00 2001
From 4f4c07ae5cef82b0ede5656b19e730d7476a4a20 Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Thu, 2 Sep 2021 16:15:19 +0000
Subject: [PATCH 05/20] Keyguard: Adjust clock style
Subject: [PATCH 06/22] Keyguard: Adjust clock style
Thinner font, less padding and unintrusive colors
@ -71,10 +71,10 @@ index c574d1fc674b..0a2c81f1cb38 100644
+ <dimen name="clock_padding_start">22dp</dimen>
+</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
index 01c03b1f25f6..9cff7ef5911b 100644
index 54c7a0823963..024c727dec84 100644
--- a/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/DefaultClockController.kt
+++ b/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/DefaultClockController.kt
@@ -168,9 +168,9 @@ class DefaultClockController(
@@ -170,9 +170,9 @@ class DefaultClockController(
if (seedColor != null) {
seedColor!!
} else if (isRegionDark) {
@ -113,10 +113,10 @@ index 7c5dbc247428..64657547621f 100644
/>
</com.android.keyguard.KeyguardSliceView>
diff --git a/packages/SystemUI/res-keyguard/values/dimens.xml b/packages/SystemUI/res-keyguard/values/dimens.xml
index 0628c3e957b1..ccb729de92e1 100644
index 186bd7cc48c5..363730d1f1ab 100644
--- a/packages/SystemUI/res-keyguard/values/dimens.xml
+++ b/packages/SystemUI/res-keyguard/values/dimens.xml
@@ -95,9 +95,9 @@
@@ -107,9 +107,9 @@
<dimen name="num_pad_key_margin_end">12dp</dimen>
<!-- additional offset for clock switch area items -->
@ -129,10 +129,10 @@ index 0628c3e957b1..ccb729de92e1 100644
<!-- Proportion of the screen height to use to set the maximum height of the bouncer to when
the device is in the DEVICE_POSTURE_HALF_OPENED posture, for the PIN/pattern entry. 0 will
diff --git a/packages/SystemUI/res-keyguard/values/styles.xml b/packages/SystemUI/res-keyguard/values/styles.xml
index 88f7bcd5d907..f0cff767b74d 100644
index c43e394cb97a..d73a3034c253 100644
--- a/packages/SystemUI/res-keyguard/values/styles.xml
+++ b/packages/SystemUI/res-keyguard/values/styles.xml
@@ -138,8 +138,6 @@
@@ -139,8 +139,6 @@
<item name="android:ellipsize">end</item>
<item name="android:maxLines">2</item>
<item name="android:fontFamily">@*android:string/config_headlineFontFamily</item>
@ -142,10 +142,10 @@ index 88f7bcd5d907..f0cff767b74d 100644
<style name="TextAppearance.Keyguard.Secondary">
diff --git a/packages/SystemUI/res/layout/keyguard_status_bar.xml b/packages/SystemUI/res/layout/keyguard_status_bar.xml
index fc0bf242dc1e..388ab51a6245 100644
index 4cb7591a3502..6108ce24f4fa 100644
--- a/packages/SystemUI/res/layout/keyguard_status_bar.xml
+++ b/packages/SystemUI/res/layout/keyguard_status_bar.xml
@@ -77,7 +77,7 @@
@@ -76,7 +76,7 @@
android:gravity="center_vertical"
android:ellipsize="marquee"
android:textDirection="locale"
@ -155,10 +155,10 @@ index fc0bf242dc1e..388ab51a6245 100644
android:singleLine="true"
systemui:showMissingSim="true"
diff --git a/packages/SystemUI/res/values/styles.xml b/packages/SystemUI/res/values/styles.xml
index 7ed9f91f30cd..2cb0c89cd785 100644
index ae15bfad0849..cb5c97383677 100644
--- a/packages/SystemUI/res/values/styles.xml
+++ b/packages/SystemUI/res/values/styles.xml
@@ -329,7 +329,7 @@
@@ -354,7 +354,7 @@
<item name="darkIconTheme">@style/DualToneDarkTheme</item>
<item name="wallpaperTextColor">@*android:color/primary_text_material_dark</item>
<item name="wallpaperTextColorSecondary">@*android:color/secondary_text_material_dark</item>
@ -167,7 +167,7 @@ index 7ed9f91f30cd..2cb0c89cd785 100644
<item name="android:colorError">@*android:color/error_color_material_dark</item>
<item name="*android:lockPatternStyle">@style/LockPatternViewStyle</item>
<item name="lockPatternStyle">@style/LockPatternContainerStyle</item>
@@ -347,7 +347,7 @@
@@ -372,7 +372,7 @@
<style name="Theme.SystemUI.LightWallpaper">
<item name="wallpaperTextColor">@*android:color/primary_text_material_light</item>
<item name="wallpaperTextColorSecondary">@*android:color/secondary_text_material_light</item>

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

@ -1,7 +1,7 @@
From 2d7a9b6d34331608e349d1f6075e0112fde7d24c Mon Sep 17 00:00:00 2001
From 1c07e4e2f1f2290a2b5b5695c1af4732eab18404 Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Sat, 2 Nov 2019 06:41:03 +0000
Subject: [PATCH 06/20] Keyguard: Hide padlock unless UDFPS is in use
Subject: [PATCH 07/22] Keyguard: Hide padlock unless UDFPS is in use
Fair enough Google, but don't give me that otherwise
@ -11,10 +11,10 @@ Change-Id: Ie91e80ca5c6637a51a8acc72fb28cd6ac2a7abb6
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
index 175fcdb6e11a..2472def4d037 100644
index 8e9815085e31..de25bec2f6b1 100644
--- a/packages/SystemUI/src/com/android/keyguard/LockIconViewController.java
+++ b/packages/SystemUI/src/com/android/keyguard/LockIconViewController.java
@@ -360,25 +360,14 @@ public class LockIconViewController implements Dumpable {
@@ -362,25 +362,14 @@ public class LockIconViewController implements Dumpable {
return;
}

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

@ -1,7 +1,7 @@
From fbe718b53b0898e984d276dc431d89402bfabbaa Mon Sep 17 00:00:00 2001
From 23f1f86aff2ac8d25b796133b61e5540660b04e7 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)
Subject: [PATCH 08/22] Keyguard: Default to small clock (1/3)
It looks alright actually, but as always breaks under landscape
@ -11,10 +11,10 @@ Change-Id: I434d033ecae597ed2a7b2ed71e96ba1a963e9cc3
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
index 2302cd3911d9..a0e8062df4d0 100644
--- a/core/res/res/values/config.xml
+++ b/core/res/res/values/config.xml
@@ -1498,7 +1498,7 @@
@@ -1514,7 +1514,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) -->

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

@ -1,22 +1,22 @@
From 8b68d455ebc34a78177be70ec62c94dae3192fdf Mon Sep 17 00:00:00 2001
From 5e641f0f51ddffd5d7dd40f5ac080cce950a4515 Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Sat, 2 Nov 2019 08:31:36 +0000
Subject: [PATCH 08/20] Keyguard: Refine indication text
Subject: [PATCH 09/22] Keyguard: Refine indication text
Change-Id: Ib771c35610f712a1de34736e817bcfe616ac37d8
---
.../SystemUI/res-keyguard/values/styles.xml | 2 --
.../SystemUI/res-keyguard/values/styles.xml | 2 -
.../res/layout/keyguard_bottom_area.xml | 1 +
packages/SystemUI/res/values/dimens.xml | 2 +-
.../KeyguardIndicationController.java | 35 ++++---------------
.../KeyguardIndicationController.java | 37 ++++---------------
.../phone/KeyguardIndicationTextView.java | 2 +-
5 files changed, 10 insertions(+), 32 deletions(-)
5 files changed, 10 insertions(+), 34 deletions(-)
diff --git a/packages/SystemUI/res-keyguard/values/styles.xml b/packages/SystemUI/res-keyguard/values/styles.xml
index f0cff767b74d..9edd294a8981 100644
index d73a3034c253..0394ab69b901 100644
--- a/packages/SystemUI/res-keyguard/values/styles.xml
+++ b/packages/SystemUI/res-keyguard/values/styles.xml
@@ -153,8 +153,6 @@
@@ -154,8 +154,6 @@
<item name="android:maxLines">1</item>
<item name="android:gravity">center</item>
<item name="android:textColor">?attr/wallpaperTextColor</item>
@ -26,7 +26,7 @@ index f0cff767b74d..9edd294a8981 100644
<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
index 6d7ce0623817..4d1af83c9d3b 100644
index e602d6c8848d..7cc54e7209b8 100644
--- a/packages/SystemUI/res/layout/keyguard_bottom_area.xml
+++ b/packages/SystemUI/res/layout/keyguard_bottom_area.xml
@@ -35,6 +35,7 @@
@ -38,10 +38,10 @@ index 6d7ce0623817..4d1af83c9d3b 100644
android:paddingEnd="@dimen/keyguard_indication_text_padding"
android:textAppearance="@style/TextAppearance.Keyguard.BottomArea"
diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml
index 2852403c8a21..bb1b552ab1c1 100644
index 602a51bb0a36..4db3a593b9ff 100644
--- a/packages/SystemUI/res/values/dimens.xml
+++ b/packages/SystemUI/res/values/dimens.xml
@@ -897,7 +897,7 @@
@@ -914,7 +914,7 @@
<dimen name="keyguard_translate_distance_on_swipe_up">-200dp</dimen>
@ -51,10 +51,10 @@ index 2852403c8a21..bb1b552ab1c1 100644
<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
index 08415cb5b0cb..a1e865e96a6d 100644
index 1ec86aea49d8..966243436b7f 100644
--- a/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 {
@@ -456,7 +456,6 @@ public class KeyguardIndicationController {
updateLockScreenDisclosureMsg();
updateLockScreenOwnerInfo();
updateLockScreenBatteryMsg(animate);
@ -62,13 +62,15 @@ index 08415cb5b0cb..a1e865e96a6d 100644
updateLockScreenTrustMsg(userId, getTrustGrantedIndication(), getTrustManagedIndication());
updateLockScreenAlignmentMsg();
updateLockScreenLogoutView();
@@ -571,22 +570,6 @@ public class KeyguardIndicationController {
@@ -601,24 +600,6 @@ public class KeyguardIndicationController {
}
}
- private void updateLockScreenUserLockedMsg(int userId) {
- if (!mKeyguardUpdateMonitor.isUserUnlocked(userId)
- || mKeyguardUpdateMonitor.isEncryptedOrLockdown(userId)) {
- boolean userUnlocked = mKeyguardUpdateMonitor.isUserUnlocked(userId);
- boolean encryptedOrLockdown = mKeyguardUpdateMonitor.isEncryptedOrLockdown(userId);
- mKeyguardLogger.logUpdateLockScreenUserLockedMsg(userId, userUnlocked, encryptedOrLockdown);
- if (!userUnlocked || encryptedOrLockdown) {
- mRotateTextViewController.updateIndication(
- INDICATION_TYPE_USER_LOCKED,
- new KeyguardIndication.Builder()
@ -85,7 +87,7 @@ index 08415cb5b0cb..a1e865e96a6d 100644
private void updateBiometricMessage() {
if (mDozing) {
updateDeviceEntryIndication(false);
@@ -679,17 +662,13 @@ public class KeyguardIndicationController {
@@ -711,17 +692,13 @@ public class KeyguardIndicationController {
}
private void updateLockScreenPersistentUnlockMsg() {

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

@ -1,7 +1,7 @@
From 6214db6cea55c2072b2a51cc07ee8d27eecf299c Mon Sep 17 00:00:00 2001
From 912c05a46cee1fa20ac795eea86c10ed8c6c485f Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Sat, 20 Mar 2021 10:35:14 +0000
Subject: [PATCH 09/20] Keyguard/UI: Fix status bar / quick settings margins
Subject: [PATCH 10/22] Keyguard/UI: Fix status bar / quick settings margins
and paddings
Last revised on 2024/04/04, targeting U QPR2
@ -31,10 +31,10 @@ Change-Id: Ic91fa398813e1907297bb0892c444d96405950e7
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
index 388ab51a6245..0c4b898055fe 100644
index 6108ce24f4fa..2bf5036e686c 100644
--- a/packages/SystemUI/res/layout/keyguard_status_bar.xml
+++ b/packages/SystemUI/res/layout/keyguard_status_bar.xml
@@ -72,7 +72,7 @@
@@ -71,7 +71,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingTop="@dimen/status_bar_padding_top"
@ -88,19 +88,19 @@ index 1e54fc9e1445..6c1cb6ce43cb 100644
<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
index bb1b552ab1c1..a6b766f60d6f 100644
index 4db3a593b9ff..de6834c2cfac 100644
--- a/packages/SystemUI/res/values/dimens.xml
+++ b/packages/SystemUI/res/values/dimens.xml
@@ -172,7 +172,7 @@
@@ -177,7 +177,7 @@
<dimen name="status_bar_clock_size">14sp</dimen>
<!-- The starting padding for the clock in the status bar. -->
- <dimen name="status_bar_clock_starting_padding">7dp</dimen>
- <dimen name="status_bar_clock_starting_padding">4dp</dimen>
+ <dimen name="status_bar_clock_starting_padding">0dp</dimen>
<!-- The end padding for the clock in the status bar. -->
<dimen name="status_bar_clock_end_padding">0dp</dimen>
@@ -384,7 +384,7 @@
@@ -391,7 +391,7 @@
<!-- padding start is a bit smaller than end to account for status icon margin-->
<dimen name="status_bar_icons_padding_start">3dp</dimen>
@ -109,7 +109,7 @@ index bb1b552ab1c1..a6b766f60d6f 100644
<dimen name="status_bar_icons_padding_bottom">0dp</dimen>
<dimen name="status_bar_icons_padding_top">0dp</dimen>
@@ -856,7 +856,7 @@
@@ -865,7 +865,7 @@
<dimen name="kg_framed_avatar_size">32dp</dimen>
<!-- Margin on the left side of the carrier text on Keyguard -->
@ -139,10 +139,10 @@ index 50a388d0fa64..81d30c210770 100644
\ No newline at end of file
+</ConstraintSet>
diff --git a/packages/SystemUI/src/com/android/systemui/shade/ShadeHeaderController.kt b/packages/SystemUI/src/com/android/systemui/shade/ShadeHeaderController.kt
index 5a5cb792c10b..874579b83aca 100644
index d26ef5e73152..1da47bffdf7f 100644
--- a/packages/SystemUI/src/com/android/systemui/shade/ShadeHeaderController.kt
+++ b/packages/SystemUI/src/com/android/systemui/shade/ShadeHeaderController.kt
@@ -144,6 +144,8 @@ constructor(
@@ -145,6 +145,8 @@ constructor(
private var roundedCorners = 0
private var cutout: DisplayCutout? = null
@ -151,7 +151,7 @@ index 5a5cb792c10b..874579b83aca 100644
private var lastInsets: WindowInsets? = null
private var nextAlarmIntent: PendingIntent? = null
private var textColorPrimary = Color.TRANSPARENT
@@ -421,14 +423,17 @@ constructor(
@@ -428,14 +430,17 @@ constructor(
val cutoutLeft = sbInsets.left
val cutoutRight = sbInsets.right
val hasCornerCutout: Boolean = insetsProvider.currentRotationHasCornerCutout()
@ -171,7 +171,7 @@ index 5a5cb792c10b..874579b83aca 100644
header.paddingEnd
)
@@ -549,7 +554,6 @@ constructor(
@@ -559,7 +564,6 @@ constructor(
}
private fun updateResources() {
@ -193,10 +193,10 @@ index 8afc72f08656..fe66c21ae568 100644
}
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 50ce8a9a14e3..e3480f7a311e 100644
index be1d9e8ef870..3c25d5d83afc 100644
--- a/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 {
@@ -183,14 +183,7 @@ public class KeyguardStatusBarView extends RelativeLayout {
mCarrierLabel.setTextSize(TypedValue.COMPLEX_UNIT_PX,
getResources().getDimensionPixelSize(
com.android.internal.R.dimen.text_size_small_material));

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

@ -1,7 +1,7 @@
From 0440d36fc0d1126bc9a7266291395f466969c2b1 Mon Sep 17 00:00:00 2001
From f852829bcf852d5ae7f8040b22bed24d00b0fabb Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Tue, 31 May 2022 00:00:08 +0000
Subject: [PATCH 10/20] Revert "SystemUI: Add left padding for keyguard slices"
Subject: [PATCH 11/22] Revert "SystemUI: Add left padding for keyguard slices"
This reverts commit 4a7a4426944e28e70a3eca6a696ff6c7599fb896.
---

27
patches_platform_personal/frameworks_base/0012-Revert-SystemUI-Match-keyguard-carrier-text-font-wit.patch Normal file
View File

@ -0,0 +1,27 @@
From 68142f99e88fbbf08b0acb9d4c544e7827dab2ef Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Sun, 30 Jun 2024 14:45:48 +0800
Subject: [PATCH 12/22] Revert "SystemUI: Match keyguard carrier text font with
system"
This reverts commit 0abcf0db0b50d270a849b6179083008c25325cc1.
---
.../android/systemui/statusbar/phone/KeyguardStatusBarView.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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 3c25d5d83afc..3f0a8a387e19 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java
@@ -419,7 +419,7 @@ public class KeyguardStatusBarView extends RelativeLayout {
/** Should only be called from {@link KeyguardStatusBarViewController}. */
void onOverlayChanged() {
int theme = Utils.getThemeAttr(mContext, com.android.internal.R.attr.textAppearanceSmall);
- mCarrierLabel.setTextAppearance(R.style.TextAppearance_StatusBar_Clock);
+ mCarrierLabel.setTextAppearance(theme);
mBatteryView.updatePercentView();
TextView userSwitcherName = mUserSwitcherContainer.findViewById(R.id.current_user_name);
--
2.34.1

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

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

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

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

22
patches_platform_personal/frameworks_base/0013-UI-Always-render-into-cutouts.patch → patches_platform_personal/frameworks_base/0015-UI-Always-render-into-cutouts.patch
View File

@ -1,7 +1,7 @@
From 569849c38ae630e1cd907ef28b48aac79a904252 Mon Sep 17 00:00:00 2001
From e2c6da83998abfe3bde32543732df0f7124cc400 Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Wed, 7 Oct 2020 14:00:35 +0000
Subject: [PATCH 13/20] UI: Always render into cutouts
Subject: [PATCH 15/22] UI: Always render into cutouts
Eliminates black/white letterboxing in apps, keyguard and QS
@ -13,10 +13,10 @@ Change-Id: I4661c7979bfa7de453329fcddbaeefc2009e2da3
3 files changed, 9 insertions(+), 22 deletions(-)
diff --git a/core/java/android/view/InsetsState.java b/core/java/android/view/InsetsState.java
index 59e0932ecd80..a090a59a1357 100644
index 21eec67bfe10..092e14bf8590 100644
--- a/core/java/android/view/InsetsState.java
+++ b/core/java/android/view/InsetsState.java
@@ -501,24 +501,7 @@ public class InsetsState implements Parcelable {
@@ -480,24 +480,7 @@ public class InsetsState implements Parcelable {
}
public void getDisplayCutoutSafe(Rect outBounds) {
@ -43,10 +43,10 @@ index 59e0932ecd80..a090a59a1357 100644
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
index 21de4c81353d..54578d347b2f 100644
index aa4818409265..a0314e0cdbfb 100644
--- a/packages/SystemUI/src/com/android/systemui/shade/QuickSettingsController.java
+++ b/packages/SystemUI/src/com/android/systemui/shade/QuickSettingsController.java
@@ -293,6 +293,8 @@ public class QuickSettingsController implements Dumpable {
@@ -289,6 +289,8 @@ public class QuickSettingsController implements Dumpable {
private int mOneFingerQuickSettingsIntercept;
private final ContentObserver mOneFingerQuickSettingsInterceptObserver;
@ -55,7 +55,7 @@ index 21de4c81353d..54578d347b2f 100644
private final Region mInterceptRegion = new Region();
/** The end bounds of a clipping animation. */
private final Rect mClippingAnimationEndBounds = new Rect();
@@ -410,6 +412,8 @@ public class QuickSettingsController implements Dumpable {
@@ -408,6 +410,8 @@ public class QuickSettingsController implements Dumpable {
}
};
@ -64,7 +64,7 @@ index 21de4c81353d..54578d347b2f 100644
dumpManager.registerDumpable(this);
}
@@ -553,8 +557,7 @@ public class QuickSettingsController implements Dumpable {
@@ -554,8 +558,7 @@ public class QuickSettingsController implements Dumpable {
* on ACTION_DOWN, and safely queried repeatedly thereafter during ACTION_MOVE events.
*/
public void updateGestureInsetsCache() {
@ -74,7 +74,7 @@ index 21de4c81353d..54578d347b2f 100644
mCachedGestureInsets = windowMetrics.getWindowInsets().getInsets(
WindowInsets.Type.systemGestures());
mCachedWindowWidth = windowMetrics.getBounds().width();
@@ -1536,8 +1539,8 @@ public class QuickSettingsController implements Dumpable {
@@ -1537,8 +1540,8 @@ public class QuickSettingsController implements Dumpable {
private int calculateRightClippingBound() {
if (mIsFullWidth) {
@ -86,10 +86,10 @@ index 21de4c81353d..54578d347b2f 100644
return mNotificationStackScrollLayoutController.getRight()
+ mDisplayLeftInset;
diff --git a/services/core/java/com/android/server/wm/DisplayPolicy.java b/services/core/java/com/android/server/wm/DisplayPolicy.java
index a85038f5d656..8541b1dc1965 100644
index b6e614b55041..4b9a120ac038 100644
--- a/services/core/java/com/android/server/wm/DisplayPolicy.java
+++ b/services/core/java/com/android/server/wm/DisplayPolicy.java
@@ -1414,6 +1414,7 @@ public class DisplayPolicy {
@@ -1426,6 +1426,7 @@ public class DisplayPolicy {
displayFrames = win.getDisplayFrames(displayFrames);
final WindowManager.LayoutParams attrs = win.mAttrs.forRotation(displayFrames.mRotation);

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

@ -1,7 +1,7 @@
From 860e099390e9ce4cb4365824c2bb05c5a5b152d6 Mon Sep 17 00:00:00 2001
From d597b3f8df5f0ca5414028863f376aedeced1cfe Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Wed, 1 Sep 2021 14:10:50 +0000
Subject: [PATCH 14/20] UI: Kill rounded corners in notification scrim
Subject: [PATCH 16/22] 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
@ -11,10 +11,10 @@ Change-Id: I09ed59e0e658ebd512a9d02a8ef3edfe2c9888da
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml
index a6b766f60d6f..272019c5893b 100644
index de6834c2cfac..3d7adc1feb22 100644
--- a/packages/SystemUI/res/values/dimens.xml
+++ b/packages/SystemUI/res/values/dimens.xml
@@ -792,7 +792,7 @@
@@ -801,7 +801,7 @@
<!-- The amount to translate lockscreen elements on the GONE->AOD transition -->
<dimen name="keyguard_enter_from_top_translation_y">-100dp</dimen>

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

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

6
patches_platform_personal/frameworks_base/0016-UI-Reconfigure-quick-settings-tiles.patch → patches_platform_personal/frameworks_base/0018-UI-Reconfigure-quick-settings-tiles.patch
View File

@ -1,7 +1,7 @@
From abadefb66f417ccfab7b179647201d4e3db9b7c6 Mon Sep 17 00:00:00 2001
From b9eaf93d2d87ff6cd436d3b456c8e572a1b6f83f Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Sat, 5 Mar 2022 01:43:37 +0000
Subject: [PATCH 16/20] UI: Reconfigure quick settings tiles
Subject: [PATCH 18/22] UI: Reconfigure quick settings tiles
Change-Id: I743f52ef3a95db0ca2c02ae973faa4629e41885d
---
@ -9,7 +9,7 @@ Change-Id: I743f52ef3a95db0ca2c02ae973faa4629e41885d
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/packages/SystemUI/res/values/config.xml b/packages/SystemUI/res/values/config.xml
index 4791ad8969f0..05ff8736f429 100644
index 0286cc65c8e2..d23be6427019 100644
--- a/packages/SystemUI/res/values/config.xml
+++ b/packages/SystemUI/res/values/config.xml
@@ -88,7 +88,7 @@

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

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

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

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

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

@ -1,7 +1,7 @@
From d60458e34f7570e362b244c156020f986f26a36c Mon Sep 17 00:00:00 2001
From 189c4aa8512127b743f374491d224679c074d9e0 Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Wed, 22 Mar 2023 00:29:13 +0000
Subject: [PATCH 19/20] UI: Restore quick settings fonts to pre-T-QPR2
Subject: [PATCH 21/22] UI: Restore quick settings fonts to pre-T-QPR2
TODO: Large header clock looks better in Regular - perhaps figure out how to transition smoothly?
Change-Id: If2e57fee61b6bd4b6b7fedc7e3011164cd2cb56f
@ -10,7 +10,7 @@ Change-Id: If2e57fee61b6bd4b6b7fedc7e3011164cd2cb56f
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/packages/SystemUI/res/values/styles.xml b/packages/SystemUI/res/values/styles.xml
index 2cb0c89cd785..80831abc1201 100644
index cb5c97383677..f6658ce089f4 100644
--- a/packages/SystemUI/res/values/styles.xml
+++ b/packages/SystemUI/res/values/styles.xml
@@ -143,7 +143,7 @@
@ -22,7 +22,7 @@ index 2cb0c89cd785..80831abc1201 100644
<item name="android:textColor">?attr/onSurface</item>
<item name="android:textSize">14sp</item>
<item name="android:letterSpacing">0.01</item>
@@ -161,6 +161,7 @@
@@ -163,6 +163,7 @@
</style>
<style name="TextAppearance.QS.Status.Build">

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

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

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

@ -1,4 +1,4 @@
From 132abfada735742924b1d02a044fb56072d43f0d Mon Sep 17 00:00:00 2001
From b1e1d47aa6510c69b45112dcc59c83d3297b14a1 Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Thu, 23 Nov 2023 23:21:58 +0800
Subject: [PATCH] SetupWizard: Least Action(s) Principle
@ -11,7 +11,7 @@ Change-Id: I892634b8ffc7beafa5a223de0afdc64276efd2f5
3 files changed, 3 insertions(+), 120 deletions(-)
diff --git a/res/raw/lineage_wizard_script.xml b/res/raw/lineage_wizard_script.xml
index 511ac7b..21cd2ef 100644
index af3df01..21cd2ef 100644
--- a/res/raw/lineage_wizard_script.xml
+++ b/res/raw/lineage_wizard_script.xml
@@ -5,13 +5,7 @@
@ -76,18 +76,18 @@ index 511ac7b..21cd2ef 100644
- <WizardAction
- wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_SETTINGS;end"
- id="lineage_settings">
- <result wizard:action="lockscreen_settings" />
- </WizardAction>
-
- <WizardAction
- wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_LOCKSCREEN_SETTINGS;end"
- id="lockscreen_settings">
- <result wizard:action="biometric_settings" />
- </WizardAction>
-
- <WizardAction
- wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_BIOMETRIC_SETTINGS;end"
- id="biometric_settings">
- <result wizard:action="lockscreen_settings" />
- </WizardAction>
-
- <WizardAction
- wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_LOCKSCREEN_SETTINGS;end"
- id="lockscreen_settings">
- <result wizard:action="navigation_settings" />
- </WizardAction>
-
@ -135,7 +135,7 @@ index 36f80c6..47e99c5 100644
<WizardAction
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
index 7f52c6f..47e99c5 100644
index 1522eda..47e99c5 100644
--- a/res/raw/lineage_wizard_script_user.xml
+++ b/res/raw/lineage_wizard_script_user.xml
@@ -5,44 +5,7 @@
@ -160,18 +160,18 @@ index 7f52c6f..47e99c5 100644
- <WizardAction
- wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_LOCATION_SETTINGS;end"
- id="location_settings">
- <result wizard:action="lockscreen_settings" />
- </WizardAction>
-
- <WizardAction
- wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_LOCKSCREEN_SETTINGS;end"
- id="lockscreen_settings">
- <result wizard:action="biometric_settings" />
- </WizardAction>
-
- <WizardAction
- wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_BIOMETRIC_SETTINGS;end"
- id="biometric_settings">
- <result wizard:action="lockscreen_settings" />
- </WizardAction>
-
- <WizardAction
- wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_LOCKSCREEN_SETTINGS;end"
- id="lockscreen_settings">
- <result wizard:action="navigation_settings" />
- </WizardAction>
-

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

@ -1,4 +1,4 @@
From fbc5159270447f5d81be73aab5e7b8ee08d789a2 Mon Sep 17 00:00:00 2001
From b33dc42de17c16c6b45eb1e9d8ad4d66a0ca455d Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Thu, 28 Oct 2021 02:30:59 +0000
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
diff --git a/quickstep/res/values/styles.xml b/quickstep/res/values/styles.xml
index bdc86b217d..7c47d126a8 100644
index 350c752c56..7129c9684a 100644
--- a/quickstep/res/values/styles.xml
+++ b/quickstep/res/values/styles.xml
@@ -227,7 +227,7 @@
@ -36,10 +36,10 @@ index bdc86b217d..7c47d126a8 100644
<item name="android:textAllCaps">false</item>
</style>
diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index 08ec0398a7..e1ab7311dd 100644
index 646c726fa0..80f884b4a9 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -805,7 +805,7 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
@@ -813,7 +813,7 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
mEmptyIcon.setCallback(this);
mEmptyMessage = context.getText(R.string.recents_empty_message);
mEmptyMessagePaint = new TextPaint();

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

@ -1,4 +1,4 @@
From 5137588e22d194c87da0000ba6642f17fe37516a Mon Sep 17 00:00:00 2001
From c30884fb18fcfe440cbaaaffd441f9164027511c Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Fri, 18 Mar 2022 08:42:18 +0000
Subject: [PATCH 2/3] Trebuchet: Kill haptics in recents
@ -13,10 +13,10 @@ Change-Id: Ie3b0eabe8cc0421e696720740edc492cae2f5153
3 files changed, 1 insertion(+), 32 deletions(-)
diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java
index 968faf07c7..bb93664b46 100644
index 3a1c42dc89..0e0397be39 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java
@@ -437,14 +437,7 @@ public class NoButtonQuickSwitchTouchController implements TouchController,
@@ -441,14 +441,7 @@ public class NoButtonQuickSwitchTouchController implements TouchController,
nonOverviewAnim.setFloatValues(startProgress, endProgress);
mNonOverviewAnim.dispatchOnStart();
}
@ -29,30 +29,30 @@ index 968faf07c7..bb93664b46 100644
- RecentsView.SCROLL_VIBRATION_FALLBACK);
- } else {
+ if (targetState != QUICK_SWITCH_FROM_HOME) {
InteractionJankMonitorWrapper.cancel(InteractionJankMonitorWrapper.CUJ_QUICK_SWITCH);
InteractionJankMonitorWrapper.cancel(Cuj.CUJ_LAUNCHER_QUICK_SWITCH);
}
diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TaskViewTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TaskViewTouchController.java
index 19bfe069c8..f6cb2c7024 100644
index e9f2d4f019..5487414660 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TaskViewTouchController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TaskViewTouchController.java
@@ -370,11 +370,6 @@ public abstract class TaskViewTouchController<T extends BaseDraggingActivity>
mCurrentAnimation.startWithVelocity(mActivity, goingToEnd,
velocity * orientationHandler.getSecondaryTranslationDirectionFactor(),
@@ -374,11 +374,6 @@ public abstract class TaskViewTouchController<T extends BaseDraggingActivity>
mCurrentAnimation.setEndAction(this::clearState);
mCurrentAnimation.startWithVelocity(mActivity, goingToEnd, Math.abs(velocity),
mEndDisplacement, animationDuration);
- if (goingUp && goingToEnd && !mIsDismissHapticRunning) {
- VibratorWrapper.INSTANCE.get(mActivity).vibrate(TASK_DISMISS_VIBRATION_PRIMITIVE,
- TASK_DISMISS_VIBRATION_PRIMITIVE_SCALE, TASK_DISMISS_VIBRATION_FALLBACK);
- mIsDismissHapticRunning = true;
- }
}
private void clearState() {
mDraggingEnabled = true;
}
diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index e1ab7311dd..c2f848c71a 100644
index 80f884b4a9..8dc8c20ff7 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -1583,25 +1583,6 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
@@ -1604,25 +1604,6 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
}
}

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

@ -1,4 +1,4 @@
From 3123bcedf9a080c651e9f009f14111585c7f1f38 Mon Sep 17 00:00:00 2001
From 6e812922a39bb8c279a7935d03141e34bf54c052 Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Mon, 20 Nov 2023 14:09:32 +0800
Subject: [PATCH 3/3] Trebuchet: Kill inverted rounded corners above the
@ -12,10 +12,10 @@ Change-Id: Ibf03a84cb8f3866b5151b02fe8a0e74167cf90ce
1 file changed, 7 deletions(-)
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarBackgroundRenderer.kt b/quickstep/src/com/android/launcher3/taskbar/TaskbarBackgroundRenderer.kt
index d6016f1304..c77fadb9aa 100644
index e290c3fa3d..a3e4e1835e 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarBackgroundRenderer.kt
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarBackgroundRenderer.kt
@@ -159,13 +159,6 @@ class TaskbarBackgroundRenderer(private val context: TaskbarActivityContext) {
@@ -158,13 +158,6 @@ class TaskbarBackgroundRenderer(private val context: TaskbarActivityContext) {
// Draw the background behind taskbar content.
canvas.drawRect(0f, 0f, canvas.width.toFloat(), persistentTaskbarHeight, paint)
}

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

@ -1,7 +1,7 @@
From e50480813b4a96cb3f3105dc5b1ccb7e5928ac68 Mon Sep 17 00:00:00 2001
From 7b512450f9a8b4d65bda3daccd5d76b6d86722d3 Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Sun, 8 Aug 2021 01:43:40 +0000
Subject: [PATCH 1/9] treble: Lineage-ify
Subject: [PATCH 1/7] treble: Lineage-ify
Squash of:
- Proper target names
@ -31,7 +31,7 @@ Change-Id: I25eee7a3804f335430a447ae1424402d7e37851b
create mode 100644 overlay-lineage/lineage-sdk/lineage/res/res/values/config.xml
diff --git a/base.mk b/base.mk
index 22525cd..e40af53 100644
index 43e261b..1c2fe3d 100644
--- a/base.mk
+++ b/base.mk
@@ -18,7 +18,13 @@ PRODUCT_COPY_FILES += \

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

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

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

@ -1,7 +1,7 @@
From aece8f5deb59a054729539eef6957bd5db325bb5 Mon Sep 17 00:00:00 2001
From 8bfd515e29aa6998c95326afcd7b9212bc50e855 Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Wed, 20 Oct 2021 11:30:25 +0000
Subject: [PATCH 3/9] treble: Set TARGET_NO_KERNEL_OVERRIDE
Subject: [PATCH 3/7] treble: Set TARGET_NO_KERNEL_OVERRIDE
Taken from Lineage generic targets - skips building kernel cleanly

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

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

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

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

4
patches_treble/device_phh_treble/0009-treble-Import-prebuilt-PHH-Superuser.patch → patches_treble/device_phh_treble/0006-treble-Import-prebuilt-PHH-Superuser.patch
View File

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

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

@ -1,35 +0,0 @@
From d0c31b8531c239d6c550ed14690496fa9d6b13d2 Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Tue, 22 Nov 2022 00:36:15 +0000
Subject: [PATCH 6/9] treble: Stop securing ADB
Seems to kill USB Debugging altogether on certain devices,
and unrelated to SN anyway
Build-time macro coupled with vendor/lineage might do better...
Change-Id: I0215b3ed970dd53a124f48e30ca2cf4b0c6d2899
---
rw-system.sh | 3 ---
1 file changed, 3 deletions(-)
diff --git a/rw-system.sh b/rw-system.sh
index 968b903..4dd61f3 100644
--- a/rw-system.sh
+++ b/rw-system.sh
@@ -804,13 +804,10 @@ if [ -f /system/phh/secure ] || [ -f /metadata/phh/secure ];then
resetprop_phh ro.boot.veritymode enforcing
resetprop_phh ro.boot.warranty_bit 0
resetprop_phh ro.warranty_bit 0
- resetprop_phh ro.debuggable 0
resetprop_phh ro.secure 1
resetprop_phh ro.build.type user
resetprop_phh --delete ro.build.selinux
- resetprop_phh ro.adb.secure 1
-
# Hide system/xbin/su
mount /mnt/phh/empty_dir /system/xbin
mount /mnt/phh/empty_dir /system/app/me.phh.superuser
--
2.34.1

166
patches_treble/device_phh_treble/0007-treble-Remove-Securize-1-2.patch Normal file
View File

@ -0,0 +1,166 @@
From 6049d780bfdddc2d11a0b3f1bca6b6de6a761ed5 Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Mon, 15 Jul 2024 22:30:54 +0800
Subject: [PATCH 7/7] treble: Remove Securize (1/2)
Leave this Play Integrity mess to the professionals
Change-Id: Ic4ef0512d8b555b85e7497464a07913101fcc819
---
base.mk | 1 -
files/ota.sh | 3 ---
phh-securize.sh | 38 -----------------------------
rw-system.sh | 63 ++++++-------------------------------------------
4 files changed, 7 insertions(+), 98 deletions(-)
delete mode 100644 phh-securize.sh
diff --git a/base.mk b/base.mk
index 1c2fe3d..dea8d2d 100644
--- a/base.mk
+++ b/base.mk
@@ -178,7 +178,6 @@ PRODUCT_PACKAGES += \
resetprop_phh
PRODUCT_COPY_FILES += \
- device/phh/treble/phh-securize.sh:system/bin/phh-securize.sh \
device/phh/treble/files/ota.sh:system/bin/ota.sh \
PRODUCT_COPY_FILES += \
diff --git a/files/ota.sh b/files/ota.sh
index a43ce81..78fea95 100644
--- a/files/ota.sh
+++ b/files/ota.sh
@@ -8,9 +8,6 @@ if ! [ "$(getprop ro.boot.dynamic_partitions)" = true ];then
fi
flavor=$(getprop ro.product.product.name)
-if [ -f /system/phh/secure ];then
- flavor=${flavor}-secure
-fi
nextVersion=$(curl --silent -L https://raw.githubusercontent.com/phhusson/treble_experimentations/master/ota/squeak/$flavor/date)
if [ -z "$nextVersion" ];then
echo "Couldn't find any OTA for $flavor"
diff --git a/phh-securize.sh b/phh-securize.sh
deleted file mode 100644
index 80b46d7..0000000
--- a/phh-securize.sh
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/system/bin/sh
-
-if [ -e /system/bin/magisk ]
-then
- # remove bind-mount of phh-su overriding /system/bin/su -> ./magisk
- umount -l /system/bin/magisk
- # we need to modify the real system partition
- MAGISK_MIRROR="$(magisk --path)/.magisk/mirror"
- SYSTEM=$MAGISK_MIRROR/system
- MOUNTPOINT_LIST="$MAGISK_MIRROR/system_root $MAGISK_MIRROR/system"
-else
- SYSTEM=/system
- MOUNTPOINT_LIST="/system /"
-fi
-
-# remove bind-mount of phh-su (preventing $SYSTEM/xbin/su to be removed)
-umount -l /system/xbin/su
-
-for MOUNTPOINT in $MOUNTPOINT_LIST
-do
- [ -d $MOUNTPOINT ] && mountpoint -q $MOUNTPOINT && break
-done
-
-mount -o remount,rw $MOUNTPOINT
-remount
-
-touch $SYSTEM/phh/secure
-rm $SYSTEM/xbin/su
-rm $SYSTEM/bin/phh-su
-rm $SYSTEM/etc/init/su.rc
-rm $SYSTEM/bin/phh-securize.sh
-rm -Rf $SYSTEM/{app,priv-app}/me.phh.superuser/
-rm -Rf /data/su || true
-mount -o remount,ro $MOUNTPOINT
-sync
-mkdir /metadata/phh
-touch /metadata/phh/secure
-reboot
diff --git a/rw-system.sh b/rw-system.sh
index 3ddfdda..7546fae 100644
--- a/rw-system.sh
+++ b/rw-system.sh
@@ -779,65 +779,16 @@ copyprop() {
resetprop_phh "$1" "$(getprop "$2")"
fi
}
-if [ -f /system/phh/secure ] || [ -f /metadata/phh/secure ];then
- copyprop ro.build.device ro.vendor.build.device
- copyprop ro.system.build.fingerprint ro.vendor.build.fingerprint
- copyprop ro.bootimage.build.fingerprint ro.vendor.build.fingerprint
- copyprop ro.build.fingerprint ro.vendor.build.fingerprint
- copyprop ro.build.device ro.vendor.product.device
- copyprop ro.product.system.device ro.vendor.product.device
- copyprop ro.product.device ro.vendor.product.device
- copyprop ro.product.system.device ro.product.vendor.device
- copyprop ro.product.device ro.product.vendor.device
- copyprop ro.product.system.name ro.vendor.product.name
- copyprop ro.product.name ro.vendor.product.name
- copyprop ro.product.system.name ro.product.vendor.device
- copyprop ro.product.name ro.product.vendor.device
- copyprop ro.system.product.brand ro.vendor.product.brand
- copyprop ro.product.brand ro.vendor.product.brand
- copyprop ro.product.system.model ro.vendor.product.model
- copyprop ro.product.model ro.vendor.product.model
- copyprop ro.product.system.model ro.product.vendor.model
- copyprop ro.product.model ro.product.vendor.model
- copyprop ro.build.product ro.vendor.product.model
- copyprop ro.build.product ro.product.vendor.model
- copyprop ro.system.product.manufacturer ro.vendor.product.manufacturer
- copyprop ro.product.manufacturer ro.vendor.product.manufacturer
- copyprop ro.system.product.manufacturer ro.product.vendor.manufacturer
- copyprop ro.product.manufacturer ro.product.vendor.manufacturer
- (getprop ro.vendor.build.security_patch; getprop ro.keymaster.xxx.security_patch) |sort |tail -n 1 |while read v;do
- [ -n "$v" ] && resetprop_phh ro.build.version.security_patch "$v"
- done
- resetprop_phh ro.build.tags release-keys
- resetprop_phh ro.boot.vbmeta.device_state locked
- resetprop_phh ro.boot.verifiedbootstate green
- resetprop_phh ro.boot.flash.locked 1
- resetprop_phh ro.boot.veritymode enforcing
- resetprop_phh ro.boot.warranty_bit 0
- resetprop_phh ro.warranty_bit 0
- resetprop_phh ro.debuggable 0
- resetprop_phh ro.secure 1
- resetprop_phh ro.build.type user
- resetprop_phh --delete ro.build.selinux
-
- resetprop_phh ro.adb.secure 1
-
- # Hide system/xbin/su
- mount /mnt/phh/empty_dir /system/xbin
- mount /mnt/phh/empty_dir /system/app/me.phh.superuser
- mount /system/phh/empty /system/xbin/phh-su
-else
- mkdir /mnt/phh/xbin
- chmod 0755 /mnt/phh/xbin
- chcon u:object_r:system_file:s0 /mnt/phh/xbin
+mkdir /mnt/phh/xbin
+chmod 0755 /mnt/phh/xbin
+chcon u:object_r:system_file:s0 /mnt/phh/xbin
- #phh-su will bind over this empty file to make a real su
- touch /mnt/phh/xbin/su
- chcon u:object_r:system_file:s0 /mnt/phh/xbin/su
+#phh-su will bind over this empty file to make a real su
+touch /mnt/phh/xbin/su
+chcon u:object_r:system_file:s0 /mnt/phh/xbin/su
- mount -o bind /mnt/phh/xbin /system/xbin
-fi
+mount -o bind /mnt/phh/xbin /system/xbin
for abi in "" 64;do
f=/vendor/lib$abi/libstagefright_foundation.so
--
2.34.1

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

@ -1,49 +0,0 @@
From 77488a9ec7f97c5b658cd6224b0ef147ef9752cd Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Thu, 29 Dec 2022 15:12:03 +0000
Subject: [PATCH 7/9] treble: Securize on-demand
Status is stored in /metadata and controlled by persist prop
Change-Id: I8069b6f471ad87ab34c18b743689ab3584cee35b
---
phh-prop-handler.sh | 14 ++++++++++++++
vndk.rc | 3 +++
2 files changed, 17 insertions(+)
diff --git a/phh-prop-handler.sh b/phh-prop-handler.sh
index e187466..fe857b7 100644
--- a/phh-prop-handler.sh
+++ b/phh-prop-handler.sh
@@ -281,3 +281,17 @@ if [ "$1" == "persist.bluetooth.system_audio_hal.enabled" ]; then
restartAudio
exit
fi
+
+if [ "$1" == "persist.sys.phh.securize" ];then
+ if [[ "$prop_value" != "true" && "$prop_value" != "false" ]]; then
+ exit 1
+ fi
+
+ if [[ "$prop_value" == "true" ]]; then
+ mkdir /metadata/phh
+ touch /metadata/phh/secure
+ else
+ rm /metadata/phh/secure
+ fi
+ exit
+fi
diff --git a/vndk.rc b/vndk.rc
index 9f74ffd..dfcfcfe 100644
--- a/vndk.rc
+++ b/vndk.rc
@@ -112,3 +112,6 @@ service watchdogd-gsi /system/bin/watchdogd 10 20
# Fix for non-AMOLED Transsion devices where brightness would be dimmer than usual
on property:ro.vendor.transsion.backlight_12bit=*
setprop ro.vendor.transsion.backlight_hal.optimization ${ro.vendor.transsion.backlight_12bit}
+
+on property:persist.sys.phh.securize=*
+ exec u:r:phhsu_daemon:s0 root -- /system/bin/phh-prop-handler.sh "persist.sys.phh.securize"
--
2.34.1

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

@ -1,46 +0,0 @@
From 74ec0afa2767a82f22e16d8499ef1a48ffa34f1c Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Wed, 22 Mar 2023 23:37:05 +0000
Subject: [PATCH 8/9] treble: Also use /data/adb for securize status
Change-Id: I778f2be5407ae0a548a098c72031cce9be83cf96
---
phh-prop-handler.sh | 5 ++++-
rw-system.sh | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/phh-prop-handler.sh b/phh-prop-handler.sh
index fe857b7..c21438c 100644
--- a/phh-prop-handler.sh
+++ b/phh-prop-handler.sh
@@ -288,10 +288,13 @@ if [ "$1" == "persist.sys.phh.securize" ];then
fi
if [[ "$prop_value" == "true" ]]; then
- mkdir /metadata/phh
+ mkdir -p /metadata/phh
touch /metadata/phh/secure
+ mkdir -p /data/adb/phh
+ touch /data/adb/phh/secure
else
rm /metadata/phh/secure
+ rm /data/adb/phh/secure
fi
exit
fi
diff --git a/rw-system.sh b/rw-system.sh
index 4dd61f3..2817795 100644
--- a/rw-system.sh
+++ b/rw-system.sh
@@ -767,7 +767,7 @@ copyprop() {
resetprop_phh "$1" "$(getprop "$2")"
fi
}
-if [ -f /system/phh/secure ] || [ -f /metadata/phh/secure ];then
+if [ -f /system/phh/secure ] || [ -f /metadata/phh/secure ] || [ -f /data/adb/phh/secure ];then
copyprop ro.build.device ro.vendor.build.device
copyprop ro.system.build.fingerprint ro.vendor.build.fingerprint
copyprop ro.bootimage.build.fingerprint ro.vendor.build.fingerprint
--
2.34.1

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

@ -1,4 +1,4 @@
From 7b5af6750bdcfd107e607906b886a3034d52cb53 Mon Sep 17 00:00:00 2001
From 82927d1019eddeb325ea689cdf493717eab7bb49 Mon Sep 17 00:00:00 2001
From: Victor Bo <bvoid@yandex.ru>
Date: Wed, 3 Mar 2021 06:31:17 -0500
Subject: [PATCH] Restore /sbin for Magisk compatibility
@ -58,7 +58,7 @@ index 9ab7f4305..c45317d0f 100644
{ 00755, AID_ROOT, AID_SHELL, 0, "system/bin/*" },
{ 00755, AID_ROOT, AID_SHELL, 0, "system/xbin/*" },
diff --git a/rootdir/Android.mk b/rootdir/Android.mk
index 7deb17324..aeeaad496 100644
index 7444f963f..b74887c43 100644
--- a/rootdir/Android.mk
+++ b/rootdir/Android.mk
@@ -96,7 +96,7 @@ endif
@ -67,7 +67,7 @@ index 7deb17324..aeeaad496 100644
LOCAL_POST_INSTALL_CMD := mkdir -p $(addprefix $(TARGET_ROOT_OUT)/, \
- dev proc sys system data data_mirror odm oem acct config storage mnt apex bootstrap-apex debug_ramdisk \
+ sbin dev proc sys system data data_mirror odm oem acct config storage mnt apex bootstrap-apex debug_ramdisk \
linkerconfig second_stage_resources postinstall $(BOARD_ROOT_EXTRA_FOLDERS)); \
linkerconfig second_stage_resources postinstall tmp $(BOARD_ROOT_EXTRA_FOLDERS)); \
ln -sf /system/bin $(TARGET_ROOT_OUT)/bin; \
ln -sf /system/etc $(TARGET_ROOT_OUT)/etc; \
diff --git a/rootdir/init.environ.rc.in b/rootdir/init.environ.rc.in

64
patches_treble/treble_app/0001-Simplify-Securize-to-CheckBoxPreference-and-persist-.patch → patches_treble/treble_app/0001-Remove-Securize-2-2.patch
View File

@ -1,42 +1,29 @@
From 66534cd4c678494e0aa0e74197a39fcee57e313a Mon Sep 17 00:00:00 2001
From 5de486b70139a2dc66c38b0be6df5396b74391fc 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
Date: Mon, 15 Jul 2024 22:14:09 +0800
Subject: [PATCH] Remove Securize (2/2)
For "Securize on-demand"
Leave this Play Integrity mess to the professionals
Change-Id: I36abaea9714ccdd5680be88e771143eee2a170cd
---
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(-)
.../java/me/phh/treble/app/MiscSettings.kt | 34 -------------------
app/src/main/res/xml/pref_misc.xml | 6 ++--
2 files changed, 4 insertions(+), 36 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
index 78556be..661abb2 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() {
@@ -21,7 +21,6 @@ object MiscSettings : Settings {
val disableButtonsBacklight = "key_misc_disable_buttons_backlight"
val forceNavbarOff = "key_misc_force_navbar_off"
val bluetooth = "key_misc_bluetooth"
- val securize = "key_misc_securize"
val removeTelephony = "key_misc_removetelephony"
val remotectl = "key_misc_remotectl"
val disableAudioEffects = "key_misc_disable_audio_effects"
@@ -58,39 +57,6 @@ class MiscSettingsFragment : SettingsFragment() {
override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
super.onCreatePreferences(savedInstanceState, rootKey)
@ -77,20 +64,19 @@ index e3b5312..5fe481f 100644
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
index dbd8b88..0e8706d 100644
--- a/app/src/main/res/xml/pref_misc.xml
+++ b/app/src/main/res/xml/pref_misc.xml
@@ -193,8 +193,11 @@
@@ -203,8 +203,10 @@
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" />
+ <Preference
+ android:enabled="false"
+ android:title="Securize"
+ android:summary="Unsupported - please try other methods\n(e.g. PlayIntegrityFix module)" />
</PreferenceCategory>
<PreferenceCategory android:title="Debugging">
<Preference android:title="Debug Sensors">

12
patches_treble_prerequisite/packages_modules_Bluetooth/0001-Revert-gd-hci-Allow-disabling-selected-local-command.patch
View File

@ -1,4 +1,4 @@
From cd3589bfec212ae631772e0fdc984f21fc2bafe7 Mon Sep 17 00:00:00 2001
From 3ddebb45d3e48e581c0ac739b0b35b11f4737acc Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Mon, 20 Nov 2023 21:59:29 +0800
Subject: [PATCH] Revert "gd: hci: Allow disabling selected local commands"
@ -9,7 +9,7 @@ This reverts commit 543afb3dd2e2b5aa4f1931a973eb7c7df634aa69.
1 file changed, 12 deletions(-)
diff --git a/system/gd/hci/controller.cc b/system/gd/hci/controller.cc
index 5576293017..c08ecab9d5 100644
index 6facfef4c3..a6c16a9061 100644
--- a/system/gd/hci/controller.cc
+++ b/system/gd/hci/controller.cc
@@ -16,7 +16,6 @@
@ -17,10 +17,10 @@ index 5576293017..c08ecab9d5 100644
#include "hci/controller.h"
-#include <android-base/strings.h>
#include <android_bluetooth_flags.h>
#include <future>
#include <memory>
#include <string>
@@ -37,8 +36,6 @@ constexpr uint8_t kMinEncryptionKeySize = 7; // #define MIN_ENCRYPTION_KEY_SIZE
@@ -43,8 +42,6 @@ constexpr uint8_t kMinEncryptionKeySize = 7; // #define MIN_ENCRYPTION_KEY_SIZE
constexpr bool kDefaultVendorCapabilitiesEnabled = true;
static const std::string kPropertyVendorCapabilitiesEnabled =
"bluetooth.core.le.vendor_capabilities.enabled";
@ -29,7 +29,7 @@ index 5576293017..c08ecab9d5 100644
using os::Handler;
@@ -301,15 +298,6 @@ struct Controller::impl {
@@ -317,15 +314,6 @@ struct Controller::impl {
ErrorCode status = complete_view.GetStatus();
ASSERT_LOG(status == ErrorCode::SUCCESS, "Status 0x%02hhx, %s", status, ErrorCodeText(status).c_str());
local_supported_commands_ = complete_view.GetSupportedCommands();

20
patches_treble_td/platform_frameworks_av/0001-APM-Restore-S-R-and-Q-behavior-respectively-for-tele.patch
View File

@ -1,4 +1,4 @@
From 4edc031741505b06ea466479f419ec86cb04718f Mon Sep 17 00:00:00 2001
From 0c66c0bf51f8edb8b880e9d15594befe9ead217c Mon Sep 17 00:00:00 2001
From: Peter Cai <peter@typeblog.net>
Date: Thu, 18 Aug 2022 15:44:46 -0400
Subject: [PATCH 01/24] APM: Restore S, R and Q behavior respectively for
@ -36,10 +36,10 @@ Change-Id: I56d36d2aef4319935cb88a3e4771b23c6d5b2145
2 files changed, 147 insertions(+), 62 deletions(-)
diff --git a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
index 135548fb9c..fc99bdbd78 100644
index 3bebb1134a..1823522fe2 100644
--- a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
+++ b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
@@ -692,6 +692,17 @@ status_t AudioPolicyManager::updateCallRoutingInternal(
@@ -699,6 +699,17 @@ status_t AudioPolicyManager::updateCallRoutingInternal(
ALOGV("%s device rxDevice %s txDevice %s", __func__,
rxDevices.itemAt(0)->toString().c_str(), txSourceDevice->toString().c_str());
@ -57,7 +57,7 @@ index 135548fb9c..fc99bdbd78 100644
auto telephonyRxModule =
mHwModules.getModuleForDeviceType(AUDIO_DEVICE_IN_TELEPHONY_RX, AUDIO_FORMAT_DEFAULT);
auto telephonyTxModule =
@@ -714,9 +725,20 @@ status_t AudioPolicyManager::updateCallRoutingInternal(
@@ -721,9 +732,20 @@ status_t AudioPolicyManager::updateCallRoutingInternal(
ALOGE("%s() no telephony Tx and/or RX device", __func__);
return INVALID_OPERATION;
}
@ -81,7 +81,7 @@ index 135548fb9c..fc99bdbd78 100644
} else {
// If the RX device is on the primary HW module, then use legacy routing method for
// voice calls via setOutputDevice() on primary output.
@@ -737,7 +759,14 @@ status_t AudioPolicyManager::updateCallRoutingInternal(
@@ -744,7 +766,14 @@ status_t AudioPolicyManager::updateCallRoutingInternal(
}
muteWaitMs = setOutputDevices(__func__, mPrimaryOutput, rxDevices, true, delayMs);
} else { // create RX path audio patch
@ -97,7 +97,7 @@ index 135548fb9c..fc99bdbd78 100644
// If the TX device is on the primary HW module but RX device is
// on other HW module, SinkMetaData of telephony input should handle it
// assuming the device uses audio HAL V5.0 and above
@@ -752,7 +781,12 @@ status_t AudioPolicyManager::updateCallRoutingInternal(
@@ -759,7 +788,12 @@ status_t AudioPolicyManager::updateCallRoutingInternal(
closeActiveClients(activeDesc);
}
}
@ -111,7 +111,7 @@ index 135548fb9c..fc99bdbd78 100644
}
if (waitMs != nullptr) {
*waitMs = muteWaitMs;
@@ -760,6 +794,36 @@ status_t AudioPolicyManager::updateCallRoutingInternal(
@@ -767,6 +801,36 @@ status_t AudioPolicyManager::updateCallRoutingInternal(
return NO_ERROR;
}
@ -148,7 +148,7 @@ index 135548fb9c..fc99bdbd78 100644
bool AudioPolicyManager::isDeviceOfModule(
const sp<DeviceDescriptor>& devDesc, const char *moduleId) const {
sp<HwModule> module = mHwModules.getModuleFromName(moduleId);
@@ -5087,83 +5151,101 @@ status_t AudioPolicyManager::createAudioPatchInternal(const struct audio_patch *
@@ -5192,83 +5256,101 @@ status_t AudioPolicyManager::createAudioPatchInternal(const struct audio_patch *
// in config XML to reach the sink so that is can be declared as available.
audio_io_handle_t output = AUDIO_IO_HANDLE_NONE;
sp<SwAudioOutputDescriptor> outputDesc;
@ -308,10 +308,10 @@ index 135548fb9c..fc99bdbd78 100644
AUDIO_STREAM_PATCH;
patchBuilder.addSource(srcMixPortConfig);
diff --git a/services/audiopolicy/managerdefault/AudioPolicyManager.h b/services/audiopolicy/managerdefault/AudioPolicyManager.h
index a1c8f6202c..ee1b595e30 100644
index a3232a2d40..cc2cf50688 100644
--- a/services/audiopolicy/managerdefault/AudioPolicyManager.h
+++ b/services/audiopolicy/managerdefault/AudioPolicyManager.h
@@ -964,6 +964,9 @@ protected:
@@ -980,6 +980,9 @@ protected:
SoundTriggerSessionCollection mSoundTriggerSessions;

2
patches_treble_td/platform_frameworks_av/0002-Fix-BT-in-call-on-CAF-devices.patch
View File

@ -1,4 +1,4 @@
From 1a713e8b42c975a61e3751b4acf66732559c4152 Mon Sep 17 00:00:00 2001
From 64131a132e24a38e12b9c4b2b9ba94b3d9091085 Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Mon, 5 Aug 2019 18:09:50 +0200
Subject: [PATCH 02/24] Fix BT in-call on CAF devices

16
patches_treble_td/platform_frameworks_av/0003-Add-partial-cam-id-is-hardcoded-support-for-Asus-ZF6.patch
View File

@ -1,4 +1,4 @@
From 323d4a565abc38d9f32c4d77825f73ad0638cf1d Mon Sep 17 00:00:00 2001
From 66a6eb4ef75d566fd86877e303ff3a5688e37165 Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Tue, 1 Oct 2019 13:35:49 +0200
Subject: [PATCH 03/24] Add (partial, cam id is hardcoded) support for Asus ZF6
@ -11,7 +11,7 @@ Change-Id: Iea6e1370780a1d16f728748d1d948d092532d8fe
2 files changed, 29 insertions(+)
diff --git a/services/camera/libcameraservice/CameraService.cpp b/services/camera/libcameraservice/CameraService.cpp
index 6acf0b6cae..8d0f3bdab7 100644
index 2d55f39b25..1e4001be1c 100644
--- a/services/camera/libcameraservice/CameraService.cpp
+++ b/services/camera/libcameraservice/CameraService.cpp
@@ -28,6 +28,7 @@
@ -22,7 +22,7 @@ index 6acf0b6cae..8d0f3bdab7 100644
#include <inttypes.h>
#include <pthread.h>
#include <poll.h>
@@ -153,6 +154,7 @@ static std::set<std::string> sServiceErrorEventSet;
@@ -159,6 +160,7 @@ static std::set<std::string> sServiceErrorEventSet;
CameraService::CameraService(
std::shared_ptr<CameraServiceProxyWrapper> cameraServiceProxyWrapper) :
@ -30,7 +30,7 @@ index 6acf0b6cae..8d0f3bdab7 100644
mCameraServiceProxyWrapper(cameraServiceProxyWrapper == nullptr ?
std::make_shared<CameraServiceProxyWrapper>() : cameraServiceProxyWrapper),
mEventLog(DEFAULT_EVENT_LOG_LENGTH),
@@ -2628,6 +2630,7 @@ Status CameraService::connectHelper(const sp<CALLBACK>& cameraCb, const std::str
@@ -2743,6 +2745,7 @@ Status CameraService::connectHelper(const sp<CALLBACK>& cameraCb, const std::str
mServiceLock.lock();
} else {
// Otherwise, add client to active clients list
@ -38,7 +38,7 @@ index 6acf0b6cae..8d0f3bdab7 100644
finishConnectLocked(client, partial, oomScoreOffset, systemNativeClient);
}
@@ -2754,6 +2757,27 @@ status_t CameraService::addOfflineClient(const std::string &cameraId,
@@ -2869,6 +2872,27 @@ status_t CameraService::addOfflineClient(const std::string &cameraId,
return OK;
}
@ -66,7 +66,7 @@ index 6acf0b6cae..8d0f3bdab7 100644
Status CameraService::turnOnTorchWithStrengthLevel(const std::string& unresolvedCameraId,
int32_t torchStrength, const sp<IBinder>& clientBinder) {
Mutex::Autolock lock(mServiceLock);
@@ -4023,6 +4047,8 @@ binder::Status CameraService::BasicClient::disconnect() {
@@ -4138,6 +4162,8 @@ binder::Status CameraService::BasicClient::disconnect() {
}
mDisconnected = true;
@ -76,10 +76,10 @@ index 6acf0b6cae..8d0f3bdab7 100644
sCameraService->logDisconnected(mCameraIdStr, mClientPid, mClientPackageName);
sCameraService->mCameraProviderManager->removeRef(CameraProviderManager::DeviceMode::CAMERA,
diff --git a/services/camera/libcameraservice/CameraService.h b/services/camera/libcameraservice/CameraService.h
index 7dc0b91cc9..15ea8b9064 100644
index 8822cd37cf..e2c38a9096 100644
--- a/services/camera/libcameraservice/CameraService.h
+++ b/services/camera/libcameraservice/CameraService.h
@@ -271,6 +271,9 @@ public:
@@ -276,6 +276,9 @@ public:
// Register an offline client for a given active camera id
status_t addOfflineClient(const std::string &cameraId, sp<BasicClient> offlineClient);

2
patches_treble_td/platform_frameworks_av/0004-APM-Optionally-force-load-audio-policy-for-system-si.patch
View File

@ -1,4 +1,4 @@
From 521e59e5aea2093c82a3ec3171725f49885a1c92 Mon Sep 17 00:00:00 2001
From 3708bb8a7cba3be95a53d3afad8f4a502b366ae6 Mon Sep 17 00:00:00 2001
From: Peter Cai <peter@typeblog.net>
Date: Wed, 24 Aug 2022 15:42:39 -0400
Subject: [PATCH 04/24] APM: Optionally force-load audio policy for system-side

2
patches_treble_td/platform_frameworks_av/0005-APM-Remove-A2DP-audio-ports-from-the-primary-HAL.patch
View File

@ -1,4 +1,4 @@
From 7d9889aa8c86186b6d5d20b9f79a9cb755f7424a Mon Sep 17 00:00:00 2001
From 70ede12fd7215948067cf687613d3eedeb57e073 Mon Sep 17 00:00:00 2001
From: Peter Cai <peter@typeblog.net>
Date: Thu, 25 Aug 2022 13:30:29 -0400
Subject: [PATCH 05/24] APM: Remove A2DP audio ports from the primary HAL

2
patches_treble_td/platform_frameworks_av/0006-audiopolicy-try-again-with-trimmed-audio-port-name-i.patch
View File

@ -1,4 +1,4 @@
From e7aac58de94e2774f1e0d3c466fb4dafdd90feeb Mon Sep 17 00:00:00 2001
From 3ad1c75d98330f969396240399b22e8e4c7c2601 Mon Sep 17 00:00:00 2001
From: Peter Cai <peter@typeblog.net>
Date: Thu, 23 Jan 2020 11:13:43 +0800
Subject: [PATCH 06/24] audiopolicy: try again with trimmed audio port name if

10
patches_treble_td/platform_frameworks_av/0007-camera-Implement-property-to-override-default-camera.patch
View File

@ -1,4 +1,4 @@
From 37cd5e07843175c9d4aa5df2f11e2e00f01e378c Mon Sep 17 00:00:00 2001
From 5a170e94d2f73ca9ff749b7cc58d90678b6ade04 Mon Sep 17 00:00:00 2001
From: Peter Cai <peter@typeblog.net>
Date: Wed, 1 Jun 2022 16:56:46 -0400
Subject: [PATCH 07/24] camera: Implement property to override default camera
@ -11,10 +11,10 @@ Change-Id: I002bfa974bafc2cc01365eeea31c7a5dcb5a2028
1 file changed, 22 insertions(+)
diff --git a/services/camera/libcameraservice/common/CameraProviderManager.cpp b/services/camera/libcameraservice/common/CameraProviderManager.cpp
index 1ba3de49a2..3fffb03da8 100644
index 15e2755a98..60e4eb7b42 100644
--- a/services/camera/libcameraservice/common/CameraProviderManager.cpp
+++ b/services/camera/libcameraservice/common/CameraProviderManager.cpp
@@ -40,6 +40,7 @@
@@ -41,6 +41,7 @@
#include <functional>
#include <camera_metadata_hidden.h>
#include <android-base/parseint.h>
@ -22,7 +22,7 @@ index 1ba3de49a2..3fffb03da8 100644
#include <android-base/logging.h>
#include <cutils/properties.h>
#include <hwbinder/IPCThreadState.h>
@@ -261,6 +262,15 @@ std::vector<std::string> CameraProviderManager::getCameraDeviceIds(std::unordere
@@ -278,6 +279,15 @@ std::vector<std::string> CameraProviderManager::getCameraDeviceIds(std::unordere
}
}
}
@ -38,7 +38,7 @@ index 1ba3de49a2..3fffb03da8 100644
return deviceIds;
}
@@ -327,6 +337,18 @@ std::vector<std::string> CameraProviderManager::getAPI1CompatibleCameraDeviceIds
@@ -344,6 +354,18 @@ std::vector<std::string> CameraProviderManager::getAPI1CompatibleCameraDeviceIds
std::sort(systemDeviceIds.begin(), systemDeviceIds.end(), sortFunc);
deviceIds.insert(deviceIds.end(), publicDeviceIds.begin(), publicDeviceIds.end());
deviceIds.insert(deviceIds.end(), systemDeviceIds.begin(), systemDeviceIds.end());

6
patches_treble_td/platform_frameworks_av/0008-There-are-three-SCO-devices.-Fallback-from-one-to-th.patch
View File

@ -1,4 +1,4 @@
From 9b1b33604d6e17d5b2f2bfccf2a1eac5f8b1334e Mon Sep 17 00:00:00 2001
From 772f3d3d92335d509ce7e669353f15d33df17abe Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Mon, 13 Apr 2020 21:01:16 +0200
Subject: [PATCH 08/24] There are three SCO devices. Fallback from one to the
@ -10,10 +10,10 @@ Change-Id: I414dcb6b154855c00cb8520b23dc1069827864b2
1 file changed, 21 insertions(+)
diff --git a/services/audiopolicy/common/managerdefinitions/src/HwModule.cpp b/services/audiopolicy/common/managerdefinitions/src/HwModule.cpp
index cb45f5438b..ffefd5fa32 100644
index 6696b45f03..3ea185d873 100644
--- a/services/audiopolicy/common/managerdefinitions/src/HwModule.cpp
+++ b/services/audiopolicy/common/managerdefinitions/src/HwModule.cpp
@@ -318,6 +318,27 @@ sp<HwModule> HwModuleCollection::getModuleForDeviceType(audio_devices_t type,
@@ -321,6 +321,27 @@ sp<HwModule> HwModuleCollection::getModuleForDeviceType(audio_devices_t type,
}
}
}

6
patches_treble_td/platform_frameworks_av/0009-Add-persist.sys.phh.samsung.camera_ids-property-to-a.patch
View File

@ -1,4 +1,4 @@
From 39b141bbcbcef2edb0837ca8b6e89330a48b5e94 Mon Sep 17 00:00:00 2001
From 3bdff36cbdf77acc3d9c277b3b2eef9a2fca1c3c Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Thu, 14 May 2020 19:54:55 +0200
Subject: [PATCH 09/24] Add persist.sys.phh.samsung.camera_ids property to
@ -11,7 +11,7 @@ Change-Id: I2c7bf535272acc28ed2277e96c78ddd28a0b4593
2 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/services/camera/libcameraservice/Android.bp b/services/camera/libcameraservice/Android.bp
index 4883a09f37..080ccf646d 100644
index 5b76bb0c0f..2f574133c6 100644
--- a/services/camera/libcameraservice/Android.bp
+++ b/services/camera/libcameraservice/Android.bp
@@ -107,6 +107,7 @@ cc_defaults {
@ -23,7 +23,7 @@ index 4883a09f37..080ccf646d 100644
"libbinderthreadstateutils",
"libcameraservice_device_independent",
diff --git a/services/camera/libcameraservice/common/hidl/HidlProviderInfo.cpp b/services/camera/libcameraservice/common/hidl/HidlProviderInfo.cpp
index d2643c1e13..71aabc14b3 100644
index 065f0c5569..1b22767779 100644
--- a/services/camera/libcameraservice/common/hidl/HidlProviderInfo.cpp
+++ b/services/camera/libcameraservice/common/hidl/HidlProviderInfo.cpp
@@ -28,6 +28,7 @@

6
patches_treble_td/platform_frameworks_av/0010-Add-a-property-to-force-camera-timestamp-source.patch
View File

@ -1,4 +1,4 @@
From 924c9942ae267e00676623718996f34478a9e541 Mon Sep 17 00:00:00 2001
From d3b95d0b5dfff1f1470dba177541b2090c8ad85d Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Tue, 19 May 2020 14:01:14 +0200
Subject: [PATCH 10/24] Add a property to force camera timestamp source
@ -18,10 +18,10 @@ timestamp source.
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/services/camera/libcameraservice/device3/Camera3Device.cpp b/services/camera/libcameraservice/device3/Camera3Device.cpp
index bdf77993ea..44394ac6ff 100644
index 303bcfc180..29702c84c0 100644
--- a/services/camera/libcameraservice/device3/Camera3Device.cpp
+++ b/services/camera/libcameraservice/device3/Camera3Device.cpp
@@ -218,8 +218,16 @@ status_t Camera3Device::initializeCommonLocked() {
@@ -209,8 +209,16 @@ status_t Camera3Device::initializeCommonLocked() {
mTimestampOffset = getMonoToBoottimeOffset();
camera_metadata_entry timestampSource =
mDeviceInfo.find(ANDROID_SENSOR_INFO_TIMESTAMP_SOURCE);

2
patches_treble_td/platform_frameworks_av/0011-FIH-devices-Fix-Earpiece-audio-output.patch
View File

@ -1,4 +1,4 @@
From 2770f16ee043c697256171eef02146114ce70890 Mon Sep 17 00:00:00 2001
From ab29ebc6a1d51718ee60d28921ce53241433d66c Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Tue, 24 Apr 2018 00:14:28 +0200
Subject: [PATCH 11/24] FIH devices: Fix "Earpiece" audio output

2
patches_treble_td/platform_frameworks_av/0012-No-longer-make-re-assigning-legacy-audio-groups-fata.patch
View File

@ -1,4 +1,4 @@
From 74fbe339a37e281023053dc2ede79568b6d3b280 Mon Sep 17 00:00:00 2001
From 958fc690726a71004bd0264664968b2bd8eb08ae Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Sat, 12 Sep 2020 12:32:50 +0200
Subject: [PATCH 12/24] No longer make re-assigning legacy audio groups fatal.

8
patches_treble_td/platform_frameworks_av/0013-Make-camera-IDs-filter-out-optional.patch
View File

@ -1,4 +1,4 @@
From f455aa5e0d283d4a0f06869f3f7acdeb2b7ffc4e Mon Sep 17 00:00:00 2001
From c3dd6050d65fe5793d30771eb8a008670949ba40 Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Mon, 21 Dec 2020 20:19:11 +0100
Subject: [PATCH 13/24] Make camera IDs filter-out optional
@ -11,10 +11,10 @@ Add a property for that.
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/services/camera/libcameraservice/common/CameraProviderManager.cpp b/services/camera/libcameraservice/common/CameraProviderManager.cpp
index 3fffb03da8..ab6cb6bd57 100644
index 60e4eb7b42..fbfdecc2ed 100644
--- a/services/camera/libcameraservice/common/CameraProviderManager.cpp
+++ b/services/camera/libcameraservice/common/CameraProviderManager.cpp
@@ -311,7 +311,9 @@ std::vector<std::string> CameraProviderManager::getAPI1CompatibleCameraDeviceIds
@@ -328,7 +328,9 @@ std::vector<std::string> CameraProviderManager::getAPI1CompatibleCameraDeviceIds
// API1 app doesn't handle logical and physical camera devices well. So
// for each camera facing, only take the first id advertised by HAL in
// all [logical, physical1, physical2, ...] id combos, and filter out the rest.
@ -25,7 +25,7 @@ index 3fffb03da8..ab6cb6bd57 100644
collectDeviceIdsLocked(providerDeviceIds, publicDeviceIds, systemDeviceIds);
}
auto sortFunc =
@@ -1108,10 +1110,12 @@ SystemCameraKind CameraProviderManager::ProviderInfo::DeviceInfo3::getSystemCame
@@ -1137,10 +1139,12 @@ SystemCameraKind CameraProviderManager::ProviderInfo::DeviceInfo3::getSystemCame
// Go through the capabilities and check if it has
// ANDROID_REQUEST_AVAILABLE_CAPABILITIES_SYSTEM_CAMERA

6
patches_treble_td/platform_frameworks_av/0014-Support-Samsung-R-multi-cams.patch
View File

@ -1,4 +1,4 @@
From 665d173a566745531c3568e958079fabdd4aa857 Mon Sep 17 00:00:00 2001
From dfa461bb49279d406df7e6b2e1817acea65e0faa Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Sat, 13 Mar 2021 14:20:03 -0500
Subject: [PATCH 14/24] Support Samsung R multi-cams
@ -10,7 +10,7 @@ Change-Id: If46f385e8dd16185cbf37ab083e6a1242e1d1555
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/services/camera/libcameraservice/Android.bp b/services/camera/libcameraservice/Android.bp
index 080ccf646d..1ece884867 100644
index 2f574133c6..6b7a74edb6 100644
--- a/services/camera/libcameraservice/Android.bp
+++ b/services/camera/libcameraservice/Android.bp
@@ -108,6 +108,7 @@ cc_defaults {
@ -22,7 +22,7 @@ index 080ccf646d..1ece884867 100644
"libbinderthreadstateutils",
"libcameraservice_device_independent",
diff --git a/services/camera/libcameraservice/common/hidl/HidlProviderInfo.cpp b/services/camera/libcameraservice/common/hidl/HidlProviderInfo.cpp
index 71aabc14b3..aefd6c3d4f 100644
index 1b22767779..c60c0c4ffa 100644
--- a/services/camera/libcameraservice/common/hidl/HidlProviderInfo.cpp
+++ b/services/camera/libcameraservice/common/hidl/HidlProviderInfo.cpp
@@ -29,6 +29,7 @@

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