Initial unified commit for Android 12, syncing up to v400.a

2021-10-20 14:54:55 +00:00
commit 796726eb09
166 changed files with 20826 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 996084a373929cf6ba65bdfe5d984328c0448ccc 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 f0627a307..032636014 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"
+@@ -21,7 +21,7 @@ echo "ro.build.version.release_or_codename=$PLATFORM_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"
+@@ -56,5 +56,10 @@ if [ -n "$BUILD_THUMBPRINT" ] ; then
+ fi
+ 
+ echo "ro.lineage.device=$LINEAGE_DEVICE"
+echo "ro.lineage.version=LineageOS 19.0 Self-built CGMod"
+echo "ro.lineage.display.version=LineageOS 19.0 Self-built CGMod"
+echo "ro.modversion=LineageOS 19.0 Self-built CGMod"
+
+echo "lockscreen.rot_override=true"
+ 
+ echo "# end build properties"
+-- 
+2.25.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 c33bf332540e7057d1d9f7491bf345658965aae9 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 f13c9db4d..a559e244d 100644
+--- a/target/product/generic_system.mk
+++ b/target/product/generic_system.mk
+@@ -32,7 +32,6 @@ PRODUCT_PACKAGES += \
+ PRODUCT_PACKAGES += \
+     LiveWallpapersPicker \
+     PartnerBookmarksProvider \
+-    Stk \
+     Tag \
+ 
+ # OTA support
+-- 
+2.25.1
+
--- a/patches_platform_personal/frameworks_base/0001-Add-LineageMonetAccentOverlay.patch
+++ b/patches_platform_personal/frameworks_base/0001-Add-LineageMonetAccentOverlay.patch
@@ -0,0 +1,173 @@
+From 34c2595216ffa9d62322f9a46ba89b195d64ce3c Mon Sep 17 00:00:00 2001
+From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
+Date: Wed, 27 Oct 2021 14:38:37 +0000
+Subject: [PATCH 01/16] Add LineageMonetAccentOverlay
+
+Applies the signature teal of LineageOS (#167C80) when Monet is absent - thanks @kdrag0n
+
+Change-Id: Ib93b2bc68a08dfe12a7c3f503dcc62cce098b459
+---
+ packages/overlays/Android.mk                  |  1 +
+ .../LineageMonetAccentOverlay/Android.bp      | 28 ++++++++
+ .../AndroidManifest.xml                       | 22 ++++++
+ .../res/values/config.xml                     | 72 +++++++++++++++++++
+ 4 files changed, 123 insertions(+)
+ create mode 100644 packages/overlays/LineageMonetAccentOverlay/Android.bp
+ create mode 100644 packages/overlays/LineageMonetAccentOverlay/AndroidManifest.xml
+ create mode 100644 packages/overlays/LineageMonetAccentOverlay/res/values/config.xml
+
+diff --git a/packages/overlays/Android.mk b/packages/overlays/Android.mk
+index 928892c60e47..d90aae92e1c5 100644
+--- a/packages/overlays/Android.mk
+++ b/packages/overlays/Android.mk
+@@ -26,6 +26,7 @@ LOCAL_REQUIRED_MODULES := \
+ 	DisplayCutoutEmulationTallOverlay \
+ 	DisplayCutoutEmulationWaterfallOverlay \
+ 	FontNotoSerifSourceOverlay \
+	LineageMonetAccentOverlay \
+ 	NavigationBarMode3ButtonOverlay \
+ 	NavigationBarModeGesturalOverlay \
+ 	NavigationBarModeGesturalOverlayNarrowBack \
+diff --git a/packages/overlays/LineageMonetAccentOverlay/Android.bp b/packages/overlays/LineageMonetAccentOverlay/Android.bp
+new file mode 100644
+index 000000000000..e4da9231dc7c
+--- /dev/null
+++ b/packages/overlays/LineageMonetAccentOverlay/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: "LineageMonetAccentOverlay",
+    product_specific: true,
+}
+diff --git a/packages/overlays/LineageMonetAccentOverlay/AndroidManifest.xml b/packages/overlays/LineageMonetAccentOverlay/AndroidManifest.xml
+new file mode 100644
+index 000000000000..11062b67bc61
+--- /dev/null
+++ b/packages/overlays/LineageMonetAccentOverlay/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="org.lineageos.overlay.accent.monet"
+        android:versionCode="1"
+        android:versionName="1.0">
+    <overlay android:targetPackage="android" android:priority="0" android:isStatic="true"/>
+</manifest>
+diff --git a/packages/overlays/LineageMonetAccentOverlay/res/values/config.xml b/packages/overlays/LineageMonetAccentOverlay/res/values/config.xml
+new file mode 100644
+index 000000000000..4777409bb587
+--- /dev/null
+++ b/packages/overlays/LineageMonetAccentOverlay/res/values/config.xml
+@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="system_accent1_0">#FFFFFF</color>
+    <color name="system_accent1_10">#EFFFFF</color>
+    <color name="system_accent1_50">#B4FDFF</color>
+    <color name="system_accent1_100">#6EF6FC</color>
+    <color name="system_accent1_200">#4CD9E0</color>
+    <color name="system_accent1_300">#1EBDC4</color>
+    <color name="system_accent1_400">#00A1A7</color>
+    <color name="system_accent1_500">#008388</color>
+    <color name="system_accent1_600">#00696E</color>
+    <color name="system_accent1_700">#004F53</color>
+    <color name="system_accent1_800">#00373A</color>
+    <color name="system_accent1_900">#002022</color>
+    <color name="system_accent1_1000">#000000</color>
+
+    <color name="system_accent2_0">#FFFFFF</color>
+    <color name="system_accent2_10">#EFFFFF</color>
+    <color name="system_accent2_50">#DAF6F7</color>
+    <color name="system_accent2_100">#CCE8E8</color>
+    <color name="system_accent2_200">#B0CCCC</color>
+    <color name="system_accent2_300">#96B0B1</color>
+    <color name="system_accent2_400">#7B9697</color>
+    <color name="system_accent2_500">#617B7C</color>
+    <color name="system_accent2_600">#496364</color>
+    <color name="system_accent2_700">#324B4D</color>
+    <color name="system_accent2_800">#1B3436</color>
+    <color name="system_accent2_900">#051F21</color>
+    <color name="system_accent2_1000">#000000</color>
+
+    <color name="system_accent3_0">#FFFFFF</color>
+    <color name="system_accent3_10">#FDFCFF</color>
+    <color name="system_accent3_50">#EBF1FF</color>
+    <color name="system_accent3_100">#D4E3FF</color>
+    <color name="system_accent3_200">#ACC8F7</color>
+    <color name="system_accent3_300">#91ACDB</color>
+    <color name="system_accent3_400">#7692BE</color>
+    <color name="system_accent3_500">#5C77A2</color>
+    <color name="system_accent3_600">#445F8A</color>
+    <color name="system_accent3_700">#2B4770</color>
+    <color name="system_accent3_800">#113158</color>
+    <color name="system_accent3_900">#001B3D</color>
+    <color name="system_accent3_1000">#000000</color>
+
+    <color name="system_neutral1_0">#FFFFFF</color>
+    <color name="system_neutral1_10">#FAFDFC</color>
+    <color name="system_neutral1_50">#EFF1F1</color>
+    <color name="system_neutral1_100">#E0E3E2</color>
+    <color name="system_neutral1_200">#C4C7C6</color>
+    <color name="system_neutral1_300">#A9ACAB</color>
+    <color name="system_neutral1_400">#8E9191</color>
+    <color name="system_neutral1_500">#737776</color>
+    <color name="system_neutral1_600">#5B5F5F</color>
+    <color name="system_neutral1_700">#444747</color>
+    <color name="system_neutral1_800">#2E3131</color>
+    <color name="system_neutral1_900">#191C1C</color>
+    <color name="system_neutral1_1000">#000000</color>
+
+    <color name="system_neutral2_0">#FFFFFF</color>
+    <color name="system_neutral2_10">#F4FEFE</color>
+    <color name="system_neutral2_50">#E8F3F2</color>
+    <color name="system_neutral2_100">#DAE5E4</color>
+    <color name="system_neutral2_200">#BEC8C9</color>
+    <color name="system_neutral2_300">#A3ADAE</color>
+    <color name="system_neutral2_400">#889393</color>
+    <color name="system_neutral2_500">#6E7878</color>
+    <color name="system_neutral2_600">#566061</color>
+    <color name="system_neutral2_700">#3F4949</color>
+    <color name="system_neutral2_800">#293232</color>
+    <color name="system_neutral2_900">#141D1E</color>
+    <color name="system_neutral2_1000">#000000</color>
+</resources>
+-- 
+2.25.1
+
--- a/patches_platform_personal/frameworks_base/0002-Add-MiuiNavbarOverlay.patch
+++ b/patches_platform_personal/frameworks_base/0002-Add-MiuiNavbarOverlay.patch
@@ -0,0 +1,396 @@
+From 7a6b1a77ffc801621c6a5f4dd4eb8d3c158fa877 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/16] Add MiuiNavbarOverlay
+
+Change-Id: I0e6791abc3c9521d7dc612df2fec2b041affe7e9
+---
+ packages/overlays/Android.mk                  |   3 +-
+ .../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, 52 insertions(+), 1 deletion(-)
+ 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 d90aae92e1c5..2e53fed86f15 100644
+--- a/packages/overlays/Android.mk
+++ b/packages/overlays/Android.mk
+@@ -27,12 +27,13 @@ LOCAL_REQUIRED_MODULES := \
+ 	DisplayCutoutEmulationWaterfallOverlay \
+ 	FontNotoSerifSourceOverlay \
+ 	LineageMonetAccentOverlay \
+	MiuiNavbarOverlay \
+ 	NavigationBarMode3ButtonOverlay \
+ 	NavigationBarModeGesturalOverlay \
+ 	NavigationBarModeGesturalOverlayNarrowBack \
+ 	NavigationBarModeGesturalOverlayWideBack \
+ 	NavigationBarModeGesturalOverlayExtraWideBack \
+-        OneHandedModeGesturalOverlay \
+    OneHandedModeGesturalOverlay \
+ 	preinstalled-packages-platform-overlays.xml
+ 
+ include $(BUILD_PHONY_PACKAGE)
+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
+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
+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.25.1
+
--- a/patches_platform_personal/frameworks_base/0003-Disable-cursor-drag-by-default-for-editable-TextView.patch
+++ b/patches_platform_personal/frameworks_base/0003-Disable-cursor-drag-by-default-for-editable-TextView.patch
@@ -0,0 +1,28 @@
+From 03ca85ab7a8d6a8eac9006f3f6b4d9dfa27d9e85 Mon Sep 17 00:00:00 2001
+From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
+Date: Mon, 27 Sep 2021 16:30:00 +0000
+Subject: [PATCH 03/16] 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.25.1
+
--- a/patches_platform_personal/frameworks_base/0004-Disable-FP-lockouts.patch
+++ b/patches_platform_personal/frameworks_base/0004-Disable-FP-lockouts.patch
@@ -0,0 +1,47 @@
+From deb5aecb8182307e352e82cd5d5484ca1791d42f Mon Sep 17 00:00:00 2001
+From: AndyCGYan <GeForce8800Ultra@gmail.com>
+Date: Fri, 22 Mar 2019 00:41:20 +0800
+Subject: [PATCH 04/16] Disable FP lockouts
+
+Both timed and permanent lockouts - GET THE FUCK OUT
+Now targeting LockoutFramework, introduced in Android 12
+
+Change-Id: I2d4b091f3546d4d7903bfb4d5585629212dc9915
+---
+ .../fingerprint/hidl/LockoutFrameworkImpl.java  | 17 +----------------
+ 1 file changed, 1 insertion(+), 16 deletions(-)
+
+diff --git a/services/core/java/com/android/server/biometrics/sensors/fingerprint/hidl/LockoutFrameworkImpl.java b/services/core/java/com/android/server/biometrics/sensors/fingerprint/hidl/LockoutFrameworkImpl.java
+index dc5dace98825..386e4f868e8d 100644
+--- a/services/core/java/com/android/server/biometrics/sensors/fingerprint/hidl/LockoutFrameworkImpl.java
+++ b/services/core/java/com/android/server/biometrics/sensors/fingerprint/hidl/LockoutFrameworkImpl.java
+@@ -100,25 +100,10 @@ public class LockoutFrameworkImpl implements LockoutTracker {
+         mLockoutResetCallback.onLockoutReset(userId);
+     }
+ 
+-    void addFailedAttemptForUser(int userId) {
+-        mFailedAttempts.put(userId, mFailedAttempts.get(userId, 0) + 1);
+-        mTimedLockoutCleared.put(userId, false);
+-
+-        if (getLockoutModeForUser(userId) != LOCKOUT_NONE) {
+-            scheduleLockoutResetForUser(userId);
+-        }
+-    }
+    void addFailedAttemptForUser(int userId) {}
+ 
+     @Override
+     public @LockoutMode int getLockoutModeForUser(int userId) {
+-        final int failedAttempts = mFailedAttempts.get(userId, 0);
+-        if (failedAttempts >= MAX_FAILED_ATTEMPTS_LOCKOUT_PERMANENT) {
+-            return LOCKOUT_PERMANENT;
+-        } else if (failedAttempts > 0
+-                && !mTimedLockoutCleared.get(userId, false)
+-                && (failedAttempts % MAX_FAILED_ATTEMPTS_LOCKOUT_TIMED == 0)) {
+-            return LOCKOUT_TIMED;
+-        }
+         return LOCKOUT_NONE;
+     }
+ 
+-- 
+2.25.1
+
--- a/patches_platform_personal/frameworks_base/0005-Keyguard-Adjust-clock-style.patch
+++ b/patches_platform_personal/frameworks_base/0005-Keyguard-Adjust-clock-style.patch
@@ -0,0 +1,112 @@
+From e8c24265c98c943b220873c85e1607db39cd8142 Mon Sep 17 00:00:00 2001
+From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
+Date: Thu, 2 Sep 2021 16:15:19 +0000
+Subject: [PATCH 05/16] Keyguard: Adjust clock style
+
+Thinner font, less padding and unintrusive colors
+
+Change-Id: I21e5d5bf37d724e75ebce4cd89349e0cc4dfc910
+---
+ .../SystemUI/res-keyguard/layout/keyguard_clock_switch.xml | 7 ++++---
+ packages/SystemUI/res-keyguard/values/dimens.xml           | 6 +++---
+ packages/SystemUI/res-keyguard/values/styles.xml           | 2 --
+ packages/SystemUI/res/values/styles.xml                    | 4 ++--
+ .../src/com/android/keyguard/AnimatableClockView.java      | 2 +-
+ 5 files changed, 10 insertions(+), 11 deletions(-)
+
+diff --git a/packages/SystemUI/res-keyguard/layout/keyguard_clock_switch.xml b/packages/SystemUI/res-keyguard/layout/keyguard_clock_switch.xml
+index 28c61663bd4d..84ea2446f9d7 100644
+--- a/packages/SystemUI/res-keyguard/layout/keyguard_clock_switch.xml
+++ b/packages/SystemUI/res-keyguard/layout/keyguard_clock_switch.xml
+@@ -38,10 +38,10 @@
+             android:layout_gravity="start"
+             android:gravity="start"
+             android:textSize="@dimen/clock_text_size"
+-            android:fontFamily="@font/clock"
+            android:fontFamily="sans-serif-thin"
+             android:elegantTextHeight="false"
+             android:singleLine="true"
+-            android:fontFeatureSettings="pnum"
+            android:fontFeatureSettings="tnum"
+             chargeAnimationDelay="350"
+             dozeWeight="200"
+             lockScreenWeight="400"
+@@ -60,9 +60,10 @@
+             android:layout_gravity="center"
+             android:gravity="center_horizontal"
+             android:textSize="@dimen/large_clock_text_size"
+-            android:fontFamily="@font/clock"
+            android:fontFamily="sans-serif-thin"
+             android:typeface="monospace"
+             android:elegantTextHeight="false"
+            android:fontFeatureSettings="tnum"
+             chargeAnimationDelay="200"
+             dozeWeight="200"
+             lockScreenWeight="400"
+diff --git a/packages/SystemUI/res-keyguard/values/dimens.xml b/packages/SystemUI/res-keyguard/values/dimens.xml
+index 7e3c87b24f07..58a1734aad22 100644
+--- a/packages/SystemUI/res-keyguard/values/dimens.xml
+++ b/packages/SystemUI/res-keyguard/values/dimens.xml
+@@ -94,8 +94,8 @@
+     <dimen name="num_pad_key_margin_end">12dp</dimen>
+ 
+     <!-- additional offset for clock switch area items -->
+-    <dimen name="clock_padding_start">28dp</dimen>
+-    <dimen name="below_clock_padding_start">32dp</dimen>
+    <dimen name="clock_padding_start">22dp</dimen>
+    <dimen name="below_clock_padding_start">28dp</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>
+ </resources>
+diff --git a/packages/SystemUI/res-keyguard/values/styles.xml b/packages/SystemUI/res-keyguard/values/styles.xml
+index 72b027af1bf6..6bfca3ece20e 100644
+--- a/packages/SystemUI/res-keyguard/values/styles.xml
+++ b/packages/SystemUI/res-keyguard/values/styles.xml
+@@ -123,8 +123,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/values/styles.xml b/packages/SystemUI/res/values/styles.xml
+index a03e9ea89342..285dd4766cab 100644
+--- a/packages/SystemUI/res/values/styles.xml
+++ b/packages/SystemUI/res/values/styles.xml
+@@ -343,7 +343,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">@*android:color/system_accent1_100</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/LockPatternStyle</item>
+         <item name="passwordStyle">@style/PasswordTheme</item>
+@@ -359,7 +359,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">@*android:color/system_accent2_600</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>
+ 
+diff --git a/packages/SystemUI/src/com/android/keyguard/AnimatableClockView.java b/packages/SystemUI/src/com/android/keyguard/AnimatableClockView.java
+index ef3104a21708..ec54cdb53f22 100644
+--- a/packages/SystemUI/src/com/android/keyguard/AnimatableClockView.java
+++ b/packages/SystemUI/src/com/android/keyguard/AnimatableClockView.java
+@@ -113,7 +113,7 @@ public class AnimatableClockView extends TextView {
+ 
+     void refreshTime() {
+         mTime.setTimeInMillis(System.currentTimeMillis());
+-        setText(DateFormat.format(mFormat, mTime));
+        setText(DateFormat.format(mFormat, mTime).toString() + ' ');
+         setContentDescription(DateFormat.format(mDescFormat, mTime));
+     }
+ 
+-- 
+2.25.1
+
--- a/patches_platform_personal/frameworks_base/0006-Keyguard-Hide-padlock-unless-UDFPS-is-in-use.patch
+++ b/patches_platform_personal/frameworks_base/0006-Keyguard-Hide-padlock-unless-UDFPS-is-in-use.patch
@@ -0,0 +1,58 @@
+From 925a1d857b5a0f9c76d920caed30bf9e7a69033d Mon Sep 17 00:00:00 2001
+From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
+Date: Sat, 2 Nov 2019 06:41:03 +0000
+Subject: [PATCH 06/16] Keyguard: Hide padlock unless UDFPS is in use
+
+Fair enough Google, but don't give me that otherwise
+
+Change-Id: Ie91e80ca5c6637a51a8acc72fb28cd6ac2a7abb6
+---
+ .../keyguard/LockIconViewController.java      | 29 +++++--------------
+ 1 file changed, 7 insertions(+), 22 deletions(-)
+
+diff --git a/packages/SystemUI/src/com/android/keyguard/LockIconViewController.java b/packages/SystemUI/src/com/android/keyguard/LockIconViewController.java
+index 509ac8a6d9fe..74b91b708433 100644
+--- a/packages/SystemUI/src/com/android/keyguard/LockIconViewController.java
+++ b/packages/SystemUI/src/com/android/keyguard/LockIconViewController.java
+@@ -232,31 +232,16 @@ public class LockIconViewController extends ViewController<LockIconView> impleme
+             return;
+         }
+ 
+-        boolean wasShowingFpIcon = mUdfpsEnrolled && !mShowUnlockIcon && !mShowLockIcon;
+-        boolean wasShowingLockIcon = mShowLockIcon;
+        boolean wasShowingFpIcon = mUdfpsEnrolled && !mShowUnlockIcon;
+         boolean wasShowingUnlockIcon = mShowUnlockIcon;
+-        mShowLockIcon = !mCanDismissLockScreen && !mUserUnlockedWithBiometric && isLockScreen()
+-            && (!mUdfpsEnrolled || !mRunningFPS);
+-        mShowUnlockIcon = mCanDismissLockScreen && isLockScreen();
+        mShowUnlockIcon = mCanDismissLockScreen && isLockScreen() && mUdfpsEnrolled;
+ 
+         final CharSequence prevContentDescription = mView.getContentDescription();
+-        if (mShowLockIcon) {
+-            mView.setImageDrawable(mLockIcon);
+-            mView.setVisibility(View.VISIBLE);
+-            mView.setContentDescription(mLockedLabel);
+-        } else if (mShowUnlockIcon) {
+-            if (!wasShowingUnlockIcon) {
+-                if (wasShowingFpIcon) {
+-                    mView.setImageDrawable(mFpToUnlockIcon);
+-                    mFpToUnlockIcon.forceAnimationOnUI();
+-                    mFpToUnlockIcon.start();
+-                } else if (wasShowingLockIcon) {
+-                    mView.setImageDrawable(mLockToUnlockIcon);
+-                    mLockToUnlockIcon.forceAnimationOnUI();
+-                    mLockToUnlockIcon.start();
+-                } else {
+-                    mView.setImageDrawable(mUnlockIcon);
+-                }
+        if (mShowUnlockIcon) {
+            if (wasShowingFpIcon) {
+                mView.setImageDrawable(mFpToUnlockIcon);
+                mFpToUnlockIcon.forceAnimationOnUI();
+                mFpToUnlockIcon.start();
+             }
+             mView.setVisibility(View.VISIBLE);
+             mView.setContentDescription(mUnlockedLabel);
+-- 
+2.25.1
+
--- a/patches_platform_personal/frameworks_base/0007-Keyguard-Never-switch-to-large-clock.patch
+++ b/patches_platform_personal/frameworks_base/0007-Keyguard-Never-switch-to-large-clock.patch
@@ -0,0 +1,38 @@
+From eb1da990af3c66a794a3516fd5da21a177779001 Mon Sep 17 00:00:00 2001
+From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
+Date: Wed, 1 Sep 2021 14:41:53 +0000
+Subject: [PATCH 07/16] Keyguard: Never switch to large clock
+
+It looks alright actually, but as always breaks under landscape
+
+Change-Id: I434d033ecae597ed2a7b2ed71e96ba1a963e9cc3
+---
+ .../com/android/keyguard/KeyguardClockSwitch.java    | 12 +-----------
+ 1 file changed, 1 insertion(+), 11 deletions(-)
+
+diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitch.java b/packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitch.java
+index a36a03473e0e..60195bcd23fb 100644
+--- a/packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitch.java
+++ b/packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitch.java
+@@ -280,17 +280,7 @@ public class KeyguardClockSwitch extends RelativeLayout {
+      * the smaller version.
+      */
+     boolean willSwitchToLargeClock(boolean hasVisibleNotifications) {
+-        if (mHasVisibleNotifications != null
+-                && hasVisibleNotifications == mHasVisibleNotifications) {
+-            return false;
+-        }
+-        boolean landscape = getResources().getConfiguration().orientation
+-                == Configuration.ORIENTATION_LANDSCAPE;
+-        boolean useLargeClock = !hasVisibleNotifications && !landscape;
+-        animateClockChange(useLargeClock);
+-
+-        mHasVisibleNotifications = hasVisibleNotifications;
+-        return useLargeClock;
+        return false;
+     }
+ 
+     public Paint getPaint() {
+-- 
+2.25.1
+
--- a/patches_platform_personal/frameworks_base/0008-Keyguard-Refine-indication-text.patch
+++ b/patches_platform_personal/frameworks_base/0008-Keyguard-Refine-indication-text.patch
@@ -0,0 +1,102 @@
+From 4252dd5be9f193c3f25f6771986b868e065b90e7 Mon Sep 17 00:00:00 2001
+From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
+Date: Sat, 2 Nov 2019 08:31:36 +0000
+Subject: [PATCH 08/16] Keyguard: Refine indication text
+
+Change-Id: Ib771c35610f712a1de34736e817bcfe616ac37d8
+---
+ packages/SystemUI/res-keyguard/values/styles.xml     |  2 --
+ packages/SystemUI/res/values/dimens.xml              |  2 +-
+ .../KeyguardIndicationRotateTextViewController.java  | 12 +++++++++++-
+ .../statusbar/KeyguardIndicationController.java      |  5 ++---
+ .../statusbar/phone/KeyguardIndicationTextView.java  |  2 +-
+ 5 files changed, 15 insertions(+), 8 deletions(-)
+
+diff --git a/packages/SystemUI/res-keyguard/values/styles.xml b/packages/SystemUI/res-keyguard/values/styles.xml
+index 6bfca3ece20e..54e5b8511b57 100644
+--- a/packages/SystemUI/res-keyguard/values/styles.xml
+++ b/packages/SystemUI/res-keyguard/values/styles.xml
+@@ -137,7 +137,5 @@
+         <item name="android:textSize">14sp</item>
+         <item name="android:maxLines">1</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>
+ </resources>
+diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml
+index 6ad9ab9a26ec..661a03aa9671 100644
+--- a/packages/SystemUI/res/values/dimens.xml
+++ b/packages/SystemUI/res/values/dimens.xml
+@@ -923,7 +923,7 @@
+     <dimen name="keyguard_lock_width">42dp</dimen>
+     <dimen name="keyguard_lock_padding">20dp</dimen>
+ 
+-    <dimen name="keyguard_indication_margin_bottom">32dp</dimen>
+    <dimen name="keyguard_indication_margin_bottom">16dp</dimen>
+     <dimen name="lock_icon_margin_bottom">98dp</dimen>
+ 
+     <!-- The text size for battery level -->
+diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardIndicationRotateTextViewController.java b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardIndicationRotateTextViewController.java
+index 2d215e0f1f62..0c5870d6b6bf 100644
+--- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardIndicationRotateTextViewController.java
+++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardIndicationRotateTextViewController.java
+@@ -183,12 +183,22 @@ public class KeyguardIndicationRotateTextViewController extends
+     }
+ 
+     /**
+-     * @return true if there are available indications to show
+     * @return true if there are available non-resting indications to show.
+      */
+     public boolean hasIndications() {
+        if (hasIndication(INDICATION_TYPE_RESTING)) {
+            return mIndicationMessages.keySet().size() > 1;
+        }
+         return mIndicationMessages.keySet().size() > 0;
+     }
+ 
+    /**
+     * @return true if there is an indication of the following type.
+     */
+    public boolean hasIndication(@IndicationType int type) {
+        return mIndicationMessages.containsKey(type);
+    }
+
+     /**
+      * Immediately show the passed indication type and schedule the next indication to show.
+      * Will re-add this indication to be re-shown after all other indications have been
+diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java b/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java
+index 503b5c0ee4b0..e49561ff1f45 100644
+--- a/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java
+@@ -432,12 +432,11 @@ public class KeyguardIndicationController {
+     }
+ 
+     private void updateResting() {
+-        if (mRestingIndication != null
+-                && !mRotateTextViewController.hasIndications()) {
+        if (!mRotateTextViewController.hasIndications()) {
+             mRotateTextViewController.updateIndication(
+                     INDICATION_TYPE_RESTING,
+                     new KeyguardIndication.Builder()
+-                            .setMessage(mRestingIndication)
+                            .setMessage(mContext.getResources().getString(R.string.keyguard_unlock))
+                             .setTextColor(mInitialTextColorState)
+                             .build(),
+                     false);
+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 f1cde8a9be7a..10037fc93d75 100644
+--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardIndicationTextView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardIndicationTextView.java
+@@ -40,7 +40,7 @@ import java.util.LinkedList;
+ public class KeyguardIndicationTextView extends TextView {
+     private static final long MSG_MIN_DURATION_MILLIS_DEFAULT = 1500;
+     private long mNextAnimationTime = 0;
+-    private boolean mAnimationsEnabled = true;
+    private boolean mAnimationsEnabled = false;
+     private LinkedList<CharSequence> mMessages = new LinkedList<>();
+     private LinkedList<KeyguardIndication> mKeyguardIndicationInfo = new LinkedList<>();
+ 
+-- 
+2.25.1
+
--- a/patches_platform_personal/frameworks_base/0009-Keyguard-UI-Fix-status-bar-quick-settings-margins-an.patch
+++ b/patches_platform_personal/frameworks_base/0009-Keyguard-UI-Fix-status-bar-quick-settings-margins-an.patch
@@ -0,0 +1,184 @@
+From 402e431a1bc55508d9d257b7a9baa21d2271feb3 Mon Sep 17 00:00:00 2001
+From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
+Date: Sat, 20 Mar 2021 10:35:14 +0000
+Subject: [PATCH 09/16] Keyguard/UI: Fix status bar / quick settings margins
+ and paddings
+
+- Change keyguard_carrier_text_margin into a padding
+- Link keyguard paddings to status_bar_padding_{start|end}
+- Add status_bar_padding_{start|end} to quick settings header
+- Remove several unnecessary margins and paddings
+
+Change-Id: Ic91fa398813e1907297bb0892c444d96405950e7
+---
+ packages/SystemUI/res/layout/keyguard_status_bar.xml  |  2 +-
+ .../SystemUI/res/layout/quick_qs_status_icons.xml     |  2 --
+ .../layout/quick_status_bar_header_date_privacy.xml   |  6 ++++--
+ packages/SystemUI/res/values-sw600dp/dimens.xml       |  6 ------
+ packages/SystemUI/res/values/dimens.xml               |  6 +++---
+ .../com/android/systemui/qs/QuickStatusBarHeader.java |  8 +++-----
+ .../statusbar/phone/KeyguardStatusBarView.java        | 11 -----------
+ 7 files changed, 11 insertions(+), 30 deletions(-)
+
+diff --git a/packages/SystemUI/res/layout/keyguard_status_bar.xml b/packages/SystemUI/res/layout/keyguard_status_bar.xml
+index eb7638233efd..249689f211af 100644
+--- a/packages/SystemUI/res/layout/keyguard_status_bar.xml
+++ b/packages/SystemUI/res/layout/keyguard_status_bar.xml
+@@ -62,7 +62,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/layout/quick_qs_status_icons.xml b/packages/SystemUI/res/layout/quick_qs_status_icons.xml
+index bbd3e47a568f..a9958aac0270 100644
+--- a/packages/SystemUI/res/layout/quick_qs_status_icons.xml
+++ b/packages/SystemUI/res/layout/quick_qs_status_icons.xml
+@@ -33,8 +33,6 @@
+         android:minWidth="48dp"
+         android:minHeight="48dp"
+         android:gravity="center_vertical|start"
+-        android:paddingStart="@dimen/status_bar_left_clock_starting_padding"
+-        android:paddingEnd="@dimen/status_bar_left_clock_end_padding"
+         android:singleLine="true"
+         android:textAppearance="@style/TextAppearance.QS.Status" />
+ 
+diff --git a/packages/SystemUI/res/layout/quick_status_bar_header_date_privacy.xml b/packages/SystemUI/res/layout/quick_status_bar_header_date_privacy.xml
+index bff93a99258a..43abaa5a4260 100644
+--- a/packages/SystemUI/res/layout/quick_status_bar_header_date_privacy.xml
+++ b/packages/SystemUI/res/layout/quick_status_bar_header_date_privacy.xml
+@@ -34,7 +34,8 @@
+         android:layout_height="match_parent"
+         android:minHeight="48dp"
+         android:layout_weight="1"
+-        android:gravity="center_vertical|start" >
+        android:gravity="center_vertical|start"
+        android:paddingStart="@dimen/status_bar_padding_start" >
+ 
+         <com.android.systemui.statusbar.policy.DateView
+             android:id="@+id/date"
+@@ -71,7 +72,8 @@
+         android:layout_height="match_parent"
+         android:minHeight="48dp"
+         android:layout_weight="1"
+-        android:gravity="center_vertical|end" >
+        android:gravity="center_vertical|end"
+        android:paddingEnd="@dimen/status_bar_padding_end" >
+ 
+     <include layout="@layout/ongoing_privacy_chip" />
+ 
+diff --git a/packages/SystemUI/res/values-sw600dp/dimens.xml b/packages/SystemUI/res/values-sw600dp/dimens.xml
+index da80b85b38bf..59a55d3a1197 100644
+--- a/packages/SystemUI/res/values-sw600dp/dimens.xml
+++ b/packages/SystemUI/res/values-sw600dp/dimens.xml
+@@ -53,9 +53,6 @@
+     <!-- end margin for multi user switch in collapsed quick settings -->
+     <dimen name="multi_user_switch_keyguard_margin">6dp</dimen>
+ 
+-    <!-- Margin on the left side of the carrier text on Keyguard -->
+-    <dimen name="keyguard_carrier_text_margin">24dp</dimen>
+-
+     <!-- The width/height of the phone/camera/unlock icon on keyguard. -->
+     <dimen name="keyguard_affordance_height">80dp</dimen>
+     <dimen name="keyguard_affordance_width">120dp</dimen>
+@@ -64,9 +61,6 @@
+      phone hints. -->
+     <dimen name="edge_tap_area_width">80dp</dimen>
+ 
+-    <!-- Margin on the right side of the system icon group on Keyguard. -->
+-    <dimen name="system_icons_keyguard_padding_end">2dp</dimen>
+-
+     <!-- Screen pinning request width -->
+     <dimen name="screen_pinning_request_width">400dp</dimen>
+     <!-- Screen pinning request bottom button circle widths -->
+diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml
+index 661a03aa9671..879f20ea8328 100644
+--- a/packages/SystemUI/res/values/dimens.xml
+++ b/packages/SystemUI/res/values/dimens.xml
+@@ -450,7 +450,7 @@
+     <dimen name="system_icons_super_container_margin_start">16dp</dimen>
+ 
+     <!-- Margin end of the system icons super container when the avatar is missing. -->
+-    <dimen name="system_icons_super_container_avatarless_margin_end">6dp</dimen>
+    <dimen name="system_icons_super_container_avatarless_margin_end">0dp</dimen>
+ 
+     <!-- Width for the notification panel and related windows -->
+     <dimen name="match_parent">-1px</dimen>
+@@ -871,7 +871,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>
+ 
+     <!-- Margin on the left side of the battery % in the header. -->
+     <dimen name="header_battery_margin_expanded">6dp</dimen>
+@@ -880,7 +880,7 @@
+     <dimen name="header_battery_margin_keyguard">6dp</dimen>
+ 
+     <!-- Margin on the right side of the system icon group on Keyguard. -->
+-    <dimen name="system_icons_keyguard_padding_end">4dp</dimen>
+    <dimen name="system_icons_keyguard_padding_end">@dimen/status_bar_padding_end</dimen>
+ 
+     <!-- Additional translation (downwards) for appearing notifications when going to the full shade
+          from Keyguard. -->
+diff --git a/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java b/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java
+index 8cbfefcb4fea..d8dde9cab7ef 100644
+--- a/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java
+@@ -386,7 +386,9 @@ public class QuickStatusBarHeader extends FrameLayout {
+                 StatusBarWindowView.paddingNeededForCutoutAndRoundedCorner(
+                         cutout, cornerCutoutPadding, -1);
+         mDatePrivacyView.setPadding(padding.first, 0, padding.second, 0);
+-        mClockIconsView.setPadding(padding.first, 0, padding.second, 0);
+        if (cutout == null) {
+            mDateContainer.setPadding(0, 0, 0, 0);
+        }
+         LinearLayout.LayoutParams datePrivacySeparatorLayoutParams =
+                 (LinearLayout.LayoutParams) mDatePrivacySeparator.getLayoutParams();
+         LinearLayout.LayoutParams mClockIconsSeparatorLayoutParams =
+@@ -476,10 +478,6 @@ public class QuickStatusBarHeader extends FrameLayout {
+                 mWaterfallTopInset,
+                 paddingRight,
+                 0);
+-        mClockIconsView.setPadding(paddingLeft,
+-                mWaterfallTopInset,
+-                paddingRight,
+-                0);
+     }
+ 
+     public void updateEverything() {
+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 4d6886714120..2ac8b3fe7bdb 100644
+--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java
+@@ -162,23 +162,12 @@ public class KeyguardStatusBarView extends RelativeLayout implements
+         lp.setMarginStart(getResources().getDimensionPixelSize(
+                 R.dimen.system_icons_super_container_margin_start));
+         mSystemIconsContainer.setLayoutParams(lp);
+-        mSystemIconsContainer.setPaddingRelative(mSystemIconsContainer.getPaddingStart(),
+-                mSystemIconsContainer.getPaddingTop(),
+-                getResources().getDimensionPixelSize(R.dimen.system_icons_keyguard_padding_end),
+-                mSystemIconsContainer.getPaddingBottom());
+ 
+         // Respect font size setting.
+         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.25.1
+
--- a/patches_platform_personal/frameworks_base/0010-Revert-monet-Add-support-for-monet-cam16.patch
+++ b/patches_platform_personal/frameworks_base/0010-Revert-monet-Add-support-for-monet-cam16.patch
@@ -0,0 +1,322 @@
+From ac9ca429fc99fd2e879567617f52fc15d6b6e33b Mon Sep 17 00:00:00 2001
+From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
+Date: Tue, 19 Oct 2021 12:11:24 +0000
+Subject: [PATCH 10/16] Revert "monet: Add support for monet (cam16)"
+
+This reverts commit f4460c9cb0494ddcc1829b05298d140fa1afc526.
+---
+ .../com/android/systemui/monet/ColorScheme.kt | 168 ------------------
+ .../com/android/systemui/monet/Shades.java    |  19 --
+ .../theme/ThemeOverlayController.java         |  55 ++----
+ 3 files changed, 10 insertions(+), 232 deletions(-)
+ delete mode 100644 packages/SystemUI/src/com/android/systemui/monet/ColorScheme.kt
+ delete mode 100644 packages/SystemUI/src/com/android/systemui/monet/Shades.java
+
+diff --git a/packages/SystemUI/src/com/android/systemui/monet/ColorScheme.kt b/packages/SystemUI/src/com/android/systemui/monet/ColorScheme.kt
+deleted file mode 100644
+index 56a9c805ca81..000000000000
+--- a/packages/SystemUI/src/com/android/systemui/monet/ColorScheme.kt
+++ /dev/null
+@@ -1,168 +0,0 @@
+-package com.android.systemui.monet
+-
+-import android.app.WallpaperColors
+-import android.graphics.Color
+-import com.android.internal.graphics.ColorUtils
+-import com.android.internal.graphics.cam.Cam
+-import com.android.internal.graphics.cam.CamUtils
+-import kotlin.math.absoluteValue
+-import kotlin.math.roundToInt
+-
+-public class ColorScheme(i: Int, val darkTheme: Boolean) {
+-    val accent1: List<Int>
+-    val accent2: List<Int>
+-    val accent3: List<Int>
+-    val neutral1: List<Int>
+-    val neutral2: List<Int>
+-
+-    init {
+-        val fromInt = Cam.fromInt(if (i == 0) -14979341 else i)
+-        val hue = fromInt.hue
+-        accent1 = Shades.of(hue, fromInt.chroma.coerceAtLeast(48.0f)).toList()
+-        accent2 = Shades.of(hue, 16.0f).toList()
+-        accent3 = Shades.of(60.0f + hue, 32.0f).toList()
+-        neutral1 = Shades.of(hue, 4.0f).toList()
+-        neutral2 = Shades.of(hue, 8.0f).toList()
+-    }
+-
+-    val accentColors1: List<Int>
+-        get() {
+-            return accent1
+-        }
+-
+-    val allAccentColors: List<Int>
+-        get() {
+-            val arrayList = mutableListOf<Int>()
+-            arrayList.addAll(accent1)
+-            arrayList.addAll(accent2)
+-            arrayList.addAll(accent3)
+-            return arrayList
+-        }
+-
+-    val allNeutralColors: List<Int>
+-        get() {
+-            val arrayList = mutableListOf<Int>()
+-            arrayList.addAll(neutral1)
+-            arrayList.addAll(neutral2)
+-            return arrayList
+-        }
+-
+-    override fun toString(): String {
+-        return "ColorScheme {\n" +
+-                "  neutral1: ${humanReadable(neutral1)}\n" +
+-                "  neutral2: ${humanReadable(neutral2)}\n" +
+-                "  accent1: ${humanReadable(accent1)}\n" +
+-                "  accent2: ${humanReadable(accent2)}\n" +
+-                "  accent3: ${humanReadable(accent3)}\n" +
+-                "}"
+-    }
+-
+-    companion object {
+-        @JvmStatic
+-        fun getSeedColor(wallpaperColors: WallpaperColors): Int {
+-            return getSeedColors(wallpaperColors).first()
+-        }
+-
+-        @JvmStatic
+-        fun getSeedColors(wallpaperColors: WallpaperColors): List<Int> {
+-            val intValue2 = wallpaperColors.allColors.values.reduce { a, b -> a + b }.toDouble()
+-            val z2 = (intValue2 == 0.0)
+-            if (z2) {
+-                val list2 = wallpaperColors.mainColors.map {
+-                    it.toArgb()
+-                }.distinct().filter {
+-                    Cam.fromInt(it).chroma >= 15.0f && CamUtils.lstarFromInt(it) >= 10.0f
+-                }.toList()
+-
+-                if (list2.isEmpty()) {
+-                    return listOf(-14979341)
+-                }
+-                return list2
+-            }
+-
+-            val linkedHashMap = wallpaperColors.allColors.mapValues { it.value.toDouble() / intValue2 }
+-
+-            val linkedHashMap2 = wallpaperColors.allColors.mapValues { Cam.fromInt(it.key) }
+-
+-            val huePopulation = huePopulations(linkedHashMap2, linkedHashMap)
+-
+-            val linkedHashMap3 = wallpaperColors.allColors.mapValues {
+-                val cam = linkedHashMap2[it.key]!!
+-                val i = cam.hue.roundToInt()
+-                val i2 = i - 15
+-                val i3 = i + 15
+-                var d = 0.0
+-                for (a in i2..i3) {
+-                    d += huePopulation[wrapDegrees(a)]
+-                }
+-                d
+-            }
+-
+-            val linkedHashMap4 = linkedHashMap2.filter {
+-                val key4 = it.key
+-                val lstarFromInt = CamUtils.lstarFromInt(key4)
+-                val d2 = linkedHashMap3[key4]!!
+-                it.value.chroma >= 15.0f && lstarFromInt >= 10.0f && (z2 || d2 > 0.01)
+-            }
+-
+-            val arrayList3 = mutableListOf<Int>()
+-            val linkedHashMap5 = linkedHashMap4.mapValues {
+-                score(it.value, linkedHashMap3[it.key]!!)
+-            }
+-
+-            val list3 = linkedHashMap5.entries.toMutableList()
+-            list3.sortByDescending { it.value }
+-
+-            for (entry6 in list3) {
+-               val num2 = entry6.key
+-               val z = arrayList3.find {
+-                    val hue1 = linkedHashMap2[num2]!!.hue
+-                    val hue2 = linkedHashMap2[it]!!.hue
+-                    hueDiff(hue1, hue2) < 15 } != null
+-                if (z) {
+-                    continue
+-                }
+-                arrayList3.add(num2)
+-            }
+-
+-            if (arrayList3.isEmpty()) {
+-                arrayList3.add(-14979341)
+-            }
+-
+-            return arrayList3;
+-       }
+-
+-        private fun wrapDegrees(i: Int): Int {
+-            if (i < 0) {
+-                return (i % 360) + 360
+-            }
+-            return if (i >= 360) i % 360 else i
+-        }
+-
+-        private fun hueDiff(f: Float, f2: Float): Float {
+-            return 180f - ((f - f2).absoluteValue - 180f).absoluteValue
+-        }
+-
+-        private fun humanReadable(list: List<Int>): String {
+-            return list.joinToString { "#" + Integer.toHexString(it) }
+-        }
+-
+-        private fun score(cam: Cam, d: Double): Double {
+-            val f = cam.getChroma()
+-            val d2 = if (f < 48.0) 0.1 else 0.3
+-            val d3 = d * 70.0
+-            return ((f - 48.0) * d2) + d3
+-        }
+-
+-        private fun huePopulations(map: Map<Int, Cam>, map2: Map<Int, Double>): List<Double> {
+-            val arrayList = List(size = 360, init = { 0.0 }).toMutableList()
+-            for (entry in map2.entries) {
+-                val d = map2[entry.key]!!
+-                val cam = map[entry.key]!!
+-                val i2 = cam.hue.roundToInt() % 360
+-                arrayList[i2] = arrayList[i2] + d
+-            }
+-            return arrayList
+-        }
+-    }
+-}
+diff --git a/packages/SystemUI/src/com/android/systemui/monet/Shades.java b/packages/SystemUI/src/com/android/systemui/monet/Shades.java
+deleted file mode 100644
+index 5ab00a1afcb4..000000000000
+--- a/packages/SystemUI/src/com/android/systemui/monet/Shades.java
+++ /dev/null
+@@ -1,19 +0,0 @@
+-package com.android.systemui.monet;
+-
+-import com.android.internal.annotations.VisibleForTesting;
+-import com.android.internal.graphics.ColorUtils;
+-
+-@VisibleForTesting
+-public class Shades {
+-    public static int[] of(float f, float f2) {
+-        int[] iArr = new int[12];
+-        iArr[0] = ColorUtils.CAMToColor(f, f2, 99.0f);
+-        iArr[1] = ColorUtils.CAMToColor(f, f2, 95.0f);
+-        int i = 2;
+-        while (i < 12) {
+-            iArr[i] = ColorUtils.CAMToColor(f, f2, i == 6 ? 49.6f : (float) (100 - ((i - 1) * 10)));
+-            i++;
+-        }
+-        return iArr;
+-    }
+-}
+diff --git a/packages/SystemUI/src/com/android/systemui/theme/ThemeOverlayController.java b/packages/SystemUI/src/com/android/systemui/theme/ThemeOverlayController.java
+index 7cd3ae1f8062..81999b534046 100644
+--- a/packages/SystemUI/src/com/android/systemui/theme/ThemeOverlayController.java
+++ b/packages/SystemUI/src/com/android/systemui/theme/ThemeOverlayController.java
+@@ -37,7 +37,6 @@ import android.content.IntentFilter;
+ import android.content.om.FabricatedOverlay;
+ import android.content.om.OverlayIdentifier;
+ import android.content.pm.UserInfo;
+-import android.content.res.Configuration;
+ import android.database.ContentObserver;
+ import android.graphics.Color;
+ import android.net.Uri;
+@@ -48,11 +47,9 @@ import android.provider.Settings;
+ import android.text.TextUtils;
+ import android.util.ArrayMap;
+ import android.util.Log;
+-import android.util.TypedValue;
+ 
+ import androidx.annotation.NonNull;
+ 
+-import com.android.internal.graphics.ColorUtils;
+ import com.android.systemui.Dumpable;
+ import com.android.systemui.SystemUI;
+ import com.android.systemui.broadcast.BroadcastDispatcher;
+@@ -62,7 +59,6 @@ import com.android.systemui.dagger.qualifiers.Main;
+ import com.android.systemui.dump.DumpManager;
+ import com.android.systemui.keyguard.WakefulnessLifecycle;
+ import com.android.systemui.settings.UserTracker;
+-import com.android.systemui.monet.ColorScheme;
+ import com.android.systemui.statusbar.FeatureFlags;
+ import com.android.systemui.statusbar.policy.DeviceProvisionedController;
+ import com.android.systemui.statusbar.policy.DeviceProvisionedController.DeviceProvisionedListener;
+@@ -75,7 +71,6 @@ import java.io.FileDescriptor;
+ import java.io.PrintWriter;
+ import java.util.Collection;
+ import java.util.HashSet;
+-import java.util.List;
+ import java.util.Map;
+ import java.util.Set;
+ import java.util.concurrent.Executor;
+@@ -408,55 +403,25 @@ public class ThemeOverlayController extends SystemUI implements Dumpable {
+      * Return the main theme color from a given {@link WallpaperColors} instance.
+      */
+     protected int getNeutralColor(@NonNull WallpaperColors wallpaperColors) {
+-        return ColorScheme.getSeedColor(wallpaperColors);
+        return wallpaperColors.getPrimaryColor().toArgb();
+     }
+ 
+     protected int getAccentColor(@NonNull WallpaperColors wallpaperColors) {
+-        return ColorScheme.getSeedColor(wallpaperColors);
+-    }
+-
+-    private final boolean inDarkMode() {
+-        return (mContext.getResources().getConfiguration().uiMode
+-                & Configuration.UI_MODE_NIGHT_MASK) == Configuration.UI_MODE_NIGHT_YES;
+        Color accentCandidate = wallpaperColors.getSecondaryColor();
+        if (accentCandidate == null) {
+            accentCandidate = wallpaperColors.getTertiaryColor();
+        }
+        if (accentCandidate == null) {
+            accentCandidate = wallpaperColors.getPrimaryColor();
+        }
+        return accentCandidate.toArgb();
+     }
+ 
+     /**
+      * Given a color candidate, return an overlay definition.
+      */
+     protected @Nullable FabricatedOverlay getOverlay(int color, int type) {
+-        ColorScheme colorScheme = new ColorScheme(color, inDarkMode());
+-        List<Integer> colors;
+-        String name;
+-
+-        if (type == ACCENT) {
+-            colors = colorScheme.getAllAccentColors();
+-            name = "accent";
+-        } else {
+-            colors = colorScheme.getAllNeutralColors();
+-            name = "neutral";
+-        }
+-
+-        int size = colorScheme.getAccent1().size();
+-        FabricatedOverlay.Builder builder = new FabricatedOverlay.Builder(mContext.getPackageName(), name, "android");
+-
+-        for (int i = 0; i < colors.size(); i++) {
+-            int lightness = i % size;
+-            int shade = i / size + 1;
+-
+-            String targetResource;
+-            if (lightness == 0) {
+-                targetResource = "android:color/system_" + name + shade + "_10";
+-            } else if (lightness == 1) {
+-                targetResource = "android:color/system_" + name + shade + "_50";
+-            } else {
+-                targetResource = "android:color/system_" + name + shade + "_" + (lightness - 1) + "00";
+-            }
+-
+-            builder.setResourceValue(targetResource, TypedValue.TYPE_INT_COLOR_ARGB8,
+-                    ColorUtils.setAlphaComponent(colors.get(i).intValue(), 0xFF));
+-        }
+-
+-        return builder.build();
+        return null;
+     }
+ 
+     private void updateThemeOverlays() {
+-- 
+2.25.1
+
--- a/patches_platform_personal/frameworks_base/0011-Revert-Update-RAT-icons-to-match-Silk-design.patch
+++ b/patches_platform_personal/frameworks_base/0011-Revert-Update-RAT-icons-to-match-Silk-design.patch
@@ -0,0 +1,273 @@
+From 7628ee0b937931a503ae11d1b6fb4270afbc9cf6 Mon Sep 17 00:00:00 2001
+From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
+Date: Sun, 5 Sep 2021 01:20:12 +0000
+Subject: [PATCH 11/16] 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_5g_uc_mobiledata.xml      | 33 -------------------
+ .../res/drawable/ic_5g_uw_mobiledata.xml      | 33 -------------------
+ .../res/drawable/ic_carrier_wifi.xml          | 15 +++++----
+ .../res/drawable/ic_lte_mobiledata.xml        | 23 +++++++------
+ .../res/drawable/stat_sys_roaming_large.xml   | 10 +++---
+ 8 files changed, 59 insertions(+), 113 deletions(-)
+ delete mode 100644 packages/SettingsLib/res/drawable/ic_5g_uc_mobiledata.xml
+ delete mode 100644 packages/SettingsLib/res/drawable/ic_5g_uw_mobiledata.xml
+
+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_5g_uc_mobiledata.xml b/packages/SettingsLib/res/drawable/ic_5g_uc_mobiledata.xml
+deleted file mode 100644
+index 93fcad298c3f..000000000000
+--- a/packages/SettingsLib/res/drawable/ic_5g_uc_mobiledata.xml
+++ /dev/null
+@@ -1,33 +0,0 @@
+-<!--
+-     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.
+--->
+-<vector xmlns:android="http://schemas.android.com/apk/res/android"
+-        android:width="27dp"
+-        android:height="16dp"
+-        android:viewportWidth="27.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"/>
+-    <path
+-        android:fillColor="#FF000000"
+-        android:pathData="M23,7.39c-0.53,0 -0.94,-0.16 -1.25,-0.47C21.45,6.6 21.3,6.16 21.3,5.6V3h0.8v2.66c0,0.3 0.08,0.54 0.23,0.71C22.48,6.54 22.7,6.62 23,6.62c0.3,0 0.52,-0.08 0.67,-0.25c0.15,-0.17 0.23,-0.41 0.23,-0.71V3h0.8v2.6c0,0.36 -0.07,0.67 -0.2,0.94s-0.33,0.48 -0.58,0.62C23.65,7.32 23.35,7.39 23,7.39z"/>
+-    <path
+-        android:fillColor="#FF000000"
+-        android:pathData="M22.99,13.1c-0.39,0 -0.73,-0.09 -1.03,-0.28c-0.3,-0.19 -0.53,-0.45 -0.7,-0.79C21.08,11.7 21,11.3 21,10.85c0,-0.46 0.08,-0.85 0.25,-1.19c0.17,-0.34 0.41,-0.6 0.71,-0.78c0.3,-0.18 0.65,-0.28 1.04,-0.28c0.31,0 0.59,0.05 0.86,0.16c0.26,0.11 0.48,0.27 0.65,0.48c0.18,0.21 0.28,0.48 0.32,0.8l-0.83,0.14c-0.06,-0.26 -0.17,-0.46 -0.35,-0.6C23.49,9.44 23.27,9.37 23,9.37c-0.22,0 -0.42,0.06 -0.61,0.17c-0.18,0.11 -0.32,0.28 -0.43,0.5c-0.1,0.22 -0.16,0.49 -0.16,0.81c0,0.32 0.05,0.58 0.16,0.8s0.25,0.39 0.43,0.5c0.18,0.11 0.38,0.17 0.61,0.17c0.26,0 0.47,-0.07 0.65,-0.21c0.18,-0.14 0.3,-0.34 0.35,-0.59l0.85,0.09c-0.06,0.29 -0.17,0.54 -0.32,0.77c-0.15,0.22 -0.36,0.39 -0.61,0.52C23.66,13.03 23.35,13.1 22.99,13.1z"/>
+-</vector>
+diff --git a/packages/SettingsLib/res/drawable/ic_5g_uw_mobiledata.xml b/packages/SettingsLib/res/drawable/ic_5g_uw_mobiledata.xml
+deleted file mode 100644
+index ca47b6ff2edb..000000000000
+--- a/packages/SettingsLib/res/drawable/ic_5g_uw_mobiledata.xml
+++ /dev/null
+@@ -1,33 +0,0 @@
+-<!--
+-     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.
+--->
+-<vector xmlns:android="http://schemas.android.com/apk/res/android"
+-        android:width="27dp"
+-        android:height="16dp"
+-        android:viewportWidth="27.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"/>
+-    <path
+-        android:fillColor="#FF000000"
+-        android:pathData="M23,7.39c-0.53,0 -0.94,-0.16 -1.25,-0.47C21.45,6.6 21.3,6.16 21.3,5.6V3h0.8v2.66c0,0.3 0.08,0.54 0.23,0.71C22.48,6.54 22.7,6.62 23,6.62c0.3,0 0.52,-0.08 0.67,-0.25c0.15,-0.17 0.23,-0.41 0.23,-0.71V3h0.8v2.6c0,0.36 -0.07,0.67 -0.2,0.94s-0.33,0.48 -0.58,0.62C23.65,7.32 23.35,7.39 23,7.39z"/>
+-    <path
+-        android:fillColor="#FF000000"
+-        android:pathData="M21.41,13L20.3,8.7h0.73l0.64,2.78l0.07,0.38h0.04l0.09,-0.38l0.81,-2.78h0.66l0.79,2.78l0.09,0.37h0.04l0.07,-0.37l0.65,-2.78h0.72L24.59,13H23.9l-0.78,-2.84l-0.1,-0.41h-0.04l-0.1,0.41L22.08,13H21.41z"/>
+-</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.25.1
+
--- a/patches_platform_personal/frameworks_base/0012-UI-Always-render-windows-into-cutouts.patch
+++ b/patches_platform_personal/frameworks_base/0012-UI-Always-render-windows-into-cutouts.patch
@@ -0,0 +1,72 @@
+From 1ff9c15ea9fa247beb1320f3cc88d066394d6355 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 12/16] UI: Always render windows into cutouts
+
+Eliminates black/white letterboxing
+Quick and dirty way to do the latter - wait for proper fix from Google
+
+Change-Id: I4661c7979bfa7de453329fcddbaeefc2009e2da3
+---
+ .../com/android/server/wm/DisplayFrames.java  | 31 +++----------------
+ .../com/android/server/wm/DisplayPolicy.java  |  2 +-
+ 2 files changed, 5 insertions(+), 28 deletions(-)
+
+diff --git a/services/core/java/com/android/server/wm/DisplayFrames.java b/services/core/java/com/android/server/wm/DisplayFrames.java
+index 32e43ca4e56c..18c28ae674f9 100644
+--- a/services/core/java/com/android/server/wm/DisplayFrames.java
+++ b/services/core/java/com/android/server/wm/DisplayFrames.java
+@@ -98,33 +98,10 @@ public class DisplayFrames {
+         state.setDisplayCutout(cutout);
+         state.setRoundedCorners(roundedCorners);
+         state.setPrivacyIndicatorBounds(indicatorBounds);
+-        if (!cutout.isEmpty()) {
+-            if (cutout.getSafeInsetLeft() > 0) {
+-                safe.left = unrestricted.left + cutout.getSafeInsetLeft();
+-            }
+-            if (cutout.getSafeInsetTop() > 0) {
+-                safe.top = unrestricted.top + cutout.getSafeInsetTop();
+-            }
+-            if (cutout.getSafeInsetRight() > 0) {
+-                safe.right = unrestricted.right - cutout.getSafeInsetRight();
+-            }
+-            if (cutout.getSafeInsetBottom() > 0) {
+-                safe.bottom = unrestricted.bottom - cutout.getSafeInsetBottom();
+-            }
+-            state.getSource(ITYPE_LEFT_DISPLAY_CUTOUT).setFrame(
+-                    unrestricted.left, unrestricted.top, safe.left, unrestricted.bottom);
+-            state.getSource(ITYPE_TOP_DISPLAY_CUTOUT).setFrame(
+-                    unrestricted.left, unrestricted.top, unrestricted.right, safe.top);
+-            state.getSource(ITYPE_RIGHT_DISPLAY_CUTOUT).setFrame(
+-                    safe.right, unrestricted.top, unrestricted.right, unrestricted.bottom);
+-            state.getSource(ITYPE_BOTTOM_DISPLAY_CUTOUT).setFrame(
+-                    unrestricted.left, safe.bottom, unrestricted.right, unrestricted.bottom);
+-        } else {
+-            state.removeSource(ITYPE_LEFT_DISPLAY_CUTOUT);
+-            state.removeSource(ITYPE_TOP_DISPLAY_CUTOUT);
+-            state.removeSource(ITYPE_RIGHT_DISPLAY_CUTOUT);
+-            state.removeSource(ITYPE_BOTTOM_DISPLAY_CUTOUT);
+-        }
+        state.removeSource(ITYPE_LEFT_DISPLAY_CUTOUT);
+        state.removeSource(ITYPE_TOP_DISPLAY_CUTOUT);
+        state.removeSource(ITYPE_RIGHT_DISPLAY_CUTOUT);
+        state.removeSource(ITYPE_BOTTOM_DISPLAY_CUTOUT);
+         return true;
+     }
+ 
+diff --git a/services/core/java/com/android/server/wm/DisplayPolicy.java b/services/core/java/com/android/server/wm/DisplayPolicy.java
+index a070942cc76a..32abd1e60714 100644
+--- a/services/core/java/com/android/server/wm/DisplayPolicy.java
+++ b/services/core/java/com/android/server/wm/DisplayPolicy.java
+@@ -1604,7 +1604,7 @@ public class DisplayPolicy {
+             pf.set((fl & FLAG_LAYOUT_IN_SCREEN) == 0 ? attached.getFrame() : df);
+         }
+ 
+-        final int cutoutMode = attrs.layoutInDisplayCutoutMode;
+        final int cutoutMode = LAYOUT_IN_DISPLAY_CUTOUT_MODE_ALWAYS;
+         // Ensure that windows with a DEFAULT or NEVER display cutout mode are laid out in
+         // the cutout safe zone.
+         if (cutoutMode != LAYOUT_IN_DISPLAY_CUTOUT_MODE_ALWAYS) {
+-- 
+2.25.1
+
--- a/patches_platform_personal/frameworks_base/0013-UI-Kill-rounded-corners-in-notification-scrim.patch
+++ b/patches_platform_personal/frameworks_base/0013-UI-Kill-rounded-corners-in-notification-scrim.patch
@@ -0,0 +1,28 @@
+From 3e6c3af43dd9f9c780bb678b0af3485f63255f37 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 13/16] 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 879f20ea8328..ad49bf4237b6 100644
+--- a/packages/SystemUI/res/values/dimens.xml
+++ b/packages/SystemUI/res/values/dimens.xml
+@@ -760,7 +760,7 @@
+     <item name="keyguard_clock_line_spacing_scale_burmese" type="dimen" format="float">1</item>
+ 
+     <item name="scrim_behind_alpha" format="float" type="dimen">0.62</item>
+-    <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.25.1
+
--- a/patches_platform_personal/frameworks_base/0014-UI-Reconfigure-power-menu-items.patch
+++ b/patches_platform_personal/frameworks_base/0014-UI-Reconfigure-power-menu-items.patch
@@ -0,0 +1,33 @@
+From 26e5a2cc1640b3de6881d9e02f910765341c146a 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 14/16] UI: Reconfigure power menu items
+
+Screenshot/airplane are broken as of now
+
+Change-Id: I32cca6e2c6bb64d891efee959127edf7c0802cbc
+---
+ core/res/res/values/config.xml | 5 -----
+ 1 file changed, 5 deletions(-)
+
+diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
+index 18804e472478..c52fa8427069 100644
+--- a/core/res/res/values/config.xml
+++ b/core/res/res/values/config.xml
+@@ -2947,13 +2947,8 @@
+          "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>
+     </string-array>
+ 
+     <!-- Number of milliseconds to hold a wake lock to ensure that drawing is fully
+-- 
+2.25.1
+
--- a/patches_platform_personal/frameworks_base/0015-UI-Relax-requirement-for-HINT_SUPPORTS_DARK_TEXT.patch
+++ b/patches_platform_personal/frameworks_base/0015-UI-Relax-requirement-for-HINT_SUPPORTS_DARK_TEXT.patch
@@ -0,0 +1,28 @@
+From b0b4ff2c65c6eb6e5182134db272d5bdf9d0cef0 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 15/16] 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 7ef0a19ec44c..8dbf94a9caad 100644
+--- a/core/java/android/app/WallpaperColors.java
+++ b/core/java/android/app/WallpaperColors.java
+@@ -543,7 +543,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.25.1
+
--- a/patches_platform_personal/frameworks_base/0016-UI-Remove-privacy-dot-padding.patch
+++ b/patches_platform_personal/frameworks_base/0016-UI-Remove-privacy-dot-padding.patch
@@ -0,0 +1,26 @@
+From 14441d096f1442c397d65ee31f962f7a8c861ae3 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 16/16] UI: Remove privacy dot padding
+
+Change-Id: I5d2e2b3e36f027b4348a83030d4b4d3c4f0209d1
+---
+ 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 ad49bf4237b6..19815aa58acb 100644
+--- a/packages/SystemUI/res/values/dimens.xml
+++ b/packages/SystemUI/res/values/dimens.xml
+@@ -1271,7 +1271,7 @@
+     <dimen name="ongoing_appops_chip_max_width">76dp</dimen>
+     <dimen name="ongoing_appops_dot_diameter">6dp</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.25.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-Do-not-warn-about-SELinux-and-build-signature-st.patch
+++ b/patches_platform_personal/lineage-sdk/0001-sdk-Do-not-warn-about-SELinux-and-build-signature-st.patch
@@ -0,0 +1,33 @@
+From 8a3d38d3148713836c12d85f7fc4a6a366cc00e4 Mon Sep 17 00:00:00 2001
+From: AndyCGYan <GeForce8800Ultra@gmail.com>
+Date: Mon, 4 Mar 2019 14:27:56 +0800
+Subject: [PATCH] sdk: Do not warn about SELinux and build signature status
+
+Change-Id: I6e1ca9f2c2f7763364a9a370f444dfe8059d0563
+---
+ .../org/lineageos/platform/internal/TrustInterfaceService.java   | 9 ---------
+ 1 file changed, 9 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 2dcb938..e9f2dca 100644
+--- a/lineage/lib/main/java/org/lineageos/platform/internal/TrustInterfaceService.java
+++ b/lineage/lib/main/java/org/lineageos/platform/internal/TrustInterfaceService.java
+@@ -197,15 +197,6 @@ public class TrustInterfaceService extends LineageSystemService {
+     }
+ 
+     private void runTestInternal() {
+-        int selinuxStatus = getSELinuxStatus();
+-        if (selinuxStatus != TrustInterface.TRUST_FEATURE_LEVEL_GOOD) {
+-            postNotificationForFeatureInternal(TrustInterface.TRUST_WARN_SELINUX);
+-        }
+-
+-        int keysStatus = getKeysStatus();
+-        if (keysStatus != TrustInterface.TRUST_FEATURE_LEVEL_GOOD) {
+-            postNotificationForFeatureInternal(TrustInterface.TRUST_WARN_PUBLIC_KEY);
+-        }
+     }
+ 
+     /* Utils */
+-- 
+2.7.4
+
--- a/patches_platform_personal/packages_apps_DeskClock/0001-DeskClock-Adjust-colors-and-layout.patch
+++ b/patches_platform_personal/packages_apps_DeskClock/0001-DeskClock-Adjust-colors-and-layout.patch
--- a/patches_platform_personal/packages_apps_DeskClock/0002-DeskClock-Revert-date-and-clock-to-Lollipop-style.patch
+++ b/patches_platform_personal/packages_apps_DeskClock/0002-DeskClock-Revert-date-and-clock-to-Lollipop-style.patch
@@ -0,0 +1,561 @@
+From 9dbc9d8105c3df1efe714d509622d338e7b9413f Mon Sep 17 00:00:00 2001
+From: AndyCGYan <GeForce8800Ultra@gmail.com>
+Date: Wed, 26 Dec 2018 22:38:54 +0800
+Subject: [PATCH 2/3] DeskClock: Revert date and clock to Lollipop style
+
+Also added dynamic date format based on alarm presence
+
+Change-Id: I04ce41d4817c794edb1579dc3a493a1cf1e8d658
+---
+ res/layout-land/main_clock_frame.xml          |  1 +
+ res/layout/date_and_next_alarm_time.xml       |  6 ++----
+ res/layout/digital_widget.xml                 |  4 ++--
+ res/layout/digital_widget_sizer.xml           |  2 --
+ res/layout/main_clock_frame.xml               |  1 +
+ res/layout/stopwatch_time.xml                 |  1 -
+ res/layout/timer_setup_time.xml               |  2 +-
+ res/layout/world_clock_remote_list_item.xml   |  8 +++----
+ res/values-h560dp/dimens.xml                  |  2 +-
+ res/values-h650dp/dimens.xml                  |  2 +-
+ res/values-v21/styles.xml                     |  8 +++----
+ res/values-v23/styles.xml                     |  2 --
+ res/values/dimens.xml                         | 10 ++++-----
+ res/values/styles.xml                         |  5 +++--
+ .../alarmclock/DigitalAppWidgetProvider.java  | 10 +++++++--
+ src/com/android/deskclock/ClockFragment.java  | 21 ++++++++++++-------
+ src/com/android/deskclock/Screensaver.java    |  8 ++++---
+ .../deskclock/ScreensaverActivity.java        |  8 ++++---
+ src/com/android/deskclock/Utils.java          | 16 ++++++++++++--
+ 19 files changed, 70 insertions(+), 47 deletions(-)
+
+diff --git a/res/layout-land/main_clock_frame.xml b/res/layout-land/main_clock_frame.xml
+index b72f62333..a1fa3557d 100644
+--- a/res/layout-land/main_clock_frame.xml
+++ b/res/layout-land/main_clock_frame.xml
+@@ -38,6 +38,7 @@
+         <com.android.deskclock.widget.AutoSizingTextClock
+             android:id="@+id/digital_clock"
+             style="@style/display_time"
+            android:fontFamily="sans-serif-thin"
+             android:layout_width="wrap_content"
+             android:layout_height="wrap_content"
+             android:ellipsize="none"
+diff --git a/res/layout/date_and_next_alarm_time.xml b/res/layout/date_and_next_alarm_time.xml
+index ad25502a8..e4edff237 100644
+--- a/res/layout/date_and_next_alarm_time.xml
+++ b/res/layout/date_and_next_alarm_time.xml
+@@ -25,8 +25,7 @@
+         android:id="@+id/date"
+         style="@style/body"
+         android:layout_width="wrap_content"
+-        android:layout_height="wrap_content"
+-        android:textAllCaps="true" />
+        android:layout_height="wrap_content" />
+ 
+     <TextView
+         android:id="@+id/nextAlarmIcon"
+@@ -45,7 +44,6 @@
+         android:id="@+id/nextAlarm"
+         style="@style/body"
+         android:layout_width="wrap_content"
+-        android:layout_height="wrap_content"
+-        android:textAllCaps="true" />
+        android:layout_height="wrap_content" />
+ 
+ </LinearLayout>
+\ No newline at end of file
+diff --git a/res/layout/digital_widget.xml b/res/layout/digital_widget.xml
+index c5b4837a6..7e2bae454 100644
+--- a/res/layout/digital_widget.xml
+++ b/res/layout/digital_widget.xml
+@@ -43,13 +43,13 @@
+         <TextClock
+             android:id="@+id/date"
+             style="@style/widget_label"
+            android:fontFamily="sans-serif"
+             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" />
+ 
+         <ImageView
+@@ -63,13 +63,13 @@
+         <TextView
+             android:id="@+id/nextAlarm"
+             style="@style/widget_label"
+            android:fontFamily="sans-serif"
+             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" />
+ 
+     </LinearLayout>
+diff --git a/res/layout/digital_widget_sizer.xml b/res/layout/digital_widget_sizer.xml
+index f524cf536..7b08ca590 100644
+--- a/res/layout/digital_widget_sizer.xml
+++ b/res/layout/digital_widget_sizer.xml
+@@ -46,7 +46,6 @@
+             android:includeFontPadding="false"
+             android:ellipsize="none"
+             android:singleLine="true"
+-            android:textAllCaps="true"
+             android:textColor="@color/white" />
+ 
+         <!-- This view is drawn to a Bitmap and sent to the widget as an icon. -->
+@@ -71,7 +70,6 @@
+             android:includeFontPadding="false"
+             android:ellipsize="none"
+             android:singleLine="true"
+-            android:textAllCaps="true"
+             android:textColor="@color/white" />
+ 
+     </LinearLayout>
+diff --git a/res/layout/main_clock_frame.xml b/res/layout/main_clock_frame.xml
+index ab960728f..2042c5b04 100644
+--- a/res/layout/main_clock_frame.xml
+++ b/res/layout/main_clock_frame.xml
+@@ -51,6 +51,7 @@
+             <com.android.deskclock.widget.AutoSizingTextClock
+                 android:id="@+id/digital_clock"
+                 style="@style/display_time"
+                android:fontFamily="sans-serif-thin"
+                 android:layout_width="wrap_content"
+                 android:layout_height="wrap_content"
+                 android:ellipsize="none"
+diff --git a/res/layout/stopwatch_time.xml b/res/layout/stopwatch_time.xml
+index c1895b488..71320fcd0 100644
+--- a/res/layout/stopwatch_time.xml
+++ b/res/layout/stopwatch_time.xml
+@@ -42,7 +42,6 @@
+         android:layout_width="wrap_content"
+         android:layout_height="wrap_content"
+         android:duplicateParentState="true"
+-        android:fontFamily="sans-serif"
+         android:includeFontPadding="false"
+         android:paddingEnd="30dp"
+         android:paddingStart="3dp"
+diff --git a/res/layout/timer_setup_time.xml b/res/layout/timer_setup_time.xml
+index 572063fc6..14e9ea3bb 100644
+--- a/res/layout/timer_setup_time.xml
+++ b/res/layout/timer_setup_time.xml
+@@ -32,7 +32,7 @@
+         android:layout_width="wrap_content"
+         android:layout_height="wrap_content"
+         android:ellipsize="none"
+-        android:fontFamily="sans-serif"
+        android:fontFamily="sans-serif-light"
+         android:fontFeatureSettings="tnum"
+         android:includeFontPadding="false"
+         android:singleLine="true"
+diff --git a/res/layout/world_clock_remote_list_item.xml b/res/layout/world_clock_remote_list_item.xml
+index 9a69cb517..f5f4eaa21 100644
+--- a/res/layout/world_clock_remote_list_item.xml
+++ b/res/layout/world_clock_remote_list_item.xml
+@@ -58,13 +58,13 @@
+                     <TextView
+                         android:id="@+id/city_name_left"
+                         style="@style/widget_label"
+                        android:fontFamily="sans-serif"
+                         android:layout_width="wrap_content"
+                         android:layout_height="wrap_content"
+                         android:layout_gravity="end"
+                         android:ellipsize="end"
+                         android:includeFontPadding="false"
+                         android:singleLine="true"
+-                        android:textAllCaps="true"
+                         android:textColor="@color/white"
+                         android:textSize="@dimen/city_widget_name_font_size" />
+ 
+@@ -73,6 +73,7 @@
+                 <TextView
+                     android:id="@+id/city_day_left"
+                     style="@style/widget_label"
+                    android:fontFamily="sans-serif"
+                     android:layout_width="wrap_content"
+                     android:layout_height="wrap_content"
+                     android:layout_marginStart="@dimen/style_label_space"
+@@ -81,7 +82,6 @@
+                     android:format24Hour="@string/abbrev_wday"
+                     android:includeFontPadding="false"
+                     android:singleLine="true"
+-                    android:textAllCaps="true"
+                     android:textColor="@color/white"
+                     android:textSize="@dimen/city_widget_name_font_size" />
+ 
+@@ -120,13 +120,13 @@
+                     <TextView
+                         android:id="@+id/city_name_right"
+                         style="@style/widget_label"
+                        android:fontFamily="sans-serif"
+                         android:layout_width="wrap_content"
+                         android:layout_height="wrap_content"
+                         android:layout_gravity="end"
+                         android:ellipsize="end"
+                         android:includeFontPadding="false"
+                         android:singleLine="true"
+-                        android:textAllCaps="true"
+                         android:textColor="@color/white"
+                         android:textSize="@dimen/city_widget_name_font_size" />
+ 
+@@ -135,6 +135,7 @@
+                 <TextView
+                     android:id="@+id/city_day_right"
+                     style="@style/widget_label"
+                    android:fontFamily="sans-serif"
+                     android:layout_width="wrap_content"
+                     android:layout_height="wrap_content"
+                     android:layout_marginStart="@dimen/style_label_space"
+@@ -143,7 +144,6 @@
+                     android:format24Hour="@string/abbrev_wday"
+                     android:includeFontPadding="false"
+                     android:singleLine="true"
+-                    android:textAllCaps="true"
+                     android:textColor="@color/white"
+                     android:textSize="@dimen/city_widget_name_font_size" />
+ 
+diff --git a/res/values-h560dp/dimens.xml b/res/values-h560dp/dimens.xml
+index 003a5ad9f..6e25621ab 100644
+--- a/res/values-h560dp/dimens.xml
+++ b/res/values-h560dp/dimens.xml
+@@ -16,5 +16,5 @@
+ 
+ <resources>
+     <!-- The maximum size of the font for the time in widgets. -->
+-    <dimen name="widget_max_clock_font_size">96dp</dimen>
+    <dimen name="widget_max_clock_font_size">88dp</dimen>
+ </resources>
+\ No newline at end of file
+diff --git a/res/values-h650dp/dimens.xml b/res/values-h650dp/dimens.xml
+index 2cc58cb32..6e25621ab 100644
+--- a/res/values-h650dp/dimens.xml
+++ b/res/values-h650dp/dimens.xml
+@@ -16,5 +16,5 @@
+ 
+ <resources>
+     <!-- The maximum size of the font for the time in widgets. -->
+-    <dimen name="widget_max_clock_font_size">100dp</dimen>
+    <dimen name="widget_max_clock_font_size">88dp</dimen>
+ </resources>
+\ No newline at end of file
+diff --git a/res/values-v21/styles.xml b/res/values-v21/styles.xml
+index f1dca16c0..7bc382a4d 100644
+--- a/res/values-v21/styles.xml
+++ b/res/values-v21/styles.xml
+@@ -18,17 +18,17 @@
+ <resources>
+ 
+     <style name="body">
+-        <item name="android:textSize">14sp</item>
+        <item name="android:textSize">16sp</item>
+         <item name="android:textColor">@color/white</item>
+-        <item name="android:fontFamily">sans-serif-medium</item>
+        <item name="android:fontFamily">sans-serif</item>
+     </style>
+ 
+     <style name="PrimaryLabelTextAppearance" parent="PrimaryLabelTextParentAppearance">
+-        <item name="android:fontFamily">sans-serif-medium</item>
+        <item name="android:fontFamily">sans-serif</item>
+     </style>
+ 
+     <style name="SecondaryLabelTextAppearance" parent="SecondaryLabelTextParentAppearance">
+-        <item name="android:fontFamily">sans-serif-medium</item>
+        <item name="android:fontFamily">sans-serif</item>
+     </style>
+ 
+ </resources>
+diff --git a/res/values-v23/styles.xml b/res/values-v23/styles.xml
+index 34dcf5d73..6bf964256 100644
+--- a/res/values-v23/styles.xml
+++ b/res/values-v23/styles.xml
+@@ -26,8 +26,6 @@
+     </style>
+ 
+     <style name="widget_label" parent="label">
+-        <item name="android:textAllCaps">true</item>
+-        <item name="android:letterSpacing">0.15</item>
+         <item name="android:shadowRadius">@dimen/widget_shadow_radius</item>
+         <item name="android:shadowColor">@color/widget_shadow_color</item>
+         <item name="android:shadowDx">@dimen/widget_shadow_dx</item>
+diff --git a/res/values/dimens.xml b/res/values/dimens.xml
+index 6a384e94b..442fdb1cc 100644
+--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
+@@ -44,7 +44,7 @@
+     <dimen name="alarm_lockscreen_bottom_margin">40dp</dimen>
+ 
+     <dimen name="main_clock_font_size">64sp</dimen>
+-    <dimen name="main_clock_digital_font_size">90sp</dimen>
+    <dimen name="main_clock_digital_font_size">88sp</dimen>
+     <dimen name="main_clock_digital_padding">24dp</dimen>
+     <dimen name="big_font_size">32sp</dimen>
+     <dimen name="label_font_size">16sp</dimen>
+@@ -93,15 +93,15 @@
+     <dimen name="digital_widget_city_24_medium_font_size">40sp</dimen>
+ 
+     <!-- The fixed size of the font for the city name / day of week in the city widget. -->
+-    <dimen name="city_widget_name_font_size">10dp</dimen>
+    <dimen name="city_widget_name_font_size">12dp</dimen>
+     <!-- The maximum size of the font for the time in widgets. -->
+     <dimen name="widget_max_clock_font_size">88dp</dimen>
+     <dimen name="widget_min_world_city_list_size">80dp</dimen>
+ 
+     <!-- shadow styles for widget text with drop shadows -->
+-    <item name="widget_shadow_radius" format="float" type="dimen">2.75</item>
+-    <item name="widget_shadow_dx" format="float" type="dimen">2.0</item>
+-    <item name="widget_shadow_dy" format="float" type="dimen">2.0</item>
+    <item name="widget_shadow_radius" format="float" type="dimen">0</item>
+    <item name="widget_shadow_dx" format="float" type="dimen">0</item>
+    <item name="widget_shadow_dy" format="float" type="dimen">0</item>
+ 
+     <!-- Divider height -->
+     <dimen name="hairline_height">1dp</dimen>
+diff --git a/res/values/styles.xml b/res/values/styles.xml
+index fbe62ae3a..ca60e46b8 100644
+--- a/res/values/styles.xml
+++ b/res/values/styles.xml
+@@ -51,12 +51,13 @@
+     <style name="world_clock_time">
+         <item name="android:textSize">48sp</item>
+         <item name="android:textColor">@color/white</item>
+-        <item name="android:fontFamily">sans-serif-light</item>
+        <item name="android:fontFamily">sans-serif-thin</item>
+     </style>
+ 
+     <style name="body">
+-        <item name="android:textSize">14sp</item>
+        <item name="android:textSize">16sp</item>
+         <item name="android:textColor">@color/white</item>
+        <item name="android:fontFamily">sans-serif</item>
+     </style>
+ 
+     <style name="big_thin">
+diff --git a/src/com/android/alarmclock/DigitalAppWidgetProvider.java b/src/com/android/alarmclock/DigitalAppWidgetProvider.java
+index 3be07eca7..86f1d991e 100644
+--- a/src/com/android/alarmclock/DigitalAppWidgetProvider.java
+++ b/src/com/android/alarmclock/DigitalAppWidgetProvider.java
+@@ -453,7 +453,13 @@ public class DigitalAppWidgetProvider extends AppWidgetProvider {
+      */
+     private static String getDateFormat(Context context) {
+         final Locale locale = Locale.getDefault();
+-        final String skeleton = context.getString(R.string.abbrev_wday_month_day_no_year);
+        final String nextAlarmTime = Utils.getNextAlarm(context);
+        final String skeleton;
+        if (TextUtils.isEmpty(nextAlarmTime)) {
+            skeleton = context.getString(R.string.full_wday_month_day_no_year);
+        } else {
+            skeleton = context.getString(R.string.abbrev_wday_month_day_no_year);
+        }
+         return DateFormat.getBestDateTimePattern(locale, skeleton);
+     }
+ 
+@@ -495,7 +501,7 @@ public class DigitalAppWidgetProvider extends AppWidgetProvider {
+         private int getClockFontSizePx() { return mClockFontSizePx; }
+         private void setClockFontSizePx(int clockFontSizePx) {
+             mClockFontSizePx = clockFontSizePx;
+-            mFontSizePx = max(1, round(clockFontSizePx / 7.5f));
+            mFontSizePx = max(1, round(clockFontSizePx / 5.5f));
+             mIconFontSizePx = (int) (mFontSizePx * 1.4f);
+             mIconPaddingPx = mFontSizePx / 3;
+         }
+diff --git a/src/com/android/deskclock/ClockFragment.java b/src/com/android/deskclock/ClockFragment.java
+index b487e52be..1459094ee 100644
+--- a/src/com/android/deskclock/ClockFragment.java
+++ b/src/com/android/deskclock/ClockFragment.java
+@@ -80,6 +80,7 @@ public final class ClockFragment extends DeskClockFragment {
+     private SelectedCitiesAdapter mCityAdapter;
+     private RecyclerView mCityList;
+     private String mDateFormat;
+    private String mDateFormatAlarm;
+     private String mDateFormatForAccessibility;
+ 
+     /**
+@@ -103,11 +104,12 @@ public final class ClockFragment extends DeskClockFragment {
+ 
+         final View fragmentView = inflater.inflate(R.layout.clock_fragment, container, false);
+ 
+-        mDateFormat = getString(R.string.abbrev_wday_month_day_no_year);
+        mDateFormat = getString(R.string.full_wday_month_day_no_year);
+        mDateFormatAlarm = getString(R.string.abbrev_wday_month_day_no_year);
+         mDateFormatForAccessibility = getString(R.string.full_wday_month_day_no_year);
+ 
+         mCityAdapter = new SelectedCitiesAdapter(getActivity(), mDateFormat,
+-                mDateFormatForAccessibility);
+                mDateFormatAlarm, mDateFormatForAccessibility);
+ 
+         mCityList = (RecyclerView) fragmentView.findViewById(R.id.cities);
+         mCityList.setLayoutManager(new LinearLayoutManager(getActivity()));
+@@ -129,7 +131,7 @@ public final class ClockFragment extends DeskClockFragment {
+             mDigitalClock = (TextClock) mClockFrame.findViewById(R.id.digital_clock);
+             mAnalogClock = (AnalogClock) mClockFrame.findViewById(R.id.analog_clock);
+             Utils.setClockIconTypeface(mClockFrame);
+-            Utils.updateDate(mDateFormat, mDateFormatForAccessibility, mClockFrame);
+            Utils.updateDate(getActivity(), mDateFormat, mDateFormatAlarm, mDateFormatForAccessibility, mClockFrame);
+             Utils.setClockStyle(mDigitalClock, mAnalogClock);
+             Utils.setClockSecondsEnabled(mDigitalClock, mAnalogClock);
+         }
+@@ -146,7 +148,8 @@ public final class ClockFragment extends DeskClockFragment {
+ 
+         final Activity activity = getActivity();
+ 
+-        mDateFormat = getString(R.string.abbrev_wday_month_day_no_year);
+        mDateFormat = getString(R.string.full_wday_month_day_no_year);
+        mDateFormatAlarm = getString(R.string.abbrev_wday_month_day_no_year);
+         mDateFormatForAccessibility = getString(R.string.full_wday_month_day_no_year);
+ 
+         // Watch for system events that effect clock time or format.
+@@ -348,13 +351,15 @@ public final class ClockFragment extends DeskClockFragment {
+         private final Context mContext;
+         private final boolean mIsPortrait;
+         private final boolean mShowHomeClock;
+-        private final String mDateFormat;
+-        private final String mDateFormatForAccessibility;
+        private static String mDateFormat;
+        private static String mDateFormatAlarm;
+        private static String mDateFormatForAccessibility;
+ 
+         private SelectedCitiesAdapter(Context context, String dateFormat,
+-                String dateFormatForAccessibility) {
+                String dateFormatAlarm, String dateFormatForAccessibility) {
+             mContext = context;
+             mDateFormat = dateFormat;
+            mDateFormatAlarm = dateFormatAlarm;
+             mDateFormatForAccessibility = dateFormatForAccessibility;
+             mInflater = LayoutInflater.from(context);
+             mIsPortrait = Utils.isPortrait(context);
+@@ -541,7 +546,7 @@ public final class ClockFragment extends DeskClockFragment {
+                     String dateFormatForAccessibility, boolean showHairline) {
+                 Utils.refreshAlarm(context, itemView);
+ 
+-                Utils.updateDate(dateFormat, dateFormatForAccessibility, itemView);
+                Utils.updateDate(context, mDateFormat, mDateFormatAlarm, mDateFormatForAccessibility, itemView);
+                 Utils.setClockStyle(mDigitalClock, mAnalogClock);
+                 mHairline.setVisibility(showHairline ? VISIBLE : GONE);
+ 
+diff --git a/src/com/android/deskclock/Screensaver.java b/src/com/android/deskclock/Screensaver.java
+index 68899d96e..7f01d880a 100644
+--- a/src/com/android/deskclock/Screensaver.java
+++ b/src/com/android/deskclock/Screensaver.java
+@@ -43,6 +43,7 @@ public final class Screensaver extends DreamService {
+     private MoveScreensaverRunnable mPositionUpdater;
+ 
+     private String mDateFormat;
+    private String mDateFormatAlarm;
+     private String mDateFormatForAccessibility;
+ 
+     private View mContentView;
+@@ -63,7 +64,7 @@ public final class Screensaver extends DreamService {
+     private final Runnable mMidnightUpdater = new Runnable() {
+         @Override
+         public void run() {
+-            Utils.updateDate(mDateFormat, mDateFormatForAccessibility, mContentView);
+            Utils.updateDate(Screensaver.this, mDateFormat, mDateFormatAlarm, mDateFormatForAccessibility, mContentView);
+         }
+     };
+ 
+@@ -84,7 +85,8 @@ public final class Screensaver extends DreamService {
+         setTheme(R.style.Theme_DeskClock);
+         super.onCreate();
+ 
+-        mDateFormat = getString(R.string.abbrev_wday_month_day_no_year);
+        mDateFormat = getString(R.string.full_wday_month_day_no_year);
+        mDateFormatAlarm = getString(R.string.abbrev_wday_month_day_no_year);
+         mDateFormatForAccessibility = getString(R.string.full_wday_month_day_no_year);
+     }
+ 
+@@ -129,7 +131,7 @@ public final class Screensaver extends DreamService {
+             getContentResolver().registerContentObserver(uri, false, mSettingsContentObserver);
+         }
+ 
+-        Utils.updateDate(mDateFormat, mDateFormatForAccessibility, mContentView);
+        Utils.updateDate(this, mDateFormat, mDateFormatAlarm, mDateFormatForAccessibility, mContentView);
+         Utils.refreshAlarm(this, mContentView);
+ 
+         startPositionUpdater();
+diff --git a/src/com/android/deskclock/ScreensaverActivity.java b/src/com/android/deskclock/ScreensaverActivity.java
+index c7d54af3f..14c9bab00 100644
+--- a/src/com/android/deskclock/ScreensaverActivity.java
+++ b/src/com/android/deskclock/ScreensaverActivity.java
+@@ -87,11 +87,12 @@ public class ScreensaverActivity extends BaseActivity {
+     private final Runnable mMidnightUpdater = new Runnable() {
+         @Override
+         public void run() {
+-            Utils.updateDate(mDateFormat, mDateFormatForAccessibility, mContentView);
+            Utils.updateDate(ScreensaverActivity.this, mDateFormat, mDateFormatAlarm, mDateFormatForAccessibility, mContentView);
+         }
+     };
+ 
+     private String mDateFormat;
+    private String mDateFormatAlarm;
+     private String mDateFormatForAccessibility;
+ 
+     private View mContentView;
+@@ -103,7 +104,8 @@ public class ScreensaverActivity extends BaseActivity {
+     protected void onCreate(Bundle savedInstanceState) {
+         super.onCreate(savedInstanceState);
+ 
+-        mDateFormat = getString(R.string.abbrev_wday_month_day_no_year);
+        mDateFormat = getString(R.string.full_wday_month_day_no_year);
+        mDateFormatAlarm = getString(R.string.abbrev_wday_month_day_no_year);
+         mDateFormatForAccessibility = getString(R.string.full_wday_month_day_no_year);
+ 
+         setContentView(R.layout.desk_clock_saver);
+@@ -160,7 +162,7 @@ public class ScreensaverActivity extends BaseActivity {
+     public void onResume() {
+         super.onResume();
+ 
+-        Utils.updateDate(mDateFormat, mDateFormatForAccessibility, mContentView);
+        Utils.updateDate(ScreensaverActivity.this, mDateFormat, mDateFormatAlarm, mDateFormatForAccessibility, mContentView);
+         Utils.refreshAlarm(ScreensaverActivity.this, mContentView);
+ 
+         startPositionUpdater();
+diff --git a/src/com/android/deskclock/Utils.java b/src/com/android/deskclock/Utils.java
+index 6d97912f7..cba5c0909 100644
+--- a/src/com/android/deskclock/Utils.java
+++ b/src/com/android/deskclock/Utils.java
+@@ -353,6 +353,11 @@ public class Utils {
+             nextAlarmView.setVisibility(View.GONE);
+             nextAlarmIconView.setVisibility(View.GONE);
+         }
+
+        String mDateFormat = context.getString(R.string.full_wday_month_day_no_year);
+        String mDateFormatAlarm = context.getString(R.string.abbrev_wday_month_day_no_year);
+        String mDateFormatForAccessibility = context.getString(R.string.full_wday_month_day_no_year);
+        Utils.updateDate(context, mDateFormat, mDateFormatAlarm, mDateFormatForAccessibility, clock);
+     }
+ 
+     public static void setClockIconTypeface(View clock) {
+@@ -363,14 +368,21 @@ public class Utils {
+     /**
+      * Clock views can call this to refresh their date.
+      **/
+-    public static void updateDate(String dateSkeleton, String descriptionSkeleton, View clock) {
+    public static void updateDate(Context context, String dateSkeleton, String dateSkeletonAlarm, String descriptionSkeleton, View clock) {
+         final TextView dateDisplay = (TextView) clock.findViewById(R.id.date);
+         if (dateDisplay == null) {
+             return;
+         }
+ 
+         final Locale l = Locale.getDefault();
+-        final String datePattern = DateFormat.getBestDateTimePattern(l, dateSkeleton);
+        final String datePattern;
+        final String alarm = getNextAlarm(context);
+        if (!TextUtils.isEmpty(alarm)) {
+            datePattern = DateFormat.getBestDateTimePattern(l, dateSkeletonAlarm);
+        } else {
+            datePattern = DateFormat.getBestDateTimePattern(l, dateSkeleton);
+        }
+
+         final String descriptionPattern = DateFormat.getBestDateTimePattern(l, descriptionSkeleton);
+ 
+         final Date now = new Date();
+-- 
+2.25.1
+
--- a/patches_platform_personal/packages_apps_DeskClock/0003-DeskClock-Remove-night-mode.patch
+++ b/patches_platform_personal/packages_apps_DeskClock/0003-DeskClock-Remove-night-mode.patch
@@ -0,0 +1,61 @@
+From 5778373cb0bfbf81bfb264930a61435a1c5eda2a 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 3/3] DeskClock: Remove night mode
+
+Change-Id: I885f39027e78fcda397f1be59d17bc24bc66671a
+---
+ res/xml/screensaver_settings.xml                   | 8 +-------
+ src/com/android/deskclock/Screensaver.java         | 5 ++---
+ src/com/android/deskclock/ScreensaverActivity.java | 2 +-
+ 3 files changed, 4 insertions(+), 11 deletions(-)
+
+diff --git a/res/xml/screensaver_settings.xml b/res/xml/screensaver_settings.xml
+index 1680aab83..73375dcfa 100644
+--- a/res/xml/screensaver_settings.xml
+++ b/res/xml/screensaver_settings.xml
+@@ -24,10 +24,4 @@
+         android:key="screensaver_clock_style"
+         android:title="@string/clock_style" />
+ 
+-    <CheckBoxPreference
+-        android:defaultValue="true"
+-        android:key="screensaver_night_mode"
+-        android:summary="@string/night_mode_summary"
+-        android:title="@string/night_mode_title" />
+-
+-</PreferenceScreen>
+\ No newline at end of file
+</PreferenceScreen>
+diff --git a/src/com/android/deskclock/Screensaver.java b/src/com/android/deskclock/Screensaver.java
+index 7f01d880a..b295d7a77 100644
+--- a/src/com/android/deskclock/Screensaver.java
+++ b/src/com/android/deskclock/Screensaver.java
+@@ -166,9 +166,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 14c9bab00..912d59b2c 100644
+--- a/src/com/android/deskclock/ScreensaverActivity.java
+++ b/src/com/android/deskclock/ScreensaverActivity.java
+@@ -119,7 +119,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.25.1
+
--- a/patches_platform_personal/packages_apps_Messaging/0001-Messaging-Use-blue-accent.patch
+++ b/patches_platform_personal/packages_apps_Messaging/0001-Messaging-Use-blue-accent.patch
--- 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,93 @@
+From deccbf542c72d5e1f78e83b3e895eb1f9480ac75 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] Trebuchet: Make overview scrim transparent again
+
+Also revert texts/buttons to workspace color
+
+Change-Id: I78c84865eb06b8e59c9c271cd2e267ae4cd7cc08
+---
+ quickstep/res/values/styles.xml                            | 4 ++--
+ quickstep/src/com/android/quickstep/views/RecentsView.java | 2 +-
+ res/color-v31/overview_scrim.xml                           | 2 +-
+ res/color-v31/overview_scrim_dark.xml                      | 2 +-
+ res/color/overview_button.xml                              | 6 +++---
+ 5 files changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/quickstep/res/values/styles.xml b/quickstep/res/values/styles.xml
+index 07c448df9e..c3a3bb8375 100644
+--- a/quickstep/res/values/styles.xml
+++ b/quickstep/res/values/styles.xml
+@@ -130,7 +130,7 @@
+         parent="@android:style/Widget.DeviceDefault.Button.Borderless">
+         <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>
+@@ -139,4 +139,4 @@
+     <style name="BaseIcon.Workspace.Taskbar" >
+         <item name="iconDisplay">taskbar</item>
+     </style>
+-</resources>
+\ No newline at end of file
+</resources>
+diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
+index b447166d6e..d94a93a909 100644
+--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
+@@ -606,7 +606,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
+index 80799957ff..894997c59a 100644
+--- a/res/color-v31/overview_scrim.xml
+++ b/res/color-v31/overview_scrim.xml
+@@ -14,5 +14,5 @@
+      limitations under the License.
+ -->
+ <selector xmlns:android="http://schemas.android.com/apk/res/android">
+-  <item android:color="@android:color/system_neutral2_500" android:lStar="87" />
+  <item android:color="@android:color/transparent" />
+ </selector>
+diff --git a/res/color-v31/overview_scrim_dark.xml b/res/color-v31/overview_scrim_dark.xml
+index b8ed7747e0..894997c59a 100644
+--- a/res/color-v31/overview_scrim_dark.xml
+++ b/res/color-v31/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="@android:color/system_neutral1_800" />
+  <item android:color="@android:color/transparent" />
+ </selector>
+diff --git a/res/color/overview_button.xml b/res/color/overview_button.xml
+index aa48b78604..e638ac2d4a 100644
+--- a/res/color/overview_button.xml
+++ b/res/color/overview_button.xml
+@@ -2,10 +2,10 @@
+ <selector xmlns:android="http://schemas.android.com/apk/res/android">
+     <item
+         android:alpha="1"
+-        android:color="?android:attr/textColorPrimary"
+        android:color="?attr/workspaceTextColor"
+         android:state_enabled="true" />
+     <item
+         android:alpha="?android:disabledAlpha"
+-        android:color="?android:attr/textColorPrimary"
+        android:color="?attr/workspaceTextColor"
+         android:state_enabled="false" />
+-</selector>
+\ No newline at end of file
+</selector>
+-- 
+2.25.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,80 @@
+From 9f56f5ced9534094a72c14d996bd21dd7800a059 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 | 24 ------------------------
+ res/values/config.xml        |  7 +++----
+ 2 files changed, 3 insertions(+), 28 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 2863edd7..00000000
+--- a/res/values-mcc460/config.xml
+++ /dev/null
+@@ -1,24 +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_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.com/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/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 bd33859aa15ad4ab099716b0d029b333c6300134 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.25.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 e3633d610a46dfa849b01ae66ff233e615efa079 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.25.1
+
--- a/patches_platform_personal/vendor_lineage/0003-Revert-overlay-Enable-monet.patch
+++ b/patches_platform_personal/vendor_lineage/0003-Revert-overlay-Enable-monet.patch
@@ -0,0 +1,23 @@
+From ef538d98c3401b7324682ebf96f32f28649dc036 Mon Sep 17 00:00:00 2001
+From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
+Date: Wed, 27 Oct 2021 13:23:31 +0000
+Subject: [PATCH 3/4] Revert "overlay: Enable monet"
+
+This reverts commit 97a1727968a2fca85c3bdc419637e9c02fce9ce7.
+---
+ .../frameworks/base/packages/SystemUI/res/values/flags.xml       | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/overlay/common/frameworks/base/packages/SystemUI/res/values/flags.xml b/overlay/common/frameworks/base/packages/SystemUI/res/values/flags.xml
+index d22d0f23..64c6e78b 100644
+--- a/overlay/common/frameworks/base/packages/SystemUI/res/values/flags.xml
+++ b/overlay/common/frameworks/base/packages/SystemUI/res/values/flags.xml
+@@ -17,5 +17,4 @@
+ <resources>
+     <bool name="flag_conversations">true</bool>
+     <bool name="flag_charging_ripple">true</bool>
+-    <bool name="flag_monet">true</bool>
+ </resources>
+-- 
+2.25.1
+
--- a/patches_platform_personal/vendor_lineage/0004-vendor_lineage-Ignore-neverallows.-again.patch
+++ b/patches_platform_personal/vendor_lineage/0004-vendor_lineage-Ignore-neverallows.-again.patch
@@ -0,0 +1,30 @@
+From 89941c7836527978fb1834a14e9ad95cb1c5c9d0 Mon Sep 17 00:00:00 2001
+From: AndyCGYan <GeForce8800Ultra@gmail.com>
+Date: Mon, 1 Jul 2019 07:03:04 +0000
+Subject: [PATCH 4/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.25.1
+