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

Changes for July 2024

Browse Source
This commit is contained in:
Andy CrossGate Yan
2024-07-21 17:16:11 +08:00
parent 1855253db2
commit b6248125ef
96 changed files with 2462 additions and 756 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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?

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

@@ -1,4 +1,4 @@
From 81689aaba1afbba29c980f60b51c04da97c3d2a1 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
@@ -6,12 +6,12 @@ Subject: [PATCH] SetupWizard: Least Action(s) Principle
Change-Id: I892634b8ffc7beafa5a223de0afdc64276efd2f5
---
res/raw/lineage_wizard_script.xml | 62 +------------------
.../lineage_wizard_script_managed_profile.xml | 21 +------
res/raw/lineage_wizard_script_user.xml | 38 +-----------
3 files changed, 3 insertions(+), 118 deletions(-)
.../lineage_wizard_script_managed_profile.xml | 22 +------
res/raw/lineage_wizard_script_user.xml | 39 +-----------
3 files changed, 3 insertions(+), 120 deletions(-)
diff --git a/res/raw/lineage_wizard_script.xml b/res/raw/lineage_wizard_script.xml
index ea342b6..43bb23f 100644
index af3df01..21cd2ef 100644
--- a/res/raw/lineage_wizard_script.xml
+++ b/res/raw/lineage_wizard_script.xml
@@ -5,13 +5,7 @@
@@ -29,7 +29,7 @@ index ea342b6..43bb23f 100644
<WizardAction
wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_WELCOME;end"
@@ -22,12 +16,6 @@
@@ -23,12 +17,6 @@
<WizardAction
wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_LOCALE;end"
id="locale">
@@ -42,7 +42,7 @@ index ea342b6..43bb23f 100644
<result wizard:action="network_setup" />
</WizardAction>
@@ -40,54 +28,6 @@
@@ -41,54 +29,6 @@
<WizardAction
wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_DATETIME;end"
id="datetime">
@@ -76,18 +76,18 @@ index ea342b6..43bb23f 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>
-
@@ -98,10 +98,10 @@ index ea342b6..43bb23f 100644
</WizardAction>
diff --git a/res/raw/lineage_wizard_script_managed_profile.xml b/res/raw/lineage_wizard_script_managed_profile.xml
index 6a4d1e5..47e99c5 100644
index 36f80c6..47e99c5 100644
--- a/res/raw/lineage_wizard_script_managed_profile.xml
+++ b/res/raw/lineage_wizard_script_managed_profile.xml
@@ -1,30 +1,11 @@
@@ -1,31 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
SPDX-FileCopyrightText: 2016 The CyanogenMod Project
@@ -115,6 +115,7 @@ index 6a4d1e5..47e99c5 100644
- <WizardAction
- wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_WELCOME;end"
- id="welcome">
- <result wizard:name="skip" wizard:resultCode="1" />
- <result wizard:action="restore" />
- </WizardAction>
-
@@ -134,10 +135,10 @@ index 6a4d1e5..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 af38520..47e99c5 100644
index 1522eda..47e99c5 100644
--- a/res/raw/lineage_wizard_script_user.xml
+++ b/res/raw/lineage_wizard_script_user.xml
@@ -5,43 +5,7 @@
@@ -5,44 +5,7 @@
SPDX-License-Identifier: Apache-2.0
-->
<WizardScript xmlns:wizard="http://schemas.android.com/apk/res/com.google.android.setupwizard"
@@ -146,6 +147,7 @@ index af38520..47e99c5 100644
- <WizardAction
- wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_WELCOME;end"
- id="welcome">
- <result wizard:name="skip" wizard:resultCode="1" />
- <result wizard:action="restore" />
- </WizardAction>
-
@@ -158,18 +160,18 @@ index af38520..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)
}