Initial unified commit for Android 14, with TrebleDroid GSI target, syncing up to 20240208

2024-02-17 16:46:38 +08:00
commit e9902a4450
281 changed files with 169698 additions and 0 deletions
--- a/patches_platform_personal/build_make/0001-build-Integrate-prop-modifications-1-2.patch
+++ b/patches_platform_personal/build_make/0001-build-Integrate-prop-modifications-1-2.patch
@@ -0,0 +1,46 @@
+From 2a644e6a7d3dbdea344fc24408c86e0676811333 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(-)
+
+diff --git a/tools/buildinfo.sh b/tools/buildinfo.sh
+index 4c82ec9edc..c01872c369 100755
+--- a/tools/buildinfo.sh
+++ b/tools/buildinfo.sh
+@@ -9,7 +9,7 @@ if [ "$BOARD_USE_VBMETA_DIGTEST_IN_FINGERPRINT" = "true" ] ; then
+ else
+   echo "ro.build.id=$BUILD_ID"
+ fi
+-echo "ro.build.display.id=$BUILD_DISPLAY_ID"
+echo "ro.build.display.id=$BUILD_ID"
+ echo "ro.build.version.incremental=$BUILD_NUMBER"
+ echo "ro.build.version.sdk=$PLATFORM_SDK_VERSION"
+ echo "ro.build.version.preview_sdk=$PLATFORM_PREVIEW_SDK_VERSION"
+@@ -23,7 +23,7 @@ echo "ro.build.version.release_or_preview_display=$PLATFORM_DISPLAY_VERSION"
+ echo "ro.build.version.security_patch=$PLATFORM_SECURITY_PATCH"
+ echo "ro.build.version.base_os=$PLATFORM_BASE_OS"
+ echo "ro.build.version.min_supported_target_sdk=$PLATFORM_MIN_SUPPORTED_TARGET_SDK_VERSION"
+-echo "ro.build.date=`$DATE`"
+echo "ro.build.date=`$DATE +\"%B %-d, %Y\"`"
+ echo "ro.build.date.utc=`$DATE +%s`"
+ echo "ro.build.type=$TARGET_BUILD_TYPE"
+ echo "ro.build.user=$BUILD_USERNAME"
+@@ -55,5 +55,10 @@ 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"
+-- 
+2.34.1
+
--- a/patches_platform_personal/build_make/0002-build-Remove-Stk-1-2.patch
+++ b/patches_platform_personal/build_make/0002-build-Remove-Stk-1-2.patch
@@ -0,0 +1,25 @@
+From 614df52d701e164b0da9586209e4a45e404df52b 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)
+
+Change-Id: I24ef17c74c3137a11b463cde96c74d0edc853edd
+---
+ target/product/generic_system.mk | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/target/product/generic_system.mk b/target/product/generic_system.mk
+index 98d6046854..da9adc3af5 100644
+--- a/target/product/generic_system.mk
+++ b/target/product/generic_system.mk
+@@ -33,7 +33,6 @@ PRODUCT_PACKAGES += \
+     LiveWallpapersPicker \
+     PartnerBookmarksProvider \
+     preinstalled-packages-platform-generic-system.xml \
+-    Stk \
+     Tag \
+ 
+ # OTA support
+-- 
+2.34.1
+
--- a/patches_platform_personal/frameworks_base/0001-Add-keylayout-for-Backbone-One-for-Android-with-AB-X.patch
+++ b/patches_platform_personal/frameworks_base/0001-Add-keylayout-for-Backbone-One-for-Android-with-AB-X.patch
@@ -0,0 +1,52 @@
+From a72755422c5a5a8ddd6bb4ca94cd98672f25b30b Mon Sep 17 00:00:00 2001
+From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
+Date: Sun, 18 Jun 2023 19:33:27 +0800
+Subject: [PATCH 01/21] Add keylayout for Backbone One for Android, with AB/XY
+ keys swapped
+
+Change-Id: Ia057c084099015b544c926cd57c37b4ac314867a
+---
+ data/keyboards/Vendor_358a_Product_0201.kl | 31 ++++++++++++++++++++++
+ 1 file changed, 31 insertions(+)
+ create mode 100644 data/keyboards/Vendor_358a_Product_0201.kl
+
+diff --git a/data/keyboards/Vendor_358a_Product_0201.kl b/data/keyboards/Vendor_358a_Product_0201.kl
+new file mode 100644
+index 000000000000..e15907f9c6f2
+--- /dev/null
+++ b/data/keyboards/Vendor_358a_Product_0201.kl
+@@ -0,0 +1,31 @@
+#
+# Backbone One for Android
+#
+
+# AB/XY swapped
+key 305 BUTTON_A
+key 304 BUTTON_B
+key 308 BUTTON_X
+key 307 BUTTON_Y
+
+key 310 BUTTON_L1
+key 311 BUTTON_R1
+key 312 BUTTON_L2
+key 313 BUTTON_R2
+
+key 317 BUTTON_THUMBL
+key 318 BUTTON_THUMBR
+
+axis 0x00 X flat 4096
+axis 0x01 Y flat 4096
+axis 0x02 Z flat 4096
+axis 0x05 RZ flat 4096
+
+axis 0x0a LTRIGGER
+axis 0x09 RTRIGGER
+
+axis 0x10 HAT_X
+axis 0x11 HAT_Y
+
+key 315 BUTTON_START
+key 314 BUTTON_SELECT
+-- 
+2.34.1
+
--- a/patches_platform_personal/frameworks_base/0002-Add-MiuiNavbarOverlay.patch
+++ b/patches_platform_personal/frameworks_base/0002-Add-MiuiNavbarOverlay.patch
@@ -0,0 +1,389 @@
+From 9e9d9ca5a1497cee04b47825e37dbded5fb90bab Mon Sep 17 00:00:00 2001
+From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
+Date: Sun, 20 Jun 2021 03:39:32 +0000
+Subject: [PATCH 02/21] Add MiuiNavbarOverlay
+
+Change-Id: I0e6791abc3c9521d7dc612df2fec2b041affe7e9
+---
+ packages/overlays/Android.mk                  |   1 +
+ .../overlays/MiuiNavbarOverlay/Android.bp     |  28 ++++++++++++++++++
+ .../MiuiNavbarOverlay/AndroidManifest.xml     |  22 ++++++++++++++
+ .../res/drawable-440dpi-v4/ic_sysbar_back.png | Bin 0 -> 2756 bytes
+ .../ic_sysbar_back_darkmode.png               | Bin 0 -> 2547 bytes
+ .../drawable-440dpi-v4/ic_sysbar_docked.png   | Bin 0 -> 3642 bytes
+ .../ic_sysbar_docked_darkmode.png             | Bin 0 -> 2810 bytes
+ .../res/drawable-440dpi-v4/ic_sysbar_home.png | Bin 0 -> 1362 bytes
+ .../ic_sysbar_home_darkmode.png               | Bin 0 -> 980 bytes
+ .../drawable-440dpi-v4/ic_sysbar_recent.png   | Bin 0 -> 278 bytes
+ .../ic_sysbar_recent_darkmode.png             | Bin 0 -> 205 bytes
+ 11 files changed, 51 insertions(+)
+ create mode 100644 packages/overlays/MiuiNavbarOverlay/Android.bp
+ create mode 100644 packages/overlays/MiuiNavbarOverlay/AndroidManifest.xml
+ create mode 100644 packages/overlays/MiuiNavbarOverlay/res/drawable-440dpi-v4/ic_sysbar_back.png
+ create mode 100644 packages/overlays/MiuiNavbarOverlay/res/drawable-440dpi-v4/ic_sysbar_back_darkmode.png
+ create mode 100644 packages/overlays/MiuiNavbarOverlay/res/drawable-440dpi-v4/ic_sysbar_docked.png
+ create mode 100644 packages/overlays/MiuiNavbarOverlay/res/drawable-440dpi-v4/ic_sysbar_docked_darkmode.png
+ create mode 100644 packages/overlays/MiuiNavbarOverlay/res/drawable-440dpi-v4/ic_sysbar_home.png
+ create mode 100644 packages/overlays/MiuiNavbarOverlay/res/drawable-440dpi-v4/ic_sysbar_home_darkmode.png
+ create mode 100644 packages/overlays/MiuiNavbarOverlay/res/drawable-440dpi-v4/ic_sysbar_recent.png
+ create mode 100644 packages/overlays/MiuiNavbarOverlay/res/drawable-440dpi-v4/ic_sysbar_recent_darkmode.png
+
+diff --git a/packages/overlays/Android.mk b/packages/overlays/Android.mk
+index a41d0e57cd21..8f2090ed807a 100644
+--- a/packages/overlays/Android.mk
+++ b/packages/overlays/Android.mk
+@@ -26,6 +26,7 @@ LOCAL_REQUIRED_MODULES := \
+ 	DisplayCutoutEmulationTallOverlay \
+ 	DisplayCutoutEmulationWaterfallOverlay \
+ 	FontNotoSerifSourceOverlay \
+	MiuiNavbarOverlay \
+ 	NavigationBarMode3ButtonOverlay \
+ 	NavigationBarModeGesturalOverlay \
+ 	NavigationBarModeGesturalOverlayNarrowBack \
+diff --git a/packages/overlays/MiuiNavbarOverlay/Android.bp b/packages/overlays/MiuiNavbarOverlay/Android.bp
+new file mode 100644
+index 000000000000..fc724fb7a686
+--- /dev/null
+++ b/packages/overlays/MiuiNavbarOverlay/Android.bp
+@@ -0,0 +1,28 @@
+//
+//  Copyright 2021, The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "frameworks_base_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-Apache-2.0
+    default_applicable_licenses: ["frameworks_base_license"],
+}
+
+runtime_resource_overlay {
+    name: "MiuiNavbarOverlay",
+    product_specific: true,
+}
+diff --git a/packages/overlays/MiuiNavbarOverlay/AndroidManifest.xml b/packages/overlays/MiuiNavbarOverlay/AndroidManifest.xml
+new file mode 100644
+index 000000000000..3f10e2e03675
+--- /dev/null
+++ b/packages/overlays/MiuiNavbarOverlay/AndroidManifest.xml
+@@ -0,0 +1,22 @@
+<!--
+  ~ Copyright (C) 2021 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+        package="com.miui.systemui.navbar.overlay"
+        android:versionCode="1"
+        android:versionName="1.0">
+    <overlay android:targetPackage="com.android.systemui" android:priority="1337" android:isStatic="true"/>
+</manifest>
+diff --git a/packages/overlays/MiuiNavbarOverlay/res/drawable-440dpi-v4/ic_sysbar_back.png b/packages/overlays/MiuiNavbarOverlay/res/drawable-440dpi-v4/ic_sysbar_back.png
+new file mode 100644
+index 0000000000000000000000000000000000000000..be2b145b4c698679bfdfdc3e5834ad12a56724c0
+GIT binary patch
+literal 2756
+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
+
+literal 0
+HcmV?d00001
+
+diff --git a/packages/overlays/MiuiNavbarOverlay/res/drawable-440dpi-v4/ic_sysbar_back_darkmode.png b/packages/overlays/MiuiNavbarOverlay/res/drawable-440dpi-v4/ic_sysbar_back_darkmode.png
+new file mode 100644
+index 0000000000000000000000000000000000000000..4873f84ff7f4750fa3adc70428ffb123502c1051
+GIT binary patch
+literal 2547
+zcmb_eeQeZZ81J!-O&ofY7;XsC6~zzi_3L(9o89Ji-N!}lm~(+4Q|z_9t?aJ7wPkn1
+zfy<Q1N5sVaL5?ZINzkZ#i3x{-Y|2E!v6)~*5ZF)|2|5SPgf9`_?&AVxDjF|o`}Xbc
+z`8~hq<9%|gOFhMtCrz6KLC|DZ30nr9O~#cn5!}}#n6HD!9l?@?8U)=r#kfq+hSx0+
+zl=PESUZGdG=Q6w!uyTUp6|Lbw5TGF_Codf2_!?1%y<(LlJCMPT_am?*IFJRIZrmMo
+ziq%rdGF5zPnWvmzR>RW*l9vnTgc(2(5Ood?2mG?egdNB*F9X)bHip2%5WU8M<Qop*
+z3U?{&R8$epwAxXgu#s>UZ6)kDP1+uVNu0>S@GOj=P@G_JJ44a%=nnzjRKdrTu|=c4
+zz?%c9*7YERVWCjS8ltR<T7?lbO=CETkt7Nbs8%oQTo{$LSz`>WsPU>4)FnlR4MxtZ
+zEY%$dP&yJqAQ-2Wwb3+zgkfPWh!IxY2x%B7@Nrylsp=ngF7TM>7XzZKYXD2cvB7FZ
+zSF~#7FR0_6Z*c%p>vqR|jH@LOh`Z4A!a5MfXhOzCYvuJp5i1ilWvR-Gg>^vYEF+pA
+z<5WdXSJZMv@sAa%bWAerbQ*=ph96!a$$}En9=XXzWI0`QAS6!WC~iXux}3;naEh^I
+z&%wb0AA!0RLGsn#3MKJ!oMv#6!HHX-plbw9=l&5a@QhDU100B13UE~-7L=<HIG#zy
+zsrVHYI0ovdoA+H#XQ`_ABtQ6|l@%Aju0p4spzU^)v=YN|-EPJuYdR<MqKkDPAU{?~
+z5*Q!n&BA${LP-(NMrofd3-x+QaO3TnbS6)6w2d6IXBB>_(FJ4nf?>~lMcU3$XeKX^
+zC{5YCD2-?0C_&PkS0rsbne7|1pQlRT6mtIm%wwEQqkWhXNdtwgA3Z%!iM69EzXT6=
+z48!rpNpK*%(E_4?jBZQgW#G0V7@-YSi-7cR`eFp8DLy^KsbYQ=$ky$&9`;xIHLmU-
+z)ZbS9##28|tNuszqsir~Ik`#%!xck}crarOjg$uabJd2w-88bs;9w3K%lH5WFYysB
+z%79u01Ns?xr3r!(wz}B-^6={er+U|J(JTiqUYb=r=?+)j*+%v?w(NOt*UUFdHlyw5
+zewov1Kk?#Ly5gAsp5x!BkN<A+KDn+0K~`^eKX8v{`o-)h)=(Ad^0W*NeA2sp*Ojk4
+z$L0?1Ydf)g%fk2P&)M9vZ04p~Jkiv=$(u4EHNVT8XlYuLk%A}Q>oh-?@@O;MVJ=V2
+zZ_Ied(gZn6iT@dxz2}l?QDA3<|9p?wU)Pu3XY1=ft6n)i|8!<uZdzmP<ix$ElTc+s
+z&X<?kZ=C+g`9*BVf<$*jde7^gtX+3yP(4Y{CR>;EFHfs|=cwyc%>Gg==jDv1wXO9i
+za{teI*@9iE0OJeO(an)d#Rr^kc+Sgp8Md^_6WwXGFTCAS#LdqT`WJT8bcjb9py>9V
+z!taSzGdVQ34-eK;c_x;P{l0rsHv(uA!uLkoBW)9Ywl{VD0E8S(N1`7@?w$~u*1350
+zjDo_TCHiipEvYWOv#4eAn@Bi4`cdR=Q^?Y}b9Q=xZ{wuBiIv~RdI<KyqPF)w5A1x}
+z{Udhp>eZ`{bj;~k=UZ`q^g(3B_1$e%OM2J8Kz2R!scbL0fIMXBobD!GdTald#UE8(
+z%%i%@UpIy}ys9K^?2aAT$BVOPPc2}7OFfyg_uJTRQ}Qck2Hn=g##NVBpE*@Dm^n1i
+z(ein)p(WJ>BP)beXRiBBC*{bg2RHarptOq#pB+Ase57IO4mtHcH)B|BJag#6lT>d)
+z&e!MKYd16)pcy-+T#iQ8NA~PL>UxV>Ywqi@Y)j6S`k$w?tzd_2HABdEi<&LDf&OGl
+zTMQD)&(DC^16irql!1BVKzD548=h$^kFSKxX^W`?7wW0OL$Ts(m0$Hf=7d(Q+HUb)
+zZja176mx*WEKzSvUf!OU*cv&PpiG!*8*(2$`^!o+r{-7RHTJTToo?Eeu+BEr?K!7Y
+z*9^Z;G+Rzj%oUn%d}G_QeqvzVy#Kj5|3$lBneo8k53^T$kGYM%Wv)UGyRG24rau72
+C-gtlj
+
+literal 0
+HcmV?d00001
+
+diff --git a/packages/overlays/MiuiNavbarOverlay/res/drawable-440dpi-v4/ic_sysbar_docked.png b/packages/overlays/MiuiNavbarOverlay/res/drawable-440dpi-v4/ic_sysbar_docked.png
+new file mode 100644
+index 0000000000000000000000000000000000000000..1c88fc5d571d0ec91b735082cb9c512603b9ceec
+GIT binary patch
+literal 3642
+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
+D=8d64
+
+literal 0
+HcmV?d00001
+
+diff --git a/packages/overlays/MiuiNavbarOverlay/res/drawable-440dpi-v4/ic_sysbar_docked_darkmode.png b/packages/overlays/MiuiNavbarOverlay/res/drawable-440dpi-v4/ic_sysbar_docked_darkmode.png
+new file mode 100644
+index 0000000000000000000000000000000000000000..fe51e11921ecb35c5535e7c446769af7f66be893
+GIT binary patch
+literal 2810
+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
+VfHkC3x%R(PPDlj%Qt&qYzX3LdVM71_
+
+literal 0
+HcmV?d00001
+
+diff --git a/packages/overlays/MiuiNavbarOverlay/res/drawable-440dpi-v4/ic_sysbar_home.png b/packages/overlays/MiuiNavbarOverlay/res/drawable-440dpi-v4/ic_sysbar_home.png
+new file mode 100644
+index 0000000000000000000000000000000000000000..20f1d887aedebaadec7f31184bdfe3e662401522
+GIT binary patch
+literal 1362
+zcma)5dsvcZ6eq3COPOfdW%DV^ZrZSmmu5@DVMeK8>Y7WZW@(O;T+M9eB{VT<`aG7k
+zn)f@oE<`v`G!hdlR3b#c8xe|l8>DE0=1%!ff9^cb_kQR6zW4o|-#O>~uHt;XmYJ+I
+zK_C#zum>?m;Z6Mb7#YIa&@1aeAQowH-T|Hv{vWHXtnBFM=<e<w92^`Q8&j**TCH|w
+zW=5ye&3!WP0UQ|_Q79BrskFVly|A!wfjKuf7x4M{d8JaBnwknAkw}F7z<|f&A$<GE
+z#9}dz$7^nGX0cc_8jVh;L(;OcvZ|`8#>Pg#+uGV-5Af^tdQj5Y*@;G@7g7WV2lw^$
+z&Cbrcy1D|=)YK%ANCpN5N=ix~<n#IPDIy{wJ3E`nWcKv*3=a<jJ~cJf+S&>ZaQ652
+zkB^VPe*JoAXb4sSfdMK7NivzNx3?D%jYb1`<#IVVU0q$En!#X*L?S?ds;;h1AP_)}
+zAPmlOI2^#?IGhE}g|<Kzp-{LW0Lq7!LM=f-K_n8XzP_H#W&;}}s;H>Q%*+JYC=?2V
+z!GL%y77OKo5-yhu+n_ns)zwrgwWXy6T1_UCp`W0EKp^Dh<v}6PaFC%=sbDCRlamt@
+z6CeiW0^~4=G>fQ@x1sX<QD1+=qAyI$kd`a0R;^yM1V^rBzv>>;Oz3t0N?$cpk-RL7
+z-Curq>S*LLrm$bkV3lSj#D<6Y;{swYW|gxi%Zs*{e(6A+T4!*U^3;3jAJaPzMpw75
+z7$ut5KkB^M^5?QL0f}~RdGFoYzGCL-{5n-sF6Va91!l$rZes=YHif6k(V{Rhzm^#u
+zalK`;ZDwOVJvHuRU~uxaZ`Dc^TF`p)x#X>!QNDJ?g&SrFgh3=0gAPcLj)}XDS)x}j
+zQJ<v!mA=U?%l=1~tj%`B)z`KbFE+KKzBz$GdPW=@wWdy+ogj$E`&FZwuZ!Zp<C4}~
+zVm#p%keE^NFI+55ke}Hcsp&xT<5FtE)tFl*wILQcp5N@wHNu;kTknn!mb^C}u(Xb{
+zz`fa%H*memyTCaq1Ap2W>D!)vB`lDpEI*IgAvkB_L`bG*pdVVjPYM(XQGXx5K?%)o
+zLs2>$w}*(t!qJq_*t<Eng8LR58%v)#oqHZo6K-pf@#;>Nf;aRca6{9uQ_PEv<)W-?
+z(KCaVz2Og5`HT(EW0DOY#`%Z2w?rbt$vWfcc*OArS@cn<@fq^g9Guwf{7Pas%bMNJ
+zdS?{t^03BBAX+^7!xLN9zWoH>T^@;-lRUM^DZ}5M%WCC|WMSxw>0+B=^sbRM4jZXO
+z$_Lnf*!02(cHH5lbT?VLt;YvjoU;yD7jgjM%PiY#eFT3yJ0;{s)Z^`kQt+<!k~_Qu
+zviuCA6KQS^l4A0z$7lHCo-;d7g&3e}+$(1}x<hC;kGbLH_zAlm>$e4s;^kW?4ngm_
+zE`Q~cX8O<Z(zEsV8qXf?Mb7nT$Cn62o198j$sS3_dA5Umo!g_|H>CWM;Mc75nWk1-
+zsTCC62DdZ&CLU}r=+K8QH9PflBu(;$$CuS~(S5S#8@}fRZa&GnX#a%YkXXbwx5=MX
+z``wiJ|MZgXydqYc;eH`$&5TsFXJu)BBv++(-ld-NA|wj=+9rOa!u0;M{>s}ZN=&zg
+jp|o;zi!=ZHCR`6amaD0~y#7)m{38ggr!VHdM;P%x23q9L
+
+literal 0
+HcmV?d00001
+
+diff --git a/packages/overlays/MiuiNavbarOverlay/res/drawable-440dpi-v4/ic_sysbar_home_darkmode.png b/packages/overlays/MiuiNavbarOverlay/res/drawable-440dpi-v4/ic_sysbar_home_darkmode.png
+new file mode 100644
+index 0000000000000000000000000000000000000000..96dc83e4a42d70c1b11ac5a55ea5eb8cd75e1e20
+GIT binary patch
+literal 980
+zcmeAS@N?(olHy`uVBq!ia0vp^O(4v{3?%p7eQ=(EfiWY%C&U%V?H>iS4*_MFJ{MqE
+zmzM<j1v8iwPFQ>B+}+pje*SoQ_Tb9?Tpg9&|JF;%JijfpWO-*ypo^KYc~ESA_nHsA
+ztz3e$KC_1!6n_!c@R_*xN!py_HCyTq=gggUaniy|?MuCzA69H^h|Zp|b=B<p2PGc`
+z0>b30*|@*0n4jWq;gIy|zKGh99kpj}USHgEp;$&A80||uT^vIyZoR$k8h+S8g!O?F
+zcj^bHLXDPyjKZ$qJ6m_`-hKM-Z=Y)^yB^s@+{vH0dq%aAaitu;AQIT=<@xp3rAvP$
+zy;7MXy;6S{7k&Q3%$mf?)m#uB5~Fl^!4@93r=m)tT64E<TJ6;MO6v5gt#7SPb6q!g
+zS=4*(tJ=ib0ZZOj6rVo7V5@I<#(RMk0++cf?<&vlvtrdMVZ3YmE^z(23+e$2<s}SK
+z3ljnsIEfmhoN8+nY~)&eV1{Nl6Oi%vK#S&VmSrqjKFn8_<*>~VU17l9;(OC(gF?VT
+zew|sHRA+K^s)$ZwynjDjB9%2Z@o9hj@z9yqKg!oksmhKrP8D1bl-3+)o+@o5{UvQu
+za+deA^S<)eZhOAF(C5HfE5hn~GjCG+m+o&3f0++AEUdr7$EqdsvefBVI!p9|LmNK}
+z*BAXVwz%BS@myD^`ADnrrX%|0>yoZt>&?Br{aWc8JyVg;b6@KwX1@Ay&*p-y%_*L#
+z{^ysm=`T&%{PpeY3#V^a$E?)Zo3}Wqvw!=8=ht19w|5|cm|EtWFQ%k?JmTvKOfn3f
+Lu6{1-oD!M<_NCyP
+
+literal 0
+HcmV?d00001
+
+diff --git a/packages/overlays/MiuiNavbarOverlay/res/drawable-440dpi-v4/ic_sysbar_recent.png b/packages/overlays/MiuiNavbarOverlay/res/drawable-440dpi-v4/ic_sysbar_recent.png
+new file mode 100644
+index 0000000000000000000000000000000000000000..4f0d314e2621d018c3cd2e4267cf4cf82a78943f
+GIT binary patch
+literal 278
+zcmeAS@N?(olHy`uVBq!ia0vp^O(4v{3?%p7eQ+K~IR*HHxB_W3aOlvXS731D$dNyP
+z{`~&^8>ry@`}c3(z6CO@t*tk0+O&D|W?NfZAou_O|I!nsR|8q1B|(0{3``sX!dw~0
+z&!m6(D0J#1t5jH`B>TrxD!+gV@;qG}Ln>~)y?T=OumO*&<LOWDj(nQ-FWQ&&(?pJ@
+znOy%Gk7P>$)d4|WP*!pH)Y~Ek3+0ck%$oDNf%ERC$_@LN)Si65+@j0wqw%{iOg5Zz
+u=kcQOsZZh^l}((KO_)H0lQP7Be}}|<Jmh~yiM-bb33$5txvX<aXaWF$9A~fq
+
+literal 0
+HcmV?d00001
+
+diff --git a/packages/overlays/MiuiNavbarOverlay/res/drawable-440dpi-v4/ic_sysbar_recent_darkmode.png b/packages/overlays/MiuiNavbarOverlay/res/drawable-440dpi-v4/ic_sysbar_recent_darkmode.png
+new file mode 100644
+index 0000000000000000000000000000000000000000..f53ec649e615e8491fb6abb63d169ab7e0faa1ce
+GIT binary patch
+literal 205
+zcmeAS@N?(olHy`uVBq!ia0vp^O(4v{3?%p7eQ+K~DF*n2xB}^ZynuIaZ52=vS4ogx
+zFoXa0-5=lXWwUX~o_?MiC>rSL;uunK>+RLuyayBnTpaC=HT>3}!PR$SSH`j?-mt2r
+zKs7+%uwa{9mTBst&#^sIIN#?w`Oh@C&bRjEiUzlg7B>c|g@RIyV08!V`R32zx~(4j
+Q*9XM+boFyt=akR{0CQqV3jhEB
+
+literal 0
+HcmV?d00001
+
+-- 
+2.34.1
+
--- a/patches_platform_personal/frameworks_base/0003-Disable-Bluetooth-by-default.patch
+++ b/patches_platform_personal/frameworks_base/0003-Disable-Bluetooth-by-default.patch
@@ -0,0 +1,26 @@
+From b2dee98e6f08035160ae2e9b792774cea1903106 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 03/21] Disable Bluetooth by default
+
+Change-Id: Iea5d24f977928bf01cd7a46b98c75c0a4bd6a23c
+---
+ packages/SettingsProvider/res/values/defaults.xml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/packages/SettingsProvider/res/values/defaults.xml b/packages/SettingsProvider/res/values/defaults.xml
+index a93cd62e6301..b63896f09710 100644
+--- a/packages/SettingsProvider/res/values/defaults.xml
+++ b/packages/SettingsProvider/res/values/defaults.xml
+@@ -38,7 +38,7 @@
+     <fraction name="def_window_transition_scale">100%</fraction>
+     <bool name="def_haptic_feedback">true</bool>
+ 
+-    <bool name="def_bluetooth_on">true</bool>
+    <bool name="def_bluetooth_on">false</bool>
+     <bool name="def_wifi_display_on">false</bool>
+     <bool name="def_install_non_market_apps">false</bool>
+     <!-- 0 == off, 3 == on -->
+-- 
+2.34.1
+
--- a/patches_platform_personal/frameworks_base/0004-Disable-cursor-drag-by-default-for-editable-TextView.patch
+++ b/patches_platform_personal/frameworks_base/0004-Disable-cursor-drag-by-default-for-editable-TextView.patch
@@ -0,0 +1,28 @@
+From 0f053cd66bac314b38669190d4a2386428314838 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 04/21] Disable cursor drag by default for editable TextViews
+
+Requested by @TadiT7
+
+Change-Id: Id54e38ee418174af8cde4113c849bc292f5fc96d
+---
+ core/java/android/widget/WidgetFlags.java | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/core/java/android/widget/WidgetFlags.java b/core/java/android/widget/WidgetFlags.java
+index fb40ee5ec843..c0c6fb6e9431 100644
+--- a/core/java/android/widget/WidgetFlags.java
+++ b/core/java/android/widget/WidgetFlags.java
+@@ -38,7 +38,7 @@ public final class WidgetFlags {
+     /**
+      * Default value for the flag {@link #ENABLE_CURSOR_DRAG_FROM_ANYWHERE}.
+      */
+-    public static final boolean ENABLE_CURSOR_DRAG_FROM_ANYWHERE_DEFAULT = true;
+    public static final boolean ENABLE_CURSOR_DRAG_FROM_ANYWHERE_DEFAULT = false;
+ 
+     /**
+      * Threshold for the direction of a swipe gesture in order for it to be handled as a cursor drag
+-- 
+2.34.1
+
--- a/patches_platform_personal/frameworks_base/0005-Disable-RESTRICTED-bucket-toast.patch
+++ b/patches_platform_personal/frameworks_base/0005-Disable-RESTRICTED-bucket-toast.patch
@@ -0,0 +1,44 @@
+From 999e9b865755a14a241e3dae2be11ced1e7c587e 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 05/21] Disable "RESTRICTED bucket" toast
+
+Change-Id: I20a328d3c77962f3a6095bfca42d0b165a093ce8
+---
+ .../server/usage/AppStandbyController.java    | 20 +------------------
+ 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 7d3837786be9..d12210f704fa 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
+                         .noteRestrictionAttempt(packageName, userId, elapsedRealtime, reason);
+ 
+                 if (isForcedByUser) {
+-                    // Only user force can bypass the delay restriction. If the user forced the
+-                    // app into the RESTRICTED bucket, then a toast confirming the action
+-                    // shouldn't be surprising.
+-                    // Exclude REASON_SUB_FORCED_USER_FLAG_INTERACTION since the RESTRICTED bucket
+-                    // isn't directly visible in that flow.
+-                    if (Build.IS_DEBUGGABLE
+-                            && (reason & REASON_SUB_MASK)
+-                            != REASON_SUB_FORCED_USER_FLAG_INTERACTION) {
+-                        Toast.makeText(mContext,
+-                                // Since AppStandbyController sits low in the lock hierarchy,
+-                                // make sure not to call out with the lock held.
+-                                mHandler.getLooper(),
+-                                mContext.getResources().getString(
+-                                        R.string.as_app_forced_to_restricted_bucket, packageName),
+-                                Toast.LENGTH_SHORT)
+-                                .show();
+-                    } else {
+-                        Slog.i(TAG, packageName + " restricted by user");
+-                    }
+                    Slog.i(TAG, packageName + " restricted by user");
+                 } else {
+                     final long timeUntilRestrictPossibleMs = app.lastUsedByUserElapsedTime
+                             + mInjector.getAutoRestrictedBucketDelayMs() - elapsedRealtime;
+-- 
+2.34.1
+
--- a/patches_platform_personal/frameworks_base/0006-Keyguard-Adjust-clock-style.patch
+++ b/patches_platform_personal/frameworks_base/0006-Keyguard-Adjust-clock-style.patch
@@ -0,0 +1,178 @@
+From 47391e102c2ab15bdf913a9856e20dba82668472 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 06/21] Keyguard: Adjust clock style
+
+Thinner font, less padding and unintrusive colors
+
+Change-Id: I21e5d5bf37d724e75ebce4cd89349e0cc4dfc910
+---
+ .../customization/res/layout/clock_default_large.xml         | 1 +
+ .../customization/res/layout/clock_default_small.xml         | 2 +-
+ packages/SystemUI/customization/res/values/colors.xml        | 5 +++++
+ packages/SystemUI/customization/res/values/dimens.xml        | 4 ++--
+ .../android/systemui/shared/clocks/DefaultClockController.kt | 4 ++--
+ .../SystemUI/res-keyguard/layout/keyguard_clock_switch.xml   | 2 +-
+ .../SystemUI/res-keyguard/layout/keyguard_slice_view.xml     | 2 +-
+ packages/SystemUI/res-keyguard/values/dimens.xml             | 2 +-
+ packages/SystemUI/res-keyguard/values/styles.xml             | 2 --
+ packages/SystemUI/res/layout/keyguard_status_bar.xml         | 2 +-
+ packages/SystemUI/res/values/styles.xml                      | 4 ++--
+ 11 files changed, 17 insertions(+), 13 deletions(-)
+ create mode 100644 packages/SystemUI/customization/res/values/colors.xml
+
+diff --git a/packages/SystemUI/customization/res/layout/clock_default_large.xml b/packages/SystemUI/customization/res/layout/clock_default_large.xml
+index 0139d50dcfba..9f5ca7b89213 100644
+--- a/packages/SystemUI/customization/res/layout/clock_default_large.xml
+++ b/packages/SystemUI/customization/res/layout/clock_default_large.xml
+@@ -26,6 +26,7 @@
+     android:fontFamily="@*android:string/config_clockFontFamily"
+     android:typeface="monospace"
+     android:elegantTextHeight="false"
+    android:fontFeatureSettings="tnum"
+     chargeAnimationDelay="200"
+     dozeWeight="200"
+     lockScreenWeight="400" />
+diff --git a/packages/SystemUI/customization/res/layout/clock_default_small.xml b/packages/SystemUI/customization/res/layout/clock_default_small.xml
+index ff6d7f9e2240..b63ffce20671 100644
+--- a/packages/SystemUI/customization/res/layout/clock_default_small.xml
+++ b/packages/SystemUI/customization/res/layout/clock_default_small.xml
+@@ -27,7 +27,7 @@
+     android:elegantTextHeight="false"
+     android:ellipsize="none"
+     android:singleLine="true"
+-    android:fontFeatureSettings="pnum"
+    android:fontFeatureSettings="tnum"
+     chargeAnimationDelay="350"
+     dozeWeight="200"
+     lockScreenWeight="400" />
+diff --git a/packages/SystemUI/customization/res/values/colors.xml b/packages/SystemUI/customization/res/values/colors.xml
+new file mode 100644
+index 000000000000..f80af4376ff1
+--- /dev/null
+++ b/packages/SystemUI/customization/res/values/colors.xml
+@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="clock_default_color_dark">@*android:color/primary_text_material_dark</color>
+    <color name="clock_default_color_light">@*android:color/primary_text_material_light</color>
+</resources>
+diff --git a/packages/SystemUI/customization/res/values/dimens.xml b/packages/SystemUI/customization/res/values/dimens.xml
+index 8eb8132b07b9..02688e5b1329 100644
+--- a/packages/SystemUI/customization/res/values/dimens.xml
+++ b/packages/SystemUI/customization/res/values/dimens.xml
+@@ -31,5 +31,5 @@
+     <!-- additional offset for clock switch area items -->
+     <dimen name="small_clock_height">114dp</dimen>
+     <dimen name="small_clock_padding_top">28dp</dimen>
+-    <dimen name="clock_padding_start">28dp</dimen>
+-</resources>
+\ No newline at end of file
+    <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 b28920c590c5..a786adad32e5 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
+@@ -157,9 +157,9 @@ class DefaultClockController(
+                 if (seedColor != null) {
+                     seedColor!!
+                 } else if (isRegionDark) {
+-                    resources.getColor(android.R.color.system_accent1_100)
+                    resources.getColor(R.color.clock_default_color_dark)
+                 } else {
+-                    resources.getColor(android.R.color.system_accent2_600)
+                    resources.getColor(R.color.clock_default_color_light)
+                 }
+ 
+             if (currentColor == color) {
+diff --git a/packages/SystemUI/res-keyguard/layout/keyguard_clock_switch.xml b/packages/SystemUI/res-keyguard/layout/keyguard_clock_switch.xml
+index fc9c917c152b..6a5ed0daef4a 100644
+--- a/packages/SystemUI/res-keyguard/layout/keyguard_clock_switch.xml
+++ b/packages/SystemUI/res-keyguard/layout/keyguard_clock_switch.xml
+@@ -27,7 +27,7 @@
+     android:layout_gravity="center_horizontal|top">
+     <com.android.keyguard.KeyguardClockFrame
+         android:id="@+id/lockscreen_clock_view"
+-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
+         android:layout_height="@dimen/small_clock_height"
+         android:layout_alignParentStart="true"
+         android:layout_alignParentTop="true"
+diff --git a/packages/SystemUI/res-keyguard/layout/keyguard_slice_view.xml b/packages/SystemUI/res-keyguard/layout/keyguard_slice_view.xml
+index 7c5dbc247428..64657547621f 100644
+--- a/packages/SystemUI/res-keyguard/layout/keyguard_slice_view.xml
+++ b/packages/SystemUI/res-keyguard/layout/keyguard_slice_view.xml
+@@ -38,7 +38,7 @@
+               android:id="@+id/row"
+               android:layout_width="match_parent"
+               android:layout_height="wrap_content"
+-              android:orientation="horizontal"
+              android:orientation="vertical"
+               android:gravity="start"
+     />
+ </com.android.keyguard.KeyguardSliceView>
+diff --git a/packages/SystemUI/res-keyguard/values/dimens.xml b/packages/SystemUI/res-keyguard/values/dimens.xml
+index 8c817330953c..cfbc3b96da7c 100644
+--- a/packages/SystemUI/res-keyguard/values/dimens.xml
+++ b/packages/SystemUI/res-keyguard/values/dimens.xml
+@@ -97,7 +97,7 @@
+     <!-- additional offset for clock switch area items -->
+     <dimen name="below_clock_padding_start">32dp</dimen>
+     <dimen name="below_clock_padding_end">16dp</dimen>
+-    <dimen name="below_clock_padding_start_icons">28dp</dimen>
+    <dimen name="below_clock_padding_start_icons">22dp</dimen>
+ 
+     <!-- 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
+--- a/packages/SystemUI/res-keyguard/values/styles.xml
+++ b/packages/SystemUI/res-keyguard/values/styles.xml
+@@ -138,8 +138,6 @@
+         <item name="android:ellipsize">end</item>
+         <item name="android:maxLines">2</item>
+         <item name="android:fontFamily">@*android:string/config_headlineFontFamily</item>
+-        <item name="android:shadowColor">@color/keyguard_shadow_color</item>
+-        <item name="android:shadowRadius">?attr/shadowRadius</item>
+     </style>
+ 
+     <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
+--- a/packages/SystemUI/res/layout/keyguard_status_bar.xml
+++ b/packages/SystemUI/res/layout/keyguard_status_bar.xml
+@@ -77,7 +77,7 @@
+         android:gravity="center_vertical"
+         android:ellipsize="marquee"
+         android:textDirection="locale"
+-        android:textAppearance="@style/TextAppearance.StatusBar.Clock"
+        android:textAppearance="?android:attr/textAppearanceSmall"
+         android:textColor="?attr/wallpaperTextColorSecondary"
+         android:singleLine="true"
+         systemui:showMissingSim="true"
+diff --git a/packages/SystemUI/res/values/styles.xml b/packages/SystemUI/res/values/styles.xml
+index af92c021ec62..847b8a961322 100644
+--- a/packages/SystemUI/res/values/styles.xml
+++ b/packages/SystemUI/res/values/styles.xml
+@@ -311,7 +311,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>
+-        <item name="wallpaperTextColorAccent">@color/material_dynamic_primary90</item>
+        <item name="wallpaperTextColorAccent">@*android:color/primary_text_material_dark</item>
+         <item name="android:colorError">@*android:color/error_color_material_dark</item>
+         <item name="*android:lockPatternStyle">@style/LockPatternViewStyle</item>
+         <item name="lockPatternStyle">@style/LockPatternContainerStyle</item>
+@@ -329,7 +329,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>
+-        <item name="wallpaperTextColorAccent">@color/material_dynamic_secondary40</item>
+        <item name="wallpaperTextColorAccent">@*android:color/primary_text_material_light</item>
+         <item name="android:colorError">@*android:color/error_color_material_light</item>
+         <item name="shadowRadius">0</item>
+ 
+-- 
+2.34.1
+
--- a/patches_platform_personal/frameworks_base/0007-Keyguard-Hide-padlock-unless-UDFPS-is-in-use.patch
+++ b/patches_platform_personal/frameworks_base/0007-Keyguard-Hide-padlock-unless-UDFPS-is-in-use.patch
@@ -0,0 +1,48 @@
+From 3bf2d7ef087a2f458ba67ab2adfdfea5ae58f8da 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 07/21] Keyguard: Hide padlock unless UDFPS is in use
+
+Fair enough Google, but don't give me that otherwise
+
+Change-Id: Ie91e80ca5c6637a51a8acc72fb28cd6ac2a7abb6
+---
+ .../keyguard/LockIconViewController.java        | 17 +++--------------
+ 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 951a6aeef11b..269c72d75e8f 100644
+--- a/packages/SystemUI/src/com/android/keyguard/LockIconViewController.java
+++ b/packages/SystemUI/src/com/android/keyguard/LockIconViewController.java
+@@ -310,25 +310,14 @@ public class LockIconViewController extends ViewController<LockIconView> impleme
+             return;
+         }
+ 
+-        boolean wasShowingFpIcon = mUdfpsEnrolled && !mShowUnlockIcon && !mShowLockIcon
+        boolean wasShowingFpIcon = mUdfpsEnrolled && !mShowUnlockIcon
+                 && !mShowAodUnlockedIcon && !mShowAodLockIcon;
+-        mShowLockIcon = !mCanDismissLockScreen && isLockScreen()
+-                && (!mUdfpsEnrolled || !mRunningFPS);
+-        mShowUnlockIcon = mCanDismissLockScreen && isLockScreen();
+        mShowUnlockIcon = mCanDismissLockScreen && isLockScreen() && mUdfpsEnrolled;
+         mShowAodUnlockedIcon = mIsDozing && mUdfpsEnrolled && !mRunningFPS && mCanDismissLockScreen;
+         mShowAodLockIcon = mIsDozing && mUdfpsEnrolled && !mRunningFPS && !mCanDismissLockScreen;
+ 
+         final CharSequence prevContentDescription = mView.getContentDescription();
+-        if (mShowLockIcon) {
+-            if (wasShowingFpIcon) {
+-                // fp icon was shown by UdfpsView, and now we still want to animate the transition
+-                // in this drawable
+-                mView.updateIcon(ICON_FINGERPRINT, false);
+-            }
+-            mView.updateIcon(ICON_LOCK, false);
+-            mView.setContentDescription(mLockedLabel);
+-            mView.setVisibility(View.VISIBLE);
+-        } else if (mShowUnlockIcon) {
+        if (mShowUnlockIcon) {
+             if (wasShowingFpIcon) {
+                 // fp icon was shown by UdfpsView, and now we still want to animate the transition
+                 // in this drawable
+-- 
+2.34.1
+
--- a/patches_platform_personal/frameworks_base/0008-Keyguard-Default-to-small-clock-1-3.patch
+++ b/patches_platform_personal/frameworks_base/0008-Keyguard-Default-to-small-clock-1-3.patch
@@ -0,0 +1,28 @@
+From 4748bf4af0e391f772c498976d3fed372d688de7 Mon Sep 17 00:00:00 2001
+From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
+Date: Wed, 1 Sep 2021 14:41:53 +0000
+Subject: [PATCH 08/21] Keyguard: Default to small clock (1/3)
+
+It looks alright actually, but as always breaks under landscape
+
+Change-Id: I434d033ecae597ed2a7b2ed71e96ba1a963e9cc3
+---
+ .../src/com/android/keyguard/KeyguardClockSwitchController.java | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitchController.java b/packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitchController.java
+index 94f6dba792e8..7a72d10975fa 100644
+--- a/packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitchController.java
+++ b/packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitchController.java
+@@ -543,7 +543,7 @@ public class KeyguardClockSwitchController extends ViewController<KeyguardClockS
+ 
+     private void updateDoubleLineClock() {
+         mCanShowDoubleLineClock = mSecureSettings.getIntForUser(
+-            Settings.Secure.LOCKSCREEN_USE_DOUBLE_LINE_CLOCK, 1,
+            Settings.Secure.LOCKSCREEN_USE_DOUBLE_LINE_CLOCK, 0,
+                 UserHandle.USER_CURRENT) != 0;
+ 
+         if (!mCanShowDoubleLineClock) {
+-- 
+2.34.1
+
--- a/patches_platform_personal/frameworks_base/0009-Keyguard-Refine-indication-text.patch
+++ b/patches_platform_personal/frameworks_base/0009-Keyguard-Refine-indication-text.patch
@@ -0,0 +1,128 @@
+From 654cfde395c0a1704fee02d3b9bbb27246e488ca 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 09/21] Keyguard: Refine indication text
+
+Change-Id: Ib771c35610f712a1de34736e817bcfe616ac37d8
+---
+ .../SystemUI/res-keyguard/values/styles.xml   |  2 --
+ .../res/layout/keyguard_bottom_area.xml       |  1 +
+ packages/SystemUI/res/values/dimens.xml       |  2 +-
+ .../KeyguardIndicationController.java         | 35 ++++---------------
+ .../phone/KeyguardIndicationTextView.java     |  2 +-
+ 5 files changed, 10 insertions(+), 32 deletions(-)
+
+diff --git a/packages/SystemUI/res-keyguard/values/styles.xml b/packages/SystemUI/res-keyguard/values/styles.xml
+index f0cff767b74d..9edd294a8981 100644
+--- a/packages/SystemUI/res-keyguard/values/styles.xml
+++ b/packages/SystemUI/res-keyguard/values/styles.xml
+@@ -153,8 +153,6 @@
+         <item name="android:maxLines">1</item>
+         <item name="android:gravity">center</item>
+         <item name="android:textColor">?attr/wallpaperTextColor</item>
+-        <item name="android:shadowColor">@color/keyguard_shadow_color</item>
+-        <item name="android:shadowRadius">?attr/shadowRadius</item>
+     </style>
+ 
+     <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 66c57fc2a9ac..dde97f679c9a 100644
+--- a/packages/SystemUI/res/layout/keyguard_bottom_area.xml
+++ b/packages/SystemUI/res/layout/keyguard_bottom_area.xml
+@@ -35,6 +35,7 @@
+             android:layout_width="match_parent"
+             android:layout_height="wrap_content"
+             android:gravity="center"
+            android:minHeight="48dp"
+             android:paddingStart="@dimen/keyguard_indication_text_padding"
+             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 0fdbf89d760a..ca2455548c2d 100644
+--- a/packages/SystemUI/res/values/dimens.xml
+++ b/packages/SystemUI/res/values/dimens.xml
+@@ -857,7 +857,7 @@
+ 
+     <dimen name="keyguard_security_container_padding_top">20dp</dimen>
+ 
+-    <dimen name="keyguard_indication_margin_bottom">32dp</dimen>
+    <dimen name="keyguard_indication_margin_bottom">16dp</dimen>
+     <dimen name="lock_icon_margin_bottom">74dp</dimen>
+     <dimen name="ambient_indication_margin_bottom">71dp</dimen>
+ 
+diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java b/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java
+index feb02586a820..eaca85f8d55d 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 {
+         updateLockScreenDisclosureMsg();
+         updateLockScreenOwnerInfo();
+         updateLockScreenBatteryMsg(animate);
+-        updateLockScreenUserLockedMsg(userId);
+         updateLockScreenTrustMsg(userId, getTrustGrantedIndication(), getTrustManagedIndication());
+         updateLockScreenAlignmentMsg();
+         updateLockScreenLogoutView();
+@@ -571,22 +570,6 @@ public class KeyguardIndicationController {
+         }
+     }
+ 
+-    private void updateLockScreenUserLockedMsg(int userId) {
+-        if (!mKeyguardUpdateMonitor.isUserUnlocked(userId)
+-                || mKeyguardUpdateMonitor.isEncryptedOrLockdown(userId)) {
+-            mRotateTextViewController.updateIndication(
+-                    INDICATION_TYPE_USER_LOCKED,
+-                    new KeyguardIndication.Builder()
+-                            .setMessage(mContext.getResources().getText(
+-                                    com.android.internal.R.string.lockscreen_storage_locked))
+-                            .setTextColor(mInitialTextColorState)
+-                            .build(),
+-                    false);
+-        } else {
+-            mRotateTextViewController.hideIndication(INDICATION_TYPE_USER_LOCKED);
+-        }
+-    }
+-
+     private void updateBiometricMessage() {
+         if (mDozing) {
+             updateDeviceEntryIndication(false);
+@@ -679,17 +662,13 @@ public class KeyguardIndicationController {
+     }
+ 
+     private void updateLockScreenPersistentUnlockMsg() {
+-        if (!TextUtils.isEmpty(mPersistentUnlockMessage)) {
+-            mRotateTextViewController.updateIndication(
+-                    INDICATION_TYPE_PERSISTENT_UNLOCK_MESSAGE,
+-                    new KeyguardIndication.Builder()
+-                            .setMessage(mPersistentUnlockMessage)
+-                            .setTextColor(mInitialTextColorState)
+-                            .build(),
+-                    true);
+-        } else {
+-            mRotateTextViewController.hideIndication(INDICATION_TYPE_PERSISTENT_UNLOCK_MESSAGE);
+-        }
+        mRotateTextViewController.updateIndication(
+                INDICATION_TYPE_PERSISTENT_UNLOCK_MESSAGE,
+                new KeyguardIndication.Builder()
+                        .setMessage(mContext.getResources().getString(R.string.keyguard_unlock))
+                        .setTextColor(mInitialTextColorState)
+                        .build(),
+                false);
+     }
+ 
+     private void updateLockScreenLogoutView() {
+diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardIndicationTextView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardIndicationTextView.java
+index 29a249fcaa41..67f5201bbf2e 100644
+--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardIndicationTextView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardIndicationTextView.java
+@@ -46,7 +46,7 @@ public class KeyguardIndicationTextView extends TextView {
+     @StyleRes
+     private static int sButtonStyleId = R.style.TextAppearance_Keyguard_BottomArea_Button;
+ 
+-    private boolean mAnimationsEnabled = true;
+    private boolean mAnimationsEnabled = false;
+     private CharSequence mMessage;
+     private KeyguardIndication mKeyguardIndicationInfo;
+ 
+-- 
+2.34.1
+
--- a/patches_platform_personal/frameworks_base/0010-Keyguard-UI-Fix-status-bar-quick-settings-margins-an.patch
+++ b/patches_platform_personal/frameworks_base/0010-Keyguard-UI-Fix-status-bar-quick-settings-margins-an.patch
@@ -0,0 +1,189 @@
+From 6961fc087e920eac71bca4673b49d7ac193ee5a1 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 10/21] Keyguard/UI: Fix status bar / quick settings margins
+ and paddings
+
+Last revised on 2024/01/21, targeting U
+
+The way I think SB/QS margins/paddings should work:
+- Devices with left notch: [notch_definition][status_bar_padding_start][content]...[content][status_bar_padding_end][rounded_corner_content_padding]
+- Devices with center or no notch: [rounded_corner_content_padding][status_bar_padding_start][content]...[content][status_bar_padding_end][rounded_corner_content_padding]
+Key point being:
+- SB (including keyguard) and QS should always act uniformly
+- Notch definition should only be the notch itself, without additional padding
+- Instead, these paddings should be covered by status_bar_padding_{start|end}
+As a result, below changes have been made:
+- Change keyguard_carrier_text_margin into a padding and link to status_bar_padding_start
+- Add status_bar_padding_{start|end} to quick settings header
+- Remove unnecessary margins and paddings if any
+
+Change-Id: Ic91fa398813e1907297bb0892c444d96405950e7
+---
+ packages/SystemUI/res/layout/keyguard_status_bar.xml   |  2 +-
+ packages/SystemUI/res/values-sw600dp/dimens.xml        |  7 ++-----
+ packages/SystemUI/res/values/dimens.xml                |  6 +++---
+ packages/SystemUI/res/xml/qqs_header.xml               |  4 ++--
+ .../android/systemui/shade/ShadeHeaderController.kt    | 10 +++++++---
+ .../statusbar/phone/KeyguardStatusBarView.java         |  7 -------
+ 6 files changed, 15 insertions(+), 21 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
+--- a/packages/SystemUI/res/layout/keyguard_status_bar.xml
+++ b/packages/SystemUI/res/layout/keyguard_status_bar.xml
+@@ -72,7 +72,7 @@
+         android:layout_width="match_parent"
+         android:layout_height="match_parent"
+         android:paddingTop="@dimen/status_bar_padding_top"
+-        android:layout_marginStart="@dimen/keyguard_carrier_text_margin"
+        android:paddingStart="@dimen/keyguard_carrier_text_margin"
+         android:layout_toStartOf="@id/system_icons_container"
+         android:gravity="center_vertical"
+         android:ellipsize="marquee"
+diff --git a/packages/SystemUI/res/values-sw600dp/dimens.xml b/packages/SystemUI/res/values-sw600dp/dimens.xml
+index 915dcdb9755f..4a727ad6ce3d 100644
+--- a/packages/SystemUI/res/values-sw600dp/dimens.xml
+++ b/packages/SystemUI/res/values-sw600dp/dimens.xml
+@@ -21,7 +21,7 @@
+     <dimen name="status_bar_header_height_keyguard">@dimen/status_bar_height</dimen>
+ 
+     <!-- padding for container with status icons and battery -->
+-    <dimen name="status_bar_icons_padding_end">4dp</dimen>
+    <dimen name="status_bar_icons_padding_end">0dp</dimen>
+     <!-- start padding is smaller to account for status icon margins coming from drawable itself -->
+     <dimen name="status_bar_icons_padding_start">3dp</dimen>
+     <dimen name="status_bar_icons_padding_bottom">2dp</dimen>
+@@ -37,9 +37,6 @@
+     <!-- The width of user avatar when on Keyguard -->
+     <dimen name="multi_user_avatar_keyguard_size">30dp</dimen>
+ 
+-    <!-- Margin on the left side of the carrier text on Keyguard -->
+-    <dimen name="keyguard_carrier_text_margin">24dp</dimen>
+-
+     <!-- Screen pinning request width -->
+     <dimen name="screen_pinning_request_width">400dp</dimen>
+     <!-- Screen pinning request bottom button circle widths -->
+@@ -81,7 +78,7 @@
+     <dimen name="large_screen_shade_header_height">42dp</dimen>
+     <!-- start padding is smaller to account for status icon margins coming from drawable itself -->
+     <dimen name="shade_header_system_icons_padding_start">3dp</dimen>
+-    <dimen name="shade_header_system_icons_padding_end">4dp</dimen>
+    <dimen name="shade_header_system_icons_padding_end">0dp</dimen>
+     <dimen name="shade_header_system_icons_padding_top">2dp</dimen>
+     <dimen name="shade_header_system_icons_padding_bottom">2dp</dimen>
+ 
+diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml
+index ca2455548c2d..3320f98d1620 100644
+--- a/packages/SystemUI/res/values/dimens.xml
+++ b/packages/SystemUI/res/values/dimens.xml
+@@ -149,7 +149,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">0dp</dimen>
+ 
+     <!-- The end padding for the clock in the status bar. -->
+     <dimen name="status_bar_clock_end_padding">0dp</dimen>
+@@ -353,7 +353,7 @@
+     <!-- padding start is a bit smaller than end to account for status icon margin-->
+     <dimen name="status_bar_icons_padding_start">3dp</dimen>
+ 
+-    <dimen name="status_bar_icons_padding_end">4dp</dimen>
+    <dimen name="status_bar_icons_padding_end">0dp</dimen>
+     <dimen name="status_bar_icons_padding_bottom">0dp</dimen>
+     <dimen name="status_bar_icons_padding_top">0dp</dimen>
+ 
+@@ -823,7 +823,7 @@
+     <dimen name="kg_framed_avatar_size">32dp</dimen>
+ 
+     <!-- Margin on the left side of the carrier text on Keyguard -->
+-    <dimen name="keyguard_carrier_text_margin">16dp</dimen>
+    <dimen name="keyguard_carrier_text_margin">@dimen/status_bar_padding_start</dimen>
+ 
+     <!-- Additional translation (downwards) for appearing notifications when going to the full shade
+          from Keyguard. -->
+diff --git a/packages/SystemUI/res/xml/qqs_header.xml b/packages/SystemUI/res/xml/qqs_header.xml
+index 50a388d0fa64..81d30c210770 100644
+--- a/packages/SystemUI/res/xml/qqs_header.xml
+++ b/packages/SystemUI/res/xml/qqs_header.xml
+@@ -44,7 +44,7 @@
+         <Layout
+             android:layout_width="wrap_content"
+             android:layout_height="@dimen/new_qs_header_non_clickable_element_height"
+-            android:layout_marginStart="8dp"
+            android:layout_marginStart="2dp"
+             app:layout_constrainedWidth="true"
+             app:layout_constraintStart_toEndOf="@id/clock"
+             app:layout_constraintEnd_toStartOf="@id/barrier"
+@@ -94,4 +94,4 @@
+             app:layout_constraintHorizontal_bias="1"
+         />
+     </Constraint>
+-</ConstraintSet>
+\ 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 5cdd6f44d4a0..098eb27995d8 100644
+--- a/packages/SystemUI/src/com/android/systemui/shade/ShadeHeaderController.kt
+++ b/packages/SystemUI/src/com/android/systemui/shade/ShadeHeaderController.kt
+@@ -143,6 +143,8 @@ constructor(
+ 
+     private var roundedCorners = 0
+     private var cutout: DisplayCutout? = null
+    private var statusBarPaddingStart = 0
+    private var statusBarPaddingEnd = 0
+     private var lastInsets: WindowInsets? = null
+     private var nextAlarmIntent: PendingIntent? = null
+     private var textColorPrimary = Color.TRANSPARENT
+@@ -415,14 +417,17 @@ constructor(
+         val cutoutLeft = sbInsets.first
+         val cutoutRight = sbInsets.second
+         val hasCornerCutout: Boolean = insetsProvider.currentRotationHasCornerCutout()
+        roundedCorners = resources.getDimensionPixelSize(R.dimen.rounded_corner_content_padding)
+        statusBarPaddingStart = resources.getDimensionPixelSize(R.dimen.status_bar_padding_start)
+        statusBarPaddingEnd = resources.getDimensionPixelSize(R.dimen.status_bar_padding_end)
+         updateQQSPaddings()
+         // Set these guides as the left/right limits for content that lives in the top row, using
+         // cutoutLeft and cutoutRight
+         var changes =
+             combinedShadeHeadersConstraintManager.edgesGuidelinesConstraints(
+-                if (view.isLayoutRtl) cutoutRight else cutoutLeft,
+                (if (view.isLayoutRtl) cutoutRight else cutoutLeft) + statusBarPaddingStart,
+                 header.paddingStart,
+-                if (view.isLayoutRtl) cutoutLeft else cutoutRight,
+                (if (view.isLayoutRtl) cutoutLeft else cutoutRight) + statusBarPaddingEnd,
+                 header.paddingEnd
+             )
+ 
+@@ -543,7 +548,6 @@ constructor(
+     }
+ 
+     private fun updateResources() {
+-        roundedCorners = resources.getDimensionPixelSize(R.dimen.rounded_corner_content_padding)
+         val padding = resources.getDimensionPixelSize(R.dimen.qs_panel_padding)
+         header.setPadding(padding, header.paddingTop, padding, header.paddingBottom)
+         updateQQSPaddings()
+diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java
+index 5eb3f587a023..be9b32bde0f1 100644
+--- 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 {
+         mCarrierLabel.setTextSize(TypedValue.COMPLEX_UNIT_PX,
+                 getResources().getDimensionPixelSize(
+                         com.android.internal.R.dimen.text_size_small_material));
+-        lp = (MarginLayoutParams) mCarrierLabel.getLayoutParams();
+ 
+-        int marginStart = calculateMargin(
+-                getResources().getDimensionPixelSize(R.dimen.keyguard_carrier_text_margin),
+-                mPadding.first);
+-        lp.setMarginStart(marginStart);
+-
+-        mCarrierLabel.setLayoutParams(lp);
+         updateKeyguardStatusBarHeight();
+     }
+ 
+-- 
+2.34.1
+
--- a/patches_platform_personal/frameworks_base/0011-Revert-SystemUI-Add-left-padding-for-keyguard-slices.patch
+++ b/patches_platform_personal/frameworks_base/0011-Revert-SystemUI-Add-left-padding-for-keyguard-slices.patch
@@ -0,0 +1,44 @@
+From 2ea9b12d2f9d2d49ddcc99a7971af35dc15f221c 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 11/21] Revert "SystemUI: Add left padding for keyguard slices"
+
+This reverts commit 4a7a4426944e28e70a3eca6a696ff6c7599fb896.
+---
+ .../src/com/android/keyguard/KeyguardSliceView.java      | 9 +++------
+ 1 file changed, 3 insertions(+), 6 deletions(-)
+
+diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardSliceView.java b/packages/SystemUI/src/com/android/keyguard/KeyguardSliceView.java
+index abb22f526f85..b4f124aa598a 100644
+--- a/packages/SystemUI/src/com/android/keyguard/KeyguardSliceView.java
+++ b/packages/SystemUI/src/com/android/keyguard/KeyguardSliceView.java
+@@ -49,7 +49,6 @@ import com.android.internal.annotations.VisibleForTesting;
+ import com.android.internal.graphics.ColorUtils;
+ import com.android.settingslib.Utils;
+ import com.android.systemui.R;
+-import com.android.systemui.keyguard.KeyguardSliceProvider;
+ import com.android.systemui.util.wakelock.KeepAwakeAnimationListener;
+ 
+ import java.io.PrintWriter;
+@@ -446,15 +445,13 @@ public class KeyguardSliceView extends LinearLayout {
+ 
+         private void updatePadding() {
+             boolean hasText = !TextUtils.isEmpty(getText());
+-            boolean isDate = Uri.parse(KeyguardSliceProvider.KEYGUARD_DATE_URI).equals(getTag());
+             int padding = (int) getContext().getResources()
+                     .getDimension(R.dimen.widget_horizontal_padding) / 2;
+-            int iconPadding = (int) mContext.getResources()
+-                    .getDimension(R.dimen.widget_icon_padding);
+             // orientation is vertical, so add padding to top & bottom
+-            setPadding(!isDate ? iconPadding : 0, padding, 0, hasText ? padding : 0);
+            setPadding(0, padding, 0, hasText ? padding : 0);
+ 
+-            setCompoundDrawablePadding(iconPadding);
+            setCompoundDrawablePadding((int) mContext.getResources()
+                    .getDimension(R.dimen.widget_icon_padding));
+         }
+ 
+         @Override
+-- 
+2.34.1
+
--- a/patches_platform_personal/frameworks_base/0012-Revert-Update-RAT-icons-to-match-Silk-design.patch
+++ b/patches_platform_personal/frameworks_base/0012-Revert-Update-RAT-icons-to-match-Silk-design.patch
@@ -0,0 +1,191 @@
+From e18664e9b380b7b96cc506f8e106903478b4b214 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 12/21] Revert "Update RAT icons to match Silk design"
+
+This reverts commit 084c13c8216f6a899cd3eda04fc1d7acff3d1248.
+---
+ .../res/drawable/ic_3g_mobiledata.xml         | 19 ++++++++-------
+ .../res/drawable/ic_4g_mobiledata.xml         | 19 ++++++++-------
+ .../res/drawable/ic_5g_mobiledata.xml         | 20 ++++++++--------
+ .../res/drawable/ic_carrier_wifi.xml          | 15 +++++++-----
+ .../res/drawable/ic_lte_mobiledata.xml        | 23 +++++++++++--------
+ .../res/drawable/stat_sys_roaming_large.xml   | 10 ++++----
+ 6 files changed, 59 insertions(+), 47 deletions(-)
+
+diff --git a/packages/SettingsLib/res/drawable/ic_3g_mobiledata.xml b/packages/SettingsLib/res/drawable/ic_3g_mobiledata.xml
+index 413a3873f438..0c942bdf993c 100644
+--- a/packages/SettingsLib/res/drawable/ic_3g_mobiledata.xml
+++ b/packages/SettingsLib/res/drawable/ic_3g_mobiledata.xml
+@@ -14,14 +14,17 @@
+      limitations under the License.
+ -->
+ <vector xmlns:android="http://schemas.android.com/apk/res/android"
+-        android:width="21dp"
+-        android:height="16dp"
+-        android:viewportWidth="21.0"
+-        android:viewportHeight="16.0">
+    android:width="12.35dp"
+    android:height="15dp"
+    android:viewportWidth="14"
+    android:viewportHeight="17">
+
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M1.9,7.88h0.77c0.5,0,0.88-0.15,1.15-0.46s0.4-0.72,0.4-1.25c0-1.17-0.45-1.75-1.35-1.75c-0.43,0-0.77,0.16-1.02,0.47 S1.49,5.62,1.49,6.13h-1.2c0-0.8,0.24-1.46,0.73-1.97s1.11-0.78,1.86-0.78c0.78,0,1.41,0.25,1.87,0.73S5.43,5.31,5.43,6.2 c0,0.46-0.12,0.89-0.36,1.29S4.52,8.18,4.14,8.37c0.94,0.35,1.41,1.12,1.41,2.33c0,0.89-0.25,1.6-0.74,2.12 c-0.49,0.53-1.14,0.79-1.94,0.79c-0.79,0-1.43-0.25-1.91-0.75c-0.49-0.5-0.73-1.17-0.73-2.01h1.21c0,0.53,0.13,0.95,0.38,1.26 c0.26,0.31,0.6,0.47,1.05,0.47c0.45,0,0.81-0.15,1.08-0.46s0.4-0.77,0.4-1.39c0-1.21-0.57-1.81-1.72-1.81H1.9V7.88z" />
+     <path
+-        android:fillColor="#FF000000"
+-        android:pathData="M5.29,13.22c-0.57,0 -1.09,-0.11 -1.57,-0.34c-0.47,-0.22 -0.85,-0.54 -1.16,-0.95C2.25,11.52 2.07,11.01 2,10.42l1.47,-0.34c0.07,0.51 0.27,0.92 0.59,1.23c0.32,0.31 0.73,0.46 1.23,0.46c0.52,0 0.94,-0.15 1.26,-0.46c0.33,-0.31 0.49,-0.71 0.49,-1.22c0,-0.51 -0.18,-0.92 -0.53,-1.22c-0.35,-0.31 -0.8,-0.46 -1.36,-0.46H4.37V7.06h0.73c0.47,0 0.86,-0.13 1.18,-0.38c0.32,-0.26 0.48,-0.63 0.48,-1.11c0,-0.42 -0.14,-0.77 -0.41,-1.04C6.08,4.27 5.7,4.14 5.21,4.14c-0.43,0 -0.79,0.13 -1.08,0.38C3.85,4.76 3.67,5.08 3.6,5.48L2.17,5.3C2.23,4.81 2.4,4.38 2.67,4c0.27,-0.38 0.62,-0.69 1.05,-0.91c0.44,-0.22 0.94,-0.34 1.5,-0.34c0.62,0 1.15,0.12 1.6,0.35c0.45,0.23 0.79,0.55 1.04,0.95C8.1,4.46 8.23,4.9 8.23,5.4C8.23,6 8.1,6.48 7.84,6.81C7.58,7.14 7.29,7.4 6.97,7.6v0.08c0.46,0.2 0.84,0.5 1.13,0.91c0.3,0.4 0.45,0.93 0.45,1.58c0,0.58 -0.14,1.1 -0.42,1.55c-0.27,0.46 -0.65,0.82 -1.15,1.09C6.5,13.09 5.93,13.22 5.29,13.22z"/>
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M13.77,12.24l-0.22,0.27c-0.63,0.73-1.55,1.1-2.76,1.1c-1.08,0-1.92-0.36-2.53-1.07c-0.61-0.71-0.93-1.72-0.94-3.02V7.56 c0-1.39,0.28-2.44,0.84-3.13s1.39-1.04,2.51-1.04c0.95,0,1.69,0.26,2.23,0.79s0.83,1.28,0.89,2.26h-1.25 C12.47,5.82,12.3,5.33,12,4.98s-0.74-0.52-1.34-0.52c-0.72,0-1.24,0.23-1.57,0.7S8.59,6.37,8.58,7.4v2.03c0,1,0.19,1.77,0.57,2.31 c0.38,0.54,0.93,0.8,1.65,0.8c0.67,0,1.19-0.16,1.54-0.49l0.18-0.17V9.59H10.7V8.52h3.07V12.24z" />
+     <path
+-        android:fillColor="#FF000000"
+-        android:pathData="M14.44,13.22c-0.88,0 -1.66,-0.21 -2.34,-0.64c-0.67,-0.44 -1.2,-1.05 -1.6,-1.83c-0.38,-0.79 -0.57,-1.71 -0.57,-2.76c0,-1.05 0.21,-1.96 0.62,-2.74c0.41,-0.79 0.97,-1.4 1.67,-1.83c0.7,-0.44 1.5,-0.66 2.39,-0.66c1.09,0 2.01,0.25 2.74,0.76c0.75,0.5 1.22,1.21 1.41,2.11L17.3,6.01c-0.17,-0.56 -0.48,-1 -0.94,-1.32c-0.45,-0.33 -1.03,-0.49 -1.75,-0.49c-0.57,0 -1.09,0.14 -1.57,0.43c-0.48,0.29 -0.85,0.71 -1.13,1.27s-0.42,1.25 -0.42,2.07c0,0.81 0.14,1.5 0.41,2.07c0.28,0.56 0.65,0.98 1.11,1.27c0.47,0.29 0.98,0.43 1.54,0.43c0.57,0 1.06,-0.11 1.47,-0.34c0.42,-0.23 0.75,-0.55 0.99,-0.94c0.25,-0.4 0.41,-0.85 0.46,-1.36h-2.88V7.79h4.37c0,0.87 0,1.74 0,2.6c0,0.87 0,1.74 0,2.6h-1.41v-1.4h-0.08c-0.28,0.49 -0.67,0.88 -1.18,1.18C15.78,13.07 15.17,13.22 14.44,13.22z"/>
+        android:pathData="M 0 0 H 14 V 17 H 0 V 0 Z" />
+ </vector>
+diff --git a/packages/SettingsLib/res/drawable/ic_4g_mobiledata.xml b/packages/SettingsLib/res/drawable/ic_4g_mobiledata.xml
+index 1de7d78ff5f2..535f3589ea6b 100644
+--- a/packages/SettingsLib/res/drawable/ic_4g_mobiledata.xml
+++ b/packages/SettingsLib/res/drawable/ic_4g_mobiledata.xml
+@@ -14,14 +14,17 @@
+      limitations under the License.
+ -->
+ <vector xmlns:android="http://schemas.android.com/apk/res/android"
+-        android:width="22dp"
+-        android:height="16dp"
+-        android:viewportWidth="22.0"
+-        android:viewportHeight="16.0">
+    android:width="12.35dp"
+    android:height="15dp"
+    android:viewportWidth="14"
+    android:viewportHeight="17">
+
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M5.07,10.13h1.11v1.03H5.07v2.31H3.86v-2.31H0.1v-0.75l3.7-6.9h1.27V10.13z M1.44,10.13h2.42V5.4L1.44,10.13z" />
+     <path
+-        android:fillColor="#FF000000"
+-        android:pathData="M2,10.98V9.81l4.28,-6.83h1.6v6.59h1.19v1.41H7.88V13H6.4v-2.02H2zM3.68,9.57H6.4V5.33H6.31L3.68,9.57z"/>
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M13.9,12.24l-0.22,0.27c-0.63,0.73-1.55,1.1-2.76,1.1c-1.08,0-1.92-0.36-2.53-1.07c-0.61-0.71-0.93-1.72-0.94-3.02V7.56 c0-1.39,0.28-2.44,0.84-3.13s1.39-1.04,2.51-1.04c0.95,0,1.69,0.26,2.23,0.79s0.83,1.28,0.89,2.26h-1.25 c-0.05-0.62-0.22-1.1-0.52-1.45s-0.74-0.52-1.34-0.52c-0.72,0-1.24,0.23-1.57,0.7S8.72,6.37,8.71,7.4v2.03 c0,1,0.19,1.77,0.57,2.31c0.38,0.54,0.93,0.8,1.65,0.8c0.67,0,1.19-0.16,1.54-0.49l0.18-0.17V9.59h-1.82V8.52h3.07V12.24z" />
+     <path
+-        android:fillColor="#FF000000"
+-        android:pathData="M15,13.22c-0.88,0 -1.66,-0.21 -2.34,-0.64c-0.67,-0.44 -1.2,-1.05 -1.6,-1.83c-0.38,-0.79 -0.57,-1.71 -0.57,-2.76c0,-1.05 0.21,-1.96 0.62,-2.74c0.41,-0.79 0.97,-1.4 1.67,-1.83c0.7,-0.44 1.5,-0.66 2.39,-0.66c1.09,0 2.01,0.25 2.74,0.76c0.75,0.5 1.22,1.21 1.41,2.11l-1.47,0.39c-0.17,-0.56 -0.48,-1 -0.94,-1.32c-0.45,-0.33 -1.03,-0.49 -1.75,-0.49c-0.57,0 -1.09,0.14 -1.57,0.43c-0.48,0.29 -0.85,0.71 -1.13,1.27c-0.28,0.56 -0.42,1.25 -0.42,2.07c0,0.81 0.14,1.5 0.41,2.07c0.28,0.56 0.65,0.98 1.11,1.27c0.47,0.29 0.98,0.43 1.54,0.43c0.57,0 1.06,-0.11 1.47,-0.34c0.42,-0.23 0.75,-0.55 0.99,-0.94c0.25,-0.4 0.41,-0.85 0.46,-1.36h-2.88V7.79h4.37c0,0.87 0,1.74 0,2.6c0,0.87 0,1.74 0,2.6h-1.41v-1.4h-0.08c-0.28,0.49 -0.67,0.88 -1.18,1.18C16.34,13.07 15.73,13.22 15,13.22z"/>
+        android:pathData="M 0 0 H 14 V 17 H 0 V 0 Z" />
+ </vector>
+diff --git a/packages/SettingsLib/res/drawable/ic_5g_mobiledata.xml b/packages/SettingsLib/res/drawable/ic_5g_mobiledata.xml
+index d961c6c2266f..2aa6e57f6f82 100644
+--- a/packages/SettingsLib/res/drawable/ic_5g_mobiledata.xml
+++ b/packages/SettingsLib/res/drawable/ic_5g_mobiledata.xml
+@@ -14,14 +14,14 @@
+      limitations under the License.
+ -->
+ <vector xmlns:android="http://schemas.android.com/apk/res/android"
+-        android:width="21dp"
+-        android:height="16dp"
+-        android:viewportWidth="21.0"
+-        android:viewportHeight="16.0">
+-    <path
+-        android:fillColor="#FF000000"
+-        android:pathData="M5.3,13.22c-0.57,0 -1.1,-0.11 -1.58,-0.34c-0.48,-0.22 -0.87,-0.55 -1.18,-0.98C2.24,11.47 2.06,10.93 2,10.3l1.48,-0.2c0.07,0.5 0.25,0.92 0.56,1.25c0.32,0.32 0.74,0.48 1.26,0.48c0.57,0 1.02,-0.18 1.34,-0.55c0.33,-0.37 0.49,-0.87 0.49,-1.48c0,-0.61 -0.16,-1.09 -0.49,-1.46C6.32,7.96 5.88,7.78 5.32,7.78C5,7.78 4.7,7.85 4.42,8C4.15,8.14 3.93,8.33 3.76,8.56L2.28,7.92l0.6,-4.94h5.26v1.36H4.1L3.72,7.02l0.08,0.03C4,6.87 4.25,6.73 4.55,6.62c0.3,-0.12 0.63,-0.18 1.01,-0.18c0.6,0 1.13,0.14 1.6,0.41C7.62,7.11 7.98,7.5 8.24,8c0.27,0.5 0.41,1.1 0.41,1.79c0,0.66 -0.14,1.26 -0.43,1.78c-0.28,0.51 -0.67,0.92 -1.18,1.22C6.55,13.08 5.97,13.22 5.3,13.22z"/>
+-    <path
+-        android:fillColor="#FF000000"
+-        android:pathData="M14.51,13.22c-0.88,0 -1.66,-0.21 -2.34,-0.64c-0.67,-0.44 -1.2,-1.05 -1.6,-1.83C10.19,9.95 10,9.03 10,7.99c0,-1.05 0.21,-1.96 0.62,-2.74c0.41,-0.79 0.97,-1.4 1.67,-1.83c0.7,-0.44 1.5,-0.66 2.39,-0.66c1.09,0 2.01,0.25 2.74,0.76c0.75,0.5 1.22,1.21 1.41,2.11l-1.47,0.39c-0.17,-0.56 -0.48,-1 -0.94,-1.32c-0.45,-0.33 -1.03,-0.49 -1.75,-0.49c-0.57,0 -1.09,0.14 -1.57,0.43c-0.48,0.29 -0.85,0.71 -1.13,1.27s-0.42,1.25 -0.42,2.07c0,0.81 0.14,1.5 0.41,2.07c0.28,0.56 0.65,0.98 1.11,1.27c0.47,0.29 0.98,0.43 1.54,0.43c0.57,0 1.06,-0.11 1.47,-0.34c0.42,-0.23 0.75,-0.55 0.99,-0.94c0.25,-0.4 0.41,-0.85 0.46,-1.36h-2.88V7.79h4.37c0,0.87 0,1.74 0,2.6c0,0.87 0,1.74 0,2.6H17.6v-1.4h-0.08c-0.28,0.49 -0.67,0.88 -1.18,1.18C15.85,13.07 15.24,13.22 14.51,13.22z"/>
+    android:width="14dp"
+    android:height="17dp"
+    android:viewportWidth="14"
+    android:viewportHeight="17">
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M13.9,12.24l-0.22,0.27c-0.63,0.73 -1.55,1.1 -2.76,1.1c-1.08,0 -1.92,-0.36 -2.53,-1.07s-0.93,-1.72 -0.94,-3.02V7.56c0,-1.39 0.28,-2.44 0.84,-3.13s1.39,-1.04 2.51,-1.04c0.95,0 1.69,0.26 2.23,0.79s0.83,1.28 0.89,2.26h-1.25c-0.05,-0.62 -0.22,-1.1 -0.52,-1.45s-0.74,-0.52 -1.34,-0.52c-0.72,0 -1.24,0.23 -1.57,0.7S8.72,6.37 8.71,7.4v2.03c0,1 0.19,1.77 0.57,2.31c0.38,0.54 0.93,0.8 1.65,0.8c0.67,0 1.19,-0.16 1.54,-0.49l0.18,-0.17V9.59h-1.82V8.52h3.07V12.24z"/>
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M1.15,8.47l0.43,-4.96h4.33v1.17H2.6L2.37,7.39C2.78,7.1 3.22,6.96 3.69,6.96c0.77,0 1.38,0.3 1.83,0.9s0.66,1.41 0.66,2.43c0,1.03 -0.24,1.84 -0.72,2.43S4.32,13.6 3.48,13.6c-0.75,0 -1.36,-0.24 -1.83,-0.73s-0.74,-1.16 -0.81,-2.02h1.13c0.07,0.57 0.23,1 0.49,1.29c0.26,0.29 0.59,0.43 1.01,0.43c0.47,0 0.84,-0.2 1.1,-0.61c0.26,-0.41 0.4,-0.96 0.4,-1.65c0,-0.65 -0.14,-1.18 -0.43,-1.59S3.88,8.09 3.4,8.09c-0.4,0 -0.72,0.1 -0.96,0.31L2.11,8.73L1.15,8.47z"/>
+ </vector>
+diff --git a/packages/SettingsLib/res/drawable/ic_carrier_wifi.xml b/packages/SettingsLib/res/drawable/ic_carrier_wifi.xml
+index 22bcf7b8c8a3..ed9d85e3cbe4 100644
+--- a/packages/SettingsLib/res/drawable/ic_carrier_wifi.xml
+++ b/packages/SettingsLib/res/drawable/ic_carrier_wifi.xml
+@@ -14,14 +14,17 @@
+      limitations under the License.
+ -->
+ <vector xmlns:android="http://schemas.android.com/apk/res/android"
+-        android:width="24dp"
+-        android:height="16dp"
+-        android:viewportWidth="24.0"
+-        android:viewportHeight="16.0">
+        android:width="38dp"
+        android:height="24dp"
+        android:viewportWidth="38.0"
+        android:viewportHeight="24.0">
+     <path
+         android:fillColor="#FF000000"
+-        android:pathData="M4.59,13L2,2.98h1.69l1.5,6.48l0.17,0.88h0.08l0.21,-0.88l1.89,-6.48h1.54l1.83,6.48l0.21,0.87h0.08l0.15,-0.87l1.51,-6.48h1.68L12.01,13H10.4L8.58,6.36L8.36,5.4H8.27L8.05,6.36L6.16,13H4.59z"/>
+        android:pathData="M9.45,14.48h1.8c-0.05,0.98 -0.24,1.82 -0.6,2.53c-0.35,0.7 -0.85,1.24 -1.51,1.62c-0.66,0.38 -1.48,0.57 -2.47,0.57c-0.71,0 -1.35,-0.14 -1.92,-0.42c-0.57,-0.28 -1.06,-0.68 -1.47,-1.2c-0.4,-0.53 -0.71,-1.16 -0.93,-1.89c-0.21,-0.74 -0.32,-1.56 -0.32,-2.48v-2.63c0,-0.91 0.11,-1.74 0.32,-2.47c0.22,-0.74 0.54,-1.36 0.95,-1.88C3.71,5.69 4.21,5.29 4.8,5.01c0.6,-0.28 1.28,-0.42 2.03,-0.42c0.92,0 1.71,0.19 2.34,0.56c0.64,0.36 1.14,0.9 1.48,1.61c0.35,0.7 0.55,1.57 0.59,2.59h-1.8C9.41,8.59 9.29,7.98 9.1,7.52C8.91,7.04 8.63,6.69 8.26,6.47C7.9,6.24 7.42,6.13 6.84,6.13c-0.52,0 -0.97,0.1 -1.36,0.31C5.1,6.65 4.79,6.95 4.54,7.34C4.3,7.72 4.12,8.19 3.99,8.74c-0.12,0.54 -0.18,1.15 -0.18,1.82v2.65c0,0.62 0.05,1.21 0.15,1.75c0.1,0.54 0.27,1.02 0.49,1.43c0.23,0.4 0.52,0.72 0.89,0.95c0.36,0.23 0.81,0.34 1.33,0.34c0.66,0 1.18,-0.11 1.56,-0.32c0.38,-0.21 0.67,-0.56 0.85,-1.03C9.27,15.85 9.39,15.23 9.45,14.48z"/>
+     <path
+         android:fillColor="#FF000000"
+-        android:pathData="M15.77,9.85V8.56h2.46V6.1h1.3v2.46H22v1.29h-2.46v2.46h-1.3V9.85H15.77z"/>
+        android:pathData="M24.87,4.78l-1.74,9.72l-0.2,1.64l-0.29,-1.44l-2.21,-9.92l-0.2,0l-1.06,0l-0.22,0l-2.28,9.92l-0.28,1.4l-0.18,-1.59l-1.78,-9.73l-1.79,0l2.83,14.22l0.34,0l0.92,0l0.35,0l2.48,-10.36l0.14,-0.84l0.15,0.84l2.36,10.36l0.36,0l0.92,0l0.34,0l2.82,-14.22z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M35.72,6.32l0,-1.54l-5.61,0l-0.34,0l-1.45,0l0,14.22l1.79,0l0,-6.28l4.8,0l0,-1.54l-4.8,0l0,-4.86z"/>
+ </vector>
+diff --git a/packages/SettingsLib/res/drawable/ic_lte_mobiledata.xml b/packages/SettingsLib/res/drawable/ic_lte_mobiledata.xml
+index 739e29d886c2..e6b4fb698242 100644
+--- a/packages/SettingsLib/res/drawable/ic_lte_mobiledata.xml
+++ b/packages/SettingsLib/res/drawable/ic_lte_mobiledata.xml
+@@ -14,17 +14,20 @@
+      limitations under the License.
+ -->
+ <vector xmlns:android="http://schemas.android.com/apk/res/android"
+-        android:width="26dp"
+-        android:height="16dp"
+-        android:viewportWidth="26.0"
+-        android:viewportHeight="16.0">
+    android:width="15.88dp"
+    android:height="15dp"
+    android:viewportWidth="18"
+    android:viewportHeight="17">
+
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M1.34,12.4h3.9v1.07H0.08V3.52h1.26V12.4z" />
+     <path
+-        android:fillColor="#FF000000"
+-        android:pathData="M2,13V2.98h1.53v8.57H8.3V13H2z"/>
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M11.1,4.6H8.48v8.88H7.23V4.6H4.62V3.52h6.48V4.6z" />
+     <path
+-        android:fillColor="#FF000000"
+-        android:pathData="M11.24,13V4.43H8.19V2.98h7.63v1.46h-3.05V13H11.24z"/>
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M17.34,8.88h-3.52v3.53h4.1v1.07h-5.35V3.52h5.28V4.6h-4.03V7.8h3.52V8.88z" />
+     <path
+-        android:fillColor="#FF000000"
+-        android:pathData="M17.41,13V2.98h6.36v1.46h-4.83v2.65h4.4v1.46h-4.4v3.01h4.83V13H17.41z"/>
+        android:pathData="M 0 0 H 18 V 17 H 0 V 0 Z" />
+ </vector>
+diff --git a/packages/SystemUI/res/drawable/stat_sys_roaming_large.xml b/packages/SystemUI/res/drawable/stat_sys_roaming_large.xml
+index 48faeb22416f..1511659ea42f 100644
+--- a/packages/SystemUI/res/drawable/stat_sys_roaming_large.xml
+++ b/packages/SystemUI/res/drawable/stat_sys_roaming_large.xml
+@@ -14,11 +14,11 @@
+      limitations under the License.
+ -->
+ <vector xmlns:android="http://schemas.android.com/apk/res/android"
+-        android:width="16dp"
+-        android:height="16dp"
+-        android:viewportWidth="16.0"
+-        android:viewportHeight="16.0">
+        android:width="@dimen/signal_icon_size"
+        android:height="@dimen/signal_icon_size"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+     <path
+         android:fillColor="#FF000000"
+-        android:pathData="M4.5,13.02V3h3.93c0.97,0 1.75,0.27 2.34,0.81c0.6,0.53 0.9,1.28 0.9,2.25c0,0.63 -0.19,1.2 -0.56,1.74c-0.37,0.53 -0.95,0.91 -1.74,1.12l2.45,4.02v0.08h-1.69L7.75,9.09H6.03v3.93H4.5zM8.46,4.44H6.03v3.23h2.44c0.49,0 0.9,-0.14 1.2,-0.41c0.31,-0.28 0.46,-0.69 0.46,-1.22s-0.15,-0.93 -0.45,-1.2C9.38,4.58 8.98,4.44 8.46,4.44z"/>
+        android:pathData="M14.21,12.81c0.36,-0.16 0.69,-0.36 0.97,-0.61c0.41,-0.38 0.72,-0.83 0.94,-1.37c0.21,-0.54 0.32,-1.14 0.32,-1.79c0,-0.92 -0.16,-1.7 -0.49,-2.33c-0.32,-0.64 -0.79,-1.12 -1.43,-1.45c-0.62,-0.33 -1.4,-0.49 -2.32,-0.49H8.23V19h1.8v-5.76h2.5L15.06,19h1.92v-0.12L14.21,12.81zM10.03,11.71V6.32h2.18c0.59,0 1.06,0.11 1.42,0.34c0.36,0.22 0.62,0.54 0.78,0.95c0.16,0.41 0.24,0.89 0.24,1.44c0,0.49 -0.09,0.93 -0.27,1.34c-0.18,0.4 -0.46,0.73 -0.82,0.97c-0.36,0.23 -0.82,0.35 -1.37,0.35H10.03z"/>
+ </vector>
+-- 
+2.34.1
+
--- a/patches_platform_personal/frameworks_base/0013-Revert-Use-the-default-top-clock-margin-on-h800-devi.patch
+++ b/patches_platform_personal/frameworks_base/0013-Revert-Use-the-default-top-clock-margin-on-h800-devi.patch
@@ -0,0 +1,29 @@
+From 916d532636decc77b67fd22e96507b2c9aaa4267 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 13/21] Revert "Use the default top clock margin on h800
+ devices"
+
+This reverts commits 50ba380f4d8d1c2523e0f76295ca556038796bfd
+and 2a254b4d479029aec46f79a0ed14ffab6d0424bc.
+---
+ packages/SystemUI/res/values-h800dp/dimens.xml | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/packages/SystemUI/res/values-h800dp/dimens.xml b/packages/SystemUI/res/values-h800dp/dimens.xml
+index 829ef98956c5..8ee3cc1944f2 100644
+--- a/packages/SystemUI/res/values-h800dp/dimens.xml
+++ b/packages/SystemUI/res/values-h800dp/dimens.xml
+@@ -15,6 +15,9 @@
+   -->
+ 
+ <resources>
+    <!-- Minimum margin between clock and top of screen or ambient indication -->
+    <dimen name="keyguard_clock_top_margin">38dp</dimen>
+
+     <!-- Margin above the ambient indication container -->
+     <dimen name="ambient_indication_container_margin_top">20dp</dimen>
+ </resources>
+-- 
+2.34.1
+
--- a/patches_platform_personal/frameworks_base/0014-UI-Always-render-into-cutouts.patch
+++ b/patches_platform_personal/frameworks_base/0014-UI-Always-render-into-cutouts.patch
@@ -0,0 +1,102 @@
+From 560702e79e667348a4487f4d34dd6ee2dba5d828 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 14/21] UI: Always render into cutouts
+
+Eliminates black/white letterboxing in apps, keyguard and QS
+
+Change-Id: I4661c7979bfa7de453329fcddbaeefc2009e2da3
+---
+ core/java/android/view/InsetsState.java       | 19 +------------------
+ .../shade/QuickSettingsController.java        | 11 +++++++----
+ .../com/android/server/wm/DisplayPolicy.java  |  1 +
+ 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
+--- a/core/java/android/view/InsetsState.java
+++ b/core/java/android/view/InsetsState.java
+@@ -501,24 +501,7 @@ public class InsetsState implements Parcelable {
+     }
+ 
+     public void getDisplayCutoutSafe(Rect outBounds) {
+-        outBounds.set(
+-                WindowLayout.MIN_X, WindowLayout.MIN_Y, WindowLayout.MAX_X, WindowLayout.MAX_Y);
+-        final DisplayCutout cutout = mDisplayCutout.get();
+-        final Rect displayFrame = mDisplayFrame;
+-        if (!cutout.isEmpty()) {
+-            if (cutout.getSafeInsetLeft() > 0) {
+-                outBounds.left = displayFrame.left + cutout.getSafeInsetLeft();
+-            }
+-            if (cutout.getSafeInsetTop() > 0) {
+-                outBounds.top = displayFrame.top + cutout.getSafeInsetTop();
+-            }
+-            if (cutout.getSafeInsetRight() > 0) {
+-                outBounds.right = displayFrame.right - cutout.getSafeInsetRight();
+-            }
+-            if (cutout.getSafeInsetBottom() > 0) {
+-                outBounds.bottom = displayFrame.bottom - cutout.getSafeInsetBottom();
+-            }
+-        }
+        outBounds.set(mDisplayFrame);
+     }
+ 
+     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 1842dd110d6d..e14bcc232823 100644
+--- a/packages/SystemUI/src/com/android/systemui/shade/QuickSettingsController.java
+++ b/packages/SystemUI/src/com/android/systemui/shade/QuickSettingsController.java
+@@ -296,6 +296,8 @@ public class QuickSettingsController implements Dumpable {
+     private int mOneFingerQuickSettingsIntercept;
+     private final ContentObserver mOneFingerQuickSettingsInterceptObserver;
+ 
+    private WindowManager mWindowManager;
+
+     private final Region mInterceptRegion = new Region();
+     /** The end bounds of a clipping animation. */
+     private final Rect mClippingAnimationEndBounds = new Rect();
+@@ -413,6 +415,8 @@ public class QuickSettingsController implements Dumpable {
+             }
+         };
+ 
+        mWindowManager = mPanelView.getContext().getSystemService(WindowManager.class);
+
+         dumpManager.registerDumpable(this);
+     }
+ 
+@@ -556,8 +560,7 @@ public class QuickSettingsController implements Dumpable {
+      *  on ACTION_DOWN, and safely queried repeatedly thereafter during ACTION_MOVE events.
+      */
+     public void updateGestureInsetsCache() {
+-        WindowManager wm = this.mPanelView.getContext().getSystemService(WindowManager.class);
+-        WindowMetrics windowMetrics = wm.getCurrentWindowMetrics();
+        WindowMetrics windowMetrics = mWindowManager.getCurrentWindowMetrics();
+         mCachedGestureInsets = windowMetrics.getWindowInsets().getInsets(
+                 WindowInsets.Type.systemGestures());
+     }
+@@ -1534,8 +1537,8 @@ public class QuickSettingsController implements Dumpable {
+ 
+     private int calculateRightClippingBound() {
+         if (mIsFullWidth) {
+-            return mPanelView.getRight()
+-                    + mDisplayRightInset;
+            // right bounds should also always reach the edge of the screen - getCurrentWindowMetrics ignores insets
+            return mWindowManager.getCurrentWindowMetrics().getBounds().right;
+         } else {
+             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 8b3e4d38d736..99d905deae72 100644
+--- a/services/core/java/com/android/server/wm/DisplayPolicy.java
+++ b/services/core/java/com/android/server/wm/DisplayPolicy.java
+@@ -1396,6 +1396,7 @@ public class DisplayPolicy {
+         displayFrames = win.getDisplayFrames(displayFrames);
+ 
+         final WindowManager.LayoutParams attrs = win.mAttrs.forRotation(displayFrames.mRotation);
+        attrs.layoutInDisplayCutoutMode = LAYOUT_IN_DISPLAY_CUTOUT_MODE_ALWAYS;
+         sTmpClientFrames.attachedFrame = attached != null ? attached.getFrame() : null;
+ 
+         // If this window has different LayoutParams for rotations, we cannot trust its requested
+-- 
+2.34.1
+
--- a/patches_platform_personal/frameworks_base/0015-UI-Kill-rounded-corners-in-notification-scrim.patch
+++ b/patches_platform_personal/frameworks_base/0015-UI-Kill-rounded-corners-in-notification-scrim.patch
@@ -0,0 +1,28 @@
+From 6b596089d52d5e95ff75605a97269770a5d3a061 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 15/21] 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
+
+Change-Id: I09ed59e0e658ebd512a9d02a8ef3edfe2c9888da
+---
+ packages/SystemUI/res/values/dimens.xml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml
+index 3320f98d1620..be08d662ed14 100644
+--- a/packages/SystemUI/res/values/dimens.xml
+++ b/packages/SystemUI/res/values/dimens.xml
+@@ -759,7 +759,7 @@
+     <!-- When large clock is showing, offset the smartspace by this amount -->
+     <dimen name="keyguard_smartspace_top_offset">12dp</dimen>
+ 
+-    <dimen name="notification_scrim_corner_radius">32dp</dimen>
+    <dimen name="notification_scrim_corner_radius">0dp</dimen>
+ 
+     <!-- The minimum amount the user needs to swipe to go to the camera / phone. -->
+     <dimen name="keyguard_min_swipe_amount">110dp</dimen>
+-- 
+2.34.1
+
--- a/patches_platform_personal/frameworks_base/0016-UI-Reconfigure-power-menu-items.patch
+++ b/patches_platform_personal/frameworks_base/0016-UI-Reconfigure-power-menu-items.patch
@@ -0,0 +1,32 @@
+From 7ed48ed3b7a097290de3695da736da668bfc5b88 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 16/21] UI: Reconfigure power menu items
+
+Change-Id: I32cca6e2c6bb64d891efee959127edf7c0802cbc
+---
+ core/res/res/values/config.xml | 5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
+diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
+index 2ae5f1f43335..82668de63c28 100644
+--- a/core/res/res/values/config.xml
+++ b/core/res/res/values/config.xml
+@@ -3489,13 +3489,10 @@
+          "logout" =  Logout the current user
+          -->
+     <string-array translatable="false" name="config_globalActionsList">
+-        <item>emergency</item>
+-        <item>lockdown</item>
+         <item>power</item>
+         <item>restart</item>
+-        <item>logout</item>
+         <item>screenshot</item>
+-        <item>bugreport</item>
+        <item>airplane</item>
+     </string-array>
+ 
+     <!-- Number of milliseconds to hold a wake lock to ensure that drawing is fully
+-- 
+2.34.1
+
--- a/patches_platform_personal/frameworks_base/0017-UI-Reconfigure-quick-settings-tiles.patch
+++ b/patches_platform_personal/frameworks_base/0017-UI-Reconfigure-quick-settings-tiles.patch
@@ -0,0 +1,26 @@
+From e1cd8d1cdc216ba64b34a3bae83a07b7003b1218 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 17/21] UI: Reconfigure quick settings tiles
+
+Change-Id: I743f52ef3a95db0ca2c02ae973faa4629e41885d
+---
+ packages/SystemUI/res/values/config.xml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/packages/SystemUI/res/values/config.xml b/packages/SystemUI/res/values/config.xml
+index 9cd22313e0a1..03135f215e05 100644
+--- a/packages/SystemUI/res/values/config.xml
+++ b/packages/SystemUI/res/values/config.xml
+@@ -78,7 +78,7 @@
+ 
+     <!-- The default tiles to display in QuickSettings -->
+     <string name="quick_settings_tiles_default" translatable="false">
+-        internet,bt,flashlight,dnd,alarm,airplane,controls,wallet,rotation,battery,cast,screenrecord,mictoggle,cameratoggle,custom(com.android.permissioncontroller/.permission.service.SafetyCenterQsTileService)
+        wifi,cell,hotspot,location,rotation,flashlight
+     </string>
+ 
+     <!-- The class path of the Safety Quick Settings Tile -->
+-- 
+2.34.1
+
--- a/patches_platform_personal/frameworks_base/0018-UI-Relax-requirement-for-HINT_SUPPORTS_DARK_TEXT.patch
+++ b/patches_platform_personal/frameworks_base/0018-UI-Relax-requirement-for-HINT_SUPPORTS_DARK_TEXT.patch
@@ -0,0 +1,28 @@
+From 55c864cf004f63aa0475a76be4537bb26589ae4f 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 18/21] UI: Relax requirement for HINT_SUPPORTS_DARK_TEXT
+
+I decide what's good enough for a wallpaper!
+
+Change-Id: I5ccd85b3df12e53746a4ac6cbc37ba8d11f6c336
+---
+ core/java/android/app/WallpaperColors.java | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/core/java/android/app/WallpaperColors.java b/core/java/android/app/WallpaperColors.java
+index 5f5a7dfe24c6..1adce321012b 100644
+--- a/core/java/android/app/WallpaperColors.java
+++ b/core/java/android/app/WallpaperColors.java
+@@ -593,7 +593,7 @@ public final class WallpaperColors implements Parcelable {
+ 
+         int hints = 0;
+         double meanLuminance = totalLuminance / pixels.length;
+-        if (meanLuminance > BRIGHT_IMAGE_MEAN_LUMINANCE && darkPixels <= maxDarkPixels) {
+        if (meanLuminance > BRIGHT_IMAGE_MEAN_LUMINANCE) {
+             hints |= HINT_SUPPORTS_DARK_TEXT;
+         }
+         if (meanLuminance < DARK_THEME_MEAN_LUMINANCE) {
+-- 
+2.34.1
+
--- a/patches_platform_personal/frameworks_base/0019-UI-Remove-privacy-dot.patch
+++ b/patches_platform_personal/frameworks_base/0019-UI-Remove-privacy-dot.patch
@@ -0,0 +1,32 @@
+From 1c65cb4d1b36523bdc993a56e7183c8b736c9382 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 19/21] UI: Remove privacy dot
+
+Change-Id: I5d2e2b3e36f027b4348a83030d4b4d3c4f0209d1
+---
+ packages/SystemUI/res/values/dimens.xml | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml
+index be08d662ed14..ea4a1db20819 100644
+--- a/packages/SystemUI/res/values/dimens.xml
+++ b/packages/SystemUI/res/values/dimens.xml
+@@ -1102,12 +1102,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>
+-    <dimen name="ongoing_appops_dot_diameter">6dp</dimen>
+    <dimen name="ongoing_appops_dot_diameter">0dp</dimen>
+     <dimen name="ongoing_appops_chip_min_animation_width">10dp</dimen>
+     <dimen name="ongoing_appops_chip_animation_in_status_bar_translation_x">15dp</dimen>
+     <dimen name="ongoing_appops_chip_animation_out_status_bar_translation_x">7dp</dimen>
+     <!--  Total minimum padding to enforce to ensure that the dot can always show  -->
+-    <dimen name="ongoing_appops_dot_min_padding">20dp</dimen>
+    <dimen name="ongoing_appops_dot_min_padding">0dp</dimen>
+ 
+     <dimen name="ongoing_appops_dialog_side_margins">@dimen/notification_shade_content_margin_horizontal</dimen>
+ 
+-- 
+2.34.1
+
--- a/patches_platform_personal/frameworks_base/0020-UI-Restore-quick-settings-fonts-to-pre-T-QPR2.patch
+++ b/patches_platform_personal/frameworks_base/0020-UI-Restore-quick-settings-fonts-to-pre-T-QPR2.patch
@@ -0,0 +1,35 @@
+From bdedcba0f39eb17bcf93d954eede85f5c079d067 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 20/21] 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
+---
+ packages/SystemUI/res/values/styles.xml | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/packages/SystemUI/res/values/styles.xml b/packages/SystemUI/res/values/styles.xml
+index 847b8a961322..09d7888ce552 100644
+--- a/packages/SystemUI/res/values/styles.xml
+++ b/packages/SystemUI/res/values/styles.xml
+@@ -143,7 +143,7 @@
+     <!-- This is hard coded to be sans-serif-condensed to match the icons -->
+ 
+     <style name="TextAppearance.QS.Status">
+-        <item name="android:fontFamily">@*android:string/config_headlineFontFamily</item>
+        <item name="android:fontFamily">@*android:string/config_headlineFontFamilyMedium</item>
+         <item name="android:textColor">?attr/onSurface</item>
+         <item name="android:textSize">14sp</item>
+         <item name="android:letterSpacing">0.01</item>
+@@ -161,6 +161,7 @@
+     </style>
+ 
+     <style name="TextAppearance.QS.Status.Build">
+        <item name="android:fontFamily">@*android:string/config_headlineFontFamily</item>
+         <item name="android:textColor">?attr/onSurfaceVariant</item>
+     </style>
+ 
+-- 
+2.34.1
+
--- a/patches_platform_personal/frameworks_base/0021-UI-Revert-to-HSL-luminance-for-wallpaper-dark-hints.patch
+++ b/patches_platform_personal/frameworks_base/0021-UI-Revert-to-HSL-luminance-for-wallpaper-dark-hints.patch
@@ -0,0 +1,47 @@
+From a1bee1d208afbf20b3db1cd03ae393d6e7d93a05 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 21/21] UI: Revert to HSL luminance for wallpaper dark hints
+
+Y U no test for consistency, Google?
+
+Change-Id: Ie5663bdf518b4ef93d6deb634e707a32d052ac55
+---
+ core/java/android/app/WallpaperColors.java | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/core/java/android/app/WallpaperColors.java b/core/java/android/app/WallpaperColors.java
+index 1adce321012b..477dbc827672 100644
+--- a/core/java/android/app/WallpaperColors.java
+++ b/core/java/android/app/WallpaperColors.java
+@@ -568,15 +568,15 @@ public final class WallpaperColors implements Parcelable {
+         float[] tmpHsl = new float[3];
+         for (int i = 0; i < pixels.length; i++) {
+             int pixelColor = pixels[i];
+-            ColorUtils.colorToHSL(pixelColor, tmpHsl);
+             final int alpha = Color.alpha(pixelColor);
+ 
+             // Apply composite colors where the foreground is a black layer with an alpha value of
+             // the dim amount and the background is the wallpaper pixel color.
+             int compositeColors = ColorUtils.compositeColors(blackTransparent, pixelColor);
+ 
+-            // Calculate the adjusted luminance of the dimmed wallpaper pixel color.
+-            double adjustedLuminance = ColorUtils.calculateLuminance(compositeColors);
+            // Calculate the luminance of the dimmed wallpaper pixel color.
+            ColorUtils.colorToHSL(compositeColors, tmpHsl);
+            double luminance = tmpHsl[2];
+ 
+             // Make sure we don't have a dark pixel mass that will
+             // make text illegible.
+@@ -588,7 +588,7 @@ public final class WallpaperColors implements Parcelable {
+                     pixels[i] = Color.RED;
+                 }
+             }
+-            totalLuminance += adjustedLuminance;
+            totalLuminance += luminance;
+         }
+ 
+         int hints = 0;
+-- 
+2.34.1
+
--- a/patches_platform_personal/frameworks_opt_telephony/0001-Telephony-Disable-SPN-retrieval.patch
+++ b/patches_platform_personal/frameworks_opt_telephony/0001-Telephony-Disable-SPN-retrieval.patch
@@ -0,0 +1,62 @@
+From f6baebedc09b503e477f7f4f1d83ac494d5028d3 Mon Sep 17 00:00:00 2001
+From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
+Date: Tue, 8 Jun 2021 12:00:26 +0000
+Subject: [PATCH] Telephony: Disable SPN retrieval
+
+Kills "double carrier name" on lock screen
+Not ideal, but not worth wasting more time on
+
+Change-Id: I06dd17989194590972e526de85dbacf74eff805e
+---
+ .../internal/telephony/uicc/IccRecords.java   | 25 +++++--------------
+ 1 file changed, 6 insertions(+), 19 deletions(-)
+
+diff --git a/src/java/com/android/internal/telephony/uicc/IccRecords.java b/src/java/com/android/internal/telephony/uicc/IccRecords.java
+index b33e899b9..220ed875d 100644
+--- a/src/java/com/android/internal/telephony/uicc/IccRecords.java
+++ b/src/java/com/android/internal/telephony/uicc/IccRecords.java
+@@ -717,35 +717,22 @@ public abstract class IccRecords extends Handler implements IccConstants {
+     }
+ 
+     /**
+-     * Return Service Provider Name stored in SIM (EF_SPN=0x6F46) or in RUIM (EF_RUIM_SPN=0x6F41).
+     * Return null, disabling Service Provider Name.
+      *
+-     * @return null if SIM is not yet ready or no RUIM entry
+     * @return null
+      */
+     public String getServiceProviderName() {
+-        if (mCarrierTestOverride.isInTestMode()) {
+-            String fakeSpn = mCarrierTestOverride.getFakeSpn();
+-            if (fakeSpn != null) {
+-                return fakeSpn;
+-            }
+-        }
+-        return mSpn;
+        return null;
+     }
+ 
+     /**
+-     * Return Service Provider Name stored in SIM (EF_SPN=0x6F46) or in RUIM (EF_RUIM_SPN=0x6F41) or
+-     * the brand override. The brand override has higher priority than the SPN from SIM.
+     * Return null, disabling Service Provider Name.
+      *
+-     * @return service provider name.
+     * @return null
+      */
+     @Nullable
+     public String getServiceProviderNameWithBrandOverride() {
+-        if (mParentApp != null && mParentApp.getUiccProfile() != null) {
+-            String brandOverride = mParentApp.getUiccProfile().getOperatorBrandOverride();
+-            if (!TextUtils.isEmpty(brandOverride)) {
+-                return brandOverride;
+-            }
+-        }
+-        return mSpn;
+        return null;
+     }
+ 
+     protected void setServiceProviderName(String spn) {
+-- 
+2.25.1
+
--- a/patches_platform_personal/lineage-sdk/0001-sdk-I-have-Trust-issues.patch
+++ b/patches_platform_personal/lineage-sdk/0001-sdk-I-have-Trust-issues.patch
@@ -0,0 +1,62 @@
+From d8a13aada0c4951deeda873543b8d6f33c402889 Mon Sep 17 00:00:00 2001
+From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
+Date: Thu, 23 Nov 2023 22:31:47 +0800
+Subject: [PATCH] sdk: I have Trust issues
+
+Spare me the onboard and warnings
+
+Change-Id: Id36104c8a9c386145e6d99a9d741947bddaa37be
+---
+ .../internal/TrustInterfaceService.java       | 29 -------------------
+ 1 file changed, 29 deletions(-)
+
+diff --git a/lineage/lib/main/java/org/lineageos/platform/internal/TrustInterfaceService.java b/lineage/lib/main/java/org/lineageos/platform/internal/TrustInterfaceService.java
+index 473bfe08..281c70ef 100644
+--- a/lineage/lib/main/java/org/lineageos/platform/internal/TrustInterfaceService.java
+++ b/lineage/lib/main/java/org/lineageos/platform/internal/TrustInterfaceService.java
+@@ -99,15 +99,6 @@ public class TrustInterfaceService extends LineageSystemService {
+             } catch (NoSuchElementException | RemoteException e) {
+                 // ignore, the hal is not available
+             }
+-
+-            // Onboard
+-            if (!hasOnboardedUser()) {
+-                postOnBoardingNotification();
+-                registerLocaleChangedReceiver();
+-                return;
+-            }
+-
+-            runTestInternal();
+         }
+     }
+ 
+@@ -351,26 +342,6 @@ public class TrustInterfaceService extends LineageSystemService {
+                 LineageSettings.System.TRUST_INTERFACE_HINTED, 0) == 1;
+     }
+ 
+-    private void registerLocaleChangedReceiver() {
+-        IntentFilter filter = new IntentFilter(Intent.ACTION_LOCALE_CHANGED);
+-        mContext.registerReceiver(mReceiver, filter);
+-    }
+-
+-    private final BroadcastReceiver mReceiver = new BroadcastReceiver() {
+-        @Override
+-        public void onReceive(Context context, Intent intent) {
+-            if (intent.getAction() == Intent.ACTION_LOCALE_CHANGED) {
+-                if (!hasOnboardedUser()) {
+-                    // When are not onboarded, we want to change the language of the notification
+-                    postOnBoardingNotification();
+-                } else {
+-                    // We don't care anymore about language changes
+-                    context.unregisterReceiver(this);
+-                }
+-            }
+-        }
+-    };
+-
+     /* Service */
+ 
+     private final IBinder mService = new ITrustInterface.Stub() {
+-- 
+2.34.1
+
--- a/patches_platform_personal/packages_apps_DeskClock/0001-Squashed-revert-of-LOS-widget-redesign.patch
+++ b/patches_platform_personal/packages_apps_DeskClock/0001-Squashed-revert-of-LOS-widget-redesign.patch
--- a/patches_platform_personal/packages_apps_DeskClock/0002-DeskClock-Remove-night-mode.patch
+++ b/patches_platform_personal/packages_apps_DeskClock/0002-DeskClock-Remove-night-mode.patch
@@ -0,0 +1,60 @@
+From 1b76c4a2eb60baceab9cd169cbded8f58b06b89e Mon Sep 17 00:00:00 2001
+From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
+Date: Sun, 5 Sep 2021 00:30:33 +0000
+Subject: [PATCH 2/4] DeskClock: Remove night mode
+
+Change-Id: I885f39027e78fcda397f1be59d17bc24bc66671a
+---
+ res/xml/screensaver_settings.xml                   | 7 -------
+ src/com/android/deskclock/Screensaver.java         | 5 ++---
+ src/com/android/deskclock/ScreensaverActivity.java | 2 +-
+ 3 files changed, 3 insertions(+), 11 deletions(-)
+
+diff --git a/res/xml/screensaver_settings.xml b/res/xml/screensaver_settings.xml
+index 7b8c9764a..908f76fef 100644
+--- a/res/xml/screensaver_settings.xml
+++ b/res/xml/screensaver_settings.xml
+@@ -26,11 +26,4 @@
+         android:title="@string/clock_style"
+         app:iconSpaceReserved="false" />
+ 
+-    <CheckBoxPreference
+-        android:defaultValue="true"
+-        android:key="screensaver_night_mode"
+-        android:summary="@string/night_mode_summary"
+-        android:title="@string/night_mode_title"
+-        app:iconSpaceReserved="false" />
+-
+ </PreferenceScreen>
+diff --git a/src/com/android/deskclock/Screensaver.java b/src/com/android/deskclock/Screensaver.java
+index ad92b1149..f6c03ed0a 100644
+--- a/src/com/android/deskclock/Screensaver.java
+++ b/src/com/android/deskclock/Screensaver.java
+@@ -136,9 +136,8 @@ public final class Screensaver extends DreamService {
+ 
+     private void setClockStyle() {
+         Utils.setScreensaverClockStyle(mDigitalClock, mAnalogClock);
+-        final boolean dimNightMode = DataModel.getDataModel().getScreensaverNightModeOn();
+-        Utils.dimClockView(dimNightMode, mMainClockView);
+-        setScreenBright(!dimNightMode);
+        Utils.dimClockView(false, mMainClockView);
+        setScreenBright(true);
+     }
+ 
+     /**
+diff --git a/src/com/android/deskclock/ScreensaverActivity.java b/src/com/android/deskclock/ScreensaverActivity.java
+index b30f82ee7..90235351f 100644
+--- a/src/com/android/deskclock/ScreensaverActivity.java
+++ b/src/com/android/deskclock/ScreensaverActivity.java
+@@ -101,7 +101,7 @@ public class ScreensaverActivity extends BaseActivity {
+         Utils.setClockIconTypeface(mMainClockView);
+         Utils.setTimeFormat((TextClock) digitalClock, false);
+         Utils.setClockStyle(digitalClock, analogClock);
+-        Utils.dimClockView(true, mMainClockView);
+        Utils.dimClockView(false, mMainClockView);
+         analogClock.enableSeconds(false);
+ 
+         mContentView.setSystemUiVisibility(View.SYSTEM_UI_FLAG_LOW_PROFILE
+-- 
+2.34.1
+
--- a/patches_platform_personal/packages_apps_DeskClock/0003-DeskClock-Adapt-digital-clocks-to-S-style.patch
+++ b/patches_platform_personal/packages_apps_DeskClock/0003-DeskClock-Adapt-digital-clocks-to-S-style.patch
@@ -0,0 +1,610 @@
+From 57684772d748887b4eca93d6fb5c35ee1dff72eb Mon Sep 17 00:00:00 2001
+From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
+Date: Wed, 19 Jan 2022 18:04:36 +0000
+Subject: [PATCH 3/4] DeskClock: Adapt digital clocks to S style
+
+Lollipop is so yesterday...
+Bring the layouts of various digital clocks (app, widget, daydream)
+in-line, and adjust their styles to match the custom keyguard on S
+
+Caveats/TODO:
+- Widget swallows all touch events, even when touching an empty area
+- World clocks in widgets are left untouched
+
+Change-Id: I10c6fa213c89ac2f6e342be13fdd6390f7f787b0
+---
+ res/layout/date_and_next_alarm_time.xml       | 53 +++++++------
+ res/layout/desk_clock_saver.xml               | 10 +--
+ res/layout/digital_widget.xml                 | 69 ++++++++---------
+ res/layout/digital_widget_sizer.xml           | 77 ++++++++-----------
+ res/layout/main_clock_frame.xml               | 36 +++------
+ res/values/dimens.xml                         | 12 ++-
+ res/values/styles.xml                         | 18 +++++
+ .../alarmclock/DigitalAppWidgetProvider.java  | 31 ++++----
+ src/com/android/deskclock/AlarmUtils.java     |  2 +-
+ src/com/android/deskclock/ClockFragment.java  |  3 -
+ src/com/android/deskclock/Utils.java          | 19 -----
+ 11 files changed, 155 insertions(+), 175 deletions(-)
+
+diff --git a/res/layout/date_and_next_alarm_time.xml b/res/layout/date_and_next_alarm_time.xml
+index 9a0cb9103..b29ffedcf 100644
+--- a/res/layout/date_and_next_alarm_time.xml
+++ b/res/layout/date_and_next_alarm_time.xml
+@@ -18,36 +18,41 @@
+     android:layout_width="wrap_content"
+     android:layout_height="wrap_content"
+     xmlns:tools="http://schemas.android.com/tools"
+-    android:layout_gravity="center_vertical"
+-    android:gravity="center">
+    android:gravity="center_vertical|start"
+    android:orientation="vertical">
+ 
+     <TextView
+         android:id="@+id/date"
+-        style="@style/body"
+        style="@style/sc_keyguard_row"
+         android:layout_width="wrap_content"
+         android:layout_height="wrap_content"
+-        android:textAllCaps="true"
+        android:paddingTop="@dimen/sc_keyguard_status_area_top_padding"
+        android:paddingStart="@dimen/sc_keyguard_row_date_start_padding"
+         tools:text="Sa., 01.01."/>
+ 
+-    <TextView
+-        android:id="@+id/nextAlarmIcon"
+-        style="@style/body"
+-        android:layout_width="wrap_content"
+-        android:layout_height="wrap_content"
+-        android:layout_gravity="center"
+-        android:layout_marginEnd="@dimen/alarm_icon_padding"
+-        android:layout_marginStart="@dimen/alarm_icon_padding"
+-        android:ellipsize="none"
+-        android:includeFontPadding="false"
+-        android:maxLines="1"
+-        android:text="@string/clock_emoji" />
+-
+-    <TextView
+-        android:id="@+id/nextAlarm"
+-        style="@style/body"
+-        android:layout_width="wrap_content"
+-        android:layout_height="wrap_content"
+-        android:textAllCaps="true"
+-        tools:text="Mo., 07:00"/>
+    <LinearLayout
+         android:layout_width="wrap_content"
+         android:layout_height="wrap_content"
+         android:paddingTop="@dimen/sc_keyguard_row_top_padding"
+         android:paddingStart="@dimen/sc_keyguard_row_alarm_start_padding">
+
+        <TextView
+            android:id="@+id/nextAlarmIcon"
+            style="@style/sc_keyguard_row"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layout_marginEnd="@dimen/alarm_icon_padding"
+            android:text="@string/clock_emoji"
+            android:textSize="@dimen/sc_keyguard_alarm_icon_size" />
+
+        <TextView
+            android:id="@+id/nextAlarm"
+            style="@style/sc_keyguard_row"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            tools:text="Mo., 07:00"/>
+
+    </LinearLayout>
+ 
+ </LinearLayout>
+diff --git a/res/layout/desk_clock_saver.xml b/res/layout/desk_clock_saver.xml
+index c147bf7cd..d24219dbb 100644
+--- a/res/layout/desk_clock_saver.xml
+++ b/res/layout/desk_clock_saver.xml
+@@ -42,16 +42,10 @@
+ 
+         <TextClock
+             android:id="@+id/digital_clock"
+-            style="@style/big_thin"
+            style="@style/sc_keyguard_clock"
+             android:layout_width="wrap_content"
+             android:layout_height="wrap_content"
+-            android:layout_gravity="center"
+-            android:layout_marginBottom="@dimen/bottom_text_spacing_digital"
+-            android:ellipsize="none"
+-            android:gravity="center"
+-            android:singleLine="true"
+-            android:textColor="@color/white"
+-            android:textSize="@dimen/main_clock_font_size" />
+            android:fontFamily="sans-serif-thin" />
+ 
+         <include layout="@layout/date_and_next_alarm_time" />
+ 
+diff --git a/res/layout/digital_widget.xml b/res/layout/digital_widget.xml
+index 5cf896a84..e376a5a7a 100644
+--- a/res/layout/digital_widget.xml
+++ b/res/layout/digital_widget.xml
+@@ -19,58 +19,53 @@
+     android:id="@+id/digital_widget"
+     android:layout_width="match_parent"
+     android:layout_height="match_parent"
+-    android:gravity="top|center_horizontal"
+    android:gravity="center"
+     android:orientation="vertical">
+ 
+-    <TextClock
+-        android:id="@+id/clock"
+-        style="@style/widget_big_thin"
+-        android:layout_width="wrap_content"
+-        android:layout_height="wrap_content"
+-        android:layout_gravity="center_horizontal|top"
+-        android:ellipsize="none"
+-        android:format12Hour="@string/lock_screen_12_hour_format"
+-        android:format24Hour="@string/lock_screen_24_hour_format"
+-        android:includeFontPadding="false"
+-        android:singleLine="true"
+-        android:textColor="@color/white" />
+-
+     <LinearLayout
+        android:id="@+id/digital_widget_actual"
+         android:layout_width="wrap_content"
+         android:layout_height="wrap_content"
+-        android:layout_gravity="center_horizontal|top">
+        android:gravity="center_vertical|start"
+        android:orientation="vertical">
+ 
+         <TextClock
+-            android:id="@+id/date"
+-            style="@style/widget_label"
+            android:id="@+id/clock"
+            style="@style/sc_keyguard_clock"
+             android:layout_width="wrap_content"
+             android:layout_height="wrap_content"
+-            android:layout_gravity="center"
+-            android:ellipsize="none"
+-            android:includeFontPadding="false"
+-            android:singleLine="true"
+-            android:textAllCaps="true"
+-            android:textColor="@color/white" />
+            android:format12Hour="@string/lock_screen_12_hour_format"
+            android:format24Hour="@string/lock_screen_24_hour_format" />
+ 
+-        <ImageView
+-            android:id="@+id/nextAlarmIcon"
+        <TextClock
+            android:id="@+id/date"
+            style="@style/sc_keyguard_row"
+             android:layout_width="wrap_content"
+             android:layout_height="wrap_content"
+-            android:layout_gravity="center"
+-            android:contentDescription="@null"
+-            android:scaleType="center" />
+            android:paddingTop="@dimen/sc_keyguard_status_area_top_padding"
+            android:paddingStart="@dimen/sc_keyguard_row_date_start_padding" />
+ 
+-        <TextView
+-            android:id="@+id/nextAlarm"
+-            style="@style/widget_label"
+        <LinearLayout
+             android:layout_width="wrap_content"
+             android:layout_height="wrap_content"
+-            android:layout_gravity="center"
+-            android:ellipsize="none"
+-            android:includeFontPadding="false"
+-            android:singleLine="true"
+-            android:textAllCaps="true"
+-            android:textColor="@color/white" />
+            android:paddingTop="@dimen/sc_keyguard_row_top_padding"
+            android:paddingStart="@dimen/sc_keyguard_row_alarm_start_padding">
+
+            <ImageView
+                android:id="@+id/nextAlarmIcon"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:contentDescription="@null"
+                android:scaleType="center" />
+
+            <TextView
+                android:id="@+id/nextAlarm"
+                style="@style/sc_keyguard_row"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content" />
+
+        </LinearLayout>
+ 
+     </LinearLayout>
+ 
+diff --git a/res/layout/digital_widget_sizer.xml b/res/layout/digital_widget_sizer.xml
+index f524cf536..b9a28c79f 100644
+--- a/res/layout/digital_widget_sizer.xml
+++ b/res/layout/digital_widget_sizer.xml
+@@ -15,64 +15,55 @@
+ -->
+ <LinearLayout
+     xmlns:android="http://schemas.android.com/apk/res/android"
+-    android:layout_width="wrap_content"
+-    android:layout_height="wrap_content"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:gravity="center"
+     android:orientation="vertical">
+ 
+-    <TextClock
+-        android:id="@+id/clock"
+-        style="@style/widget_big_thin"
+-        android:layout_width="wrap_content"
+-        android:layout_height="wrap_content"
+-        android:layout_gravity="center_horizontal|top"
+-        android:includeFontPadding="false"
+-        android:ellipsize="none"
+-        android:format12Hour="@string/lock_screen_12_hour_format"
+-        android:format24Hour="@string/lock_screen_24_hour_format"
+-        android:singleLine="true"
+-        android:textColor="@color/white" />
+-
+     <LinearLayout
+         android:layout_width="wrap_content"
+         android:layout_height="wrap_content"
+-        android:layout_gravity="center_horizontal|top">
+        android:gravity="center_vertical|start"
+        android:orientation="vertical">
+ 
+         <TextClock
+-            android:id="@+id/date"
+-            style="@style/widget_label"
+            android:id="@+id/clock"
+            style="@style/sc_keyguard_clock"
+             android:layout_width="wrap_content"
+             android:layout_height="wrap_content"
+-            android:layout_gravity="center"
+-            android:includeFontPadding="false"
+-            android:ellipsize="none"
+-            android:singleLine="true"
+-            android:textAllCaps="true"
+-            android:textColor="@color/white" />
+            android:format12Hour="@string/lock_screen_12_hour_format"
+            android:format24Hour="@string/lock_screen_24_hour_format" />
+ 
+-        <!-- This view is drawn to a Bitmap and sent to the widget as an icon. -->
+-        <TextView
+-            android:id="@+id/nextAlarmIcon"
+-            style="@style/widget_label"
+        <TextClock
+            android:id="@+id/date"
+            style="@style/sc_keyguard_row"
+             android:layout_width="wrap_content"
+             android:layout_height="wrap_content"
+-            android:layout_gravity="center"
+-            android:includeFontPadding="false"
+-            android:ellipsize="none"
+-            android:singleLine="true"
+-            android:text="@string/clock_emoji"
+-            android:textColor="@color/white" />
+            android:paddingTop="@dimen/sc_keyguard_status_area_top_padding"
+            android:paddingStart="@dimen/sc_keyguard_row_date_start_padding" />
+ 
+-        <TextView
+-            android:id="@+id/nextAlarm"
+-            style="@style/widget_label"
+        <LinearLayout
+             android:layout_width="wrap_content"
+             android:layout_height="wrap_content"
+-            android:layout_gravity="center"
+-            android:includeFontPadding="false"
+-            android:ellipsize="none"
+-            android:singleLine="true"
+-            android:textAllCaps="true"
+-            android:textColor="@color/white" />
+            android:paddingTop="@dimen/sc_keyguard_row_top_padding"
+            android:paddingStart="@dimen/sc_keyguard_row_alarm_start_padding">
+
+            <!-- This view is drawn to a Bitmap and sent to the widget as an icon. -->
+            <TextView
+                android:id="@+id/nextAlarmIcon"
+                style="@style/sc_keyguard_row"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:text="@string/clock_emoji" />
+
+            <TextView
+                android:id="@+id/nextAlarm"
+                style="@style/sc_keyguard_row"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content" />
+
+        </LinearLayout>
+ 
+     </LinearLayout>
+ 
+diff --git a/res/layout/main_clock_frame.xml b/res/layout/main_clock_frame.xml
+index c26f61dbd..c2e84eaa3 100644
+--- a/res/layout/main_clock_frame.xml
+++ b/res/layout/main_clock_frame.xml
+@@ -26,44 +26,28 @@
+     android:layout_marginEnd="24dp"
+     android:orientation="vertical">
+ 
+-    <androidx.constraintlayout.widget.ConstraintLayout
+-        android:layout_width="match_parent"
+    <LinearLayout
+        android:layout_width="wrap_content"
+         android:layout_height="wrap_content"
+-        android:layout_gravity="start">
+        android:gravity="center_vertical|start"
+        android:orientation="vertical">
+ 
+         <com.android.deskclock.AnalogClock
+             android:id="@+id/analog_clock"
+             android:layout_width="wrap_content"
+             android:layout_height="wrap_content"
+-            android:layout_marginTop="@dimen/circle_margin_top"
+-            app:layout_constraintBottom_toBottomOf="parent"
+-            app:layout_constraintDimensionRatio="1:1"
+-            app:layout_constraintEnd_toEndOf="parent"
+-            app:layout_constraintStart_toStartOf="parent"
+-            app:layout_constraintTop_toTopOf="parent"
+-            app:layout_constraintWidth_percent="@dimen/analog_clock_width_percent"/>
+            android:layout_marginTop="@dimen/circle_margin_top"/>
+ 
+         <com.android.deskclock.widget.AutoSizingTextClock
+             android:id="@+id/digital_clock"
+-            style="@style/display_time"
+-            android:layout_width="match_parent"
+            style="@style/sc_keyguard_clock"
+            android:layout_width="wrap_content"
+             android:layout_height="wrap_content"
+-            android:ellipsize="none"
+-            android:includeFontPadding="false"
+             android:paddingTop="@dimen/main_clock_digital_padding"
+-            android:singleLine="true"
+-            android:textSize="@dimen/main_clock_digital_font_size"
+-            app:layout_constraintBottom_toBottomOf="parent"
+-            app:layout_constraintStart_toStartOf="parent"
+-            app:layout_constraintTop_toTopOf="parent"
+             tools:text="01:23"/>
+ 
+-    </androidx.constraintlayout.widget.ConstraintLayout>
+        <include layout="@layout/date_and_next_alarm_time" />
+
+    </LinearLayout>
+ 
+-    <include
+-        layout="@layout/date_and_next_alarm_time"
+-        android:id="@+id/date_and_next_alarm_time"
+-        android:layout_width="wrap_content"
+-        android:layout_height="wrap_content"
+-        android:layout_gravity="start"/>
+ </LinearLayout>
+diff --git a/res/values/dimens.xml b/res/values/dimens.xml
+index c136fe25a..58a9fedc0 100644
+--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
+@@ -62,7 +62,7 @@
+     <dimen name="body_font_padding">4dp</dimen>
+ 
+     <dimen name="alarm_label_size">14sp</dimen>
+-    <dimen name="alarm_icon_padding">6dp</dimen>
+    <dimen name="alarm_icon_padding">7dp</dimen>
+ 
+     <dimen name="backspace_icon_size">24dp</dimen>
+     <dimen name="no_alarms_size">90dp</dimen>
+@@ -144,4 +144,14 @@
+     <dimen name="settings_padding">4dp</dimen>
+ 
+     <dimen name="analog_clock_width_percent">0.5</dimen>
+
+    <!-- Keyguard dimens, taken from S fwb -->
+    <dimen name="sc_keyguard_clock_text_size">86dp</dimen>
+    <dimen name="sc_keyguard_row_text_size">16dp</dimen>
+    <dimen name="sc_keyguard_alarm_icon_size">21dp</dimen>
+    <!-- Padding correction values, measured from S fwb -->
+    <dimen name="sc_keyguard_status_area_top_padding">9dp</dimen>
+    <dimen name="sc_keyguard_row_top_padding">11dp</dimen>
+    <dimen name="sc_keyguard_row_date_start_padding">6dp</dimen>
+    <dimen name="sc_keyguard_row_alarm_start_padding">5.5dp</dimen>
+ </resources>
+diff --git a/res/values/styles.xml b/res/values/styles.xml
+index 8c6364344..159f24766 100644
+--- a/res/values/styles.xml
+++ b/res/values/styles.xml
+@@ -209,4 +209,22 @@
+         <item name="layout_constraintStart_toStartOf">parent</item>
+         <item name="layout_constraintTop_toBottomOf">@id/timer_setup_time</item>
+     </style>
+
+    <style name="sc_keyguard_clock">
+        <item name="android:fontFamily">sans-serif-light</item>
+        <item name="android:fontFeatureSettings">tnum</item>
+        <item name="android:textSize">@dimen/sc_keyguard_clock_text_size</item>
+        <item name="android:textColor">@color/white</item>
+        <item name="android:ellipsize">none</item>
+        <item name="android:includeFontPadding">false</item>
+        <item name="android:maxLines">1</item>
+    </style>
+
+    <style name="sc_keyguard_row">
+        <item name="android:textSize">@dimen/sc_keyguard_row_text_size</item>
+        <item name="android:textColor">@color/white</item>
+        <item name="android:ellipsize">none</item>
+        <item name="android:includeFontPadding">false</item>
+        <item name="android:maxLines">1</item>
+    </style>
+ </resources>
+diff --git a/src/com/android/alarmclock/DigitalAppWidgetProvider.java b/src/com/android/alarmclock/DigitalAppWidgetProvider.java
+index b54a500c5..fb1b30aa7 100644
+--- a/src/com/android/alarmclock/DigitalAppWidgetProvider.java
+++ b/src/com/android/alarmclock/DigitalAppWidgetProvider.java
+@@ -223,7 +223,7 @@ public class DigitalAppWidgetProvider extends AppWidgetProvider {
+         if (Utils.isWidgetClickable(wm, widgetId)) {
+             final Intent openApp = new Intent(context, DeskClock.class);
+             final PendingIntent pi = PendingIntent.getActivity(context, 0, openApp, FLAG_IMMUTABLE);
+-            rv.setOnClickPendingIntent(R.id.digital_widget, pi);
+            rv.setOnClickPendingIntent(R.id.digital_widget_actual, pi);
+         }
+ 
+         // Configure child views of the remote view.
+@@ -255,7 +255,7 @@ public class DigitalAppWidgetProvider extends AppWidgetProvider {
+         final int targetWidthPx = portrait ? minWidthPx : maxWidthPx;
+         final int targetHeightPx = portrait ? maxHeightPx : minHeightPx;
+         final int largestClockFontSizePx =
+-                resources.getDimensionPixelSize(R.dimen.widget_max_clock_font_size);
+                resources.getDimensionPixelSize(R.dimen.sc_keyguard_clock_text_size);
+ 
+         // Create a size template that describes the widget bounds.
+         final Sizes template = new Sizes(targetWidthPx, targetHeightPx, largestClockFontSizePx);
+@@ -327,13 +327,13 @@ public class DigitalAppWidgetProvider extends AppWidgetProvider {
+         }
+ 
+         // Measure the widget at the largest possible size.
+-        Sizes high = measure(template, template.getLargestClockFontSizePx(), sizer);
+        Sizes high = measure(context, template, template.getLargestClockFontSizePx(), sizer);
+         if (!high.hasViolations()) {
+             return high;
+         }
+ 
+         // Measure the widget at the smallest possible size.
+-        Sizes low = measure(template, template.getSmallestClockFontSizePx(), sizer);
+        Sizes low = measure(context, template, template.getSmallestClockFontSizePx(), sizer);
+         if (low.hasViolations()) {
+             return low;
+         }
+@@ -345,7 +345,7 @@ public class DigitalAppWidgetProvider extends AppWidgetProvider {
+                 return low;
+             }
+ 
+-            final Sizes midSize = measure(template, midFontSize, sizer);
+            final Sizes midSize = measure(context, template, midFontSize, sizer);
+             if (midSize.hasViolations()) {
+                 high = midSize;
+             } else {
+@@ -411,7 +411,7 @@ public class DigitalAppWidgetProvider extends AppWidgetProvider {
+      * the offscreen {@code sizer} view. Measure the {@code sizer} view and return the resulting
+      * size measurements.
+      */
+-    private static Sizes measure(Sizes template, int clockFontSize, View sizer) {
+    private static Sizes measure(Context context, Sizes template, int clockFontSize, View sizer) {
+         // Create a copy of the given template sizes.
+         final Sizes measuredSizes = template.newSize();
+ 
+@@ -422,13 +422,13 @@ public class DigitalAppWidgetProvider extends AppWidgetProvider {
+         final TextView nextAlarmIcon = sizer.findViewById(R.id.nextAlarmIcon);
+ 
+         // Adjust the font sizes.
+-        measuredSizes.setClockFontSizePx(clockFontSize);
+        measuredSizes.setClockFontSizePx(context, clockFontSize);
+         clock.setText(getLongestTimeString(clock));
+         clock.setTextSize(COMPLEX_UNIT_PX, measuredSizes.mClockFontSizePx);
+         date.setTextSize(COMPLEX_UNIT_PX, measuredSizes.mFontSizePx);
+         nextAlarm.setTextSize(COMPLEX_UNIT_PX, measuredSizes.mFontSizePx);
+         nextAlarmIcon.setTextSize(COMPLEX_UNIT_PX, measuredSizes.mIconFontSizePx);
+-        nextAlarmIcon.setPadding(measuredSizes.mIconPaddingPx, 0, measuredSizes.mIconPaddingPx, 0);
+        nextAlarmIcon.setPadding(0, 0, measuredSizes.mIconPaddingPx, 0);
+ 
+         // Measure and layout the sizer.
+         final int widthSize = View.MeasureSpec.getSize(measuredSizes.mTargetWidthPx);
+@@ -509,12 +509,17 @@ public class DigitalAppWidgetProvider extends AppWidgetProvider {
+         private int getLargestClockFontSizePx() { return mLargestClockFontSizePx; }
+         private int getSmallestClockFontSizePx() { return mSmallestClockFontSizePx; }
+         private int getClockFontSizePx() { return mClockFontSizePx; }
+-        private void setClockFontSizePx(int clockFontSizePx) {
+        private void setClockFontSizePx(Context context, int clockFontSizePx) {
+            final Resources resources = context.getResources();
+            int keyguardClockTextSizePx = resources.getDimensionPixelSize(R.dimen.sc_keyguard_clock_text_size);
+            int keyguardRowTextSizePx = resources.getDimensionPixelSize(R.dimen.sc_keyguard_row_text_size);
+            int keyguardAlarmIconSizePx = resources.getDimensionPixelSize(R.dimen.sc_keyguard_alarm_icon_size);
+            int alarmIconPaddingPx = resources.getDimensionPixelSize(R.dimen.alarm_icon_padding);
+             mClockFontSizePx = clockFontSizePx;
+-            mFontSizePx = max(1, round(clockFontSizePx / 7.5f));
+-            mIconFontSizePx = (int) (mFontSizePx * 1.4f);
+-            mIconPaddingPx = mFontSizePx / 3;
+-        }
+            mFontSizePx = max(1, round(clockFontSizePx / (float) keyguardClockTextSizePx * (float) keyguardRowTextSizePx));
+            mIconFontSizePx = max(1, round(clockFontSizePx / (float) keyguardClockTextSizePx * (float) keyguardAlarmIconSizePx));
+            mIconPaddingPx = max(1, round(clockFontSizePx / (float) keyguardClockTextSizePx * (float) alarmIconPaddingPx));
+         }
+ 
+         /**
+          * @return the amount of widget height available to the world cities list
+diff --git a/src/com/android/deskclock/AlarmUtils.java b/src/com/android/deskclock/AlarmUtils.java
+index c3739bac8..5b931a46d 100644
+--- a/src/com/android/deskclock/AlarmUtils.java
+++ b/src/com/android/deskclock/AlarmUtils.java
+@@ -38,7 +38,7 @@ import java.util.Locale;
+ public class AlarmUtils {
+ 
+     public static String getFormattedTime(Context context, Calendar time) {
+-        final String skeleton = DateFormat.is24HourFormat(context) ? "EHm" : "Ehma";
+        final String skeleton = DateFormat.is24HourFormat(context) ? "Hm" : "hma";
+         final String pattern = DateFormat.getBestDateTimePattern(Locale.getDefault(), skeleton);
+         return (String) DateFormat.format(pattern, time);
+     }
+diff --git a/src/com/android/deskclock/ClockFragment.java b/src/com/android/deskclock/ClockFragment.java
+index bf53584e4..7a0e3ae0b 100644
+--- a/src/com/android/deskclock/ClockFragment.java
+++ b/src/com/android/deskclock/ClockFragment.java
+@@ -123,7 +123,6 @@ public final class ClockFragment extends DeskClockFragment {
+             Utils.updateDate(mDateFormat, mDateFormatForAccessibility, mClockFrame);
+             Utils.setClockStyle(mDigitalClock, mAnalogClock);
+             Utils.setClockSecondsEnabled(mDigitalClock, mAnalogClock);
+-            Utils.updateDateGravity(mClockFrame);
+         }
+ 
+         // Schedule a runnable to update the date every quarter hour.
+@@ -151,7 +150,6 @@ public final class ClockFragment extends DeskClockFragment {
+         if (mDigitalClock != null && mAnalogClock != null) {
+             Utils.setClockStyle(mDigitalClock, mAnalogClock);
+             Utils.setClockSecondsEnabled(mDigitalClock, mAnalogClock);
+-            Utils.updateDateGravity(mClockFrame);
+         }
+ 
+         final View view = getView();
+@@ -493,7 +491,6 @@ public final class ClockFragment extends DeskClockFragment {
+                 Utils.updateDate(dateFormat, dateFormatForAccessibility, itemView);
+                 Utils.setClockStyle(mDigitalClock, mAnalogClock);
+                 Utils.setClockSecondsEnabled(mDigitalClock, mAnalogClock);
+-                Utils.updateDateGravity(itemView);
+             }
+         }
+     }
+diff --git a/src/com/android/deskclock/Utils.java b/src/com/android/deskclock/Utils.java
+index 4eea6beba..4a5ad5a0a 100644
+--- a/src/com/android/deskclock/Utils.java
+++ b/src/com/android/deskclock/Utils.java
+@@ -52,9 +52,7 @@ import android.text.style.RelativeSizeSpan;
+ import android.text.style.StyleSpan;
+ import android.text.style.TypefaceSpan;
+ import android.util.ArraySet;
+-import android.view.Gravity;
+ import android.view.View;
+-import android.widget.LinearLayout;
+ import android.widget.TextClock;
+ import android.widget.TextView;
+ 
+@@ -302,23 +300,6 @@ public class Utils {
+         dateDisplay.setContentDescription(new SimpleDateFormat(descriptionPattern, l).format(now));
+     }
+ 
+-    public static void updateDateGravity(View clockFrame) {
+-        View dateAndNextAlarm = clockFrame.findViewById(R.id.date_and_next_alarm_time);
+-        LinearLayout.LayoutParams lp =
+-                (LinearLayout.LayoutParams)dateAndNextAlarm.getLayoutParams();
+-
+-        final DataModel.ClockStyle clockStyle = DataModel.getDataModel().getClockStyle();
+-        switch (clockStyle) {
+-            case ANALOG:
+-                lp.gravity = Gravity.CENTER;
+-                break;
+-            case DIGITAL:
+-                lp.gravity = Gravity.START;
+-                break;
+-        }
+-        dateAndNextAlarm.setLayoutParams(lp);
+-    }
+-
+     /***
+      * Formats the time in the TextClock according to the Locale with a special
+      * formatting treatment for the am/pm label.
+-- 
+2.34.1
+
--- a/patches_platform_personal/packages_apps_DeskClock/0004-DeskClock-Wallpaper-based-text-coloring-for-digital-.patch
+++ b/patches_platform_personal/packages_apps_DeskClock/0004-DeskClock-Wallpaper-based-text-coloring-for-digital-.patch
@@ -0,0 +1,118 @@
+From 13cd5543d2d0a253c86fa84030bb3dfb636ceea1 Mon Sep 17 00:00:00 2001
+From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
+Date: Thu, 20 Jan 2022 04:42:03 +0000
+Subject: [PATCH 4/4] DeskClock: Wallpaper-based text coloring for digital
+ clock widget
+
+RemoteViews is such a restrictive PITA
+
+Change-Id: Ie22c4980526575f73ebb4e56780d4c2193cc45d3
+---
+ .../alarmclock/DigitalAppWidgetProvider.java  | 57 +++++++++++++++++++
+ 1 file changed, 57 insertions(+)
+
+diff --git a/src/com/android/alarmclock/DigitalAppWidgetProvider.java b/src/com/android/alarmclock/DigitalAppWidgetProvider.java
+index fb1b30aa7..c04528240 100644
+--- a/src/com/android/alarmclock/DigitalAppWidgetProvider.java
+++ b/src/com/android/alarmclock/DigitalAppWidgetProvider.java
+@@ -38,6 +38,8 @@ import static java.lang.Math.round;
+ import android.annotation.SuppressLint;
+ import android.app.AlarmManager;
+ import android.app.PendingIntent;
+import android.app.WallpaperColors;
+import android.app.WallpaperManager;
+ import android.appwidget.AppWidgetManager;
+ import android.appwidget.AppWidgetProvider;
+ import android.content.BroadcastReceiver;
+@@ -111,12 +113,40 @@ public class DigitalAppWidgetProvider extends AppWidgetProvider {
+     /** Intent used to deliver the {@link #ACTION_ON_DAY_CHANGE} callback. */
+     private static final Intent DAY_CHANGE_INTENT = new Intent(ACTION_ON_DAY_CHANGE);
+ 
+    private static WallpaperManager mWallpaperManager;
+    private static boolean mDarkText;
+
+    private static void relayoutAllWidgets(Context context) {
+        final AppWidgetManager wm = AppWidgetManager.getInstance(context);
+        final ComponentName provider = new ComponentName(context, DigitalAppWidgetProvider.class);
+        final int[] widgetIds = wm.getAppWidgetIds(provider);
+        for (int widgetId : widgetIds) {
+            relayoutWidget(context, wm, widgetId, wm.getAppWidgetOptions(widgetId));
+        }
+    }
+
+    private static void addOnColorsChangedListener(Context context) {
+        mWallpaperManager.addOnColorsChangedListener(new WallpaperManager.OnColorsChangedListener() {
+            @Override
+            public void onColorsChanged(WallpaperColors colors, int which) {
+                relayoutAllWidgets(context);
+            }
+        }, null);
+    }
+
+     @Override
+     public void onEnabled(Context context) {
+         super.onEnabled(context);
+ 
+         // Schedule the day-change callback if necessary.
+         updateDayChangeCallback(context);
+
+        // Listen for wallpaper color changes
+        mWallpaperManager = WallpaperManager.getInstance(context);
+        addOnColorsChangedListener(context);
+
+        // Force a relayout to pick up initial colors
+        relayoutAllWidgets(context);
+     }
+ 
+     @Override
+@@ -215,6 +245,19 @@ public class DigitalAppWidgetProvider extends AppWidgetProvider {
+      */
+     private static RemoteViews relayoutWidget(Context context, AppWidgetManager wm, int widgetId,
+             Bundle options, boolean portrait) {
+        // Determine text colors.
+        if (mWallpaperManager == null) {
+            mWallpaperManager = WallpaperManager.getInstance(context);
+            addOnColorsChangedListener(context);
+        }
+        WallpaperColors wallpaperColors = mWallpaperManager.getWallpaperColors(WallpaperManager.FLAG_SYSTEM);
+        // Live wallpapers might not implement the WallpaperColors API.
+        if (wallpaperColors == null) {
+            mDarkText = false;
+        } else {
+            mDarkText = (wallpaperColors.getColorHints() & WallpaperColors.HINT_SUPPORTS_DARK_TEXT) != 0;
+        }
+
+         // Create a remote view for the digital clock.
+         final String packageName = context.getPackageName();
+         final RemoteViews rv = new RemoteViews(packageName, R.layout.digital_widget);
+@@ -272,6 +315,17 @@ public class DigitalAppWidgetProvider extends AppWidgetProvider {
+         rv.setTextViewTextSize(R.id.nextAlarm, COMPLEX_UNIT_PX, sizes.mFontSizePx);
+         rv.setTextViewTextSize(R.id.clock, COMPLEX_UNIT_PX, sizes.mClockFontSizePx);
+ 
+        // Apply the text color to the remote views.
+        if (mDarkText) {
+            rv.setTextColor(R.id.clock, resources.getColor(R.color.black));
+            rv.setTextColor(R.id.date, resources.getColor(R.color.black));
+            rv.setTextColor(R.id.nextAlarm, resources.getColor(R.color.black));
+        } else {
+            rv.setTextColor(R.id.clock, resources.getColor(R.color.white));
+            rv.setTextColor(R.id.date, resources.getColor(R.color.white));
+            rv.setTextColor(R.id.nextAlarm, resources.getColor(R.color.white));
+        }
+
+         final int smallestWorldCityListSizePx =
+                 resources.getDimensionPixelSize(R.dimen.widget_min_world_city_list_size);
+         if (sizes.getListHeight() <= smallestWorldCityListSizePx) {
+@@ -430,6 +484,9 @@ public class DigitalAppWidgetProvider extends AppWidgetProvider {
+         nextAlarmIcon.setTextSize(COMPLEX_UNIT_PX, measuredSizes.mIconFontSizePx);
+         nextAlarmIcon.setPadding(0, 0, measuredSizes.mIconPaddingPx, 0);
+ 
+        // Adjust the alarm icon text color before generating its bitmap.
+        nextAlarmIcon.setTextColor(context.getResources().getColor(mDarkText ? R.color.black : R.color.white));
+
+         // Measure and layout the sizer.
+         final int widthSize = View.MeasureSpec.getSize(measuredSizes.mTargetWidthPx);
+         final int heightSize = View.MeasureSpec.getSize(measuredSizes.mTargetHeightPx);
+-- 
+2.34.1
+
--- a/patches_platform_personal/packages_apps_Nfc/0001-NfcService-Disable-NFC-by-default.patch
+++ b/patches_platform_personal/packages_apps_Nfc/0001-NfcService-Disable-NFC-by-default.patch
@@ -0,0 +1,26 @@
+From 61630e83287a097f512b03203722f7385100bd5f Mon Sep 17 00:00:00 2001
+From: Daniel Micay <danielmicay@gmail.com>
+Date: Sat, 6 Jun 2015 10:40:51 -0400
+Subject: [PATCH] NfcService: Disable NFC by default
+
+Change-Id: Ibe6abec7fa84c6fde476b8a083f57a3f61b50909
+---
+ src/com/android/nfc/NfcService.java | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/com/android/nfc/NfcService.java b/src/com/android/nfc/NfcService.java
+index f22dc9da..28aedc59 100644
+--- a/src/com/android/nfc/NfcService.java
+++ b/src/com/android/nfc/NfcService.java
+@@ -141,7 +141,7 @@ public class NfcService implements DeviceHostListener, ForegroundUtils.Callback
+     public static final String PREF_TAG_APP_LIST = "TagIntentAppPreferenceListPrefs";
+ 
+     static final String PREF_NFC_ON = "nfc_on";
+-    static final boolean NFC_ON_DEFAULT = true;
+    static final boolean NFC_ON_DEFAULT = false;
+     static final String PREF_SECURE_NFC_ON = "secure_nfc_on";
+     static final boolean SECURE_NFC_ON_DEFAULT = false;
+     static final String PREF_FIRST_BOOT = "first_boot";
+-- 
+2.34.1
+
--- a/patches_platform_personal/packages_apps_Settings/0001-Keyguard-Default-to-small-clock-2-3.patch
+++ b/patches_platform_personal/packages_apps_Settings/0001-Keyguard-Default-to-small-clock-2-3.patch
@@ -0,0 +1,26 @@
+From 4dad46e31da483f2b0818e81791cac4a4a674385 Mon Sep 17 00:00:00 2001
+From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
+Date: Mon, 20 Nov 2023 10:42:58 +0800
+Subject: [PATCH] Keyguard: Default to small clock (2/3)
+
+Change-Id: Ieb39c323e99fd2795f683a8a2930bb3a27212a6d
+---
+ .../settings/display/LockscreenClockPreferenceController.java   | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/com/android/settings/display/LockscreenClockPreferenceController.java b/src/com/android/settings/display/LockscreenClockPreferenceController.java
+index 70ae55eaf9..fd6e0fe248 100644
+--- a/src/com/android/settings/display/LockscreenClockPreferenceController.java
+++ b/src/com/android/settings/display/LockscreenClockPreferenceController.java
+@@ -37,7 +37,7 @@ public class LockscreenClockPreferenceController extends TogglePreferenceControl
+ 
+     @Override
+     public boolean isChecked() {
+-        return Settings.Secure.getInt(mContext.getContentResolver(), SETTING_KEY, 1) != 0;
+        return Settings.Secure.getInt(mContext.getContentResolver(), SETTING_KEY, 0) != 0;
+     }
+ 
+     @Override
+-- 
+2.34.1
+
--- a/patches_platform_personal/packages_apps_SetupWizard/0001-SetupWizard-Least-Action-s-Principle.patch
+++ b/patches_platform_personal/packages_apps_SetupWizard/0001-SetupWizard-Least-Action-s-Principle.patch
@@ -0,0 +1,163 @@
+From 7f78c8c7ea3b7aad4c234338263ed88eef8485e7 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
+
+Change-Id: I892634b8ffc7beafa5a223de0afdc64276efd2f5
+---
+ res/raw/lineage_wizard_script.xml             | 43 +------------------
+ .../lineage_wizard_script_managed_profile.xml | 15 +------
+ res/raw/lineage_wizard_script_user.xml        | 27 +-----------
+ 3 files changed, 5 insertions(+), 80 deletions(-)
+
+diff --git a/res/raw/lineage_wizard_script.xml b/res/raw/lineage_wizard_script.xml
+index 616f6ed..e7c9b7f 100644
+--- a/res/raw/lineage_wizard_script.xml
+++ b/res/raw/lineage_wizard_script.xml
+@@ -18,21 +18,13 @@
+ -->
+ 
+ <WizardScript xmlns:wizard="http://schemas.android.com/apk/res/com.google.android.setupwizard"
+-    wizard:firstAction="bluetooth_setup">
+-
+-    <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_BLUETOOTH_SETUP;end" id="bluetooth_setup">
+-        <result wizard:action="welcome" />
+-    </WizardAction>
+    wizard:firstAction="welcome">
+ 
+     <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_WELCOME;end" id="welcome">
+         <result wizard:action="locale" />
+     </WizardAction>
+ 
+     <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_LOCALE;end" id="locale">
+-        <result wizard:action="sim_missing" />
+-    </WizardAction>
+-
+-    <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_SIM_MISSING;end" id="sim_missing">
+         <result wizard:action="network_setup" />
+     </WizardAction>
+ 
+@@ -41,44 +33,13 @@
+     </WizardAction>
+ 
+     <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_DATETIME;end" id="datetime">
+-        <result wizard:action="location_settings" />
+-    </WizardAction>
+-
+-    <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_LOCATION_SETTINGS;end" id="location_settings">
+-        <result wizard:action="device_specific" />
+-    </WizardAction>
+-
+-    <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.DEVICE_SPECIFIC;end" id="device_specific">
+-        <result wizard:action="recovery_update" />
+-    </WizardAction>
+-
+-    <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_RECOVERY_UPDATE;end" id="recovery_update">
+-        <result wizard:action="lineage_settings" />
+-    </WizardAction>
+-
+-    <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="restore" />
+-    </WizardAction>
+-
+-    <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_RESTORE_BACKUP;end" id="restore">
+-        <result wizard:action="navigation_settings" />
+-    </WizardAction>
+-
+-    <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.NAVIGATION_SETTINGS;end" id="navigation_settings">
+         <result wizard:action="finish" />
+     </WizardAction>
+ 
+     <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_SETUP_COMPLETE;end" id="finish">
+         <result wizard:action="exit" />
+     </WizardAction>
+
+     <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.EXIT;end" id="exit" />
+ 
+ </WizardScript>
+diff --git a/res/raw/lineage_wizard_script_managed_profile.xml b/res/raw/lineage_wizard_script_managed_profile.xml
+index 00a66e3..4f8b867 100644
+--- a/res/raw/lineage_wizard_script_managed_profile.xml
+++ b/res/raw/lineage_wizard_script_managed_profile.xml
+@@ -2,7 +2,6 @@
+ 
+ <!--
+      Copyright (C) 2016 The CyanogenMod Project
+-     Copyright (C) 2021 The Calyx Institute
+ 
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+@@ -18,19 +17,7 @@
+ -->
+ 
+ <WizardScript xmlns:wizard="http://schemas.android.com/apk/res/com.google.android.setupwizard"
+-              wizard:firstAction="welcome">
+-
+-    <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_WELCOME;end" id="welcome">
+-        <result wizard:action="location_settings" />
+-    </WizardAction>
+-
+-    <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_LOCATION_SETTINGS;end" id="location_settings">
+-        <result wizard:action="restore" />
+-    </WizardAction>
+-
+-    <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_RESTORE_BACKUP;end" id="restore">
+-        <result wizard:action="finish" />
+-    </WizardAction>
+              wizard:firstAction="finish">
+ 
+     <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_SETUP_COMPLETE;end" id="finish">
+         <result wizard:action="exit" />
+diff --git a/res/raw/lineage_wizard_script_user.xml b/res/raw/lineage_wizard_script_user.xml
+index d480901..4f8b867 100644
+--- a/res/raw/lineage_wizard_script_user.xml
+++ b/res/raw/lineage_wizard_script_user.xml
+@@ -17,35 +17,12 @@
+ -->
+ 
+ <WizardScript xmlns:wizard="http://schemas.android.com/apk/res/com.google.android.setupwizard"
+-              wizard:firstAction="welcome">
+-
+-    <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_WELCOME;end" id="welcome">
+-        <result wizard:action="location_settings" />
+-    </WizardAction>
+-
+-    <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_LOCATION_SETTINGS;end" id="location_settings">
+-        <result wizard:action="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="restore" />
+-    </WizardAction>
+-
+-    <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_RESTORE_BACKUP;end" id="restore">
+-        <result wizard:action="navigation_settings" />
+-    </WizardAction>
+-
+-    <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.NAVIGATION_SETTINGS;end" id="navigation_settings">
+-        <result wizard:action="finish" />
+-    </WizardAction>
+              wizard:firstAction="finish">
+ 
+     <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_SETUP_COMPLETE;end" id="finish">
+         <result wizard:action="exit" />
+     </WizardAction>
+
+     <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.EXIT;end" id="exit" />
+ 
+ </WizardScript>
+-- 
+2.34.1
+
--- a/patches_platform_personal/packages_apps_ThemePicker/0001-Keyguard-Default-to-small-clock-3-3.patch
+++ b/patches_platform_personal/packages_apps_ThemePicker/0001-Keyguard-Default-to-small-clock-3-3.patch
@@ -0,0 +1,27 @@
+From f80b0972ed320771192feddfe0b0da27041e19f5 Mon Sep 17 00:00:00 2001
+From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
+Date: Mon, 20 Nov 2023 10:43:38 +0800
+Subject: [PATCH] Keyguard: Default to small clock (3/3)
+
+Change-Id: I7c11ec93df2135d19afbe30cd0c1c017c3901d4f
+---
+ .../picker/clock/data/repository/ClockPickerRepositoryImpl.kt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/com/android/customization/picker/clock/data/repository/ClockPickerRepositoryImpl.kt b/src/com/android/customization/picker/clock/data/repository/ClockPickerRepositoryImpl.kt
+index 370668ef..ea7a5582 100644
+--- a/src/com/android/customization/picker/clock/data/repository/ClockPickerRepositoryImpl.kt
+++ b/src/com/android/customization/picker/clock/data/repository/ClockPickerRepositoryImpl.kt
+@@ -194,7 +194,7 @@ class ClockPickerRepositoryImpl(
+         // The color tone to apply to the selected color
+         private const val KEY_METADATA_COLOR_TONE_PROGRESS = "metadataColorToneProgress"
+ 
+-        // The default clock size is 1, which means dynamic
+-        private const val DEFAULT_CLOCK_SIZE = 1
+        // The default clock size is 0, which means small
+        private const val DEFAULT_CLOCK_SIZE = 0
+     }
+ }
+-- 
+2.34.1
+
--- a/patches_platform_personal/packages_apps_Trebuchet/0001-Trebuchet-Make-overview-scrim-transparent-again.patch
+++ b/patches_platform_personal/packages_apps_Trebuchet/0001-Trebuchet-Make-overview-scrim-transparent-again.patch
@@ -0,0 +1,194 @@
+From 13b848a8b08c6e99086ab3af9e526c698920ebaa 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
+
+Also revert texts/buttons to workspace color
+
+Change-Id: I78c84865eb06b8e59c9c271cd2e267ae4cd7cc08
+---
+ quickstep/res/values/styles.xml               |  2 +-
+ .../android/quickstep/views/RecentsView.java  |  2 +-
+ res/color-v31/overview_scrim.xml              | 18 -----------------
+ res/color-v31/overview_scrim_dark.xml         | 18 -----------------
+ res/color-v33/overview_scrim.xml              | 20 -------------------
+ res/color-v33/overview_scrim_dark.xml         | 20 -------------------
+ res/color/overview_button.xml                 |  6 +++---
+ res/color/overview_scrim.xml                  |  2 +-
+ res/color/overview_scrim_dark.xml             |  2 +-
+ 9 files changed, 7 insertions(+), 83 deletions(-)
+ delete mode 100644 res/color-v31/overview_scrim.xml
+ delete mode 100644 res/color-v31/overview_scrim_dark.xml
+ delete mode 100644 res/color-v33/overview_scrim.xml
+ delete mode 100644 res/color-v33/overview_scrim_dark.xml
+
+diff --git a/quickstep/res/values/styles.xml b/quickstep/res/values/styles.xml
+index fc0370421d..61ca1e05d6 100644
+--- a/quickstep/res/values/styles.xml
+++ b/quickstep/res/values/styles.xml
+@@ -227,7 +227,7 @@
+         <item name="android:paddingBottom">4dp</item>
+         <item name="android:textColor">@color/overview_button</item>
+         <item name="android:drawableTint">@color/overview_button</item>
+-        <item name="android:tint">?android:attr/textColorPrimary</item>
+        <item name="android:tint">?attr/workspaceTextColor</item>
+         <item name="android:drawablePadding">8dp</item>
+         <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 23fcbea42f..9b151394fa 100644
+--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
+@@ -793,7 +793,7 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
+         mEmptyIcon.setCallback(this);
+         mEmptyMessage = context.getText(R.string.recents_empty_message);
+         mEmptyMessagePaint = new TextPaint();
+-        mEmptyMessagePaint.setColor(Themes.getAttrColor(context, android.R.attr.textColorPrimary));
+        mEmptyMessagePaint.setColor(Themes.getAttrColor(context, R.attr.workspaceTextColor));
+         mEmptyMessagePaint.setTextSize(getResources()
+                 .getDimension(R.dimen.recents_empty_message_text_size));
+         mEmptyMessagePaint.setTypeface(Typeface.create(Themes.getDefaultBodyFont(context),
+diff --git a/res/color-v31/overview_scrim.xml b/res/color-v31/overview_scrim.xml
+deleted file mode 100644
+index 212518ff65..0000000000
+--- a/res/color-v31/overview_scrim.xml
+++ /dev/null
+@@ -1,18 +0,0 @@
+-<?xml version="1.0" encoding="utf-8"?>
+-<!-- Copyright (C) 2021 The Android Open Source Project
+-
+-     Licensed under the Apache License, Version 2.0 (the "License");
+-     you may not use this file except in compliance with the License.
+-     You may obtain a copy of the License at
+-
+-          http://www.apache.org/licenses/LICENSE-2.0
+-
+-     Unless required by applicable law or agreed to in writing, software
+-     distributed under the License is distributed on an "AS IS" BASIS,
+-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-     See the License for the specific language governing permissions and
+-     limitations under the License.
+--->
+-<selector xmlns:android="http://schemas.android.com/apk/res/android">
+-  <item android:color="@android:color/system_neutral2_200" />
+-</selector>
+diff --git a/res/color-v31/overview_scrim_dark.xml b/res/color-v31/overview_scrim_dark.xml
+deleted file mode 100644
+index 2ab8ecdec9..0000000000
+--- a/res/color-v31/overview_scrim_dark.xml
+++ /dev/null
+@@ -1,18 +0,0 @@
+-<?xml version="1.0" encoding="utf-8"?>
+-<!-- Copyright (C) 2021 The Android Open Source Project
+-
+-     Licensed under the Apache License, Version 2.0 (the "License");
+-     you may not use this file except in compliance with the License.
+-     You may obtain a copy of the License at
+-
+-          http://www.apache.org/licenses/LICENSE-2.0
+-
+-     Unless required by applicable law or agreed to in writing, software
+-     distributed under the License is distributed on an "AS IS" BASIS,
+-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-     See the License for the specific language governing permissions and
+-     limitations under the License.
+--->
+-<selector xmlns:android="http://schemas.android.com/apk/res/android">
+-  <item android:color="@android:color/system_neutral1_500" android:lStar="35" />
+-</selector>
+diff --git a/res/color-v33/overview_scrim.xml b/res/color-v33/overview_scrim.xml
+deleted file mode 100644
+index b9cda980b7..0000000000
+--- a/res/color-v33/overview_scrim.xml
+++ /dev/null
+@@ -1,20 +0,0 @@
+-<?xml version="1.0" encoding="utf-8"?>
+-<!-- Copyright (C) 2023 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="80"/>
+-</selector>
+diff --git a/res/color-v33/overview_scrim_dark.xml b/res/color-v33/overview_scrim_dark.xml
+deleted file mode 100644
+index 84d22e6515..0000000000
+--- a/res/color-v33/overview_scrim_dark.xml
+++ /dev/null
+@@ -1,20 +0,0 @@
+-<?xml version="1.0" encoding="utf-8"?>
+-<!-- Copyright (C) 2023 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="35"/>
+-</selector>
+diff --git a/res/color/overview_button.xml b/res/color/overview_button.xml
+index 1dd8da60c7..8868ad7349 100644
+--- a/res/color/overview_button.xml
+++ b/res/color/overview_button.xml
+@@ -3,10 +3,10 @@
+     xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">
+     <item
+         android:alpha="1"
+-        android:color="?androidprv:attr/materialColorOnSurface"
+        android:color="?attr/workspaceTextColor"
+         android:state_enabled="true" />
+     <item
+         android:alpha="?android:disabledAlpha"
+-        android:color="?androidprv:attr/materialColorOnSurface"
+        android:color="?attr/workspaceTextColor"
+         android:state_enabled="false" />
+-</selector>
+\ No newline at end of file
+</selector>
+diff --git a/res/color/overview_scrim.xml b/res/color/overview_scrim.xml
+index 48cf5763a1..894997c59a 100644
+--- a/res/color/overview_scrim.xml
+++ b/res/color/overview_scrim.xml
+@@ -14,5 +14,5 @@
+      limitations under the License.
+ -->
+ <selector xmlns:android="http://schemas.android.com/apk/res/android">
+-  <item android:color="#30000000" />
+  <item android:color="@android:color/transparent" />
+ </selector>
+diff --git a/res/color/overview_scrim_dark.xml b/res/color/overview_scrim_dark.xml
+index 48cf5763a1..894997c59a 100644
+--- a/res/color/overview_scrim_dark.xml
+++ b/res/color/overview_scrim_dark.xml
+@@ -14,5 +14,5 @@
+      limitations under the License.
+ -->
+ <selector xmlns:android="http://schemas.android.com/apk/res/android">
+-  <item android:color="#30000000" />
+  <item android:color="@android:color/transparent" />
+ </selector>
+-- 
+2.34.1
+
--- a/patches_platform_personal/packages_apps_Trebuchet/0002-Trebuchet-Kill-haptics-in-recents.patch
+++ b/patches_platform_personal/packages_apps_Trebuchet/0002-Trebuchet-Kill-haptics-in-recents.patch
@@ -0,0 +1,83 @@
+From 471be03743d96834bea2007e1beccd858149b8f6 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
+
+This partially reverts commit cc5c8843dfebfa92057b6ce8904ac58cd05ffaef.
+
+Change-Id: Ie3b0eabe8cc0421e696720740edc492cae2f5153
+---
+ .../NoButtonQuickSwitchTouchController.java   |  9 +--------
+ .../TaskViewTouchController.java              |  5 -----
+ .../android/quickstep/views/RecentsView.java  | 19 -------------------
+ 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 6f421eb14a..655797da62 100644
+--- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java
+@@ -438,14 +438,7 @@ public class NoButtonQuickSwitchTouchController implements TouchController,
+             nonOverviewAnim.setFloatValues(startProgress, endProgress);
+             mNonOverviewAnim.dispatchOnStart();
+         }
+-        if (targetState == QUICK_SWITCH_FROM_HOME) {
+-            // Navigating to quick switch, add scroll feedback since the first time is not
+-            // considered a scroll by the RecentsView.
+-            VibratorWrapper.INSTANCE.get(mLauncher).vibrate(
+-                    RecentsView.SCROLL_VIBRATION_PRIMITIVE,
+-                    RecentsView.SCROLL_VIBRATION_PRIMITIVE_SCALE,
+-                    RecentsView.SCROLL_VIBRATION_FALLBACK);
+-        } else {
+        if (targetState != QUICK_SWITCH_FROM_HOME) {
+             InteractionJankMonitorWrapper.cancel(InteractionJankMonitorWrapper.CUJ_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 3d94857848..849b9fd2d1 100644
+--- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TaskViewTouchController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TaskViewTouchController.java
+@@ -369,11 +369,6 @@ public abstract class TaskViewTouchController<T extends BaseDraggingActivity>
+         mCurrentAnimation.startWithVelocity(mActivity, goingToEnd,
+                 velocity * orientationHandler.getSecondaryTranslationDirectionFactor(),
+                 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() {
+diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
+index 9b151394fa..0ce5537d2e 100644
+--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
+@@ -1558,25 +1558,6 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
+         }
+     }
+ 
+-    @Override
+-    protected void onEdgeAbsorbingScroll() {
+-        vibrateForScroll();
+-    }
+-
+-    @Override
+-    protected void onScrollOverPageChanged() {
+-        vibrateForScroll();
+-    }
+-
+-    private void vibrateForScroll() {
+-        long now = SystemClock.uptimeMillis();
+-        if (now - mScrollLastHapticTimestamp > mScrollHapticMinGapMillis) {
+-            mScrollLastHapticTimestamp = now;
+-            VibratorWrapper.INSTANCE.get(mContext).vibrate(SCROLL_VIBRATION_PRIMITIVE,
+-                    SCROLL_VIBRATION_PRIMITIVE_SCALE, SCROLL_VIBRATION_FALLBACK);
+-        }
+-    }
+-
+     @Override
+     protected void determineScrollingStart(MotionEvent ev, float touchSlopScale) {
+         // Enables swiping to the left or right only if the task overlay is not modal.
+-- 
+2.34.1
+
--- a/patches_platform_personal/packages_apps_Trebuchet/0003-Trebuchet-Kill-inverted-rounded-corners-above-the-ta.patch
+++ b/patches_platform_personal/packages_apps_Trebuchet/0003-Trebuchet-Kill-inverted-rounded-corners-above-the-ta.patch
@@ -0,0 +1,34 @@
+From 1d5fe3cd174200d7ec1e34b1363b4b7aa34154e1 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
+ taskbar
+
+Again, where rectangles collide should be perfectly straight
+
+Change-Id: Ibf03a84cb8f3866b5151b02fe8a0e74167cf90ce
+---
+ .../android/launcher3/taskbar/TaskbarBackgroundRenderer.kt | 7 -------
+ 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 d237c1f997..d7142eef59 100644
+--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarBackgroundRenderer.kt
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarBackgroundRenderer.kt
+@@ -131,13 +131,6 @@ class TaskbarBackgroundRenderer(context: TaskbarActivityContext) {
+             canvas.translate(0f, canvas.height - backgroundHeight - bottomMargin)
+             // Draw the background behind taskbar content.
+             canvas.drawRect(0f, 0f, canvas.width.toFloat(), backgroundHeight, paint)
+-
+-            // Draw the inverted rounded corners above the taskbar.
+-            canvas.translate(0f, -leftCornerRadius)
+-            canvas.drawPath(invertedLeftCornerPath, paint)
+-            canvas.translate(0f, leftCornerRadius)
+-            canvas.translate(canvas.width - rightCornerRadius, -rightCornerRadius)
+-            canvas.drawPath(invertedRightCornerPath, paint)
+         } else if (!isInSetup) {
+             // backgroundHeight is a value from [0...maxBackgroundHeight], so we can use it as a
+             // proxy to figure out the animation progress of the stash/unstash animation.
+-- 
+2.34.1
+
--- a/patches_platform_personal/packages_modules_NetworkStack/0001-Replace-captive-portal-URLs-globally.patch
+++ b/patches_platform_personal/packages_modules_NetworkStack/0001-Replace-captive-portal-URLs-globally.patch
@@ -0,0 +1,87 @@
+From b09034c7e5f9bbc2d29c3f10452259956fcb9f46 Mon Sep 17 00:00:00 2001
+From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
+Date: Sat, 16 Oct 2021 00:33:15 +0000
+Subject: [PATCH] Replace captive portal URLs globally
+
+...so that it works even without a SIM inserted, which is a typical usecase of mine
+URLs from Chinese OEM UIs are faster and more reliable than g.cn and other int'l ones
+
+Change-Id: Ic3e124b2b62838a2bcf1dad0d670515f3d056964
+---
+ res/values-mcc460/config.xml | 31 -------------------------------
+ res/values/config.xml        |  7 +++----
+ 2 files changed, 3 insertions(+), 35 deletions(-)
+ delete mode 100644 res/values-mcc460/config.xml
+
+diff --git a/res/values-mcc460/config.xml b/res/values-mcc460/config.xml
+deleted file mode 100644
+index 3c4b4933..00000000
+--- a/res/values-mcc460/config.xml
+++ /dev/null
+@@ -1,31 +0,0 @@
+-<?xml version="1.0" encoding="utf-8"?>
+-<resources>
+-    <!-- Network validation URL configuration for devices using a Chinese SIM (MCC 460).
+-         The below URLs are often whitelisted by captive portals, so they should not be used in the
+-         general case as this could degrade the user experience (portals not detected properly).
+-         However in China the default URLs are not accessible in general. The below alternatives
+-         should allow users to connect to local networks normally. -->
+-    <!-- default_captive_portal_http_url is not configured as overlayable so
+-         OEMs that wish to change captive_portal_http_url configuration must
+-         do so via configuring runtime resource overlay to
+-         config_captive_portal_http_url and *NOT* by changing or overlaying
+-         this resource. It will break if the enforcement of overlayable starts.
+-         -->
+-    <string name="default_captive_portal_http_url" translatable="false">http://connectivitycheck.gstatic.cn/generate_204</string>
+-    <!-- default_captive_portal_https_url is not configured as overlayable so
+-         OEMs that wish to change captive_portal_https_url configuration must
+-         do so via configuring runtime resource overlay to
+-         config_captive_portal_https_url and *NOT* by changing or overlaying
+-         this resource. It will break if the enforcement of overlayable starts.
+-         -->
+-    <string name="default_captive_portal_https_url" translatable="false">https://connectivitycheck.gstatic.cn/generate_204</string>
+-    <!-- default_captive_portal_fallback_urls is not configured as overlayable
+-         so OEMs that wish to change captive_portal_fallback_urls configuration
+-         must do so via configuring runtime resource overlay to
+-         config_captive_portal_fallback_urls and *NOT* by changing or overlaying
+-         this resource. It will break if the enforcement of overlayable starts.
+-         -->
+-    <string-array name="default_captive_portal_fallback_urls" translatable="false">
+-        <item>http://www.googleapis.cn/generate_204</item>
+-    </string-array>
+-</resources>
+diff --git a/res/values/config.xml b/res/values/config.xml
+index 805ca041..61297dda 100644
+--- a/res/values/config.xml
+++ b/res/values/config.xml
+@@ -13,7 +13,7 @@
+          config_captive_portal_http_url and *NOT* by changing or overlaying
+          this resource. It will break if the enforcement of overlayable starts.
+          -->
+-    <string name="default_captive_portal_http_url" translatable="false">http://connectivitycheck.gstatic.com/generate_204</string>
+    <string name="default_captive_portal_http_url" translatable="false">http://conn4.coloros.com/generate204</string>
+     <!-- HTTPS URL for network validation, to use for confirming internet connectivity. -->
+     <!-- default_captive_portal_https_url is not configured as overlayable so
+          OEMs that wish to change captive_portal_https_url configuration must
+@@ -21,7 +21,7 @@
+          config_captive_portal_https_url and *NOT* by changing or overlaying
+          this resource. It will break if the enforcement of overlayable starts.
+          -->
+-    <string name="default_captive_portal_https_url" translatable="false">https://www.google.com/generate_204</string>
+    <string name="default_captive_portal_https_url" translatable="false">https://conn4.coloros.com/generate204</string>
+ 
+     <!-- List of fallback URLs to use for detecting captive portals. -->
+     <!-- default_captive_portal_fallback_urls is not configured as overlayable
+@@ -31,8 +31,7 @@
+          this resource. It will break if the enforcement of overlayable starts.
+          -->
+     <string-array name="default_captive_portal_fallback_urls" translatable="false">
+-        <item>http://www.google.com/gen_204</item>
+-        <item>http://play.googleapis.com/generate_204</item>
+        <item>http://connect.rom.miui.com/generate_204</item>
+     </string-array>
+     <!-- Configuration hooks for the above settings.
+          Empty by default but may be overridden by RROs. -->
+-- 
+2.25.1
+
--- a/patches_platform_personal/packages_modules_Permission/0001-Disable-Safety-Center-Tile.patch
+++ b/patches_platform_personal/packages_modules_Permission/0001-Disable-Safety-Center-Tile.patch
@@ -0,0 +1,36 @@
+From 0b0220f3ae8d67817ea1a602d73f5349bbff365d Mon Sep 17 00:00:00 2001
+From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
+Date: Mon, 20 Nov 2023 17:53:44 +0800
+Subject: [PATCH] Disable Safety Center Tile
+
+Change-Id: I0f642f486d1c53ee38195eb10aee3fec5992a323
+---
+ PermissionController/AndroidManifest.xml | 12 ------------
+ 1 file changed, 12 deletions(-)
+
+diff --git a/PermissionController/AndroidManifest.xml b/PermissionController/AndroidManifest.xml
+index 817dd0881..9c2a67f78 100644
+--- a/PermissionController/AndroidManifest.xml
+++ b/PermissionController/AndroidManifest.xml
+@@ -528,18 +528,6 @@
+             </intent-filter>
+         </service>
+ 
+-        <service
+-            android:name="com.android.permissioncontroller.permission.service.v33.SafetyCenterQsTileService"
+-            android:enabled="@bool/is_at_least_t"
+-            android:exported="true"
+-            android:label="@string/safety_privacy_qs_tile_title"
+-            android:icon ="@drawable/ic_safety_center_shield"
+-            android:permission="android.permission.BIND_QUICK_SETTINGS_TILE">
+-            <intent-filter>
+-                <action android:name="android.service.quicksettings.action.QS_TILE" />
+-            </intent-filter>
+-        </service>
+-
+         <service android:name="com.android.permissioncontroller.auto.DrivingDecisionReminderService" />
+ 
+         <receiver android:name="com.android.permissioncontroller.role.service.ClearUserDeniedReceiver"
+-- 
+2.34.1
+
--- a/patches_platform_personal/vendor_lineage/0001-build-Integrate-prop-modifications-2-2.patch
+++ b/patches_platform_personal/vendor_lineage/0001-build-Integrate-prop-modifications-2-2.patch
@@ -0,0 +1,36 @@
+From 863e8f70e3a4f987938ff4ad01c22822bc38e409 Mon Sep 17 00:00:00 2001
+From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
+Date: Sun, 20 Jun 2021 09:09:15 +0000
+Subject: [PATCH 1/4] build: Integrate prop modifications (2/2)
+
+Change-Id: I076973f902ab20011964e50955e4326c18d5b34e
+---
+ build/core/main_version.mk | 7 +------
+ 1 file changed, 1 insertion(+), 6 deletions(-)
+
+diff --git a/build/core/main_version.mk b/build/core/main_version.mk
+index 28044e2c..c5aa9617 100644
+--- a/build/core/main_version.mk
+++ b/build/core/main_version.mk
+@@ -5,17 +5,12 @@ ADDITIONAL_SYSTEM_PROPERTIES += \
+ endif
+ 
+ # LineageOS System Version
+# Do not set Display Versions here, due to Makefile not playing nice with spaces
+ ADDITIONAL_SYSTEM_PROPERTIES += \
+-    ro.lineage.version=$(LINEAGE_VERSION) \
+     ro.lineage.releasetype=$(LINEAGE_BUILDTYPE) \
+     ro.lineage.build.version=$(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR) \
+-    ro.modversion=$(LINEAGE_VERSION) \
+     ro.lineagelegal.url=https://lineageos.org/legal
+ 
+-# LineageOS Platform Display Version
+-ADDITIONAL_SYSTEM_PROPERTIES += \
+-    ro.lineage.display.version=$(LINEAGE_DISPLAY_VERSION)
+-
+ # LineageOS Platform SDK Version
+ ADDITIONAL_SYSTEM_PROPERTIES += \
+     ro.lineage.build.version.plat.sdk=$(LINEAGE_PLATFORM_SDK_VERSION)
+-- 
+2.34.1
+
--- a/patches_platform_personal/vendor_lineage/0002-build-Remove-Stk-2-2.patch
+++ b/patches_platform_personal/vendor_lineage/0002-build-Remove-Stk-2-2.patch
@@ -0,0 +1,40 @@
+From 34f8aa093286970f82014f1dae0e86e4cbeba896 Mon Sep 17 00:00:00 2001
+From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
+Date: Sat, 16 Oct 2021 00:41:07 +0000
+Subject: [PATCH 2/4] build: Remove Stk (2/2)
+
+Change-Id: I4e1cfacd296e47ef1731f3c32555089a5fca6f0c
+---
+ config/data_only.mk | 4 ----
+ config/telephony.mk | 3 +--
+ 2 files changed, 1 insertion(+), 6 deletions(-)
+
+diff --git a/config/data_only.mk b/config/data_only.mk
+index 5ff877c9..ab70301b 100644
+--- a/config/data_only.mk
+++ b/config/data_only.mk
+@@ -1,7 +1,3 @@
+ # World APN list
+ PRODUCT_PACKAGES += \
+     apns-conf.xml
+-
+-# Telephony packages
+-PRODUCT_PACKAGES += \
+-    Stk
+diff --git a/config/telephony.mk b/config/telephony.mk
+index 6adf48d9..e63b320d 100644
+--- a/config/telephony.mk
+++ b/config/telephony.mk
+@@ -8,8 +8,7 @@ PRODUCT_PACKAGES += \
+ 
+ # Telephony packages
+ PRODUCT_PACKAGES += \
+-    messaging \
+-    Stk
+    messaging
+ 
+ # Default ringtone
+ PRODUCT_PRODUCT_PROPERTIES += \
+-- 
+2.34.1
+
--- a/patches_platform_personal/vendor_lineage/0003-vendor_lineage-Ignore-neverallows.-again.patch
+++ b/patches_platform_personal/vendor_lineage/0003-vendor_lineage-Ignore-neverallows.-again.patch
@@ -0,0 +1,30 @@
+From 84b5b23519166701423a324cac955e9110e36eae Mon Sep 17 00:00:00 2001
+From: AndyCGYan <GeForce8800Ultra@gmail.com>
+Date: Mon, 1 Jul 2019 07:03:04 +0000
+Subject: [PATCH 3/4] vendor_lineage: Ignore neverallows... again
+
+Because unofficial builds are better than no builds!
+
+Change-Id: I4b19d09b28f79c6f5020bf03fdf8931145bca03a
+---
+ build/core/config.mk | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/build/core/config.mk b/build/core/config.mk
+index f2e595ff..d6d036a9 100644
+--- a/build/core/config.mk
+++ b/build/core/config.mk
+@@ -20,5 +20,10 @@ FRAMEWORK_LINEAGE_PLATFORM_API_FILE := $(TOPDIR)lineage-sdk/api/lineage_current.
+ FRAMEWORK_LINEAGE_PLATFORM_REMOVED_API_FILE := $(TOPDIR)lineage-sdk/api/lineage_removed.txt
+ FRAMEWORK_LINEAGE_API_NEEDS_UPDATE_TEXT := $(TOPDIR)vendor/lineage/build/core/apicheck_msg_current.txt
+ 
+# We modify several neverallows, so let the build proceed
+ifneq ($(TARGET_BUILD_VARIANT),user)
+SELINUX_IGNORE_NEVERALLOWS := true
+endif
+
+ # Rules for QCOM targets
+ include $(TOPDIR)vendor/lineage/build/core/qcom_target.mk
+-- 
+2.34.1
+
--- a/patches_platform_personal/vendor_lineage/0004-vendor_lineage-Personal-theme-as-SRO.patch
+++ b/patches_platform_personal/vendor_lineage/0004-vendor_lineage-Personal-theme-as-SRO.patch